From 18188947fa36358fac213245d41206edf2c3c7e7 Mon Sep 17 00:00:00 2001 From: Tim Digel Date: Mon, 14 Nov 2016 14:56:24 +0100 Subject: [PATCH 001/361] 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 002/361] 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 003/361] 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 362c84227332dddf536238e75acb7fd1c646714a Mon Sep 17 00:00:00 2001 From: timor Date: Sun, 10 Sep 2017 13:43:32 +0200 Subject: [PATCH 004/361] 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 dc8500165ca456df4ea9c4e828ea6dfb85797feb Mon Sep 17 00:00:00 2001 From: Danylo Hlynskyi Date: Thu, 5 Oct 2017 00:42:50 +0000 Subject: [PATCH 005/361] 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 78785a06f99d20ae86479c4f6896463f812e2760 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 4 Oct 2017 17:35:45 -0500 Subject: [PATCH 006/361] 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 318b3fb34e3dd5f8f3a86f6e60ade1ac3bce6305 Mon Sep 17 00:00:00 2001 From: Volth Date: Thu, 19 Oct 2017 00:45:09 +0000 Subject: [PATCH 007/361] 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 bc2aaeb75caae20ececbb34d8abea789e94af3b1 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 21 Oct 2017 07:30:22 +0000 Subject: [PATCH 008/361] 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 18d286b6c9fb97434e8ef1a555fdc0b646335ef6 Mon Sep 17 00:00:00 2001 From: Michael Peyton Jones Date: Sat, 21 Oct 2017 22:29:45 +0100 Subject: [PATCH 009/361] 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 e6a199b95d5bb24485c7b8eb7f2c51cadebaa558 Mon Sep 17 00:00:00 2001 From: Michael Peyton Jones Date: Sat, 21 Oct 2017 22:31:21 +0100 Subject: [PATCH 010/361] 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 380bb673d46fbdcca42515d5a1a04c7385ff681f Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Sun, 22 Oct 2017 16:06:34 +0200 Subject: [PATCH 011/361] 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 97c7b69e250b4f6d19ce6737815615c38568cee5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 27 Oct 2017 22:20:20 +0200 Subject: [PATCH 012/361] 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 f8ce957263d4ff2fc910f99511ceb16a20381101 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Sun, 15 Oct 2017 13:26:20 -0400 Subject: [PATCH 013/361] 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 014/361] 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 015/361] 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 016/361] 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 017/361] 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 018/361] 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 019/361] 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 020/361] 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 021/361] 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 022/361] 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 a71e80db8b9a99d59ad13f2dbce477e3276a2ee1 Mon Sep 17 00:00:00 2001 From: Ingo Blechschmidt Date: Sat, 28 Oct 2017 16:22:07 +0200 Subject: [PATCH 023/361] 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 274f71e18cb19e4d918a8137519e8fbbcb033375 Mon Sep 17 00:00:00 2001 From: Benjamin Saunders Date: Mon, 9 Oct 2017 20:39:36 -0700 Subject: [PATCH 024/361] 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 025/361] 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 4cbf66b578629b1d8f94d570aaafa00b3993644c Mon Sep 17 00:00:00 2001 From: dywedir Date: Sun, 29 Oct 2017 00:42:42 +0300 Subject: [PATCH 026/361] 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 e270f158ac2319dddc9a44ae2512c4aba1855a60 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 29 Oct 2017 15:54:18 -0400 Subject: [PATCH 027/361] 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 b831d3845f885ebb102ec0d63d4b664fbdfd10f8 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 28 Oct 2017 14:59:04 +0800 Subject: [PATCH 028/361] 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 029/361] 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 030/361] 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 031/361] 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 032/361] 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 033/361] 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 034/361] 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 035/361] 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 036/361] 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 037/361] 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 038/361] 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 039/361] 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 040/361] 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 041/361] 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 042/361] 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 043/361] 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 044/361] 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 045/361] 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 046/361] 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 047/361] 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 048/361] 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 049/361] 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 050/361] 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 051/361] 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 052/361] 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 053/361] 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 a2fe432e2c9262b62d0f853b9965ef08de3408bc Mon Sep 17 00:00:00 2001 From: Kai Harries Date: Sun, 29 Oct 2017 21:15:10 +0100 Subject: [PATCH 054/361] 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 f7616c4f5e2c869192f353843a31eff7dab68d7f Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Thu, 16 Feb 2017 22:06:57 +0100 Subject: [PATCH 055/361] 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 d424bfe236ed257960de00618750cf76ca77a7c7 Mon Sep 17 00:00:00 2001 From: Michiel Leenaars Date: Mon, 30 Oct 2017 23:21:22 +0100 Subject: [PATCH 056/361] 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 d05b21d7c0c53a11319279f05ba56333f9016818 Mon Sep 17 00:00:00 2001 From: Kamil Chmielewski Date: Thu, 6 Oct 2016 23:26:34 +0200 Subject: [PATCH 057/361] 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 633b03c57f658d57a192eabb088b171b4542081e Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sun, 29 Oct 2017 17:15:43 +0100 Subject: [PATCH 058/361] 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 8e541c08d6468e37f8e950b04994cc1782d9f99a Mon Sep 17 00:00:00 2001 From: Roger Qiu Date: Mon, 31 Jul 2017 16:48:37 +1000 Subject: [PATCH 059/361] 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 060/361] 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 8162e580f5ec8897729e0e6a6199dd90b3c01895 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 1 Nov 2017 22:15:09 +0100 Subject: [PATCH 061/361] 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 e4913c2d303cb58cc8d31abf0854d3b332fa62de Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 1 Nov 2017 23:58:54 +0100 Subject: [PATCH 062/361] 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 faa9afbdfd492ed262e67383fa69d5cddeb0e415 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 2 Nov 2017 10:48:03 +0100 Subject: [PATCH 063/361] 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 d8702bfaebfc78a11858d9ea2346aff8336db689 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 14 Oct 2017 14:48:00 +0800 Subject: [PATCH 064/361] 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 51629d777d3d7ff2a91ff9bb1f09ad00544cf45a Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 2 Nov 2017 13:37:24 -0400 Subject: [PATCH 065/361] 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 066/361] 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 067/361] 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 068/361] 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 9fa8f3ed0d3cb32c5fdf6fe8e4aff46ee2df842c Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 3 Nov 2017 02:07:38 +0800 Subject: [PATCH 069/361] 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 070/361] 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 998027a531b0fce8e1be96da7782ff56b4607772 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Wed, 1 Nov 2017 17:07:01 -0400 Subject: [PATCH 071/361] 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 eeef094dfdb34755e57c5cc46c140ebee769a61e Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 2 Nov 2017 13:47:12 -0500 Subject: [PATCH 072/361] 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 073/361] 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 074/361] 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 3c74fcf6bf84b515f0b20f08d417caeae32bfb53 Mon Sep 17 00:00:00 2001 From: John Boehr Date: Thu, 2 Nov 2017 12:49:55 -0700 Subject: [PATCH 075/361] 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 076/361] 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 077/361] 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 078/361] 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 079/361] 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 080/361] 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 081/361] 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 082/361] 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 083/361] 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 084/361] 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 085/361] 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 086/361] 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 087/361] 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 088/361] 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 089/361] 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 090/361] 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 091/361] 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 092/361] 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 449a0531524dfffd3f8f387c651ae19235b14f5b Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 2 Nov 2017 19:53:57 -0400 Subject: [PATCH 093/361] 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 094/361] 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 78ed9da5e4d9c4cd3451d10195f816eb0c0983d8 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Fri, 3 Nov 2017 04:14:22 +0000 Subject: [PATCH 095/361] 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 096/361] 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 097/361] 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 098/361] 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 099/361] 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 100/361] 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 101/361] 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 102/361] 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 103/361] 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 104/361] 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 105/361] 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 106/361] 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 107/361] 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 108/361] 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 109/361] 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 110/361] 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 111/361] 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 112/361] 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 113/361] 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 114/361] 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 115/361] 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 116/361] 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 117/361] 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 118/361] 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 119/361] 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 120/361] 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 121/361] 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 122/361] 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 123/361] 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 124/361] 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 125/361] 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 126/361] 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 127/361] 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 128/361] 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 129/361] 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 130/361] 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 131/361] 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 132/361] 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 133/361] 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 134/361] 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 135/361] 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 136/361] 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 22:40:44 +0100 Subject: [PATCH 137/361] 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 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 138/361] 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 139/361] 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 140/361] 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 141/361] 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 142/361] 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 143/361] 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 144/361] 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 145/361] 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 146/361] 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 147/361] 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 148/361] 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 149/361] 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 150/361] 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 151/361] 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 152/361] 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 153/361] 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 154/361] 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 155/361] 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 156/361] 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 157/361] 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 158/361] 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 159/361] 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 ba885e1d7decd14dd70c1602a208eda4d2b352cb Mon Sep 17 00:00:00 2001 From: gjeusel Date: Sat, 4 Nov 2017 11:48:38 +0100 Subject: [PATCH 160/361] 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 161/361] 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 162/361] 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 163/361] 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 164/361] 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 165/361] 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 166/361] 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 167/361] 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 168/361] 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 169/361] 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 170/361] 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 171/361] 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 172/361] 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 173/361] 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 4e892b9c03ea69eee38cdd40126194ea92cc00be Mon Sep 17 00:00:00 2001 From: Renaud Date: Sat, 4 Nov 2017 15:26:22 +0100 Subject: [PATCH 174/361] 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 7325ad9ab735424257b05a81e0c8197e4651e68f Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Wed, 1 Nov 2017 01:09:39 +0100 Subject: [PATCH 175/361] 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 176/361] 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 177/361] 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 178/361] 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 179/361] 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 180/361] 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 181/361] 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 182/361] 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 183/361] 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 184/361] 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 185/361] 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 186/361] 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 187/361] 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 188/361] 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 189/361] 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 190/361] 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 191/361] 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 192/361] 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 193/361] 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 194/361] 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 195/361] 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 196/361] 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 197/361] 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 198/361] 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 199/361] 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 5fde24c20bf212e3faa80802e2831c19a62abdbc Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 5 Nov 2017 13:44:16 +0100 Subject: [PATCH 200/361] 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 201/361] 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 202/361] 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 203/361] 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 204/361] 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 205/361] 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 206/361] 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 207/361] 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 208/361] 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 209/361] 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 210/361] 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 211/361] 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 212/361] 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 213/361] 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 214/361] 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 215/361] 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 216/361] 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 217/361] 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 218/361] 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 219/361] 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 220/361] 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 221/361] 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 222/361] 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 223/361] 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 224/361] 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 225/361] 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 226/361] 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 227/361] 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 228/361] =?UTF-8?q?gnome3.folks:=200.11.3=20=E2=86=92=200.?= =?UTF-8?q?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 229/361] 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 230/361] =?UTF-8?q?gnome3.grilo:=200.3.3=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/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 231/361] =?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 232/361] =?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 233/361] =?UTF-8?q?clutter=5Fgtk:=201.8.2=20=E2=86=92=201.?= =?UTF-8?q?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 234/361] =?UTF-8?q?gnome3.libpeas:=201.18.0=20=E2=86=92=20?= =?UTF-8?q?1.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 235/361] =?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 236/361] =?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 237/361] =?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 238/361] =?UTF-8?q?libchamplain:=200.12.14=20=E2=86=92=200?= =?UTF-8?q?.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 239/361] =?UTF-8?q?librsvg:=202.40.17=20=E2=86=92=202.40.1?= =?UTF-8?q?9?= 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 240/361] =?UTF-8?q?libgtop:=202.34.1=20=E2=86=92=202.38.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 241/361] =?UTF-8?q?spice=5Fprotocol:=200.12.12=20=E2=86=92?= =?UTF-8?q?=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 242/361] =?UTF-8?q?spice=5Fgtk:=200.33=20=E2=86=92=200.34?= 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 243/361] =?UTF-8?q?libxkbcommon:=200.7.1=20=E2=86=92=200.7?= =?UTF-8?q?.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 244/361] =?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 245/361] 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 246/361] 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 247/361] =?UTF-8?q?gstreamer:=201.10.4=20=E2=86=92=201.12.?= =?UTF-8?q?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 248/361] =?UTF-8?q?gnome3.libgxps:=200.2.2=20=E2=86=92=200?= =?UTF-8?q?.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 249/361] 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 250/361] 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 251/361] 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 252/361] 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 253/361] 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 254/361] 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 de1e0ee43f1c4c87a2a3f8f283c7b1b6b51a9484 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sun, 5 Nov 2017 18:15:53 +0100 Subject: [PATCH 255/361] 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 256/361] 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 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 257/361] 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 258/361] 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 259/361] 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 260/361] 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 261/361] 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 080092ffa73edebd0e78c3a8130ac1436ef2149a Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sun, 5 Nov 2017 18:10:48 +0000 Subject: [PATCH 262/361] nat-traverse: do not wrap with perl path --- pkgs/tools/networking/nat-traverse/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/networking/nat-traverse/default.nix b/pkgs/tools/networking/nat-traverse/default.nix index 0972e767758..a352596eed0 100644 --- a/pkgs/tools/networking/nat-traverse/default.nix +++ b/pkgs/tools/networking/nat-traverse/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, makeWrapper }: +{ stdenv, fetchurl, perl }: stdenv.mkDerivation rec { name = "nat-traverse-${version}"; @@ -9,13 +9,12 @@ stdenv.mkDerivation rec { sha256 = "0knwnqsjwv7sa5wjb863ghabs7s269a73qwkmxpsbngjw9s0j2ih"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ perl ]; 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; { @@ -31,8 +30,8 @@ stdenv.mkDerivation rec { 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; + license = licenses.gpl3Plus; + platforms = platforms.all; maintainers = [ maintainers.iblech ]; }; } From 587037c42d3c3cfe7f22f1ea08d7a6b503c5480d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 5 Nov 2017 19:18:34 +0100 Subject: [PATCH 263/361] lilypond: disable parallel building Example failure: https://hydra.nixos.org/build/63597640 --- pkgs/misc/lilypond/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/lilypond/default.nix b/pkgs/misc/lilypond/default.nix index 15481d74598..f312cce19d7 100644 --- a/pkgs/misc/lilypond/default.nix +++ b/pkgs/misc/lilypond/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec{ fontforge help2man groff makeWrapper t1utils ]; - enableParallelBuilding = true; + #enableParallelBuilding = true; # fatal error: parser.hh: No such file or directory meta = with stdenv.lib; { description = "Music typesetting system"; From 35539c641ec620b527330acc26377dcd4a5a1a91 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sun, 5 Nov 2017 19:28:20 +0100 Subject: [PATCH 264/361] arx-libertatis: 2017-02-26 -> 2017-10-30 --- pkgs/games/arx-libertatis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/arx-libertatis/default.nix b/pkgs/games/arx-libertatis/default.nix index 40b594a1952..e6594adde55 100644 --- a/pkgs/games/arx-libertatis/default.nix +++ b/pkgs/games/arx-libertatis/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation rec { name = "arx-libertatis-${version}"; - version = "2017-02-26"; + version = "2017-10-30"; src = fetchFromGitHub { owner = "arx"; repo = "ArxLibertatis"; - rev = "0d2bb46025b2ad0fd5c8bcddd1cc04750282608d"; + rev = "e5ea4e8f0f7e86102cfc9113c53daeb0bdee6dd3"; sha256 = "11z0ndhk802jr3w3z5gfqw064g98v99xin883q1qd36jw96s27p5"; }; From a9b39814dd378f3a721ff20fba0e8f4c790d0486 Mon Sep 17 00:00:00 2001 From: volth Date: Sun, 5 Nov 2017 18:33:13 +0000 Subject: [PATCH 265/361] timescaledb: 0.5.0 -> 0.6.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 fbf0bfa1926..223bd6e470b 100644 --- a/pkgs/servers/sql/postgresql/timescaledb/default.nix +++ b/pkgs/servers/sql/postgresql/timescaledb/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { name = "timescaledb-${version}"; - version = "0.5.0"; + version = "0.6.0"; buildInputs = [ postgresql ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { owner = "timescale"; repo = "timescaledb"; rev = version; - sha256 = "01swgjw563c42azxsg55ry7cyiipxkcvfrxmw71jil5dxl3s0fkz"; + sha256 = "061z1ll3x7ca7fj12rl2difkdvmqykksqhpsql552qkkylg7iq4d"; }; installPhase = '' From 9cb5201d3337dabd27938337fe4f5d5e784818cc Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sun, 5 Nov 2017 11:24:39 -0600 Subject: [PATCH 266/361] yosys/symbiyosys: 2017.10.16 -> 2017.11.05 Signed-off-by: Austin Seipp --- pkgs/applications/science/logic/symbiyosys/default.nix | 6 +++--- pkgs/development/compilers/yosys/default.nix | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/science/logic/symbiyosys/default.nix b/pkgs/applications/science/logic/symbiyosys/default.nix index 5da3e7c31b4..53e1a90f5b6 100644 --- a/pkgs/applications/science/logic/symbiyosys/default.nix +++ b/pkgs/applications/science/logic/symbiyosys/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "symbiyosys-${version}"; - version = "2017.10.16"; + version = "2017.11.05"; src = fetchFromGitHub { owner = "cliffordwolf"; repo = "symbiyosys"; - rev = "f403b99fae053baab651e3ec8345a68cb3ba6a96"; - sha256 = "0jzzlybxaqmhrasfjv3q3skshalr7lvv4p142qgdqz1ig36znbi8"; + rev = "db9c7e97b8f84ef7e9b18ae630009897c7982a08"; + sha256 = "0pyznkjm0vjmaf6mpwknmh052qrwy2fzi05h80ysx1bxc51ns0m0"; }; buildInputs = [ python3 yosys ]; diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index 02f5d3494e6..b1c36f841a4 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -4,21 +4,21 @@ stdenv.mkDerivation rec { name = "yosys-${version}"; - version = "2017.10.16"; + version = "2017.11.05"; srcs = [ (fetchFromGitHub { owner = "cliffordwolf"; repo = "yosys"; - rev = "716dbc92745aa8b41d85a60d50263433d5a79393"; - sha256 = "0va77my4iddsw6psgjfhfgs0z0z1hpj0l8ipchcl8crpxipxcr77"; + rev = "4f31cb6daddedcee467d85797d81b79360ce1826"; + sha256 = "1a5n0g5kpjsy8f99f64w81gkrr450wvffp407r1pddl8pmb0c3r7"; name = "yosys"; }) (fetchFromBitbucket { owner = "alanmi"; repo = "abc"; - rev = "6283c5d99b06"; - sha256 = "1mv8r1la4d4r9bk32sl4nq3flyxi8jf2ccaak64j5rz9hirrlpla"; + rev = "f6838749f234"; + sha256 = "0n7ywvih958h1c4n7a398a9w3qikhkv885fx5j3y2a0xwqc86m4y"; name = "yosys-abc"; }) ]; From 5ccd5cded42cdfb1aefa53b0cb7ead43ce360bd3 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sun, 5 Nov 2017 11:27:24 -0600 Subject: [PATCH 267/361] icestorm: 2017.10.16 -> 2017.11.05 Signed-off-by: Austin Seipp --- pkgs/development/tools/icestorm/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/icestorm/default.nix b/pkgs/development/tools/icestorm/default.nix index b01127ffa56..b9d72084518 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.10.16"; + version = "2017.11.05"; src = fetchFromGitHub { - owner = "cliffordwolf"; - repo = "icestorm"; - rev = "d9d2a3dcaa749014f5b9a539768b8368bb529b28"; - sha256 = "1a755jnbjq3v7a3l90qjlgihmrpbdfiiabb4g8sw3ay3qmvzwh6b"; + owner = "cliffordwolf"; + repo = "icestorm"; + rev = "3ba18d001754de563ab0baa2a1c8eecbe63ef121"; + sha256 = "1c7yv91xi4vx0130xn2zq74gfjbf7fhm2q4fma9xgwj5xpdy8rmn"; }; buildInputs = [ python3 libftdi ]; From c4f784db1d7994957cb87ec3533bc7d5a08f2d24 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sun, 5 Nov 2017 11:28:41 -0600 Subject: [PATCH 268/361] arachne-pnr: 2017.06.29 -> 2017.11.05 Signed-off-by: Austin Seipp --- pkgs/development/compilers/arachne-pnr/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/arachne-pnr/default.nix b/pkgs/development/compilers/arachne-pnr/default.nix index 17f068c1c6f..7db75d12978 100644 --- a/pkgs/development/compilers/arachne-pnr/default.nix +++ b/pkgs/development/compilers/arachne-pnr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "arachne-pnr-${version}"; - version = "2017.06.29"; + version = "2017.11.05"; src = fetchFromGitHub { - owner = "cseed"; - repo = "arachne-pnr"; - rev = "7e135edb31feacde85ec5b7e5c03fc9157080977"; - sha256 = "1wszcx6hgw4q4r778zswrlwdwvwxq834bkajck8w9yfqwxs9lmq8"; + owner = "cseed"; + repo = "arachne-pnr"; + rev = "1e81432830c75c505c76e419619f605a6c4c7583"; + sha256 = "0lzblmi1klbsmd32h8nh027npm1z1a199lng13lcrqwr17lhb7my"; }; enableParallelBuilding = true; From e27e0ebe48d784b9bf304413889593946b4acca8 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sun, 5 Nov 2017 11:34:32 -0600 Subject: [PATCH 269/361] cvc4: unstable-2017-05-18 -> 1.5 Signed-off-by: Austin Seipp --- .../science/logic/cvc4/default.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/science/logic/cvc4/default.nix b/pkgs/applications/science/logic/cvc4/default.nix index df7eac02513..6b213226635 100644 --- a/pkgs/applications/science/logic/cvc4/default.nix +++ b/pkgs/applications/science/logic/cvc4/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchFromGitHub, cln, gmp, swig, pkgconfig, readline, libantlr3c, -boost, jdk, autoreconfHook, python2, antlr3_4 }: +{ stdenv, fetchurl, cln, gmp, swig, pkgconfig +, readline, libantlr3c, boost, jdk, autoreconfHook +, python2, antlr3_4 +}: stdenv.mkDerivation rec { - name = "cvc4-unstable-${version}"; - version = "2017-05-18"; + name = "cvc4-${version}"; + version = "1.5"; - src = fetchFromGitHub { - owner = "CVC4"; - repo = "CVC4"; - rev = "d77107cc56b0a089364c3d1512813701c155ea93"; - sha256 = "085bjrrm33rl5pwqx13af9sgni9cfbg70wag6lm08jj41ws411xs"; + src = fetchurl { + url = "http://cvc4.cs.stanford.edu/downloads/builds/src/cvc4-${version}.tar.gz"; + sha256 = "0yxxawgc9vd2cz883swjlm76rbdkj48n7a8dfppsami530y2rvhi"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { "--with-readline" "--with-boost=${boost.dev}" ]; + preConfigure = '' patchShebangs ./src/ ''; From 5fc4f17862883b1f133e69f8e283f96715018c30 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sun, 5 Nov 2017 11:36:21 -0600 Subject: [PATCH 270/361] yices: 2.5.3 -> 2.5.4 Signed-off-by: Austin Seipp --- .../science/logic/yices/default.nix | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/science/logic/yices/default.nix b/pkgs/applications/science/logic/yices/default.nix index aac72ba24f0..a607f106639 100644 --- a/pkgs/applications/science/logic/yices/default.nix +++ b/pkgs/applications/science/logic/yices/default.nix @@ -2,38 +2,40 @@ stdenv.mkDerivation rec { name = "yices-${version}"; - version = "2.5.3"; + version = "2.5.4"; src = fetchurl { url = "https://github.com/SRI-CSL/yices2/archive/Yices-${version}.tar.gz"; name = "${name}-src.tar.gz"; - sha256 = "0a3zzbvmgyiljzqn6xmc037gismm779p696jywk09j2pqbvp52ac"; + sha256 = "1k8wmlddi3zv5kgg6xbch3a0s0xqsmsfc7y6z8zrgcyhswl36h7p"; }; - patchPhase = ''patchShebangs tests/regress/check.sh''; - - configureFlags = [ "--with-static-gmp=${gmp-static.out}/lib/libgmp.a" - "--with-static-gmp-include-dir=${gmp-static.dev}/include" - "--enable-mcsat" - ]; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ gmp-static gperf libpoly ]; + buildInputs = [ gmp-static gperf libpoly ]; + configureFlags = + [ "--with-static-gmp=${gmp-static.out}/lib/libgmp.a" + "--with-static-gmp-include-dir=${gmp-static.dev}/include" + "--enable-mcsat" + ]; enableParallelBuilding = true; doCheck = true; + # Usual shenanigans + patchPhase = ''patchShebangs tests/regress/check.sh''; + # Includes a fix for the embedded soname being libyices.so.2.5, but - # only installing the libyices.so.2.5.1 file. + # only installing the libyices.so.2.5.x file. installPhase = '' make install LDCONFIG=true - (cd $out/lib && ln -s -f libyices.so.2.5.3 libyices.so.2.5) + (cd $out/lib && ln -s -f libyices.so.${version} libyices.so.2.5) ''; meta = with stdenv.lib; { description = "A high-performance theorem prover and SMT solver"; homepage = "http://yices.csl.sri.com"; license = licenses.gpl3; - platforms = platforms.linux ++ platforms.darwin; + platforms = with platforms; linux ++ darwin; maintainers = [ maintainers.thoughtpolice ]; }; } From 50c236772ba1009e52f5869fd1cf0e5503998d4a Mon Sep 17 00:00:00 2001 From: Jens Binkert Date: Sun, 5 Nov 2017 18:53:40 +0100 Subject: [PATCH 271/361] typora: 0.9.31 -> 0.9.38 --- pkgs/applications/editors/typora/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix index 0733bd79665..b20a6e5ec45 100644 --- a/pkgs/applications/editors/typora/default.nix +++ b/pkgs/applications/editors/typora/default.nix @@ -3,18 +3,18 @@ stdenv.mkDerivation rec { name = "typora-${version}"; - version = "0.9.31"; + version = "0.9.38"; src = if stdenv.system == "x86_64-linux" then fetchurl { url = "https://www.typora.io/linux/typora_${version}_amd64.deb"; - sha256 = "786b5164d9c63ecc23eb427c5ff393285ce8fd540c5bfdd5c1464655fac87a42"; + sha256 = "bf6a069c5da4a7dc289bdb3c8d27e7a81daeaee99488d4d3b512c6b673780557"; } else fetchurl { url = "https://www.typora.io/linux/typora_${version}_i386.deb"; - sha256 = "a8fe53f8984d9f8c4e06c14affbb616be58a91cd2b475b9681fb18a6e21930d1"; + sha256 = "edd092e96ebf69503cf6b39b77a61ec5e3185f8a1447da0bed063fa11861c1b9"; } ; @@ -57,8 +57,10 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out dpkg -x $src $out - cp -av $out/usr/* $out + mv $out/usr/bin $out + mv $out/usr/share $out rm $out/bin/typora + rmdir $out/usr # Otherwise it looks "suspicious" chmod -R g-w $out @@ -81,9 +83,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A minimal Markdown reading & writing app"; homepage = https://typora.io; - license = licenses.free; - maintainers = with stdenv.lib.maintainers; [ jensbin ]; + license = licenses.unfree; + maintainers = with maintainers; [ jensbin ]; platforms = [ "x86_64-linux" "i686-linux" ]; }; } - From d8249443147ad11a354f433f76ab085450f7bc6e Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Sun, 5 Nov 2017 16:09:41 +0000 Subject: [PATCH 272/361] firefox-bin: Fail on unsupported architectures --- .../networking/browsers/firefox-bin/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 31bc01ea14a..347ceba9ab4 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -54,9 +54,12 @@ let inherit (generated) version sources; - arch = if stdenv.system == "i686-linux" - then "linux-i686" - else "linux-x86_64"; + mozillaPlatforms = { + "i686-linux" = "linux-i686"; + "x86_64-linux" = "linux-x86_64"; + }; + + arch = mozillaPlatforms.${stdenv.system}; isPrefixOf = prefix: string: builtins.substring 0 (builtins.stringLength prefix) string == prefix; @@ -185,7 +188,7 @@ stdenv.mkDerivation { free = false; url = http://www.mozilla.org/en-US/foundation/trademarks/policy/; }; - platforms = platforms.linux; + platforms = builtins.attrNames mozillaPlatforms; maintainers = with maintainers; [ garbas ]; }; } From 9c5bf726e5aba99fb786ee7206e1d9481aac97b4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 5 Nov 2017 13:16:18 +0100 Subject: [PATCH 273/361] python.pkgs: maintenance updates --- pkgs/development/python-modules/Cython/default.nix | 4 ++-- pkgs/development/python-modules/aiohttp/default.nix | 4 ++-- pkgs/development/python-modules/asgi_ipc/default.nix | 4 ++-- pkgs/development/python-modules/dulwich/default.nix | 4 ++-- pkgs/development/python-modules/fiona/default.nix | 4 ++-- pkgs/development/python-modules/gflags/default.nix | 4 ++-- pkgs/development/python-modules/jug/default.nix | 4 ++-- pkgs/development/python-modules/keras/default.nix | 4 ++-- pkgs/development/python-modules/multidict/default.nix | 4 ++-- pkgs/development/python-modules/netcdf4/default.nix | 4 ++-- pkgs/development/python-modules/notebook/default.nix | 4 ++-- pkgs/development/python-modules/phonenumbers/default.nix | 4 ++-- pkgs/development/python-modules/pyodbc/default.nix | 4 ++-- pkgs/development/python-modules/pyspread/default.nix | 4 ++-- pkgs/development/python-modules/shapely/default.nix | 4 ++-- pkgs/development/python-modules/sqlalchemy/default.nix | 4 ++-- pkgs/development/python-modules/sqlmap/default.nix | 4 ++-- 17 files changed, 34 insertions(+), 34 deletions(-) diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix index e507b89bbbb..751e064ad70 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.27.2"; + version = "0.27.3"; src = fetchPypi { inherit pname version; - sha256 = "265dacf64ed8c0819f4be9355c39beaa13dc2ad2f85237a2c4e478f5ce644b48"; + sha256 = "6a00512de1f2e3ce66ba35c5420babaef1fe2d9c43a8faab4080b0dbcc26bc64"; }; # With Python 2.x on i686-linux or 32-bit ARM this test fails because the diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index 19e94471c86..5f87580643f 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.3.1"; + version = "2.3.2"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "04f58bbcc9ae6f9aec30b9219ae47fa3c31586c77679405720545738ea62236e"; + sha256 = "42373fbdbe8f09233c17e74f53cee877bc7d5b495b4fc14c32a119255e85e736"; }; disabled = pythonOlder "3.4"; diff --git a/pkgs/development/python-modules/asgi_ipc/default.nix b/pkgs/development/python-modules/asgi_ipc/default.nix index 41de61dbcca..a60109b6e8c 100644 --- a/pkgs/development/python-modules/asgi_ipc/default.nix +++ b/pkgs/development/python-modules/asgi_ipc/default.nix @@ -2,13 +2,13 @@ asgiref, msgpack, posix_ipc }: buildPythonPackage rec { - version = "1.4.1"; + version = "1.4.2"; pname = "asgi_ipc"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/a/asgi_ipc/${name}.tar.gz"; - sha256 = "87cc9dda476d28f335261b73f0f3070f28847718de2e64da9a80492638203e43"; + sha256 = "2403f41184405791b05e7aee570bd6ccd47e2d91845d78fe17adcf58ef48c037"; }; propagatedBuildInputs = [ asgiref msgpack posix_ipc ]; diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix index 778c8c984c8..422674152a6 100644 --- a/pkgs/development/python-modules/dulwich/default.nix +++ b/pkgs/development/python-modules/dulwich/default.nix @@ -3,13 +3,13 @@ , git, glibcLocales }: buildPythonPackage rec { - version = "0.18.4"; + version = "0.18.5"; pname = "dulwich"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/d/dulwich/${name}.tar.gz"; - sha256 = "b4baace48dde5e0a76f37b251c246c7e1829bda0617679f00cbade0e70a5ac5b"; + sha256 = "838bac318fd0ed79e0eedb6cfd53b6424dc618fec6b99dc959881b12da7bd6e0"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/python-modules/fiona/default.nix b/pkgs/development/python-modules/fiona/default.nix index d53a29d182f..5c150844c84 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.post1"; + version = "1.7.10.post1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "68e8a925b23e3987845c11b0fdd6378fdec4316fe8ba767a935151b6ee1fc607"; + sha256 = "fc4c8996be3131f36c791d66273317d38b72b19dc24c2afc332fd734752eb7a8"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/gflags/default.nix b/pkgs/development/python-modules/gflags/default.nix index 48fff723056..f73ff2b4686 100644 --- a/pkgs/development/python-modules/gflags/default.nix +++ b/pkgs/development/python-modules/gflags/default.nix @@ -1,13 +1,13 @@ { lib, buildPythonPackage, fetchPypi, six, pytest }: buildPythonPackage rec { - version = "3.1.1"; + version = "3.1.2"; name = "gflags-${version}"; src = fetchPypi { inherit version; pname = "python-gflags"; - sha256 = "0qvcizlz6r4511kl4jlg6fr34y1ka956dr2jj1q0qcklr94n9zxa"; + sha256 = "40ae131e899ef68e9e14aa53ca063839c34f6a168afe622217b5b875492a1ee2"; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/jug/default.nix b/pkgs/development/python-modules/jug/default.nix index ab94d7b40ac..b1053bbdaab 100644 --- a/pkgs/development/python-modules/jug/default.nix +++ b/pkgs/development/python-modules/jug/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "Jug"; - version = "1.6.3"; + version = "1.6.4"; buildInputs = [ nose numpy ]; propagatedBuildInputs = [ bottle @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0dpcwjaf8zzqpdz8w8h0p7vmd6z6bzfz2805a6bdjqs9hhkhrg86"; + sha256 = "e739b20e7fe53ac50f5954b9e32568bdd92012dd4bd199d13e2a675ccd69d97d"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index 877fbe9470d..c2d5362b134 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "Keras"; - version = "2.0.8"; + version = "2.0.9"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "899dc6aaed366f20100b9f80cf1093ea5b43eecc74afd1dc63a4e48dfa776ab9"; + sha256 = "6b8572cf1b4a22fd0120b7c23382ba4fa04a6f0397e02af1249be9a7309d1767"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix index 8d9340625e1..614157542b1 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.3.0"; + version = "3.3.2"; in buildPythonPackage rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "e76909da2fad6966281d4e0e4ccfd3c3025699ebcc30806afa09fa1384c3532b"; + sha256 = "f82e61c7408ed0dce1862100db55595481911f159d6ddec0b375d35b6449509b"; }; buildInputs = [ cython ]; diff --git a/pkgs/development/python-modules/netcdf4/default.nix b/pkgs/development/python-modules/netcdf4/default.nix index 0ef864d33e2..67df4403f98 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.3.0"; + version = "1.3.1"; disabled = isPyPy; src = fetchurl { url = "mirror://pypi/n/netCDF4/${name}.tar.gz"; - sha256 = "1982372aeacc6b36054d90d8cb54ee9506b66b6f44d5cff10e2ffb162aad5476"; + sha256 = "570ea59992aa6d98a9b672c71161d11ba5683f787da53446086077470a869957"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix index c30e6e5e77d..2a23ff4de78 100644 --- a/pkgs/development/python-modules/notebook/default.nix +++ b/pkgs/development/python-modules/notebook/default.nix @@ -22,12 +22,12 @@ buildPythonPackage rec { pname = "notebook"; - version = "5.2.0"; + version = "5.2.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "1sh3jkkmjzv17c3r8ii3kfhpxi6dkjk846b2lfy71g9qwqdcvbvz"; + sha256 = "4ae5b81dd39b37cdd99dcffe83a5182c849947b92d46ac4d2b5093af2bb9f224"; }; LC_ALL = "en_US.utf8"; diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index 9fb16bb0302..75a3f51afc6 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.4"; + version = "8.8.5"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "01kim7mwgm97wysclhyxcwvd2a8ifinaidkskglx7b2k0r7ji5sj"; + sha256 = "adb2dd985f875ac035bbdc6a1cc57e30834e106e2ff7899e09a1690b474c1774"; }; meta = { diff --git a/pkgs/development/python-modules/pyodbc/default.nix b/pkgs/development/python-modules/pyodbc/default.nix index c09e15f4bfb..b236715a5d6 100644 --- a/pkgs/development/python-modules/pyodbc/default.nix +++ b/pkgs/development/python-modules/pyodbc/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pyodbc"; - version = "4.0.19"; + version = "4.0.21"; name = "${pname}-${version}"; disabled = isPyPy; # use pypypdbc instead src = fetchPypi { inherit pname version; - sha256 = "05mkaxbi9n02bpr3l0qnyfb3458f35hk71bq8jmadikp3h8al7dg"; + sha256 = "9655f84ca9e5cb2dfffff705601017420c840d55271ba62dd44f05383eff0329"; }; buildInputs = [ libiodbc ]; diff --git a/pkgs/development/python-modules/pyspread/default.nix b/pkgs/development/python-modules/pyspread/default.nix index 2f275005c19..7fbda048ca3 100644 --- a/pkgs/development/python-modules/pyspread/default.nix +++ b/pkgs/development/python-modules/pyspread/default.nix @@ -19,11 +19,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "pyspread"; - version = "1.1"; + version = "1.1.1"; src = fetchPypi { inherit pname version; - sha256 = "0m1a4zvzrfrnc42j8mrbm7747w03nzyl9z02wjagccmlhi6nd9hx"; + sha256 = "b90edb92c7fce3b8332cdddd3dd1c72ba14440ab39a10ca89c9888ad973a8862"; }; propagatedBuildInputs = [ numpy wxPython matplotlib pycairo python-gnupg xlrd xlwt jedi pyenchant basemap pygtk ]; diff --git a/pkgs/development/python-modules/shapely/default.nix b/pkgs/development/python-modules/shapely/default.nix index 85052a34a56..e8e92818ecf 100644 --- a/pkgs/development/python-modules/shapely/default.nix +++ b/pkgs/development/python-modules/shapely/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "Shapely"; - version = "1.6.1"; + version = "1.6.2.post1"; src = fetchPypi { inherit pname version; - sha256 = "1iyhrkm6g233gwbd20sf4aq4by0kg52cz1d2k7imnqgzjpmkgqas"; + sha256 = "07fba518e76b3276558f62a5829bdfa476f790cdef752383ccdc8c66b04b0899"; }; buildInputs = [ geos glibcLocales cython ]; diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index ed1c32df555..9b3a5fa2039 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.14"; + version = "1.1.15"; src = fetchPypi { inherit pname version; - sha256 = "f1191e29e35b6fe1aef7175a09b1707ebb7bd08d0b17cb0feada76c49e5a2d1e"; + sha256 = "8b79a5ed91cdcb5abe97b0045664c55c140aec09e5dd5c01303e23de5fe7a95a"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix index 7156d86bb80..2c85bdbe3d1 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.10"; + version = "1.1.11"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "90db96664955c6a576b495c973bd3976b9d4eaffaea205c0343ac7e8f8147cbe"; + sha256 = "bb5297df9cd97316b3c7ca64f8e31cae5cc6b94c015afd84c546877f1f77d6e4"; }; # No tests in archive From 5d21308f81e8332e8743a2c807b6406d37642da9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 5 Nov 2017 13:37:45 +0100 Subject: [PATCH 274/361] python.pkgs.six: 1.10.0 -> 1.11.0 --- .../python-modules/six/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +------------- 2 files changed, 28 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/six/default.nix diff --git a/pkgs/development/python-modules/six/default.nix b/pkgs/development/python-modules/six/default.nix new file mode 100644 index 00000000000..38117337d06 --- /dev/null +++ b/pkgs/development/python-modules/six/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +}: + +buildPythonPackage rec { + pname = "six"; + version = "1.11.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "70e8a77beed4562e7f14fe23a786b54f6296e34344c23bc42f07b15018ff98e9"; + }; + + checkInputs = [ pytest ]; + + checkPhase = '' + py.test test_six.py + ''; + + meta = { + description = "A Python 2 and 3 compatibility library"; + homepage = http://pypi.python.org/pypi/six/; + license = lib.licenses.mit; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 890aae47124..0ae7d8f2bea 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -19539,25 +19539,7 @@ in { }; - six = buildPythonPackage rec { - name = "six-1.10.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/s/six/${name}.tar.gz"; - sha256 = "0snmb8xffb3vsma0z67i0h0w2g2dy0p3gsgh9gi4i0kgc5l8spqh"; - }; - - buildInputs = with self; [ pytest ]; - - checkPhase = '' - py.test test_six.py - ''; - - meta = { - description = "A Python 2 and 3 compatibility library"; - homepage = http://pypi.python.org/pypi/six/; - }; - }; + six = callPackage ../development/python-modules/six { }; skype4py = buildPythonPackage (rec { From a51f6474d2c814f2252a8aa32286736d567c01e0 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 18 Sep 2017 03:25:11 +0200 Subject: [PATCH 275/361] =?UTF-8?q?libical:=201.0.1=20=E2=86=92=202.0.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../development/libraries/libical/default.nix | 9 ++-- .../libraries/libical/respect-env-tzdir.patch | 48 ++++++++++--------- 2 files changed, 31 insertions(+), 26 deletions(-) diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix index a91205e182c..5ba8bb66784 100644 --- a/pkgs/development/libraries/libical/default.nix +++ b/pkgs/development/libraries/libical/default.nix @@ -2,18 +2,21 @@ stdenv.mkDerivation rec { name = "libical-${version}"; - version = "1.0.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "libical"; repo = "libical"; rev = "v${version}"; - sha256 = "1y6rbw24m133d984pyqzx2bi7f37dsw6f33l6arwn6yd4zlqdib9"; + sha256 = "0xsvqy1hzmwxn783wrb2k8p751544pzv39v9ynr9pj4yzkwjzsvb"; }; nativeBuildInputs = [ perl cmake ]; - patches = [ ./respect-env-tzdir.patch ]; + patches = [ + # TODO: upstream this patch + ./respect-env-tzdir.patch + ]; meta = with stdenv.lib; { homepage = https://github.com/libical/libical; diff --git a/pkgs/development/libraries/libical/respect-env-tzdir.patch b/pkgs/development/libraries/libical/respect-env-tzdir.patch index fad78c2fb8a..715ba1fa842 100644 --- a/pkgs/development/libraries/libical/respect-env-tzdir.patch +++ b/pkgs/development/libraries/libical/respect-env-tzdir.patch @@ -1,27 +1,29 @@ ---- a/src/libical/icaltz-util.c 2015-06-11 15:40:58.843138630 +0200 -+++ b/src/libical/icaltz-util.c 2015-06-11 15:43:12.722046252 +0200 -@@ -107,7 +107,7 @@ - char charcnt[4]; - } tzinfo; - --static char *search_paths [] = {"/usr/share/zoneinfo","/usr/lib/zoneinfo","/etc/zoneinfo","/usr/share/lib/zoneinfo"}; -+static char *search_paths [] = {"/etc/zoneinfo","/usr/share/zoneinfo","/usr/lib/zoneinfo","/usr/share/lib/zoneinfo"}; +--- a/src/libical/icaltz-util.c ++++ b/src/libical/icaltz-util.c +@@ -96,9 +96,9 @@ typedef struct static char *zdir = NULL; - #define NUM_SEARCH_PATHS (sizeof (search_paths)/ sizeof (search_paths [0])) -@@ -194,6 +194,15 @@ - const char *fname = ZONES_TAB_SYSTEM_FILENAME; - unsigned int i; + static char *search_paths[] = { ++ "/etc/zoneinfo", + "/usr/share/zoneinfo", + "/usr/lib/zoneinfo", +- "/etc/zoneinfo", + "/usr/share/lib/zoneinfo" + }; -+ const char *env_tzdir = getenv ("TZDIR"); -+ if (env_tzdir) { -+ sprintf (file_path, "%s/%s", env_tzdir, fname); -+ if (!access (file_path, F_OK|R_OK)) { -+ zdir = env_tzdir; -+ return; -+ } -+ } +@@ -179,6 +179,15 @@ static void set_zonedir(void) + const char *fname = ZONES_TAB_SYSTEM_FILENAME; + size_t i, num_search_paths; + ++ const char *env_tzdir = getenv ("TZDIR"); ++ if (env_tzdir) { ++ snprintf(file_path, MAXPATHLEN, "%s/%s", env_tzdir, fname); ++ if (!access (file_path, F_OK|R_OK)) { ++ zdir = env_tzdir; ++ return; ++ } ++ } + - for (i = 0; i < NUM_SEARCH_PATHS; i++) { - sprintf (file_path, "%s/%s", search_paths [i], fname); - if (!access (file_path, F_OK|R_OK)) { + num_search_paths = sizeof(search_paths) / sizeof(search_paths[0]); + for (i = 0; i < num_search_paths; i++) { + snprintf(file_path, MAXPATHLEN, "%s/%s", search_paths[i], fname); From 55abc42a1ed79941c779ef7f22021cfea18dc014 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 18 Sep 2017 11:12:30 +0200 Subject: [PATCH 276/361] =?UTF-8?q?glib-networking:=202.50.0=20=E2=86=92?= =?UTF-8?q?=202.54.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/glib-networking/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index 422b7f4c58c..fd8055fd0b3 100644 --- a/pkgs/development/libraries/glib-networking/default.nix +++ b/pkgs/development/libraries/glib-networking/default.nix @@ -2,7 +2,7 @@ , gsettings_desktop_schemas }: let - ver_maj = "2.50"; + ver_maj = "2.54"; ver_min = "0"; in stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/glib-networking/${ver_maj}/${name}.tar.xz"; - sha256 = "3f1a442f3c2a734946983532ce59ed49120319fdb10c938447c373d5e5286bee"; + sha256 = "5961b3779080b72314b373ff5d4790eb7e41b75ca91816ad7a81ef32922f7096"; }; outputs = [ "out" "dev" ]; # to deal with propagatedBuildInputs From 05562d92376959bede93a354798c64bde22b47ba Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 18 Sep 2017 11:46:49 +0200 Subject: [PATCH 277/361] networkmanagerapplet: cleanup --- .../networking/network-manager-applet/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix index 3220aebdfe4..fc320ba2fb9 100644 --- a/pkgs/tools/networking/network-manager-applet/default.nix +++ b/pkgs/tools/networking/network-manager-applet/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, intltool, pkgconfig, libglade, networkmanager, gnome3 -, libnotify, libsecret, polkit, isocodes, modemmanager, librsvg +, libnotify, libsecret, polkit, isocodes, modemmanager , mobile_broadband_provider_info, glib_networking, gsettings_desktop_schemas -, makeWrapper, udev, libgudev, hicolor_icon_theme, jansson, wrapGAppsHook, webkitgtk +, udev, libgudev, hicolor_icon_theme, jansson, wrapGAppsHook, webkitgtk , withGnome ? false }: stdenv.mkDerivation rec { @@ -24,13 +24,13 @@ 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 + polkit isocodes udev libgudev gnome3.libgnome_keyring + modemmanager jansson glib_networking ] ++ stdenv.lib.optional withGnome webkitgtk; nativeBuildInputs = [ intltool pkgconfig wrapGAppsHook ]; - propagatedUserEnvPkgs = [ gnome3.gconf gnome3.gnome_keyring hicolor_icon_theme ]; + propagatedUserEnvPkgs = [ gnome3.gnome_keyring hicolor_icon_theme ]; makeFlags = [ ''CFLAGS=-DMOBILE_BROADBAND_PROVIDER_INFO=\"${mobile_broadband_provider_info}/share/mobile-broadband-provider-info/serviceproviders.xml\"'' From fd115ece2952afaf39505ae8ded6ac4eb1db5196 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 18 Sep 2017 11:49:05 +0200 Subject: [PATCH 278/361] =?UTF-8?q?libgudev:=20231=20=E2=86=92=20232?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/libgudev/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libgudev/default.nix b/pkgs/development/libraries/libgudev/default.nix index ef2a44bf183..a5f8f5036d0 100644 --- a/pkgs/development/libraries/libgudev/default.nix +++ b/pkgs/development/libraries/libgudev/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libgudev-${version}"; - version = "231"; + version = "232"; src = fetchurl { - url = "https://download.gnome.org/sources/libgudev/${version}/${name}.tar.xz"; - sha256 = "15iz0qp57qy5pjrblsn36l0chlncqggqsg8h8i8c71499afzj7iv"; + url = "mirror://gnome/sources/libgudev/${version}/${name}.tar.xz"; + sha256 = "ee4cb2b9c573cdf354f6ed744f01b111d4b5bed3503ffa956cefff50489c7860"; }; nativeBuildInputs = [ pkgconfig ]; From c01fd4a3e359ad07e58b29fbbd1067d29842b19e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 18 Sep 2017 12:34:10 +0200 Subject: [PATCH 279/361] =?UTF-8?q?libinput:=201.7.3=20=E2=86=92=201.9.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../libraries/libinput/default.nix | 22 +++++++++---------- .../libinput/udev-absolute-path.patch | 21 +++++++++--------- 2 files changed, 20 insertions(+), 23 deletions(-) diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 1cc275b3048..553bb9463ed 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -1,9 +1,8 @@ -{ stdenv, fetchurl, pkgconfig +{ 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 }: assert documentationSupport -> doxygen != null && graphviz != null; @@ -11,38 +10,37 @@ 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}"; + mkFlag = optSet: flag: "-D${flag}=${stdenv.lib.boolToString optSet}"; in with stdenv.lib; stdenv.mkDerivation rec { name = "libinput-${version}"; - version = "1.7.3"; + version = "1.9.1"; src = fetchurl { url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz"; - sha256 = "07fbzxddvhjcch43hdxb24sj7ri96zzpcjalvsicmw0i4wnn2v89"; + sha256 = "1y3559146zlfizncky1jlly226i66vwikxhpdkw0jg8v47j0sy7h"; }; outputs = [ "out" "dev" ]; - configureFlags = [ + mesonFlags = [ (mkFlag documentationSupport "documentation") - (mkFlag eventGUISupport "event-gui") + (mkFlag eventGUISupport "debug-gui") (mkFlag testsSupport "tests") ]; - nativeBuildInputs = [ pkgconfig ]; - - buildInputs = [ libevdev mtdev libwacom autoconf automake ] - ++ optionals eventGUISupport [ cairo glib gtk3 ] + nativeBuildInputs = [ pkgconfig meson ninja ] ++ optionals documentationSupport [ doxygen graphviz ] ++ optionals testsSupport [ check valgrind ]; + buildInputs = [ libevdev mtdev libwacom ] + ++ optionals eventGUISupport [ cairo glib gtk3 ]; + 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"; diff --git a/pkgs/development/libraries/libinput/udev-absolute-path.patch b/pkgs/development/libraries/libinput/udev-absolute-path.patch index 2d3fa966b29..fb22fea40e8 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 ++++ b/meson.build +@@ -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 a5a8bb0a62ead5d1288bc53ecc8a3b9ede3dff55 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 18 Sep 2017 12:34:29 +0200 Subject: [PATCH 280/361] =?UTF-8?q?libwacom:=200.22=20=E2=86=92=200.26?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/libwacom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libwacom/default.nix b/pkgs/development/libraries/libwacom/default.nix index ad3cbe119c5..1fb0605530d 100644 --- a/pkgs/development/libraries/libwacom/default.nix +++ b/pkgs/development/libraries/libwacom/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libwacom-${version}"; - version = "0.22"; + version = "0.26"; src = fetchurl { url = "mirror://sourceforge/linuxwacom/libwacom/${name}.tar.bz2"; - sha256 = "1h10awwapj5v8nik220ga0raggv3lgaq0kzwlma2qjmzdhhrrhcp"; + sha256 = "0xpvkjvzaj9blcmw8ha46616bzfivj99kwzvr91clxd6iaf11r63"; }; nativeBuildInputs = [ pkgconfig ]; From 3f12993f3ad6d27a1d87328ad489f21d670b7678 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 18 Sep 2017 12:35:50 +0200 Subject: [PATCH 281/361] =?UTF-8?q?xf86=5Finput=5Fwacom:=200.34=20?= =?UTF-8?q?=E2=86=92=200.35?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/os-specific/linux/xf86-input-wacom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/xf86-input-wacom/default.nix b/pkgs/os-specific/linux/xf86-input-wacom/default.nix index e231e3a5989..2ebb2b1890d 100644 --- a/pkgs/os-specific/linux/xf86-input-wacom/default.nix +++ b/pkgs/os-specific/linux/xf86-input-wacom/default.nix @@ -3,11 +3,11 @@ , ncurses, pkgconfig, randrproto, xorgserver, xproto, udev, libXinerama, pixman }: stdenv.mkDerivation rec { - name = "xf86-input-wacom-0.34.0"; + name = "xf86-input-wacom-0.35.0"; src = fetchurl { url = "mirror://sourceforge/linuxwacom/${name}.tar.bz2"; - sha256 = "0idhkigl0pnyp08sqm6bqfb4h20v6rjrb71z1gdv59gk7d7qwpgi"; + sha256 = "0za44snc0zirq65a4lxsmg7blp1bynj6j835hm459x8yx1qhmxjm"; }; buildInputs = [ inputproto libX11 libXext libXi libXrandr libXrender From 185484d6ac5133bab3ea86c69dacc47b14ca164f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 19 Sep 2017 03:52:06 +0200 Subject: [PATCH 282/361] =?UTF-8?q?gnome3.vte:=200.48.3=20=E2=86=92=200.50?= =?UTF-8?q?.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/core/vte/src.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/vte/src.nix b/pkgs/desktops/gnome-3/core/vte/src.nix index 841798848e6..45029e8bb8d 100644 --- a/pkgs/desktops/gnome-3/core/vte/src.nix +++ b/pkgs/desktops/gnome-3/core/vte/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "vte-0.48.3"; + name = "vte-0.50.1"; src = fetchurl { - url = mirror://gnome/sources/vte/0.48/vte-0.48.3.tar.xz; - sha256 = "a3a9fb182740b392a45cd3f46fa61a985f68bb6b1817b52daec22034c46158c3"; + url = mirror://gnome/sources/vte/0.50/vte-0.50.1.tar.xz; + sha256 = "cf1708e3e573160e1db107014b3ef70888fefe6b668373fed70e8d1cac45a8c2"; }; } From c2bc77220336e717f901b44967148144db78ed09 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 26 Sep 2017 21:19:21 +0200 Subject: [PATCH 283/361] =?UTF-8?q?gobjectIntrospection:=201.52.1=20?= =?UTF-8?q?=E2=86=92=201.54.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/gobject-introspection/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index b26ae9c9d61..f629b9a8a3c 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -7,7 +7,7 @@ # In that case its about 6MB which could be separated let - ver_maj = "1.52"; + ver_maj = "1.54"; ver_min = "1"; in with stdenv.lib; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gobject-introspection/${ver_maj}/${name}.tar.xz"; - sha256 = "1x5gkyrglv3dn9b4fsgw6asqgjw1wj7qc37g9pyac6pyaa6w7l1f"; + sha256 = "0zl7pfkzkm07733391b4f3cwjbnvb1nwvpmajf5bajh6bxgfv3dq"; }; outputs = [ "out" "dev" ]; From db16b930394ba40ecacba6b3c3b4202b18456ad2 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 2 Oct 2017 15:39:35 +0200 Subject: [PATCH 284/361] =?UTF-8?q?ostree:=202017.9=20=E2=86=92=202017.12?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/tools/misc/ostree/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix index 82abb5c9bbc..a8332ad494d 100644 --- a/pkgs/tools/misc/ostree/default.nix +++ b/pkgs/tools/misc/ostree/default.nix @@ -1,24 +1,24 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk_doc, gobjectIntrospection , libgsystem, xz, e2fsprogs, libsoup, gpgme, which, autoconf, automake, libtool, fuse -, libcap, yacc, libxslt, docbook_xsl, docbook_xml_dtd_42 +, libarchive, libcap, bzip2, yacc, libxslt, docbook_xsl, docbook_xml_dtd_42 }: let libglnx-src = fetchFromGitHub { owner = "GNOME"; repo = "libglnx"; - rev = "50a0feaba03ffa5a1980d3a14487276b8f49f8a6"; - sha256 = "1rn5jdh84y1yfpqmvidx82lkm0jr7scjzdrps57r37ksxvrk3ibs"; + rev = "5362f6bc3ff3e30f379e767b203d15c9e56d6f08"; + sha256 = "1l4vm7bx3cf4q44n3a1i2gszyryqyimcxvx54gna72q7dw130mrr"; }; bsdiff-src = fetchFromGitHub { owner = "mendsley"; repo = "bsdiff"; - rev = "7d70d8f4ff48345bc76e314c9d98da91f78873fa"; - sha256 = "0ai2kykj8i4bqcy3gry36r3n4ax0fldncfhksl5b293nf2fihnws"; + rev = "1edf9f656850c0c64dae260960fabd8249ea9c60"; + sha256 = "1h71d2h2d3anp4msvpaff445rnzdxii3id2yglqk7af9i43kdsn1"; }; - version = "2017.9"; + version = "2017.12"; in stdenv.mkDerivation { name = "ostree-${version}"; @@ -26,7 +26,7 @@ in stdenv.mkDerivation { rev = "v${version}"; owner = "ostreedev"; repo = "ostree"; - sha256 = "1040xcw8qcs6xq8x4wg47hha3915qzb6lndb38wjyn6wzl1680q3"; + sha256 = "0gxvpzwz7z4zihz5hkn6ajv7f6gas4zi2pznhi5v6wy7cw06if68"; }; nativeBuildInputs = [ @@ -34,7 +34,7 @@ in stdenv.mkDerivation { libxslt docbook_xsl docbook_xml_dtd_42 ]; - buildInputs = [ libgsystem xz e2fsprogs libsoup gpgme fuse libcap ]; + buildInputs = [ libgsystem xz e2fsprogs libsoup gpgme fuse libarchive libcap bzip2 ]; prePatch = '' rmdir libglnx bsdiff @@ -50,7 +50,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Git for operating system binaries"; - homepage = "http://live.gnome.org/OSTree/"; + homepage = https://ostree.readthedocs.io/en/latest/; license = licenses.lgpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ copumpkin ]; From 01d7bb6dc4a70edf8ddc0ec7fd321bcdc47bd117 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 12 Oct 2017 23:30:40 +0200 Subject: [PATCH 285/361] =?UTF-8?q?json=5Fglib:=201.2.0=20=E2=86=92=201.4.?= =?UTF-8?q?2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../libraries/json-glib/default.nix | 26 +++++++++++++------ 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix index 9d434c088ba..2414931e76a 100644 --- a/pkgs/development/libraries/json-glib/default.nix +++ b/pkgs/development/libraries/json-glib/default.nix @@ -1,24 +1,34 @@ -{ stdenv, fetchurl, glib, pkgconfig, gobjectIntrospection, dbus, libintlOrEmpty }: +{ stdenv, fetchurl, fetchpatch, glib, meson, ninja, pkgconfig, gettext, gobjectIntrospection, dbus, libintlOrEmpty }: stdenv.mkDerivation rec { - name = "json-glib-${minVer}.0"; - minVer = "1.2"; + name = "json-glib-${minVer}.2"; + minVer = "1.4"; src = fetchurl { url = "mirror://gnome/sources/json-glib/${minVer}/${name}.tar.xz"; - sha256 = "1lx7p1c7cl21byvfgw92n8dhm09vi6qxrs0zkx9dg3y096zdzmlr"; + sha256 = "2d7709a44749c7318599a6829322e081915bdc73f5be5045882ed120bb686dc8"; }; - configureflags= "--with-introspection"; - - propagatedBuildInputs = [ glib gobjectIntrospection ]; - nativeBuildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ glib ]; + nativeBuildInputs = [ meson ninja pkgconfig gettext gobjectIntrospection ]; buildInputs = libintlOrEmpty; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; + patches = [ + # https://gitlab.gnome.org/GNOME/json-glib/issues/27 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/json-glib/merge_requests/2.diff"; + sha256 = "0pf006jxj1ki7a0w4ykxm6b24m0wafrhpdcmixsw9x83m227156c"; + }) + ]; + outputs = [ "out" "dev" ]; + doCheck = true; + + checkPhase = "meson test"; + meta = with stdenv.lib; { homepage = http://live.gnome.org/JsonGlib; description = "A library providing (de)serialization support for the JavaScript Object Notation (JSON) format"; From 360f9b7706e0e371da846eba185740926a39bad2 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 12 Oct 2017 23:31:36 +0200 Subject: [PATCH 286/361] =?UTF-8?q?zeitgeist:=200.9.15=20=E2=86=92=201.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/zeitgeist/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/zeitgeist/default.nix b/pkgs/development/libraries/zeitgeist/default.nix index e759e65dfc6..ed84dec365e 100644 --- a/pkgs/development/libraries/zeitgeist/default.nix +++ b/pkgs/development/libraries/zeitgeist/default.nix @@ -1,16 +1,17 @@ -{ stdenv, fetchurl, pkgconfig, glib, sqlite, gnome3, vala_0_23 +{ stdenv, fetchgit, pkgconfig, glib, sqlite, gnome3, vala_0_38 , intltool, libtool, dbus_libs, telepathy_glib , gtk3, json_glib, librdf_raptor2, dbus_glib , pythonSupport ? true, python2Packages }: stdenv.mkDerivation rec { - version = "0.9.15"; + version = "1.0"; name = "zeitgeist-${version}"; - src = fetchurl { - url = "https://github.com/seiflotfy/zeitgeist/archive/v${version}.tar.gz"; - sha256 = "07pnc7kmjpd0ncm32z6s3ny5p4zl52v9lld0n0f8sp6cw87k12p0"; + src = fetchgit { + url = "git://anongit.freedesktop.org/git/zeitgeist/zeitgeist"; + rev = "v${version}"; + sha256 = "0vw6m0azycqabbz8f0fd8xsh5kf6j3ig4wpqlhw6sklvf44ii5b8"; }; NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; @@ -19,9 +20,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-session-bus-services-dir=$(out)/share/dbus-1/services" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib sqlite gnome3.gnome_common intltool - libtool dbus_libs telepathy_glib vala_0_23 dbus_glib + nativeBuildInputs = [ pkgconfig gnome3.gnome_common intltool libtool vala_0_38 ]; + buildInputs = [ glib sqlite dbus_libs telepathy_glib dbus_glib gtk3 json_glib librdf_raptor2 python2Packages.rdflib ]; prePatch = "patchShebangs ."; From cdd40ba79e7eca9674bdb23a65223ab10528219c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 12 Oct 2017 23:36:57 +0200 Subject: [PATCH 287/361] =?UTF-8?q?colord:=201.2.12=20=E2=86=92=201.4.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/tools/misc/colord/default.nix | 43 +++++++-------- pkgs/tools/misc/colord/fix-build-paths.patch | 56 ++++++++++++++++++++ 2 files changed, 74 insertions(+), 25 deletions(-) create mode 100644 pkgs/tools/misc/colord/fix-build-paths.patch diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix index 40ea672296d..020599e17a8 100644 --- a/pkgs/tools/misc/colord/default.nix +++ b/pkgs/tools/misc/colord/default.nix @@ -1,51 +1,44 @@ { stdenv, fetchurl, bash-completion -, glib, polkit, pkgconfig, intltool, gusb, libusb1, lcms2, sqlite, systemd, dbus -, gtk_doc, gobjectIntrospection, argyllcms, autoreconfHook +, glib, polkit, pkgconfig, gettext, gusb, lcms2, sqlite, systemd, dbus +, gobjectIntrospection, argyllcms, meson, ninja, libxml2, vala_0_38 , libgudev, sane-backends }: stdenv.mkDerivation rec { - name = "colord-1.2.12"; + name = "colord-1.4.1"; src = fetchurl { url = "http://www.freedesktop.org/software/colord/releases/${name}.tar.xz"; - sha256 = "0flcsr148xshjbff030pgyk9ar25an901m9q1pjgjdvaq5j1h96m"; + sha256 = "0m854clp8szvq38z16jpazzlqfb3lb3icxcfnsisfrc25748y1ib"; }; enableParallelBuilding = true; - # Version mismatch requires intltoolize to overwrite - # with newer version. - preConfigure = '' - intltoolize --force - ''; - - configureFlags = [ - "--enable-sane" - "--with-udevrulesdir=$(out)/lib/udev/rules.d" - "--with-systemdsystemunitdir=$(out)/etc/systemd/system" + mesonFlags = [ + "-Denable-sane=true" + "-Denable-vala=true" "--localstatedir=/var" - "--disable-bash-completion" + "-Denable-bash-completion=true" + # TODO: man page cannot be build with docbook2x + "-Denable-man=false" + "-Denable-docs=false" ]; + patches = [ + ./fix-build-paths.patch + ]; - # don't touch /var at install time, colord creates what it needs at runtime - postPatch = '' - sed -e "s|if test -w .*;|if false;|" -i src/Makefile.{am,in} - ''; + nativeBuildInputs = [ meson pkgconfig vala_0_38 ninja gettext libxml2 gobjectIntrospection ]; - nativeBuildInputs = [ autoreconfHook intltool pkgconfig ]; - - buildInputs = [ glib polkit gusb libusb1 lcms2 sqlite systemd dbus gobjectIntrospection + buildInputs = [ glib polkit gusb lcms2 sqlite systemd dbus bash-completion argyllcms libgudev sane-backends ]; postInstall = '' - mkdir -p $out/etc/bash_completion.d - cp -v data/colormgr $out/etc/bash_completion.d + glib-compile-schemas $out/share/glib-2.0/schemas ''; meta = { description = "System service to manage, install and generate color profiles to accurately color manage input and output devices"; - homepage = http://www.freedesktop.org/software/colord/intro.html; + homepage = https://www.freedesktop.org/software/colord/; license = stdenv.lib.licenses.lgpl2Plus; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/misc/colord/fix-build-paths.patch b/pkgs/tools/misc/colord/fix-build-paths.patch new file mode 100644 index 00000000000..7eb66a0b34b --- /dev/null +++ b/pkgs/tools/misc/colord/fix-build-paths.patch @@ -0,0 +1,56 @@ +--- a/contrib/session-helper/meson.build ++++ b/contrib/session-helper/meson.build +@@ -21,7 +21,7 @@ + output : 'colord-session.service', + configuration : con2, + install: true, +- install_dir: systemd.get_pkgconfig_variable('systemduserunitdir'), ++ install_dir: join_paths(get_option('prefix'), 'etc', 'systemd', 'user'), + ) + endif + +--- a/data/meson.build ++++ b/data/meson.build +@@ -8,13 +8,13 @@ + + if get_option('enable-systemd') + install_data('colord.conf', +- install_dir: systemd.get_pkgconfig_variable('tmpfilesdir') ++ install_dir: join_paths(get_option('prefix'), 'lib', 'tmpfiles.d') + ) + endif + + if get_option('enable-bash-completion') + install_data('colormgr', +- install_dir: bash_completion.get_pkgconfig_variable('completionsdir') ++ install_dir: join_paths(get_option('prefix'), 'etc', 'bash_completion.d') + ) + endif + +@@ -31,7 +31,7 @@ + output : 'colord.service', + configuration : con2, + install: true, +- install_dir: systemd.get_pkgconfig_variable('systemdsystemunitdir'), ++ install_dir: join_paths(get_option('prefix'), 'etc', 'systemd', 'system'), + ) + endif + +--- a/meson.build ++++ b/meson.build +@@ -258,6 +258,3 @@ + subdir('policy') + subdir('rules') + subdir('src') +- +-meson.add_install_script('meson_post_install.sh', +- localstatedir, get_option('with-daemon-user')) +--- a/rules/meson.build ++++ b/rules/meson.build +@@ -9,5 +9,5 @@ + sensor_rules_in, + '95-cd-devices.rules', + ], +- install_dir : join_paths(udev.get_pkgconfig_variable('udevdir'), 'rules.d') ++ install_dir : join_paths(get_option('prefix'), 'lib', 'udev', 'rules.d') + ) From e7795a6dd79c9dc36fb6a5b38995f2614688e53a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 12 Oct 2017 23:37:56 +0200 Subject: [PATCH 288/361] appstream-glib: clean up --- .../libraries/appstream-glib/default.nix | 24 ++++--------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/pkgs/development/libraries/appstream-glib/default.nix index e07e1fc3908..d177c3acfa7 100644 --- a/pkgs/development/libraries/appstream-glib/default.nix +++ b/pkgs/development/libraries/appstream-glib/default.nix @@ -1,17 +1,9 @@ -{ stdenv, fetchFromGitHub, pkgconfig, gettext, gtk3, intltool, glib -, gtk_doc, autoconf, automake, libtool, libarchive -, gobjectIntrospection, sqlite, libsoup, gcab, attr, acl, docbook_xsl -, libuuid, json_glib, autoconf-archive, meson, gperf, ninja, gdk_pixbuf +{ stdenv, fetchFromGitHub, pkgconfig, gettext, gtk3, glib +, gtk_doc, libarchive, gobjectIntrospection +, sqlite, libsoup, gcab, attr, acl, docbook_xsl +, libuuid, json_glib, meson, gperf, ninja }: -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 dcb074ae9c8a5769d5125adcd2362ed2113d6ba0 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 12 Oct 2017 23:38:57 +0200 Subject: [PATCH 289/361] =?UTF-8?q?packagekit:=201.1.3=20=E2=86=92=201.1.7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/tools/package-management/packagekit/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix index 180395571b2..d4e6885d8f3 100644 --- a/pkgs/tools/package-management/packagekit/default.nix +++ b/pkgs/tools/package-management/packagekit/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, lib , intltool, glib, pkgconfig, polkit, python, sqlite, systemd -, gobjectIntrospection, vala_0_23, gtk_doc, autoreconfHook, autoconf-archive +, gobjectIntrospection, vala_0_38, gtk_doc, autoreconfHook, autoconf-archive # TODO: set enableNixBackend to true, as soon as it builds , nix, enableNixBackend ? false, boost , enableCommandNotFound ? false @@ -8,16 +8,16 @@ stdenv.mkDerivation rec { name = "packagekit-${version}"; - version = "1.1.3"; + version = "1.1.7"; src = fetchFromGitHub { owner = "hughsie"; repo = "PackageKit"; rev = "PACKAGEKIT_${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "150mpar7bhlvwfpwsr6zrjn3yggvklzr6nlhk0shaxnrfkfxvvb6"; + sha256 = "076rrczmyhapj87pxqldsar5pbz4mid6cm9l1n91zh2q403chdkb"; }; - buildInputs = [ glib polkit systemd python gobjectIntrospection vala_0_23 ] + buildInputs = [ glib polkit systemd python gobjectIntrospection vala_0_38 ] ++ lib.optional enableBashCompletion bash-completion; propagatedBuildInputs = [ sqlite nix boost ]; nativeBuildInputs = [ intltool pkgconfig autoreconfHook autoconf-archive gtk_doc ]; From 64e34730178cc924ead9349c8e43c16acb2b95a3 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 17 Sep 2017 01:35:19 +0200 Subject: [PATCH 290/361] =?UTF-8?q?nautilus-sendto:=203.8.1=20=E2=86=92=20?= =?UTF-8?q?3.8.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desktops/gnome-3/apps/nautilus-sendto/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/nautilus-sendto/default.nix b/pkgs/desktops/gnome-3/apps/nautilus-sendto/default.nix index 7d71d1b7adc..2812e7673b4 100644 --- a/pkgs/desktops/gnome-3/apps/nautilus-sendto/default.nix +++ b/pkgs/desktops/gnome-3/apps/nautilus-sendto/default.nix @@ -1,18 +1,17 @@ -{ stdenv, fetchurl, glib, pkgconfig, gnome3, intltool -, gobjectIntrospection, makeWrapper }: +{ stdenv, fetchurl, meson, ninja, glib, pkgconfig, gnome3, appstream-glib, gettext }: stdenv.mkDerivation rec { name = "nautilus-sendto-${version}"; - version = "3.8.1"; + version = "3.8.6"; src = fetchurl { url = "mirror://gnome/sources/nautilus-sendto/3.8/${name}.tar.xz"; - sha256 = "03fa46bff271acdbdedab6243b2a84e5ed3daa19c81b69d087b3e852c8fe5dab"; + sha256 = "164d7c6e8bae29c4579bcc67a7bf50d783662b1545b62f3008e7ea3c0410e04d"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib gobjectIntrospection intltool makeWrapper ]; + nativeBuildInputs = [ meson ninja pkgconfig appstream-glib gettext ]; + buildInputs = [ glib ]; meta = with stdenv.lib; { description = "Integrates Evolution and Pidgin into the Nautilus file manager"; From 309a831e05067e436897737a51e30eb42c086365 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 17 Sep 2017 16:45:40 +0200 Subject: [PATCH 291/361] gnome3.totem-pl-parser: clean up --- pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 370fdee5381..56fef312927 100644 --- a/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix +++ b/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix @@ -3,8 +3,8 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ file intltool gmime libxml2 libsoup ]; + nativeBuildInputs = [ pkgconfig file intltool ]; + buildInputs = [ gmime libxml2 libsoup ]; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Videos; From 1260fe96a69eb4ee5e50a8a0466b5633df945d27 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 17 Sep 2017 18:51:53 +0200 Subject: [PATCH 292/361] gnome3.mutter: remove stale patches --- pkgs/desktops/gnome-3/core/mutter/default.nix | 4 ---- pkgs/desktops/gnome-3/core/mutter/math.patch | 10 ---------- pkgs/desktops/gnome-3/core/mutter/x86.patch | 20 ------------------- 3 files changed, 34 deletions(-) delete mode 100644 pkgs/desktops/gnome-3/core/mutter/math.patch delete mode 100644 pkgs/desktops/gnome-3/core/mutter/x86.patch diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix index ebceb4ef706..bf91259ebad 100644 --- a/pkgs/desktops/gnome-3/core/mutter/default.nix +++ b/pkgs/desktops/gnome-3/core/mutter/default.nix @@ -28,10 +28,6 @@ stdenv.mkDerivation rec { --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" ''; - patches = [ - ./x86.patch # ./math.patch - ]; - enableParallelBuilding = true; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/core/mutter/math.patch b/pkgs/desktops/gnome-3/core/mutter/math.patch deleted file mode 100644 index dbdfd93f5e1..00000000000 --- a/pkgs/desktops/gnome-3/core/mutter/math.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- mutter-3.18.0/src/backends/meta-cursor-renderer.c.orig 2015-09-23 13:54:31.297523343 +0200 -+++ mutter-3.18.0/src/backends/meta-cursor-renderer.c 2015-09-23 13:54:43.728271766 +0200 -@@ -31,6 +31,7 @@ - - #include - #include -+#include - - #include "meta-stage.h" - diff --git a/pkgs/desktops/gnome-3/core/mutter/x86.patch b/pkgs/desktops/gnome-3/core/mutter/x86.patch deleted file mode 100644 index 93df1e7f283..00000000000 --- a/pkgs/desktops/gnome-3/core/mutter/x86.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/src/core/window.c 2015-05-26 10:52:41.382834963 +0200 -+++ b/src/core/window.c 2015-05-26 10:53:03.039948034 +0200 -@@ -3499,7 +3499,7 @@ - - static MetaMonitorInfo * - find_monitor_by_winsys_id (MetaWindow *window, -- guint winsys_id) -+ gint winsys_id) - { - int i; - -@@ -3618,7 +3618,7 @@ - */ - - gboolean did_placement; -- guint old_output_winsys_id; -+ gint old_output_winsys_id; - MetaRectangle unconstrained_rect; - MetaRectangle constrained_rect; - MetaMoveResizeResultFlags result = 0; From 4d66728328dc2e1af708d2add2683116e4cd6a8d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 18 Sep 2017 12:33:45 +0200 Subject: [PATCH 293/361] gnome3.mutter: add libwacom dependency --- pkgs/desktops/gnome-3/core/mutter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix index bf91259ebad..2b44d4112fb 100644 --- a/pkgs/desktops/gnome-3/core/mutter/default.nix +++ b/pkgs/desktops/gnome-3/core/mutter/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo , pango, cogl, clutter, libstartup_notification, libcanberra_gtk2, zenity, libcanberra_gtk3 , libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libudev, libinput -, libgudev, xwayland }: +, libgudev, libwacom, xwayland }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = with gnome3; [ pkgconfig intltool glib gobjectIntrospection gtk gsettings_desktop_schemas upower gnome_desktop cairo pango cogl clutter zenity libstartup_notification libcanberra_gtk2 - gnome3.geocode_glib libudev libinput libgudev + gnome3.geocode_glib libudev libinput libgudev libwacom libcanberra_gtk3 zenity libtool makeWrapper xkeyboard_config libxkbfile libxkbcommon ]; From e14e705d82fe483e31410ce9877b7485bb51cb8c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 10 Oct 2017 22:23:30 +0200 Subject: [PATCH 294/361] telepathy_glib: cleanup --- pkgs/development/libraries/telepathy/glib/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/telepathy/glib/default.nix b/pkgs/development/libraries/telepathy/glib/default.nix index ec26c9f567b..fffe677f6a7 100644 --- a/pkgs/development/libraries/telepathy/glib/default.nix +++ b/pkgs/development/libraries/telepathy/glib/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, dbus_glib, glib, python2, pkgconfig, libxslt -, gobjectIntrospection, valaSupport ? true, vala_0_23, glibcLocales }: +, gobjectIntrospection, valaSupport ? true, vala_0_38, glibcLocales }: stdenv.mkDerivation rec { name = "telepathy-glib-0.24.1"; @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { LC_ALL = "en_US.UTF-8"; propagatedBuildInputs = [dbus_glib glib gobjectIntrospection]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libxslt glibcLocales python2 ] ++ stdenv.lib.optional valaSupport vala_0_23; + nativeBuildInputs = [ pkgconfig libxslt ] ++ stdenv.lib.optional valaSupport vala_0_38; + buildInputs = [ glibcLocales python2 ]; preConfigure = '' substituteInPlace telepathy-glib/telepathy-glib.pc.in --replace Requires.private Requires From de0cede481674d09020bde097b2504e987b5e1d5 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 10 Oct 2017 22:24:04 +0200 Subject: [PATCH 295/361] gnome3.dconf: cleanup --- pkgs/desktops/gnome-3/core/dconf/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/dconf/default.nix b/pkgs/desktops/gnome-3/core/dconf/default.nix index 402c6c1c355..130e8255edc 100644 --- a/pkgs/desktops/gnome-3/core/dconf/default.nix +++ b/pkgs/desktops/gnome-3/core/dconf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, vala_0_32, libxslt, pkgconfig, glib, dbus_glib, gnome3 +{ stdenv, fetchurl, vala, libxslt, pkgconfig, glib, dbus_glib, gnome3 , libxml2, intltool, docbook_xsl_ns, docbook_xsl, makeWrapper }: let @@ -15,9 +15,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "lib" "dev" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ vala_0_32 libxslt glib dbus_glib gnome3.gtk libxml2 - intltool docbook_xsl docbook_xsl_ns makeWrapper ]; + nativeBuildInputs = [ vala pkgconfig intltool libxslt libxml2 docbook_xsl docbook_xsl_ns makeWrapper ]; + buildInputs = [ glib dbus_glib ]; postConfigure = stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace client/Makefile \ From 8f8de4a34bb1154c0c1407f604bc323f39435992 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 3 Nov 2017 22:09:29 +0100 Subject: [PATCH 296/361] =?UTF-8?q?libevdev:=201.5.6=20=E2=86=92=201.5.7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/libevdev/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libevdev/default.nix b/pkgs/development/libraries/libevdev/default.nix index a91acb23052..090a12f63de 100644 --- a/pkgs/development/libraries/libevdev/default.nix +++ b/pkgs/development/libraries/libevdev/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python }: stdenv.mkDerivation rec { - name = "libevdev-1.5.6"; + name = "libevdev-1.5.7"; src = fetchurl { url = "https://www.freedesktop.org/software/libevdev/${name}.tar.xz"; - sha256 = "1256ypz93039n6km4macg158fpmjgylhmcmk20pnklxicsfpxv7c"; + sha256 = "08nl3p6226k51zph52fhilxvi3b31spp6fz8szzrglzhl8vrxrd1"; }; buildInputs = [ python ]; From 716a0d6c190cfd3fcf9581f1c7fe50e33fb726f5 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 3 Nov 2017 22:48:50 +0100 Subject: [PATCH 297/361] gnome3.mutter: fix libgudev 232 compatibility --- pkgs/desktops/gnome-3/core/mutter/default.nix | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix index 2b44d4112fb..5c918f964fe 100644 --- a/pkgs/desktops/gnome-3/core/mutter/default.nix +++ b/pkgs/desktops/gnome-3/core/mutter/default.nix @@ -1,7 +1,7 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo +{ fetchurl, fetchpatch, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo , pango, cogl, clutter, libstartup_notification, libcanberra_gtk2, zenity, libcanberra_gtk3 , libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libudev, libinput -, libgudev, libwacom, xwayland }: +, libgudev, libwacom, xwayland, autoreconfHook }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { libXtst ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = with gnome3; [ pkgconfig intltool glib gobjectIntrospection gtk gsettings_desktop_schemas upower gnome_desktop cairo pango cogl clutter zenity libstartup_notification libcanberra_gtk2 @@ -23,6 +25,15 @@ stdenv.mkDerivation rec { libcanberra_gtk3 zenity libtool makeWrapper xkeyboard_config libxkbfile libxkbcommon ]; + patches = [ + # https://bugzilla.gnome.org/show_bug.cgi?id=760670 + (fetchpatch { + name = "libgudev-232.patch"; + url = https://bugzilla.gnome.org/attachment.cgi?id=358904; + sha256 = "0chvd7g9f2zp3a0gdhvinsfvp2h10rwb6a8ja386vsrl93ac8pix"; + }) + ]; + preFixup = '' wrapProgram "$out/bin/mutter" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" From 3c98114d6ff86b9934ca9d63a010a8b4447c4a63 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 3 Nov 2017 23:30:56 +0100 Subject: [PATCH 298/361] gnome3.mutter: cleanup --- pkgs/desktops/gnome-3/core/mutter/default.nix | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix index 5c918f964fe..208b8b75648 100644 --- a/pkgs/desktops/gnome-3/core/mutter/default.nix +++ b/pkgs/desktops/gnome-3/core/mutter/default.nix @@ -9,20 +9,30 @@ stdenv.mkDerivation rec { # fatal error: gio/gunixfdlist.h: No such file or directory NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0 -Wno-error=format -Wno-error=sign-compare"; - configureFlags = "--with-x --disable-static --enable-shape --enable-sm --enable-startup-notification --enable-xsync --enable-verbose-mode --with-libcanberra --with-xwayland-path=${xwayland}/bin/Xwayland"; + configureFlags = [ + "--with-x" + "--disable-static" + "--enable-shape" + "--enable-sm" + "--enable-startup-notification" + "--enable-xsync" + "--enable-verbose-mode" + "--with-libcanberra" + "--with-xwayland-path=${xwayland}/bin/Xwayland" + ]; propagatedBuildInputs = [ # required for pkgconfig to detect mutter-clutter libXtst ]; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook pkgconfig intltool libtool makeWrapper ]; buildInputs = with gnome3; - [ pkgconfig intltool glib gobjectIntrospection gtk gsettings_desktop_schemas upower + [ glib gobjectIntrospection gtk gsettings_desktop_schemas upower gnome_desktop cairo pango cogl clutter zenity libstartup_notification libcanberra_gtk2 gnome3.geocode_glib libudev libinput libgudev libwacom - libcanberra_gtk3 zenity libtool makeWrapper xkeyboard_config libxkbfile + libcanberra_gtk3 zenity xkeyboard_config libxkbfile libxkbcommon ]; patches = [ From 09bda3529d3c0be81ac9ce9d95c3e7e40c8e320d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 4 Nov 2017 19:27:40 +0100 Subject: [PATCH 299/361] libinput: enable tests Three tests are ran, libinput-test-suite-runner is skipped because it must be run as root. --- pkgs/development/libraries/libinput/default.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 553bb9463ed..d39a71e16da 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -2,12 +2,12 @@ , 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, python3Packages ? null }: assert documentationSupport -> doxygen != null && graphviz != null; assert eventGUISupport -> cairo != null && glib != null && gtk3 != null; -assert testsSupport -> check != null && valgrind != null; +assert testsSupport -> check != null && valgrind != null && python3Packages != null; let mkFlag = optSet: flag: "-D${flag}=${stdenv.lib.boolToString optSet}"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig meson ninja ] ++ optionals documentationSupport [ doxygen graphviz ] - ++ optionals testsSupport [ check valgrind ]; + ++ optionals testsSupport [ check valgrind python3Packages.pyparsing ]; buildInputs = [ libevdev mtdev libwacom ] ++ optionals eventGUISupport [ cairo glib gtk3 ]; @@ -42,6 +42,16 @@ stdenv.mkDerivation rec { patches = [ ./udev-absolute-path.patch ]; + preBuild = '' + # meson setup-hook changes the directory so the files are located one level up + patchShebangs ../udev/parse_hwdb.py + patchShebangs ../test/symbols-leak-test.in + ''; + + doCheck = testsSupport; + + checkPhase = "meson test"; + meta = { description = "Handles input devices in Wayland compositors and provides a generic X.Org input driver"; homepage = http://www.freedesktop.org/wiki/Software/libinput; From 922b0b9629988c721bee3d271b75ebeb63164db7 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sun, 5 Nov 2017 20:55:06 +0100 Subject: [PATCH 300/361] mkvtoolnix: 16.0.0 -> 17.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 2d7f7144f5f..183722beed8 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 = "16.0.0"; + version = "17.0.0"; src = fetchFromGitHub { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "0zdmjp0f7sh0bkaj0ls4sy4sg9qdq9ycrl18hlkafnj9xnbijgnn"; + sha256 = "1v74rxf9wm0sn2illy0hp36hpwz7q04y0k32wq6wn7qrnzkzcc88"; }; nativeBuildInputs = [ pkgconfig autoconf automake gettext drake ruby docbook_xsl libxslt ]; From 99cf2b6eec330a00d9cdef9070974a5a50a701e5 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sun, 5 Nov 2017 19:08:36 +0100 Subject: [PATCH 301/361] vapoursynth: R38 -> R39 --- .../libraries/vapoursynth/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/vapoursynth/default.nix b/pkgs/development/libraries/vapoursynth/default.nix index cdbecb4dc8b..6864db12f18 100644 --- a/pkgs/development/libraries/vapoursynth/default.nix +++ b/pkgs/development/libraries/vapoursynth/default.nix @@ -1,7 +1,8 @@ -{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, - zimg, libass, yasm, python3, libiconv, ApplicationServices, - ocrSupport ? false, tesseract, - imwriSupport? true, imagemagick7 +{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook +, zimg, libass, python3, libiconv +, ApplicationServices, nasm +, ocrSupport ? false, tesseract +, imwriSupport? true, imagemagick7 }: assert ocrSupport -> tesseract != null; @@ -11,18 +12,18 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "vapoursynth-${version}"; - version = "R38"; + version = "R39"; src = fetchFromGitHub { owner = "vapoursynth"; repo = "vapoursynth"; rev = version; - sha256 = "0nabl6949s7awy7rnr4ck52v50xr0hwr280fyzsqixgp8w369jn0"; + sha256 = "0cw7w8xiwhxhwykydy13m44wm9vn9hrsi30z6017ngga9d84fhqy"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkgconfig autoreconfHook nasm ]; buildInputs = [ - zimg libass tesseract yasm + zimg libass (python3.withPackages (ps: with ps; [ sphinx cython ])) ] ++ optionals stdenv.isDarwin [ libiconv ApplicationServices ] ++ optional ocrSupport tesseract From 4874862732b036a174ab1a4d3fa9a6f4df7836e4 Mon Sep 17 00:00:00 2001 From: Markus Mueller Date: Tue, 17 Jan 2017 13:45:43 +0000 Subject: [PATCH 302/361] babeld module: init --- nixos/modules/module-list.nix | 1 + nixos/modules/services/networking/babeld.nix | 98 ++++++++++++++++++++ 2 files changed, 99 insertions(+) create mode 100644 nixos/modules/services/networking/babeld.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index e66a2ba272a..521e2c0ca24 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -413,6 +413,7 @@ ./services/networking/asterisk.nix ./services/networking/atftpd.nix ./services/networking/avahi-daemon.nix + ./services/networking/babeld.nix ./services/networking/bind.nix ./services/networking/autossh.nix ./services/networking/bird.nix diff --git a/nixos/modules/services/networking/babeld.nix b/nixos/modules/services/networking/babeld.nix new file mode 100644 index 00000000000..dd76bac9df7 --- /dev/null +++ b/nixos/modules/services/networking/babeld.nix @@ -0,0 +1,98 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.babeld; + + paramsString = params: + concatMapStringsSep "" (name: "${name} ${boolToString (getAttr name params)}") + (attrNames params); + + interfaceConfig = name: + let + interface = getAttr name cfg.interfaces; + in + "interface ${name} ${paramsString interface}\n"; + + configFile = with cfg; pkgs.writeText "babeld.conf" ( + (optionalString (cfg.interfaceDefaults != null) '' + default ${paramsString cfg.interfaceDefaults} + '') + + (concatMapStrings interfaceConfig (attrNames cfg.interfaces)) + + extraConfig); + +in + +{ + + ###### interface + + options = { + + services.babeld = { + + enable = mkOption { + default = false; + description = '' + Whether to run the babeld network routing daemon. + ''; + }; + + interfaceDefaults = mkOption { + default = null; + description = '' + A set describing default parameters for babeld interfaces. + See babeld8 for options. + ''; + type = types.nullOr (types.attrsOf types.unspecified); + example = + { + wired = true; + "split-horizon" = true; + }; + }; + + interfaces = mkOption { + default = {}; + description = '' + A set describing babeld interfaces. + See babeld8 for options. + ''; + type = types.attrsOf (types.attrsOf types.unspecified); + example = + { enp0s2 = + { wired = true; + "hello-interval" = 5; + "split-horizon" = "auto"; + }; + }; + }; + + extraConfig = mkOption { + default = ""; + description = '' + Options that will be copied to babeld.conf. + See babeld8 for details. + ''; + }; + }; + + }; + + + ###### implementation + + config = mkIf config.services.babeld.enable { + + systemd.services.babeld = { + description = "Babel routing daemon"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig.ExecStart = "${pkgs.babeld}/bin/babeld -c ${configFile}"; + }; + + }; + +} From 9e2f54a30ca1818732385d66a2534d91deed55a7 Mon Sep 17 00:00:00 2001 From: Sauyon Lee Date: Sun, 17 Sep 2017 08:59:56 +0100 Subject: [PATCH 303/361] python.pkgs.faulthandler: init at 2.6 --- .../python-modules/faulthandler/default.nix | 19 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 4 ++++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/python-modules/faulthandler/default.nix diff --git a/pkgs/development/python-modules/faulthandler/default.nix b/pkgs/development/python-modules/faulthandler/default.nix new file mode 100644 index 00000000000..f8d877f0655 --- /dev/null +++ b/pkgs/development/python-modules/faulthandler/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchPypi, buildPythonPackage }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "faulthandler"; + version = "2.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "0zywq3jaznddvqc3hnfrlv24wmpyq4xgajk9xhv6578qw1rpfj2r"; + }; + + meta = { + description = "Dump the Python traceback"; + license = stdenv.lib.licenses.bsd2; + maintainers = with stdenv.lib.maintainers; [ sauyon ]; + homepage = http://faulthandler.readthedocs.io/; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0ae7d8f2bea..f69312a7ca3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5299,6 +5299,10 @@ in { buildInputs = with self; [ fudge_9 nose ]; }; + faulthandler = if ! isPy3k + then callPackage ../development/python-modules/faulthandler {} + else throw "faulthandler is built into ${python.executable}"; + fedpkg = callPackage ../development/python-modules/fedpkg { }; flit = callPackage ../development/python-modules/flit { }; From a5f5bee85f23b581965986f1e2f70da3ff0a4359 Mon Sep 17 00:00:00 2001 From: Sauyon Lee Date: Sun, 17 Sep 2017 09:00:23 +0100 Subject: [PATCH 304/361] python.pkgs.pyobjc: init at 4.0b1 --- .../python-modules/pyobjc/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 4 ++++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/python-modules/pyobjc/default.nix diff --git a/pkgs/development/python-modules/pyobjc/default.nix b/pkgs/development/python-modules/pyobjc/default.nix new file mode 100644 index 00000000000..0cf08319645 --- /dev/null +++ b/pkgs/development/python-modules/pyobjc/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchPypi, isPy3k, buildPythonPackage }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "pyobjc"; + version = "4.0b1"; + + # Gives "No matching distribution found for + # pyobjc-framework-Collaboration==4.0b1 (from pyobjc==4.0b1)" + disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "16bng6960c1m57nnh1l09ycnyimrqzw9mx9pnyjxn5zzm5kalr37"; + }; + + meta = { + description = "A bridge between the Python and Objective-C programming languages"; + license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ sauyon ]; + homepage = https://pythonhosted.org/pyobjc/; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f69312a7ca3..b42195e3630 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16579,6 +16579,10 @@ in { }; }; + pyobjc = if stdenv.isDarwin + then callPackage ../development/python-modules/pyobjc {} + else throw "pyobjc can only be built on Mac OS"; + pyodbc = callPackage ../development/python-modules/pyodbc { }; pyocr = callPackage ../development/python-modules/pyocr { }; From 7486ae8e7ccc256873982c60445f34dfa72382e9 Mon Sep 17 00:00:00 2001 From: Sauyon Lee Date: Sun, 17 Sep 2017 09:00:36 +0100 Subject: [PATCH 305/361] quodlibet: 2.6.3 -> 3.9.1 --- pkgs/applications/audio/quodlibet/default.nix | 80 +++++++------------ .../quodlibet/quodlibet-package-plugins.patch | 18 ----- pkgs/top-level/all-packages.nix | 31 ++++++- 3 files changed, 57 insertions(+), 72 deletions(-) delete mode 100644 pkgs/applications/audio/quodlibet/quodlibet-package-plugins.patch diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index 2e6d61b693d..fd328669846 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -1,64 +1,44 @@ -{ stdenv, fetchurl, python2Packages, intltool -, gst-python, withGstPlugins ? false, gst-plugins-base ? null -, gst-plugins-good ? null, gst-plugins-ugly ? null, gst-plugins-bad ? null }: +{ stdenv, fetchurl, python2Packages, wrapGAppsHook, gettext, intltool, libsoup, gnome3, + tag ? "", + gst_all_1, withGstPlugins ? true, + xineBackend ? false, xineLib, + withDbusPython ? false, withPyInotify ? false, withMusicBrainzNgs ? false, withPahoMqtt ? false, + webkitgtk ? null, + keybinder3 ? null, gtksourceview ? null, libmodplug ? null, kakasi ? null, libappindicator-gtk3 ? null }: -assert withGstPlugins -> gst-plugins-base != null - || gst-plugins-good != null - || gst-plugins-ugly != null - || gst-plugins-bad != null; - -let - version = "2.6.3"; - inherit (python2Packages) buildPythonApplication python mutagen pygtk pygobject2 dbus-python; -in buildPythonApplication { - # call the package quodlibet and just quodlibet - name = "quodlibet${stdenv.lib.optionalString (!withGstPlugins) "-without-gst-plugins"}-${version}"; +let optionals = stdenv.lib.optionals; in +python2Packages.buildPythonApplication rec { + name = "quodlibet${tag}-${version}"; + version = "3.9.1"; # XXX, tests fail doCheck = false; - srcs = [ - (fetchurl { - url = "https://bitbucket.org/lazka/quodlibet-files/raw/default/releases/quodlibet-${version}.tar.gz"; - sha256 = "0ilasi4b0ay8r6v6ba209wsm80fq2nmzigzc5kvphrk71jwypx6z"; - }) - (fetchurl { - url = "https://bitbucket.org/lazka/quodlibet-files/raw/default/releases/quodlibet-plugins-${version}.tar.gz"; - sha256 = "1rv08rhdjad8sjhplqsspcf4vkazgkxyshsqmbfbrrk5kvv57ybc"; - }) - ]; + src = fetchurl { + url = "https://github.com/quodlibet/quodlibet/releases/download/release-${version}/quodlibet-${version}.tar.gz"; + sha256 = "d2b42df5d439213973dc97149fddc779a6c90cec389c24baf1c0bdcc39ffe591"; + }; - preConfigure = '' - # TODO: for now don't a apply gdist overrides, will be needed for shipping icons, gtk, etc - sed -i /distclass/d setup.py - ''; + nativeBuildInputs = [ wrapGAppsHook gettext intltool ]; + # ++ (with python2Packages; [ pytest pyflakes pycodestyle polib ]); # test deps - sourceRoot = "quodlibet-${version}"; + buildInputs = [ gnome3.defaultIconTheme libsoup webkitgtk keybinder3 gtksourceview libmodplug libappindicator-gtk3 kakasi ] + ++ (if xineBackend then [ xineLib ] else with gst_all_1; + [ gstreamer gst-plugins-base ] ++ optionals withGstPlugins [ gst-plugins-good gst-plugins-ugly gst-plugins-bad ]); - postUnpack = '' - # the patch searches for plugins in directory ../plugins - # so link the appropriate directory there - ln -sf quodlibet-plugins-${version} plugins - ''; + propagatedBuildInputs = with python2Packages; + [ pygobject3 pycairo mutagen pygtk gst-python feedparser faulthandler futures ] + ++ optionals withDbusPython [ dbus-python ] + ++ optionals withPyInotify [ pyinotify ] + ++ optionals withMusicBrainzNgs [ musicbrainzngs ] + ++ optionals stdenv.isDarwin [ pyobjc ] + ++ optionals withPahoMqtt [ paho-mqtt ]; - patches = [ ./quodlibet-package-plugins.patch ]; - - buildInputs = stdenv.lib.optionals withGstPlugins [ - gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad - ]; - - propagatedBuildInputs = [ - mutagen pygtk pygobject2 dbus-python gst-python intltool - ]; - - postInstall = stdenv.lib.optionalString withGstPlugins '' - # Wrap quodlibet so it finds the GStreamer plug-ins - wrapProgram "$out/bin/quodlibet" --prefix \ - GST_PLUGIN_SYSTEM_PATH ":" "$GST_PLUGIN_SYSTEM_PATH" \ - ''; + makeWrapperArgs = optionals (kakasi != null) [ "--prefix PATH : ${kakasi}/bin" ]; meta = { description = "GTK+-based audio player written in Python, using the Mutagen tagging library"; + license = stdenv.lib.licenses.gpl2; longDescription = '' Quod Libet is a GTK+-based audio player written in Python, using @@ -74,7 +54,7 @@ in buildPythonApplication { & internet radio, and all major audio formats. ''; - maintainers = [ stdenv.lib.maintainers.coroa ]; + maintainers = with stdenv.lib.maintainers; [ coroa sauyon ]; homepage = https://quodlibet.readthedocs.io/en/latest/; }; } diff --git a/pkgs/applications/audio/quodlibet/quodlibet-package-plugins.patch b/pkgs/applications/audio/quodlibet/quodlibet-package-plugins.patch deleted file mode 100644 index d518f857cf1..00000000000 --- a/pkgs/applications/audio/quodlibet/quodlibet-package-plugins.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -Naur quodlibet-2.5.orig/setup.py quodlibet-2.5.new/setup.py ---- quodlibet-2.5.orig/setup.py 2012-12-19 08:47:41.000000000 +0000 -+++ quodlibet-2.5.new/setup.py 2013-04-22 19:27:07.152631051 +0000 -@@ -337,5 +338,14 @@ - } - } - }) -+ else: -+ from os.path import join -+ -+ data_files = [] -+ for type in ["playorder", "songsmenu", "editing", "events", "gstreamer"]: -+ data_files.append((join('quodlibet', 'plugins', type), -+ glob.glob(join('..', 'plugins', type, '*.py')))) -+ setup_kwargs.update({ 'data_files': data_files }); -+ - setup(**setup_kwargs) - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f7eed45314f..a7e1bd3fe2d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16272,14 +16272,37 @@ with pkgs; quiterss = libsForQt5.callPackage ../applications/networking/newsreaders/quiterss {}; - quodlibet-without-gst-plugins = callPackage ../applications/audio/quodlibet { }; + falkon = libsForQt5.callPackage ../applications/networking/browsers/falkon { }; quodlibet = callPackage ../applications/audio/quodlibet { - withGstPlugins = true; - gst-plugins-bad = null; + keybinder3 = null; + libmodplug = null; + kakasi = null; + libappindicator-gtk3 = null; }; - falkon = libsForQt5.callPackage ../applications/networking/browsers/falkon { }; + quodlibet-without-gst-plugins = quodlibet.override { + withGstPlugins = false; + tag = "-without-gst-plugins"; + }; + + quodlibet-xine = quodlibet.override { xineBackend = true; tag = "-xine"; }; + + quodlibet-full = callPackage ../applications/audio/quodlibet { + inherit (gnome2) gtksourceview; + withDbusPython = true; + withPyInotify = true; + withMusicBrainzNgs = true; + withPahoMqtt = true; + keybinder3 = keybinder3; + libmodplug = libmodplug; + kakasi = kakasi; + webkitgtk = webkitgtk24x-gtk3; + libappindicator-gtk3 = libappindicator-gtk3; + tag = "-full"; + }; + + quodlibet-xine-full = quodlibet-full.override { xineBackend = true; tag = "-xine-full"; }; qutebrowser = libsForQt5.callPackage ../applications/networking/browsers/qutebrowser { inherit (python3Packages) buildPythonApplication pyqt5 jinja2 pygments pyyaml pypeg2 cssutils pyopengl attrs; From 8c190c3f7d49be0469645157297bb2f0773e8f87 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 5 Nov 2017 22:47:09 +0200 Subject: [PATCH 306/361] lib/types.nix: Disable 32-bit integer types for now This file doesn't evaluate in 32-bit versions of Nix because the integer type is a signed 32-bit integer there, so 4294967296 causes an 'invalid integer' error. I see no other way around than commenting this out :( (s32 could be made to work by tweaking the expressions a bit, but didn't do that for now since it'd be asymmetric to have s32 but no u32). --- lib/types.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/types.nix b/lib/types.nix index adbae8f08a5..46ed05d288f 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -157,14 +157,14 @@ rec { }; 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; + # the biggest int a 64-bit Nix accepts is 2^63 - 1 (9223372036854775808), for a 32-bit Nix it is 2^31 - 1 (2147483647) + # the smallest int a 64-bit Nix accepts is -2^63 (-9223372036854775807), for a 32-bit Nix it is -2^31 (-2147483648) + # u32 = unsign 32 4294967296; + # u64 = unsign 64 18446744073709551616; s8 = sign 8 256; s16 = sign 16 65536; - s32 = sign 32 4294967296; + # s32 = sign 32 4294967296; }; str = mkOptionType { From 30f6d630f1908d05da1d22aff80c489f3c09652d Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 5 Nov 2017 16:47:03 -0500 Subject: [PATCH 307/361] linux: 4.14.0-rc7 -> 4.14.0-rc8 --- 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 8c8fd3c9733..54e37e72130 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-rc7"; - modDirVersion = "4.14.0-rc7"; + version = "4.14-rc8"; + modDirVersion = "4.14.0-rc8"; extraMeta.branch = "4.14"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "1w7b1sc5dsxcqywsdbwgs92i8jpj7hsnss67yzb58z3bz3hb73m3"; + sha256 = "0ir2ggflm1xjnn1kvv2c99m5zni5kg0ygzlpm588wnhkzd93nqjh"; }; # Should the testing kernels ever be built on Hydra? From c3786d07b16bdc7c8268a979fdcdf0307974e9d2 Mon Sep 17 00:00:00 2001 From: Fahad Sadah <92872+fahadsadah@users.noreply.github.com> Date: Sun, 5 Nov 2017 21:37:27 +0000 Subject: [PATCH 308/361] python: fastimport 0.9.4 -> 0.9.6 --- .../python-modules/fastimport/default.nix | 22 ++++++++++++++++ pkgs/top-level/python-packages.nix | 26 ++----------------- 2 files changed, 24 insertions(+), 24 deletions(-) create mode 100644 pkgs/development/python-modules/fastimport/default.nix diff --git a/pkgs/development/python-modules/fastimport/default.nix b/pkgs/development/python-modules/fastimport/default.nix new file mode 100644 index 00000000000..ee1048ec5fa --- /dev/null +++ b/pkgs/development/python-modules/fastimport/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, python, fetchurl }: + +buildPythonPackage rec { + name = "fastimport-${version}"; + version = "0.9.6"; + + src = fetchurl { + url = "mirror://pypi/f/fastimport/${name}.tar.gz"; + sha256 = "1aqjsin4rmqm7ln4j0p73fzxifws6c6ikgyhav7r137m2ixsxl43"; + }; + + checkPhase = '' + ${python.interpreter} -m unittest discover + ''; + + meta = with stdenv.lib; { + homepage = https://launchpad.net/python-fastimport; + description = "VCS fastimport/fastexport parser"; + maintainers = with maintainers; [ koral ]; + license = licenses.gpl2Plus; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7664f422c0b..595e7dc27b4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8645,30 +8645,8 @@ in { }; }; - fastimport = buildPythonPackage rec { - name = "fastimport-${version}"; - version = "0.9.4"; - - # Judging from SyntaxError - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "mirror://pypi/f/fastimport/${name}.tar.gz"; - sha256 = "0k8x7552ypx9rc14vbsvg2lc6z0r8pv9laah28pdwyynbq10825d"; - }; - - checkPhase = '' - ${python.interpreter} -m unittest discover - ''; - - meta = { - homepage = https://launchpad.net/python-fastimport; - description = "VCS fastimport/fastexport parser"; - maintainers = with maintainers; [ koral ]; - license = licenses.gpl2Plus; - }; - }; - + fastimport = callPackage ../development/python-modules/fastimport { }; + feedgen = callPackage ../development/python-modules/feedgen { }; feedgenerator = callPackage ../development/python-modules/feedgenerator { From fe68ba81d28b1a8294d7c648022e3d9754d9c217 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Thu, 19 Oct 2017 19:36:29 -0500 Subject: [PATCH 309/361] sage: 6.8 -> 8.0 This "un-breaks" sage while also updating it to 8.0. It compiles sage with its dependencies as one big pile, which is not the best approach but definately better than nothing for now. To be able to shrink the huge output pile a little, it also splits docs from the rest of the output. --- lib/maintainers.nix | 1 + .../science/math/sage/default.nix | 173 ++++++++++++++++-- pkgs/applications/science/math/sage/env.patch | 22 +++ .../science/math/sage/fetch-mirrors.sh | 11 ++ .../science/math/sage/spkg-giac.patch | 11 ++ .../science/math/sage/spkg-git.patch | 14 +- .../science/math/sage/spkg-python.patch | 11 -- .../science/math/sage/spkg-python2.patch | 12 ++ .../science/math/sage/spkg-python3.patch | 12 ++ .../science/math/sage/spkg-singular.patch | 36 +--- 10 files changed, 244 insertions(+), 59 deletions(-) create mode 100644 pkgs/applications/science/math/sage/env.patch create mode 100755 pkgs/applications/science/math/sage/fetch-mirrors.sh create mode 100644 pkgs/applications/science/math/sage/spkg-giac.patch delete mode 100644 pkgs/applications/science/math/sage/spkg-python.patch create mode 100644 pkgs/applications/science/math/sage/spkg-python2.patch create mode 100644 pkgs/applications/science/math/sage/spkg-python3.patch diff --git a/lib/maintainers.nix b/lib/maintainers.nix index e2d3c73301b..a1a6d36b698 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -627,6 +627,7 @@ ThomasMader = "Thomas Mader "; thoughtpolice = "Austin Seipp "; timbertson = "Tim Cuthbertson "; + timokau = "Timo Kaufmann "; titanous = "Jonathan Rudenberg "; tnias = "Philipp Bartsch "; tohl = "Tomas Hlavaty "; diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix index bf3c7fcea98..c1b5484da0f 100644 --- a/pkgs/applications/science/math/sage/default.nix +++ b/pkgs/applications/science/math/sage/default.nix @@ -1,42 +1,183 @@ -{ stdenv, fetchurl, m4, perl, gfortran, texlive, ffmpeg, tk, gnused_422 -, imagemagick, liblapack, python, openssl, libpng +# TODO +# - consider writing a script to convert spkgs to nix packages, similar to vim +# or cabal2nix. This would allow a more efficient and "cleaner" build, greater +# flexibility and the possibility to select which dependencies to add and which +# to remove. It would also allow to use system packages for some dependencies +# and recompile others (optimized for the system) without recompiling everything. +# - add optdeps: +# - imagemagick +# - texlive full for documentation +# - ... +# - further seperate build outputs. Also maybe run `make doc`. +# Configure flags like --bindir and --libdir oculd also be used for that, see +# ./configure --help`. + +# Other resources: +# - https://wiki.debian.org/DebianScience/Sage +# - https://github.com/cschwan/sage-on-gentoo +# - https://git.archlinux.org/svntogit/community.git/tree/trunk?h=packages/sagemath + +{ stdenv +, fetchurl +, perl +, gfortran +, python +, autoreconfHook +, gettext , which +, texlive +, hevea }: stdenv.mkDerivation rec { - name = "sage-6.8"; + version = "8.0"; + name = "sage-${version}"; src = fetchurl { - url = "http://old.files.sagemath.org/src-old/${name}.tar.gz"; - sha256 = "102mrzzi215g1xn5zgcv501x9sghwg758jagx2jixvg1rj2jijj9"; - + # Note that the source is *not* fetched from github, since that doesn't + # the upstream folder with all the source tarballs of the spkgs. + # If those are not present they are fetched at build time, which breaks + # when building in a sandbox (and probably only works if you install the + # latest sage version). + urls = [ + "http://mirrors.mit.edu/sage/src/sage-${version}.tar.gz" + "ftp://ftp.fu-berlin.de/unix/misc/sage/src/sage-${version}.tar.gz" + "http://sagemath.polytechnic.edu.na/src/sage-${version}.tar.gz" + "ftp://ftp.sun.ac.za/pub/mirrors/www.sagemath.org/src/sage-${version}.tar.gz" + "http://sagemath.mirror.ac.za/src/sage-${version}.tar.gz" + "http://ftp.leg.uct.ac.za/pub/packages/sage/src/sage-${version}.tar.gz" + "http://mirror.ufs.ac.za/sagemath/src/sage-${version}.tar.gz" + "http://mirrors-usa.go-parts.com/sage/sagemath/src/sage-${version}.tar.gz" + "http://www.cecm.sfu.ca/sage/src/sage-${version}.tar.gz" + "http://files.sagemath.org/src/sage-${version}.tar.gz" + "http://mirrors.xmission.com/sage/src/sage-${version}.tar.gz" + "http://sagemath.c3sl.ufpr.br/src/sage-${version}.tar.gz" + "http://linorg.usp.br/sage/src/sage-${version}.tar.gz" + "http://mirror.hust.edu.cn/sagemath/src/sage-${version}.tar.gz" + "http://ftp.iitm.ac.in/sage/src/sage-${version}.tar.gz" + "http://ftp.kaist.ac.kr/sage/src/sage-${version}.tar.gz" + "http://ftp.riken.jp/sagemath/src/sage-${version}.tar.gz" + "http://mirrors.tuna.tsinghua.edu.cn/sagemath/src/sage-${version}.tar.gz" + "http://mirrors.ustc.edu.cn/sagemath/src/sage-${version}.tar.gz" + "http://ftp.tsukuba.wide.ad.jp/software/sage/src/sage-${version}.tar.gz" + "http://ftp.yz.yamagata-u.ac.jp/pub/math/sage/src/sage-${version}.tar.gz" + "http://mirror.yandex.ru/mirrors/sage.math.washington.edu/src/sage-${version}.tar.gz" + "http://mirror.aarnet.edu.au/pub/sage/src/sage-${version}.tar.gz" + "http://sage.mirror.garr.it/mirrors/sage/src/sage-${version}.tar.gz" + "http://www.mirrorservice.org/sites/www.sagemath.org/src/sage-${version}.tar.gz" + "http://mirror.switch.ch/mirror/sagemath/src/sage-${version}.tar.gz" + "https://mirrors.up.pt/pub/sage/src/sage-${version}.tar.gz" + "http://www-ftp.lip6.fr/pub/math/sagemath/src/sage-${version}.tar.gz" + "http://ftp.ntua.gr/pub/sagemath/src/sage-${version}.tar.gz" + ]; + sha256 = "1a9rhb8jby6fdqa2s7n2fl9jwqqlsl7qz7dbpbwvg6jwlrvni7fg"; }; - buildInputs = [ m4 perl gfortran texlive.combined.scheme-basic ffmpeg gnused_422 tk imagemagick liblapack - python openssl libpng which ]; + postPatch = '' + substituteAllInPlace src/bin/sage-env + ''; - patches = [ ./spkg-singular.patch ./spkg-python.patch ./spkg-git.patch ]; + installPhase = '' + # Sage installs during first `make`, `make install` is no-op and just takes time. + ''; + + outputs = [ "out" "doc" ]; + + buildInputs = [ + perl # needed for the build + python # needed for the build + gfortran # needed to build giac + autoreconfHook # needed to configure sage with prefix + gettext # needed to build the singular spkg + hevea # needed to build the docs of the giac spkg + which # needed in configure of mpir + # needed to build the docs of the giac spkg + (texlive.combine { inherit (texlive) + scheme-basic + collection-pstricks # needed by giac + times # font needed by giac + stmaryrd # needed by giac + babel-greek # optional for giac, otherwise throws a bunch of latex command not founds + ; + }) + ]; + + patches = [ + # fix usages of /bin/rm + ./spkg-singular.patch + # help python find the crypt library + ./spkg-python2.patch + ./spkg-python3.patch + # fix usages of /usr/bin/perl + ./spkg-git.patch + # fix usages of /bin/cp and add necessary argument to function call + ./spkg-giac.patch + # environment + ./env.patch + ]; enableParallelBuilding = true; - hardeningDisable = [ "format" ]; + hardeningDisable = [ + "format" # needed to build palp, for lines like `printf(ctime(&_NFL->TIME))` + # TODO could be patched with `sed s|printf(ctime(\(.*\)))|%s... or fixed upstream + ]; preConfigure = '' export SAGE_NUM_THREADS=$NIX_BUILD_CORES export SAGE_ATLAS_ARCH=fast - mkdir -p $out/sageHome - export HOME=$out/sageHome - export CPPFLAGS="-P" + + export HOME=$out/sage-home + mkdir -p $out/sage-home + + mkdir -p "$out" + + # we need to keep the source around + dir="$PWD" + cd .. + mv "$dir" "$out/sage-root" + + cd "$out/sage-root" # build in target dir, since `make` is also `make install` ''; - preBuild = "patchShebangs build"; + # for reference: http://doc.sagemath.org/html/en/installation/source.html + preBuild = '' + # TODO do this conditionally + export SAGE_SPKG_INSTALL_DOCS='no' + patchShebangs build + ''; - installPhase = ''DESTDIR=$out make install''; + postBuild = '' + rm -r "$out/sage-root/upstream" # don't keep the sources of all the spkgs + rm -r "$out/sage-root/src/build" + rm -rf "$out/sage-root/src/.git" + rm -r "$out/sage-root/logs" + # Fix dependency cycle between out and doc + rm -f "$out/sage-root/config.status" + rm -f "$out/sage-root/build/make/Makefile-auto" + rm -f "$out/sage-home/.sage/gap/libgap-workspace-"* + ''; + + # TODO there are some doctest failures, which seem harmless. + # We should figure out a way to fix the failures or ignore only those tests. + doCheck = false; + + checkTarget = "ptestalllong"; # all long tests in parallell + preCheck = '' + export SAGE_TIMEOUT=0 # no timeout + export SAGE_TIMEOUT_LONG=0 # no timeout + ''; meta = { homepage = http://www.sagemath.org; description = "A free open source mathematics software system"; + # taken from the homepage + longDescription = '' + SageMath is a free open-source mathematics software system licensed under the GPL. It builds on top of many existing open-source packages: NumPy, SciPy, matplotlib, Sympy, Maxima, GAP, FLINT, R and many more. Access their combined power through a common, Python-based language or directly via interfaces or wrappers. + Mission: Creating a viable free open source alternative to Magma, Maple, Mathematica and Matlab. + ''; license = stdenv.lib.licenses.gpl2Plus; - broken = true; + platforms = stdenv.lib.platforms.all; + maintainers = with stdenv.lib.maintainers; [ timokau ]; }; } diff --git a/pkgs/applications/science/math/sage/env.patch b/pkgs/applications/science/math/sage/env.patch new file mode 100644 index 00000000000..a7f8538eac3 --- /dev/null +++ b/pkgs/applications/science/math/sage/env.patch @@ -0,0 +1,22 @@ +diff --git a/src/bin/sage-env b/src/bin/sage-env +index ead308f861..ed8db9f9b7 100644 +--- a/src/bin/sage-env ++++ b/src/bin/sage-env +@@ -111,6 +111,8 @@ resolvelinks() { + } + + ++SAGE_ROOT="@out@/sage-root" ++ + # New value for SAGE_ROOT: either SAGE_ROOT (if given) + # or a guessed value based on pwd. + if [ -n "$SAGE_ROOT" ]; then +@@ -185,6 +187,8 @@ fi + export SAGE_ENV_SOURCED=$SAGE_ENV_VERSION + + export SAGE_ROOT="$NEW_SAGE_ROOT" ++export SAGE_LOCAL='@out@/' ++export PYTHONPATH="@out@/lib/python2.7/site-packages:$PYTHONPATH" + + + # sage-env must know where the Sage's script files are. diff --git a/pkgs/applications/science/math/sage/fetch-mirrors.sh b/pkgs/applications/science/math/sage/fetch-mirrors.sh new file mode 100755 index 00000000000..a1103e86beb --- /dev/null +++ b/pkgs/applications/science/math/sage/fetch-mirrors.sh @@ -0,0 +1,11 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i bash -p curl go-pup + +# Fetches a list of all available source mirrors from the sage homepage. +# Note that the list is sorted by country, but fetchurl doesn't offer an option +# to customize mirror preference. + +curl -s http://www.sagemath.org/download-source.html \ + | pup 'table#mirror' \ + | pup 'a attr{href}' \ + | sed -e 's/index\.html/sage-${version}.tar.gz/' diff --git a/pkgs/applications/science/math/sage/spkg-giac.patch b/pkgs/applications/science/math/sage/spkg-giac.patch new file mode 100644 index 00000000000..15b91433d25 --- /dev/null +++ b/pkgs/applications/science/math/sage/spkg-giac.patch @@ -0,0 +1,11 @@ +--- old/build/pkgs/giac/spkg-install 2017-07-21 14:10:00.000000000 -0500 ++++ new/build/pkgs/giac/spkg-install 2017-10-15 15:55:55.321237645 -0500 +@@ -4,6 +4,8 @@ + ## Giac + ########################################### + ++find . -type f -exec sed -e 's@/bin/cp@cp@g' -i '{}' ';' && echo "Patching input parser" && find . -iname 'input_parser.cc' ++sed -e 's@yylex (&yylval)@yylex (\&yyval, scanner)@gp' -i 'src/src/input_parser.cc' + + if [ "$SAGE_LOCAL" = "" ]; then + echo "SAGE_LOCAL undefined ... exiting"; diff --git a/pkgs/applications/science/math/sage/spkg-git.patch b/pkgs/applications/science/math/sage/spkg-git.patch index a3e768a7c24..ff9a7b2e491 100644 --- a/pkgs/applications/science/math/sage/spkg-git.patch +++ b/pkgs/applications/science/math/sage/spkg-git.patch @@ -1,10 +1,12 @@ ---- old/build/pkgs/git/spkg-install 2015-07-26 15:34:43.000000000 +0200 -+++ new/build/pkgs/git/spkg-install 2015-09-17 08:28:03.586657451 +0200 -@@ -45,6 +45,8 @@ - fi - done +diff --git a/build/pkgs/git/spkg-install b/build/pkgs/git/spkg-install +index 8469cb58c2..d0dc9a1db9 100755 +--- a/build/pkgs/git/spkg-install ++++ b/build/pkgs/git/spkg-install +@@ -35,6 +35,8 @@ fi -+find . -exec sed -e 's@/usr/bin/perl@perl@g' -i '{}' ';' + cd src + ++find . -type f -exec sed -e 's@/usr/bin/perl@perl@g' -i '{}' ';' + # We don't want to think about Fink or Macports export NO_FINK=1 diff --git a/pkgs/applications/science/math/sage/spkg-python.patch b/pkgs/applications/science/math/sage/spkg-python.patch deleted file mode 100644 index 4db9427e3e0..00000000000 --- a/pkgs/applications/science/math/sage/spkg-python.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- old/build/pkgs/python2/spkg-install 2015-07-26 15:34:43.000000000 +0200 -+++ new/build/pkgs/python2/spkg-install 2015-09-16 20:48:51.904555797 +0200 -@@ -32,7 +32,7 @@ - done - - # We are setting LDFLAGS so that we pick up Sage's readline --LDFLAGS="-L$SAGE_LOCAL/lib $LDFLAGS" -+LDFLAGS="-L$SAGE_LOCAL/lib -lcrypt $LDFLAGS" - export LDFLAGS - - if [ "$SAGE_DEBUG" = "yes" ]; then diff --git a/pkgs/applications/science/math/sage/spkg-python2.patch b/pkgs/applications/science/math/sage/spkg-python2.patch new file mode 100644 index 00000000000..5d92d3f8bea --- /dev/null +++ b/pkgs/applications/science/math/sage/spkg-python2.patch @@ -0,0 +1,12 @@ +--- old/build/pkgs/python2/spkg-install 2017-07-21 14:10:00.000000000 -0500 ++++ new/build/pkgs/python2/spkg-install 2017-10-15 11:26:54.823134067 -0500 +@@ -22,6 +22,9 @@ + + cd src + ++LDFLAGS="-lcrypt $LDFLAGS" ++export LDFLAGS ++ + if [ "$SAGE_DEBUG" = "yes" ]; then + echo "Building Python with pydebug" + PYTHON_CONFIGURE="$PYTHON_CONFIGURE --with-pydebug" diff --git a/pkgs/applications/science/math/sage/spkg-python3.patch b/pkgs/applications/science/math/sage/spkg-python3.patch new file mode 100644 index 00000000000..51827fd11be --- /dev/null +++ b/pkgs/applications/science/math/sage/spkg-python3.patch @@ -0,0 +1,12 @@ +--- old/build/pkgs/python3/spkg-install 2017-07-21 14:10:00.000000000 -0500 ++++ new/build/pkgs/python3/spkg-install 2017-10-15 13:11:17.769261404 -0500 +@@ -22,6 +22,9 @@ + + cd src + ++LDFLAGS="-lcrypt $LDFLAGS" ++export LDFLAGS ++ + if [ "$SAGE_DEBUG" = "yes" ]; then + echo "Building Python with pydebug" + PYTHON_CONFIGURE="$PYTHON_CONFIGURE --with-pydebug" diff --git a/pkgs/applications/science/math/sage/spkg-singular.patch b/pkgs/applications/science/math/sage/spkg-singular.patch index a4c29825a4c..d561768600b 100644 --- a/pkgs/applications/science/math/sage/spkg-singular.patch +++ b/pkgs/applications/science/math/sage/spkg-singular.patch @@ -1,28 +1,12 @@ ---- old/build/pkgs/singular/spkg-install 2015-07-26 15:34:43.000000000 +0200 -+++ new/build/pkgs/singular/spkg-install 2015-09-15 20:42:51.716505855 +0200 -@@ -115,6 +115,11 @@ - done - } +--- old/build/pkgs/singular/spkg-install 2017-10-15 10:35:41.826540964 -0500 ++++ new/build/pkgs/singular/spkg-install 2017-10-15 10:36:40.613743443 -0500 +@@ -4,6 +4,9 @@ + ## Singular + ########################################### -+nix_nuke_bin_rm() -+{ -+ find . -exec sed -e 's@/bin/rm@rm@g' -i '{}' ';' -+} ++find . -type f -exec sed -e 's@/bin/rm@rm@g' -i '{}' ';' ++#echo '#!/usr/bin/env bash\nIgnoring missing $1' > src/build-aux/missing + - remove_old_version() - { - rm -f "$SAGE_LOCAL"/bin/Singular* -@@ -306,11 +311,11 @@ - - - # Actually run all the functions defined above --for i in choose_patches apply_patches remove_old_version config \ -+for i in choose_patches apply_patches nix_nuke_bin_rm remove_old_version config \ - build_singular build_libsingular build_factory build_libfac \ - create_singular_script install_docs ; do - echo "### Singular spkg-install: $i ###" -- cd "$SRC" && $i -+ cd "$SRC" && pwd && $i - if [ $? -ne 0 ]; then - echo >&2 "Error building Singular (error in $i)." - exit 1 + if [ -z "$SAGE_LOCAL" ]; then + echo >&2 "Error: SAGE_LOCAL undefined -- exiting..." + echo >&2 "Maybe run 'sage -sh'?" From 3a53ddd6933f76be8dadefd82a404caae5931b83 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 6 Nov 2017 08:21:45 +0800 Subject: [PATCH 310/361] sshguard: 2.0.0 -> 2.1.0 --- pkgs/tools/security/sshguard/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/security/sshguard/default.nix b/pkgs/tools/security/sshguard/default.nix index bb165e53c73..6db16c95fc8 100644 --- a/pkgs/tools/security/sshguard/default.nix +++ b/pkgs/tools/security/sshguard/default.nix @@ -1,13 +1,12 @@ { stdenv, fetchurl, autoreconfHook, yacc, flex}: - stdenv.mkDerivation rec { - version = "2.0.0"; + version = "2.1.0"; name = "sshguard-${version}"; src = fetchurl { - url = "mirror://sourceforge/sshguard/sshguard-2.0.0.tar.gz"; - sha256 = "e87c6c4a6dddf06f440ea76464eb6197869c0293f0a60ffa51f8a6a0d7b0cb06"; + url = "mirror://sourceforge/sshguard/${name}.tar.gz"; + sha256 = "12h2rx40lf3p3kgazmgakkgajjk2d3sdvr2f73ghi15d6i42l991"; }; doCheck = true; @@ -16,8 +15,6 @@ stdenv.mkDerivation rec { configureFlags = [ "--sysconfdir=/etc" ]; - patches = [ ./0001-Remove-the-unnecessary-from-ipset-cmds.patch ]; - meta = with stdenv.lib; { description = "SSHGuard protects hosts from brute-force attacks"; longDescription = '' From 0cc1cf74075daaf0e510a108e1e88379fa794278 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Sun, 5 Nov 2017 18:16:48 -0600 Subject: [PATCH 311/361] qutebrowser: 1.0.2 -> 1.0.3 --- .../networking/browsers/qutebrowser/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index da3c826adcd..4f0e891dc49 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -28,13 +28,14 @@ let }; in buildPythonApplication rec { - name = "qutebrowser-${version}"; - version = "1.0.2"; + name = "qutebrowser-${version}${fix_postfix}"; + fix_postfix = "-1"; + version = "1.0.3"; namePrefix = ""; src = fetchurl { - url = "https://github.com/The-Compiler/qutebrowser/releases/download/v${version}/${name}.tar.gz"; - sha256 = "093nmvl9x3ykrpmvnmx98g9npg4wmq0mmf7qzgbzmg93dnyq2cpk"; + url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${name}.tar.gz"; + sha256 = "04d6hg2yf2wjwn0sd05bpx3zngnb93g7rizbdq17bbpmnwxchzap"; }; # Needs tox From 85eac6ff730d33c50d6ca02b42d34d2aba4ef641 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 6 Nov 2017 01:25:04 +0000 Subject: [PATCH 312/361] Restrict platforms to what is known to work. --- pkgs/applications/science/math/sage/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix index c1b5484da0f..24dc4436b0f 100644 --- a/pkgs/applications/science/math/sage/default.nix +++ b/pkgs/applications/science/math/sage/default.nix @@ -177,7 +177,7 @@ stdenv.mkDerivation rec { Mission: Creating a viable free open source alternative to Magma, Maple, Mathematica and Matlab. ''; license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ timokau ]; }; } From 0711fe96f2005064c55d4f2e9cbb8baca8646dff Mon Sep 17 00:00:00 2001 From: Sean Zicari Date: Sun, 5 Nov 2017 19:55:23 -0600 Subject: [PATCH 313/361] xosview2: init at 2.2.2 (#30629) --- lib/maintainers.nix | 1 + pkgs/tools/X11/xosview2/default.nix | 41 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 44 insertions(+) create mode 100644 pkgs/tools/X11/xosview2/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index d6031330b4f..45f7f8f51d1 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -566,6 +566,7 @@ schristo = "Scott Christopher "; scolobb = "Sergiu Ivanov "; sdll = "Sasha Illarionov "; + SeanZicari = "Sean Zicari "; sepi = "Raffael Mancini "; seppeljordan = "Sebastian Jordan "; shanemikel = "Shane Pearlman "; diff --git a/pkgs/tools/X11/xosview2/default.nix b/pkgs/tools/X11/xosview2/default.nix new file mode 100644 index 00000000000..3850a6b022e --- /dev/null +++ b/pkgs/tools/X11/xosview2/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, libX11 }: + +stdenv.mkDerivation rec { + name = "xosview2-${version}"; + version = "2.2.2"; + + src = fetchurl { + url = "mirror://sourceforge.net/xosview/${name}.tar.gz"; + sha256 = "3502e119a5305ff2396f559340132910807351c7d4e375f13b5c338404990406"; + }; + + # The software failed to buid with this enabled; it seemed tests were not implemented + doCheck = false; + + buildInputs = [ libX11 ]; + + meta = with stdenv.lib; { + description = "Lightweight program that gathers information from your operating system and displays it in graphical form"; + longDescription = '' + xosview is a lightweight program that gathers information from your + operating system and displays it in graphical form. It attempts to show + you in a quick glance an overview of how your system resources are being + utilized. + + It can be configured to be nothing more than a small strip showing a + couple of parameters on a desktop task bar. Or it can display dozens of + meters and rolling graphical charts over your entire screen. + + Since xosview renders all graphics with core X11 drawing methods, you can + run it on one machine and display it on another. This works even if your + other host is an operating system not running an X server inside a + virtual machine running on a physically different host. If you can + connect to it on a network, then you can popup an xosview instance and + monitor what is going on. + ''; + homepage = "http://xosview.sourceforge.net/index.html"; + license = licenses.gpl1; + maintainers = [ maintainers.SeanZicari ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a7e1bd3fe2d..4189496fb0d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19692,6 +19692,8 @@ with pkgs; xosd = callPackage ../misc/xosd { }; + xosview2 = callPackage ../tools/X11/xosview2 { }; + xpad = callPackage ../applications/misc/xpad { inherit (gnome3) gtksourceview; }; From 3d8f6400ecc45a70462a77f6989463b18e75a9ae Mon Sep 17 00:00:00 2001 From: Sean Zicari Date: Sun, 5 Nov 2017 20:09:24 -0600 Subject: [PATCH 314/361] Remove .net from mirror URL. --- pkgs/tools/X11/xosview2/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/X11/xosview2/default.nix b/pkgs/tools/X11/xosview2/default.nix index 3850a6b022e..c8b658d4350 100644 --- a/pkgs/tools/X11/xosview2/default.nix +++ b/pkgs/tools/X11/xosview2/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.2.2"; src = fetchurl { - url = "mirror://sourceforge.net/xosview/${name}.tar.gz"; + url = "mirror://sourceforge/xosview/${name}.tar.gz"; sha256 = "3502e119a5305ff2396f559340132910807351c7d4e375f13b5c338404990406"; }; From 8b0014ae5ac042b2308d5c008513b513e72acbc5 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Fri, 22 Sep 2017 18:48:13 +0800 Subject: [PATCH 315/361] freetds: 0.91 -> 1.00.70 --- .../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..d764121e8d6 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.70"; 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 = "1ydh0c89nb6wh6wakbkqad7mdwpymygvgbcrk8c2mp7abgv1jqzp"; }; - hardeningDisable = [ "format" ]; + configureFlags = [ + "--with-tdsver=7.3" + ]; - 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 762f2ea4b0450bcf90f0ba7a20c8a67f41fd8e0a Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sat, 4 Nov 2017 11:26:29 +0800 Subject: [PATCH 316/361] sqsh: fix build with new freetds --- pkgs/development/tools/sqsh/default.nix | 39 ++++++++++++++----------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/pkgs/development/tools/sqsh/default.nix b/pkgs/development/tools/sqsh/default.nix index c55f76f9b7f..636d8ef7b78 100644 --- a/pkgs/development/tools/sqsh/default.nix +++ b/pkgs/development/tools/sqsh/default.nix @@ -1,33 +1,38 @@ -{ stdenv, fetchurl, freetds, readline }: +{ stdenv, fetchurl, autoreconfHook, freetds, readline }: -stdenv.mkDerivation rec { - version = "2.5.16.1"; +let + mainVersion = "2.5"; + +in stdenv.mkDerivation rec { name = "sqsh-${version}"; + version = "${mainVersion}.16.1"; src = fetchurl { - url = "http://www.mirrorservice.org/sites/downloads.sourceforge.net/s/sq/sqsh/sqsh/sqsh-2.5/${name}.tgz"; + url = "mirror://sourceforge/sqsh/sqsh/sqsh-${mainVersion}/${name}.tgz"; sha256 = "1wi0hdmhk7l8nrz4j3kaa177mmxyklmzhj7sq1gj4q6fb8v1yr6n"; }; - preConfigure = - '' + preConfigure = '' export SYBASE=${freetds} - ''; - buildInputs = [ - freetds - readline - ]; + substituteInPlace src/cmd_connect.c \ + --replace CS_TDS_80 CS_TDS_73 + ''; - meta = { + enableParallelBuilding = true; + + buildInputs = [ freetds readline ]; + + nativeBuildInputs = [ autoreconfHook ]; + + meta = with stdenv.lib; { description = "Command line tool for querying Sybase/MSSQL databases"; - longDescription = - '' + longDescription = '' Sqsh (pronounced skwish) is short for SQshelL (pronounced s-q-shell), it is intended as a replacement for the venerable 'isql' program supplied by Sybase. - ''; - homepage = http://www.cs.washington.edu/~rose/sqsh/sqsh.html; - platforms = stdenv.lib.platforms.all; + ''; + homepage = http://sourceforge.net/projects/sqsh/; + platforms = platforms.all; }; } From 2902e8c5ca3869cf5fe72af7644c76f0d6bab5d9 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sat, 4 Nov 2017 11:51:44 +0800 Subject: [PATCH 317/361] calligra2: broken due to freetds upgrade but we already have calligra 3 --- pkgs/applications/office/calligra/2.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/office/calligra/2.nix b/pkgs/applications/office/calligra/2.nix index 76027f29a70..959a44a35c1 100644 --- a/pkgs/applications/office/calligra/2.nix +++ b/pkgs/applications/office/calligra/2.nix @@ -51,5 +51,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ phreedom ebzzry ]; inherit (kdelibs4.meta) platforms; license = licenses.gpl2; + broken = true; }; } From dd18e063ef681aab4f67454ad385fe4b21331458 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 2 Nov 2017 15:16:24 +0800 Subject: [PATCH 318/361] sqlitebrowser: 3.10.0 -> 3.10.1 and make it work with Qt 5.9 --- .../tools/database/sqlitebrowser/default.nix | 27 ++++++++++++------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/pkgs/development/tools/database/sqlitebrowser/default.nix b/pkgs/development/tools/database/sqlitebrowser/default.nix index adeb377dccd..74adac9f8a3 100644 --- a/pkgs/development/tools/database/sqlitebrowser/default.nix +++ b/pkgs/development/tools/database/sqlitebrowser/default.nix @@ -1,32 +1,39 @@ -{ mkDerivation, lib, fetchFromGitHub, qtbase, qttools, sqlite, cmake }: +{ mkDerivation, lib, fetchFromGitHub, cmake, antlr +, qtbase, qttools, qscintilla, sqlite }: mkDerivation rec { - version = "3.10.0"; + version = "3.10.1"; name = "sqlitebrowser-${version}"; src = fetchFromGitHub { repo = "sqlitebrowser"; owner = "sqlitebrowser"; rev = "v${version}"; - sha256 = "1fwr7p4b6glc3s0a06i7cg8l9p1mrcm4vyhyf2wi89cyg22rrf5c"; + sha256 = "1brzam8yv6sbdmbqsp7vglhd6wlx49g2ap8llr271zrkld4k3kar"; }; - buildInputs = [ qtbase qttools sqlite ]; - nativeBuildInputs = [ cmake ]; + buildInputs = [ qtbase qscintilla sqlite ]; - cmakeFlags = [ "-DUSE_QT5=TRUE" ]; + nativeBuildInputs = [ cmake antlr qttools ]; - # A regression was introduced in CMakeLists.txt on v3.9.x - # See https://github.com/sqlitebrowser/sqlitebrowser/issues/832 and issues/755 + enableParallelBuilding = true; + + # We have to patch out Test and PrintSupport to make this work with Qt 5.9 + # It can go when the application supports 5.9 postPatch = '' - substituteInPlace CMakeLists.txt --replace 'project("DB Browser for SQLite")' 'project(sqlitebrowser)' + substituteInPlace CMakeLists.txt \ + --replace Test "" \ + --replace PrintSupport "" + + substituteInPlace libs/qcustomplot-source/CMakeLists.txt \ + --replace PrintSupport "" ''; meta = with lib; { description = "DB Browser for SQLite"; homepage = http://sqlitebrowser.org/; license = licenses.gpl3; - maintainers = [ maintainers.matthiasbeyer ]; + maintainers = with maintainers; [ matthiasbeyer ]; platforms = platforms.linux; # can only test on linux }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7383df20c0e..56e57ca42bc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7588,7 +7588,7 @@ with pkgs; flex = flex_2_5_35; }; - sqlitebrowser = libsForQt56.callPackage ../development/tools/database/sqlitebrowser { }; + sqlitebrowser = libsForQt5.callPackage ../development/tools/database/sqlitebrowser { }; sselp = callPackage ../tools/X11/sselp{ }; From 4b9e73c6cf03be8da7f36df11ad18f9a7e333128 Mon Sep 17 00:00:00 2001 From: Vaibhav Sagar Date: Sun, 5 Nov 2017 02:22:57 +0800 Subject: [PATCH 319/361] all-cabal-hashes: 2017-10-08T03:25:59Z -> 2017-11-04T17:56:01Z --- 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 14ae22798c2..c3cd9bdb4b3 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -7,8 +7,8 @@ src-spec ? { owner = "commercialhaskell"; repo = "all-cabal-hashes"; - rev = "901c2522e6797270f5ded4495b1a529e6c16ef45"; - sha256 = "05jmwsgrk77nz9vvgfbpsps0l320qgjpkr2c9zhkn9sc3d275lfb"; + rev = "5e87c40f2cd96bd5dd953758e82f302107c7895e"; + sha256 = "12rw5fld64s0a2zjsdijfs0dv6vc6z7gcf24h4m2dmymzms4namg"; } , lib }: From 1a38312dae311561c95c898a0ed7826fc9d989db Mon Sep 17 00:00:00 2001 From: Christopher Singley Date: Mon, 30 Oct 2017 07:13:58 -0500 Subject: [PATCH 320/361] plexpy: add user id --- nixos/modules/misc/ids.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 7d9d9984cf2..beb91a7c150 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -212,6 +212,7 @@ lambdabot = 191; asterisk = 192; plex = 193; + plexpy = 195; grafana = 196; skydns = 197; # ripple-rest = 198; # unused, removed 2017-08-12 From 29c182f2b27e5f8a2e8df92483e26e459d0c6905 Mon Sep 17 00:00:00 2001 From: Richard Wallace Date: Tue, 31 Oct 2017 13:27:48 -0700 Subject: [PATCH 321/361] sbt-extras: make sure which and curl are available in the PATH --- .../development/tools/build-managers/sbt-extras/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/sbt-extras/default.nix b/pkgs/development/tools/build-managers/sbt-extras/default.nix index cd9635ab614..fbbca9a0cfe 100644 --- a/pkgs/development/tools/build-managers/sbt-extras/default.nix +++ b/pkgs/development/tools/build-managers/sbt-extras/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, which, curl, makeWrapper }: let rev = "77686b3dfa20a34270cc52377c8e37c3a461e484"; @@ -17,9 +17,13 @@ stdenv.mkDerivation { dontBuild = true; + buildInputs = [ makeWrapper ]; + installPhase = '' mkdir -p $out/bin install bin/sbt $out/bin + + wrapProgram $out/bin/sbt --prefix PATH : ${stdenv.lib.makeBinPath [ which curl]} ''; meta = { From 03bcadd40c4f47b272791a549b46ff7098307027 Mon Sep 17 00:00:00 2001 From: Jake Waksbaum Date: Mon, 2 Oct 2017 18:10:55 -0400 Subject: [PATCH 322/361] splint: Add darwin support --- pkgs/development/tools/analysis/splint/darwin.patch | 13 +++++++++++++ pkgs/development/tools/analysis/splint/default.nix | 4 ++-- 2 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/tools/analysis/splint/darwin.patch diff --git a/pkgs/development/tools/analysis/splint/darwin.patch b/pkgs/development/tools/analysis/splint/darwin.patch new file mode 100644 index 00000000000..8c435707571 --- /dev/null +++ b/pkgs/development/tools/analysis/splint/darwin.patch @@ -0,0 +1,13 @@ +diff --git a/src/osd.c b/src/osd.c +index ebe214a..4ba81d5 100644 +--- a/src/osd.c ++++ b/src/osd.c +@@ -516,7 +516,7 @@ osd_getPid () + # if defined (WIN32) || defined (OS2) && defined (__IBMC__) + int pid = _getpid (); + # else +- __pid_t pid = getpid (); ++ pid_t pid = getpid (); + # endif + + return (int) pid; diff --git a/pkgs/development/tools/analysis/splint/default.nix b/pkgs/development/tools/analysis/splint/default.nix index e8a056bca5a..2d6129dd376 100644 --- a/pkgs/development/tools/analysis/splint/default.nix +++ b/pkgs/development/tools/analysis/splint/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "02pv8kscsrkrzip9r08pfs9xs98q74c52mlxzbii6cv6vx1vd3f7"; }; - patches = [ ./tmpdir.patch ]; + patches = [ ./tmpdir.patch ] ++ stdenv.lib.optional stdenv.isDarwin ./darwin.patch; buildInputs = [ flex ]; @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl2Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; } From a1449ea180d34622340f7523fb8a6b4a7f3b545b Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 5 Nov 2017 08:39:59 +0000 Subject: [PATCH 323/361] omake: 0.10.2 -> 0.10.3 --- pkgs/development/tools/ocaml/omake/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/ocaml/omake/default.nix b/pkgs/development/tools/ocaml/omake/default.nix index 93d96005d35..0f536c489eb 100644 --- a/pkgs/development/tools/ocaml/omake/default.nix +++ b/pkgs/development/tools/ocaml/omake/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "omake-${version}"; - version = "0.10.2"; + version = "0.10.3"; src = fetchurl { url = "http://download.camlcity.org/download/${name}.tar.gz"; - sha256 = "1znnlkpz89hk44byvnl1pr92ym6hwfyyw2qm9clq446r6l2z4m64"; + sha256 = "07bdg1h5i7qnlv9xq81ad5hfypl10hxm771h4rjyl5cn8plhfcgz"; }; buildInputs = [ ocaml ncurses ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4189496fb0d..d58ecda7135 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7426,9 +7426,7 @@ with pkgs; obuild = callPackage ../development/tools/ocaml/obuild { }; - omake = callPackage ../development/tools/ocaml/omake { - inherit (ocamlPackages_4_02) ocaml; - }; + omake = callPackage ../development/tools/ocaml/omake { }; inherit (ocamlPackages) omake_rc1; From 030223237ab88229246d7fbb5dd62602849eb3e7 Mon Sep 17 00:00:00 2001 From: Peter Marheine Date: Mon, 6 Nov 2017 08:33:59 +0000 Subject: [PATCH 324/361] flexget: fix build with updated dependencies --- pkgs/applications/networking/flexget/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 9e5e90996bc..105239aca02 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -24,9 +24,6 @@ buildPythonApplication rec { # unicode-capable filesystem (and setting LC_ALL doesn't work). # setlocale: LC_ALL: cannot change locale (en_US.UTF-8) postPatch = '' - sed -i '/def test_non_ascii/i\ import pytest\ - @pytest.mark.skip' flexget/tests/test_filesystem.py - substituteInPlace requirements.txt \ --replace "chardet==3.0.3" "chardet" \ --replace "rebulk==0.8.2" "rebulk" \ @@ -35,7 +32,13 @@ buildPythonApplication rec { --replace "sqlalchemy==1.1.10" "sqlalchemy" \ --replace "zxcvbn-python==4.4.15" "zxcvbn-python" \ --replace "flask-cors==3.0.2" "flask-cors" \ - --replace "certifi==2017.4.17" "certifi" + --replace "certifi==2017.4.17" "certifi" \ + --replace "apscheduler==3.3.1" "apscheduler" \ + --replace "path.py==10.3.1" "path.py" \ + --replace "tempora==1.8" "tempora" \ + --replace "cheroot==5.5.0" "cheroot" \ + --replace "six==1.10.0" "six" \ + --replace "aniso8601==1.2.1" "aniso8601" ''; checkPhase = '' @@ -47,7 +50,8 @@ buildPythonApplication rec { and not test_double_episodes \ and not test_inject_force \ and not test_double_prefered \ - and not test_double" + and not test_double \ + and not test_non_ascii" ''; buildInputs = [ pytest mock vcrpy pytest-catchlog boto3 ]; From eece8755d1f5da1a5be319edf37c1a6244289010 Mon Sep 17 00:00:00 2001 From: Vaibhav Sagar Date: Mon, 6 Nov 2017 14:29:56 +0800 Subject: [PATCH 325/361] ihaskell: re-enable --- nixos/modules/misc/ids.nix | 4 ++-- nixos/modules/module-list.nix | 2 +- .../tools/haskell/ihaskell/wrapper.nix | 23 ++++++++++--------- pkgs/top-level/all-packages.nix | 12 ++++------ 4 files changed, 20 insertions(+), 21 deletions(-) diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index beb91a7c150..7d0cbf6aad0 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -207,7 +207,7 @@ ripple-data-api = 186; mediatomb = 187; rdnssd = 188; - # ihaskell = 189; # unused + ihaskell = 189; i2p = 190; lambdabot = 191; asterisk = 192; @@ -484,7 +484,7 @@ #ripple-data-api = 186; #unused mediatomb = 187; #rdnssd = 188; # unused - # ihaskell = 189; # unused + ihaskell = 189; i2p = 190; lambdabot = 191; asterisk = 192; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 521e2c0ca24..99d3c0112f2 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -304,7 +304,7 @@ ./services/misc/gogs.nix ./services/misc/gollum.nix ./services/misc/gpsd.nix - #./services/misc/ihaskell.nix + ./services/misc/ihaskell.nix ./services/misc/irkerd.nix ./services/misc/jackett.nix ./services/misc/logkeys.nix diff --git a/pkgs/development/tools/haskell/ihaskell/wrapper.nix b/pkgs/development/tools/haskell/ihaskell/wrapper.nix index f1a4f219682..75ad33e72f6 100644 --- a/pkgs/development/tools/haskell/ihaskell/wrapper.nix +++ b/pkgs/development/tools/haskell/ihaskell/wrapper.nix @@ -1,27 +1,28 @@ -{ stdenv, writeScriptBin, makeWrapper, buildEnv, ghcWithPackages, ihaskell, ipython, packages }: +{ stdenv, writeScriptBin, makeWrapper, buildEnv, haskell, ghcWithPackages, ihaskell, jupyter, packages }: let ihaskellEnv = ghcWithPackages (self: [ self.ihaskell - self.ihaskell-blaze - self.ihaskell-diagrams - self.ihaskell-display + (haskell.lib.doJailbreak self.ihaskell-blaze) + (haskell.lib.doJailbreak self.ihaskell-diagrams) + (haskell.lib.doJailbreak self.ihaskell-display) ] ++ packages self); ihaskellSh = writeScriptBin "ihaskell-notebook" '' #! ${stdenv.shell} export GHC_PACKAGE_PATH="$(echo ${ihaskellEnv}/lib/*/package.conf.d| tr ' ' ':'):$GHC_PACKAGE_PATH" - export PATH="${stdenv.lib.makeBinPath [ ihaskell ihaskellEnv ipython ]}" - ${ihaskell}/bin/ihaskell install -l $(${ihaskellEnv}/bin/ghc --print-libdir) && ${ipython}/bin/ipython notebook --kernel=haskell + export PATH="${stdenv.lib.makeBinPath ([ ihaskell ihaskellEnv jupyter ])}" + ${ihaskell}/bin/ihaskell install -l $(${ihaskellEnv}/bin/ghc --print-libdir) && ${jupyter}/bin/jupyter notebook ''; - profile = "${ihaskell.pname}-${ihaskell.version}/profile/profile.tar"; in buildEnv { name = "ihaskell-with-packages"; - paths = [ ihaskellEnv ipython ]; + buildInputs = [ makeWrapper ]; + paths = [ ihaskellEnv jupyter ]; postBuild = '' - . "${makeWrapper}/nix-support/setup-hook" - ln -s ${ihaskellSh}/bin/ihaskell-notebook $out/bin/. + ln -s ${ihaskellSh}/bin/ihaskell-notebook $out/bin/ for prg in $out/bin"/"*;do - wrapProgram $prg --set PYTHONPATH "$(echo ${ipython}/lib/*/site-packages)" + if [[ -f $prg && -x $prg ]]; then + wrapProgram $prg --set PYTHONPATH "$(echo ${jupyter}/lib/*/site-packages)" + fi done ''; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d58ecda7135..ebb9831d3ff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2684,15 +2684,13 @@ with pkgs; }; - # ihaskell = callPackage ../development/tools/haskell/ihaskell/wrapper.nix { - # inherit (haskellPackages) ihaskell ghcWithPackages; + ihaskell = callPackage ../development/tools/haskell/ihaskell/wrapper.nix { + inherit (haskellPackages) ihaskell ghcWithPackages; - # ipython = python3.buildEnv.override { - # extraLibs = with python3Packages; [ ipython ipykernel jupyter_client notebook ]; - # }; + jupyter = python3.withPackages (ps: [ ps.jupyter ps.notebook ]); - # packages = config.ihaskell.packages or (self: []); - # }; + packages = config.ihaskell.packages or (self: []); + }; imapproxy = callPackage ../tools/networking/imapproxy { }; From 0af15f6f45b88aeb6f4e2f237d9f2e98adf007f8 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Mon, 6 Nov 2017 17:20:23 +0800 Subject: [PATCH 326/361] firejail: 0.9.48 -> 0.9.50 --- pkgs/os-specific/linux/firejail/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix index 9230e6920f9..5ee8ab564b0 100644 --- a/pkgs/os-specific/linux/firejail/default.nix +++ b/pkgs/os-specific/linux/firejail/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="firejail"; - version="0.9.48"; + version="0.9.50"; name="${baseName}-${version}"; - hash="02a74nx8p2gbpd6ffnr52p02pxxllw3yy5fy4083a77r3wia8zb3"; - url="https://vorboss.dl.sourceforge.net/project/firejail/firejail/firejail-0.9.48.tar.xz"; - sha256="02a74nx8p2gbpd6ffnr52p02pxxllw3yy5fy4083a77r3wia8zb3"; + hash="005q7f1h7z4c1wg8vzb1zh0xi4msz6z0fcph0y3ywhlbxjvpam61"; + url="https://vorboss.dl.sourceforge.net/project/firejail/firejail/firejail-0.9.50.tar.xz"; + sha256="005q7f1h7z4c1wg8vzb1zh0xi4msz6z0fcph0y3ywhlbxjvpam61"; }; buildInputs = [ which From 7100c1a0e02cca0259c33ed0bd2d96263ae233f0 Mon Sep 17 00:00:00 2001 From: Antoine Eiche Date: Mon, 6 Nov 2017 10:26:55 +0100 Subject: [PATCH 327/361] pythonPackages.devpi_common: remove one test --- pkgs/development/python-modules/devpi-common/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/devpi-common/default.nix b/pkgs/development/python-modules/devpi-common/default.nix index 082f2baeceb..67f8debc43a 100644 --- a/pkgs/development/python-modules/devpi-common/default.nix +++ b/pkgs/development/python-modules/devpi-common/default.nix @@ -14,6 +14,8 @@ with pythonPackages;buildPythonPackage rec { checkInputs = [ pytest ]; checkPhase = '' + # Don't know why this test is failing! + substituteInPlace testing/test_request.py --replace "test_env" "noop_test_env" py.test ''; From a0f01a5f0b1dc7d0bd1794ea93380600f44e6a51 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 6 Nov 2017 10:48:09 +0100 Subject: [PATCH 328/361] bitcoin-abc: 0.15.0 -> 0.16.0 --- pkgs/applications/altcoins/bitcoin-abc.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/altcoins/bitcoin-abc.nix b/pkgs/applications/altcoins/bitcoin-abc.nix index a113aadcd62..011e3cd7c87 100644 --- a/pkgs/applications/altcoins/bitcoin-abc.nix +++ b/pkgs/applications/altcoins/bitcoin-abc.nix @@ -7,13 +7,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "bitcoin" + (toString (optional (!withGui) "d")) + "-abc-" + version; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "bitcoin-ABC"; repo = "bitcoin-abc"; rev = "v${version}"; - sha256 = "1fygn6cc99iasg5g5jyps5ps873hfnn4ln4hsmcwlwiqd591qxyv"; + sha256 = "0wwcgvd8zgl5qh6z1sa3kdv1lr9cwwbs9j2gaad5mqr9sfwbbxdh"; }; patches = [ ./fix-bitcoin-qt-build.patch ]; From a5eaa1cfea3585e16fab1a47f823be43245dfeba Mon Sep 17 00:00:00 2001 From: dywedir Date: Mon, 6 Nov 2017 12:15:33 +0200 Subject: [PATCH 329/361] feh: 2.21 -> 2.22 --- 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 f68162de4e3..88dc24a97fa 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.21"; + version = "2.22"; src = fetchurl { url = "https://feh.finalrewind.org/${name}.tar.bz2"; - sha256 = "0azgpr4al2pi4858z4xh4lfz84cvzxw3n426fn7rz6cdj34q212j"; + sha256 = "0yqcczb9c126zgfvjq2fpzqz0rg16yad8mfr3gryxwlbymy2cmxj"; }; outputs = [ "out" "man" "doc" ]; From 8c4dc462af8c54132eed73bf5e8f50126154fc25 Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Mon, 6 Nov 2017 10:44:19 +0000 Subject: [PATCH 330/361] vim-plugins: update command no longer requires user input --- 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 eab2efbb6be..e821ce123f1 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 -I nixpkgs=/path/to/your/local/fork -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 Date: Mon, 6 Nov 2017 11:13:56 +0000 Subject: [PATCH 331/361] vimPlugins.command-t: 2017-06-23 -> 2017-09-29 --- pkgs/misc/vim-plugins/default.nix | 15 +++++++-------- .../vim2nix/additional-nix-code/command-t | 7 +++---- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index e821ce123f1..5d4adaaad9e 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -3,7 +3,7 @@ , which, fetchgit, llvmPackages , xkb_switch, rustracerd, fzf , python3, boost, icu -, ycmd +, ycmd, makeWrapper, rake , pythonPackages, python3Packages , Cocoa ? null, git }: @@ -1903,18 +1903,17 @@ rec { }; command-t = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "command-t-2017-06-23"; + name = "command-t-2017-09-29"; src = fetchgit { url = "https://github.com/wincent/command-t"; - rev = "29f2606a9665058a98b56f2d8062ba614a3f246e"; - sha256 = "0q6kqjy88w1478k2q6vqyyid69whd72746i0cd33xnslgykwm2hn"; + rev = "c5882de56f0ca3ce8e891c434f192519aca5c7bb"; + sha256 = "0dbghh7fwy49zyjick7840dkbybqchjw2sg9c6p0kmp5w3j46b92"; }; dependencies = []; - buildInputs = [ perl ruby git ]; + buildInputs = [ ruby rake ]; buildPhase = '' - pushd ruby/command-t - gem build ./command-t.gemspec - popd + rake make + rm ruby/command-t/ext/command-t/*.o ''; }; diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/command-t b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/command-t index 5c96e11de7a..f850425cba7 100644 --- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/command-t +++ b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/command-t @@ -1,6 +1,5 @@ - buildInputs = [ perl ruby git ]; + buildInputs = [ ruby rake ]; buildPhase = '' - pushd ruby/command-t - gem build ./command-t.gemspec - popd + rake make + rm ruby/command-t/ext/command-t/*.o ''; From c755d83c4766a9721a00dad8eddff144d9108c21 Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Mon, 6 Nov 2017 11:24:35 +0000 Subject: [PATCH 332/361] vimPlugins: update all --- pkgs/misc/vim-plugins/default.nix | 577 +++++++++++++------------ pkgs/misc/vim-plugins/vim-plugin-names | 1 - 2 files changed, 289 insertions(+), 289 deletions(-) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 5d4adaaad9e..5ce78702148 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -105,6 +105,17 @@ rec { wombat256 = wombat256-vim; # backwards compat, added 2015-7-8 yankring = YankRing; + # do not auto-update this one, as the name clashes with vim-snippets + vim-docbk-snippets = buildVimPluginFrom2Nix { + name = "vim-docbk-snippets-2017-11-02"; + src = fetchgit { + url = "https://github.com/jhradilek/vim-snippets"; + rev = "69cce66defdf131958f152ea7a7b26c21ca9d009"; + sha256 = "1363b2fmv69axrl2hm74dmx51cqd8k7rk116890qllnapzw1zjgc"; + }; + dependencies = []; + }; + fzfWrapper = buildVimPluginFrom2Nix { name = fzf.name; src = fzf.src; @@ -147,11 +158,11 @@ rec { }; Hoogle = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Hoogle-2017-03-01"; + name = "Hoogle-2017-11-04"; src = fetchgit { url = "git://github.com/Twinside/vim-hoogle"; - rev = "cfb0c864dbacf6f916ba05c4a688e21154aa971b"; - sha256 = "0gddyh47gwy684kjs9yxfnc0lg8jq9w5pdyv3yrvypyiqi51vw1b"; + rev = "14256fa4f482bb40f55311a6d8037103549c7844"; + sha256 = "1dhfy9s6q11cb424x595anj17sgsqywdyrcw3ynmk3949iiwaqhb"; }; dependencies = []; @@ -180,11 +191,11 @@ rec { }; Syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Syntastic-2017-07-07"; + name = "Syntastic-2017-11-06"; src = fetchgit { url = "git://github.com/scrooloose/syntastic"; - rev = "e1161a723a353db99780f9a9351340df7abbb106"; - sha256 = "00gvx33yz199n7lynli0fb8cf58lb5cs0jxrqggjjy261xv2lcq1"; + rev = "206b616c8e49f948d18231799c469aa3e6e2c29c"; + sha256 = "0q6k00x2gxd1lryqj80pqd0g9q1nmzz1fxacs81gxhx8c8hpxmcy"; }; dependencies = []; @@ -202,33 +213,33 @@ rec { }; Tagbar = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Tagbar-2017-06-15"; + name = "Tagbar-2017-10-19"; src = fetchgit { url = "git://github.com/majutsushi/tagbar"; - rev = "f5792732de16b8a2cc202f920e363eb413d7241d"; - sha256 = "188xdmrp2g7bfzg95pv1qa2l17sqwy1g2p4syj7546fksddmwgms"; + rev = "dc155af2fdd20e081680d777bde558c56f8d55c3"; + sha256 = "0xicazayayp208qv7ln4shj41favj5a6aysvz29pwqy28svmg3xd"; }; dependencies = []; }; The_NERD_Commenter = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "The_NERD_Commenter-2017-04-07"; + name = "The_NERD_Commenter-2017-10-31"; src = fetchgit { url = "git://github.com/scrooloose/nerdcommenter"; - rev = "285902752f7ab2052ac700a6d29b263dd5788afb"; - sha256 = "1hd5ibpvxra8asr4zp0l68wc4djjgfbvh7kzmxc1r7jqr70wj8dl"; + rev = "63ba1a1123609c9bfb9f5d76debcd34afe429096"; + sha256 = "01aq0n5028kyvjzgb0yrzwnp0r3jiayahmbvkfakg3vw9hgapggr"; }; dependencies = []; }; The_NERD_tree = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "The_NERD_tree-2017-07-17"; + name = "The_NERD_tree-2017-11-02"; src = fetchgit { url = "git://github.com/scrooloose/nerdtree"; - rev = "e2a9929bbea0ec2050f2ea44b7e7bae3ccac66e6"; - sha256 = "03mygl8ic4awx4js04x0nw2l96kjv4vsldkgrdx0n43sh5i4z7nk"; + rev = "97433edd43f3a4a95c84389bcaafbe7a047cf756"; + sha256 = "04z45bs1a37mdck80bcqj3d0bp2zz5xyjkys0zv925mpq9rwx22s"; }; dependencies = []; @@ -246,11 +257,11 @@ rec { }; VimOutliner = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "VimOutliner-2017-05-03"; + name = "VimOutliner-2017-08-02"; src = fetchgit { url = "git://github.com/vimoutliner/vimoutliner"; - rev = "fd2ca709acc161a9e65e75577c2bfefde173401a"; - sha256 = "13cqhajfz6rag7qwj2rws5gjs1f2jlrb2s30kyjrx227i05vikkn"; + rev = "c13141d604959d84225c3a53dc4b0ef5ae8b2bfe"; + sha256 = "1bg45cnpvnk2k7r6l2n3sz0cw2lhrglphak10yp11yqf4q1rxl7x"; }; dependencies = []; @@ -284,11 +295,11 @@ rec { }; clang_complete = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "clang_complete-2017-07-15"; + name = "clang_complete-2017-09-25"; src = fetchgit { url = "git://github.com/Rip-Rip/clang_complete"; - rev = "c41eea05317526a4ddd3bd389f3723390b196d4d"; - sha256 = "0bfalbzhy3n1k8bsvnh6aykgj6d17n6qgi9ahp0d8plvbjjvfw6j"; + rev = "fb8f4f25ab808bc83bc7c704f23171cb6b020737"; + sha256 = "0y80ds4l5gqqdm56ymkgsfpizpx96kzrr0ivx29q7ahd4ry847xa"; }; dependencies = []; # In addition to the arguments you pass to your compiler, you also need to @@ -305,11 +316,11 @@ rec { }; commentary = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "commentary-2017-03-12"; + name = "commentary-2017-10-09"; src = fetchgit { url = "git://github.com/tpope/vim-commentary"; - rev = "be79030b3e8c0ee3c5f45b4333919e4830531e80"; - sha256 = "1msbmbz96wa88ymjvcrbr07mxdrsjy1w2hl7z4pihf318ryq98cm"; + rev = "89f43af18692d22ed999c3097e449f12fdd8b299"; + sha256 = "0nqm4s00c607r58fz29n67r2z5p5r9qayl5y1chy8bcrl59m17a2"; }; dependencies = []; @@ -331,11 +342,11 @@ rec { }; ctrlp-py-matcher = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ctrlp-py-matcher-2017-01-05"; + name = "ctrlp-py-matcher-2017-11-01"; src = fetchgit { url = "git://github.com/FelikZ/ctrlp-py-matcher"; - rev = "a0710a4937ab9dc10bc0a8b56b41fcc88534147c"; - sha256 = "198y8998sx2maarn2vawx8hqldsfbnn4i6rlg56qw6brsrssssx2"; + rev = "cf63fd546f1e80dd4db3db96afbeaad301d21f13"; + sha256 = "0hs829x3vxv12y78hz5g4a5qpw05xf42dk0hxxk3ind77mnl1ir1"; }; dependencies = []; @@ -364,11 +375,11 @@ rec { }; fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "fugitive-2017-07-12"; + name = "fugitive-2017-10-21"; src = fetchgit { url = "git://github.com/tpope/vim-fugitive"; - rev = "913fff1cea3aa1a08a360a494fa05555e59147f5"; - sha256 = "1qxzxk5szm25r7wi39n5s91fjnjgz5xib67risjcwhk6jdv0vzyd"; + rev = "7c9b87a3c3ef4b53425aca4a27e11a7359caae9f"; + sha256 = "1kpgnn3pmy82kqy9vcvd1vi9jjmfj03p4606pvh42ky4y0m0qmms"; }; dependencies = []; @@ -397,11 +408,11 @@ rec { }; vim-autoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-autoformat-2017-06-26"; + name = "vim-autoformat-2017-10-23"; src = fetchgit { url = "https://github.com/Chiel92/vim-autoformat"; - rev = "ad189cdde5a50699a1d6b2b4b669e73942e47710"; - sha256 = "0jk1qigvz2xkpr13ii0pg0nszrnzwn51gckxjvgaqwbsz967ccsj"; + rev = "c32b27cd4059770ff6f4639082b69e76ada948bd"; + sha256 = "1sy1bjrk560qww97538m883r8gkmfl114lbp68gdl0j48fdhmh78"; }; dependencies = []; @@ -419,22 +430,22 @@ rec { }; tsuquyomi = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "tsuquyomi-2017-05-31"; + name = "tsuquyomi-2017-11-01"; src = fetchgit { url = "https://github.com/Quramy/tsuquyomi"; - rev = "46dfcd72b9701a52331349ba0d5c7596167093ab"; - sha256 = "12rvkc3wf959siijrgld56xvfhgacglxb69z4q567fsjv3ynqnrv"; + rev = "fb5a5fd26bcca3c3a9fcde732b969e34c1ae89ea"; + sha256 = "0pg2w250fksnj168ygkdniryyr4asrr8y5fh2gq2hpyx6wpph7f8"; }; dependencies = []; }; deoplete-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "deoplete-nvim-2017-07-22"; + name = "deoplete-nvim-2017-11-04"; src = fetchgit { url = "https://github.com/Shougo/deoplete.nvim"; - rev = "5cef0e6b607d3acb742d1de07a4ddd3a5bfa3036"; - sha256 = "0mh8zjaw369djffi1vzy124pwnrcxg4pbyjnhy3pq2j6k579znc2"; + rev = "bea8e1c122d31ab6f2dd6f7d9a5b4545d08b2c4f"; + sha256 = "0y88h7w8d3h43yfjkawgn9inkyky5llrk8gmdfax5fqvgjgz4jg9"; }; dependencies = []; @@ -463,11 +474,11 @@ rec { }; vim-closetag = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-closetag-2017-07-24"; + name = "vim-closetag-2017-11-01"; src = fetchgit { url = "https://github.com/alvan/vim-closetag"; - rev = "2cacc501df30586c0f96f40f24d1a1239529198c"; - sha256 = "00fayl6bnrf8b80xk73r1009z6hpzfc2jaih042hmnybx8k70byg"; + rev = "277e21d04c417112da6ecd3485373c6d3ff93b90"; + sha256 = "1wx9qqas0gd301pn9zabbl4b9v41i1hwbnd8fyy8kxxf0cbpdwaf"; }; dependencies = []; @@ -485,35 +496,36 @@ rec { }; vim-css-color = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-css-color-2017-02-09"; + name = "vim-css-color-2017-11-03"; src = fetchgit { url = "https://github.com/ap/vim-css-color"; - rev = "2411b84298eb6db034001f35ce7cc32c36f9b43b"; - sha256 = "1igqshk7wkh1wgihnmxnlh84fb98fm9lm8lfyjpcz6x8rg5vpmwc"; + rev = "fcf5829daa7817994fb856dbaa905e6fd8beb50c"; + sha256 = "1a617ji11395zimqjgpcq2qciyjzq5ixm85vc8rkj8jda0qgm91c"; }; dependencies = []; }; LanguageClient-neovim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "LanguageClient-neovim-2017-09-05"; + name = "LanguageClient-neovim-2017-11-06"; src = fetchgit { url = "https://github.com/autozimu/LanguageClient-neovim"; - rev = "5bfc3492d50c3c48c6e0b0d1899ed2bbca2cf48f"; - sha256 = "1zi3v4yx4hgzfr23377z84yngiqvdwjpdpkn12lpi6irb04q6641"; + rev = "a42cad5247417a1dbe7517748df14a76bd795fc1"; + sha256 = "1dk44xmxpq7yix0vpy8pzabk90l0cqxjm79w1zh8vqmpcp27z4jd"; }; dependencies = []; }; clighter8 = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "clighter8-2017-07-23"; + name = "clighter8-2017-09-30"; src = fetchgit { url = "https://github.com/bbchung/clighter8"; - rev = "a75644681c3a25f9441c482fd0b1c983d12da7e1"; - sha256 = "0hl14l8d0c0rwh7pv1d9bxkrvh1wjxdgjyi7cnhn75m7x9fd3ijh"; + rev = "193512aaa722d1f3dfd3c07bd60942e59c753f25"; + sha256 = "1xl1ggkvwg8j6xhfgs1vcah9wksw2z03b1333iyfbgcjdxrdail6"; }; dependencies = []; + buildInputs = [ makeWrapper ]; preFixup = '' sed "/^let g:clighter8_libclang_path/s|')$|${llvmPackages.clang.cc}/lib/libclang.so')|" \ -i "$out"/share/vim-plugins/clighter8/plugin/clighter8.vim @@ -521,11 +533,11 @@ rec { }; neomake = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neomake-2017-07-25"; + name = "neomake-2017-11-04"; src = fetchgit { url = "https://github.com/benekastah/neomake"; - rev = "0d1f1508ce2c9cfcffbf74a6bdea9c5766301fd6"; - sha256 = "0wc9b63s4j80f6irf2g6dmk2nx8w9il4dccbgmzirchmymndw4vh"; + rev = "ef4e5be7315ffcb536b855974c91b1378beda62d"; + sha256 = "1xma1isbk7b3gccddfphvyxpi2sih6i1jgk69p8cig5rbggkrc4a"; }; dependencies = []; @@ -543,22 +555,22 @@ rec { }; vim-trailing-whitespace = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-trailing-whitespace-2016-03-27"; + name = "vim-trailing-whitespace-2017-09-22"; src = fetchgit { url = "https://github.com/bronson/vim-trailing-whitespace"; - rev = "733fb64337b6da4a51c85a43450cd620d8b617b5"; - sha256 = "1469bd744lf8vk1nnw7kyq4ahpw84crp614mkpq88cs6rhvjhcyw"; + rev = "4c596548216b7c19971f8fc94e38ef1a2b55fee6"; + sha256 = "0f1cpnp1nxb4i5hgymjn2yn3k1jwkqmlgw1g02sq270lavp2dzs9"; }; dependencies = []; }; vim-sort-motion = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-sort-motion-2017-04-27"; + name = "vim-sort-motion-2017-10-03"; src = fetchgit { url = "https://github.com/christoomey/vim-sort-motion"; - rev = "9833b22b24b469574178bff4a305472d52bd93b8"; - sha256 = "1rvg4c89vlhqdy0p76rn51hz5mz7qv5pckdacs5zz3g8rcpqxxwq"; + rev = "7384f20d829b4abde28ced40975f0beb319dce27"; + sha256 = "1x4hxa7dijb5g7vmrbgs2zi8aiqc759ljmh8qqwk6lafc016plnj"; }; dependencies = []; @@ -587,11 +599,11 @@ rec { }; ctrlp-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ctrlp-vim-2017-07-18"; + name = "ctrlp-vim-2017-08-30"; src = fetchgit { url = "https://github.com/ctrlpvim/ctrlp.vim"; - rev = "3a048e85d3c2f72b1564e2dc43ed5b1d67bd59a9"; - sha256 = "10i2lwjizd74b3zi1ahinz2h8qbd18jzw93xrpw0iswrynfsprjv"; + rev = "bde7a2950adaa82e894d7bdf69e3e7383e40d229"; + sha256 = "19q3cfs3rd3q1xfhyz55r1c3750nrjvwz7jxnhqqn751zgimnsyl"; }; dependencies = []; @@ -631,11 +643,11 @@ rec { }; pony-vim-syntax = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "pony-vim-syntax-2016-01-23"; + name = "pony-vim-syntax-2017-09-26"; src = fetchgit { url = "https://github.com/dleonard0/pony-vim-syntax"; - rev = "a0ab2e14d5a3796ebec01ce196392dc1de349cb3"; - sha256 = "1wraray7870hq75jqxyilxb125flhcgk9ysz437qbg75c495znl0"; + rev = "caa34b3d7a15d9bfbfbb2f5944c85eb1eddcfafc"; + sha256 = "0r2lv99hkm95dv8wy9rkrkcwz5wkmwggfwi5vakgw497l3a9jskr"; }; dependencies = []; @@ -664,22 +676,22 @@ rec { }; neco-ghc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neco-ghc-2017-07-22"; + name = "neco-ghc-2017-08-17"; src = fetchgit { url = "https://github.com/eagletmt/neco-ghc"; - rev = "1c7bf1b544f295d066863b9f193de709aec5bbad"; - sha256 = "1vbl75s0zvbw6zvs790yla06rl8akpamm0p98s5mbj7mdnivkqhb"; + rev = "faa033c05e6a6470d3d780e3931b4c9c72042009"; + sha256 = "01l5n4x94sb6bhjhjx2sibs8gm3zla7hb6szdfgbdmdf7jlzazak"; }; dependencies = []; }; editorconfig-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "editorconfig-vim-2017-05-13"; + name = "editorconfig-vim-2017-10-14"; src = fetchgit { url = "https://github.com/editorconfig/editorconfig-vim"; - rev = "a069da8426ec5b9fc4d9f83c783c999e9d20f7d0"; - sha256 = "1zx5a8if3r77dnyidix7j0gi04y4pmmi5kfzlr3kjazj00606l79"; + rev = "0abb0634a8bf3c760a283e9e7475594b83869a46"; + sha256 = "1wazl37ivn9nhsy296g1ncvvwc78930lbp8arhwavr52mzpfji21"; }; dependencies = []; @@ -697,11 +709,11 @@ rec { }; vim-elixir = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-elixir-2017-07-19"; + name = "vim-elixir-2017-10-20"; src = fetchgit { url = "https://github.com/elixir-lang/vim-elixir"; - rev = "7c16ab889d12a32a7d15c54c36c0f47809b06e06"; - sha256 = "0h9gqxqyl6p6ckknn8838wz71xz5v2jqkc2swjdkfbff2n9k1gwb"; + rev = "3066d5fb5e1c694e607b2bb5d8277266ca524262"; + sha256 = "1j5sic3rssh2kaj73lv4m5sck3irn1jzgkpdr5qw7qi0gyfgpg81"; }; dependencies = []; @@ -741,11 +753,11 @@ rec { }; ensime-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ensime-vim-2017-07-06"; + name = "ensime-vim-2017-08-27"; src = fetchgit { url = "https://github.com/ensime/ensime-vim"; - rev = "a8a2f024283af8e0b69165960ba59d850d1b80a4"; - sha256 = "0vn7iv05jil7j1k4wgnnb9b1b4yqlxjkqmmz8a71291qg17bs5c8"; + rev = "d992b971a84afdfb2d99896d8aed537030e09a80"; + sha256 = "1rhrq3zplvpyli1ymqjmhq91p61ixpjz1v5xf68nvq4ax50nl45z"; }; dependencies = ["vimproc" "vimshell" "self" "forms"]; pythonDependencies = with pythonPackages; [ sexpdata websocket_client ]; @@ -763,44 +775,44 @@ rec { }; vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-go-2017-07-25"; + name = "vim-go-2017-11-05"; src = fetchgit { url = "https://github.com/fatih/vim-go"; - rev = "76cd99db6a88e825f361df0043cbff777c4a14fb"; - sha256 = "1pda9dmaacnzwm92a7vsly053dq2c1bcsqx99rwr41mkpzsk649l"; + rev = "c0d209cce7f0eb0af250d2471ae9495a8bf1f19e"; + sha256 = "1ci8nhsnda4wrpqi0knara1dqjjba6bccbqiw6va8d9mzsr12ivn"; }; dependencies = []; }; vim-colorschemes = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-colorschemes-2016-08-01"; + name = "vim-colorschemes-2017-08-22"; src = fetchgit { url = "https://github.com/flazz/vim-colorschemes"; - rev = "b8dff40f69f1873effbed97c759a8452ecb240ed"; - sha256 = "1mb08l2crl5mal0jllh9s099w2bqcb88vfjw3z5zj1jn8bbpniaj"; + rev = "eab315701f4627967fd62582eefc4e37a3745786"; + sha256 = "12jfqfs6lqd6jijxrdx3k76bzxrh9517zwczb73qjaqbg286fh5k"; }; dependencies = []; }; floobits-neovim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "floobits-neovim-2017-07-25"; + name = "floobits-neovim-2017-08-02"; src = fetchgit { url = "https://github.com/floobits/floobits-neovim"; - rev = "5b83fc75e4241911649782fd5b87ac7da30e77bd"; - sha256 = "05jrybkhg39v3z295l55aasb074wvm3pnyp7l38jqk7z4432gdc4"; + rev = "9ccd5a8d5d28261b9686717d61a32b756f38f189"; + sha256 = "02njg49qz9bfzggpn7z5c7w1wa1k5hxly66904wizl601fa6c664"; }; dependencies = []; }; psc-ide-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "psc-ide-vim-2017-07-14"; + name = "psc-ide-vim-2017-10-24"; src = fetchgit { url = "https://github.com/frigoeu/psc-ide-vim"; - rev = "0ff0c0a4e4087cb4444d0a19f2b2e436e723b186"; - sha256 = "0kq8iqhv8flyc12m9ajmbrfk7k6zl3gnnxg5j8sw69aqy6pqvd0p"; + rev = "23bf302de91181d409fb988ce372ab703b119bc5"; + sha256 = "1yjnc6173zdxbcbszrv7184rk5jax6d187c1klsm8b6lx4j1jv4d"; }; dependencies = []; @@ -840,11 +852,11 @@ rec { }; idris-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "idris-vim-2017-06-05"; + name = "idris-vim-2017-08-02"; src = fetchgit { url = "https://github.com/idris-hackers/idris-vim"; - rev = "0709927e689f4f4158661d4eb8ac6ce310cd7548"; - sha256 = "05fiamb92l7d08kxv1jk5xpqvkxphr9vqi3bfa203mjkvymd3x34"; + rev = "7f1363b65e14a8918d17f98b7f16de8f44f6bd00"; + sha256 = "07ws5c1yfv4kp1yl4fa634l9w162pp784zg12r2953xzwwmgwr83"; }; dependencies = []; @@ -862,11 +874,11 @@ rec { }; lightline-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "lightline-vim-2017-05-30"; + name = "lightline-vim-2017-11-05"; src = fetchgit { url = "https://github.com/itchyny/lightline.vim"; - rev = "ff74d6561487d220ed9d878172d8b55a79a4c17e"; - sha256 = "0j8pn42vfc1ka6hjnfsanl98vlk2839am5d4ynz9p1j1hichiqzv"; + rev = "73f125dcf24db4baabe9be76d02de63be22dbd44"; + sha256 = "1aj0sn3fs78993nk8qfvyfbbny3586fnmsvkqkg7n9j2gd7dfn93"; }; dependencies = []; @@ -938,6 +950,17 @@ 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 = []; + + }; + auto-pairs = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "auto-pairs-2017-07-03"; src = fetchgit { @@ -994,11 +1017,11 @@ rec { }; fzf-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "fzf-vim-2017-07-24"; + name = "fzf-vim-2017-11-02"; src = fetchgit { url = "https://github.com/junegunn/fzf.vim"; - rev = "685f9aae97072a190a1230a5c79692e15b7f46c9"; - sha256 = "1064qwypq8hl0dx65fhvx0aq4jp7hc60rzb0vy98zjr3sr4wshbh"; + rev = "5c6cee878a71ed27b137aafa7993624a357c0b82"; + sha256 = "07wavw8j170siysjvpmm2znv6c1q72w1m0cgs908v9pr1fh1bghj"; }; dependencies = []; @@ -1049,11 +1072,11 @@ rec { }; typescript-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "typescript-vim-2017-03-15"; + name = "typescript-vim-2017-10-24"; src = fetchgit { url = "https://github.com/leafgarland/typescript-vim"; - rev = "4dc79bd1b0c43c16cae146bee065f2acc6d2b789"; - sha256 = "1hm7cpkx7na106xpivzi5cqb322nanpa0sdjmvnkhgll244q5vy4"; + rev = "fbd0e9e508535f7d89778f7280dc76505348dcc6"; + sha256 = "1psxdkr35m1x6lpsrn2v482sn9n4pysw1i0j9nr1g7r4nh1058fk"; }; dependencies = []; @@ -1071,22 +1094,22 @@ rec { }; vimtex = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimtex-2017-07-25"; + name = "vimtex-2017-11-01"; src = fetchgit { url = "https://github.com/lervag/vimtex"; - rev = "1bba731f008a0905c1cf34e185c3f299d1f1759b"; - sha256 = "0gcsfdc2rrdaylsqz6hn9smchndb4y22f4sm230ljdf1rda6v57v"; + rev = "b56537a229d74fab815090e8e4b4ae873121e69c"; + sha256 = "1d94i19bkgqay7n5108majla2bx3nw5s230a2nw761v327bp65wd"; }; dependencies = []; }; vim-easymotion = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-easymotion-2017-07-14"; + name = "vim-easymotion-2017-10-20"; src = fetchgit { url = "https://github.com/lokaltog/vim-easymotion"; - rev = "e4d71c7ba45baf860fdaaf8c06cd9faebdccbd50"; - sha256 = "16ww4myvgh7is5fbwm67v87bbdyhldvr9d4vqkvnn8v9mbj7p7vd"; + rev = "342549e7a1e5b07a030803e0e4b6f0415aa51275"; + sha256 = "1glv4s95v8xxj47n0jzjxd0pxphnnpgzyd384d2bh0ql1xgf320v"; }; dependencies = []; @@ -1130,22 +1153,22 @@ rec { }; vim-highlightedyank = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-highlightedyank-2017-03-25"; + name = "vim-highlightedyank-2017-10-03"; src = fetchgit { url = "https://github.com/machakann/vim-highlightedyank"; - rev = "d656e1e62d2b4e1abd66c5f3a13a2be31a5a80ed"; - sha256 = "0rcd2q8f49iyv93s5g95brml7sng7lr8k9s5m4mxq3y0m9yf68fd"; + rev = "5fb7d0f2cb9e25397b1a6e1a5345584a6975b724"; + sha256 = "19jzaiv4iqgqvbwj6r5m6037qfm5nhk6jcwciyfacispdycmpkp7"; }; dependencies = []; }; Jenkinsfile-vim-syntax = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Jenkinsfile-vim-syntax-2017-05-16"; + name = "Jenkinsfile-vim-syntax-2017-08-29"; src = fetchgit { url = "https://github.com/martinda/Jenkinsfile-vim-syntax"; - rev = "d3ad4bc4888740c524bfa2f8b3192cfb23ddec3f"; - sha256 = "1sw1rwxspa94aak9gq6i1z47cqhkm2nbbj8xlkzbk3c04mqljksf"; + rev = "e3d2e19ad1c8f79872380901c0392c2671757831"; + sha256 = "18bfyjsxgqg562n8kkcnyd05pp17ipap7ray9az92fapzhw5q4x9"; }; dependencies = []; @@ -1185,11 +1208,11 @@ rec { }; vim-startify = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-startify-2017-06-15"; + name = "vim-startify-2017-11-02"; src = fetchgit { url = "https://github.com/mhinz/vim-startify"; - rev = "7f910ed4367de96310fedc98d5a12b97173a405f"; - sha256 = "1l5q8mqqp6gzmxqm5i0lx6lbm181vmkcg8w24ypa77vnid0ihd93"; + rev = "22ccf5861397dd2365756c24ce1952736632cd8c"; + sha256 = "1np32vz56hz19hd6zpz154dim2mzw3x1lx1vyhkkyda8rd9w4rmb"; }; dependencies = []; @@ -1207,11 +1230,11 @@ rec { }; ack-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ack-vim-2017-05-07"; + name = "ack-vim-2017-11-05"; src = fetchgit { url = "https://github.com/mileszs/ack.vim"; - rev = "a16a9b63eb85cc0960a7f25c54647ac1f99f3360"; - sha256 = "09bwawm2csliancl281y6wgalrrmaqq7d0baz4dq1cw18x657mk7"; + rev = "6e04746a63dd2453601ae36c83d53fe2021a45f4"; + sha256 = "0453ghmaaqwv6z8a3sncd3jxs9j050sp9ymiw2aqpc1a28kdlrv8"; }; dependencies = []; @@ -1276,22 +1299,22 @@ rec { }; haskell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "haskell-vim-2017-07-18"; + name = "haskell-vim-2017-10-16"; src = fetchgit { url = "https://github.com/neovimhaskell/haskell-vim"; - rev = "21c48768f1c5986d4f2351784b119eb9a5f925db"; - sha256 = "1dd18plhahkdz782d7y8w8265di2wvs78w2q2hx2m68686abmn0h"; + rev = "d877d5cd5f2f5747fa835d4b639499187fa4ae9e"; + sha256 = "16iihz0jy61s5dyzzf5dbvd6ii1zna98pckqkjlpxcqqx636sm5c"; }; dependencies = []; }; cpsm = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "cpsm-2017-02-12"; + name = "cpsm-2017-10-30"; src = fetchgit { url = "https://github.com/nixprime/cpsm"; - rev = "8e61bf3e30868c57ad7cf1fe4315b2352d61467c"; - sha256 = "0qcc10dx48wyvcgz9q3nid9l1wxvl9m97608s289lj4zps8iqpcs"; + rev = "3744240ca48f98eea064f3cbc1a62b3f25f44030"; + sha256 = "0x5jac7x85bqdh38vggi1fvxjw2z29b2227n471f3cxy8arvylrw"; }; dependencies = []; buildInputs = [ @@ -1320,11 +1343,11 @@ rec { }; vim-watchdogs = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-watchdogs-2017-06-23"; + name = "vim-watchdogs-2017-10-23"; src = fetchgit { url = "https://github.com/osyo-manga/vim-watchdogs"; - rev = "22a08dcd33223ddbe95c977ca72e77d62d2c75d9"; - sha256 = "0d3i39cz5kpps2gxlbz2l73bz0rs67lhh6qrpzl3a2p014hixbyi"; + rev = "4ba5e8f2d456d36ef4e660580245c648a6f106ff"; + sha256 = "1736m48yp41p2kwn6n0jmkzvxi84mf4llk1zw38n0v8npzcc2lnp"; }; dependencies = []; @@ -1353,44 +1376,44 @@ rec { }; vim-racer = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-racer-2017-07-19"; + name = "vim-racer-2017-10-15"; src = fetchgit { url = "https://github.com/racer-rust/vim-racer"; - rev = "c729b895885c9ef548ed4f9c1cec7c7c741b5869"; - sha256 = "1r0idhc7yj5r4h2rfmbb5p0i1yckr3mckif3ijy6sm9rhwi242sw"; + rev = "da725d38a6f0dd223771018c05e62a33c4a92f09"; + sha256 = "16m9iw6x6wr26ilm72vwjsm9p346hbjd6md62mqk6ranln8rdirp"; }; dependencies = []; }; purescript-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "purescript-vim-2016-08-31"; + name = "purescript-vim-2017-10-19"; src = fetchgit { url = "https://github.com/raichoo/purescript-vim"; - rev = "2c55bcefd63bc40ed2aa9d6ce9d89a590dfa3477"; - sha256 = "1y96w8p865gd6zr29wpxn1qwsk833y06x1qp586gylgi0jp1ybzv"; + rev = "ece34d9782a075761f31854a33eccd932eb2cf57"; + sha256 = "0x6hpibmhgw5aqq25rcpvgz2a60jh7i8x23gigakmmrxv51cjcrj"; }; dependencies = []; }; vim-grammarous = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-grammarous-2017-07-02"; + name = "vim-grammarous-2017-08-25"; src = fetchgit { url = "https://github.com/rhysd/vim-grammarous"; - rev = "d117cd139b58319d8ac94f2fd36ee548b6ea1e88"; - sha256 = "0a5a65j9a3s54z9asjmfbqsvawx014bq772jqgpsxww53lap3s5x"; + rev = "51ef5190813c0d9d8aaebd5191f183cff767f805"; + sha256 = "1mm8hd39q2sl4hi83c4zvrl27a8djr1pv35ch0pivg84ad9p7qq5"; }; dependencies = []; }; vim-puppet = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-puppet-2017-07-02"; + name = "vim-puppet-2017-08-25"; src = fetchgit { url = "https://github.com/rodjek/vim-puppet"; - rev = "cb1863af2ba4de9fb1c1d952d82692502348fb92"; - sha256 = "0a3q6f8jplxbvpjaz9vnh589al64vg567nc00xabp46vcm83nk4x"; + rev = "0d8ddd0dc3b7c908a82a6f16fa61aade766cc7e3"; + sha256 = "1jgn9vahyn80zz0wfzx9abamsahh9wrrq1nf9qghljm4si3fq766"; }; dependencies = []; @@ -1408,44 +1431,44 @@ rec { }; nvim-completion-manager = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "nvim-completion-manager-2017-09-05"; + name = "nvim-completion-manager-2017-10-26"; src = fetchgit { url = "https://github.com/roxma/nvim-completion-manager"; - rev = "d9db97f7e5a4ab8af905bc00a4501d770368dee4"; - sha256 = "1aaclyz1ss2iv0lwcxkz8x5x4wivsixmlk5xakwy989q9g9ps2f1"; + rev = "a56d17bcfc107bed851c9a36f1a6fc8e93c04acd"; + sha256 = "18zd7sigp93057lw4mx9jfqrp1l31kwhh8df5kfimbyh75xpj469"; }; dependencies = []; }; rust-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "rust-vim-2017-07-14"; + name = "rust-vim-2017-09-20"; src = fetchgit { url = "https://github.com/rust-lang/rust.vim"; - rev = "5a6133680ecf9e22eeba35c35e62ea6210225b02"; - sha256 = "0mxzl8lghq7bnwp8qs3haxq83ds5q8s8br0ajn40a3c3ns2hkhla"; + rev = "b6d88adcf9867aa69f4d20d45d49bb54979842a4"; + sha256 = "0n0hiqlv3amnzn69wyyq6z3r8zr0gcg86hw6flk7z39cxjhjv3vr"; }; dependencies = []; }; vim-devicons = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-devicons-2017-05-29"; + name = "vim-devicons-2017-10-13"; src = fetchgit { url = "https://github.com/ryanoasis/vim-devicons"; - rev = "153266275acc4f4615407a18e90f58780ebaef92"; - sha256 = "1zjrra0q5c7lmgxzlz7ddd7vi6k2vhz69fdy2s7d873nnmmd7kgn"; + rev = "a3e50225a8d544c9eff9c53c5405269a1b2b29f8"; + sha256 = "0glnwqnaw28g41zd9c3wvcsk6fmiphlwiq80lskbyn1pxfb3h14m"; }; dependencies = []; }; neoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neoformat-2017-07-22"; + name = "neoformat-2017-11-01"; src = fetchgit { url = "https://github.com/sbdchd/neoformat"; - rev = "a0c8e1f3c8b917afd175fc9ed9b2685ce5f952e9"; - sha256 = "1w2m54ag1g1czfwa8y2vq4p05wysvb1qhgfnbzqvlwb1mn9sh2kf"; + rev = "0e2cfe93a14639b9e26373593a4a61b30e5e96ff"; + sha256 = "1nzc8yjpbimbg0sn3cmn4jkb1f91lk0iqg4c38czlzlvbfb2xasq"; }; dependencies = []; @@ -1463,66 +1486,66 @@ rec { }; vim-polyglot = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-polyglot-2017-06-12"; + name = "vim-polyglot-2017-10-27"; src = fetchgit { url = "https://github.com/sheerun/vim-polyglot"; - rev = "8eab5f5403afc1c33a7593459a27f7ff625fa60b"; - sha256 = "0q2xfmqk5iad6gv8zzlpcv48xpv7lwr6mswc7mdllzkgaqilz75g"; + rev = "a61ab44810a0cb78223a179d78eff16d2e0b8bf6"; + sha256 = "0q3h46blqv963c4m636hr48j9ka1x2qv4naja7q2rr4f2pndhd23"; }; dependencies = []; }; neco-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neco-vim-2017-07-23"; + name = "neco-vim-2017-10-01"; src = fetchgit { url = "https://github.com/shougo/neco-vim"; - rev = "7c188577ebf65bfb9e27affce8158e0f5af2ec3e"; - sha256 = "1jb9vw2gkag2fg18vxqj3rc6y4zqgrn0kf6vb5z8kgkbsam0cybk"; + rev = "f5397c5e800d65a58c56d8f1b1b92686b05f4ca9"; + sha256 = "0yb7ja6qgrazszk4i01cwjj00j9vd43zs2r11b08iy8n10jnzr73"; }; dependencies = []; }; neocomplete-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neocomplete-vim-2017-07-23"; + name = "neocomplete-vim-2017-10-22"; src = fetchgit { url = "https://github.com/shougo/neocomplete.vim"; - rev = "d8caad4fc14fc1be5272bf6ebc12048212d67d2c"; - sha256 = "1ab1p4w6187r15alb34mnvaq43mikk7ic05ysgilx4f4zz6dgz5y"; + rev = "46791e7692e07384a089d125c5c536246698d04c"; + sha256 = "1iqd6fqlkm8bvibsapcvqqmyklzjad2l0c745lppdgdb959v016a"; }; dependencies = []; }; neosnippet-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neosnippet-snippets-2017-07-05"; + name = "neosnippet-snippets-2017-09-26"; src = fetchgit { url = "https://github.com/shougo/neosnippet-snippets"; - rev = "b89c544264912b064c79da2a90fc5d4e69d621b2"; - sha256 = "1cqgagzxl559mf06kkggdm90g27is0x80qqrrha09ng16hf6qf7a"; + rev = "8dbb78599984140c50418d3dd23d0de4c8f13e74"; + sha256 = "1hs4xvr9x03ccrcczhly4qlvr5bfxfvdk3ir4821mlg1gsgclkwh"; }; dependencies = []; }; neosnippet-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neosnippet-vim-2017-07-15"; + name = "neosnippet-vim-2017-10-01"; src = fetchgit { url = "https://github.com/shougo/neosnippet.vim"; - rev = "4bf88a9e497dc7180e9fe58551ad340de0192f39"; - sha256 = "0mj14cninszfw95zb0rwcmzf40851i49lj6vk8gz4iq9y0hxsnx7"; + rev = "ddd01d0ee3d965d9a30051f2e12b14234c83b3ae"; + sha256 = "0475ilqyg0ppk276awvva2iaslm993l364vqcxqrl31x7ir2qa7f"; }; dependencies = []; }; unite-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "unite-vim-2017-07-01"; + name = "unite-vim-2017-10-22"; src = fetchgit { url = "https://github.com/shougo/unite.vim"; - rev = "ad15f96365b5cb43a45d0ca779df6a497f954f15"; - sha256 = "0pigwfwyas4zdzrazk08p9bnbmi51np4gb0mf5dy434glw9rrvjz"; + rev = "c5c69d5d94e61a67d61730d04c82763196f63b10"; + sha256 = "1zn23x1bx40z0anl42v8ac8dv0c7f29rd1vwdqsmwdrkyxlyi1n1"; }; dependencies = []; @@ -1569,11 +1592,11 @@ rec { }; alchemist-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "alchemist-vim-2017-07-23"; + name = "alchemist-vim-2017-10-31"; src = fetchgit { url = "https://github.com/slashmili/alchemist.vim"; - rev = "35b0e59b4ae45baeef7fc46b6faf9b96515d35cb"; - sha256 = "021iwhnjjsfhmpbimm91jgmcrlj1hjh8rxcdqxwcwxc92h73wl58"; + rev = "15e6439439997a02fddb65fd3db51c1eb62207c0"; + sha256 = "03hvkj6957hcmlfqpzlddhm675ljqb7ka5r3j95ykl80npmqrnml"; }; dependencies = []; @@ -1613,11 +1636,11 @@ rec { }; vim-quickrun = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-quickrun-2017-03-21"; + name = "vim-quickrun-2017-08-14"; src = fetchgit { url = "https://github.com/thinca/vim-quickrun"; - rev = "98889e1fc0f7136262c4dd7c312b82879df16486"; - sha256 = "1drv53fwp24z0yb79lj2nyapyndw1yirg202hg7px9jvxjr4k8a0"; + rev = "13e60587a503620bd7d0dd1b822c29e18350e461"; + sha256 = "185pqahvpmag01vzr2xh68vnfz6fybpd3qlpr2qdq8712x11apwi"; }; dependencies = []; @@ -1635,11 +1658,11 @@ rec { }; vim-dispatch = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-dispatch-2017-07-12"; + name = "vim-dispatch-2017-10-10"; src = fetchgit { url = "https://github.com/tpope/vim-dispatch"; - rev = "14a1695f844a320dd28a7706710325773d1046a8"; - sha256 = "1whmqikg5ch523ffs2apkrd4clwl7s0y98gmxgaqq6gm2fa2wmfp"; + rev = "be7b194f47bdee6baa4460ccd030b860ada548dd"; + sha256 = "0lxhk6y1lf625i8hnsl44wzh8mfxi2h1hswrmisbmm2dbmyy84hd"; }; dependencies = []; @@ -1701,11 +1724,11 @@ rec { }; youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "youcompleteme-2017-07-24"; + name = "youcompleteme-2017-10-27"; src = fetchgit { url = "https://github.com/valloric/youcompleteme"; - rev = "998303e2fd5e762c3bc2aee8c23af1b388fb459c"; - sha256 = "158wnxgnjir4n5p1jnpxqq4qwl6hapd9kpdd3gklihxvbj1zqskc"; + rev = "bade99f5e9c5ba2f848cffb2d1a905e85d3ddb05"; + sha256 = "0rf9gd4asq9bddhp3c6qvvjcm6zpiadjhvslknkqh1i9aq01kj7a"; }; dependencies = []; buildPhase = '' @@ -1727,22 +1750,22 @@ rec { }; vim-airline-themes = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-airline-themes-2017-07-10"; + name = "vim-airline-themes-2017-10-29"; src = fetchgit { url = "https://github.com/vim-airline/vim-airline-themes"; - rev = "5d75d76ca2e17edd68f89ac4f547009d477570c6"; - sha256 = "15vq8fjax69wi447vhirj7vzqxppxcpvq2v8dhi0pf39gbzcd229"; + rev = "26f67b926553555e505ac60e992c97ab5fdfc83f"; + sha256 = "0gzhi7l0cwzd66mzkrs6pgbzm9vqkkyhv4cwblywh5dkqqa9q71x"; }; dependencies = []; }; vim-pandoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-pandoc-2017-04-26"; + name = "vim-pandoc-2017-11-04"; src = fetchgit { url = "https://github.com/vim-pandoc/vim-pandoc"; - rev = "fc209c66e937172efdd6db39ee64fcb3980ce329"; - sha256 = "19x8hf78833hcg508sn5a4g79h47ynqzzas998rqr2cmmpsc4mzs"; + rev = "e9a24376c17817632951088838a3c3bdc1c5da30"; + sha256 = "17mmvsvdzmx9xqhxiryvv8l67m52bd4xl9lyrg0h9vk8s58cy0ig"; }; dependencies = []; @@ -1881,22 +1904,22 @@ rec { }; ale = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ale-2017-07-23"; + name = "ale-2017-11-05"; src = fetchgit { url = "https://github.com/w0rp/ale"; - rev = "a0059cfe0362e8ba55bad1f4fa8a310c74b55280"; - sha256 = "0hjli8ww0i4yxa7gxiyvy9xgc9s8krr7vhdh8036nwwnrzrmcc5h"; + rev = "fa7d041c26aa6616c13a62274a7fc8458f6096dd"; + sha256 = "13h4pcahnfm0b5f7zbyfg7w2ailv8id58v59sp7h2qk3cx7zwb9k"; }; dependencies = []; }; vim-wakatime = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-wakatime-2017-07-03"; + name = "vim-wakatime-2017-11-05"; src = fetchgit { url = "https://github.com/wakatime/vim-wakatime"; - rev = "0c5368cf01f4d452a05eb5e5569e6fe78dca2657"; - sha256 = "025d0gz0fs3jb062jp7js11b8vb20zyxa32llqsjkyy4gr8kv53b"; + rev = "23e92a5701bad21f3604b3ab129546aef51a9b80"; + sha256 = "0hmpjrqy1w4qimpfg1l6sj5h9zbyz7lfzs3mjv1d3d2sp413warh"; }; dependencies = []; buildInputs = [ python ]; @@ -1940,22 +1963,22 @@ rec { }; nim-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "nim-vim-2016-05-19"; + name = "nim-vim-2017-10-31"; src = fetchgit { url = "https://github.com/zah/nim.vim"; - rev = "dcf25798f4a3f75e9538f9915959061edbff97cf"; - sha256 = "1jaiqkspfz2a4ny130dl0h6x9752flpcwwy0kscrqmlqf5fqiyvm"; + rev = "ae63bd21211b68d21b176ad5ea0cc4fc8f90eda5"; + sha256 = "1i5yxddwlcr3d2bzv5g9jz1z2lg7xnd6i038ph02rvllngcfsv00"; }; dependencies = []; }; deoplete-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "deoplete-go-2017-05-26"; + name = "deoplete-go-2017-09-08"; src = fetchgit { url = "https://github.com/zchee/deoplete-go"; - rev = "aef73fdf275053a6fb00c3f66d1f18821bc74bd3"; - sha256 = "1ixav3d78wy9zs9a8hg8yqk812srkbkwsaz17lg5sxjq6azljgvq"; + rev = "9330737f365bcf430a9481561f24271ea2ab120b"; + sha256 = "1j8i2ahpwa0v9mjwl45a6bdqdsksyh0fpwpl96jgylq58d2g5gzb"; }; dependencies = []; buildInputs = [ python3 ]; @@ -1968,11 +1991,22 @@ rec { }; deoplete-jedi = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "deoplete-jedi-2017-07-16"; + name = "deoplete-jedi-2017-10-24"; src = fetchgit { url = "https://github.com/zchee/deoplete-jedi"; - rev = "56528fd1238bbf2f9363f16710d0936703dc9eab"; - sha256 = "1kwwbr1w3865rlqs04hpxrqv67a14mzyf85pa29djmryi2156wxb"; + rev = "436624ce43d1424d4efef42e0990ac5fd19b5029"; + sha256 = "0phgjf6v90lwcbx2lks461ny6v4x5ypcs2cidg51w2jav2xvlqrq"; + }; + dependencies = []; + + }; + + 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 = []; @@ -1990,11 +2024,11 @@ rec { }; gruvbox = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "gruvbox-2016-09-28"; + name = "gruvbox-2017-10-01"; src = fetchgit { url = "git://github.com/morhetz/gruvbox"; - rev = "127c9d14d4bac1bac31e328b835a8919a255789c"; - sha256 = "19wg9143wvlynblpxm0cnk3ars2hgss3y745hligqgvfy308f7sm"; + rev = "16504d394e145e0372d2491e02769d241350399a"; + sha256 = "0yhas9lnsn9lfld37lvm5msmmkj6c7d8ajgarazc5rykbl8bw8rg"; }; dependencies = []; @@ -2023,11 +2057,11 @@ rec { }; pathogen = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "pathogen-2017-05-27"; + name = "pathogen-2017-08-04"; src = fetchgit { url = "git://github.com/tpope/vim-pathogen"; - rev = "ddfb1f14d7597e6aedc749be06b559a673c437ab"; - sha256 = "0fdd88gj75bzq6ifaddz3sl71w8ljnnci9npm04jmyvf048gnjg8"; + rev = "e7857bed4e0705f91f781dbe99706f07d08d104b"; + sha256 = "15s08q1chrdywj7fdiwzygxywg4cpcbvk5r1r8zvw6d82kyhadw1"; }; dependencies = []; @@ -2067,11 +2101,11 @@ rec { }; sleuth = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "sleuth-2017-07-23"; + name = "sleuth-2017-10-24"; src = fetchgit { url = "git://github.com/tpope/vim-sleuth"; - rev = "dfe0a33253c61dd8fac455baea4ec492e6cf0fe3"; - sha256 = "0576k4l2wbzy9frvv268vdix4k6iz9pw6n6626ifvg8hk6gbc5g9"; + rev = "d56a4302358359ddf9845252addf637a5e6bd6d5"; + sha256 = "1klp2lqsql90v156kih0mnm0j957pc4r0zy5y6srww2q3wkkjgr2"; }; dependencies = []; @@ -2111,11 +2145,11 @@ rec { }; table-mode = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "table-mode-2017-04-20"; + name = "table-mode-2017-10-26"; src = fetchgit { url = "git://github.com/dhruvasagar/vim-table-mode"; - rev = "4e41af8e5f0bf53326d1b83c2feb1eff89fe90d4"; - sha256 = "0l83j3963lzkmn54vcagkwm2rhk96cl9v42l5r7zcgjign28cfzw"; + rev = "40fe641708c58476c3a1b9aeafb68dd888d4920b"; + sha256 = "1rb2jq81965gpziqxlljr2bqjyfbikqa9ncxaaak3x61prn4z084"; }; dependencies = []; @@ -2143,33 +2177,33 @@ rec { }; tlib = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "tlib-2017-05-20"; + name = "tlib-2017-08-13"; src = fetchgit { url = "git://github.com/tomtom/tlib_vim"; - rev = "6f9d75b54478bcaab722d33cbec69d8a1fe49f32"; - sha256 = "1mh2m3c9xi7g650s06qxfpz57g493n0qjq35inad9y62yb1gsidm"; + rev = "c96db6151fde9d06a8fed71b7df05c6dbb3f14fe"; + sha256 = "1dhvf1v2mkmq8aifwq57ylm7nnk3zz3hna33q2gj6p7v70vay7v8"; }; dependencies = []; }; undotree = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "undotree-2017-03-24"; + name = "undotree-2017-10-26"; src = fetchgit { url = "git://github.com/mbbill/undotree"; - rev = "ad08a88df70c1865b8c9ef6eeac5cdb051d2a18a"; - sha256 = "1i1sss8vzsym44amq19rfy95wm7143ks5h9imm7z7rah7xkcqv9l"; + rev = "cdbb9022b8972d3e156b8d60af33bf795625b058"; + sha256 = "0y62hp8k2kbrq0jhxj850f706rqjv2dkd7dxhz458mrsdk60f253"; }; dependencies = []; }; vim-addon-actions = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-actions-2014-09-22"; + name = "vim-addon-actions-2017-09-23"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-actions"; - rev = "a5d20500fb8812958540cf17862bd73e7af64936"; - sha256 = "1wfkwr89sn2w97i94d0dqylcg9mr6pirjadi0a4l492nfnsh99bc"; + rev = "7f48bea57fd9dfb06498422bc1cbe9f7553efa6e"; + sha256 = "0q9w2x49zd3a43cm4ikgpwrqiz0k9a6pss0zrvskaxhh6mifpxpg"; }; dependencies = ["vim-addon-mw-utils" "tlib"]; @@ -2286,11 +2320,11 @@ rec { }; vim-addon-nix = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-nix-2015-03-10"; + name = "vim-addon-nix-2017-09-11"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-nix"; - rev = "2aed79ba5d8c5e6abd102de77e55e242f61b17f1"; - sha256 = "0zx1q9994py6jmm0qbbx6fc1dy5la8zfskkbvqqxssxrl5dx7vvi"; + rev = "3001a9db5f816dd7af11384f15415bddd146ef86"; + sha256 = "195z2yz09wirpqjpsha8x7qcr9is1q8qph4j0svws6qbqrkh8ryy"; }; dependencies = ["vim-addon-completion" "vim-addon-goto-thing-at-cursor" "vim-addon-errorformats" "vim-addon-actions" "vim-addon-mw-utils" "tlib"]; @@ -2374,11 +2408,11 @@ rec { }; vim-airline = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-airline-2017-07-21"; + name = "vim-airline-2017-11-06"; src = fetchgit { url = "git://github.com/vim-airline/vim-airline"; - rev = "72e5f04f7c422e21cb6f6856c4e94cef25ea2288"; - sha256 = "0pkdlmil0lqwwi7anzn7r1zxxqbip9zy1pbwri031yksff6v2096"; + rev = "396cc9226171f8dbf1069800a0ae56700bbf3913"; + sha256 = "1km9cvvrip5z8xzaa1r83n7w0kdw21zrxax27qmvnhlnq74s24zb"; }; dependencies = []; @@ -2418,11 +2452,11 @@ rec { }; vim-gitgutter = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-gitgutter-2017-06-08"; + name = "vim-gitgutter-2017-11-01"; src = fetchgit { url = "git://github.com/airblade/vim-gitgutter"; - rev = "dcac1f74ee5c26125363dca164463bde6657c838"; - sha256 = "0knkdv0sbdwf4p82g438l7pylwzxfbxcj44np3v15wr97w95wmlv"; + rev = "1e60667322b7cd1bfcba98762fbba746a888d21a"; + sha256 = "1g9giir7gmkp6n6w4z20qm2dyq00w2a8f573c0b8b27cj36ri0wq"; }; dependencies = []; @@ -2440,88 +2474,66 @@ rec { }; vim-latex-live-preview = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-latex-live-preview-2017-07-19"; + name = "vim-latex-live-preview-2017-09-22"; src = fetchgit { url = "git://github.com/xuhdev/vim-latex-live-preview"; - rev = "172b03cd0677f1fe55abeab86fa4a4c484e4c3b5"; - sha256 = "1wgnq1kbx80xqwm9rx3z4i9fldj965046s4hh62rdi5585hh6aps"; + rev = "63abf0f2361e332597a5278b2dbd0fef980ebdb2"; + sha256 = "0pk2nx04bl8ym77mlylb6q5n3vz0y96jzs72gydjiffp1nm062l9"; }; dependencies = []; }; vim-multiple-cursors = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-multiple-cursors-2017-06-02"; + name = "vim-multiple-cursors-2017-08-04"; src = fetchgit { url = "git://github.com/terryma/vim-multiple-cursors"; - rev = "3afc475cc64479a406ce73d3333df1f67db3c73f"; - sha256 = "04dijb4hgidypppphcy83bacmfrd9ikyjc761hqq6bl4kc49f5kc"; + rev = "a97dab5bc440bf0a7b62bb2de4479963a888f4ff"; + sha256 = "1ac5l5h138ns9z9ni4qbcykkg9yfpjjalk0g9wrra4rp0nlakaqk"; }; dependencies = []; }; vim-signature = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-signature-2017-06-20"; + name = "vim-signature-2017-09-24"; src = fetchgit { url = "git://github.com/kshenoy/vim-signature"; - rev = "c6decc68d644a66a34345ea09677469d6e482e1f"; - sha256 = "1iflyvskimq74hzb6l8mzjv3rh0i15bw9jv5x6arns86q3201l23"; + rev = "eaa8af20ac4d46f911a083298d7a19e27be180e0"; + sha256 = "1vha52bmbs88lnwjfvkbx2jb74k8gqjky0c9gv8gqy74lypcdas5"; }; dependencies = []; }; vim-signify = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-signify-2017-07-19"; + name = "vim-signify-2017-08-19"; src = fetchgit { url = "git://github.com/mhinz/vim-signify"; - rev = "748cb0ddab1b7e64bb81165c733a7b752b3d36e4"; - sha256 = "0kc4nbf3a7ab0an4r1j37bvzjarr4135qqhkz348r7zdhmqkyyfm"; + rev = "1a8a15d835d8f2da56cd793a0222227af6c89839"; + sha256 = "13yvwy2vw64g4v08k83svhp26nmmir0qd21wpp89qclbzwb2q2k2"; }; dependencies = []; }; vim-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-snippets-2017-07-07"; + name = "vim-snippets-2017-11-02"; src = fetchgit { url = "git://github.com/honza/vim-snippets"; - rev = "0817950a4fb8ccd48ec38a2b65cf046b597eecb3"; - sha256 = "0hxd96zl5gjkx5d381yzyrbahwbz3r9dljzn2cxbdbjsb7im6aks"; + rev = "a7670a7b71e44fd93e0b97fe2c24739a20732f94"; + sha256 = "0bm4475x723bk9q6snl5d804pn3vvsk0p9bvgil6c0q24ams6abh"; }; dependencies = []; }; vim-webdevicons = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-webdevicons-2017-05-29"; + name = "vim-webdevicons-2017-10-13"; src = fetchgit { url = "git://github.com/ryanoasis/vim-devicons"; - rev = "153266275acc4f4615407a18e90f58780ebaef92"; - sha256 = "1zjrra0q5c7lmgxzlz7ddd7vi6k2vhz69fdy2s7d873nnmmd7kgn"; - }; - dependencies = []; - - }; - - 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"; + rev = "a3e50225a8d544c9eff9c53c5405269a1b2b29f8"; + sha256 = "0glnwqnaw28g41zd9c3wvcsk6fmiphlwiq80lskbyn1pxfb3h14m"; }; dependencies = []; @@ -2539,11 +2551,11 @@ rec { }; vimwiki = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimwiki-2017-07-15"; + name = "vimwiki-2017-11-04"; src = fetchgit { url = "git://github.com/vimwiki/vimwiki"; - rev = "976cbbcd23dcd19ddb5dc5544645da8a51dbdfe6"; - sha256 = "1mna3qavwj1jcjnvmw8hngrfccpk5krj2z0v2grp97i9m2kmkifx"; + rev = "7c2ae8a714a71956297cb291dbaefb6a0ce47da3"; + sha256 = "1sis3g7v5ck9gan3x6i64kdfmn6r40zvxp2jyw0qxaha1kfb1qa1"; }; dependencies = []; @@ -2570,15 +2582,4 @@ rec { dependencies = []; }; - - 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 b2273221e90..dd5cc1ba100 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -72,7 +72,6 @@ "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 2c50340575a4b91bd983894d294e5619ae4aee96 Mon Sep 17 00:00:00 2001 From: Michael Fellinger Date: Mon, 6 Nov 2017 14:47:33 +0100 Subject: [PATCH 333/361] elm-format: 0.5.2 -> 0.7.0 --- .../compilers/elm/packages/elm-format.nix | 43 ++++++++++--------- 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/pkgs/development/compilers/elm/packages/elm-format.nix b/pkgs/development/compilers/elm/packages/elm-format.nix index a9340fc94fe..56db835ac10 100644 --- a/pkgs/development/compilers/elm/packages/elm-format.nix +++ b/pkgs/development/compilers/elm/packages/elm-format.nix @@ -1,37 +1,40 @@ -{ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base, binary -, bytestring, containers, directory, edit-distance, fetchgit -, filemanip, filepath, HUnit, indents, mtl, optparse-applicative -, parsec, pretty, process, QuickCheck, quickcheck-io -, regex-applicative, split, stdenv, tasty, tasty-golden -, tasty-hunit, tasty-quickcheck, text, union-find, wl-pprint +{ mkDerivation, ansi-terminal, ansi-wl-pprint, base, binary +, bytestring, Cabal, cmark, containers, directory, fetchgit +, filepath, free, HUnit, indents, json, mtl, optparse-applicative +, parsec, process, QuickCheck, quickcheck-io, split, stdenv, tasty +, tasty-golden, tasty-hunit, tasty-quickcheck, text }: mkDerivation { pname = "elm-format"; - version = "0.5.2"; + version = "0.7.0"; src = fetchgit { url = "http://github.com/avh4/elm-format"; - sha256 = "0lman7h6wr75y90javcc4y1scvwgv125gqqaqvfrd5xrfmm43gg8"; - rev = "e452ed9342620e7bb0bc822983b96411d57143ef"; + sha256 = "1snl2lrrzdwgzi68agi3sdw84aslj04pzzxpm1mam9ic6dzhn3jf"; + rev = "da4b415c6a2b7e77b7d9f00beca3e45230e603fb"; }; - isLibrary = false; + + doHaddock = false; + isLibrary = true; isExecutable = true; - executableHaskellDepends = [ - aeson ansi-terminal ansi-wl-pprint base binary bytestring - containers directory edit-distance filemanip filepath indents mtl - optparse-applicative parsec pretty process regex-applicative split - text + setupHaskellDepends = [ base Cabal directory filepath process ]; + libraryHaskellDepends = [ + ansi-terminal ansi-wl-pprint base binary bytestring containers + directory filepath free indents json mtl optparse-applicative + parsec process split text ]; + executableHaskellDepends = [ base ]; testHaskellDepends = [ - aeson ansi-terminal ansi-wl-pprint base binary bytestring - containers directory edit-distance filemanip filepath HUnit indents - mtl optparse-applicative parsec pretty process QuickCheck - quickcheck-io regex-applicative split tasty tasty-golden - tasty-hunit tasty-quickcheck text union-find wl-pprint + base cmark containers HUnit mtl parsec QuickCheck quickcheck-io + split tasty tasty-golden tasty-hunit tasty-quickcheck text ]; jailbreak = true; postInstall = '' ln -s $out/bin/elm-format-0.18 $out/bin/elm-format ''; + postPatch = '' + sed -i "s|desc <-.*||" ./Setup.hs + sed -i "s|gitDescribe = .*|gitDescribe = \\\\\"da4b415c\\\\\"\"|" ./Setup.hs + ''; homepage = http://elm-lang.org; description = "A source code formatter for Elm"; license = stdenv.lib.licenses.bsd3; From 294bb6daeae973ab087aa54b7811caa1d1ed68ac Mon Sep 17 00:00:00 2001 From: Sarah Brofeldt Date: Mon, 6 Nov 2017 13:55:56 +0100 Subject: [PATCH 334/361] nixos/tests/gitlab.nix: Unbreak config, still times out --- nixos/tests/gitlab.nix | 54 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 51 insertions(+), 3 deletions(-) diff --git a/nixos/tests/gitlab.nix b/nixos/tests/gitlab.nix index 35791104696..7268636b62a 100644 --- a/nixos/tests/gitlab.nix +++ b/nixos/tests/gitlab.nix @@ -9,9 +9,57 @@ import ./make-test.nix ({ pkgs, ...} : { nodes = { gitlab = { config, pkgs, ... }: { virtualisation.memorySize = 768; - services.gitlab.enable = true; - services.gitlab.databasePassword = "gitlab"; + + services.nginx = { + enable = true; + virtualHosts = { + "localhost" = { + locations."/".proxyPass = "http://unix:/run/gitlab/gitlab-workhorse.socket"; + }; + }; + }; + systemd.services.gitlab.serviceConfig.TimeoutStartSec = "10min"; + services.gitlab = { + enable = true; + databasePassword = "dbPassword"; + secrets = { + secret = "secret"; + otp = "otpsecret"; + db = "dbsecret"; + + # nix-shell -p openssl --run "openssl genrsa 2048" + jws = '' + -----BEGIN RSA PRIVATE KEY----- + MIIEpAIBAAKCAQEA13/qEio76OWUtWO0WIz9lWnsTWOU8Esv4sQHDq9PCEFsLt21 + PAXrlWhLjjWcxGfsrDwnh7YErGHYL62BMSxMdFJolaknlQK/O/V8UETDe45VoHM+ + Znk270RfUcfYFgiihnXUZXVmL0om9TsQSk646wCcjCY9LxtxUyKNhvT7KjgYw2aX + z34aw7M+Js3T2p1TjZPSC82GtmtKkJEKFMi5EjprLTDE7EdcUzr9Xuw+kQ+gRm9k + 7FE+JQqSoprwE3Q0v2OAn3UhLMgg0gNFRnsc5l6IAshDzV+H22RPqKKlJjVjjfPY + 0TQSvYLVApigHbDPH0BoCXfjFfQazbbP3OUHrwIDAQABAoIBAQCMU+tkcMQaYIV5 + qLdjgkwO467QpivyXcOM8wF1eosIYTHFQvIlZ+WEoSmyLQ8shlADyBgls01Pw1c3 + lNAv6RzQEmmwKzpvOh61OKH+0whIiOMRXHoh2IUBQZCgfHYlwvGyhUAN4WjtGmhM + AG4XNTQNM5S9Xpkw97nP3Qwz+YskbbkrfqtCEVy9ro+4nhbjqPsuO3adbnkva4zR + cyurRhrHgHU6LPjn5NHnHH4qw2faY2oAsL8pmpkTbO5IqWDvOcbjNfjVPgVoq26O + bbaa1qs4nmc80qQgMjRPJef535xyf3eLsSlDvpf6O8sPrJzVR1zaqEqixpQCZDac + +kRiSBrhAoGBAOwHiq0PuyJh6VzBu7ybqX6+gF/wA4Jkwzx6mbfaBgurvU1aospp + kisIonAkxSbxllZMnjbkShZEdATYKeT9o5NEhnU4YnHfc5bJZbiWOZAzYGLcY7g8 + vDQ31pBItyY4pFgPbSpNlbUvUsoPVJ45RasRADDTNCzMzdjFQQXst2V9AoGBAOm7 + sSpzYfFPLEAhieAkuhtbsX58Boo46djiKVfzGftfp6F9aHTOfzGORU5jrZ16mSbS + qkkC6BEFrATX2051dzzXC89fWoJYALrsffE5I3KlKXsCAWSnCP1MMxOfH+Ls61Mr + 7pK/LKfvJt53mUH4jIdbmmFUDwbg18oBEH+x9PmbAoGAS/+JqXu9N67rIxDGUE6W + 3tacI0f2+U9Uhe67/DTZaXyc8YFTlXU0uWKIWy+bw5RaYeM9tlL/f/f+m2i25KK+ + vrZ7zNag7CWU5GJovGyykDnauTpZaYM03mN0VPT08/uc/zXIYqyknbhlIeaZynCK + fDB3LUF0NVCknz20WCIGU0kCgYEAkxY0ZXx61Dp4pFr2wwEZxQGs7uXpz64FKyEX + 12r6nMATY4Lh6y/Px0W6w5vis8lk+5Ny6cNUevHQ0LNuJS+yu6ywl+1vrbrnqroM + f3LvpcPeGLSoX8jl1VDQi7aFgG6LoKly1xJLbdsH4NPutB9PgBbbTghx9GgmI88L + rPA2M6UCgYBOmkYJocNgxg6B1/n4Tb9fN1Q/XuJrFDE6NxVUoke+IIyMPRH7FC3m + VMYzu+b7zTVJjaBb1cmJemxl/xajziWDofJYPefhdbOVU7HXtmJFY0IG3pVxU1zW + 3bmDj5QAtCUDpuuNa6GEIT0YR4+D/V7o3DmlZ0tVIwKJmVJoQ2f5dw== + -----END RSA PRIVATE KEY----- + ''; + }; + }; }; }; @@ -19,6 +67,6 @@ import ./make-test.nix ({ pkgs, ...} : { $gitlab->start(); $gitlab->waitForUnit("gitlab.service"); $gitlab->waitForUnit("gitlab-sidekiq.service"); - $gitlab->waitUntilSucceeds("curl http://localhost:8080/users/sign_in"); + $gitlab->waitUntilSucceeds("curl http://localhost:80/users/sign_in"); ''; }) From cac4cb401c2f3190fb8ddae27fcb5a9c9fc9da8a Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Mon, 6 Nov 2017 14:15:43 +0000 Subject: [PATCH 335/361] debootstrap: 1.0.87 -> 1.0.92 --- pkgs/tools/misc/debootstrap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix index e70efe6c4f1..a65862a7845 100644 --- a/pkgs/tools/misc/debootstrap/default.nix +++ b/pkgs/tools/misc/debootstrap/default.nix @@ -4,13 +4,13 @@ # There is also cdebootstrap now. Is that easier to maintain? stdenv.mkDerivation rec { name = "debootstrap-${version}"; - version = "1.0.87"; + version = "1.0.92"; src = fetchurl { # git clone git://git.debian.org/d-i/debootstrap.git # I'd like to use the source. However it's lacking the lanny script ? (still true?) url = "mirror://debian/pool/main/d/debootstrap/debootstrap_${version}.tar.gz"; - sha256 = "1amk3wghx4f7zfp7d8r0hgqn5gvph50qa6nvh32q2j8aihdr7374"; + sha256 = "06gp6ivmfh0ks4mibx1mz0pwzjyxqas319s741pp9b3k091jkip1"; }; buildInputs = [ dpkg gettext gawk perl ]; From 217257c835ebda5ff189108adddeb72fc82a58da Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Mon, 6 Nov 2017 14:40:12 +0000 Subject: [PATCH 336/361] dfeet: 0.3.11 -> 0.3.12 --- pkgs/development/tools/misc/d-feet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/d-feet/default.nix b/pkgs/development/tools/misc/d-feet/default.nix index bd08c6c4c05..14a52f4e08a 100644 --- a/pkgs/development/tools/misc/d-feet/default.nix +++ b/pkgs/development/tools/misc/d-feet/default.nix @@ -2,7 +2,7 @@ , pythonPackages, makeWrapper, gnome3, libwnck3 }: let - version = "${major}.11"; + version = "${major}.12"; major = "0.3"; in pythonPackages.buildPythonApplication rec { name = "d-feet-${version}"; @@ -10,7 +10,7 @@ in pythonPackages.buildPythonApplication rec { src = fetchurl { url = "mirror://gnome/sources/d-feet/${major}/d-feet-${version}.tar.xz"; - sha256 = "a3dc940c66f84b996c328531e3034d475ec690d7ff639445ff7ca746aa8cb9c2"; + sha256 = "054hl56rii9ff7rzl42h7993ywjbxmhlcd7bk8fi1c2bx98c6s68"; }; nativeBuildInputs = [ pkgconfig ]; From 40b347f2051b158e4d077eb95eff02df8a65524f Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Mon, 6 Nov 2017 17:52:08 +0100 Subject: [PATCH 337/361] i3lock-color: limit to i686 and x86-64 platforms Compilation fails for other CPU architectures due to requiring the SSE2 instruction set. See [1] for upstream issue. [1]: https://github.com/chrjguill/i3lock-color/issues/44 --- pkgs/applications/window-managers/i3/lock-color.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix index fd47a104326..a589e21be98 100644 --- a/pkgs/applications/window-managers/i3/lock-color.nix +++ b/pkgs/applications/window-managers/i3/lock-color.nix @@ -28,6 +28,9 @@ stdenv.mkDerivation rec { homepage = https://i3wm.org/i3lock/; maintainers = with maintainers; [ garbas malyn ]; license = licenses.bsd3; - platforms = platforms.all; + + # Needs the SSE2 instruction set. See upstream issue + # https://github.com/chrjguill/i3lock-color/issues/44 + platforms = platforms.i686 ++ platforms.x86_64; }; } From 05b90907a7b134ab8e4c51dce87fff2c4ac3a85a Mon Sep 17 00:00:00 2001 From: Sarah Brofeldt Date: Mon, 6 Nov 2017 18:18:19 +0100 Subject: [PATCH 338/361] openra: Add python to bin PATH, fixing launcher --- pkgs/games/openra/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/openra/default.nix b/pkgs/games/openra/default.nix index fb01346d84e..5665dfc9e94 100644 --- a/pkgs/games/openra/default.nix +++ b/pkgs/games/openra/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, mono, makeWrapper, lua , SDL2, freetype, openal, systemd, pkgconfig, - dotnetPackages, gnome3, curl, unzip, which + dotnetPackages, gnome3, curl, unzip, which, python }: stdenv.mkDerivation rec { @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { postInstall = with stdenv.lib; let runtime = makeLibraryPath [ SDL2 freetype openal systemd lua ]; - binaries= makeBinPath [ which mono gnome3.zenity ]; + binaries= makeBinPath [ which mono gnome3.zenity python ]; in '' wrapProgram $out/lib/openra/launch-game.sh \ --prefix PATH : "${binaries}" \ From 6949cfa58edacf1e9fb83f69ba60aae18a3c851c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 6 Nov 2017 19:07:36 +0100 Subject: [PATCH 339/361] nix-zsh-completions: 0.3.1 -> 0.3.2 Adds support for nix1.12 and various improvements. --- lib/maintainers.nix | 1 + pkgs/shells/nix-zsh-completions/default.nix | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 45f7f8f51d1..514709082fc 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -265,6 +265,7 @@ hbunke = "Hendrik Bunke "; hce = "Hans-Christian Esperer "; hectorj = "Hector Jusforgues "; + hedning = "Tor Hedin Brønner "; heel = "Sergii Paryzhskyi "; henrytill = "Henry Till "; hhm = "hhm "; diff --git a/pkgs/shells/nix-zsh-completions/default.nix b/pkgs/shells/nix-zsh-completions/default.nix index eaae85990b2..af055266293 100644 --- a/pkgs/shells/nix-zsh-completions/default.nix +++ b/pkgs/shells/nix-zsh-completions/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: let - version = "0.3.1"; + version = "0.3.2"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "spwhitt"; repo = "nix-zsh-completions"; rev = "${version}"; - sha256 = "1sbc52f5818bcygljrji84dyvgw727x50m9v6qfrsdaji3zkqga1"; + sha256 = "0i306k50g07n9smy68npma1k90sv173zy12jdi8wm7h1sj53m5rv"; }; installPhase = '' @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { description = "ZSH completions for Nix, NixOS, and NixOps"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.spwhitt stdenv.lib.maintainers.olejorgenb ]; + maintainers = [ stdenv.lib.maintainers.spwhitt stdenv.lib.maintainers.olejorgenb stdenv.lib.maintainers.hedning ]; }; } From 880a636ef4e18d10abdf50f3485b5624ff0d4299 Mon Sep 17 00:00:00 2001 From: James Edington Date: Mon, 6 Nov 2017 12:22:17 -0600 Subject: [PATCH 340/361] palemoon: 27.5.0 -> 27.6.0 Version bump because apparently Moonchild published 27.6.0_Release --- 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 d5e6e47e928..e24c21b535b 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.5.0"; + version = "27.6.0"; src = fetchFromGitHub { name = "palemoon-src"; owner = "MoonchildProductions"; repo = "Pale-Moon"; rev = version + "_Release"; - sha256 = "0m4fgwxn6hs8r240i6acaajx76cvqy1b7cqmdsxd33qpjrrj1h9d"; + sha256 = "1v5rbam93fcc7c1l69clr9chi2l0zv0dhjq12v535n8vv9lhahhl"; }; desktopItem = makeDesktopItem { From 967ecb802ea4f07c50514d1642f4fa83a1dc6327 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 5 Nov 2017 19:20:46 +0200 Subject: [PATCH 341/361] raspberrypifw: 1.20170811 -> 1.20171029 --- pkgs/os-specific/linux/firmware/raspberrypi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix index bb714f60c2d..c71f1c0ea2e 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "raspberrypi-firmware-${version}"; - version = "1.20170811"; + version = "1.20171029"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "firmware"; rev = version; - sha256 = "1lrbbslpwjgvrn7hk3l104gkl07qxh7qd4cdyqccqhqzip9wqhkn"; + sha256 = "12aisha8rlr28310hakps04z9p45kd2wvks0w1vxw1kwfh1ncy9s"; }; dontStrip = true; # Stripping breaks some of the binaries From bf585f288100b5cf08499f3053b811581b0fa1a6 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 5 Nov 2017 19:28:00 +0200 Subject: [PATCH 342/361] linux_rpi: 1.20170811 -> 1.20171029 --- pkgs/os-specific/linux/kernel/linux-rpi.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix index 2d8a3f0afcd..fb97aa579df 100644 --- a/pkgs/os-specific/linux/kernel/linux-rpi.nix +++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix @@ -1,8 +1,8 @@ { stdenv, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args: let - modDirVersion = "4.9.41"; - tag = "1.20170811"; + modDirVersion = "4.9.59"; + tag = "1.20171029"; in stdenv.lib.overrideDerivation (import ./generic.nix (args // rec { version = "${modDirVersion}-${tag}"; @@ -12,7 +12,7 @@ stdenv.lib.overrideDerivation (import ./generic.nix (args // rec { owner = "raspberrypi"; repo = "linux"; rev = "raspberrypi-kernel_${tag}-1"; - sha256 = "1ly0x7a43zvig0fv7lc6rpq49pcdb7i9sdb78p4gi5485zap40kb"; + sha256 = "19lb1gxz21x1d5zdznzqfq60kxg7iqmyl6l0mb9qg2vrl8fcgnxk"; }; features = { From 5d5eb6aba4189a0cb13dbf9b127fac91c6df2b9c Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 7 Nov 2017 00:17:31 +0200 Subject: [PATCH 343/361] lcdproc: Disable parallel build https://hydra.nixos.org/build/63628044 --- pkgs/servers/monitoring/lcdproc/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/monitoring/lcdproc/default.nix b/pkgs/servers/monitoring/lcdproc/default.nix index 027e1090157..859849f7b2c 100644 --- a/pkgs/servers/monitoring/lcdproc/default.nix +++ b/pkgs/servers/monitoring/lcdproc/default.nix @@ -24,7 +24,9 @@ stdenv.mkDerivation rec { buildInputs = [ freetype libX11 libftdi libusb libusb1 ncurses ]; nativeBuildInputs = [ autoreconfHook doxygen makeWrapper pkgconfig ]; - enableParallelBuilding = true; + + # In 0.5.9: gcc: error: libbignum.a: No such file or directory + enableParallelBuilding = false; postFixup = '' for f in $out/bin/*.pl ; do From 97f816dc56f4205b3689011b8837bab889ff0474 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Mon, 6 Nov 2017 17:53:35 -0500 Subject: [PATCH 344/361] pythonPackages.fuse: fix infinite recursion in expression I believe this resolves #31338. --- 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 d76c836734c..8cba91324a0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8991,7 +8991,7 @@ in { }; }; - fuse = callPackage ../development/python-modules/python-fuse { }; + fuse = callPackage ../development/python-modules/python-fuse { fuse = pkgs.fuse; }; fusepy = buildPythonPackage rec { name = "fusepy-2.0.4"; From 471175e0be6ef55b368363e132ff8cee09c3ca1c Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 6 Nov 2017 17:38:29 +0000 Subject: [PATCH 345/361] ocamlPackages.zed: 1.5 -> 1.6 --- pkgs/development/ocaml-modules/zed/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/zed/default.nix b/pkgs/development/ocaml-modules/zed/default.nix index 85977792b4d..1ddb6d18040 100644 --- a/pkgs/development/ocaml-modules/zed/default.nix +++ b/pkgs/development/ocaml-modules/zed/default.nix @@ -3,8 +3,8 @@ let param = if stdenv.lib.versionAtLeast ocaml.version "4.02" then { - version = "1.5"; - sha256 = "1nq884cxl1k4daa549bk7bxarwivbpp51k4blbiwyxwfhs29xgfr"; + version = "1.6"; + sha256 = "00hhxcjf3bj3w2qm8nzs9x6vrqkadf4i0277s5whzy2rmiknj63v"; buildInputs = [ jbuilder ]; extra = { buildPhase = "jbuilder build -p zed"; From 37fc1fcd4557eb45924c7c8747b6ec0e953d300a Mon Sep 17 00:00:00 2001 From: Anthony Cowley Date: Mon, 6 Nov 2017 20:38:18 -0500 Subject: [PATCH 346/361] rtags: 2.12 -> 2.15 --- pkgs/development/tools/rtags/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/rtags/default.nix b/pkgs/development/tools/rtags/default.nix index 32be2a503bf..8fe47bd0cb5 100644 --- a/pkgs/development/tools/rtags/default.nix +++ b/pkgs/development/tools/rtags/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "rtags-${version}"; - version = "2.12"; + version = "2.15"; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ llvmPackages.llvm openssl emacs ] @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { rev = "refs/tags/v${version}"; fetchSubmodules = true; url = "https://github.com/andersbakken/rtags.git"; - sha256 = "0bgjcvyvkpqcgw4571iz39sqydmcaz6ymx7kxcmq6j7rffs6qs7l"; + sha256 = "12nnyav2q1ddkz9wm0aclhn7r74xj4ibrb0x05k7mcf694bg79c0"; # unicode file names lead to different checksums on HFS+ vs. other # filesystems because of unicode normalisation postFetch = '' From 7ccad2a4f2f89081903bc467bbd8b2fae41370ed Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Tue, 7 Nov 2017 00:34:44 -0500 Subject: [PATCH 347/361] vboot_reference: build all the tools This expands the build to include more things that are useful on chromebooks, like `crossystem` --- pkgs/tools/system/vboot_reference/default.nix | 16 +++++----- .../vboot_reference/dont_static_link.patch | 30 +++++++++++++++++++ 2 files changed, 38 insertions(+), 8 deletions(-) create mode 100644 pkgs/tools/system/vboot_reference/dont_static_link.patch diff --git a/pkgs/tools/system/vboot_reference/default.nix b/pkgs/tools/system/vboot_reference/default.nix index 0b8933bb7af..e410ef1cee5 100644 --- a/pkgs/tools/system/vboot_reference/default.nix +++ b/pkgs/tools/system/vboot_reference/default.nix @@ -17,17 +17,17 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildPhase = '' + patches = [ ./dont_static_link.patch ]; + + preBuild = '' 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/futility/futility $out/bin + makeFlags = [ + "DESTDIR=$(out)" + ]; + + postInstall = '' mkdir -p $out/share/vboot cp -r tests/devkeys* $out/share/vboot/ ''; diff --git a/pkgs/tools/system/vboot_reference/dont_static_link.patch b/pkgs/tools/system/vboot_reference/dont_static_link.patch new file mode 100644 index 00000000000..506b942e246 --- /dev/null +++ b/pkgs/tools/system/vboot_reference/dont_static_link.patch @@ -0,0 +1,30 @@ +--- +--- a/Makefile ++++ b/Makefile +@@ -964,7 +964,7 @@ ${UTILLIB21}: ${UTILLIB21_OBJS} ${FWLIB2 + # Link tests for external repos + ${BUILD}/host/linktest/extern: ${HOSTLIB} + ${BUILD}/host/linktest/extern: LIBS = ${HOSTLIB} +-${BUILD}/host/linktest/extern: LDLIBS += -static ++#${BUILD}/host/linktest/extern: LDLIBS += -static + TEST_OBJS += ${BUILD}/host/linktest/extern.o + + .PHONY: hostlib +@@ -1056,7 +1056,7 @@ ${UTIL_BINS} ${UTIL_BINS_STATIC}: ${UTIL + ${UTIL_BINS} ${UTIL_BINS_STATIC}: LIBS = ${UTILLIB} + + # Utilities for auto-update toolkits must be statically linked. +-${UTIL_BINS_STATIC}: LDFLAGS += -static ++${UTIL_BINS_STATIC}: + + + .PHONY: utils +@@ -1089,7 +1089,7 @@ futil: ${FUTIL_STATIC_BIN} ${FUTIL_BIN} + + ${FUTIL_STATIC_BIN}: ${FUTIL_STATIC_OBJS} ${UTILLIB} + @${PRINTF} " LD $(subst ${BUILD}/,,$@)\n" +- ${Q}${LD} -o $@ ${CFLAGS} ${LDFLAGS} -static $^ ${LDLIBS} ++ ${Q}${LD} -o $@ ${CFLAGS} ${LDFLAGS} $^ ${LDLIBS} + + ${FUTIL_BIN}: LDLIBS += ${CRYPTO_LIBS} + ${FUTIL_BIN}: ${FUTIL_OBJS} ${UTILLIB} From 52d6eecc241a26f5a0ecb9ed04c76d2fd924255a Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 7 Nov 2017 08:47:48 +0100 Subject: [PATCH 348/361] iniparser: 4.0 -> 4.1 --- .../libraries/iniparser/default.nix | 27 +++++++------------ 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/pkgs/development/libraries/iniparser/default.nix b/pkgs/development/libraries/iniparser/default.nix index a09bcd6f039..e586b30393e 100644 --- a/pkgs/development/libraries/iniparser/default.nix +++ b/pkgs/development/libraries/iniparser/default.nix @@ -1,17 +1,14 @@ { stdenv, fetchFromGitHub }: -let - inherit (stdenv.lib) optional; - -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "iniparser-${version}"; - version = "4.0"; + version = "4.1"; src = fetchFromGitHub { owner = "ndevilla"; repo = "iniparser"; rev = "v${version}"; - sha256 = "0339qa0qxa5z02xjcs5my8v91v0r9jm4piswrl1sa29kwyxgv5nb"; + sha256 = "0dhab6pad6wh816lr7r3jb6z273njlgw2vpw8kcfnmi7ijaqhnr5"; }; patches = ./no-usr.patch; @@ -19,9 +16,6 @@ in stdenv.mkDerivation rec { 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" ]; - installPhase = '' mkdir -p $out/lib @@ -34,17 +28,16 @@ in stdenv.mkDerivation rec { done; cp -r html $out/share/doc/${name} - '' + (if stdenv.isDarwin then '' cp libiniparser.a $out/lib - '' else '' - cp libiniparser.so.0 $out/lib - ln -s libiniparser.so.0 $out/lib/libiniparser.so - ''); + cp libiniparser.so.1 $out/lib + ln -s libiniparser.so.1 $out/lib/libiniparser.so + ''; - meta = { + meta = with stdenv.lib; { inherit (src.meta) homepage; description = "Free standalone ini file parsing library"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; + license = licenses.mit; + platforms = platforms.unix; + maintainers = [ maintainers.primeos ]; }; } From 27c8fd24e509d7ab0d80c7da1ab1f9ebb739c442 Mon Sep 17 00:00:00 2001 From: Raphael Das Gupta Date: Mon, 6 Nov 2017 22:33:37 +0100 Subject: [PATCH 349/361] nixos/mysql: fix typo in description of mysql.bind option --- nixos/modules/services/databases/mysql.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix index 845e6d4c22e..c6c463bce7d 100644 --- a/nixos/modules/services/databases/mysql.nix +++ b/nixos/modules/services/databases/mysql.nix @@ -67,7 +67,7 @@ in type = types.nullOr types.str; default = null; example = literalExample "0.0.0.0"; - description = "Address to bind to. The default it to bind to all addresses"; + description = "Address to bind to. The default is to bind to all addresses"; }; port = mkOption { From d2df286df7657c5be9bb1801ff9d5d099d8b0d0d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 7 Nov 2017 12:25:17 +0100 Subject: [PATCH 350/361] nixUnstable: nix-1.12pre5663_c7af84ce -> nix-1.12pre5732_fd10f6f2 --- 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 4359682d96a..efe239224ae 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 = "pre5663_c7af84ce"; + suffix = "pre5732_fd10f6f2"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "c7af84ce846a9deefa5b4db1b1bce1c091ca2a1e"; - sha256 = "1sc6rkx0500jz4fyfqm7443s1q24whmpx10mfs12wdk516f0q8qh"; + rev = "fd10f6f2414521947ca60b9d1508d909f50e9faa"; + sha256 = "17561jll94c8hdpxnyvdbjslnwr9g7ii4wqvrla7gfza236j9hff"; }; fromGit = true; })) // { perl-bindings = perl-bindings { nix = nixUnstable; }; }; From 139d931d4dc6f7da75cb66094c204526961a9633 Mon Sep 17 00:00:00 2001 From: Raphael Das Gupta Date: Tue, 7 Nov 2017 11:34:03 +0100 Subject: [PATCH 351/361] nox: add license information: MIT nox was licensed under MIT License since at least 0.0.2. See https://github.com/madjar/nox/commit/b7e084a7c507aff4c56afb4d719eefb142393d1a --- pkgs/tools/package-management/nox/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/package-management/nox/default.nix b/pkgs/tools/package-management/nox/default.nix index ed7ec74483f..f6c5c7b53e1 100644 --- a/pkgs/tools/package-management/nox/default.nix +++ b/pkgs/tools/package-management/nox/default.nix @@ -25,6 +25,7 @@ pythonPackages.buildPythonApplication rec { homepage = https://github.com/madjar/nox; description = "Tools to make nix nicer to use"; maintainers = [ lib.maintainers.madjar ]; + license = lib.licenses.mit; platforms = lib.platforms.all; }; } From 5a43ac2c601f870cc3b5eeee027712ed74726bca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maxime=20D=C3=A9n=C3=A8s?= Date: Sun, 22 Oct 2017 16:15:12 +0200 Subject: [PATCH 352/361] coqPackages.mathcomp: 1.6.1 -> 1.6.4 --- pkgs/development/coq-modules/mathcomp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix index a80c934c6c1..046c3b2f795 100644 --- a/pkgs/development/coq-modules/mathcomp/default.nix +++ b/pkgs/development/coq-modules/mathcomp/default.nix @@ -2,9 +2,9 @@ let param = { - version = "1.6.1"; - url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.1.tar.gz; - sha256 = "1j9ylggjzrxz1i2hdl2yhsvmvy5z6l4rprwx7604401080p5sgjw"; + version = "1.6.4"; + url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.4.tar.gz; + sha256 = "0qmjjb6jsxmmf4gpw10r30rmrvwqgzirvvgyy41mz2vhgwis8wn6"; }; in callPackage ./generic.nix { From 90d33e4eaa5248e640fa9f8836a7876a34d14c59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maxime=20D=C3=A9n=C3=A8s?= Date: Sun, 22 Oct 2017 16:15:57 +0200 Subject: [PATCH 353/361] coqPackages.ssreflect: 1.6.1 -> 1.6.4 --- pkgs/development/coq-modules/ssreflect/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/coq-modules/ssreflect/default.nix b/pkgs/development/coq-modules/ssreflect/default.nix index 352b98ab88b..49f999fc20b 100644 --- a/pkgs/development/coq-modules/ssreflect/default.nix +++ b/pkgs/development/coq-modules/ssreflect/default.nix @@ -2,9 +2,9 @@ let param = { - version = "1.6.1"; - url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.1.tar.gz; - sha256 = "1j9ylggjzrxz1i2hdl2yhsvmvy5z6l4rprwx7604401080p5sgjw"; + version = "1.6.4"; + url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.4.tar.gz; + sha256 = "0qmjjb6jsxmmf4gpw10r30rmrvwqgzirvvgyy41mz2vhgwis8wn6"; }; in callPackage ./generic.nix { From 3c3e1db36408277e6b8590c822146978d59868b2 Mon Sep 17 00:00:00 2001 From: Parnell Springmeyer Date: Tue, 7 Nov 2017 06:26:45 -0600 Subject: [PATCH 354/361] signal-desktop: init at 1.0.35 (#31335) * signal-desktop: init at 1.0.35 --- .../signal-desktop/default.nix | 88 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 90 insertions(+) create mode 100644 pkgs/applications/networking/instant-messengers/signal-desktop/default.nix diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix new file mode 100644 index 00000000000..0376fb79c9b --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -0,0 +1,88 @@ +{ stdenv, lib, fetchurl, dpkg, gnome2, atk, cairo, gdk_pixbuf, glib, freetype, +fontconfig, dbus, libX11, xlibs, libXi, libXcursor, libXdamage, libXrandr, +libXcomposite, libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, +nspr, alsaLib, cups, expat, udev +}: +let + rpath = lib.makeLibraryPath [ + alsaLib + atk + cairo + cups + dbus + expat + fontconfig + freetype + gdk_pixbuf + glib + gnome2.GConf + gnome2.gtk + gnome2.pango + libX11 + libXScrnSaver + libXcomposite + libXcursor + libXdamage + libXext + libXfixes + libXi + libXrandr + libXrender + libXtst + nspr + nss + stdenv.cc.cc + udev + xlibs.libxcb + ]; + +in + stdenv.mkDerivation rec { + name = "signal-desktop-${version}"; + + version = "1.0.35"; + + src = + if stdenv.system == "x86_64-linux" then + fetchurl { + url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; + sha256 = "d9f9d4d54f4121efc8eadf1cf0ff957828088b313e53b66dc540b851c44c1860"; + } + else + throw "Signal for Desktop is not currently supported on ${stdenv.system}"; + + phases = [ "unpackPhase" "installPhase" ]; + nativeBuildInputs = [ dpkg ]; + unpackPhase = "dpkg-deb -x $src ."; + installPhase = '' + mkdir -p $out + cp -R opt $out + + mv ./usr/share $out/share + mv $out/opt/Signal $out/libexec + rmdir $out/opt + + chmod -R g-w $out + + # Patch signal + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath ${rpath}:$out/libexec $out/libexec/signal-desktop + + # Symlink to bin + mkdir -p $out/bin + ln -s $out/libexec/signal-desktop $out/bin/signal-desktop + + # Fix the desktop link + substituteInPlace $out/share/applications/signal-desktop.desktop \ + --replace /opt/Signal/signal-desktop $out/bin/signal-desktop + ''; + + meta = { + description = "Signal Private Messenger for the Desktop."; + homepage = https://signal.org/; + license = lib.licenses.gpl3; + platforms = [ + "x86_64-linux" + ]; + }; + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 94522d50e46..a99e007f733 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4379,6 +4379,8 @@ with pkgs; sigil = libsForQt56.callPackage ../applications/editors/sigil { }; + signal-desktop = callPackage ../applications/networking/instant-messengers/signal-desktop { }; + # aka., pgp-tools signing-party = callPackage ../tools/security/signing-party { }; From 3339a7dc7c047c79d71ea58f98cd9817612aa435 Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Tue, 7 Nov 2017 12:36:48 +0000 Subject: [PATCH 355/361] python.pkgs.textfixtures: 4.5.0 -> 5.3.0 --- .../python-modules/testfixtures/default.nix | 23 +++++++++++++++++ pkgs/top-level/python-packages.nix | 25 +------------------ 2 files changed, 24 insertions(+), 24 deletions(-) create mode 100644 pkgs/development/python-modules/testfixtures/default.nix diff --git a/pkgs/development/python-modules/testfixtures/default.nix b/pkgs/development/python-modules/testfixtures/default.nix new file mode 100644 index 00000000000..23b5a5aa9e2 --- /dev/null +++ b/pkgs/development/python-modules/testfixtures/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi +, mock, manuel, pytest, sybil, zope_component, django }: + +buildPythonPackage rec { + pname = "testfixtures"; + version = "5.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1xfar653qmikwb94xj3f0xfp8dh2llxjsxipx1272d8qwl0aknnx"; + }; + + checkInputs = [ mock manuel pytest sybil zope_component ]; + + checkPhase = '' + # django is too much hasle to setup at the moment + pytest --ignore=testfixtures/tests/test_django testfixtures/tests + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/Simplistix/testfixtures"; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8cba91324a0..2cfe3f6087f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -21809,30 +21809,7 @@ EOF }; }; - testfixtures = buildPythonPackage rec { - name = "testfixtures-${version}"; - version = "4.5.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/t/testfixtures/testfixtures-${version}.tar.gz"; - sha256 = "0my8zq9d27mc7j78pz9971cn5wz6zi4vxlqa50szr2vq9j2xxkll"; - }; - - buildInputs = with self; [ nose mock manuel ]; - - checkPhase = '' - nosetests -v - ''; - - # Test suite seems broken - # TypeError: TestSuite() missing 1 required positional argument: 'm' - # Haven't checked with newer version - doCheck = false; - - meta = with stdenv.lib; { - homepage = "https://github.com/Simplistix/testfixtures"; - }; - }; + testfixtures = callPackage ../development/python-modules/testfixtures {}; tissue = buildPythonPackage rec { name = "tissue-0.9.2"; From 8fb1ec1af424236fc3e6abfca70fc60b9cff5fbb Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Tue, 7 Nov 2017 12:41:27 +0000 Subject: [PATCH 356/361] python.pkgs.update_checker: 0.11 -> 0.16 --- .../python-modules/update_checker/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +--------------- 2 files changed, 23 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/update_checker/default.nix diff --git a/pkgs/development/python-modules/update_checker/default.nix b/pkgs/development/python-modules/update_checker/default.nix new file mode 100644 index 00000000000..ad401d80190 --- /dev/null +++ b/pkgs/development/python-modules/update_checker/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, fetchPypi, requests}: + +buildPythonPackage rec { + pname = "update_checker"; + version = "0.16"; + + src = fetchPypi { + inherit pname version; + sha256 = "1f38l40d32dm0avcidf3dmikma8z0la84yngj88v4xygzi399qvh"; + }; + + propagatedBuildInputs = [ requests ]; + + # requires network + doCheck = false; + + meta = with stdenv.lib; { + description = "A python module that will check for package updates"; + homepage = https://github.com/bboe/update_checker; + license = licenses.bsd2; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2cfe3f6087f..8f39040f4bf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20556,24 +20556,7 @@ in { }; }; - update_checker = buildPythonPackage rec { - name = "update_checker-0.11"; - - src = pkgs.fetchurl { - url = "mirror://pypi/u/update_checker/${name}.tar.gz"; - sha256 = "681bc7c26cffd1564eb6f0f3170d975a31c2a9f2224a32f80fe954232b86f173"; - }; - - propagatedBuildInputs = with self; [ requests ]; - - doCheck = false; - - meta = { - description = "A python module that will check for package updates"; - homepage = https://github.com/bboe/update_checker; - license = licenses.bsd2; - }; - }; + update_checker = callPackage ../development/python-modules/update_checker {}; uritemplate = buildPythonPackage rec { name = "uritemplate-${version}"; From b0225f8cbc1ae6a07bd35b020a17301a2d5787a9 Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Tue, 7 Nov 2017 12:47:24 +0000 Subject: [PATCH 357/361] python.pkgs.sybil: init at 1.0.5 --- .../python-modules/sybil/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/python-modules/sybil/default.nix diff --git a/pkgs/development/python-modules/sybil/default.nix b/pkgs/development/python-modules/sybil/default.nix new file mode 100644 index 00000000000..b1fe22df476 --- /dev/null +++ b/pkgs/development/python-modules/sybil/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonApplication, fetchPypi +, pytest, nose }: + +buildPythonApplication rec { + pname = "sybil"; + version = "1.0.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "0x8qd5p5qliv8wmdglda2iy3f70i4jg8zqyk8yhklm5hrxm8jdl6"; + }; + + checkInputs = [ pytest nose ]; + + checkPhase = '' + py.test tests + ''; + + meta = with stdenv.lib; { + description = "Automated testing for the examples in your documentation."; + homepage = https://github.com/cjw296/sybil/; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8f39040f4bf..8cc46bc2589 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -19733,6 +19733,8 @@ in { }; }; + sybil = callPackage ../development/python-modules/sybil { }; + syncthing-gtk = buildPythonPackage rec { version = "0.9.2.3"; name = "syncthing-gtk-${version}"; From af9e6c1634de3a0f256cbcf788dd8b16d7de8618 Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Tue, 7 Nov 2017 12:50:11 +0000 Subject: [PATCH 358/361] python.pkgs.prawcore: init at 0.12.0 --- .../python-modules/prawcore/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/prawcore/default.nix diff --git a/pkgs/development/python-modules/prawcore/default.nix b/pkgs/development/python-modules/prawcore/default.nix new file mode 100644 index 00000000000..eb3fb784dc9 --- /dev/null +++ b/pkgs/development/python-modules/prawcore/default.nix @@ -0,0 +1,38 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub +, requests +, testfixtures, mock, requests_toolbelt +, betamax, betamax-serializers, betamax-matchers +}: + +buildPythonPackage rec { + pname = "prawcore"; + version = "0.12.0"; + + src = fetchFromGitHub { + owner = "praw-dev"; + repo = "prawcore"; + rev = "v${version}"; + sha256 = "1z5fz6v4bv6xw84l4q3rpw3j63bb2dldl0fd6ckz8wqlpb2l45br"; + }; + + propagatedBuildInputs = [ + requests + ]; + + checkInputs = [ + testfixtures + mock + betamax + betamax-serializers + betamax-matchers + requests_toolbelt + ]; + + meta = with stdenv.lib; { + description = "Low-level communication layer for PRAW"; + homepage = http://praw.readthedocs.org/; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = with maintainers; [ jgeerds ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8cc46bc2589..dbfb52b1fad 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15095,6 +15095,8 @@ in { }; }; + prawcore = callPackage ../development/python-modules/prawcore { }; + premailer = callPackage ../development/python-modules/premailer { }; prettytable = buildPythonPackage rec { From a5744101a2a1e01901e8a82a4a0654bdaff5ff9a Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Tue, 7 Nov 2017 12:53:19 +0000 Subject: [PATCH 359/361] python.pkgs.praw: 3.5.0 -> 5.2.0 --- .../python-modules/praw/default.nix | 43 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 29 +------------ 2 files changed, 44 insertions(+), 28 deletions(-) create mode 100644 pkgs/development/python-modules/praw/default.nix diff --git a/pkgs/development/python-modules/praw/default.nix b/pkgs/development/python-modules/praw/default.nix new file mode 100644 index 00000000000..c0be1009b06 --- /dev/null +++ b/pkgs/development/python-modules/praw/default.nix @@ -0,0 +1,43 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub +, requests, decorator, flake8, mock, six, update_checker, pytestrunner, prawcore +, pytest, betamax, betamax-serializers, betamax-matchers, requests_toolbelt +}: + +buildPythonPackage rec { + pname = "praw"; + version = "5.2.0"; + + src = fetchFromGitHub { + owner = "praw-dev"; + repo = "praw"; + rev = "v${version}"; + sha256 = "0nwfadczxa1fyq65zc3sfv8g2r4w3xrx3bdi5fv9xpn97wh2ifgw"; + }; + + propagatedBuildInputs = [ + requests + decorator + flake8 + mock + six + update_checker + pytestrunner + prawcore + ]; + + checkInputs = [ + pytest + betamax + betamax-serializers + betamax-matchers + requests_toolbelt + ]; + + meta = with stdenv.lib; { + description = "Python Reddit API wrapper"; + homepage = http://praw.readthedocs.org/; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = with maintainers; [ jgeerds ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dbfb52b1fad..727a2b25adb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15066,34 +15066,7 @@ in { }; }; - praw = buildPythonPackage rec { - name = "praw-3.5.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/praw/${name}.zip"; - sha256 = "1hwdzqbrjdkicqhyxpcpsmld21k0ndpy8d2gk6l5mv9isw3dm8qa"; - }; - - propagatedBuildInputs = with self; [ - requests - decorator - flake8 - mock - six - update_checker - ]; - - # can't find the tests module? - doCheck = false; - - meta = { - description = "Python Reddit API wrapper"; - homepage = http://praw.readthedocs.org/; - license = licenses.gpl3; - platforms = platforms.all; - maintainers = with maintainers; [ jgeerds ]; - }; - }; + praw = callPackage ../development/python-modules/praw { }; prawcore = callPackage ../development/python-modules/prawcore { }; From 5413be5645d688a2dd56c024a796e8f213bc657c Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Tue, 7 Nov 2017 12:59:22 +0000 Subject: [PATCH 360/361] python.pkgs.betamax-serializers: init at 0.2.0 --- .../betamax-serializers/default.nix | 20 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 1 + 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/python-modules/betamax-serializers/default.nix diff --git a/pkgs/development/python-modules/betamax-serializers/default.nix b/pkgs/development/python-modules/betamax-serializers/default.nix new file mode 100644 index 00000000000..2ad23f1f9e6 --- /dev/null +++ b/pkgs/development/python-modules/betamax-serializers/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi +, betamax, pyyaml }: + +buildPythonPackage rec { + pname = "betamax-serializers"; + version = "0.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1yqzwx204m4lxlpg04cwv6iwzmcpdzr19wvj97vvxchp0g4qg83d"; + }; + + buildInputs = [ betamax pyyaml ]; + + meta = with stdenv.lib; { + homepage = https://gitlab.com/betamax/serializers; + description = "A set of third-party serializers for Betamax"; + license = licenses.asl20; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 727a2b25adb..475b3a2ea40 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1329,6 +1329,7 @@ in { maintainers = with maintainers; [ pSub ]; }; }; + betamax-serializers = callPackage ../development/python-modules/betamax-serializers { }; bibtexparser = callPackage ../development/python-modules/bibtexparser { }; From b71500ef5ae25a8ae7a445302dfeb1ca3b71b415 Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Tue, 7 Nov 2017 13:00:05 +0000 Subject: [PATCH 361/361] python.pkgs.betamax-matchers: 0.3.0 -> 0.4.0 --- .../betamax-matchers/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 18 +--------------- 2 files changed, 22 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/betamax-matchers/default.nix diff --git a/pkgs/development/python-modules/betamax-matchers/default.nix b/pkgs/development/python-modules/betamax-matchers/default.nix new file mode 100644 index 00000000000..762154ac45d --- /dev/null +++ b/pkgs/development/python-modules/betamax-matchers/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi +, betamax, requests_toolbelt }: + +buildPythonPackage rec { + pname = "betamax-matchers"; + version = "0.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "07qpwjyq2i2aqhz5iwghnj4pqr2ys5n45v1vmpcfx9r5mhwrsq43"; + }; + + buildInputs = [ betamax requests_toolbelt ]; + + meta = with stdenv.lib; { + homepage = https://github.com/sigmavirus24/betamax_matchers; + description = "A group of experimental matchers for Betamax"; + license = licenses.asl20; + maintainers = with maintainers; [ pSub ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 475b3a2ea40..9941a80dd6b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1311,24 +1311,8 @@ in { }; }; - betamax-matchers = buildPythonPackage rec { - name = "betamax-matchers-${version}"; - version = "0.3.0"; + betamax-matchers = callPackage ../development/python-modules/betamax-matchers { }; - src = pkgs.fetchurl { - url = "mirror://pypi/b/betamax-matchers/${name}.tar.gz"; - sha256 = "039kvqsdcvvlfxjc3n1x2xvjg6qkqbql0p7rc4z7bnxm9kcm88la"; - }; - - buildInputs = with self; [ betamax requests_toolbelt ]; - - meta = with stdenv.lib; { - homepage = https://github.com/sigmavirus24/betamax_matchers; - description = "A group of experimental matchers for Betamax"; - license = licenses.asl20; - maintainers = with maintainers; [ pSub ]; - }; - }; betamax-serializers = callPackage ../development/python-modules/betamax-serializers { }; bibtexparser = callPackage ../development/python-modules/bibtexparser { };