From ab2b3a5d0ab682388a39e267705e2f838199b179 Mon Sep 17 00:00:00 2001 From: Ryan Trinkle Date: Wed, 6 Dec 2017 11:17:38 -0500 Subject: [PATCH 001/296] nat: add extraCommands and extraStopCommands options --- nixos/modules/services/networking/nat.nix | 26 +++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/nixos/modules/services/networking/nat.nix b/nixos/modules/services/networking/nat.nix index bfaf30c1178..df4246d216d 100644 --- a/nixos/modules/services/networking/nat.nix +++ b/nixos/modules/services/networking/nat.nix @@ -19,6 +19,8 @@ let iptables -w -t nat -D POSTROUTING -j nixos-nat-post 2>/dev/null || true iptables -w -t nat -F nixos-nat-post 2>/dev/null || true iptables -w -t nat -X nixos-nat-post 2>/dev/null || true + + ${cfg.extraStopCommands} ''; setupNat = '' @@ -59,6 +61,8 @@ let --to-destination ${cfg.dmzHost} ''} + ${cfg.extraCommands} + # Append our chains to the nat tables iptables -w -t nat -A PREROUTING -j nixos-nat-pre iptables -w -t nat -A POSTROUTING -j nixos-nat-post @@ -170,6 +174,28 @@ in ''; }; + networking.nat.extraCommands = mkOption { + type = types.lines; + default = ""; + example = "iptables -A INPUT -p icmp -j ACCEPT"; + description = + '' + Additional shell commands executed as part of the nat + initialisation script. + ''; + }; + + networking.nat.extraStopCommands = mkOption { + type = types.lines; + default = ""; + example = "iptables -D INPUT -p icmp -j ACCEPT || true"; + description = + '' + Additional shell commands executed as part of the nat + teardown script. + ''; + }; + }; From 472973dca65e7228ac54878c0b2d0e5cc59dff63 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Tue, 19 Dec 2017 08:53:23 +0100 Subject: [PATCH 002/296] qjackctl: 0.4.5 -> 0.5.0 --- pkgs/applications/audio/qjackctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix index c5a977d741a..925078fb3a1 100644 --- a/pkgs/applications/audio/qjackctl/default.nix +++ b/pkgs/applications/audio/qjackctl/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, alsaLib, libjack2, dbus, qtbase, qttools, qtx11extras }: stdenv.mkDerivation rec { - version = "0.4.5"; + version = "0.5.0"; name = "qjackctl-${version}"; # some dependencies such as killall have to be installed additionally src = fetchurl { url = "mirror://sourceforge/qjackctl/${name}.tar.gz"; - sha256 = "1dsavjfzz5bpzc80mvfs940w9f9f47cf4r9cqxnaqrl4xilsa3f5"; + sha256 = "0lx81dfwanc10vrny1vzi0wx73ph82dlz99ffjzsigj3cqzz6x4s"; }; buildInputs = [ From 62d228bed4b86b46540d28a22e837da1b65b6052 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Tue, 19 Dec 2017 09:10:53 +0100 Subject: [PATCH 003/296] qmidinet: 0.4.3 -> 0.5.0 --- pkgs/applications/audio/qmidinet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/qmidinet/default.nix b/pkgs/applications/audio/qmidinet/default.nix index 132e4a0fca2..831a30bc4fe 100644 --- a/pkgs/applications/audio/qmidinet/default.nix +++ b/pkgs/applications/audio/qmidinet/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, qt5, alsaLib, libjack2 }: stdenv.mkDerivation rec { - version = "0.4.3"; + version = "0.5.0"; name = "qmidinet-${version}"; src = fetchurl { url = "mirror://sourceforge/qmidinet/${name}.tar.gz"; - sha256 = "1qhxhlvi6bj2a06i48pw81zf5vd36idxbq04g30794yhqcimh6vw"; + sha256 = "0nxbvjgx11ljy1nxqknyq7pla55ky2ybi1jbisvq2cqxa34jsxf6"; }; hardeningDisable = [ "format" ]; From db1e1dcf341a0fe9d6d3b38a121c0c01da41209c Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Tue, 19 Dec 2017 10:55:19 +0100 Subject: [PATCH 004/296] sqldeveloper: fix trailing whitespace --- pkgs/development/tools/database/sqldeveloper/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/database/sqldeveloper/default.nix b/pkgs/development/tools/database/sqldeveloper/default.nix index d5acd487e6b..67fbc84cfa1 100644 --- a/pkgs/development/tools/database/sqldeveloper/default.nix +++ b/pkgs/development/tools/database/sqldeveloper/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { obtain it you need to - navigate to ${url} - - make sure that it says "Version ${version}" above the list of downloads + - make sure that it says "Version ${version}" above the list of downloads - if it does not, click on the "Previous Version" link below the downloads and repeat until the version is correct. This is necessarry because as the time of this writing there exists no permanent link for the current version From eac6d05de31f5aaec4190f50de1d3366dde25d47 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Tue, 19 Dec 2017 10:58:47 +0100 Subject: [PATCH 005/296] sqldeveloper: 17.3.0.271.2323 -> 17.3.1.279.0537 --- pkgs/development/tools/database/sqldeveloper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/database/sqldeveloper/default.nix b/pkgs/development/tools/database/sqldeveloper/default.nix index 67fbc84cfa1..a7a8640a94e 100644 --- a/pkgs/development/tools/database/sqldeveloper/default.nix +++ b/pkgs/development/tools/database/sqldeveloper/default.nix @@ -1,7 +1,7 @@ { stdenv, makeWrapper, requireFile, unzip, openjdk }: stdenv.mkDerivation rec { - version = "17.3.0.271.2323"; + version = "17.3.1.279.0537"; name = "sqldeveloper-${version}"; src = requireFile rec { @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { nix-prefetch-url --type sha256 file:///path/to/${name} ''; # obtained by `sha256sum sqldeveloper-${version}-no-jre.zip` - sha256 = "06ba5920544bacbea83425548b1b8f69ab3e9bb279076321aece2c0c6d415dad"; + sha256 = "d9c3c61b12a57d6b0fd6e172bf5716d6e829306d44815bf68ae42eab8a51bea3"; }; buildInputs = [ makeWrapper unzip ]; From fe502b0fad84e591a7e4fb85105bee3d249b8386 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 19 Dec 2017 08:34:11 -0200 Subject: [PATCH 006/296] connman: enable support for Wireless daemon for Linux (iwd) --- pkgs/tools/networking/connman/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix index 0dc3d02d154..f40b1ce6f4c 100644 --- a/pkgs/tools/networking/connman/default.nix +++ b/pkgs/tools/networking/connman/default.nix @@ -44,6 +44,7 @@ stdenv.mkDerivation rec { "--enable-datafiles" "--enable-pptp" "--with-pptp=${pptp}/sbin/pptp" + "--enable-iwd" ]; postInstall = '' From 23ffb9d701e8eb7b56f8c2c56f69ec9114e3c3ca Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Tue, 19 Dec 2017 16:55:19 -0500 Subject: [PATCH 007/296] go-1.8, go-1.9: use stdenv.shell instead of /usr/bin/env bash Fixes tests on ARMv6/7 during sandboxed builds. --- pkgs/development/compilers/go/1.8.nix | 2 +- pkgs/development/compilers/go/1.9.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.8.nix b/pkgs/development/compilers/go/1.8.nix index 210f259df89..23fd3b0f291 100644 --- a/pkgs/development/compilers/go/1.8.nix +++ b/pkgs/development/compilers/go/1.8.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go '' + optionalString stdenv.isArm '' sed -i '/TestCurrent/areturn' src/os/user/user_test.go - echo '#!/usr/bin/env bash' > misc/cgo/testplugin/test.bash + echo '#!${stdenv.shell}' > misc/cgo/testplugin/test.bash '' + optionalString stdenv.isDarwin '' substituteInPlace src/race.bash --replace \ "sysctl machdep.cpu.extfeatures | grep -qv EM64T" true diff --git a/pkgs/development/compilers/go/1.9.nix b/pkgs/development/compilers/go/1.9.nix index 8708bd762c4..e908a8725e2 100644 --- a/pkgs/development/compilers/go/1.9.nix +++ b/pkgs/development/compilers/go/1.9.nix @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go '' + optionalString stdenv.isArm '' sed -i '/TestCurrent/areturn' src/os/user/user_test.go - echo '#!/usr/bin/env bash' > misc/cgo/testplugin/test.bash + echo '#!${stdenv.shell}' > misc/cgo/testplugin/test.bash '' + optionalString stdenv.isDarwin '' substituteInPlace src/race.bash --replace \ "sysctl machdep.cpu.extfeatures | grep -qv EM64T" true From 3bfb5f6848da36b22a4b8499187bf56035a28661 Mon Sep 17 00:00:00 2001 From: joncojonathan Date: Tue, 26 Dec 2017 10:13:44 +0000 Subject: [PATCH 008/296] phpstorm: 2017.3 -> 2017.3.2 Motivation for change: Updating to latest version. --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index ec0d90115e6..a4f069c1e89 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -299,12 +299,12 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2017.3"; /* updated by script */ + version = "2017.3.2"; description = "Professional IDE for Web and PHP developers"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "1byhlm5bnp6ic4n2xg17v4g34ipygy50i9xj4292b0xw7srxh910"; /* updated by script */ + sha256 = "1grkqvj4j33d8hmy11ipkcci20sw7jpnc5zl28a9g85f2pzvsvs0"; }; wmClass = "jetbrains-phpstorm"; update-channel = "PS2017.3"; From 92b687398a57c28718e7dc9d026c18351f227c23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 26 Dec 2017 15:58:12 -0200 Subject: [PATCH 009/296] numix-icon-theme: 17-11-18 -> 17-12-25 --- pkgs/data/icons/numix-icon-theme/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/data/icons/numix-icon-theme/default.nix b/pkgs/data/icons/numix-icon-theme/default.nix index a7c6c490897..08fd012bb41 100644 --- a/pkgs/data/icons/numix-icon-theme/default.nix +++ b/pkgs/data/icons/numix-icon-theme/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, hicolor_icon_theme }: stdenv.mkDerivation rec { - version = "2017-11-18"; + version = "17-12-25"; package-name = "numix-icon-theme"; @@ -10,10 +10,12 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "numixproject"; repo = package-name; - rev = "ea7f2069ca1f6190494e96aa2febcadf6248c5b4"; - sha256 = "1nk0mc2qycwmjqdlrsfgar5m83pyj3hf6f66pywf9706nn2yz8fv"; + rev = version; + sha256 = "0q3hpq2jc9iwnzzqpb12g1qzjsw4ckhdqkfqf6nirl87r5drkv6j"; }; + buildInputs = [ hicolor_icon_theme ]; + dontBuild = true; installPhase = '' From fbf9ab27dbf27d623edd1accd3d1f286800c0975 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 26 Dec 2017 15:59:32 -0200 Subject: [PATCH 010/296] numix-icon-theme-circle: 17-09-13 -> 17-12-25 --- pkgs/data/icons/numix-icon-theme-circle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix index 1dd268cf816..3de3dbe110c 100644 --- a/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, numix-icon-theme }: stdenv.mkDerivation rec { - version = "17-09-13"; + version = "17-12-25"; package-name = "numix-icon-theme-circle"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "numixproject"; repo = package-name; rev = version; - sha256 = "14ck07j9v0yh8ky191sa3xxi4qh7bbg84i8jijy3kbjcx9s0zl8a"; + sha256 = "10sn2w9xzmh7arbw0vn516p9nfym1bs8bf7i8zzvz7y09s61lkxh"; }; buildInputs = [ numix-icon-theme ]; From 12629c689546f082c495fd59be2c236ee9d50905 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 26 Dec 2017 15:59:56 -0200 Subject: [PATCH 011/296] numix-icon-theme-square: 17-09-13 -> 17-12-25 --- pkgs/data/icons/numix-icon-theme-square/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/data/icons/numix-icon-theme-square/default.nix index 90040c8fc28..503a66b736f 100644 --- a/pkgs/data/icons/numix-icon-theme-square/default.nix +++ b/pkgs/data/icons/numix-icon-theme-square/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${package-name}-${version}"; package-name = "numix-icon-theme-square"; - version = "17-09-13"; + version = "17-12-25"; src = fetchFromGitHub { owner = "numixproject"; repo = package-name; rev = version; - sha256 = "1grpm902hiid561fbp9y1rb9z21y8d1krjgxgs7j8qnpx380sd5x"; + sha256 = "07rcfkz3c1z5fwqiib4r1bm964mpwf1f128xm8kz55xp6w1c7zgl"; }; buildInputs = [ numix-icon-theme ]; From 0ccf8bf1df97f6c341b2a09b4f57489895a3bdc6 Mon Sep 17 00:00:00 2001 From: Alexandre Peyroux Date: Tue, 26 Dec 2017 20:07:32 +0100 Subject: [PATCH 012/296] jmeter: 2.11 -> 3.3 and fix java command not found --- pkgs/applications/networking/jmeter/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/jmeter/default.nix b/pkgs/applications/networking/jmeter/default.nix index db36c8dca61..a89898c3739 100644 --- a/pkgs/applications/networking/jmeter/default.nix +++ b/pkgs/applications/networking/jmeter/default.nix @@ -1,13 +1,17 @@ -{ fetchurl, stdenv, ant }: +{ fetchurl, stdenv, jre }: stdenv.mkDerivation rec { - name = "jmeter-2.11"; + name = "jmeter-3.3"; src = fetchurl { url = "http://archive.apache.org/dist/jmeter/binaries/apache-${name}.tgz"; - sha256 = "1fr3sw06qncb6yygcf2lbnkxma4v1dbigpf39ajrm0isxbpyv944"; + sha256 = "190k6yrh5casadphkv4azp4nvf4wf2q85mrfysw67r9d96nb9kk5"; }; + buildInputs = [ jre ]; + installPhase = '' + substituteInPlace ./bin/jmeter.sh --replace "java $ARGS" "${jre}/bin/java $ARGS" + substituteInPlace ./bin/jmeter --replace "java $ARGS" "${jre}/bin/java $ARGS" mkdir $out cp ./* $out/ -R ''; From b95cdd4f6cb547a3ce09608396db85a49f39d237 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Fri, 29 Dec 2017 22:11:04 -0500 Subject: [PATCH 013/296] gitlab: Rename jws_private_key to openid_connect_signing_key See https://github.com/gitlabhq/omnibus-gitlab/commit/24d56df29b156576f16fca84257304c2f062e9db --- nixos/modules/services/misc/gitlab.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 7b2b40e5923..cd042ad1695 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -70,7 +70,7 @@ let secret_key_base: ${cfg.secrets.secret} otp_key_base: ${cfg.secrets.otp} db_key_base: ${cfg.secrets.db} - jws_private_key: ${builtins.toJSON cfg.secrets.jws} + openid_connect_signing_key: ${builtins.toJSON cfg.secrets.jws} ''; gitlabConfig = { From 2fd1b95fad27331307bfd14bda731e5997d60908 Mon Sep 17 00:00:00 2001 From: wchresta <34962284+wchresta@users.noreply.github.com> Date: Sat, 30 Dec 2017 21:06:09 +0100 Subject: [PATCH 014/296] steam: add wrapper testing for libGL NixOS: Failing to set hardware.opengl.driSupport32Bit will lead to a confusing error message about missing libGL.so.1. We include a wrapper around the steam bin to test for working 32bit opengl with glxinfo. When failing, we display a proper warning hinting towards the option. Fixes: #19518 --- pkgs/games/steam/chrootenv.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix index a7392bbc34e..019b1577e15 100644 --- a/pkgs/games/steam/chrootenv.nix +++ b/pkgs/games/steam/chrootenv.nix @@ -69,6 +69,9 @@ in buildFHSUserEnv rec { xlibs.libX11 xlibs.libXfixes + # Needed to properly check for libGL.so.1 in steam-wrapper.sh + pkgsi686Linux.glxinfo + # Not formally in runtime but needed by some games gst_all_1.gstreamer gst_all_1.gst-plugins-ugly @@ -103,7 +106,15 @@ in buildFHSUserEnv rec { export TZDIR=/etc/zoneinfo ''; - runScript = "steam"; + runScript = writeScript "steam-wrapper.sh" '' + #!${stdenv.shell} + glxinfo >/dev/null 2>&1 + if [ ! "$?" = "0" ]; then + echo "*** WARNING: Test for 32-bit libGL unsuccessful." + echo " This could mean you forgot to activate hardware.opengl.driSupport32Bit" + fi + steam + ''; passthru.run = buildFHSUserEnv { name = "steam-run"; From 341583b2d230f810f940dd02cf66ed2298413f70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Sun, 31 Dec 2017 03:34:11 +0100 Subject: [PATCH 015/296] fcron module: be compatible with non-wrapped sendmail's, like opensmtpd's --- nixos/modules/services/scheduling/fcron.nix | 28 +++++++++++++-------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/nixos/modules/services/scheduling/fcron.nix b/nixos/modules/services/scheduling/fcron.nix index ac589be5773..e3b6b638f5a 100644 --- a/nixos/modules/services/scheduling/fcron.nix +++ b/nixos/modules/services/scheduling/fcron.nix @@ -90,16 +90,24 @@ in [ (allowdeny "allow" (cfg.allow)) (allowdeny "deny" cfg.deny) # see man 5 fcron.conf - { source = pkgs.writeText "fcron.conf" '' - fcrontabs = /var/spool/fcron - pidfile = /var/run/fcron.pid - fifofile = /var/run/fcron.fifo - fcronallow = /etc/fcron.allow - fcrondeny = /etc/fcron.deny - shell = /bin/sh - sendmail = /run/wrappers/bin/sendmail - editor = ${pkgs.vim}/bin/vim - ''; + { source = + let + isSendmailWrapped = + lib.hasAttr "sendmail" config.security.wrappers; + sendmailPath = + if isSendmailWrapped then "/run/wrappers/bin/sendmail" + else "${config.system.path}/bin/sendmail"; + in + pkgs.writeText "fcron.conf" '' + fcrontabs = /var/spool/fcron + pidfile = /var/run/fcron.pid + fifofile = /var/run/fcron.fifo + fcronallow = /etc/fcron.allow + fcrondeny = /etc/fcron.deny + shell = /bin/sh + sendmail = ${sendmailPath} + editor = ${pkgs.vim}/bin/vim + ''; target = "fcron.conf"; gid = config.ids.gids.fcron; mode = "0644"; From b1d1679d5c0d3eed2c99822525da50ea1a0bec0f Mon Sep 17 00:00:00 2001 From: Tyler Compton Date: Sun, 31 Dec 2017 03:28:06 -0700 Subject: [PATCH 016/296] lxterminal: init at 0.3.1 --- lib/maintainers.nix | 1 + pkgs/applications/misc/lxterminal/default.nix | 44 +++++++++++++++++++ .../setup-hooks/build-single-xml-catalog.sh | 21 +++++++++ pkgs/top-level/all-packages.nix | 8 ++++ 4 files changed, 74 insertions(+) create mode 100644 pkgs/applications/misc/lxterminal/default.nix create mode 100644 pkgs/build-support/setup-hooks/build-single-xml-catalog.sh diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 684bb3489b9..6afa27e979d 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -693,6 +693,7 @@ vbmithr = "Vincent Bernardoff "; vcunat = "Vladimír Čunát "; vdemeester = "Vincent Demeester "; + velovix = "Tyler Compton "; veprbl = "Dmitry Kalinkin "; vidbina = "David Asabina "; vifino = "Adrian Pistol "; diff --git a/pkgs/applications/misc/lxterminal/default.nix b/pkgs/applications/misc/lxterminal/default.nix new file mode 100644 index 00000000000..15cb5ea61cc --- /dev/null +++ b/pkgs/applications/misc/lxterminal/default.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchurl, automake, autoconf, intltool, pkgconfig, gtk2, vte +, libxslt, docbook_xml_dtd_412, docbook_xml_xslt, libxml2, findXMLCatalogs +, buildSingleXMLCatalog +}: + +let version = "0.3.1"; in + +stdenv.mkDerivation rec { + name = "lxterminal-${version}"; + + src = fetchurl { + url = "https://github.com/lxde/lxterminal/archive/${version}.tar.gz"; + sha256 = "e91f15c8a726d5c13227263476583137a2639d4799c021ca0726c9805021b54c"; + }; + + configureFlags = [ + "--enable-man" + "--with-xml-catalog=../catalog.xml" # Generated by buildSingleXMLCatalog + ]; + + buildInputs = [ + automake autoconf intltool pkgconfig gtk2 vte libxslt docbook_xml_dtd_412 + docbook_xml_xslt libxml2 findXMLCatalogs buildSingleXMLCatalog + ]; + + preConfigure = '' + ./autogen.sh + ''; + + doCheck = true; + + meta = { + description = "The standard terminal emulator of LXDE"; + longDescription = '' + LXTerminal is the standard terminal emulator of LXDE. The terminal is a + desktop-independent VTE-based terminal emulator for LXDE without any + unnecessary dependencies. + ''; + homepage = https://wiki.lxde.org/en/LXTerminal; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.velovix ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/build-support/setup-hooks/build-single-xml-catalog.sh b/pkgs/build-support/setup-hooks/build-single-xml-catalog.sh new file mode 100644 index 00000000000..1545b229f03 --- /dev/null +++ b/pkgs/build-support/setup-hooks/build-single-xml-catalog.sh @@ -0,0 +1,21 @@ +# Creates a single XML catalog that references the catalogs found by +# findXMLCatalogs. +# Useful for situations where only one catalog is expected. +buildSingleXMLCatalog() { + echo '' > catalog.xml + echo '' >> catalog.xml + + catalogs=$(echo $XML_CATALOG_FILES | tr " " "\n") + for x in $catalogs + do + echo ' ' >> catalog.xml + done + + echo '' >> catalog.xml +} + +if [ -z "$buildSingleXMLCatalogHookDone" ]; then + buildSingleXMLCatalogHookDone=1 + + envHooks+=(buildSingleXMLCatalog) +fi diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9a30baab075..8a4707bf135 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -359,6 +359,10 @@ with pkgs; findXMLCatalogs = makeSetupHook { } ../build-support/setup-hooks/find-xml-catalogs.sh; + buildSingleXMLCatalog = makeSetupHook { + deps = [ findXMLCatalogs ]; + } ../build-support/setup-hooks/build-single-xml-catalog.sh; + wrapGAppsHook = makeSetupHook { deps = [ gnome3.dconf.lib gnome3.gtk librsvg makeWrapper ]; } ../build-support/setup-hooks/wrap-gapps-hook.sh; @@ -17091,6 +17095,10 @@ with pkgs; vte = gnome2.vte.override { pythonSupport = true; }; }; + lxterminal = callPackage ../applications/misc/lxterminal { + vte = gnome2.vte; + }; + deepin-terminal = callPackage ../applications/misc/deepin-terminal { inherit (gnome3) libgee vte; wnck = libwnck3; From f4c9cc6878ee262730833a98d7fa55cbb29601ac Mon Sep 17 00:00:00 2001 From: wchresta <34962284+wchresta@users.noreply.github.com> Date: Sun, 31 Dec 2017 11:43:21 +0100 Subject: [PATCH 017/296] steam: Check for NixOS, improve error message --- pkgs/games/steam/chrootenv.nix | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix index 019b1577e15..49d786284da 100644 --- a/pkgs/games/steam/chrootenv.nix +++ b/pkgs/games/steam/chrootenv.nix @@ -108,10 +108,21 @@ in buildFHSUserEnv rec { runScript = writeScript "steam-wrapper.sh" '' #!${stdenv.shell} - glxinfo >/dev/null 2>&1 - if [ ! "$?" = "0" ]; then - echo "*** WARNING: Test for 32-bit libGL unsuccessful." - echo " This could mean you forgot to activate hardware.opengl.driSupport32Bit" + if [ -f /host/etc/NIXOS ]; then # Check only useful on NixOS + glxinfo >/dev/null 2>&1 + # If there was an error running glxinfo, we know something is wrong with the configuration + if [ $? -ne 0 ]; then + cat < /dev/stderr + ** + WARNING: Steam is not set up. Add the following options to /etc/nixos/configuration.nix + and then run \`sudo nixos-rebuild switch\`: + { + hardware.opengl.driSupport32Bit = true; + hardware.pulseaudio.support32Bit = true; + } + ** + EOF + fi fi steam ''; From c4e1e1255a489e3a4829530305a931be4c1cf955 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Sun, 31 Dec 2017 17:39:40 +0100 Subject: [PATCH 018/296] focuswriter: 1.6.7 -> 1.6.8 --- pkgs/applications/editors/focuswriter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/focuswriter/default.nix b/pkgs/applications/editors/focuswriter/default.nix index 10816e0a283..4964de13986 100644 --- a/pkgs/applications/editors/focuswriter/default.nix +++ b/pkgs/applications/editors/focuswriter/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "focuswriter-${version}"; - version = "1.6.7"; + version = "1.6.8"; src = fetchurl { url = "https://gottcode.org/focuswriter/focuswriter-${version}-src.tar.bz2"; - sha256 = "10rqzinr6yd6ca06rklg34kdc08a3xgygfzmprsfg7gdsybfay5z"; + sha256 = "1d2q99xa7dhdpqkipapzi1r1mvynf70s7sgdczd59kn0d8sr3map"; }; nativeBuildInputs = [ pkgconfig qmake qttools ]; From 548a14a7b7eea422afe3a139cb77ec0ab4b7ea76 Mon Sep 17 00:00:00 2001 From: Maxim Dzabraev Date: Sun, 31 Dec 2017 20:36:20 +0300 Subject: [PATCH 019/296] add new maintainer --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 4b9fc86f67d..9889f74a32c 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -189,6 +189,7 @@ dtzWill = "Will Dietz "; dupgit = "Olivier Delhomme "; dywedir = "Vladyslav M. "; + dzabraev = "Maksim Dzabraev "; e-user = "Alexander Kahl "; earldouglas = "James Earl Douglas "; ebzzry = "Rommel Martinez "; From b7681eddba4beff886a3d066281a461f52987aab Mon Sep 17 00:00:00 2001 From: Maxim Dzabraev Date: Sun, 31 Dec 2017 20:40:03 +0300 Subject: [PATCH 020/296] pysigset: init at 0.3.2 --- .../python-modules/pysigset/default.nix | 18 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/development/python-modules/pysigset/default.nix diff --git a/pkgs/development/python-modules/pysigset/default.nix b/pkgs/development/python-modules/pysigset/default.nix new file mode 100644 index 00000000000..85bcf56f062 --- /dev/null +++ b/pkgs/development/python-modules/pysigset/default.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "pysigset"; + version = "0.3.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0ym44z3nwp8chfi7snmknkqnl2q9bghzv9p923r8w748i5hvyxx8"; + }; + + meta = with stdenv.lib; { + description = "Provides access to sigprocmask(2) and friends and convenience wrappers to python application developers wanting to SIG_BLOCK and SIG_UNBLOCK signals"; + homepage = https://github.com/ossobv/pysigset; + license = licenses.gpl3; + maintainers = with maintainers; [ dzabraev ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9c1cc710c13..75a877fb850 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -23240,6 +23240,8 @@ EOF ephem = callPackage ../development/python-modules/ephem { }; voluptuous = callPackage ../development/python-modules/voluptuous { }; + + pysigset = callPackage ../development/python-modules/pysigset { }; }); in fix' (extends overrides packages) From 96f07d6b61f8c741af216d96b9dd4ed1cc9f5ab0 Mon Sep 17 00:00:00 2001 From: Daniel Fullmer Date: Sun, 31 Dec 2017 18:15:56 -0500 Subject: [PATCH 021/296] john: Fix extra utility programs --- pkgs/tools/security/john/default.nix | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/security/john/default.nix b/pkgs/tools/security/john/default.nix index 37946b940cf..7552b21ed33 100644 --- a/pkgs/tools/security/john/default.nix +++ b/pkgs/tools/security/john/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, openssl, nss, nspr, kerberos, gmp, zlib, libpcap, re2 -, writeText, gcc +, writeText, gcc, pythonPackages, perl, perlPackages, makeWrapper }: with stdenv.lib; @@ -35,7 +35,11 @@ stdenv.mkDerivation rec { ''; configureFlags = [ "--disable-native-macro" ]; - buildInputs = [ openssl nss nspr kerberos gmp zlib libpcap re2 gcc ]; + buildInputs = [ openssl nss nspr kerberos gmp zlib libpcap re2 gcc pythonPackages.wrapPython perl makeWrapper ]; + propagatedBuildInputs = (with pythonPackages; [ dpkt scapy lxml ]) ++ # For pcap2john.py + (with perlPackages; [ DigestMD4 DigestMD5 DigestSHA1 GetoptLong MIMEBase64 # For pass_gen.pl + NetLDAP ]); # For sha-dump.pl + # TODO: Get dependencies for radius2john.pl and lion2john-alt.pl # gcc -DAC_BUILT -Wall vncpcap2john.o memdbg.o -g -lpcap -fopenmp -o ../run/vncpcap2john # gcc: error: memdbg.o: No such file or directory @@ -43,18 +47,23 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-DJOHN_SYSTEMWIDE=1" ]; - installPhase = '' - mkdir -p "$out/etc/john" "$out/share/john" "$out/share/doc/john" - find ../run -mindepth 1 -maxdepth 1 -type f -executable \ - -exec "${stdenv.shell}" "${writeText "john-binary-install.sh" '' - filename="$(basename "$1")" - install -vD "$1" "$out/bin/''${filename%.*}" - ''}" {} \; + postInstall = '' + mkdir -p "$out/bin" "$out/etc/john" "$out/share/john" "$out/share/doc/john" + find -L ../run -mindepth 1 -maxdepth 1 -type f -executable \ + -exec cp -d {} "$out/bin" \; cp -vt "$out/etc/john" ../run/*.conf cp -vt "$out/share/john" ../run/*.chr ../run/password.lst cp -vrt "$out/share/doc/john" ../doc/* ''; + postFixup = '' + wrapPythonPrograms + + for i in $out/bin/*.pl; do + wrapProgram "$i" --prefix PERL5LIB : $PERL5LIB + done + ''; + meta = { description = "John the Ripper password cracker"; license = licenses.gpl2; From b2598d57d0dce8bccb2b663977c6999ab9975a9c Mon Sep 17 00:00:00 2001 From: Izorkin Date: Mon, 1 Jan 2018 11:45:45 +0300 Subject: [PATCH 022/296] mariadb: disabling mysql-test and sql-bench directories --- pkgs/servers/sql/mariadb/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 66125b35378..efcd89b256b 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -134,6 +134,8 @@ everything = stdenv.mkDerivation (common // { "-DINSTALL_DOCREADMEDIR=share/doc/mysql" "-DINSTALL_DOCDIR=share/doc/mysql" "-DINSTALL_SHAREDIR=share/mysql" + "-DINSTALL_MYSQLTESTDIR=OFF" + "-DINSTALL_SQLBENCHDIR=OFF" "-DENABLED_LOCAL_INFILE=ON" "-DWITH_READLINE=ON" @@ -152,7 +154,7 @@ everything = stdenv.mkDerivation (common // { ]; postInstall = common.postInstall + '' - rm -r "$out"/{mysql-test,sql-bench,data} # Don't need testing data + rm -r "$out"/data # Don't need testing data rm "$out"/share/man/man1/mysql-test-run.pl.1 rm "$out"/bin/rcmysql ''; From bcf7218fde0125a3922964969fcc239837b7cc2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 22 Dec 2017 18:06:43 -0200 Subject: [PATCH 023/296] adapta-backgrounds: 0.5.1.1 -> 0.5.2.3 --- pkgs/data/misc/adapta-backgrounds/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/data/misc/adapta-backgrounds/default.nix b/pkgs/data/misc/adapta-backgrounds/default.nix index 35655cf851b..41f704e750c 100644 --- a/pkgs/data/misc/adapta-backgrounds/default.nix +++ b/pkgs/data/misc/adapta-backgrounds/default.nix @@ -2,21 +2,21 @@ stdenv.mkDerivation rec { name = "adapta-backgrounds-${version}"; - version = "0.5.1.1"; + version = "0.5.2.3"; src = fetchFromGitHub { owner = "adapta-project"; repo = "adapta-backgrounds"; rev = version; - sha256 = "00gwiraq6c9jh1xl5mmmi5fdj9l3r75ii5wk8jnw856qvrajhxyq"; + sha256 = "0n0ggcxinja81lasmpviqq3l4jiwb05bs8r5aah1im2zvls1g007"; }; nativeBuildInputs = [ autoreconfHook ]; meta = with stdenv.lib; { - description = "A wallpaper collection for adapta-project"; + description = "Wallpaper collection for adapta-project"; homepage = https://github.com/adapta-project/adapta-backgrounds; - license = with licenses; [ gpl2 cc-by-sa-30 ]; + license = with licenses; [ gpl2 cc-by-sa-40 ]; platforms = platforms.all; maintainers = [ maintainers.romildo ]; }; From 3b74349661360dc77a0c2fa70f9db722b74be022 Mon Sep 17 00:00:00 2001 From: Tristan Helmich Date: Mon, 1 Jan 2018 14:22:58 +0100 Subject: [PATCH 024/296] lldpd module: create a lldpd user as system user --- nixos/modules/services/networking/lldpd.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/networking/lldpd.nix b/nixos/modules/services/networking/lldpd.nix index ba4e1b1542f..db1534edfd7 100644 --- a/nixos/modules/services/networking/lldpd.nix +++ b/nixos/modules/services/networking/lldpd.nix @@ -24,6 +24,7 @@ in description = "lldpd user"; group = "_lldpd"; home = "/var/run/lldpd"; + isSystemUser = true; }; users.extraGroups._lldpd = {}; From 275fa4162c68ea51938bb9e92e073015bbe19fe9 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Wed, 13 Dec 2017 12:02:46 -0500 Subject: [PATCH 025/296] jemalloc: disable transparent huge pages by default on ARMv6/7 The default NixOS kernels for ARMv7 (and probably ARMv6) do not have support for transparent huge pages, but jemalloc is unable to detect this. This is a known bug and the current solution is to pass --disable-thp to ./configure. --- pkgs/development/libraries/jemalloc/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/jemalloc/default.nix b/pkgs/development/libraries/jemalloc/default.nix index 8c8c181409d..ebe9ce46f9a 100644 --- a/pkgs/development/libraries/jemalloc/default.nix +++ b/pkgs/development/libraries/jemalloc/default.nix @@ -1,4 +1,8 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, + # jemalloc is unable to correctly detect transparent hugepage support on + # ARM (https://github.com/jemalloc/jemalloc/issues/526), and the default + # kernel ARMv6/7 kernel does not enable it, so we explicitly disable support + thpSupport ? !stdenv.isArm }: stdenv.mkDerivation rec { name = "jemalloc-${version}"; @@ -12,7 +16,8 @@ stdenv.mkDerivation rec { # By default, jemalloc puts a je_ prefix onto all its symbols on OSX, which # then stops downstream builds (mariadb in particular) from detecting it. This # option should remove the prefix and give us a working jemalloc. - configureFlags = stdenv.lib.optional stdenv.isDarwin "--with-jemalloc-prefix="; + configureFlags = stdenv.lib.optional stdenv.isDarwin "--with-jemalloc-prefix=" + ++ stdenv.lib.optional (!thpSupport) "--disable-thp"; doCheck = true; From 98dd418e8576838a5f7dccaaa7ff0567c76d09f2 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Wed, 13 Dec 2017 12:45:07 -0500 Subject: [PATCH 026/296] jemalloc: 4.5.0 -> 5.0.1 --- pkgs/development/libraries/jemalloc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/jemalloc/default.nix b/pkgs/development/libraries/jemalloc/default.nix index ebe9ce46f9a..ee8703a4cf3 100644 --- a/pkgs/development/libraries/jemalloc/default.nix +++ b/pkgs/development/libraries/jemalloc/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "jemalloc-${version}"; - version = "4.5.0"; + version = "5.0.1"; src = fetchurl { url = "https://github.com/jemalloc/jemalloc/releases/download/${version}/${name}.tar.bz2"; - sha256 = "9409d85664b4f135b77518b0b118c549009dc10f6cba14557d170476611f6780"; + sha256 = "4814781d395b0ef093b21a08e8e6e0bd3dab8762f9935bbfb71679b0dea7c3e9"; }; # By default, jemalloc puts a je_ prefix onto all its symbols on OSX, which From 4ef269528491cab88d8b25b8957df28d6e087e94 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Mon, 4 Dec 2017 12:56:33 +0100 Subject: [PATCH 027/296] php: Init at 7.2.0 --- pkgs/development/interpreters/php/default.nix | 13 ++++++++++++- pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index db4eb6eaee0..8bfc01ba46c 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -4,7 +4,7 @@ , mysql, libxml2, readline, zlib, curl, postgresql, gettext , openssl, pcre, pkgconfig, sqlite, config, libjpeg, libpng, freetype , libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, freetds -, uwimap, pam, gmp, apacheHttpd, libiconv, systemd }: +, uwimap, pam, gmp, apacheHttpd, libiconv, systemd, libsodium }: let @@ -226,6 +226,11 @@ let calendar = { configureFlags = ["--enable-calendar"]; }; + + sodium = { + configureFlags = ["--with-sodium=${libsodium.dev}"]; + buildInputs = [libsodium]; + }; }; cfg = { @@ -265,6 +270,7 @@ let mssqlSupport = (!php7) && (config.php.mssql or (!stdenv.isDarwin)); ztsSupport = config.php.zts or false; calendarSupport = config.php.calendar or true; + sodiumSupport = (lib.versionAtLeast version "7.2") && config.php.sodium or true; }; hardeningDisable = [ "bindnow" ]; @@ -346,4 +352,9 @@ in { version = "7.1.11"; sha256 = "0ww5493w8w3jlks0xqlfm3v6mm53vpnv5vjy63inkj8zf3gdfikn"; }; + + php72 = generic { + version = "7.2.0"; + sha256 = "0jn642bm4ah6a5cjavpz8mzw3ddxa270fcwxkj3rg6vb4bjgmzib"; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 668fba30a96..98518797f0e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6773,7 +6773,8 @@ with pkgs; inherit (callPackages ../development/interpreters/php { }) php56 php70 - php71; + php71 + php72; php-embed = php71-embed; From a3edbc13991a9b1a62ad324c63e5539c9edf7773 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Tue, 5 Dec 2017 22:08:02 +0100 Subject: [PATCH 028/296] phpPackages: Init at php72Packages --- pkgs/top-level/all-packages.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 98518797f0e..c77658244df 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6770,6 +6770,11 @@ with pkgs; php = php71; }); + php72Packages = recurseIntoAttrs (callPackage ./php-packages.nix { + php = php72; + }); + + inherit (callPackages ../development/interpreters/php { }) php56 php70 From d9e26a08b9e1876e1d3dfd0c6223bfe566593a82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Mon, 1 Jan 2018 18:28:49 +0100 Subject: [PATCH 029/296] subsurface: fix compilation with Qt 5.10 --- pkgs/applications/misc/subsurface/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix index aaf2f488c38..376ea9e293a 100644 --- a/pkgs/applications/misc/subsurface/default.nix +++ b/pkgs/applications/misc/subsurface/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchFromGitHub, autoreconfHook, cmake, makeWrapper, pkgconfig, qmake , curl, grantlee, libgit2, libusb, libssh2, libxml2, libxslt, libzip, zlib -, qtbase, qtconnectivity, qtlocation, qtsvg, qttools, qtwebkit +, qtbase, qtconnectivity, qtlocation, qtsvg, qttools, qtwebkit, libXcomposite }: let @@ -32,24 +32,25 @@ let googlemaps = stdenv.mkDerivation rec { name = "googlemaps-${version}"; - version = "2017-09-17"; + version = "2017-12-18"; src = fetchFromGitHub { owner = "vladest"; repo = "googlemaps"; - rev = "1b857c02504dd52b1aa442418b8dcea78ced3f35"; - sha256 = "14icmc925g4abwwdrldjc387aiyvcp3ia5z7mfh9qa09bv829a84"; + rev = "79f3511d60dc9640de02a5f24656094c8982b26d"; + sha256 = "11334w0bnfb97sv23vvj2b5hcwvr0171hxldn91jms9y12l5j15d"; }; nativeBuildInputs = [ qmake ]; - buildInputs = [ qtbase qtlocation ]; + buildInputs = [ qtbase qtlocation libXcomposite ]; pluginsSubdir = "lib/qt-${qtbase.qtCompatVersion}/plugins"; installPhase = '' - mkdir $out $(dirname ${pluginsSubdir}) - mv plugins ${pluginsSubdir} + mkdir -p $out $(dirname ${pluginsSubdir}) + mkdir -p ${pluginsSubdir} + mv *.so ${pluginsSubdir} mv lib $out/ ''; From f1779cec242a6bf540218606636c71dd680afcf8 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Mon, 1 Jan 2018 18:23:27 +0100 Subject: [PATCH 030/296] php72Packages.xdebug: Init at 2.6.0beta1 Earlier versions doesn't work with PHP 7.2. --- pkgs/top-level/php-packages.nix | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 5af4b6f0c09..d297496c81e 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -8,6 +8,8 @@ let }; isPhpOlder55 = pkgs.lib.versionOlder php.version "5.5"; isPhp7 = pkgs.lib.versionAtLeast php.version "7.0"; + isPhp72 = pkgs.lib.versionAtLeast php.version "7.2"; + isPhpOlder7 = pkgs.lib.versionOlder php.version "7.0"; apcu = if isPhp7 then apcu51 else apcu40; @@ -179,7 +181,7 @@ let buildInputs = [ pkgs.spidermonkey_1_8_5 ]; }; - xdebug = if isPhp7 then xdebug25 else xdebug23; + xdebug = if isPhp72 then xdebug26 else if isPhp7 then xdebug25 else xdebug23; xdebug23 = assert !isPhp7; buildPecl { name = "xdebug-2.3.1"; @@ -190,7 +192,7 @@ let checkTarget = "test"; }; - xdebug25 = buildPecl { + xdebug25 = assert !isPhp72; buildPecl { name = "xdebug-2.5.0"; sha256 = "03c9y25a3gc3kpav0cdgmhjixcaly6974hx7wgihi0wlchgavmlb"; @@ -199,6 +201,15 @@ let checkTarget = "test"; }; + xdebug26 = assert !isPhpOlder7; buildPecl { + name = "xdebug-2.6.0beta1"; + + sha256 = "0zaj821jbpaqqcbr9a64sa27my9n980pmyy9kxrvvjqq3qg6dpj9"; + + doCheck = true; + checkTarget = "test"; + }; + yaml = if isPhp7 then yaml20 else yaml13; yaml13 = assert !isPhp7; buildPecl { From f15fad898b3076eb758bad7e437ecae9dae7752f Mon Sep 17 00:00:00 2001 From: gnidorah Date: Sun, 22 Oct 2017 15:42:00 +0300 Subject: [PATCH 031/296] pam: add optional pam_gnome_keyring integration --- nixos/modules/security/pam.nix | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index 8d658a20a1f..3fff9e78aa1 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -223,6 +223,17 @@ let ''; }; + enableGnomeKeyring = mkOption { + default = false; + type = types.bool; + description = '' + If enabled, pam_gnome_keyring will attempt to automatically unlock the + user's default Gnome keyring upon login. If the user login password does + not match their keyring password, Gnome Keyring will prompt separately + after login. + ''; + }; + text = mkOption { type = types.nullOr types.lines; description = "Contents of the PAM service file."; @@ -273,7 +284,7 @@ let # prompts the user for password so we run it once with 'required' at an # earlier point and it will run again with 'sufficient' further down. # We use try_first_pass the second time to avoid prompting password twice - (optionalString (cfg.unixAuth && (config.security.pam.enableEcryptfs || cfg.pamMount || cfg.enableKwallet)) '' + (optionalString (cfg.unixAuth && (config.security.pam.enableEcryptfs || cfg.pamMount || cfg.enableKwallet || cfg.enableGnomeKeyring)) '' auth required pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} likeauth ${optionalString config.security.pam.enableEcryptfs "auth optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so unwrap"} @@ -282,6 +293,8 @@ let ${optionalString cfg.enableKwallet ("auth optional ${pkgs.plasma5.kwallet-pam}/lib/security/pam_kwallet5.so" + " kwalletd=${pkgs.libsForQt5.kwallet.bin}/bin/kwalletd5")} + ${optionalString cfg.enableGnomeKeyring + ("auth optional ${pkgs.gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so")} '') + '' ${optionalString cfg.unixAuth "auth sufficient pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} likeauth try_first_pass"} @@ -351,6 +364,8 @@ let ${optionalString (cfg.enableKwallet) ("session optional ${pkgs.plasma5.kwallet-pam}/lib/security/pam_kwallet5.so" + " kwalletd=${pkgs.libsForQt5.kwallet.bin}/bin/kwalletd5")} + ${optionalString (cfg.enableGnomeKeyring) + "session optional ${pkgs.gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so auto_start"} ${optionalString (config.virtualisation.lxc.lxcfs.enable) "session optional ${pkgs.lxcfs}/lib/security/pam_cgfs.so -c freezer,memory,name=systemd,unified,cpuset"} ''); From 8ebbedadbaad6211b01fc29a42851e673da311cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Mon, 1 Jan 2018 21:02:22 +0100 Subject: [PATCH 032/296] phantomjs2: Fixes build with Qt5.10 --- pkgs/development/tools/phantomjs2/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/tools/phantomjs2/default.nix b/pkgs/development/tools/phantomjs2/default.nix index 1a6a4ca890c..f7d22395a03 100644 --- a/pkgs/development/tools/phantomjs2/default.nix +++ b/pkgs/development/tools/phantomjs2/default.nix @@ -74,6 +74,10 @@ in stdenv.mkDerivation rec { url = "https://anonscm.debian.org/cgit/collab-maint/phantomjs.git/plain/debian/patches/build-qt55-print.patch?id=9b5c1ce95a7044ebffc634f773edf7d4eb9b6cd3"; sha256 = "1fydmdjxnplglpbd3ypaih5l237jkxjirpdhzz92mcpy29yla6jw"; }) + (fetchpatch { + url = "https://anonscm.debian.org/cgit/collab-maint/phantomjs.git/plain/debian/patches/unlock-qt.patch"; + sha256 = "13bwz4iw17d6hq5pwkbpcckqyw7fhc6648lvs26m39pp31zwyp03"; + }) ./system-qtbase.patch ]; From 72ade2a813767506520d27394c42c933055412d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Mon, 1 Jan 2018 21:05:15 +0100 Subject: [PATCH 033/296] cutemaze: 1.2.1 -> 1.2.2 --- pkgs/games/cutemaze/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/cutemaze/default.nix b/pkgs/games/cutemaze/default.nix index 19fcbb2443d..253a7fcbf30 100644 --- a/pkgs/games/cutemaze/default.nix +++ b/pkgs/games/cutemaze/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "cutemaze-${version}"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { url = "https://gottcode.org/cutemaze/${name}-src.tar.bz2"; - sha256 = "841f2a208770c9de6009fed64e24a059a878686c444c4b572c56b564e4cfa66e"; + sha256 = "1a2jmkm7fjzdrvzgvbqfq20k0vvpwfcycagsm0haxb3fpv86950y"; }; nativeBuildInputs = [ qmake qttools ]; From a7e54afc4d1203bfd7e92c6a466fd394281b9dc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Mon, 1 Jan 2018 21:07:59 +0100 Subject: [PATCH 034/296] mgba: 0.6.0 -> 0.6.1 Also fixes build with qt 5.10. --- pkgs/misc/emulators/mgba/default.nix | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/emulators/mgba/default.nix b/pkgs/misc/emulators/mgba/default.nix index f14608fd93e..64e29f59a18 100644 --- a/pkgs/misc/emulators/mgba/default.nix +++ b/pkgs/misc/emulators/mgba/default.nix @@ -1,21 +1,34 @@ -{ stdenv, fetchFromGitHub +{ stdenv, fetchFromGitHub, fetchpatch , pkgconfig, cmake, libzip, epoxy, ffmpeg, imagemagick, SDL2 , qtbase, qtmultimedia }: stdenv.mkDerivation rec { name = "mgba-${version}"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "mgba-emu"; repo = "mgba"; rev = version; - sha256 = "1kzb6zj2lxfaiyfq9h7q26fh7xh1ggybmh5pin5rcgs7jyygrsjb"; + sha256 = "1fgxn3j6wc5mcgb81sc6fzy5m4saz02jz4zlms51dgycvy0flbz7"; }; nativeBuildInputs = [ pkgconfig cmake ]; + buildInputs = [ libzip epoxy ffmpeg imagemagick SDL2 qtbase qtmultimedia ]; + patches = [ + (fetchpatch { + url = "https://github.com/mgba-emu/mgba/commit/e31373560535203d826687044290a4994706c2dd.patch"; + sha256 = "07582vj0fqgsgryx28pnshiwri9dn88l1rr4vkraib7bzx7cs4f9"; + }) + + (fetchpatch { + url = "https://github.com/mgba-emu/mgba/commit/baabe0090bb1fd5997e531fd9568c2de09b5fc21.patch"; + sha256 = "1kv9dxxna35s050q9af9nzskplz2x1aq8avg0ihbznhxjl8vmxz9"; + }) + ]; + meta = with stdenv.lib; { homepage = https://mgba.io; description = "A modern GBA emulator with a focus on accuracy"; From 0ea0e3cf719e2a238ecd5e9918cc30e2b642cce4 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 1 Jan 2018 22:03:53 +0100 Subject: [PATCH 035/296] linuxPackages.acpi_call: fix build with 4.14+ kernels --- pkgs/os-specific/linux/acpi-call/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/acpi-call/default.nix b/pkgs/os-specific/linux/acpi-call/default.nix index a04d1decbd8..bd12373da88 100644 --- a/pkgs/os-specific/linux/acpi-call/default.nix +++ b/pkgs/os-specific/linux/acpi-call/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation { hardeningDisable = [ "pic" ]; + nativeBuildInputs = kernel.moduleBuildDependencies; + preBuild = '' sed -e 's/break/true/' -i examples/turn_off_gpu.sh sed -e 's@/bin/bash@.bin/sh@' -i examples/turn_off_gpu.sh From 453be1677e55f24ab2f314f9bc05ddf021a9f380 Mon Sep 17 00:00:00 2001 From: Bryan Richter Date: Mon, 1 Jan 2018 16:07:35 -0500 Subject: [PATCH 036/296] perl-vidir: init at 0.040 --- lib/maintainers.nix | 1 + pkgs/top-level/perl-packages.nix | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 816917397fc..150519f026b 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -117,6 +117,7 @@ ChengCat = "Yucheng Zhang "; choochootrain = "Hurshal Patel "; chpatrick = "Patrick Chilton "; + chreekat = "Bryan Richter "; chris-martin = "Chris Martin "; chrisjefferson = "Christopher Jefferson "; chrisrosset = "Christopher Rosset "; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a55ef256b7a..58b8b3bf9dc 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15645,6 +15645,25 @@ let self = _self // overrides; _self = with self; { }; }; + vidir = buildPerlPackage rec { + name = "vidir-0.040"; + src = fetchurl { + url = "mirror://cpan/authors/id/W/WO/WOLDRICH/App-${name}-woldrich.tar.gz"; + sha256 = "0c97yx33pyhskbmwpqbwlkxr85awd6kg1baibvqkarhhvc8v7l0h"; + }; + # NB: This preInstall a workaround for a problem that is fixed in HEAD. + preInstall = '' + sed -i -e '/^use encoding/d' bin/vidir + ''; + outputs = [ "out" ]; + meta = { + maintainers = [ maintainers.chreekat ]; + homepage = "http://search.cpan.org/~woldrich/App-vidir/bin/vidir"; + description = "Edit a directory in $EDITOR"; + license = with stdenv.lib.licenses; [ gpl1 ]; + }; + }; + VMEC2 = buildPerlModule rec { name = "VM-EC2-1.28"; src = fetchurl { From cc9722b63837a986e17c2658f98a08fe57025e2c Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Mon, 1 Jan 2018 12:57:13 +0100 Subject: [PATCH 037/296] haskell: configuration-ghc-8.0.x.nix: keep inline-c at 0.5.6.1 --- .../configuration-ghc-8.0.x.nix | 3 ++ .../configuration-hackage2nix.yaml | 2 + .../haskell-modules/hackage-packages.nix | 40 +++++++++++++++++++ 3 files changed, 45 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix index 30ecbe92f16..804da79f568 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix @@ -65,4 +65,7 @@ self: super: { # Add appropriate Cabal library to build this code. stack = addSetupDepend super.stack self.Cabal_2_0_1_1; + # inline-c > 0.5.6.0 requires template-haskell >= 2.12 + inline-c = super.inline-c_0_5_6_1; + inline-c-cpp = super.inline-c-cpp_0_1_0_0; } diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 39064998c44..4f0fbf8711b 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2689,6 +2689,8 @@ extra-packages: - haskell-gi-overloading == 0.0 # gi-* packages use this dependency to disable overloading support - haskell-src-exts == 1.19.* # required by hindent and structured-haskell-mode - hpack == 0.20.* # required by stack-1.6.1 + - inline-c < 0.6 # required on GHC 8.0.x + - inline-c-cpp < 0.2 # required on GHC 8.0.x - language-c == 0.7.0 # required by c2hs hack to work around https://github.com/haskell/c2hs/issues/192. - mtl < 2.2 # newer versions require transformers > 0.4.x, which we cannot provide in GHC 7.8.x - mtl-prelude < 2 # required for to build postgrest on mtl 2.1.x platforms diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 5aa31e7e948..86e09a7f7b7 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -113707,6 +113707,34 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "inline-c_0_5_6_1" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring + , containers, cryptohash, directory, filepath, gsl, gslcblas + , hashable, hspec, mtl, parsec, parsers, QuickCheck, raw-strings-qq + , regex-posix, stdenv, template-haskell, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "inline-c"; + version = "0.5.6.1"; + sha256 = "0kpbwrri9idllwd7gfamghrdrz16zqjphmb3cp5nq160dxz73brd"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-wl-pprint base binary bytestring containers cryptohash + directory filepath hashable mtl parsec parsers QuickCheck + template-haskell transformers unordered-containers vector + ]; + executableSystemDepends = [ gsl gslcblas ]; + testHaskellDepends = [ + ansi-wl-pprint base containers hashable hspec parsers QuickCheck + raw-strings-qq regex-posix template-haskell transformers + unordered-containers vector + ]; + description = "Write Haskell source files including C code inline. No FFI required."; + license = stdenv.lib.licenses.mit; + }) {inherit (pkgs) gsl; gslcblas = null;}; + "inline-c" = callPackage ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers, gsl , gslcblas, hashable, hspec, mtl, parsec, parsers, QuickCheck @@ -113733,6 +113761,18 @@ self: { license = stdenv.lib.licenses.mit; }) {inherit (pkgs) gsl; gslcblas = null;}; + "inline-c-cpp_0_1_0_0" = callPackage + ({ mkDerivation, base, inline-c, stdenv, template-haskell }: + mkDerivation { + pname = "inline-c-cpp"; + version = "0.1.0.0"; + sha256 = "0iba77p2ncxbg5sb4ks8f3lgp6zdnjhzvrr2ap3yg49is5b9f5rf"; + libraryHaskellDepends = [ base inline-c template-haskell ]; + testHaskellDepends = [ base ]; + description = "Lets you embed C++ code into Haskell"; + license = stdenv.lib.licenses.mit; + }) {}; + "inline-c-cpp" = callPackage ({ mkDerivation, base, hspec, inline-c, safe-exceptions , template-haskell From 0e7358002679ad7f35d2bd99977b9f0e403d4de2 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 1 Jan 2018 23:49:36 +0100 Subject: [PATCH 038/296] dhcpcd: 6.11.5 -> 7.0.0 --- pkgs/tools/networking/dhcpcd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index d8316c66203..adbd4e87c1e 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, udev }: stdenv.mkDerivation rec { - name = "dhcpcd-6.11.5"; + name = "dhcpcd-7.0.0"; src = fetchurl { url = "mirror://roy/dhcpcd/${name}.tar.xz"; - sha256 = "17nnhxmbdcc7k2mh6sgvxisqcqbic5540xbig363ds97gvf795kg"; + sha256 = "1m90wsg4m9bcaavh36vlhjghrbdsi5x2yy92ixhgynmzrgnwlqdb"; }; nativeBuildInputs = [ pkgconfig ]; From 8d96d0f992fc099913a764f9acc164f3c580a5e7 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 2 Jan 2018 00:30:22 +0100 Subject: [PATCH 039/296] openexr: 2.2.0 -> 2.2.1 --- pkgs/development/libraries/ilmbase/default.nix | 4 ++-- pkgs/development/libraries/openexr/default.nix | 10 +--------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/ilmbase/default.nix b/pkgs/development/libraries/ilmbase/default.nix index 21c2c46105e..956a8667be5 100644 --- a/pkgs/development/libraries/ilmbase/default.nix +++ b/pkgs/development/libraries/ilmbase/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, automake, autoconf, libtool, which }: stdenv.mkDerivation rec { - name = "ilmbase-2.2.0"; + name = "ilmbase-2.2.1"; src = fetchurl { url = "http://download.savannah.nongnu.org/releases/openexr/${name}.tar.gz"; - sha256 = "1izddjwbh1grs8080vmaix72z469qy29wrvkphgmqmcm0sv1by7c"; + sha256 = "17k0hq19wplx9s029kjrq6c51x2ryrfmaavcappkd0g67gk0dhna"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix index d2d8b686f35..8d5a6bb65a9 100644 --- a/pkgs/development/libraries/openexr/default.nix +++ b/pkgs/development/libraries/openexr/default.nix @@ -5,19 +5,11 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://download.savannah.nongnu.org/releases/openexr/${name}.tar.gz"; - sha256 = "0ca2j526n4wlamrxb85y2jrgcv0gf21b3a19rr0gh4rjqkv1581n"; + sha256 = "1kdf2gqznsdinbd5vcmqnif442nyhdf9l7ckc51410qm2gv5m6lg"; }; patches = [ ./bootstrap.patch - (fetchpatch { - # https://github.com/openexr/openexr/issues/232 - # https://github.com/openexr/openexr/issues/238 - name = "CVE-2017-12596.patch"; - url = "https://github.com/openexr/openexr/commit/f09f5f26c1924.patch"; - sha256 = "1d014da7c8cgbak5rgr4mq6wzm7kwznb921pr7nlb52vlfvqp4rs"; - stripLen = 1; - }) ]; outputs = [ "bin" "dev" "out" "doc" ]; From 1d537f8c53a84b4d50fce23153bbf927b6993210 Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Mon, 1 Jan 2018 16:01:44 -0800 Subject: [PATCH 040/296] mwprocapture: fix build with kernels >4.14.9 --- pkgs/os-specific/linux/mwprocapture/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/mwprocapture/default.nix b/pkgs/os-specific/linux/mwprocapture/default.nix index 322d0260f7b..e2abbd7335e 100644 --- a/pkgs/os-specific/linux/mwprocapture/default.nix +++ b/pkgs/os-specific/linux/mwprocapture/default.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { sha256 = "1ri7c4l4xgkhpz0f15jra1p7mpzi8ir6lpwjm7q7hc9m4cvxcs1g"; }; + nativeBuildInputs = [ kernel.moduleBuildDependencies ]; + patches = [ ./linux_4_14_fix.patch ]; preConfigure = From 4b6b7c2c7d0b73fa6ad43802f5eb6fc7860ba458 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 2 Jan 2018 01:05:06 +0100 Subject: [PATCH 041/296] zeromq: 4.2.2 -> 4.2.3 --- pkgs/development/libraries/zeromq/4.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/zeromq/4.x.nix b/pkgs/development/libraries/zeromq/4.x.nix index 030246db318..eea0fb727b0 100644 --- a/pkgs/development/libraries/zeromq/4.x.nix +++ b/pkgs/development/libraries/zeromq/4.x.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "zeromq-${version}"; - version = "4.2.2"; + version = "4.2.3"; src = fetchFromGitHub { owner = "zeromq"; repo = "libzmq"; rev = "v${version}"; - sha256 = "09317g4zkalp3k11x6vbidcm4qf02ciml1wxgp3742lrlgcblgxy"; + sha256 = "1yadf4vz4m49lpwwwscxs6wf4v9dgqgxkwgwpby9lvb4pv8qbmaf"; }; nativeBuildInputs = [ cmake asciidoc ]; From c5d1929a73ca564502835d79e2fc2243561230e9 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sun, 31 Dec 2017 17:20:53 +0100 Subject: [PATCH 042/296] clipster: 1.2.5 -> 1.4.1 --- pkgs/tools/misc/clipster/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/clipster/default.nix b/pkgs/tools/misc/clipster/default.nix index a70cba3f3d0..df638f2b556 100644 --- a/pkgs/tools/misc/clipster/default.nix +++ b/pkgs/tools/misc/clipster/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "clipster-${version}"; - version = "1.2.5"; + version = "1.4.1"; src = fetchFromGitHub { owner = "mrichar1"; repo = "clipster"; rev = "${version}"; - sha256 = "0yjljpqpcbi84ibbrxbm5cbgs16ada4cmvir744hygrdl948zzk3"; + sha256 = "16gdrm985qwbrsmsqjfyh33glcmx678abl2jpq49djk2qrbhm49k"; }; pythonEnv = python3.withPackages(ps: with ps; [ pygobject3 ]); From f8a500f722baf0fe9ef66f0b2f3d796cbbf5d51e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 25 Dec 2017 06:46:30 +0100 Subject: [PATCH 043/296] brltty: build python bindings --- pkgs/tools/misc/brltty/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/misc/brltty/default.nix b/pkgs/tools/misc/brltty/default.nix index ea1ac6d116b..8dbcd08fba6 100644 --- a/pkgs/tools/misc/brltty/default.nix +++ b/pkgs/tools/misc/brltty/default.nix @@ -1,35 +1,37 @@ -{ stdenv, fetchurl, pkgconfig, alsaSupport, alsaLib ? null, bluez, systemdSupport, systemd ? null }: +{ stdenv, fetchurl, pkgconfig, python3, alsaSupport, alsaLib ? null, bluez, systemdSupport, systemd ? null }: assert alsaSupport -> alsaLib != null; assert systemdSupport -> systemd != null; stdenv.mkDerivation rec { name = "brltty-5.5"; - + src = fetchurl { url = "http://brltty.com/archive/${name}.tar.gz"; sha256 = "0slrqanwj9cm7ql0rpb296xq676zrc1sjyr13lh5lygp4b8qfpci"; }; - - nativeBuildInputs = [ pkgconfig ]; + + nativeBuildInputs = [ pkgconfig python3.pkgs.cython ]; buildInputs = [ bluez ] ++ stdenv.lib.optional alsaSupport alsaLib ++ stdenv.lib.optional systemdSupport systemd; - + meta = { description = "Access software for a blind person using a braille display"; longDescription = '' BRLTTY is a background process (daemon) which provides access to the Linux/Unix console (when in text mode) for a blind person using a refreshable braille display. It drives the braille display, and provides complete screen review functionality. - Some speech capability has also been incorporated. + Some speech capability has also been incorporated. ''; homepage = http://www.brltty.com/; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.bramd ]; platforms = stdenv.lib.platforms.all; }; - + + makeFlags = [ "PYTHON_PREFIX=$(out)" ]; + preConfigurePhases = [ "preConfigure" ]; preConfigure = '' From 866c511a0afb01115786769f72c8ecafcbb84268 Mon Sep 17 00:00:00 2001 From: Bert Moens Date: Sat, 16 Dec 2017 23:36:08 +0100 Subject: [PATCH 044/296] orca: init at 3.26.0 --- pkgs/applications/misc/orca/default.nix | 67 +++++++++++++++++++++ pkgs/applications/misc/orca/fix-paths.patch | 29 +++++++++ pkgs/top-level/all-packages.nix | 4 ++ 3 files changed, 100 insertions(+) create mode 100644 pkgs/applications/misc/orca/default.nix create mode 100644 pkgs/applications/misc/orca/fix-paths.patch diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix new file mode 100644 index 00000000000..fc7fd95bbb9 --- /dev/null +++ b/pkgs/applications/misc/orca/default.nix @@ -0,0 +1,67 @@ +{ stdenv, lib, pkgconfig, fetchurl, buildPythonApplication +, autoreconfHook, wrapGAppsHook +, intltool, yelp_tools, itstool, libxmlxx3 +, python, pygobject3, gtk3, gnome3, substituteAll +, at_spi2_atk, at_spi2_core, pyatspi, dbus, dbus-python, pyxdg +, xkbcomp, gsettings_desktop_schemas, liblouis +, speechd, brltty, setproctitle, gst_all_1, gst-python +}: + +with lib; +let + version = "3.26.0"; + majorVersion = builtins.concatStringsSep "." (take 2 (splitString "." version)); +in buildPythonApplication rec { + name = "orca-${version}"; + + format = "other"; + + src = fetchurl { + url = "mirror://gnome/sources/orca/${majorVersion}/${name}.tar.xz"; + sha256 = "0xk5k9cbswymma60nrfj00dl97wypx59c107fb1hwi75gm0i07a7"; + }; + + patches = [ + (substituteAll { + src = ./fix-paths.patch; + xkbcomp = "${xkbcomp}/bin/xkbcomp"; + }) + ]; + + nativeBuildInputs = [ + autoreconfHook wrapGAppsHook pkgconfig libxmlxx3 + intltool yelp_tools itstool + ]; + + propagatedBuildInputs = [ + pygobject3 pyatspi dbus-python pyxdg brltty liblouis speechd gst-python setproctitle + ]; + + buildInputs = [ + python gtk3 at_spi2_atk at_spi2_core dbus gsettings_desktop_schemas + gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good + ]; + + # Run intltoolize to create po/Makefile.in.in + preConfigure = '' + intltoolize + ''; + + meta = { + homepage = https://wiki.gnome.org/Projects/Orca; + description = "Screen reader"; + longDescription = '' + A free, open source, flexible and extensible screen reader that provides + access to the graphical desktop via speech and refreshable braille. + It works with applications and toolkits that support the Assistive + Technology Service Provider Interface (AT-SPI). That includes the GNOME + Gtk+ toolkit, the Java platform's Swing toolkit, LibreOffice, Gecko, and + WebKitGtk. AT-SPI support for the KDE Qt toolkit is being pursued. + + Needs `services.gnome3.at-spi2-core.enable = true;` in `configuration.nix`. + ''; + maintainers = with maintainers; [ berce ] ++ gnome3.maintainers; + license = licenses.lgpl21; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/orca/fix-paths.patch b/pkgs/applications/misc/orca/fix-paths.patch new file mode 100644 index 00000000000..d3e77773f28 --- /dev/null +++ b/pkgs/applications/misc/orca/fix-paths.patch @@ -0,0 +1,29 @@ +--- a/src/orca/orca.py ++++ b/src/orca/orca.py +@@ -239,7 +239,7 @@ + + def _setXmodmap(xkbmap): + """Set the keyboard map using xkbcomp.""" +- p = subprocess.Popen(['xkbcomp', '-w0', '-', os.environ['DISPLAY']], ++ p = subprocess.Popen(['@xkbcomp@', '-w0', '-', os.environ['DISPLAY']], + stdin=subprocess.PIPE, stdout=None, stderr=None) + p.communicate(xkbmap) + +@@ -297,7 +297,7 @@ + """ + + global _originalXmodmap +- _originalXmodmap = subprocess.check_output(['xkbcomp', os.environ['DISPLAY'], '-']) ++ _originalXmodmap = subprocess.check_output(['@xkbcomp@', os.environ['DISPLAY'], '-']) + + def _restoreXmodmap(keyList=[]): + """Restore the original xmodmap values for the keys in keyList. +@@ -309,7 +309,7 @@ + + global _capsLockCleared + _capsLockCleared = False +- p = subprocess.Popen(['xkbcomp', '-w0', '-', os.environ['DISPLAY']], ++ p = subprocess.Popen(['@xkbcomp@', '-w0', '-', os.environ['DISPLAY']], + stdin=subprocess.PIPE, stdout=None, stderr=None) + p.communicate(_originalXmodmap) + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c77658244df..cdfa41ac698 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16308,6 +16308,10 @@ with pkgs; opera = callPackage ../applications/networking/browsers/opera {}; + orca = python3Packages.callPackage ../applications/misc/orca { + inherit (gnome3) yelp_tools; + }; + osmctools = callPackage ../applications/misc/osmctools { }; vivaldi = callPackage ../applications/networking/browsers/vivaldi {}; From 904ac3185f82bdde9bd329e34fa38660c9871e0e Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Tue, 2 Jan 2018 02:21:20 +0100 Subject: [PATCH 045/296] borgbackup: 1.1.3 -> 1.1.4 --- pkgs/tools/backup/borg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix index 2dc84069d62..12a7d484bf7 100644 --- a/pkgs/tools/backup/borg/default.nix +++ b/pkgs/tools/backup/borg/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { name = "borgbackup-${version}"; - version = "1.1.3"; + version = "1.1.4"; namePrefix = ""; src = fetchurl { url = "https://github.com/borgbackup/borg/releases/download/" + "${version}/${name}.tar.gz"; - sha256 = "1rvn8b6clzd1r317r9jkvk34r31risi0dxfjc7jffhnwasck4anc"; + sha256 = "1cicqwh85wfp65y00qaq6q4i4jcyy9b66qz5gpl80qc880wab912"; }; nativeBuildInputs = with python3Packages; [ From b7387e1db8774dd7a7a14e75d5d0701494c82876 Mon Sep 17 00:00:00 2001 From: Ingolf Wagner Date: Tue, 2 Jan 2018 18:10:41 +1300 Subject: [PATCH 046/296] bitwig-studio: refactor to support older major versions --- .../{default.nix => bitwig-studio1.nix} | 32 +++++++++---------- .../audio/bitwig-studio/bitwig-studio2.nix | 18 +++++++++++ pkgs/top-level/all-packages.nix | 7 +++- 3 files changed, 40 insertions(+), 17 deletions(-) rename pkgs/applications/audio/bitwig-studio/{default.nix => bitwig-studio1.nix} (77%) create mode 100644 pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix diff --git a/pkgs/applications/audio/bitwig-studio/default.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix similarity index 77% rename from pkgs/applications/audio/bitwig-studio/default.nix rename to pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix index bc87254cf18..8b26ba0959d 100644 --- a/pkgs/applications/audio/bitwig-studio/default.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix @@ -1,35 +1,35 @@ -{ stdenv, fetchurl, alsaLib, bzip2, cairo, dpkg, ffmpeg, freetype, gdk_pixbuf -, glib, gtk2, harfbuzz, jdk, lib, libX11, libXau, libXcursor, libXdmcp -, libXext, libXfixes, libXrender, libbsd, libjack2, libpng, libxcb -, libxkbcommon, libxkbfile, makeWrapper, pixman, xcbutil, xcbutilwm +{ stdenv, fetchurl, alsaLib, bzip2, cairo, dpkg, freetype, gdk_pixbuf +, glib, gtk2, harfbuzz, jdk, lib, xorg +, libbsd, libjack2, libpng +, libxkbcommon +, makeWrapper, pixman , xdg_utils, zenity, zlib }: stdenv.mkDerivation rec { name = "bitwig-studio-${version}"; - version = "2.2.2"; + version = "1.3.16"; src = fetchurl { - url = "https://downloads.bitwig.com/stable/${version}/bitwig-studio-${version}.deb"; - sha256 = "1x4wka32xlygmhdh9rb15s37zh5qjrgap2qk35y34c52lf5aak22"; + url = "https://downloads.bitwig.com/stable/${version}/bitwig-studio-${version}.deb"; + sha256 = "0n0fxh9gnmilwskjcayvjsjfcs3fz9hn00wh7b3gg0cv3qqhich8"; }; nativeBuildInputs = [ dpkg makeWrapper ]; unpackCmd = "mkdir root ; dpkg-deb -x $curSrc root"; - dontBuild = true; + dontBuild = true; dontPatchELF = true; - dontStrip = true; + dontStrip = true; - libPath = lib.makeLibraryPath [ - alsaLib bzip2.out cairo freetype gdk_pixbuf glib gtk2 harfbuzz - libX11 libXau libXcursor libXdmcp libXext libXfixes libXrender - libbsd libjack2 libpng libxcb libxkbfile pixman xcbutil xcbutilwm - zlib + libPath = with xorg; lib.makeLibraryPath [ + alsaLib bzip2.out cairo freetype gdk_pixbuf glib gtk2 harfbuzz libX11 libXau + libXcursor libXdmcp libXext libXfixes libXrender libbsd libjack2 libpng libxcb + libxkbfile pixman xcbutil xcbutilwm zlib ]; binPath = lib.makeBinPath [ - ffmpeg xdg_utils zenity + xdg_utils zenity ]; installPhase = '' @@ -95,6 +95,6 @@ stdenv.mkDerivation rec { homepage = http://www.bitwig.com/; license = licenses.unfree; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ michalrus ]; + maintainers = with maintainers; [ michalrus mrVanDalo ]; }; } diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix new file mode 100644 index 00000000000..e5a5cc7c9c6 --- /dev/null +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, bitwig-studio1, + xdg_utils, zenity, ffmpeg }: + +bitwig-studio1.overrideAttrs (oldAttrs: rec { + name = "bitwig-studio-${version}"; + version = "2.2.2"; + + src = fetchurl { + url = "https://downloads.bitwig.com/stable/${version}/bitwig-studio-${version}.deb"; + sha256 = "1x4wka32xlygmhdh9rb15s37zh5qjrgap2qk35y34c52lf5aak22"; + }; + + buildInputs = bitwig-studio1.buildInputs ++ [ ffmpeg ]; + + binPath = stdenv.lib.makeBinPath [ + ffmpeg xdg_utils zenity + ]; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cdfa41ac698..7512da925b8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14191,9 +14191,14 @@ with pkgs; bitscope = callPackage ../applications/science/electronics/bitscope/packages.nix { }; - bitwig-studio = callPackage ../applications/audio/bitwig-studio { + bitwig-studio1 = callPackage ../applications/audio/bitwig-studio/bitwig-studio1.nix { inherit (gnome2) zenity; }; + bitwig-studio2 = callPackage ../applications/audio/bitwig-studio/bitwig-studio2.nix { + inherit (gnome2) zenity; + inherit (self) bitwig-studio1; + }; + bitwig-studio = bitwig-studio2; bgpdump = callPackage ../tools/networking/bgpdump { }; From a5880ace7fbc4359d3f0d8621fff16a0977283a1 Mon Sep 17 00:00:00 2001 From: Tyler Compton Date: Tue, 2 Jan 2018 00:58:20 -0700 Subject: [PATCH 047/296] lxterminal: patch m4 to respect XML_CATALOG_FILES The patch removes the need for a separate script to combine existing catalog files, making the package simpler. --- pkgs/applications/misc/lxterminal/default.nix | 8 ++++--- .../respect-xml-catalog-files-var.patch | 15 +++++++++++++ .../setup-hooks/build-single-xml-catalog.sh | 21 ------------------- pkgs/top-level/all-packages.nix | 4 ---- 4 files changed, 20 insertions(+), 28 deletions(-) create mode 100644 pkgs/applications/misc/lxterminal/respect-xml-catalog-files-var.patch delete mode 100644 pkgs/build-support/setup-hooks/build-single-xml-catalog.sh diff --git a/pkgs/applications/misc/lxterminal/default.nix b/pkgs/applications/misc/lxterminal/default.nix index 15cb5ea61cc..145672cad38 100644 --- a/pkgs/applications/misc/lxterminal/default.nix +++ b/pkgs/applications/misc/lxterminal/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchurl, automake, autoconf, intltool, pkgconfig, gtk2, vte , libxslt, docbook_xml_dtd_412, docbook_xml_xslt, libxml2, findXMLCatalogs -, buildSingleXMLCatalog }: let version = "0.3.1"; in @@ -15,12 +14,15 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-man" - "--with-xml-catalog=../catalog.xml" # Generated by buildSingleXMLCatalog ]; buildInputs = [ automake autoconf intltool pkgconfig gtk2 vte libxslt docbook_xml_dtd_412 - docbook_xml_xslt libxml2 findXMLCatalogs buildSingleXMLCatalog + docbook_xml_xslt libxml2 findXMLCatalogs + ]; + + patches = [ + ./respect-xml-catalog-files-var.patch ]; preConfigure = '' diff --git a/pkgs/applications/misc/lxterminal/respect-xml-catalog-files-var.patch b/pkgs/applications/misc/lxterminal/respect-xml-catalog-files-var.patch new file mode 100644 index 00000000000..598f506118f --- /dev/null +++ b/pkgs/applications/misc/lxterminal/respect-xml-catalog-files-var.patch @@ -0,0 +1,15 @@ +diff --git a/acinclude.m4 b/acinclude.m4 +index be626c5..b449b1b 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -40,8 +40,8 @@ AC_DEFUN([JH_CHECK_XML_CATALOG], + [ + AC_REQUIRE([JH_PATH_XML_CATALOG],[JH_PATH_XML_CATALOG(,[:])])dnl + AC_MSG_CHECKING([for ifelse([$2],,[$1],[$2]) in XML catalog]) +- if $jh_found_xmlcatalog && \ +- AC_RUN_LOG([$XMLCATALOG --noout "$XML_CATALOG_FILE" "$1" >&2]); then ++ # empty argument forces libxml to use XML_CATALOG_FILES variable ++ if AC_RUN_LOG([$XMLCATALOG --noout "" "$1" >&2]); then + AC_MSG_RESULT([found]) + ifelse([$3],,,[$3 + ])dnl diff --git a/pkgs/build-support/setup-hooks/build-single-xml-catalog.sh b/pkgs/build-support/setup-hooks/build-single-xml-catalog.sh deleted file mode 100644 index 1545b229f03..00000000000 --- a/pkgs/build-support/setup-hooks/build-single-xml-catalog.sh +++ /dev/null @@ -1,21 +0,0 @@ -# Creates a single XML catalog that references the catalogs found by -# findXMLCatalogs. -# Useful for situations where only one catalog is expected. -buildSingleXMLCatalog() { - echo '' > catalog.xml - echo '' >> catalog.xml - - catalogs=$(echo $XML_CATALOG_FILES | tr " " "\n") - for x in $catalogs - do - echo ' ' >> catalog.xml - done - - echo '' >> catalog.xml -} - -if [ -z "$buildSingleXMLCatalogHookDone" ]; then - buildSingleXMLCatalogHookDone=1 - - envHooks+=(buildSingleXMLCatalog) -fi diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8a4707bf135..875419fbd1f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -359,10 +359,6 @@ with pkgs; findXMLCatalogs = makeSetupHook { } ../build-support/setup-hooks/find-xml-catalogs.sh; - buildSingleXMLCatalog = makeSetupHook { - deps = [ findXMLCatalogs ]; - } ../build-support/setup-hooks/build-single-xml-catalog.sh; - wrapGAppsHook = makeSetupHook { deps = [ gnome3.dconf.lib gnome3.gtk librsvg makeWrapper ]; } ../build-support/setup-hooks/wrap-gapps-hook.sh; From aaa7952b361fd08df5418fb2c850b0b02ae3cdf1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 2 Jan 2018 09:59:43 +0100 Subject: [PATCH 048/296] python.pkgs.lark-parser: 2017-12-10 -> 2017-12-18 --- pkgs/development/python-modules/lark-parser/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/lark-parser/default.nix b/pkgs/development/python-modules/lark-parser/default.nix index b81cc132a2d..a1b58a4eb05 100644 --- a/pkgs/development/python-modules/lark-parser/default.nix +++ b/pkgs/development/python-modules/lark-parser/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "lark-parser"; # PyPI name - version = "2017-12-10"; + version = "2017-12-18"; src = fetchFromGitHub { owner = "erezsh"; repo = "lark"; - rev = "852607b978584ecdec68ac115dd8554cdb0a2305"; - sha256 = "1clzmvbp1b4zamcm6ldak0hkw46n3lhw4b28qq9xdl0n4va6zig7"; + rev = "9d6cde9b1ba971f02ea8106fa3b71a934e83d6fa"; + sha256 = "0nv6nxd8wx9dwhn37m94fkc10gknckrjs1hzajxygla3dpql455j"; }; checkPhase = '' From e3de7b06b7e0fc67450f2b82f97424536fb93acd Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 2 Jan 2018 10:14:27 +0100 Subject: [PATCH 049/296] jsonnet: 0.9.4 -> 0.9.5 --- pkgs/development/compilers/jsonnet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/jsonnet/default.nix b/pkgs/development/compilers/jsonnet/default.nix index 790f9a4827a..d4664673306 100644 --- a/pkgs/development/compilers/jsonnet/default.nix +++ b/pkgs/development/compilers/jsonnet/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, emscripten }: -let version = "0.9.4"; in +let version = "0.9.5"; in stdenv.mkDerivation { name = "jsonnet-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { rev = "v${version}"; owner = "google"; repo = "jsonnet"; - sha256 = "1bh9x8d3mxnic31b6gh4drn5l6qpyqfgsn2l48sv0jknhinm1a7l"; + sha256 = "193sa4hdhvml0c32nmdkjii41hbyc5l0zisdn699ar0gaq7yiqan"; }; buildInputs = [ emscripten ]; From a0be858835267656ac634386cabc946e5bec0fef Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 2 Jan 2018 10:15:08 +0100 Subject: [PATCH 050/296] python3.pkgs.jsonnet: enable Python 3 builds since support was added in 0.9.5 by @benley --- pkgs/top-level/python-packages.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9c1cc710c13..e723518b12a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9887,8 +9887,6 @@ in { jsonnet = buildPythonPackage { inherit (pkgs.jsonnet) name src; - # Python 3 is not yet supported https://github.com/google/jsonnet/pull/335 - disabled = isPy3k; }; jupyter_client = callPackage ../development/python-modules/jupyter_client { }; From 52cdee8ebfd64f73dff928b30335d126a092d5f2 Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Tue, 2 Jan 2018 10:27:48 +0100 Subject: [PATCH 051/296] gauge: init at 0.9.6 Signed-off-by: Vincent Demeester --- pkgs/development/tools/gauge/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/tools/gauge/default.nix diff --git a/pkgs/development/tools/gauge/default.nix b/pkgs/development/tools/gauge/default.nix new file mode 100644 index 00000000000..f1533f551b2 --- /dev/null +++ b/pkgs/development/tools/gauge/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "gauge-${version}"; + version = "0.9.6"; + + goPackagePath = "github.com/getgauge/gauge"; + + src = fetchFromGitHub { + owner = "getgauge"; + repo = "gauge"; + rev = "v${version}"; + sha256 = "0p2bnrzgx616jbyr9h4h9azaq7ry63z4qkwgy0ivwrpmhfqfqwmh"; + }; + + meta = with stdenv.lib; { + description = "Light weight cross-platform test automation"; + homepage = http://gauge.org; + license = licenses.gpl3; + maintainers = [ maintainers.vdemeester ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7512da925b8..b1a5bd8dcc9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2238,6 +2238,8 @@ with pkgs; garmintools = callPackage ../development/libraries/garmintools {}; + gauge = callPackage ../development/tools/gauge { }; + gawk = callPackage ../tools/text/gawk { inherit (darwin) locale; }; From bd40601acb642ea180e0b311b1cd6a7b76c11cd5 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 2 Jan 2018 10:30:49 +0100 Subject: [PATCH 052/296] yabar-unstable: 2017-10-12 -> 2018-01-02 The unstable branch of `yabar` received some minor useful changes: - Fixed missprint (https://github.com/geommer/yabar/commit/f1b1eff48108654219311e63147365cd6f006593) - Update information on Debian installation (https://github.com/geommer/yabar/commit/ce20fe75f7bca2488168e45c577d6bb4996f7377) - Add indicator to show current indicator using `libxkbcommon` (https://github.com/geommer/yabar/commit/5aa1fb5eb558f58f0bcfe495b8f49414aa6d88a2) The last change requires a `libxkbcommon` as additional build input. Furthermore I thought that it might be better to add the dependencies of unstable (namely `playerctl` and `libxkbcommon`) to the `unstable.nix` to reduce the closure size of the stable build. --- .../window-managers/yabar/build.nix | 4 +--- .../window-managers/yabar/unstable.nix | 22 +++++++++++++------ 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/window-managers/yabar/build.nix b/pkgs/applications/window-managers/yabar/build.nix index 5e92c52e521..a5d02093e3f 100644 --- a/pkgs/applications/window-managers/yabar/build.nix +++ b/pkgs/applications/window-managers/yabar/build.nix @@ -2,7 +2,6 @@ , xcbutilwm, alsaLib, wirelesstools, asciidoc, libxslt, makeWrapper, docbook_xsl , configFile ? null, lib , rev, sha256, version -, playerctl }: stdenv.mkDerivation { @@ -21,7 +20,6 @@ stdenv.mkDerivation { buildInputs = [ cairo gdk_pixbuf libconfig pango xcbutilwm docbook_xsl alsaLib wirelesstools asciidoc libxslt makeWrapper - playerctl ]; postPatch = '' @@ -30,7 +28,7 @@ stdenv.mkDerivation { --replace "a2x" "${asciidoc}/bin/a2x --no-xmllint" ''; - makeFlags = [ "DESTDIR=$(out)" "PREFIX=/" "PLAYERCTL=1" ]; + makeFlags = [ "DESTDIR=$(out)" "PREFIX=/" ]; postInstall = '' mkdir -p $out/share/yabar/examples diff --git a/pkgs/applications/window-managers/yabar/unstable.nix b/pkgs/applications/window-managers/yabar/unstable.nix index b704c480d66..842e10ad83b 100644 --- a/pkgs/applications/window-managers/yabar/unstable.nix +++ b/pkgs/applications/window-managers/yabar/unstable.nix @@ -1,10 +1,18 @@ -{ callPackage, attrs ? {} }: +{ playerctl, libxkbcommon, callPackage, attrs ? {} }: let - overrides = { - version = "unstable-2017-10-12"; + pkg = callPackage ./build.nix ({ + version = "unstable-2018-01-02"; - rev = "cbecc7766e37f29d50705da0a82dc76ce7c3b86e"; - sha256 = "1wprjas3k14rxfl06mgr0xq2ra735w1c7dq4xrdvii887wnl37xb"; - } // attrs; -in callPackage ./build.nix overrides + rev = "d9f75933f1fdd7bec24bf7db104c7e1df2728b98"; + sha256 = "0ry2pgqsnl6cmvkhakm73cjqdnirkimldnmbngl6hbvggx32z8c9"; + } // attrs); +in pkg.overrideAttrs (o: { + buildInputs = o.buildInputs ++ [ + playerctl libxkbcommon + ]; + + makeFlags = o.makeFlags ++ [ + "PLAYERCTL=1" + ]; +}) From bde59aa034cdef1de828a64a23f47c6e14f219b8 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 2 Jan 2018 10:37:12 +0100 Subject: [PATCH 053/296] nodejs-4_x: 4.8.5 -> 4.8.7 --- pkgs/development/web/nodejs/v4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v4.nix b/pkgs/development/web/nodejs/v4.nix index 08fd91aaf8d..64674066b29 100644 --- a/pkgs/development/web/nodejs/v4.nix +++ b/pkgs/development/web/nodejs/v4.nix @@ -5,7 +5,7 @@ let in buildNodejs { inherit enableNpm; - version = "4.8.5"; - sha256 = "0lqdnnihmc2wpl1v1shj60i49wka2354b00a86k0xbjg5gyfx2m4"; + version = "4.8.7"; + sha256 = "1y21wq092d3gmccm2zldbflbbbx7a71wi9l0bpkxvzmgws69liq3"; patches = lib.optionals stdenv.isDarwin [ ./no-xcode.patch ]; } From ccb0b88577256703d0925d80dc345eb1fb0d6742 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 2 Jan 2018 10:37:13 +0100 Subject: [PATCH 054/296] nodejs-6_x: 6.11.5 -> 6.12.2 --- pkgs/development/web/nodejs/v6.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v6.nix b/pkgs/development/web/nodejs/v6.nix index c703377d5a0..3688ee0b7ef 100644 --- a/pkgs/development/web/nodejs/v6.nix +++ b/pkgs/development/web/nodejs/v6.nix @@ -5,7 +5,7 @@ let in buildNodejs { inherit enableNpm; - version = "6.11.5"; - sha256 = "1bwakrvy0if5spbymwpb05qwrb47xwzlnc42rapgp6b744ay8v8w"; + version = "6.12.2"; + sha256 = "1z6sn4b973sxw0h9hd38rjq6cqdkzl5gsd48f793abvarwgpqrrk"; patches = lib.optionals stdenv.isDarwin [ ./no-xcode.patch ]; } From 8a2a9492581c8013dbe377a9d742b63f83b81636 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 2 Jan 2018 10:37:14 +0100 Subject: [PATCH 055/296] nodejs-8_x: 8.9.1 -> 8.9.3 --- pkgs/development/web/nodejs/v8.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v8.nix b/pkgs/development/web/nodejs/v8.nix index 14dfb8164f4..e34ba8da925 100644 --- a/pkgs/development/web/nodejs/v8.nix +++ b/pkgs/development/web/nodejs/v8.nix @@ -5,7 +5,7 @@ let in buildNodejs { inherit enableNpm; - version = "8.9.1"; - sha256 = "1q0p9zl260pd8038yvn13lw5whs480dy11ar2ijcm2hgyqhhq5pg"; + version = "8.9.3"; + sha256 = "1nmjwsdql92jh6y94jpqa8cmirw6cl3cvaiqdsjyd1bbm8xxp3bl"; patches = lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ]; } From eb1baf2f10c9b79201dbfd5bb3f2203a0ba78ce9 Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Tue, 2 Jan 2018 10:40:22 +0100 Subject: [PATCH 056/296] skopeo: 0.1.23 to 0.1.27 Signed-off-by: Vincent Demeester --- pkgs/development/tools/skopeo/default.nix | 4 ++-- pkgs/development/tools/skopeo/path.patch | 13 ------------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index d05706a7fad..0f720f1f7e3 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -4,7 +4,7 @@ with stdenv.lib; buildGoPackage rec { name = "skopeo-${version}"; - version = "0.1.23"; + version = "0.1.27"; rev = "v${version}"; goPackagePath = "github.com/projectatomic/skopeo"; @@ -17,7 +17,7 @@ buildGoPackage rec { inherit rev; owner = "projectatomic"; repo = "skopeo"; - sha256 = "1axxnm87fpsd7q28v951ilhmzd42k8wyh741gdfdcajjwglfj0nn"; + sha256 = "1xwwzxjczz8qdk1rf0h78qd3vk9mxxb8yi6f8kfqvcdcsvkajd5g"; }; patches = [ diff --git a/pkgs/development/tools/skopeo/path.patch b/pkgs/development/tools/skopeo/path.patch index eb3c54ae66c..fe456b58e54 100644 --- a/pkgs/development/tools/skopeo/path.patch +++ b/pkgs/development/tools/skopeo/path.patch @@ -22,17 +22,4 @@ index 50e29b2..7108df5 100644 if c.GlobalBool("insecure-policy") { policy = &signature.Policy{Default: []signature.PolicyRequirement{signature.NewPRInsecureAcceptAnything()}} } else if policyPath == "" { -diff --git a/vendor/github.com/containers/image/docker/docker_client.go b/vendor/github.com/containers/image/docker/docker_client.go -index b989770..697d2ee 100644 ---- a/vendor/github.com/containers/image/docker/docker_client.go -+++ b/vendor/github.com/containers/image/docker/docker_client.go -@@ -154,6 +154,9 @@ func setupCertificates(dir string, tlsc *tls.Config) error { - if os.IsNotExist(err) { - return nil - } -+ if os.IsPermission(err) { -+ return nil -+ } - return err - } From dd2d96c37c8ab42518b1bdc5d84fd639908460e3 Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Tue, 2 Jan 2018 10:46:51 +0100 Subject: [PATCH 057/296] delve: 0.12.1 -> 0.12.2 Signed-off-by: Vincent Demeester --- pkgs/development/tools/delve/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/delve/default.nix b/pkgs/development/tools/delve/default.nix index 06b6a0993be..66bceb92453 100644 --- a/pkgs/development/tools/delve/default.nix +++ b/pkgs/development/tools/delve/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "delve-${version}"; - version = "0.12.1"; + version = "0.12.2"; goPackagePath = "github.com/derekparker/delve"; excludedPackages = "\\(_fixtures\\|scripts\\|service/test\\)"; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "derekparker"; repo = "delve"; rev = "v${version}"; - sha256 = "0vkyx9sd66yrqz9sa4pysmpjv6gdgpfk1icrbjk93h2ry15ma8d6"; + sha256 = "1241zqyimgqil4qd72f0yiw935lkdmfr88kvqbkn9n05k7xhdg30"; }; meta = { From 59be35113d81ca8f433d4b0a9a3950cd18a09e7e Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 2 Jan 2018 04:50:37 -0500 Subject: [PATCH 058/296] ruby_2_5: init at 2.5.0 (#33293) --- .../development/interpreters/ruby/default.nix | 20 +++++++++++++++++-- .../interpreters/ruby/patchsets.nix | 5 +++++ .../interpreters/ruby/rvm-patchsets.nix | 4 ++-- pkgs/top-level/all-packages.nix | 6 ++++-- 4 files changed, 29 insertions(+), 6 deletions(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index d664c00bc31..3d18d5650a8 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, fetchpatch, fetchFromSavannah, fetchFromGitHub , zlib, openssl, gdbm, ncurses, readline, groff, libyaml, libffi, autoreconfHook, bison , autoconf, darwin ? null -, buildEnv, bundler, bundix +, buildEnv, bundler, bundix, Foundation } @ args: let @@ -27,6 +27,7 @@ let tag = ver.gitTag; isRuby20 = ver.majMin == "2.0"; isRuby21 = ver.majMin == "2.1"; + isRuby25 = ver.majMin == "2.5"; baseruby = self.override { useRailsExpress = false; }; self = lib.makeOverridable ( { stdenv, lib, fetchurl, fetchpatch, fetchFromSavannah, fetchFromGitHub @@ -40,7 +41,7 @@ let , libffi, fiddleSupport ? true , autoreconfHook, bison, autoconf , darwin ? null - , buildEnv, bundler, bundix + , buildEnv, bundler, bundix, Foundation }: let rubySrc = if useRailsExpress then fetchFromGitHub { @@ -75,11 +76,13 @@ let ++ (op opensslSupport openssl) ++ (op gdbmSupport gdbm) ++ (op yamlSupport libyaml) + ++ (op isRuby25 autoconf) # Looks like ruby fails to build on darwin without readline even if curses # support is not enabled, so add readline to the build inputs if curses # support is disabled (if it's enabled, we already have it) and we're # running on darwin ++ (op (!cursesSupport && stdenv.isDarwin) readline) + ++ (op (isRuby25 && stdenv.isDarwin) Foundation) ++ (ops stdenv.isDarwin (with darwin; [ libiconv libobjc libunwind ])); enableParallelBuilding = true; @@ -106,6 +109,11 @@ let cp ${config}/config.guess tool/ cp ${config}/config.sub tool/ '' + else if isRuby25 then '' + sed -i configure.ac -e '/config.guess/d' + cp ${config}/config.guess tool/ + cp ${config}/config.sub tool/ + '' else opString useRailsExpress '' sed -i configure.in -e '/config.guess/d' cp ${config}/config.guess tool/ @@ -220,4 +228,12 @@ in { git = "1w83kzak3m6vv3k09ynfw9vpgc7vpmij3x3zmgrhwm4ds1sp5irl"; }; }; + + ruby_2_5_0 = generic { + version = rubyVersion "2" "5" "0" ""; + sha256 = { + src = "1azj0d2lzziw6iml7bx3sxpxzcdmfwfq3yhm7djyp20q1xiz7rj6"; + git = "0d436nqmp3ykdkp4sck5bb8sf3qvx30x1p58xh8axv66mvsyc2jd"; + }; + }; } diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index 3d3b17cd2f7..858bc0a13f3 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -39,4 +39,9 @@ rec { "${patchSet}/patches/ruby/2.4/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.4/head/railsexpress/03-display-more-detailed-stack-trace.patch" ]; + "2.5.0" = ops useRailsExpress [ + "${patchSet}/patches/ruby/2.5/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch" + "${patchSet}/patches/ruby/2.5/head/railsexpress/02-improve-gc-stats.patch" + "${patchSet}/patches/ruby/2.5/head/railsexpress/03-more-detailed-stacktrace.patch" + ]; } diff --git a/pkgs/development/interpreters/ruby/rvm-patchsets.nix b/pkgs/development/interpreters/ruby/rvm-patchsets.nix index c60d6e3728d..1598cbc56e1 100644 --- a/pkgs/development/interpreters/ruby/rvm-patchsets.nix +++ b/pkgs/development/interpreters/ruby/rvm-patchsets.nix @@ -3,6 +3,6 @@ fetchFromGitHub { owner = "skaes"; repo = "rvm-patchsets"; - rev = "15f5df0fba0e2fb489856b5bdb67a52fb9745f94"; - sha256 = "0vdgr7xp3gbmsyaz4q78qlbwmp006b1gkgj0kwi6h8d80dclbzny"; + rev = "ba5a3c6f972e1b957b4b3fe28b5730ef0e27bff3"; + sha256 = "0sjmhhb8hshxa58x062j44w0xdck8ykgpsg33wjr0wv9npwpkwrz"; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7512da925b8..95cdbee14ae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6916,12 +6916,13 @@ with pkgs; bundlerEnv = callPackage ../development/ruby-modules/bundler-env { }; bundlerApp = callPackage ../development/ruby-modules/bundler-app { }; - inherit (callPackage ../development/interpreters/ruby {}) + inherit (callPackage ../development/interpreters/ruby { inherit (darwin.apple_sdk.frameworks) Foundation; }) ruby_2_0_0 ruby_2_1_10 ruby_2_2_8 ruby_2_3_5 - ruby_2_4_2; + ruby_2_4_2 + ruby_2_5_0; # Ruby aliases ruby = ruby_2_3; @@ -6930,6 +6931,7 @@ with pkgs; ruby_2_2 = ruby_2_2_8; ruby_2_3 = ruby_2_3_5; ruby_2_4 = ruby_2_4_2; + ruby_2_5 = ruby_2_5_0; scsh = callPackage ../development/interpreters/scsh { }; From 114cb09c5c950b3bca881dd2f4b383284c5f4a4a Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Tue, 2 Jan 2018 10:51:24 +0100 Subject: [PATCH 059/296] vndr: 20170511-0cb33a0 -> 20171005-b57c579 Signed-off-by: Vincent Demeester --- pkgs/development/tools/vndr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/vndr/default.nix b/pkgs/development/tools/vndr/default.nix index 66fdb1841e4..2a4ddaf8039 100644 --- a/pkgs/development/tools/vndr/default.nix +++ b/pkgs/development/tools/vndr/default.nix @@ -2,8 +2,8 @@ buildGoPackage rec { name = "vndr-${version}"; - version = "20170511-${lib.strings.substring 0 7 rev}"; - rev = "0cb33a0eb64c8ca73b8e2939a3430b22fbb8d3e3"; + version = "20171005-${lib.strings.substring 0 7 rev}"; + rev = "b57c5799efd5ed743f347a025482babf01ba963e"; goPackagePath = "github.com/LK4D4/vndr"; excludedPackages = "test"; @@ -12,7 +12,7 @@ buildGoPackage rec { inherit rev; owner = "LK4D4"; repo = "vndr"; - sha256 = "02vdr59xn79hffayfcxg29nf62rdc33a60i104fgj746kcswgy5n"; + sha256 = "15mmy4a06jgzvlbjbmd89f0xx695x8wg7jqi76kiz495i6figk2v"; }; meta = { From 2e00e2b27667cd2da433996a5c957bb36520aa77 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 2 Jan 2018 10:51:03 +0100 Subject: [PATCH 060/296] taglib: Fix CVE-2017-12678 --- pkgs/development/libraries/taglib/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/taglib/default.nix b/pkgs/development/libraries/taglib/default.nix index e4d7b426854..67db6e5097d 100644 --- a/pkgs/development/libraries/taglib/default.nix +++ b/pkgs/development/libraries/taglib/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, zlib, cmake}: +{stdenv, fetchurl, zlib, cmake, fetchpatch}: stdenv.mkDerivation rec { name = "taglib-1.11.1"; @@ -8,6 +8,15 @@ stdenv.mkDerivation rec { sha256 = "0ssjcdjv4qf9liph5ry1kngam1y7zp8fzr9xv4wzzrma22kabldn"; }; + patches = [ + (fetchpatch { + # https://github.com/taglib/taglib/issues/829 + name = "CVE-2017-12678.patch"; + url = "https://github.com/taglib/taglib/commit/eb9ded1206f18.patch"; + sha256 = "1bvpxsvmlpi3by7myzss9kkpdkv405612n8ff68mw1ambj8h1m90"; + }) + ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ zlib ]; From cd30356b2eff07b651cf97242f10f39020dfdb79 Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Tue, 2 Jan 2018 10:57:05 +0100 Subject: [PATCH 061/296] godef: 20160620-ee532b9 -> 20170920-b692db1 Signed-off-by: Vincent Demeester --- pkgs/development/tools/godef/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/godef/default.nix b/pkgs/development/tools/godef/default.nix index fdb53dd288f..6644c8fcfc4 100644 --- a/pkgs/development/tools/godef/default.nix +++ b/pkgs/development/tools/godef/default.nix @@ -2,8 +2,8 @@ buildGoPackage rec { name = "godef-${version}"; - version = "20160620-${stdenv.lib.strings.substring 0 7 rev}"; - rev = "ee532b944160bb27b6f23e4f5ef38b8fdaa2a6bd"; + version = "20170920-${stdenv.lib.strings.substring 0 7 rev}"; + rev = "b692db1de5229d4248e23c41736b431eb665615d"; goPackagePath = "github.com/rogpeppe/godef"; excludedPackages = "go/printer/testdata"; @@ -11,7 +11,7 @@ buildGoPackage rec { src = fetchgit { inherit rev; url = "https://github.com/rogpeppe/godef"; - sha256 = "1r8c4ijjnwvb9pci4wasmq88yj0ginwly2542kw4hyg2c87j613l"; + sha256 = "0xqp9smfyznm8v2iy4wyy3kd24mga12fx0y0896qimac4hj2al15"; }; meta = { From 708a0ff86323b14aecd831fe5837d425c95fd184 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 2 Jan 2018 11:03:56 +0100 Subject: [PATCH 062/296] imagemagick: 6.9.9-26 -> 6.9.9-28 --- .../graphics/ImageMagick/default.nix | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index e3500a621cb..519bf025b43 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, libtool +{ lib, stdenv, fetchFromGitHub, fetchpatch, pkgconfig, libtool , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg , lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp , ApplicationServices @@ -14,8 +14,8 @@ let else throw "ImageMagick is not supported on this platform."; cfg = { - version = "6.9.9-26"; - sha256 = "10rcq7b9hhz50m4yqnm4g3iai7lr9jkglb7sm49ycw59arrkmwnw"; + version = "6.9.9-28"; + sha256 = "132kdl7jlkghfg3smdab14c29cpvrx65ibipxkmwg1nc88ycqivh"; patches = []; } # Freeze version on mingw so we don't need to port the patch too often. @@ -36,13 +36,10 @@ stdenv.mkDerivation rec { name = "imagemagick-${version}"; inherit (cfg) version; - src = fetchurl { - urls = [ - "mirror://imagemagick/releases/ImageMagick-${version}.tar.xz" - # the original source above removes tarballs quickly - "http://distfiles.macports.org/ImageMagick/ImageMagick-${version}.tar.xz" - "https://bintray.com/homebrew/mirror/download_file?file_path=imagemagick-${version}.tar.xz" - ]; + src = fetchFromGitHub { + owner = "ImageMagick"; + repo = "ImageMagick"; + rev = cfg.version; inherit (cfg) sha256; }; From 7d409d58058346eeac71299dab513b97fde4ec00 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 2 Jan 2018 11:04:47 +0100 Subject: [PATCH 063/296] imagemagick7: 7.0.7-14 -> 7.0.7-19 --- 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 98e2c0e3f7d..e1d8dd01f9c 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-14"; - sha256 = "04hpc9i6fp09iy0xkidlfhfqr7zg45izqqj5fx93n3dxalq65xqw"; + version = "7.0.7-19"; + sha256 = "1naib6hspmq7d4gfpsksx78gc1lq3p2v3i9pxkkdvr9p9j15c4az"; patches = []; }; in From deb78410168ab7952e6884cf9cd2b90381309b40 Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Tue, 2 Jan 2018 11:19:41 +0100 Subject: [PATCH 064/296] goconvey: init at 1.6.3 Signed-off-by: Vincent Demeester --- pkgs/development/tools/goconvey/default.nix | 25 +++++++++++++++++++++ pkgs/development/tools/goconvey/deps.nix | 20 +++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 47 insertions(+) create mode 100644 pkgs/development/tools/goconvey/default.nix create mode 100644 pkgs/development/tools/goconvey/deps.nix diff --git a/pkgs/development/tools/goconvey/default.nix b/pkgs/development/tools/goconvey/default.nix new file mode 100644 index 00000000000..e4ef9d26da2 --- /dev/null +++ b/pkgs/development/tools/goconvey/default.nix @@ -0,0 +1,25 @@ +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "goconvey-${version}"; + version = "1.6.3"; + + goPackagePath = "github.com/smartystreets/goconvey"; + excludedPackages = "web/server/watch/integration_testing"; + + goDeps = ./deps.nix; + + src = fetchFromGitHub { + owner = "smartystreets"; + repo = "goconvey"; + rev = "${version}"; + sha256 = "1ph18rkl3ns3fgin5i4j54w5a69grrmf3apcsmnpdn1wlrbs3dxh"; + }; + + meta = { + description = "Go testing in the browser. Integrates with `go test`. Write behavioral tests in Go."; + homepage = https://github.com/smartystreets/goconvey; + maintainers = with stdenv.lib.maintainers; [ vdemeester ]; + license = stdenv.lib.licenses.mit; + }; +} diff --git a/pkgs/development/tools/goconvey/deps.nix b/pkgs/development/tools/goconvey/deps.nix new file mode 100644 index 00000000000..d329359da70 --- /dev/null +++ b/pkgs/development/tools/goconvey/deps.nix @@ -0,0 +1,20 @@ +[ + { + goPackagePath = "github.com/jtolds/gls"; + fetch = { + type = "git"; + url = "https://github.com/jtolds/gls"; + rev = "77f18212c9c7edc9bd6a33d383a7b545ce62f064"; + sha256 = "1vm37pvn0k4r6d3m620swwgama63laz8hhj3pyisdhxwam4m2g1h"; + }; + } + { + goPackagePath = "github.com/smartystreets/assertions"; + fetch = { + type = "git"; + url = "https://github.com/smartystreets/assertions"; + rev = "0b37b35ec7434b77e77a4bb29b79677cced992ea"; + sha256 = "1j0adgbykl55rf2945g0n5bmqdsnjcqlx5dcmpfh4chki43hiwg9"; + }; + } +] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7512da925b8..74138fd1c58 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13108,6 +13108,8 @@ with pkgs; gocode = callPackage ../development/tools/gocode { }; + goconvey = callPackage ../development/tools/goconvey { }; + gotags = callPackage ../development/tools/gotags { }; golint = callPackage ../development/tools/golint { }; From d7ab19d9c0a98eefb6093ae850e87e6a0d7874f4 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 2 Jan 2018 11:23:00 +0100 Subject: [PATCH 065/296] delve: Build on darwin --- pkgs/development/tools/delve/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/delve/default.nix b/pkgs/development/tools/delve/default.nix index 66bceb92453..3671a3dcca9 100644 --- a/pkgs/development/tools/delve/default.nix +++ b/pkgs/development/tools/delve/default.nix @@ -14,11 +14,11 @@ buildGoPackage rec { sha256 = "1241zqyimgqil4qd72f0yiw935lkdmfr88kvqbkn9n05k7xhdg30"; }; - meta = { + meta = with stdenv.lib; { description = "debugger for the Go programming language"; homepage = https://github.com/derekparker/delve; - maintainers = with stdenv.lib.maintainers; [ vdemeester ]; - license = stdenv.lib.licenses.mit; - platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ vdemeester ]; + license = licenses.mit; + platforms = [ "x86_64-linux" ] ++ platforms.darwin; }; } From e4beb97b9c9a31fd9eb1b6d4e8b5ecebc7e8bb5d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 2 Jan 2018 11:45:29 +0100 Subject: [PATCH 066/296] brotli: Use multiple outputs --- pkgs/tools/compression/brotli/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/compression/brotli/default.nix b/pkgs/tools/compression/brotli/default.nix index 86ba3ffe78f..92146f1f178 100644 --- a/pkgs/tools/compression/brotli/default.nix +++ b/pkgs/tools/compression/brotli/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { buildInputs = [ cmake ]; + outputs = [ "out" "dev" "lib" ]; + # This breaks on Darwin because our cmake hook tries to make a build folder # and the wonderful bazel BUILD file is already there (yay case-insensitivity?) prePatch = "rm BUILD"; From 9da1b2f91185e2817195c74c2c557522c5a975d1 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 2 Jan 2018 00:00:25 +0100 Subject: [PATCH 067/296] postgresql93: 9.3.19 -> 9.3.20 --- pkgs/servers/sql/postgresql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index cf3349dc166..c60489b00b4 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -91,9 +91,9 @@ let in { postgresql93 = common { - version = "9.3.19"; + version = "9.3.20"; psqlSchema = "9.3"; - sha256 = "1d9gmi1psg4aa6h6ylvsrdm5jnnb7p36pn4h2qrvl9z9v4n8g7pv"; + sha256 = "1jp6lac4b0q6hb28yrdsl0ymzn75gg59hvp5zasarf3mf3b8l4zb"; }; postgresql94 = common { From b7302ccb817b71dabf47d7856215c337c199f1e5 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 2 Jan 2018 00:00:51 +0100 Subject: [PATCH 068/296] postgresql94: 9.4.14 -> 9.4.15 --- pkgs/servers/sql/postgresql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index c60489b00b4..6f50930f97d 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -97,9 +97,9 @@ in { }; postgresql94 = common { - version = "9.4.14"; + version = "9.4.15"; psqlSchema = "9.4"; - sha256 = "0szc0navrcjnpyafw2sai8cmwr3znsy0w6031lv7n1ab20xg4zcf"; + sha256 = "1i5c67gg4fj38hk07h6w6m4mqak84bhnblqsjbpiamg4x33v7gqj"; }; postgresql95 = common { From 414dc6ba1520dd38bc0f3ca040c3fced9a48da95 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 2 Jan 2018 00:01:29 +0100 Subject: [PATCH 069/296] postgresql95: 9.5.9 -> 9.5.10 --- pkgs/servers/sql/postgresql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 6f50930f97d..1164795d6c3 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -103,9 +103,9 @@ in { }; postgresql95 = common { - version = "9.5.9"; + version = "9.5.10"; psqlSchema = "9.5"; - sha256 = "1m6d4y3m3ir20dzl6q3s3yvmr0a7hq3si2v1hg5hanmbck3db379"; + sha256 = "10gjfn16bhzkmlqfsn384w49db0j39bg3n4majwxdpjd17g7lpcl"; }; postgresql96 = common { From 71acd1f8a2dbeb56b50f39b5ed80728acb4d565a Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 2 Jan 2018 00:02:00 +0100 Subject: [PATCH 070/296] postgresql96: 9.6.5 -> 9.6.6 --- pkgs/servers/sql/postgresql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 1164795d6c3..0707deb1b2d 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -109,9 +109,9 @@ in { }; postgresql96 = common { - version = "9.6.5"; + version = "9.6.6"; psqlSchema = "9.6"; - sha256 = "0k3ls2x182jz6djjiqj9kycddabdl2gk1y1ajq1vipnxwfki5nh6"; + sha256 = "0m417h30s18rwa7yzkqqcdb22ifpcda2fpg2cyx8bxvjp3ydz71r"; }; postgresql100 = common { From 2d74fa62a8db65f4fdfd1352df469a13683437b1 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 2 Jan 2018 00:02:28 +0100 Subject: [PATCH 071/296] postgresql100: 10.0 -> 10.1 --- pkgs/servers/sql/postgresql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 0707deb1b2d..cffdbb96928 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -115,9 +115,9 @@ in { }; postgresql100 = common { - version = "10.0"; + version = "10.1"; psqlSchema = "10.0"; - sha256 = "1lbzwpmdxmk5bh0ix0rn72qbd52dq5cb55nzajscb0bvwa95abvi"; + sha256 = "04z7lm4h94625vbncwv98svycqr942n3q47ailqaczkszqjlxjrw"; }; } From 9c91d0d63c7348c97f3f819eae9c09df9654f9c6 Mon Sep 17 00:00:00 2001 From: Drew Hess Date: Tue, 2 Jan 2018 03:36:42 -0800 Subject: [PATCH 072/296] ghc: fix armv7l-linux support in new binary versions. --- pkgs/development/compilers/ghc/7.10.3-binary.nix | 2 +- pkgs/development/compilers/ghc/8.2.1-binary.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ghc/7.10.3-binary.nix b/pkgs/development/compilers/ghc/7.10.3-binary.nix index a0ee96829f6..d4a07a54308 100644 --- a/pkgs/development/compilers/ghc/7.10.3-binary.nix +++ b/pkgs/development/compilers/ghc/7.10.3-binary.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { url = "http://haskell.org/ghc/dist/${version}/ghc-${version}b-x86_64-deb8-linux.tar.bz2"; sha256 = "5e163c557e9236cce68be41c984eab0fcdbdc1602e39040ca9ae325e6bdec1c3"; }; - "armv7-linux" = { + "armv7l-linux" = { url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-armv7-deb8-linux.tar.bz2"; sha256 = "2913763eef88e4d1843a1e4c34225afb1866310d1a1956c08a4131f4593518f6"; }; diff --git a/pkgs/development/compilers/ghc/8.2.1-binary.nix b/pkgs/development/compilers/ghc/8.2.1-binary.nix index de02ac79aa3..caf8a63f81f 100644 --- a/pkgs/development/compilers/ghc/8.2.1-binary.nix +++ b/pkgs/development/compilers/ghc/8.2.1-binary.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-deb8-linux.tar.xz"; sha256 = "543b81bf610240bd0398111d6c6607a9094dc2d159b564057d46c8a3d1aaa130"; }; - "armv7-linux" = { + "armv7l-linux" = { url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-armv7-deb8-linux.tar.xz"; sha256 = "0f0e5e1d4fad3fa1a87ca1fe0d19242f4a94d158b7b8a08f99efefd98b51b019"; }; From 81581ba38100d3a626a8caeb015dd3f8866c3398 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 2 Jan 2018 02:31:03 +0100 Subject: [PATCH 073/296] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.7.2 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/d8aa793b337fedf07adc3666332fd50d641bac41. --- .../haskell-modules/hackage-packages.nix | 302 +++++++++++++++--- 1 file changed, 258 insertions(+), 44 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 01fba37bee8..c4d9e490336 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -10692,6 +10692,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "JuicyPixels_3_2_9_3" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, deepseq, mtl + , primitive, transformers, vector, zlib + }: + mkDerivation { + pname = "JuicyPixels"; + version = "3.2.9.3"; + sha256 = "14s57fgf6kd5n5al2kcvk1aaxbq1ph0r5h8blflrjkx83yl6r8yn"; + libraryHaskellDepends = [ + base binary bytestring containers deepseq mtl primitive + transformers vector zlib + ]; + homepage = "https://github.com/Twinside/Juicy.Pixels"; + description = "Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "JuicyPixels-canvas" = callPackage ({ mkDerivation, base, containers, JuicyPixels }: mkDerivation { @@ -20727,6 +20745,20 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "acme-mutable-package" = callPackage + ({ mkDerivation, base, Cabal }: + mkDerivation { + pname = "acme-mutable-package"; + version = "0"; + sha256 = "16da6pkkdr2g77dn3n4v9x6mwi6yz3xlpisvpn0id2xz0bayipmr"; + revision = "2"; + editedCabalFile = "03qif3idd7s5ldk0fm89ii6gnw1qkwpgcwkg35raqawsfsvn4sbg"; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ base ]; + description = "A mutable package"; + license = stdenv.lib.licenses.mit; + }) {}; + "acme-now" = callPackage ({ mkDerivation, base, time }: mkDerivation { @@ -29034,8 +29066,8 @@ self: { }: mkDerivation { pname = "ats-format"; - version = "0.1.0.14"; - sha256 = "020gbvh8wj5xnldmc1l2dib26bwinqdq66pn4z3xdpl3zf4zj1in"; + version = "0.1.0.16"; + sha256 = "1cvhbzjsqdzq758hz3fms32nn87dzbdsw6qz46ax957hfwp3wimw"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -39653,8 +39685,8 @@ self: { }: mkDerivation { pname = "cabal2nix"; - version = "2.7.1"; - sha256 = "0skwm7fds2m7gkzd0af59bbgj09cwr0vapz8gxl6cb9m5cjsd05x"; + version = "2.7.2"; + sha256 = "1376a97pmhpxf78lhl4b6glraajjwhk99cvvrz4p7nmdc1qq9zhy"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -45501,6 +45533,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cmdargs_0_10_19" = callPackage + ({ mkDerivation, base, filepath, process, template-haskell + , transformers + }: + mkDerivation { + pname = "cmdargs"; + version = "0.10.19"; + sha256 = "1m1a2zl5ijjkjfrl5zqdqbbdf883y81zlq8qaiy2pww52cai3snf"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base filepath process template-haskell transformers + ]; + executableHaskellDepends = [ + base filepath process template-haskell transformers + ]; + homepage = "https://github.com/ndmitchell/cmdargs#readme"; + description = "Command line argument processing"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cmdargs-browser" = callPackage ({ mkDerivation, base, bytestring, cmdargs, directory, filepath , http-types, process, text, transformers, wai, wai-handler-launch @@ -51288,8 +51342,8 @@ self: { }: mkDerivation { pname = "credential-store"; - version = "0.1.1"; - sha256 = "1qim9hqyak3c7giqjrkvdvlpgwlbgnyz418q6pndwvyrhzm7n21m"; + version = "0.1.2"; + sha256 = "114jdbpiyx8xnjxnpz05nqpnb5s29y1iv330b0i491vik8hvrbad"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -55917,8 +55971,8 @@ self: { ({ mkDerivation, base, dates, hspec, QuickCheck, time }: mkDerivation { pname = "date-conversions"; - version = "0.1.0.0"; - sha256 = "0348mi754n9611hzs62v17f3qba4vyls9x82capjasy8f2mw1cqn"; + version = "0.2.0.0"; + sha256 = "1bx8r66wfghrfbmcyddsi6z5b66kc9skrq0hnk2mvz4gx2cl0gdq"; libraryHaskellDepends = [ base dates time ]; testHaskellDepends = [ base dates hspec QuickCheck time ]; homepage = "https://github.com/thoughtbot/date-conversions#readme"; @@ -69075,8 +69129,8 @@ self: { }: mkDerivation { pname = "fast-combinatorics"; - version = "0.1.0.6"; - sha256 = "1bkrdqlqhccp0scz7ww7xp08sjx2fjrsgdhmk8n1l2qxnvag0wpm"; + version = "0.1.0.7"; + sha256 = "06c5m5rd4xw7nl5x2f75xbky4f16nr3wk10cvx23pf5l9987rrvq"; setupHaskellDepends = [ base Cabal directory http-client http-client-tls tar zlib ]; @@ -76567,6 +76621,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "generic-random_1_1_0_1" = callPackage + ({ mkDerivation, base, QuickCheck }: + mkDerivation { + pname = "generic-random"; + version = "1.1.0.1"; + sha256 = "0axbsrxcczhlci4zm4brq2lmd7cjgmixl9hk6jnd86w4v107xiph"; + libraryHaskellDepends = [ base QuickCheck ]; + testHaskellDepends = [ base QuickCheck ]; + homepage = "http://github.com/lysxia/generic-random"; + description = "Generic random generators"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "generic-records" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -79748,8 +79816,8 @@ self: { }: mkDerivation { pname = "gio"; - version = "0.13.4.0"; - sha256 = "1jjkz7d81dljhgdcpc5zr5bn1jxnlb23f8hpzx4xz5v9jfy0bflr"; + version = "0.13.4.1"; + sha256 = "11w567c4zafcdm5i6wpi1dr4m6mpfvyqyda4llq7wgvjbshy5fqk"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ @@ -99696,8 +99764,8 @@ self: { }: mkDerivation { pname = "hledger-iadd"; - version = "1.3.0"; - sha256 = "0kr0s2zdi1453cfbwm5i99ajybk72q012k9bd13lwc22fksph9xq"; + version = "1.3.1"; + sha256 = "0z7f9bm7xkq8a9kbhf3bd6fxhfaab08ddgghpbg5z460l4lhcczv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -112401,8 +112469,8 @@ self: { }: mkDerivation { pname = "imap"; - version = "0.3.0.4"; - sha256 = "021ya9pkf8q1nk805ck5hhm06q9lnp22d78hr0nz112xbxm5rqkw"; + version = "0.3.0.5"; + sha256 = "1wkm6agp0gsqg8lqfqp7sm0aq64426lpfw56nmnzvfk1hkq2gwmp"; libraryHaskellDepends = [ attoparsec base bytestring connection containers derive either exceptions hslogger list-t network pipes random rolling-queue stm @@ -112480,6 +112548,93 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "imj-animation" = callPackage + ({ mkDerivation, base, imj-base, imj-prelude, mtl }: + mkDerivation { + pname = "imj-animation"; + version = "0.1.0.2"; + sha256 = "1v0rji1b45n309wn4ld5fs60rri8gn4xg0wz319f2mcqqrih6ir4"; + libraryHaskellDepends = [ base imj-base imj-prelude mtl ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/OlivierSohn/hamazed/blob/master/imj-animation/README.md"; + description = "Animation Framework"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "imj-base" = callPackage + ({ mkDerivation, ansi-terminal, base, imj-prelude, mtl, primitive + , random, terminal-size, text, time, vector, vector-algorithms + }: + mkDerivation { + pname = "imj-base"; + version = "0.1.0.2"; + sha256 = "1b42xqzbgr47r2rkhy9299p68z9imgx19xc1d5rvfc3qyg8ciph2"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal base imj-prelude mtl primitive random terminal-size + text time vector vector-algorithms + ]; + executableHaskellDepends = [ + ansi-terminal base imj-prelude mtl text time + ]; + testHaskellDepends = [ + ansi-terminal base imj-prelude mtl text time + ]; + homepage = "https://github.com/OlivierSohn/hamazed/blob/master/imj-base/README.md"; + description = "Game engine with geometry, easing, animated text, delta rendering"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "imj-game-hamazed" = callPackage + ({ mkDerivation, base, containers, imj-animation, imj-base + , imj-prelude, matrix, mtl, terminal-size, text, vector + }: + mkDerivation { + pname = "imj-game-hamazed"; + version = "0.1.0.2"; + sha256 = "0s0a2c1pfp5mwfmh1fjbq83ws68d8k5r526b7qmq36p4n78hx22g"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers imj-animation imj-base imj-prelude matrix mtl + terminal-size text vector + ]; + executableHaskellDepends = [ base imj-prelude ]; + testHaskellDepends = [ base imj-base mtl text ]; + homepage = "https://github.com/OlivierSohn/hamazed/blob/master/imj-game-hamazed//README.md"; + description = "A game with flying numbers and 8-bit color animations"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "imj-measure-stdout" = callPackage + ({ mkDerivation, base, imj-prelude, optparse-applicative }: + mkDerivation { + pname = "imj-measure-stdout"; + version = "0.1.0.2"; + sha256 = "15s7dd241z9lzm0nb46yr0y7rjryy6jydwfgigcsalv5my4p2j6x"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base imj-prelude optparse-applicative + ]; + homepage = "https://github.com/OlivierSohn/hamazed/blob/master/imj-measure-stdout/README.md"; + description = "An application to determine the maximum capacity of stdout buffer"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "imj-prelude" = callPackage + ({ mkDerivation, base, mtl, text }: + mkDerivation { + pname = "imj-prelude"; + version = "0.1.0.2"; + sha256 = "1nv3fxps3i4znibv98qygxdl22dzri5zkw6hjaqajb4nlnh4bd0v"; + libraryHaskellDepends = [ base mtl text ]; + homepage = "https://github.com/OlivierSohn/hamazed/blob/master/imj-prelude/README.md"; + description = "Prelude library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "imm" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, atom-conduit, base , blaze-html, blaze-markup, bytestring, case-insensitive @@ -134364,7 +134519,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "mmark_0_0_4_1" = callPackage + "mmark_0_0_4_2" = callPackage ({ mkDerivation, aeson, base, case-insensitive, containers , criterion, data-default-class, deepseq, dlist, email-validate , foldl, hashable, hspec, hspec-megaparsec, html-entity-map, lucid @@ -134374,8 +134529,8 @@ self: { }: mkDerivation { pname = "mmark"; - version = "0.0.4.1"; - sha256 = "0m2naq38ijmxnd9kdr77qb5h5z1bnfsbvy1g1mz54yj1y44jr4ra"; + version = "0.0.4.2"; + sha256 = "0jkcgk8m9dc98cvkc7j6din5nl92n9whvsv144zdgn4fjjlcl2zl"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base case-insensitive containers data-default-class deepseq @@ -145159,8 +145314,8 @@ self: { }: mkDerivation { pname = "opencv"; - version = "0.0.2.0"; - sha256 = "1v3a97qrqxssl56bwip98ifkism9lzjhmizbgxbdhn8dbrmn8jgg"; + version = "0.0.2.1"; + sha256 = "1bwl3csl2bsgz32i7s59hb25hxj05vn9g3fa8xix9klz8kyrzam1"; configureFlags = [ "--with-gcc=${stdenv.cc}/bin/c++" "--with-ld=${stdenv.cc}/bin/c++" ]; @@ -145193,8 +145348,8 @@ self: { }: mkDerivation { pname = "opencv-extra"; - version = "0.2.0.0"; - sha256 = "0qdcikwr3shxjx3sdsnawwbg0h6pc1pn29cxq15hpjbv37yg2fc1"; + version = "0.2.0.1"; + sha256 = "0l4bphpsc9nv6kjvbyjqx0345mq4ryigi93ak64vv0bwp84xk5xz"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bindings-DSL bytestring containers inline-c inline-c-cpp @@ -151058,8 +151213,8 @@ self: { }: mkDerivation { pname = "persistent-redis"; - version = "2.5.2"; - sha256 = "04rbszmdykk3ks5qpfbvw6gpgqic6lqyyw49rjf3g4p1yhlmd9kv"; + version = "2.5.2.1"; + sha256 = "1vbrbgvjymrf3r6x3lix2yvb81iakdq7w8n3g2cq68l0vp8bryah"; libraryHaskellDepends = [ aeson attoparsec base binary bytestring hedis http-api-data monad-control mtl path-pieces persistent scientific text time @@ -180671,10 +180826,8 @@ self: { }: mkDerivation { pname = "snap-templates"; - version = "1.0.0.0"; - sha256 = "06sns89y2b2y8ln9ci99vph9v67yphcvw7fwdqgp41wx2x496a7n"; - revision = "1"; - editedCabalFile = "0y86zbaw4ain6ia15b7fpr48sxxz37x230qvrf28dicxcxm8jmva"; + version = "1.0.0.1"; + sha256 = "1l6gc2ppsvbaf783namglpyzghhynlg97q3ajc2ralibs21vsn7c"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -184927,8 +185080,8 @@ self: { }: mkDerivation { pname = "stackage2nix"; - version = "0.3.0"; - sha256 = "1cgcdgsw8qbc7dcfvj2jhwaja5x03fqa8f67c8f86fzrn0wcvw47"; + version = "0.4.0"; + sha256 = "0qj8v7kdyqsgm518gfrpdsvv7njwzrg2lm3k6cwd3lh50l9vsgcd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -184942,7 +185095,7 @@ self: { testHaskellDepends = [ base bytestring Cabal hspec pretty shakespeare text yaml ]; - homepage = "https://github.com/4e6/stackage2nix#readme"; + homepage = "https://github.com/typeable/stackage2nix#readme"; description = "Convert Stack files into Nix build instructions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -201349,6 +201502,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "typed-process_0_2_1_0" = callPackage + ({ mkDerivation, async, base, base64-bytestring, bytestring, hspec + , process, stm, temporary, transformers + }: + mkDerivation { + pname = "typed-process"; + version = "0.2.1.0"; + sha256 = "1l6wpkwnz4lriq1n0hxv3mdvzmrf44ddkb1ys8cyj3ywfn2xh56j"; + libraryHaskellDepends = [ + async base bytestring process stm transformers + ]; + testHaskellDepends = [ + async base base64-bytestring bytestring hspec process stm temporary + transformers + ]; + homepage = "https://haskell-lang.org/library/typed-process"; + description = "Run external processes, with strong typing of streams"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "typed-spreadsheet" = callPackage ({ mkDerivation, async, base, diagrams-cairo, diagrams-gtk , diagrams-lib, foldl, gtk, microlens, stm, text, transformers @@ -201944,27 +202118,27 @@ self: { }) {}; "uhc-light" = callPackage - ({ mkDerivation, array, base, binary, bytestring, containers - , directory, fgl, filepath, hashable, mtl, network, old-locale - , primitive, process, syb, transformers, uhc-util, utf8-string - , uulib, vector + ({ mkDerivation, array, base, binary, bytestring, chr-data + , containers, directory, fgl, filepath, hashable, mtl, network + , old-locale, primitive, process, syb, transformers, uhc-util + , utf8-string, uulib, vector }: mkDerivation { pname = "uhc-light"; - version = "1.1.9.5"; - sha256 = "07b8hvam9n801ldwrm6jjds691gxjw4yp33zsg4bbbv2mk6z7fpa"; + version = "1.1.10.0"; + sha256 = "0l8p6jn5f2lakdq5lvish0w62cpc0dsx7xm0jcwy6bml3ivlpzw9"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - array base binary bytestring containers directory fgl filepath - hashable mtl network old-locale primitive process syb transformers - uhc-util utf8-string uulib vector + array base binary bytestring chr-data containers directory fgl + filepath hashable mtl network old-locale primitive process syb + transformers uhc-util utf8-string uulib vector ]; executableHaskellDepends = [ - array base binary bytestring containers directory fgl filepath - hashable mtl network old-locale primitive process syb transformers - uhc-util utf8-string uulib vector + array base binary bytestring chr-data containers directory fgl + filepath hashable mtl network old-locale primitive process syb + transformers uhc-util utf8-string uulib vector ]; homepage = "https://github.com/UU-ComputerScience/uhc"; description = "Part of UHC packaged as cabal/hackage installable library"; @@ -211747,6 +211921,46 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "wreq_0_5_2_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, attoparsec + , authenticate-oauth, base, base16-bytestring, base64-bytestring + , byteable, bytestring, Cabal, cabal-doctest, case-insensitive + , containers, cryptohash, directory, doctest, exceptions, filepath + , ghc-prim, hashable, http-client, http-client-tls, http-types + , HUnit, lens, lens-aeson, mime-types, network-info, psqueues + , QuickCheck, snap-core, snap-server, template-haskell, temporary + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , text, time, time-locale-compat, transformers, unix-compat + , unordered-containers, uuid, vector + }: + mkDerivation { + pname = "wreq"; + version = "0.5.2.0"; + sha256 = "06v70dpnh7lp1sr0i0fvl2b2cx0z57dfwi8i2fxva0gcdwan0fki"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + aeson attoparsec authenticate-oauth base base16-bytestring byteable + bytestring case-insensitive containers cryptohash exceptions + ghc-prim hashable http-client http-client-tls http-types lens + lens-aeson mime-types psqueues template-haskell text time + time-locale-compat unordered-containers + ]; + testHaskellDepends = [ + aeson aeson-pretty base base64-bytestring bytestring + case-insensitive containers directory doctest filepath hashable + http-client http-types HUnit lens lens-aeson network-info + QuickCheck snap-core snap-server temporary test-framework + test-framework-hunit test-framework-quickcheck2 text time + transformers unix-compat unordered-containers uuid vector + ]; + homepage = "http://www.serpentine.com/wreq"; + description = "An easy-to-use HTTP client library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wreq-sb" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec , authenticate-oauth, base, base16-bytestring, base64-bytestring From 1e137832b8a60f0521ca196110157389a134da1e Mon Sep 17 00:00:00 2001 From: Drew Hess Date: Tue, 2 Jan 2018 03:57:12 -0800 Subject: [PATCH 074/296] ghc: add ARM variants to meta.platforms for new binary versions. --- pkgs/development/compilers/ghc/7.10.3-binary.nix | 2 +- pkgs/development/compilers/ghc/8.2.1-binary.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ghc/7.10.3-binary.nix b/pkgs/development/compilers/ghc/7.10.3-binary.nix index d4a07a54308..84b6157c865 100644 --- a/pkgs/development/compilers/ghc/7.10.3-binary.nix +++ b/pkgs/development/compilers/ghc/7.10.3-binary.nix @@ -149,5 +149,5 @@ stdenv.mkDerivation rec { ''; meta.license = stdenv.lib.licenses.bsd3; - meta.platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin"]; + meta.platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin" "armv7l-linux"]; } diff --git a/pkgs/development/compilers/ghc/8.2.1-binary.nix b/pkgs/development/compilers/ghc/8.2.1-binary.nix index caf8a63f81f..1242c6ae1b0 100644 --- a/pkgs/development/compilers/ghc/8.2.1-binary.nix +++ b/pkgs/development/compilers/ghc/8.2.1-binary.nix @@ -152,5 +152,5 @@ stdenv.mkDerivation rec { ''; meta.license = stdenv.lib.licenses.bsd3; - meta.platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin"]; + meta.platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin" "armv7l-linux" "aarch64-linux"]; } From 25b70085204e4324b7dc8e712735291cd6cf81ab Mon Sep 17 00:00:00 2001 From: Michele Guerini Rocco Date: Tue, 2 Jan 2018 12:15:20 +0000 Subject: [PATCH 075/296] qutebrowser: make gstreamer and pdfjs configurable (#33074) qutebrowser: make gstreamer and pdfjs configurable --- .../browsers/qutebrowser/default.nix | 47 ++++++++++--------- pkgs/top-level/all-packages.nix | 5 +- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index f4beb70f40d..fb8c16abd53 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -1,37 +1,36 @@ -{ stdenv, lib, fetchurl, unzip, buildPythonApplication, makeWrapper, wrapGAppsHook -, qtbase, pyqt5, jinja2, pygments, pyyaml, pypeg2, pyopengl, cssutils, glib_networking -, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2, libxslt -, gst-plugins-base, gst-plugins-good, gst-plugins-bad, gst-plugins-ugly, gst-libav -, qtwebkit-plugins ? null -, attrs +{ stdenv, lib, fetchurl, fetchzip, python3Packages +, makeWrapper, wrapGAppsHook, qtbase, glib_networking +, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2 +, libxslt, gst_all_1 ? null +, withPdfReader ? true +, withMediaPlayback ? true , withWebEngineDefault ? true }: -assert (! withWebEngineDefault) -> qtwebkit-plugins != null; +assert withMediaPlayback -> gst_all_1 != null; let pdfjs = stdenv.mkDerivation rec { name = "pdfjs-${version}"; version = "1.7.225"; - src = fetchurl { + src = fetchzip { url = "https://github.com/mozilla/pdf.js/releases/download/v${version}/${name}-dist.zip"; - sha256 = "1n8ylmv60r0qbw2vilp640a87l4lgnrsi15z3iihcs6dj1n1yy67"; + sha256 = "0bsmbz7bbh0zpd70dlhss4fjdw7zq356091wld9s7kxnb2rixqd8"; + stripRoot = false; }; - nativeBuildInputs = [ unzip ]; - buildCommand = '' mkdir $out - unzip -d $out $src + cp -r $src $out ''; }; -in buildPythonApplication rec { - name = "qutebrowser-${version}${fix_postfix}"; - fix_postfix = ""; - version = "1.0.4"; +in python3Packages.buildPythonApplication rec { + name = "qutebrowser-${version}${versionPostfix}"; namePrefix = ""; + version = "1.0.4"; + versionPostfix = ""; src = fetchurl { url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${name}.tar.gz"; @@ -43,21 +42,25 @@ in buildPythonApplication rec { buildInputs = [ qtbase - gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav glib_networking - ] - ++ lib.optional (! withWebEngineDefault) qtwebkit-plugins; + ] ++ lib.optionals withMediaPlayback (with gst_all_1; [ + gst-plugins-base gst-plugins-good + gst-plugins-bad gst-plugins-ugly gst-libav + ]) ++ lib.optional (!withWebEngineDefault) python3Packages.qtwebkit-plugins; nativeBuildInputs = [ - makeWrapper wrapGAppsHook asciidoc docbook_xml_dtd_45 docbook_xsl libxml2 libxslt + makeWrapper wrapGAppsHook asciidoc + docbook_xml_dtd_45 docbook_xsl libxml2 libxslt ]; - propagatedBuildInputs = [ - pyyaml pyqt5 jinja2 pygments pypeg2 cssutils pyopengl attrs + propagatedBuildInputs = with python3Packages; [ + pyyaml pyqt5 jinja2 pygments + pypeg2 cssutils pyopengl attrs ]; postPatch = '' sed -i "s,/usr/share/qutebrowser,$out/share/qutebrowser,g" qutebrowser/utils/standarddir.py + '' + lib.optionalString withPdfReader '' sed -i "s,/usr/share/pdf.js,${pdfjs},g" qutebrowser/browser/pdfjs.py ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 545481f07fa..2a1ddb49c28 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16660,10 +16660,7 @@ with pkgs; 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; - inherit (gst_all_1) gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav; - }; + qutebrowser = libsForQt5.callPackage ../applications/networking/browsers/qutebrowser { }; rabbitvcs = callPackage ../applications/version-management/rabbitvcs {}; From f8427deea0da34d30ad0f75ed3a0ee0f1beda75b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Mon, 1 Jan 2018 21:11:23 +0100 Subject: [PATCH 076/296] ttfautohint: 1.7 -> 1.8.1 --- pkgs/tools/misc/ttfautohint/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/ttfautohint/default.nix b/pkgs/tools/misc/ttfautohint/default.nix index 5dcaea3ec1e..38dac37aa7d 100644 --- a/pkgs/tools/misc/ttfautohint/default.nix +++ b/pkgs/tools/misc/ttfautohint/default.nix @@ -1,23 +1,27 @@ -{ stdenv, lib, fetchurl, pkgconfig, freetype, harfbuzz, libiconv, qtbase, enableGUI ? true }: +{ + stdenv, lib, fetchurl, pkgconfig, autoreconfHook +, freetype, harfbuzz, libiconv, qtbase +, enableGUI ? true +}: stdenv.mkDerivation rec { - version = "1.7"; + version = "1.8.1"; name = "ttfautohint-${version}"; src = fetchurl { url = "mirror://savannah/freetype/${name}.tar.gz"; - sha256 = "1wh783pyg79ks5qbni61x7qngdhyfc33swrkcl5r1czdwhhlif9x"; + sha256 = "1yflnydzdfkr8bi29yf42hb6h6525a4rdid3w8qjfk8rpqh53pqj"; }; postPatch = '' substituteInPlace configure --replace "macx-g++" "macx-clang" ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ freetype harfbuzz libiconv ] ++ lib.optional enableGUI qtbase; - configureFlags = lib.optional (!enableGUI) "--with-qt=no"; + configureFlags = [ ''--with-qt=${if enableGUI then "${qtbase}/lib" else "no"}'' ]; enableParallelBuilding = true; From b084b360100dcd5f849a22a6ff4543eef0aa3a1f Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 2 Jan 2018 07:33:04 -0500 Subject: [PATCH 077/296] docker: 17.{09,11} -> 17.12 --- .../virtualization/docker/default.nix | 35 ++++++------------- pkgs/top-level/all-packages.nix | 7 ++-- 2 files changed, 13 insertions(+), 29 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 09e7de898d5..c4c0adbb9bf 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -105,6 +105,7 @@ rec { cd ./components/engine export AUTO_GOPATH=1 export DOCKER_GITCOMMIT="${rev}" + export VERSION="${version}" ./hack/make.sh dynbinary cd - '') + '' @@ -136,11 +137,7 @@ rec { extraPath = optionals (stdenv.isLinux) (makeBinPath [ iproute iptables e2fsprogs xz xfsprogs procps utillinux ]); installPhase = optionalString (stdenv.isLinux) '' - if [ -d "./components/engine/bundles/${version}" ]; then - install -Dm755 ./components/engine/bundles/${version}/dynbinary-daemon/dockerd-${version} $out/libexec/docker/dockerd - else - install -Dm755 ./components/engine/bundles/dynbinary-daemon/dockerd-${version} $out/libexec/docker/dockerd - fi + install -Dm755 ./components/engine/bundles/dynbinary-daemon/dockerd $out/libexec/docker/dockerd makeWrapper $out/libexec/docker/dockerd $out/bin/dockerd \ --prefix PATH : "$out/libexec/docker:$extraPath" @@ -207,26 +204,14 @@ rec { # Get revisions from # https://github.com/docker/docker-ce/blob/v${version}/components/engine/hack/dockerfile/binaries-commits - docker_17_09 = dockerGen rec { - version = "17.09.1-ce"; - rev = "19e2cf6259bd7f027a3fff180876a22945ce4ba8"; # git commit - sha256 = "10glpbaw7bg2acgf1nmfn79is2b3xsm4shz67rp72dmpzzaavb42"; - runcRev = "3f2f8b84a77f73d38244dd690525642a72156c64"; - runcSha256 = "0vaagmav8443kmyxac2y1y5l2ipcs1c7gdmsnvj48y9bafqx72rq"; - containerdRev = "06b9cb35161009dcb7123345749fef02f7cea8e0"; - containerdSha256 = "10hms8a2nn69nfnwly6923jzx40c3slpsdhjhff4bxh36flpf9gd"; - tiniRev = "949e6facb77383876aeff8a6944dde66b3089574"; - tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw"; - }; - - docker_17_11 = dockerGen rec { - version = "17.11.0-ce"; - rev = "1caf76ce6baa889133ece59fab3c36aaf143d4ef"; # git commit - sha256 = "09s7lxcs4wdjj69l7z3nybbms7iqspk1wy7qnr4r52s8vr3fd5s4"; - runcRev = "0351df1c5a66838d0c392b4ac4cf9450de844e2d"; - runcSha256 = "1cmkdv6rli7v0y0fddqxvrvzd486fg9ssp3kgkya3szkljzz4xj0"; - containerdRev = "992280e8e265f491f7a624ab82f3e238be086e49"; - containerdSha256 = "1ci6jlgrrgz4ph451035sl98lj2jd467pd4qnv85ma9gzblrxs7n"; + docker_17_12 = dockerGen rec { + version = "17.12.0-ce"; + rev = "486a48d2701493bb65385788a291e36febb44ec1"; # git commit + sha256 = "14kp7wrzf3s9crk8px1dc575lchyrcl2dqiwr3sgxb9mzjfiyqps"; + runcRev = "b2567b37d7b75eb4cf325b77297b140ea686ce8f"; + runcSha256 = "0zarsrbfcm1yp6mdl6rcrigdf7nb70xmv2cbggndz0qqyrw0mk0l"; + containerdRev = "89623f28b87a6004d4b785663257362d1658a729"; + containerdSha256 = "0irx7ps6rhq7z69cr3gspxdr7ywrv6dz62gkr1z2723cki9hsxma"; tiniRev = "949e6facb77383876aeff8a6944dde66b3089574"; tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw"; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 545481f07fa..910be591f41 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14484,11 +14484,10 @@ with pkgs; }; inherit (callPackage ../applications/virtualization/docker { }) - docker_17_09 - docker_17_11; + docker_17_12; - docker = docker_17_09; - docker-edge = docker_17_11; + docker = docker_17_12; + docker-edge = docker_17_12; docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { }; From 02e95ea0b5dc4d62fd1d8cc48e881840b4b07b39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 2 Jan 2018 15:23:17 +0100 Subject: [PATCH 078/296] jemalloc: do not expose hugepage support as an option The only common use case so far seems ARMv6/ARMv7 support. The way this option is exposed might collide with a package with the same name. Also the option naming on its own is not self-descriptive without context. --- pkgs/development/libraries/jemalloc/default.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/jemalloc/default.nix b/pkgs/development/libraries/jemalloc/default.nix index ee8703a4cf3..d11ec0a7823 100644 --- a/pkgs/development/libraries/jemalloc/default.nix +++ b/pkgs/development/libraries/jemalloc/default.nix @@ -1,8 +1,4 @@ -{ stdenv, fetchurl, - # jemalloc is unable to correctly detect transparent hugepage support on - # ARM (https://github.com/jemalloc/jemalloc/issues/526), and the default - # kernel ARMv6/7 kernel does not enable it, so we explicitly disable support - thpSupport ? !stdenv.isArm }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "jemalloc-${version}"; @@ -17,11 +13,12 @@ stdenv.mkDerivation rec { # then stops downstream builds (mariadb in particular) from detecting it. This # option should remove the prefix and give us a working jemalloc. configureFlags = stdenv.lib.optional stdenv.isDarwin "--with-jemalloc-prefix=" - ++ stdenv.lib.optional (!thpSupport) "--disable-thp"; - + # jemalloc is unable to correctly detect transparent hugepage support on + # ARM (https://github.com/jemalloc/jemalloc/issues/526), and the default + # kernel ARMv6/7 kernel does not enable it, so we explicitly disable support + ++ stdenv.lib.optional stdenv.isArm "--disable-thp"; doCheck = true; - meta = with stdenv.lib; { homepage = http://jemalloc.net; description = "General purpose malloc(3) implementation"; From 34a91b79220cf54bce20db52cf2d5775ccc5e611 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 2 Jan 2018 11:37:54 -0500 Subject: [PATCH 079/296] haskell: Fix depending on libs with internal libs on darwin. Thanks to @hamishmack for the pointer. Fixes #33149. --- pkgs/development/haskell-modules/generic-builder.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index c633310a37a..e4ae24f74fa 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -243,7 +243,7 @@ stdenv.mkDerivation ({ # libraries) from all the dependencies. local dynamicLinksDir="$out/lib/links" mkdir -p $dynamicLinksDir - for d in $(grep dynamic-library-dirs "$packageConfDir/"*|awk '{print $2}'); do + for d in $(grep dynamic-library-dirs "$packageConfDir/"*|awk '{print $2}'|sort -u); do ln -s "$d/"*.dylib $dynamicLinksDir done # Edit the local package DB to reference the links directory. From fa777a4de7aa29ae4f634a9e0100c9e25fdc4091 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 2 Jan 2018 11:05:58 -0600 Subject: [PATCH 080/296] lxterminal: use nativeBuildInputs for compile-time-only deps --- pkgs/applications/misc/lxterminal/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/lxterminal/default.nix b/pkgs/applications/misc/lxterminal/default.nix index 145672cad38..a514b0ff63d 100644 --- a/pkgs/applications/misc/lxterminal/default.nix +++ b/pkgs/applications/misc/lxterminal/default.nix @@ -16,11 +16,13 @@ stdenv.mkDerivation rec { "--enable-man" ]; - buildInputs = [ - automake autoconf intltool pkgconfig gtk2 vte libxslt docbook_xml_dtd_412 - docbook_xml_xslt libxml2 findXMLCatalogs + nativeBuildInputs = [ + automake autoconf intltool pkgconfig + libxslt docbook_xml_dtd_412 docbook_xml_xslt libxml2 findXMLCatalogs ]; + buildInputs = [ gtk2 vte ]; + patches = [ ./respect-xml-catalog-files-var.patch ]; From 5465d6f7ded73a815b4ed3953f6d00d0aa563ac3 Mon Sep 17 00:00:00 2001 From: Uli Schlachter Date: Tue, 2 Jan 2018 18:24:56 +0100 Subject: [PATCH 081/296] awesome: Use --search instead of $LUA_PATH/$LUA_CPATH Instead of polluting the environment with environment variables which are inherited by processes spawned from awesome, use the command line argument "--search" to add things to the search path. cc #33169 --- .../modules/services/x11/window-managers/awesome.nix | 11 ++++++----- pkgs/applications/window-managers/awesome/default.nix | 4 ++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/x11/window-managers/awesome.nix b/nixos/modules/services/x11/window-managers/awesome.nix index eb97449c6bd..71eb02ec595 100644 --- a/nixos/modules/services/x11/window-managers/awesome.nix +++ b/nixos/modules/services/x11/window-managers/awesome.nix @@ -6,7 +6,11 @@ let cfg = config.services.xserver.windowManager.awesome; awesome = cfg.package; - inherit (pkgs.luaPackages) getLuaPath getLuaCPath; + getLuaPath = lib : dir : "${lib}/${dir}/lua/${pkgs.luaPackages.lua.luaversion}"; + makeSearchPath = lib.concatMapStrings (path: + " --search " + (getLuaPath path "share") + + " --search " + (getLuaPath path "lib") + ); in { @@ -46,10 +50,7 @@ in { name = "awesome"; start = '' - export LUA_CPATH="${lib.concatStringsSep ";" (map getLuaCPath cfg.luaModules)}" - export LUA_PATH="${lib.concatStringsSep ";" (map getLuaPath cfg.luaModules)}" - - ${awesome}/bin/awesome & + ${awesome}/bin/awesome ${makeSearchPath cfg.luaModules} & waitPID=$! ''; }; diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index 4043c05e3d6..ca596cdfddc 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -49,8 +49,8 @@ with luaPackages; stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/awesome \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix LUA_CPATH ";" '${lgi}/lib/lua/${lua.luaversion}/?.so' \ - --prefix LUA_PATH ";" '${lgi}/share/lua/${lua.luaversion}/?.lua' \ + --add-flags '--search ${lgi}/lib/lua/${lua.luaversion}' \ + --add-flags '--search ${lgi}/share/lua/${lua.luaversion}' \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH" \ --prefix PATH : "${stdenv.lib.makeBinPath [ compton unclutter procps iproute coreutils curl alsaUtils findutils xterm ]}" From b222e44f0ac9e2f3ae2a07a0c6f5101216d76d4f Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Tue, 2 Jan 2018 19:06:21 +0100 Subject: [PATCH 082/296] toot: 0.15.0 -> 0.16.2 --- pkgs/applications/misc/toot/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/toot/default.nix b/pkgs/applications/misc/toot/default.nix index d1b1daa26d6..be865261912 100644 --- a/pkgs/applications/misc/toot/default.nix +++ b/pkgs/applications/misc/toot/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchFromGitHub, pythonPackages }: +{ stdenv, fetchFromGitHub, python3Packages }: -pythonPackages.buildPythonApplication rec { - version = "0.15.0"; +python3Packages.buildPythonApplication rec { + version = "0.16.2"; name = "toot-${version}"; src = fetchFromGitHub { owner = "ihabunek"; repo = "toot"; rev = "${version}"; - sha256 = "08k913gw0ip2q686z9k63bcn1n5s4w6b7jj6jmmamm427xmibkph"; + sha256 = "19n6rmm44y24zvkpk56vd2xmx49sn6wc5qayi1jm83jlnlbbwfh7"; }; - checkInputs = with pythonPackages; [ pytest ]; + checkInputs = with python3Packages; [ pytest ]; - propagatedBuildInputs = with pythonPackages; + propagatedBuildInputs = with python3Packages; [ requests beautifulsoup4 future ]; checkPhase = '' From e80b27f3838cb7844d198de41bf5be950c56806a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 2 Jan 2018 16:29:16 -0200 Subject: [PATCH 083/296] pnmixer: 0.7.1 -> 0.7.2 --- pkgs/tools/audio/pnmixer/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/audio/pnmixer/default.nix b/pkgs/tools/audio/pnmixer/default.nix index 385021b7354..9906fa449dd 100644 --- a/pkgs/tools/audio/pnmixer/default.nix +++ b/pkgs/tools/audio/pnmixer/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, gettext, alsaLib, gtk3, glib, libnotify, libX11 }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, gettext, alsaLib, gtk3, glib, libnotify, libX11, pcre }: stdenv.mkDerivation rec { name = "pnmixer-${version}"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "nicklan"; repo = "pnmixer"; rev = "v${version}"; - sha256 = "0mmrq4m2rk0wmkfmqs3fk2rnw5g5lvd7ill2s3d7ggf9vba1pcn2"; + sha256 = "0416pa933ddf4b7ph9zxhk5jppkk7ppcq1aqph6xsrfnka4yb148"; }; nativeBuildInputs = [ cmake pkgconfig gettext ]; - buildInputs = [ alsaLib gtk3 glib libnotify libX11 ]; + buildInputs = [ alsaLib gtk3 glib libnotify libX11 pcre ]; meta = with stdenv.lib; { homepage = https://github.com/nicklan/pnmixer; From 19f1fd14b3157d42ef51ae2b9c5a95e25f74b348 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 2 Jan 2018 12:15:48 -0600 Subject: [PATCH 084/296] invisible-island programs: Fix FTP URL's, use HTTPS, prefer ftp FTP URL's should use ftp.invisible-island.net. --- pkgs/applications/misc/xterm/default.nix | 5 ++++- pkgs/applications/networking/browsers/lynx/default.nix | 5 ++++- pkgs/development/libraries/ncurses/default.nix | 5 ++++- pkgs/development/tools/parsing/byacc/default.nix | 4 ++-- pkgs/tools/text/diffstat/default.nix | 5 ++++- pkgs/tools/text/mawk/default.nix | 2 +- 6 files changed, 19 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix index 9e64557838e..ca26b35f29e 100644 --- a/pkgs/applications/misc/xterm/default.nix +++ b/pkgs/applications/misc/xterm/default.nix @@ -6,7 +6,10 @@ stdenv.mkDerivation rec { name = "xterm-330"; src = fetchurl { - url = "http://invisible-mirror.net/archives/xterm/${name}.tgz"; + urls = [ + "ftp://ftp.invisible-island.net/xterm/${name}.tgz" + "https://invisible-mirror.net/archives/xterm/${name}.tgz" + ]; sha256 = "1psnfmqd23v9gxj8a98nzrgvymrk0p1whwqi92gy15bbkzrgkvks"; }; diff --git a/pkgs/applications/networking/browsers/lynx/default.nix b/pkgs/applications/networking/browsers/lynx/default.nix index 0f6c4ed36d4..b1f9b0a1695 100644 --- a/pkgs/applications/networking/browsers/lynx/default.nix +++ b/pkgs/applications/networking/browsers/lynx/default.nix @@ -12,7 +12,10 @@ stdenv.mkDerivation rec { version = "2.8.9dev.16"; src = fetchurl { - url = "http://invisible-mirror.net/archives/lynx/tarballs/lynx${version}.tar.bz2"; + urls = [ + "ftp://ftp.invisible-island.net/lynx/tarballs/lynx${version}.tar.bz2" + "https://invisible-mirror.net/archives/lynx/tarballs/lynx${version}.tar.bz2" + ]; sha256 = "1j0vx871ghkm7fgrafnvd2ml3ywcl8d3gyhq02fhfb851c88lc84"; }; diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 9aade8b9672..3cdc88fd644 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -18,7 +18,10 @@ stdenv.mkDerivation rec { url = "mirror://gnu/ncurses/${name}.tar.gz"; sha256 = "0fsn7xis81za62afan0vvm38bvgzg5wfmv1m86flqcj0nj7jjilh"; } else { - url = "ftp://ftp.invisible-island.net/ncurses/current/${name}.tgz"; + urls = [ + "ftp://ftp.invisible-island.net/ncurses/current/${name}.tgz" + "https://invisible-mirror.net/archives/ncurses/current/${name}.tgz" + ]; sha256 = "11adzj0k82nlgpfrflabvqn2m7fmhp2y6pd7ivmapynxqb9vvb92"; }); diff --git a/pkgs/development/tools/parsing/byacc/default.nix b/pkgs/development/tools/parsing/byacc/default.nix index c34eb9fc708..ce8f7de1bbb 100644 --- a/pkgs/development/tools/parsing/byacc/default.nix +++ b/pkgs/development/tools/parsing/byacc/default.nix @@ -6,8 +6,8 @@ stdenv.mkDerivation rec { src = fetchurl { urls = [ - "ftp://invisible-island.net/byacc/${name}.tgz" - "http://invisible-mirror.net/archives/byacc/${name}.tgz" + "ftp://ftp.invisible-island.net/byacc/${name}.tgz" + "https://invisible-mirror.net/archives/byacc/${name}.tgz" ]; sha256 = "90b768d177f91204e6e7cef226ae1dc7cac831b625774cebd3e233a917754f91"; }; diff --git a/pkgs/tools/text/diffstat/default.nix b/pkgs/tools/text/diffstat/default.nix index cfc1d4badbd..d106d140a67 100644 --- a/pkgs/tools/text/diffstat/default.nix +++ b/pkgs/tools/text/diffstat/default.nix @@ -4,7 +4,10 @@ stdenv.mkDerivation rec { name = "diffstat-1.61"; src = fetchurl { - url = "ftp://invisible-island.net/diffstat/${name}.tgz"; + urls = [ + "ftp://ftp.invisible-island.net/diffstat/${name}.tgz" + "https://invisible-mirror.net/archives/diffstat/${name}.tgz" + ]; sha256 = "1vjmda2zfjxg0qkaj8hfqa8g6bfwnn1ja8696rxrjgqq4w69wd95"; }; diff --git a/pkgs/tools/text/mawk/default.nix b/pkgs/tools/text/mawk/default.nix index a8657c3ea2f..ed54f9d349e 100644 --- a/pkgs/tools/text/mawk/default.nix +++ b/pkgs/tools/text/mawk/default.nix @@ -5,8 +5,8 @@ stdenv.mkDerivation rec { src = fetchurl { urls = [ + "ftp://ftp.invisible-island.net/mawk/${name}.tgz" "https://invisible-mirror.net/archives/mawk/${name}.tgz" - "ftp://invisible-island.net/mawk/${name}.tgz" ]; sha256 = "0nwyxhipn4jx7j695lih1xggxm6cp4fjk4wbgihd33ni3rfi25yv"; }; From 94f06c886825f125b7a7169387b1f4bbde928923 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 2 Jan 2018 12:21:43 -0600 Subject: [PATCH 085/296] byacc: 20170201 -> 20170709 http://invisible-island.net/byacc/CHANGES.html#t20170709 --- pkgs/development/tools/parsing/byacc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/parsing/byacc/default.nix b/pkgs/development/tools/parsing/byacc/default.nix index ce8f7de1bbb..612196cba77 100644 --- a/pkgs/development/tools/parsing/byacc/default.nix +++ b/pkgs/development/tools/parsing/byacc/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "byacc-${version}"; - version = "20170201"; + version = "20170709"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/byacc/${name}.tgz" "https://invisible-mirror.net/archives/byacc/${name}.tgz" ]; - sha256 = "90b768d177f91204e6e7cef226ae1dc7cac831b625774cebd3e233a917754f91"; + sha256 = "1syrg1nwh2qmlr5mh7c4vz9psdv4gf55h8i5ffw84q6whlcq1kr7"; }; doCheck = true; From e3f83c3f4bbbea5af7a3ca3f23eb340cab0cb78e Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 2 Jan 2018 11:54:12 -0600 Subject: [PATCH 086/296] cdk: 5.0-20161210 -> 5.0-20171209 http://invisible-island.net/cdk/CHANGES.html#t20171209 --- pkgs/development/libraries/cdk/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/cdk/default.nix b/pkgs/development/libraries/cdk/default.nix index a97ca5cc698..19f39217fd0 100644 --- a/pkgs/development/libraries/cdk/default.nix +++ b/pkgs/development/libraries/cdk/default.nix @@ -2,15 +2,18 @@ stdenv.mkDerivation rec { name = "cdk-${version}"; - version ="5.0-20161210"; + version ="5.0-20171209"; buildInputs = [ ncurses ]; src = fetchurl { - url = "ftp://invisible-island.net/cdk/cdk-${version}.tgz"; - sha256 = "1bazwcwz4qhxyc8jaahdd2nlm30f5dhy0f6cnix5rjjhi35mhxcy"; + urls = [ + "ftp://ftp.invisible-island.net/cdk/cdk-${version}.tgz" + "https://invisible-mirror.net/archives/cdk/cdk-${version}.tgz" + ]; + sha256 = "0jq0dx7gm7gl6lv5mhlfkxhw5362g9dxqdlpjlrag069nns8xdc8"; }; meta = with stdenv.lib; { From bf8be80ce350548703725260823177255baecece Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 2 Jan 2018 11:55:13 -0600 Subject: [PATCH 087/296] dialog: 1.3-20160209 -> 1.3-20171209 --- pkgs/development/tools/misc/dialog/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/dialog/default.nix b/pkgs/development/tools/misc/dialog/default.nix index 76d34bfd564..8c236597484 100644 --- a/pkgs/development/tools/misc/dialog/default.nix +++ b/pkgs/development/tools/misc/dialog/default.nix @@ -13,11 +13,14 @@ assert unicodeSupport -> ncurses.unicode && ncurses != null; stdenv.mkDerivation rec { name = "dialog-${version}"; - version = "1.3-20160209"; + version = "1.3-20171209"; src = fetchurl { - url = "ftp://invisible-island.net/dialog/${name}.tgz"; - sha256 = "11rzh14xy9s99gxdi5i7fgmgihjqsv0ls0ksavkmip2y37rgf503"; + urls = [ + "ftp://ftp.invisible-island.net/dialog/${name}.tgz" + "https://invisible-mirror.net/archives/dialog/${name}.tgz" + ]; + sha256 = "1rk72as52f5br3wcr74d00wib41w65g8wvi36mfgybly251984r0"; }; buildInputs = [ ncurses ]; From 73824f1e65be567384a03fb3158de391f1f8e31b Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 2 Jan 2018 12:18:57 -0600 Subject: [PATCH 088/296] xterm: 330 -> 331 https://invisible-island.net/xterm/xterm.log.html#xterm_331 --- pkgs/applications/misc/xterm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix index ca26b35f29e..1909c48dbd4 100644 --- a/pkgs/applications/misc/xterm/default.nix +++ b/pkgs/applications/misc/xterm/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - name = "xterm-330"; + name = "xterm-331"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/xterm/${name}.tgz" "https://invisible-mirror.net/archives/xterm/${name}.tgz" ]; - sha256 = "1psnfmqd23v9gxj8a98nzrgvymrk0p1whwqi92gy15bbkzrgkvks"; + sha256 = "047gk58hvj64974sg259ss5gixj7pac6halmjfz4cc6r1yimds4s"; }; buildInputs = From 9d2c5010fb9c4d1d84e79fc3000a0c42c44572e5 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 2 Jan 2018 12:28:34 -0600 Subject: [PATCH 089/296] xterm: Fix license from BSD to 'mit', don't use string Inspecting source suggests it's MIT-X11; don't see mention of BSD licensing. https://repology.org/metapackage/xterm/information shows we're currently only one marking it as BSD. --- pkgs/applications/misc/xterm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix index 1909c48dbd4..838043881e4 100644 --- a/pkgs/applications/misc/xterm/default.nix +++ b/pkgs/applications/misc/xterm/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://invisible-island.net/xterm; - license = "BSD"; + license = with stdenv.lib.licenses; [ mit ]; maintainers = with stdenv.lib.maintainers; [viric vrthra]; platforms = with stdenv.lib.platforms; linux ++ darwin; }; From ab651d2c9bab620ebe5e515476fbd70d2c5b0c61 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 26 Jun 2017 16:56:03 -0400 Subject: [PATCH 090/296] linux bootstrap tools: Use same derivation whether cross compiling or not --- .../linux/make-bootstrap-tools-cross.nix | 237 +----------------- pkgs/stdenv/linux/make-bootstrap-tools.nix | 34 ++- pkgs/top-level/release-cross.nix | 4 +- pkgs/top-level/release.nix | 5 +- 4 files changed, 42 insertions(+), 238 deletions(-) diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix index 02cbac0f278..ac1d57a2275 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix @@ -1,233 +1,16 @@ {system ? builtins.currentSystem}: -let buildFor = toolsArch: ( - let - lib = import ../../../lib; - pkgsFun = import ../../..; - - inherit (lib.systems.examples) - sheevaplug raspberryPi armv7l-hf-multiplatform - aarch64-multiplatform scaleway-c1 pogoplug4; - - selectedCrossSystem = - if toolsArch == "armv5tel" then sheevaplug else - if toolsArch == "scaleway" then scaleway-c1 else - if toolsArch == "pogoplug4" then pogoplug4 else - if toolsArch == "armv6l" then raspberryPi else - if toolsArch == "armv7l" then armv7l-hf-multiplatform else - if toolsArch == "aarch64" then aarch64-multiplatform else null; - - pkgs = pkgsFun ({ inherit system; crossSystem = selectedCrossSystem; }); - - glibc = pkgs.libcCross; - bash = pkgs.bash; - findutils = pkgs.findutils; - diffutils = pkgs.diffutils; - gnused = pkgs.gnused; - gnugrep = pkgs.gnugrep; - gawk = pkgs.gawk; - gzip = pkgs.gzip; - bzip2 = pkgs.bzip2; - gnumake = pkgs.gnumake; - patch = pkgs.patch; - patchelf = pkgs.patchelf; - gcc = pkgs.gcc.cc; - gmpxx = pkgs.gmpxx; - mpfr = pkgs.mpfr; - zlib = pkgs.zlib; - libmpc = pkgs.libmpc; - binutils = pkgs.binutils; - libelf = pkgs.libelf; - - # Keep these versions in sync with the versions used in the current GCC! - isl = pkgs.isl_0_14; -in - -rec { - - - coreutilsMinimal = pkgs.coreutils.override (args: { - # We want coreutils without ACL/attr support. - aclSupport = false; - attrSupport = false; - # Our tooling currently can't handle scripts in bin/, only ELFs and symlinks. - singleBinary = "symlinks"; - }); - - tarMinimal = pkgs.gnutar.override { acl = null; }; - - busyboxMinimal = pkgs.busybox.override { - useMusl = true; - enableStatic = true; - enableMinimal = true; - extraConfig = '' - CONFIG_ASH y - CONFIG_ASH_BUILTIN_ECHO y - CONFIG_ASH_BUILTIN_TEST y - CONFIG_ASH_OPTIMIZE_FOR_SIZE y - CONFIG_MKDIR y - CONFIG_TAR y - CONFIG_UNXZ y - ''; + make = crossSystem: import ./make-bootstrap-tools.nix { + localSystem = { inherit system; }; + inherit crossSystem; }; - build = - - pkgs.stdenv.mkDerivation { - name = "stdenv-bootstrap-tools-cross"; - crossConfig = pkgs.hostPlatform.config; - - nativeBuildInputs = [ - pkgs.buildPackages.nukeReferences - pkgs.buildPackages.cpio - ]; - - buildCommand = '' - set -x - mkdir -p $out/bin $out/lib $out/libexec - - # Copy what we need of Glibc. - cp -d ${glibc.out}/lib/ld-*.so* $out/lib - cp -d ${glibc.out}/lib/libc*.so* $out/lib - cp -d ${glibc.out}/lib/libc_nonshared.a $out/lib - cp -d ${glibc.out}/lib/libm*.so* $out/lib - cp -d ${glibc.out}/lib/libdl*.so* $out/lib - cp -d ${glibc.out}/lib/librt*.so* $out/lib - cp -d ${glibc.out}/lib/libpthread*.so* $out/lib - cp -d ${glibc.out}/lib/libnsl*.so* $out/lib - cp -d ${glibc.out}/lib/libutil*.so* $out/lib - cp -d ${glibc.out}/lib/libnss*.so* $out/lib - cp -d ${glibc.out}/lib/libresolv*.so* $out/lib - cp -d ${glibc.out}/lib/crt?.o $out/lib - - cp -rL ${glibc.dev}/include $out - chmod -R u+w "$out" - - # glibc can contain linker scripts: find them, copy their deps, - # and get rid of absolute paths (nuke-refs would make them useless) - local lScripts=$(grep --files-with-matches --max-count=1 'GNU ld script' -R "$out/lib") - cp -d -t "$out/lib/" $(cat $lScripts | tr " " "\n" | grep -F '${glibc.out}' | sort -u) - for f in $lScripts; do - substituteInPlace "$f" --replace '${glibc.out}/lib/' "" - done - - # Hopefully we won't need these. - rm -rf $out/include/mtd $out/include/rdma $out/include/sound $out/include/video - find $out/include -name .install -exec rm {} \; - find $out/include -name ..install.cmd -exec rm {} \; - mv $out/include $out/include-glibc - - # Copy coreutils, bash, etc. - cp ${coreutilsMinimal}/bin/* $out/bin - (cd $out/bin && rm vdir dir sha*sum pinky factor pathchk runcon shuf who whoami shred users) - - cp ${bash}/bin/bash $out/bin - cp ${findutils}/bin/find $out/bin - cp ${findutils}/bin/xargs $out/bin - cp -d ${diffutils}/bin/* $out/bin - cp -d ${gnused}/bin/* $out/bin - cp -d ${gnugrep}/bin/grep $out/bin - cp ${gawk}/bin/gawk $out/bin - cp -d ${gawk}/bin/awk $out/bin - cp ${tarMinimal}/bin/tar $out/bin - cp ${gzip}/bin/gzip $out/bin - cp ${bzip2.bin}/bin/bzip2 $out/bin - cp -d ${gnumake}/bin/* $out/bin - cp -d ${patch}/bin/* $out/bin - cp ${patchelf}/bin/* $out/bin - - cp -d ${gnugrep.pcre.out}/lib/libpcre*.so* $out/lib # needed by grep - - # Copy what we need of GCC. - cp -d ${gcc.out}/bin/gcc $out/bin - cp -d ${gcc.out}/bin/cpp $out/bin - cp -d ${gcc.out}/bin/g++ $out/bin - cp -d ${gcc.lib}/lib*/libgcc_s.so* $out/lib - cp -d ${gcc.lib}/lib*/libstdc++.so* $out/lib - cp -rd ${gcc.out}/lib/gcc $out/lib - chmod -R u+w $out/lib - rm -f $out/lib/gcc/*/*/include*/linux - rm -f $out/lib/gcc/*/*/include*/sound - rm -rf $out/lib/gcc/*/*/include*/root - rm -f $out/lib/gcc/*/*/include-fixed/asm - rm -rf $out/lib/gcc/*/*/plugin - #rm -f $out/lib/gcc/*/*/*.a - cp -rd ${gcc.out}/libexec/* $out/libexec - chmod -R u+w $out/libexec - rm -rf $out/libexec/gcc/*/*/plugin - mkdir $out/include - cp -rd ${gcc.out}/include/c++ $out/include - chmod -R u+w $out/include - rm -rf $out/include/c++/*/ext/pb_ds - rm -rf $out/include/c++/*/ext/parallel - - cp -d ${gmpxx.out}/lib/libgmp*.so* $out/lib - cp -d ${mpfr.out}/lib/libmpfr*.so* $out/lib - cp -d ${libmpc.out}/lib/libmpc*.so* $out/lib - cp -d ${zlib.out}/lib/libz.so* $out/lib - cp -d ${libelf}/lib/libelf.so* $out/lib - - # These needed for cross but not native tools because the stdenv - # GCC has certain things built in statically. See - # pkgs/stdenv/linux/default.nix for the details. - cp -d ${isl}/lib/libisl*.so* $out/lib - - cp -d ${bzip2.out}/lib/libbz2.so* $out/lib - - # Copy binutils. - for i in as ld ar ranlib nm strip readelf objdump; do - cp ${binutils.bintools.out}/bin/$i $out/bin - done - - chmod -R u+w $out - - # Strip executables even further. - for i in $out/bin/* $out/libexec/gcc/*/*/*; do - if test -x $i -a ! -L $i; then - chmod +w $i - $crossConfig-strip -s $i || true - fi - done - - nuke-refs $out/bin/* - nuke-refs $out/lib/* - nuke-refs $out/libexec/gcc/*/*/* - nuke-refs $out/lib/gcc/*/*/* - - mkdir $out/.pack - mv $out/* $out/.pack - mv $out/.pack $out/pack - - mkdir $out/on-server - tar cvfJ $out/on-server/bootstrap-tools.tar.xz --hard-dereference --sort=name --numeric-owner --owner=0 --group=0 --mtime=@1 -C $out/pack . - cp ${busyboxMinimal}/bin/busybox $out/on-server - chmod u+w $out/on-server/busybox - nuke-refs $out/on-server/busybox - ''; # */ - - # The result should not contain any references (store paths) so - # that we can safely copy them out of the store and to other - # locations in the store. - allowedReferences = []; - }; - - dist = pkgs.stdenv.mkDerivation { - name = "stdenv-bootstrap-tools-cross"; - - buildCommand = '' - mkdir -p $out/nix-support - echo "file tarball ${build}/on-server/bootstrap-tools.tar.xz" >> $out/nix-support/hydra-build-products - echo "file busybox ${build}/on-server/busybox" >> $out/nix-support/hydra-build-products - ''; - }; -} - -); in { - armv5tel = buildFor "armv5tel"; - armv6l = buildFor "armv6l"; - armv7l = buildFor "armv7l"; - aarch64 = buildFor "aarch64"; - scaleway = buildFor "scaleway"; - pogoplug4 = buildFor "pogoplug4"; +in with (import ../../../lib).systems.examples; { + armv5tel = make sheevaplug; + scaleway = make scaleway-c1; + pogoplug4 = make pogoplug4; + armv6l = make raspberryPi; + armv7l = make armv7l-hf-multiplatform; + aarch64 = make aarch64-multiplatform; } diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index 15be64a22a9..f51a39d5820 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -1,8 +1,13 @@ -{ system ? builtins.currentSystem }: +{ localSystem ? { system = builtins.currentSystem; } +, crossSystem ? null +}: -with import ../../.. {inherit system;}; - -rec { +let + pkgs = import ../../.. { inherit localSystem crossSystem; }; + glibc = if pkgs.hostPlatform != pkgs.buildPlatform + then pkgs.glibcCross + else pkgs.glibc; +in with pkgs; rec { coreutilsMinimal = coreutils.override (args: { @@ -35,7 +40,7 @@ rec { stdenv.mkDerivation { name = "stdenv-bootstrap-tools"; - buildInputs = [nukeReferences cpio]; + nativeBuildInputs = [ buildPackages.nukeReferences buildPackages.cpio ]; buildCommand = '' set -x @@ -118,10 +123,17 @@ rec { cp -d ${gmpxx.out}/lib/libgmp*.so* $out/lib cp -d ${mpfr.out}/lib/libmpfr*.so* $out/lib - cp -d ${libmpc}/lib/libmpc*.so* $out/lib + cp -d ${libmpc.out}/lib/libmpc*.so* $out/lib cp -d ${zlib.out}/lib/libz.so* $out/lib cp -d ${libelf}/lib/libelf.so* $out/lib + '' + lib.optionalString (hostPlatform != buildPlatform) '' + # These needed for cross but not native tools because the stdenv + # GCC has certain things built in statically. See + # pkgs/stdenv/linux/default.nix for the details. + cp -d ${isl_0_14.out}/lib/libisl*.so* $out/lib + + '' + '' cp -d ${bzip2.out}/lib/libbz2.so* $out/lib # Copy binutils. @@ -135,13 +147,14 @@ rec { for i in $out/bin/* $out/libexec/gcc/*/*/*; do if test -x $i -a ! -L $i; then chmod +w $i - strip -s $i || true + $STRIP -s $i || true fi done nuke-refs $out/bin/* nuke-refs $out/lib/* nuke-refs $out/libexec/gcc/*/*/* + nuke-refs $out/lib/gcc/*/*/* mkdir $out/.pack mv $out/* $out/.pack @@ -176,11 +189,14 @@ rec { bootstrapTools = runCommand "bootstrap-tools.tar.xz" {} "cp ${build}/on-server/bootstrap-tools.tar.xz $out"; }; - bootstrapTools = import ./bootstrap-tools { inherit system bootstrapFiles; }; + bootstrapTools = import ./bootstrap-tools { + inherit (hostPlatform) system; + inherit bootstrapFiles; + }; test = derivation { name = "test-bootstrap-tools"; - inherit system; + inherit (hostPlatform) system; builder = bootstrapFiles.busybox; args = [ "ash" "-e" "-c" "eval \"$buildCommand\"" ]; diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index 62f7134616b..b00d74b5e14 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -123,6 +123,8 @@ in bootstrapTools = let tools = import ../stdenv/linux/make-bootstrap-tools-cross.nix { system = "x86_64-linux"; }; maintainers = [ lib.maintainers.dezgeg ]; - mkBootstrapToolsJob = drv: hydraJob' (lib.addMetaAttrs { inherit maintainers; } drv); + mkBootstrapToolsJob = drv: + assert lib.elem drv.system (supportedSystems ++ [ "aarch64-linux" ]); + hydraJob' (lib.addMetaAttrs { inherit maintainers; } drv); in lib.mapAttrsRecursiveCond (as: !lib.isDerivation as) (name: mkBootstrapToolsJob) tools; } diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 201c3a38cf8..5358738acb6 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -123,7 +123,10 @@ let stdenvBootstrapTools = with lib; genAttrs systemsWithAnySupport (system: { - inherit (import ../stdenv/linux/make-bootstrap-tools.nix { inherit system; }) + inherit + (import ../stdenv/linux/make-bootstrap-tools.nix { + localSystem = { inherit system; }; + }) dist test; }) # darwin is special in this From e538e00404a7a79bde1465924a3f60f05648794e Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 19 Dec 2017 15:19:38 +0100 Subject: [PATCH 091/296] test-driver: support testing user units It is quite complicated to test services using the test-driver when declaring user services with `systemd.user.services` such as many X11-based services like `xautolock.service`. This change adds an optional `$user` parameter to each systemd-related function in the test-driver and runs `systemctl --user` commands using `su -l $user -c ...` and sets the `XDG_RUNTIME_DIR` variable accordingly and a new function named `systemctl` which is able to run a systemd command with or without a specified user. The change can be confirmed with a simple VM declaration like this: ``` import ./nixos/tests/make-test.nix ({ pkgs, lib }: with lib; { name = "systemd-user-test"; nodes.machine = { imports = [ ./nixos/tests/common/user-account.nix ]; services.xserver.enable = true; services.xserver.displayManager.auto.enable = true; services.xserver.displayManager.auto.user = "bob"; services.xserver.xautolock.enable = true; }; testScript = '' $machine->start; $machine->waitForX; $machine->waitForUnit("xautolock.service", "bob"); $machine->stopJob("xautolock.service", "bob"); $machine->startJob("xautolock.service", "bob"); $machine->systemctl("list-jobs --no-pager", "bob"); $machine->systemctl("show 'xautolock.service' --no-pager", "bob"); ''; }) ``` --- nixos/lib/test-driver/Machine.pm | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm index a01c3c336a1..78598b3efb4 100644 --- a/nixos/lib/test-driver/Machine.pm +++ b/nixos/lib/test-driver/Machine.pm @@ -362,8 +362,8 @@ sub mustFail { sub getUnitInfo { - my ($self, $unit) = @_; - my ($status, $lines) = $self->execute("systemctl --no-pager show '$unit'"); + my ($self, $unit, $user) = @_; + my ($status, $lines) = $self->systemctl("--no-pager show \"$unit\"", $user); return undef if $status != 0; my $info = {}; foreach my $line (split '\n', $lines) { @@ -373,6 +373,16 @@ sub getUnitInfo { return $info; } +sub systemctl { + my ($self, $q, $user) = @_; + if ($user) { + $q =~ s/'/\\'/g; + return $self->execute("su -l $user -c \$'XDG_RUNTIME_DIR=/run/user/`id -u` systemctl --user $q'"); + } + + return $self->execute("systemctl $q"); +} + # Fail if the given systemd unit is not in the "active" state. sub requireActiveUnit { my ($self, $unit) = @_; @@ -387,16 +397,16 @@ sub requireActiveUnit { # Wait for a systemd unit to reach the "active" state. sub waitForUnit { - my ($self, $unit) = @_; + my ($self, $unit, $user) = @_; $self->nest("waiting for unit ‘$unit’", sub { retry sub { - my $info = $self->getUnitInfo($unit); + my $info = $self->getUnitInfo($unit, $user); my $state = $info->{ActiveState}; die "unit ‘$unit’ reached state ‘$state’\n" if $state eq "failed"; if ($state eq "inactive") { # If there are no pending jobs, then assume this unit # will never reach active state. - my ($status, $jobs) = $self->execute("systemctl list-jobs --full 2>&1"); + my ($status, $jobs) = $self->systemctl("list-jobs --full 2>&1", $user); if ($jobs =~ /No jobs/) { # FIXME: fragile # Handle the case where the unit may have started # between the previous getUnitInfo() and @@ -430,14 +440,14 @@ sub waitForFile { } sub startJob { - my ($self, $jobName) = @_; - $self->execute("systemctl start $jobName"); + my ($self, $jobName, $user) = @_; + $self->systemctl("start $jobName", $user); # FIXME: check result } sub stopJob { - my ($self, $jobName) = @_; - $self->execute("systemctl stop $jobName"); + my ($self, $jobName, $user) = @_; + $self->systemctl("stop $jobName", $user); } From 60e76dfff86cf93483240159172449c66d0efcc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Merlin=20G=C3=B6ttlinger?= Date: Sat, 30 Dec 2017 20:39:17 +0100 Subject: [PATCH 092/296] icesl: init at 2.1.10 --- lib/licenses.nix | 6 ++++ lib/maintainers.nix | 1 + pkgs/applications/misc/icesl/default.nix | 39 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 4 files changed, 48 insertions(+) create mode 100644 pkgs/applications/misc/icesl/default.nix diff --git a/lib/licenses.nix b/lib/licenses.nix index 1f2c448470b..1fdcc15fd72 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -309,6 +309,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { free = false; }; + inria-icesl = { + fullName = "INRIA Non-Commercial License Agreement for IceSL"; + url = "http://shapeforge.loria.fr/icesl/EULA_IceSL_binary.pdf"; + free = false; + }; + ipa = spdx { spdxId = "IPA"; fullName = "IPA Font License"; diff --git a/lib/maintainers.nix b/lib/maintainers.nix index f4af4fe366b..fd9d673b3b0 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -421,6 +421,7 @@ meisternu = "Matt Miemiec "; metabar = "Celine Mercier "; mgdelacroix = "Miguel de la Cruz "; + mgttlinger = "Merlin Göttlinger Date: Tue, 2 Jan 2018 14:26:21 -0500 Subject: [PATCH 093/296] maintainers: add ryantrinkle --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 684bb3489b9..8a843cc101f 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -581,6 +581,7 @@ ryanartecona = "Ryan Artecona "; ryansydnor = "Ryan Sydnor "; ryantm = "Ryan Mulligan "; + ryantrinkle = "Ryan Trinkle "; rybern = "Ryan Bernstein "; rycee = "Robert Helgesson "; ryneeverett = "Ryne Everett "; From 36fbcfd81118307a53fbb0bb437c387cae252f30 Mon Sep 17 00:00:00 2001 From: Ryan Trinkle Date: Tue, 2 Jan 2018 14:28:56 -0500 Subject: [PATCH 094/296] thunderbolt: init at 0.9.2 --- .../os-specific/linux/thunderbolt/default.nix | 39 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/os-specific/linux/thunderbolt/default.nix diff --git a/pkgs/os-specific/linux/thunderbolt/default.nix b/pkgs/os-specific/linux/thunderbolt/default.nix new file mode 100644 index 00000000000..3189872ca3b --- /dev/null +++ b/pkgs/os-specific/linux/thunderbolt/default.nix @@ -0,0 +1,39 @@ +{ stdenv +, boost +, cmake +, fetchFromGitHub +, pkgconfig +, txt2tags +}: + +stdenv.mkDerivation rec { + name = "thunderbolt-${version}"; + version = "0.9.2"; + src = fetchFromGitHub { + owner = "01org"; + repo = "thunderbolt-software-user-space"; + rev = "1ae06410180320a5d0e7408a8d1a6ae2aa443c23"; + sha256 = "03yk419gj0767lpk6zvla4jx3nx56zsg4x4adl4nd50xhn409rcc"; + }; + + buildInputs = [ + boost + cmake + pkgconfig + txt2tags + ]; + + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE='Release'" + "-DUDEV_BIN_DIR=$out/bin" + "-DUDEV_RULES_DIR=$out/udev" + ]; + + meta = { + description = "Thunderbolt(TM) user-space components"; + license = stdenv.lib.licenses.bsd3; + maintainers = [ stdenv.lib.maintainers.ryantrinkle ]; + homepage = https://01.org/thunderbolt-sw; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 63fe2f5a6d2..5d0f05bb474 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17111,6 +17111,8 @@ with pkgs; enableGTK3 = true; }; + thunderbolt = callPackage ../os-specific/linux/thunderbolt {}; + thunderbird-bin = callPackage ../applications/networking/mailreaders/thunderbird-bin { gconf = pkgs.gnome2.GConf; inherit (pkgs.gnome2) libgnome libgnomeui; From 792b085b1a54fe3723beb6a284eb5f3ce3aa5463 Mon Sep 17 00:00:00 2001 From: Justin Humm Date: Tue, 2 Jan 2018 20:54:45 +0100 Subject: [PATCH 095/296] osrm-backend: 5.14.1 -> 5.14.3 --- pkgs/servers/osrm-backend/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/osrm-backend/default.nix b/pkgs/servers/osrm-backend/default.nix index 7ade52b2ee7..db5fe26cee6 100644 --- a/pkgs/servers/osrm-backend/default.nix +++ b/pkgs/servers/osrm-backend/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "osrm-backend-${version}"; - version = "5.14.1"; + version = "5.14.3"; src = fetchFromGitHub { rev = "v${version}"; owner = "Project-OSRM"; repo = "osrm-backend"; - sha256 = "0n7fpm8m5r93dxciagp2n8ij1wg483yb9srbzdzjqf1zzyh637sz"; + sha256 = "1ajgybjx7g6qzddavab8bj7il7wn5wy24nivjj5rk84mfbi71s5v"; }; buildInputs = [ cmake pkgconfig bzip2 libxml2 libzip boost lua luabind tbb expat]; From 9361b7eb85045c7e7dd20d2ddd716a9d10bf4bd4 Mon Sep 17 00:00:00 2001 From: Drew Hess Date: Tue, 2 Jan 2018 12:15:16 -0800 Subject: [PATCH 096/296] ghc: bootstrap 8.2.2 with 8.2.1-binary. --- pkgs/top-level/haskell-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index fc4074dd8cd..cba1f9a54a2 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -72,7 +72,7 @@ in rec { sphinx = pkgs.python27Packages.sphinx; }; ghc822 = callPackage ../development/compilers/ghc/8.2.2.nix rec { - bootPkgs = packages.ghc7103Binary; + bootPkgs = packages.ghc821Binary; inherit (bootPkgs) hscolour alex happy; inherit buildPlatform targetPlatform; sphinx = pkgs.python3Packages.sphinx; From b68156006ad41025d5e9d338888756ac4ab6e373 Mon Sep 17 00:00:00 2001 From: Jaakko Luttinen Date: Tue, 2 Jan 2018 18:19:16 +0200 Subject: [PATCH 097/296] rssguard: 3.4.2 -> 3.5.5 --- .../feedreaders/rssguard/default.nix | 25 +++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/networking/feedreaders/rssguard/default.nix b/pkgs/applications/networking/feedreaders/rssguard/default.nix index b25d4e109eb..0a89ec6023b 100644 --- a/pkgs/applications/networking/feedreaders/rssguard/default.nix +++ b/pkgs/applications/networking/feedreaders/rssguard/default.nix @@ -1,22 +1,27 @@ -{ stdenv, fetchgit, qmake, qtwebengine, qttools, wrapGAppsHook }: +{ stdenv, fetchFromGitHub, qmake, qtwebengine, qttools, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "rssguard-${version}"; - version = "3.4.2"; + name = "${pname}-${version}"; + pname = "rssguard"; + version = "3.5.5"; - src = fetchgit { - url = https://github.com/martinrotter/rssguard; - rev = "refs/tags/${version}"; - sha256 = "0iy0fd3qr2dm0pc6xr7sin6cjfxfa0pxhxiwzs55dhsdk9zir62s"; - # Submodules are required only for Windows (and one of them is a huge binary - # package ~400MB). See project wiki for more details. - fetchSubmodules = false; + src = fetchFromGitHub { + owner = "martinrotter"; + repo = pname; + rev = version; + sha256 = "0swjh664y1yqr1rn3ym2kicyx7r97ypr4qf7qrjl4a5q1spzsv48"; }; buildInputs = [ qtwebengine qttools ]; nativeBuildInputs = [ qmake wrapGAppsHook ]; qmakeFlags = [ "CONFIG+=release" ]; + # FIXME: This shouldn't be needed after 3.5.5. + # See: https://github.com/martinrotter/rssguard/issues/175 + preConfigure = '' + lrelease rssguard.pro + ''; + meta = with stdenv.lib; { description = "Simple RSS/Atom feed reader with online synchronization"; longDescription = '' From 566ded39b1c76ac512c65a14e6ab14751814a9b9 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 2 Jan 2018 14:36:11 -0600 Subject: [PATCH 098/296] pandoc: fix build by using buildDepends to match cabal file The previously used dependency hsb2hs was a build-tools dependency, but file-embed is build-depends: https://github.com/jgm/pandoc/commit/ff991d1e2151479ff7dc15aba9c17251ff060408 Fixes #33349 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c19d9a8afc1..552bd34650a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3896,7 +3896,7 @@ with pkgs; pandoc = haskell.lib.overrideCabal (haskell.lib.justStaticExecutables haskellPackages.pandoc) (drv: { configureFlags = drv.configureFlags or [] ++ ["-fembed_data_files"]; - buildTools = drv.buildTools or [] ++ [haskellPackages.file-embed]; + buildDepends = drv.buildDepends or [] ++ [haskellPackages.file-embed]; }); pamtester = callPackage ../tools/security/pamtester { }; From d8141bc059cb0a7aaa3329bad24c5226d46b4e71 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 2 Jan 2018 11:01:32 -0600 Subject: [PATCH 099/296] irker: cleanup manual setting of XML_CATALOG_FILES, no longer needed --- pkgs/servers/irker/default.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/servers/irker/default.nix b/pkgs/servers/irker/default.nix index 6ad233593a3..002760ff0fd 100644 --- a/pkgs/servers/irker/default.nix +++ b/pkgs/servers/irker/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1hslwqa0gqsnl3l6hd5hxpn0wlachxd51infifhlwhyhd6iwgx8p"; }; - nativeBuildInputs = [ pkgconfig xmlto docbook2x ]; + nativeBuildInputs = [ pkgconfig xmlto docbook2x docbook_xsl docbook_xml_dtd_412 ]; buildInputs = [ python @@ -21,10 +21,6 @@ stdenv.mkDerivation rec { # python.pkgs.pysocks ]; - preBuild = '' - export XML_CATALOG_FILES='${docbook_xsl}/xml/xsl/docbook/catalog.xml ${docbook_xml_dtd_412}/xml/dtd/docbook/catalog.xml' - ''; - postPatch = '' substituteInPlace Makefile \ --replace '-o 0 -g 0' "" From 63c850768f1629f612ba540c2261adb9b2db8c21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 2 Jan 2018 19:59:28 -0200 Subject: [PATCH 100/296] deepin-gtk-theme: 17.10.4 -> 17.10.5 --- pkgs/misc/themes/deepin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/themes/deepin/default.nix b/pkgs/misc/themes/deepin/default.nix index 670a02c85d9..bdddc28cc44 100644 --- a/pkgs/misc/themes/deepin/default.nix +++ b/pkgs/misc/themes/deepin/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "deepin-gtk-theme-${version}"; - version = "17.10.4"; + version = "17.10.5"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = "deepin-gtk-theme"; rev = version; - sha256 = "1hb0y72fzmcj2yl6q7mbc0c7yxkd1qgnyw4vixdqxnxk2c82sxzw"; + sha256 = "0ff1yg4gz4p7nd0qg3dcbsiw8yqlvqccm55kxi998w8j1wrg6pq3"; }; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; From 8aafa83838748f73409588e6d79692dce422e705 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 2 Jan 2018 23:35:51 +0100 Subject: [PATCH 101/296] plasma: 5.11.4 -> 5.11.5 --- pkgs/desktops/plasma-5/fetch.sh | 2 +- pkgs/desktops/plasma-5/srcs.nix | 352 ++++++++++++++++---------------- 2 files changed, 177 insertions(+), 177 deletions(-) diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh index 0469589e48c..921441c0292 100644 --- a/pkgs/desktops/plasma-5/fetch.sh +++ b/pkgs/desktops/plasma-5/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/plasma/5.11.4/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.11.5/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index 4b71e314fba..ee605bdba8a 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -3,355 +3,355 @@ { bluedevil = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/bluedevil-5.11.4.tar.xz"; - sha256 = "1xjvx5w2pkwj63hdxjkh4fdqyydxvc2sqg1pwkwqnw58z78lhq20"; - name = "bluedevil-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/bluedevil-5.11.5.tar.xz"; + sha256 = "0xzdf1qrf2nlpvn2hr9zk72hw027i318s9pnzgmqg1lwhdr276h5"; + name = "bluedevil-5.11.5.tar.xz"; }; }; breeze = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/breeze-5.11.4.tar.xz"; - sha256 = "0nxp13x5326ahkrb37rbrsn7xhl9gbrrpnbhhflmr9zdx2af7700"; - name = "breeze-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/breeze-5.11.5.tar.xz"; + sha256 = "0xxwnhxpkdf4nyc1rvsjrnqsv1cgzs3a88mwfwpvci4snfva8jp1"; + name = "breeze-5.11.5.tar.xz"; }; }; breeze-grub = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/breeze-grub-5.11.4.tar.xz"; - sha256 = "1yz31j3dgzkliz8sk80d6fs0afnd45nw6xkhrws2aar2rnn9d1w4"; - name = "breeze-grub-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/breeze-grub-5.11.5.tar.xz"; + sha256 = "1l3dv1acgs6ssydg985d90136p9n4h0xry3xlx12g5wg07i8s89g"; + name = "breeze-grub-5.11.5.tar.xz"; }; }; breeze-gtk = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/breeze-gtk-5.11.4.tar.xz"; - sha256 = "0n9fn3jp610g617561c8pr7i9v4k6cdpyqi7kl4f56h6cwq6b0ga"; - name = "breeze-gtk-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/breeze-gtk-5.11.5.tar.xz"; + sha256 = "0mkd1gqih5irmabxly2y744sr1iwxy7r7hx68jrd452nbvqvyrqq"; + name = "breeze-gtk-5.11.5.tar.xz"; }; }; breeze-plymouth = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/breeze-plymouth-5.11.4.tar.xz"; - sha256 = "099hl3dfcc3n4yh94hdhgnwy01a74s6as2yma57idcqw2akf6d0v"; - name = "breeze-plymouth-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/breeze-plymouth-5.11.5.tar.xz"; + sha256 = "0ydfrrsqvzn71j9x1f26771x99yiq59h745k476dcqajj2m0ari3"; + name = "breeze-plymouth-5.11.5.tar.xz"; }; }; discover = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/discover-5.11.4.tar.xz"; - sha256 = "1n6s52n8ynsymcwjckkfxrnzsj15f10if8r3ka5qhd7w6nb2x2iz"; - name = "discover-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/discover-5.11.5.tar.xz"; + sha256 = "0yxsp4jimyrsxf72hinqa51ycg4hmfxrxdicm9n8qfz47srcgkml"; + name = "discover-5.11.5.tar.xz"; }; }; drkonqi = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/drkonqi-5.11.4.tar.xz"; - sha256 = "0vnfx8sha9mdsdb5baw5xwlswm32wmd96kv8yzm3zr67fkz95n3s"; - name = "drkonqi-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/drkonqi-5.11.5.tar.xz"; + sha256 = "1kngafr1hdq6r02mpd4bj5lgbgzk2cd10f5zqsvdfgsirz91vfsf"; + name = "drkonqi-5.11.5.tar.xz"; }; }; kactivitymanagerd = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/kactivitymanagerd-5.11.4.tar.xz"; - sha256 = "10942fzaai30agzmbldwiwycpb7198qhgk3jr2p5wlfrawl1sl4q"; - name = "kactivitymanagerd-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/kactivitymanagerd-5.11.5.tar.xz"; + sha256 = "11nnmqpw4kq96912rys2a539yzgncc5vp7b52wgc4is9i5czsr50"; + name = "kactivitymanagerd-5.11.5.tar.xz"; }; }; kde-cli-tools = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/kde-cli-tools-5.11.4.tar.xz"; - sha256 = "07415ssr25lnr9klv6r7jclf9l5mca6dxf6xskwgixcap1fl5vdg"; - name = "kde-cli-tools-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/kde-cli-tools-5.11.5.tar.xz"; + sha256 = "0d4d360pq6winykjp6lgq77k9yc435d5g71dj7bivkyilqc4cp8c"; + name = "kde-cli-tools-5.11.5.tar.xz"; }; }; kdecoration = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/kdecoration-5.11.4.tar.xz"; - sha256 = "0vvhhdd3jlb7x9zdc3bjalchhvjkg411ip379rifn9z7zxbrsq9m"; - name = "kdecoration-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/kdecoration-5.11.5.tar.xz"; + sha256 = "0hl9mqwyfkh1r5nbl46g5axi446fdf7fw09b7v6l3jg9c5xbx89d"; + name = "kdecoration-5.11.5.tar.xz"; }; }; kde-gtk-config = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/kde-gtk-config-5.11.4.tar.xz"; - sha256 = "08s5z7lck37cyzkkg5v9qrnlfxjrpfd565y2i1ng9k6vm9m39172"; - name = "kde-gtk-config-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/kde-gtk-config-5.11.5.tar.xz"; + sha256 = "1y9ji82qlvp2z00xw0l32zj8asbg85n6azw8ringg2l6376r01l6"; + name = "kde-gtk-config-5.11.5.tar.xz"; }; }; kdeplasma-addons = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/kdeplasma-addons-5.11.4.tar.xz"; - sha256 = "19ywc3ryjax7g7wg969j256n4cr3n51lzxsw4gklf4n0px4pk2pi"; - name = "kdeplasma-addons-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/kdeplasma-addons-5.11.5.tar.xz"; + sha256 = "1vp9r7ia5wriw5srpyq89nqdp82akz3jnh7dcbh2h0gdagw7hb94"; + name = "kdeplasma-addons-5.11.5.tar.xz"; }; }; kgamma5 = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/kgamma5-5.11.4.tar.xz"; - sha256 = "1njzb06hk0lpj3s6i2hmlww0k7122dca9mi0rbr0ilfwha36ib2s"; - name = "kgamma5-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/kgamma5-5.11.5.tar.xz"; + sha256 = "16vlx51n52j5q1nfsz4ji6bz4x6sfagxzn6q3r6ckj41rkwmp9gg"; + name = "kgamma5-5.11.5.tar.xz"; }; }; khotkeys = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/khotkeys-5.11.4.tar.xz"; - sha256 = "0wszl7bzjl6gszvg9n4p8x3m6h0x5xx3qz3yi1y6g5mplfg7h0c6"; - name = "khotkeys-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/khotkeys-5.11.5.tar.xz"; + sha256 = "051yjqkf5bigz6cz2qbq0lggw9i6ydfaxrvy4xh40mw2c6x3xmvh"; + name = "khotkeys-5.11.5.tar.xz"; }; }; kinfocenter = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/kinfocenter-5.11.4.tar.xz"; - sha256 = "0ff3v90fj187glb22rvp27kp1b83br71vshcq2cpfzrbv97wrqf4"; - name = "kinfocenter-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/kinfocenter-5.11.5.tar.xz"; + sha256 = "0ym7i64k48x8dcln0lajj0379blp3c3a0axfcjibp3ya2xcaqdif"; + name = "kinfocenter-5.11.5.tar.xz"; }; }; kmenuedit = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/kmenuedit-5.11.4.tar.xz"; - sha256 = "0kbqrri7mnnarfw45k7j3ckxdpkasc25prvn1zlhci0acqhz0skk"; - name = "kmenuedit-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/kmenuedit-5.11.5.tar.xz"; + sha256 = "0wh4hk51k2mz1gqm9brvdy16gp2ap2iz5b6yjiqbkpz6giy88kwc"; + name = "kmenuedit-5.11.5.tar.xz"; }; }; kscreen = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/kscreen-5.11.4.tar.xz"; - sha256 = "0rjy594qj9825gan3r4iw4qphnksnrfn2f1dgyvd63ds70xm272h"; - name = "kscreen-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/kscreen-5.11.5.tar.xz"; + sha256 = "0qa23qs8v8hm91190ssdnlg7dyljra7csgykb7d8la30yxa9vzc7"; + name = "kscreen-5.11.5.tar.xz"; }; }; kscreenlocker = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/kscreenlocker-5.11.4.tar.xz"; - sha256 = "0r2438s7gs39qbkprx90smvb8mlgqm486qgv34ljx9vi0zm4kq47"; - name = "kscreenlocker-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/kscreenlocker-5.11.5.tar.xz"; + sha256 = "0qrby8jxmvmnr1abkry8h5xapdswabj27n35s9l71d9lp9p96naz"; + name = "kscreenlocker-5.11.5.tar.xz"; }; }; ksshaskpass = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/ksshaskpass-5.11.4.tar.xz"; - sha256 = "1wqzwvlimw5mkq1hfzjjw9az3g9bdqkiw9m7vrxfb67asgmmbrbx"; - name = "ksshaskpass-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/ksshaskpass-5.11.5.tar.xz"; + sha256 = "08jf6f1i9xn0zsz2j2czgdzcr203wrlj1nlam26dakrphhaj8vm2"; + name = "ksshaskpass-5.11.5.tar.xz"; }; }; ksysguard = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/ksysguard-5.11.4.tar.xz"; - sha256 = "1dl5q6k2ipdwlg8i5bh2xsz20wg5dwn8401rba9jzp3la97id2sc"; - name = "ksysguard-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/ksysguard-5.11.5.tar.xz"; + sha256 = "161bcmsw4bjlsgkr3izfsqbiwambmm3za8mln3m96nf70gpqpa6i"; + name = "ksysguard-5.11.5.tar.xz"; }; }; kwallet-pam = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/kwallet-pam-5.11.4.tar.xz"; - sha256 = "0xkgm0i0x1kcw4rcsv762pqs1vk2gxi09n421whq9ibmj8cm2ky2"; - name = "kwallet-pam-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/kwallet-pam-5.11.5.tar.xz"; + sha256 = "0wqnaszvwclz2gn74nmhqmci39525hwvpc3igxzjhdccnkfb5ac4"; + name = "kwallet-pam-5.11.5.tar.xz"; }; }; kwayland-integration = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/kwayland-integration-5.11.4.tar.xz"; - sha256 = "03azlds5iv3mq7g1livrqca4k30znac088qllzl4rh0mfmw4bmcy"; - name = "kwayland-integration-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/kwayland-integration-5.11.5.tar.xz"; + sha256 = "0xisgzymlhmbngvmv3dkh6a51dqnhcwrjj2480f0yxsmhvknxrps"; + name = "kwayland-integration-5.11.5.tar.xz"; }; }; kwin = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/kwin-5.11.4.tar.xz"; - sha256 = "0lfp2nyh28mlqbm3qjhd9adgp8w8j2gfn6xzw8ckxmkrzpdv52gr"; - name = "kwin-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/kwin-5.11.5.tar.xz"; + sha256 = "06bz2vm78i1x0i0ljdqd2a0bnnrfwz9zvlg7r86qlmhkzn2dpc4z"; + name = "kwin-5.11.5.tar.xz"; }; }; kwrited = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/kwrited-5.11.4.tar.xz"; - sha256 = "16l280dh3fw0sn3h9yprb74wmc0adsqq092s4dyka55md06qzqif"; - name = "kwrited-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/kwrited-5.11.5.tar.xz"; + sha256 = "0sx5v1apambb8w6mndkkp2lvwlqwzbpxxp5d5zsz96lxndjx6sbv"; + name = "kwrited-5.11.5.tar.xz"; }; }; libkscreen = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/libkscreen-5.11.4.tar.xz"; - sha256 = "0sv3q6zmplm0iz6ax87763mg771zvk1dfdh2gmiz2dn2lnxbkrzd"; - name = "libkscreen-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/libkscreen-5.11.5.tar.xz"; + sha256 = "03cnr7z74j2kjwbg1ddavmj0l8hpxg7bg2ipglirnzvp2ihv1wzg"; + name = "libkscreen-5.11.5.tar.xz"; }; }; libksysguard = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/libksysguard-5.11.4.tar.xz"; - sha256 = "1ry4478fv7blp80zyhz0xr3qragsddrkzjzmxkdarh01f4p987aq"; - name = "libksysguard-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/libksysguard-5.11.5.tar.xz"; + sha256 = "0f2py4zkqzpxxf3mqaij0q8ka0v3nschj17dv6rbzzmr5mjv825f"; + name = "libksysguard-5.11.5.tar.xz"; }; }; milou = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/milou-5.11.4.tar.xz"; - sha256 = "1zq6gcmjc4wa23b2c94nwsxranpangl2b3apj56qpl68bjfvlrbq"; - name = "milou-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/milou-5.11.5.tar.xz"; + sha256 = "0ja7a668wv67vb3mgsd2nbjdcp0lm7aix5dpc496wr1jy47pxv8a"; + name = "milou-5.11.5.tar.xz"; }; }; oxygen = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/oxygen-5.11.4.tar.xz"; - sha256 = "0vfs220w6rc0vf5y2qshqby1jmd5kgm0gqkzg9ckgvjm0skbk75z"; - name = "oxygen-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/oxygen-5.11.5.tar.xz"; + sha256 = "1n2xr3a0002xfiy99gjqlny76nxjlss1d3sgcj8adpza44j91228"; + name = "oxygen-5.11.5.tar.xz"; }; }; plasma-desktop = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/plasma-desktop-5.11.4.tar.xz"; - sha256 = "0adc9fi582x7gkxsxz3xhs0h6ardxbcxsl5xxzi3y2bmhd4f7vrq"; - name = "plasma-desktop-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/plasma-desktop-5.11.5.tar.xz"; + sha256 = "0djzs80mr0radmhai3k7jnlwlp76maf7vvrgkfckzs63n1jhdhb3"; + name = "plasma-desktop-5.11.5.tar.xz"; }; }; plasma-integration = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/plasma-integration-5.11.4.tar.xz"; - sha256 = "0wialbswpgf03paxfr4473sgb11fymxw34xvwdql6wwks86xyf6k"; - name = "plasma-integration-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/plasma-integration-5.11.5.tar.xz"; + sha256 = "1rmq8i0flrvqcl21fnn94d58zyw55scagrzbjw92p34i1mllhif1"; + name = "plasma-integration-5.11.5.tar.xz"; }; }; plasma-nm = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/plasma-nm-5.11.4.tar.xz"; - sha256 = "1kjbad69s3dfqgv1zyfzq7bmfyhr0hd4xwhf6bljad8d2l5azydi"; - name = "plasma-nm-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/plasma-nm-5.11.5.tar.xz"; + sha256 = "11lw26nd1rp2wbmqlf37wgk8qzv4fcc5x04g1i1h7c6hmjf5svqv"; + name = "plasma-nm-5.11.5.tar.xz"; }; }; plasma-pa = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/plasma-pa-5.11.4.tar.xz"; - sha256 = "0zg34xs3fbxig63i1lf0hyfsmsis3d5gmlgyqc0vkdbwg6l2qpbw"; - name = "plasma-pa-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/plasma-pa-5.11.5.tar.xz"; + sha256 = "1gdkz9yx21skg3c95nwh1mwacvrklgpfl0cspsmyyfnbnv93cz94"; + name = "plasma-pa-5.11.5.tar.xz"; }; }; plasma-sdk = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/plasma-sdk-5.11.4.tar.xz"; - sha256 = "0vis5psn2zyglkd6gcgqsnf99b38dcjpq3rwbyhj8rfjcakdg4nx"; - name = "plasma-sdk-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/plasma-sdk-5.11.5.tar.xz"; + sha256 = "013dc8dg0nhgdjlflgpqi28jsyparnwrj5am8lzvc0kkd9f69yhk"; + name = "plasma-sdk-5.11.5.tar.xz"; }; }; plasma-tests = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/plasma-tests-5.11.4.tar.xz"; - sha256 = "1kifka84csqsm3qjycagwx093hv3n5wsxl8p6xpa44cxjg4xjqfa"; - name = "plasma-tests-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/plasma-tests-5.11.5.tar.xz"; + sha256 = "00n1i6s1811w5h37i2iyy924495d2w24vfsl348cxplfxpxhcqf0"; + name = "plasma-tests-5.11.5.tar.xz"; }; }; plasma-vault = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/plasma-vault-5.11.4.tar.xz"; - sha256 = "1pymr6hiz0j4x98dchrzsq17ddlbcj5f9dggzr0fiw4sm5yvyxz0"; - name = "plasma-vault-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/plasma-vault-5.11.5.tar.xz"; + sha256 = "1pg891fahslnjn5jdsjjlw8i2l71ddznxjg96l9wycvh6nn7k0v6"; + name = "plasma-vault-5.11.5.tar.xz"; }; }; plasma-workspace = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/plasma-workspace-5.11.4.tar.xz"; - sha256 = "1qin68zcczgf3rwa8gg4i3rcsy6i8na9z8kk4bm9q3mfagbzqfx8"; - name = "plasma-workspace-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/plasma-workspace-5.11.5.tar.xz"; + sha256 = "1ipklc6v2ml095sy80rgq4123vkk3famjwf8s3rgkk172s76qm98"; + name = "plasma-workspace-5.11.5.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/plasma-workspace-wallpapers-5.11.4.tar.xz"; - sha256 = "09q63i85d82fdq9vafv55wiflndil048ryn9n3kpa4v9s0yjklkh"; - name = "plasma-workspace-wallpapers-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/plasma-workspace-wallpapers-5.11.5.tar.xz"; + sha256 = "0zhcpbb74phnmr24kxcp0k6gr7gjzdfbrrv4xjjb2qpg2d00l3pm"; + name = "plasma-workspace-wallpapers-5.11.5.tar.xz"; }; }; plymouth-kcm = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/plymouth-kcm-5.11.4.tar.xz"; - sha256 = "17jyg6133xb0f1dm1c0cpys2008aa65k1y1ap4b3y29xyv1p79rd"; - name = "plymouth-kcm-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/plymouth-kcm-5.11.5.tar.xz"; + sha256 = "152fyg5hc3rzvqw0z88pgapnhc64jx34vcqgsslsfja8mwk9h0ql"; + name = "plymouth-kcm-5.11.5.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.11.4"; + version = "1-5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/polkit-kde-agent-1-5.11.4.tar.xz"; - sha256 = "004ra4nb6dh3b1lmpfg303fg7201d2sm9f4glkj0mk3a0s9fkfcw"; - name = "polkit-kde-agent-1-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/polkit-kde-agent-1-5.11.5.tar.xz"; + sha256 = "0bwv567czi9h3rxgn19aw10nq5c674zd8wgk9nj006km1yyxrgy6"; + name = "polkit-kde-agent-1-5.11.5.tar.xz"; }; }; powerdevil = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/powerdevil-5.11.4.tar.xz"; - sha256 = "0cncn8xv5sqv1wqmnmhmqn2jznzy7yik4hvq0vadsrh4blyzwyrj"; - name = "powerdevil-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/powerdevil-5.11.5.tar.xz"; + sha256 = "0jqf85bain8vj5plxvvbdwiwc2jyb1r6idajhr6igcpjryfa75hj"; + name = "powerdevil-5.11.5.tar.xz"; }; }; sddm-kcm = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/sddm-kcm-5.11.4.tar.xz"; - sha256 = "1jhm5gbz296hk1dc7476kw23v73l7s939baln5v5pax349w40l23"; - name = "sddm-kcm-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/sddm-kcm-5.11.5.tar.xz"; + sha256 = "1ln1h4r614rg4w6b7g5l7yqqijkaaj04s4g4m41d8rg8z5ywq4v0"; + name = "sddm-kcm-5.11.5.tar.xz"; }; }; systemsettings = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/systemsettings-5.11.4.tar.xz"; - sha256 = "1j555f505hbc2zmg7biv05llzd2bb58z5ccspdgcvmskkwm2rlb3"; - name = "systemsettings-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/systemsettings-5.11.5.tar.xz"; + sha256 = "0ycdfl585853481bjix63nnj7qvg767qpbyr015k32c1v3vllx8y"; + name = "systemsettings-5.11.5.tar.xz"; }; }; user-manager = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/user-manager-5.11.4.tar.xz"; - sha256 = "0mz6kaqwns57bwp2gl7qzm7mwq3w2qh6kyp7m5qqh96wgq133c55"; - name = "user-manager-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/user-manager-5.11.5.tar.xz"; + sha256 = "1r4q411g2r6cz4z6bm5jwygfbvrfrl8dawdd69s6h93ixs7697s4"; + name = "user-manager-5.11.5.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/xdg-desktop-portal-kde-5.11.4.tar.xz"; - sha256 = "162gc6bfsxlj5rc4yz94sv41p75gf2kgayxa534gw3zhvry1jb52"; - name = "xdg-desktop-portal-kde-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/xdg-desktop-portal-kde-5.11.5.tar.xz"; + sha256 = "07xwb4zbf0cp4a672vs631dh9cqyvn0j9wwlknc21jzr619mnkap"; + name = "xdg-desktop-portal-kde-5.11.5.tar.xz"; }; }; } From b33b4a76dede4f138ceaf7c0f5ceaa153763b943 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 2 Jan 2018 17:15:19 -0200 Subject: [PATCH 102/296] xkbmon: init at 0.1 --- pkgs/applications/misc/xkbmon/default.nix | 25 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/applications/misc/xkbmon/default.nix diff --git a/pkgs/applications/misc/xkbmon/default.nix b/pkgs/applications/misc/xkbmon/default.nix new file mode 100644 index 00000000000..38bda9a8f56 --- /dev/null +++ b/pkgs/applications/misc/xkbmon/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, libX11 }: + +stdenv.mkDerivation rec { + name = "xkbmon-${version}"; + version = "0.1"; + + src = fetchFromGitHub { + owner = "xkbmon"; + repo = "xkbmon"; + rev = version; + sha256 = "1smyqsd9cpbzqaplm221a8mq0nham6rg6hjsm9g5gph94xmk6d67"; + }; + + buildInputs = [ libX11 ]; + + installPhase = "install -D -t $out/bin xkbmon"; + + meta = with stdenv.lib; { + homepage = https://github.com/xkbmon/xkbmon; + description = "Command-line keyboard layout monitor for X11"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c19d9a8afc1..bbaef3658d6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17730,6 +17730,8 @@ with pkgs; xkbset = callPackage ../tools/X11/xkbset { }; + xkbmon = callPackage ../applications/misc/xkbmon { }; + win-spice = callPackage ../applications/virtualization/driver/win-spice { }; win-virtio = callPackage ../applications/virtualization/driver/win-virtio { }; win-qemu = callPackage ../applications/virtualization/driver/win-qemu { }; From c261b32aa2b71f59ee17f08e2f3d37f68eda8de0 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Tue, 2 Jan 2018 16:10:56 -0500 Subject: [PATCH 103/296] elpa-packages: 2018-01-02 --- .../editors/emacs-modes/elpa-generated.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index 5ee3d61a65a..9c3be2e6ac1 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -135,10 +135,10 @@ arbitools = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: elpaBuild { pname = "arbitools"; - version = "0.91"; + version = "0.93"; src = fetchurl { - url = "https://elpa.gnu.org/packages/arbitools-0.91.el"; - sha256 = "0r0nbpwjxal40ydvx7hmjq56x12jcfqgld7yc4fjfz93wn8m40qf"; + url = "https://elpa.gnu.org/packages/arbitools-0.93.el"; + sha256 = "0z3lqp8dqfkams5h4sw569p48d2rvpd3d8lb4xaw0z8l49y2mvg8"; }; packageRequires = [ cl-lib ]; meta = { @@ -768,10 +768,10 @@ el-search = callPackage ({ elpaBuild, emacs, fetchurl, lib, stream }: elpaBuild { pname = "el-search"; - version = "1.4.0.11"; + version = "1.4.0.12"; src = fetchurl { - url = "https://elpa.gnu.org/packages/el-search-1.4.0.11.tar"; - sha256 = "12m468fxwfrwjkm0wcraafb7n9shh9fmw43nggc216ch3syxmfaw"; + url = "https://elpa.gnu.org/packages/el-search-1.4.0.12.tar"; + sha256 = "140p1ian8dwip6305spg4rvm3rqxhznlq0w5msixw6ykwm735a8z"; }; packageRequires = [ emacs stream ]; meta = { @@ -2254,10 +2254,10 @@ }) {}; vlf = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "vlf"; - version = "1.7"; + version = "1.7.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/vlf-1.7.tar"; - sha256 = "007zdr5szimr6nwwrqz9s338s0qq82r006pdwgcm8nc41jsmsx7r"; + url = "https://elpa.gnu.org/packages/vlf-1.7.1.tar"; + sha256 = "0cnwxk20573iqkwk0c0h7pyjk0rkr8l2qd0xmyqj8mvdxjb8nnkz"; }; packageRequires = []; meta = { From 9cc47a6c238ef8d8d9406234b0c50840b39e40b3 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Tue, 2 Jan 2018 17:01:06 -0500 Subject: [PATCH 104/296] org-packages: 2018-01-02 --- .../editors/emacs-modes/org-generated.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix index ae80ab2ba8d..933dfd9d3d0 100644 --- a/pkgs/applications/editors/emacs-modes/org-generated.nix +++ b/pkgs/applications/editors/emacs-modes/org-generated.nix @@ -1,10 +1,10 @@ { callPackage }: { org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org"; - version = "20171225"; + version = "20180102"; src = fetchurl { - url = "http://orgmode.org/elpa/org-20171225.tar"; - sha256 = "1wp1mbp0b8vygrlx0bb79d9zb91kca13nlhrxh59h9w496jj30dy"; + url = "https://orgmode.org/elpa/org-20180102.tar"; + sha256 = "1jz92wv637x1kp726kgcc29s4s4rscfhb7rhhnr69ny83r1hlczi"; }; packageRequires = []; meta = { @@ -14,10 +14,10 @@ }) {}; org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org-plus-contrib"; - version = "20171225"; + version = "20180102"; src = fetchurl { - url = "http://orgmode.org/elpa/org-plus-contrib-20171225.tar"; - sha256 = "10d44sqm9sh8gjy7xlnpqhyq35yxdijjm2322khc5bylvq60ianc"; + url = "https://orgmode.org/elpa/org-plus-contrib-20180102.tar"; + sha256 = "02ajqc8k44w2gskjazkglmn2v0jsxfns0wq3pgslhb7ychs3yrlv"; }; packageRequires = []; meta = { From b3203b930279b55022d55516116794431226875c Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Tue, 2 Jan 2018 16:11:22 -0500 Subject: [PATCH 105/296] melpa-stable-packages: 2018-01-02 --- .../emacs-modes/melpa-stable-generated.nix | 209 +++++++++++++----- 1 file changed, 157 insertions(+), 52 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix index ac0d4d2598e..f0a6ceb68dd 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix @@ -4256,12 +4256,12 @@ cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }: melpaBuild { pname = "cider"; - version = "0.15.1"; + version = "0.16.0"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "cider"; - rev = "8a9eab32646abcaaf31fe83b2d897c01971b98f1"; - sha256 = "0ddkm87l9ann05a6j57r0x59qqgfavwrvlzhkc5xhak1nmk5556h"; + rev = "74f7901b416efbd032bb4f8b5c25f57fdf731115"; + sha256 = "0n2b6q8r2gzr3ghyvg5sawir47rk7jmsslvxx6by27bn77h4nzil"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider"; @@ -7190,6 +7190,27 @@ license = lib.licenses.free; }; }) {}; + dimmer = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "dimmer"; + version = "0.2.1"; + src = fetchFromGitHub { + owner = "gonewest818"; + repo = "dimmer.el"; + rev = "b0faaa6919e633229ced07ff8bd8b5c68b90243a"; + sha256 = "04k7m5kg2a32ldgxfc2jkdwbmxzyc3yv66871ywv9152db2g7iml"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/8ae80e9202d69ed3214325dd15c4b2f114263954/recipes/dimmer"; + sha256 = "0w8n5svckk1jp8856pg2gkws9798prqjjkdqf8ili2hjcqnd1a3r"; + name = "dimmer"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/dimmer"; + license = lib.licenses.free; + }; + }) {}; dionysos = callPackage ({ alert, cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, libmpdee, melpaBuild, pkg-info, s }: melpaBuild { pname = "dionysos"; @@ -7809,12 +7830,12 @@ doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "doom-themes"; - version = "2.0.9"; + version = "2.1.0"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-doom-themes"; - rev = "8ff86e456b22ab4c28605c44e544b3ef0b4b4637"; - sha256 = "0zfr6487hvn08dc9hhwf2snhd3ds4kfaglribxddx38dhd87hk73"; + rev = "bc747b3b65baf737f99dc4ccf68558581958bbba"; + sha256 = "0j5aywwh8cw0bb55frrpmyfmbzg6d6jv29ys61p1xf49gvki870m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c5084bc2c3fe378af6ff39d65e40649c6359b7b5/recipes/doom-themes"; @@ -8270,12 +8291,12 @@ easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "easy-hugo"; - version = "2.7.19"; + version = "2.8.20"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-easy-hugo"; - rev = "1a8c4286ac1d92114dbda9042ed831cc83175db9"; - sha256 = "11vwzgy1dn4sj1yhnvvim6p9w3dl896azh3wlrmg8g6y6qfzblc7"; + rev = "253d91cda8722fa69b8ee67b1802137863bc3d9a"; + sha256 = "1i5hdm9xwajid7kzx6gq8lhx5w2aihvb0ka5h2s88zb1xnnxss46"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo"; @@ -8291,12 +8312,12 @@ easy-jekyll = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "easy-jekyll"; - version = "1.4.10"; + version = "1.5.11"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-easy-jekyll"; - rev = "d5226405c035d0dd675cacfd514388c348a4559a"; - sha256 = "1pmaa0ry1yd8d2pbn4srv5bf1hqss046zjl2p3ag1ag0qb35fh39"; + rev = "4eac3993d9bbec9ddfe38b128fd3ed6670f526e2"; + sha256 = "0ffspw6xavfbk0klqjp8va7ybvsdcxlw1qmqhi6paqam90m6vazz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3f281145bad12c27bdbef32ccc07b6a5f13b577/recipes/easy-jekyll"; @@ -12988,12 +13009,12 @@ flycheck-objc-clang = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-objc-clang"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "GyazSquare"; repo = "flycheck-objc-clang"; - rev = "29a9eb320d62400564360986f7ad400b74070d8e"; - sha256 = "0b4vwbxzhds9vb4nknfdywvfpr1gkk86vsbbq6f5ds0pfk75x022"; + rev = "07f17d1dbe878fdcabac791a8916ddf643571a68"; + sha256 = "03624xn6g1ybcjw634c7nd5s2yllwfffk2gzn5hm70vfz06q7wb9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4ff4412f507371b93cfb85fc744e54110cd87338/recipes/flycheck-objc-clang"; @@ -13219,12 +13240,12 @@ flycheck-swift3 = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-swift3"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "GyazSquare"; repo = "flycheck-swift3"; - rev = "756833425f51baa9eb0a2fa7493df6e68612c88d"; - sha256 = "1hvrg717q0nlz4r8wby82gs3vdx8fdhf38rg4j77j3fqfmxdd3fi"; + rev = "34973cd28ca5e63f8f6328a17fd7b78cc913b93d"; + sha256 = "1iy6j05dzpi7pi87y6rpjzmlnl2s9izqpbzknis2kx9072qddm3q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f1fb8c731c118327dc0bbb726e046fec46bcfb82/recipes/flycheck-swift3"; @@ -14038,12 +14059,12 @@ fountain-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fountain-mode"; - version = "2.3.1"; + version = "2.4.0"; src = fetchFromGitHub { owner = "rnkn"; repo = "fountain-mode"; - rev = "5c63d2f199e96bdf8fd60d375b2b6e305a5f9017"; - sha256 = "0vxizl4pr0668b1d94wrl42li2709srvnn5likn8lskv2mv0bnvn"; + rev = "3f953ae30ad55bbbbb80aa0350992e79f4b00f56"; + sha256 = "1zksjvpvhbr79fg281yhx8k419q9kd4jpi47i9943cs0m088ykyn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/913386ac8d5049d37154da3ab32bde408a226511/recipes/fountain-mode"; @@ -15765,6 +15786,27 @@ license = lib.licenses.free; }; }) {}; + go-tag = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: + melpaBuild { + pname = "go-tag"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "brantou"; + repo = "emacs-go-tag"; + rev = "51b032465405a62f84d9181168a570610ba04085"; + sha256 = "0158c3yjw21skwa03qmh3xpg9wg7rnk6xbxqx5vxi24205zsz0kd"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/fc4cd3fd8fb0707912e205b9d71789ea8126c442/recipes/go-tag"; + sha256 = "18ff41i0gr708fl4gzzspf9cc09nv4wy21wsn609yhwlh7w0vs1f"; + name = "go-tag"; + }; + packageRequires = [ emacs go-mode ]; + meta = { + homepage = "https://melpa.org/#/go-tag"; + license = lib.licenses.free; + }; + }) {}; godoctor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "godoctor"; @@ -15936,12 +15978,12 @@ goto-chg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "goto-chg"; - version = "1.7"; + version = "1.7.1"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "goto-chg"; - rev = "171b1331022caf12d8c3593e9b5075f87ee958d4"; - sha256 = "1jcnrin4j1x8p63fd9r37dq1vr5a7a1nvzk6kp0bdsgn9vbjmapc"; + rev = "6cb244922b733358fd6985b36c4b87ef2e177293"; + sha256 = "0miscmk5gg7mqqwjb5mlrkbpsx4pny2w3rpr90f7yiv30rf83b5j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf1fc176430fe3ab55ce537a0efc59780bb812be/recipes/goto-chg"; @@ -16104,12 +16146,12 @@ grails-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "grails-mode"; - version = "1.0.2"; + version = "2.0"; src = fetchFromGitHub { owner = "Groovy-Emacs-Modes"; repo = "groovy-emacs-modes"; - rev = "f8e9628916d4d41e1816b53d02f0b5a00c499555"; - sha256 = "1myb15n207yl2cgacmn105r1xbjq076paq6anvw53smy3fhw9sh9"; + rev = "d7b362e6186d263ec3eefc141dbb5b27a8773f24"; + sha256 = "0c1d4cbnlny8gpcd20zr1wxx6ggf28jgh7sgd5r1skpsvjpbfqx2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/grails-mode"; @@ -16383,22 +16425,22 @@ license = lib.licenses.free; }; }) {}; - groovy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + groovy-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "groovy-mode"; - version = "1.0.2"; + version = "2.0"; src = fetchFromGitHub { owner = "Groovy-Emacs-Modes"; repo = "groovy-emacs-modes"; - rev = "f8e9628916d4d41e1816b53d02f0b5a00c499555"; - sha256 = "1myb15n207yl2cgacmn105r1xbjq076paq6anvw53smy3fhw9sh9"; + rev = "d7b362e6186d263ec3eefc141dbb5b27a8773f24"; + sha256 = "0c1d4cbnlny8gpcd20zr1wxx6ggf28jgh7sgd5r1skpsvjpbfqx2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/groovy-mode"; sha256 = "1pxw7rdn56klmr6kw21lhzh7zhp338gyf54ypsml64ibzr1x9kal"; name = "groovy-mode"; }; - packageRequires = []; + packageRequires = [ emacs s ]; meta = { homepage = "https://melpa.org/#/groovy-mode"; license = lib.licenses.free; @@ -16533,12 +16575,12 @@ guix = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }: melpaBuild { pname = "guix"; - version = "0.3.3"; + version = "0.3.4"; src = fetchFromGitHub { owner = "alezost"; repo = "guix.el"; - rev = "54bd174b514c5de11e82c4263ac2723addb0fe87"; - sha256 = "1i5kwzwlb6lx65rgixm8mbdi6x03n0hb4hbc7j76lar4j58ypwz2"; + rev = "a43828f6e5d6dc4e623a4b78e0dfdddbf5b20185"; + sha256 = "0c19njb5cg6g3fav9322hkbl4h9zwcbymhc5wr0k9yqi7pv8gz0v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix"; @@ -21002,12 +21044,12 @@ js-auto-format-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "js-auto-format-mode"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitHub { owner = "ybiquitous"; repo = "js-auto-format-mode"; - rev = "cad63f1760e765298cc91e3503ac46c8771da4be"; - sha256 = "1pg4ghfi0fzmnwrw3y4z3gy031psxvzjydwm4jbdrm33ais7919g"; + rev = "7872e6f1d8280830c70cae8f1e3edb8049aba295"; + sha256 = "0a9rbs0pjx953rbblmia9jznxykz5qa9q5wzkj341z6vfq9rq3rf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d3be16771b5b5fde639da3ee97890620354ee7a/recipes/js-auto-format-mode"; @@ -23647,12 +23689,12 @@ meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }: melpaBuild { pname = "meghanada"; - version = "0.8.4"; + version = "0.9.0"; src = fetchFromGitHub { owner = "mopemope"; repo = "meghanada-emacs"; - rev = "555b8b9ea8ef56dda645ea605b38501cb4222b12"; - sha256 = "1z3vvasah4gq6byq4ibkihy5mbch5zzxnn0gy86jldapwi1z74sq"; + rev = "98ad6a5361c725319a355522d2d1ba0e0fbb7cde"; + sha256 = "06iryz4dbldc9vxy67g977hih8r1bfvjld53lvwnjsc7r3x9i07q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada"; @@ -25364,11 +25406,11 @@ }) {}; notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "notmuch"; - version = "0.25.3"; + version = "0.26pre1"; src = fetchgit { url = "git://git.notmuchmail.org/git/notmuch"; - rev = "ae55a86639f86ad1b547e961f71b1bde2180752d"; - sha256 = "0kq2j23381qr50zkvx68yciq1xag20fzidgy5jd69bd7z6gziq90"; + rev = "1ed211d042d5f413731f812b5af7e82819a6e8ae"; + sha256 = "140c3bhh24dy2cfsvgf9y7h02sjp6cjv8qam6kd8wjlrd3y9zd80"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch"; @@ -25633,6 +25675,27 @@ license = lib.licenses.free; }; }) {}; + ob-coffeescript = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ob-coffeescript"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "brantou"; + repo = "ob-coffeescript"; + rev = "b70f3d822c707cb02333fcb739ba4874614cad2a"; + sha256 = "0284v3km41427q7dr0wmvf3zhbsgzj0j2r9zny0g3n85qvyk0rgd"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ba1a808c77653bac1948d6c44bd1db09301ffeff/recipes/ob-coffeescript"; + sha256 = "05q1wnabw52kd3fpcpinpxs9z6xmi4n1p19jbcz0bgjpnw05s27p"; + name = "ob-coffeescript"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/ob-coffeescript"; + license = lib.licenses.free; + }; + }) {}; ob-http = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ob-http"; @@ -25654,6 +25717,27 @@ license = lib.licenses.free; }; }) {}; + ob-hy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ob-hy"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "brantou"; + repo = "ob-hy"; + rev = "a3512f274709dc4ab6c18d7955d361f8715505f0"; + sha256 = "1i796041svy7njjl3aqaxzjydmm24q688vpxvqd0pj5hyajqdgqw"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/12a7a7dba169010a3a047f961010236a203c16c2/recipes/ob-hy"; + sha256 = "18a8fpda0f28wxmjprhd9dmz7bpk1j3iayl20lqffrcal6m4f1h7"; + name = "ob-hy"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/ob-hy"; + license = lib.licenses.free; + }; + }) {}; ob-prolog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ob-prolog"; @@ -32959,12 +33043,12 @@ shx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shx"; - version = "0.0.12"; + version = "0.0.13"; src = fetchFromGitHub { owner = "riscy"; repo = "shx-for-emacs"; - rev = "aa45e7b586b1215ca1af05c14984ce872571b5f7"; - sha256 = "0ya7vbp71vmvli35rwcwspbclss5ngr1ck9074i2gg1dzrqyxijn"; + rev = "33383bd359d795df2d7ef725b5349c953f5a6aa8"; + sha256 = "1arwsb6as8jpah0bs3b92a3kdnbfkhnsm1jglspfh4lqpafmx5vf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a2ff78ae3c4289ebf9e06cdfd8f8082c395a16f/recipes/shx"; @@ -33817,6 +33901,27 @@ license = lib.licenses.free; }; }) {}; + solidity-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "solidity-mode"; + version = "0.1.8"; + src = fetchFromGitHub { + owner = "ethereum"; + repo = "emacs-solidity"; + rev = "b5d95ef678305ca70b17e94fc2ee4289a8328048"; + sha256 = "04l3hvfpgqiaxdxh8s2cg2rx4cy50i7a411q81g8661fx60c6h6p"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/bb9df5ec0692352b6494d435d11166f4ea26c99e/recipes/solidity-mode"; + sha256 = "1qdzdivrf5yaa80p61b9r1gryw112v5l2m2jkvkc7glhkhrcvwsx"; + name = "solidity-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/solidity-mode"; + license = lib.licenses.free; + }; + }) {}; sos = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "sos"; @@ -34743,12 +34848,12 @@ swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "swift-mode"; - version = "4.0.0"; + version = "4.0.1"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "swift-mode"; - rev = "18c3dc47dfece59640ad501266f2e47b918f2a14"; - sha256 = "0qk962xzxm8si1h5p7vdnqw7xcaxdjxsaz1yad11pvn9l2b2zpzq"; + rev = "8c45f69a078c41619a7a3db6d54a732c3fad8e3f"; + sha256 = "1isy71vkws3ywm4iwa85dk12810az3h85n6bimd36dfqbhfwdrli"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode"; @@ -38675,8 +38780,8 @@ version = "1.80"; src = fetchhg { url = "https://www.yatex.org/hgrepos/yatex/"; - rev = "16763e5b7481"; - sha256 = "1mrcc9amz0kflm570bd2cprhin0z8lr668k2s56mj6shixb61dwh"; + rev = "feef2aa1f50f"; + sha256 = "0453y7a9lq28bmbrrcbsnsrwnhjphq4s4vcr9ncb5252m6fnwdyl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e28710244a1bef8f56156fe1c271520896a9c694/recipes/yatex"; From 82293063696dd3236dfdd965fc63c1bbd551c74c Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Tue, 2 Jan 2018 16:12:24 -0500 Subject: [PATCH 106/296] melpa-packages: 2018-01-02 --- .../editors/emacs-modes/melpa-generated.nix | 925 +++++++++++------- 1 file changed, 557 insertions(+), 368 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix index f4c6e9a8a20..8c9585ae151 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix @@ -1093,12 +1093,12 @@ ace-popup-menu = callPackage ({ avy-menu, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ace-popup-menu"; - version = "20170518.2244"; + version = "20171231.2215"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "ace-popup-menu"; - rev = "eae1b0ea1a56cc1da2543e95570867a1a026669d"; - sha256 = "1w1q0r104v9fngzi3q8l6gwzb0c9gdq2jmbjb372j7969py73ywc"; + rev = "7b8ad628a058d32c420f7615927a34a5d51a7ad3"; + sha256 = "183gc5lidxahfzik9ima2vph2sdi2rd9805kfnghsmwhck275i2r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/53742e2242101c4b3b3901f5c74e24facf62c7d6/recipes/ace-popup-menu"; @@ -1114,12 +1114,12 @@ ace-window = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ace-window"; - version = "20171211.921"; + version = "20171228.1109"; src = fetchFromGitHub { owner = "abo-abo"; repo = "ace-window"; - rev = "6c52b0bbcfa2a6f62236050bacd9d915f99732b7"; - sha256 = "0j84gv4f4z1l11dyd6ckwgr2bmghxmlqfpr48q8ccwy270x1qxdi"; + rev = "c0fbdd51be8fdd43fd7a89140ebd4b4c311d45fc"; + sha256 = "0jiq2d2bgp6f26d5hjmd56cv68l2x6rlbpsvp6ig42nydv2yjjkz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe131d3c2ea498e4df30ba539a6b91c00f5b07/recipes/ace-window"; @@ -3656,6 +3656,27 @@ license = lib.licenses.free; }; }) {}; + auto-sudoedit = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "auto-sudoedit"; + version = "20171227.156"; + src = fetchFromGitHub { + owner = "ncaq"; + repo = "auto-sudoedit"; + rev = "5a6f7da018fbb880c4c51032b39d7628a478989c"; + sha256 = "190izcami97h2yzw267crs0xny494b9b58dmmb7bqslv38ayl396"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/7cf6bc8bb7b618d74427622b9b2812daa79a3767/recipes/auto-sudoedit"; + sha256 = "1clp52fqxsilyi62p1cabhan55lbwax6fqlhccyjbl36yrdig3fh"; + name = "auto-sudoedit"; + }; + packageRequires = [ emacs f ]; + meta = { + homepage = "https://melpa.org/#/auto-sudoedit"; + license = lib.licenses.free; + }; + }) {}; auto-virtualenv = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, pyvenv, s }: melpaBuild { pname = "auto-virtualenv"; @@ -3953,12 +3974,12 @@ avy = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "avy"; - version = "20171211.923"; + version = "20171230.220"; src = fetchFromGitHub { owner = "abo-abo"; repo = "avy"; - rev = "6459f7f12aef1e71ff5e265b1edb414fd81123e6"; - sha256 = "192pmqi35r3s01q2m91iscj1yzqx2wv6m47rdgzhgpb32irzvsgh"; + rev = "34d3531a3cd35ae6b9e8dbc37343c027504fdcb0"; + sha256 = "0rgwbm5jcbv132xldbz2kcp09c7hs96329mwfa019v99qdbb5k32"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/77fac7a702d4086fb860514e377037acedc60412/recipes/avy"; @@ -3995,12 +4016,12 @@ avy-menu = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "avy-menu"; - version = "20170518.2245"; + version = "20171231.2220"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "avy-menu"; - rev = "c36e28cabbcea8fdd2ada723b9a28ecc35a2d6c0"; - sha256 = "14ci1saksmhnnk5a7dy2v9dbsw7c030524vwb3y1wpw0vv863zjh"; + rev = "990cc94d708c923f761be083b3a57f6f844566c8"; + sha256 = "0kjxfg8wx5c8cixazih24s0mv4crk648v9bb6pd1i6lmh266rc6g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2f0b4cfb30c405d44803b36ebcaccef0cf87fe2d/recipes/avy-menu"; @@ -6669,8 +6690,8 @@ src = fetchFromGitHub { owner = "ocaml"; repo = "ocaml"; - rev = "1707e24f0001a122f6e71eba237b1044e5f0bfa1"; - sha256 = "0dfykliby2jx466ckvxyrzmhyzdz23khhdq5faf4h9ndhd8ca9br"; + rev = "34a11aaa62ff54cbff4403b16ede46a3c3b04799"; + sha256 = "06im9ixs7z9ysnhdgw9v57x3r5sb4hkmj4j2j4qa5yfcp6cmm07f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d5a3263cdcc229b11a3e96edbf632d56f32c47aa/recipes/caml"; @@ -6770,12 +6791,12 @@ cask = callPackage ({ cl-lib ? null, dash, epl, f, fetchFromGitHub, fetchurl, lib, melpaBuild, package-build, s, shut-up }: melpaBuild { pname = "cask"; - version = "20171225.2312"; + version = "20171230.452"; src = fetchFromGitHub { owner = "cask"; repo = "cask"; - rev = "324d99d209eec53fa8f289e65004d2403344f284"; - sha256 = "0aaqf1m786b8sg4n0agpbawnm03la5gvn09c3rf9k5bzq4m77a6i"; + rev = "4c3c8890f72456f3ae4bc2213978f675c39c7a66"; + sha256 = "02jvmrr8xr77lqdr5jsmqr1w7ix48yfkvr1vi7nsc7gzmx8vp28z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/cask"; @@ -7294,12 +7315,12 @@ challenger-deep-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "challenger-deep-theme"; - version = "20171118.437"; + version = "20171229.435"; src = fetchFromGitHub { owner = "MaxSt"; repo = "challenger-deep"; - rev = "08985cc17302f0e90a532fd5d67cfe2429b22444"; - sha256 = "1qn1l48fwhqw3lkag4322r16cq2ms9spg42jf0w1fc0y6w691p54"; + rev = "0dd5b03310d6607f445a123e91487b358501db3c"; + sha256 = "0dvglln69h01p74fw2fm2qc9hj8psz3p1y0wfjpc7alm0cbfh3gk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7942f539d025c1e2b059d49e1984716cbbc90a67/recipes/challenger-deep-theme"; @@ -7357,12 +7378,12 @@ char-menu = callPackage ({ avy-menu, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "char-menu"; - version = "20170518.2247"; + version = "20171231.2218"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "char-menu"; - rev = "b4542123e8c9bc40de1328f9a8078a0704a9a98d"; - sha256 = "101r6gryj5ic3mbv400klcjw8zfpn1rwi8ayyki93a53pali5g96"; + rev = "3235f8e3c88848ce10d25f84a5da39061fd35c0d"; + sha256 = "05pjfj6g4gdbdj4z63283j5qzkvhvrzsx1jhbc5iih0nsffwapc3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f6676747e853045b3b19e7fc9524c793c6a08303/recipes/char-menu"; @@ -7756,12 +7777,12 @@ cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }: melpaBuild { pname = "cider"; - version = "20171224.931"; + version = "20180101.958"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "cider"; - rev = "84de0dcd22a2df289cc14954897f8e52bdd97f5a"; - sha256 = "1y14wf3nv0bqh06kh3rfl18rxdipmdcd077addkk3lp9704rd4w4"; + rev = "f1dc7543cef77f560ae82c4407d9bf3787b66866"; + sha256 = "0jj7jqcvy12lk9rrk99icalk7szhylqbbl9w68lgrma3lnrpi04d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider"; @@ -8521,22 +8542,22 @@ license = lib.licenses.free; }; }) {}; - clomacs = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + clomacs = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, simple-httpd }: melpaBuild { pname = "clomacs"; - version = "20170726.436"; + version = "20180101.1354"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clomacs"; - rev = "8d3e12a2f73e81499fa18f30adaea8c861e4a9b1"; - sha256 = "01wpzbv4vjad0nvbydc0rwb3jdqbncwajs5xrng88n1xxhrajh1x"; + rev = "20706c65f218dd0671b0331f35bd8965e443062a"; + sha256 = "1mkn5y2mgdxv6njhy1njbpigzhx3x2hb618fzcd54yxn59mb5r47"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/345f9797e87e3f5f957c167a5e3d33d1e31b50a3/recipes/clomacs"; sha256 = "1vfjzrzp58ap75i0dh5bwnlkb8qbpfmrd3fg9n6aaibvvd2m3hyh"; name = "clomacs"; }; - packageRequires = [ cider emacs s ]; + packageRequires = [ cider emacs s simple-httpd ]; meta = { homepage = "https://melpa.org/#/clomacs"; license = lib.licenses.free; @@ -8696,8 +8717,8 @@ src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "cd2ed4b87adf83e406a1c02c169d50e29743879c"; - sha256 = "1wj59vf7d7mmcd9gyxqsnf59m3jzwdr8nc25q0xkb0p6krq8spsd"; + rev = "011f2de484c0be3a4c21cca5982c0b7452a32e30"; + sha256 = "1fazl514qwdcmwz4d47svay7g7sjw5yvcc8szsqhm3zq71ck5q2v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -9448,12 +9469,12 @@ company = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company"; - version = "20171219.133"; + version = "20180101.1101"; src = fetchFromGitHub { owner = "company-mode"; repo = "company-mode"; - rev = "a57441832674f88ba1c166678ad024c1e6665b5a"; - sha256 = "10wj0878d3yg5yfipgclx2imm99bgi8625136flgar2v51qn5iaw"; + rev = "4a8289dc257c3991c3953b64671fc25c887b2ca4"; + sha256 = "178wf0n1mdfx6yqwdqlw7drbr5fy7gf6x6p4094s9br7slk9kssk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company"; @@ -9928,8 +9949,8 @@ src = fetchFromGitHub { owner = "nsf"; repo = "gocode"; - rev = "0444ce1cda44fedd8f89f853dfb9d3ee6973fa13"; - sha256 = "1zr8ql7blacz4iz8l969sz3dmy9cfp4v15bwzxv71rg9vhz1ip9g"; + rev = "22bc785b7506257947079201bd1a117e885af8bb"; + sha256 = "16pkv3xc19i0gaxgvixjsdm17ikmibvaq6rr4bg4rpzk2z2l11fg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/company-go"; @@ -10375,8 +10396,8 @@ src = fetchFromGitHub { owner = "nathankot"; repo = "company-sourcekit"; - rev = "8ba62ac25bf533b7f148f333bcb5c1db799f749b"; - sha256 = "01dh0wdaydiai4v13r8g05rpiwqr5qqi34wif8vbk2mrr25wc7i9"; + rev = "abf9bc5a0102eb666d3aa6d6bf22f6efcc852781"; + sha256 = "1g8a4fgy2c5nqk8gysbnzn5jvfw6ynmfhc6j3hkrbswgf9188v5n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/45969cd5cd936ea61fbef4722843b0b0092d7b72/recipes/company-sourcekit"; @@ -10959,12 +10980,12 @@ counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: melpaBuild { pname = "counsel"; - version = "20171225.159"; + version = "20180101.832"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "864fbfeb0328d13e7d4641fcba9d001326229d37"; - sha256 = "045fqwgc02fh5mb09b0kzjwadr7b9vvsksicklffsx31fwbav4d6"; + rev = "c2bc6ac92a6cea730d7887813a816bdf873f9b92"; + sha256 = "040z731dm66w4c0475q8vl1lm4dnvi9yz2qslxdma0qdx70hymrr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel"; @@ -11022,12 +11043,12 @@ counsel-etags = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "counsel-etags"; - version = "20171227.2228"; + version = "20171228.1836"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "counsel-etags"; - rev = "921fa5a062bda9a0f9226fdaa76530ad809ff7b9"; - sha256 = "1qvp3ihchfwy57sfnnkk6m591s381w57ppig9c0izlbzw3n7hi7n"; + rev = "e39bb84a590ba121dcd4ca75a3a9ac20a41b7cba"; + sha256 = "19wp4klk1kxrhx2qkdxfdxlhha0v5dz0s90m2kdhqk4s87sggg7d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87528349a3ab305bfe98f30c5404913272817a38/recipes/counsel-etags"; @@ -11505,12 +11526,12 @@ crux = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "crux"; - version = "20170801.1334"; + version = "20171230.1100"; src = fetchFromGitHub { owner = "bbatsov"; repo = "crux"; - rev = "4f5c8fefd5a6aa52e128c4a0401cc86410d6ac8f"; - sha256 = "1fdxvv25cs01sg6fmvmzxpzvs50i6v8n2jya60lbavxqqhi0sbxd"; + rev = "6c02dab04fadd8ffb96dc513467e443b0549d1d3"; + sha256 = "08yv469k3rvnxnqrj7iwywq974z9lp0szkrgxlxxfap03wv59f66"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/575e3442a925500a5806e0b900208c1e6bfd11ae/recipes/crux"; @@ -12030,12 +12051,12 @@ cyphejor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cyphejor"; - version = "20171221.236"; + version = "20171231.2218"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "cyphejor"; - rev = "47a6f6ad62f552bacea397626e6e8b2618951ab8"; - sha256 = "0mvlymqy5xasv17dsndqhwkyiginhbqipvr0526abh2aaaycpixc"; + rev = "d2faf26420ac16c4056f6eda067b845d33e102cd"; + sha256 = "0vg0n8xcqiv28i3xmnxzji77dbnyxrld4ncdzpa3hpc1j92s9a09"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ad7cacfa39d8f85e26372ef21898663aebb68e43/recipes/cyphejor"; @@ -12223,8 +12244,8 @@ src = fetchFromGitHub { owner = "rails-to-cosmos"; repo = "danneskjold-theme"; - rev = "de694a6cac4e72c5a36b2776b12503fa736ba590"; - sha256 = "0aj71nhilmv4bqm5ynlah75wsf3m6rn71xmr7m6ip3wa0bz6pr99"; + rev = "b2cb6afa47755f9c426aebd19394d6d0ce317a1d"; + sha256 = "1q9ayi985kd5pk78ik7rywpzkzpbdb3010nwp8gnrkgli17lkvaa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/557244a3b60c7cd3ca964ff843aa1e9d5a1e32ec/recipes/danneskjold-theme"; @@ -12534,12 +12555,12 @@ dashboard = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, page-break-lines }: melpaBuild { pname = "dashboard"; - version = "20170923.719"; + version = "20180101.2352"; src = fetchFromGitHub { owner = "rakanalh"; repo = "emacs-dashboard"; - rev = "8594c4f55448148b720eda5b72d51667fb7a8a39"; - sha256 = "1hhh1kfsz87qfmh45wjf2r93rz79rq0vbyxlfrsl02092zjbl1zr"; + rev = "7b514b2c4895034b645cb2028220a411882e3b0e"; + sha256 = "0wrlj4nvqr6qcdap0wa6f1pjf77mnyrw820249qb2flb2j4xbd7x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e9a79341ccaa82a8c065e71c02fe6aee22007c66/recipes/dashboard"; @@ -12912,12 +12933,12 @@ define-word = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "define-word"; - version = "20171125.25"; + version = "20171231.1005"; src = fetchFromGitHub { owner = "abo-abo"; repo = "define-word"; - rev = "1e8e537c3b5b25e770c1b2f993497298405225b2"; - sha256 = "1phbyak6m97h2md0a8id5aqb5rmkpfw5259l2a7d87gk0lgkaqa2"; + rev = "7ed98a55221075dc55f629972fd0d15d8c402417"; + sha256 = "0lvvs5xnkfd0mvya8qzvgnl6pigq3vlbm4l5a87ydppnr0c7z605"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e318b30d8b2b89981f4b89d78e5a46e77d3de412/recipes/define-word"; @@ -13415,12 +13436,12 @@ dimmer = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dimmer"; - version = "20171226.2250"; + version = "20180101.1022"; src = fetchFromGitHub { owner = "gonewest818"; repo = "dimmer.el"; - rev = "1801a6868dcf84a2b00848c5a4961ec621478e20"; - sha256 = "1yadl6qvb9dlnaj64928i4wmjxnk8q04rhz48fbn58g71yrfizl8"; + rev = "4963092d1d37987e6b9b3eca21be425a1ae44d99"; + sha256 = "1b4wg20038ji54bbiwnmvr3ghkkm6x7skhz16110saqwfdfibmdx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8ae80e9202d69ed3214325dd15c4b2f114263954/recipes/dimmer"; @@ -13503,8 +13524,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "edea7534b36297211fe1c0e493220a5cc1bdec93"; - sha256 = "1g05r0krgyyj91digvd07vn6qi9m8yigj6w97bg8zgcsrxhlmc07"; + rev = "f0628fb58ae25563a5bba211f613f8bd7e23fabd"; + sha256 = "02dwazx62297wyyxxvb1zw2yz031lsw2h9kc1zgn63ra33kb4b2a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-avfs"; @@ -13524,8 +13545,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "edea7534b36297211fe1c0e493220a5cc1bdec93"; - sha256 = "1g05r0krgyyj91digvd07vn6qi9m8yigj6w97bg8zgcsrxhlmc07"; + rev = "f0628fb58ae25563a5bba211f613f8bd7e23fabd"; + sha256 = "02dwazx62297wyyxxvb1zw2yz031lsw2h9kc1zgn63ra33kb4b2a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6aab23df1451682ff18d9ad02c35cb7ec612bc38/recipes/dired-collapse"; @@ -13650,8 +13671,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "edea7534b36297211fe1c0e493220a5cc1bdec93"; - sha256 = "1g05r0krgyyj91digvd07vn6qi9m8yigj6w97bg8zgcsrxhlmc07"; + rev = "f0628fb58ae25563a5bba211f613f8bd7e23fabd"; + sha256 = "02dwazx62297wyyxxvb1zw2yz031lsw2h9kc1zgn63ra33kb4b2a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-filter"; @@ -13671,8 +13692,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "edea7534b36297211fe1c0e493220a5cc1bdec93"; - sha256 = "1g05r0krgyyj91digvd07vn6qi9m8yigj6w97bg8zgcsrxhlmc07"; + rev = "f0628fb58ae25563a5bba211f613f8bd7e23fabd"; + sha256 = "02dwazx62297wyyxxvb1zw2yz031lsw2h9kc1zgn63ra33kb4b2a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-hacks-utils"; @@ -13797,8 +13818,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "edea7534b36297211fe1c0e493220a5cc1bdec93"; - sha256 = "1g05r0krgyyj91digvd07vn6qi9m8yigj6w97bg8zgcsrxhlmc07"; + rev = "f0628fb58ae25563a5bba211f613f8bd7e23fabd"; + sha256 = "02dwazx62297wyyxxvb1zw2yz031lsw2h9kc1zgn63ra33kb4b2a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8994330f90a925df17ae425ccdc87865df8e19cd/recipes/dired-narrow"; @@ -13818,8 +13839,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "edea7534b36297211fe1c0e493220a5cc1bdec93"; - sha256 = "1g05r0krgyyj91digvd07vn6qi9m8yigj6w97bg8zgcsrxhlmc07"; + rev = "f0628fb58ae25563a5bba211f613f8bd7e23fabd"; + sha256 = "02dwazx62297wyyxxvb1zw2yz031lsw2h9kc1zgn63ra33kb4b2a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-open"; @@ -13860,8 +13881,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "edea7534b36297211fe1c0e493220a5cc1bdec93"; - sha256 = "1g05r0krgyyj91digvd07vn6qi9m8yigj6w97bg8zgcsrxhlmc07"; + rev = "f0628fb58ae25563a5bba211f613f8bd7e23fabd"; + sha256 = "02dwazx62297wyyxxvb1zw2yz031lsw2h9kc1zgn63ra33kb4b2a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-rainbow"; @@ -13877,12 +13898,12 @@ dired-ranger = callPackage ({ dash, dired-hacks-utils, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-ranger"; - version = "20160924.335"; + version = "20171229.753"; src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "edea7534b36297211fe1c0e493220a5cc1bdec93"; - sha256 = "1g05r0krgyyj91digvd07vn6qi9m8yigj6w97bg8zgcsrxhlmc07"; + rev = "f0628fb58ae25563a5bba211f613f8bd7e23fabd"; + sha256 = "02dwazx62297wyyxxvb1zw2yz031lsw2h9kc1zgn63ra33kb4b2a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c03f6f8c779c8784f52adb20b266404cb537113a/recipes/dired-ranger"; @@ -13944,8 +13965,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "edea7534b36297211fe1c0e493220a5cc1bdec93"; - sha256 = "1g05r0krgyyj91digvd07vn6qi9m8yigj6w97bg8zgcsrxhlmc07"; + rev = "f0628fb58ae25563a5bba211f613f8bd7e23fabd"; + sha256 = "02dwazx62297wyyxxvb1zw2yz031lsw2h9kc1zgn63ra33kb4b2a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d6a947ac9476f10b95a3c153ec784d2a8330dd4c/recipes/dired-subtree"; @@ -14850,12 +14871,12 @@ dokuwiki = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }: melpaBuild { pname = "dokuwiki"; - version = "20170213.122"; + version = "20180101.1659"; src = fetchFromGitHub { owner = "accidentalrebel"; repo = "emacs-dokuwiki"; - rev = "a78289d99068ec3dfb4945877c32751e789d099d"; - sha256 = "0hynymx3gm9nqmpb0a9j8d9g298vsl0gxa9f1yx9xp60mq6y7l3r"; + rev = "594c4d4904dcc2796bbbd2c0845d9e7c09ccf6f7"; + sha256 = "0vqx8npw0i02dhw2yb7s4z7njw60r3xyncw4z8l6fj99pp6pfh15"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dokuwiki"; @@ -14934,12 +14955,12 @@ doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "doom-themes"; - version = "20171214.1412"; + version = "20180101.2140"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-doom-themes"; - rev = "5189ef50a0224c0557d6f604b93a58ee91727e7d"; - sha256 = "0hd8l1aalmvjvr2f92ragmirwyx949jg9fkk84f9xa07xg9wbipv"; + rev = "bc747b3b65baf737f99dc4ccf68558581958bbba"; + sha256 = "0j5aywwh8cw0bb55frrpmyfmbzg6d6jv29ys61p1xf49gvki870m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c5084bc2c3fe378af6ff39d65e40649c6359b7b5/recipes/doom-themes"; @@ -15878,12 +15899,12 @@ easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "easy-hugo"; - version = "20171226.17"; + version = "20171231.306"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-easy-hugo"; - rev = "1a8c4286ac1d92114dbda9042ed831cc83175db9"; - sha256 = "11vwzgy1dn4sj1yhnvvim6p9w3dl896azh3wlrmg8g6y6qfzblc7"; + rev = "253d91cda8722fa69b8ee67b1802137863bc3d9a"; + sha256 = "1i5hdm9xwajid7kzx6gq8lhx5w2aihvb0ka5h2s88zb1xnnxss46"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo"; @@ -15899,12 +15920,12 @@ easy-jekyll = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "easy-jekyll"; - version = "20171226.246"; + version = "20171231.401"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-easy-jekyll"; - rev = "d5226405c035d0dd675cacfd514388c348a4559a"; - sha256 = "1pmaa0ry1yd8d2pbn4srv5bf1hqss046zjl2p3ag1ag0qb35fh39"; + rev = "4eac3993d9bbec9ddfe38b128fd3ed6670f526e2"; + sha256 = "0ffspw6xavfbk0klqjp8va7ybvsdcxlw1qmqhi6paqam90m6vazz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3f281145bad12c27bdbef32ccc07b6a5f13b577/recipes/easy-jekyll"; @@ -15983,12 +16004,12 @@ ebal = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ebal"; - version = "20170810.631"; + version = "20171231.2216"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "ebal"; - rev = "65a131b95a1e934c0cab384ef533b0ac58961f0c"; - sha256 = "1b8i7qh743lhmkrmw1ac486i8nk8fdxl0ayxjs2sfb8fk4621rfr"; + rev = "3a7a9a66efed30416e2013da80fed2f79b91def1"; + sha256 = "0vxxswbx8l9jcv81akw1bd7ra4k51gjmv79z11fhbzf17n7y910a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/629aa451162a0085488caad4052a56366b7ce392/recipes/ebal"; @@ -16725,11 +16746,11 @@ }) {}; eide = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eide"; - version = "20170906.1216"; + version = "20171229.1435"; src = fetchgit { url = "git://git.tuxfamily.org/gitroot/eide/emacs-ide.git"; - rev = "25f9af215781163b10d411fe2b5674033eb24165"; - sha256 = "0mwy5a67hap9bx1klk2pzfaav65drd6mfkkhnk2045z4jvzgkn70"; + rev = "faae6f1384826d18f70b28826dc528d70e91a5c9"; + sha256 = "02hylmgs6il59kkq59i9lpdg9gdirpb2y37xzybh7n5lqyzdafai"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/eide"; @@ -17225,12 +17246,12 @@ electric-operator = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names }: melpaBuild { pname = "electric-operator"; - version = "20171221.1330"; + version = "20171229.304"; src = fetchFromGitHub { owner = "davidshepherd7"; repo = "electric-operator"; - rev = "0c5439689e22806550bb2856a2da57967e87611e"; - sha256 = "12qnaxqj0kvjcf207cg11v084pi1gbixmmrz8pjl0pphpz9rcjgi"; + rev = "e414534bd0a4149919647beec8fe4e342d2d1219"; + sha256 = "0ahxxjlfpr2zj3sbiz9xyb422pld8xhzzj5nkzxyfksbnbvms5hd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/906cdf8647524bb76f644373cf8b65397d9053a5/recipes/electric-operator"; @@ -17309,12 +17330,12 @@ elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elfeed"; - version = "20171224.1850"; + version = "20180101.1921"; src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "5ba4b1b0b47dc5cd40c52d51227f2dd6436859f2"; - sha256 = "1rsx371cz48lw78hjnjc54rqjx6965dc3ddqfn6k98qjlcvgr599"; + rev = "fc081840e56f3eb3a28265e7c4bcb03a0458bdb9"; + sha256 = "0jka43vas7g5dj5yg7i3hnxvff2m24fkbv3izxv58wv6ydc5amkh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed"; @@ -17404,8 +17425,8 @@ src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "5ba4b1b0b47dc5cd40c52d51227f2dd6436859f2"; - sha256 = "1rsx371cz48lw78hjnjc54rqjx6965dc3ddqfn6k98qjlcvgr599"; + rev = "fc081840e56f3eb3a28265e7c4bcb03a0458bdb9"; + sha256 = "0jka43vas7g5dj5yg7i3hnxvff2m24fkbv3izxv58wv6ydc5amkh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web"; @@ -17862,12 +17883,12 @@ elpy = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }: melpaBuild { pname = "elpy"; - version = "20171220.504"; + version = "20171228.1239"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "elpy"; - rev = "ef4cc68d5e68f3b81160e3556573f216d86af474"; - sha256 = "1gjad8xfvrdfj6ql23khjps5znnsnf0ga3vk97rcfpzkjq1b95lm"; + rev = "d0c6121148f97adafa1ae1828b59569e0f5c11d0"; + sha256 = "1fps5ll0sdrn341k0pp4shli3qadmkdc2dn6vbl19zdlhzyb2lda"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy"; @@ -18479,11 +18500,11 @@ emms = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emms"; - version = "20171226.113"; + version = "20171229.1306"; src = fetchgit { url = "https://git.savannah.gnu.org/git/emms.git"; - rev = "f5b2da5876a66b9a7570001feba7dfc06668787b"; - sha256 = "1rw0as7iq8yyxdn214g7hnl5bcxxjl12hwrybk4lk673n4grjdg6"; + rev = "f586070b598b1a19842212686e88df346f1ebc1f"; + sha256 = "14k49gkhn1b6fmw8zx8125j6cymbww8bha7fs0kbjcqvfp9isr8c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/emms"; @@ -19383,8 +19404,8 @@ src = fetchFromGitHub { owner = "drewbarbs"; repo = "erc-status-sidebar"; - rev = "48ed93ca8e225b4a212d89ffc01803355f66ee0a"; - sha256 = "1pxs48rsmna177qvglyk32hy3rdfydg0spr4rzkf1gvn169ispss"; + rev = "9e972f4e31287362020daa81dc7af26999ea6c5b"; + sha256 = "0g7m5r5f01i73k05wny0xycrjcyhzwc314a5lb8h09kglwnmisgv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/29631de8ec4140a8e35cc500902b58115faa3955/recipes/erc-status-sidebar"; @@ -19677,8 +19698,8 @@ src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "0052a4641d6f904fe632a9c056b9eed7ffc18b54"; - sha256 = "1v05miw43hd039nc0fy56lh8fybchzjymyaxh7gwginfq34v5b6q"; + rev = "3d124b9ea557fd26ca7a33276b84c72d9e72044e"; + sha256 = "16ya5416mdyramdapzvnnxxfiqr92ls8888z9lbcgl1igqsmhrcn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -20659,12 +20680,12 @@ evil = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }: melpaBuild { pname = "evil"; - version = "20171224.929"; + version = "20171228.926"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil"; - rev = "8d2477231e0326df42a3a3a17492e34df91ea86b"; - sha256 = "19ykkznjdqg428ar10l38j5nzrjnixnyifzcv3b99c84ikkfzrc1"; + rev = "3475b3260c290e5ea5e45d9bfc89005c06846152"; + sha256 = "16m6ry56rxyxn4nh9n4743zx108zjnqzhld22ffipfj5ckqxlspn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/440482c0edac8ee8bd4fe22f6bc5c1607f34c7ad/recipes/evil"; @@ -20806,12 +20827,12 @@ evil-collection = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-collection"; - version = "20171224.1553"; + version = "20171229.1311"; src = fetchFromGitHub { owner = "jojojames"; repo = "evil-collection"; - rev = "78e0797d152c7a46783ce8a12f17b0ed4f549635"; - sha256 = "0hzngyw6z998dfwzg5af7zir7h3kpd0s79xr4kf38a9chdafdy43"; + rev = "4ce6968d221e98d0ad522082711ea927d80017af"; + sha256 = "1x50i42i7wy8b2qx9kb1lhbifsrdxb6n6cs1mkjrljqyqqg57lj1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d7538c9eb00b6826867891b037e7aa537ac5b160/recipes/evil-collection"; @@ -21797,8 +21818,8 @@ src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil"; - rev = "8d2477231e0326df42a3a3a17492e34df91ea86b"; - sha256 = "19ykkznjdqg428ar10l38j5nzrjnixnyifzcv3b99c84ikkfzrc1"; + rev = "3475b3260c290e5ea5e45d9bfc89005c06846152"; + sha256 = "16m6ry56rxyxn4nh9n4743zx108zjnqzhld22ffipfj5ckqxlspn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87da8c50f9167ad9c3844b23becb6904f809611d/recipes/evil-test-helpers"; @@ -22409,12 +22430,12 @@ f = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "f"; - version = "20171119.723"; + version = "20171230.1229"; src = fetchFromGitHub { owner = "rejeep"; repo = "f.el"; - rev = "595519ea07d6ff49e5cb1cbd442eb689f9142ed1"; - sha256 = "1nxkfya6bwn0bmiwcq5q68qpyhkdsc9b4n75vav06nn7w1k5y3gv"; + rev = "78fb8ba22c660027c607c6df09343120610d993c"; + sha256 = "0wirps6zy493kybkcmkdp4rdgpj3piqndqdalcgxl7f14vx8k5z7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/f"; @@ -23267,12 +23288,12 @@ fix-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fix-input"; - version = "20170518.2311"; + version = "20171231.2220"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "fix-input"; - rev = "a0fd233bba6206854c5d7365d7182aaae842f210"; - sha256 = "1zwbysh9fq6dbdi93cdzgrsp2azy8b3j0gz32ih0vbs9xyysbhlz"; + rev = "e053fcc641f1f835f2fdb71143e095c1889b8233"; + sha256 = "1w8vv2ijmsch02xsc1r97r6s3jz0dkd8kwz5wgiizq5ghx7x6x6j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7d31f907997d1d07ec794a4f09824f43818f035c/recipes/fix-input"; @@ -23309,12 +23330,12 @@ fix-word = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fix-word"; - version = "20170518.2343"; + version = "20171231.2215"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "fix-word"; - rev = "7df98ac9f9b0e6e09d7999d83e678cb22248be77"; - sha256 = "13i604lmx30r0kk0s998dp4czzazqavyqqi3kx6lh6mj2csgkgda"; + rev = "3e3339f5d44dd8be100cec1c88bcaefd328a2bde"; + sha256 = "0hd5bhq57qgabs881xfrz1v1n8sp1nv2hrfs386dx7g5b3ancr0i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/22636390e8a15c09293a1506a901286dd72e565f/recipes/fix-word"; @@ -24701,12 +24722,12 @@ flycheck-objc-clang = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-objc-clang"; - version = "20171014.651"; + version = "20171231.453"; src = fetchFromGitHub { owner = "GyazSquare"; repo = "flycheck-objc-clang"; - rev = "29a9eb320d62400564360986f7ad400b74070d8e"; - sha256 = "0b4vwbxzhds9vb4nknfdywvfpr1gkk86vsbbq6f5ds0pfk75x022"; + rev = "07f17d1dbe878fdcabac791a8916ddf643571a68"; + sha256 = "03624xn6g1ybcjw634c7nd5s2yllwfffk2gzn5hm70vfz06q7wb9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4ff4412f507371b93cfb85fc744e54110cd87338/recipes/flycheck-objc-clang"; @@ -24764,12 +24785,12 @@ flycheck-perl6 = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-perl6"; - version = "20150414.1832"; + version = "20171231.445"; src = fetchFromGitHub { owner = "hinrik"; repo = "flycheck-perl6"; - rev = "6999f1b439fb4bc9504bc73f550b369c0bd47156"; - sha256 = "0s01f0fy2q7j52334wpp38kyflnprn279q1cbrcd609878c94nf7"; + rev = "7a69ddbb54dc0748734ace95f598c69e9882aa94"; + sha256 = "1bsbw5pjin7m556pnphq8plgfjvbp1pl738lf5qc85jcvinv998m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2f6ecdb2ce6bc74a27dca01ab4942778e986ac8f/recipes/flycheck-perl6"; @@ -25079,12 +25100,12 @@ flycheck-swift3 = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-swift3"; - version = "20170926.317"; + version = "20171231.452"; src = fetchFromGitHub { owner = "GyazSquare"; repo = "flycheck-swift3"; - rev = "756833425f51baa9eb0a2fa7493df6e68612c88d"; - sha256 = "1hvrg717q0nlz4r8wby82gs3vdx8fdhf38rg4j77j3fqfmxdd3fi"; + rev = "34973cd28ca5e63f8f6328a17fd7b78cc913b93d"; + sha256 = "1iy6j05dzpi7pi87y6rpjzmlnl2s9izqpbzknis2kx9072qddm3q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f1fb8c731c118327dc0bbb726e046fec46bcfb82/recipes/flycheck-swift3"; @@ -26486,12 +26507,12 @@ fountain-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fountain-mode"; - version = "20171227.2105"; + version = "20180102.41"; src = fetchFromGitHub { owner = "rnkn"; repo = "fountain-mode"; - rev = "307d71269503746099ad72c58ab0d1eae6c65510"; - sha256 = "0vq5r4fi7h5z8h56pxh5lhdrbxn8dbbhhz6j2hqs22c4n5f90wrw"; + rev = "3f953ae30ad55bbbbb80aa0350992e79f4b00f56"; + sha256 = "1zksjvpvhbr79fg281yhx8k419q9kd4jpi47i9943cs0m088ykyn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/913386ac8d5049d37154da3ab32bde408a226511/recipes/fountain-mode"; @@ -26779,8 +26800,8 @@ src = fetchFromGitHub { owner = "factor"; repo = "factor"; - rev = "9dbfc9351cf4a45fa2e23e1b493ea37f66b4d92b"; - sha256 = "11pl2gj036ib4x3fbzs0na8pbyccnk1qc8bf3wz91m3py65ls07c"; + rev = "fb9c3920ae99f051b5fa2939a5fc62d4d1015536"; + sha256 = "0099sfvf3cxyqnraf52ba6883kh5gck665skwpkn322jk74qi6vb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/fuel"; @@ -26905,8 +26926,8 @@ src = fetchFromGitHub { owner = "HIPERFIT"; repo = "futhark"; - rev = "bdbbdcbe91929e1045c5d5acf8313f80bbe51f18"; - sha256 = "1j1ybjgcdyvrkf4sclhzvzwaimf1xxqc9zcqk1p7ny5k90asn1ga"; + rev = "c7b67d469f896fa9b93a0804c4ecc36cb1b4b320"; + sha256 = "0idyfkrdrmq3cmizjxvl8iqdz3769c38pkpib4vazyaglgn703mb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode"; @@ -27722,8 +27743,8 @@ src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "0ee62ee80eca660a5d05dab34bcf4b80a3ee749d"; - sha256 = "0hgkb6vf53f0hannbb6a50kdlwzhx73wf4hr3y3yw7ihjr9qd89h"; + rev = "ebd8c6510dc1c95e6ca4007a7f62ed037379d251"; + sha256 = "1qjnbkrm8svham59pddzwzjvp7s0icszc7dkm97s4yciikgmsirf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit"; @@ -28663,12 +28684,12 @@ gnus-summary-ext = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gnus-summary-ext"; - version = "20171201.1850"; + version = "20171231.549"; src = fetchFromGitHub { owner = "vapniks"; repo = "gnus-summary-ext"; - rev = "fa75cdccc4d0775c775bae1ef92f4429e0341a37"; - sha256 = "1954r76228wcp1kmhrprgvywrzmmzj0qsp3n0rcsypz9i6y8qrz0"; + rev = "b2259a2501f4e0c23b51aedf056b812c8140b958"; + sha256 = "1y4379wrd2y9jzbg2bhifwa03nbf84xzb4rhfih6xmh9h5gg4bi1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5ca4a905b5f81991074c7d3e41d4422c7e6713d5/recipes/gnus-summary-ext"; @@ -28751,8 +28772,8 @@ src = fetchFromGitHub { owner = "nsf"; repo = "gocode"; - rev = "0444ce1cda44fedd8f89f853dfb9d3ee6973fa13"; - sha256 = "1zr8ql7blacz4iz8l969sz3dmy9cfp4v15bwzxv71rg9vhz1ip9g"; + rev = "22bc785b7506257947079201bd1a117e885af8bb"; + sha256 = "16pkv3xc19i0gaxgvixjsdm17ikmibvaq6rr4bg4rpzk2z2l11fg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/go-autocomplete"; @@ -28975,6 +28996,27 @@ license = lib.licenses.free; }; }) {}; + go-imports = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "go-imports"; + version = "20171227.858"; + src = fetchFromGitHub { + owner = "yasushi-saito"; + repo = "go-imports"; + rev = "403c93f717fcd62c4e4804e6aaa3d2aa961e9709"; + sha256 = "1dv383i45ca26s8g0y93n22di44f4q0si81pxihsf7vci5ic333g"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4118ebf0db84cc047fab311c789bfbffd6eb2d92/recipes/go-imports"; + sha256 = "0xxlh4rmyvfxiynsdqng6wd3js7h3azhb8ii0ch7n0hhqkcnda4x"; + name = "go-imports"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/go-imports"; + license = lib.licenses.free; + }; + }) {}; go-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "go-mode"; @@ -29150,8 +29192,8 @@ src = fetchFromGitHub { owner = "brantou"; repo = "emacs-go-tag"; - rev = "51b032465405a62f84d9181168a570610ba04085"; - sha256 = "0158c3yjw21skwa03qmh3xpg9wg7rnk6xbxqx5vxi24205zsz0kd"; + rev = "9a55097c34e9c3170ecec31129c92e897e35058d"; + sha256 = "0m4h13czlsp0l46dkfhzvis7bikwi2g9azd4b1lzq5hls7nc6fwz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc4cd3fd8fb0707912e205b9d71789ea8126c442/recipes/go-tag"; @@ -29566,12 +29608,12 @@ goto-chg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "goto-chg"; - version = "20170917.1200"; + version = "20171231.312"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "goto-chg"; - rev = "81fca94d2592cf32bab451c39a9cd2d9b03fbd6b"; - sha256 = "033msplvpahkva9ha09gsg9232fyz2bjihrdxaa2z9g4yzql8jkq"; + rev = "6cb244922b733358fd6985b36c4b87ef2e177293"; + sha256 = "0miscmk5gg7mqqwjb5mlrkbpsx4pny2w3rpr90f7yiv30rf83b5j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf1fc176430fe3ab55ce537a0efc59780bb812be/recipes/goto-chg"; @@ -29633,8 +29675,8 @@ src = fetchFromGitHub { owner = "vmware"; repo = "govmomi"; - rev = "3f8349f3b2ee9bc74ed11c2649e6c65d08f44f5f"; - sha256 = "02l48jarwx9hi7y91mn1k6sl1bqkbpba2fg8qiyjypirnznpdapq"; + rev = "d70eca22cace05a6ed7a5787ecd660724d65d911"; + sha256 = "0rgvlvv8dbm47qcw9wxrdd85rxa1csysqiyrhql6gwd4a5iwrbp1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc"; @@ -29759,8 +29801,8 @@ src = fetchFromGitHub { owner = "Groovy-Emacs-Modes"; repo = "groovy-emacs-modes"; - rev = "c1e4cf8378bdd7e0d8205b2bcdcb3ff3e05ad8d2"; - sha256 = "0jk0a0n43jabyn8shv2i0fzqcy2aw16hanjqcsfzmrv5881hzyy1"; + rev = "2bfaf08cd76981620f36b2b7fc52a9a0b8214d13"; + sha256 = "07l28zgjzvrm1jpnpzidx316x3k0n6ar1pkxjwzr56ikjlcgszxa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/grails-mode"; @@ -29797,12 +29839,12 @@ grandshell-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "grandshell-theme"; - version = "20171227.29"; + version = "20171230.440"; src = fetchFromGitHub { owner = "steckerhalter"; repo = "grandshell-theme"; - rev = "22c8df52c0fb8899fa748fa2980947ab38b53380"; - sha256 = "08556ci80iycm4qkvbnrci55wyv91b4fh6sjp0im0ywndmrq3yyc"; + rev = "c8f1dd4ceb3b752bcb4a0122af45e3a197c4fa99"; + sha256 = "1b0azylab54183kf9nmpx6qb8hrr91fsxladwfmiljrcpvf6pdh8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b04b0024f5a0367e2998d35ca88c2613a8e3470/recipes/grandshell-theme"; @@ -30139,22 +30181,22 @@ license = lib.licenses.free; }; }) {}; - groovy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + groovy-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "groovy-mode"; - version = "20171024.221"; + version = "20171230.930"; src = fetchFromGitHub { owner = "Groovy-Emacs-Modes"; repo = "groovy-emacs-modes"; - rev = "c1e4cf8378bdd7e0d8205b2bcdcb3ff3e05ad8d2"; - sha256 = "0jk0a0n43jabyn8shv2i0fzqcy2aw16hanjqcsfzmrv5881hzyy1"; + rev = "2bfaf08cd76981620f36b2b7fc52a9a0b8214d13"; + sha256 = "07l28zgjzvrm1jpnpzidx316x3k0n6ar1pkxjwzr56ikjlcgszxa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/groovy-mode"; sha256 = "1pxw7rdn56klmr6kw21lhzh7zhp338gyf54ypsml64ibzr1x9kal"; name = "groovy-mode"; }; - packageRequires = [ s ]; + packageRequires = [ emacs s ]; meta = { homepage = "https://melpa.org/#/groovy-mode"; license = lib.licenses.free; @@ -30268,12 +30310,12 @@ gtk-pomodoro-indicator = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gtk-pomodoro-indicator"; - version = "20170517.900"; + version = "20171230.840"; src = fetchFromGitHub { owner = "abo-abo"; repo = "gtk-pomodoro-indicator"; - rev = "0fa0e682b3bd1595f230275d73ca231e93c6d28a"; - sha256 = "1jm7kcray6qd867hacyhs5c7hhdm0fyfa1jx35sh09g5c9xa4x2f"; + rev = "eb59b229de0dde307b20654075a9bbac69899a66"; + sha256 = "0dmaazcscg9mdsmij26873af5jl2np4q9xf2klw1jmcl61wzggb0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b98ec72605077f3b3f587713a681eb2144f29645/recipes/gtk-pomodoro-indicator"; @@ -30352,12 +30394,12 @@ guix = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }: melpaBuild { pname = "guix"; - version = "20171223.1417"; + version = "20171228.1131"; src = fetchFromGitHub { owner = "alezost"; repo = "guix.el"; - rev = "cacfb7c063f29193d71ef3588f0d0c342d2f84c8"; - sha256 = "1aaggksxcwvsddlv2aj8n2bwh0j8bbg8wn7yrl4kjf5ahp07gx6a"; + rev = "a43828f6e5d6dc4e623a4b78e0dfdddbf5b20185"; + sha256 = "0c19njb5cg6g3fav9322hkbl4h9zwcbymhc5wr0k9yqi7pv8gz0v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix"; @@ -30918,12 +30960,12 @@ hasky-extensions = callPackage ({ avy-menu, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hasky-extensions"; - version = "20171209.736"; + version = "20171231.941"; src = fetchFromGitHub { owner = "hasky-mode"; repo = "hasky-extensions"; - rev = "d4f4eb136ccbf880d7f50c541450dbb0b403b7f2"; - sha256 = "03h5nvwdp75sj0ggf92zd5d8kpd8zff7nx6d2jk70hybwwszzv1a"; + rev = "c8f6abf9a05a573261a2b708ffbbcf28b717c1d8"; + sha256 = "0hy89yyv50ynywij0cpbd7k9ljc66j0zxj23wc6dsfvn5m2l9534"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e3f73e3df8476fa231d04211866671dd74911603/recipes/hasky-extensions"; @@ -30939,12 +30981,12 @@ hasky-stack = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }: melpaBuild { pname = "hasky-stack"; - version = "20171218.9"; + version = "20171231.942"; src = fetchFromGitHub { owner = "hasky-mode"; repo = "hasky-stack"; - rev = "17b9facafcff8203012c037c5a589f290169fc33"; - sha256 = "00k13sl2yjnqjjdqlmz8ril07xw5al2ysbsnpmz81sccqa1kbikr"; + rev = "7a97d039489ff23b3362b543dea1007357e2ada9"; + sha256 = "1rqj7yypsd25h4x9lx6vkqchq70fwnjs4dpivd7n105h41pz3kiv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3faf544872478c3bccf2fe7dc51d406031e4d80/recipes/hasky-stack"; @@ -31127,12 +31169,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "20171227.2150"; + version = "20180101.14"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "b25ac4818cec94b07d6d1ce82880a4f842115aec"; - sha256 = "0ibqyz9pqvh9rbqkk44kx1r1wp7crxzvbnnddzqq7m9gs1gkxxl2"; + rev = "2399979be21bd622c17c2f1719b7e133e85cb229"; + sha256 = "1k55p4vcqxpkd30wcjb7ghxb568vgx4rnzbd8qp582f9bw3sl5vf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -31757,12 +31799,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "20171227.2227"; + version = "20180102.19"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "b25ac4818cec94b07d6d1ce82880a4f842115aec"; - sha256 = "0ibqyz9pqvh9rbqkk44kx1r1wp7crxzvbnnddzqq7m9gs1gkxxl2"; + rev = "2399979be21bd622c17c2f1719b7e133e85cb229"; + sha256 = "1k55p4vcqxpkd30wcjb7ghxb568vgx4rnzbd8qp582f9bw3sl5vf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -34256,12 +34298,12 @@ helpful = callPackage ({ dash, dash-functional, elisp-refs, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }: melpaBuild { pname = "helpful"; - version = "20171222.1456"; + version = "20180101.352"; src = fetchFromGitHub { owner = "Wilfred"; repo = "helpful"; - rev = "ed23fa740151cd15c27ad56d8cef5fc84b63d003"; - sha256 = "0skhmy131aq5cwqn0by5838vcirswnfzinl67svla85cr2wvjfh1"; + rev = "08233ef9e9a4aacf046d7b0177b5d53bd5c9e926"; + sha256 = "0x3j2lcw4s0c7vrfbmxi3wpziqq1526sj40kldfh93qvgrllvkzl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/889d34b654de13bd413d46071a5ff191cbf3d157/recipes/helpful"; @@ -34931,8 +34973,8 @@ src = fetchFromGitHub { owner = "chrisdone"; repo = "hindent"; - rev = "cb0987ca0a0a97db298cbb70167b81c195d54884"; - sha256 = "013m48ynrv1p3xfgphzmjj3izf3q64wv1wr1lxjya7fcjjzwpcia"; + rev = "7101c1da8b0a4fc62a45967c5f02c2922bbfcfd4"; + sha256 = "1w7l79mx9hf9x5igkpy794db7nipr6skvvlhf1zm28r3dk5s1r2v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent"; @@ -35928,6 +35970,27 @@ license = lib.licenses.free; }; }) {}; + ialign = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ialign"; + version = "20171229.410"; + src = fetchFromGitHub { + owner = "mkcms"; + repo = "interactive-align"; + rev = "82055a5546e6ae9f766896dfe8afc78092241ab5"; + sha256 = "07bmkmhw38ls94d9c1kpq7ilw7bny4n5y0g7iiyvdhm45vvq4if8"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/072f1f7ce17e2972863bce10af9c52b3c6502eab/recipes/ialign"; + sha256 = "070a0fa2vbdfvbnpbzv4z0c7311lf8sy2zw2ifn9k548n4l8k62j"; + name = "ialign"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/ialign"; + license = lib.licenses.free; + }; + }) {}; iasm-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "iasm-mode"; @@ -37230,12 +37293,12 @@ inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inf-clojure"; - version = "20171214.1444"; + version = "20180101.2315"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "inf-clojure"; - rev = "8c27b0603971e603db686131c3e411a02579501d"; - sha256 = "0834x1kmbhmny8fcb6kh0qnvkg7pwn7q2wikrw9w2swgmjg1c47k"; + rev = "c4adc89c1c17c01c8da039464cdb5211030cbd1d"; + sha256 = "05qrbncf0snvh46ngfqklzy65kmcm7w4hpp017swl7kbrdgcfqqy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d6112e06d1efcb7cb5652b0bec8d282d7f67bd9/recipes/inf-clojure"; @@ -38300,12 +38363,12 @@ ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ivy"; - version = "20171224.842"; + version = "20171231.144"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "864fbfeb0328d13e7d4641fcba9d001326229d37"; - sha256 = "045fqwgc02fh5mb09b0kzjwadr7b9vvsksicklffsx31fwbav4d6"; + rev = "c2bc6ac92a6cea730d7887813a816bdf873f9b92"; + sha256 = "040z731dm66w4c0475q8vl1lm4dnvi9yz2qslxdma0qdx70hymrr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy"; @@ -38451,8 +38514,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "864fbfeb0328d13e7d4641fcba9d001326229d37"; - sha256 = "045fqwgc02fh5mb09b0kzjwadr7b9vvsksicklffsx31fwbav4d6"; + rev = "c2bc6ac92a6cea730d7887813a816bdf873f9b92"; + sha256 = "040z731dm66w4c0475q8vl1lm4dnvi9yz2qslxdma0qdx70hymrr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra"; @@ -38636,12 +38699,12 @@ ivy-xref = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "ivy-xref"; - version = "20171202.1351"; + version = "20171229.252"; src = fetchFromGitHub { owner = "alexmurray"; repo = "ivy-xref"; - rev = "43b7c35be871b04635864334ffd2b315401150d5"; - sha256 = "13v4l95smna8jgv1c8al9bkj4nfdcrplra9yphxzac9rz77mim3m"; + rev = "aa97103ea8ce6ab8891e34deff7d43aa83fe36dd"; + sha256 = "1j4xnr16am5hz02y1jgiz516rqmn43564394qilckmzvi9clhny8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a4cd8724e8a4119b61950a97b88219bf56ce3945/recipes/ivy-xref"; @@ -39537,12 +39600,12 @@ js-auto-format-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "js-auto-format-mode"; - version = "20171220.1859"; + version = "20171229.414"; src = fetchFromGitHub { owner = "ybiquitous"; repo = "js-auto-format-mode"; - rev = "cad63f1760e765298cc91e3503ac46c8771da4be"; - sha256 = "1pg4ghfi0fzmnwrw3y4z3gy031psxvzjydwm4jbdrm33ais7919g"; + rev = "7872e6f1d8280830c70cae8f1e3edb8049aba295"; + sha256 = "0a9rbs0pjx953rbblmia9jznxykz5qa9q5wzkj341z6vfq9rq3rf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d3be16771b5b5fde639da3ee97890620354ee7a/recipes/js-auto-format-mode"; @@ -40394,12 +40457,12 @@ kaolin-themes = callPackage ({ autothemer, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kaolin-themes"; - version = "20171227.1451"; + version = "20171231.2330"; src = fetchFromGitHub { owner = "ogdenwebb"; repo = "emacs-kaolin-themes"; - rev = "c5876bdd121076a13bc2a439ae1068e9c42b385d"; - sha256 = "0p4i9ksf6fja1m4fdpnm07xkdbcysdz75gibbhyk5rjhpkydabzw"; + rev = "1c9185516c969fb70a51afca1ba01727b54557ea"; + sha256 = "0bs90drv377n5cxnpmrfld66w82pzjk955jmfc469syr6fx8mqbz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/043a4e3bd5301ef8f4df2cbda0b3f4111eb399e4/recipes/kaolin-themes"; @@ -40793,12 +40856,12 @@ kill-or-bury-alive = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kill-or-bury-alive"; - version = "20170518.2358"; + version = "20171231.2218"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "kill-or-bury-alive"; - rev = "415de48695efd30163a015063873b03f4ca5b743"; - sha256 = "1jsgvwi3zy22wirxgzkbbjzk4q6f6mxf3223cf5pkk7x2prv6fcn"; + rev = "d21aa7a12f1a76d47249db36eb9825242df9d512"; + sha256 = "1m790afdrns8afh7f690slq2gcya5bp7630fxwi8fqp5vil7lswg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/25016ed09b6333bd79b989a8f6b7b03cd92e08b3/recipes/kill-or-bury-alive"; @@ -40902,8 +40965,8 @@ src = fetchFromGitHub { owner = "kivy"; repo = "kivy"; - rev = "4c6f7be66628e01a22e3bd72b19db2380a6444bb"; - sha256 = "1vpj02af8mck8jwdc855svxkmwsnhm57s9jz2mgpli0pqpvfwmvj"; + rev = "1d1935206085a220c3de090f1d269a0f35969976"; + sha256 = "1s2w74g39qqybssg29xgjgxid9hx09172fm1nlr2p814pq9q31yy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode"; @@ -42270,12 +42333,12 @@ lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }: melpaBuild { pname = "lispy"; - version = "20171226.103"; + version = "20180101.1312"; src = fetchFromGitHub { owner = "abo-abo"; repo = "lispy"; - rev = "c75ca63199d035dd71183aac2d9be5c4ea736d35"; - sha256 = "10j19ff52and3x244lw3v5bz1ns5ly6qcdhssjq9mql2sl1awmg2"; + rev = "28bf928db432c61a59ec4eb78966844b8d7bbfe5"; + sha256 = "1i5vx2phxhwm38igfb9xxaas4q85mncs8zql87l1jwwij14v71xa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy"; @@ -42693,8 +42756,8 @@ version = "20150910.644"; src = fetchgit { url = "https://llvm.org/git/llvm"; - rev = "fc240a136aa7138e2876330db933446e675c0851"; - sha256 = "06bfifz08q8madprlj51kklb5xdzm0cyp8nb4zi2q61myngf2qg3"; + rev = "21623270b8b07e1e82eca1f1dbd88d079176ca48"; + sha256 = "1c9j5dk5wl849kjalqd7jnq76055gc643mv2zn99prj9ziimqgcc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/llvm-mode"; @@ -43233,12 +43296,12 @@ lsp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "lsp-mode"; - version = "20171223.442"; + version = "20171230.2213"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-mode"; - rev = "18f13f84aab37c5bb6ca355fe99e829c4fbbaae4"; - sha256 = "0dssg7v47zf4781995dw7bz5baqn880bknd4la7c5q6730lvnh5n"; + rev = "6aa831ac2ea8996e0ad5a0ab9573ec17c83d20f1"; + sha256 = "00sp25qhpk1y6qkhdfdp356w916awf0sap9bgvy23hwchi03g31v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-mode"; @@ -43314,6 +43377,27 @@ license = lib.licenses.free; }; }) {}; + lsp-ui = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, lsp-mode, markdown-mode, melpaBuild }: + melpaBuild { + pname = "lsp-ui"; + version = "20180101.1522"; + src = fetchFromGitHub { + owner = "emacs-lsp"; + repo = "lsp-ui"; + rev = "5292ac5434bcb9ce31af444177236a2622a57959"; + sha256 = "00g0hh494mfdygd4qlbmq9hcyrqhkikjx53xv03mkwnnbff1qag3"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1e4fa7cdf71f49f6998b26d81de9522248bc58e6/recipes/lsp-ui"; + sha256 = "00y5i44yd79z0v00a9lvgixb4mrx9nq5vcgmib70h41ffffaq42j"; + name = "lsp-ui"; + }; + packageRequires = [ emacs flycheck lsp-mode markdown-mode ]; + meta = { + homepage = "https://melpa.org/#/lsp-ui"; + license = lib.licenses.free; + }; + }) {}; lsp-vue = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }: melpaBuild { pname = "lsp-vue"; @@ -43653,12 +43737,12 @@ magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, ghub, git-commit, let-alist, lib, magit-popup, melpaBuild, with-editor }: melpaBuild { pname = "magit"; - version = "20171219.1342"; + version = "20171227.2034"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "0ee62ee80eca660a5d05dab34bcf4b80a3ee749d"; - sha256 = "0hgkb6vf53f0hannbb6a50kdlwzhx73wf4hr3y3yw7ihjr9qd89h"; + rev = "ebd8c6510dc1c95e6ca4007a7f62ed037379d251"; + sha256 = "1qjnbkrm8svham59pddzwzjvp7s0icszc7dkm97s4yciikgmsirf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0263ca6aea7bf6eae26a637454affbda6bd106df/recipes/magit"; @@ -44510,12 +44594,12 @@ markdown-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "markdown-mode"; - version = "20171222.927"; + version = "20180101.503"; src = fetchFromGitHub { owner = "jrblevin"; repo = "markdown-mode"; - rev = "faf60003180bc9db5e69fcef08040f544217d08f"; - sha256 = "1kfz9w2lb2afjd9vxmpcbkgcsxa39iwhx6af2m7gwxa1mh2grfj3"; + rev = "fc4e143831f8590dc9b25da76961536eade02411"; + sha256 = "05q7962wc8px9v2810v6z68qrqr7kvjicc53byyqbxlp4sqcz6x4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/74610ec93d4478e835f8b3b446279efc0c71d644/recipes/markdown-mode"; @@ -44706,12 +44790,12 @@ marshal = callPackage ({ eieio ? null, fetchFromGitHub, fetchurl, ht, json ? null, lib, melpaBuild }: melpaBuild { pname = "marshal"; - version = "20171018.932"; + version = "20180102.201"; src = fetchFromGitHub { owner = "sigma"; repo = "marshal.el"; - rev = "6a31133b25addabc5ec9c87ba959d69c5122171b"; - sha256 = "1h5ilihlpqg1as6cd58z3flxzhj7izk7sz1nzwhwzvh3kfm47h9d"; + rev = "e25b170779ca8d0cdef0bfeb6f35c264a23a44e8"; + sha256 = "01m5cjjhi02aqpv1c9h7n4kq1b7vplb9cwncb4kx17k5xyml7yb1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/203f2061c5c7d4aefab3175de5e0538f12158ee3/recipes/marshal"; @@ -45062,12 +45146,12 @@ meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }: melpaBuild { pname = "meghanada"; - version = "20171122.626"; + version = "20171230.802"; src = fetchFromGitHub { owner = "mopemope"; repo = "meghanada-emacs"; - rev = "555b8b9ea8ef56dda645ea605b38501cb4222b12"; - sha256 = "1z3vvasah4gq6byq4ibkihy5mbch5zzxnn0gy86jldapwi1z74sq"; + rev = "98ad6a5361c725319a355522d2d1ba0e0fbb7cde"; + sha256 = "06iryz4dbldc9vxy67g977hih8r1bfvjld53lvwnjsc7r3x9i07q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada"; @@ -45900,12 +45984,12 @@ mmt = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mmt"; - version = "20170519.4"; + version = "20171231.2219"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "mmt"; - rev = "5cc5d1ee3efe675fa49d62fe0ae6b483d7ad9392"; - sha256 = "1vkj28351si30l3szjpkdgjlmp2vfjp6jxk3dvlbxicfqd1k823p"; + rev = "b8cc8d29e185c15a1e43ecc2a78e36a6d2f86b8f"; + sha256 = "17v26116g05py2yd24a5rjlr2lbdacahglxar10k5291v9i4msdw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d1137bb53ecd92b1a8537abcd2635602c5ab3277/recipes/mmt"; @@ -46047,12 +46131,12 @@ modalka = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "modalka"; - version = "20170519.32"; + version = "20171231.2213"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "modalka"; - rev = "3cb3fdd20def5888e232863e13bd9ad68ea85a01"; - sha256 = "1zkfby6m16yafzz511jgjlh3cyjnqaknbrdky05h1a4hbk2rvsnl"; + rev = "e69ec8fa01e86cb789f7f2b27b6d5a47e1ca3069"; + sha256 = "10yn56vamcfblilsnfqfagssr4060gr7qbpnqa2fjqv1l8fg6jrf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fa0a02da851a603b81e183f461da55bf4c71f0e9/recipes/modalka"; @@ -46086,6 +46170,27 @@ license = lib.licenses.free; }; }) {}; + mode-line-bell = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "mode-line-bell"; + version = "20171231.1939"; + src = fetchFromGitHub { + owner = "purcell"; + repo = "mode-line-bell"; + rev = "dcfad0929a606af0e836d93e78be989a8ac16f87"; + sha256 = "0vpi3x60izvwwcck6scdm4386bc67693nqwwll0mbzf8n9args4v"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/26f19808655b0242a1e9e5e5d41f7f794542e243/recipes/mode-line-bell"; + sha256 = "1ri771hb91b7hd203f8zp83h5hcndh8ccc1y8shhqmak6a6l04wk"; + name = "mode-line-bell"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/mode-line-bell"; + license = lib.licenses.free; + }; + }) {}; mode-line-debug = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mode-line-debug"; @@ -46534,8 +46639,8 @@ src = fetchFromGitHub { owner = "retroj"; repo = "mowedline"; - rev = "fcf01eafc6d201396dff521012f40c18a0c7a8d8"; - sha256 = "0v0pxbnf1xs25nrnyyvxjk3pz3pxhlpabnbhhd80s31jcnh5zy1s"; + rev = "6121b7d4aacd18f7b24da226e61dbae054e50a7c"; + sha256 = "16j3y4hffnv2rg97p49hqz3x1icp7qkpcjxhalny5l4gysx9mfqg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/86f7df6b8df3398ef476c0ed31722b03f16b2fec/recipes/mowedline"; @@ -46593,12 +46698,12 @@ mozc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mozc"; - version = "20160102.1506"; + version = "20180101.0"; src = fetchFromGitHub { owner = "google"; repo = "mozc"; - rev = "4767ce2f2b6a63f1f139daea6e98bc7a564d5e4e"; - sha256 = "1azx128zsr7mlg2k538483c3qi1zmm8cc4z8sk06534wnx7wxs88"; + rev = "6b878e31fb6ac4347dc9dfd8ccc1080fe718479f"; + sha256 = "03gcda62xl6hfibw3y15lf6b04998kj1v95gyzs3q0bqxav74ahw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30fef77e1d7194ee3c3c1d4775c349a4a9f6af2c/recipes/mozc"; @@ -47830,12 +47935,12 @@ neato-graph-bar = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "neato-graph-bar"; - version = "20170731.2341"; + version = "20171230.1753"; src = fetchFromGitLab { owner = "RobertCochran"; repo = "neato-graph-bar"; - rev = "3ebd5168c9b8cc56cc4163206c03864b9b802f27"; - sha256 = "133k1lwmb7ky91ij03nd4vipkivvx4bz56m4waf1pdmaynsidy6j"; + rev = "c59f15ed9a40aecc174aa22c4bbfa7978e182705"; + sha256 = "0bdgsxdlwpkd3hjnw1jmj30slakzmj2pinj3pyr5qqba9apxnvri"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/49c5bd4e1506a28ada9856e5f70e520890123d16/recipes/neato-graph-bar"; @@ -48603,11 +48708,11 @@ }) {}; notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "notmuch"; - version = "20171208.1819"; + version = "20171231.526"; src = fetchgit { url = "git://git.notmuchmail.org/git/notmuch"; - rev = "9ced40228b2524bd09dc8e0063f1ce3db450caea"; - sha256 = "0ravkhrfzdbc5lcwd0lyq0vzjjhkxvx43f20r25y1380ysy95zss"; + rev = "c8fc3d1428d86a653a23a5f8c32ea8ac52c8f160"; + sha256 = "10prhf2xnz76f8xvyys7yg2rs7ci69bq33cy61y2pvii13hd9lcl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch"; @@ -49150,6 +49255,27 @@ license = lib.licenses.free; }; }) {}; + ob-clojure-literate = callPackage ({ cider, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: + melpaBuild { + pname = "ob-clojure-literate"; + version = "20180101.427"; + src = fetchFromGitHub { + owner = "stardiviner"; + repo = "ob-clojure-literate"; + rev = "e3c05e0926558f2bf614ca8611940644b798835f"; + sha256 = "08l5lw1gk0lgbq2mkz11iw2ni79wcc6crks53rqvx8dfvhbd7wy6"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e958745861c9673248955443bcc2c76d504b32f7/recipes/ob-clojure-literate"; + sha256 = "0jprgnslkc9m404n32rr510is823yr9kziqcw70z828fy7wl2glk"; + name = "ob-clojure-literate"; + }; + packageRequires = [ cider dash emacs org ]; + meta = { + homepage = "https://melpa.org/#/ob-clojure-literate"; + license = lib.licenses.free; + }; + }) {}; ob-coffee = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ob-coffee"; @@ -49178,8 +49304,8 @@ src = fetchFromGitHub { owner = "brantou"; repo = "ob-coffeescript"; - rev = "b70f3d822c707cb02333fcb739ba4874614cad2a"; - sha256 = "0284v3km41427q7dr0wmvf3zhbsgzj0j2r9zny0g3n85qvyk0rgd"; + rev = "d68a8335d29c947f388b4fa556de4f3ee75a19c6"; + sha256 = "0hjyvvq089c0m9hqjlk3fb07z24vha7fmvfy8w9203jxqkazm1di"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ba1a808c77653bac1948d6c44bd1db09301ffeff/recipes/ob-coffeescript"; @@ -49388,8 +49514,8 @@ src = fetchFromGitHub { owner = "brantou"; repo = "ob-hy"; - rev = "a3512f274709dc4ab6c18d7955d361f8715505f0"; - sha256 = "1i796041svy7njjl3aqaxzjydmm24q688vpxvqd0pj5hyajqdgqw"; + rev = "cad6a1aaa463e8d72d37b12744be1c5732bb8cc4"; + sha256 = "0cm238139vf356vayv3xzx5gw2hlklzgrbpzk3ixnfh4gkgnmdj0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/12a7a7dba169010a3a047f961010236a203c16c2/recipes/ob-hy"; @@ -50842,12 +50968,12 @@ org-brain = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-brain"; - version = "20171223.19"; + version = "20180101.821"; src = fetchFromGitHub { owner = "Kungsgeten"; repo = "org-brain"; - rev = "93c3517d0c659b30cfc3371def9e8c4fc7daf73c"; - sha256 = "1q2571y444mvx78v4a0z5n007aw8pv4qzm284pr6fjm4n7j9qpcx"; + rev = "8625974c444f2dddbdd1eeeb9e4063aa8977503b"; + sha256 = "040hxhq82cgfdmdk1sisklx9m5m6bpwp8w1l1fwb9rxnyzcsji4y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/47480fbae06e4110d50bc89db7df05fa80afc7d3/recipes/org-brain"; @@ -51699,6 +51825,27 @@ license = lib.licenses.free; }; }) {}; + org-noter = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: + melpaBuild { + pname = "org-noter"; + version = "20171229.1823"; + src = fetchFromGitHub { + owner = "weirdNox"; + repo = "org-noter"; + rev = "ad3ecfc75bba19625dab07f4ff0483f043ddaf70"; + sha256 = "09y9pamb7zld41qlvfpp5szl0lyblrjd2211qzbs8zm4mk3hlzy3"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4a2bc0d95dc2744277d6acbba1f7483b4c14d75c/recipes/org-noter"; + sha256 = "0vsc2b1yz9lw0zv1vnm722pl35kxpwhcdi7h6mijhnw8vv7rhixf"; + name = "org-noter"; + }; + packageRequires = [ cl-lib emacs org ]; + meta = { + homepage = "https://melpa.org/#/org-noter"; + license = lib.licenses.free; + }; + }) {}; org-octopress = callPackage ({ ctable, fetchFromGitHub, fetchurl, lib, melpaBuild, org, orglue }: melpaBuild { pname = "org-octopress"; @@ -52206,6 +52353,27 @@ license = lib.licenses.free; }; }) {}; + org-send-ebook = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: + melpaBuild { + pname = "org-send-ebook"; + version = "20171231.2313"; + src = fetchFromGitHub { + owner = "stardiviner"; + repo = "org-send-ebook"; + rev = "a22d565413b82c415c4f12daab5bfcc489053ec5"; + sha256 = "19qf3a8vagbfbdj2cd7wklran4z6w9ddlimy0r15pxs23abicwjl"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/646106cf43649544056285aef8c4035b6e5bbbdb/recipes/org-send-ebook"; + sha256 = "0gvnrl4rfqn3zd0wmj4bhd63zkjk68lwwcgmsqrfw7af22wlfv3d"; + name = "org-send-ebook"; + }; + packageRequires = [ cl-lib emacs seq ]; + meta = { + homepage = "https://melpa.org/#/org-send-ebook"; + license = lib.licenses.free; + }; + }) {}; org-static-blog = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-static-blog"; @@ -52950,22 +53118,22 @@ license = lib.licenses.free; }; }) {}; - origami = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + origami = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "origami"; - version = "20170129.805"; + version = "20180101.753"; src = fetchFromGitHub { owner = "gregsexton"; repo = "origami.el"; - rev = "5630536d04613476e13b413fe05fd0bbff4107ca"; - sha256 = "1w6cyyvjw6x4x0a7mbybw37f70cdnwajv8snvmnrqd73vggm70fd"; + rev = "1f38085c8f9af7842765ed63f7d6dfe4dab59366"; + sha256 = "0ha1qsz2p36pqa0sa2sp83lspbgx5lr7930qxnwd585liajzdd9x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b816be227dfc7330292a50346c4bb37394d3e998/recipes/origami"; sha256 = "0rkb55zcvsgxzp190vrnbzdfbcjd8zi6vhbhwpqxi0qmyq6a08pr"; name = "origami"; }; - packageRequires = [ dash emacs s ]; + packageRequires = [ cl-lib dash emacs s ]; meta = { homepage = "https://melpa.org/#/origami"; license = lib.licenses.free; @@ -54551,8 +54719,8 @@ src = fetchFromGitHub { owner = "cute-jumper"; repo = "parsec.el"; - rev = "212f848d95c2614a86f135c1bf3de15ef0e09805"; - sha256 = "11qr9i55530pzmiwilfazaqxcjw8sx1iry19jvzdqsffjqvx2mnl"; + rev = "72c1897a42b3b0b59505b3562e8f46c6354faec1"; + sha256 = "0yg35fs9gr07j6x7xi4f3v11xdanmkhr5sr9lqim0m10aglv7vwf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/248aaf5ff9c98cd3e439d0a26611cdefe6b6c32a/recipes/parsec"; @@ -57470,12 +57638,12 @@ prassee-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "prassee-theme"; - version = "20171222.2326"; + version = "20171231.1852"; src = fetchFromGitHub { owner = "prassee"; repo = "prassee-emacs-theme"; - rev = "c798d59817ef7a9fe1d9d01cb5d9908b84f1a626"; - sha256 = "0ci54w8clv3igbnhw8q27js3c4yyshvj165nbacrknr5qcczxbbl"; + rev = "293926b947bc5f479880addce87eb114aaa977f6"; + sha256 = "0qnxhql3dv99yjxhzcqg71h0wrxjr3n1qmibmbzk74c68rzp3nrn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/15425b576045af1c508912e2091daf475b80b429/recipes/prassee-theme"; @@ -57931,12 +58099,12 @@ projectile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: melpaBuild { pname = "projectile"; - version = "20171126.6"; + version = "20171229.1155"; src = fetchFromGitHub { owner = "bbatsov"; repo = "projectile"; - rev = "184d3451c9258cfbbfa2b26a07c7daeee2e9a605"; - sha256 = "0a3h980xyqx7wx90gnfzqjs5zhakq8cygvxgc7iy0v54d6qp5v5s"; + rev = "5b3ac9b7eb7c1c70fbd05db11bdd67c5b2f0a4b0"; + sha256 = "1c7djn90yjm34yg6s3ibvx424fnfb9f6fzw7ppkcf2qq0jqh3z51"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/projectile"; @@ -58376,8 +58544,8 @@ src = fetchFromGitHub { owner = "google"; repo = "protobuf"; - rev = "099d99759101c295244c24d8954ec85b8ac65ce3"; - sha256 = "0mi7ym70ff0i9qrspqzavdsywvqv2sax26n74ingkny4lzq8ay4h"; + rev = "8529f2aee33ae793c9ce362a45370b98f675370a"; + sha256 = "0nsygvv5vd7apfirjilsp59gm2kxr82xl038l3zw6h40rr69kq3f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; @@ -58414,12 +58582,12 @@ psc-ide = callPackage ({ cl-lib ? null, company, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, s, seq }: melpaBuild { pname = "psc-ide"; - version = "20171122.347"; + version = "20180101.1421"; src = fetchFromGitHub { owner = "epost"; repo = "psc-ide-emacs"; - rev = "633b07b238aff51dc4b95a75c67910a18ba28da1"; - sha256 = "0myvb9dqxm5g1zf7hgx6frgkr5h5839sdnrv25xf2h1w8jmyc0cn"; + rev = "085e9d5541ccf35e876a6135daaddaa0a58f3bb2"; + sha256 = "0q7xqrjvllngz658w32zm9jbz1njqwpaqgiv3b377nfnay9rsh3p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/384ffc463cc6edb4806f8da68bd251e662718e65/recipes/psc-ide"; @@ -59115,12 +59283,12 @@ pyim = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pyim-basedict }: melpaBuild { pname = "pyim"; - version = "20171212.2309"; + version = "20180101.2256"; src = fetchFromGitHub { owner = "tumashu"; repo = "pyim"; - rev = "3b1c5fbdf3b910f96771935785e28cf33d8d54cc"; - sha256 = "1ijfsnjvyys941kgcq00d5dgnkbzj14gb7c9pks0x11bsdl0vr6p"; + rev = "1868d2dbcd73b072bf63a7dfe7c034068c9c4ebf"; + sha256 = "16avf1h40rhai3lyn1klhdpksxqp7xliblalcvmdp5mh2v2g19w7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/pyim"; @@ -59245,8 +59413,8 @@ src = fetchFromGitHub { owner = "PyCQA"; repo = "pylint"; - rev = "00f77bff3743d92c01aa1335b22297e06f788575"; - sha256 = "1bpsnxfymalkxnzlys0hy3x70m95vd9frafx587mqbxaj2p88sji"; + rev = "2d461678e2c1c02985c4042bbc15ac6f3611c61d"; + sha256 = "1gmx6xlj6rzil7x42pcqrgslzsaf4h59b10d9cpqc9nsfyfy42ac"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint"; @@ -60501,12 +60669,12 @@ realgud = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, load-relative, loc-changes, melpaBuild, test-simple }: melpaBuild { pname = "realgud"; - version = "20171218.1850"; + version = "20171228.919"; src = fetchFromGitHub { owner = "rocky"; repo = "emacs-dbgr"; - rev = "3ccd602ec02b9c82e3a6f60fda2116ea1b18aeb0"; - sha256 = "10cik0b2dlsbp1n5kf4g1737m48h5f4gs5n16wcdxb1ra4s66cxq"; + rev = "c593d0cb226e1517d47670efc68325b12fe20057"; + sha256 = "03hqngshin19108p4k4zz1f240rmar2h5f7slb85mx69nip1svnd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud"; @@ -60822,12 +60990,12 @@ redprl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "redprl"; - version = "20171204.757"; + version = "20180101.2200"; src = fetchFromGitHub { owner = "RedPRL"; repo = "sml-redprl"; - rev = "c6f7ba8655f4bbf6332900483a194eaf18bb5fa8"; - sha256 = "1s2pa53cgv33ady43wglh969kl43p1v5fkwg5ijmsx7miilwmr99"; + rev = "3df6aa8888c282112c7df9508ff94cfded2bbff9"; + sha256 = "0fyps4h2ckcgyz0mx633nlkcl7nzgbsyaq0jd6ci58hgapqmkfnw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl"; @@ -62501,12 +62669,12 @@ ryo-modal = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ryo-modal"; - version = "20170217.1021"; + version = "20180102.547"; src = fetchFromGitHub { owner = "Kungsgeten"; repo = "ryo-modal"; - rev = "f6073b56c43a8bc4fc01eb27faba3335d556606a"; - sha256 = "1pq8c79qrs2zwp8q89rhm5lmcpl48axnc9mwl10gq4jy2rlzfrks"; + rev = "fee33898b5726b3c15b6ceb2ebb051bebd4f3592"; + sha256 = "1rpn309s7a7rgs2n9l4m409x2r5p83xkgaq1aa2dab4p594hy29g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ryo-modal"; @@ -62883,8 +63051,8 @@ src = fetchFromGitHub { owner = "openscad"; repo = "openscad"; - rev = "ec4cdec902b29d52289b1120cd8f3aa9301c95eb"; - sha256 = "0y80wrrn3a9n96fwcr1k8v2v13xa42lhn0c23ay1s8qvm7884kca"; + rev = "47402a706468da612ad752dc59917d0d00d6218c"; + sha256 = "0j7i3zcnz4j8h611bwq8nxw59k99p8l7k4qzzlii2k2xnplqq6iv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode"; @@ -64473,12 +64641,12 @@ shx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shx"; - version = "20171108.910"; + version = "20171230.1219"; src = fetchFromGitHub { owner = "riscy"; repo = "shx-for-emacs"; - rev = "aa2fda2419b6e2540f1e6eb3789b6a247c319050"; - sha256 = "1imnpbc1wkx8gwac1v3ailycjxs4yxwhbhifgn20jib85nn8s66i"; + rev = "33383bd359d795df2d7ef725b5349c953f5a6aa8"; + sha256 = "1arwsb6as8jpah0bs3b92a3kdnbfkhnsm1jglspfh4lqpafmx5vf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a2ff78ae3c4289ebf9e06cdfd8f8082c395a16f/recipes/shx"; @@ -64725,12 +64893,12 @@ simple-paren = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "simple-paren"; - version = "20171222.1158"; + version = "20171229.1018"; src = fetchFromGitHub { owner = "andreas-roehler"; repo = "simple-paren"; - rev = "ae1e14fd78840011f73347a857c1a20e4e39d546"; - sha256 = "10hwqkvz97amh4v0aw497ajhnbxybgg0gfb5v11l41i85dspc7wi"; + rev = "40b3ef7e3e8aae8b0148b621895a692f47924526"; + sha256 = "035lcbi901124fcvpg4f9yg74ff80ycidh6drvyskb7w94lhhsc2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e8886feb4a034fddd40d7381508b09db79f608f/recipes/simple-paren"; @@ -65061,12 +65229,12 @@ slime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, macrostep, melpaBuild }: melpaBuild { pname = "slime"; - version = "20171225.337"; + version = "20171230.1630"; src = fetchFromGitHub { owner = "slime"; repo = "slime"; - rev = "f26744d2ad7b5257e13eba46b69512a556d224ac"; - sha256 = "0rvh8qc5fda37h0virw49nbkqd5jbgrs4ifri3ny0cylczk0gfdd"; + rev = "179741a0616f78f4e5901fe04dea79654c504fba"; + sha256 = "0vljhr6gkmw5jkdzhq6vsl9sa48hv1a02d9g4sfwqraz85k4x85k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14c60acbfde13d5e9256cea83d4d0d33e037d4b9/recipes/slime"; @@ -65837,12 +66005,12 @@ smbc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smbc"; - version = "20160706.1522"; + version = "20171229.1008"; src = fetchFromGitHub { owner = "sakshamsharma"; repo = "emacs-smbc"; - rev = "c377b806118d82140197d9cb1095548477e00497"; - sha256 = "16cj6jsy1psmcjshxb46i44sf1zb9s4mfiagl5cr22njy01ajq1h"; + rev = "10538e3d575ba6ef3c94d555af2744b42dfd36c7"; + sha256 = "0b2fndvp9kzlr65b0gr0z5hmapa4y96a6zvc2nrlijffkgyk05nn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05b4f16cd8028edc758ada842432df11c8276fd3/recipes/smbc"; @@ -66320,12 +66488,12 @@ solarized-theme = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "solarized-theme"; - version = "20171215.2313"; + version = "20180101.42"; src = fetchFromGitHub { owner = "bbatsov"; repo = "solarized-emacs"; - rev = "e77ddc10b43a5155e6c72608539df7c68802371d"; - sha256 = "1xg9my5galzbkylsn9mmq5ii45s8dph45ilcakkmkdiwlhsvv1c5"; + rev = "2dd2699b2f315374333292b132dc0dc03719aba2"; + sha256 = "04365kpw8a3f3963v6c3q8zka5xivx9jikvcar7fx59l4l7k5i2p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/solarized-theme"; @@ -66341,12 +66509,12 @@ solidity-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "solidity-mode"; - version = "20171227.735"; + version = "20171231.741"; src = fetchFromGitHub { owner = "ethereum"; repo = "emacs-solidity"; - rev = "07714e315920e3fbe564845559d0b5b2d56a9edc"; - sha256 = "1cxpqnjrmwiv5g8g7gspm1111m0ggjh2ps76hlrhv6jvck9mrfs7"; + rev = "b5d95ef678305ca70b17e94fc2ee4289a8328048"; + sha256 = "04l3hvfpgqiaxdxh8s2cg2rx4cy50i7a411q81g8661fx60c6h6p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb9df5ec0692352b6494d435d11166f4ea26c99e/recipes/solidity-mode"; @@ -66558,12 +66726,12 @@ sourcekit = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "sourcekit"; - version = "20170126.353"; + version = "20180101.34"; src = fetchFromGitHub { owner = "nathankot"; repo = "company-sourcekit"; - rev = "8ba62ac25bf533b7f148f333bcb5c1db799f749b"; - sha256 = "01dh0wdaydiai4v13r8g05rpiwqr5qqi34wif8vbk2mrr25wc7i9"; + rev = "abf9bc5a0102eb666d3aa6d6bf22f6efcc852781"; + sha256 = "1g8a4fgy2c5nqk8gysbnzn5jvfw6ynmfhc6j3hkrbswgf9188v5n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/45969cd5cd936ea61fbef4722843b0b0092d7b72/recipes/sourcekit"; @@ -66851,12 +67019,12 @@ speed-type = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "speed-type"; - version = "20171217.624"; + version = "20171230.847"; src = fetchFromGitHub { owner = "parkouss"; repo = "speed-type"; - rev = "6a1784c80a6b62d6bf76eb0ff0058e36ade70e1e"; - sha256 = "1z1x3n9cxchbylima4w7is8j98ny58c8y68ygyp55c3s4h0qm892"; + rev = "7a67fcd7bf825eee890097bd4a1b3c4f531a1135"; + sha256 = "0nlmqgf4rg5qmkhpsal7j18wr5h74971k6d0wzw7rmjmpnjqhzvc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d6c33b5bd15875baea0fd2f24ee8ec9414a6f7aa/recipes/speed-type"; @@ -66977,12 +67145,12 @@ spiral = callPackage ({ a, clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, treepy }: melpaBuild { pname = "spiral"; - version = "20171227.744"; + version = "20180101.614"; src = fetchFromGitHub { owner = "unrepl"; repo = "spiral"; - rev = "5c24e7fbeec7467e85fd5cd6796520c73af6ba0d"; - sha256 = "10n4i137al5812fvmdwjkn1pfrgxqm0g8yif0aiw53fr2nc50wxb"; + rev = "bd9ec34ab1f3e5a442614d9ad61970e1280b8825"; + sha256 = "193dr2a7lv5yrgs8as5785azbpivspbv97fvd29qg2k02a74cr65"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/77609e10c836a26de43ddb304ecfa275e314da21/recipes/spiral"; @@ -68109,12 +68277,12 @@ suggest = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }: melpaBuild { pname = "suggest"; - version = "20171016.1420"; + version = "20171229.1712"; src = fetchFromGitHub { owner = "Wilfred"; repo = "suggest.el"; - rev = "345e00569333095eb24e61239a80b0f0c77b2d11"; - sha256 = "0npqvhnfmrx7jq1slz489rh2l4rnfhqhbi6ybdzw5rism8r3jqwb"; + rev = "5caf98ab49c6b3c421d8f274c0682bbb7fc662fe"; + sha256 = "1niifkdirlwcyx5rk398dgk9lqnqr06ilhh0r89hx1xxdnbjglbi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest"; @@ -68424,12 +68592,12 @@ swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "swift-mode"; - version = "20171222.2242"; + version = "20171228.2315"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "swift-mode"; - rev = "359efc05cceecac363f4b0d34d0c06de803cf3ee"; - sha256 = "17n32xr5agig062d3vxp0h4k09lmgijn5an8kcbsar6gyki8zij0"; + rev = "8c45f69a078c41619a7a3db6d54a732c3fad8e3f"; + sha256 = "1isy71vkws3ywm4iwa85dk12810az3h85n6bimd36dfqbhfwdrli"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode"; @@ -68470,8 +68638,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "864fbfeb0328d13e7d4641fcba9d001326229d37"; - sha256 = "045fqwgc02fh5mb09b0kzjwadr7b9vvsksicklffsx31fwbav4d6"; + rev = "c2bc6ac92a6cea730d7887813a816bdf873f9b92"; + sha256 = "040z731dm66w4c0475q8vl1lm4dnvi9yz2qslxdma0qdx70hymrr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper"; @@ -68885,12 +69053,12 @@ systemd = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "systemd"; - version = "20171006.1352"; + version = "20180101.1803"; src = fetchFromGitHub { owner = "holomorph"; repo = "systemd-mode"; - rev = "22f024fe8f433af7b6a6b99520cea1e766894fe5"; - sha256 = "11h1nr9gz0mw2gwlplv00i06s9ziw77a7zfcrrzd01rmanz1m4fa"; + rev = "228f0b99ca3e1f3139ae8cacd15f9698d5b6da90"; + sha256 = "0cdqpzkx01qm0pk66hs6yhzv5iccrzzgfv3bh5c8i91v55d66bff"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca810e512c357d1d0130aeeb9b46b38c595e3351/recipes/systemd"; @@ -69847,6 +70015,27 @@ license = lib.licenses.free; }; }) {}; + texfrag = callPackage ({ auctex, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "texfrag"; + version = "20171229.1913"; + src = fetchFromGitHub { + owner = "TobiasZawada"; + repo = "texfrag"; + rev = "ba1382c073b1f73cb411fb30e618480b9a804916"; + sha256 = "19cinynqicsfdvpa8jmrrx9xmbplw2wnykm3bcii8rs5vkwdh61b"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/756649bbe2dc6233c66c3d128a8096be12231078/recipes/texfrag"; + sha256 = "195vdpwqzypz35v8hc7ai9xpv1flrik60lgrk5m7xypnlp7mpr2x"; + name = "texfrag"; + }; + packageRequires = [ auctex emacs ]; + meta = { + homepage = "https://melpa.org/#/texfrag"; + license = lib.licenses.free; + }; + }) {}; textile-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "textile-mode"; @@ -70999,12 +71188,12 @@ transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "transmission"; - version = "20171209.905"; + version = "20180101.1803"; src = fetchFromGitHub { owner = "holomorph"; repo = "transmission"; - rev = "7ba791404541c5cf7b063bbfe390ee7384dd2bdd"; - sha256 = "0nibvw1d5ykdgm7im6nil0hclribss7lk3ynn9whqcjbk790xg2f"; + rev = "b52760e0160f99312a1773953e7725800c13bb40"; + sha256 = "195z30yaj0qibkaci7imfhp4sr7zxhmlg4fq4bjzvawlmxi1i56p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission"; @@ -71585,12 +71774,12 @@ twittering-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "twittering-mode"; - version = "20170312.735"; + version = "20171231.24"; src = fetchFromGitHub { owner = "hayamiz"; repo = "twittering-mode"; - rev = "63c96fb029033b1a300b90aa922e167c7c405bcb"; - sha256 = "0kax42y0f1pa1pgybz3f57ig9g8fvmgcw8j7zl9nsw70dar4amqk"; + rev = "bc0dfd600a19860f79eec1b0f8ab18c8094f79ee"; + sha256 = "0apwkiqiq53b3skpy643bb9cxi4n0gkxvi8j7a4sdxix48lwmwkp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/twittering-mode"; @@ -71627,12 +71816,12 @@ typescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "typescript-mode"; - version = "20171213.541"; + version = "20171229.810"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "typescript.el"; - rev = "861d5983b6894a101b6417ef3f4bd2999ea17ea1"; - sha256 = "1bld49njpbd8r86d886yc96i91z722553r1d9zy94iz76yw98fnw"; + rev = "330c887241cf585aa4e2e3f3e9d851f28b92b08e"; + sha256 = "05bsr5drz8d5p0fx4ai2cfgmgzyi3245gpbr61iyv37an3zkcrav"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d3f534a1e2cee4ad2e32e32802c5080207417b3d/recipes/typescript-mode"; @@ -71690,12 +71879,12 @@ typit = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, mmt }: melpaBuild { pname = "typit"; - version = "20170519.51"; + version = "20171231.2214"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "typit"; - rev = "bf6e72d76c0f3a68d7cd53c6580e92aa15d28dc5"; - sha256 = "0qf2599x60nipmr78cmlnswid0lj552b0fjcw2lbyg7mnhxlnkmj"; + rev = "41309d8a64a992f532753093742c15d413c446b5"; + sha256 = "1fqaf4n236l4qzy4ac370laysb9jnj98769nri6qkirsfzk6hcgd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d17d019155e19c156f123dcd702f18cfba488701/recipes/typit"; @@ -72292,8 +72481,8 @@ src = fetchFromGitHub { owner = "grettke"; repo = "universal-emotions-emoticons"; - rev = "9f249b39172bf9b8e148856ad941eee485161215"; - sha256 = "1qn757pn1hcfik05i458bic32dm812xznsfz5vgxn2v8wxihjlf8"; + rev = "c89063a4f8e00f8e9c4dc6c252474b6d4bfc4e01"; + sha256 = "0wgff3bbjgskbm1c4cww6akia93hd5sqr9md5szkqm6iiqi3q95z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57f913112c98db2248cf69e44deb69fd09cee042/recipes/universal-emotions-emoticons"; @@ -73128,12 +73317,12 @@ vimish-fold = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vimish-fold"; - version = "20170730.2206"; + version = "20171231.2212"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "vimish-fold"; - rev = "5e2875c18e2d8ef27f594e0ea1ca15a2f759be42"; - sha256 = "1a24diw5xwk10d9y8dr1bgpc78d36f3swvlll0igl5b91q4x86dn"; + rev = "1469c953bc20d21d87ce5d92def767e551cda07c"; + sha256 = "0nywz6nk1qanx7z9sykf28h9c2qj7xzs9w4hya4vmhwigqqbhldl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4862b0a3d43f073e645803cbbf11d973a4b51d5/recipes/vimish-fold"; @@ -75478,12 +75667,12 @@ xah-fly-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-fly-keys"; - version = "20171223.1832"; + version = "20171229.1015"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-fly-keys"; - rev = "f4df23c658815b8988b7a2ceefc21bb2ce428963"; - sha256 = "1shrykhrifl32rm1ns484n2iljdjcmp5isd6wjhb2k20hwmym85d"; + rev = "2c7abcf737112ee8c6da4182be3c1c9b54eeb189"; + sha256 = "1lvfc5smckcb5j4hrdv21983cyzhwys3smjkaxnf2xmys2bwi1fy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-fly-keys"; @@ -76423,12 +76612,12 @@ yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yasnippet"; - version = "20170923.1646"; + version = "20180101.1211"; src = fetchFromGitHub { owner = "joaotavora"; repo = "yasnippet"; - rev = "4ab9cb5bac683112852f58b26557a7dc283b717b"; - sha256 = "1sjvzdzzkifw6751gplvm964b85c04jcl1sbq6pjm75alsjv6mrp"; + rev = "ce11fd66900eb9f871af03dc945c85a8ac980821"; + sha256 = "103z5702dg4n0laivk17b0l49b4fq7njmvmxghmxsjr3l0n8mh26"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet"; @@ -76485,11 +76674,11 @@ }) {}; yatex = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yatex"; - version = "20171030.502"; + version = "20180102.635"; src = fetchhg { url = "https://www.yatex.org/hgrepos/yatex/"; - rev = "16763e5b7481"; - sha256 = "1mrcc9amz0kflm570bd2cprhin0z8lr668k2s56mj6shixb61dwh"; + rev = "feef2aa1f50f"; + sha256 = "0453y7a9lq28bmbrrcbsnsrwnhjphq4s4vcr9ncb5252m6fnwdyl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e28710244a1bef8f56156fe1c271520896a9c694/recipes/yatex"; @@ -76850,12 +77039,12 @@ zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild }: melpaBuild { pname = "zerodark-theme"; - version = "20171128.610"; + version = "20171228.1139"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "zerodark-theme"; - rev = "8f348962ea876980f09e01a945026e8e3e629add"; - sha256 = "1czdf34iwj4znvyjn3rphrq04jvvyrc38djrq0c2k9vmb9rwhxwa"; + rev = "bbad75027d56e49ee13eb2c93ccc26100d48650e"; + sha256 = "0ci7wzkg9dy95s2svmsfdvlh29wdc321yxhnab5ka27h8v75jwy8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d00b78ead693e844e35c760fe2c39b8ed6cb0d81/recipes/zerodark-theme"; @@ -77290,12 +77479,12 @@ zzz-to-char = callPackage ({ avy, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zzz-to-char"; - version = "20170519.335"; + version = "20171231.2219"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "zzz-to-char"; - rev = "96dfe16a990474267cd290498cf9ac6dd6b3e7c0"; - sha256 = "1jvysrq9ya77x2xg0wqy1q27y0r43578d10bdhihpj2281nxng1y"; + rev = "8ddda49de3356d8fa0308d79b5d68272baf2c57b"; + sha256 = "17d8mmmgj2w4nm2nfg12g35i7zbp4bp47ix5ifqqm1zvwmbmzrqx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7063cbc1f1501ce81552d7ef1d42d1309f547c42/recipes/zzz-to-char"; From db475df127f8c82853181c46501c142ff020c3d8 Mon Sep 17 00:00:00 2001 From: Bojan Nikolic Date: Tue, 2 Jan 2018 22:37:12 +0000 Subject: [PATCH 107/296] mingw-w64-pthreads: The C compiler is needed It was a copy and paste error from the headers derivation. Also test in release-cross. --- pkgs/os-specific/windows/mingw-w64/pthreads.nix | 4 ++-- pkgs/top-level/release-cross.nix | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/windows/mingw-w64/pthreads.nix b/pkgs/os-specific/windows/mingw-w64/pthreads.nix index c585ab54ff8..1a33e8db07e 100644 --- a/pkgs/os-specific/windows/mingw-w64/pthreads.nix +++ b/pkgs/os-specific/windows/mingw-w64/pthreads.nix @@ -1,9 +1,9 @@ -{ stdenvNoCC, callPackage }: +{ stdenv, callPackage }: let inherit (callPackage ./common.nix {}) name src; -in stdenvNoCC.mkDerivation { +in stdenv.mkDerivation { name = name + "-pthreads"; inherit src; diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index b00d74b5e14..ce6fba9c40f 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -41,6 +41,7 @@ let libtool = nativePlatforms; libunistring = nativePlatforms; windows.wxMSW = nativePlatforms; + windows.mingw_w64_pthreads = nativePlatforms; }; darwinCommon = { From b7ed446cd19f24a62917658bce95fdcf69f5ca63 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 2 Jan 2018 10:25:45 -0600 Subject: [PATCH 108/296] fac: 1.0.1 Fixes #33321. --- pkgs/development/tools/fac/default.nix | 30 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/tools/fac/default.nix diff --git a/pkgs/development/tools/fac/default.nix b/pkgs/development/tools/fac/default.nix new file mode 100644 index 00000000000..22b5ff4f086 --- /dev/null +++ b/pkgs/development/tools/fac/default.nix @@ -0,0 +1,30 @@ +{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, git }: + +buildGoPackage rec { + name = "fac-${version}"; + version = "1.0.1"; + + goPackagePath = "github.com/mkchoi212/fac"; + + src = fetchFromGitHub { + owner = "mkchoi212"; + repo = "fac"; + rev = "v${version}"; + sha256 = "1j5kip3l3p9qlly03pih905sdz3ncvpj7135jpnfhckbk1s5x9dc"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + wrapProgram $bin/bin/fac \ + --prefix PATH : ${git}/bin + ''; + + meta = with stdenv.lib; { + description = "CUI for fixing git conflicts"; + inherit (src.meta) homepage; + license = licenses.mit; + maintainers = with maintainers; [ dtzWill ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bbaef3658d6..683af8c93b0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1087,6 +1087,8 @@ with pkgs; f3 = callPackage ../tools/filesystems/f3 { }; + fac = callPackage ../development/tools/fac { }; + facedetect = callPackage ../tools/graphics/facedetect { }; facter = callPackage ../tools/system/facter { }; From 1eb53a38305510adbadb460c471c91bbe11b8f07 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 2 Jan 2018 19:30:58 -0500 Subject: [PATCH 109/296] linux: 4.4.108 -> 4.4.109 --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index e27c3dd4b42..ec3f81b815c 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.4.108"; + version = "4.4.109"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "06m5bcvz1s6c28j5629mxzhmka5f6gh46jqyxyqggsawcac1202s"; + sha256 = "1i73xn85p6c62rafipmf9ja9ya149aaz6lbgnhl989fyyyh2bjd2"; }; } // (args.argsOverride or {})) From 56f91dcb7b57449e171a05836b714c88e1e56f4b Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 2 Jan 2018 19:31:14 -0500 Subject: [PATCH 110/296] linux: 4.9.73 -> 4.9.74 --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 68d2fb47aff..1c7cc7b2f15 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.9.73"; + version = "4.9.74"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0avfq79fn8rfjbn24wfr9pz438qvwm8vdm3si4fl4v3d7z2nb2sm"; + sha256 = "1ivhzmsa8n5ns8igryzb9dyaakq2p51j23f6j9kpqyby7842i1y8"; }; } // (args.argsOverride or {})) From 00b038a3f829b8952a90706e5433abdf146cc02f Mon Sep 17 00:00:00 2001 From: Bojan Nikolic Date: Tue, 2 Jan 2018 22:59:03 +0000 Subject: [PATCH 111/296] boost: Do not force numpy support from 1.65 The reason is that if cross compiling (or for other reasons) python bindings as a whole are turned off. Those two lines then trigger assertion errors unless manually overridden for cross compilation. This way: 1. The `enableNumpy` default respects the `enablePython deafult. 2. Cross works by default 3. Absurd manual overrides still break as they should 4. The `>= 1.65` logic is direct and not a maintaince gotcha. --- pkgs/development/libraries/boost/1.65.nix | 2 -- pkgs/development/libraries/boost/1.66.nix | 2 -- pkgs/development/libraries/boost/generic.nix | 2 +- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/development/libraries/boost/1.65.nix b/pkgs/development/libraries/boost/1.65.nix index 427ef072ffe..9837e1c6919 100644 --- a/pkgs/development/libraries/boost/1.65.nix +++ b/pkgs/development/libraries/boost/1.65.nix @@ -9,6 +9,4 @@ callPackage ./generic.nix (args // rec { sha256 = "9807a5d16566c57fd74fb522764e0b134a8bbe6b6e8967b83afefd30dcd3be81"; }; - enableNumpy = args.enableNumpy or true; - }) diff --git a/pkgs/development/libraries/boost/1.66.nix b/pkgs/development/libraries/boost/1.66.nix index a89ae84db38..3fd9c160824 100644 --- a/pkgs/development/libraries/boost/1.66.nix +++ b/pkgs/development/libraries/boost/1.66.nix @@ -9,6 +9,4 @@ callPackage ./generic.nix (args // rec { sha256 = "5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9"; }; - enableNumpy = args.enableNumpy or true; - }) diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index adb7ca665cc..6ea7dba0cb1 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -11,7 +11,7 @@ , enableShared ? !(hostPlatform.libc == "msvcrt") # problems for now , enableStatic ? !enableShared , enablePython ? hostPlatform == buildPlatform -, enableNumpy ? false +, enableNumpy ? enablePython && stdenv.lib.versionAtLeast version "1.65" , taggedLayout ? ((enableRelease && enableDebug) || (enableSingleThreaded && enableMultiThreaded) || (enableShared && enableStatic)) , patches ? [] , mpi ? null From 1e129a3f9934ae62b77475909f6812f2ac3ab51f Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 2 Jan 2018 19:31:31 -0500 Subject: [PATCH 112/296] linux: 4.14.10 -> 4.14.11 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 0fe68fb693b..4fc15a9219b 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; import ./generic.nix (args // rec { - version = "4.14.10"; + version = "4.14.11"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); @@ -13,6 +13,6 @@ import ./generic.nix (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "046i3vcnhavblid71hrqdid4aay0rrcpzbiwlkcvs0x09hvz3fl6"; + sha256 = "02kdp2k27gqqfxjv78wqlvqn1niin72masxs97mlw79za5m9as3p"; }; } // (args.argsOverride or {})) From b720e9c23a2e3593bda09772d5db1dd6beb82ee1 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 2 Jan 2018 19:38:01 -0500 Subject: [PATCH 113/296] linux-copperhead: 4.14.10.a -> 4.14.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 f7bedc311fc..f08f2cb17b9 100644 --- a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix +++ b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix @@ -3,9 +3,9 @@ with stdenv.lib; let - version = "4.14.10"; + version = "4.14.11"; revision = "a"; - sha256 = "1dz1kgg8jvw2xzbv1r867r1c29gpiyhgac7pwpaps609v563a154"; + sha256 = "05180jqxama1n0bi650sm9ing222gs2ks13cnpwamr415f01ws9c"; # modVersion needs to be x.y.z, will automatically add .0 if needed modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); From ef3a5865d12797fdc055c5d999d98f718d4d1611 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 2 Jan 2018 08:14:26 +0100 Subject: [PATCH 114/296] gmtk: init 1.0.9 --- pkgs/development/libraries/gmtk/default.nix | 32 +++++++++++++++++++ .../libraries/gmtk/fix-paths.patch | 20 ++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 54 insertions(+) create mode 100644 pkgs/development/libraries/gmtk/default.nix create mode 100644 pkgs/development/libraries/gmtk/fix-paths.patch diff --git a/pkgs/development/libraries/gmtk/default.nix b/pkgs/development/libraries/gmtk/default.nix new file mode 100644 index 00000000000..0fac97aaa43 --- /dev/null +++ b/pkgs/development/libraries/gmtk/default.nix @@ -0,0 +1,32 @@ +{stdenv, substituteAll, fetchFromGitHub, libtool, pkgconfig, intltool, glib, gtk3 +, libpulseaudio, mplayer, gnome_mplayer }: + +stdenv.mkDerivation rec { + name = "gmtk-${version}"; + version = "1.0.9"; + + src = fetchFromGitHub { + owner = "kdekorte"; + repo = "gmtk"; + rev = "v${version}"; + sha256 = "1zb5m1y1gckal3140gvx31572a6xpccwfmdwa1w5lx2wdq1pwk1i"; + }; + + nativeBuildInputs = [ libtool pkgconfig intltool ]; + buildInputs = [ glib gtk3 libpulseaudio ]; + + patches = [ + (substituteAll { + src = ./fix-paths.patch; + mplayer = "${mplayer}/bin/mplayer"; + }) + ]; + + meta = with stdenv.lib; { + description = "Common functions for gnome-mplayer and gecko-mediaplayer"; + homepage = https://sites.google.com/site/kdekorte2/gnomemplayer; + license = licenses.gpl2; + maintainers = gnome_mplayer.meta.maintainers; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/gmtk/fix-paths.patch b/pkgs/development/libraries/gmtk/fix-paths.patch new file mode 100644 index 00000000000..64738300aba --- /dev/null +++ b/pkgs/development/libraries/gmtk/fix-paths.patch @@ -0,0 +1,20 @@ +--- a/src/gmtk_media_player.c ++++ b/src/gmtk_media_player.c +@@ -2449,7 +2449,7 @@ + player->minimum_mplayer = detect_mplayer_features(player); + + if (player->mplayer_binary == NULL || !g_file_test(player->mplayer_binary, G_FILE_TEST_EXISTS)) { +- argv[argn++] = g_strdup_printf("mplayer"); ++ argv[argn++] = g_strdup_printf("@mplayer@"); + } else { + argv[argn++] = g_strdup_printf("%s", player->mplayer_binary); + } +@@ -4135,7 +4135,7 @@ + return ret; + + if (player->mplayer_binary == NULL || !g_file_test(player->mplayer_binary, G_FILE_TEST_EXISTS)) { +- av[ac++] = g_strdup_printf("mplayer"); ++ av[ac++] = g_strdup_printf("@mplayer@"); + } else { + av[ac++] = g_strdup_printf("%s", player->mplayer_binary); + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cdfa41ac698..6ec532be1dd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15237,6 +15237,8 @@ with pkgs; inherit (darwin) IOKit; }; + gmtk = callPackage ../development/libraries/gmtk { }; + gmu = callPackage ../applications/audio/gmu { }; gnome_mplayer = callPackage ../applications/video/gnome-mplayer { From 608daaa649bbd2c57e35dd144046052e7f9f78a2 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 2 Jan 2018 08:50:11 +0100 Subject: [PATCH 115/296] =?UTF-8?q?gnome=5Fmplayer:=201.0.4=20=E2=86=92=20?= =?UTF-8?q?1.0.9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../video/gnome-mplayer/default.nix | 33 ++++--- .../video/gnome-mplayer/fix-paths.patch | 87 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +- 3 files changed, 111 insertions(+), 13 deletions(-) create mode 100644 pkgs/applications/video/gnome-mplayer/fix-paths.patch diff --git a/pkgs/applications/video/gnome-mplayer/default.nix b/pkgs/applications/video/gnome-mplayer/default.nix index ba72e085bf7..9f98d46d53b 100644 --- a/pkgs/applications/video/gnome-mplayer/default.nix +++ b/pkgs/applications/video/gnome-mplayer/default.nix @@ -1,20 +1,33 @@ -{stdenv, fetchurl, pkgconfig, glib, gtk2, dbus, dbus_glib, GConf}: +{stdenv, substituteAll, fetchFromGitHub, pkgconfig, gettext, glib, gtk3, gmtk, dbus, dbus_glib +, libnotify, libpulseaudio, mplayer, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "gnome-mplayer-1.0.4"; + name = "gnome-mplayer-${version}"; + version = "1.0.9"; - src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/gnome-mplayer/${name}.tar.gz"; - sha256 = "1k5yplsvddcm7xza5h4nfb6vibzjcqsk8gzis890alizk07f5xp2"; + src = fetchFromGitHub { + owner = "kdekorte"; + repo = "gnome-mplayer"; + rev = "v${version}"; + sha256 = "0qvy9fllvg1mad6y1j79iaqa6khs0q2cb0z62yfg4srbr07fi8xr"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib gtk2 dbus dbus_glib GConf]; + nativeBuildInputs = [ pkgconfig gettext wrapGAppsHook ]; + buildInputs = [ glib gtk3 gmtk dbus dbus_glib libnotify libpulseaudio ]; - hardeningDisable = [ "format" ]; + patches = [ + (substituteAll { + src = ./fix-paths.patch; + mencoder = "${mplayer}/bin/mencoder"; + mplayer = "${mplayer}/bin/mplayer"; + }) + ]; - meta = { - homepage = http://kdekorte.googlepages.com/gnomemplayer; + meta = with stdenv.lib; { description = "Gnome MPlayer, a simple GUI for MPlayer"; + homepage = https://sites.google.com/site/kdekorte2/gnomemplayer; + license = licenses.gpl2; + maintainers = with maintainers; []; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/video/gnome-mplayer/fix-paths.patch b/pkgs/applications/video/gnome-mplayer/fix-paths.patch new file mode 100644 index 00000000000..ede4991c466 --- /dev/null +++ b/pkgs/applications/video/gnome-mplayer/fix-paths.patch @@ -0,0 +1,87 @@ +--- a/src/gui.c ++++ b/src/gui.c +@@ -7470,7 +7470,7 @@ + filename = g_strdup_printf("%s/00000001.jpg", dirname); + g_free(basepath); + // run mplayer and try to get the first frame and convert it to a jpeg +- av[ac++] = g_strdup_printf("mplayer"); ++ av[ac++] = g_strdup_printf("@mplayer@"); + av[ac++] = g_strdup_printf("-vo"); + av[ac++] = g_strdup_printf("jpeg:outdir=%s", dirname); + av[ac++] = g_strdup_printf("-ao"); +--- a/src/property_page_common.c ++++ b/src/property_page_common.c +@@ -80,7 +80,7 @@ + MetaData *ret; + ret = g_new0(MetaData, 1); + +- av[ac++] = g_strdup_printf("mplayer"); ++ av[ac++] = g_strdup_printf("@mplayer@"); + av[ac++] = g_strdup_printf("-vo"); + av[ac++] = g_strdup_printf("null"); + av[ac++] = g_strdup_printf("-ao"); +--- a/src/support.c ++++ b/src/support.c +@@ -566,7 +566,7 @@ + } else { + playlist = FALSE; + if (mplayer_bin == NULL || !g_file_test(mplayer_bin, G_FILE_TEST_EXISTS)) { +- av[ac++] = g_strdup_printf("mplayer"); ++ av[ac++] = g_strdup_printf("@mplayer@"); + } else { + av[ac++] = g_strdup_printf("%s", mplayer_bin); + } +@@ -728,7 +728,7 @@ + playlist = FALSE; + // run mplayer and try to get the first frame and convert it to a jpeg + if (mplayer_bin == NULL || !g_file_test(mplayer_bin, G_FILE_TEST_EXISTS)) { +- av[ac++] = g_strdup_printf("mplayer"); ++ av[ac++] = g_strdup_printf("@mplayer@"); + } else { + av[ac++] = g_strdup_printf("%s", mplayer_bin); + } +@@ -825,7 +825,7 @@ + playlist = FALSE; + + if (mplayer_bin == NULL || !g_file_test(mplayer_bin, G_FILE_TEST_EXISTS)) { +- av[ac++] = g_strdup_printf("mplayer"); ++ av[ac++] = g_strdup_printf("@mplayer@"); + } else { + av[ac++] = g_strdup_printf("%s", mplayer_bin); + } +@@ -1251,7 +1251,7 @@ + gm_log(verbose, G_LOG_LEVEL_INFO, "getting file metadata for %s", name); + + if (mplayer_bin == NULL || !g_file_test(mplayer_bin, G_FILE_TEST_EXISTS)) { +- av[ac++] = g_strdup_printf("mplayer"); ++ av[ac++] = g_strdup_printf("@mplayer@"); + } else { + av[ac++] = g_strdup_printf("%s", mplayer_bin); + } +@@ -1532,7 +1532,7 @@ + return 0; + + if (mplayer_bin == NULL || !g_file_test(mplayer_bin, G_FILE_TEST_EXISTS)) { +- av[ac++] = g_strdup_printf("mplayer"); ++ av[ac++] = g_strdup_printf("@mplayer@"); + } else { + av[ac++] = g_strdup_printf("%s", mplayer_bin); + } +@@ -1597,7 +1597,7 @@ + + if (control_id == 0) { + ac = 0; +- av[ac++] = g_strdup_printf("mencoder"); ++ av[ac++] = g_strdup_printf("@mencoder@"); + av[ac++] = g_strdup_printf("-ovc"); + av[ac++] = g_strdup_printf("copy"); + av[ac++] = g_strdup_printf("-oac"); +@@ -2830,7 +2830,7 @@ + gboolean ret = TRUE; + + if (mplayer_bin == NULL || !g_file_test(mplayer_bin, G_FILE_TEST_EXISTS)) { +- av[ac++] = g_strdup_printf("mplayer"); ++ av[ac++] = g_strdup_printf("@mplayer@"); + } else { + av[ac++] = g_strdup_printf("%s", mplayer_bin); + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6ec532be1dd..47cc7d3ce30 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15241,9 +15241,7 @@ with pkgs; gmu = callPackage ../applications/audio/gmu { }; - gnome_mplayer = callPackage ../applications/video/gnome-mplayer { - inherit (gnome2) GConf; - }; + gnome_mplayer = callPackage ../applications/video/gnome-mplayer { }; gnumeric = callPackage ../applications/office/gnumeric { }; From a5cc983c45fc8b2d0f6b7aa70f0f1911d35c1a13 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sun, 10 Sep 2017 15:36:48 -0400 Subject: [PATCH 116/296] ghc: Clean up, and add `passthru.targetPrefix`, in preparation for cross No hashes should be changed. --- .../compilers/ghc/6.10.2-binary.nix | 5 ++ pkgs/development/compilers/ghc/6.10.4.nix | 5 ++ pkgs/development/compilers/ghc/6.12.3.nix | 5 ++ .../compilers/ghc/7.0.4-binary.nix | 5 ++ pkgs/development/compilers/ghc/7.0.4.nix | 5 ++ .../compilers/ghc/7.10.3-binary.nix | 5 ++ pkgs/development/compilers/ghc/7.10.3.nix | 30 ++++++++--- pkgs/development/compilers/ghc/7.2.2.nix | 10 +++- .../compilers/ghc/7.4.2-binary.nix | 5 ++ pkgs/development/compilers/ghc/7.4.2.nix | 10 +++- pkgs/development/compilers/ghc/7.6.3.nix | 10 +++- .../compilers/ghc/7.8.4-binary.nix | 5 ++ pkgs/development/compilers/ghc/7.8.4.nix | 10 +++- pkgs/development/compilers/ghc/8.0.2.nix | 37 ++++++++----- .../compilers/ghc/8.2.1-binary.nix | 5 ++ pkgs/development/compilers/ghc/8.2.2.nix | 53 ++++++++++++------- pkgs/development/compilers/ghc/head.nix | 48 ++++++++++------- 17 files changed, 187 insertions(+), 66 deletions(-) diff --git a/pkgs/development/compilers/ghc/6.10.2-binary.nix b/pkgs/development/compilers/ghc/6.10.2-binary.nix index fb2e1a2a259..03831f3b6b6 100644 --- a/pkgs/development/compilers/ghc/6.10.2-binary.nix +++ b/pkgs/development/compilers/ghc/6.10.2-binary.nix @@ -4,6 +4,9 @@ , enableIntegerSimple ? false }: +# Prebuilt only does native +assert stdenv.targetPlatform == stdenv.hostPlatform; + stdenv.mkDerivation rec { version = "6.10.2"; @@ -93,6 +96,8 @@ stdenv.mkDerivation rec { [ $(./main) == "yes" ] ''; + passthru = { targetPrefix = ""; }; + meta = { homepage = http://haskell.org/ghc; description = "The Glasgow Haskell Compiler"; diff --git a/pkgs/development/compilers/ghc/6.10.4.nix b/pkgs/development/compilers/ghc/6.10.4.nix index c56762edd24..18b4385834d 100644 --- a/pkgs/development/compilers/ghc/6.10.4.nix +++ b/pkgs/development/compilers/ghc/6.10.4.nix @@ -1,5 +1,8 @@ {stdenv, fetchurl, libedit, ghc, perl, gmp, ncurses}: +# TODO(@Ericson2314): Cross compilation support +assert stdenv.targetPlatform == stdenv.hostPlatform; + stdenv.mkDerivation rec { version = "6.10.4"; @@ -22,6 +25,8 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-fomit-frame-pointer"; + passthru = { targetPrefix = ""; }; + meta = { homepage = http://haskell.org/ghc; description = "The Glasgow Haskell Compiler"; diff --git a/pkgs/development/compilers/ghc/6.12.3.nix b/pkgs/development/compilers/ghc/6.12.3.nix index a46ef66a8cb..a9779ab49fb 100644 --- a/pkgs/development/compilers/ghc/6.12.3.nix +++ b/pkgs/development/compilers/ghc/6.12.3.nix @@ -1,5 +1,8 @@ {stdenv, fetchurl, ghc, perl, gmp, ncurses}: +# TODO(@Ericson2314): Cross compilation support +assert stdenv.targetPlatform == stdenv.hostPlatform; + stdenv.mkDerivation rec { version = "6.12.3"; @@ -33,6 +36,8 @@ stdenv.mkDerivation rec { # that in turn causes GHCi to abort stripDebugFlags=["-S" "--keep-file-symbols"]; + passthru = { targetPrefix = ""; }; + meta = { homepage = http://haskell.org/ghc; description = "The Glasgow Haskell Compiler"; diff --git a/pkgs/development/compilers/ghc/7.0.4-binary.nix b/pkgs/development/compilers/ghc/7.0.4-binary.nix index c518c67d16b..d9b4ff16782 100644 --- a/pkgs/development/compilers/ghc/7.0.4-binary.nix +++ b/pkgs/development/compilers/ghc/7.0.4-binary.nix @@ -3,6 +3,9 @@ , ncurses5, gmp, libiconv }: +# Prebuilt only does native +assert stdenv.targetPlatform == stdenv.hostPlatform; + let libPath = stdenv.lib.makeLibraryPath ([ ncurses5 gmp @@ -131,6 +134,8 @@ stdenv.mkDerivation rec { [ $(./main) == "yes" ] ''; + passthru = { targetPrefix = ""; }; + meta.license = stdenv.lib.licenses.bsd3; meta.platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin"]; } diff --git a/pkgs/development/compilers/ghc/7.0.4.nix b/pkgs/development/compilers/ghc/7.0.4.nix index 9d052ddb246..a1931411d94 100644 --- a/pkgs/development/compilers/ghc/7.0.4.nix +++ b/pkgs/development/compilers/ghc/7.0.4.nix @@ -1,5 +1,8 @@ { stdenv, fetchurl, ghc, perl, gmp, ncurses, libiconv }: +# TODO(@Ericson2314): Cross compilation support +assert stdenv.targetPlatform == stdenv.hostPlatform; + stdenv.mkDerivation rec { version = "7.0.4"; name = "ghc-${version}"; @@ -42,6 +45,8 @@ stdenv.mkDerivation rec { # that in turn causes GHCi to abort stripDebugFlags=["-S" "--keep-file-symbols"]; + passthru = { targetPrefix = ""; }; + meta = { homepage = http://haskell.org/ghc; description = "The Glasgow Haskell Compiler"; diff --git a/pkgs/development/compilers/ghc/7.10.3-binary.nix b/pkgs/development/compilers/ghc/7.10.3-binary.nix index 84b6157c865..6fed39317c7 100644 --- a/pkgs/development/compilers/ghc/7.10.3-binary.nix +++ b/pkgs/development/compilers/ghc/7.10.3-binary.nix @@ -4,6 +4,9 @@ , gcc }: +# Prebuilt only does native +assert stdenv.targetPlatform == stdenv.hostPlatform; + let libPath = stdenv.lib.makeLibraryPath ([ ncurses5 gmp @@ -148,6 +151,8 @@ stdenv.mkDerivation rec { [ $(./main) == "yes" ] ''; + passthru = { targetPrefix = ""; }; + meta.license = stdenv.lib.licenses.bsd3; meta.platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin" "armv7l-linux"]; } diff --git a/pkgs/development/compilers/ghc/7.10.3.nix b/pkgs/development/compilers/ghc/7.10.3.nix index d573a22e0ae..373172540db 100644 --- a/pkgs/development/compilers/ghc/7.10.3.nix +++ b/pkgs/development/compilers/ghc/7.10.3.nix @@ -1,14 +1,28 @@ -{ stdenv, fetchurl, fetchpatch, bootPkgs, perl, ncurses, libiconv, targetPackages, coreutils -, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_45, docbook_xml_dtd_42, hscolour +{ stdenv, targetPackages +, buildPlatform, hostPlatform, targetPlatform - # If enabled GHC will be build with the GPL-free but slower integer-simple +# build-tools +, bootPkgs, hscolour +, coreutils, fetchurl, fetchpatch, perl +, docbook_xsl, docbook_xml_dtd_45, docbook_xml_dtd_42, libxml2, libxslt + +, libiconv ? null, ncurses + +, # If enabled, GHC will be built with the GPL-free but slower integer-simple # library instead of the faster but GPLed integer-gmp library. -, enableIntegerSimple ? false, gmp + enableIntegerSimple ? false, gmp ? null }: +assert !enableIntegerSimple -> gmp != null; + let inherit (bootPkgs) ghc; + # TODO(@Ericson2314) Make unconditional + targetPrefix = stdenv.lib.optionalString + (targetPlatform != hostPlatform) + "${targetPlatform.config}-"; + docFixes = fetchurl { url = "https://downloads.haskell.org/~ghc/7.10.3/ghc-7.10.3a.patch"; sha256 = "1j45z4kcd3w1rzm4hapap2xc16bbh942qnzzdbdjcwqznsccznf0"; @@ -18,10 +32,10 @@ in stdenv.mkDerivation rec { version = "7.10.3"; - name = "ghc-${version}"; + name = "${targetPrefix}ghc-${version}"; src = fetchurl { - url = "https://downloads.haskell.org/~ghc/${version}/${name}-src.tar.xz"; + url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz"; sha256 = "1vsgmic8csczl62ciz51iv8nhrkm72lyhbz7p7id13y2w7fcx46g"; }; @@ -62,7 +76,7 @@ stdenv.mkDerivation rec { postInstall = '' # Install the bash completion file. - install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/ghc + install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc # Patch scripts to include "readelf" and "cat" in $PATH. for i in "$out/bin/"*; do @@ -73,7 +87,7 @@ stdenv.mkDerivation rec { ''; passthru = { - inherit bootPkgs; + inherit bootPkgs targetPrefix; }; meta = { diff --git a/pkgs/development/compilers/ghc/7.2.2.nix b/pkgs/development/compilers/ghc/7.2.2.nix index dd3b5cb2ebc..15f860dd211 100644 --- a/pkgs/development/compilers/ghc/7.2.2.nix +++ b/pkgs/development/compilers/ghc/7.2.2.nix @@ -1,10 +1,14 @@ { stdenv, fetchurl, ghc, perl, ncurses, libiconv - # If enabled GHC will be build with the GPL-free but slower integer-simple +, # If enabled, GHC will be built with the GPL-free but slower integer-simple # library instead of the faster but GPLed integer-gmp library. -, enableIntegerSimple ? false, gmp + enableIntegerSimple ? false, gmp ? null }: +# TODO(@Ericson2314): Cross compilation support +assert stdenv.targetPlatform == stdenv.hostPlatform; +assert !enableIntegerSimple -> gmp != null; + stdenv.mkDerivation rec { version = "7.2.2"; name = "ghc-${version}"; @@ -51,6 +55,8 @@ stdenv.mkDerivation rec { # that in turn causes GHCi to abort stripDebugFlags=["-S" "--keep-file-symbols"]; + passthru = { targetPrefix = ""; }; + meta = { homepage = http://haskell.org/ghc; description = "The Glasgow Haskell Compiler"; diff --git a/pkgs/development/compilers/ghc/7.4.2-binary.nix b/pkgs/development/compilers/ghc/7.4.2-binary.nix index 3cb28e2c820..70c8797c264 100644 --- a/pkgs/development/compilers/ghc/7.4.2-binary.nix +++ b/pkgs/development/compilers/ghc/7.4.2-binary.nix @@ -3,6 +3,9 @@ , ncurses5, gmp, libiconv }: +# Prebuilt only does native +assert stdenv.targetPlatform == stdenv.hostPlatform; + let libPath = stdenv.lib.makeLibraryPath ([ ncurses5 gmp @@ -133,6 +136,8 @@ stdenv.mkDerivation rec { [ $(./main) == "yes" ] ''; + passthru = { targetPrefix = ""; }; + meta.license = stdenv.lib.licenses.bsd3; meta.platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin"]; } diff --git a/pkgs/development/compilers/ghc/7.4.2.nix b/pkgs/development/compilers/ghc/7.4.2.nix index e5bc4724c9e..d28980a01d3 100644 --- a/pkgs/development/compilers/ghc/7.4.2.nix +++ b/pkgs/development/compilers/ghc/7.4.2.nix @@ -1,10 +1,14 @@ { stdenv, fetchurl, ghc, perl, ncurses, libiconv - # If enabled GHC will be build with the GPL-free but slower integer-simple +, # If enabled, GHC will be built with the GPL-free but slower integer-simple # library instead of the faster but GPLed integer-gmp library. -, enableIntegerSimple ? false, gmp + enableIntegerSimple ? false, gmp ? null }: +# TODO(@Ericson2314): Cross compilation support +assert stdenv.targetPlatform == stdenv.hostPlatform; +assert !enableIntegerSimple -> gmp != null; + stdenv.mkDerivation rec { version = "7.4.2"; @@ -52,6 +56,8 @@ stdenv.mkDerivation rec { # that in turn causes GHCi to abort stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols"; + passthru = { targetPrefix = ""; }; + meta = { homepage = http://haskell.org/ghc; description = "The Glasgow Haskell Compiler"; diff --git a/pkgs/development/compilers/ghc/7.6.3.nix b/pkgs/development/compilers/ghc/7.6.3.nix index fde4ca2aa37..7549b43bce1 100644 --- a/pkgs/development/compilers/ghc/7.6.3.nix +++ b/pkgs/development/compilers/ghc/7.6.3.nix @@ -1,10 +1,14 @@ { stdenv, fetchurl, ghc, perl, ncurses, libiconv - # If enabled GHC will be build with the GPL-free but slower integer-simple +, # If enabled, GHC will be built with the GPL-free but slower integer-simple # library instead of the faster but GPLed integer-gmp library. -, enableIntegerSimple ? false, gmp + enableIntegerSimple ? false, gmp ? null }: +# TODO(@Ericson2314): Cross compilation support +assert stdenv.targetPlatform == stdenv.hostPlatform; +assert !enableIntegerSimple -> gmp != null; + let # The "-Wa,--noexecstack" options might be needed only with GNU ld (as opposed # to the gold linker). It prevents binaries' stacks from being marked as @@ -78,6 +82,8 @@ in stdenv.mkDerivation rec { # that in turn causes GHCi to abort stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols"; + passthru = { targetPrefix = ""; }; + meta = { homepage = http://haskell.org/ghc; description = "The Glasgow Haskell Compiler"; diff --git a/pkgs/development/compilers/ghc/7.8.4-binary.nix b/pkgs/development/compilers/ghc/7.8.4-binary.nix index 9525536ef0d..58a9370b321 100644 --- a/pkgs/development/compilers/ghc/7.8.4-binary.nix +++ b/pkgs/development/compilers/ghc/7.8.4-binary.nix @@ -3,6 +3,9 @@ , ncurses5, gmp, libiconv }: +# Prebuilt only does native +assert stdenv.targetPlatform == stdenv.hostPlatform; + let libPath = stdenv.lib.makeLibraryPath ([ ncurses5 gmp @@ -146,6 +149,8 @@ stdenv.mkDerivation rec { [ $(./main) == "yes" ] ''; + passthru = { targetPrefix = ""; }; + meta.license = stdenv.lib.licenses.bsd3; meta.platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin"]; } diff --git a/pkgs/development/compilers/ghc/7.8.4.nix b/pkgs/development/compilers/ghc/7.8.4.nix index 5a380c75c69..7cea395efc9 100644 --- a/pkgs/development/compilers/ghc/7.8.4.nix +++ b/pkgs/development/compilers/ghc/7.8.4.nix @@ -1,10 +1,14 @@ { stdenv, fetchurl, ghc, perl, ncurses, libiconv - # If enabled GHC will be build with the GPL-free but slower integer-simple +, # If enabled, GHC will be built with the GPL-free but slower integer-simple # library instead of the faster but GPLed integer-gmp library. -, enableIntegerSimple ? false, gmp + enableIntegerSimple ? false, gmp ? null }: +# TODO(@Ericson2314): Cross compilation support +assert stdenv.targetPlatform == stdenv.hostPlatform; +assert !enableIntegerSimple -> gmp != null; + stdenv.mkDerivation (rec { version = "7.8.4"; name = "ghc-${version}"; @@ -49,6 +53,8 @@ stdenv.mkDerivation (rec { # that in turn causes GHCi to abort stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols"; + passthru = { targetPrefix = ""; }; + meta = { homepage = http://haskell.org/ghc; description = "The Glasgow Haskell Compiler"; diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix index d475e3438b4..924f927b0bc 100644 --- a/pkgs/development/compilers/ghc/8.0.2.nix +++ b/pkgs/development/compilers/ghc/8.0.2.nix @@ -1,21 +1,33 @@ -{ stdenv, lib, fetchurl, fetchpatch, bootPkgs, perl, ncurses, libiconv, targetPackages, coreutils -, hscolour, patchutils, sphinx +{ stdenv, targetPackages +, buildPlatform, hostPlatform, targetPlatform - # If enabled GHC will be build with the GPL-free but slower integer-simple +# build-tools +, bootPkgs, hscolour +, coreutils, fetchurl, fetchpatch, patchutils, perl, sphinx + +, libiconv ? null, ncurses + +, # If enabled, GHC will be built with the GPL-free but slower integer-simple # library instead of the faster but GPLed integer-gmp library. -, enableIntegerSimple ? false, gmp -, cross ? null + enableIntegerSimple ? false, gmp ? null }: +assert !enableIntegerSimple -> gmp != null; + let inherit (bootPkgs) ghc; + + # TODO(@Ericson2314) Make unconditional + targetPrefix = stdenv.lib.optionalString + (targetPlatform != hostPlatform) + "${targetPlatform.config}-"; in stdenv.mkDerivation rec { version = "8.0.2"; - name = "ghc-${version}"; + name = "${targetPrefix}ghc-${version}"; src = fetchurl { - url = "https://downloads.haskell.org/~ghc/8.0.2/${name}-src.tar.xz"; + url = "https://downloads.haskell.org/~ghc/8.0.2/ghc-${version}-src.tar.xz"; sha256 = "1c8qc4fhkycynk4g1f9hvk53dj6a1vvqi6bklqznns6hw59m8qhi"; }; @@ -47,19 +59,20 @@ stdenv.mkDerivation rec { "--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" - ] ++ + ] ++ stdenv.lib.optionals (targetPlatform.isDarwin && targetPlatform.isAarch64) [ # 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"; + "--disable-large-address-space" + ]; # 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"; postInstall = '' - paxmark m $out/lib/${name}/bin/{ghc,haddock} + paxmark m $out/lib/${name}/bin/${if targetPlatform != hostPlatform then "ghc" else "{ghc,haddock}"} # Install the bash completion file. - install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/ghc + install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc # Patch scripts to include "readelf" and "cat" in $PATH. for i in "$out/bin/"*; do @@ -70,7 +83,7 @@ stdenv.mkDerivation rec { ''; passthru = { - inherit bootPkgs; + inherit bootPkgs targetPrefix; }; meta = { diff --git a/pkgs/development/compilers/ghc/8.2.1-binary.nix b/pkgs/development/compilers/ghc/8.2.1-binary.nix index 1242c6ae1b0..b3b5e2eceec 100644 --- a/pkgs/development/compilers/ghc/8.2.1-binary.nix +++ b/pkgs/development/compilers/ghc/8.2.1-binary.nix @@ -3,6 +3,9 @@ , ncurses5, gmp, libiconv }: +# Prebuilt only does native +assert stdenv.targetPlatform == stdenv.hostPlatform; + let libPath = stdenv.lib.makeLibraryPath ([ ncurses5 gmp @@ -151,6 +154,8 @@ stdenv.mkDerivation rec { [ $(./main) == "yes" ] ''; + passthru = { targetPrefix = ""; }; + meta.license = stdenv.lib.licenses.bsd3; meta.platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin" "armv7l-linux" "aarch64-linux"]; } diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix index 736a6edc365..7ff172ff3b1 100644 --- a/pkgs/development/compilers/ghc/8.2.2.nix +++ b/pkgs/development/compilers/ghc/8.2.2.nix @@ -1,16 +1,29 @@ -{ stdenv, lib, fetchurl, bootPkgs, perl, ncurses, libiconv, binutils, coreutils -, autoconf, automake, happy, alex, python3, sphinx, hscolour -, buildPlatform, targetPlatform , selfPkgs, cross ? null +{ stdenv, targetPackages +, buildPlatform, hostPlatform, targetPlatform +, selfPkgs, cross ? null - # If enabled GHC will be build with the GPL-free but slower integer-simple +# build-tools +, bootPkgs, alex, happy, hscolour +, autoconf, automake, coreutils, fetchurl, perl, python3, sphinx + +, libiconv ? null, ncurses + +, # If enabled, GHC will be built with the GPL-free but slower integer-simple # library instead of the faster but GPLed integer-gmp library. -, enableIntegerSimple ? false, gmp + enableIntegerSimple ? false, gmp ? null }: +assert !enableIntegerSimple -> gmp != null; + let inherit (bootPkgs) ghc; version = "8.2.2"; + # TODO(@Ericson2314) Make unconditional + targetPrefix = stdenv.lib.optionalString + (targetPlatform != hostPlatform) + "${targetPlatform.config}-"; + commonBuildInputs = [ alex autoconf automake ghc happy hscolour perl python3 sphinx ]; commonPreConfigure = '' sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure @@ -50,28 +63,28 @@ in stdenv.mkDerivation (rec { # 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"; + stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; checkTarget = "test"; postInstall = '' - paxmark m $out/lib/${name}/bin/{ghc,haddock} + paxmark m $out/lib/${name}/bin/${if targetPlatform != hostPlatform then "ghc" else "{ghc,haddock}"} # Install the bash completion file. - install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/ghc + install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}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 + sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i done ''; outputs = [ "out" "doc" ]; passthru = { - inherit bootPkgs; + inherit bootPkgs targetPrefix; } // stdenv.lib.optionalAttrs (targetPlatform != buildPlatform) { crossCompiler = selfPkgs.ghc.override { cross = targetPlatform; @@ -94,24 +107,24 @@ in stdenv.mkDerivation (rec { ''; 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" + "CC=${stdenv.cc}/bin/${cross.config}-cc" + "LD=${stdenv.cc.bintools}/bin/${cross.config}-ld" + "AR=${stdenv.cc.bintools}/bin/${cross.config}-ar" + "NM=${stdenv.cc.bintools}/bin/${cross.config}-nm" + "RANLIB=${stdenv.cc.bintools}/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"; + stdenv.lib.optional (cross.config or null == "aarch64-apple-darwin14") "--disable-large-address-space"; - buildInputs = commonBuildInputs ++ [ stdenv.ccCross stdenv.binutils ]; + buildInputs = commonBuildInputs; - dontSetConfigureCross = true; + configurePlatforms = []; passthru = { inherit bootPkgs cross; - cc = "${stdenv.ccCross}/bin/${cross.config}-cc"; - ld = "${stdenv.binutils}/bin/${cross.config}-ld"; + cc = "${stdenv.cc}/bin/${cross.config}-cc"; + ld = "${stdenv.cc}/bin/${cross.config}-ld"; }; }) diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 3f5dfa65958..00cf46abd52 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -1,20 +1,33 @@ -{ stdenv, lib, fetchgit, bootPkgs, perl, ncurses, libiconv, targetPackages, coreutils -, autoconf, automake, happy, alex, python3, buildPlatform, targetPlatform +{ stdenv, targetPackages +, buildPlatform, hostPlatform, targetPlatform , selfPkgs, cross ? null - # If enabled GHC will be build with the GPL-free but slower integer-simple +# build-tools +, bootPkgs, alex, happy +, autoconf, automake, coreutils, fetchgit, perl, python3 + +, libiconv ? null, ncurses + +, # If enabled, GHC will be built with the GPL-free but slower integer-simple # library instead of the faster but GPLed integer-gmp library. -, enableIntegerSimple ? false, gmp + enableIntegerSimple ? false, gmp ? null + , version ? "8.5.20171209" }: +assert !enableIntegerSimple -> gmp != null; + let inherit (bootPkgs) ghc; - commonBuildInputs = [ ghc perl autoconf automake happy alex python3 ]; - rev = "4335c07ca7e64624819b22644d7591853826bd75"; + # TODO(@Ericson2314) Make unconditional + targetPrefix = stdenv.lib.optionalString + (targetPlatform != hostPlatform) + "${targetPlatform.config}-"; + + commonBuildInputs = [ ghc perl autoconf automake happy alex python3 ]; commonPreConfigure = '' echo ${version} >VERSION echo ${rev} >GIT_COMMIT_ID @@ -27,7 +40,8 @@ let '' + stdenv.lib.optionalString enableIntegerSimple '' echo "INTEGER_LIBRARY=integer-simple" > mk/build.mk ''; -in stdenv.mkDerivation (rec { +in +stdenv.mkDerivation (rec { inherit version rev; name = "ghc-${version}"; @@ -57,15 +71,15 @@ in stdenv.mkDerivation (rec { # 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"; + stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; checkTarget = "test"; postInstall = '' - paxmark m $out/lib/${name}/bin/{ghc,haddock} + paxmark m $out/lib/${name}/bin/${if targetPlatform != hostPlatform then "ghc" else "{ghc,haddock}"} # Install the bash completion file. - install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/ghc + install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc # Patch scripts to include "readelf" and "cat" in $PATH. for i in "$out/bin/"*; do @@ -78,7 +92,7 @@ in stdenv.mkDerivation (rec { outputs = [ "out" "doc" ]; passthru = { - inherit bootPkgs; + inherit bootPkgs targetPrefix; } // stdenv.lib.optionalAttrs (targetPlatform != buildPlatform) { crossCompiler = selfPkgs.ghc.override { cross = targetPlatform; @@ -102,15 +116,15 @@ in stdenv.mkDerivation (rec { configureFlags = [ "CC=${stdenv.cc}/bin/${cross.config}-cc" - "LD=${stdenv.cc}/bin/${cross.config}-ld" - "AR=${stdenv.cc}/bin/${cross.config}-ar" - "NM=${stdenv.cc}/bin/${cross.config}-nm" - "RANLIB=${stdenv.cc}/bin/${cross.config}-ranlib" + "LD=${stdenv.cc.bintools}/bin/${cross.config}-ld" + "AR=${stdenv.cc.bintools}/bin/${cross.config}-ar" + "NM=${stdenv.cc.bintools}/bin/${cross.config}-nm" + "RANLIB=${stdenv.cc.bintools}/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"; + stdenv.lib.optional (cross.config or null == "aarch64-apple-darwin14") "--disable-large-address-space"; buildInputs = commonBuildInputs; @@ -118,9 +132,7 @@ in stdenv.mkDerivation (rec { passthru = { inherit bootPkgs cross; - cc = "${stdenv.cc}/bin/${cross.config}-cc"; - ld = "${stdenv.cc}/bin/${cross.config}-ld"; }; }) From d831604a783fc72e245d9b91039ac39700c6ea8b Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Wed, 3 Jan 2018 00:27:51 +0000 Subject: [PATCH 117/296] python.pkgs.evdev: move to python-modules --- .../python-modules/evdev/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 25 +----------------- 2 files changed, 27 insertions(+), 24 deletions(-) create mode 100644 pkgs/development/python-modules/evdev/default.nix diff --git a/pkgs/development/python-modules/evdev/default.nix b/pkgs/development/python-modules/evdev/default.nix new file mode 100644 index 00000000000..98f7e3c4f7c --- /dev/null +++ b/pkgs/development/python-modules/evdev/default.nix @@ -0,0 +1,26 @@ +{ lib, buildPythonPackage, isPy34, fetchurl, linuxHeaders }: + +buildPythonPackage rec { + version = "0.6.4"; + name = "evdev-${version}"; + disabled = isPy34; # see http://bugs.python.org/issue21121 + + src = fetchurl { + url = "mirror://pypi/e/evdev/${name}.tar.gz"; + sha256 = "1wkag91s8j0f45jx5n619z354n8pz8in9krn81hp7hlkhi6p8s2j"; + }; + + buildInputs = [ linuxHeaders ]; + + patchPhase = "sed -e 's#/usr/include/linux/#${linuxHeaders}/include/linux/#g' -i setup.py"; + + doCheck = false; + + meta = with lib; { + description = "Provides bindings to the generic input event interface in Linux"; + homepage = http://pythonhosted.org/evdev; + license = licenses.bsd3; + maintainers = with maintainers; [ goibhniu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f2f43163c8e..d9588e9f9f2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4546,30 +4546,7 @@ in { }; }; - evdev = buildPythonPackage rec { - version = "0.6.4"; - name = "evdev-${version}"; - disabled = isPy34; # see http://bugs.python.org/issue21121 - - src = pkgs.fetchurl { - url = "mirror://pypi/e/evdev/${name}.tar.gz"; - sha256 = "1wkag91s8j0f45jx5n619z354n8pz8in9krn81hp7hlkhi6p8s2j"; - }; - - buildInputs = with self; [ pkgs.linuxHeaders ]; - - patchPhase = "sed -e 's#/usr/include/linux/#${pkgs.linuxHeaders}/include/linux/#g' -i setup.py"; - - doCheck = false; - - meta = { - description = "Provides bindings to the generic input event interface in Linux"; - homepage = http://pythonhosted.org/evdev; - license = licenses.bsd3; - maintainers = with maintainers; [ goibhniu ]; - platforms = platforms.linux; - }; - }; + evdev = callPackage ../development/python-modules/evdev {}; eve = callPackage ../development/python-modules/eve {}; From 2a859190795ac2e64a51f93354d891977ba8a344 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Wed, 3 Jan 2018 00:31:01 +0000 Subject: [PATCH 118/296] python.pkgs.evdev: 0.6.4 -> 0.7.0 --- .../python-modules/evdev/default.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/evdev/default.nix b/pkgs/development/python-modules/evdev/default.nix index 98f7e3c4f7c..250a2f55932 100644 --- a/pkgs/development/python-modules/evdev/default.nix +++ b/pkgs/development/python-modules/evdev/default.nix @@ -1,21 +1,24 @@ -{ lib, buildPythonPackage, isPy34, fetchurl, linuxHeaders }: +{ lib, buildPythonPackage, isPy34, fetchPypi, linuxHeaders }: buildPythonPackage rec { - version = "0.6.4"; - name = "evdev-${version}"; - disabled = isPy34; # see http://bugs.python.org/issue21121 + pname = "evdev"; + version = "0.7.0"; - src = fetchurl { - url = "mirror://pypi/e/evdev/${name}.tar.gz"; - sha256 = "1wkag91s8j0f45jx5n619z354n8pz8in9krn81hp7hlkhi6p8s2j"; + src = fetchPypi { + inherit pname version; + sha256 = "188ahmqnh5y1f46m7pyjdmi9zfxswaggn6xga65za554d72azvap"; }; buildInputs = [ linuxHeaders ]; - patchPhase = "sed -e 's#/usr/include/linux/#${linuxHeaders}/include/linux/#g' -i setup.py"; + patchPhase = '' + substituteInPlace setup.py --replace /usr/include/linux ${linuxHeaders}/include/linux + ''; doCheck = false; + disabled = isPy34; # see http://bugs.python.org/issue21121 + meta = with lib; { description = "Provides bindings to the generic input event interface in Linux"; homepage = http://pythonhosted.org/evdev; From aa241aed14a76a87b04819ac7a6bee645c7a5e70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Wed, 3 Jan 2018 02:23:02 +0100 Subject: [PATCH 119/296] nixos/dkimproxy-out: init (#33229) --- nixos/modules/module-list.nix | 1 + nixos/modules/services/mail/dkimproxy-out.nix | 118 ++++++++++++++++++ 2 files changed, 119 insertions(+) create mode 100644 nixos/modules/services/mail/dkimproxy-out.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 700b3baaa90..fdd3bb844c2 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -260,6 +260,7 @@ ./services/logging/rsyslogd.nix ./services/logging/syslog-ng.nix ./services/logging/syslogd.nix + ./services/mail/dkimproxy-out.nix ./services/mail/dovecot.nix ./services/mail/dspam.nix ./services/mail/exim.nix diff --git a/nixos/modules/services/mail/dkimproxy-out.nix b/nixos/modules/services/mail/dkimproxy-out.nix new file mode 100644 index 00000000000..894b88e25c1 --- /dev/null +++ b/nixos/modules/services/mail/dkimproxy-out.nix @@ -0,0 +1,118 @@ +{ config, lib, pkgs, ... }: + +with lib; +let + cfg = config.services.dkimproxy-out; + keydir = "/var/lib/dkimproxy-out"; + privkey = "${keydir}/private.key"; + pubkey = "${keydir}/public.key"; +in +{ + ##### interface + options = { + services.dkimproxy-out = { + enable = mkOption { + type = types.bool; + default = false; + description = + '' + Whether to enable dkimproxy_out. + + Note that a key will be auto-generated, and can be found in + ${keydir}. + ''; + }; + + listen = mkOption { + type = types.str; + example = "127.0.0.1:10027"; + description = "Address:port DKIMproxy should listen on."; + }; + + relay = mkOption { + type = types.str; + example = "127.0.0.1:10028"; + description = "Address:port DKIMproxy should forward mail to."; + }; + + domains = mkOption { + type = with types; listOf str; + example = [ "example.org" "example.com" ]; + description = "List of domains DKIMproxy can sign for."; + }; + + selector = mkOption { + type = types.str; + example = "selector1"; + description = + '' + The selector to use for DKIM key identification. + + For example, if 'selector1' is used here, then for each domain + 'example.org' given in `domain`, 'selector1._domainkey.example.org' + should contain the TXT record indicating the public key is the one + in ${pubkey}: "v=DKIM1; t=s; p=[THE PUBLIC KEY]". + ''; + }; + + keySize = mkOption { + type = types.int; + default = 2048; + description = + '' + Size of the RSA key to use to sign outgoing emails. Note that the + maximum mandatorily verified as per RFC6376 is 2048. + ''; + }; + + # TODO: allow signature for other schemes than dkim(c=relaxed/relaxed)? + # This being the scheme used by gmail, maybe nothing more is needed for + # reasonable use. + }; + }; + + ##### implementation + config = let + configfile = pkgs.writeText "dkimproxy_out.conf" + '' + listen ${cfg.listen} + relay ${cfg.relay} + + domain ${concatStringsSep "," cfg.domains} + selector ${cfg.selector} + + signature dkim(c=relaxed/relaxed) + + keyfile ${privkey} + ''; + in + mkIf cfg.enable { + users.groups.dkimproxy-out = {}; + users.users.dkimproxy-out = { + description = "DKIMproxy_out daemon"; + group = "dkimproxy-out"; + isSystemUser = true; + }; + + systemd.services.dkimproxy-out = { + description = "DKIMproxy_out"; + wantedBy = [ "multi-user.target" ]; + preStart = '' + if [ ! -d "${keydir}" ]; then + mkdir -p "${keydir}" + chmod 0700 "${keydir}" + ${pkgs.openssl}/bin/openssl genrsa -out "${privkey}" ${toString cfg.keySize} + ${pkgs.openssl}/bin/openssl rsa -in "${privkey}" -pubout -out "${pubkey}" + chown -R dkimproxy-out:dkimproxy-out "${keydir}" + fi + ''; + script = '' + exec ${pkgs.dkimproxy}/bin/dkimproxy.out --conf_file=${configfile} + ''; + serviceConfig = { + User = "dkimproxy-out"; + PermissionsStartOnly = true; + }; + }; + }; +} From a224dfc2532fd3b06ba12bd81bd76f6cecb08d9d Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sun, 10 Sep 2017 15:36:48 -0400 Subject: [PATCH 120/296] haskell infra: Fix cross as much as possible without changing hashes --- .../haskell-modules/generic-builder.nix | 37 +++++++++++-------- .../haskell-modules/make-package-set.nix | 25 ++++++++----- .../haskell-modules/with-packages-wrapper.nix | 5 +-- .../darwin/ghc-standalone-archive/default.nix | 3 +- 4 files changed, 40 insertions(+), 30 deletions(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 4df554a6b39..d24b2ca4143 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -1,7 +1,14 @@ -{ stdenv, fetchurl, ghc, pkgconfig, glibcLocales, coreutils, gnugrep, gnused -, jailbreak-cabal, hscolour, cpphs, nodejs, lib, removeReferencesTo +{ stdenv, buildPackages, ghc +, jailbreak-cabal, hscolour, cpphs, nodejs +, buildPlatform, hostPlatform }: -let isCross = (ghc.cross or null) != null; in + +let + isCross = buildPlatform != hostPlatform; + inherit (buildPackages) + fetchurl removeReferencesTo + pkgconfig coreutils gnugrep gnused glibcLocales; +in { pname , dontStrip ? (ghc.isGhcjs or false) @@ -20,8 +27,8 @@ let isCross = (ghc.cross or null) != null; in , enableLibraryProfiling ? false , enableExecutableProfiling ? false # TODO enable shared libs for cross-compiling -, enableSharedExecutables ? !isCross && (((ghc.isGhcjs or false) || stdenv.lib.versionOlder "7.7" ghc.version)) -, enableSharedLibraries ? !isCross && (((ghc.isGhcjs or false) || stdenv.lib.versionOlder "7.7" ghc.version)) +, enableSharedExecutables ? ((ghc.isGhcjs or false) || stdenv.lib.versionOlder "7.7" ghc.version) +, enableSharedLibraries ? ((ghc.isGhcjs or false) || stdenv.lib.versionOlder "7.7" ghc.version) , enableSplitObjs ? null # OBSOLETE, use enableDeadCodeElimination , enableDeadCodeElimination ? (!stdenv.isDarwin) # TODO: use -dead_strip for darwin , enableStaticLibraries ? true @@ -53,7 +60,7 @@ let isCross = (ghc.cross or null) != null; in , shellHook ? "" , coreSetup ? false # Use only core packages to build Setup.hs. , useCpphs ? false -, hardeningDisable ? lib.optional (ghc.isHaLVM or false) "all" +, hardeningDisable ? stdenv.lib.optional (ghc.isHaLVM or false) "all" , enableSeparateDataOutput ? false , enableSeparateDocOutput ? doHaddock } @ args: @@ -102,10 +109,10 @@ let enableParallelBuilding = (versionOlder "7.8" ghc.version && !hasActiveLibrary) || versionOlder "8.0.1" ghc.version; crossCabalFlags = [ - "--with-ghc=${ghc.cross.config}-ghc" - "--with-ghc-pkg=${ghc.cross.config}-ghc-pkg" - "--with-gcc=${ghc.cc}" - "--with-ld=${ghc.ld}" + "--with-ghc=${ghc.targetPrefix}ghc" + "--with-ghc-pkg=${ghc.targetPrefix}ghc-pkg" + "--with-gcc=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" + "--with-ld=${stdenv.cc.bintools}/bin/${stdenv.cc.bintools.targetPrefix}ld" "--with-hsc2hs=${nativeGhc}/bin/hsc2hs" ] ++ (if isHaLVM then [] else ["--hsc2hs-options=--cross-compile"]); @@ -135,7 +142,7 @@ let ] ++ optionals isGhcjs [ "--ghcjs" ] ++ optionals isCross ([ - "--configure-option=--host=${ghc.cross.config}" + "--configure-option=--host=${hostPlatform.config}" ] ++ crossCabalFlags); setupCompileFlags = [ @@ -171,8 +178,7 @@ let setupBuilder = if isCross then "${nativeGhc}/bin/ghc" else ghcCommand; setupCommand = "./Setup"; ghcCommand' = if isGhcjs then "ghcjs" else "ghc"; - crossPrefix = if (ghc.cross or null) != null then "${ghc.cross.config}-" else ""; - ghcCommand = "${crossPrefix}${ghcCommand'}"; + ghcCommand = "${ghc.targetPrefix}${ghcCommand'}"; ghcCommandCaps= toUpper ghcCommand'; in @@ -269,6 +275,8 @@ stdenv.mkDerivation ({ runHook postCompileBuildDriver ''; + inherit configureFlags; + configurePhase = '' runHook preConfigure @@ -402,7 +410,6 @@ stdenv.mkDerivation ({ // optionalAttrs (postCompileBuildDriver != "") { inherit postCompileBuildDriver; } // optionalAttrs (preUnpack != "") { inherit preUnpack; } // optionalAttrs (postUnpack != "") { inherit postUnpack; } -// optionalAttrs (configureFlags != []) { inherit configureFlags; } // optionalAttrs (patches != []) { inherit patches; } // optionalAttrs (patchPhase != "") { inherit patchPhase; } // optionalAttrs (preConfigure != "") { inherit preConfigure; } @@ -421,5 +428,5 @@ stdenv.mkDerivation ({ // optionalAttrs (postFixup != "") { inherit postFixup; } // optionalAttrs (dontStrip) { inherit dontStrip; } // optionalAttrs (hardeningDisable != []) { inherit hardeningDisable; } -// optionalAttrs (stdenv.isLinux) { LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive"; } +// optionalAttrs (buildPlatform.isLinux){ LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive"; } ) diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 7ac0ef509f4..448c6e0e437 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -1,7 +1,10 @@ # This expression takes a file like `hackage-packages.nix` and constructs # a full package set out of that. -{ # package-set used for non-haskell dependencies (all of nixpkgs) +{ # package-set used for build tools (all of nixpkgs) + buildPackages + +, # package-set used for non-haskell dependencies (all of nixpkgs) pkgs , # stdenv to use for building haskell packages @@ -28,19 +31,21 @@ self: let + inherit (stdenv) buildPlatform hostPlatform; inherit (stdenv.lib) fix' extends makeOverridable; inherit (haskellLib) overrideCabal; + buildHaskellPackages = if hostPlatform != buildPlatform + then self.ghc.bootPkgs + else self; + mkDerivationImpl = pkgs.callPackage ./generic-builder.nix { inherit stdenv; - inherit (pkgs) fetchurl pkgconfig glibcLocales coreutils gnugrep gnused; - nodejs = pkgs.nodejs-slim; - jailbreak-cabal = if (self.ghc.cross or null) != null - then self.ghc.bootPkgs.jailbreak-cabal - else self.jailbreak-cabal; + nodejs = buildPackages.nodejs-slim; + inherit (buildHaskellPackages) jailbreak-cabal; inherit (self) ghc; - hscolour = overrideCabal self.hscolour (drv: { + hscolour = overrideCabal buildHaskellPackages.hscolour (drv: { isLibrary = false; doHaddock = false; hyperlinkSource = false; # Avoid depending on hscolour for this build. @@ -104,13 +109,13 @@ let haskellSrc2nix = { name, src, sha256 ? null }: let sha256Arg = if isNull sha256 then "--sha256=" else ''--sha256="${sha256}"''; - in pkgs.stdenv.mkDerivation { + in pkgs.buildPackages.stdenv.mkDerivation { name = "cabal2nix-${name}"; - buildInputs = [ pkgs.haskellPackages.cabal2nix ]; + nativeBuildInputs = [ pkgs.buildPackages.haskellPackages.cabal2nix ]; preferLocalBuild = true; phases = ["installPhase"]; LANG = "en_US.UTF-8"; - LOCALE_ARCHIVE = pkgs.lib.optionalString pkgs.stdenv.isLinux "${pkgs.glibcLocales}/lib/locale/locale-archive"; + LOCALE_ARCHIVE = pkgs.lib.optionalString buildPlatform.isLinux "${buildPackages.glibcLocales}/lib/locale/locale-archive"; installPhase = '' export HOME="$TMP" mkdir -p "$out" diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index ac484b3c112..d92201b8767 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -36,9 +36,8 @@ let isHaLVM = ghc.isHaLVM or false; ghc761OrLater = isGhcjs || isHaLVM || lib.versionOlder "7.6.1" ghc.version; packageDBFlag = if ghc761OrLater then "--global-package-db" else "--global-conf"; - ghcCommand' = if isGhcjs then "ghcjs" else "ghc"; - crossPrefix = if (ghc.cross or null) != null then "${ghc.cross.config}-" else ""; - ghcCommand = "${crossPrefix}${ghcCommand'}"; + ghcCommand' = if isGhcjs then "ghcjs" else "ghc"; + ghcCommand = "${ghc.targetPrefix}${ghcCommand'}"; ghcCommandCaps= lib.toUpper ghcCommand'; libDir = if isHaLVM then "$out/lib/HaLVM-${ghc.version}" else "$out/lib/${ghcCommand}-${ghc.version}"; docDir = "$out/share/doc/ghc/html"; diff --git a/pkgs/os-specific/darwin/ghc-standalone-archive/default.nix b/pkgs/os-specific/darwin/ghc-standalone-archive/default.nix index d23328d362e..46ba6828186 100644 --- a/pkgs/os-specific/darwin/ghc-standalone-archive/default.nix +++ b/pkgs/os-specific/darwin/ghc-standalone-archive/default.nix @@ -2,8 +2,7 @@ { haskellPackages, src, deps ? p : [], name }: let inherit (haskellPackages) ghc ghcWithPackages; with-env = ghcWithPackages deps; - crossPrefix = if (ghc.cross or null) != null then "${ghc.cross.config}-" else ""; - ghcName = "${crossPrefix}ghc"; + ghcName = "${ghc.targetPrefix}ghc"; in runCommand name { buildInputs = [ with-env cctools ]; } '' mkdir -p $out/lib mkdir -p $out/include From faa4b45a1eff573b5773dd686e2a7f07c9986598 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sun, 10 Sep 2017 14:50:00 -0400 Subject: [PATCH 121/296] ghc 8.2.2, head: Inline `common*` bindings Cross case purposely changed as it will be rewritten anyways. But no native hashes should be changed. --- pkgs/development/compilers/ghc/8.2.2.nix | 34 +++++++++------------- pkgs/development/compilers/ghc/head.nix | 37 ++++++++++-------------- 2 files changed, 29 insertions(+), 42 deletions(-) diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix index 7ff172ff3b1..f39edff5ef3 100644 --- a/pkgs/development/compilers/ghc/8.2.2.nix +++ b/pkgs/development/compilers/ghc/8.2.2.nix @@ -23,18 +23,8 @@ let targetPrefix = stdenv.lib.optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-"; - - 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 { +in +stdenv.mkDerivation (rec { inherit version; name = "ghc-${version}"; @@ -45,9 +35,19 @@ in stdenv.mkDerivation (rec { postPatch = "patchShebangs ."; - preConfigure = commonPreConfigure; + preConfigure = '' + 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 + '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' + sed 's|#BuildFlavour = quick-cross|BuildFlavour = perf-cross|' mk/build.mk.sample > mk/build.mk + ''; - buildInputs = commonBuildInputs; + buildInputs = [ alex autoconf automake ghc happy hscolour perl python3 sphinx ]; enableParallelBuilding = true; @@ -102,10 +102,6 @@ in stdenv.mkDerivation (rec { } // 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.cc}/bin/${cross.config}-cc" "LD=${stdenv.cc.bintools}/bin/${cross.config}-ld" @@ -118,8 +114,6 @@ in stdenv.mkDerivation (rec { # fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ stdenv.lib.optional (cross.config or null == "aarch64-apple-darwin14") "--disable-large-address-space"; - buildInputs = commonBuildInputs; - configurePlatforms = []; passthru = { diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 00cf46abd52..c5be301baf6 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -26,20 +26,6 @@ let targetPrefix = stdenv.lib.optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-"; - - commonBuildInputs = [ ghc perl autoconf automake happy alex python3 ]; - commonPreConfigure = '' - echo ${version} >VERSION - echo ${rev} >GIT_COMMIT_ID - ./boot - 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 rev; @@ -53,9 +39,22 @@ stdenv.mkDerivation (rec { postPatch = "patchShebangs ."; - preConfigure = commonPreConfigure; + preConfigure = '' + echo ${version} >VERSION + echo ${rev} >GIT_COMMIT_ID + ./boot + 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 + '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' + sed 's|#BuildFlavour = quick-cross|BuildFlavour = perf-cross|' mk/build.mk.sample > mk/build.mk + ''; - buildInputs = commonBuildInputs; + buildInputs = [ ghc perl autoconf automake happy alex python3 ]; enableParallelBuilding = true; @@ -110,10 +109,6 @@ stdenv.mkDerivation (rec { } // 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.cc}/bin/${cross.config}-cc" "LD=${stdenv.cc.bintools}/bin/${cross.config}-ld" @@ -126,8 +121,6 @@ stdenv.mkDerivation (rec { # fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ stdenv.lib.optional (cross.config or null == "aarch64-apple-darwin14") "--disable-large-address-space"; - buildInputs = commonBuildInputs; - configurePlatforms = []; passthru = { From bc066466fbdd38c1982ea162d01b74d7df88e874 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Fri, 22 Sep 2017 19:09:39 -0400 Subject: [PATCH 122/296] haskell generic-builder: Don't use absolute path to tools, and also track strip --- pkgs/development/haskell-modules/generic-builder.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index d24b2ca4143..29bcdfce2c9 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -111,9 +111,10 @@ let crossCabalFlags = [ "--with-ghc=${ghc.targetPrefix}ghc" "--with-ghc-pkg=${ghc.targetPrefix}ghc-pkg" - "--with-gcc=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" - "--with-ld=${stdenv.cc.bintools}/bin/${stdenv.cc.bintools.targetPrefix}ld" - "--with-hsc2hs=${nativeGhc}/bin/hsc2hs" + "--with-gcc=${stdenv.cc.targetPrefix}cc" + "--with-ld=${stdenv.cc.bintools.targetPrefix}ld" + "--with-hsc2hs=${nativeGhc}/bin/hsc2hs" # not cross one + "--with-strip=${stdenv.cc.bintools.targetPrefix}strip" ] ++ (if isHaLVM then [] else ["--hsc2hs-options=--cross-compile"]); crossCabalFlagsString = From 24d61a48b30bb53b4b1720f215f613879e6d1037 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Wed, 3 Jan 2018 00:01:37 +0000 Subject: [PATCH 123/296] sc-controller: init at 0.4.0.1 --- pkgs/misc/drivers/sc-controller/default.nix | 62 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 ++ 2 files changed, 67 insertions(+) create mode 100644 pkgs/misc/drivers/sc-controller/default.nix diff --git a/pkgs/misc/drivers/sc-controller/default.nix b/pkgs/misc/drivers/sc-controller/default.nix new file mode 100644 index 00000000000..bbb0d1523df --- /dev/null +++ b/pkgs/misc/drivers/sc-controller/default.nix @@ -0,0 +1,62 @@ +{ lib, buildPythonApplication, fetchFromGitHub, wrapGAppsHook +, gtk3, gobjectIntrospection, libappindicator-gtk3, librsvg +, evdev, pygobject3, pylibacl, pytest +, linuxHeaders +, libX11, libXext, libXfixes, libusb1 +}: + +buildPythonApplication rec { + pname = "sc-controller"; + version = "0.4.0.1"; + + src = fetchFromGitHub { + owner = "kozec"; + repo = "sc-controller"; + rev = "v${version}"; + sha256 = "0vhgiqg4r4bnn004ql80rvi23y05wlax80sj8qsr91pvqsxwv3yl"; + }; + + nativeBuildInputs = [ wrapGAppsHook ]; + + buildInputs = [ gtk3 gobjectIntrospection libappindicator-gtk3 librsvg ]; + + propagatedBuildInputs = [ evdev pygobject3 pylibacl ]; + + checkInputs = [ pytest ]; + + postPatch = '' + substituteInPlace scc/paths.py --replace sys.prefix "'$out'" + substituteInPlace scc/uinput.py --replace /usr/include ${linuxHeaders}/include + ''; + + LD_LIBRARY_PATH = lib.makeLibraryPath [ libX11 libXext libXfixes libusb1 ]; + + preFixup = '' + gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH") + # gdk-pixbuf setup hook can not choose between propagated librsvg + # and our librsvg with GObject introspection. + GDK_PIXBUF_MODULE_FILE=$(echo ${librsvg}/lib/gdk-pixbuf-2.0/*/loaders.cache) + ''; + + postFixup = '' + ( + # scc runs these scripts as programs. (See find_binary() in scc/tools.py.) + cd $out/lib/python*/site-packages/scc/x11 + patchPythonScript scc-autoswitch-daemon.py + patchPythonScript scc-osd-daemon.py + ) + ''; + + checkPhase = '' + PYTHONPATH=. py.test + ''; + + meta = with lib; { + homepage = https://github.com/kozec/sc-controller; + # donations: https://www.patreon.com/kozec + description = "User-mode driver and GUI for Steam Controller and other controllers"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.orivej ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bbaef3658d6..b15954384f8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19754,6 +19754,11 @@ with pkgs; sane-frontends = callPackage ../applications/graphics/sane/frontends.nix { }; + sc-controller = pythonPackages.callPackage ../misc/drivers/sc-controller { + inherit libusb1; # Shadow python.pkgs.libusb1. + librsvg = librsvg.override { enableIntrospection = true; }; + }; + sct = callPackage ../tools/X11/sct {}; seafile-shared = callPackage ../misc/seafile-shared { }; From 5e31e828f88a8aa229d68bade00d9f2d70f7b9f8 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 2 Jan 2018 23:39:28 -0500 Subject: [PATCH 124/296] ghcWithPackages: Fix cross, and avoid needless C compiler --- pkgs/development/haskell-modules/make-package-set.nix | 2 +- pkgs/development/haskell-modules/with-packages-wrapper.nix | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 448c6e0e437..968773ded98 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -100,7 +100,7 @@ let defaultScope = mkScope self; callPackage = drv: args: callPackageWithScope defaultScope drv args; - withPackages = packages: callPackage ./with-packages-wrapper.nix { + withPackages = packages: buildPackages.callPackage ./with-packages-wrapper.nix { inherit (self) llvmPackages; haskellPackages = self; inherit packages; diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index d92201b8767..6b3d6dfd2b0 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, ghc, llvmPackages, packages, symlinkJoin, makeWrapper +{ lib, targetPlatform, ghc, llvmPackages, packages, symlinkJoin, makeWrapper , ignoreCollisions ? false, withLLVM ? false , postBuild ? "" , haskellPackages @@ -48,7 +48,7 @@ let # https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/code-generators.html llvm = lib.makeBinPath ([ llvmPackages.llvm ] - ++ lib.optional stdenv.isDarwin llvmPackages.clang); + ++ lib.optional targetPlatform.isDarwin llvmPackages.clang); in if paths == [] && !withLLVM then ghc else symlinkJoin { @@ -98,7 +98,7 @@ symlinkJoin { makeWrapper ${ghc}/bin/$prg $out/bin/$prg --add-flags "${packageDBFlag}=${packageCfgDir}" fi done - '' + (lib.optionalString stdenv.isDarwin '' + '' + (lib.optionalString targetPlatform.isDarwin '' # Work around a linker limit in macOS Sierra (see generic-builder.nix): local packageConfDir="$out/lib/${ghc.name}/package.conf.d"; local dynamicLinksDir="$out/lib/links" From 453e15ec9127bad79b27ff9cb8387ad656db7008 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 3 Jan 2018 11:15:47 +0100 Subject: [PATCH 125/296] nixos/redis: remove static uid/gid assignment all files are chowned on startup --- nixos/modules/misc/ids.nix | 4 ++-- nixos/modules/services/databases/redis.nix | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 579a3f6393c..91207871d8c 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -200,7 +200,7 @@ memcached = 177; ntp = 179; zabbix = 180; - redis = 181; + #redis = 181; removed 2018-01-03 unifi = 183; uptimed = 184; zope2 = 185; @@ -478,7 +478,7 @@ #memcached = 177; # unused #ntp = 179; # unused #zabbix = 180; # unused - #redis = 181; # unused + #redis = 181; # unused, removed 2018-01-03 #unifi = 183; # unused #uptimed = 184; # unused #zope2 = 185; # unused diff --git a/nixos/modules/services/databases/redis.nix b/nixos/modules/services/databases/redis.nix index a039ad138f6..e4e38a4364a 100644 --- a/nixos/modules/services/databases/redis.nix +++ b/nixos/modules/services/databases/redis.nix @@ -219,7 +219,6 @@ in users.extraUsers.redis = { name = cfg.user; - uid = config.ids.uids.redis; description = "Redis database user"; }; From c9c8a2c5b3b72668656add5409853db8e15ea99d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 3 Jan 2018 12:10:45 +0100 Subject: [PATCH 126/296] nixos/memcached: make unix sockets usuable before: - /var/run/memcached is a bad default for a socket path, since its parent directory must be writeable by memcached. - Socket directory was not created by the module itself -> this was left as a burden to the user? - Having a static uid with a dynamic user name is not very useful. after: - Replace services.memcached.socket by a boolean flag. This simplifies our code, since we do not have to check if the user specifies a path with a parent directory that should be owned by memcached (/run/memcached/memcached.sock -> /run/memcached). - Remove fixed uid/gid allocation. The only file ever owned by the daemon is the socket that will be recreated on every start. Therefore user and group ids do not need to be static. - only create the memcached user, if the user has not specified a different one. The major use case for changing option is to allow existing services (such as php-fpm) opening the local unix socket. If we would unconditionally create a user that option would be useless. --- nixos/doc/manual/release-notes/rl-1803.xml | 8 +++ nixos/modules/misc/ids.nix | 4 +- .../modules/services/databases/memcached.nix | 51 ++++++++++--------- 3 files changed, 38 insertions(+), 25 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-1803.xml b/nixos/doc/manual/release-notes/rl-1803.xml index 3dc4c353e25..0ab119232ee 100644 --- a/nixos/doc/manual/release-notes/rl-1803.xml +++ b/nixos/doc/manual/release-notes/rl-1803.xml @@ -131,6 +131,14 @@ following incompatible changes: Other types dependencies should be unaffected. + + + The memcached service no longer accept dynamic socket + paths via . Unix sockets can be + still enabled by and + will be accessible at /run/memcached/memcached.sock. + + diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 579a3f6393c..d0cd32cb904 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -197,7 +197,7 @@ #input = 174; # unused sddm = 175; tss = 176; - memcached = 177; + #memcached = 177; removed 2018-01-03 ntp = 179; zabbix = 180; redis = 181; @@ -475,7 +475,7 @@ input = 174; sddm = 175; tss = 176; - #memcached = 177; # unused + #memcached = 177; # unused, removed 2018-01-03 #ntp = 179; # unused #zabbix = 180; # unused #redis = 181; # unused diff --git a/nixos/modules/services/databases/memcached.nix b/nixos/modules/services/databases/memcached.nix index c6875af506d..46bc6fc5c13 100644 --- a/nixos/modules/services/databases/memcached.nix +++ b/nixos/modules/services/databases/memcached.nix @@ -40,11 +40,7 @@ in description = "The port to bind to"; }; - socket = mkOption { - default = ""; - description = "Unix socket path to listen on. Setting this will disable network support"; - example = "/var/run/memcached"; - }; + enableUnixSocket = mkEnableOption "unix socket at /run/memcached/memcached.sock"; maxMemory = mkOption { default = 64; @@ -68,31 +64,40 @@ in config = mkIf config.services.memcached.enable { - users.extraUsers.memcached = - { name = cfg.user; - uid = config.ids.uids.memcached; - description = "Memcached server user"; - }; + users.extraUsers = optional (cfg.user == "memcached") { + name = "memcached"; + description = "Memcached server user"; + }; environment.systemPackages = [ memcached ]; - systemd.services.memcached = - { description = "Memcached server"; + systemd.services.memcached = { + description = "Memcached server"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; - serviceConfig = { - ExecStart = - let - networking = if cfg.socket != "" - then "-s ${cfg.socket}" - else "-l ${cfg.listen} -p ${toString cfg.port}"; - in "${memcached}/bin/memcached ${networking} -m ${toString cfg.maxMemory} -c ${toString cfg.maxConnections} ${concatStringsSep " " cfg.extraOptions}"; + serviceConfig = { + PermissionsStartOnly = true; + ExecStartPre = optionals cfg.enableUnixSocket [ + "${pkgs.coreutils}/bin/install -d -o ${cfg.user} /run/memcached/" + "${pkgs.coreutils}/bin/chown -R ${cfg.user} /run/memcached/" + ]; + ExecStart = + let + networking = if cfg.enableUnixSocket + then "-s /run/memcached/memcached.sock" + else "-l ${cfg.listen} -p ${toString cfg.port}"; + in "${memcached}/bin/memcached ${networking} -m ${toString cfg.maxMemory} -c ${toString cfg.maxConnections} ${concatStringsSep " " cfg.extraOptions}"; - User = cfg.user; - }; + User = cfg.user; }; + }; }; + imports = [ + (mkRemovedOptionModule ["services" "memcached" "socket"] '' + This option was replaced by a fixed unix socket path at /run/memcached/memcached.sock enabled using services.memached.enableUnixSocket. + '') + ]; } From 340cadd97d925ad239b8c98a53a75d8c6e9d62d5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 3 Jan 2018 14:33:50 +0100 Subject: [PATCH 127/296] python.pkgs.arrow: fix python 2 build --- pkgs/development/python-modules/arrow/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/arrow/default.nix b/pkgs/development/python-modules/arrow/default.nix index 72b88d3e557..374b82225a1 100644 --- a/pkgs/development/python-modules/arrow/default.nix +++ b/pkgs/development/python-modules/arrow/default.nix @@ -18,6 +18,10 @@ buildPythonPackage rec { checkInputs = [ nose chai simplejson ]; propagatedBuildInputs = [ dateutil backports_functools_lru_cache ]; + postPatch = '' + substituteInPlace setup.py --replace "==1.2.1" "" + ''; + meta = with stdenv.lib; { description = "Python library for date manipulation"; license = "apache"; From ab1fdc784d41252db40484cb51d26a8b5894f424 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Wed, 3 Jan 2018 14:42:56 +0100 Subject: [PATCH 128/296] osrm-backend: Use nativeBuildInputs for compile-time-only deps --- pkgs/servers/osrm-backend/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/osrm-backend/default.nix b/pkgs/servers/osrm-backend/default.nix index db5fe26cee6..fa8e7d087cc 100644 --- a/pkgs/servers/osrm-backend/default.nix +++ b/pkgs/servers/osrm-backend/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1ajgybjx7g6qzddavab8bj7il7wn5wy24nivjj5rk84mfbi71s5v"; }; - buildInputs = [ cmake pkgconfig bzip2 libxml2 libzip boost lua luabind tbb expat]; + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ bzip2 libxml2 libzip boost lua luabind tbb expat ]; postInstall = "mkdir -p $out/share/osrm-backend && cp -r ../profiles $out/share/osrm-backend/profiles"; From 96f0d3b9084bd1949f9b2b79e11ee7ee35bac084 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 3 Jan 2018 08:18:48 -0600 Subject: [PATCH 129/296] ncurses: simplify patch expr, fix ncurses6 build w/clang MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Somewhat amusingly given its name, "clang.patch" applies to both 5 and 6 but is the cause of ncurses6 breakage on 6 but is required on 5... gcc is happy in all four configurations: 5 5p 6 6p gcc ✓ ✓ ✓ ✓ clang ✗ ✓ ✓ ✗ Which is why this commit enables the patch for 5 but not 6; this matches behavior in Gentoo, for example. For further simplification, we also use gcc-5 patch regardless. --- pkgs/development/libraries/ncurses/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 79414f016d3..ae875faddd7 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { sha256 = "11adzj0k82nlgpfrflabvqn2m7fmhp2y6pd7ivmapynxqb9vvb92"; }); - patches = [ ./clang.patch ] ++ lib.optional (abiVersion == "5" && stdenv.cc.isGNU) ./gcc-5.patch; + patches = lib.optionals (abiVersion == "5") [ ./clang.patch ./gcc-5.patch ]; outputs = [ "out" "dev" "man" ]; setOutputFlags = false; # some aren't supported From 48a5212c15864dc8804133a53b28e43cb7a59050 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 3 Jan 2018 08:43:34 -0600 Subject: [PATCH 130/296] ncurses: use more complicated expression to avoid mass-rebuilds, note --- pkgs/development/libraries/ncurses/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index ae875faddd7..675756509c8 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -22,7 +22,9 @@ stdenv.mkDerivation rec { sha256 = "11adzj0k82nlgpfrflabvqn2m7fmhp2y6pd7ivmapynxqb9vvb92"; }); - patches = lib.optionals (abiVersion == "5") [ ./clang.patch ./gcc-5.patch ]; + # Unnecessarily complicated in order to avoid mass-rebuilds + patches = lib.optional (!stdenv.cc.isClang || abiVersion == "5") ./clang.patch + ++ lib.optional (stdenv.cc.isGNU && abiVersion == "5") ./gcc-5.patch; outputs = [ "out" "dev" "man" ]; setOutputFlags = false; # some aren't supported From 286e30e42c21419b7332c77ad2d62e0cdffee970 Mon Sep 17 00:00:00 2001 From: dywedir Date: Wed, 3 Jan 2018 19:19:27 +0200 Subject: [PATCH 131/296] fd: 6.1.0 -> 6.2.0 --- pkgs/tools/misc/fd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix index 6a7c2cc095d..2681d14665c 100644 --- a/pkgs/tools/misc/fd/default.nix +++ b/pkgs/tools/misc/fd/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { name = "fd-${version}"; - version = "6.1.0"; + version = "6.2.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = "fd"; rev = "v${version}"; - sha256 = "1md6k531ymsg99zc6y8lni4cpfz4rcklwgibq1i5xdam3hs1n2jg"; + sha256 = "1l1p7jlrryd54jwwrwgvs4njr3r59m8xsh31z7db0bzpw3dk7n5k"; }; - cargoSha256 = "00n2j0mjmd4lrfygnv90mixv3hfv1z56zyqcm957cwq08qavqzf1"; + cargoSha256 = "1dikix9d46f0ydi81ray2vdvsy6y326w8ql6c89zx0p9cjm8m83r"; preFixup = '' mkdir -p "$out/man/man1" From cc122e5ec302c523ded2572eb35f4a867f5f49a0 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Wed, 3 Jan 2018 19:55:38 +0100 Subject: [PATCH 132/296] font-lock-plus: 2017-0222.1755 -> 20180101.25 Also specified specific revisions of the file to download to not have a breaking package whenever the author decides to update the package. This happened on 2018-01-01 when the author updated the copyright of the package to match the new year. --- .../editors/emacs-modes/font-lock-plus/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/font-lock-plus/default.nix b/pkgs/applications/editors/emacs-modes/font-lock-plus/default.nix index 7b7004b72f3..733393307d3 100644 --- a/pkgs/applications/editors/emacs-modes/font-lock-plus/default.nix +++ b/pkgs/applications/editors/emacs-modes/font-lock-plus/default.nix @@ -2,11 +2,11 @@ melpaBuild { pname = "font-lock-plus"; - version = "20170222.1755"; + version = "20180101.25"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/font-lock+.el"; - sha256 = "0iajkgh0n3pbrwwxx9rmrrwz8dw2m7jsp4mggnhq7zsb20ighs30"; + url = "https://www.emacswiki.org/emacs/download/font-lock%2b.el?revision=25"; + sha256 = "0197yzn4hbjmw5h3m08264b7zymw63pdafph5f3yzfm50q8p7kp4"; name = "font-lock+.el"; }; From b2282b0e1d7967274f4e4539e7b43eef871cb5d5 Mon Sep 17 00:00:00 2001 From: Michel Kuhlmann Date: Wed, 3 Jan 2018 20:17:41 +0100 Subject: [PATCH 133/296] gdal: 2.2.1 -> 2.2.3 --- pkgs/development/libraries/gdal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 0f1637a87e9..54174e7cfe4 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -8,12 +8,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "2.2.1"; + version = "2.2.3"; name = "gdal-${version}"; src = fetchurl { url = "http://download.osgeo.org/gdal/${version}/${name}.tar.xz"; - sha256 = "0rk0p0k787whzzdl8m1f9wcrm7h9bf1pny3z96d93b4383arhw4j"; + sha256 = "a328d63d476b3653f5a25b5f7971e87a15cdf8860ab0729d4b1157ba988b8d0b"; }; buildInputs = [ unzip libjpeg libtiff libpng proj openssl sqlite From 3b33aba3096e452f720b1952383710117ef19fcf Mon Sep 17 00:00:00 2001 From: Michel Kuhlmann Date: Wed, 3 Jan 2018 20:18:57 +0100 Subject: [PATCH 134/296] saga: 5.0.0 -> 6.2.0 --- pkgs/applications/gis/saga/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix index 4d229450a4a..847421de3b1 100644 --- a/pkgs/applications/gis/saga/default.nix +++ b/pkgs/applications/gis/saga/default.nix @@ -2,15 +2,15 @@ libharu, opencv, vigra, postgresql }: stdenv.mkDerivation rec { - name = "saga-5.0.0"; + name = "saga-6.2.0"; buildInputs = [ gdal wxGTK30 proj libharu opencv vigra postgresql libiodbc lzma jasper ]; enableParallelBuilding = true; src = fetchurl { - url = "mirror://sourceforge/project/saga-gis/SAGA%20-%205/SAGA%20-%205.0.0/saga-5.0.0.tar.gz"; - sha256 = "9be997209737e80262d9f13fd9b9797194a9f2facb10e5b9bd756d8cda675089"; + url = "mirror://sourceforge/project/saga-gis/SAGA%20-%206/SAGA%20-%206.2.0/saga-6.2.0.tar.gz"; + sha256 = "91b030892c894ba02eb4292ebfc9ccbf4acf3062118f2a89a9a11208773fa280"; }; meta = { From 9d33aa50fe4f70f23d91b9753dcb660a718bbb34 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Tue, 2 Jan 2018 19:34:44 +0100 Subject: [PATCH 135/296] brotli: fix darwin build --- pkgs/tools/compression/brotli/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/compression/brotli/default.nix b/pkgs/tools/compression/brotli/default.nix index 92146f1f178..f4fbb368535 100644 --- a/pkgs/tools/compression/brotli/default.nix +++ b/pkgs/tools/compression/brotli/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "1rpg16zpr7h6vs7qr6npmqhyw4w5nkp24iq70s4dryn77m0r4mcv"; }; - buildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; outputs = [ "out" "dev" "lib" ]; @@ -21,6 +21,10 @@ stdenv.mkDerivation rec { # and the wonderful bazel BUILD file is already there (yay case-insensitivity?) prePatch = "rm BUILD"; + preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' + cmakeFlagsArray+=("-DCMAKE_INSTALL_NAME_DIR=$lib/lib") + ''; + meta = with stdenv.lib; { inherit (src.meta) homepage; From 707cfbf39a27058c14de5af36fb3b22febb7935b Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 3 Jan 2018 14:59:39 -0500 Subject: [PATCH 136/296] haskell: Add hoogle-5.0.14 for hie-hoogle. 5.0.14 is actually the version of hoogle in the stackage LTS we're tracking, but due to NixOS/cabal2nix@5c816fdee9316953a89101b207c5560d0a6bf8cc that isn't respected. --- .../configuration-hackage2nix.yaml | 1 + .../haskell-modules/hackage-packages.nix | 32 +++++++++++++++++++ .../haskell-modules/hie-packages.nix | 5 +-- 3 files changed, 36 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 97d6d9960e0..71b1d9b93b4 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2688,6 +2688,7 @@ extra-packages: - happy <1.19.6 # newer versions break Agda - haskell-gi-overloading == 0.0 # gi-* packages use this dependency to disable overloading support - haskell-src-exts == 1.19.* # required by hindent and structured-haskell-mode + - hoogle == 5.0.14 # required by hie-hoogle - hpack == 0.20.* # required by stack-1.6.1 - inline-c < 0.6 # required on GHC 8.0.x - inline-c-cpp < 0.2 # required on GHC 8.0.x diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index c4d9e490336..a3481d547e2 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -101685,6 +101685,38 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hoogle_5_0_14" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, cmdargs, conduit + , conduit-extra, connection, containers, deepseq, directory, extra + , filepath, haskell-src-exts, http-conduit, http-types, js-flot + , js-jquery, mmap, network, network-uri, old-locale, process + , process-extras, QuickCheck, resourcet, stdenv, storable-tuple + , tar, template-haskell, text, time, transformers, uniplate + , utf8-string, vector, wai, wai-logger, warp, warp-tls, zlib + }: + mkDerivation { + pname = "hoogle"; + version = "5.0.14"; + sha256 = "e7cfa9ca7496d7a30b476f3502c0dfa38671d4235042bb46806568602e97bbf8"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base binary bytestring cmdargs conduit conduit-extra + connection containers deepseq directory extra filepath + haskell-src-exts http-conduit http-types js-flot js-jquery mmap + network network-uri old-locale process process-extras QuickCheck + resourcet storable-tuple tar template-haskell text time + transformers uniplate utf8-string vector wai wai-logger warp + warp-tls zlib + ]; + executableHaskellDepends = [ base ]; + testTarget = "--test-option=--no-net"; + homepage = "http://hoogle.haskell.org/"; + description = "Haskell API Search"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hoogle" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, cmdargs, conduit , conduit-extra, connection, containers, deepseq, directory, extra diff --git a/pkgs/development/haskell-modules/hie-packages.nix b/pkgs/development/haskell-modules/hie-packages.nix index 41b28023348..5ed5fb62ca0 100644 --- a/pkgs/development/haskell-modules/hie-packages.nix +++ b/pkgs/development/haskell-modules/hie-packages.nix @@ -28,6 +28,7 @@ let src = pkgs.fetchFromGitHub }; cabal-helper = self.cabal-helper_hie; haddock-library = self.haddock-library_1_4_4; + hoogle = self.hoogle_5_0_14; ghc-dump-tree = self.ghc-dump-tree_hie; ghc-mod = self.ghc-mod_hie; HaRe = self.HaRe_hie; @@ -259,7 +260,7 @@ in homepage = "http://github.com/githubuser/haskell-ide-engine#readme"; description = "Provide a common engine to power any Haskell IDE"; license = stdenv.lib.licenses.bsd3; - }) {}; + }) { inherit hoogle; }; hie-apply-refact = callPackage ({ mkDerivation, aeson, apply-refact, base, either, extra, ghc-mod , ghc-mod-core, haskell-src-exts, hie-base, hie-plugin-api, hlint @@ -435,7 +436,7 @@ in ]; description = "Haskell IDE Hoogle plugin"; license = stdenv.lib.licenses.bsd3; - }) { inherit ghc-mod; }; + }) { inherit ghc-mod hoogle; }; hie-plugin-api = callPackage ({ mkDerivation, aeson, base, containers, Diff, directory, either , filepath, fingertree, ghc, ghc-mod-core, haskell-lsp, hie-base From 7147ef8e80ae9f5d7f13b0c29bbf7a4d27982d3d Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Wed, 3 Jan 2018 12:39:24 -0800 Subject: [PATCH 137/296] zbar: Enable building on darwin by disabling video support there --- pkgs/tools/graphics/zbar/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix index 87bb4923b8a..b8bf73fda64 100644 --- a/pkgs/tools/graphics/zbar/default.nix +++ b/pkgs/tools/graphics/zbar/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, imagemagickBig, pkgconfig, python2Packages, perl , libX11, libv4l, qt4, lzma, gtk2, fetchpatch, autoreconfHook +, enableVideo ? stdenv.isLinux }: let @@ -38,7 +39,12 @@ in stdenv.mkDerivation rec { buildInputs = [ imagemagickBig pkgconfig python pygtk perl libX11 - libv4l qt4 lzma gtk2 autoreconfHook ]; + lzma autoreconfHook ] ++ + stdenv.lib.optionals enableVideo [ libv4l gtk2 qt4 ]; + + configureFlags = stdenv.lib.optionals (!enableVideo) [ + "--disable-video" "--without-gtk" "--without-qt" + ]; hardeningDisable = [ "fortify" ]; @@ -52,7 +58,7 @@ in stdenv.mkDerivation rec { Code. ''; maintainers = with maintainers; [ raskin ]; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.lgpl21; homepage = http://zbar.sourceforge.net/; }; From d4bc14898df74a6fc2a0a6becce282b1dc50c8de Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Wed, 3 Jan 2018 19:25:38 +0100 Subject: [PATCH 138/296] fonttools: 3.21.0 -> 3.21.1 --- pkgs/development/python-modules/fonttools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix index a567f7155f8..f7dfb5a8edf 100644 --- a/pkgs/development/python-modules/fonttools/default.nix +++ b/pkgs/development/python-modules/fonttools/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "fonttools"; - version = "3.21.0"; + version = "3.21.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "95b5c66d19dbffd57be1636d1f737c7644d280a48c28f933aeb4db73a7c83495"; + sha256 = "1whama3bm34xp9l7f543sz2h9dms77ci820sdbxi5dl9krs4xkxb"; extension = "zip"; }; From 35462db2e3c09edc4b0222f901771d8138de2a0e Mon Sep 17 00:00:00 2001 From: Bojan Nikolic Date: Wed, 3 Jan 2018 19:26:16 +0000 Subject: [PATCH 139/296] Correct boost configure phase when enablePython is false The bootstrap script does not seem to have --without-python; instead just omit --with-python option --- pkgs/development/libraries/boost/generic.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 6ea7dba0cb1..c2a59431ac0 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -125,9 +125,9 @@ stdenv.mkDerivation { configureFlags = [ "--includedir=$(dev)/include" "--libdir=$(out)/lib" - (if enablePython then "--with-python=${python.interpreter}" else "--without-python") - (if hostPlatform == buildPlatform then "--with-icu=${icu.dev}" else "--without-icu") - ] ++ optional (toolset != null) "--with-toolset=${toolset}"; + ] ++ optional enablePython "--with-python=${python.interpreter}" + ++ [ (if hostPlatform == buildPlatform then "--with-icu=${icu.dev}" else "--without-icu") ] + ++ optional (toolset != null) "--with-toolset=${toolset}"; buildPhase = '' ./b2 ${b2Args} From 0df29e125997bf862335ebdafacbaa609e312adf Mon Sep 17 00:00:00 2001 From: John Ericson Date: Wed, 3 Jan 2018 16:42:32 -0500 Subject: [PATCH 140/296] ghc: Noramlized source URLs --- pkgs/development/compilers/ghc/6.10.4.nix | 2 +- pkgs/development/compilers/ghc/6.12.3.nix | 2 +- pkgs/development/compilers/ghc/7.0.4.nix | 2 +- pkgs/development/compilers/ghc/7.2.2.nix | 2 +- pkgs/development/compilers/ghc/7.4.2.nix | 2 +- pkgs/development/compilers/ghc/7.6.3.nix | 2 +- pkgs/development/compilers/ghc/7.8.4.nix | 2 +- pkgs/development/compilers/ghc/8.0.2.nix | 2 +- pkgs/development/compilers/ghc/8.2.2.nix | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/compilers/ghc/6.10.4.nix b/pkgs/development/compilers/ghc/6.10.4.nix index 18b4385834d..0308edbd56c 100644 --- a/pkgs/development/compilers/ghc/6.10.4.nix +++ b/pkgs/development/compilers/ghc/6.10.4.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { name = "ghc-${version}"; src = fetchurl { - url = "${meta.homepage}/dist/${version}/${name}-src.tar.bz2"; + url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.bz2"; sha256 = "d66a8e52572f4ff819fe5c4e34c6dd1e84a7763e25c3fadcc222453c0bd8534d"; }; diff --git a/pkgs/development/compilers/ghc/6.12.3.nix b/pkgs/development/compilers/ghc/6.12.3.nix index a9779ab49fb..16d6d39e95f 100644 --- a/pkgs/development/compilers/ghc/6.12.3.nix +++ b/pkgs/development/compilers/ghc/6.12.3.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { name = "ghc-${version}"; src = fetchurl { - url = "http://darcs.haskell.org/download/dist/${version}/${name}-src.tar.bz2"; + url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.bz2"; sha256 = "0s2y1sv2nq1cgliv735q2w3gg4ykv1c0g1adbv8wgwhia10vxgbc"; }; diff --git a/pkgs/development/compilers/ghc/7.0.4.nix b/pkgs/development/compilers/ghc/7.0.4.nix index a1931411d94..0f560313007 100644 --- a/pkgs/development/compilers/ghc/7.0.4.nix +++ b/pkgs/development/compilers/ghc/7.0.4.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { name = "ghc-${version}"; src = fetchurl { - url = "http://haskell.org/ghc/dist/${version}/${name}-src.tar.bz2"; + url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.bz2"; sha256 = "1a9b78d9d66c9c21de6c0932e36bb87406a4856f1611bf83bd44539bdc6ed0ed"; }; diff --git a/pkgs/development/compilers/ghc/7.2.2.nix b/pkgs/development/compilers/ghc/7.2.2.nix index 15f860dd211..cb8470bcff1 100644 --- a/pkgs/development/compilers/ghc/7.2.2.nix +++ b/pkgs/development/compilers/ghc/7.2.2.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { name = "ghc-${version}"; src = fetchurl { - url = "http://haskell.org/ghc/dist/${version}/${name}-src.tar.bz2"; + url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.bz2"; sha256 = "0g87d3z9275dniaqzkf56qfgzp1msd89nqqhhm2gkc6iga072spz"; }; diff --git a/pkgs/development/compilers/ghc/7.4.2.nix b/pkgs/development/compilers/ghc/7.4.2.nix index d28980a01d3..6f30b03efb9 100644 --- a/pkgs/development/compilers/ghc/7.4.2.nix +++ b/pkgs/development/compilers/ghc/7.4.2.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { name = "ghc-${version}"; src = fetchurl { - url = "http://haskell.org/ghc/dist/7.4.2/${name}-src.tar.bz2"; + url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.bz2"; sha256 = "0vc3zmxqi4gflssmj35n5c8idbvyrhd88abi50whbirwlf4i5vpj"; }; diff --git a/pkgs/development/compilers/ghc/7.6.3.nix b/pkgs/development/compilers/ghc/7.6.3.nix index 7549b43bce1..78202297686 100644 --- a/pkgs/development/compilers/ghc/7.6.3.nix +++ b/pkgs/development/compilers/ghc/7.6.3.nix @@ -22,7 +22,7 @@ in stdenv.mkDerivation rec { name = "ghc-${version}"; src = fetchurl { - url = "http://haskell.org/ghc/dist/${version}/${name}-src.tar.bz2"; + url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.bz2"; sha256 = "1669m8k9q72rpd2mzs0bh2q6lcwqiwd1ax3vrard1dgn64yq4hxx"; }; diff --git a/pkgs/development/compilers/ghc/7.8.4.nix b/pkgs/development/compilers/ghc/7.8.4.nix index 7cea395efc9..b5e2ac256a7 100644 --- a/pkgs/development/compilers/ghc/7.8.4.nix +++ b/pkgs/development/compilers/ghc/7.8.4.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (rec { name = "ghc-${version}"; src = fetchurl { - url = "http://www.haskell.org/ghc/dist/7.8.4/${name}-src.tar.xz"; + url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz"; sha256 = "1i4254akbb4ym437rf469gc0m40bxm31blp6s1z1g15jmnacs6f3"; }; diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix index 924f927b0bc..f1f61acd768 100644 --- a/pkgs/development/compilers/ghc/8.0.2.nix +++ b/pkgs/development/compilers/ghc/8.0.2.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { name = "${targetPrefix}ghc-${version}"; src = fetchurl { - url = "https://downloads.haskell.org/~ghc/8.0.2/ghc-${version}-src.tar.xz"; + url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz"; sha256 = "1c8qc4fhkycynk4g1f9hvk53dj6a1vvqi6bklqznns6hw59m8qhi"; }; diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix index f39edff5ef3..357768549c8 100644 --- a/pkgs/development/compilers/ghc/8.2.2.nix +++ b/pkgs/development/compilers/ghc/8.2.2.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (rec { name = "ghc-${version}"; src = fetchurl { - url = "https://downloads.haskell.org/~ghc/8.2.2/${name}-src.tar.xz"; + url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz"; sha256 = "1z05vkpaj54xdypmaml50hgsdpw29dhbs2r7magx0cm199iw73mv"; }; From 3fb5fd0060d51b0a7c52921dc1c66cee6fe622ed Mon Sep 17 00:00:00 2001 From: John Ericson Date: Wed, 3 Jan 2018 16:29:18 -0500 Subject: [PATCH 141/296] ghc: Normalize derivations in hash-preserving ways --- pkgs/development/compilers/ghc/7.10.3.nix | 2 +- pkgs/development/compilers/ghc/8.0.2.nix | 2 +- pkgs/development/compilers/ghc/8.2.2.nix | 7 ++----- pkgs/development/compilers/ghc/head.nix | 4 +--- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/pkgs/development/compilers/ghc/7.10.3.nix b/pkgs/development/compilers/ghc/7.10.3.nix index 373172540db..1d9e2814a1f 100644 --- a/pkgs/development/compilers/ghc/7.10.3.nix +++ b/pkgs/development/compilers/ghc/7.10.3.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { # 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"; + stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; postInstall = '' # Install the bash completion file. diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix index f1f61acd768..762fe547ca9 100644 --- a/pkgs/development/compilers/ghc/8.0.2.nix +++ b/pkgs/development/compilers/ghc/8.0.2.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { # 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"; + stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; postInstall = '' paxmark m $out/lib/${name}/bin/${if targetPlatform != hostPlatform then "ghc" else "{ghc,haddock}"} diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix index 357768549c8..bffc7c3fc6c 100644 --- a/pkgs/development/compilers/ghc/8.2.2.nix +++ b/pkgs/development/compilers/ghc/8.2.2.nix @@ -17,7 +17,6 @@ assert !enableIntegerSimple -> gmp != null; let inherit (bootPkgs) ghc; - version = "8.2.2"; # TODO(@Ericson2314) Make unconditional targetPrefix = stdenv.lib.optionalString @@ -25,8 +24,8 @@ let "${targetPlatform.config}-"; in stdenv.mkDerivation (rec { - inherit version; - name = "ghc-${version}"; + version = "8.2.2"; + name = "${targetPrefix}ghc-${version}"; src = fetchurl { url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz"; @@ -100,8 +99,6 @@ stdenv.mkDerivation (rec { }; } // stdenv.lib.optionalAttrs (cross != null) { - name = "${cross.config}-ghc-${version}"; - configureFlags = [ "CC=${stdenv.cc}/bin/${cross.config}-cc" "LD=${stdenv.cc.bintools}/bin/${cross.config}-ld" diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index c5be301baf6..9b4c932eb11 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -29,7 +29,7 @@ let in stdenv.mkDerivation (rec { inherit version rev; - name = "ghc-${version}"; + name = "${targetPrefix}ghc-${version}"; src = fetchgit { url = "git://git.haskell.org/ghc.git"; @@ -107,8 +107,6 @@ stdenv.mkDerivation (rec { }; } // stdenv.lib.optionalAttrs (cross != null) { - name = "${cross.config}-ghc-${version}"; - configureFlags = [ "CC=${stdenv.cc}/bin/${cross.config}-cc" "LD=${stdenv.cc.bintools}/bin/${cross.config}-ld" From 319722113e92e2bad3aeb9278f2f9c4d5b7db425 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Wed, 3 Jan 2018 23:11:21 +0100 Subject: [PATCH 142/296] lib/generators: abort on pattern match failure --- lib/generators.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/generators.nix b/lib/generators.nix index b27ab485f41..f207033c955 100644 --- a/lib/generators.nix +++ b/lib/generators.nix @@ -130,6 +130,6 @@ rec { (name: value: "${toPretty args name} = ${toPretty args value};") v) + " }" - else "toPretty: should never happen (v = ${v})"; + else abort "toPretty: should never happen (v = ${v})"; } From d732c53c1557abf16bb55c0f173f1bac7d8cdefe Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Mon, 25 Dec 2017 14:58:31 +0100 Subject: [PATCH 143/296] linux-steam-integration: init at 0.7.2 --- .../games/linux-steam-integration/default.nix | 80 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 + 2 files changed, 84 insertions(+) create mode 100644 pkgs/games/linux-steam-integration/default.nix diff --git a/pkgs/games/linux-steam-integration/default.nix b/pkgs/games/linux-steam-integration/default.nix new file mode 100644 index 00000000000..161f4691c8f --- /dev/null +++ b/pkgs/games/linux-steam-integration/default.nix @@ -0,0 +1,80 @@ +{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, git, gtk, pkgs, gettext, + gcc_multi, libressl }: + +let + version = "0.7.2"; + steamBinPath = "${stdenv.lib.makeBinPath (with pkgs; [ steam ])}/steam"; + zenityBinPath = "${stdenv.lib.makeBinPath (with pkgs; [ gnome3.zenity ])}/zenity"; + +in stdenv.mkDerivation rec { + name = "linux-steam-integration-${version}"; + + nativeBuildInputs = [ meson ninja pkgconfig git gettext gcc_multi ]; + buildInputs = [ gtk libressl ]; + + src = fetchFromGitHub { + owner = "solus-project"; + repo = "linux-steam-integration"; + rev = "v${version}"; + sha256 = "0yn71fvjqi63dxk04jsndb26pgipl0nla10sy94bi7q95pk3sdf6"; + fetchSubmodules = true; + }; + + # Patch lib paths (AUDIT_PATH and REDIRECT_PATH) in shim.c + # Patch path to lsi-steam in lsi-steam.desktop + # Patch path to zenity in lsi.c + postPatch = '' + sed -i -e "s|/usr/|$out/|g" src/shim/shim.c + sed -i -e "s|/usr/|$out/|g" data/lsi-steam.desktop + sed -i -e "s|zenity|${zenityBinPath}|g" src/lsi/lsi.c + ''; + + configurePhase = '' + # Configure 64bit things + meson build \ + -Dwith-shim=co-exist \ + -Dwith-frontend=true \ + -Dwith-steam-binary=${steamBinPath} \ + -Dwith-new-libcxx-abi=true \ + -Dwith-libressl-mode=native \ + --prefix / \ + --libexecdir lib \ + --libdir lib \ + --bindir bin + + # Configure 32bit things + CC="gcc -m32" CXX="g++ -m32" meson build32 \ + -Dwith-shim=none \ + -Dwith-libressl-mode=native \ + --prefix / \ + --libexecdir lib32 \ + --libdir lib32 + ''; + + buildPhase = '' + # Build 64bit things + ninja -C build + + # Build 32bit things + ninja -C build32 + ''; + + installPhase = '' + DESTDIR="$out" ninja -C build install + DESTDIR="$out" ninja -C build32 install + ''; + + meta = with stdenv.lib; { + description = "Steam wrapper to improve compability and performance"; + longDescription = '' + Linux Steam Integration is a helper system to make the Steam Client and + Steam games run better on Linux. In a nutshell, LSI automatically applies + various workarounds to get games working, and fixes long standing bugs in + both games and the client + ''; + homepage = https://github.com/solus-project/linux-steam-integration; + license = licenses.lgpl21; + maintainers = [ maintainers.etu ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 254740c3460..54cdf4e8ad8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18429,6 +18429,10 @@ with pkgs; nativeOnly = true; }).run; + linux-steam-integration = callPackage ../games/linux-steam-integration { + gtk = pkgs.gtk3; + }; + stepmania = callPackage ../games/stepmania { ffmpeg = ffmpeg_2; }; From e8caa47b357405ad3e4791e501e3e047ff8cba16 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Wed, 3 Jan 2018 13:39:37 -0800 Subject: [PATCH 144/296] nss: Omit an extraneous definition; fix other problems on Darwin --- pkgs/development/libraries/nss/ckpem.patch | 11 +++++++++++ pkgs/development/libraries/nss/default.nix | 19 ++++++++++++++----- 2 files changed, 25 insertions(+), 5 deletions(-) create mode 100644 pkgs/development/libraries/nss/ckpem.patch diff --git a/pkgs/development/libraries/nss/ckpem.patch b/pkgs/development/libraries/nss/ckpem.patch new file mode 100644 index 00000000000..c1a65a6c0b2 --- /dev/null +++ b/pkgs/development/libraries/nss/ckpem.patch @@ -0,0 +1,11 @@ +--- nss/lib/ckfw/pem/ckpem.h 2018-01-03 13:36:12.000000000 -0800 ++++ nss/lib/ckfw/pem/ckpem.h 2018-01-03 13:36:20.000000000 -0800 +@@ -156,8 +156,6 @@ + NSS_EXTERN_DATA pemInternalObject nss_pem_data[]; + NSS_EXTERN_DATA const PRUint32 nss_pem_nObjects; + +- PRBool logged_in; +- + /* our raw object data array */ + NSS_EXTERN_DATA pemInternalObject nss_pem_data[]; + NSS_EXTERN_DATA const PRUint32 nss_pem_nObjects; diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 3e8ed856bfa..47f5c1ef5cf 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -28,6 +28,7 @@ in stdenv.mkDerivation rec { [ # Based on http://patch-tracker.debian.org/patch/series/dl/nss/2:3.15.4-1/85_security_load.patch ./85_security_load.patch + ./ckpem.patch ]; patchFlags = "-p0"; @@ -45,7 +46,8 @@ in stdenv.mkDerivation rec { "NSS_ENABLE_ECC=1" "USE_SYSTEM_ZLIB=1" "NSS_USE_SYSTEM_SQLITE=1" - ] ++ stdenv.lib.optional stdenv.is64bit "USE_64=1"; + ] ++ stdenv.lib.optional stdenv.is64bit "USE_64=1" + ++ stdenv.lib.optional stdenv.isDarwin "CCC=clang++"; NIX_CFLAGS_COMPILE = "-Wno-error"; @@ -84,15 +86,22 @@ in stdenv.mkDerivation rec { postFixup = '' for libname in freebl3 nssdbm3 softokn3 - do - libfile="$out/lib/lib$libname.so" - LD_LIBRARY_PATH=$out/lib $out/bin/shlibsign -v -i "$libfile" + do '' + + (if stdenv.isDarwin + then '' + libfile="$out/lib/lib$libname.dylib" + DYLD_LIBRARY_PATH=$out/lib:${nspr.out}/lib \ + '' else '' + libfile="$out/lib/lib$libname.so" + LD_LIBRARY_PATH=$out/lib:${nspr.out}/lib \ + '') + '' + $out/bin/shlibsign -v -i "$libfile" done moveToOutput bin "$tools" moveToOutput bin/nss-config "$dev" moveToOutput lib/libcrmf.a "$dev" # needed by firefox, for example - rm "$out"/lib/*.a + rm -f "$out"/lib/*.a ''; meta = { From 75634afba892419057ce93e72aa1360acc27c1a5 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Wed, 3 Jan 2018 12:39:50 -0800 Subject: [PATCH 145/296] pass-otp: New expression --- pkgs/tools/security/pass-otp/default.nix | 25 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 26 insertions(+) create mode 100644 pkgs/tools/security/pass-otp/default.nix diff --git a/pkgs/tools/security/pass-otp/default.nix b/pkgs/tools/security/pass-otp/default.nix new file mode 100644 index 00000000000..70350f669e9 --- /dev/null +++ b/pkgs/tools/security/pass-otp/default.nix @@ -0,0 +1,25 @@ +{ stdenv, pass, fetchFromGitHub }: +stdenv.mkDerivation { + name = "pass-otp"; + + src = fetchFromGitHub { + owner = "tadfisher"; + repo = "pass-otp"; + rev = "f2feb3082324a91089782af9b7fbb71d34aa213d"; + sha256 = "0iklvcfgw1320dggdr02lq3bc7xvnd2934l1w9kkjpbsfmhs955c"; + }; + + buildInputs = [ pass ]; + + installPhase = '' + make PREFIX=$out install + ''; + + meta = with stdenv.lib; { + description = "A pass extension for managing one-time-password (OTP) tokens"; + homepage = https://github.com/tadfisher/pass-otp; + license = licenses.gpl3; + maintainers = with maintainers; [ jwiegley ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 69bc811d7e1..670c4b1e46e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -626,6 +626,7 @@ with pkgs; lastpass-cli = callPackage ../tools/security/lastpass-cli { }; pass = callPackage ../tools/security/pass { }; + pass-otp = callPackage ../tools/security/pass-otp { }; gopass = callPackage ../tools/security/gopass { }; From 29510ca8fea668e82e6115d9227838504f67866c Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Wed, 3 Jan 2018 15:23:14 -0800 Subject: [PATCH 146/296] pass-otp: Change oathtool reference into an absolute path --- pkgs/tools/security/pass-otp/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/pass-otp/default.nix b/pkgs/tools/security/pass-otp/default.nix index 70350f669e9..327a9680f98 100644 --- a/pkgs/tools/security/pass-otp/default.nix +++ b/pkgs/tools/security/pass-otp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pass, fetchFromGitHub }: +{ stdenv, pass, fetchFromGitHub, oathToolkit }: stdenv.mkDerivation { name = "pass-otp"; @@ -9,7 +9,11 @@ stdenv.mkDerivation { sha256 = "0iklvcfgw1320dggdr02lq3bc7xvnd2934l1w9kkjpbsfmhs955c"; }; - buildInputs = [ pass ]; + buildInputs = [ pass oathToolkit ]; + + patchPhase = '' + sed -i -e 's|OATH=\$(which oathtool)|OATH=${oathToolkit}/bin/oathtool|' otp.bash + ''; installPhase = '' make PREFIX=$out install From a325405c930a60b5cd241fb6fde8eac2eac8d826 Mon Sep 17 00:00:00 2001 From: Mathieu Boespflug Date: Thu, 4 Jan 2018 00:33:15 +0100 Subject: [PATCH 147/296] bazel: 0.8.0 -> 0.9.0 (#33082) --- pkgs/development/tools/build-managers/bazel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index 41861a6142e..67d186c5a25 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { - version = "0.8.0"; + version = "0.9.0"; meta = with stdenv.lib; { homepage = "https://github.com/bazelbuild/bazel/"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - sha256 = "0y50fhwh135fim39ra4szwzzgyb4ibls3i0hpv3d7asns0hh715a"; + sha256 = "0aiifrp6g1d3ilhg8111wdhsrjy41x8gcmq67rjyxypw9znqzcpg"; }; sourceRoot = "."; From 5b72e1be768b78c40f5c222016edd00aa3c35ec2 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Thu, 4 Jan 2018 00:22:23 +0100 Subject: [PATCH 148/296] libtorrentRasterbar: 1.1.5 -> 1.1.6 --- pkgs/development/libraries/libtorrent-rasterbar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix index ff5027fd472..00ec2298617 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix @@ -1,6 +1,6 @@ args@{ callPackage, ... }: callPackage (import ./generic.nix { - version = "1.1.5"; - sha256 = "1ifpcqw5mj2dwk23lhc2vpb47mg3j573v5z4zp8dkczpz7wg5jxq"; + version = "1.1.6"; + sha256 = "1xlh0sqypjbx0imw3bkbjwgwb4bm6zl7c0y01p0xsw8ncfmwjll7"; }) args From 97317562057cd5c94f11567c6c25e8e829a2453b Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Thu, 4 Jan 2018 00:40:18 +0100 Subject: [PATCH 149/296] deluge: use libtorrentRasterbar instead of libtorrentRasterbar_1_0 --- pkgs/applications/networking/p2p/deluge/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/p2p/deluge/default.nix b/pkgs/applications/networking/p2p/deluge/default.nix index 7f8594b8bbb..c6e5d0f3cb3 100644 --- a/pkgs/applications/networking/p2p/deluge/default.nix +++ b/pkgs/applications/networking/p2p/deluge/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, libtorrentRasterbar_1_0, pythonPackages }: +{ stdenv, fetchurl, intltool, libtorrentRasterbar, pythonPackages }: pythonPackages.buildPythonPackage rec { name = "deluge-${version}"; version = "1.3.15"; @@ -9,7 +9,7 @@ pythonPackages.buildPythonPackage rec { }; propagatedBuildInputs = with pythonPackages; [ - pyGtkGlade libtorrentRasterbar_1_0 twisted Mako chardet pyxdg pyopenssl service-identity + pyGtkGlade libtorrentRasterbar twisted Mako chardet pyxdg pyopenssl service-identity ]; nativeBuildInputs = [ intltool ]; From cc097d752d5c40d7e2d9fadbf7b44126b15045e6 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Thu, 4 Jan 2018 00:40:47 +0100 Subject: [PATCH 150/296] libtorrentRasterbar_1_0: removed since the last consumer is gone --- .../libraries/libtorrent-rasterbar/1.0.nix | 13 ------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 15 deletions(-) delete mode 100644 pkgs/development/libraries/libtorrent-rasterbar/1.0.nix diff --git a/pkgs/development/libraries/libtorrent-rasterbar/1.0.nix b/pkgs/development/libraries/libtorrent-rasterbar/1.0.nix deleted file mode 100644 index fbd30ac04f7..00000000000 --- a/pkgs/development/libraries/libtorrent-rasterbar/1.0.nix +++ /dev/null @@ -1,13 +0,0 @@ -args@{ callPackage, fetchpatch, ... }: - -callPackage (import ./generic.nix { - version = "1.0.11"; - sha256 = "17p34d3n29q04pvz975gfl1fyj3sg9cl5l6j673xqfq3fpyis58i"; - patches = [ - # Compatibility with new Boost - (fetchpatch { - url = "https://github.com/arvidn/libtorrent/commit/7eb3cf6bc6dbada3fa7bb7ff4d5981182813a0e2.patch"; - sha256 = "07agbrii6i8q4wmgpqbln7ldhhadaf5npcinvi6hnyipsr48jbj5"; - }) - ]; -}) args diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 670c4b1e46e..2341d1567c0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9835,8 +9835,6 @@ with pkgs; libtorrentRasterbar = callPackage ../development/libraries/libtorrent-rasterbar { }; - libtorrentRasterbar_1_0 = callPackage ../development/libraries/libtorrent-rasterbar/1.0.nix { }; - libtoxcore-new = callPackage ../development/libraries/libtoxcore/new-api.nix { }; libtoxcore = callPackage ../development/libraries/libtoxcore { }; From 91f15c9c7267f11a7bc406bf7a0e02e4aa953bdc Mon Sep 17 00:00:00 2001 From: adisbladis Date: Thu, 4 Jan 2018 00:51:07 +0100 Subject: [PATCH 151/296] qbittorrent: 4.0.1 -> 4.0.3 --- pkgs/applications/networking/p2p/qbittorrent/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index 1cf6db21bed..a2b72ea99dc 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -10,11 +10,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "qbittorrent-${version}"; - version = "4.0.1"; + version = "4.0.3"; src = fetchurl { url = "mirror://sourceforge/qbittorrent/${name}.tar.xz"; - sha256 = "0khy875ahh9rlk8lyfpwsbxjsbp7i1cwqvd1j1s4cqc812szh3z3"; + sha256 = "1lkbrvpzdfbqwilj09a9vraai7pz6dh999w4vl51mj1adm7bh0ws"; }; nativeBuildInputs = [ pkgconfig which ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2341d1567c0..5482392ac26 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16539,9 +16539,7 @@ with pkgs; pythonmagick = callPackage ../applications/graphics/PythonMagick { }; - qbittorrent = libsForQt5.callPackage ../applications/networking/p2p/qbittorrent { - libtorrentRasterbar = libtorrentRasterbar_1_0; - }; + qbittorrent = libsForQt5.callPackage ../applications/networking/p2p/qbittorrent { }; eiskaltdcpp = callPackage ../applications/networking/p2p/eiskaltdcpp { lua5 = lua5_1; From 0ee70af836aac3f7fecdc0e26cfb9781830ee64a Mon Sep 17 00:00:00 2001 From: David McFarland Date: Wed, 3 Jan 2018 20:08:29 -0400 Subject: [PATCH 152/296] transgui: fix crash at startup with file argument --- .../applications/networking/p2p/transgui/r988-compile-fix.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/p2p/transgui/r988-compile-fix.patch b/pkgs/applications/networking/p2p/transgui/r988-compile-fix.patch index fe5a04fee81..4b070d0cbe8 100644 --- a/pkgs/applications/networking/p2p/transgui/r988-compile-fix.patch +++ b/pkgs/applications/networking/p2p/transgui/r988-compile-fix.patch @@ -16,7 +16,7 @@ index eb8b828..1ff2440 100644 function ParamStrUTF8(Param: Integer): utf8string; begin - Result:=FileUtil.ParamStrUTF8(Param); -+ Result:=ParamStrUTF8(Param); ++ Result:=LazUtf8.ParamStrUTF8(Param); end; function ParamCount: integer; From dd602120a02a3a9c239d56c3c17103f3df56f4f0 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Wed, 3 Jan 2018 19:34:32 -0500 Subject: [PATCH 153/296] doc: Obtaining NixOS now refers to USB media creation chapter. This: * Removes contradiction with information in the later paragraph. * Removes a dead link to the Wiki. --- nixos/doc/manual/installation/obtaining.xml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/nixos/doc/manual/installation/obtaining.xml b/nixos/doc/manual/installation/obtaining.xml index 20a4838be88..c19508f2161 100644 --- a/nixos/doc/manual/installation/obtaining.xml +++ b/nixos/doc/manual/installation/obtaining.xml @@ -12,12 +12,8 @@ download page. There are a number of installation options. If you happen to have an optical drive and a spare CD, burning the image to CD and booting from that is probably the easiest option. Most people will need to prepare a USB stick to boot from. -Unetbootin is recommended and the process is described in brief below. -Note that systems which use UEFI require some additional manual steps. -If you run into difficulty a number of alternative methods are presented -in the NixOS -Wiki. + describes the preferred method +to prepare a USB stick. As an alternative to installing NixOS yourself, you can get a running NixOS system through several other means: From 0e6346f16a9989a9c218b13875c466e0ba3134dd Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Wed, 3 Jan 2018 19:35:40 -0500 Subject: [PATCH 154/296] doc: Obtaining NixOS: New link to section in wiki. This adds a link to the new section in the new wiki that refers to the same contents as the previously removed link. --- nixos/doc/manual/installation/obtaining.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/doc/manual/installation/obtaining.xml b/nixos/doc/manual/installation/obtaining.xml index c19508f2161..9b2b474c60c 100644 --- a/nixos/doc/manual/installation/obtaining.xml +++ b/nixos/doc/manual/installation/obtaining.xml @@ -14,6 +14,9 @@ image to CD and booting from that is probably the easiest option. Most people will need to prepare a USB stick to boot from. describes the preferred method to prepare a USB stick. +A number of alternative methods are presented in the NixOS +Wiki. As an alternative to installing NixOS yourself, you can get a running NixOS system through several other means: From bf4936d88ffddda66fc11fe05896b50a76dda601 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Thu, 4 Jan 2018 02:15:07 +0100 Subject: [PATCH 155/296] memcached: 1.4.39 -> 1.5.4 --- pkgs/servers/memcached/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix index fabd5b83724..c625ce575f2 100644 --- a/pkgs/servers/memcached/default.nix +++ b/pkgs/servers/memcached/default.nix @@ -1,11 +1,12 @@ {stdenv, fetchurl, cyrus_sasl, libevent}: stdenv.mkDerivation rec { - name = "memcached-1.4.39"; + version = "1.5.4"; + name = "memcached-${version}"; src = fetchurl { url = "http://memcached.org/files/${name}.tar.gz"; - sha256 = "0dfpmx0fqgp55j4vl06cz63fwx5kzhzipdm7n2kxjkvyg1ybzi13"; + sha256 = "1m03fhzq1f9byk2agccsr0x458niqqjpips5mbcgzhm4kylczhz0"; }; buildInputs = [cyrus_sasl libevent]; From b651b552c95ea578431fefb42260446b9961d772 Mon Sep 17 00:00:00 2001 From: volth Date: Thu, 4 Jan 2018 02:07:49 +0000 Subject: [PATCH 156/296] coursier: 1.0.0-RC13 -> 1.0.0 --- pkgs/development/tools/coursier/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/coursier/default.nix b/pkgs/development/tools/coursier/default.nix index 2f220001070..79a077f4a75 100644 --- a/pkgs/development/tools/coursier/default.nix +++ b/pkgs/development/tools/coursier/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "coursier-${version}"; - version = "1.0.0-RC13"; + version = "1.0.0"; src = fetchurl { url = "https://github.com/coursier/coursier/raw/v${version}/coursier"; - sha256 = "18i7imd6lqkvpzhx1m72g6jwsqq7h6aisfny5aiccgnyg6jpag6i"; + sha256 = "0167cgp3kqx336p8dmlxx57bi3lhzyp6ncly28v1s7r2sjxj9krj"; }; nativeBuildInputs = [ makeWrapper ]; From eac3d9ce697102fdd103526b8c7ca425514cdc32 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Thu, 4 Jan 2018 03:13:34 +0100 Subject: [PATCH 157/296] gopass: 1.6.6 -> 1.6.7 --- pkgs/tools/security/gopass/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index d03c08211c2..abe7aa1fc7c 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub, git, gnupg, makeWrapper }: buildGoPackage rec { - version = "1.6.6"; + version = "1.6.7"; name = "gopass-${version}"; goPackagePath = "github.com/justwatchcom/gopass"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "justwatchcom"; repo = "gopass"; rev = "v${version}"; - sha256 = "0n3isjrjpn2cnlwfdkjdcz5j8n16dhyaw4zyjpmis51nl0bqd3jw"; + sha256 = "0al2avdvmnnz7h21hnvlacr20k50my5l67plgf4cphy52p9461vp"; }; wrapperPath = with stdenv.lib; makeBinPath ([ From ebeb95d18b7166562c944884f9382bac1703eeff Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Wed, 3 Jan 2018 04:22:37 -0600 Subject: [PATCH 158/296] z3: 4.5.0-2017-11-06 -> 4.6.0 Signed-off-by: Austin Seipp --- pkgs/applications/science/logic/z3/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix index be25738a607..532df11209b 100644 --- a/pkgs/applications/science/logic/z3/default.nix +++ b/pkgs/applications/science/logic/z3/default.nix @@ -4,13 +4,13 @@ let python = python2; in stdenv.mkDerivation rec { name = "z3-${version}"; - version = "4.5.0-2017-11-06"; + version = "4.6.0"; src = fetchFromGitHub { owner = "Z3Prover"; repo = "z3"; - rev = "3350f32e1f2c01c9df63b7d71899796a18ce2272"; - sha256 = "00jn0njn5h9v49pl67yxj6225m6334ndrx6mp37vcqac05pdbpw7"; + rev = "b0aaa4c6d7a739eb5e8e56a73e0486df46483222"; + sha256 = "1cgwlmjdbf4rsv2rriqi2sdpz9qxihxrcpm6a4s37ijy437xg78l"; }; buildInputs = [ python fixDarwinDylibNames ]; From f8fd0b7a5f1dfdc401df41ba2ccac4e56a220c89 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 3 Jan 2018 06:55:38 +0100 Subject: [PATCH 159/296] zcash: 1.0.12 -> 1.0.13 libsnark now comes bundled with zcash. --- pkgs/applications/altcoins/zcash/default.nix | 13 +++--- .../altcoins/zcash/libsnark/ate-pairing.nix | 29 ------------ .../altcoins/zcash/libsnark/default.nix | 45 ------------------- .../altcoins/zcash/libsnark/mie.nix | 27 ----------- .../altcoins/zcash/libsnark/xbyak.nix | 28 ------------ 5 files changed, 5 insertions(+), 137 deletions(-) delete mode 100644 pkgs/applications/altcoins/zcash/libsnark/ate-pairing.nix delete mode 100644 pkgs/applications/altcoins/zcash/libsnark/default.nix delete mode 100644 pkgs/applications/altcoins/zcash/libsnark/mie.nix delete mode 100644 pkgs/applications/altcoins/zcash/libsnark/xbyak.nix diff --git a/pkgs/applications/altcoins/zcash/default.nix b/pkgs/applications/altcoins/zcash/default.nix index e9236544ee7..6a8fba3c2bb 100644 --- a/pkgs/applications/altcoins/zcash/default.nix +++ b/pkgs/applications/altcoins/zcash/default.nix @@ -2,20 +2,19 @@ , zlib, gtest, gmock, callPackage, gmp, qt4, utillinux, protobuf, qrencode, libevent , withGui }: -let libsnark = callPackage ./libsnark { inherit boost openssl; }; - librustzcash = callPackage ./librustzcash {}; +let librustzcash = callPackage ./librustzcash {}; in with stdenv.lib; stdenv.mkDerivation rec { name = "zcash" + (toString (optional (!withGui) "d")) + "-" + version; - version = "1.0.12"; + version = "1.0.13"; src = fetchFromGitHub { owner = "zcash"; repo = "zcash"; rev = "v${version}"; - sha256 = "19bxhdnkvgncgl9x6nbaf5nwgrdfw99icvdbi9adfh646pd5z64s"; + sha256 = "05y7wxs66anxr5akbf05r36mmjfzqpwawn6vyh3jhpva51hzzzyz"; }; # Dependencies are underspecified: "make -C src gtest/zcash_gtest-test_merkletree.o" @@ -23,17 +22,15 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ gtest gmock gmp libsnark openssl wget db62 boost zlib + buildInputs = [ gtest gmock gmp openssl wget db62 boost zlib protobuf libevent libsodium librustzcash ] ++ optionals stdenv.isLinux [ utillinux ] ++ optionals withGui [ qt4 qrencode ]; - configureFlags = [ "LIBSNARK_INCDIR=${libsnark}/include/libsnark" - "--with-boost-libdir=${boost.out}/lib" + configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] ++ optionals withGui [ "--with-gui=qt4" ]; patchPhase = '' - sed -i"" '/^\[LIBSNARK_INCDIR/d' configure.ac sed -i"" 's,-lboost_system-mt,-lboost_system,' configure.ac sed -i"" 's,-fvisibility=hidden,,g' src/Makefile.am ''; diff --git a/pkgs/applications/altcoins/zcash/libsnark/ate-pairing.nix b/pkgs/applications/altcoins/zcash/libsnark/ate-pairing.nix deleted file mode 100644 index 303b3bc171e..00000000000 --- a/pkgs/applications/altcoins/zcash/libsnark/ate-pairing.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, xbyak, gmp, fetchFromGitHub }: - -stdenv.mkDerivation rec { - name = "ate-pairing-unstable-${version}"; - version = "2016-05-03"; - - src = fetchFromGitHub { - owner = "herumi"; - repo = "ate-pairing"; - rev = "dcb9da999b1113f90b115bccb6f4b57ddf3a8452"; - sha256 = "0jr6r1cma414k8mhsyp7n8hqaqxi7zklsp6820a095sbb3zajckh"; - }; - - buildInputs = [ gmp xbyak ]; - - installPhase = '' - mkdir -p $out - cp -r lib $out - cp -r include $out - ''; - - meta = with stdenv.lib; { - description = "Optimal Ate Pairing over Barreto-Naehrig Curves"; - homepage = https://github.com/herumi/ate-pairing; - maintainers = with maintainers; [ rht ]; - license = licenses.bsd3; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/altcoins/zcash/libsnark/default.nix b/pkgs/applications/altcoins/zcash/libsnark/default.nix deleted file mode 100644 index be885493dcd..00000000000 --- a/pkgs/applications/altcoins/zcash/libsnark/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ stdenv, libsodium, callPackage, boost, zlib, openssl, gmp, procps, fetchFromGitHub }: - -let atePairing = callPackage ./ate-pairing.nix { inherit xbyak; }; - mie = callPackage ./mie.nix { }; - xbyak = callPackage ./xbyak.nix {}; -in -stdenv.mkDerivation rec{ - name = "libsnark-unstable-${version}"; - version = "2017-02-09"; - - src = fetchFromGitHub { - owner = "zcash"; - repo = "libsnark"; - rev = "9ada3f84ab484c57b2247c2f41091fd6a0916573"; - sha256 = "0vhslcb9rwqab9szavyn856z4h9w1syiamfcixqmj0s908zzlaaq"; - }; - - buildInputs = [ libsodium atePairing mie xbyak zlib openssl boost gmp ]; - - makeFlags = [ - "PREFIX=$(out)" - "CURVE=ALT_BN128" - "NO_SUPERCOP=1" - "STATIC=1" - ]; - - buildPhase = '' - CXXFLAGS="-fPIC -DBINARY_OUTPUT -DNO_PT_COMPRESSION=1" \ - make lib \ - CURVE=ALT_BN128 \ - MULTICORE=1 \ - STATIC=1 \ - NO_PROCPS=1 \ - NO_GTEST=1 \ - FEATUREFLAGS=-DMONTGOMERY_OUTPUT \ - ''; - - meta = with stdenv.lib; { - description = "a C++ library for zkSNARK proofs"; - homepage = https://github.com/zcash/libsnark; - maintainers = with maintainers; [ rht ]; - license = licenses.mit; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/altcoins/zcash/libsnark/mie.nix b/pkgs/applications/altcoins/zcash/libsnark/mie.nix deleted file mode 100644 index a66ff128293..00000000000 --- a/pkgs/applications/altcoins/zcash/libsnark/mie.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - name = "mie-unstable-${version}"; - version = "2016-05-10"; - - src = fetchFromGitHub { - owner = "herumi"; - repo = "mie"; - rev = "704b625b7770a8e1eab26ac65d1fed14c2fcf090"; - sha256 = "144bpmgfs2m4qqv7a2mccgi1aq5jmlr25gnk78ryq09z8cyv88y2"; - }; - - phases = ["unpackPhase" "installPhase"]; - - installPhase = '' - mkdir -p $out - cp -r include $out - ''; - - meta = with stdenv.lib; { - homepage = https://github.com/herumi/mie; - maintainers = with maintainers; [ rht ]; - license = licenses.bsd3; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/altcoins/zcash/libsnark/xbyak.nix b/pkgs/applications/altcoins/zcash/libsnark/xbyak.nix deleted file mode 100644 index 88d432fd163..00000000000 --- a/pkgs/applications/altcoins/zcash/libsnark/xbyak.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - name = "xbyak-unstable-${version}"; - version = "2016-05-03"; - - src = fetchFromGitHub { - owner = "herumi"; - repo = "xbyak"; - rev = "b6133a02dd6b7116bea31d0e6b7142bf97f071aa"; - sha256 = "1rc2nx8kj2lj13whxb9chhh79f4hmjjj4j1hpqsd0lbdb60jikrn"; - }; - - dontBuild = true; - - installPhase = '' - mkdir -p $out/include - cp -r xbyak $out/include - ''; - - meta = with stdenv.lib; { - description = "JIT assembler for x86, x64"; - homepage = https://github.com/herumi/xbyak; - maintainers = with maintainers; [ rht ]; - license = licenses.bsd3; - platforms = platforms.unix; - }; -} From ccb0ba56ef190205a39d59743ef7bd6936da43a0 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 3 Jan 2018 07:10:24 +0100 Subject: [PATCH 160/296] linux_hardended: enable gcc latent entropy plugin --- pkgs/os-specific/linux/kernel/hardened-config.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/hardened-config.nix b/pkgs/os-specific/linux/kernel/hardened-config.nix index a859a3cefbd..b7959f9d359 100644 --- a/pkgs/os-specific/linux/kernel/hardened-config.nix +++ b/pkgs/os-specific/linux/kernel/hardened-config.nix @@ -97,6 +97,9 @@ PANIC_TIMEOUT -1 GCC_PLUGINS y # Enable gcc plugin options +# Gather additional entropy at boot time for systems that may not have appropriate entropy sources. +GCC_PLUGIN_LATENT_ENTROPY y + ${optionalString (versionAtLeast version "4.11") '' GCC_PLUGIN_STRUCTLEAK y # A port of the PaX structleak plugin ''} From 426c513c14c10feac6a6afb1a810f74d8a16ed6e Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Wed, 3 Jan 2018 21:47:29 -0800 Subject: [PATCH 161/296] apg: Permit building again on Darwin --- pkgs/tools/security/apg/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/apg/default.nix b/pkgs/tools/security/apg/default.nix index 24d88517b6a..04b29bcf8f7 100644 --- a/pkgs/tools/security/apg/default.nix +++ b/pkgs/tools/security/apg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, openssl }: stdenv.mkDerivation rec { name = "apg-2.3.0b"; src = fetchurl { @@ -8,9 +8,14 @@ stdenv.mkDerivation rec { configurePhase = '' substituteInPlace Makefile --replace /usr/local "$out" ''; + makeFlags = stdenv.lib.optionals stdenv.isDarwin ["CC=cc"]; patches = [ ./apg.patch ]; + postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + sed -i -e 's|APG_CLIBS += -lcrypt|APG_CLIBS += -L${openssl.out}/lib -lcrypto|' Makefile + ''; + meta = { description = "Tools for random password generation"; longDescription = '' From aa9fc7ee25e6440be461b4d58b54ef8707076865 Mon Sep 17 00:00:00 2001 From: Aneesh Agrawal Date: Thu, 5 Oct 2017 04:12:17 -0400 Subject: [PATCH 162/296] bundler-env: Remove unused args --- pkgs/development/ruby-modules/bundler-env/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/ruby-modules/bundler-env/default.nix b/pkgs/development/ruby-modules/bundler-env/default.nix index 2e2653621a7..5d1489ba200 100644 --- a/pkgs/development/ruby-modules/bundler-env/default.nix +++ b/pkgs/development/ruby-modules/bundler-env/default.nix @@ -1,7 +1,4 @@ -{ stdenv, runCommand, writeText, writeScript, writeScriptBin, ruby, lib -, callPackage, defaultGemConfig, fetchurl, fetchgit, buildRubyGem, buildEnv -, linkFarm, git, makeWrapper, bundler, tree -}@defs: +{ ruby, lib, callPackage, defaultGemConfig, buildEnv, bundler }@defs: { name ? null , pname ? null From 8686b98612dc41d14df2a1f09a313d9084e5f6b6 Mon Sep 17 00:00:00 2001 From: Aneesh Agrawal Date: Thu, 5 Oct 2017 04:28:45 -0400 Subject: [PATCH 163/296] ruby-modules: Allow overriding gemset This allows patching the gemset output by bundix from a default.nix file, making it easier to perform updates since the bundix update no longer has to be manually updated. --- pkgs/development/ruby-modules/bundled-common/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ruby-modules/bundled-common/default.nix b/pkgs/development/ruby-modules/bundled-common/default.nix index 64a88d8f7b8..1f31aec886a 100644 --- a/pkgs/development/ruby-modules/bundled-common/default.nix +++ b/pkgs/development/ruby-modules/bundled-common/default.nix @@ -29,7 +29,9 @@ with import ./functions.nix { inherit lib gemConfig; }; let gemFiles = bundlerFiles args; - importedGemset = import gemFiles.gemset; + importedGemset = if builtins.typeOf gemFiles.gemset == "path" + then import gemFiles.gemset + else gemFiles.gemset; filteredGemset = filterGemset { inherit ruby groups; } importedGemset; From 36f1bcbeb85d8d3447e9a5dadb5801cfe615fded Mon Sep 17 00:00:00 2001 From: Aneesh Agrawal Date: Thu, 5 Oct 2017 04:10:57 -0400 Subject: [PATCH 164/296] ruby treewide: don't merge source into top-level Keep the `source` attrset distinct to prevent its entries from merging with the top level attrs. Since each type of source has a different set of entries for `source`, this is the easiest way to keep them together. This will pave the way for a new `url` type of source. This is a mass-rebuild of many ruby packages, notably those using `git` type sources. --- .../ruby-modules/bundled-common/functions.nix | 4 +++- pkgs/development/ruby-modules/bundler/default.nix | 2 +- .../ruby-modules/gem-config/default.nix | 3 +-- pkgs/development/ruby-modules/gem/default.nix | 15 ++++++++------- pkgs/tools/misc/tmuxinator/default.nix | 8 ++++---- pkgs/tools/networking/hss/default.nix | 2 +- pkgs/tools/text/gist/default.nix | 2 +- pkgs/tools/video/flvtool2/default.nix | 2 +- 8 files changed, 20 insertions(+), 18 deletions(-) diff --git a/pkgs/development/ruby-modules/bundled-common/functions.nix b/pkgs/development/ruby-modules/bundled-common/functions.nix index b17a4639e77..85e93959e4b 100644 --- a/pkgs/development/ruby-modules/bundled-common/functions.nix +++ b/pkgs/development/ruby-modules/bundled-common/functions.nix @@ -67,8 +67,10 @@ rec { }; in res; - composeGemAttrs = ruby: gems: name: attrs: ((removeAttrs attrs ["source" "platforms"]) // attrs.source // { + composeGemAttrs = ruby: gems: name: attrs: ((removeAttrs attrs ["platforms"]) // { inherit ruby; + inherit (attrs.source) type; + source = removeAttrs attrs.source ["type"]; gemName = name; gemPath = map (gemName: gems."${gemName}") (attrs.dependencies or []); }); diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/development/ruby-modules/bundler/default.nix index 9251c4d2a41..6ba1d5f10ec 100644 --- a/pkgs/development/ruby-modules/bundler/default.nix +++ b/pkgs/development/ruby-modules/bundler/default.nix @@ -5,7 +5,7 @@ buildRubyGem rec { name = "${gemName}-${version}"; gemName = "bundler"; version = "1.14.6"; - sha256 = "0h3x2csvlz99v2ryj1w72vn6kixf7rl35lhdryvh7s49brnj0cgl"; + source.sha256 = "0h3x2csvlz99v2ryj1w72vn6kixf7rl35lhdryvh7s49brnj0cgl"; dontPatchShebangs = true; postFixup = '' diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index e434a863c0e..5361c3ce65e 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -31,8 +31,7 @@ let rainbow_rake = buildRubyGem { name = "rake"; gemName = "rake"; - remotes = ["https://rubygems.org"]; - sha256 = "01j8fc9bqjnrsxbppncai05h43315vmz9fwg28qdsgcjw9ck1d7n"; + source.sha256 = "01j8fc9bqjnrsxbppncai05h43315vmz9fwg28qdsgcjw9ck1d7n"; type = "gem"; version = "12.0.0"; }; diff --git a/pkgs/development/ruby-modules/gem/default.nix b/pkgs/development/ruby-modules/gem/default.nix index 62a9d60686f..eba0dc2c4a7 100644 --- a/pkgs/development/ruby-modules/gem/default.nix +++ b/pkgs/development/ruby-modules/gem/default.nix @@ -41,7 +41,6 @@ lib.makeOverridable ( , patches ? [] , gemPath ? [] , dontStrip ? true -, remotes ? ["https://rubygems.org"] # Assume we don't have to build unless strictly necessary (e.g. the source is a # git checkout). # If you need to apply patches, make sure to set `dontBuild = false`; @@ -56,12 +55,14 @@ let src = attrs.src or ( if type == "gem" then fetchurl { - urls = map (remote: "${remote}/gems/${gemName}-${version}.gem") remotes; - inherit (attrs) sha256; + urls = map ( + remote: "${remote}/gems/${gemName}-${version}.gem" + ) (attrs.source.remotes or [ "https://rubygems.org" ]); + inherit (attrs.source) sha256; } else if type == "git" then fetchgit { - inherit (attrs) url rev sha256 fetchSubmodules; + inherit (attrs.source) url rev sha256 fetchSubmodules; leaveDotGit = true; } else @@ -74,7 +75,7 @@ let in -stdenv.mkDerivation (attrs // { +stdenv.mkDerivation ((builtins.removeAttrs attrs ["source"]) // { inherit ruby; inherit doCheck; inherit dontBuild; @@ -161,9 +162,9 @@ stdenv.mkDerivation (attrs // { ${lib.optionalString (type == "git") '' ruby ${./nix-bundle-install.rb} \ ${gemName} \ - ${attrs.url} \ + ${attrs.source.url} \ ${src} \ - ${attrs.rev} \ + ${attrs.source.rev} \ ${version} \ ${lib.escapeShellArgs buildFlags} ''} diff --git a/pkgs/tools/misc/tmuxinator/default.nix b/pkgs/tools/misc/tmuxinator/default.nix index b41f3890538..35bdcf1b823 100644 --- a/pkgs/tools/misc/tmuxinator/default.nix +++ b/pkgs/tools/misc/tmuxinator/default.nix @@ -9,14 +9,14 @@ buildRubyGem rec { name = "${gemName}-${version}"; gemName = "tmuxinator"; version = "0.10.0"; - sha256 = "199pq15qknpcafw8ryb9kk1jsrwnncg6k5l9d4n0nmms4knxlqlf"; + source.sha256 = "199pq15qknpcafw8ryb9kk1jsrwnncg6k5l9d4n0nmms4knxlqlf"; erubis = buildRubyGem rec { inherit ruby; name = "ruby${ruby.version}-${gemName}-${version}"; gemName = "erubis"; version = "2.7.0"; - sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3"; + source.sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3"; }; thor = buildRubyGem rec { @@ -24,7 +24,7 @@ buildRubyGem rec { name = "ruby${ruby.version}-${gemName}-${version}"; gemName = "thor"; version = "0.19.1"; - sha256 = "08p5gx18yrbnwc6xc0mxvsfaxzgy2y9i78xq7ds0qmdm67q39y4z"; + source.sha256 = "08p5gx18yrbnwc6xc0mxvsfaxzgy2y9i78xq7ds0qmdm67q39y4z"; }; xdg = buildRubyGem rec { @@ -32,7 +32,7 @@ buildRubyGem rec { name = "ruby${ruby.version}-${gemName}-${version}"; gemName = "xdg"; version = "2.2.3"; - sha256 = "1bn47fdbwxqbdvjcfg86i32hmwm36k0xl876kb85f5da5v84lzmq"; + source.sha256 = "1bn47fdbwxqbdvjcfg86i32hmwm36k0xl876kb85f5da5v84lzmq"; }; propagatedBuildInputs = [ erubis thor xdg ]; diff --git a/pkgs/tools/networking/hss/default.nix b/pkgs/tools/networking/hss/default.nix index cfc9986b0db..913e76c0f4b 100644 --- a/pkgs/tools/networking/hss/default.nix +++ b/pkgs/tools/networking/hss/default.nix @@ -13,7 +13,7 @@ buildRubyGem rec { inherit ruby; gemName = "hss"; version = "1.0.1"; - sha256 = "0hdfpxxqsh6gisn8mm0knsl1aig9fir0h2x9sirk3gr36qbz5xa4"; + source.sha256 = "0hdfpxxqsh6gisn8mm0knsl1aig9fir0h2x9sirk3gr36qbz5xa4"; postInstall = '' substituteInPlace $GEM_HOME/gems/${gemName}-${version}/bin/hss \ diff --git a/pkgs/tools/text/gist/default.nix b/pkgs/tools/text/gist/default.nix index 11fcae85528..cf4b90643d7 100644 --- a/pkgs/tools/text/gist/default.nix +++ b/pkgs/tools/text/gist/default.nix @@ -5,7 +5,7 @@ buildRubyGem rec { name = "${gemName}-${version}"; gemName = "gist"; version = "4.6.1"; - sha256 = "16qvmn7syvcf4lnblngzvq8xynvb62h1xhfc7xfb0c1sjh166hff"; + source.sha256 = "16qvmn7syvcf4lnblngzvq8xynvb62h1xhfc7xfb0c1sjh166hff"; buildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/video/flvtool2/default.nix b/pkgs/tools/video/flvtool2/default.nix index 65bc240af00..9a60ebf17be 100644 --- a/pkgs/tools/video/flvtool2/default.nix +++ b/pkgs/tools/video/flvtool2/default.nix @@ -5,7 +5,7 @@ buildRubyGem rec { name = "${gemName}-${version}"; gemName = "flvtool2"; version = "1.0.6"; - sha256 = "0xsla1061pi4ryh3jbvwsbs8qchprchbqjy7652g2g64v37i74qj"; + source.sha256 = "0xsla1061pi4ryh3jbvwsbs8qchprchbqjy7652g2g64v37i74qj"; meta = { homepage = https://github.com/unnu/flvtool2; From 6484eac5b2e38490724d9df3079e736605c7eeb6 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Thu, 4 Jan 2018 09:51:14 +0100 Subject: [PATCH 165/296] python2Packages.odfpy: disable tests --- pkgs/development/python-modules/odfpy/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/odfpy/default.nix b/pkgs/development/python-modules/odfpy/default.nix index 39ed5edef0b..37790b6eaf8 100644 --- a/pkgs/development/python-modules/odfpy/default.nix +++ b/pkgs/development/python-modules/odfpy/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , python +, isPy27 }: buildPythonPackage rec { @@ -14,7 +15,9 @@ buildPythonPackage rec { sha256 = "6bcaf3b23aa9e49ed8c8c177266539b211add4e02402748a994451482a10cb1b"; }; - checkPhase = '' + # Python 2.7 uses a different ordering for xml namespaces. + # The testAttributeForeign test expects "ns44", but fails since it gets "ns43" + checkPhase = " " + lib.optionalString (!isPy27) '' ${python.interpreter} -m unittest discover -s tests ''; From 4e4b3a691bbaa9d116433709b2c7f82d5f4bdba1 Mon Sep 17 00:00:00 2001 From: Markus Hauck Date: Thu, 4 Jan 2018 13:05:23 +0100 Subject: [PATCH 166/296] scalafmt: 1.3.0 -> 1.4.0 --- pkgs/development/tools/scalafmt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/scalafmt/default.nix b/pkgs/development/tools/scalafmt/default.nix index 6c30768d900..d50b1435b73 100644 --- a/pkgs/development/tools/scalafmt/default.nix +++ b/pkgs/development/tools/scalafmt/default.nix @@ -2,7 +2,7 @@ let baseName = "scalafmt"; - version = "1.3.0"; + version = "1.4.0"; deps = stdenv.mkDerivation { name = "${baseName}-deps-${version}"; buildCommand = '' @@ -13,7 +13,7 @@ let ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "0q1vw6drpdrfifbm3266igpml0phdk6pl0gd3b5amysigx83m251"; + outputHash = "12hsix3b7qnyr9x2v7i6jgqljdqxpfj4bfvhjdl99ijr793g3lnp"; }; in stdenv.mkDerivation rec { From ae20c22531d802f4acc45ab72b3dccb9b9205a3b Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Fri, 7 Apr 2017 17:40:04 +0800 Subject: [PATCH 167/296] hyperv-daemons: init at current linux kernel version --- .../linux/hyperv-daemons/default.nix | 109 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 111 insertions(+) create mode 100644 pkgs/os-specific/linux/hyperv-daemons/default.nix diff --git a/pkgs/os-specific/linux/hyperv-daemons/default.nix b/pkgs/os-specific/linux/hyperv-daemons/default.nix new file mode 100644 index 00000000000..f89747dc200 --- /dev/null +++ b/pkgs/os-specific/linux/hyperv-daemons/default.nix @@ -0,0 +1,109 @@ +{ stdenv, lib, python, kernel, makeWrapper, writeText }: + +let + daemons = stdenv.mkDerivation rec { + name = "hyperv-daemons-bin-${version}"; + inherit (kernel) src version; + + nativeBuildInputs = [ makeWrapper ]; + + # as of 4.9 compilation will fail due to -Werror=format-security + hardeningDisable = [ "format" ]; + + preConfigure = '' + cd tools/hv + ''; + + installPhase = '' + runHook preInstall + + for f in fcopy kvp vss ; do + install -Dm755 hv_''${f}_daemon -t $out/bin + done + + install -Dm755 hv_get_dns_info.sh lsvmbus -t $out/bin + + # I don't know why this isn't being handled automatically by fixupPhase + substituteInPlace $out/bin/lsvmbus \ + --replace '/usr/bin/env python' ${python.interpreter} + + runHook postInstall + ''; + + postFixup = '' + # kvp needs to be able to find the script(s) + wrapProgram $out/bin/hv_kvp_daemon --prefix PATH : $out/bin + ''; + }; + + service = bin: title: check: + writeText "hv-${bin}.service" '' + [Unit] + Description=Hyper-V ${title} daemon + ConditionVirtualization=microsoft + ${lib.optionalString (check != "") '' + ConditionPathExists=/dev/vmbus/${check} + ''} + [Service] + ExecStart=@out@/hv_${bin}_daemon -n + Restart=on-failure + PrivateTmp=true + Slice=hyperv.slice + + [Install] + WantedBy=hyperv-daemons.target + ''; + +in stdenv.mkDerivation rec { + name = "hyperv-daemons-${version}"; + + inherit (kernel) version; + + # we just stick the bins into out as well as it requires "out" + outputs = [ "bin" "lib" "out" ]; + + phases = [ "installPhase" ]; + + buildInputs = [ daemons ]; + + installPhase = '' + system=$lib/lib/systemd/system + + mkdir -p $system + + cp ${service "fcopy" "file copy (FCOPY)" "hv_fcopy" } $system/hv-fcopy.service + cp ${service "kvp" "key-value pair (KVP)" "" } $system/hv-kvp.service + cp ${service "vss" "volume shadow copy (VSS)" "" } $system/hv-vss.service + + cat > $system/hyperv-daemons.target < Date: Fri, 7 Apr 2017 17:40:17 +0800 Subject: [PATCH 168/296] hyperv-daemons: add nixos module --- nixos/modules/module-list.nix | 1 + nixos/modules/virtualisation/hyperv-guest.nix | 37 +++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 nixos/modules/virtualisation/hyperv-guest.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index f32fb50368e..93ba90bdc5d 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -746,6 +746,7 @@ ./virtualisation/lxcfs.nix ./virtualisation/lxd.nix ./virtualisation/amazon-options.nix + ./virtualisation/hyperv-guest.nix ./virtualisation/openvswitch.nix ./virtualisation/parallels-guest.nix ./virtualisation/rkt.nix diff --git a/nixos/modules/virtualisation/hyperv-guest.nix b/nixos/modules/virtualisation/hyperv-guest.nix new file mode 100644 index 00000000000..ecd2a811771 --- /dev/null +++ b/nixos/modules/virtualisation/hyperv-guest.nix @@ -0,0 +1,37 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.virtualisation.hypervGuest; + +in { + options = { + virtualisation.hypervGuest = { + enable = mkEnableOption "Hyper-V Guest Support"; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ config.boot.kernelPackages.hyperv-daemons.bin ]; + + security.rngd.enable = false; + + # enable hotadding memory + services.udev.packages = lib.singleton (pkgs.writeTextFile { + name = "hyperv-memory-hotadd-udev-rules"; + destination = "/etc/udev/rules.d/99-hyperv-memory-hotadd.rules"; + text = '' + ACTION="add", SUBSYSTEM=="memory", ATTR{state}="online" + ''; + }); + + systemd = { + packages = [ config.boot.kernelPackages.hyperv-daemons.lib ]; + + targets.hyperv-daemons = { + wantedBy = [ "multi-user.target" ]; + }; + }; + }; +} From 484c24b3243b07dd5ac8bb90802e8d6e0999c5bd Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Thu, 21 Dec 2017 20:53:42 +0100 Subject: [PATCH 169/296] megaglest: use fetchFromGitHub --- pkgs/games/megaglest/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/games/megaglest/default.nix b/pkgs/games/megaglest/default.nix index 3fafcfddcbf..6f61fbbd8d3 100644 --- a/pkgs/games/megaglest/default.nix +++ b/pkgs/games/megaglest/default.nix @@ -1,6 +1,7 @@ -{ stdenv, fetchgit, cmake, pkgconfig, git, curl, SDL, xercesc, openal, lua, vlc +{ stdenv, cmake, pkgconfig, git, curl, SDL, xercesc, openal, lua, vlc , libjpeg, wxGTK, cppunit, ftgl, glew, libogg, libvorbis, buildEnv, libpng , fontconfig, freetype, xorg, makeWrapper, bash, which, gnome3, mesa_glu, glib +, fetchFromGitHub }: let version = "3.9.2"; @@ -18,9 +19,11 @@ in stdenv.mkDerivation { name = "megaglest-${version}"; - src = fetchgit { - url = "git://github.com/MegaGlest/megaglest-source"; - rev = "refs/tags/${version}"; + src = fetchFromGitHub { + owner = "MegaGlest"; + repo = "megaglest-source"; + rev = "${version}"; + fetchSubmodules = true; sha256 = "1406ns1533x5678d91s2xxxv19q7r238zsaxr37c6mv5jrx7s5jv"; }; From c400bb9fb81861a370db458c93456760a6fb05a2 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Thu, 4 Jan 2018 13:43:35 +0000 Subject: [PATCH 170/296] megaglest: 3.9.2 -> 3.13.0 --- pkgs/games/megaglest/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/games/megaglest/default.nix b/pkgs/games/megaglest/default.nix index 6f61fbbd8d3..742b1e79370 100644 --- a/pkgs/games/megaglest/default.nix +++ b/pkgs/games/megaglest/default.nix @@ -1,13 +1,13 @@ -{ stdenv, cmake, pkgconfig, git, curl, SDL, xercesc, openal, lua, vlc +{ stdenv, cmake, pkgconfig, git, curl, SDL2, xercesc, openal, lua, vlc , libjpeg, wxGTK, cppunit, ftgl, glew, libogg, libvorbis, buildEnv, libpng , fontconfig, freetype, xorg, makeWrapper, bash, which, gnome3, mesa_glu, glib , fetchFromGitHub }: let - version = "3.9.2"; + version = "3.13.0"; lib-env = buildEnv { name = "megaglest-lib-env"; - paths = [ SDL xorg.libSM xorg.libICE xorg.libX11 xorg.libXext + paths = [ SDL2 xorg.libSM xorg.libICE xorg.libX11 xorg.libXext xercesc openal libvorbis lua libjpeg libpng curl fontconfig ftgl freetype stdenv.cc.cc glew mesa_glu wxGTK ]; }; @@ -24,11 +24,11 @@ stdenv.mkDerivation { repo = "megaglest-source"; rev = "${version}"; fetchSubmodules = true; - sha256 = "1406ns1533x5678d91s2xxxv19q7r238zsaxr37c6mv5jrx7s5jv"; + sha256 = "0fb58a706nic14ss89zrigphvdiwy5s9dwvhscvvgrfvjpahpcws"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake git curl SDL xercesc openal lua libpng libjpeg vlc wxGTK + buildInputs = [ cmake git curl SDL2 xercesc openal lua libpng libjpeg vlc wxGTK glib cppunit fontconfig freetype ftgl glew libogg libvorbis makeWrapper mesa_glu ]; configurePhase = '' From 28fe4ce07502947513a4e8dc2b77813501e35026 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Thu, 21 Dec 2017 20:56:50 +0100 Subject: [PATCH 171/296] megaglest: do not build tests --- pkgs/games/megaglest/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/megaglest/default.nix b/pkgs/games/megaglest/default.nix index 742b1e79370..52506275eb0 100644 --- a/pkgs/games/megaglest/default.nix +++ b/pkgs/games/megaglest/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { glib cppunit fontconfig freetype ftgl glew libogg libvorbis makeWrapper mesa_glu ]; configurePhase = '' - cmake -DCMAKE_INSTALL_PREFIX=$out -DBUILD_MEGAGLEST_TESTS=ON + cmake -DCMAKE_INSTALL_PREFIX=$out ''; postInstall = '' From 5c8ca3de03f955ac8756caf34d40e0868b636ff1 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Thu, 21 Dec 2017 20:57:26 +0100 Subject: [PATCH 172/296] megaglest: build the map and model editors too --- pkgs/games/megaglest/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/games/megaglest/default.nix b/pkgs/games/megaglest/default.nix index 52506275eb0..d43904bca6c 100644 --- a/pkgs/games/megaglest/default.nix +++ b/pkgs/games/megaglest/default.nix @@ -32,7 +32,11 @@ stdenv.mkDerivation { glib cppunit fontconfig freetype ftgl glew libogg libvorbis makeWrapper mesa_glu ]; configurePhase = '' - cmake -DCMAKE_INSTALL_PREFIX=$out + cmake -DCMAKE_INSTALL_PREFIX=$out \ + -DBUILD_MEGAGLEST=On \ + -DBUILD_MEGAGLEST_MAP_EDITOR=On \ + -DBUILD_MEGAGLEST_MODEL_IMPORT_EXPORT_TOOLS=On \ + -DBUILD_MEGAGLEST_MODEL_VIEWER=On ''; postInstall = '' From 231754d995eba46c05cbc49caf6e7627659b0964 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Fri, 29 Dec 2017 16:45:38 +0100 Subject: [PATCH 173/296] haskellPackages.restless-git: fix build --- pkgs/development/haskell-modules/configuration-common.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 52eecb709a8..1222c0a8729 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -915,7 +915,8 @@ self: super: { grakn = dontCheck (doJailbreak super.grakn); # test suite requires git and does a bunch of git operations - restless-git = dontCheck super.restless-git; + # doJailbreak because of hardcoded time, seems to be fixed upstream + restless-git = dontCheck (doJailbreak super.restless-git); # Depends on broken fluid. fluid-idl-http-client = markBroken super.fluid-idl-http-client; From 42af265eeeba158ddcad187dd09d19f1b3da6b05 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 4 Jan 2018 15:23:04 +0100 Subject: [PATCH 174/296] uwsgi: fix php plugin build fixes #33400 closes #33420 --- pkgs/servers/uwsgi/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix index 921708f2fd3..4614a9768b0 100644 --- a/pkgs/servers/uwsgi/default.nix +++ b/pkgs/servers/uwsgi/default.nix @@ -4,7 +4,7 @@ , pam, withPAM ? false , systemd, withSystemd ? false , python2, python3, ncurses -, ruby, php-embed +, ruby, php-embed, mysql }: let pythonPlugin = pkg : lib.nameValuePair "python${if pkg ? isPy2 then "2" else "3"}" { @@ -34,6 +34,7 @@ let pythonPlugin = pkg : lib.nameValuePair "python${if pkg ? isPy2 then "2" else # usage: https://uwsgi-docs.readthedocs.io/en/latest/PHP.html#running-php-apps-with-nginx path = "plugins/php"; inputs = [ php-embed ] ++ php-embed.buildInputs; + NIX_CFLAGS_LINK = [ "-L${mysql.connector-c}/lib/mysql" ]; }) ]; @@ -88,7 +89,7 @@ stdenv.mkDerivation rec { ${lib.concatMapStringsSep "\n" (x: x.install or "") needed} ''; - NIX_CFLAGS_LINK = [ "-lsystemd" ]; + NIX_CFLAGS_LINK = [ "-lsystemd" ] ++ lib.concatMap (x: x.NIX_CFLAGS_LINK or []) needed; meta = with stdenv.lib; { homepage = http://uwsgi-docs.readthedocs.org/en/latest/; From fa4035bec64fe22344876c3314224a5ef2421cdf Mon Sep 17 00:00:00 2001 From: Tristan Helmich Date: Thu, 4 Jan 2018 15:24:23 +0100 Subject: [PATCH 175/296] emby: 3.2.36.0 -> 3.2.60.0 --- pkgs/servers/emby/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix index 745ed18c00f..05d53d44462 100644 --- a/pkgs/servers/emby/default.nix +++ b/pkgs/servers/emby/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "emby-${version}"; - version = "3.2.36.0"; + version = "3.2.60.0"; src = fetchurl { url = "https://github.com/MediaBrowser/Emby/releases/download/${version}/Emby.Mono.zip"; - sha256 = "0b75v6g7qm03jqm5za70z4x5lqks3a4cd84vblqr35zrla9vs83b"; + sha256 = "0yrbwq5dzzq5047vdpar4vkwzcgd9dj2v9basaw413hzncf2q8gj"; }; buildInputs = with pkgs; [ From ddc309c406a7994e7ef12f9ae39a74f3cf2dce13 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Thu, 4 Jan 2018 02:40:33 +0100 Subject: [PATCH 176/296] x265: 2.5 -> 2.6 --- pkgs/development/libraries/x265/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix index 29d7ddf1fdc..418829e7af8 100644 --- a/pkgs/development/libraries/x265/default.nix +++ b/pkgs/development/libraries/x265/default.nix @@ -16,14 +16,14 @@ in stdenv.mkDerivation rec { name = "x265-${version}"; - version = "2.5"; + version = "2.6"; src = fetchurl { urls = [ "http://get.videolan.org/x265/x265_${version}.tar.gz" "https://github.com/videolan/x265/archive/${version}.tar.gz" ]; - sha256 = "05rxbnfcc8yl05q3xqkl1kk90k7zn5ih305r46dxnzjaa2djalrf"; + sha256 = "1gyd94jkwdii9308m07nymsbxrmrcl81c0j8i10zhslr2mj07w0v"; }; enableParallelBuilding = true; From 31898ec13a1c3a95f68ffbc07b4b1fb2881e386e Mon Sep 17 00:00:00 2001 From: adisbladis Date: Thu, 4 Jan 2018 09:34:32 +0100 Subject: [PATCH 177/296] calibre: 3.12.0 -> 3.14.0 --- pkgs/applications/misc/calibre/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index b406f38613d..14e9375cb79 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "3.12.0"; + version = "3.14.0"; name = "calibre-${version}"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz"; - sha256 = "0l7r5ny9a36yg22fqzz3as6wh1xqpa3hrlx2gy25yp649sbkd9vq"; + sha256 = "1367jh82mhjjlvyd30mfz3qwscg60l0gimakvzpbkrah918kfk51"; }; patches = [ From cd7ce7ca70ba67948f9fa84567de614cfeb1e515 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Thu, 4 Jan 2018 09:34:33 +0100 Subject: [PATCH 178/296] wireshark: 2.4.2 -> 2.4.3 --- pkgs/applications/networking/sniffers/wireshark/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 2ed87c71a90..5fe818a506b 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -12,7 +12,7 @@ assert withQt -> !withGtk && qt5 != null; with stdenv.lib; let - version = "2.4.2"; + version = "2.4.3"; variant = if withGtk then "gtk" else if withQt then "qt" else "cli"; in stdenv.mkDerivation { @@ -20,7 +20,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"; - sha256 = "0zglapd3sz08p2z9x8a5va3jnz17b3n5a1bskf7f2dgx6m3v5b6i"; + sha256 = "0bpiby916k3k8bm7q8b1dflva6zs0a4ircskrck0d538dfcrb50q"; }; cmakeFlags = optional withGtk "-DBUILD_wireshark_gtk=TRUE"; From 30b68c9ba9c6d8e4357f64401dab6ce13b1459d2 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Thu, 4 Jan 2018 09:34:34 +0100 Subject: [PATCH 179/296] nftables: 0.7 -> 0.8 --- pkgs/os-specific/linux/nftables/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/nftables/default.nix b/pkgs/os-specific/linux/nftables/default.nix index c06de7ea6f2..9d645fb1d84 100644 --- a/pkgs/os-specific/linux/nftables/default.nix +++ b/pkgs/os-specific/linux/nftables/default.nix @@ -2,11 +2,11 @@ , flex, bison, libmnl, libnftnl, gmp, readline }: stdenv.mkDerivation rec { - name = "nftables-0.7"; + name = "nftables-0.8"; src = fetchurl { url = "http://netfilter.org/projects/nftables/files/${name}.tar.bz2"; - sha256 = "0hzdqigdx4i6jbpxbdyq4zy4p4waqn8l6vvz7685ikh1v0wr4qzy"; + sha256 = "16iq9x0qxikdhp1nan500rk33ycqddl1k57876m4dfv3n7kqhnrz"; }; configureFlags = [ From b85de87e8ab48b2d352166ccafa35af19f9ea7f7 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Thu, 4 Jan 2018 09:34:35 +0100 Subject: [PATCH 180/296] sysdig: 0.18.0 -> 0.19.1 --- pkgs/os-specific/linux/sysdig/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index 71d7e9e1b78..919ddc1c3df 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -3,13 +3,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "sysdig-${version}"; - version = "0.18.0"; + version = "0.19.1"; src = fetchFromGitHub { owner = "draios"; repo = "sysdig"; rev = version; - sha256 = "1hmkjvfg3371hp873mnkjq9cirqszw2ji4p7mb6jcn9ihwxil2z2"; + sha256 = "04bsb7g6mh6dwk023v1rbdcjwp898y6ixdvrd7nxzm186qpycpnn"; }; buildInputs = [ From 16b5329629ade5c84d91c6cfaeeaa796b3aff424 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Thu, 4 Jan 2018 09:34:36 +0100 Subject: [PATCH 181/296] redis: 4.0.2 -> 4.0.6 --- pkgs/servers/nosql/redis/default.nix | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index 9ef0987d9b9..354b4d57960 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -1,22 +1,14 @@ -{ stdenv, fetchurl, fetchpatch, lua }: +{ stdenv, fetchurl, lua }: stdenv.mkDerivation rec { - version = "4.0.2"; + version = "4.0.6"; name = "redis-${version}"; src = fetchurl { url = "http://download.redis.io/releases/${name}.tar.gz"; - sha256 = "04s8cgvwjj1979s3hg8zkwc9pyn3jkjpz5zidp87kfcipifr385i"; + sha256 = "1ypnwmxwm49l0b8i9swcbjdxnc6f0r9zyqm2h423wz13xilmv6vn"; }; - patches = [ - (fetchpatch { - name = "CVE-2017-15047.patch"; - url = https://github.com/antirez/redis/commit/ffcf7d5ab1e98d84c28af9bea7be76c6737820ad.patch; - sha256 = "0cgx3lm0n7jxhsly8v9hdvy6vlamj3ck2jsid4fwyapz6907h64l"; - }) - ]; - buildInputs = [ lua ]; makeFlags = "PREFIX=$(out)"; From 7e74a9b0b47e548439c20df6f0dd4ca09acd6485 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Thu, 4 Jan 2018 09:34:37 +0100 Subject: [PATCH 182/296] traefik: 1.4.4 -> 1.4.6 --- pkgs/servers/traefik/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix index d0d0efa9aa6..ebc08b745c6 100644 --- a/pkgs/servers/traefik/default.nix +++ b/pkgs/servers/traefik/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "traefik-${version}"; - version = "1.4.4"; + version = "1.4.6"; goPackagePath = "github.com/containous/traefik"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "containous"; repo = "traefik"; rev = "v${version}"; - sha256 = "114861v8kg77zwnf742n25h7c4fly3i52inqx1kcpqs074rqm1wn"; + sha256 = "1sd7wfp1hvq505lgybbaiq9d1hyygzf5jgl0qidn103xnf1yqaw0"; }; buildInputs = [ go-bindata bash ]; From 26456837967ebfae4ba3420ff2313c6cacd5d984 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Thu, 4 Jan 2018 09:34:38 +0100 Subject: [PATCH 183/296] ncftp: 3.2.5 -> 3.2.6 --- pkgs/tools/networking/ncftp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/ncftp/default.nix b/pkgs/tools/networking/ncftp/default.nix index c83bc61bbcd..4c632899ac2 100644 --- a/pkgs/tools/networking/ncftp/default.nix +++ b/pkgs/tools/networking/ncftp/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ncurses, coreutils }: -let version = "3.2.5"; in +let version = "3.2.6"; in stdenv.mkDerivation { name = "ncftp-${version}"; src = fetchurl { - url = "ftp://ftp.ncftp.com/ncftp/ncftp-${version}-src.tar.bz2"; - sha256 = "0hlx12i0lwi99qsrx7nccf4nvwjj2gych4yks5y179b1ax0y5sxl"; + url = "ftp://ftp.ncftp.com/ncftp/ncftp-${version}-src.tar.xz"; + sha256 = "1389657cwgw5a3kljnqmhvfh4vr2gcr71dwz1mlhf22xq23hc82z"; }; buildInputs = [ ncurses ]; From 274e0a268290f8092a2852b46e031b0acab76608 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Thu, 4 Jan 2018 09:34:40 +0100 Subject: [PATCH 184/296] offlineimap: 7.1.2 -> 7.1.4 --- pkgs/tools/networking/offlineimap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix index c167851086e..4295151516d 100644 --- a/pkgs/tools/networking/offlineimap/default.nix +++ b/pkgs/tools/networking/offlineimap/default.nix @@ -2,7 +2,7 @@ asciidoc, libxml2, libxslt, docbook_xml_xslt }: pythonPackages.buildPythonApplication rec { - version = "7.1.2"; + version = "7.1.4"; name = "offlineimap-${version}"; namePrefix = ""; @@ -10,7 +10,7 @@ pythonPackages.buildPythonApplication rec { owner = "OfflineIMAP"; repo = "offlineimap"; rev = "v${version}"; - sha256 = "1bvlbw3bsx3qs8np1qdqbhpdr9qykzsql9684gm7gg84gw51i667"; + sha256 = "04y2bsgmxykkhcjh3540y2a43xrwfkzd7wks1wvl6av0vjaqa5gm"; }; postPatch = '' From 13b203fb4fbc66a6bc452fe32b37366d2c163583 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Thu, 4 Jan 2018 09:34:41 +0100 Subject: [PATCH 185/296] stunnel: 5.41 -> 5.44 --- pkgs/tools/networking/stunnel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix index fbebba21dbd..deac3746836 100644 --- a/pkgs/tools/networking/stunnel/default.nix +++ b/pkgs/tools/networking/stunnel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "stunnel-${version}"; - version = "5.41"; + version = "5.44"; src = fetchurl { url = "http://www.stunnel.org/downloads/${name}.tar.gz"; - sha256 = "13qld0b8w2yfs2kfwnqvhcg98warh8hcyk13rjxdwv8zxqhn6p7h"; + sha256 = "1692y69wl7j6yjgnrrzclgzb34bxsaxjzl1dfy47vms7pdfk42lr"; }; buildInputs = [ openssl ]; From 1c0c82582a89dcf9854cc6d05fdbcc15c0942c96 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Thu, 4 Jan 2018 09:34:42 +0100 Subject: [PATCH 186/296] fail2ban: 0.9.7 -> 0.10.1 --- pkgs/tools/security/fail2ban/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix index 31f2262cd9f..ca9cdcc8d6c 100644 --- a/pkgs/tools/security/fail2ban/default.nix +++ b/pkgs/tools/security/fail2ban/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, python, pythonPackages, gamin }: -let version = "0.9.7"; in +let version = "0.10.1"; in pythonPackages.buildPythonApplication { name = "fail2ban-${version}"; @@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication { owner = "fail2ban"; repo = "fail2ban"; rev = version; - sha256 = "07l5pz93mz1r3g59xiyyznlpjfpv2zgvh3h9w0cbn79v7njim8kb"; + sha256 = "05ngnjxrwvfdd233s5n2wd8w4ndkpgrgymlfzn6i2fjlwf4hdikj"; }; propagatedBuildInputs = [ gamin ] From 2e4b802e98a2515200810b825ca48327e4148721 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Thu, 4 Jan 2018 09:34:43 +0100 Subject: [PATCH 187/296] pcsclite: 1.8.22 -> 1.8.23 --- pkgs/tools/security/pcsclite/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix index 74bb5cc5819..5d9c8089441 100644 --- a/pkgs/tools/security/pcsclite/default.nix +++ b/pkgs/tools/security/pcsclite/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "pcsclite-${version}"; - version = "1.8.22"; + version = "1.8.23"; src = fetchurl { # This URL changes in unpredictable ways, so it is not sensible # to put a version variable in there. - url = "https://alioth.debian.org/frs/download.php/file/4225/pcsc-lite-1.8.22.tar.bz2"; - sha256 = "01flkdyqs7kr6c63dv2qg8dwir3v9jlr9rzlw7vafrivxmhqydba"; + url = "https://alioth.debian.org/frs/download.php/file/4235/pcsc-lite-1.8.23.tar.bz2"; + sha256 = "1jc9ws5ra6v3plwraqixin0w0wfxj64drahrbkyrrwzghqjjc9ss"; }; patches = [ ./no-dropdir-literals.patch ]; From 3cfa038870cb2f6017d1a3148aba6c83480eec62 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Thu, 4 Jan 2018 09:34:44 +0100 Subject: [PATCH 188/296] dos2unix: 7.3.4 -> 7.4.0 --- pkgs/tools/text/dos2unix/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/text/dos2unix/default.nix b/pkgs/tools/text/dos2unix/default.nix index 338967e5b9a..59697891b6a 100644 --- a/pkgs/tools/text/dos2unix/default.nix +++ b/pkgs/tools/text/dos2unix/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "dos2unix-${version}"; - version = "7.3.4"; + version = "7.4.0"; src = fetchurl { - url = "http://waterlan.home.xs4all.nl/dos2unix/${name}.tar.gz"; - sha256 = "1i9hbxn0br7xa18z4bjpkdv7mrzmbfxhm44mzpd07yd2qnxsgkcc"; + url = "https://waterlan.home.xs4all.nl/dos2unix/${name}.tar.gz"; + sha256 = "12h4c61g376bhq03y5g2xszkrkrj5hwd928rly3xsp6rvfmnbixs"; }; configurePhase = '' @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { description = "Tools to transform text files from dos to unix formats and vicervesa"; license = licenses.bsd2; maintainers = with maintainers; [viric ndowens ]; - + }; } From 6bdf9a7f6db9f247bd3594324b72fa556df39d6c Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 2 Jan 2018 23:10:25 -0500 Subject: [PATCH 189/296] ghcWithPackages: Don't bother with ignoreCollisions cause we don't use buildEnv SymlinkJoin doesn't know or care about this. --- pkgs/development/haskell-modules/with-packages-wrapper.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index 6b3d6dfd2b0..7d192dc5d7d 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -1,5 +1,5 @@ { lib, targetPlatform, ghc, llvmPackages, packages, symlinkJoin, makeWrapper -, ignoreCollisions ? false, withLLVM ? false +, withLLVM ? false , postBuild ? "" , haskellPackages , ghcLibdir ? null # only used by ghcjs, when resolving plugins @@ -58,7 +58,6 @@ symlinkJoin { name = ghc.name + "-with-packages"; paths = paths ++ [ghc]; extraOutputsToInstall = [ "out" "doc" ]; - inherit ignoreCollisions; postBuild = '' . ${makeWrapper}/nix-support/setup-hook From 83110ac0be3eb0d58f1b9f8cd61a3186df5d8151 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 28 Dec 2017 08:01:03 +0000 Subject: [PATCH 190/296] ocamlPackages.notty: 0.1.1a -> 0.2.1 jackline: 2017-08-17 -> 2017-12-24 --- .../instant-messengers/jackline/default.nix | 8 ++--- .../ocaml-modules/notty/default.nix | 32 +++++++++---------- pkgs/top-level/all-packages.nix | 4 +-- 3 files changed, 20 insertions(+), 24 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/jackline/default.nix b/pkgs/applications/networking/instant-messengers/jackline/default.nix index 9f9236244ae..32e7c877614 100644 --- a/pkgs/applications/networking/instant-messengers/jackline/default.nix +++ b/pkgs/applications/networking/instant-messengers/jackline/default.nix @@ -3,20 +3,20 @@ assert stdenv.lib.versionAtLeast ocamlPackages.ocaml.version "4.02.2"; stdenv.mkDerivation rec { - version = "2017-08-17"; + version = "2017-12-24"; name = "jackline-${version}"; src = fetchFromGitHub { owner = "hannesm"; repo = "jackline"; - rev = "26688f07c3edc3b83e7aa0b9136cd1e9dcb58ed5"; - sha256 = "0yspgjhp7zy9rzvwl4pxppf5wkpa07y0122s7n09kvr0fzsh6aqf"; + rev = "8678e8a1a06e641218a31ae25150040202f89289"; + sha256 = "05z9kvd7gwr59ic7hnmbayhwyyqd41xxz01cvdlcgplk3z7zlwg5"; }; buildInputs = with ocamlPackages; [ ocaml ocamlbuild findlib topkg ppx_sexp_conv erm_xmpp_0_3 tls nocrypto x509 ocaml_lwt otr astring - ptime notty sexplib_p4 hex uutf + ptime notty sexplib hex uutf ]; buildPhase = "${ocamlPackages.topkg.run} build --pinned true"; diff --git a/pkgs/development/ocaml-modules/notty/default.nix b/pkgs/development/ocaml-modules/notty/default.nix index dcc57fddaf6..2dffb472f3e 100644 --- a/pkgs/development/ocaml-modules/notty/default.nix +++ b/pkgs/development/ocaml-modules/notty/default.nix @@ -1,30 +1,27 @@ -{ stdenv, buildOcaml, fetchpatch, fetchFromGitHub, findlib, topkg, ocb-stubblr +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, ocb-stubblr , result, uucp, uuseg, uutf , lwt ? null }: with stdenv.lib; +if !versionAtLeast ocaml.version "4.03" +then throw "notty is not available for OCaml ${ocaml.version}" +else + let withLwt = lwt != null; in -buildOcaml rec { - version = "0.1.1a"; - name = "notty"; +stdenv.mkDerivation rec { + version = "0.2.1"; + name = "ocaml${ocaml.version}-notty-${version}"; - minimumSupportedOcamlVersion = "4.02"; - - src = fetchFromGitHub { - owner = "pqwy"; - repo = "notty"; - rev = "53f5946653490fce980dc5d8cadf8b122cff4f19"; - sha256 = "0qmwb1hrp04py2i5spy0yd6c5jqxyss3wzvlkgxyl9r07kvsx6xf"; + src = fetchurl { + url = "https://github.com/pqwy/notty/releases/download/v${version}/notty-${version}.tbz"; + sha256 = "0wdfmgx1mz77s7m451vy8r9i4iqwn7s7b39kpbpckf3w9417riq0"; }; - patches = [ (fetchpatch { - url = https://github.com/dbuenzli/notty/commit/b0e12930acc26d030a74d6d63d622ae220b12c92.patch; - sha256 = "0pklplbnjbsjriqj73pc8fsadg404px534w7zknz2617zb44m6x6"; - })]; + unpackCmd = "tar -xjf $curSrc"; - buildInputs = [ findlib topkg ocb-stubblr ]; + buildInputs = [ ocaml findlib ocamlbuild topkg ocb-stubblr ]; propagatedBuildInputs = [ result uucp uuseg uutf ] ++ optional withLwt lwt; @@ -34,7 +31,8 @@ buildOcaml rec { inherit (topkg) installPhase; meta = { - inherit (src.meta) homepage; + homepage = "https://github.com/pqwy/notty"; + inherit (ocaml.meta) platforms; description = "Declarative terminal graphics for OCaml"; license = licenses.isc; maintainers = with maintainers; [ sternenseemann ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6faaaf070c4..10a5307a5b8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15404,9 +15404,7 @@ with pkgs; hyper = callPackage ../applications/misc/hyper { inherit (gnome2) GConf; }; hyperterm = self.hyper; - jackline = callPackage ../applications/networking/instant-messengers/jackline { - ocamlPackages = ocaml-ng.ocamlPackages_4_02; - }; + jackline = callPackage ../applications/networking/instant-messengers/jackline { }; slack = callPackage ../applications/networking/instant-messengers/slack { }; From d7944aba3ea519d0fff5adefbab80a19552bcf27 Mon Sep 17 00:00:00 2001 From: Matthew Pickering Date: Thu, 4 Jan 2018 16:51:32 +0000 Subject: [PATCH 191/296] Use self rather than super to make stringbuilder overridable --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 4253283d3c8..473402e031c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -48,7 +48,7 @@ self: super: { clock = dontCheck super.clock; Dust-crypto = dontCheck super.Dust-crypto; hasql-postgres = dontCheck super.hasql-postgres; - hspec = super.hspec.override { stringbuilder = dontCheck super.stringbuilder; }; + hspec = super.hspec.override { stringbuilder = dontCheck self.stringbuilder; }; hspec-core = super.hspec-core.override { silently = dontCheck super.silently; temporary = dontCheck super.temporary; }; hspec-expectations = dontCheck super.hspec-expectations; HTTP = dontCheck super.HTTP; From 1b0f696d109beebb5190eecaae4f5525b5ee8b06 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 4 Jan 2018 18:14:55 +0100 Subject: [PATCH 192/296] Fix copy-tarballs.pl --- maintainers/scripts/copy-tarballs.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/maintainers/scripts/copy-tarballs.pl b/maintainers/scripts/copy-tarballs.pl index 178dcfb38da..f3fe7236760 100755 --- a/maintainers/scripts/copy-tarballs.pl +++ b/maintainers/scripts/copy-tarballs.pl @@ -1,5 +1,5 @@ #! /usr/bin/env nix-shell -#! nix-shell -i perl -p perl perlPackages.NetAmazonS3 perlPackages.FileSlurp nixUnstable +#! nix-shell -i perl -p perl perlPackages.NetAmazonS3 perlPackages.FileSlurp nixUnstable nixUnstable.perl-bindings # This command uploads tarballs to tarballs.nixos.org, the # content-addressed cache used by fetchurl as a fallback for when @@ -59,6 +59,7 @@ my $s3 = Net::Amazon::S3->new( { aws_access_key_id => $aws_access_key_id, aws_secret_access_key => $aws_secret_access_key, retry => 1, + host => "s3-eu-west-1.amazonaws.com", }); my $bucket = $s3->bucket("nixpkgs-tarballs") or die; From 0f925943fdeafd7f6813488aac587e9c989e6e91 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 4 Jan 2018 12:15:31 -0500 Subject: [PATCH 193/296] Fix emacsWithPackages after 7f3ca3e21a22fd3101b40cadb86899542dec2e35. This is hacky but it does the job, resurrects findInputs from before staging merge --- pkgs/build-support/emacs/wrapper.nix | 36 +++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/build-support/emacs/wrapper.nix index bd733f1b9ba..27633c912b2 100644 --- a/pkgs/build-support/emacs/wrapper.nix +++ b/pkgs/build-support/emacs/wrapper.nix @@ -55,12 +55,46 @@ stdenv.mkDerivation { deps = runCommand "emacs-packages-deps" { inherit explicitRequires lndir emacs; } '' + findInputsOld() { + local pkg="$1"; shift + local var="$1"; shift + local propagatedBuildInputsFiles=("$@") + + # TODO(@Ericson2314): Restore using associative array once Darwin + # nix-shell doesn't use impure bash. This should replace the O(n) + # case with an O(1) hash map lookup, assuming bash is implemented + # well :D. + local varSlice="$var[*]" + # ''${..-} to hack around old bash empty array problem + case "''${!varSlice-}" in + *" $pkg "*) return 0 ;; + esac + unset -v varSlice + + eval "$var"'+=("$pkg")' + + if ! [ -e "$pkg" ]; then + echo "build input $pkg does not exist" >&2 + exit 1 + fi + + local file + for file in "''${propagatedBuildInputsFiles[@]}"; do + file="$pkg/nix-support/$file" + [[ -f "$file" ]] || continue + + local pkgNext + for pkgNext in $(< "$file"); do + findInputsOld "$pkgNext" "$var" "''${propagatedBuildInputsFiles[@]}" + done + done + } mkdir -p $out/bin mkdir -p $out/share/emacs/site-lisp local requires for pkg in $explicitRequires; do - findInputs $pkg requires propagated-user-env-packages + findInputsOld $pkg requires propagated-user-env-packages done # requires now holds all requested packages and their transitive dependencies From 42b84057a4cd608974348ee2066ff08b681c139c Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 4 Jan 2018 12:39:00 -0600 Subject: [PATCH 194/296] qt5.6: backport seccomp patch to fix errors w/new glibc + epoll_pwait Based on: https://chromium.googlesource.com/chromium/src/+/4e8083b4ab953ba298aedfc4e79d464be15e4012 Fixes mendeley bug mentioned in #33396, which links to related issues in other distributions and upstream Qt. --- .../libraries/qt-5/5.6/default.nix | 4 ++-- .../qt-5/5.6/qtwebengine-seccomp.patch | 24 +++++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/qt-5/5.6/qtwebengine-seccomp.patch diff --git a/pkgs/development/libraries/qt-5/5.6/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix index 7930bd909aa..9ad5af8eecd 100644 --- a/pkgs/development/libraries/qt-5/5.6/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/default.nix @@ -51,8 +51,8 @@ let qtscript = [ ./qtscript.patch ]; qtserialport = [ ./qtserialport.patch ]; qttools = [ ./qttools.patch ]; - qtwebengine = - optional stdenv.needsPax ./qtwebengine-paxmark-mksnapshot.patch; + qtwebengine = [ ./qtwebengine-seccomp.patch ] + ++ optional stdenv.needsPax ./qtwebengine-paxmark-mksnapshot.patch; qtwebkit = [ ./qtwebkit.patch ]; }; diff --git a/pkgs/development/libraries/qt-5/5.6/qtwebengine-seccomp.patch b/pkgs/development/libraries/qt-5/5.6/qtwebengine-seccomp.patch new file mode 100644 index 00000000000..bf6af805982 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.6/qtwebengine-seccomp.patch @@ -0,0 +1,24 @@ +Backported to Qt 5.6 for epoll_pwait fix on newer glibc +Part of upstream Chromium's 4e8083b4ab953ba298aedfc4e79d464be15e4012 +Review URL: https://codereview.chromium.org/1613883002 +--- +diff --git a/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc b/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc +index 10278dc5fc9b..b30b3e6acef6 100644 +--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc ++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc +@@ -414,6 +414,7 @@ bool SyscallSets::IsAllowedEpoll(int sysno) { + case __NR_epoll_create: + case __NR_epoll_wait: + #endif ++ case __NR_epoll_pwait: + case __NR_epoll_create1: + case __NR_epoll_ctl: + return true; +@@ -421,7 +422,6 @@ bool SyscallSets::IsAllowedEpoll(int sysno) { + #if defined(__x86_64__) + case __NR_epoll_ctl_old: + #endif +- case __NR_epoll_pwait: + #if defined(__x86_64__) + case __NR_epoll_wait_old: + #endif From dea9fceb0b05aae8729a32a947d38cfa49caac89 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 2 Jan 2018 22:14:50 -0500 Subject: [PATCH 195/296] ghcWithPackages: Get rid of unused passthrough If you want the whole packages set...don't use ghcWithPackages. --- pkgs/development/haskell-modules/make-package-set.nix | 1 - pkgs/development/haskell-modules/with-packages-wrapper.nix | 2 -- 2 files changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 968773ded98..6d11048cb6d 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -102,7 +102,6 @@ let withPackages = packages: buildPackages.callPackage ./with-packages-wrapper.nix { inherit (self) llvmPackages; - haskellPackages = self; inherit packages; }; diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index 7d192dc5d7d..09b6683e26a 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -1,7 +1,6 @@ { lib, targetPlatform, ghc, llvmPackages, packages, symlinkJoin, makeWrapper , withLLVM ? false , postBuild ? "" -, haskellPackages , ghcLibdir ? null # only used by ghcjs, when resolving plugins }: @@ -131,6 +130,5 @@ symlinkJoin { passthru = { preferLocalBuild = true; inherit (ghc) version meta; - inherit haskellPackages; }; } From ec2f121bed216c089a066a1fe076d74256b55a49 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 2 Jan 2018 23:19:22 -0500 Subject: [PATCH 196/296] ghcWithPackages: Fix comment URL --- pkgs/development/haskell-modules/with-packages-wrapper.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index 09b6683e26a..3e8fad712bf 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -44,7 +44,7 @@ let paths = lib.filter (x: x ? isHaskellLibrary) (lib.closePropagation packages); hasLibraries = lib.any (x: x.isHaskellLibrary) paths; # CLang is needed on Darwin for -fllvm to work: - # https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/code-generators.html + # https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/codegens.html#llvm-code-generator-fllvm llvm = lib.makeBinPath ([ llvmPackages.llvm ] ++ lib.optional targetPlatform.isDarwin llvmPackages.clang); From f07d90d5c5f62955828a8bf0e40fa1e27e3b4056 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 3 Jan 2018 14:17:33 -0600 Subject: [PATCH 197/296] mendeley: fix gconf errors by propgating to user env gconf fix is based on same done w/guake in #16670. See also: https://github.com/NixOS/nixpkgs/issues/24709#issuecomment-292565654 --- pkgs/applications/office/mendeley/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index b78eaa9fd3f..12ad8431cac 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -96,6 +96,8 @@ stdenv.mkDerivation { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ dpkg which ] ++ deps; + propagatedUserEnvPkgs = [ gconf ]; + unpackPhase = "true"; installPhase = '' From 039b9ab8b97dfd2b9303a6a4493b5001cbe6d146 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 3 Jan 2018 14:27:09 -0600 Subject: [PATCH 198/296] mendeley: Use libsForQt56.callPackage, NFCI --- pkgs/applications/office/mendeley/default.nix | 22 ++++++++++++------- pkgs/top-level/all-packages.nix | 3 +-- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index 12ad8431cac..c2b6dc710ba 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -15,7 +15,13 @@ , orc , nss , nspr -, qt5 +, qtbase +, qtsvg +, qtdeclarative +, qtwebchannel +, qtquickcontrols +, qtwebkit +, qtwebengine , sqlite , xorg , xlibs @@ -47,13 +53,13 @@ let else "11z65mj1a2rw6cwfarl8r1vzpcz4ww5mgvd5fyv31l60mbmnqkap"; deps = [ - qt5.qtbase - qt5.qtsvg - qt5.qtdeclarative - qt5.qtwebchannel - qt5.qtquickcontrols - qt5.qtwebkit - qt5.qtwebengine + qtbase + qtsvg + qtdeclarative + qtwebchannel + qtquickcontrols + qtwebkit + qtwebengine alsaLib dbus freetype diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 10a5307a5b8..ea2a5a90697 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15896,8 +15896,7 @@ with pkgs; mcomix = callPackage ../applications/graphics/mcomix { }; - mendeley = callPackage ../applications/office/mendeley { - qt5 = qt56; + mendeley = libsForQt56.callPackage ../applications/office/mendeley { gconf = pkgs.gnome2.GConf; }; From 144b7d2acc5606acd7006565d1f3aad9f9d399e0 Mon Sep 17 00:00:00 2001 From: Eric Litak Date: Mon, 1 Jan 2018 15:33:07 -0800 Subject: [PATCH 199/296] betaflight: init at 3.2.3 --- pkgs/development/stm32/betaflight/default.nix | 65 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 67 insertions(+) create mode 100644 pkgs/development/stm32/betaflight/default.nix diff --git a/pkgs/development/stm32/betaflight/default.nix b/pkgs/development/stm32/betaflight/default.nix new file mode 100644 index 00000000000..8d4d0d7f4a2 --- /dev/null +++ b/pkgs/development/stm32/betaflight/default.nix @@ -0,0 +1,65 @@ +{ stdenv, fetchFromGitHub +, gcc-arm-embedded, python2 +, skipTargets ? [ + # These targets do not build for various unexplored reasons + # TODO ... fix them + "AFROMINI" + "ALIENWHOOP" + "BEEBRAIN" + "CJMCU" + "FRSKYF3" +]}: + +let + + version = "3.2.3"; + +in stdenv.mkDerivation rec { + + name = "betaflight-${version}"; + + src = fetchFromGitHub { + owner = "betaflight"; + repo = "betaflight"; + rev = "v${version}"; + sha256 = "0vbjyxfjxgpaiiwvj5bscrlfikzp3wnxpmc4sxcz5yw5mwb9g428"; + }; + + buildInputs = [ + gcc-arm-embedded + python2 + ]; + + postPatch = '' + sed -ri "s/REVISION.*=.*git log.*/REVISION = ${builtins.substring 0 9 src.rev}/" Makefile # Let's not require git in shell + sed -ri "s/binary hex/hex/" Makefile # No need for anything besides .hex + ''; + + enableParallelBuilding = true; + + preBuild = '' + buildFlagsArray=( + "SKIP_TARGETS=${toString skipTargets}" + "GCC_REQUIRED_VERSION=$(arm-none-eabi-gcc -dumpversion)" + all + ) + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out + cp obj/*.hex $out + + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "Flight controller software (firmware) used to fly multi-rotor craft and fixed wing craft"; + homepage = https://github.com/betaflight/betaflight; + license = licenses.gpl3; + maintainers = with maintainers; [ elitak ]; + platforms = platforms.linux; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c77658244df..c370aa0befe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6998,6 +6998,8 @@ with pkgs; avr8burnomat = callPackage ../development/misc/avr8-burn-omat { }; + betaflight = callPackage ../development/stm32/betaflight { }; + sourceFromHead = callPackage ../build-support/source-from-head-fun.nix {}; ecj = callPackage ../development/eclipse/ecj { }; From cb178e74376c59e9db2ac9e99f0f391003ea5888 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Thu, 4 Jan 2018 17:59:52 -0500 Subject: [PATCH 200/296] 2018 will be the year of NixOS --- COPYING | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/COPYING b/COPYING index afc460fff5c..198597a1b41 100644 --- a/COPYING +++ b/COPYING @@ -1,4 +1,4 @@ -Copyright (c) 2003-2017 Eelco Dolstra and the Nixpkgs/NixOS contributors +Copyright (c) 2003-2018 Eelco Dolstra and the Nixpkgs/NixOS contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the From bd43424e2ca48c1864725d77aa2705dcd135f0db Mon Sep 17 00:00:00 2001 From: Ingo Blechschmidt Date: Fri, 5 Jan 2018 00:01:51 +0100 Subject: [PATCH 201/296] signal-desktop: fix URL to Debian package (fixes #33401) (#33440) --- .../networking/instant-messengers/signal-desktop/beta.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/beta.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/beta.nix index 1276306a8dc..9876767b57e 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/beta.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/beta.nix @@ -45,7 +45,7 @@ in src = if stdenv.system == "x86_64-linux" then fetchurl { - url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop-beta_${version}_amd64.deb"; + url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop-beta/signal-desktop-beta_${version}_amd64.deb"; sha256 = "1kllym2iazp9i5afrh0vmsqqlh5b8i6f929p5yhl8bl4zd17zwpx"; } else From 00309d66ffef977d0b541531811bc621bbc70d1b Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Fri, 5 Jan 2018 00:39:44 +0100 Subject: [PATCH 202/296] pcsclite: fix darwin build --- pkgs/tools/security/pcsclite/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix index 5d9c8089441..589316b1d1c 100644 --- a/pkgs/tools/security/pcsclite/default.nix +++ b/pkgs/tools/security/pcsclite/default.nix @@ -20,7 +20,9 @@ stdenv.mkDerivation rec { "--enable-confdir=/etc" "--enable-ipcdir=/run/pcscd" ] ++ stdenv.lib.optional stdenv.isLinux - "--with-systemdsystemunitdir=\${out}/etc/systemd/system"; + "--with-systemdsystemunitdir=\${out}/etc/systemd/system" + ++ stdenv.lib.optional (!stdenv.isLinux) + "--disable-libsystemd"; postConfigure = '' sed -i -re '/^#define *PCSCLITE_HP_DROPDIR */ { From 93f30a4144c037e44af7d5287d04980a49bebac8 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Wed, 3 Jan 2018 22:20:00 -0400 Subject: [PATCH 203/296] youtube-dl: 2017.12.23 -> 2017.12.31 - add phantomjs2 to PATH for openload plugin --- pkgs/tools/misc/youtube-dl/default.nix | 10 ++++++---- pkgs/top-level/python-packages.nix | 1 + 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index d8af8169a18..808858724e6 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, buildPythonApplication -, zip, ffmpeg, rtmpdump, atomicparsley, pycryptodome, pandoc +, zip, ffmpeg, rtmpdump, phantomjs2, atomicparsley, pycryptodome, pandoc # Pandoc is required to build the package's man page. Release tarballs contain a # formatted man page already, though, it will still be installed. We keep the # manpage argument in place in case someone wants to use this derivation to @@ -8,6 +8,7 @@ , generateManPage ? false , ffmpegSupport ? true , rtmpSupport ? true +, phantomjsSupport ? true , hlsEncryptedSupport ? true , makeWrapper }: @@ -15,11 +16,11 @@ with stdenv.lib; buildPythonApplication rec { name = "youtube-dl-${version}"; - version = "2017.12.23"; + version = "2017.12.31"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "12m1bjdqm9bsc1f5psnzc203avzwr070xpdr6fqr728am536q845"; + sha256 = "0cq10ii96lpq3z7l1js0s59sqb4h4yqwdqinl2yf7cdjynvj62xi"; }; nativeBuildInputs = [ makeWrapper ]; @@ -33,7 +34,8 @@ buildPythonApplication rec { packagesToBinPath = [ atomicparsley ] ++ optional ffmpegSupport ffmpeg - ++ optional rtmpSupport rtmpdump; + ++ optional rtmpSupport rtmpdump + ++ optional phantomjsSupport phantomjs2; in '' wrapProgram $out/bin/youtube-dl --prefix PATH : "${makeBinPath packagesToBinPath}" ''; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d9588e9f9f2..b356c1005bc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18873,6 +18873,7 @@ EOF youtube-dl-light = callPackage ../tools/misc/youtube-dl { ffmpegSupport = false; + phantomjsSupport = false; }; zbase32 = buildPythonPackage (rec { From c01cfb9e01c6925034119e7e027720e306e9043b Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 5 Jan 2018 02:32:17 +0100 Subject: [PATCH 204/296] firmware-linux-nonfree: 2017-12-06 -> 2018-01-04 --- .../linux/firmware/firmware-linux-nonfree/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix index 0044a3f6f4a..809d0ba5264 100644 --- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "firmware-linux-nonfree-${version}"; - version = "2017-12-06-${src.iwlRev}"; + version = "2018-01-04-${src.iwlRev}"; # The src runCommand automates the process of building a merged repository of both # @@ -18,12 +18,12 @@ stdenv.mkDerivation rec { src = runCommand "firmware-linux-nonfree-src-merged-${version}" { shallowSince = "2017-10-01"; - baseRev = "7f93c9deb484c0a8f4cf59780e77dc7b0c14abe3"; + baseRev = "65b1c68c63f974d72610db38dfae49861117cae2"; iwlRev = "iwlwifi-fw-2017-11-15"; # When updating this, you need to let it run with a wrong hash, in order to find out the desired hash # randomly mutate the hash to break out of fixed hash, when updating - outputHash = "007ncka33vkyaxnih3a36w5pnhn19wdzjl95ig7lhznzvf1bnc1w"; + outputHash = "1anr7fblxfcrfrrgq98kzy64yrwygc2wdgi47skdmjxhi3wbrvxz"; outputHashAlgo = "sha256"; outputHashMode = "recursive"; @@ -55,12 +55,15 @@ stdenv.mkDerivation rec { installFlags = [ "DESTDIR=$(out)" ]; + # Firmware blobs do not need fixing and should not be modified + dontFixup = true; + meta = with stdenv.lib; { description = "Binary firmware collection packaged by kernel.org"; homepage = http://packages.debian.org/sid/firmware-linux-nonfree; license = licenses.unfreeRedistributableFirmware; platforms = platforms.linux; - maintainers = with maintainers; [ wkennington fpletz ]; + maintainers = with maintainers; [ fpletz ]; priority = 6; # give precedence to kernel firmware }; From 14a4749e44af4fbcd92d4b2628e46e9e28365134 Mon Sep 17 00:00:00 2001 From: Victor Calvert Date: Thu, 4 Jan 2018 20:33:49 -0500 Subject: [PATCH 205/296] tomb: 2.4 -> 2.5 --- pkgs/os-specific/linux/tomb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/tomb/default.nix b/pkgs/os-specific/linux/tomb/default.nix index 2ef5d53b066..a43c53e02bb 100644 --- a/pkgs/os-specific/linux/tomb/default.nix +++ b/pkgs/os-specific/linux/tomb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "tomb-${version}"; - version = "2.4"; + version = "2.5"; src = fetchFromGitHub { owner = "dyne"; repo = "Tomb"; rev = "v${version}"; - sha256 = "192jpgn02mvi4d4inbq2q11zl7xw6njymvali7al8wmygkkycrw4"; + sha256 = "1wk1aanzfln88min29p5av2j8gd8vj5afbs2gvarv7lvx1vi7kh1"; }; nativeBuildInputs = [ makeWrapper ]; From 4e990c25e3c0a24e29e1d68f63cd2c04f8cdd649 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Fri, 5 Jan 2018 03:51:03 +0000 Subject: [PATCH 206/296] broadcom-sta: fix build --- pkgs/os-specific/linux/broadcom-sta/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix index 8a42e5a0b26..c6bd4f4b206 100644 --- a/pkgs/os-specific/linux/broadcom-sta/default.nix +++ b/pkgs/os-specific/linux/broadcom-sta/default.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation { hardeningDisable = [ "pic" ]; + nativeBuildInputs = kernel.moduleBuildDependencies; + patches = [ ./i686-build-failure.patch ./license.patch From c696d38ecdfd7563b4d85ade25c0821c33a654ed Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Fri, 5 Jan 2018 14:17:03 +0900 Subject: [PATCH 207/296] universal-ctags: 2017-09-22 -> 2018-01-05 Fixup of https://github.com/NixOS/nixpkgs/issues/33124 (ctags failed to create its temporary files when TMPDIR was not in environment). I used the opportunity to bump version with the improvements made to ctags to help diagnose these kinds of errors: https://github.com/universal-ctags/ctags/pull/1648 --- .../tools/misc/universal-ctags/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/misc/universal-ctags/default.nix b/pkgs/development/tools/misc/universal-ctags/default.nix index 2a77fc42602..eb51abe0321 100644 --- a/pkgs/development/tools/misc/universal-ctags/default.nix +++ b/pkgs/development/tools/misc/universal-ctags/default.nix @@ -2,22 +2,25 @@ stdenv.mkDerivation rec { name = "universal-ctags-${version}"; - version = "2017-09-22"; + version = "2018-01-05"; src = fetchFromGitHub { owner = "universal-ctags"; repo = "ctags"; - rev = "b9537289952cc7b26526aaff3094599d714d1729"; - sha256 = "1kbw9ycl2ddzpfs1v4rbqa4gdhw4inrisf4awyaxb7zxfxmbzk1g"; + rev = "c66bdfb4db99977c1bd0568e33e60853a48dca65"; + sha256 = "0fdzhr0704cj84ym00plkl5l9w83haal6i6w70lx6f4968pcliyi"; }; nativeBuildInputs = [ autoreconfHook pkgconfig pythonPackages.docutils ]; buildInputs = stdenv.lib.optional stdenv.isDarwin libiconv; + # to generate makefile.in autoreconfPhase = '' - ./autogen.sh --tmpdir + ./autogen.sh ''; + configureFlags = [ "--enable-tmpdir=/tmp" ]; + postConfigure = '' sed -i 's|/usr/bin/env perl|${perl}/bin/perl|' misc/optlib2c ''; From 028068a274d8b575cf6821617829ac6605d9b791 Mon Sep 17 00:00:00 2001 From: Daniel Fullmer Date: Thu, 4 Jan 2018 20:45:50 -0500 Subject: [PATCH 208/296] qtpass: 1.1.6 -> 1.2.1 --- pkgs/applications/misc/qtpass/default.nix | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix index d300e411c94..95328deef4c 100644 --- a/pkgs/applications/misc/qtpass/default.nix +++ b/pkgs/applications/misc/qtpass/default.nix @@ -2,32 +2,27 @@ stdenv.mkDerivation rec { name = "qtpass-${version}"; - version = "1.1.6"; + version = "1.2.1"; src = fetchFromGitHub { owner = "IJHack"; repo = "QtPass"; rev = "v${version}"; - sha256 = "0jq5a1cvqvsjwld0nldl6kmcz9g59hiccmbg98xwji04n8174y7j"; + sha256 = "0pp38b3fifkfwqcb6vi194ccgb8j3zc8j8jq8ww5ib0wvhldzsg8"; }; buildInputs = [ git gnupg pass qtbase qtsvg qttools ]; nativeBuildInputs = [ makeWrapper qmake ]; - preConfigure = '' - qmakeFlags="$qmakeFlags DESTDIR=$out" - ''; - - installPhase = '' - mkdir $out/bin - mv $out/qtpass $out/bin - install -D {,$out/share/applications/}qtpass.desktop - install -D artwork/icon.svg $out/share/icons/hicolor/scalable/apps/qtpass-icon.svg - runHook postInstall + postPatch = '' + substituteInPlace qtpass.pro --replace "SUBDIRS += src tests main" "SUBDIRS += src main" + substituteInPlace qtpass.pro --replace "main.depends = tests" "main.depends = src" ''; postInstall = '' + install -D qtpass.desktop $out/share/applications/qtpass.desktop + install -D artwork/icon.svg $out/share/icons/hicolor/scalable/apps/qtpass-icon.svg wrapProgram $out/bin/qtpass \ --suffix PATH : ${git}/bin \ --suffix PATH : ${gnupg}/bin \ From 1e6a48e2966ca8c8523056631b090e139c48ebc0 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 5 Jan 2018 16:11:12 +0800 Subject: [PATCH 209/296] qtpass: Fix huge icons and spacing --- pkgs/applications/misc/qtpass/default.nix | 2 ++ pkgs/applications/misc/qtpass/hidpi.patch | 13 +++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/applications/misc/qtpass/hidpi.patch diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix index 95328deef4c..e03dd65b9eb 100644 --- a/pkgs/applications/misc/qtpass/default.nix +++ b/pkgs/applications/misc/qtpass/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0pp38b3fifkfwqcb6vi194ccgb8j3zc8j8jq8ww5ib0wvhldzsg8"; }; + patches = [ ./hidpi.patch ]; + buildInputs = [ git gnupg pass qtbase qtsvg qttools ]; nativeBuildInputs = [ makeWrapper qmake ]; diff --git a/pkgs/applications/misc/qtpass/hidpi.patch b/pkgs/applications/misc/qtpass/hidpi.patch new file mode 100644 index 00000000000..629bcbb5bac --- /dev/null +++ b/pkgs/applications/misc/qtpass/hidpi.patch @@ -0,0 +1,13 @@ +diff --git a/main/main.cpp b/main/main.cpp +index 8a18409c..1cddd911 100644 +--- a/main/main.cpp ++++ b/main/main.cpp +@@ -35,7 +35,7 @@ + * @return + */ + int main(int argc, char *argv[]) { +- qputenv("QT_AUTO_SCREEN_SCALE_FACTOR", "1"); ++ QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); + QString text = ""; + for (int i = 1; i < argc; ++i) { + if (i > 1) From c513945df8498c77dea00e98556ca0fc9c9667d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 5 Jan 2018 09:25:04 +0100 Subject: [PATCH 210/296] linuxPackages.ixgbevf: needs libelf from kernel.moduleBuildDependencies --- pkgs/os-specific/linux/ixgbevf/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/ixgbevf/default.nix b/pkgs/os-specific/linux/ixgbevf/default.nix index df4ef81adb8..68064386a30 100644 --- a/pkgs/os-specific/linux/ixgbevf/default.nix +++ b/pkgs/os-specific/linux/ixgbevf/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1666hsavaspjmf45ij396mkndzk6g0n3ibr2glfdhjfqhfy35zb8"; }; + nativeBuildInputs = kernel.moduleBuildDependencies; + hardeningDisable = [ "pic" ]; configurePhase = '' From b1a1062dad115a5f44503031f0d98a0e359fccc3 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Tue, 2 Jan 2018 16:07:29 -0500 Subject: [PATCH 211/296] text-icu: Some sort of testing issue with ghc-8.2 --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c6c38df4e0d..5e04bf5a846 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1003,6 +1003,9 @@ self: super: { # https://github.com/alphaHeavy/protobuf/issues/34 protobuf = dontCheck super.protobuf; + # https://github.com/bos/text-icu/issues/32 + text-icu = dontCheck super.text-icu; + # https://github.com/strake/lenz.hs/issues/2 lenz = let patch = pkgs.fetchpatch From a1a3aeaa8f8cc20eb386a240e94e3a373d959621 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 3 Jan 2018 02:30:39 +0100 Subject: [PATCH 212/296] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.7.2 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/1ec0a139aaf92a4138b47175062920e76e5162ab. --- .../haskell-modules/hackage-packages.nix | 1354 +++++++++++++++-- 1 file changed, 1193 insertions(+), 161 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index a3481d547e2..7c6f472b879 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -4008,6 +4008,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Decimal_0_5_1" = callPackage + ({ mkDerivation, base, deepseq, HUnit, QuickCheck, test-framework + , test-framework-hunit, test-framework-quickcheck2 + }: + mkDerivation { + pname = "Decimal"; + version = "0.5.1"; + sha256 = "0k7kh05mr2f54w1lpgq1nln0h8k6s6h99dyp5jzsb9cfbb3aap2p"; + libraryHaskellDepends = [ base deepseq ]; + testHaskellDepends = [ + base deepseq HUnit QuickCheck test-framework test-framework-hunit + test-framework-quickcheck2 + ]; + homepage = "https://github.com/PaulJohnson/Haskell-Decimal"; + description = "Decimal numbers with variable precision"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "DecisionTree" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -6021,8 +6040,8 @@ self: { ({ mkDerivation, base, GLFW, monad-task, OpenGL, transformers }: mkDerivation { pname = "GLFW-task"; - version = "0.2.0"; - sha256 = "110iwxp6xs3wj4bva8m6mgz7iq90zrcz2dnjlq3s2x3in2m4818p"; + version = "0.3.0"; + sha256 = "1il8npm7ygg0j8byczlxadlnnf6xxy5hn307k75drbhn4z8swcqg"; libraryHaskellDepends = [ base GLFW monad-task OpenGL transformers ]; @@ -11857,8 +11876,8 @@ self: { ({ mkDerivation, base, bytestring, hidapi, mtl }: mkDerivation { pname = "MBot"; - version = "0.2.3.0"; - sha256 = "1h2fapfjr5hzsr9grpk268rxfaiwl4yfgfw7wz0khrcnhjs5m9b2"; + version = "0.2.4.0"; + sha256 = "1jzjf1p1ld9xdxqb9jf32nyhzmp29mirpinz24s8blwpscia5v56"; libraryHaskellDepends = [ base bytestring hidapi mtl ]; description = "Haskell interface for controlling the mBot educational robot"; license = stdenv.lib.licenses.gpl3; @@ -13878,6 +13897,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Ordinary" = callPackage + ({ mkDerivation, base, safe, threepenny-gui }: + mkDerivation { + pname = "Ordinary"; + version = "0.2018.1.4"; + sha256 = "15vlilrv2m0b1xkc28ywcl50i0bxdpxqd5164a99nhl0in0s62m1"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base safe threepenny-gui ]; + executableHaskellDepends = [ base safe threepenny-gui ]; + testHaskellDepends = [ base safe threepenny-gui ]; + homepage = "https://github.com/MarisaKirisame/Ordinary#readme"; + description = "Short description of your package"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "PArrows" = callPackage ({ mkDerivation, base, containers, ghc-prim, mtl }: mkDerivation { @@ -20751,8 +20786,8 @@ self: { pname = "acme-mutable-package"; version = "0"; sha256 = "16da6pkkdr2g77dn3n4v9x6mwi6yz3xlpisvpn0id2xz0bayipmr"; - revision = "2"; - editedCabalFile = "03qif3idd7s5ldk0fm89ii6gnw1qkwpgcwkg35raqawsfsvn4sbg"; + revision = "3"; + editedCabalFile = "094kr4ib0hldgccr5bvy9azpfvkf5dmq3hq6xk5hyha6djjkx2gc"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base ]; description = "A mutable package"; @@ -29058,24 +29093,24 @@ self: { "ats-format" = callPackage ({ mkDerivation, alex, ansi-terminal, ansi-wl-pprint, array, base - , Cabal, composition-prelude, criterion, deepseq, directory - , dirstream, file-embed, filepath, happy, hspec, hspec-core - , htoml-megaparsec, lens, megaparsec, optparse-applicative, pipes - , pipes-safe, process, recursion-schemes, system-filepath, text - , unordered-containers + , blaze-html, blaze-markup, Cabal, composition-prelude, criterion + , deepseq, directory, dirstream, file-embed, filepath, happy, hspec + , hspec-core, htoml-megaparsec, lens, megaparsec + , optparse-applicative, pipes, pipes-safe, process + , recursion-schemes, system-filepath, text, unordered-containers }: mkDerivation { pname = "ats-format"; - version = "0.1.0.16"; - sha256 = "1cvhbzjsqdzq758hz3fms32nn87dzbdsw6qz46ax957hfwp3wimw"; + version = "0.1.0.17"; + sha256 = "1byflc9cwn1yc4d0ynp7ypxhf7x7dfccvj6h4qddhmsvlvjlv2n7"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal directory lens process ]; libraryHaskellDepends = [ - ansi-terminal ansi-wl-pprint array base composition-prelude deepseq - directory file-embed htoml-megaparsec lens megaparsec - optparse-applicative process recursion-schemes text + ansi-terminal ansi-wl-pprint array base blaze-html blaze-markup + composition-prelude deepseq directory file-embed htoml-megaparsec + lens megaparsec optparse-applicative process recursion-schemes text unordered-containers ]; libraryToolDepends = [ alex happy ]; @@ -31993,6 +32028,53 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "bdcs" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, Cabal + , codec-rpm, cond, conduit, conduit-combinators, conduit-extra + , containers, content-store, cpio-conduit, cryptonite, directory + , esqueleto, exceptions, filepath, gi-gio, gi-glib, gi-ostree + , gitrev, hspec, http-conduit, HUnit, memory, monad-control + , monad-logger, monad-loops, mtl, network-uri, ostree, parsec + , parsec-numbers, persistent, persistent-sqlite + , persistent-template, process, regex-pcre, resourcet, split, tar + , tar-conduit, temporary, text, time, unix, unordered-containers + , xml-conduit + }: + mkDerivation { + pname = "bdcs"; + version = "0.1.0"; + sha256 = "1z9wfyay1l6d1l86izh31nldg0yidqyzvj3l11k4wrqr5yn07hfs"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal filepath ]; + libraryHaskellDepends = [ + aeson base bytestring codec-rpm cond conduit conduit-combinators + conduit-extra containers content-store cpio-conduit cryptonite + directory esqueleto exceptions filepath gi-gio gi-glib gi-ostree + gitrev http-conduit memory monad-control monad-logger mtl + network-uri parsec parsec-numbers persistent persistent-sqlite + persistent-template process regex-pcre resourcet split tar + tar-conduit temporary text time unix unordered-containers + xml-conduit + ]; + libraryPkgconfigDepends = [ ostree ]; + executableHaskellDepends = [ + aeson aeson-pretty base bytestring cond conduit content-store + directory filepath monad-loops mtl network-uri persistent-sqlite + process regex-pcre text time + ]; + testHaskellDepends = [ + aeson base bytestring codec-rpm cond conduit conduit-combinators + containers directory esqueleto filepath gi-gio gi-glib hspec HUnit + monad-logger mtl parsec parsec-numbers persistent persistent-sqlite + persistent-template resourcet text time unix + ]; + homepage = "https://github.com/weldr/bdcs"; + description = "Tools for managing a content store of software packages"; + license = "LGPL"; + }) {inherit (pkgs) ostree;}; + "bdd" = callPackage ({ mkDerivation, base, directory, HUnit, mtl, process , test-framework, test-framework-hunit, transformers @@ -37140,7 +37222,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "brick_0_32" = callPackage + "brick_0_32_1" = callPackage ({ mkDerivation, base, config-ini, containers, contravariant , data-clist, deepseq, dlist, microlens, microlens-mtl , microlens-th, stm, template-haskell, text, text-zipper @@ -37148,8 +37230,8 @@ self: { }: mkDerivation { pname = "brick"; - version = "0.32"; - sha256 = "0n9gg58ky1bn6p9s1yxz2yiml46sa4hxjhmy41w90v6gwgw8i4cr"; + version = "0.32.1"; + sha256 = "09lyl9zz8hl6p7w5d34kpwsac66w3pqr4f6k97yb9chpcpfiqmb6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -38322,8 +38404,8 @@ self: { ({ mkDerivation, base, bytestring, terminal-progress-bar, time }: mkDerivation { pname = "bytestring-progress"; - version = "1.0.7"; - sha256 = "0c1pz39jp9p8ppajnj3f2phph12nvhhjj7iz8sm580gzdl5rbc4p"; + version = "1.0.8"; + sha256 = "0zqb9aanlwq2ddcn7n8xar73fjb04xvfym7k5pjah2cs1lh3cv8l"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring terminal-progress-bar time @@ -40559,6 +40641,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "capataz" = callPackage + ({ mkDerivation, async, base, bytestring, data-default, pretty-show + , protolude, safe-exceptions, stm, tasty, tasty-hunit, tasty-rerun + , tasty-smallcheck, teardown, text, time, unordered-containers + , uuid, vector + }: + mkDerivation { + pname = "capataz"; + version = "0.0.0.1"; + sha256 = "0bfwciidmp0ijgaq7zbyqw35m702xs9lm382072jwws8y353n29s"; + libraryHaskellDepends = [ + async base bytestring data-default protolude safe-exceptions stm + teardown text time unordered-containers uuid vector + ]; + testHaskellDepends = [ + async base bytestring data-default pretty-show protolude + safe-exceptions stm tasty tasty-hunit tasty-rerun tasty-smallcheck + teardown text time unordered-containers uuid vector + ]; + homepage = "https://github.com/roman/Haskell-capataz#readme"; + description = "OTP-like supervision trees in Haskell"; + license = stdenv.lib.licenses.mit; + }) {}; + "capped-list" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -45733,6 +45839,24 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "coalpit" = callPackage + ({ mkDerivation, base, generic-random, megaparsec, network-uri + , scientific, tasty, tasty-quickcheck, tasty-travis, time + }: + mkDerivation { + pname = "coalpit"; + version = "0.1.1.0"; + sha256 = "0adays54vg3pyrc3hsdmir0cj7h4r4vvm3a4zakia82gd8bz99iq"; + libraryHaskellDepends = [ + base megaparsec network-uri scientific time + ]; + testHaskellDepends = [ + base generic-random tasty tasty-quickcheck tasty-travis + ]; + description = "Command-line options and DSV parsing and printing"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "code-builder" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -48451,6 +48575,38 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "conduit-extra_1_2_3_2" = callPackage + ({ mkDerivation, async, attoparsec, base, blaze-builder, bytestring + , bytestring-builder, conduit, criterion, directory, exceptions + , filepath, hspec, monad-control, network, primitive, process + , QuickCheck, resourcet, stm, streaming-commons, text, transformers + , transformers-base, typed-process, unliftio-core + }: + mkDerivation { + pname = "conduit-extra"; + version = "1.2.3.2"; + sha256 = "1xihl8zrd6jyfnlmsrqshwwqc8176whs5im4jvxvk9038wl6cnqx"; + libraryHaskellDepends = [ + async attoparsec base blaze-builder bytestring conduit directory + exceptions filepath monad-control network primitive process + resourcet stm streaming-commons text transformers transformers-base + typed-process unliftio-core + ]; + testHaskellDepends = [ + async attoparsec base blaze-builder bytestring bytestring-builder + conduit directory exceptions hspec process QuickCheck resourcet stm + streaming-commons text transformers transformers-base + ]; + benchmarkHaskellDepends = [ + base blaze-builder bytestring bytestring-builder conduit criterion + transformers + ]; + homepage = "http://github.com/snoyberg/conduit"; + description = "Batteries included conduit: adapters for common libraries"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "conduit-find" = callPackage ({ mkDerivation, attoparsec, base, conduit, conduit-combinators , conduit-extra, directory, doctest, either, exceptions, filepath @@ -50780,8 +50936,8 @@ self: { ({ mkDerivation, base, containers, parallel }: mkDerivation { pname = "cpsa"; - version = "3.4.0"; - sha256 = "01imn0nnb567m1l48bjaa6nqp0555bw5lp40d9bqz56dalh4lnlk"; + version = "3.4.1"; + sha256 = "1sd6h0xw76iwvgl7i4c9wy6q5fmq75inq5vh79rzf3bhmahb1529"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -51789,6 +51945,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "crypto-api_0_13_3" = callPackage + ({ mkDerivation, base, bytestring, cereal, entropy, tagged + , transformers + }: + mkDerivation { + pname = "crypto-api"; + version = "0.13.3"; + sha256 = "19bsmkqkpnvh01b77pmyarx00fic15j4hvg4pzscrj4prskrx2i9"; + libraryHaskellDepends = [ + base bytestring cereal entropy tagged transformers + ]; + homepage = "https://github.com/TomMD/crypto-api"; + description = "A generic interface for cryptographic operations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "crypto-api-tests" = callPackage ({ mkDerivation, base, bytestring, cereal, crypto-api, directory , filepath, HUnit, QuickCheck, test-framework, test-framework-hunit @@ -58956,8 +59129,10 @@ self: { }: mkDerivation { pname = "dib"; - version = "0.6.1"; - sha256 = "0y7bkmmzqi9rgiq98m006gfjkr3q2wz2hpxx1dn9pyv896g1cr9l"; + version = "0.7.1"; + sha256 = "19qk3k39ckjjinsiixapjnslv2y7abnb0vivp33g054lhjv066z3"; + revision = "1"; + editedCabalFile = "19kzycbym6q077kwz5xw6gqkzc8bd6ig6pvx0pri4d1r1bkmgy0i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -68624,21 +68799,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "extensible-effects_2_3_0_1" = callPackage - ({ mkDerivation, base, criterion, directory, HUnit, mtl, QuickCheck + "extensible-effects_2_4_0_0" = callPackage + ({ mkDerivation, base, criterion, HUnit, mtl, QuickCheck, silently , test-framework, test-framework-hunit, test-framework-quickcheck2 , test-framework-th, transformers, transformers-base }: mkDerivation { pname = "extensible-effects"; - version = "2.3.0.1"; - sha256 = "1mznv07wz8wq42ww54w867x38xq9zr23jf54h6bqyrqjwyl7lavw"; + version = "2.4.0.0"; + sha256 = "024566vv5mmnma2fwnbfg9bzayi6inl1a6ys4nqg0cv57rqny6nc"; libraryHaskellDepends = [ base transformers transformers-base ]; testHaskellDepends = [ - base directory HUnit QuickCheck test-framework test-framework-hunit + base HUnit QuickCheck silently test-framework test-framework-hunit + test-framework-quickcheck2 test-framework-th + ]; + benchmarkHaskellDepends = [ + base criterion HUnit mtl test-framework test-framework-hunit test-framework-quickcheck2 test-framework-th ]; - benchmarkHaskellDepends = [ base criterion mtl ]; homepage = "https://github.com/suhailshergill/extensible-effects"; description = "An Alternative to Monad Transformers"; license = stdenv.lib.licenses.mit; @@ -69102,6 +69280,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fast-arithmetic" = callPackage + ({ mkDerivation, base, Cabal, criterion, directory, hspec + , http-client, http-client-tls, parallel-io, tar, zlib + }: + mkDerivation { + pname = "fast-arithmetic"; + version = "0.1.0.7"; + sha256 = "1swvs1gwl92xdcwn5mml2js219pilclwvbzp6pi5dyc3gbmz69r1"; + setupHaskellDepends = [ + base Cabal directory http-client http-client-tls parallel-io tar + zlib + ]; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec ]; + benchmarkHaskellDepends = [ base criterion ]; + homepage = "https://github.com/vmchale/fast-arithmetic#readme"; + description = "Fast number-theoretic functions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "fast-builder" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , deepseq, ghc-prim, process, QuickCheck, scientific, stm @@ -69129,8 +69327,8 @@ self: { }: mkDerivation { pname = "fast-combinatorics"; - version = "0.1.0.7"; - sha256 = "06c5m5rd4xw7nl5x2f75xbky4f16nr3wk10cvx23pf5l9987rrvq"; + version = "0.1.0.9"; + sha256 = "0p9pdp51ii0ggf6ghh7aijk1q1crf850qwdvyi7nkx65nfi9qc7z"; setupHaskellDepends = [ base Cabal directory http-client http-client-tls tar zlib ]; @@ -69432,15 +69630,13 @@ self: { , haskell-src-exts, language-ecmascript, mtl, mtl-compat , optparse-applicative, process, safe, sourcemap, split, spoon, syb , text, time, transformers, transformers-compat - , traverse-with-class, type-eq, uniplate, unordered-containers - , utf8-string, vector + , traverse-with-class, uniplate, unordered-containers, utf8-string + , vector }: mkDerivation { pname = "fay"; - version = "0.23.1.16"; - sha256 = "0r4ac76mn7dykva0dz6ar2zfcij2kiz8kjfcywpgdg40g75zhvn4"; - revision = "8"; - editedCabalFile = "1ybc4vv0d3vya4a1xgr2sbq1zx1bzm82acxivs458i9pj56wp87j"; + version = "0.23.2.0"; + sha256 = "1fhdznpqyrgk2m239qdq6zxsdhx3qhciq8fi2ka7s6l7h9z277dw"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -69449,8 +69645,8 @@ self: { data-lens-light directory filepath ghc-paths haskell-src-exts language-ecmascript mtl mtl-compat process safe sourcemap split spoon syb text time transformers transformers-compat - traverse-with-class type-eq uniplate unordered-containers - utf8-string vector + traverse-with-class uniplate unordered-containers utf8-string + vector ]; executableHaskellDepends = [ base mtl optparse-applicative split ]; homepage = "https://github.com/faylang/fay/wiki"; @@ -78372,6 +78568,19 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "ghc-tcplugins-extra_0_2_2" = callPackage + ({ mkDerivation, base, ghc }: + mkDerivation { + pname = "ghc-tcplugins-extra"; + version = "0.2.2"; + sha256 = "1k52r8hdbhsp5ydfi010976nck81q38lm8x069x6sdvslmwda1wq"; + libraryHaskellDepends = [ base ghc ]; + homepage = "http://github.com/clash-lang/ghc-tcplugins-extra"; + description = "Utilities for writing GHC type-checker plugins"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-time-alloc-prof" = callPackage ({ mkDerivation, attoparsec, base, containers, directory, filepath , process, tasty, tasty-hunit, temporary, text, time @@ -78427,6 +78636,29 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "ghc-typelits-extra_0_2_4" = callPackage + ({ mkDerivation, base, ghc, ghc-prim, ghc-tcplugins-extra + , ghc-typelits-knownnat, ghc-typelits-natnormalise, integer-gmp + , tasty, tasty-hunit, template-haskell, transformers + }: + mkDerivation { + pname = "ghc-typelits-extra"; + version = "0.2.4"; + sha256 = "0inj776401846brd945p00qkjylniwlvycn1c300p90kyighkpdg"; + libraryHaskellDepends = [ + base ghc ghc-prim ghc-tcplugins-extra ghc-typelits-knownnat + ghc-typelits-natnormalise integer-gmp transformers + ]; + testHaskellDepends = [ + base ghc-typelits-knownnat ghc-typelits-natnormalise tasty + tasty-hunit template-haskell + ]; + homepage = "http://www.clash-lang.org/"; + description = "Additional type-level operations on GHC.TypeLits.Nat"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-typelits-knownnat" = callPackage ({ mkDerivation, base, ghc, ghc-tcplugins-extra , ghc-typelits-natnormalise, singletons, tasty, tasty-hunit @@ -78449,6 +78681,28 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "ghc-typelits-knownnat_0_4" = callPackage + ({ mkDerivation, base, ghc, ghc-tcplugins-extra + , ghc-typelits-natnormalise, tasty, tasty-hunit, tasty-quickcheck + , template-haskell, transformers + }: + mkDerivation { + pname = "ghc-typelits-knownnat"; + version = "0.4"; + sha256 = "0qwp44jpp8jbrgri0i3yviqnypdj79b8hpxxbk80dwwsjg1q5ynv"; + libraryHaskellDepends = [ + base ghc ghc-tcplugins-extra ghc-typelits-natnormalise + template-haskell transformers + ]; + testHaskellDepends = [ + base ghc-typelits-natnormalise tasty tasty-hunit tasty-quickcheck + ]; + homepage = "http://clash-lang.org/"; + description = "Derive KnownNat constraints from other KnownNat constraints"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-typelits-natnormalise" = callPackage ({ mkDerivation, base, ghc, ghc-tcplugins-extra, integer-gmp, tasty , tasty-hunit, template-haskell @@ -78466,6 +78720,24 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "ghc-typelits-natnormalise_0_5_8" = callPackage + ({ mkDerivation, base, ghc, ghc-tcplugins-extra, integer-gmp, tasty + , tasty-hunit, template-haskell + }: + mkDerivation { + pname = "ghc-typelits-natnormalise"; + version = "0.5.8"; + sha256 = "0xkhj0kka7j9achgzn66zbxs84pxr5h9jq35x4kdnha5hw34c0i1"; + libraryHaskellDepends = [ + base ghc ghc-tcplugins-extra integer-gmp + ]; + testHaskellDepends = [ base tasty tasty-hunit template-haskell ]; + homepage = "http://www.clash-lang.org/"; + description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-typelits-presburger" = callPackage ({ mkDerivation, base, equational-reasoning, ghc , ghc-tcplugins-extra, presburger, reflection, singletons @@ -84719,16 +84991,17 @@ self: { "graphmod" = callPackage ({ mkDerivation, base, Cabal, containers, directory, dotgen - , filepath, haskell-lexer + , filepath, haskell-lexer, pretty }: mkDerivation { pname = "graphmod"; - version = "1.4"; - sha256 = "11gikmhdamsi900nk206hwm9fjjhdcsspj6aa06i8wqg8g4zbblq"; + version = "1.4.1"; + sha256 = "029lrdgms3kvqh5g9r762r31nwr0cjkzwksbc501d9kd0gk0ymjh"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base Cabal containers directory dotgen filepath haskell-lexer + pretty ]; homepage = "http://github.com/yav/graphmod/wiki"; description = "Present the module dependencies of a program as a \"dot\" graph"; @@ -87570,8 +87843,8 @@ self: { }: mkDerivation { pname = "hackage-whatsnew"; - version = "0.1.0.1"; - sha256 = "0bg0l6y6v0nrjz3ywfjx5jknhn9898q2h04m8q3iz1j5y6pzj80d"; + version = "0.1.0.2"; + sha256 = "0z57nnp0sn15399b11h7kb5dxqmg1gd3l8qv7vw8knxv65yfgra3"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -88021,6 +88294,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hadolint" = callPackage + ({ mkDerivation, base, bytestring, gitrev, hspec, HUnit + , language-docker, optparse-applicative, parsec, ShellCheck, split + }: + mkDerivation { + pname = "hadolint"; + version = "1.2.5"; + sha256 = "1rnbxkzqj493yn41ln9hxpmbdvgynb1mm86kl4l522is96smqp7v"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring language-docker parsec ShellCheck split + ]; + executableHaskellDepends = [ + base gitrev language-docker optparse-applicative parsec + ]; + testHaskellDepends = [ + base bytestring hspec HUnit language-docker parsec ShellCheck split + ]; + homepage = "https://github.com/hadolint/hadolint"; + description = "Dockerfile Linter JavaScript API"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "hadoop-formats" = callPackage ({ mkDerivation, attoparsec, base, bytestring, filepath, snappy , text, vector @@ -90857,6 +91154,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hashmap_1_3_3" = callPackage + ({ mkDerivation, base, containers, deepseq, hashable }: + mkDerivation { + pname = "hashmap"; + version = "1.3.3"; + sha256 = "0ma7svf9nanlfbj9nkk6bzk4m98i7xd71xrdc3a5dmmws5yba1nw"; + libraryHaskellDepends = [ base containers deepseq hashable ]; + homepage = "https://github.com/foxik/hashmap"; + description = "Persistent containers Map and Set based on hashing"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hashring" = callPackage ({ mkDerivation, base, containers, hashable, QuickCheck , test-framework, test-framework-quickcheck2 @@ -92432,6 +92742,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "haskell-tools-ast_1_0_0_3" = callPackage + ({ mkDerivation, base, ghc, mtl, references, template-haskell + , uniplate + }: + mkDerivation { + pname = "haskell-tools-ast"; + version = "1.0.0.3"; + sha256 = "1zfcwm6na7ivl4xy6yfdbgncklxp70g5llzl7i754sqvacbp7ygv"; + libraryHaskellDepends = [ + base ghc mtl references template-haskell uniplate + ]; + homepage = "https://github.com/nboldi/haskell-tools"; + description = "Haskell AST for efficient tooling"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-tools-ast-fromghc" = callPackage ({ mkDerivation, base, bytestring, containers, ghc , haskell-tools-ast, mtl, references, safe, split, template-haskell @@ -92504,6 +92831,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "haskell-tools-backend-ghc_1_0_0_3" = callPackage + ({ mkDerivation, base, bytestring, containers, ghc, ghc-boot-th + , haskell-tools-ast, mtl, references, safe, split, template-haskell + , transformers, uniplate + }: + mkDerivation { + pname = "haskell-tools-backend-ghc"; + version = "1.0.0.3"; + sha256 = "1k8ykgasq621dndazb99834l6c0gz3qp40r81ja5mjwfqnihy2wk"; + libraryHaskellDepends = [ + base bytestring containers ghc ghc-boot-th haskell-tools-ast mtl + references safe split template-haskell transformers uniplate + ]; + homepage = "https://github.com/nboldi/haskell-tools"; + description = "Creating the Haskell-Tools AST from GHC's representations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-tools-builtin-refactorings" = callPackage ({ mkDerivation, base, Cabal, containers, directory, either , filepath, ghc, ghc-paths, haskell-tools-ast @@ -92536,6 +92882,38 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskell-tools-builtin-refactorings_1_0_0_3" = callPackage + ({ mkDerivation, base, Cabal, containers, directory, either + , filepath, ghc, ghc-paths, haskell-tools-ast + , haskell-tools-backend-ghc, haskell-tools-prettyprint + , haskell-tools-refactor, haskell-tools-rewrite, mtl, old-time + , polyparse, references, split, tasty, tasty-hunit + , template-haskell, time, transformers, uniplate + }: + mkDerivation { + pname = "haskell-tools-builtin-refactorings"; + version = "1.0.0.3"; + sha256 = "0m6wwx3z5gbh9pak7r6lirk66clyb6yzryhbzcqhnwlnaawrpnh4"; + libraryHaskellDepends = [ + base Cabal containers directory filepath ghc ghc-paths + haskell-tools-ast haskell-tools-backend-ghc + haskell-tools-prettyprint haskell-tools-refactor + haskell-tools-rewrite mtl references split template-haskell + transformers uniplate + ]; + testHaskellDepends = [ + base Cabal containers directory either filepath ghc ghc-paths + haskell-tools-ast haskell-tools-backend-ghc + haskell-tools-prettyprint haskell-tools-refactor + haskell-tools-rewrite mtl old-time polyparse references split tasty + tasty-hunit template-haskell time transformers uniplate + ]; + homepage = "https://github.com/haskell-tools/haskell-tools"; + description = "Refactoring Tool for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-tools-cli" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , directory, filepath, ghc, ghc-paths, Glob @@ -92573,6 +92951,43 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskell-tools-cli_1_0_0_3" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, criterion + , directory, filepath, ghc, ghc-paths, Glob + , haskell-tools-builtin-refactorings, haskell-tools-daemon + , haskell-tools-refactor, knob, mtl, optparse-applicative, process + , references, split, strict, tasty, tasty-hunit, time + }: + mkDerivation { + pname = "haskell-tools-cli"; + version = "1.0.0.3"; + sha256 = "1cbp5n2b4q3kjacj4adnblb5znwi9waqx0pg14khk6nhdpqbp4l7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers directory filepath ghc ghc-paths + haskell-tools-builtin-refactorings haskell-tools-daemon + haskell-tools-refactor mtl references split strict + ]; + executableHaskellDepends = [ + base directory filepath Glob haskell-tools-builtin-refactorings + haskell-tools-daemon mtl optparse-applicative process split + ]; + testHaskellDepends = [ + base bytestring directory filepath + haskell-tools-builtin-refactorings knob tasty tasty-hunit + ]; + benchmarkHaskellDepends = [ + aeson base bytestring criterion directory filepath + haskell-tools-builtin-refactorings haskell-tools-daemon knob split + time + ]; + homepage = "https://github.com/haskell-tools/haskell-tools"; + description = "Command-line frontend for Haskell-tools Refact"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-tools-daemon" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, containers , deepseq, Diff, directory, filepath, fswatch, ghc, ghc-paths, Glob @@ -92608,6 +93023,41 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskell-tools-daemon_1_0_0_3" = callPackage + ({ mkDerivation, aeson, base, bytestring, Cabal, containers + , deepseq, Diff, directory, filepath, fswatch, ghc, ghc-paths, Glob + , haskell-tools-builtin-refactorings, haskell-tools-prettyprint + , haskell-tools-refactor, HUnit, mtl, network, optparse-applicative + , pretty, process, references, split, strict, tasty, tasty-hunit + , template-haskell + }: + mkDerivation { + pname = "haskell-tools-daemon"; + version = "1.0.0.3"; + sha256 = "1g25i9ilsrk0201cnnm2r5xbcnlmknpvw3h99vl087i3d913wln7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring Cabal containers deepseq Diff directory + filepath fswatch ghc ghc-paths haskell-tools-builtin-refactorings + haskell-tools-prettyprint haskell-tools-refactor mtl network + optparse-applicative pretty process references split strict + template-haskell + ]; + executableHaskellDepends = [ + base directory filepath haskell-tools-builtin-refactorings + ]; + testHaskellDepends = [ + aeson base bytestring directory filepath ghc Glob + haskell-tools-builtin-refactorings HUnit network process tasty + tasty-hunit + ]; + homepage = "https://github.com/haskell-tools/haskell-tools"; + description = "Background process for Haskell-tools that editors can connect to"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-tools-debug" = callPackage ({ mkDerivation, base, filepath, ghc, ghc-paths, haskell-tools-ast , haskell-tools-backend-ghc, haskell-tools-builtin-refactorings @@ -92633,6 +93083,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskell-tools-debug_1_0_0_3" = callPackage + ({ mkDerivation, base, filepath, ghc, ghc-paths, haskell-tools-ast + , haskell-tools-backend-ghc, haskell-tools-builtin-refactorings + , haskell-tools-prettyprint, haskell-tools-refactor, references + , split, template-haskell + }: + mkDerivation { + pname = "haskell-tools-debug"; + version = "1.0.0.3"; + sha256 = "1f2m1ggjjbdwl23v558dlyqzcl00dg2almhppf8m3xg5vzgjzlpj"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base filepath ghc ghc-paths haskell-tools-ast + haskell-tools-backend-ghc haskell-tools-builtin-refactorings + haskell-tools-prettyprint haskell-tools-refactor references split + template-haskell + ]; + executableHaskellDepends = [ base ]; + homepage = "https://github.com/haskell-tools/haskell-tools"; + description = "Debugging Tools for Haskell-tools"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-tools-demo" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, ghc, ghc-paths, haskell-tools-ast @@ -92665,6 +93140,38 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskell-tools-demo_1_0_0_3" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , filepath, ghc, ghc-paths, haskell-tools-ast + , haskell-tools-backend-ghc, haskell-tools-builtin-refactorings + , haskell-tools-prettyprint, haskell-tools-refactor, http-types + , HUnit, mtl, network, references, tasty, tasty-hunit, transformers + , wai, wai-websockets, warp, websockets + }: + mkDerivation { + pname = "haskell-tools-demo"; + version = "1.0.0.3"; + sha256 = "17cqnchan6qm9hhrrzk8m9v3qqzr3rfb1q8iyf8daa50qj9s836p"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers directory filepath ghc ghc-paths + haskell-tools-ast haskell-tools-backend-ghc + haskell-tools-builtin-refactorings haskell-tools-prettyprint + haskell-tools-refactor http-types mtl references transformers wai + wai-websockets warp websockets + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + aeson base bytestring directory filepath HUnit network tasty + tasty-hunit websockets + ]; + homepage = "https://github.com/haskell-tools/haskell-tools"; + description = "A web-based demo for Haskell-tools Refactor"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-tools-experimental-refactorings" = callPackage ({ mkDerivation, base, Cabal, containers, directory, either , filepath, ghc, ghc-paths, haskell-tools-ast @@ -92675,8 +93182,8 @@ self: { }: mkDerivation { pname = "haskell-tools-experimental-refactorings"; - version = "1.0.0.2"; - sha256 = "0avxnp5zdc3rafqg5arvnfljyhp3v2ass96z39458b4zmrxf2mgd"; + version = "1.0.0.3"; + sha256 = "0y8dzrxv62ad164nikzhlny55im4ys16nkiak041yqygzg9qzshz"; libraryHaskellDepends = [ base Cabal containers directory filepath ghc ghc-paths haskell-tools-ast haskell-tools-backend-ghc @@ -92713,6 +93220,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "haskell-tools-prettyprint_1_0_0_3" = callPackage + ({ mkDerivation, base, containers, ghc, haskell-tools-ast, mtl + , references, split, text, uniplate + }: + mkDerivation { + pname = "haskell-tools-prettyprint"; + version = "1.0.0.3"; + sha256 = "0gm48sikbm3dzv687wy7qn7j6159jf6j2gq0yhrhvxqhss4r03md"; + libraryHaskellDepends = [ + base containers ghc haskell-tools-ast mtl references split text + uniplate + ]; + homepage = "https://github.com/haskell-tools/haskell-tools"; + description = "Pretty printing of Haskell-Tools AST"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-tools-refactor" = callPackage ({ mkDerivation, base, Cabal, containers, directory, filepath, ghc , ghc-paths, haskell-tools-ast, haskell-tools-backend-ghc @@ -92734,6 +93259,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "haskell-tools-refactor_1_0_0_3" = callPackage + ({ mkDerivation, base, Cabal, containers, directory, filepath, ghc + , ghc-paths, haskell-tools-ast, haskell-tools-backend-ghc + , haskell-tools-prettyprint, haskell-tools-rewrite, mtl, references + , split, template-haskell, transformers, uniplate + }: + mkDerivation { + pname = "haskell-tools-refactor"; + version = "1.0.0.3"; + sha256 = "1gfy04fj3rg900ii32msyqrhzzwfcj6sl9z3ldjfm0c0jpdx4bm3"; + libraryHaskellDepends = [ + base Cabal containers directory filepath ghc ghc-paths + haskell-tools-ast haskell-tools-backend-ghc + haskell-tools-prettyprint haskell-tools-rewrite mtl references + split template-haskell transformers uniplate + ]; + homepage = "https://github.com/haskell-tools/haskell-tools"; + description = "Refactoring Tool for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-tools-rewrite" = callPackage ({ mkDerivation, base, containers, directory, filepath, ghc , haskell-tools-ast, haskell-tools-prettyprint, mtl, references @@ -92756,6 +93303,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "haskell-tools-rewrite_1_0_0_3" = callPackage + ({ mkDerivation, base, containers, directory, filepath, ghc + , haskell-tools-ast, haskell-tools-prettyprint, mtl, references + , tasty, tasty-hunit + }: + mkDerivation { + pname = "haskell-tools-rewrite"; + version = "1.0.0.3"; + sha256 = "15i25crjz50i9kxj2r2dsvmckfq8c0hkwypqrivy7c39cmqhv504"; + libraryHaskellDepends = [ + base containers ghc haskell-tools-ast haskell-tools-prettyprint mtl + references + ]; + testHaskellDepends = [ + base directory filepath haskell-tools-ast haskell-tools-prettyprint + tasty tasty-hunit + ]; + homepage = "https://github.com/haskell-tools/haskell-tools"; + description = "Facilities for generating new parts of the Haskell-Tools AST"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-tor" = callPackage ({ mkDerivation, array, asn1-encoding, asn1-types, async , attoparsec, base, base64-bytestring, binary, bytestring, cereal @@ -95516,6 +96086,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hdaemonize_0_5_5" = callPackage + ({ mkDerivation, base, bytestring, extensible-exceptions, filepath + , hsyslog, mtl, unix + }: + mkDerivation { + pname = "hdaemonize"; + version = "0.5.5"; + sha256 = "17q2zr9bv6xwnldgbsh1idwfgybp8q4xzq79p2lmmi3f0q6cnl6j"; + libraryHaskellDepends = [ + base bytestring extensible-exceptions filepath hsyslog mtl unix + ]; + homepage = "http://github.com/greydot/hdaemonize"; + description = "Library to handle the details of writing daemons for UNIX"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hdaemonize-buildfix" = callPackage ({ mkDerivation, base, extensible-exceptions, filepath, hsyslog , mtl, unix @@ -96390,8 +96977,8 @@ self: { }: mkDerivation { pname = "heist"; - version = "1.0.1.1"; - sha256 = "1incy8w291k3vivnrxxqw12i77qzq8b840z8l99i0mkwbl3w3gf7"; + version = "1.0.1.2"; + sha256 = "0kpn5c3j7d42l12axd05hglhxqc4y7l0rz57lcqh3yznjl7mzv71"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder blaze-html bytestring containers directory directory-tree dlist filepath hashable @@ -98721,21 +99308,21 @@ self: { }) {}; "hindent" = callPackage - ({ mkDerivation, base, bytestring, containers, criterion, deepseq - , descriptive, Diff, directory, exceptions, ghc-prim - , haskell-src-exts, hspec, monad-loops, mtl, path, path-io, text - , transformers, unix-compat, utf8-string, yaml + ({ mkDerivation, base, bytestring, Cabal, containers, criterion + , deepseq, descriptive, Diff, directory, exceptions, filepath + , ghc-prim, haskell-src-exts, hspec, monad-loops, mtl, path + , path-io, text, transformers, unix-compat, utf8-string, yaml }: mkDerivation { pname = "hindent"; - version = "5.2.4.1"; - sha256 = "0m35gd2r49cnaxsn9k82g8arj5pz66glsijlji2g77psd9a3flff"; + version = "5.2.5"; + sha256 = "19lckzwsqy8d1wry7hlg5vcg10dc5isai1z0n8srap5hlqvifw1g"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base bytestring containers exceptions haskell-src-exts monad-loops - mtl text transformers utf8-string yaml + base bytestring Cabal containers directory exceptions filepath + haskell-src-exts monad-loops mtl text transformers utf8-string yaml ]; executableHaskellDepends = [ base bytestring deepseq descriptive directory exceptions ghc-prim @@ -100912,6 +101499,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hoauth2_1_6_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, exceptions + , http-conduit, http-types, microlens, text, unordered-containers + , uri-bytestring, uri-bytestring-aeson, wai, warp + }: + mkDerivation { + pname = "hoauth2"; + version = "1.6.1"; + sha256 = "0rmb3f4ci75fpzzqcq4qrjnqpnpmpr6i9j69z7cf8m2ji1vnvlw7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring exceptions http-conduit http-types microlens + text unordered-containers uri-bytestring uri-bytestring-aeson + ]; + executableHaskellDepends = [ + aeson base bytestring containers http-conduit http-types text + uri-bytestring wai warp + ]; + homepage = "https://github.com/freizl/hoauth2"; + description = "Haskell OAuth2 authentication client"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hob" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , glib, gtk-largeTreeStore, gtk3, gtksourceview3, hspec, mtl, pango @@ -101011,8 +101623,8 @@ self: { }: mkDerivation { pname = "hocker"; - version = "1.0.2"; - sha256 = "1bdzbggvin83m778qq6367mpv2cwgwpbahhlzf290iwikmhmhgr2"; + version = "1.0.3"; + sha256 = "1cwd6d3m8d2zrinll5jdm50nnasb75i19172jjaw018figj3cf96"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -101690,14 +102302,14 @@ self: { , conduit-extra, connection, containers, deepseq, directory, extra , filepath, haskell-src-exts, http-conduit, http-types, js-flot , js-jquery, mmap, network, network-uri, old-locale, process - , process-extras, QuickCheck, resourcet, stdenv, storable-tuple - , tar, template-haskell, text, time, transformers, uniplate - , utf8-string, vector, wai, wai-logger, warp, warp-tls, zlib + , process-extras, QuickCheck, resourcet, storable-tuple, tar + , template-haskell, text, time, transformers, uniplate, utf8-string + , vector, wai, wai-logger, warp, warp-tls, zlib }: mkDerivation { pname = "hoogle"; version = "5.0.14"; - sha256 = "e7cfa9ca7496d7a30b476f3502c0dfa38671d4235042bb46806568602e97bbf8"; + sha256 = "1y5vjwp60s35h13bnhjh4ga731m3vz004dbg8w5s7mwnfk5akkz7"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -101715,6 +102327,7 @@ self: { homepage = "http://hoogle.haskell.org/"; description = "Haskell API Search"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hoogle" = callPackage @@ -101728,8 +102341,8 @@ self: { }: mkDerivation { pname = "hoogle"; - version = "5.0.15"; - sha256 = "0bfb3y4rasl8dzcivvhhpq6ijspn37i53rhzxc9gx4yvdnai57sb"; + version = "5.0.16"; + sha256 = "0fkq0mgf48rkyscs5ca11dcz47wr9f2sayl2607rcj4v897kx1a5"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -102824,8 +103437,8 @@ self: { ({ mkDerivation, base, random }: mkDerivation { pname = "hpg"; - version = "0.7"; - sha256 = "0p2a8h9z5kbqpb99rclgkll1yv2in2fni5xvhrrzyphyhpqi1f6a"; + version = "0.8"; + sha256 = "1in245bwnymzxp1bzvzkmfwxs2pxnhw94c9j8z9v3vxvz7g0fygs"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base random ]; @@ -105470,6 +106083,29 @@ self: { license = stdenv.lib.licenses.mit; }) {inherit (pkgs) lua5_3;}; + "hslua_0_9_5" = callPackage + ({ mkDerivation, base, bytestring, containers, exceptions, fail + , lua5_3, mtl, QuickCheck, quickcheck-instances, tasty + , tasty-expected-failure, tasty-hunit, tasty-quickcheck, text + }: + mkDerivation { + pname = "hslua"; + version = "0.9.5"; + sha256 = "1j2zk7f7nyywg2b0n6kb2yf6ljc7cn2sk9jz0h76g3ag2b70l12n"; + configureFlags = [ "-fsystem-lua" ]; + libraryHaskellDepends = [ + base bytestring containers exceptions fail mtl text + ]; + librarySystemDepends = [ lua5_3 ]; + testHaskellDepends = [ + base bytestring containers QuickCheck quickcheck-instances tasty + tasty-expected-failure tasty-hunit tasty-quickcheck text + ]; + description = "A Lua language interpreter embedding in Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) lua5_3;}; + "hslua-aeson" = callPackage ({ mkDerivation, aeson, base, hashable, hslua, hspec, HUnit , ieee754, QuickCheck, quickcheck-instances, scientific, text @@ -106071,6 +106707,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hspec-golden-aeson_0_5_1_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory + , filepath, hspec, hspec-core, QuickCheck, quickcheck-arbitrary-adt + , random, silently, transformers + }: + mkDerivation { + pname = "hspec-golden-aeson"; + version = "0.5.1.0"; + sha256 = "0d3ww44c0al841j6z5w6br1qa91v5nr0lfbzaa4cdydynvi4s6lq"; + libraryHaskellDepends = [ + aeson aeson-pretty base bytestring directory filepath hspec + QuickCheck quickcheck-arbitrary-adt random transformers + ]; + testHaskellDepends = [ + aeson base directory hspec hspec-core QuickCheck + quickcheck-arbitrary-adt silently transformers + ]; + homepage = "https://github.com/plow-technologies/hspec-golden-aeson#readme"; + description = "Use tests to monitor changes in Aeson serialization"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hspec-hashable" = callPackage ({ mkDerivation, base, hashable, hspec, hspec-core, QuickCheck , silently @@ -107755,8 +108414,8 @@ self: { }: mkDerivation { pname = "htoml-megaparsec"; - version = "1.0.1.11"; - sha256 = "09810a4s0gfza0sh4ldh355sbp3810qy8gkcpvq2048h6ajh2kz5"; + version = "1.0.1.12"; + sha256 = "1yzkhbsbxfpmy70nb52715gsppmlsnzr50vfmv0w0fqmw76abd8i"; libraryHaskellDepends = [ base composition-prelude containers deepseq megaparsec mtl old-locale text time unordered-containers vector @@ -107765,11 +108424,8 @@ self: { aeson base bytestring containers file-embed hspec megaparsec tasty tasty-hspec tasty-hunit text time unordered-containers vector ]; - benchmarkHaskellDepends = [ - aeson base containers criterion text time unordered-containers - vector - ]; - homepage = "https://github.com/vmchale/htoml-megaparsec"; + benchmarkHaskellDepends = [ base criterion text ]; + homepage = "https://hub.darcs.net/vmchale/htoml-megaparsec"; description = "Parser for TOML files"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -113649,8 +114305,8 @@ self: { ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring , containers, cryptohash, directory, filepath, gsl, gslcblas , hashable, hspec, mtl, parsec, parsers, QuickCheck, raw-strings-qq - , regex-posix, stdenv, template-haskell, transformers - , unordered-containers, vector + , regex-posix, template-haskell, transformers, unordered-containers + , vector }: mkDerivation { pname = "inline-c"; @@ -113671,6 +114327,7 @@ self: { ]; description = "Write Haskell source files including C code inline. No FFI required."; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) gsl; gslcblas = null;}; "inline-c" = callPackage @@ -113700,7 +114357,7 @@ self: { }) {inherit (pkgs) gsl; gslcblas = null;}; "inline-c-cpp_0_1_0_0" = callPackage - ({ mkDerivation, base, inline-c, stdenv, template-haskell }: + ({ mkDerivation, base, inline-c, template-haskell }: mkDerivation { pname = "inline-c-cpp"; version = "0.1.0.0"; @@ -113709,6 +114366,7 @@ self: { testHaskellDepends = [ base ]; description = "Lets you embed C++ code into Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "inline-c-cpp" = callPackage @@ -119955,20 +120613,21 @@ self: { }) {}; "kicad-data" = callPackage - ({ mkDerivation, base, ieee754, lens-family, parsec, parsec-numbers - , pretty-compact, QuickCheck, test-framework - , test-framework-quickcheck2 + ({ mkDerivation, base, charsetdetect, encoding, HUnit, ieee754 + , lens-family, parsec, pretty-compact, QuickCheck, test-framework + , test-framework-hunit, test-framework-quickcheck2 }: mkDerivation { pname = "kicad-data"; - version = "0.4.0"; - sha256 = "098yfgrf9wiib8agx6frdgd766lyzkqyifx9lbj4ssyrgp03qnm5"; + version = "0.5.0"; + sha256 = "0nbzprp6j1d6l507h9s9c82y130w5b0jqlmc3dxd1ns2q5qf8cin"; libraryHaskellDepends = [ - base ieee754 lens-family parsec parsec-numbers pretty-compact + base ieee754 lens-family parsec pretty-compact ]; testHaskellDepends = [ - base ieee754 lens-family parsec parsec-numbers pretty-compact - QuickCheck test-framework test-framework-quickcheck2 + base charsetdetect encoding HUnit ieee754 lens-family parsec + pretty-compact QuickCheck test-framework test-framework-hunit + test-framework-quickcheck2 ]; homepage = "http://github.com/kasbah/haskell-kicad-data"; description = "Parser and writer for KiCad files"; @@ -121688,6 +122347,33 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "language-docker_2_0_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, directory, filepath, free + , Glob, hspec, HUnit, mtl, parsec, pretty, process, QuickCheck + , semigroups, split, template-haskell, text, th-lift + , th-lift-instances, time, transformers, unordered-containers, yaml + }: + mkDerivation { + pname = "language-docker"; + version = "2.0.1"; + sha256 = "0xd7r6npr7kzdh3pxcidvqff3lrww6dqyyksg58chnb57d87b0sc"; + libraryHaskellDepends = [ + aeson base bytestring directory filepath free Glob mtl parsec + pretty semigroups split template-haskell text th-lift + th-lift-instances time transformers unordered-containers yaml + ]; + testHaskellDepends = [ + aeson base bytestring directory filepath free Glob hspec HUnit mtl + parsec pretty process QuickCheck semigroups split template-haskell + text th-lift th-lift-instances time transformers + unordered-containers yaml + ]; + homepage = "https://github.com/hadolint/language-docker#readme"; + description = "Dockerfile parser, pretty-printer and embedded DSL"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "language-dockerfile" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, filepath, free , Glob, hspec, HUnit, mtl, parsec, pretty, process, QuickCheck @@ -127668,18 +128354,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "log-warper_1_8_4" = callPackage + "log-warper_1_8_5" = callPackage ({ mkDerivation, aeson, ansi-terminal, async, base, containers - , data-default, deepseq, directory, filepath, fmt, hspec, HUnit - , markdown-unlit, microlens, microlens-mtl, microlens-platform - , mmorph, monad-control, monad-loops, mtl, QuickCheck, text, time - , transformers, transformers-base, universum, unix - , unordered-containers, vector, yaml + , data-default, deepseq, directory, filepath, fmt, hspec + , hspec-discover, HUnit, markdown-unlit, microlens, microlens-mtl + , microlens-platform, mmorph, monad-control, monad-loops, mtl + , QuickCheck, text, time, transformers, transformers-base + , universum, unix, unordered-containers, vector, yaml }: mkDerivation { pname = "log-warper"; - version = "1.8.4"; - sha256 = "0dnqcp97qlsn2yq8nf779l1sm0p30bl15j9ivwrnaxb02kyws5pn"; + version = "1.8.5"; + sha256 = "11yai7siw1jkyk5v1kprkv7j13npwkp16za366ihqf5lg6hhw63l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -127695,6 +128381,7 @@ self: { async base data-default directory filepath hspec HUnit microlens-mtl QuickCheck universum unordered-containers ]; + testToolDepends = [ hspec-discover ]; homepage = "https://github.com/serokell/log-warper"; description = "Flexible, configurable, monadic and pretty logging"; license = stdenv.lib.licenses.mit; @@ -129706,22 +130393,22 @@ self: { }) {}; "madlang" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, Cabal, composition-prelude - , containers, criterion, directory, file-embed, hspec - , hspec-megaparsec, http-client, http-client-tls, megaparsec + ({ mkDerivation, ansi-wl-pprint, base, binary, Cabal + , composition-prelude, containers, criterion, directory, file-embed + , hspec, hspec-megaparsec, http-client, http-client-tls, megaparsec , MonadRandom, mtl, optparse-applicative, process, random-shuffle , recursion-schemes, recursion-schemes-ext, tar, template-haskell , text, th-lift-instances, titlecase, zip-archive, zlib }: mkDerivation { pname = "madlang"; - version = "3.2.0.1"; - sha256 = "0ypca6yy8zvp0n0njqhm6az5xfaxjc91j4p39f3sn9dgd2ksbw27"; + version = "4.0.0.0"; + sha256 = "1dg13q8sq6ha5hpjx16cm1ny32kjd7l9mwdmi0x756yh675835xi"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal directory process ]; libraryHaskellDepends = [ - ansi-wl-pprint base composition-prelude containers directory + ansi-wl-pprint base binary composition-prelude containers directory file-embed http-client http-client-tls megaparsec MonadRandom mtl optparse-applicative random-shuffle recursion-schemes recursion-schemes-ext tar template-haskell text th-lift-instances @@ -134551,7 +135238,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "mmark_0_0_4_2" = callPackage + "mmark_0_0_4_3" = callPackage ({ mkDerivation, aeson, base, case-insensitive, containers , criterion, data-default-class, deepseq, dlist, email-validate , foldl, hashable, hspec, hspec-megaparsec, html-entity-map, lucid @@ -134561,8 +135248,8 @@ self: { }: mkDerivation { pname = "mmark"; - version = "0.0.4.2"; - sha256 = "0jkcgk8m9dc98cvkc7j6din5nl92n9whvsv144zdgn4fjjlcl2zl"; + version = "0.0.4.3"; + sha256 = "0xl88vry05050i1pxmakb625x98wmq90h4jz44h0nc7jrqzvqxa0"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base case-insensitive containers data-default-class deepseq @@ -134601,6 +135288,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "mmark-ext_0_0_1_2" = callPackage + ({ mkDerivation, base, data-default-class, foldl, hspec, lucid + , microlens, mmark, modern-uri, text + }: + mkDerivation { + pname = "mmark-ext"; + version = "0.0.1.2"; + sha256 = "0f698yvlcbvq627advl832nlzl975jx462zg7pd8h43chdbj5qar"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base data-default-class foldl lucid microlens mmark modern-uri text + ]; + testHaskellDepends = [ + base data-default-class hspec lucid mmark text + ]; + homepage = "https://github.com/mrkkrp/mmark-ext"; + description = "Commonly useful extensions for MMark markdown processor"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mmorph" = callPackage ({ mkDerivation, base, mtl, transformers, transformers-compat }: mkDerivation { @@ -134789,19 +135497,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "modern-uri_0_1_2_1" = callPackage + "modern-uri_0_2_0_0" = callPackage ({ mkDerivation, base, bytestring, containers, contravariant , criterion, deepseq, exceptions, hspec, hspec-megaparsec - , megaparsec, profunctors, QuickCheck, template-haskell, text - , weigh + , megaparsec, mtl, profunctors, QuickCheck, reflection, tagged + , template-haskell, text, weigh }: mkDerivation { pname = "modern-uri"; - version = "0.1.2.1"; - sha256 = "10y3ppcd4d987khk9jxaa0clkjssmvip2kpq63z8xcigvdiil91h"; + version = "0.2.0.0"; + sha256 = "01wq2w2kfy9zlpsh8pwcs61xjy3xdwbz6nd0skb6g3bigrqs2w8z"; libraryHaskellDepends = [ base bytestring containers contravariant deepseq exceptions - megaparsec profunctors QuickCheck template-haskell text + megaparsec mtl profunctors QuickCheck reflection tagged + template-haskell text ]; testHaskellDepends = [ base bytestring hspec hspec-megaparsec megaparsec QuickCheck text @@ -136042,8 +136751,8 @@ self: { ({ mkDerivation, base, mtl, transformers }: mkDerivation { pname = "monad-task"; - version = "0.1.0"; - sha256 = "01w3wqmsfl9w96kfpdiwfyghm2zjn70x78l436bzxfrcm1d3ayi8"; + version = "0.2.0"; + sha256 = "02qp31w0zgms07b13km3aiina4iqbzxkiajab3b0czmc17xv4kx4"; libraryHaskellDepends = [ base mtl transformers ]; homepage = "http://github.com/ninegua/monad-task"; description = "A monad transformer that turns event processing into co-routine programming"; @@ -137986,8 +138695,8 @@ self: { }: mkDerivation { pname = "mulang"; - version = "3.5.2"; - sha256 = "1x32zdz6d7mssqpqxdgn5l4dv73wav1dxs1qqy8wzrxhsclb3rgg"; + version = "3.6.1"; + sha256 = "0phpy2dickbam17n6ppq10qlfjxmhf1c7jb67qjk7672rxyrqfzb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -142567,8 +143276,8 @@ self: { }: mkDerivation { pname = "nix-deploy"; - version = "1.0.0"; - sha256 = "0qvf83kai3fa2s5xf6az2j1gxhiannvw569fnd2lylhcmjffl3j5"; + version = "1.0.1"; + sha256 = "04wknx8yy4s7b3qx5rg26znrfl0932nvrcx17zcfiggrh4lcw33x"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -147044,6 +147753,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "packcheck" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "packcheck"; + version = "0.1.0"; + sha256 = "03asx4j9bj2fka6ydgc8qh3j8kzk7mdi7420rcj7n5g4ma4hhhb3"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + benchmarkHaskellDepends = [ base ]; + homepage = "https://github.com/harendra-kumar/packcheck"; + description = "Universal build and CI testing for Haskell packages"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "packdeps" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, directory , filepath, optparse-applicative, process, semigroups, split, tar @@ -147494,6 +148217,43 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pandoc-citeproc_0_12_2_5" = 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 + , setenv, split, syb, tagsoup, temporary, text, time + , unordered-containers, vector, xml-conduit, yaml + }: + mkDerivation { + pname = "pandoc-citeproc"; + version = "0.12.2.5"; + sha256 = "1l58nbflcnlznc93qimkk7ghk2gv8kipf45zf88piqa2zys41yyx"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ + aeson base bytestring containers data-default directory filepath + hs-bibutils mtl old-locale pandoc pandoc-types parsec rfc5051 + setenv split syb tagsoup text time unordered-containers vector + xml-conduit yaml + ]; + executableHaskellDepends = [ + aeson aeson-pretty attoparsec base bytestring containers directory + filepath mtl pandoc pandoc-types process syb temporary text vector + yaml + ]; + testHaskellDepends = [ + aeson base bytestring containers directory filepath mtl pandoc + pandoc-types process temporary text yaml + ]; + doCheck = false; + homepage = "https://github.com/jgm/pandoc-citeproc"; + description = "Supports using pandoc with citeproc"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pandoc-citeproc-preamble" = callPackage ({ mkDerivation, base, directory, filepath, pandoc-types, process }: @@ -151152,6 +151912,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "persistent-mysql-haskell_0_3_6" = callPackage + ({ mkDerivation, aeson, base, bytestring, conduit, containers + , io-streams, monad-control, monad-logger, mysql-haskell, network + , persistent, persistent-template, resource-pool, resourcet, text + , time, tls, transformers + }: + mkDerivation { + pname = "persistent-mysql-haskell"; + version = "0.3.6"; + sha256 = "1a829hrbsa54qikbnafv7vk7shzyg0697nvj43md19p172mkwj93"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring conduit containers io-streams monad-control + monad-logger mysql-haskell network persistent resource-pool + resourcet text time tls transformers + ]; + executableHaskellDepends = [ + base monad-logger persistent persistent-template transformers + ]; + homepage = "http://www.yesodweb.com/book/persistent"; + description = "A pure haskell backend for the persistent library using MySQL database server"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "persistent-odbc" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , convertible, HDBC, HDBC-odbc, monad-control, monad-logger @@ -151207,6 +151993,28 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; + "persistent-postgresql_2_6_2_2" = callPackage + ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit + , containers, monad-control, monad-logger, persistent + , postgresql-libpq, postgresql-simple, resource-pool, resourcet + , text, time, transformers + }: + mkDerivation { + pname = "persistent-postgresql"; + version = "2.6.2.2"; + sha256 = "057x064kvmnj1z0a726wphzdqf49ms0pxjq3bmp3h36kqg4zcwm9"; + libraryHaskellDepends = [ + aeson base blaze-builder bytestring conduit containers + monad-control monad-logger persistent postgresql-libpq + postgresql-simple resource-pool resourcet text time transformers + ]; + homepage = "http://www.yesodweb.com/book/persistent"; + description = "Backend for the persistent library using postgresql"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ psibi ]; + }) {}; + "persistent-protobuf" = callPackage ({ mkDerivation, base, bytestring, persistent, protocol-buffers , protocol-buffers-descriptor, template-haskell, text @@ -151661,8 +152469,8 @@ self: { pname = "pgdl"; version = "10.9"; sha256 = "0hwky1331bv1zbjq9nbfnvx8gkbfhs5sjawxjccz9l484xsrbb5z"; - revision = "8"; - editedCabalFile = "1zasl5qvmaxf8pymfmapp30rbwl2a0zm4krd3xlk6ddx0dz1w0yq"; + revision = "9"; + editedCabalFile = "1r1sjcnaawwklr8lx98zf79qmd9cxkmj83kahdn71q4rvfxm29fv"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -153304,6 +154112,8 @@ self: { pname = "pipes-s3"; version = "0.3.0.3"; sha256 = "16gm7xjc8vbbajwmq91fj1l5cgd6difrz5g30b8czac4gdgqfppa"; + revision = "1"; + editedCabalFile = "1hm2wwz8qz67hpwp5gfpp1rnz864z8pnn4ii5n35phhy9vg67dlz"; libraryHaskellDepends = [ aws base bytestring http-client http-client-tls http-types pipes pipes-bytestring pipes-safe resourcet text transformers @@ -160463,18 +161273,16 @@ self: { "q4c12-twofinger" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, deepseq, doctest, lens - , QuickCheck, semigroupoids, streams, template-haskell + , semigroupoids, streams, tasty, tasty-quickcheck }: mkDerivation { pname = "q4c12-twofinger"; - version = "0.0.0.2"; - sha256 = "036c02x5vph24a43vr58acrwny9vidmmv7536sw5b9fiynfkd343"; + version = "0.1"; + sha256 = "01rj89w3q0k24f0w179yl3pssixhlrh83nni5wm2hambz8ls0aqr"; setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - base deepseq QuickCheck semigroupoids streams - ]; + libraryHaskellDepends = [ base deepseq semigroupoids streams ]; testHaskellDepends = [ - base doctest lens QuickCheck streams template-haskell + base doctest lens streams tasty tasty-quickcheck ]; homepage = "https://github.com/quasicomputational/mega/tree/master/packages/twofinger"; description = "Efficient alternating finger trees"; @@ -161193,6 +162001,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "quickcheck-arbitrary-adt_0_3_1_0" = callPackage + ({ mkDerivation, base, hspec, lens, QuickCheck, template-haskell + , transformers + }: + mkDerivation { + pname = "quickcheck-arbitrary-adt"; + version = "0.3.1.0"; + sha256 = "1fa5gb111m740q399l7wbr9n03ws9rasq48jhnx7dvvd6qh2wjjw"; + libraryHaskellDepends = [ base QuickCheck ]; + testHaskellDepends = [ + base hspec lens QuickCheck template-haskell transformers + ]; + homepage = "https://github.com/plow-technologies/quickcheck-arbitrary-adt#readme"; + description = "Generic typeclasses for generating arbitrary ADTs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "quickcheck-assertions" = callPackage ({ mkDerivation, base, hspec, ieee754, pretty-show, QuickCheck }: mkDerivation { @@ -162834,8 +163660,8 @@ self: { }: mkDerivation { pname = "rapid-term"; - version = "0.1.2"; - sha256 = "0q65c8rjqvikpfghpmmsb69d9qmx5bha36qs4iwbsh6iq08xiw18"; + version = "0.1.2.1"; + sha256 = "0pyqsj07g2am9n84232cpy20r6w54mah01x9kl7rczab0yvfplbc"; libraryHaskellDepends = [ base clock kan-extensions process transformers unix ]; @@ -164958,10 +165784,8 @@ self: { }: mkDerivation { pname = "reflex"; - version = "0.4.0"; - sha256 = "173b8ysrghrw2fvdsqf6ybik9f24kw4ji1h8w4wj5kspbi12s36n"; - revision = "2"; - editedCabalFile = "14nrr41ndyfbdgpsi69xl9hmz5m6lank4cjbzxblvh3k0chg13z8"; + version = "0.4.0.1"; + sha256 = "1v4wwy2qc1gb914w5nqjvf7gibdw9yakmhdg260yjxbv1fkg8gyc"; libraryHaskellDepends = [ base containers dependent-map dependent-sum exception-transformers haskell-src-exts haskell-src-meta mtl primitive ref-tf semigroups @@ -167591,8 +168415,8 @@ self: { pname = "rest-client"; version = "0.5.1.1"; sha256 = "0qzn56bj821l9gcxyq6lcgwfa2444igiqczajybrnyy8yb4j792x"; - revision = "1"; - editedCabalFile = "1q7ad9lhlszbmdv5r9zzqj9c3rh9x5hlrl4dyb4wb0xf0v3bj3kx"; + revision = "2"; + editedCabalFile = "0issr73rbnyaqfgx4c0wsy9sq948sqrkima2cr2sb1lkf8n4ihr8"; libraryHaskellDepends = [ aeson-utils base bytestring case-insensitive data-default exceptions http-client http-conduit http-types hxt hxt-pickle-utils @@ -167763,8 +168587,8 @@ self: { pname = "rest-wai"; version = "0.2.0.1"; sha256 = "00hd7i28p5diy00m18yi6f2jp5cxbvb9s2fv24phakjsp2vmw81q"; - revision = "1"; - editedCabalFile = "1j2n7bypgjajwsaahvp50cdwrl7y0nbv67bd3kfdq03yvz5s1py3"; + revision = "2"; + editedCabalFile = "1n3sd3vszi0ifw098jf2yan8xcnrxckr22jssl61k0vn74573hw3"; libraryHaskellDepends = [ base base-compat bytestring case-insensitive containers http-types mime-types mtl rest-core text unordered-containers wai @@ -169727,8 +170551,8 @@ self: { }: mkDerivation { pname = "rss-conduit"; - version = "0.4.2.0"; - sha256 = "1fgaf15i2fbr1v2kd0s80zkbafsl50sv4b48my0nvs8vqhha5n7y"; + version = "0.4.2.1"; + sha256 = "04jpc3zrm9sh1ncqz2n0qr7wgabgpi56vsj24rppqiwrx31jrxdq"; libraryHaskellDepends = [ atom-conduit base conduit conduit-combinators containers dublincore-xml-conduit lens-simple safe safe-exceptions singletons @@ -174153,8 +174977,8 @@ self: { }: mkDerivation { pname = "servant-aeson-specs"; - version = "0.5.3.0"; - sha256 = "13xakmbr0qykff695cj631g97nlcjmmzki68c2gg5sn9jl63yq1q"; + version = "0.6.0.0"; + sha256 = "0ylwd5dawhgfwhmzndc2950zkwg3xm2zv9az4a4pb9pxnpmb4z7n"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring directory filepath hspec hspec-golden-aeson QuickCheck quickcheck-arbitrary-adt random @@ -178848,6 +179672,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "simpleconfig" = callPackage + ({ mkDerivation, base, containers, generic-deriving, lens, text }: + mkDerivation { + pname = "simpleconfig"; + version = "0.0.8"; + sha256 = "0xxnirw7px97gssi2i823hsri168jy2rjwkhnkh6c80p997icdjf"; + libraryHaskellDepends = [ base containers lens ]; + testHaskellDepends = [ + base containers generic-deriving lens text + ]; + homepage = "https://github.com/koterpillar/simpleconfig#readme"; + description = "Short description of your package"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "simpleirc" = callPackage ({ mkDerivation, base, bytestring, connection, containers, hspec , HUnit, knob, network, old-locale, time @@ -187032,10 +187871,8 @@ self: { }: mkDerivation { pname = "streaming-postgresql-simple"; - version = "0.2.0.1"; - sha256 = "1ffsxwgsaxqnf49n4lnyrh2zy6q9zc1i3ssd03m08ip813pk5j8k"; - revision = "1"; - editedCabalFile = "1y5j3p3gphr3mnzl1dvfmbm8iipsdy0vq2fk0klxgid1dsqfl2vn"; + version = "0.2.0.3"; + sha256 = "1gy6yy14q18zfbbj6rvsnhvhkra78m2jwbyd3hnpbx25jgvz230n"; libraryHaskellDepends = [ base bytestring exceptions postgresql-libpq postgresql-simple resourcet safe-exceptions streaming transformers @@ -187792,6 +188629,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "strive_5_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, data-default, gpolyline + , http-client, http-client-tls, http-types, markdown-unlit + , template-haskell, text, time, transformers + }: + mkDerivation { + pname = "strive"; + version = "5.0.0"; + sha256 = "1ywzn3vg47w36777ha0w2gx64kfnw2mdj9b9w60q3d6pl052lxq0"; + libraryHaskellDepends = [ + aeson base bytestring data-default gpolyline http-client + http-client-tls http-types template-haskell text time transformers + ]; + testHaskellDepends = [ base bytestring markdown-unlit time ]; + homepage = "https://github.com/tfausak/strive#readme"; + description = "A client for the Strava V3 API"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "strptime" = callPackage ({ mkDerivation, base, bytestring, text, time }: mkDerivation { @@ -188071,7 +188928,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "stylish-haskell_0_9_0_1" = callPackage + "stylish-haskell_0_9_0_2" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , file-embed, filepath, haskell-src-exts, HUnit, mtl , optparse-applicative, strict, syb, test-framework @@ -188079,8 +188936,8 @@ self: { }: mkDerivation { pname = "stylish-haskell"; - version = "0.9.0.1"; - sha256 = "1qv5apapb2in7fdq68pn3v5g4i40ml6nc14d5kvsbxfq24y0flpm"; + version = "0.9.0.2"; + sha256 = "0w0hh08b1zlp3disxp20yrg20vblqgk5y3arf8xbfiznzf05x5zr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -191666,6 +192523,34 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "tasty-discover_4_1_3" = callPackage + ({ mkDerivation, base, containers, directory, filepath, Glob + , hedgehog, tasty, tasty-hedgehog, tasty-hspec, tasty-hunit + , tasty-quickcheck, tasty-smallcheck + }: + mkDerivation { + pname = "tasty-discover"; + version = "4.1.3"; + sha256 = "13w177l9ghfb9dwjwp4y1j45y2acv2ga7nw38jcqgj6a81ai9m5c"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers directory filepath Glob + ]; + executableHaskellDepends = [ + base containers directory filepath Glob + ]; + testHaskellDepends = [ + base containers directory filepath Glob hedgehog tasty + tasty-hedgehog tasty-hspec tasty-hunit tasty-quickcheck + tasty-smallcheck + ]; + homepage = "https://github.com/lwm/tasty-discover#readme"; + description = "Test discovery for the tasty framework"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-expected-failure" = callPackage ({ mkDerivation, base, tagged, tasty }: mkDerivation { @@ -193948,8 +194833,8 @@ self: { }: mkDerivation { pname = "texbuilder"; - version = "0.1.3.0"; - sha256 = "1ixhlqk5hgmkhhq0png7d2f6ryp84hdzwzzxi184lzzcyqqgxdya"; + version = "0.1.4.0"; + sha256 = "0i301a78790cqhgb28bhc2qksymbx2jdr31m2x59nsj7hmw268b2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -195508,8 +196393,8 @@ self: { }: mkDerivation { pname = "thank-you-stars"; - version = "0.2.0"; - sha256 = "0a1mv7k7m4yaadfrmb45s09aa5zy0wd2jccjsyqhp63v89m58z8j"; + version = "0.3.0"; + sha256 = "0cks475c8ivhikci7h8zkvxhxmp7n9w85b16wvx998q3bjrbkj04"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -196257,24 +197142,22 @@ self: { }) {}; "tickle" = callPackage - ({ mkDerivation, base, bifunctors, bytestring, directory, doctest - , filepath, lens, mtl, QuickCheck, semigroupoids, semigroups - , template-haskell, transformers, validation + ({ mkDerivation, base, bifunctors, bytestring, checkers, filepath + , lens, mtl, papa, QuickCheck, semigroupoids, semigroups, tasty + , tasty-hunit, tasty-quickcheck, transformers, validation }: mkDerivation { pname = "tickle"; - version = "0.0.6"; - sha256 = "19xv9s3qz2q2jvgzig8rfc47c25m8xl3d10xdx1d4dsmhbj1nw55"; - revision = "1"; - editedCabalFile = "1j0npns8ilxq84087gfdg1isncjssp9q0ijgrpg849cip8h0y5y1"; + version = "0.0.9"; + sha256 = "10fq51mvks300yhhzzsjfmjd0g888z35x7qc4b7a2i7307zjrjml"; libraryHaskellDepends = [ - base bifunctors bytestring filepath lens mtl semigroupoids + base bifunctors bytestring filepath mtl papa semigroupoids semigroups transformers validation ]; testHaskellDepends = [ - base directory doctest filepath QuickCheck template-haskell + base checkers lens QuickCheck tasty tasty-hunit tasty-quickcheck ]; - homepage = "https://github.com/NICTA/tickle"; + homepage = "https://github.com/qfpl/tickle"; description = "A port of @Data.Binary@"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -196633,6 +197516,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "time-lens_0_4_0_2" = callPackage + ({ mkDerivation, base, data-lens-light, time }: + mkDerivation { + pname = "time-lens"; + version = "0.4.0.2"; + sha256 = "07nh97x1mx5hc48xqv3gk3cgls6xpb829h3bzsjx8rwqnzybijyq"; + libraryHaskellDepends = [ base data-lens-light time ]; + homepage = "https://github.com/feuerbach/time-lens"; + description = "Lens-based interface to Data.Time data structures"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "time-locale-compat" = callPackage ({ mkDerivation, base, old-locale, time }: mkDerivation { @@ -203616,6 +204512,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "unliftio-core_0_1_1_0" = callPackage + ({ mkDerivation, base, transformers }: + mkDerivation { + pname = "unliftio-core"; + version = "0.1.1.0"; + sha256 = "1193fplsjm1lcr05xwvkj1rsyzx74i755f6kw3ikmxbsv0bv0l3m"; + libraryHaskellDepends = [ base transformers ]; + homepage = "https://github.com/fpco/unliftio/tree/master/unliftio-core#readme"; + description = "The MonadUnliftIO typeclass for unlifting monads to IO"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "unlit" = callPackage ({ mkDerivation, base, directory, text }: mkDerivation { @@ -208482,6 +209391,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "wai-middleware-rollbar_0_8_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, case-insensitive + , containers, hostname, hspec, hspec-golden-aeson, http-client + , http-conduit, http-types, lens, lens-aeson, network, QuickCheck + , text, time, unordered-containers, uuid, wai + }: + mkDerivation { + pname = "wai-middleware-rollbar"; + version = "0.8.1"; + sha256 = "1h12fypbk1y96s8v4qb44b6lvccgxy5namvd9blza222crmiriv1"; + libraryHaskellDepends = [ + aeson base bytestring case-insensitive hostname http-client + http-conduit http-types network text time unordered-containers uuid + wai + ]; + testHaskellDepends = [ + aeson base bytestring case-insensitive containers hspec + hspec-golden-aeson lens lens-aeson QuickCheck text + ]; + homepage = "https://github.com/joneshf/wai-middleware-rollbar#readme"; + description = "Middleware that communicates to Rollbar"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wai-middleware-route" = callPackage ({ mkDerivation, base, bytestring, http-types, HUnit , test-framework, test-framework-hunit, text, wai, wai-test @@ -209694,6 +210628,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "web-routes_0_27_13" = callPackage + ({ mkDerivation, base, blaze-builder, bytestring, exceptions + , ghc-prim, hspec, http-types, HUnit, mtl, parsec, QuickCheck + , split, text, utf8-string + }: + mkDerivation { + pname = "web-routes"; + version = "0.27.13"; + sha256 = "10b0hs7mmvs9ay3ik93s8xd7zlx8pyz20626nrha4mwyixgkmc59"; + libraryHaskellDepends = [ + base blaze-builder bytestring exceptions ghc-prim http-types mtl + parsec split text utf8-string + ]; + testHaskellDepends = [ base hspec HUnit QuickCheck text ]; + homepage = "http://www.happstack.com/docs/crashcourse/index.html#web-routes"; + description = "portable, type-safe URL routing"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "web-routes-boomerang" = callPackage ({ mkDerivation, base, boomerang, mtl, parsec, text, web-routes }: mkDerivation { @@ -210306,6 +211260,46 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "websockets_0_12_3_0" = callPackage + ({ mkDerivation, attoparsec, base, base64-bytestring, binary + , blaze-builder, bytestring, case-insensitive, containers + , criterion, entropy, HUnit, network, QuickCheck, random, SHA + , streaming-commons, test-framework, test-framework-hunit + , test-framework-quickcheck2, text + }: + mkDerivation { + pname = "websockets"; + version = "0.12.3.0"; + sha256 = "1k7mh4gpgzw83ck66kncz8jvmwc21jd2i36xnj78zbyi2sbclx86"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base base64-bytestring binary blaze-builder bytestring + case-insensitive containers entropy network random SHA + streaming-commons text + ]; + executableHaskellDepends = [ + attoparsec base base64-bytestring binary blaze-builder bytestring + case-insensitive containers entropy network random SHA text + ]; + testHaskellDepends = [ + attoparsec base base64-bytestring binary blaze-builder bytestring + case-insensitive containers entropy HUnit network QuickCheck random + SHA streaming-commons test-framework test-framework-hunit + test-framework-quickcheck2 text + ]; + benchmarkHaskellDepends = [ + attoparsec base base64-bytestring binary blaze-builder bytestring + case-insensitive containers criterion entropy network random SHA + text + ]; + doCheck = false; + homepage = "http://jaspervdj.be/websockets"; + description = "A sensible and clean way to write WebSocket-capable servers in Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "websockets-rpc" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers , exceptions, hashable, monad-control, MonadRandom, mtl, QuickCheck @@ -210868,8 +211862,8 @@ self: { }: mkDerivation { pname = "wild-bind-task-x11"; - version = "0.2.0.0"; - sha256 = "1cm2vf9lc1q0rs1hl4gch58iklfk7dvplhflqcf8na6ncbp126g7"; + version = "0.2.0.1"; + sha256 = "0n8sg0qg0ambh0744c19zwxxky2b0vwpmn464i3mp587dkfpm0p2"; libraryHaskellDepends = [ base text transformers wild-bind wild-bind-indicator wild-bind-x11 ]; @@ -212044,6 +213038,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "wreq-stringless_0_5_2_0" = callPackage + ({ mkDerivation, base, bytestring, text, utf8-string, wreq }: + mkDerivation { + pname = "wreq-stringless"; + version = "0.5.2.0"; + sha256 = "0nswlrrs5pby5l758i5bbrfj0rpjxb71jak26gzwkm674kby9hjq"; + libraryHaskellDepends = [ base bytestring text utf8-string wreq ]; + homepage = "https://github.com/j-keck/wreq-stringless#readme"; + description = "Simple wrapper to use wreq without Strings"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wright" = callPackage ({ mkDerivation, assertions, base, bed-and-breakfast, containers , filepath, lens @@ -213458,6 +214465,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "xml-conduit_1_7_0_1" = callPackage + ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html + , blaze-markup, bytestring, conduit, conduit-extra, containers + , data-default-class, deepseq, hspec, HUnit, monad-control + , resourcet, text, transformers, xml-types + }: + mkDerivation { + pname = "xml-conduit"; + version = "1.7.0.1"; + sha256 = "16pg2zzh0nz16zg6y5s7392d76fnhlki48ni1c18dzn41ybj8vll"; + libraryHaskellDepends = [ + attoparsec base blaze-builder blaze-html blaze-markup bytestring + conduit conduit-extra containers data-default-class deepseq + monad-control resourcet text transformers xml-types + ]; + testHaskellDepends = [ + base blaze-markup bytestring conduit containers hspec HUnit + resourcet text transformers xml-types + ]; + homepage = "http://github.com/snoyberg/xml"; + description = "Pure-Haskell utilities for dealing with XML with the conduit package"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "xml-conduit-decode" = callPackage ({ mkDerivation, base, bifunctors, data-default, lens, semigroups , tasty, tasty-hunit, text, time, xml-conduit, xml-types From 91f03e6b1909edcf800d0514b1f21f5960cc2583 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 5 Jan 2018 09:31:09 +0100 Subject: [PATCH 213/296] linuxPackages.ena: 1.2.0 -> 1.5.0; fix build dependencies --- pkgs/os-specific/linux/ena/default.nix | 38 +++++++++++++------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/pkgs/os-specific/linux/ena/default.nix b/pkgs/os-specific/linux/ena/default.nix index 363ecf4fc41..9ed691d69f0 100644 --- a/pkgs/os-specific/linux/ena/default.nix +++ b/pkgs/os-specific/linux/ena/default.nix @@ -1,41 +1,41 @@ { lib, stdenv, fetchFromGitHub, kernel, kmod }: stdenv.mkDerivation rec { - version = "1.2.0"; + version = "1.5.0"; name = "ena-${version}-${kernel.version}"; src = fetchFromGitHub { owner = "amzn"; repo = "amzn-drivers"; rev = "ena_linux_${version}"; - sha256 = "0m0jqd6gyk4r43w6p5dvp1djg2qgvyhnzmg53sszlh55mlgla714"; + sha256 = "1h3vnwa2129advyws69n0sqyra4nz68mng6g84whbvhzjyx810sj"; }; hardeningDisable = [ "pic" ]; + nativeBuildInputs = kernel.moduleBuildDependencies; + # linux 3.12 NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; - configurePhase = - '' - cd kernel/linux/ena - substituteInPlace Makefile --replace '/lib/modules/$(BUILD_KERNEL)' ${kernel.dev}/lib/modules/${kernel.modDirVersion} - ''; + configurePhase = '' + cd kernel/linux/ena + substituteInPlace Makefile --replace '/lib/modules/$(BUILD_KERNEL)' ${kernel.dev}/lib/modules/${kernel.modDirVersion} + ''; - installPhase = - '' - strip -S ena.ko - dest=$out/lib/modules/${kernel.modDirVersion}/misc - mkdir -p $dest - cp ena.ko $dest/ - xz $dest/ena.ko - ''; + installPhase = '' + strip -S ena.ko + dest=$out/lib/modules/${kernel.modDirVersion}/misc + mkdir -p $dest + cp ena.ko $dest/ + xz $dest/ena.ko + ''; - meta = { + meta = with stdenv.lib; { description = "Amazon Elastic Network Adapter (ENA) driver for Linux"; homepage = https://github.com/amzn/amzn-drivers; - license = lib.licenses.gpl2; - maintainers = [ lib.maintainers.eelco ]; - platforms = lib.platforms.linux; + license = licenses.gpl2; + maintainers = [ maintainers.eelco ]; + platforms = platforms.linux; }; } From 8124abd16a487dca0360677e9e2986bdd31423a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 5 Jan 2018 09:33:37 +0100 Subject: [PATCH 214/296] linuxPackages.ixgbevf: 4.2.1 -> 4.3.3 --- pkgs/os-specific/linux/ixgbevf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/ixgbevf/default.nix b/pkgs/os-specific/linux/ixgbevf/default.nix index 68064386a30..ffdf0d678d7 100644 --- a/pkgs/os-specific/linux/ixgbevf/default.nix +++ b/pkgs/os-specific/linux/ixgbevf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ixgbevf-${version}-${kernel.version}"; - version = "4.2.1"; + version = "4.3.3"; src = fetchurl { url = "mirror://sourceforge/e1000/ixgbevf-${version}.tar.gz"; - sha256 = "1666hsavaspjmf45ij396mkndzk6g0n3ibr2glfdhjfqhfy35zb8"; + sha256 = "0kq8y0944kaprw445wb8iswdck2jmc0xpkx0iv6idy3r5cc4hvyg"; }; nativeBuildInputs = kernel.moduleBuildDependencies; From 14f3eb2dfdd5168c20ce66226028cd2e5106aa17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 5 Jan 2018 09:38:35 +0100 Subject: [PATCH 215/296] linuxPackages.bcc: 0.4.0 -> 0.5.0 --- pkgs/os-specific/linux/bcc/default.nix | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix index 75b7802772d..23e8c1ca7d7 100644 --- a/pkgs/os-specific/linux/bcc/default.nix +++ b/pkgs/os-specific/linux/bcc/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchFromGitHub, makeWrapper, cmake, llvmPackages_5, kernel -, flex, bison, elfutils, python, pythonPackages, luajit, netperf, iperf }: +{ stdenv, fetchFromGitHub, fetchpatch, makeWrapper, cmake, llvmPackages_5, kernel +, flex, bison, elfutils, python, pythonPackages, luajit, netperf, iperf, libelf }: stdenv.mkDerivation rec { - version = "0.4.0"; + version = "0.5.0"; name = "bcc-${version}"; src = fetchFromGitHub { owner = "iovisor"; repo = "bcc"; rev = "v${version}"; - sha256 = "106ri3yhjhp3dgsjb05y4j6va153d5nqln3zjdz6qfz87svak0rw"; + sha256 = "0bb3244xll5sqx0lvrchg71qy2zg0yj6r5h4v5fvrg1fjhaldys9"; }; buildInputs = [ @@ -17,7 +17,17 @@ stdenv.mkDerivation rec { elfutils python pythonPackages.netaddr luajit netperf iperf ]; - nativeBuildInputs = [ makeWrapper cmake flex bison ]; + patches = [ + # fix build with llvm > 5.0.0 && < 6.0.0 + (fetchpatch { + url = "https://github.com/iovisor/bcc/commit/bd7fa55bb39b8978dafd0b299e35616061e0a368.patch"; + sha256 = "1sgxhsq174iihyk1x08py73q8fh78d7y3c90k5nh8vcw2pf1xbnf"; + }) + ]; + + nativeBuildInputs = [ makeWrapper cmake flex bison ] + # libelf is incompatible with elfutils-libelf + ++ stdenv.lib.filter (x: x != libelf) kernel.moduleBuildDependencies; cmakeFlags="-DBCC_KERNEL_MODULES_DIR=${kernel.dev}/lib/modules"; From d5ba7d42b15c725b82addd0c0774c764e316f52e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Fri, 5 Jan 2018 10:15:09 +0100 Subject: [PATCH 216/296] teamspeak_client: 3.1.6 -> 3.1.7 --- .../networking/instant-messengers/teamspeak/client.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix index c14c9ade2dd..b7dfdb3e341 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { name = "teamspeak-client-${version}"; - version = "3.1.6"; + version = "3.1.7"; src = fetchurl { urls = [ @@ -39,8 +39,8 @@ stdenv.mkDerivation rec { "http://teamspeak.gameserver.gamed.de/ts3/releases/${version}/TeamSpeak3-Client-linux_${arch}-${version}.run" ]; sha256 = if stdenv.is64bit - then "0ncqs5ykk1zsn2lqarf7pr39rbp4h54vaqq1sgqi5irpj6yagzak" - else "222e8abb24de9e3ea00fca10be32340ad88859a4d811afa644c5096aada4996d"; + then "1ww20805b7iphkh1ra3py6f7l7s321cg70sfl9iw69n05l3313fn" + else "0yvhmbhliraakn9k4bij6rnai7hn50g4z6mfjsyliizf6437x4nr"; }; # grab the plugin sdk for the desktop icon From ad87adfe964baa923fd99ba1fe7b0efef456ca4e Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 5 Jan 2018 10:43:44 +0100 Subject: [PATCH 217/296] sqldeveloper: 17.3.1.279.0537 -> 17.4.0.355.2349 - Java 9 (JDK) is now supported - Data Guard in DBA panel is only available for 12c and higher connections - Updated the NoSQL drivers to version 4.5 - Added support for defining consumer group mappings for CLIENT_ID - Preferences Search feature now covers all options - Differentiate between a temporary connection used in the unshared worksheet and a truly private connection used internally for things like the UT Repos or the Instance Viewer....the naming logic for the Unshared Worksheet is now 'MyConn (Unshared)' instead of 'MyConn__1' - RAC support added to Real Time SQL Monitoring --- pkgs/development/tools/database/sqldeveloper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/database/sqldeveloper/default.nix b/pkgs/development/tools/database/sqldeveloper/default.nix index a7a8640a94e..72c0aaabf85 100644 --- a/pkgs/development/tools/database/sqldeveloper/default.nix +++ b/pkgs/development/tools/database/sqldeveloper/default.nix @@ -1,7 +1,7 @@ { stdenv, makeWrapper, requireFile, unzip, openjdk }: stdenv.mkDerivation rec { - version = "17.3.1.279.0537"; + version = "17.4.0.355.2349"; name = "sqldeveloper-${version}"; src = requireFile rec { @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { nix-prefetch-url --type sha256 file:///path/to/${name} ''; # obtained by `sha256sum sqldeveloper-${version}-no-jre.zip` - sha256 = "d9c3c61b12a57d6b0fd6e172bf5716d6e829306d44815bf68ae42eab8a51bea3"; + sha256 = "70add9b5c998583416e3d127aeb63dde8e3d0489036982026b930c85496c7850"; }; buildInputs = [ makeWrapper unzip ]; From 766c98e2212dec8e3899d3aeff1ade37ed53486b Mon Sep 17 00:00:00 2001 From: taku0 Date: Fri, 5 Jan 2018 09:13:00 +0900 Subject: [PATCH 218/296] firefox-bin: 57.0.3 -> 57.0.4 --- .../browsers/firefox-bin/release_sources.nix | 762 +++++++++--------- 1 file changed, 381 insertions(+), 381 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 80f9c895f9a..c56d30a3ccb 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,955 +1,955 @@ { - version = "57.0.3"; + version = "57.0.4"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/ach/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/ach/firefox-57.0.4.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "7e783e4ecefefcc03eda1eea18216b95aa0473f6f911320c08c478dc68543f9ae1ddde67a6f5f4e6147633b72b416ef04f91c390b66c24eb7369b258721ea9ff"; + sha512 = "44b5cd0112f6d6a8577b831b55bff2df34ed86e7ba6e16f54d2ec8a738453b27fcd4cb0d2f1c6d64ebdf9492ab2d0dedf15e3a50c16eb1701e24ed7293708ae9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/af/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/af/firefox-57.0.4.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "615abeb7d8e4b3e9c40e1a97bb6b9e9a44e8d7d1430be3bda06fe89eedc67f8b01fdb6c7284a27b1a23ca9b367990b2e952e086b0cbd8f07a0f9c9b03e7b64e3"; + sha512 = "734b6f164ec97e366f5e747c2bdd104f48c33d39f4467438da9eb9483d285688040cd508e864d9e451a9cae3907b4cbf0738489c3697ea38dfbf5d8186b85068"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/an/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/an/firefox-57.0.4.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "12576dd70c416c33c464c43001f9a2e8896ffc41afe1b012178e6b5bea399ba4ed6812dae6a3f95c775a4e2989e21c8929de130c0c4fb80afc59b91e4bafae2b"; + sha512 = "1be1776853195dd56b83ed4e35ba96f263a72ba009311c48e59ed42b3206a3b9052805fa7573f7064307763396a3b10b44744dc38f11d767ea67c450aa33e129"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/ar/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/ar/firefox-57.0.4.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "b33f949093ba7ceb852ade0ef5f771fbeb9e225f66df152ee7079b56737a85bfb7e8bec1cc47e4b76a089e357878a37b6e94f82aac691d139410556c6496d528"; + sha512 = "87ead011bce9035004af52e6f25b1606d3061cd425c0deb19de91f166ac793b0d8689440aab6e45f469426ee4deddcfc5a9f4872f92121e404c4e69cc50eb22e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/as/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/as/firefox-57.0.4.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "a73bf7a1a35b83bcf28d0dabe1597b0c6f1c6a617e5193bd9177841b93ba02399fab6baad83268825c1dc753572e8eb2e3147afbba17a338bdce68742f80ae30"; + sha512 = "0cef33747c17bf4646aec1d231269ca2198009038ac2b666edabe2b85333c375c18e249402ce201683d5145292057ee38082ef81d92304ce34d8fb31e5d240cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/ast/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/ast/firefox-57.0.4.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "8671c892f024bb16ebec39aada71975f511642e6d38d22998b5224735e2030dca4b2b2507fb0426825f4ec238d3ce5d33770802fdd22c8ed383feb341b549694"; + sha512 = "ee98e03759f85a3a52571b83c4fd9eb43bc655bb17735197a6cf30b894f1875ca1905e5807cdece521f24d7ded98118ac0c157b9c981720d80bba208d67f423b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/az/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/az/firefox-57.0.4.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "8e6ec01b879abd9d6af2e39cca088b3c325242a214d64f27ac01320174316974b9900678c896f0c9a42ecf85692f998064d59a1db69ae9642663b5313d2a6ac8"; + sha512 = "78fdbdeb6ac24450f0c6a52e308edbb31f1cc2c6950fc25295315c4be953cf35e3ba220c8f8b9994be055d963f6a2f55775b743161c71e24552fd5882dcf0b57"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/be/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/be/firefox-57.0.4.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "33e097eb0c3750fdb85e19b30d6b760b693957b674c56cbb9130ce24786af23509e34d447a686a98f725ec326a0705cdd1403d19ed0579c5cec3b9b1e0d55cf7"; + sha512 = "07248a7ddf23657647d6e3f154be6325e04cc30b02a724a0b4c2c159060b7c11c2ebe4d7c4bd09313d1b37eea7e1bc45c666b9e19ae7d01e8e10f6392a70aa04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/bg/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/bg/firefox-57.0.4.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "33f6750887c2f86a10ac0d47f13addfe5a0de9b911fd06c7c7115f6e9dc94fb95c8cd6ad1ad11de9443d734f927a70d56bd35911076ee47f9afb9dc3fd94e612"; + sha512 = "6a05d69ec9e607bd1c7e48b882e90f2069522f99b8397c4daffe70d7e0ac2012287db2cf78d71df1a7e4f20ceaea1de86c61b857986cd3f785b4c55574346340"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/bn-BD/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/bn-BD/firefox-57.0.4.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "03a1662fe4aebbba790fcc859df9436e1d2eb2c5c8d2927119f7e1f629ce48aa355897f1fdd0cec74c00a0fcb9c9339b96aad1f71ab6e15d18f09a196b834141"; + sha512 = "441f56cc7eb513e20a89732745c1d3f56d82bccf09f2903d9f07547a018ec31fc95bf5b56b9875cba08f44bf5d9af0afb6314f72c5c4eb0f6546e06a6115fb4c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/bn-IN/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/bn-IN/firefox-57.0.4.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "0014a45b28c117549bb6d5ec77a4a7656fcac5924e30f2b2c5f28a583f3e4e68f8e81d622418c4586446b103f878862f75d8877fbadc58689ae4de036ab51db9"; + sha512 = "eded452d957d9bcc6c65e716e1271cc130ac76897a166f2507628e99b50d99dd970265e4e5ff276d509fcf2026d3c95f4ddbd7b0b09144495bd483af724c9636"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/br/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/br/firefox-57.0.4.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "0078d101f4a6dfefd9a3a1a35ac733aad43e3b6574e3a4cb1b0ee9b04ab2363f0c0fff52f019eb38a85c9e0dfb930900ee1e5264dd92e0aa40c58de0c6dbc692"; + sha512 = "7ccf63c946299241612875d220c613887dbd4cfe5db019db4a2626df2ad6de8c00564bcf28aba66566eb26cdaa5cd7ae15eb5c6a37d7959663609581c617dd0e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/bs/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/bs/firefox-57.0.4.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "4475c7cb7da700da33ff41708eef052ba634e8a1286444688ff61d721d55f98387038bf2c815b2c9c5e0fd5feea5f7e47c04a91447a9cf99532430af28e7d748"; + sha512 = "de319c64ef4a008d30dd1bd26e32c17a7fc5ed73a74af2029807004ee98393adeaba06ac9f02687e359ea0c41a5ec176630fc1cec1b87fbf789d2da68549dd35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/ca/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/ca/firefox-57.0.4.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "47d5e1feb1188bac57b36829fa458ac47eb4bee1c9bfd24b412f36bd3a8d7d12c755ebefba6f61cde1144e3586c99391ba8734e69ccd99c5f404ad5065e77a70"; + sha512 = "f90f57a74a082e1015d04e4992d3137d6cd92d15ad304a2eedd3c293babba3c4a2f352512c0d3971478cd3df353d29f9ae3b1fc09ffed19cc3c7ab4475129371"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/cak/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/cak/firefox-57.0.4.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "8e8bd52dc36d3df42e7ef6ba604c0401b7ab7f45d54803c16f1ceae89b2f1dcb08644a462d660ff53c6288319c19e34b261f0a06f0b0354daed7e7dcb617c3c0"; + sha512 = "0bf057c37cb1bfbad87dc79386dc13eca311399ddf1deaa625ba920c72f690f01e20ce3cf0d7d1afeb016e2f27c96dff405c1b168aa83bed0615e55f1eb259c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/cs/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/cs/firefox-57.0.4.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "78d3e4b2cb1f07a401c00e9e54ea65e33c7c4b74a8f3e71c0342cbd4933043d82c372600084455fa253d3cc6befa6f046740b1e47aa639577954db52cf86a319"; + sha512 = "609d94b2e7e920a70c2774c3ac9531c7b97492401a7860e43c3a8b0ff8870d9c51955dcc0eb9ab4f12eece415338e6a8a1f08f55f4c5ce5f15def081d03d783b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/cy/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/cy/firefox-57.0.4.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "cf89564ad1c1d8d346fd655cb27c219689fae63040ec2775d0a588551884fe75ebb80cb842840b7cb16d1d9b20d215f44e5e0f9287169d0b2a376586e33e31f2"; + sha512 = "c77903916d9cbb55eaaf6220dd8a1a101c90a338fc3c9b289cbdb1c0e2080dd9a839b00575e38014ddce4478f53711cd31834d6dc94deb517b0a3e8e674df7e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/da/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/da/firefox-57.0.4.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "f403324556a40d82b9fb52ab25e4ef92c6e65d44a5cbb6a3fbf581a4f0d189b716af031857137e665b8bd7c7c500a1403746a8c973c282776dad09df80fc5839"; + sha512 = "69486cfe520e313485eec89f64b446de50a87d5f94ff6bc76412c61c898177b0f7ff969bbcd7daca3bbde648394e2f82b2cd50be933f5ab6168157d18156d8da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/de/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/de/firefox-57.0.4.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "07cd39dd4fdd91ae6fc445727f35c42adaacc8a71c81e8d2f565f22b4d26d4e9d4108487626c28e982e551cbc65dc3eb3830cdef6163ee9a029d1592ee095910"; + sha512 = "c85ac2270f30c9516df4a1331df5fe4a28c79787a12e306185b78c30a0b74d655c1cfa3e2b17ea17acb5ae28e47dc1235948deb6eba1a8d744f6a3864806c869"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/dsb/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/dsb/firefox-57.0.4.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "07c8eac5714b7fbd5442e994168fd95f18260b6aaf74e97c664f750be699f2bbb61eb34d591788db45841f1df17c1f977d668acfb40004d2cc4716a705a4218c"; + sha512 = "24b96b1db0e5f5f1a20e63d80dc69e309daaccddc0327b40fc8aae20a2e18f2698bfa50d3dbbd8268b54d3e92ab5a07ce1fa04de8c4dee31dc261109274728cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/el/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/el/firefox-57.0.4.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "02add1f0db002936b8ae153dbfb04392fda5a8948d2008e86acebcabeba4734a36f8e3983c1c218fb87c26d0673e305bce031bf5b91fd8ce1448ce9119aed117"; + sha512 = "f22348ac3448a39472e427714136c51648f5bbf6979a402838b0c11dedb090b4c16397841cee5b2dc142fe942517386db0063ddc0e4b317e911110548a7805a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/en-GB/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/en-GB/firefox-57.0.4.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "799dda485a170ee5f4767385a2c7773fd6d8584d5d15058a18969ab81b11f6e06da0e12351c0cda80124ae683a8b82ff28c0bb052e6577ded1756b3ba29518dd"; + sha512 = "6f53f1aa5f788f4b05135b610e117fb368c100053620f8283d39a9bad6e9710978b7ebc638514a04fbb3025407fe728b3be4a80d2708ba0aadfa11485e012e30"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/en-US/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/en-US/firefox-57.0.4.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "9b9a795664c7d2aef7539b7ea6093af55883e4ab055b1cb5cfaae01cf8f87b6c295e9ad69903b67225ec750ca594f3eba836a502928470f86d277706bf1b58aa"; + sha512 = "c6e9841fa901f78593d5bd60c3c4616e9a8dff696a5b812bcc4fed52287fe7db6c7bfef85a7433f08b3b940de6418aaf1c7c90dde6cff1cc6c7e0efe439e0ddd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/en-ZA/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/en-ZA/firefox-57.0.4.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "82a1c617ffb51ce228f34d277ff466e1c37b8263c7b3817484c4513fcb7511e442eb449e3e53bcfd4c92eef94d19f0d810411d23831b6b28a3f12eeddea2547e"; + sha512 = "a980707b6b773c0e34f385ddce1be8c4ef3d5a378601ba3aa40890fb247a666cb8253aad8a64859527a7becc9925124c9eac1e13a19a932158aaa953bbe158ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/eo/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/eo/firefox-57.0.4.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "aeecd1a2169a8f1c61db4681363f95a523602be751288854f2469627fd603a9990c78123ca43d5a66bd2df92a08d7a09c13cf24f14f7afa63f8de928a9e304c1"; + sha512 = "6b23c8ddcd84c96993b4cf7f256df3485871e170068db563e5d0c649abd8e3b5869cbe8732d3a97e1927f45c7c8c18d697fdebab4ec1bef7de78496d06c1c0f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/es-AR/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/es-AR/firefox-57.0.4.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "539eb57257d82ce3d8bf3254560118da7d81a3cbbb877bd5db3ed10b7cf672a2d7fdf479f175f2b78f79003dfc2d9818d1034b063643c1307294e6da5dd3063c"; + sha512 = "985149e873bdeccffd6be63b35a56b3f93d3dc35cf04b055af8dafff68ce82bfb752a0d48e3ab43a9b197d15cc11748243bd2e9537a42f59c27a7868c2b95546"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/es-CL/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/es-CL/firefox-57.0.4.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "676b2199127683831f6112ff6847c4a46bb9aeee225cd08673a2d7d8a8a8b62a7aaed22d406653cb839500b0da7d26ebb22dcb4e3c00395eb462732f686a9477"; + sha512 = "4ec591554411410fb90215dfa229fe207bc3303a1bc68c4fc8894390386c07ebf958fcc894f2d17a9876c2da9b8424a00a62fd828921fa575ce0b0aeb037ea4d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/es-ES/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/es-ES/firefox-57.0.4.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "e76ca567c4f82f91bec00fc1d66b6aeaa0f91a62ed88d39337eb9017707c13099d0e98b7e2177c729f1af47a42273fa01128f7360fa5097c5bb4369abd84f7c0"; + sha512 = "751741292c0794916be2636b42d03671d408b5e1675544c44238cb28131e64eae07b9524b57e5cebcd491ac80960d2d60619a641f94d333b5622ab8cda812e8e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/es-MX/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/es-MX/firefox-57.0.4.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "07f481896b44b119b311c5c717bfb5567219bd78d3990c2dc7ea76dcc7a1d907f78907971dac71acc6b8efba519efbdd73951975ce953bb939196a433f103a83"; + sha512 = "b54419f6cd1d7bbbcee875cdcfc06b9b6d053a1f320e47ef575c6d11ee3dcdef0937adcd6889e0b45c592e51547b66e09ceaa9ddbbd901aac6fdba0aa09df9e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/et/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/et/firefox-57.0.4.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "38d0c69e6a8f86a4f7717fc73d4bf08bdcef0e7f7283da4712ef325f80f440d8e906877ca304d8ec92e11df14b42a9c0b70f33437d7b76634c892a860eedb942"; + sha512 = "fcbf4c77a053abbcf0e071edeec310db34a195c9b1d07fe75ada0dbee71854631756a148b9fb36aba96865c462b3efb6c5c6689cf094430c6b9704a2e3e57294"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/eu/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/eu/firefox-57.0.4.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "6ef281592e2ba0cb4d83956048535f070e18cc72f69b5e425ecb9172abe67055cdb81b182733f23cfc41e0e69d61c162c974a3ce221766b6f6ea1a3c7dae5864"; + sha512 = "6930dd5dba3b9d75d1ed998ee079a06b4222e130b7456851b2be8353d29bfc883439617a0bdbfadbf027a1c14d987b5ef4e15419190cc67c54d88d942f2ada42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/fa/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/fa/firefox-57.0.4.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "12353ec2052be27681828ed57ed3d40aee84ee6c370901b70ae8a391b06f7ce8ae771a90ab7cb7f6c3d190326548eba5488d9e7eab2e68de8eae481bddf71e33"; + sha512 = "967abdce15e37d3cad52a5eb6a3e929b0ef0c6c8e43d803c88c20b649dfae3ecc980ba64f0ebdf140938627e857a86d1cd4884a4db682bdb4c9601e6cf1b3efa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/ff/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/ff/firefox-57.0.4.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "0d425d4220eb45cfee960cee97ac6abc985c19d774283cb6eeb4cc51f4f26c781e1037f9360d85366a4cab85752e32feb1e37f40eaff896f3a0a8bab43a6fbaf"; + sha512 = "28ee8f395cd3d214cc67068a1421b466dfba935cc63f9156c258556c89ec74ca70d21bcaa627f4ed7bbe372fd1577b77e03230b2f031ff26e72c87b8889cad93"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/fi/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/fi/firefox-57.0.4.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "8e4e256390c026f6dc151ae39026b9dc232cc00a27b5ae62176add02404941e38801f9ab71a63a715a9257281bee2eade5d677e73e8a79786f3b4a37ca5ef685"; + sha512 = "bb3eff25215b09cd7789e80161b06c7a6e3929036895a9bd9d949b94233bfa98056ba2123602f06b2d7572857371390bb887c50c2c1a37c641b20e250b083a5d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/fr/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/fr/firefox-57.0.4.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "b0acb5c1729163c5fc28dd38da1cc99899bdfd861b79a1c886e09bc5cbbe677822196343800e62ea8ba3b02f9819e85af13c362d772d4bf301f93b122c21ec11"; + sha512 = "facac474073bcfceae7f1a1b8554e807136c277f31abc999b2abe33f2dd6f365cbe6549a5f9542982c3f5b80f42fc1c7e361a5402f74e359170c24570671802f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/fy-NL/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/fy-NL/firefox-57.0.4.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "ee936cd1431432767b51a628867f92f3ef0565f69e305856c55fa66ea00e5c930fb479e6032b64ecd60299e56b6d43f1b198fdf99db645505f76c7901ef719b2"; + sha512 = "84deb0e23a3d6a56cb2e52958c7ec4a650ed32a0302d51ba0f9b02f9f6d7f974402c7445d51a7be4cb22be0bf582af377653e2944829cc075a01804727bf0387"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/ga-IE/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/ga-IE/firefox-57.0.4.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "f5c41fab676f6007d218141ede1fc6f86d46998dd4b4c6be25061a19277bfd6cbd5ff2ba44b312360224cc12a1f56d4558edaec95cca198a877a45090b0432c4"; + sha512 = "41ca5151a5d76314255a9f772ae7483d8c67df84a5511ad78cb951c6d11c8b0b78d43f19d3047ddd8add13706303335058adc4be7779dbe3bfa5b3b60a1929ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/gd/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/gd/firefox-57.0.4.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "bf0bddd8a9849c6f406d1009317c9e93d82868e9d2a621524f2bf40e6f6b6586c368515f18e331c9a871a78339cdeca90686adb7ffb4edabb9e78951d91e2008"; + sha512 = "020921ef0e372eb1a9cff8c71133668f6a708436027a5d163188b8d2928fc8a264ffe5f7a1cbc40e109a711ed4a8bec26c333c29c84d4cef6c1985fdfa54a0f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/gl/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/gl/firefox-57.0.4.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "e50d6b80f7833b2e417bd6429b83b07e34c951a55eb8eb5df3a254976fff1e23c5dc3567263ee0a0830c65c9452830e488ebeda9e604e3eb099e09141596201c"; + sha512 = "40d1131d2f2a365bfa0432b8deefa8c705b508419ae3e1b764500fbe67cbe38ed9a9813031e37ccae2e835d1f9d6b6c18edab829bb24f0658a6885f197d108d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/gn/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/gn/firefox-57.0.4.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "00abd6b13e6bc65b4c69b0ba4ae7538c9a6e8a4e8545153ece51029504aab8ef77f3eec09272d3ea6c51da1e8e8c3a77589889ecedaa6cba57c4191e2b8acd35"; + sha512 = "fc16f7ae512a49f5af381e3952b9af0772393c1e0b917d3d946a8565733dd8ae9187bb1101bd9604a4e860b8e4d001ad3bbd8c3ec023207cca28e91f6ead19bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/gu-IN/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/gu-IN/firefox-57.0.4.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "5ea5297d8f7f1b6a78314579b4f11dcc792172f47773ca448e0818254b150d3c384ae2cda62b12d4388b2b19f352a526520636afdc44ebbf9d3fbf1ca79c07a0"; + sha512 = "693dca0183d8dc7962a4505925abb40d286b86fae206ad2c88153ceff02138e756a61615d9043bd65fe9a60ab990d5a79f2bd0fcce784c361488c3047282be17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/he/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/he/firefox-57.0.4.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "2a4300e271285f926657cc02c80f35d9e3f8c2c09efe6fff5976dfeedc4877219a4c7e3d45ddf77987ac24024df1a89a4b49fe85b2cf250c4ba1c980be5254e0"; + sha512 = "75c52bd15a6c3b7254981b82f9d5f0b9aaa43d2346bd1376913f6974b63d9f6929ef92fda0916103c643ecaa7f235b4268ecd956a4194ae41048d794029605d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/hi-IN/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/hi-IN/firefox-57.0.4.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "23213f41de69b819bb96b975f7698cd9ab662d9b8f6b77d69a127f70426873f28ae298836bffebe289a7eb6dc0493f5ad50bcfa364c76edcd10727a82cdc60e4"; + sha512 = "752852c1295153ceea9d55e49afcdd185ca34f31d38dc2a85252f5ef2b0dacd9a6b3a1828ed0d88314574241157dd90d1da33c6d19fe25d1180ee959bbd8ccf5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/hr/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/hr/firefox-57.0.4.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "b229241f8c3965baaabefae35c92b1faaee95aef4105b11a6af46e92f0999f37a6e61339c9ecabb3c1ee97c0582db5783d1f92d867a7298fda6476824c0b1bd4"; + sha512 = "01b29494db80f9483334bfe23d62859aa16dcd918b1acf308d765b9864304616182195d2c10e6ced4c7f1709ab2d5a3c5485614506ce727fefb2187b82a28895"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/hsb/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/hsb/firefox-57.0.4.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "b463568cef3931a3a290c37aaaaf91cf65d0dd1dcee8695054ada4bba0cd91e4fd0e88f797302a67f9610639504ea8f2f428b512258d49cdd6f8be564aa79c03"; + sha512 = "efb189a9daa8335e8d2b2b31194d808edcfc0f8b607a227daf0b74ae456600b7ecfc9fdb1340a17cdb6913735ade2eaccd552603737c4c9bf3abdd99bf438d63"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/hu/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/hu/firefox-57.0.4.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "21da18ed2c20bcf93aa1fac251762bffac5555562015116c38d2b3711c9ac4e16a3c3ea8ae5a882e1a9f8a72a6479215e65163516149037b8b1e7256ba0b3e70"; + sha512 = "4d6a08d3ea1cf72261aaffb7c1887fac28ee68f6e1bb5a540967164a4f7294f0a378b0cfe3dba867a5adfd21e4df3478a9bd5be057ce923c53fee39fdcbced4c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/hy-AM/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/hy-AM/firefox-57.0.4.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "babcdb2439d6de5c1ed85f8d5ede8c3bcff9a6dd448589d822c510aad350da580e26f37ab46891260244087c51ade46517a54fed76805a336d2b8e22d468dae1"; + sha512 = "c68660b7e1482e46ad66c86623d9252466b15eaa3d2c848392985db2932624e3d953ee48d6eab39c42dcafda174713fa148aab41cf04ff63db38eba563303c96"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/id/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/id/firefox-57.0.4.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "a2f68ca0a667f8c9d2777dbdbe6ef927fe296991daeda11ebfd50c84ae9343728e707b71265cbd0cd93506b2322cc09c7ab541bee15b918a292964061471592d"; + sha512 = "c93a02327cb8679b65c9770d6105bfdb6ad3bca90191f3d0fb1a5a35d3bfb1d4616ea54f3af5aeb76449de973d4acad0873e37674524d90010cb830247189652"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/is/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/is/firefox-57.0.4.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "316cb66e3101d297b771b211bd0e3a3c57abddafcb01f15e4a5821a45af0fcf8d70a97082815c43724c3954be63795747a4483011695ffef46713feb66d94e61"; + sha512 = "b7961afc123a574e656e98eb7b6f819517d3658a36303af89d36f03c9a32137984e047e4021d30d137294f41930645a62f5dfc06456ade330942a880aa4381a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/it/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/it/firefox-57.0.4.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "8998f85ae38c92722c87ab47ce257dfde4f713d167dbdf79983b3c8d979f9e47f14c44e520a266e8e58d31d2eb50270f56d5d395014a7037426fecf3d683db28"; + sha512 = "7ee154c376146c40828375072f0c5ecc652eff04f8df644a25f106963fb1ba6973aaa7e7d5b27918672fa42069d91d4207e8f779d684cb342c29d56a1a020ce0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/ja/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/ja/firefox-57.0.4.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "cae82ff29c8f228f4f5d50914520b4f962b322793fad4637540c471b367a2fa8809c3097e23f52e33c412571acb398d59dbd8acd6b641ed3ef50952f460ea534"; + sha512 = "ff5ccae9fedb3366319a6ee2afeb849720ef9aab9a25700e15871b01addb1bd18d6a1ce655e0ef0adf4a1f826f81b85ee2a3e21161e554b5a2e9050f72c13786"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/ka/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/ka/firefox-57.0.4.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "2e4534bbcfd879741ab0abfa5123ee112ff06cc9ea9fb5483d9f58f704b25db79b8acf1c09e2b9fa00584ee5331f964f07771951601f8f84e81ba507a320896a"; + sha512 = "fe165e0c5d4204209ee9a647272c73c28344bd16343338ae6b8261dca2b5ae4d05b7fc6cbd3a7b3871e693706b7e73a3b7ef3dcf40ee4dceabaeac12d5398a22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/kab/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/kab/firefox-57.0.4.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "cd7d7d7627ea3a9bfb2c9f04f37cecc79c80bfc5054a10b1fca41077bd9ef79b25fe7601915c16f2b6b92cd7cfba104a58e586819da4a76055554665f5f2d425"; + sha512 = "294d0980cc5f9d7feb628c797d260024d786e919d2872f3f5695ba7e4fbabdbfbe9bf5c7327645ad99771aae8902fb3fa6d6e5de1eb56746b32b36a24564501c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/kk/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/kk/firefox-57.0.4.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "19fb1b47c1512b7657a2b2e5381488cd3856518f41eb87429000be1a90e4463d30d2dd813e752d088ff366551a90a458dbb55e44f552dcfcdb37dec502755437"; + sha512 = "221497e9d38f2068f38ab37efd8818cfcb3f6281ada16436d7ed22be0c02806a0188ba5be52220ee632e575989e76fbf57263182281bf0bf736f203f6a048bd3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/km/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/km/firefox-57.0.4.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "f104e24c2499832e4e5393973aa4b1b2a8757b18ba1861cf3e105994e5865e236c92ab1f1f66e94896daf65660a0d1fc11b126e64b5ed7ca8d47ff307f6e820c"; + sha512 = "cce416868cfc51aaa334bc1fa5d7102177024bec64d98cc1034fd1741290876d4ab2244bb49befaaf7e198a4401e43b3010894226fbdf838aa3b8b8282577ff1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/kn/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/kn/firefox-57.0.4.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "66e159c7f6d8fccf316d9e06a9fbe43b9d37c54dac91a45605d5f43de943b1ad37c5a67fdab405d147346184d9360c90e7f2fbcabef2dc4152f384ee17a1e040"; + sha512 = "6f1039c079af325b6190e1a0396192270adc3aba374e7cfe2cb2deb39b86fe07d605c9a3d3b063c91abb8ec6348c324c419c212bcb79735ce8ccdb7ce4608fbd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/ko/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/ko/firefox-57.0.4.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "f609ccc5b9ef40a1fb5190440acc7ae5bb040944c535a86ba4e218cdafa587cbd4e7f34b8cb27815698af33a5cd0c59c17f71e911735e41c03c66a7663ff8872"; + sha512 = "425b023e7eecb9f550fdf96c544faf21aadd04388a4b57fc28cf9e43f82d58dd957983046399592b21099039bb5976d691512a93f4c1a94bc384126b8667e19f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/lij/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/lij/firefox-57.0.4.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "fdfdedddf2c05b6be1e1e36cb707ec1c0f93b1c989b540b025962bc09f777533b276c6cdce1ab60df68899f4b9c36da03bc2ab08cc8857f0dc5c8ec02da5ac14"; + sha512 = "2410a21d6158314076474318c2be450cb3b3397ffc5a9e9e8391218b16116371e2816c6fb1684b3fc3589a7a9834874bec01a2af39331dd592fe9fe54a3f90f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/lt/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/lt/firefox-57.0.4.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "7f7d3d627db0180c9aaf12795fcc52e1839c58545390cbc3bf656fc71a8eafaad158af833b74879cf37ee762e838369756c9b062697162fb3d03d2597847db94"; + sha512 = "78ec1d96aeee8f610c2637be20284fe85913cd885a46ecd3965ee0a8f62770307200e33505bbe67e192c38769d4614682536394186ad488b51593a7f6c7151f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/lv/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/lv/firefox-57.0.4.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "c996b2c766dcf866fc851ce8ff548ef5103af6fa6925c480fb91be5886abe5330f298bb8c5590918252b2fa0aad4f9666293e3f59ded03b17c6b0e0d7c374aeb"; + sha512 = "9a257cc93498e256c9b0a12ad8b8922cf749fdda789197285f0d1910eb50b3d601da46806dd50a4510ea3b3fb8e8f4e494ef87d1e5db2208993a9e3ed59e57e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/mai/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/mai/firefox-57.0.4.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "89bcc8b7b9fcb4318e0a5e80a9fdcc5aefe5ba42deb0d62bde813ee95ef5f32da1939e4816b7b92d47ad343e9ef89e7e73803394953df6cf9ca22b15af63ffc4"; + sha512 = "bfd02ab5efb92205dc649afb65263b15ff46e7fd0d32c560ec3977ea18d420c89782fae63596571155ae7a77a59a5c2e9d25a41d18b845e502784bfa264638a7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/mk/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/mk/firefox-57.0.4.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "c89c0c7ba6ecc1bdd2a36de4536fa32c1fa098faea7aa3aa44ba7d533a773d41b7d38d7d6ea749298e20a36cc26b0fc55a49028f50b39472e6e624a0d664cb54"; + sha512 = "29d5b2edae82aeea218625ed9175455bd3a3928886035e55f60b6d5fb717d632769ed57023b4e6d944d22e03c5169eb2887c09ee4c682a6882a5bf298ee0af23"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/ml/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/ml/firefox-57.0.4.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "a6fb93a79f54b58a2409f70a5ad08478a2b8f561876b29c07750ce84103186787fd842b5a850f91adb881dc9b1203ee5f1481af5bf891c09bc6f7026ed21dbd0"; + sha512 = "f247d859982459d3438310fd9d3c86ad1cb7448238a71dd81f0c8712b31da1fe27adf1821e7e91d52e68212d70826d11bd3728ad3642a206574cd278df734b05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/mr/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/mr/firefox-57.0.4.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "656ccbd9b8997e27a9cc35fc10d70b946e6e4a18c622c1b28fdbc16f07ba2f3b617a4b1e0513cb26a763f412deb1551754abb241cd3e186e3da3ecbf90d2f17f"; + sha512 = "63654388432e076ae5d28cffb969213cf875894b94354f652d40891d63dd0a25e6175c3b51417ba5b760a85584bce85457d742829603dee9084c4c21469aa02e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/ms/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/ms/firefox-57.0.4.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "ac06ccbfdd34fa1ef9f106d0127f0095d581bde5a07c3d85af08c9093c22919e1accb8d98b754392598d5a7c48d6d9b81222ffc228b7e93fe3bdfff1d8ab34de"; + sha512 = "bbaeecbb9d2f6d7a881f219120d9f3769abd5713a8d38a1cffac2dc3dcd7849b49098df20dcd84812bf4f3a55e70ca1199cc15e67ab248f4c5ab9d2ea91cfcc2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/my/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/my/firefox-57.0.4.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "651c57dfb2b11cef2226d28d372c58755e0a99d992537ea3d32250a478cf81b3048dbb916708d20482ac29c8303d9cb7e3756849974ea46f7dd2dd36824dd9bc"; + sha512 = "882e00804181821783617db75170650d5d8f36db1d32fa183a7d1ffbf04dbd7a7b2c9405520bc09973af800f8d5aa9859ead7f298fb9a18c2c0ffb0f18ab3542"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/nb-NO/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/nb-NO/firefox-57.0.4.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "ca1e488d2847bfb945e17d9bafad01d696b6dab2adb7e53c286c18041a3022a38f23b916a95f1645c8b8677964f0a0654a6c87c63f0fe8a3a120de595c862087"; + sha512 = "5203d4a39f9a3ea14d262ca13d2e940d8381337cbb1e9d92773d3ae086d9853bb3b5e9d9bee550655b15ac2cd6f0fbb3d6ee52a836e94cf6b133f6924d6eee83"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/nl/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/nl/firefox-57.0.4.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "3b41a4bd3177f56cfcb7fec27f8671984e8375673cd48e97a1a0c3d00c8ff2c2a591521b6fea6f5b1ac82e3e68da94b69dc835bf21348584a8ca7c97f9fae5c7"; + sha512 = "4ec42e236d0fd252300d2785f865e9d1991ba5230a5621798c74bd2802220ddaeacdb43ae44fdd365dee79e7e4b97cb50597713acc603c72c630aa0f409cc5c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/nn-NO/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/nn-NO/firefox-57.0.4.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "87ee51682fd0de072f24da52700a69e168540b566cb8d4aeddf243f83178b743f4841ab00cccebb12cc329a9be5d964e2e95df273aa53035125b3102162c0d0c"; + sha512 = "4a50223708c6a45869981bebdeb8b5192b3541eb54e57e29e60671d436e12ce688943936761a9033b03d069a3c09ee1cd5a2265c0173c30f581710a35f559e89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/or/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/or/firefox-57.0.4.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "421b7268ec03f0dfc64c85b7d4cf21b56809d32135261914824939a08783991329b3bcc11064df88bce4143cba7216c7bbb29ad552b9f6648007b63bc6275f6a"; + sha512 = "6439073c29b4d930a0b2365824bfdda5e1ae3ceadde8f1949c4eba55e9aee9f15a22ec7293e1c8dd7a5f0ec63914f8054d688dd3fafbbd70e6e9473821a482f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/pa-IN/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/pa-IN/firefox-57.0.4.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "28a1e054f493f0d9bf39283b5f5001b6479442b3cc00904f197fb76810cff9835dc80e78136947471a8efe40ec29233653180c418c1d1d24625ca5d22c642930"; + sha512 = "ee2ba2085c389d70312390926f523e9e39d030d5b0b261088fe9b0dcd752fc1560b80817844d60835a38ddc49df315aa9575cd5091ce346a97e5634f810ff4e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/pl/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/pl/firefox-57.0.4.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "757d79018c843a9740f44a0c1b034a669af98782dff3ce31f2ea57a09d74912c55984334f7ffa5a94637726561627f09b3477fee8f0b48697df29c000cb4f13f"; + sha512 = "b2c4b4ac6b2b70834787efab3bf6670ba4b9e378a3ea7a206877778a32a7acc51efc32376d8f358adf9f7756e0c784e436003b8f16366741c6c7f346344352c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/pt-BR/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/pt-BR/firefox-57.0.4.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "f145ebdb0a161b71c6c7515e39b54b3125c76625cee8a3e59b2a069ae3d5600b62eb4388d96a2527e40d453c05e3209066379639a49991e6345068504ff96807"; + sha512 = "3acee98821d5f24f8ead9f27233fa22372e2b5d36bad52616b5a59705992f816ef6b4cec3e2add96a76f3e50fbffca762fc88445b5fba12f058ba06fb3c7ba6b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/pt-PT/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/pt-PT/firefox-57.0.4.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "97a86780284eaf856ca69ccfee1a14f00ea9b92aad96f2172ddf6d3c26116287deb03971f7afa31b73def8257866586ad03d7d962fe1d22b0492f252e9c45a73"; + sha512 = "16ba9337bf8de3061d2d7fc9b609b02a61e7e33e5bacf5dc31f2b76bb281f8b298534f68b8bce4d5adfe87b0a18b660f71bf81bf556625b35a118630f2ef0d23"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/rm/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/rm/firefox-57.0.4.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "f06a3fe73e45d9e226572a6987a978623fd0c77a3da81819f22bf9d4d754dee3c12326287e1a2d12e87261f582f57d55d4b72143bb72b42ce24c0c035659c702"; + sha512 = "433b965bb97d00e81071d1732941021166088b55bada961f8dfb1bb1c8831f0df7f2b89879e52f992c781b33ed68e2fb6058c9ae71fc6827459ea3a854ff7af6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/ro/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/ro/firefox-57.0.4.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "f3a3d226f2666e11bf1e5dcfdd952cbbb9b087409732f219764a88de95d88789dc78cfefa6ddfacaaa005a2bf9215c9b33362d617789d4bf803927e4981ccd40"; + sha512 = "749c7351f99abe43f073eaf32fec454ff27e725e28eb6f2cb094570d1bde4fd772cca4f05ad3ca83803542c3d85dd2fe60c274c92a8339ab1b619e7fdfda7675"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/ru/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/ru/firefox-57.0.4.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "737d4f3d446a88dda0b2302ac775832d7127e3344b7a1392dbbb714619833f146b1696007cc079fab30f1c9227c0eeb0fc73d5d3ebad51543bd6bf7fa9b9bdab"; + sha512 = "430c7afe325707be3618d717bff3d9e5b39edf82b786d0060fe6f6df18d8c9145848f4a1e1daf61b4da83b548dc95d4e5766ec4c882a2cd016e934d7c179791e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/si/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/si/firefox-57.0.4.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "d01009524ccb39bf9ef751d80de5d9c52d5abb4a5d7c8e69875debdd9c06b9d699132a7a9883c65175eff1c78ff22a2e5bec4890d6335b75bc5bcc7f9dcf38bd"; + sha512 = "452c3fcc5466e49c6e56192476d0957aeb60328ac2d5b9284204f50b07dee7a4835f287cc86a52476160da38f68212ad2508aa4599b8c2824190017fe3567764"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/sk/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/sk/firefox-57.0.4.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "6d51939fac75d1cbc9d9ad11409e5a9cc75ad430cbf68253a31b97a932d27e235a900993d83875359d2a0d7030f3cc4f6a91ed37d528157dac328c7ec1017a96"; + sha512 = "cb67db6707e32c44eba532323ea16c55146a53621ed1c37a50f963ac3b4e66040a028defc175a16a0d4c0986fe67c966c56b5ee19db042e1aa93c92517e42761"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/sl/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/sl/firefox-57.0.4.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "f1661fe168d09cafaec34bc8d1367b97d5564eff3166e7a8212b2c2d9f9e52ab62f5f8148159f6446d91da3a20c8e1bbebea837cf518cd121fda529d86eb8561"; + sha512 = "f0269fbb62113370d23ef2ac9e26e602ec6457991e4b98335ddbb2df1e632604bccee27420ec4ff7910f936ac7518f7320ddc875c0bb3b95634ffed3cae5121a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/son/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/son/firefox-57.0.4.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "4ee61282564908f2d822a2ff34a0a086fbd954854080851e57690d39ec8479e4a809818141a78a89e705e565f868eff328f32ee687e0ffb1faa93c2aa67d716a"; + sha512 = "1b5c3c0d2cb42eb985d6c05ea6454b5880c2cf33a6c46d7993ea8793027a9d1414373a14cd756f2e991d2f744ff87972cf7c050390dd4dd7a497e5ead3ef29c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/sq/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/sq/firefox-57.0.4.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "429969333bfff2cb9c43132f1221d373dda9391c7cc0b669f490ca0c75afc889113dee7e369c395f722ac072ce46b692d206ba5b37215a02f5d4ef2c79e1eb58"; + sha512 = "646bccefc4e52e823d099521b75d6796905d1ae1241ca2f0066996ca4e3a70fae901c8f890b821694699f101dfbcfcfea1cb7c7cb6de048bd896a62ea20e1348"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/sr/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/sr/firefox-57.0.4.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "b5a97775f6d7c8c434fcf3c50f80f09dfcef3f327c6728d0eb74189ca53d853beb029de22fa02d0894de9cc660161516b525837b0ee3ba3e10f273ee60b69e87"; + sha512 = "15ae853a20c97c380f3f6280d370a821461c462b2af5496416c81fcb1c47a0cbd0bcb80eaa0f017dabcf630f42a886dd72e6d5738305b599f24c5320180650e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/sv-SE/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/sv-SE/firefox-57.0.4.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "20883637d383f87b9aa789b2d41de462990b5f4531a8cb205fc1350c0c2e7b473039ed176d3ba84d695f05ea8717eabee1d309481d210b1a01eb37943f3ee085"; + sha512 = "2dc41cfc4cacebdaee4ebda94064bf9e2cf7e66a95b57e66936b69c7420302d0c3100c5101646b91438493016521b45fa378913b463fc55abc7681a34e24c4d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/ta/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/ta/firefox-57.0.4.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "e5c084ac35f92d1bad2cd9a69d35904e313b5e36e9427d235c41ec98e1cfe05ff2a00b554b2fd0b202fba0f641b1437afad3c0cdedf12715ece2f6bae6cf2cee"; + sha512 = "9f1fb4fef04e8a5944bed3293b190845e668431bf6fe214166ec3bd2dd7dbe328ab8ff904627788b80a0c1d663f37662c47a07c5f8a3818a8d2a509a4648b72c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/te/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/te/firefox-57.0.4.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "38ce280f6b2f24edd6b5f8d8a4ce790b4462edc01f3189deb9a1b59ee65a4f2627ad040d94f79dea7f73d92c2f747adb4ee55f8946c41e104b3a2a2a3cf580e9"; + sha512 = "a874ea926cf495a26fd1fd621686f0a123e3cbd67e51699c34e4e5874c30c98f6e36739f2b214d6abbc483bdc0fa202a1d5153078fe69fe9d20b4a3a517dcd91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/th/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/th/firefox-57.0.4.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "502037d125ec37094254017853de4efd96a22d2993dac438fda625d04acef44ca0482913f654a742f12d97567e019d75f4a3533b55396b42350b50f7d1c21874"; + sha512 = "dca7e779ca59b49f51198860541a6e0034ab132de0781ae76cbb0688ed0b9d4277ba6200d22020720abf0bab25326783eda0560f1c2fa0b912a50cb9afbf5ce5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/tr/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/tr/firefox-57.0.4.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "f8017379c524949fd5a72c3be969ed7ce2fe0ba545e4f51c677bc270592cddfcb32ccd92c810e274021d354fa2f0a27d3f89fdb762961797bf03e8686cf59cc6"; + sha512 = "459051cee1bd3df7d9f2606006edcc134d701e9bae614b2baba6538b2fb738da5e671b7b79e65ee6996e5a35df45d285d9e354b635b12d860c926e0a167bf20e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/uk/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/uk/firefox-57.0.4.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "0c3c25769d58dd438e3cd363a43b09fee159c271d996debbfa34bca7538853c72d60eded3e913ad400733e9e0e761337064f5917b79257e0cd081301e9eac386"; + sha512 = "f3354ce8c703a3d204ebb1370aa561be7fd1fabcc7361a8f270156ca62863c04f74ef2acd25f56adb5c50a19f0256f1956a2cb38c25402ba046cc59b1096d35c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/ur/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/ur/firefox-57.0.4.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "3d8f09d6d8b098d88514cb0fff725a1bcaa9b84b786d68bdc502cdea8ab7b0e94b894e3cf28c9808c60cc201e5cf8eb1403e72ef22d22efc6ea91b1a6cc2bece"; + sha512 = "42f0d747bd8c5b3fe53a436472ccbd223ab9a23782065af2d4784e5ed075caf95cc0c4eb060fa1a2b11ade6dc12b99dc4ab497eba1339e2b8ddd99dbb5d286f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/uz/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/uz/firefox-57.0.4.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "cb7bab29b6f84b3bd3f7cfb162027f3801eed54291c6f3f2b7d56078e6729485478a0b77b0ab523aa2a74d8da4a69c2cafb115e9ce516ae79671ced4b88c2fcd"; + sha512 = "476a632365c53ce0c72503bfb7dfe9166c6a4cc389dc7b174823b9dff1717c9ffa91f95eb975ecbe13135d39b90c3f18d96a5a08501eaf32ceafba0c2203b990"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/vi/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/vi/firefox-57.0.4.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "774a7556cb81e6650758867612a1bd80b623a72ca42fca4e01060ab7251cc79feadc28921618cf5e2338d4b4b9ec4459f950685ebee67650baff54d23b284fa8"; + sha512 = "8f8146925562109cc1e21a6146203b16306931f03fd1451f679f3d345e589626669f35d5028b4189d175cec3b7c652a3d863cebbb521b72d9a04dd77e65a2c35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/xh/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/xh/firefox-57.0.4.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "87c114b73ffe949ea78eff0279c522406f95cab80bbde6e65435704e5c94b30f99dcf41be311b29491440de55fbd1af50d6bb8744e8f84cd0ed593c74153e2e6"; + sha512 = "b382942e20e4188b4ade8417d5e1d036e81dba87ad0e5250c0fd3e43fcac5134b11f02e4220ecafd5b1fcf2a7fd12d44efb595251fe8e9a9b48a93400f264632"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/zh-CN/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/zh-CN/firefox-57.0.4.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "dd12c41346fb17efa534505d3af6a114c8fc5efa047de05d1fce97a1afdedd8e6f27906fd922e1685eabbbd773baf4f4d3bdacabb154d95dbb794129d4c45adf"; + sha512 = "9fabab7faff2a166a001c91d65953c6dc80150ab6548c72bc180dcb87aba485b2d06efebf5518f43b740909616b1ac04de57e17bd60fc3e7843e4c7e54b63259"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/zh-TW/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/zh-TW/firefox-57.0.4.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "bc6c7b9bbd211d31c904c815b6c716441bd330d3f2490b333610f9208f95afe083e5b7e75438167d3e28e7a22a8c2c2f4a1b6b0143980b9d79e5cec0f0f4e9b3"; + sha512 = "a334f4904ff329ddea28cf1eb4416d0c665a8099b20673d40792f2bb653fa09f60b6efc09b6d22c25f8bbafc0aa1e1aed6615f1377da37f6f843adade51d881b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/ach/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/ach/firefox-57.0.4.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "8756fc8508f62a34a6609000e7a80ea094d44b160091c4ec8f967cd48699ae6673b5fb6518251f9153faebd6b707ab9e492398e3ac973f5921f3ddde05425f00"; + sha512 = "1bf24191ae24fb8bd553c97d2ce2bd9599f84b2b6d57162a5619821c3312e7671aa04fefece26aeb0786c48d5fb934b79adab513f3ab382ec1e71f44d7a3835e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/af/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/af/firefox-57.0.4.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "a47dcdca5a84d842111b45760dc139575652ef8b37ea0ef1ab7abb2f1602f11c78aa00a5c3b844fe1226c60a73ff96c2c873353c63b5841496672fabc7d3f81a"; + sha512 = "6fa02d454c375af8661826b23c0220d9dc402331c8739a8b09e2e4583dbc0d9d6e742f65509f69bdad2882265c51a956892a04b8d75f3885b722b0688eb87ab8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/an/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/an/firefox-57.0.4.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "2b1127ecb63f4e10be8dcfa9bde47a8071f3182d73b3f0f0a3b9661977cfccca21707f8eb783e8dc5211ee6e8d4f1b748547f58723e3e7299f1d7792f56c5548"; + sha512 = "c75a7318937244cd8f227f05b8cd8b13c948312fd692040125fea3bf3b8100e7c0912e0f4edd67ac7c9425e4a333ad091a8ddcd29acb9f045d4a0459f9d35342"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/ar/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/ar/firefox-57.0.4.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "d16d3397e025523fa0aec5c0b4856ff2afd0624fcba31c8e26f917c2609b359afe1d1929ad93b3a795c0803270652d6192cc2cd77518f6c7ab8c0d92c8e37ae3"; + sha512 = "baa36a5936edea572d6ffad24c968538baf5ec888be09c8ee8179993f0088f661fc9f275edf2b848fc17beb3799b50fd8ca5a5a76bb4d52360b9c1a2ad38b76d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/as/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/as/firefox-57.0.4.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "b5d740ce732c4265f198095cd8d6020af6d1c69f717e1e253d0ec6ddf997d0c84a109d1dadd2aac7e4bc501a5853d46a0d583133986e8d78c20e8f28a232bb13"; + sha512 = "8094dff31f7ac1de02f5e8af06bf64d8fda669c68556faba2f30de63f3954b3aa18ee130c76c6acea8e59fcd532cffac0ed822d3bbdce737ea4e01e9f2abc7b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/ast/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/ast/firefox-57.0.4.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "b43a307983ecd261b789d9335c65497c80ce65ba3fd5e594c326cb30a526eb2819777cf5f2f4bec0c481c850434b1ba376ae381f8d78f9a3ca469fa923b27cfb"; + sha512 = "0a5953952051dbf0aeb872593eb6efedc557d8e518393a4672d2fed5a327f2c56720c2c50f31ea64b0799722b30202c3df4c46bf4c8dd227333c42a9fcd2fbaf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/az/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/az/firefox-57.0.4.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "4a8102dcab4619d1b119afbcc6a3a35b421b570b9e387aeac730a2cb071b9eb123054a0daab6f32d238023311ea4436867b6d506091e271e59ae95f677687879"; + sha512 = "0eaa6a6d139868933b345b8ca62df9cd378c68053cca98d40f2cd83daf46bd9ac0dce4e91900eb447d1ab0ec8f76de293a65bd99913b560bd2f5b6794c565018"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/be/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/be/firefox-57.0.4.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "57747a6ce33486d8cc73c14124db8e3ca04d9f5598e7ab748bb57ad625052872423baef1b2d14c830476a6e2f49ef8c9c78b2d176a1b2ccaf4043007c76a422f"; + sha512 = "b76736401d8f20d9638e9808b7acb41f46a51f29eeac9eb7d7850a8b3c32974982e946f679c98f8e71b548e87589edf5c7127a20f7108e4e42deb0e0ed71fc1f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/bg/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/bg/firefox-57.0.4.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "f600f82587e327477cf1f35317516026d5fecaeccf45cbe8125ec2862789faa35b2450a29400507b57c92682248aacbae8df343b3f4916d58ecc1506fd3358f6"; + sha512 = "7a47b07dd0791f1cbab7f02645e1b97173630ebc44fb81b2308ceb539d92f0197e8a9aa24f640ddba6fa888fb71a979837d6bd19d0315cc8c8eb2a8cbf99af15"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/bn-BD/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/bn-BD/firefox-57.0.4.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "1288ec7872408a84760015d23cd249e2407ece44ae0adcc0c999db57e1412e355237bb4432fbf9fc4f1a7f15f798612069c9f0fdb24072da9d5c098c8b137af5"; + sha512 = "15ece8585166d99b9d52b1de03a909d1c38cceccae5547dc13267da223026f4be4fcbc2cb42a7c225a4a74147b014ad19173635fe4c3249f4180169b4a503bfc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/bn-IN/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/bn-IN/firefox-57.0.4.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "59d07361e4196270e8907cec0dd6e9368c51c374c71d6266d198cc76fd9e3ecc959b30384ff9430773f1d387aea63174378c0c9b0df750a359713b79cdf4509d"; + sha512 = "72df101c9d0c602542e65da9235dc63d17c220ff56d2d1008c285fc6c10e090bf343ef968e60a36664d0dec72d7bccfe016af542b014ab116c0f243920aae93d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/br/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/br/firefox-57.0.4.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "987369a0aec78602941df46cf3e15df5e3bb822e35e74dbf199e4cdf6010c2133efae9c5bc60fc3922a86a82f41243d8792bbde1a220e492f9b1d61f57cc4023"; + sha512 = "d0830fa2a0e4159d46c24e048767ac5c032910c6e73858eabff4a1ca0006189b3a4978c3e4822242883e6fb3abe639122ed76afeda5d9d2d5391806ea07f6796"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/bs/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/bs/firefox-57.0.4.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "d93a3f274dda1a8b30b902f0925211b9c4490014f0ddf9ffb33c6c77eedb0df1a0cdc4e0448311b23264ea07c7e32be954637b62c1e6b3f6e1f249ca0ed0d9f2"; + sha512 = "cf93ea42460de4e9c13392eb1bbe4c6053c049a18cfd7038d99c658cf076d9989648abbcc006e345fdb2fc66f56ff8abd044b527ca0ae29accd2b0f52dfcc2a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/ca/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/ca/firefox-57.0.4.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "a39ba910f7a9e97d0f51db2f1eb77f1c4111552cd70e619d564c241d28a9ea5b425f80123b0827f02c06c688a8f68da9e87253a9d92cfc0d31debcbfc227cc0d"; + sha512 = "3fbbfc5973384a0a6d65e02d5b82a6b5591ea8d610fec2ece24aa423550eebac1b25fd7d0080bae4300f64ae1955fc6dc881816f10edf33b07e0cb308260a4cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/cak/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/cak/firefox-57.0.4.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "845210b43958d4cdfe98f4f079b42c093e4e01fe6302fbf6d6cfcf32f156f3ac72d69dcaf88f1b4db50a509c7c9bbcc649d9a44e9e32ee8f9285844c1d354c88"; + sha512 = "0cf301895b2dab45cf487e41ba093e547bb4d42b997a9c7a90da2fbfcdb044e654cfc23e4bfb6de7065ecdb8e4923434f98e8b58313cd9ee7cf64dd5435951a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/cs/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/cs/firefox-57.0.4.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "4f75b07055ecf79a0ea5e9cdd531b17419fc56da891cd5ebcd1c70e544c311696f300066b7f1a670caad80856db05ab7463ab3c7f714e37119dd39cf0402e7ea"; + sha512 = "20011fd4567fb3112a75a07ae181ab7d3a85702b9583efeb007dfe7a3009c34f8632db631710105dd68ca579b44a83f53d84bd4768f0030ed106bbe12eda8f16"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/cy/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/cy/firefox-57.0.4.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "e03f8434b9e062e1854e51d10628a6c8b070fe54b9c437a971caf560cf2d076173c3ba70a06b79e3a2d8d90dddf95af11501001a29aa30e3df805450c533143e"; + sha512 = "1f9b31e5e36a581ba51737e5e1f85a2d6ce804de854585ad2919f7070305567883724fad9368529ebd98d3f428eeb36c555d2f7ccefcfedb877227969688f896"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/da/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/da/firefox-57.0.4.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "77656ac653e3aa31c6fa1d682468b22c2262d1c81c9413c3f498bccebceb21fd15f95f9230794eb102516b1a7f2def73f2296e8b86255df52d3389974a3f630d"; + sha512 = "a919e582953660fff4f438d58c8814cd5437f13fc42af9ddb383db163485754fac667b4e830e68cc827d7646436760bd6760ac4b2d7fca2a951c1d5f7d43be59"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/de/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/de/firefox-57.0.4.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "73b7ec4d7452ce1ec2501df01185c46678c41507adc5a94fec9b96d2f83775066826744404e6524a549146461ea5377d3868694164ed8c8eef4a2b846513ef19"; + sha512 = "c5f844f17a3201a7a62e1e9c9dab3ede7042ca33bc8d388d9677858ab289d1f0a823594701e7eedcf1f9ee015c2ff16cdb0d9bc0e6861701f065827c69204f90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/dsb/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/dsb/firefox-57.0.4.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "32ebc64e788801b01e4b9d9de6edc2f419a94c737ddc51258a6cc9a910603dde7869a051e05d771b4f0def34b72ea71763b66b38a0f4a71276428d6bd1d05992"; + sha512 = "fda1a2b51a3ae8d0d28629141575fe14263baef7d68f3bafed89a744a493382faba2bc7d263648d8ed809eca274dbaf0e1669b534a23281944135195593f0616"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/el/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/el/firefox-57.0.4.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "a9035ad5de2506f44e48b48a4a7eef316cfb8b90c9f8f255f34fbcdcb785a390365f87972379b666f857574c41f841019709ff7721cec5f7173034a35f66cbfb"; + sha512 = "0c48e342f0ec141f4a7512c0f1cb4826b9dfe77cf315d22365e4f3eee090f067a35215798ace57eaa38a80a5b62dde257992eed2084737dcd85b1d4d3f46740c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/en-GB/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/en-GB/firefox-57.0.4.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "7cce5795c2d91e8754504358672db85b3f20e1cf86659b5e4f5b2197728333c225f6a05bf675dcf9e390c727fe07b5f42e51bca096188777dcc937ecca7686b7"; + sha512 = "d9d24a97b0257bcd1a1b468e6f986ff4fe8d26ced92e3878123d8667957ab187d87bb01e8d389da6fbffde66e1714fe81a9e926a9f3f5c52ea5d38a8eb961d00"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/en-US/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/en-US/firefox-57.0.4.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "1399c978a800ccbe2b2e57e3acd65722ad423d0188073ff24d2d386479670b1616eca5cc3111dfc6c9ce4f9048112f610d6d00c510934fe5ca8745a5eda26fea"; + sha512 = "b641a671d7390c505577fa956bc1452f58f6cc8418b3ccaf25eb8b5bb08799a3a2e1e7113525ad720f710d7022b18901c5234be1a1c372881e4908d2ae419743"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/en-ZA/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/en-ZA/firefox-57.0.4.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "8613b67a20cd19a29141890933ab9a2fbff03d8f8e2c94ef1c298ad19a711ef29630ca46a43a5c5842d8ecc9eabb45f1d37e6496f48451a6702a67520a2e42ff"; + sha512 = "605b7027a57c75e90d8e7004c50415ebdd2e2e111ac679d6bb87f1c55f0ca022aa4b77394a04ed94aa634d9b05359d9384e428f8f9dd000ddb2da755bb5d797a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/eo/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/eo/firefox-57.0.4.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "1654635d26f67d34fa710d732afaed7344244f83c891078a10e15b5f154422a339d60f84232c09effc1e9f8feb5bb97e84caae4c689d5017f97dfaa0c91a8543"; + sha512 = "d5e81e82ffccb2538d94be4752d8bde9e5e84eaf06c5c29a34e0e16b13cc8df62ae17c88a50cdd846dc2ddf35c76355db39f39d74d1d9aac19c962d823d2a5d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/es-AR/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/es-AR/firefox-57.0.4.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "cfc1a7eafcdc2809020228dbe13656b4f99ccc73e630f15610ece0f4afe6100dc09d09c7d7c7e84f408b471839197a901140e8b613bf7f7ad46789df62b8bacb"; + sha512 = "27ad3f34bdb4f94a08043c699f2c9ce2a5de2cd297e9dc2edf777b78656902dcde7aeebe17463e3f7125d58a2cb5ac7de671695d46852bf15225cf201541eaf3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/es-CL/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/es-CL/firefox-57.0.4.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "e99ee28e7815434982013749bfcc9db359cb33f9ee71fa82594cf3e31f059cd56c167cda2e8356ff5ea0eaaeb737d8baa2a235003147d397d3d5f78f01db3d4a"; + sha512 = "e65607bb7e1f08a2f0aea512e384d44b7d219939c82cb98cdd8a3697b5d43e7fba7036d4529c102a2ddbdf660baac45e8f9358692293d0a5d0869f72c8ca677c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/es-ES/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/es-ES/firefox-57.0.4.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "536e87efce7e93c0461abba20230cc88ab838b5cb7f9b970f901b9186626c080fe92822b8a80c35235b55598e3ec617f4fb25e933347426bcad77ab208154a95"; + sha512 = "f486c0f40cd610540743546a188c434bf16c2482d88145841ec90974a819e7f82952cc6f9e8c8787665f28f47f1e8b7def418f0b08f9fbce73f9d1aabe62e91e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/es-MX/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/es-MX/firefox-57.0.4.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "9d0d41142fd2dbe89ddc6e7ac57617efce3f0f8c8631a708f0a0568f532518ebba36e6e7d6bcddd00fbc9d856adf785635702f7660c036a9e92fa30dbe7ba4ff"; + sha512 = "c4e45e86b5680cb9580948bf8db29c5f3a13d2b2c6a73753872ab2c77715ecb64f756522d4c1e50009d783cd4f589ae39e3bedf771ebb4b03ea6930506210a06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/et/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/et/firefox-57.0.4.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "e5d69d12669016c9466a48da3a67aedad13ee0290fe69225490ba9490a8cbee681a5cad1bce73fb9bcf4a1d72d140d24f892e4ea0e368cf83a74b2e1da9bab3b"; + sha512 = "181772128d6eb85141169208c283caa0f4658e3ef627b92f723694fa5f38be7fa8e4c6591901971cfbfb760cffd693a285589089436bb25e72ff95fad36c632d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/eu/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/eu/firefox-57.0.4.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "c916f3ed272661c34909deb58835323e55883acd6c941e52fdb398522d54f4fd91869140554954528a95e5e62d2576c2ff13691c5b2e99e4641902eb73e6fbe9"; + sha512 = "e582332c908c98b6eddefa04b223366442e61e231e9039e237e5d15007113d7986a0759e8b927262370ae61b103e749f96160a2596a7b79d2e7321a5416fa0b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/fa/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/fa/firefox-57.0.4.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "a8b6c52f80fb4719469e5992cd0b837c9d06ee4109089cb508f931a2723df585990b915c7f95086bdc483c354a948c76799542b8474ce55df6927b3b617b298b"; + sha512 = "118684887c685acf3fd2a9f0ab1b63bee19c29e285e1817d013202a9fb722b17a3e774db3afa4056618172d4ce741aa78952bf806752d52fda4b651a633139d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/ff/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/ff/firefox-57.0.4.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "c640bd0852970fb9910aaa187903bfd767992222525e7ee0ce80f485f6665391a18a8a36d482e8366310a1f3b655fcf04206afb12aa77b4130fed8497a2137ef"; + sha512 = "d4917fd09f789ae2ec456b4cef807ba17fd1e2a80f1cf9dd635c18dcebf87c9c5ccaa5937df7846ec24de943c8c58ba4a0c9282ed586958bb3275234fc9bd27c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/fi/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/fi/firefox-57.0.4.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "d1d85a118e05e36adb41708ae30103aa2e3aecbeba26d6308fdf3f362829af84416b4753df95958e6a82b7c7e46526e41bde663ecf235768db8902e81c479b10"; + sha512 = "891c8a01940d9896dba75de258ba7da71b5e1b03697fcc04c5919b6570fa8b7164d9f8fba6f5a52614e637c5fe859f59da7fba34d4387c9763b82e7dd4e4ffd0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/fr/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/fr/firefox-57.0.4.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "c7ca1e93b0ed5a81c288158f5257739f87b99b244bca7f52c6a81e49ad2f120708dc304720e27b482c11480a38f367e0cbd19f94af637b142d51bf5b2c9efb30"; + sha512 = "cb6bf51bd4362b21416dc82a2c52cbecf0afb2aa88d6ab96affac7668d3ff0d7f81f345ce3440b04e0b4df0740505c204efa0d7eaf43af0b5c99294e0170a357"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/fy-NL/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/fy-NL/firefox-57.0.4.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "805dd607f6f08df62e9145cd68e25bd58bfd27d0aaa14d8ad8ea2eb3a0c884853767f99c53c0cbd346b5bf26ecf25f0c2f4ffd47b838cf7f2497dcfbd6a71486"; + sha512 = "17e3030507c7cd0dccb2b94bb36414ad9e4c8248b671f438dce27ec849c06a2a98343520bd457b9157813e11f9360a1e38cd9dc3dda49ee039ed2757168e5d26"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/ga-IE/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/ga-IE/firefox-57.0.4.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "c25645d57a5c238ee848203a8b76b6be734cef1b72049688d34d0e873ef41319a0f71b477e46ee693b82612a1a7b4350fcf6eae64b33827ef19fde5901144632"; + sha512 = "18bf7782acd20cb9972e419ddd62be4c9b0d18d2f545bf728f1729f2a63e9f69353cf47b8e2fdf8525829fafa3c87cecc6bc272e899a2df6dd1ae4cf11b5bed4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/gd/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/gd/firefox-57.0.4.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "ca4c81d0b8e886ec0909e74888d0f575df1b0e8b26ff0f948981fb7d8006aa08ae486722a19cdb575c80f6bd98f2f713a2643b6815c62dbd9d32eb5c22965cb1"; + sha512 = "27d56b6d98b4478821e1697398aa0b39ed51123eb72a18f06f03bcca53c7017b4c55fbd32af626a52a74b5c53c9efbd7a20bb265af1d43140189f6f5d03168d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/gl/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/gl/firefox-57.0.4.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "30a4c10653edcf897c0f93b363a5012f55a1603bebf98c3769eae5c41fdf359017a79cf84ab98ad3fb3e4b2b3291c1a16d7f0608bc1072c32bcc3c470f519697"; + sha512 = "5a7c2e1faee64d224c8dcd822d0e3f0b064f4aa5617944aa048d32335fb2a45caefe7f6971058368493c483a5ac107808794289c68530d97f85d0e2438285a4c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/gn/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/gn/firefox-57.0.4.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "1fe4444e9d7431ba877b04c62f91cfb0838b92bb9d9be758b460ed2d25ab6bc840d6cb164508298c12cf340562d23760cf685d8b279a7060028ab84b70ab45e3"; + sha512 = "5c05eb1d50d0de7f7e25bc0821767ec916ff17a3499ed4cbbe53cb7d833fd43edaf3ec1c1c2db02b76523bad8a78043d7ac25be4d1a4076da942b09097949dd9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/gu-IN/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/gu-IN/firefox-57.0.4.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "2df2a7a88c5871116621a5847f193881228d89be2b7c6f9741ae689ee28303b2bbcb5a6c8cb0b7e4a187fe12959b475063b706a9af0fdcbc4ec168ffc0ce3725"; + sha512 = "43eaf8f5ff8f921ead14cc2a2a5d9a98ca674af49087407dff37afe4acd9c22a4d83e96750bb50e8e6fd4219beab08c8bf52831fe15b8320b5858d6c93c611f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/he/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/he/firefox-57.0.4.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "86b89434222c99d7485cd5df1e1597ecae5cca98704fcec4ef4467d89358e290d857fb18389af6f075d9c5369b62c0edf54c747b03eb73482d5c9a622cc870ae"; + sha512 = "9573f5d24af9f89abad0d46d99750b9380ce77c4c017143236178f3fbbfb2e43d1c1f1ae2223ae0d4c81b22688fc7da8c1fc2a19cb5619bdd42ca03ea7ef810e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/hi-IN/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/hi-IN/firefox-57.0.4.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "b0f992412f108226be8d632e860c74832a986a969fc27882f5a2ad1165923ad0fee1c40d9f2f58e0d2b676d3ba42d2fb83a58f4934787acd1a4ec032aadf793a"; + sha512 = "ac0d13b6d935f8b51379287f5ad5e434bec58eee0e29fdc786e43e7d7e270afea094b8af27c779e0f0c11e3f3582f84e2cac4e01fc69339aa569830d180fca6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/hr/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/hr/firefox-57.0.4.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "fcb6e3e3c35e80ce54cb9d1b7e28cb4e3119966e9fcae00123560837f62ada7fec5e2bc099daa9d75e5437405d4a41f89533ff425144a84c99e61e36ce88d579"; + sha512 = "3f17557b50fff4334a27885358cd1c91fcfbaab4394b5cb9a571c47a24bd45a2b807534c6645b58220b65285aef5014582ec6e1a04e57e54f7cdc5cbc4d0e1ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/hsb/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/hsb/firefox-57.0.4.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "7b201321e567455615fd0bd3cf04db132f78b8a196868897450c6b4f89c6c16ee2ec285457731589f74e715906c0a2492ab72563c35e3d9263d4d598c096b218"; + sha512 = "ea3cc8998fa736c27469efaa6aeef4263c1c23d62804721ef577d020295100bd99e6690336c29a0af7f274f8c0fd554d16ce39638b8c9de2132dc0fabe21b91e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/hu/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/hu/firefox-57.0.4.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "2ba67f65a06ae537b3d579b1a6c0b817bfc56148db4f51d44605dfcaf4267f8f06a2953342eedddff9913ac03bf43d7bdb05e674137ba68530a8f4ef2747f260"; + sha512 = "988721816865e6db32a4e874d7bcc67c0e7bfcf621bc9e8d6a8aa8732ac448930646891a53a6f66bdf64d625b1607ffcca4141ba8b011ec2b69803fb0eca32c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/hy-AM/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/hy-AM/firefox-57.0.4.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "66601e8af60c2d0d3e83fcfb1a4eb565101ef7db402154456876af725162487d1de74dc57765475c50e877574df2cf2a256bcd314f4cc6e95be6deade9a9fc5e"; + sha512 = "214105d839762ba56f8f30f9fd4e2b706ba2ab0ff4f76826661745505d2bf7b85481b17782182ee5250d82f0f233b9f3c7123669c2475d33bec40aa270cb83bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/id/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/id/firefox-57.0.4.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "61d3e8e598dc32c28c9f0396ef51d2f7ba919812d1e0eb8aa75aa5a25d3fdb39e398ad9ccb7fb0349d2b6fa6d184586a3228979a3ccd21344da5cc3d8bdac712"; + sha512 = "60af8126c39ee9b7bd9f9c06048677ce5e9ac1b4da28176c965064e6d937df3218d01c923fe6bda822ac9fcfd95904e4f01438b88e0659b7df6c5a4b7b475330"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/is/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/is/firefox-57.0.4.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "99738c5975e92e409d85e7a5861fac32ff9bde85758c9c19a8a630648746afd70f59e5f6c49744b56bc860964a994d3f127df11e79a697c2e163a2e95c0f9496"; + sha512 = "07230ab55805e4bc26c6aa427d43daef7d799115780d712db5b358a8d731296abb06baa8e21a200310922ac81e23a1e33584c1a25a76031c03a849e33aaabf0f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/it/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/it/firefox-57.0.4.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "c35609aa667d707893259b86b4a410cc258ae617b2736e75eb75aea4223634f0a44e0f32cac397320d60fd16cf0325641c1ea3ae9a75fbe64d382571c77aee5a"; + sha512 = "4e80d7f042dec9c9752a81f434520b4ea2605319fdbe26a4ffee8e01ff60163a9df9100f154d45690ea4a492953f09a9b602609b88a350250dd71b2f66029713"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/ja/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/ja/firefox-57.0.4.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "f53742b610ab338e0f7f2b76492979653f1243b8163076052ea450d66839c21fa860b2f9e9d412f9822f87050f4aae34158ddd0ee5a8220c4c7546ac28c066d5"; + sha512 = "a14fdbc6e2fb341d78878bbed3df456d3906a6f9721ed80764f8747faa82407ceb48a4a6e8b6c90c4164fcf231208b3f4f147d6465bc434496e991613c7cf250"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/ka/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/ka/firefox-57.0.4.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "020462ebf2e5a98822cd6fae5deed631afc112b7040b58542d4b1589af3ff0504affdf417e9d1568f74a12eee246c3b6498a0c2338575ab485c812182913e190"; + sha512 = "e411fd39ee928f4e66937f55589f7a7d77eb9ee64abb30d49622e18b20d2ed2eecc34a54bb32a40d28a83b43e822b526494227b7b1a8b3cef831dbe8d5573dcf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/kab/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/kab/firefox-57.0.4.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "a0e55697e83f2a9685669fc97656548bfafe88685df234cd61738e1338a76dceeea17f57eb0316c884c851d410a482731d01881525a6864ae2042a5503c1d6c0"; + sha512 = "b430ee1803556d791fdd19ffa21aa32d8245421c2e8a7dda7cda10d751cf9be125bc089de9149fe8b858db663397827b2e511a54a56053827c405b0fa2e17ad3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/kk/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/kk/firefox-57.0.4.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "a97362931d2979f1b3d8893688d6e1009dc05ce87a16eb63978b4bfbca5abd815a9691470c5f02c47b99c93a7bb1c71f298392cc45e5f00d2602f2e808eca3d5"; + sha512 = "24f142f4c9b85cefb404905317d1afcfb37868fa4061b5e4c659a3e172d86f2fd9d7c07672fc4a78283da27c534e2f0639d1c567350740d698aae6fa50846772"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/km/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/km/firefox-57.0.4.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "3c14ff4420c4a6c4ce8f4fe7979971ed252c1ead1bd50ec134a765403c1eba35c944fb5aa2cbbd6d8623107a7d2b319fd9739cc93373b23729fafebc83928445"; + sha512 = "226fa56eec9704baacf04e54a5f74ed4a6fb01eab2020badd61542f2059f47ddac605f69117d23635fe0562c02d86a088d695ee1a15071315ebe5e19100b965c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/kn/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/kn/firefox-57.0.4.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "2c06895f2fac1060b7794859f354ecc4ae8dd791d42d2639352226a6adb03725814d77101e232c6cc926966be3a6db0ff7eedb212f6612dae7adb61caba3c210"; + sha512 = "c0c5eb6887ab1e3fe7f8669ff1c09cb5cea4fdad9c8fa488412bb3aef33b7252526ce5069e1dc8a2186c0ab4aa48a6d223487ef62554f90a022287aaed31d09e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/ko/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/ko/firefox-57.0.4.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "0bd5f1e98d39447285503c73bfba2ec5839af9bfd1c8800f5023e5b26b77d0371366f9e5411ed273d0d560ce3943e606b58c020ce2ebb2f16054ffe6ba58e3a1"; + sha512 = "397063d49b248302df350e01bc87fbb691e63681371fd9b2180edd8cffa9d00ddaa68de320165e0414bdf89dba037ebf8decdc6801ae0f5134dfe81cbb3c7052"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/lij/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/lij/firefox-57.0.4.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "335b199471c7fdd43c4601a512eca015cf88c10dcb52850a6598b9970fe4300f3fcf59b78cf551af1469cfe085253e709a87341a3fcc669e3a7facb8ab6826f1"; + sha512 = "0c47e5568f5776829163ee5823c512d91e795478049ca0aa6239afc66c2ec0af940aaa32fb70473f41ddac3755c0dd32cd5b68207e94f095a033bf5accbe9675"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/lt/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/lt/firefox-57.0.4.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "b497abcdc0964fffdf05180064fd6df4d0a4187ace3070c3f6076c9c4db4a93cca48b14814ced2e94407885d294b3d6ec1c44dd92497912a390b1f97e8627576"; + sha512 = "3a18a2209fcc5adcfe4426b8acfafc7e6e781c01b7562d35cd02001f8469d93e1db4db400ba34844ad5296ac40a3540ebad5341457fcf00b7d33b9b672514a27"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/lv/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/lv/firefox-57.0.4.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "7877e07a97eeaa2e66b2be49a48eb5fbf2af64247230703f04fb80b960127e5cc39101ccdeb1ffe35b2e5ff01b64396c880dc145636f92661b47066e0cf3af0b"; + sha512 = "ec9938c819e98f3d1b7979b6e207cdf798af6e0f937f9ad7f23ceae9968272fb44c6d2d28c066b20d6aafcb7edddedb299fa32d0bba29f17e3c50db7bbbf6cc8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/mai/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/mai/firefox-57.0.4.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "24fbd2b86511aef229a16396cf954360a61f7377de53253d83e7fed81a22f5ae5196889337edfec488b48283d4fde8f9f8f072d1ee276a5b310973a2c1aaa837"; + sha512 = "ea5cce55b13cb8eaa652aef1cdc2883720397f872d63728c781805000835c41bbac1c2bef035700c72d1dff79ccb6a8d4980d6485f0774b3aa8c0424e94a3ce1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/mk/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/mk/firefox-57.0.4.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "2fc3df289505893490be4954309aadee8a6189488b1d99237f577bc61c8829d6a08f2cf18aed14518f2d40fa2744dc0061413811f7701438a4cf464b623f8b48"; + sha512 = "653d8d32d776fbc08126a25fa8a70b3826302e9cce01b8bb6f8abe958a79456df7cdfb8ae09a74b560594c29c515e50afc77bbc1ee260980028d1b1f10cfc1a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/ml/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/ml/firefox-57.0.4.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "3941b7516a0ad4d6308c9c7252a38ad26fd551b3bb09ccf973b71d8fbaaba3f420064b02b4ff30986f0cc54149d9df293aed0c05b31f8582bda07e52ee5c3418"; + sha512 = "e99a9acba626060fe8eea88a478879f3be751ba224ff1e1cfe28ae6c9eedc2d672329f67773f71edbb58d6c3e71be26f57b53504474c67dd65e7ffac79767fc9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/mr/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/mr/firefox-57.0.4.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "dc64a90547e7ddbc02715d774063d258da0873728691f2f39a5c6821fc918b41fb83277ee65ab88b6df657aaada87821dc2824fd3f13e2c317638c81bc0362a3"; + sha512 = "6f64740c424e77ce62270b80594915d3e2eb4cc2d3606791e6c9e3c8d3d8bd362ea4d46ed742b13aa427389150fe1a97af782ddd05190b0a5a84e8dfae04563f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/ms/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/ms/firefox-57.0.4.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "c4b10e0f4e200823b1c1a0d660811373c31b7e008df573d633499734a137c031799df162a06772eb087411912c955cb01f912b7849ed798ef40a65ce4298e77c"; + sha512 = "f3d2450ef0770ccac86b11e84a27c2e58d8a1c4133e874f9ae1cb7524ddb5f104d4bd42ca1fc37c20a8a3b297b386a1df0d2fb348616cbe9ef5d01c59b43ae3f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/my/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/my/firefox-57.0.4.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "e9e3dbb826645d272dc5432e921b8577037bfeaecefa92bb7cdaa3015b463e72475d9faa58f3a1bdb57393602843e186e132f9879f325b62bd6c6504c8d1d965"; + sha512 = "8398627bba83a1d0bb4929d1fd15c135bd35c8e8d0560ca804a49a0e36a083fe377652cdded198eef2b8ec1492cd1d7a33d6c660cf72081d090d40ea8b4cf7f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/nb-NO/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/nb-NO/firefox-57.0.4.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "d0f575f930d9943b8d926b03aaa919780c6218e4cc4279b319540f2807494a9af14e6fbda9e0673673c9abceb20d2152e499e879a906305af3d6d10c8f5dcf79"; + sha512 = "123552055f7838ea2215a379f97c82b5d2e4085dc8e2a9cfc12f0ef5f3550f7247c4f3e70c806baf7eb12e031ff8b857eee721366d480e959dc1acae1d9453cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/nl/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/nl/firefox-57.0.4.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "7ff62ae89ca5934e6efa6402ab73dcbbc4a968d49141760d36cf2b199ed081fb615cac7e0a90e67cafa372455ef2163407e5bbdb4910eb8038fdb138fe086c00"; + sha512 = "179c634792a96d8b3f5537273bff06d962cf5faf2ae7e299fa3e11aa4e5b08aba10759e17eaf656fb373c9a9a807590656f905b477c79a5f7da385b66f17a55a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/nn-NO/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/nn-NO/firefox-57.0.4.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "bedb7c2fde56acada9519ba0b82bca658fd8b169602c028473c84c421db169b807a9d13137c4be2ae3c6fe03887f619dd89f3d192e6f3f4e61411c2ae1873460"; + sha512 = "b71efed9fe95408710ef4a4e8d7040ddd2c3f9979567211c5ccb48dabc2eecc609f29c2bdae59ef96913d54f0c52ae432a2bec265cc5d7a9ed1b683cc83379a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/or/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/or/firefox-57.0.4.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "a43d11ed724709844b26ae50bc2ccd4c74368d3437eba883f56511094847985c2e6a10159da9d711ca2913bbccceda9ec2bea0631d601c88ef68e31f06016fe0"; + sha512 = "998b2d7a6c215a4634209d1f2e04f5e80858a4172276afe5f3440416212351093c1083e19c116dcf2480a09287749e55adb3d522f62ea4170bfa2610e3884e4b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/pa-IN/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/pa-IN/firefox-57.0.4.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "c66315bb44d02eede78d019c7c4f8384ba64b74e364c5849de034ac3c988dfac5664cb16d0ccadb06315f980bcf51f38d3eb8aada990d3bf69185e53dbf74f64"; + sha512 = "f15b76ba3fed7604b96315343e04b11823bcd9b1407c10678fb5a57193b37ca365bab3a41106f1113f2487ee5b81a14068a083243cb4a298aa53105c814b8b22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/pl/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/pl/firefox-57.0.4.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "6e8362e71b8ed437666c49215cd9bafee308073ce62022481948c6935ad51f4ab1558b7a1c5c19d0a69db79231879485e1a77b895fe61c040b19789ec2353077"; + sha512 = "cf10e29d8daee0ccca0a3260b97abc4c61f13716b209babed7dbac72809645a05f12ee0baa5ceb02a2b8cf283f27796697eb72bdaaeab5adb07cd89525da924c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/pt-BR/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/pt-BR/firefox-57.0.4.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "8ff7f3ff2d8d98ad374571ae4dc5b19bd19fb882a95965f6bde116a42fe09a94e2a6da65b6403a882aebb85b6c6da987a592dd4b80daa8cb09602f7fe124b467"; + sha512 = "0bcc63288bb18b5dcaf382857a65e408d802da8e703cbc376be828e512fe66ed6f12b5e3a46db8c5f883000dd0ce152ab387d25642878abc2660d4d3782c5a0e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/pt-PT/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/pt-PT/firefox-57.0.4.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "0c950dc7e68e163536abbabc7138425e126798fca19db2f3aecc4da90fd84846abb86fa6e830ccad4580131749d96f2d731fde13c608b57f4a14a57443447ae0"; + sha512 = "79969af79356540c274935741e00a0507ec2d7d7047bd03ab5420246daa0329b51320f0f2e92250e8e1c11491cd500a3112bcc7d4c61acebe079ffac8284e0ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/rm/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/rm/firefox-57.0.4.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "25f6187c98cad96f4c14872a0724979cb6051328dfff16bb9384dc59972e9bf41bb1e9bd7fffb58a0c0cad8dee4da817ddc86f6e40dea29758751fbcfe2e4abb"; + sha512 = "5ba523ff6ce9cf291b6d16c56eaa9688f8bab2fc43eb00d1c496cac9909187e781e0436a0afe47d8cd3808533a1f762e0e7dd417428ac7e5958487271b3e6d5f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/ro/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/ro/firefox-57.0.4.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "afabdbf4516aa1f9f6cc39025f867e507668609e9f2cb754a92ee00960d0d3628df3c931b25c63668e42f6647b733e6429b304405636477eece998ecf6078cb9"; + sha512 = "9575744e3f62b7803a93524e24baf9838488067df5dcdcbce2031fd735fa25223869f22de807d33217f8b541d2185a4a6dd62ada6bd37bf6386f1d6f6b776ff7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/ru/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/ru/firefox-57.0.4.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "6525efa101eab27af2f1e91576ac4ec4183d7f53fce1e08fbab683c9830634391f379606da588ec912f641898aa296ab6b252dc863e78f1410ae4a136440cae9"; + sha512 = "7529dc04a413c7ad5db86b199318bdf8bba0e8837b3f5e50840326301ebd84562d2a3cae2ae352e2625db85d652675bec20dad2de5db46ec520853789fc930f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/si/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/si/firefox-57.0.4.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "654e128ee1910a6f2e56c0216945981fafa39c1c12f18312ec1bb9616c83ff5ad64b1315497b6d313ebaf31f6c0a59ed7791836dc80ca1bbde2556665e9a6ca5"; + sha512 = "7ec9f3b071ca4b7436b81c81c847acc915d8cc6e4d147587cde63527ba5b3f7d177857af308c0d4dc4566e53b3e4cc2398b3dfd367cc4ceae6eb90582027dda4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/sk/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/sk/firefox-57.0.4.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "a6b27276e43fd74ef08087a3ee9e741fc492c3e04f04c37f496644393d0d49b3dd697beb04537ea5f2faf0ad41a0cf90cc6fbd06bc49d30340449b68c9d4812c"; + sha512 = "9fa5dc5cd172388bc61719e03fe7df5a2a6e56cd49ad3c7afd9622aca64ba25fbbe83f834431dc4c2a26b2873d80026769e7712c78dce550077cad4d84559dab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/sl/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/sl/firefox-57.0.4.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "e4e2eb23c4da496d8725902d82bb3fc8d96fec65bcca1bab839de1589378825203ba6d6ffdfbc1df6b82d8e3f49a3c2a271ce0cb659008b29cad4fa7c5fef8b6"; + sha512 = "3e142ce6878e9b01ee34e9a18152e4c869fdb9902a8f78810293d854e4196c8e0a43a8bfb7f7354dd27f2547792a48ac957bec96751aca050a3d65dc5e227f5b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/son/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/son/firefox-57.0.4.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "185dfe1f335d9d74de153c7083e739a48970b3abe970dab57ab5f50d813df0ddc4b5e592e394a2e7d61baab7032571f15ff9621a729c51a47b75a8ae7cd18f4d"; + sha512 = "b0bda73680d788b55526763306477504430b49b4ce465f091b5d3aa62f5e56618f8d6125cc1a68dc4b5403dbe28ae2c1dfa9e7d85e0bde9f06dc8735083d159d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/sq/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/sq/firefox-57.0.4.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "8772ad36a9e51fd413f0afbe4436f973ff6daeb6c062fb833b8387a6ca1960bc3b699aa730cd3e991aa39ce0d061e2b452c5d79ffd519fe05295cffb7cf4ba35"; + sha512 = "285d6f4b2f27c14642bd44c572776c49c80d4360a635da1e92161f665a6714b011bd0be2b37f3ec1b2c1726ea6627eb7a21879e2af72bb4c04560a1f701770a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/sr/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/sr/firefox-57.0.4.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "59c7ba1b9f0a1f45b2086fd6ed87a85c7bfc858a480c54972950fc4839109954d4e51e4dce864b3b23148b629e000e13d4ef49b718fbd5d8bb1d8cc7a738567a"; + sha512 = "14c451f7a3237e43bbd6f5fd9370224452a401f97732901c9796e40d313f4542d635984b5feaaba9d44be77e6e3e65a6c191d4081bc5d2d1b57bae12d432c414"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/sv-SE/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/sv-SE/firefox-57.0.4.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "3f4aac40aae1b2efd92a4c1f1f65ff75a7199b955edeab5eb4ffc58d8c899ab05d160e9f0468be6a5cbd5da67110b4fd703214a5ccd75392add3f833f09df670"; + sha512 = "70eb6083426d6e382934e7734718d6eaa4884a9ac24e36b1fd87a9c9405dce16353e8f6058912adc4fac0cb4ddecf7e2fdc8428e088b44d56508bc47f6c55abc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/ta/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/ta/firefox-57.0.4.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "698dc4daeda232bf73cc876c027b0398b6c26c7a65b5b5c403f275e275fe3399c66219c7d9916f2713342d04d8bc33186b68ec5b738ccac7665bad7ae073b408"; + sha512 = "615d3727a9efc2e14fefe093678cb83f83e1efaab9053a98391b7613754e40fa7929e4fa3de34da7aaef8053ea752e6ca00f83d114c90c1769f708742f492db5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/te/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/te/firefox-57.0.4.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "2e85fbadafd18140f75b7b1f9aef525c90f363dc5649aeee177cf86b24adb55cdb6c594457c5a7509177076b750a79e48785ed73343fe480ea33b696bb4d33b4"; + sha512 = "246c2699bbd27a318778f5517d62bc7c96dd6fdba0a8291f291b0e803d2a68710d96c4a11118fd105d00e4489924a62195c7752edc403b5b42a8a06a36962571"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/th/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/th/firefox-57.0.4.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "28236c8b7d3dacf156e65faa9d72cae11d8726dabd5b4408b556f9f2beb073469c4cb285721ed9ccb438df618f1be503717399d7e6669a308c45858a5962c0df"; + sha512 = "3b34c97e9e3b0ec436e299c45e4913fcb90c9a565687d587774adef2fb10bacf9fd8c576a15a5c8100e2f82cec2d3c4353e645acc9c20245e6fb6e2b73213011"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/tr/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/tr/firefox-57.0.4.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "4691739124c0ac4c5da2ff478f51205849e816428bc4dbdc5ea93abaae41b12d27ab316d4294d44b155378cd80370dff8da53a5bf2adbbaa44d6732607642aee"; + sha512 = "184b6e4f5a88fd7606868bba6860718d2dec0a6db123222195ea9bafd5ff3a391ee34a911591eff58c5ae7bc90b171aa1866d3d872349d4057ce72a709eea0b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/uk/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/uk/firefox-57.0.4.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "89483ebc8c4baab09c88a221bdf0740415cb80e376d6c8c0db449cf96d9283a9f43c4568bd9c67ee170173caa9a5e8b86ebf096acdc1f1b514de6747dc04aad7"; + sha512 = "bb343353890e94526ae5dab5c2dca510ddda25d0d808decdd5ed628af174e60e584f1a883e19f33be2b316e423ed1be7e8c30916eb10ed11c618a015beaa538c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/ur/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/ur/firefox-57.0.4.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "9df394814870aef097880ca8d5b012652968cc0832a5bc166d95a5adb52d996c4cac87e08f3543e704460e8165bcada3b03de36566b1772ba072cd61605bef4f"; + sha512 = "f54e1cb54992436bc78b1491214978aa7986153564bc93f9da2c64e038f4bbb77dbf3f44ab4cece5a02e1ff8e1c0d4bf5ed64815817fc908482f9ef203689cc3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/uz/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/uz/firefox-57.0.4.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "f3d28a80144fc542c9fe8f1c607c35c14fa561ba5c7030f9b69515eb29ad7fc87f8fe45406fc8c86e3428bed20e7c7c9714192720ec2ec29cc532206e510797d"; + sha512 = "832c7b687c1db9545ac9fd81ecf95d29eb329518dad9386541073f6834ba88e80ad9bc70d6ab7e12d820e8430064f638d1558c0559d6b410a8ebd81a7a82b245"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/vi/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/vi/firefox-57.0.4.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "506b68ead1facd94b90ef2b5096760748ba234c71f01c22cb202a9ef59aff3257eca92f238357ddc51ff0d21e72d2ec32371e7f4add4c0f8ce534447dd622dcc"; + sha512 = "e60023cc021263b402ffe829b24ec00f0c0e2e782fb0acba23b3527f612aed710a1c8c65cc28bcb03bbfa54a4450085adeff36be69bb21bbb175bddf4c5894c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/xh/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xh/firefox-57.0.4.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "44ea4098952c2a289a25e90f2e8d12efa58294169f79c47a445d53fee0a0c8dffdb567b6745b55e581c70475855d2142e0cfd9c79faa354606a354a83a70e105"; + sha512 = "94ba86099376c14900fadef25a77b9b4422d8f50d26bcc3bf024dc5d6a35f4c08f897cb5dc1c94232798d9fff11e7b018c90ff7808bc7ee9c861e57f425e96e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/zh-CN/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/zh-CN/firefox-57.0.4.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "cc7a52f748adfea0366f02536f22c384fdd39cfd792a4995e0f7b85e6835df08780fe3b3779922eed6958082c8df8d471cf18f5e65a613d7aec4b27db9a0a863"; + sha512 = "a6cdd0d0553e84a727da33e8f06afe004f4a95d726982b32dc7f74f36182e8bd2b186dfd7f3a90760ab7b01f932fdfc8de4d1b154c5133151f29b7a4d78a409f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/zh-TW/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/zh-TW/firefox-57.0.4.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "eb5638f8a1f4a1b63d7c7681bba31b1fffd4826476442ee971e5844611b53bc3b070f8033c49f17d45d9cc9e7b9567805578cd3ced63ba186ac67d341544c0fe"; + sha512 = "a6ecdee1aefeb29b51861b011334346acf9816971c8b40196a06969c3e21e1a8ed96f1393f25e558f6fc6e5cf35b5a497de91df4764ad30c52d7ce06bd7d6732"; } ]; } From 68200d1230ec59ac5f1278bdc3eac11256d7c661 Mon Sep 17 00:00:00 2001 From: taku0 Date: Fri, 5 Jan 2018 09:13:10 +0900 Subject: [PATCH 219/296] firefox: 57.0.3 -> 57.0.4 --- pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index cfe37fd8dac..7a01978f7d9 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -6,10 +6,10 @@ rec { firefox = common rec { pname = "firefox"; - version = "57.0.3"; + version = "57.0.4"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "1f887ab6bb16ef69bce56b689e761b3e09fc106b4bee7842be2c8e7eac05981f9922e9c3a8bd22b4935545cbbc10bf0a0c79df7800cd3c80fd4137070c9bfd09"; + sha512 = "58846037aebbf14b85e6b3a46dbe617c780c6916e437ea4ee32a2502a6b55e3689921a0be28b920dedf2f966195df04ac8e45411caeb2601a168ec08b4827cf0"; }; patches = From 2493ddf0e517ff612a9a86db35135a033558a6e9 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 5 Jan 2018 17:48:10 +0800 Subject: [PATCH 220/296] firefox-beta-bin: 58.0b13 -> 58.0b14 --- .../browsers/firefox-bin/beta_sources.nix | 770 +++++++++--------- 1 file changed, 385 insertions(+), 385 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 847ffcc2e10..8a46a163599 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,965 +1,965 @@ { - version = "58.0b13"; + version = "58.0b14"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/ach/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/ach/firefox-58.0b14.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "67577eb6fbf7be5639746c54ad59b6107d89eca49919b21d5049d23f20c5b4ba974eafb3c526d64de1950f34ef07252087d91f8c0b06198adc64e42131ed4afc"; + sha512 = "dfe229644983e46329dd217c8e29a49ffa5678057d1482f6cc5d6ae6844e83307b17a0c024b634a6b089528f6ca2da4a087e4d8f46648f0c1def985763a1b6e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/af/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/af/firefox-58.0b14.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "76ee8cbc4637b4aee38e5cdb6702ed5163215f04602dbdaccae192ef7e745730748eff8dda27c587529bae941611df269c7d460a5ae8777dfd3db14b2749ecb9"; + sha512 = "5d55a86bcd5da6525e60157ff3caa2ce602484f1390588f17646854ca3d9526566149911f52d5d572ed816ef2a06c4003846cf13444e46a9b471e26a58411b3a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/an/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/an/firefox-58.0b14.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "9c80842fe90531b757b1b40245a478a498a3df1ae4e2cbc57159355c0bdb44ae884b9cd6d4108465d6874656966e806ae39117011113eeeba75bc5b2773f4292"; + sha512 = "b7aaa785467398b3424073609ac9e04305d3848bb1a6e9a4c7311cf547e1da6d95871b31783bb5a10597d5e8a57112bd0cfa42312d19eef6cdd5359c06ff24c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/ar/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/ar/firefox-58.0b14.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "26a7e9465ee7c33c00e4ec9f00cdde7eb3668bd36db6b18a694de8c05a23be9490f58dd5defe3e370ef56d7a999574b9179a9d71f8f30fdc5882f5d598807fbc"; + sha512 = "84e5698b9cc98ae2fa57f8702aefe639bf6a7861a826f03b008730ffb4762db4e2220eea772c41e15759e4c74635bb0718484cd8a762d860ce798a8431868977"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/as/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/as/firefox-58.0b14.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "79bf14c0cc2e347b469bd93139d95a018bc0d89cda94a52580c89d63a6e557c940c5306882d8ae8d1d4e4b3de755914a08f771ed7c2f0eb2b469474f6e41113d"; + sha512 = "9776ee28f136772d28131d2c4acdc8cfb181e35afde891cafca7574ca5938af9f67307e42020ce3d92c349204d64ddf7fd08cff115c97c47ade2c0858be2f2c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/ast/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/ast/firefox-58.0b14.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "724bd26e4d2043fe03a7286590113e8ab10e68f7f54b9f7e9ff8fedd47d0acd6bb2cd15252beb5e28ea389823a66c84c2e13319e7b414cc0c7b6c339f1e2ac15"; + sha512 = "06b4f211d132db3e77473e3c13ab1453132153ac3592b1889db8bbab62253fcab6f289e5de238f038655480fc298961781294cfc0e186034b31e6d035a2638e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/az/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/az/firefox-58.0b14.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "d39fc0e8b7d3f6db9c8fb867d4ea83ff1f67a825680315c636789e3881d2dcfbb683b28d7ac1f6ddcb24ac49a6ec38393d8ea964356b6c47f6059aad863377c6"; + sha512 = "fab76f1b6a2670d4a6b1a483ec38695e67346862326b48bc3f75ed795ada807c7fe9f10027ae6a8eb6828724842b2f03e8809a7c8785bc2609619b58bdb3e6f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/be/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/be/firefox-58.0b14.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "8ac7baad2e1bafc8e457794325e40e0ea0617069933d1f84016dca7e9e968288bef16481ee1af22b9e2985dc6d401d3809c4d158b5164c68682529d347e443d4"; + sha512 = "d0e76a4e99da48991b3452559f845823d5776456132e9f50d764b099d0e6e90ddb28f67be2c4c97ab9245ecb9597559cf6b38acbac8b774f956218328cf839b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/bg/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/bg/firefox-58.0b14.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "86501fb0e27dbf761824d290bc836da07a1c5051e07c35e9dcbba36635c8b3338c281e1fdecf4c76b827c26341d292a0250929e6088cea84e60226925a1d85ee"; + sha512 = "4b7083e7c8feb9cb8524847fe523ba0476c9184e41e533f221d9060d73b6f8e0235770ef603b9550e59a8eae348b0273e1e2d2ee347787f30312a96dd8715c58"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/bn-BD/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/bn-BD/firefox-58.0b14.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "85f3d9919561cabc49dca5ed8550f3ae2da72dd3d798314ef2cb1793a22838cab99f912a7c49d467393e65dc4a738f38b60ebecdcd735c40d2589aaf79295812"; + sha512 = "f644772ee7aa04975164bf5ec8d578b88416a191b1b5dd0c447c9599426b663c2ddb97cd4864dbd5ce25614a9383aff59aa5b8d45181d12fa82072446d360e8e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/bn-IN/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/bn-IN/firefox-58.0b14.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "a8480e313a1e2157398f5898f3f1b8685b06da9e8c29ac00979e069c126439c976374e33c9c672842f14f3e974d1d698cdeca10f9a8bdc3e72795c0c75df416f"; + sha512 = "1a81f5042ef3a81c507b2c0bc8a5bce8563e140a5ae486c7e11ad94a11f5b869a439e495634b00307c97b0ebc345ee6d0cacc5b1c59e7e824e8a89f7b62f71b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/br/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/br/firefox-58.0b14.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "990a8365e93aa7e496504481bb39fb4f34dc0985481fead3cfeffcaafd6cba59174043e6a4c691d5ccfd8facb2bb0acc92ee55408e369541d0dc7f1d8fbccbac"; + sha512 = "64e40b8b0580fa1f9fc547c0e5f49c8bc2ff6c4d3b02d4c9eec8c531e4f5842aa442be7729535e05c279b8d17bbd6c86e2ebfd21ce0175c08c5989b5ffb5c0ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/bs/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/bs/firefox-58.0b14.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "f49f38337bbcb0f54d695963276e54c26a5f83d84029efec3a28f0eb8b28d11cb7e2e88e9d065f99a8703e0ac5f66ec5068e091db87ab0c27569ee8c52e20f8a"; + sha512 = "6f0c175d92123c3a1ecfdb555a0e10c07b2d1c11d1cb8aef6002d9c01f3cdc2b82b538d3e584eaaca10164cc749455cc95985eeb0d0986f59302c43663a76d75"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/ca/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/ca/firefox-58.0b14.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "9901e13b24ed492e2fd4835d1476b52c3adc5d7b744c78dba99184a42b1e7ff13de1f6351cfae4126061aba3a7d1d5e12f8eb7b7ba3adeb98a00f9cc3a982bc7"; + sha512 = "b37c959c3228f00c0cb40afd6555286e20e05a62aec68c2a573cb34ccae3e8f2030e1fcb4c0134ba55a079c809d5b1f3e7e7cdabe5fa4fcae03b117f6e0f8733"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/cak/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/cak/firefox-58.0b14.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "03536bafa95d7c4352251ef4a34c1c61017552efbe1256d26445df646d1df4cd6364adbbe1242614a0c51701892ecb85178026a51898bde16dc84cfcf3e20e8a"; + sha512 = "7d091221b43b21d21ac3124844495d64994858778a273c0074083d40c21def90e1e0dc66035d4b73a2451e525814f6534bd7017a124939b6e11a3fb4331a1106"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/cs/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/cs/firefox-58.0b14.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "24ad0af07150d45df06f8bda7b53548fbd54713c9cc1cf2b28a544e6a357e412b913a20b17267857831359ddd6bd01db6ad7670d6aeab2571241056b2cd282db"; + sha512 = "4f07710eb7ce56b8702fd411a66212185893a0755a36b022e876b6767254149b8f75a045060055f1e1b13ecf7171274fbf52174bb213b31228fe9c364d20d20e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/cy/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/cy/firefox-58.0b14.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "7aff87b4bb75cf8ea9c1ccbbdc9f00cac23d22a9a277e41200ebcd42add2ac3c816102c8a954b302924a840703b8910e0e4a4cdd083a9167917520cb3a621575"; + sha512 = "b894d8c3c4a86bf1158ac654fa72f58f53fdde33d4b59eb27578013c2be7d1e6c9025f669c20683299a263e76b3148a74f6cb482ecf8a897a481cf47ea75654a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/da/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/da/firefox-58.0b14.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "490f84543bddd06d0df96a4c968ed61c8908aaf2ed7b6e41154a134febcbc5804641d5247f3974d4bfc0561bbf37008c68e665a3ebfb3f85d9824458d44070cb"; + sha512 = "95161597c7dedb9de0c11be6d0d210143b4255c0aefa51fa2221a805a5d11a77d8f4749a9581fa0178b9b027dceb57829cf55bb685309bdf9d5ab30baf8d7f72"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/de/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/de/firefox-58.0b14.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "5178040281997f2728daf6ed98429ba28089656a62202e6101f009bfe4722cb7717f8da7760692720582ccb8a10d727ab09a541fd773465c10783a488496a3f2"; + sha512 = "4964f2c8755b71f9f3a48b7ffe347b26765573d240fdd97c2ec0768c54f7a107c71d0aaa1e7104bc5e048a29483f3480944304148c0b04f660ee6c1e1be9a6c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/dsb/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/dsb/firefox-58.0b14.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "b4007b103ccccdbeeb386ab9aeabd46225d0bb312a7cdfc1a27dd4671db5bbe7271938e34b412aac7071e7dff46f79ffee3f8c6f93a3d79c4b2112fb9e462b85"; + sha512 = "9f08622a46162d86ca1c17973a924eac8cd31f11af00cc9e036125d9645a112582a027ba987781835bd00b043951a45b8ecc8da3478d791b6640b6caa83ee57d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/el/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/el/firefox-58.0b14.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "66189cdcbdd6eaaac9481c87ff50261e7f5481b64280279aadac3956c4208072bab72082eba74fa7401bea42f7ad4c554ce23223c7b16040f99dfee70ce441f9"; + sha512 = "8a9d6df296f865cdb44bdf5c854a621f56431671c25d09a1c02e63c7facb3b6d5617812f67ce06e3a4629c5af2d3e76bb82c940976529fc826d288dd74e63918"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/en-GB/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/en-GB/firefox-58.0b14.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "34979c996b3b00b402c99eae4d5be4d007529b8b5b05489fab9e9465e56cb495a50aa361f47057df15e00455c80c00bdfffdfbfb3a69cd0da5eda28c062e056a"; + sha512 = "ef996b4c64b648b2a7f73f7e2fd6fe65ea440d9304b2a6f8e843a70645a6b4d266135cd4321c4abf18ea2e9d002a1862cba526d3f180f8a951ccbc634f80cf32"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/en-US/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/en-US/firefox-58.0b14.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "ee2bfdf82622307c89ace3aea77709cd5dc384eefda029c0711573eb1df4f117862eeaf5aa4e16432d63ad34430de821885ebfaeb766352df8f01c635ee163be"; + sha512 = "1b1ac13674318aacf86da19b170d4fcd6f3a6cbf87fec513f229c891915ce61f966ece3a50b5d4e55d15becf1525d1effd296d9f3340260d247ff2088316c936"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/en-ZA/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/en-ZA/firefox-58.0b14.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "8148b72decaeefc6b917976504b3feb5a8e535232f82afb22849b63b12bb560a37438785ac661e70ee00ec7b41e09d0f541ca2d5a07efbf1f667ac72b635fa12"; + sha512 = "c2ca23d016b17ab719d0ffeac2989d8465d3782781a26ddc70d0fae3e533f8d423ee9fbaec752ffca0c0c7d871cbc20b8d3e10332e8819de2bf6e286144b0012"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/eo/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/eo/firefox-58.0b14.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "ae5d5f087dfb8506eb5364674510d0c8066c989b06a7fe58b0ac009e25d33f3265d19f597c1f43900812f30cfeef0042da557699d839585e8c2fa8ec14f77562"; + sha512 = "2717339fef386d8f9e1c646340844be5a920924e257cedf1aa16fd4dea0047a92e35d02844a5e9724d10498c4e5baf7d88ad05f501712b34b4f2bd2a674d8623"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/es-AR/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/es-AR/firefox-58.0b14.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "0a1044d2a4bdc97800f1eafb5d6bc72225c0361eba8a233503182090d55bc5cc2535f3a30fb7c9ed6400f3e6e6395a451c6e486e8670fc4af4830f56a128411a"; + sha512 = "2143f1a1d98ef8eafbc3dcdad241fdfbdf99900148625e94a6df8d11ddc5ba534933e727ea3e77cff90ad223771694788e4a102d60d0c393d250ce02e237be41"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/es-CL/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/es-CL/firefox-58.0b14.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "bb15d0fdaf0c29d6d4025e88b0ab28cf61f6497fb4367a7f88a3e49c330344f3caf7e53d06a48d919ff68307c29bbcaa7243d7d94a4d87e780aec95530d882b1"; + sha512 = "b940969542e6aab7144c840cef654dca0171dd10f1e77d878ddb2ce5dd5648ecc4feda8fae158836b028d73be2a8c50df468fb8a0f58a08eee07ad5864dfcbdb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/es-ES/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/es-ES/firefox-58.0b14.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "8c70f191039db32f0a919c078dce84e06e777e554f4f24d64a8e141e3832ee11d135667911a6d21066a4a298904a6d154de304bc257d5dab2c35377a9fb441fb"; + sha512 = "511f7cd5e5ce88387436d8d650ba8748a72cc972148164c545015f1c183bde0599665c3b8ebb4c55b2084e4399832e5c022bc547943dafd2abf410620cb2e3db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/es-MX/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/es-MX/firefox-58.0b14.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "0c87efbe5f9dd33d9c9664c57cbfbbcda16d2acf55c3e34b1ace157ef769af5656fe949f4ad615cd6ccb8365ebe2635bcfe11ec4049752e7eb8db6fdbf951fec"; + sha512 = "5fcd416d661355062d1fdd29ab994eedc7fc250d77f6f86960be03901e49c165bc607779d24d3424e85ad6198ee20a470636e2545b4ba07b89ec58f14e1a0d18"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/et/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/et/firefox-58.0b14.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "7960cf7fbd94d344536cc2b3169ec416f1a569f36d4852391d8cfec48c7bc457e8ca5b4b2433300789ca7a71fa06c311e02f84ea534004f731b7369c1e582bb6"; + sha512 = "a7b3e3fbdfd3bbf77f1881ef3735ccaef0e23927467a7d3afea092996b4b3d525615066f74a6cd9477a03ac32104aa08f2b191750637fe87bbe6dc4d3a649f38"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/eu/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/eu/firefox-58.0b14.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "cc0c820c2adb0769ac7d14387d7fac7c5271b8a92286f84e1866cb3d4b1f8de752ec3572ea0769c98ffab7c46fe11315983692589a78aeed9a013f507b9a6f4e"; + sha512 = "491ff0f447bf66477a4ae4cab08dd214ffb04765c07e5378485f3b6f6e76c43d30c5a92279fb3fbe071f8a10899c6c441eae2c80a577c9f93f06209fb9e59a78"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/fa/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/fa/firefox-58.0b14.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "56e160e7d33306b14606c149bfc8ed93125a22c108514b4340ff9d1c95754b2ae6bbdcd8ced85567c8e8dc4ae9ba4ed8e617406822c0f1ab1a229c062f19ba94"; + sha512 = "83d5a44ded3b073d94c365175006431a5323c74d7fc79901740f42025761a166ae4cae634d72f279c29210c009050a1d1ffab0ab44e0845d917e994516541532"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/ff/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/ff/firefox-58.0b14.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "44da8376b46737638e1eb269d30d6eba0436f6215536fa81c7fa8de45790157212a2d0854faaa8c7da73a448097efe18201d8edd65b5c68d5bf2c2789a63549b"; + sha512 = "c5ca7bbb6d52c6fc6eb3b48ccbd83acca1bca1ba208cb0b62a003b980a64686e01c1d2d11a53f16d3f378a956ca16700858fdf66000fa00f5fc93a11910712f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/fi/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/fi/firefox-58.0b14.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "3eb8615842ca6953eb801488d68132720184eb6d5a6fac353b22246ac49c471ef5bc63a76042ab5edcf1e58ba9b248b1c25901151a73f108d985440199f90bb6"; + sha512 = "d553ed980b9fe45302541705ac448c4ec27db9166ef27a1fbfbc752d9c762ca8f095d5028b5e0b82a97374ee4d09d7b62633e3040540a3e837640c872e6c3717"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/fr/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/fr/firefox-58.0b14.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "71b69f9aae5771b6e6f36b8b8afd2d2fcf8d5b6b4ac4b122ceb551696d64aafade5b459c9099d183c9fb60fd65d74d2ecea77ac0b5bf48245b7754a3bf5d70b6"; + sha512 = "ee84d52b7cac71ce0c0a528280c0d63c50298ed6f3913fdfc4d9307877537645ef77ddf9d20f4fe4abfd3cd8d61d7b0f4c9eb545ab016763be36e0c8b8613774"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/fy-NL/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/fy-NL/firefox-58.0b14.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "543f31811e78b2bca78be3e49e6a039310d71532d1537e5b59e779f261f5d7defa1dc2416cf4a95201d6b8dfb6a6c6a3bb2a3f9b9236a69689c945db7bd9a2dd"; + sha512 = "3814abb02c98a0f84265e476cb1ef77b29428468fe38328c55c90d6d93f52b4935317dd8cea5cc0219ef514cbb4ba5b2b28974b899663328ab9572fabbe40cca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/ga-IE/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/ga-IE/firefox-58.0b14.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "16526b3d22af1703a373b72c6f5ddb6d5a47ff9e24f03f5f006b9ebb514e233376fa2ce6c74acbc3c4df926b76cd81a993d159bf32c13202b11edfbeba5ca705"; + sha512 = "c3adbb5f630e499c4af90fa3d48d0d1ac563eb5d962f73344d5811ec52f5148d8480094a829d713fd13d0d99699d92176662b67b7e18b4e5da7ea308e1290e92"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/gd/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/gd/firefox-58.0b14.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "9c307de41cbd4b082a6a05285d973b6b6f8d197289c3045578acba75e87a25e3bd4296dabf16079c7e9a42117633c7028574a5693bb84afd608a94026eb5a664"; + sha512 = "b69908c851f690ba5f97a305558e30a078186982e0d43e8d28ffdfd038ed67307dddee51c565fcee7b90366dcabd758104cfc6b52a270c7b83c77a76ffb28df7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/gl/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/gl/firefox-58.0b14.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "73e68638ca5543ff9953708eb87f666cb7917f8e56b18c99bda37dab9aaf2feb18860c36bfee192bc0e561c9d1485d23925e18f9ffc98533b62d5e6945ab2232"; + sha512 = "62df47199073568f72243f084191de96ae904cf54ee77f16160570546b70e7b600bf2ca2e291c485e312a27fa2a4540eb79c42372032738a542d42be5fa59309"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/gn/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/gn/firefox-58.0b14.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "a8283f28210b638a89bad4c07cf94dae860b3fe43bc904971f11f4d1be185337bece218beb3d27d106bedb1c00d1500dcbc1c4a565bed10978c4990bc7271124"; + sha512 = "6c3b90c7041e0ddc632acaf30bd7dbd710387c380b25582d69c4f3a2cc4bf5789caea51081f3896f555734d7c9c50ece5f894a909d2f7b90bd828deeea084028"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/gu-IN/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/gu-IN/firefox-58.0b14.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "062cc45b61251c502be2c51bc0a5d3604ee651a99d5411c95d4547c7a02127e97f6f0276b3869ee1439b124420966461d675a9c6c411849210d6b61cdc99e892"; + sha512 = "b6793a64985240e92a31768a4dd98a743627515dab25d7a044a779dc72a8904696d884e83eed0c2ab01b89f1f0d37bd220f09c9b9b85a4cef4832263cfef2976"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/he/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/he/firefox-58.0b14.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "05cc0211601d9a13f2f3fc822b5f0712fe2fdc425b66ec4650676f891c9d3510c5ab9e0661e016466c53db33846e266d12b6acbfc992a8e0b204977fbf36c913"; + sha512 = "dc94e7143b8fa026f306bb256e91647dce5479162d7b6a87b1a30ace09136f1f587e749ae4bfb6742f720ea69105ba41976cbe2d9af316e562e879c80bbf387b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/hi-IN/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/hi-IN/firefox-58.0b14.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "bc0492bd7f899052a96d40d22d649d11b97b5aa6009812874d9f1a496d36f994689cf28381055a540dfce4466c49e6cbf39aca539e684de3a408b78f5dd62f04"; + sha512 = "5cd98e756f672e570611e5246a0c5c8f2e7919a021781c1e8af2fbc28dabf579802091e268d6f43f848769aae611da5e0dcbc163c4ef8b09f0bdc8a013bf9b49"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/hr/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/hr/firefox-58.0b14.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "22a68aeeb805c4d38dcd00fd57d34bba60449a873a13b7a9c0bf6e5d7b86a988a471681a1fdfe8fc597de4a08532961a9d18d07cc072ac5c50dc1831ef2c6f19"; + sha512 = "ccef787f7ff52ff83f00612172d78be0775ce78aa5879417e69e93ae72b4d624851fba5cd4ab0ad067c7d1a8974aa9712bfe35e4d83dd20caae4d0175e73d12f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/hsb/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/hsb/firefox-58.0b14.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "d477fa9c3c6755568173cfa100091230995fdf943cb3595028cc0aed4455835d6c53e66a3ea900c6c7b9a312d245c77dc70defcdd279366f860ae8aa9c52b7e1"; + sha512 = "7360ab7122e63640a4dd78bab40a1260398f68745964e095c1ca6cda030f6fef2aea7a4ab1826749c9af49feb34817334d2850bb6956273c6812909ae8dfae98"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/hu/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/hu/firefox-58.0b14.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "740f2c15f6a00246ba069865a62f3ab2de787f808ad40d1a81118d831cf2e07ff85294b0bc6b3e7fc2bf935d69cc4114f7b6e3d620005dc3f95ea7ba645a8394"; + sha512 = "78908d6d068f15296b3f49990985959b634ad535780a6d255bf8c193839ac01b29c93dfa0cd51ffabfb723239d2f26f4ba0b5a73c9363c00ae791ab00c16c345"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/hy-AM/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/hy-AM/firefox-58.0b14.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "aa2b299e262b3487a1ed611b80b4105080f0e4f4464d53e334c761b0adb009c4161f248d848e6c9c25a8f4532ed18f369f2b6c622180cff1f2c6c8e96a3595b1"; + sha512 = "af57561329462067f27a42b786fae3c9fb9a24556eea02e17f746ab831d77189d578022ed1333b2e807eb558da490844b22a80aa458bf8935b05ca4213a23b22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/id/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/id/firefox-58.0b14.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "159f8e1f08ecc63f05be64f1f52a673cc0c143239352253f0ad8b1c84133f718b7941d5895f091fd78547e883871baf57a21fdfe3b22d46a9b261ca634c431d1"; + sha512 = "4a79c952f68991fce05d71b3731f2dd703f0ac7a5be99f30b6bd099acf2f5606b9f759c3d6a3a8d706263d23eae447db95eeb46629f8190ce2ad8e650146658a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/is/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/is/firefox-58.0b14.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "34dd89382b5f2530a4b72e4284dcf8ddd56c417b780e0c4cbc203fd962d03f2bf7a441d74d3bdecdb74a9deeb48515870c28ad4fee73b0ab3561c8e75661b92f"; + sha512 = "98c75e6551f7cb45d45eeadeaffda537b25c82625c0627e67c76fdce103a05c7104efb05f665f2a8ba8fd5f8f442d4e05b0f0386275043654353831037a6174f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/it/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/it/firefox-58.0b14.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "96249308625ab6f27b06fab04da102fd2b375c006489c30e23b153b21f47d69672e48c74b3e5b41ee087bcd087359f4bfa05be86ff6717afe38112eb62c6f878"; + sha512 = "7d527cbfc21a6edb8a1bb6ce4c2c2bf82377b3f1dc03e53120060f913aa725be3be1a3e4f9be775b85408a65e60a03b4140aceda4a7c1c932b4b82025d88fa2d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/ja/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/ja/firefox-58.0b14.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "62d2fa96cb98406ba183bdaba038ddcf2e6589e434a9d4381aca8aef7caf9bc39249e8eb6f9a3b9ae6d5e112d98c398bd4222a594e6b46046d0ffcb6506eaac3"; + sha512 = "f8415489224a896fac91431d81dbeb424583db55ed0bf2019554090a39a4796efc9e9c741901c10b29d8c642ce91817c13d1d5387b163e9aec96923d61395b3e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/ka/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/ka/firefox-58.0b14.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "c4d5953efcc8054dfb0b35f17bd3a4c182d4d84dca3f5c8a3f7e86eddd6f46c54bcc272c68321bf4cfc0fb9583faf4e29316879c2e7d3f49372b3b02a34d86ef"; + sha512 = "af1a3f9eeadd01fcdefd3e8285ecaaeb2800c0367803699a89e7d8ec26390b238545e04dfa7ed587a8cb355c505bde9cb209c59b26ca7154fc16d7c5e2ba13d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/kab/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/kab/firefox-58.0b14.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "81b320f6fa190494566dd859196f602a8bd73274c05710d28e71b90e90af777a6e637bd03ac800c490a13d698479785597b4c4be54ec4f6d2693784ed792731a"; + sha512 = "53826a0b2caafe561fbdadb1e6248e742c260c3e4d26ff3834a092fa2812f9e78f13daa8415089305797b1a90f06e8250caf7a4666917ab4cff8d3e5331874e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/kk/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/kk/firefox-58.0b14.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "238922febb9998d1c6cda5bec41f72575a86a986fdf41f48a0e010176a46c6b6773d1027c72178cf5069c74bdb494e68f53cb9babac027ad7a9cf5049ee27334"; + sha512 = "e38fc107fdcb2c4e9b21dde22050b4c1ab80bd9e8eaf27e89a662ed2c60a1af1f86d3ccd2eac67931bc6c5f5e77d8ff450f59181961791a174df375119012274"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/km/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/km/firefox-58.0b14.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "f85bb41a4c46e768a520df75bd45c9473745f52dd8b7a49c54d2cfc2635cd092e2292ddc07c264042393847d3a40308212743a13ad95dd35cd40e5eefcab036e"; + sha512 = "701c698cdd92668e2a6077466764e4fbeb84d9f4fc1a1c49f384edccb940db6aa4b62ab63b071bcfe92a2edb4c7e190bf3a34edddbb8834a937afae00465292d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/kn/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/kn/firefox-58.0b14.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "750ec3e162d1b246abe5571d87ec9857d2e3276c72ba69da0671bc5f9688c74d90fba463cc1efb0bc3ec60869900e8d55d6da1d1b7bb3203390db57669965732"; + sha512 = "4651f9c6ab727273603be836a92b33233b65e73933fe3f77f32c380716ed089bf040dd2631a0a6291278a7281f00d90f7e5ce7785748c00685ad6fea5b72d52c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/ko/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/ko/firefox-58.0b14.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "63f1d3d5f059c71798150437e67965a86340d2a869340e9e6e550e7368fb12488962459af2e7af5be4f06a1cd07ec1d391c6ef1af4e1718c5c0fb387b2183fc5"; + sha512 = "ebe6ef4b9b1f1d07814b0ba316ab9d04fed0a276c0722beb90b5a8e26d8d682f533dd335556be0f8739a7e82ae6969111079b4e30e9101d3f156aa20b83e94bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/lij/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/lij/firefox-58.0b14.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "3f228685d256a19fbf22e1add92ae53d94b1738e6cd197be0e28acc973486e67dd71febfd514fbb85b256a7de13d399caefd31f83c043ff2938979dea57e2221"; + sha512 = "0becadfd74b4a73bc6977f578e85edfe86e8c162397a2dd5806a101adc6fe31ebb65b6e158494b6c10e48e49e041287a9354fc5e2fc51315b79168d35e90b097"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/lt/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/lt/firefox-58.0b14.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "43b4b3786a23abecd58d46c44aad27cd35dc971d5b744d914e131fcd5a10c7974356ac68f4048d735ab4b9649e74dc765997afd9a16203e7e0a7a22192a450e2"; + sha512 = "fe8888b40e8a5326f397f439064bbef351249c492e062eed6ed54608aab6547000b206630a9aa8e470136f493453020bd5cec89efe73b345da194fe4b565063a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/lv/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/lv/firefox-58.0b14.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "bf1db22940a8b434e4fe1a372edac7d69ad7cc002cacb80ee6686efa7168556cc6b47fcea215f537ed94c8cd473ce46a8c4880f8974130ab6b1087a454c35707"; + sha512 = "1f5792a60f2d1669796c653d786b88637ac9a0704fad8ef10fba642933f0f75f037b937183f62ab0a98601dff1c2ae53af4be721d6d393ffa2409b96d142ca73"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/mai/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/mai/firefox-58.0b14.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "989e5b19a3043cc228bd028d018fcafaa9694ba33a74aba6d8faa2dc4011a8a29ecba0472b95d96ab8a33b8516ee09fb20f757cf57708018205a21a4663fe075"; + sha512 = "9effc17d9dbcbc49eb14942d4dcd3d82e6cc002b8ba95cc87c29e8c5261b3134a45b1610671408b331ceb78e5779b954278c3ad307c88aeb3a4e99547864a0e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/mk/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/mk/firefox-58.0b14.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "63eb91f47a7d957a3e7296b8a0abc13f3ace37be4d1a3c992dcc258a55a06c1634323994884dfad8729905f647f537c2b2ca449df228b96590fad7a5c9e9f351"; + sha512 = "be5acc803fdf206409c600fba0b03bbb946c6e7a3c33cc2438a337bfe054a419e96a381e0d967c98a7109b16de419292d8d504ab5f558249906e35cea9fb3651"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/ml/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/ml/firefox-58.0b14.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "3427c229e46ef5eb7ef8051ac0c013da1992ca01aa14f53abcfce9b7400040f77e1927732eff42c9d62fa5d0f4d4e8a8c94e53552239659c26b2fb2d9ee158ba"; + sha512 = "8e21eb57d52a807d3c449553e5c1710272e92cacc7110433256e6ddd3007817c27dc183255f3a271f3f4e2ff9e37587ec4386734a8631f88b0e07a6b91373e13"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/mr/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/mr/firefox-58.0b14.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "a784432e84a20a70d0d3946b6d7de320729e4019daba816a63835930442759e19dc5936717813b64ad7545b51110d147ddb2de58cfe4efd740a0d293d65e994c"; + sha512 = "c589fcb9d42c313580808e7771b4a598b4feea97baa39519a2e2fa79144751f923f5e313329bf90000688a8b76c33a61b53a79e3453f6a7137f9923268b3af68"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/ms/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/ms/firefox-58.0b14.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "91e6eb4a21ac6d1a4af721a3efbba13fe06e7ba0135b53efbce7de0a5802cd683db85e4cd95c7441d2866088d267d7b6842b15741de292e99f0fa975d20c1bf3"; + sha512 = "1a98adc91bd8c73e59dbcd90270ab7984d316682052d30046ea311ecac9fe0fe6198c10688ee390331eaa1874c7ae581ec331c8ecb20faf9303f00cb6d64dfe9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/my/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/my/firefox-58.0b14.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "37389866dde8716768b239dd7ed7493a53d6bb8c1c75a1b75e2299a91747136ab4a3c831227dbb61a92c6da68791663d87045b1a3f2d3449f6e174535af2cf3a"; + sha512 = "5e41573fd3758fb4b545c8f86f1f3cedd5e4694e628bfb38c6f3c0b7dc3862b5367b90bf0d560b2dc851c18d61f8cdc32b8a33e4e2c4308d311b7704a8bd8296"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/nb-NO/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/nb-NO/firefox-58.0b14.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "9617c549bdc1b69c2efe8c848c95f0bac375f02c3fb580dcbc0f1b56303a69603b5481b0c6e7dea08de53c512192f071bc7010289fdf439b66a4d01fd439faac"; + sha512 = "2f4e6effa5a329209c62fe346edf1371560b525335812787c336acf508ceda794aaa30909997cb995a78a302304937de3b36bc181d33eda884ec94ce5908a1b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/ne-NP/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/ne-NP/firefox-58.0b14.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "1af3a72ad2e0ea8a5aec3a2463212d0d57984a0f71f1040f68911e85b2f82fd93c7ea1aa3c27a53c014ddca56ee1d598f31671f1a6dd2f616f998731a9fa96f9"; + sha512 = "bf2525665ef1c3ba35eb7f2397e3790afcaa4b53449cea70896575a7711ac5714811df768011ed5448ed4c42ce8a7ff40eade6935bfd5a4217c18c8b6cf937a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/nl/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/nl/firefox-58.0b14.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "be681c2e1de8a7fc87d2f6d0fb7b519016adc22fd866570ed0c6877df789d3e732cc4622320b9e2c7b0347a1950d8014f59a00dab240b4f70b18cf58cc405dd5"; + sha512 = "66821845ae3facbb553494a86d4a2f41197722f3034e97aeaf5ca315fc0e0cec63ab3b22230ba71cffca5444987ff5f44e00830b8c446b245a141b544cbcb17c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/nn-NO/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/nn-NO/firefox-58.0b14.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "dffa29a9679c5ff82cbdd39d118b6e0e9059e79bf7419562a4a4bb628a73b1df8e40bd24c75493af4d7f63920052f404b21d304ef99ef4d89940fd72e4801d43"; + sha512 = "0eec132ebc5bb3e0080eb460ce3ae91ce8477e1160db7de3b010d4ca593debfc8003a85f8dc855e4c8b9ddc5fdb6ed6293c0d18c49d7266c65aad29915c4c0d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/or/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/or/firefox-58.0b14.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "8b6274174ad152a74723af93c25a96347290e728435fa981fa811a52ddaa418ca288dd8f55c9a1e12f41ff42f1ac88cb71e2786912ddae4e591a1921f7ee7fb3"; + sha512 = "f039b2b2bb4f2368eb5f7978255d36eeabe35c4bde88ef6880f866affbc72a5239bb00e9590f6ab316fe3f39f2c813c98d60dfa3a912456c159092fcbda8460b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/pa-IN/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/pa-IN/firefox-58.0b14.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "b5b1b9d6c4a75ed91b6ce95beec321e7422c2169bf0435cca350bcdd84650966e6ad1bff9bb576928df8906ce8546640f86d154aa8e0d729fef45843fa24498d"; + sha512 = "af566a5478da1326f6257da3f09062adb7665d2ea14b14db3f6eb4b2b692c14662267afa3d5c95aad61c117c77e1169091a11810e51a650dc4f2e63ad3de3152"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/pl/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/pl/firefox-58.0b14.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "cb275e3bac85b4586f41022741fb5dacbf6a62bfbbd2230e033827144b63c54085eba1fdb9d84e1c1450ec7dbc6a9a7d0926dc6a353a68e5e0e6bafdff744029"; + sha512 = "e3aa70f878338e3fc83293372e118c204cc1d490c3e3656d659053e30b6611c8eb08802ba56142c544e5d898838e9d2e0c234135e912975044461cc2a58be479"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/pt-BR/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/pt-BR/firefox-58.0b14.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "63b0ffa7db2a7566846dd81493cb9c8821459fb1fd5a2ff593f6ed24139567504328adcb329be8b4608df51bf9e2fcea92975d6693e7af2034c5f25cd60f938e"; + sha512 = "dea7891aa14005ab6778360e7f70869bd286c87a2d20e765081baaab1cfe345ad77b87df134d365267ce8ac209e62d52f9035f2a0acbdedfc9cae53346b528fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/pt-PT/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/pt-PT/firefox-58.0b14.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "63f81261d5827b7ce850b6392691ae9a48a93c04a78a3457bf1e47f27a01b980cf42383d720ed1dd29a7d6facb0931e54dbcfa1d5f7b153e0d071d66988897fd"; + sha512 = "d54a9b7443f7d3656267e38064432e76d9d6992a7589c9018e12d75f62f7ed0571253958eb979026b615200a46d65f73af73f8142b5acdedc4ebec10fee93ab0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/rm/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/rm/firefox-58.0b14.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "d16068f72a20627af737978404927915cefaffde661115a56e816fea225efee99750e6cd31bd3afad7cbb00f8da9c2498834368bfb508d4c125d5ecc23fa2b8a"; + sha512 = "737350bfac26ace68bae68f78a65a9ebfa52a35c72fccdddd1874b16615e9a8eccc0ea4ee10ab2f16f560a80f5eba14c427e163fa1590cd09c8ecbf5668dde2d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/ro/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/ro/firefox-58.0b14.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "50ef08cd69d3bfd72d278b4d452fab7658e29dda88ce3b17df87a8221419806328fc260ea7b40b8151d92437b225ab069689051bfe5860f67d6ab78fbdc0195b"; + sha512 = "64c0f1ca4bfb96e1bb1f363a632b915178236a77f09df7bc0aff7d4e13574c8e16f745d98cf571a6ee0fcbccaadfeda5d9ebcfa2d8f3e68716ac8beff8256262"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/ru/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/ru/firefox-58.0b14.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "027404754d1d577da8548d4871e58d4128700f7bc042775c6ae0a192b4ed560e30a76bbe10b83b2af3d9702b225f7c4c798c117ee10fa479b26b791e5011c6e6"; + sha512 = "60ca4353529dd9cc6cef5af1b1fbebf37df5e170b9b08a29350bad142aaa46feba828431a9b1d3792114f70f670e40247287a35dd7b8d126c3adfe320b119dda"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/si/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/si/firefox-58.0b14.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "337db970657ee0a87830167f8869f5c7b09416654353c15e6a9789a0a9a86257517c3f530956b9956c95928eadebb46e3df98cc77e055f235f8654271eda8fb8"; + sha512 = "59f72eb5ea0b5f19fbde49718bf194db74952ccf21d4c13659da1c8e9996ed2f343c1841de79aea67e25176cd5f77f883844b8c7e12f6ae4171ebad06240e7df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/sk/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/sk/firefox-58.0b14.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "b2e8e1f421481a21b07bfda4c4519e96fa28b320e682b6ae67af84877121cb8400d2c832ec96fb8407f4e72d5ab6cbd70935e9f25c69a0cfaa17a72aa8cc14bb"; + sha512 = "f500f0f9e300eebc3c3adc09fe663723963f57a5330d2f2b3bdc26fc9e66752384464b27433ce111065b07c939ead643147739edf83c600b754c386321273e53"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/sl/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/sl/firefox-58.0b14.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "966e8e3a2fa276778dc66eab53887067f1ff519e5af56b7e80b6bc8124aa0381614b3296ef08f305f022bbcf2e83b4b1d9f316bed8712e4529934bc92cd2a5d5"; + sha512 = "58d4585227d8e5275897ed693763b6192a6a7dfc26acb9ff6a30b589d9a45361f772888b4ae581cbd9d2bd301afbaa6a05ae3362c4f60e54e289fa7707a7eb1b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/son/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/son/firefox-58.0b14.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "5eda3572783fe01b09ad9dd0cd5092c9f67bb0c8726ec412248d49155eb7ee75820da298ea21f5433517c2f08c658c74b09945618662727f0abeccb544ec290d"; + sha512 = "3285c03d6d3dea658167df9bcc3a1fab52ef7328b2323148cb5c689a7b876c3b56e17f3bc33d50beb9693f74fa89b30fa1abced15d26b7aa8d78ddd0aebabbea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/sq/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/sq/firefox-58.0b14.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "5d18f49c0121dac274b09a9d778e25e575b7044a14bae95973442ed2a6b1d381999b271175f8b41f439d242ad371fe6d7e39a251ee3a97c499b313b17dff4f54"; + sha512 = "16f664a4e8b592cf39db4b99c67cf22339ad8d9bbd783aec05977263748414bc889294701a8936f938ada61cc2d59256241b47208ae3e3d360638a817e923c68"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/sr/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/sr/firefox-58.0b14.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "629c5323cdec45ed5351958ba651a4692a81760a3274a1b0fbbc16cab11957b6ed0a964393a7c5095fba9302c64501263c5a577d80f9a25e6aaac7f2fc8ab520"; + sha512 = "c5e83384fc83546d126c0c34ccc172963880fb6a5cf5fe6afaf9eb133bba44b9c62e00d4eb95afe943ff7d48bd399919ad8918a1faac626aae04e361927106a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/sv-SE/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/sv-SE/firefox-58.0b14.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "1092461cec1b2b5ef46cccdb4c50e159d8b93ff3a249e5f3b9f7e0e396d012fbdb2ae391258b3eab7c08d6ed2747e13dba7d28db7c3e551341053ec7db2485cd"; + sha512 = "ae7cb449715e35e1b953d2289396a301c8c1d9e14e74188cf6b393ff41397335e729c6fcffa688e06e072c821a968099f77d10ec1cfcb6446bbe10bf9a736d3d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/ta/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/ta/firefox-58.0b14.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "544473a19fbfec6333c3bdd330cc4a4a4cf8e97d7587c2f7b2bf9ec3cc82158f5b831526bf92fd9ebff19950f672089498df1f1a0cfac15fb1452d36da99f974"; + sha512 = "c380351cee80a34ebd74428788d0bbf043ef3b736d0c523dfc787113a8761422a5111256a470df2b750849bfcbdcc117def227a55764a7cb7c20075493975dd8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/te/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/te/firefox-58.0b14.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "0ad9a18ca1143ec6f4a745394bc4f57abff1057be04e7f54549de73f3bee6dfaacd6a7e4abdcad43ddea524913b5ae51cc97cda70270536b8ce5f7555c960670"; + sha512 = "0b94c90ef5a59483070fd50dd78baf4745055bf716ca3bb07640aaca1f0e3bd4b724d2565ceeccd63bf67c53c221b18990d46c1019b26c86fe36570efd0f0a7f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/th/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/th/firefox-58.0b14.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "6b516b5e35313e5f52a17c0de0fa51a081685563eeaa66ee0c88e29e9bd6df1ba0615867214090eb0830de38fd36c1333089cbfc598e10376e5c5c6a1393b68b"; + sha512 = "fe2844a4753c4347801d0afd8d3201717b95ed44b8dc6b19d33b4e2dc9af9caac95f479d9c7f9f18520363d09698e0c9cd37e9bcf77001dbfe484ad77d6ada41"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/tr/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/tr/firefox-58.0b14.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "12352c3ad5517dc24a205f7a29ca799c6bf10a84d591324c55877b8820fd11feb96038a0866aaa48de325eec44eb997a63bf237235a05488c0207ad2b0a17397"; + sha512 = "e983842366ab1d9e0c8b0562819a9c13bdd9f01da6968b883086215972e2ac4995ffdb2b1dcc40fdecbce98d81636351da1e62d54aa5ba74f7125a51f3fe5370"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/uk/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/uk/firefox-58.0b14.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "6ab711818cb4226c5c71181adceb3324a4997f938cae9b900b87f9fee3f61e3ae469cb43a2dfc2fbe06d8f493aec48af3fbc451c6d83da48ef60882551d0a3aa"; + sha512 = "41351bfcded6dc05552aaf8b08661b9fda9bcba9409578965ebfdf66a55ac82e3dd6ccb15ef7e79cb1bbfd946d0be46fe966aabac73ba7cb8490ef409065496c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/ur/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/ur/firefox-58.0b14.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "d9da42da8ecb8efe5517681861166176e055f41a0df869aa1b3046b4c57237c3b2dec912001ec13b4270296ee7f89b631f60aa6751f8a91b0b709153b1c3cc13"; + sha512 = "5d8544331ae459139b6dfa038a8705986bdd05cd258497cb892a2ed55eef188938e344297d07d24d0b35f10bddc32fe69ad438e4ae949b706ce1f0e17324063a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/uz/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/uz/firefox-58.0b14.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "55774224f284e0372b7646d9c1e7339474e5d166ab75dd42aca0e65e41948140b3247a7dfeb4def332785e9174f2b0474a61052e7223a116a0ea4790e86a985e"; + sha512 = "8a4e5728cd765554c7df8145231dc59494221029244282b6428b3b2dfa497337b0d3605c1b3f7e5ead3e62d2b5df476c9ee49d0e867d4b31779afc2ca54fc459"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/vi/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/vi/firefox-58.0b14.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "3bb8061caa29b029cb5ac6864737a54ac7498ce7da8e4b648dc749a9dc8ed63a9491ec61efa87b8d91521f177539d53633ba8d5bc744c3750d99d32eaca28aca"; + sha512 = "9734ad3b9d9e3f9f2d400c8fd8df5076fb8f89a8f7fbb3f3437ff10bab667fa398393582780d3cadc36b10d405b445d2f35c577087a9140f7932bcf5d406d23b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/xh/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/xh/firefox-58.0b14.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "d46082434ea208d25371f09481148f5d22b3744aec16039e7d02b1a9673dbb6263dc87ae8a56431f28af79141b2a3286b382c5e52bdb390bcee2f4cd0224db78"; + sha512 = "2512815d5a7dd0b32a6d3fa13559bf030fe808cb905de6345885e370e89c6afd557d0f4205a5a4be84775b112a3d2eb62084b7ec532908218bc143a79b01ff1f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/zh-CN/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/zh-CN/firefox-58.0b14.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "392ffbd48019d863ced0edb4977041307a01cc50dae35fc63be9aa0161b40bb9af31a8eb9570c3ad0ec243a9da6f241787e7331cf6a6cbebe7261c7e7fd104a1"; + sha512 = "bc4bfb7342a98d9c8d21f162a456fc3feb38ca61349978b92f554ffe58b4d9e54322cf519f888a04d1b285f5553b3b822142df97522904b13f8b06b489a11afe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-x86_64/zh-TW/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-x86_64/zh-TW/firefox-58.0b14.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "95c92408800957b38a329310fe4b53bed282c7d0fd7644af97d0ab3be4020b8d6c1851fe6e37ed625b626df2ea1a43094ff48f4cb5975c2c1dc09e314e51ae6c"; + sha512 = "1c56d5fba2a0b8dfa474607cceb550d5fb4faa40e4d5d22359f9d751c7b075ad4f8e689de8e72e3657f3369df4f72dafc618a6025e464494301ad2bbf56cb11c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/ach/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/ach/firefox-58.0b14.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "b5a47efd7ef1b266c9816bab408b43cdf98855fc956092e6adda1743a3ebce4181958b926e5a7c3ae451f1ab27858e1cab78a862fdfda416489b91ac576da439"; + sha512 = "8ff8b76820f7c375a7ee30c6d23d901f01bf3457fd6e402e498fc3f09559c46b57ba345d79ee28fa557de6acf439b6c91a89323c86df257281133eb771a3852d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/af/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/af/firefox-58.0b14.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "34ed2a19e82c006dc6b94048e0b984724503cf934b5436475a105f2bd6e3e021a0c81b18454cc2fdbf84f5c7a84d9a1cf39a772415c9f8e768c0bde97106d92a"; + sha512 = "d4e9ac9252a8e0ed7a93ee0dc424d333f4ef68a1d6db2db0899e2acf024238325cc4ef47b58c8d6dc50d46003ab607541a8388e74e92978f178a9806bb4f7d77"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/an/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/an/firefox-58.0b14.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "096fea3e7e510bf0369beaff5db7290f00a8142e2d10621a4c4da424afadd75637f446ec8293e58c6d3997b6949a410f3ac8566434f770fa6a9b9b4f521c0896"; + sha512 = "add52c4b0dc78abf88dd84acc380bfa278a1ecc77a14d5462ab4d911070ef0ab160c6da0d6d25ba690e4eecf84b07f7270bdda4ab242adcaeb460270e75f08f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/ar/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/ar/firefox-58.0b14.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "af4ee6448fa2ce27940b9a9280fda4a16f806797d5ec137d7fe2103ae125cdb7500c3439818055f28a70e388828a5648bfe57fed721d5717bf3e25dc1b7cf0fe"; + sha512 = "aa8660fb0e37b059b3b90302ed2c03e3a2f9c21719bb8c2b47dfa560dfff58293ea71b441533e17f4533be2fc413a14d6c355a20daa63d6e2b13eaa08ffec7eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/as/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/as/firefox-58.0b14.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "26e7a9718aa76aa944db6a6328b3c8dc620f34f398c82620f4dd18c9b5fdb1bc3558d640bbaf1df53946c5fdd52167f682389194d3437aa5ddfc9bf752115f9a"; + sha512 = "69b3f46e48b1fa7920201bd1d27eb3caed1cd273e164a61e1295f77ccbf84577170da34402f7c432be9e0203cb4df7af787cadbc804b6a98c12202f981777f7d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/ast/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/ast/firefox-58.0b14.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "edcd24d34d03ac3f1df2108ec5f96ce869843408179f2c0d8accc3a0f38b1d753258db41c66390fa5e3ae674332ff0029f5e1bc42938ebe652f30767e3f4323e"; + sha512 = "3f8ffcebb8186d4febc2da1816430ca78bd7f46b5ef1cf16a09fdbe5553e543d884b3a4c5945b0240095f1b3d40f0763e320b3b37499f4e3e501fb01b588a171"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/az/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/az/firefox-58.0b14.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "9de430c8403a5281d7bbdbddad5381e693b2cdcfd4cbd9e72717938edaa0e19963d41d134d5ae1056dc83f28b84e90a6675eefbf599d4ab16badc58febbe0c34"; + sha512 = "961543e7e7d4853f7a047f21a1cda664f4c8e33c8d4e58ac97b900c1a3bc807794c7e19cca4039d72308b227e5866c80f4cf4baaba92390672c3531028cd303d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/be/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/be/firefox-58.0b14.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "e711ee46d21fc957c47675a0ad32328f2f8f3d268d9b1b2a3c12613343467a014236f2942aba5b3ec75ace50c4023e3f3515614206e0f14d8d124d5fa7a8d503"; + sha512 = "c1311b0a3d66e983d5b374829a79cdc79fdbeac619d96afdf2060b8f13fab7658fc35093d7055f7219a5ad5aa084a9bfc7f3c998e5c9b166c79a7988bc336bce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/bg/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/bg/firefox-58.0b14.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "32feb118f7388dd13ab0c6d932652183f29a9edb58285554229714aa3fe7d0a6267d05c77f82b3500311ce79af5438b2dcf4fc134967d998356a6a5a19267da9"; + sha512 = "9a6a823cc20743929758b7634cd29739d1b13a5e05e1d60bcf04d6d8d2460fb38de751721a1b5ce836d94d9202057bac658211029187b9e3890c3fcfa66191f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/bn-BD/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/bn-BD/firefox-58.0b14.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "6de4c0007aa6d4cd92af3799d048917e7bc66474a2e5ad5d21f19e43889e05fe30dba546eb9185fde5c5ac774c815f555ecf704d42d556aa1e55af835ba4e78a"; + sha512 = "943f6aa84e6d16cbebd19db22acccba7a5a532c571965a8d38bb8048e7b8d2c05d069518631e104391afc77f7a2477ff473bf233a52c898f8af96880f06c882d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/bn-IN/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/bn-IN/firefox-58.0b14.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "5e21710d5dfdc5c4796f3b9162885d3d1bffbfc2f059b4be46fa476f6f5fd5607c371ea13fdd6bc8b56ee933efa5f1700a1dfb87d39e4b781771d00474c9a5f0"; + sha512 = "aefb185b76604e2387b044a4c26bfedfd36d08b94ef2e46165e96241d7d6f619ca6a85fd4610893bba048d6d5ed542e691a6114bc02e8f0ebae814f661cf9b21"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/br/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/br/firefox-58.0b14.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "d7405b9d8ad5b9f968ca8712f8a0d468a6d141bfa386e71a2f56180cce0bac5e011a152eb1e92c0d99cdfcc09e767c67c9cafa5d83eb18b5c21d7d4f3497142c"; + sha512 = "a63da48ce02cbf4056a91b95fbbdbe1083c6c0fd5ac87918fa3f6c6bafb0cd502a1f5771ddc5ccb648cb83637da14545cb65f97eee27f832e0d5fbe6fa688abe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/bs/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/bs/firefox-58.0b14.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "bb16a1e47014db8e28ae3433cbe3ea6921397f7be1a57dc2c1d3e2764be814f7fe45f9b9be7e1ff2e0fa660f5383937f979bfd75fa55c4300427073f9d931970"; + sha512 = "15c76c096d4d3ce65f349a8fe02eee7a5baefb6f6805733c182851d41352ed33b9c6dba0d977649119bf50f59fc78bf3c0921831567d4d84c6e46a38b7cabf7d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/ca/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/ca/firefox-58.0b14.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "19a86b7ce25d485be24e50b600916b193461b34eba7e663bdb440de8c510405959d19facbf65645eb899932378fb4b720dd2bc347639676735a3026befc5828f"; + sha512 = "c949f843e15cbb14773c8ddffd431fd7c06d24d2d2955f680ad0abbee153592ae4fd4261e63d31f7bd8f255bf8c151bcbb8f5aca9345b7389688737db141d941"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/cak/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/cak/firefox-58.0b14.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "f70932c38a40fb11dc0806c7331b756217ce018f28ab5b49ff0617e59468dae64cc9d68e444f7f3cf3fcd48868a855e9ac94aaef78303abb25590be8accf552f"; + sha512 = "903ffe09f436da649610ff6d5059ee1854205fbac41531be962100883b68862a609643c40fb7c16cb4f002dd0bf1bd1c29362a24dc5197afe57038caf133966b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/cs/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/cs/firefox-58.0b14.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "a8878a591facd6c83e284e63a3aaf06c004b84d05e5a40abd69ff1a23c9e84cdbba73adfd18908a92243fbb91517c5a0a060d09983c0ed373952b49e13bfde7f"; + sha512 = "7f56d0b6512d440d131d56d0c91b73bb55057c424d8c61b9cbbddf23153095eb2615f7a1d93f63cddeddc34c2dd47bce1509f852de5138fefc3c8c491b59c170"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/cy/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/cy/firefox-58.0b14.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "94d59fdf6fbf8786707b96e7a6dab4402f8b8c4932d726e2fd1a9d55d075b0b0a03d8c2ae102e1d515ff70317b73cf7af70b4a0c7f66452e8748bb202cb1cb8d"; + sha512 = "0fa1382d9972ec5672b3af229ab6f9a7328158c52049552adda2bea2e1929f231b08a4dca909dc0a49b551eca5d7f9e2dbda303e15062f256d371df4b22ad794"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/da/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/da/firefox-58.0b14.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "2a3207f9260b95a60851f97af0fe5a8c58546ab2e5a9645f3deaf68812b3af66c7747048d6724b255d943951b363fffd9615f0529f236b0172c73c7d82e9e540"; + sha512 = "9021004fdc3ee57e7ce0ca1b2d16d052d3055c4cc7964d67b172f3a1f1d2eb091a0dee068beca9d6fe158282b79d91d19c9af56905c8556b2a7c1cd8c9b1309c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/de/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/de/firefox-58.0b14.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "d5c3fb72595b8f0e591cec922269b511afbe43e15ec2e7fa44e4dd4490d5c915f0ba17d912d30838f6bc60231edc4f5eba59c67edc586f4c39c18201ecf0706e"; + sha512 = "8888a1c15eafe22476fcbd06b6df1ff950a69ac49a732de1aa4e66f1933b1122e815294cb51876aa2137d9965c60c490443b8680d72303421a55a8f8391c3f86"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/dsb/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/dsb/firefox-58.0b14.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "8f2cee9727c7b23fd57149a3c3e12d8f731ee7048a60a85b23317b933cdfb4be9d73c7063a996347e5fe79f442d24626fbdf9ca29b8477f13716c576337efecc"; + sha512 = "3cfe15d7578bd974f38b8643951ab8ff7e6e5a41d1d3f1411611de85b25ceb62e58e76be5042dba6c51ad52b44b39a1b4646227bcfb9dd249681aef6dd84fb97"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/el/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/el/firefox-58.0b14.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "92cd90808cf3d483a44fe98ba5ffcaa9544d4eda466e96e6fd81707691b9497d89ffe6b1101fefffbec8ad4bb0b1907402eebca777cef85222a0ec9bbfc81761"; + sha512 = "649489fc2d0340eccc4cdd2ba99760a85eac52ac0067d56a1cb28cd51105d4f007ffb9def8d508fcb6b02029e96b1a13ac845b969394c301c853437ddd6affdd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/en-GB/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/en-GB/firefox-58.0b14.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "e443e5f2b79951425c701035b46b84b0830be2f9fa12972f9bd98868a2318a07090f9c902419861be13e74425ceaf709463505f4442c46e65c9a5a4f8190569f"; + sha512 = "ab4c92bbfec94e22ea1062fd63caafde671a7021e901796149f8f5bc1bdd79c5cbd305e24146628cc706d7242f20f9666fa07c1734f7c12987f75129858b1087"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/en-US/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/en-US/firefox-58.0b14.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "bfc337414ac63bba5330a1736e74cd445d609ac103d0bb0b4f80f75bd5fcefb0d19f662dd5c535dc6fc8509fe0a0d7c5830d561a13f6b69266231920e9544324"; + sha512 = "4fb9f83f87d0cbcc5bdc40ccc15aa00f31f97055f8a88e7ae43fe703820eabe55520647645092cc2157958e6fb0883c705c0b8e1d9f369be3b8e922bedd8a5ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/en-ZA/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/en-ZA/firefox-58.0b14.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "11041d83c119a167e943083fecbac44fa1985f4ad1cafe6318fd7171722cc7f709ea84c9de8124424ff8142af7a830892de3e9f313ad502d6ff3d8958a0d131d"; + sha512 = "adc8adfdbbd916c9f454127664b06fc3db0ed099af1d2e0bb0cbd834b8cc9b78d1a8ea54e642048b4316c55465438c47335ac5eb53e321f92de8198deb9d6389"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/eo/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/eo/firefox-58.0b14.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "7b7ebf6828698732658f5c579d74bebf4421779e93bb5f7e30942aa4bf0ef83f9a3e06dadb36894ee45db2d12a23aa798c9326d1c974fa0855909dd99f1b4768"; + sha512 = "33fe20c647cdcd81e50b15eac265f0afc82092fb714409dd493d4a604ab8ea42973baf380bf2d6aa832a7935755bae2dbbb5bea7fb98d0233a75351612dbe665"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/es-AR/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/es-AR/firefox-58.0b14.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "ee636bd31445cf61805fed701e26b6ed7c00e7d022867ed4ab65964c011b70730bb30f1944809661cc9b3eaa5e993acf64954ea1eb7350ebfa58403269d61b40"; + sha512 = "02350831b7183bcd0219c35d63367d6213f29e9976d81622ed078be49c09b8195df3926497193955357aadd2e0b2c401cb6adc260186924d7e267028c234b74f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/es-CL/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/es-CL/firefox-58.0b14.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "dd7fe2b9a337aa44e5277f8d693f30340418e039f5c4a597b25fd264199fa63cbc934da240e13cb271e6da1de3f8502b66cd59101f9f13f9a8353f8799ec2ab5"; + sha512 = "ff0e3a1bf143d5c7f4cd90ad59b1113be01a29022e8ab1bc8a26dc213252ba5356acda5855fdffd94f59daa6679e23ec8e72346a929561598e19bf2fc1d96e53"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/es-ES/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/es-ES/firefox-58.0b14.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "e6da7a4e2d392ff05752d936748e7d4ba3362a84ed9a42b8998bb1a0f8fe55d87d56a256badf76308b1c3fbd1046e394633360e1fd5cc2f3c2f3085bf165a360"; + sha512 = "39a41fd85bb37de86787eb5e6c769894cc530168910f9f465f57830ba08f0bf4d9106d146c0dbe836a080e69454f30238efdc54c8ed7ad1b46d8de82184f54d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/es-MX/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/es-MX/firefox-58.0b14.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "4cd4408a958baded9016af99e1c570cb6438d5606b69ee1a8e95c96a5761b5e291fc5c81a8cfd22b1eef6cef0dfa921e2cc10274321ea97b94f2078e985741e2"; + sha512 = "68caee4ee9fdb79cfe772eb2229aa9694c49e88114e5b18a024ee91382cf59dd99bf452efe7f1bc04a618df2652bcc4b21f16ad037cca4a9bc0f19724642ba2b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/et/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/et/firefox-58.0b14.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "8ab322b2031015e55afdd1aea5d600ac5543a98897a4660f891136678b43b4ae9bc59047febbeb67888b35d84c1540eb1943726b852e7837c4399a0fb075b4e4"; + sha512 = "b263908dd98c0ea3a3f7a979577da67f1dbd9362ef8eafae877081ffcebddd756289a381717634345429ba77d5fd51c36cffc5cd08c6cea323aedd5c87b62002"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/eu/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/eu/firefox-58.0b14.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "20f0d664184e934c4b3482c5efd43c9c49a58dc3201021198bd07148069c725dbebdec6780f98516881ffc5c0a00c5bc1de1a5ad014fa998d63abd7360a14fc9"; + sha512 = "29cfcab146f87d671dcf7723a8e34cd8993220f855cafa23cf658ae1e34573017f947d78620f60d473855d1ff215cf39e861d6cfe7fa9138636aff206e467571"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/fa/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/fa/firefox-58.0b14.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "a2dabefce906f41bcc0d9dd7fa34cf4a68004cf80c9e796c5165e72217c943aeed9bd41d6d546a69d8726a3c44d900aca483c4573af4c260aebddd89299855ad"; + sha512 = "286f2c3c13fc43d20112d10ad2c32f6bbd6531f9f0d2793b5bb216b1e6b10c49c139211faa5a31d0b128009e2a70b8fe889a8fd073a1ab281b9b09b4283d869a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/ff/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/ff/firefox-58.0b14.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "9edcaf8f928ed274e9055daaccdd53a0d4902f1ba43233e5ad5febac0c24134bb4cb9da94e5463f04a847bc7e32c1b11661f3e987120e50ff2e9e88a0e903acb"; + sha512 = "9af5bf988b04c1b9577fcb56a34894bf35f8b5d71fa93271847cc5114b89d089c8955f0ea3fcb6f8b76ed1965fc723d803da47f2f7f1bcef05fef0346fe740c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/fi/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/fi/firefox-58.0b14.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "200d542e938b05d4cabe2d86c1cabda6c122875c9f76a94f20918d491cd74e22a8983a51226a084f5d7d524c84d6d156fa27ea58c58c5e0d850ac088800f67bc"; + sha512 = "db25ac73fcb4a2543204dce567344f80dcf5b873395ade64f477ab5b775ef912525de785f8305342fec6b681cde8e098b13d584cfe22c6e5a80056daf5b5ab4e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/fr/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/fr/firefox-58.0b14.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "8825ec993253b797c35c77d46d3035fdb7a8ba662469f1bde98cf5252819eb167fc05e27594834f964989127002cbe2d388ec573a93d8dfaafdeedd19f96d147"; + sha512 = "451eae5f1bbc2462642bc2fa427d1dc6e30c1de6321e94acf5c10ec688ec1bdef8ebefd316cda77ad5786ae069de4e05810c0587ac931078380fe6892b96f782"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/fy-NL/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/fy-NL/firefox-58.0b14.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "81cad40a3a13e53e769efbf564d7f9226d8351ea31160019078988f074069c6c63f3af613668f6d2d62d2c38300cbfdc064783d58fe58f027240ddbf97cbeeec"; + sha512 = "7d1359fdb29c018f626bcbaab45147b1265f883b9d6923541dd7199df0a090e9cb79fe8991ad128be9e49586aede6a9a7ab7439cbae9d6b152124c28f1210049"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/ga-IE/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/ga-IE/firefox-58.0b14.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "3b1c4deee30695f331ff953a28a6cdc6fd97b73dc455510b9d2e0af1261936cf0290c9d38bd173337942c1b513c5f2dd8c0707bd59ef68b01bcbb46a3a5f7d61"; + sha512 = "6af25a7ce61e41c44c8d5af9a5194c8a02175074d8f2f046170d443fee1486596546484a6d1be94f1bb1c809bfa0408de229b02f6bb4e846ecc70f5565a3badd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/gd/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/gd/firefox-58.0b14.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "4d66c30aec5c5f8b8c8f19a927f3c2cfd4a8acefe925b5f12b54867a8ba6ad9b547db28c9978b64c66ce770b1b2467798d8289ef5aeadd039d68c9383f8934de"; + sha512 = "b11a57d9a84e3ca30093be36207bd45b419fa267bdb50c2b3bc90a74d737782b5385ca325ad990740753bc04c14cc4c9f1680d0f4a4d3bc9ea618090c223bd58"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/gl/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/gl/firefox-58.0b14.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "5bf4918007763f29439acd6d387d0564be5e2f757046913be873ddca42cdd72d00a6ba388a0a92e73504e02827cc378b2573538cb2b7e8ea1f43d28ed1e5ed5c"; + sha512 = "3f0b386d11d559fcdc224e74fcb728473861028c9aa0938f37e26b11e8439e8cac5558139d2322acd8107226c8b7ceedcefea40f5d7f325ab5b4586324733e53"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/gn/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/gn/firefox-58.0b14.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "7405b7c53b57f409ee61fdba73a5f7504109b8bdadb6bfc88fda5fb09ff3898e641dd4fa3e5921b357a5fe5133e060242fa6b36bf6b61fdc77c13626c8ce6abf"; + sha512 = "761ae605a5dddf3598896c9fb552c3ad0b59e18b1c17aecd6a17ac5f42cb3d6b2eba066e3225f46255818dfe11bf32dbc08d1e0f4042ce103cda4850bc8a50c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/gu-IN/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/gu-IN/firefox-58.0b14.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "7c8cdec0e621d5bc8fd96d9c4ea37bbe4e0b908e1f6bdca6c95267cb9d55e9ac32abed037bbb170f731d8d87d409a9da47284329e7195eede74c42c8916d16c4"; + sha512 = "b2c0c40fe81c4abd92a7a7524198c35d663318617be2395edbfdf77a0b0f1676a2cbad5f26cddee4ced4650bb35e7babcd1fc40dc7c053c4aae2a795bcea4514"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/he/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/he/firefox-58.0b14.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "edf4683fb9b3c9bb84d4e833eb702ba6679d91ef301ec9cc75778196fb5638ccb430bf3469432ebd188833baad157a8c2322b08de50080281c71c997ca677e15"; + sha512 = "099972835e69966b6526ebc96493d24f8418f7bbe5792d020481677247c0a9afeb16436bacf3df0e0ec8319e1a7825ae699be201ea1682286168779a0851f9b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/hi-IN/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/hi-IN/firefox-58.0b14.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "1ebbf41bc7cc94af6227e25d6bff9a824bd8dd689c00afbdba1bdf10729103ee28809d65bd85b09d993c5774bdc69910f985d04de8fec5e12e929cac112f9d43"; + sha512 = "da525833735d6765198e125432672cf2584fd01e1ebdc14b72472be5be5f0c57839672be8593bef044768fce50d287bffb0f6fafdcb5a8db6b4904266017c670"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/hr/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/hr/firefox-58.0b14.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "7f69f785b72d965f78d6bb8ab2c1b9dcdde07ca67eff3ef075e0a2466cda54942f58c55e409aa9660f181a9c9cac6bda026b0bdc54fc19b1abec539cfed93ee7"; + sha512 = "9bb35d52ec3a217502d10304abb03a791923515bacca9b829032a9e07d4937a8e3804daf89b2ac5b925f009db8d1bd7a41f5fbd31acfc03f88aad1fbf86f594b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/hsb/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/hsb/firefox-58.0b14.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "34c2ded27a5c93f5376eb3a0b5d4f7db224bcb5ee9320385936665da2a784655797b2e80ee4707517d6cd3cfcefe3dbb901cb46015963e2f38791e4839bde760"; + sha512 = "82b8140fd9369a902531f311533e2e4dabce9f514cd4ff88e14c61c473466ef01e6fe09e73abb11440595153ac2629fdc7d94ca2db887e0965e2aecc789f71c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/hu/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/hu/firefox-58.0b14.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "8b2589d93ad2220abfb0d5d112ef00683bba4e96e50ac95369df10b7ca5977354cd68d508a077e7a1a72136f2f0f8281e982ebb5e4ba9355ba10a5e07008a47f"; + sha512 = "794efea4a84b7c851c5aa25d12449e347420ff7754579ce95059400c60e74d983cf0f3d12abbbf3b384c4649d68cbf9728555e89d03717b63b500ec93f366272"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/hy-AM/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/hy-AM/firefox-58.0b14.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "c47c55b058cff5d70bc2cf76c6cc395966c5232c5ccfbebb304a0c7927d29de123070e4a193f69a79a6106f865daa0425b1ed2c10001815822f263a0ed9c3234"; + sha512 = "97e811eeee4dfc051ae9dd79046816d106af3ba3ad9a46b0945c59ec18bd086b05a563d4da2bb2d718cc9aa28dad9aff8f8ac86779e27f24fa191cf95c072094"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/id/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/id/firefox-58.0b14.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "97b17727c2dbf2d10cd845295defe38ed2f485c39982fb991fba8ce8f95312146f691523f0123b23b4749f05ac919c75aa950914199ca27b1372ff39986f1289"; + sha512 = "aee9605151d846a045d3d7e6c7ce4a863d958bab9da3bb3d23bd02d1f59bb1980f118d16564f8bf8dfbf78ddb3405e9f3e0b940c3cdb0437313a4952da8d0887"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/is/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/is/firefox-58.0b14.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "1b9750f6d185cd17c8413da519224b7b40693909597aa3363660bf61b421fb125ee79fe69768799fbfa541f992e398e4f431c8ae8e2b03191d24060ae87baaa4"; + sha512 = "00d8bde6dc4bfb79894b0ddd2261b940ed2f6bc94dcf7fcc035ac1fb6523dc4b6e9b35cdfcd3ada27591cb62a5908e435761d85b72c754283e01f02d5fc7a2a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/it/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/it/firefox-58.0b14.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "ca2fa90f329f820a5e413515f45e1660d03474862c30f5ed5f0eca86389e118c263b032b8d66b4538e1c2e4176baf052c196ecaaedee61fc4d46d51b8c7a2270"; + sha512 = "7f8ee0b38514a49caa4695c58ff620cf337e26af5f0c3dc8daa9236f395987b409bfddc1e729cb80e2b577f9b15cf66568dcd06af1f55db03b80197ef3e7831d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/ja/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/ja/firefox-58.0b14.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "cea0e3fdf682e32c4cf2bcc3c2f24716f722382305179ab0e59cb3ada9f14ac180cadedd80c97b4fb2dc0ea23ad8ee87997f6b4803882e2ade8236348e0134c6"; + sha512 = "2ea1ffd0e86802d650b137f74429e42f6e0a1b9cff90aaf55565654ac22c4f99fdc730c040a85489ee7a563aad4c2d7b2e0e0e16e8647082b1a9c6d128c34c8b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/ka/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/ka/firefox-58.0b14.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "6d672c87f6a227c060f88a98bfd2ad02b4feec929cbed8af5bf7f9929a189a4df93d60522611532b13306c8051a07f1d03fb197e1916dcbdfe5cc5c01802dd3e"; + sha512 = "9612f10762cb826123201380a3ce8ae08e1ba14f7eafaffec73627c0e087ac814fc4c5799368a802489a804ca58950a1dbe015c426d9019ea494b644d435edec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/kab/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/kab/firefox-58.0b14.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "65ac3081fe45f2a93d76a62a99c67a45e7dc5dbfb0f566dc1829f1d3377893a962d9325c4a162fbb2c9225935a4cd919387f31176f7690d32497a2a47aff65fa"; + sha512 = "f2a66dc341f651de1ab1e6375bf71be08edbb9065015ce2c7422bd3894c850cafe0188d96f5a44db7060fab03f00bc7c7e683c13ecc9479796e52cf60811f9ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/kk/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/kk/firefox-58.0b14.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "f7f22aa439708d2e10f84153d1c6a2345aeeb6dee619662e4f62a4a13733356cbfc4e1363a804638aeadaf9e687f373e9771dab0ae55080e9ec0cc153fd8464e"; + sha512 = "7e77392cb66194dbaa0880cf587275bbdbe2f395c501f5415ef19585effb40550857fdd6f7b67913aabe8718aefd3602f995094fbb670a00fe7db25f69be8776"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/km/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/km/firefox-58.0b14.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "4ff49d90c2cd45c53989ab2081badc5b146e20b66bcae2ff48184c531d5cfd0cc6a1e4ad3c57f214d9d16d800a0c7c1c08148eeb1440b6ae4d6d37fc34aba53f"; + sha512 = "2ea267311c6677bfee22c3eb287036404607492426f8e6587f7ed78472e599d646de3dd8738ab6db48c4b73892a2be0131daac1297dad967d9924d3a98aacbcb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/kn/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/kn/firefox-58.0b14.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "eb4d80902e96e6f79cbf7d2f98d2c73ee09409316f89e6a9ee5043bdfec7a451fcdb42a2d49eda12af73a77b356c2588d7c47972777998713257faaddbde9ea1"; + sha512 = "07fac06877aa71b3c5e010453ecf517df8024ecb888c202ffd8d97fccce8bcecbf3516e487c6e639e3707d7ada1066e1469a211af72c03a15531fb71c5fe43cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/ko/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/ko/firefox-58.0b14.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "3eb3f4e16023fb317f70b358ff5973dd1ac444259beb2077a4b02b6ebfe43942035e1f847f38582784f2ac78a2ae098526c7155e5509328edf7162a285ca0bd7"; + sha512 = "78abb218ca0104998daf49f616e2dc3f0654f82923bcdfe5333b54b1f716639a14640378f9a102068401476ef2b44fc7f6c8c363a0467f741eb35a04c5df6825"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/lij/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/lij/firefox-58.0b14.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "442576f3556ee04b043d5d643c2fbce53bfb3969145a752a125b648200cc98a3a2207b4adf789f17422c66a47dd63d74fa02928a430aab564762bec3f2e199b6"; + sha512 = "2da4f0609788e2539b2d0fbc460f55a80b736d38a84651d4ff68fcb44faf4cd47212c7d0b026b5231b1926810401e819359d23a388f9e86b66247e0b956536d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/lt/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/lt/firefox-58.0b14.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "5edca2668ed8a638de9c9be287580ac392aefbeee982395a56c4d1064266263e4bcc6ecae0c65276b90035de9ae7a51caadbd93295513a3606b74491cb9514c2"; + sha512 = "8ad611c87680184c207f3cd7a1e8ca1d06cf3f7d31a4dcf2ddf04f02c4d1ec0098e806c3853d0decd5e6485a87745f6bb79e81dc936e968d25124838b0e549f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/lv/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/lv/firefox-58.0b14.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "6be7874a6a1367cbdf501f4101e2a65b5ef60df081e8f402f1ef51d82ed0127c05c50d87789a3cee54a92802e918731e0b7ff02ee3feec1d0bbaf16ee37441ec"; + sha512 = "c6db944dfac8ab41e4d02876fc43739b3501585412edc289ac8836a64f032e937e7e7da8844878c530df16afdeed613825ec7656352d01c7b06e6de95524ec9b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/mai/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/mai/firefox-58.0b14.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "ee60c751823e2ae1b8061cce83386dd9ef7e79b95e6925a211654af21b02b151574d5a8ee77a3609d819468961a316948d5692484ed71f1c071a6c7b9d8205b3"; + sha512 = "065d0a58018572cd7e2ef5f9375afae05d0f78d40b077f07973a4543493a130221c2e095a514a3895a31bda08300d721f8543019e59482107cacb421d60b526d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/mk/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/mk/firefox-58.0b14.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "8f01fbc8e7e225033e0210e4307160f4f4b3ffbb51a2e27c6bb11bee1f357f9b9467acac9d2d9efc7e17c7dadd7180b8e739d534b39d43f38b2601809b44a21a"; + sha512 = "4709e081c376399cdb379121284b3c597d382bca3bb18c02b3dfdc3a7bf8e9279a90ef660781f0fd5f67248921c58fb9d7eef062c4ee03c7e43c6fb7568512e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/ml/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/ml/firefox-58.0b14.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "d230479669cbfe3e772b6bcc84fe2bd707211c45a63c5af028aab243dc3cbc5b5900e4973790ad7a3844068dcc87d00a3570148db45fc4829ab445389b188ede"; + sha512 = "64e43847c47598bce7ebebc8f769565e52af2d98c6e24fd2bde5bb0eb47721f6319ca1f27384ae18556c133a2e5fb61c18e113513eac992bc3c693f78fe512b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/mr/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/mr/firefox-58.0b14.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "1dc41cbce5a1573c332ef97b000152ddd2d37ab805d64a9b30cb4c35a3ffc789eec21a9731f6a7b82c00a32bfabc3615ba2b5edc3d24f24cbe2f033d98f342c1"; + sha512 = "6a46a4cbe8396d4660b6d98580c485a1795ff0de86b00d7dc524571370a5a4f686476aafbca456b9eb329e06535128fdb63c8c2d1c6d89dd25bd73efde614ae8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/ms/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/ms/firefox-58.0b14.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "717c9bb0055cf537a874e8e68fae8350fe6d93c6d0409b2dfa9bfe4e0cc363a976ff8d8099b97ae96848e1adb23f9ee506ea8ddb98ab38a9469bf3cc3bc0e4bf"; + sha512 = "5221ee1babe9162c994b7e500d055593a977d3e2ed0258c7a7182f836ba8c53ea82b96648220ae1e2e9cc0d2b4a533832872cea1983022f78abdaa7b5e6b9145"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/my/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/my/firefox-58.0b14.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "f44dc0f81c5bda31c565ac8fd91c6d55126b0ebb7a3a8296100681cb522e16ddeaa2539f26bc4a515787adaf8373b71fdbe9433496b8697f12656e4600980152"; + sha512 = "c7ac55ed5b5a97d9913fb4b49340e9bba27a7a7bdc39031d961e01efa3e3a845c7cc7dd4b60b13390d8c8142a0981bd315026c6efe4e1e298560fbef8d727209"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/nb-NO/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/nb-NO/firefox-58.0b14.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "88b098acf8c56b69fdc8859e117612493661ee0a41935cbd92842c4c61080f9cf305cb0804cf88556ebb503344da1f34f67332f50d41f2fd3b1bbc5ecc5b2adb"; + sha512 = "a4e1c20948ff5b39652ec1794c89ea31c4c5410ba0929321891d4d2fe25f20a0d29b76c89554a519cda383ce4a52a63f74d1f345c7fb9f6a1196195356afeeb2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/ne-NP/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/ne-NP/firefox-58.0b14.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "5d02eb9558ffee0c3ccdad2317aecb63629b6683b180bd38cb2c4535de89cb44d29c9b7594ab528aad86ccb3d6648bd7fc39d8d883cec8f63953d74a1aa6f91c"; + sha512 = "faac387c54983dced165032030cdb3e821951419db2319a747f05f7092e85f95c1094c25f1753367fb293a08f15878fcea45f5841753ff7a5058e0af92021bcc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/nl/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/nl/firefox-58.0b14.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "1ab3ea57c188ab8ade55def0fe02a7fe81b88b6c855ff72b32609d27cf3b3c152c239d091a1ed3272d671151207a0776b73a181af6b3d375dcf2e3bf1ce6e5a6"; + sha512 = "ad6f71dd875f0708d5f3a81fb5850b7d61248f753f8f71c2945d71f4f31c302ee7dc0dc371156bb075c1976708ae15d2f363055c9246d2975eb693b78ecdaf65"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/nn-NO/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/nn-NO/firefox-58.0b14.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "51cf9bd5219da8f6b85ec236fd7d0e6ab3644def6d1be4b20f3542a6bffe51502397b96829fc23ecccca8e313c42fc21ac253fd5233e59ae4e9b89fd95c419a0"; + sha512 = "833246386b16bdc3f19e19b9cdf5199676de259c295297fae795c0f762b6229388e13ace64cae35d35435b1ee48352982be9e573154931845fca9240048738a7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/or/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/or/firefox-58.0b14.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "77d6dce4289302936b0cc217ce5eb063af3bff8587edac723c765915428da30e4f54e44f85c18732a271d84b8af7abfc896964b40f88790a6b904dcc50b847d3"; + sha512 = "1b22fb3d4f8ec57e372cc7e05e4c536a72c8abd5c90555632e92246d634a3578b4291e652bc2add72badbaab7feba4b2c84e855fb998d3bba31106cbfcb5d7f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/pa-IN/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/pa-IN/firefox-58.0b14.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "1e3c9c4e8ad0268fd7c9fa16bff6c738e7a80d8a1978e551060b2eca2ba0f6198246e378e82f9eebd67c775d66dc98bb4dcb2706d25a70a9b2cd384374c4c56b"; + sha512 = "c0ad5fc40fb65a22bc75d3f506c47228d709c7909ac3a7da158b02d681594dd08c030508ee4a8db99a08147f14d001bb6d6bb995a494a3f4fbd1c2e0a7594c8c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/pl/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/pl/firefox-58.0b14.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "24f1e327c299698e8711c38468ec404ab3dc4a59bdd9a493f86a03cf00afa6624d39a7f6e9dd7bd7b6a722767414b3ec3a30c490a5ca76b0f8ac71f858fa38b1"; + sha512 = "e675bb4a54fd5702881fc3914435000dd52e4e65578b05b940d4f7f4dda8df59196dba9e459e9ff0efb1e42781548fc0b566ea0308d37bde259f78382e05e3ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/pt-BR/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/pt-BR/firefox-58.0b14.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "f46b405567add664b9cd45052bf1b2641531b08af0336f65ed84a0855e08cc8243b8fca6dcf70d6d9404b94e6c9a9ba5a1f0e3e89f7e4b15976ecee72003a09a"; + sha512 = "9b12ef4426b804bc0b72b5ad449adbdb09f6280286f761c55ef4695f1e30bec07ad796c84fa007f2bae0e53610122aab630753a9ea544242d4eba465df7da098"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/pt-PT/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/pt-PT/firefox-58.0b14.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "3fd9d4381a51c47462fa6562f0d4942c11c1d2588520d7900e93dc6a80361572824697063942734085b67f6a81345ae7e0f1d4b10c9ee86a95dcbfd86f9ee074"; + sha512 = "d24a957086c3769e759adc8b432f134f8bf19c6f1a0e77594e36c560cd25dbd9bdeca0bdc18e1013dd745dccb3535f4442a604510e77dcb5756d1f48364a8655"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/rm/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/rm/firefox-58.0b14.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "04e85dbfe005666f330aa285c5fba069ace9398465a4e730814ef459f10e08305be8ce40490d9ecffbcdb0fed2e9c46a96c16f37c2eefb2f0cff3fb1afc61019"; + sha512 = "07168aa5cad3e554ae969921a88f5141c3f3c4cd6ea96787dc755dba2a2962e699687ecacad17283a9cf06caa741ca957fcb524bf46b571c14c6cf5a25c7f1d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/ro/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/ro/firefox-58.0b14.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "75a4f8e58dc00889014e4e915869e12bb280c4c9f356523a88504a686894bf0116c1f9e087d0f32f08fdd7bf721d2af3dbadaea4f5b5dda2600dee0f77cc7029"; + sha512 = "5c0e3b36edbf5bead24b8894361433c1f14c407571af9170f7f57e66f15d8caf5e66358f626636881b938bc64b7eaf1918ff43f95df8310edfa7e84487b9260b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/ru/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/ru/firefox-58.0b14.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "65b74693dfa60318e2295205323ef84fd1b7c1acbb8c9292af506bfedf8a2139d05e8dca8eed12612a6eea54f501079371eb093feb93bf87325c8e6b4bdaa221"; + sha512 = "f171522b4db6b3f89d0fdb88c9409e39854c277b5cd06e70c6ea50799f4a231d0c87087c2c741910bcc392e0629f2012668fdd5774bd0edc4fc35371d6200b3d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/si/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/si/firefox-58.0b14.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "158d7c307269e5015d0951b501787ee0a900769f730a92686bf8866912707ae9f6a139ac1fb23448e2f0184bab0ecf4cf84752cf57a8c16f2009c3824dff256a"; + sha512 = "470649c3ad59f34c5356f8d3048ed965e1657e575cffdd6fa3c98a43f1e7d83919d18f1bc667d831f11903d49ca2e258a30171403520f1f00fb79fd649964f15"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/sk/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/sk/firefox-58.0b14.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "5ed7da411f60ad143f0bfac88d47ab2ffa66acdb89ac46cc6302c023d3f877f6d3d955b8bd5686b461fd6a8e643a3b8dfd3b8dcccaf4f313f5489bbaf131a435"; + sha512 = "812d9355ddd75a369fc8a287695f28f8ccf8e106496b35ceb78fa274f5a12e7b05143d7e94c7f97968444887ef6a98d31ecfb0b78bff1da591b7f6870551fbbc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/sl/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/sl/firefox-58.0b14.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "bc1a436c78e719a04c6e530d9dd9b2223a47a018ae62e7c22cf7e7f97c4b90f03a9cc91fc88a4874e1847800e68702b91a9917078959f5235864f409395d8b6f"; + sha512 = "b18ec3b8c6f0a2ec40a3bde217d3b4367e74d9a063dca19702b94b1d16484ea90dee45b9c709e9a09b5a310fbf4c94660703bdc715d8c2c6b2d875579fd124f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/son/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/son/firefox-58.0b14.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "17162c1f5fe8487b1995cc6aea7ae8d002824254471a7e41ec8c3bed47d669342038ac480046f21bede29baccafa6c50c76a81e5046549a2da5f760c864fd648"; + sha512 = "7f6954211565c3ee882cde11a374bf0a71208265dddadf9bb2157503dddd8f3dcdd4a1c8e91f63970a3dead7cafe1c598b68d47f93305bd40df22f862f60f6e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/sq/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/sq/firefox-58.0b14.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "3afa0ee8d4d3087ec93d1bf8292a74f15bdff7d6ca4f3ea7b6c24e34f1fcb4183545f0d53e3d1325a5fec13a42ba7b3922a0f1cb963ea6bcb3507a477c731da0"; + sha512 = "c978ec9dc1f3440c96151cdb538935f86a615da24b3724b2a7d1530b697ff36a6ac195fb8b89e6736c1c8cc3ece70f58a378521f361087158bf5e6c237a1016d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/sr/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/sr/firefox-58.0b14.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "00f20f359c8eb9e1f5ce11423ca11af8eca228d10d78ca4fca3501d0fe2426a18aac6688e42125589f277ae1600a241949f196431e0ca5231fe2370fa3703745"; + sha512 = "f74d3da16d9fd305044b1623398c171bde03b2a6b86c1323ee609563bb944583a4cdfa4b177970093213284fd34bd6792680be18b4dd194b2aa1622dd83dc2b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/sv-SE/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/sv-SE/firefox-58.0b14.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "547af37e07626a138ee5977cd4a32d6b9f2b03320c99ff13e92bb626f2a2d3ca2d48de5d457a5240adf44c33b68aa79980f8240ba29659b851772fc0ab24498e"; + sha512 = "addf65f6f7b6dd0f378655330c634074227bb203e9ccef28b6d218d9fe2cc491b47632543a767e14e3c9b7bd073ebf66cd6c5e2c74006ec5cf223b8767edeacc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/ta/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/ta/firefox-58.0b14.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "1659632355fa9e0f4ecde5ae50c210b3f0c00cb6cfd31bc502f8d6623f969eccf7c3ff8a4cf972e83206bff09a3778df83c3e9e0aa93f64aad78c135bd5ab17a"; + sha512 = "88a30b82193dd00a1e906bdda6c7ebedb85b46a6fe7150c6302808b777fbf611dcd38ffcddb41fecde20f4c49d4da696a587020e956daefc5805cf58f9fc5937"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/te/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/te/firefox-58.0b14.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "21255bbca8b372ee295caf228e19a789773c45571732e522cebcb17f2dbc969879d9b50f699d5e1e2f874033ac84add4d507a8789c61af3c8b2a2ca75b7419bc"; + sha512 = "f8b77ba3874b954191b096d3d3aad9a66b1d6d24b65bc857bc94642ef279354e6f3fb702c85279e65078ba389cd4913f7d0ccc81457afc59db52d8f80da19a85"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/th/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/th/firefox-58.0b14.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "644ac1d67eb10a460924a7beb91ffc13321b14cceb3d60af7d1dcb89626bc910d069d5e72c92a7e49b9e21c0dd1aba9088c1381b080e80afcf374c768c2a73da"; + sha512 = "99ab0c670ea89578fcd578059e0270923bd2696d079f82c4a3c142c5b3ff8c04ec893401191d7b5cb695e503ed7b1821405e36199f6c0fb02c588b1ed38e3769"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/tr/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/tr/firefox-58.0b14.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "be9c78d88f6f37de591c28f9ee189b29fdc63ae3be87e8108aaa76bdba2d07c1e9cc00089a99e3586d26b8212b76058bdd2393dadd20482be4495565ca384336"; + sha512 = "4acf6db1594f3f1ae795705df0903a44266975cf7dfa4e28a42515839bcfb606fdd73395b9487e549a557fb63e6917bdc73c2fd2ffc18fb006f02d68971b7df1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/uk/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/uk/firefox-58.0b14.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "116ca47723172dd6bf671da490e6c1a092e61d1ac8afdc931d14027b95220f859cf5f36c230808aebd28215ff779e2b6cc18577148610028178b7cee686f87e2"; + sha512 = "7815fe653908299120e1c876498fd096cae0e4001461f56734d896c87149d25f2caf6aad2221989d6114d6ef275b2d4c532c958ef26d38447542196288d01c95"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/ur/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/ur/firefox-58.0b14.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "c82da77585a642d3125fe44a1df55ac4ca17abd1ff09ee2590b4f1f98c1129bced818ba661ce36fdcc7de47cae686b474f3c9f270479b499b76f2c7584fdc024"; + sha512 = "d5a4be68e92f9fd386b2f16b6701507d923b984448db1b25fe94d9cdd30cfd3650184f6ba3157a9ccf55a6f65fa4a1516cc3b9b6b75479cd8a12d9fcaf5ccb22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/uz/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/uz/firefox-58.0b14.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "aee10e92378ed9a32510b4cbcf14b7c8f5e1a2df55ee7e120d952d4871915e2455931f5fe9a4cdcb7a9fd706eb6755c62e4db66c676cc08465f497f61451b4ca"; + sha512 = "f7d7a81a050ee248f68f789ac4bc0625b1a38084572e7a456f8256926e80e2b70a98e20c63e39bf9cddc23161b0e900c28cf5ae3f91bd763348d464f20adab3a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/vi/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/vi/firefox-58.0b14.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "45a3aaa79c8294a0540dd472c2530d02e03454e7a7ef95cf7ede54b2c8ca396c6749b89d78dbe4499d5805a56f0d83d19692f25846ad838ecd6eac8f5153ed3b"; + sha512 = "1ddd8c64d6e5ecece8940131870ff36b920a0adcdaea789f864d9c01894d03642d6715701525cde38f014985d6e64fd40ab34d7e0469afb88c9ba117287bcc07"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/xh/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/xh/firefox-58.0b14.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "f778e9a579e3f39419880aa2833ca1add8ad0ad70c08fe301f03725cdab4494f091d56b7df5452627697d5a0cacf8194b5f8837dc8139ebaccb0e6cb45001805"; + sha512 = "126498ad2e19e4d52507fd2101ebbb0e9470651afd0f321fa815c071b7baf2c677f58391f955044eb5afda92ba3d9cea26c78c8edc9f612072bb9b737dbc9841"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/zh-CN/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/zh-CN/firefox-58.0b14.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "8ff54e5ce5dc169633e26f695461cb878d87703cd1566c8562ecfab1d6b8e1b83604de5ab30cf4d080300684c70150554dd5bf27da5aed599c1bd21c94eeb04e"; + sha512 = "5b0cc478407ced0586b708185351fbce09467388296767ab77d41fcc5eee166e7dbb4d0a08e36a9b612efbbf9c71be92c81b620d1676537533cb8d5eb53e37d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b13/linux-i686/zh-TW/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b14/linux-i686/zh-TW/firefox-58.0b14.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "51cb8b19322f91809cb92bb5d81929ac194f8f093e48284572f40d1db36fb8383488f242ebc1eb03ff4881362183eed1f6e3589708e20a2b9121766ecc1bb992"; + sha512 = "c4da7b5382901527b4af0756317dae4fd293a7e74fa428fe2b2568f0f865f1f560b37dfa2e2ce690ea4db95d27cb67a0441dfa176a9c53a70003e408ca601204"; } ]; } From 204655b0e3a60ed540da8064b889fbe8ecf729f3 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 5 Jan 2018 17:48:11 +0800 Subject: [PATCH 221/296] firefox-devedition-bin: 58.0b13 -> 58.0b14 --- .../firefox-bin/devedition_sources.nix | 770 +++++++++--------- 1 file changed, 385 insertions(+), 385 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index bedae3b3bce..816574dec0f 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,965 +1,965 @@ { - version = "58.0b13"; + version = "58.0b14"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/ach/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/ach/firefox-58.0b14.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "11f0a522efa1dd01242a8490232ab9b9c522c8dc1637ecb6608c22f6a9123e952b2c8a311bb9b71ab12425b3e151b1fc732832ffe373e46ce12ea8c6db0fd031"; + sha512 = "74a0b3dc0f1d603f19c16b7e300b534ff8ae23405533f744b5e065dd98310a00cd3f3c01ac063cdcd9e6225a5164beaf0a3466b6afb521b15cece191289f9300"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/af/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/af/firefox-58.0b14.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "6eca1ade55eabab16244e9f5e264d072f304f2c3244e741f99d4e702cc09dcfccb0d358ed9bef0a23fcec80123986c11873507bde6bcdb6b566ed7d7d7dd3fe1"; + sha512 = "d011e8cb436839ce8a472b6dca23bebd4b59fe958f0a9b447a848db5f3843114ebc54afc8a2e117aa89fc6f85f73704324e73d57e11c198116f867ee38c78242"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/an/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/an/firefox-58.0b14.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "0ff70724d47ee17f78dbc17d668a4f4d8520814de5680402d0ccc84b42c71cfb3ee9a597c679eae07c70b72afd69c439892cc4a3773e54432895d0307e51b6f4"; + sha512 = "d6e4270ddb47e7874bcbb6db90b1bd19db336b48abfd0b8fe4853e534ab3c660686f69137ba42c30f83ed8f1ad7fbb182497be996c20f83c95b203e37a1ef848"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/ar/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/ar/firefox-58.0b14.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "1cc50a7eae66a116ddb23c3659054880831252ec2976c9e41d79f84fd331373bef4148cd29c46aa96fb384797831fde12820a35729f1d44485d580442d3d2940"; + sha512 = "5cc9640e820746ad71ed9192e9e505effec27c9a7916ed42a0d7a41d95c95c527f70069055712cef1b0c89e7677e7fe36c2ad5169a6721e051a114b7b5eed65d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/as/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/as/firefox-58.0b14.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "66b9ff17433db176f1f01e6ec03b6d0bd37646094b7d76beda5974142faeb80c6b0f6563c5dc7ea4b5f517e1d8b5777be33999d1b7cc9c69afaa19712730e984"; + sha512 = "635c3ff3fdbf7205dc4cd50a2658340b0c254151cbc59ab85eb16e560879644cf73c03420e5dfdc94d0991380efd657e1d9629d14ceb17b1d7bbd007a56b932f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/ast/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/ast/firefox-58.0b14.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "1ae076d42b83d17ee7ac69d26f51bdf1dfc2d376d4264ca47500c002246f6b14313c02bb7903b4ebdb2ef67f7dd65c4cd70acb132612e10ed20eb37a2c301af2"; + sha512 = "f48c5a16effef2ced2f7cc028123132ec3c7bbaef8b02ffc14c5f1890725c6f6f5a2f891a01c07a161d7231cc2602e55d4dafa8d014fa4ce46106ba7b79df2fe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/az/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/az/firefox-58.0b14.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "10c9a5f47f7f4257983939bfc9b9cd45929c42dd085a4cafebdbbf5b23973ef5b289be9b17679a9931eb4b35579240af76ffb692b8b45a80ccbc55b406800d12"; + sha512 = "d588d18a22eb31e3e1a20fd64c83499d3653c60895105d8ce669ea10ad66028cbe618a3d3330283888a5e5e363ffe0149f070c7a06a4244d3457f199863fedbd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/be/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/be/firefox-58.0b14.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "fc47261056de907741233539d5712985170b2776500ee59675dc1f0eb834be5ec0cb6da4faf67501ef7e590d6f3fe9ee570fadc77a64e39368292162e43138d8"; + sha512 = "e4536f75604e885dd4518cc04ff06b507dbe5d47b476bb28e259bda1867148c6461dd5088d997324df6022b386ee1ecc6975f5bdec9f5b0be7debf4cfb2a8e40"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/bg/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/bg/firefox-58.0b14.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "79d8ae3152c03bcd44719f46efbb975c0509ba62a292999fbe5b5ff835081577d2c7f20a50c55dcdf05f8c098cd9a7e5d786d71f2dd8a4d03897b7a000d9e099"; + sha512 = "2278749f945caf86b6464c60e8cd3641e761d3cf131c7bda658888f9977ba0b99f833b709b17b140868c2c1f38d565ab75fa8484c6895d37abbb87108442f1a8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/bn-BD/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/bn-BD/firefox-58.0b14.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "ca37ee2550d2b6010046600fd62456da7b20ed90fe908291106dd0e57eb098f428ea5b8b1367331596f5083c72c352d9b941b1b45032ad26bc83980e133c6b4d"; + sha512 = "110c21bc4408dbc46fa32fd8e2077036dca7e4adbe4934e4aacc76033967ba71f6e42dc4ce629520220515d7ab1e8a18a18e600ef699ff2288f736bb38901082"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/bn-IN/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/bn-IN/firefox-58.0b14.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "1c8464c0cc7f36d4f451cd1596ce8afba9977c70a5c206de08edc3171054fb0e9e625e7c7540c04cc788aba918b430fcf354a10038cc03906e4dd795878bee2b"; + sha512 = "e5954e0641bb07624fa83c06aba0eb833804da5c28ad6baba574699b0f51d80be00e199e934be6b324e1d153ecd68f3ba15a5458c53b4a9e0b3d6391ee1154d8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/br/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/br/firefox-58.0b14.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "13ddc4844b317f1fc1e9253a53bc413ae37ced6277865fbb9339d613f5c1893bc5c7ebaf83bfbe7430c0f53d456d527e6092e76b5376391c8fdab267d808882f"; + sha512 = "35c97b9447d35db14ed6e175974b74b5256662c8360e3159f253cde1db8282c29bd401093c4ee76f52a992341308986ff3da9384352ade837083c6f2fb87b0ab"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/bs/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/bs/firefox-58.0b14.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "65518717722f858a93a289187afbbbab2af74ddd5c02f32cbe7feee1bebe18a5318db621b01e239a1cb77168cd2b3e43b5cab96cf4f9a990f1a16d805470f636"; + sha512 = "81db99c77b6ed5dc4b8f555c53c4bcac3c4fdf8c8efbcf1ef631aadb60a4cd71949839660e4ea4dab5bdd6ce2af69782313e38b06c8b22b02c2134c70a0cf54a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/ca/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/ca/firefox-58.0b14.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "a0ad30dbce385babfb0ebcbce1b4baef0ffdb873912a67e38aff816af8adca1b7073fcc1f05348e33f3de9af1c5ec7e1c31c6335d8ffc1e6fcf8031f4e82ddb1"; + sha512 = "293123a9a75bf2f445f9a0a5ab9486ad0e56cae002ab1692fb47f554ba92630b1ab2540a46be6ae731984f1b86e2363b2c4e56002e0f80246e441cc0fc492a5a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/cak/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/cak/firefox-58.0b14.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "bf49dd6fcb202a78f719f558f3cd3484817ad0c3121b7ae8c523932463ae4f7fb35793a2c2bc385a9e82c78875ad7f47c1b086aa2a310b0e564cef944b0fa6ef"; + sha512 = "952030e1e9c22bddf312fcdc69248de06eaa52c3753484c592cd73dde7fea5991081ed7727df0230dcc05ec25e21eede4b8d9381f30bd18f7bb14caeeb89f056"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/cs/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/cs/firefox-58.0b14.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "f7c740e8d17fd7ad4bfd404f8ff2f3dd74e24828bdcb9fcfe05faa7fb596d4a8ad6919ddd4454702749c874335ac8d00131983fceb23e9dc3ec71e7a877722c5"; + sha512 = "d5f57ba860b7f86fbfcd8b252049063a825d91f16b6c70f03f9a742520166a4fdfafe5009608d157f7fd4d3497e3654c48f5567285ed60d1b4959470bce35772"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/cy/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/cy/firefox-58.0b14.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "b5e3dff8872f74d311741b64cc6ee479d1a0ab46f2452fdfafd35a3e4f17c74ec05e87e65723fa15908c374993f115c24c12f03483d9b26bcc0721a77efe5b12"; + sha512 = "ed7d22bb65b447e2c3af1d2a221e6d37728ca3f714fb329113d932d9e02e6494700c53e7de4f53c4fbdf2ef300107984c656a6c4604dcb76515ad9915a770c56"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/da/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/da/firefox-58.0b14.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "ad5a7035f12c3909516d0003b5eb8d343adf3e889d0e5983b523bcaba928fbc8dc3841247108bc6abf8f47d661f35f528bf53e3c36521cb9098091532b6cb192"; + sha512 = "fa3e8ae342ffb91e64e6fab403e87ea14a6012ff23ee0f880df0007bc46d78850407b1956409f7b50d8017fc42a5800f7318120f56d3fc98d8f55476faa0b348"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/de/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/de/firefox-58.0b14.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "f1f187aa189a383c5f6cfafe06e8e1ee4dd687623cdb87dd8a49954732fe1e4faa5b874fc4c459af473b19d52d7b4fd21d9107c18780ecbeb471291694be3b65"; + sha512 = "556f1fb49df6f80b1e4933f58fb866499d785a957e646a26d6aee5896a8c245d381b4aa3b1398ea44406175f073714ff5de2ecff4c4f29676fefe4d052fc2c57"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/dsb/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/dsb/firefox-58.0b14.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "eb599346274afec96ab00173b7e5303a59c3e0867ec204c010e01b41754117635f7d0302dc8028ed7741648c5e422cc33e1e8f289ab01bc2583b2f6f062d6d1f"; + sha512 = "23cd241214c04253b6a50279c23d242ea280ddd8c510fc96f4df5445359fae3267b1d8efdf65181f80ce28a0920976cc267edc9b7485d3722b1a7bdfd8dc6f11"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/el/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/el/firefox-58.0b14.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "f493abde0abfaea3a2a019c8d8c8dec2f8ef154893939a7c38e540e9972190ff95239b4d1d83009c038ea417f9de9b698237fcd01c6e122a0f8b407dae2bdf3b"; + sha512 = "8c82594e824a5e3b9833daa55d5e2865c9a12ea08746be1607de9e08f2aec2e762030ebd535c9e46720ae6ee025c09fbea82aac82e6a56324c74f8100d45ec91"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/en-GB/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/en-GB/firefox-58.0b14.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "117596e6065126d79dd07f7144a15f98ee103de9dfd6fdb7b15307223a5f11ab5e17edf87d4924b2218a8963f6902f41c220d3938e871317b7ec5deec77e6e64"; + sha512 = "815ae43565996109d00fc8230c11f2d82666625e982b03e0e704fc7e0f21744e8d7b3ba6643eaf67532a87631a8718a2f911a062aaf890eb43eb79de8e25d092"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/en-US/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/en-US/firefox-58.0b14.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "1b16f67b8c2caefdd011bbe3ba012ae7d26fddd71c363b1e5ee99ede64395719aa5b67c71f81e5a4bf2fa958cd00a4ee3f70bae95ce1c58c24454da9c3ecfdc4"; + sha512 = "09e24bf4e42eee93875834a498ab54a3623fc83a117b37dba95e3f7f4dda0a6883ed396041531b4a906267cd6cc557b458bda437e6b221ac816e200de65846bc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/en-ZA/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/en-ZA/firefox-58.0b14.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "6cffd90957af264887fc673fd20cbdc4446c8a98bf9742e372a3352d3b61773c2f97942f6321a9e0ea550727c3e0a3688ac4b77e2f81f78ebd3da80e84a0f816"; + sha512 = "aba52795cc2e6e570203e4d33b5c75996fdb208a623802af8082413ffa4abc04361b38469a261fa49ddfcfaed3112c9eab08757067645d0ead562e52491046f9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/eo/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/eo/firefox-58.0b14.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "320f7d8c6c81c38b0d6c56c8bdb6d0fe4d5c5bb5e4d13a3fb966377de576607bcb94bea8234a02af2724e09e4a0f8d45dc54b18a5298d820a665628f7f4d54db"; + sha512 = "67ecfeef424495e56e374d5ffbdca20d2838196fc3239b0f9728058e5a8aaf7e1b64acc74176a96428583e5276ea3ab7ae62355b2530ef5974100c485ed8dee7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/es-AR/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/es-AR/firefox-58.0b14.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "1e9c4accdd7927e2646b333120765fbc687bfb6a35b4ea9378b073e1d5a87e1950e6ea135e183e68ea3b1f895b7c03696782d40bc0bd86120e12c7f0f39386ff"; + sha512 = "1b09ca8bc60077778b81900ae28f9e48ad54a2af62fca717e6861ec6027005784764a8d11d5c494aa9bfc66370141cd8e81981e2db0cad613b08d8cb6e316862"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/es-CL/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/es-CL/firefox-58.0b14.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "13653b78afb28d98081a6a57ecbbee14c2f3f78ae939160431cfc98a467f886a0f9dcce577a6ec0d2ea35e87b81f02176c2a208905d42b0f15c5addf970786cc"; + sha512 = "d3dc892931a2e2527902b7e787677df32ed008ffce9f2ba839b483bdc9ef5cf0eb4e1f304f53aaf042204f24d7ea668ff0b6126ce1d5e9a723f29a7eb84d89d8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/es-ES/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/es-ES/firefox-58.0b14.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "1b94ad3a3adcea115cce6fd7c0052eb1e35ff3e81751fa4dedb9fcc0e29fc472ae8c196cf776e5f37f92a74043870596572356dae06693e5d13997d0b526d2b1"; + sha512 = "45419e025c3d7253cd65fc214afbd9a6c34a260a6316a1f5136f74e50db97f100c4360ca6c86fc02f47cad2ae9f11159b671d501a572baaae08df0fab985d32e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/es-MX/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/es-MX/firefox-58.0b14.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "7fb284a281dd490a8315ba99920578a743f29f6340415fe877a1b4a68e4441d11cd9c31c58f007e2866f9ca921845e857f1d3298583b3c0c279009640fd6a15b"; + sha512 = "11d728e471f42e9bbb50f83ca41bb2f7853259bbcd0328f1cd2162dd889d365a31362c01ea9e5046358d1f8e2b6f6f8b21e3001fc5863f3f46083dd2ebefc4c8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/et/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/et/firefox-58.0b14.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "c12cd9b80d4c60d26ffcd6533345608a5cb305c21514ab7be2e0c2fa1a7609a96d1c22d0b87d7a412fb379935e028102e7d2dd5520195ca061bb075136e222b0"; + sha512 = "b9979e90815c6254f0b46560b7e3cccd5213757ded088d644dd497852290c28b051f21194b993e15ef52194101a8d3c63eb725b4cb8c335ac42d226f152943ab"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/eu/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/eu/firefox-58.0b14.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "36a8092311e39516d89d2672c531eb52cff11d7d9933795427427bc3b5acf296be2b8cb06bf347c71b860f5a72575d3c6288f6fc8b6adba941c4bf4266792944"; + sha512 = "e75b72ba07eeddbb4e2bfa30854793a8790483fd8eef13e1c8652699443587726c885417168c80e5ed8aa5a51ca07f4a23560aca3f03bcf183b018adda447b0d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/fa/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/fa/firefox-58.0b14.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "4f98d046ba03a371d46ece71b3b87eb717b9e5578148444f691bf6a17132c43c1f2ba202c85a81a7e56c0aae6ba742eee24ab13c559a139a14f3665b235eeb7e"; + sha512 = "88d049641a6b7cc6eb51fe3c5ef034337bc89201a67c93af8a1da780e5d72993b73b5f76ff8f275d66caf9538f45fa45bbd48506738dcb5ffbb4b82511e19303"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/ff/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/ff/firefox-58.0b14.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "12973b78aac617eb1fdc7a24146f6ac1659990f0934fc0af8719b3e8e373086e8168fe3264dab12ac2405bd5c1cf0ac0310aafb6f793030157b70ebbb587d8ec"; + sha512 = "43efd321efda7eb5f9d75217373e2ed890c579758602188d9376849e2876eac64f09e35bb067ba9656496f996500fbbb1ce0ce497a2f5352d23d491101144ea0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/fi/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/fi/firefox-58.0b14.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "18de473f76ef26cbb047b7e25874e8ebedf0e020c605a10cab7a442eed836e7d2c478f3d33a84611483cf343dbf7f2f93f758f9019330e6f2c776c3d6653fdf9"; + sha512 = "3b8e4cc10e5f32ec321bad2cbd32872b3c08975c86db44a9c1486be1b78d97c2c0f4545efd6e924581e9d250371e5458f4bfb9a2e93de258f8412c61bd4d2a59"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/fr/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/fr/firefox-58.0b14.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "ce6457d5176380c77b5550a38002d6395eb6e7acdc946868800c46e03ce4a3ad8b6cf6d8b394e35fa410a1a22c86254d0cc8315ff30e9519c5d1d1affe33342e"; + sha512 = "c0ab03599a3924070ccaa2ca431045822b6e4039f36fd774b7afa483d4c841317d295c07de8fbf32b3cfd668851618c942e56a86e15030b54f6e61a719beb443"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/fy-NL/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/fy-NL/firefox-58.0b14.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "2a161a4ffbea636056f13b3452ca61172528865cc736f15d9d717acdc2b6189bae285bb0fd14cecef40900976cbe9f71d0e3194d1bca06f301d99aaa31d09c04"; + sha512 = "fad00b5c23a714a940dd44c1605bba61fbd1df51783462d2e3df2d09d8cf93084929380a43d9054b6a986dd831a3bca64a866e89aabd4721f964062a80141839"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/ga-IE/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/ga-IE/firefox-58.0b14.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "b4f8d86fd0f51626fb97c49cc6ae3342c0592ce6cd4fab2d899e88fb8c82863567bef876dd1f0416857f600d87c9c6df979f8e9ba0d714c27ff542f4c9b48e41"; + sha512 = "8e3dee01ac722f15056771d49c3db2c426328f237d0871041cd280741e2a4047a5d28b82af72d1eb91b1435cb88413e6d73ca2712e96be1c70d21b71e8fd2761"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/gd/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/gd/firefox-58.0b14.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "db0774a6440b78e53b0b4b44296452e81d98a02b7e4267bb5960c61185696a50abf5a39e930b020347ee7b1abd853e72dfac3a99e93148553c8135ee31328af7"; + sha512 = "3adf0b97839d48eb7c34c037e091801dbb4de945a541a943d659bbfd87b077770a54889f8241e624986498c2d88e0b1a90042f45c4db75db21bcc3edbeb5832f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/gl/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/gl/firefox-58.0b14.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "64ac6ea73f5059cc10e6005e8c3ed37e9b40945edb3373a13eb9d249ed559ff4d49e007286e549f04dbc3846b68f7dbbf418eb5abe85cd684621b97432ce2ff0"; + sha512 = "62675f7b9932d8c9dec8d9ef6132c7e6d883f5d32936fae0df4edf4277d5bb2a8c27fbd9b650b17d6ebfc0844d11cc7bed351234ee5a4f3746f0cdb992f069e3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/gn/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/gn/firefox-58.0b14.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "9ebed23a4f3a9541b2bc213823c9824b7d9372116a09d512490050bbd368bc77ea565ac4c17a3b6b4d52d0ff3c253923e39b1b29e02af813c675ed8845912882"; + sha512 = "4931f3836ed065a1181407e205a77a1f6f77b535b3805b8bdbbad5a1fd9cc82ec918b5780cab3540e6b97e109ee4e1f9d17c066df0f634d80a7303e4d82e7422"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/gu-IN/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/gu-IN/firefox-58.0b14.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "f3e521bd770f4483235af44052445a3fce4a3bbf0c14cee01639c91ef60a735bc87b1f0eaead0b606de3995b07cd70f181b0c31743e5eb4e0fe048ecbd9a52c6"; + sha512 = "2935bca9300f72463ad6ed5d653b47b28f86f948000eb0760e1d1fd5c33be8847bc32b9fc8fe2cf512811d5795d0f62043f831da78478200896dd9c6a1c5c4b3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/he/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/he/firefox-58.0b14.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "c29c4603c1c456c79af6eb10146641a6af6aea5ee55a6610181f9ce91c1fcf593a30b03fd85050cb12f16588c9299e7c084e686438c6da039b4227f9f9aadd2c"; + sha512 = "0bec9d5ae18fcdcf76bba4ad38c928fb8f3412bd24b50432b3524e0fd19bd5c7dac640a3d4eaec7aa7e0daa00c383fdab8ceea659cc6b45dee814f0ce724ba4f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/hi-IN/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/hi-IN/firefox-58.0b14.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "e5ffd77d99353c4c3a2fc0080ed81c789022000d12afdafe488019a58cdebc63bfb3f617de00ec7e3838223ddd28c5f9d9fcd8399353ed3aa62f6f8f0775bb85"; + sha512 = "c18d71b312811454d7f666893c0c48ea02f442420c2243c6454cfd4dfc610abc3365b3de7e73a6e416f30a29fc0e0ead9eea21e7afbb870b02a63e69218bc279"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/hr/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/hr/firefox-58.0b14.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "0d75e41af1280b2933094986e29689b69af9dde7949dc54e839d47bed240fcb858a534de2538bb9dfdea8ea73c6d116b3eca1223aaa783beb27b4ab0014dddd4"; + sha512 = "b7ab46671ba0a5927e20c8691b836023c0eb4e7ea8c5d9b17438bd2bd1427ce12ffb1f5eb7e36543b524e043cd43fcbfc5c2f94b6d765e3a024bfc42d931b2e9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/hsb/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/hsb/firefox-58.0b14.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "37c08ff588b746041d0053bd2197ecb3071ee119d6e6b8e7fab9a789d98997ed329fddbb4a7815298794955c167e21526cee16cd4a28b38ee17505402435f12d"; + sha512 = "edfd8715a4a1bc0bbb61e70e2e84960c4841cb1c2be71ca04a2613bec5aa7a564af523fa0d4a4f0bd612eba854cd7bc8cf6b5a09304e7568f09c41d73dcf2bc2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/hu/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/hu/firefox-58.0b14.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "3e5d5037fe955895ad7ad303199964c3728da014bb0b7ea070a7527f86f0f7037ae5d355d06969f9d12698c89a160644762816149d11c749a1bcf2fd683a675f"; + sha512 = "717cc6e0be4461352b847c7713b7eebe6a8645fa86616070f16f46e5bfa99857d5368796755a4b7d2faac4fae201736d88aa9cfcdb514b71b187b1e9512aabb2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/hy-AM/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/hy-AM/firefox-58.0b14.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "0cb19b5b466687f2cccc8f6831fac18210afc699b26b8f97647a0b98f4ed072b3c27cbe56ff703d70fe06bc1840a9a217a998e95c6ab705d47ecc766294474b8"; + sha512 = "c4a8bae061613bb9c955bb35f65b50a5e0dff805e5dd00c66989cfb56979ad01d8294e08fd9366bb9f15cb04f13c98cb58290e026c99cb8a958f0a2ae995d3b9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/id/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/id/firefox-58.0b14.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "a30d8269df421b311db28f53f51f2486f94bb11bee4c814b81b2e8035bc95863598a4e6b02782c932e16fc65d6407b92c1240a764a9a4760535c09bee0563f9b"; + sha512 = "a862d3c3323a00080bf728f390bc91a9cf39ee0fcca22f09cdcf160c012f21ff193fb3a995abfcf089e55cf4dd5db519a780c562560c331c8f61539eff6a577a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/is/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/is/firefox-58.0b14.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "9e30fdf87e24889511fceb3462a10bfe16c799de84403c0866225134c679f0b5d9a07e6120ab79c5bfe8a5cebe51f3cce11261277a74fded3fa7077fbc893376"; + sha512 = "5f84d17b1f564cd3d555d6bdf44584004891309a04fe274285e63ff30020de8403f6a2f24cb77ce1836fe22574bd0afc186a703c6058dda8d6cb00f3361e43f0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/it/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/it/firefox-58.0b14.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "2fd43d2a7968d469f235db9a54e068da1ee4f0d81e3299a3d19191affccacb2c13d831aa7bcb58ee1cf727bf91ccfff75d07d3f429c0d494a50b0c3a5671766d"; + sha512 = "d3e9507d67b5276f74cd6ec57e98d79186fc30ec6ecf9ed19df7f865a27ad14cfc27ca5b92f25d6794b6d5be76fa3d9e19b0e3e84155a8a3bd45f427c7a1cf2c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/ja/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/ja/firefox-58.0b14.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "a67dc0ad0469d14a68e5b670e72c9a9a94b31c340cee756a445c7b6073ace1c3006b8804a9e618c28b8f877d2ec299ff7ef3b380f16c533d7ac232011bb4d26a"; + sha512 = "de5776dde524271356593c3a5195249a8c7233678fff7ce6a04afd60701300a904d615c7444711feda7feaf03d10dc048cab734f9f46ad5fddf67268351bef62"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/ka/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/ka/firefox-58.0b14.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "9fe8d84cf6ac2138a5821bcf23ae09a93181ae60f92d559738b983dc752a4f6e203c6d8d4e1bc66a1429b4472a7d0eeb5f6e7e06c213eb72e826b6d1d731158a"; + sha512 = "47c149065676b34a5217ca33c0b245615a51c8d0f3ea67c2c7691c7069455d53a06e6ab51f90aeb220ea73031f7e6deec1d1880f64325eacfe634e56ce96c0fa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/kab/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/kab/firefox-58.0b14.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "b0c85aed03771ab29c9be18415e349a9b3a3b52c22ba4501f6ece83e74925f30f8679f03899ad6072628d6256a03143867d5daca2c930ed7f08a4547414eb7b7"; + sha512 = "3cf5b61e53ee43ad20a852c08e45be0f237e8dff1742e6a776274e688ebb42f6d7619262a9bcd60eba329ffa6eaf0677ee33d2244472bf28fd873d3a3f4a03c4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/kk/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/kk/firefox-58.0b14.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "8714d706616259cf33ab9ac286fd0299eb6ec2808633a6dbe45f7a9e50e7a231d4109340f92406e4a54d85857451c9e401103b619a19c5c0a4123345861d5991"; + sha512 = "e6d844085e04bb118975bc7e95b783f839500b3666b9d18dd7d831bf022c3572c31f1fe360ed797e9dce2ceb3a56f76e113e20d26d8ed4f19ddedad32da5de83"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/km/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/km/firefox-58.0b14.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "1beb18bdd80885e86e5c3a80ee7cdb1656c91d02969b65e385c2df7401d01b1ded842c17b613ad696e994eae8a5ed29797f6fb57046924f304bc74c5437fc94c"; + sha512 = "a4907da819f69aa3779cc49124732d9664e95a65bdbbd7e2232d3b17248d8906d75bb522032d9a08f03a1d4726fc14f359f9e74b20974669ef175b93b0699de4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/kn/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/kn/firefox-58.0b14.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "1884d3d37683555fd8c76be54aae20372c5cbe7e0bd564324c5ff6d0da289a4a71cf7f54171ac47d48d44af547ccdbedb53e9eb0746b6423eb23a99750bf8524"; + sha512 = "03268c9ae3ebb9d623357f42350e8f805376644a3690caaa2536889f1b42c1161f95bd1918f77ce2d4ea51ada0bddc1541b1d0f68446cedab999551794bb2e1b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/ko/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/ko/firefox-58.0b14.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "927fd2bc93bc88c9f02ae8df60161ee7e17cbe645ad3f1c1781899a5816399822c8aedca8aa49842da671c65dcac25ad4afe271d157ad41d5b86285b01106bc1"; + sha512 = "b2045e0e9699ed3c5bbb3ddec56c5274cbb7c8a81e5436f56eb5d57a1faa5aa34c34f7e956fff81a0cc0f8d73084999e7ce6648ffcd5683b415725d30ca8e14f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/lij/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/lij/firefox-58.0b14.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "8cf78589d4c406609a1daf635bcd611a0d22776cfd190aa43f0e91a243e09d377fc95264816d303a68be4cae37a58f0b88f02c00eadc6047ad08599d8fb84242"; + sha512 = "cb5988a84f6cae8026e751b081ec644ac071317dd979ff13d0d2e6166dac87d259d0c88bf3bfd0293555fdf65bf80961aa6fb66a682470c041b36dd261c8ba8d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/lt/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/lt/firefox-58.0b14.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "c56d078820ee3f1508f1795de1d734dbfa670c1d74e35760aaee02bad9fb604fb929b8cff2342cd99bb37ade12368bcbf159f3c19b6fbc9acb5d1bb649a094d5"; + sha512 = "76811afc825476612df93c1854c0146f013fc7ab95bffa2f2667ff407f874b5ac45a9372e2af9781a0e6d3c80f77d3ad3783b9368814201b1e494e8153a9d337"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/lv/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/lv/firefox-58.0b14.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "0ea76f05da2446addae5d6e1320b778f2f74d5996607c57a5493dccdd838cfc0f98cc890b7c5cb215ea088640b73bcc7942006e8ef7e87db6f40a233d4961e9d"; + sha512 = "a6e0d578c73fad30ebbe4f329e93f4c28bb7cddc7521ecf771e1dbf17a37c5ee9e34a10007b50caff7393804a4953fa7fd4b900e61c31e61fd64f500fa8299b6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/mai/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/mai/firefox-58.0b14.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "df534eb95a1c2d1aa853a07316f634bb33ed28c0f2661931a630ba8305046b6364016d854c038e6967efae57ba1e5133fa6e50410e33e9905ac29b9ffa5ea687"; + sha512 = "82cc1acdc4f26e0383c1c7f7d2ee8e90832def57c6b0f34e878b944833f5bfc235dc2cfe77431a7f8c774ad1f1e951ed32852190f245ce0acc44a0ab65f58d55"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/mk/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/mk/firefox-58.0b14.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "b73d4a5d56906c3da74cf055fe7ed496c551b1518877a8b36847c62dff27ca6ac4df84e1e66f7c93c1c27556164977bb7b0af88f7ad3cc4354e179fb061c1f82"; + sha512 = "6aedbf8e5447527a9cd33777965e9e15bb5c5ac12d9be394516f74e1826e5ed9f320f13cbc5f0be6cd5800ea5d8329fb8b8ca568d2e7b6d75527b89b48e32e6e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/ml/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/ml/firefox-58.0b14.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "bf06299251aaf8b4ee7f91c4ec0533debfd725dfdfbe4854aa9e7ff2f201fcf97750069121dc8d722bccd7a01fedec9d3f19fb86546202485629d0337383c1da"; + sha512 = "d3d0ab9433f6ec324e8c3b38446999b19faea5191c94f9a50c711f3affe3d47d1a7cbfa12c0cf4199810bfe4bc5ffc925f83ba051962d384ca915fc5540ab32a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/mr/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/mr/firefox-58.0b14.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "d51bb938706be47740fd56638bcd39f9df26cfb403047fb83b16e7b918b72c504a3b6b706a23733fb66ec5907fe5c999c1c0219e9b86daed7bb6c738a0fc0b63"; + sha512 = "cdedf5a39d31f6bd1704182d48217d94f994f3a665d780d3a30137695d9fc2ded2dc6c9fc1505df7052926b4800b050841ce26b581b3bcd9d2fd795a0b9aedba"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/ms/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/ms/firefox-58.0b14.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "e73851c34973d288a37f35a930a67c386ab4908ca5a48f8dfc86c9ade722e908fcb93f1f9d195d5e7c17c635961d696db2911ce4228b8b537b49ced7d03f1186"; + sha512 = "e3f843cc888c8ba411f92bfa013fa6de71982f82d6963c69bdf463028768c47f658d1774d26394f0a2f0f6e6eaadb98d348adea21144782def8ded79914790ec"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/my/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/my/firefox-58.0b14.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "fb347b4fafcbf5724149ee25017eab4658578d5f12fbf948c31883ee43937c5555991c4cfec4a3b42488a69132daf1b88c21ba832b724b87bf0bb89ea4122b8e"; + sha512 = "16ff9785d5f8247098cf5ccad372940373408eb194ba6c70a5bcb490dec0ee80a7958a4f7a0928b36e3997b3b7bda286db3594d4d4cbc38850b266c17b1d6d8c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/nb-NO/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/nb-NO/firefox-58.0b14.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "f75e3333ec9cff950cf8805981f1bde8aa2ba3fd3b82eefc1065f07779d812e007d4b679c6a328e41babd5296379ad458ff96ef4b69fdd6b7fae06dce7cdcd2c"; + sha512 = "97d5abc08bbdfa7b8a58bea5d6a5acb5d3eaeac5e48dc577f53ae7e97343e0840e0f0c7705a8a49bda0f4b21a81e8b8afcdff344f546d1a54ec779542d2b9cfa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/ne-NP/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/ne-NP/firefox-58.0b14.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "afa6ad49a82750fce2664d98753ca53953364ee37a8e677771ffa0af681c88bcc192984758f6e6107ad487e2ab951497c4a41c52e373ca65322cf8ffd1acdc1a"; + sha512 = "ca6dc4f0597819b7fd7e32c60c93fd6becb83c8ae5c81b0f9149c4e79612c95e96ee2e0b711e6fa475eaae6350664e07d93b60c1a088d869f09f449af94ea208"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/nl/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/nl/firefox-58.0b14.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "062c793783450bad5f52905a508de1d4fff4ec9c39364e6f3fa83ae8b8d789f1dfdfa3628f6cf84f30b9c225801e115565706e443eb7a82bffdeca45d0c26f02"; + sha512 = "29d5c72a92e55d0c505a5b6cacf4d4e70fab9affc88c64dfeb650c19185811ffff6761bfc978c4d148b27be18b8921c2efd173f8528311621af816911d49bb74"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/nn-NO/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/nn-NO/firefox-58.0b14.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "2a8826ed0ad7b681cca26c4d274bd373328d8ebf0dc255ee4ffdda59573d1da35a5d93b212a7b1bfbcac19e96728487e2d77346ba3e23d1c49205b6cf114c470"; + sha512 = "4665838713d59886611e63a2ce1c9ad407bda2fa6c1f687cd8215ddd1b171d83ee822e75dccf404c588d594fc28863e439e0c021d27fb3030b1062703d9f0d24"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/or/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/or/firefox-58.0b14.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "7ed436800cdd06dde0d56c3830863fe92bcc5981e1029c8de06c50f3bc158d1645edb79192b48cef1a5d89f49215e6f6b19ed6c74871ef3271487185ff1bafda"; + sha512 = "7ca268a7d0ef3fd1f1f11ce0b60c03c1b3538721446d7a207ac6ca7d047da3f0062e645516e813155ecf19acb38dea06f0beee12c26edb5880b3410299a64814"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/pa-IN/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/pa-IN/firefox-58.0b14.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "0c0aa8c8aa566475b51dc37917d007ff7ea51aa41439173a76f854e6e7dbe6328619c6742fcc24c2bf29afc829e71732a6094c1491695f5878ce6ab440fde353"; + sha512 = "1c3c6680c5f8cf01a36582ad2f755b101b1ab67bdd1cf53b0407c73317700a57b66ee9081f4ca856cf682e739a389c6bff47c7d9a455d60928af8ab5ad1b3f63"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/pl/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/pl/firefox-58.0b14.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "d1d8fc0f52bf13cfc0ed99370bfc06013f6a2d75f177b28c9f72d083592858259fe61b214bb819ea8c693c450cb4c40d13a6616f442d5f180c9f37bcc1e0daa3"; + sha512 = "6dddf16c7883efb753b4eaa6a170ba9f92de2305acfb12d8f1630be85c522d644a83e2ff18343e444d998da9a8aa1dce749a4b4c32ba24a766008b7ef14bd279"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/pt-BR/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/pt-BR/firefox-58.0b14.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "168214338c518918c4ec17aa4b9795ba68ee32e49ec0dedefa80448f64b16a342e0b0279fa09c2348be9a00e865be95a68d338452dae594d28a5749b5c9245a0"; + sha512 = "6d9b346aeec423ea7ebaf9dfff45224503bda63a7abca63106f52ba8aeb8d66e6b8e727ba48196d2847714dcf921d8f100ebde9c189fa6a948da22387f0a6b5b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/pt-PT/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/pt-PT/firefox-58.0b14.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "cd98c3686c3cd386d91bde93c4114b48eac20dc941a7443e98b4c5c936699a1c6507abd9fc8a9cae41276ba6036d16127e341cd84cb7dde5d7a1c0d96bac174a"; + sha512 = "4f90e74972bd29db90fc60a9f66e6abf4a2bf31d246e7de1daa85ac293aa1ea13f84144dbaa245cf3c41ee5c4aaddfdfa64d28d8a267404bdbc8797b184b6039"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/rm/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/rm/firefox-58.0b14.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "2de65cb315335e71102b9ed67fb9857fc738b630a710514ae1b9f0d52b5c9961403416be2905fa2dffbdc800e7a6cbf974a6b63f8463e0793cab98f0102a674c"; + sha512 = "251df7868b7e14c1f0ed1b52338d27678e1edbb0ebb28c842e7dfdcc214917143fe34391703271c2c295c7fb245074d3c1e0d2c8749c08bfc1b4e397d5d8e621"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/ro/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/ro/firefox-58.0b14.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "2f4b01a893b6520abdce36f7858ae075f28a4798d3a7fa4e785879fa477863ab97a68357bb58de1067dbd67ee4f29c325410d23b5532507d77c26565925d28f8"; + sha512 = "95aac1bd129874cf8207475385305870905ca2faa3209714d43c2b8d6b85eeb5d58794a43ec0cf8db84f9732c14b04b5298270dd62128e5d4da3079b44575e1b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/ru/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/ru/firefox-58.0b14.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "1515777ea4c2e19f1bf884ca06b4d419faf41b4c87c67cd2bf74e27bca2c99aa9087f94e2c928892d0055b0e2e23a63609a9e789b9521f18a7585806bf21ba82"; + sha512 = "2f59144faadf2058aec796f33facba137a14962e96d0505a2d302742367f9820f16c74f17f6ff2b3f4a18cb59569ee5ccbc4bf2cb784f8f1ea9a5645a96f1e20"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/si/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/si/firefox-58.0b14.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "13e60aca871237aa2d1fd7e9e21cde24139ba1b2ffe9d3514fadd9b277d5c0b4181026c5540a10d238ba89bcccc14fc87b3818d891c6e40aa9e7eec56ae7aae9"; + sha512 = "457d58956f288577ae885300f23f51a03619c551e92505bbbf5731cdeb1334a1e3f92af1d915378ab664aea995452fd78f7debc6ef62a65973c4894d4c46463f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/sk/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/sk/firefox-58.0b14.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "481be829b180af0788e68b0d074baeceaf073759a0d099499ae0c299d242872949a1bb32a4c20293b0f396720f3bd04a0fabb52eb982fe3c032b740970f551bf"; + sha512 = "eb47a1eab81c5be66981484fdc72e2f200574ed43e45018b4c5ddc0c7c83cdb1834b36c22387a9fc458e10ed99719865473d9300bff0279e54b611b9043f3b9b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/sl/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/sl/firefox-58.0b14.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "50e4c2790efa1318fff26aa3835539d0e7d20f7e6a205d0cf5a1e18a5dd94de0432c4d6a09bfda3f15fa8bd8f55c7713bb4c1b3d62d787d352aa748385d56847"; + sha512 = "3fbf38bc92b6f9a3b7a8ec8babb19de05bb9b169ebcd30e2f22ad5182acf44685815647e69c2ea8298692a4052e8dcb63f7f0cd5d2ff24c4b22da0dd9ee907cc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/son/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/son/firefox-58.0b14.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "a56a407d50d67193cb477fddfe70d398d845102950935fe8044a8be24fb97688df887e059377fd063ddc2bd84703199c7cf17ddfc5aded3909f43604cef35665"; + sha512 = "9b66b2a2704dbf78cfd8f1d04d1c47018ab70f127e101056bbe18ba1d28f0467a5fd47cebe3bc279218262efa87e5dfb9932f85911cf84aa369fa746a66f9f8b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/sq/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/sq/firefox-58.0b14.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "775e3e5f02540282a3a04fe9d71678a26ceec20d57effb86e6d261752ee7513c0efc5e7f543e2ffb9cee8b907e3513759577b5a1c912639594defa7f166cba6e"; + sha512 = "ae96a36d42ecfbcc73d5d966666e57ed8c4199aa66229ad4ec89056f0774efc085614c75bc5684ba7cee4f021949dc2501ac31e7029d1a2434c17b6508393d13"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/sr/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/sr/firefox-58.0b14.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "d879cb47c1cd060fe6b75b3c40ed5416361821c008416c1e7a16317b91ac3bf28536a97d207192cc93fff55ef45f21c0069cecc244886a4894e380dc78180919"; + sha512 = "8ae1519627c03d68d827fc27a658abdb53d3bb221322aa513fc2160d2aaaa2c307d324cf2290bd22e0a7c00b5be8212d1f69f74433731f26dc17926ee2330392"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/sv-SE/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/sv-SE/firefox-58.0b14.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "c7738213ef6f716dac4a8c6ba21c19d902d393f2f4a7562dec941092324b6f75d987c40954c4428925b6571d7c73ba707215c55562b7714076248367b3c649fc"; + sha512 = "f7e1ef1234c1dbbfb5d27d8640ff0c4fc6ac3d6a9ce74fccd3c234d945134a69cb60e6862ac1518880df313254e95bf113e2664fa4486bbca9453daabcf9a88d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/ta/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/ta/firefox-58.0b14.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "14029b3386eace9cf7bf35742338fc1a098e37b998e547129db340713deb743b0afd7816c3033aa6fe6fdbbfbe07c6fa46337da6c548f0a20d17e43deb73d8ed"; + sha512 = "98fd17f88a47dffb23ccf3ea8abec65a3a3b0a87f8d04614f253edb886e9b88f3f8fa290fef8f244a745f5f1273d9dcecbd4952f7ee87fa36851294b343a9717"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/te/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/te/firefox-58.0b14.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "7f95ba50c714adc24c8e55fd3dbdc65746736439823a2bdbdcb7b4c1255bc7315bdd74df6d4957c8ce913ff4147f6d6cab9dbb4ffd82dee57cc51c5a5af08df3"; + sha512 = "ff844a35ec53b139bc58bbec510a2248d59f2a1ffe5c42f0092db852ac288e0b45ea57d593d899e399bbde705fb75cecb2db9e0f9132cfee19b4fd8ecac173ad"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/th/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/th/firefox-58.0b14.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "35c733ba797476f7f7140efc690afdeebf492d76447cdd2b8742b8ed2492ab9750494c0f6e3850b0c2e9b4f88a633c91dce739afae7bec8330ae689f146acc4c"; + sha512 = "42ec07444002f1c40b96d2fe7b28e4d00f38fbaa52e44731fd6ee00466a53ba3f029b2346c6fb9b19d0d117c160024b3072ecdf6af80d7aa01f4dfc0e66c9d75"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/tr/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/tr/firefox-58.0b14.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "d9b75f364763fe99cc636ccaaad0357510bef79923e6b7f3f807a58074a56aa48c567d7d00e5217bba87c9c1172433ce716a280488e25175d87e36eba14fe86f"; + sha512 = "4580a523008e3174787c5a450dbc871fd5c9643b11a676a640c153ae9d50462897f1e9388ca9852d96aff7aeef188075bc287d2b9f8c88ef430dd1d23bc12c82"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/uk/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/uk/firefox-58.0b14.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "2f1fee0a6b2b5664a6cccd0f38db596b2c5969b27f4eddea5b1aff414f432a012dc3c9cf771eb6be0d19fcc00ba0b3ad8994de234ec5367a311c7ca731d28aeb"; + sha512 = "e004d757c1da5b099efa6f780f635c1c97f606365304be9bf0dedf7ff622a0ccb6be1831a345edb0377c11f2c41030c9441edaffcc72f5b66ffe0dedfce345c2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/ur/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/ur/firefox-58.0b14.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "5a96fd34d7e08e8fb4444cb5ebb81bbde817390926e06a676cc17da2f073b790b42f59200b52145fab6f43f4961d2f9597e46cf72ecffafcb0bfce04e56f029e"; + sha512 = "a90993c6428af047b81db2f9575df92a60705799813e094694e81e80d631554fa703614a122a376fe6e8a6e6fc0a279153152dbeb5ea75ed42517f1cf032db91"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/uz/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/uz/firefox-58.0b14.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "9da76a17adeabb9d3862854965e1bbdc6e7ef16300aaa23e76f644089d9e372cf9cead10b88b379dd28da6ddc2a2c05e657831d3ccb6d76ddfd537074a650620"; + sha512 = "d0b5e0189ba5fe262e60278581cfffe12065567cc0779e2e28e5d50ae79e2dced1d2f990733500833b1b4527dbed4d6c9243bcc13f77bc6c4ed221a55e9050dc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/vi/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/vi/firefox-58.0b14.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "3f7a70b6d71cbb428524f49dd0b3b21f2ef969a9a43271755a3835bce6b66a147df4130fc62efd53353cf36b737083ddc554246753df8bc274c6fe795fdcf773"; + sha512 = "82b5b925f623a10a3c27bccb53ab9d37c276e15d631d785c51ff735627050a681dbfad9ff6cd2736da41b5449c1fcb5bfcfe90eb3b409c744491b454c8d95fe6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/xh/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/xh/firefox-58.0b14.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "79ac0d40206b147938d4e185fd60378229c22af37d9037fdd1d867f8c1000f33dcca2d09d3ff437cd892652a8d5d28e539e4101c0540112cadc20eb379d4ba19"; + sha512 = "d38d13667ca4bc323b468e8daccff942180be051a3d75100d920a67a7690067c6ab2a7bd43f8c0491f7a93c1320cecdcbab3b2034ae99e81164739b0e7ade7ac"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/zh-CN/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/zh-CN/firefox-58.0b14.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "4af99eadf0a25f562e16e2bc7d29859a10d371c4437fdf9fd79495e22604d41f33988150ef2d8bd29b767a510d8fdd0fb1b604c69764f583575129863d981cea"; + sha512 = "00978f6846178e35750a262caa99007043d939665abce832511d8e7689838e359d02628268e02d2bd07dc44059e2674954171770957b3665c2613d9f8aac167b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-x86_64/zh-TW/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-x86_64/zh-TW/firefox-58.0b14.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "2ffa56957decfc1539e5fe6758280d7e04eb6e0928c2069175edc28772a393317a05e13871cec21f903c5ba0d9b1a1e4a2cdb42b491b9f02c0aed6bc74290ce3"; + sha512 = "da6434fa184e8204bf4a9709c80348f95f0829e4e134bb2c0486d5e8bc42c8b767e08adf7c72989da65a86c6ecf3eaea42d4425e370feac7f78e9f54f5c0b667"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/ach/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/ach/firefox-58.0b14.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "81fb2dcb9ebfd2da37bd2655efede796bf8b5ba1d308f4eff281804b34261a5f4f6db86b294e93abda0ac8eb7058f2cd6cab07ad1026513ae99dadd1d3c65029"; + sha512 = "e9a51f9f43686dd44f16def40217c00982ec6d0223f4978d4b53a4e3fcb3f15510db1be36e32c092232d69fabfaf93433238ea584d615cffedd6aefee330ebef"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/af/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/af/firefox-58.0b14.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "4a81ba311feb2ae416ecda1fa930b9180ceea3b555ade219feb4ba3d5c1f155369fcc4770d424f0c971ce22a993855d9f74502369b9007ab9b10bffa9f05256f"; + sha512 = "c01a606ce914e293b5c9f30a48c5157fcc9393b96cfda1f3a1fcc629f5040e77cb0339b1071d40460b3648a4743477327cebd81a4f2d6ae02ec996c60afc442a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/an/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/an/firefox-58.0b14.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "d5dd1b0cb156f9b812e868ae0c150efefcfad30f5b73239bed4fc766ed1a7006e46204c230759d3503cb433a035683b6a603977b9a801bdf054c8aa49e2e6fac"; + sha512 = "e2eaaa5195cfbf155f1e7fca07260bd00a2793195ebf98436537199076b88bf0627dac3520999f88c45ea5abd795cdb2fa25863fc45d78308f3dcb978192a684"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/ar/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/ar/firefox-58.0b14.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "fc75a8b7c3613b7100d34ef12419b6f6cf66af1c1a021c94c4ba3688a0ee35a98addad6ee9b9b2b7b5c3ceea6794d57eef7805b1c93b90a09b53c72bb98e30c6"; + sha512 = "0c8df7759565308b2dc5ea0ff190e81a598bebe5c80291ad1430c2fa01f3019fbea8b52272352b6e90a648cd068df70ed19fae462905f7257e7ac8a4e46648fc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/as/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/as/firefox-58.0b14.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "b6722a617d6d58e2225c3f61e3e8dfa1fce09adb370f10337c34d372d372dbf5dd045adab87db0b5608e5e33e430567c11bdf38cb6c0c2d5ab21fd78a97706e8"; + sha512 = "35f12cc23c1c38d1ecad6a81ce45898f2221cc240fb789e8ee638510fad27d9001442efe8e5f3387d119fa62f0261446822dfb8a6e51df6fbfdd5ac63af54984"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/ast/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/ast/firefox-58.0b14.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "a803de6a3dfadd8a0d83c2cf7a76dce1a2b160f759c3ac0f265b55f35126d2de8c4334d4d0ed0fd5d5268d4dc4c3c118ead6b1d09f518906c3d50cc7eefc8950"; + sha512 = "c39d8443a6d8c2399b8bad2b72d5266c34b0cace5032e93b94b962e14033fa0784089621a87bbc6e7e3df6c1ac1804dd83fc95a4d9a9e45c60be1da22ee7e4b9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/az/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/az/firefox-58.0b14.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "8643a0ac6ecc5ae0efb925c93ab26f45a3eaea2b28d73436edad1d88e870bfe008d5e0fa002ec8e882f154ae2fb11acb716a6bbc216ea73504f58db522ea0cc4"; + sha512 = "eb49dea061bb18bdb01884c6916b7d78bbbdda07d1c1c684bee8612ec8a1e042a4f64281987d86b4fc5aaafe8b4f3eae5b437bebe58e58e6708dad79b46efea7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/be/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/be/firefox-58.0b14.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "75c7070724fce72e30dbd2ede403d50230d4fdb3961904d786719c527c60f22b747c689502f438c83d718e95d0840122b9389c14c8d6d858f3b2928f55cfceed"; + sha512 = "c1ad332056c956a8ea9db6fa40c6f0f59111bec12148ea3a546598c6715ba9a21a1f78eb961dab97d4f810c0275ea3384a3e38c82c07c576410b6fad165fd807"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/bg/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/bg/firefox-58.0b14.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "c6a27b4ca82079834d55722bf1128822a3875ce16e0f52ffa5f30b2d6a64b962d9f67c20b0d5e9dfe1491485d7a8d926cd7692fc3b69d3079f33da06b81e186c"; + sha512 = "1e5c3bbf4bbad367b2edf4316def1e020b50e59d97e145776aaa09b06173c2897817595dac362caf1f9d16d632afbf7ff74df11c5d79c705f1983e4e66a3d5b5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/bn-BD/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/bn-BD/firefox-58.0b14.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "cd93c57f92738510fd84aebf49e6465ca1dc16046dbd943d5e40cc0bc78890a5408b986834c16077c51acb3cf67b7f8791249dc771586398152cfea52ac85adb"; + sha512 = "56ed6b4ef6965be35bb39a60b61fc87bcb93fcc038c48da5f8f5bc14e2df83fe4490dda4bd915864f3313efcfe6a6d5af2a0ebbb27b8c783d6c56c30f894f7d8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/bn-IN/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/bn-IN/firefox-58.0b14.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "2c6321af5a750c4797d8c36d27a86569c98470c277364d295620e2b221cfd379c8dca1eb507dfaa907da0e783ca8dd8a1f3fe1f89021aa791c85c09c2af508b4"; + sha512 = "395399cc32f77d93742c55e0fc2cac5970e38127e1be21db767db29d9cb2f255ce615b70b77021b774c41916efdb7495af6ebed739c885b822d7b2f0336d6587"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/br/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/br/firefox-58.0b14.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "5f0d71b50c8c7f86d91d09e30aa0a4a0c528ff198c533fc7ba919c35061ec7eaeaf5e9e5b7213498b03c6b48f3da9eb45e3120e105e992ba5514e417b6ab98f3"; + sha512 = "19ebb3303fe726a8b3c2dfcd0999fb4cad3626b57a2f236ba8aac9e88a6109ab1992c5287ea40c544338781b3b14ce2ace586af285e35c950d47404b303166e1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/bs/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/bs/firefox-58.0b14.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "057ef6f341b4b00111386790f5bda9a8ebcef320325548ad4e4e8ab4443391b99594c0d23a1f892af65e2b0e5d77651ca46c94f9da6bd316d930482d1d1b7850"; + sha512 = "595a2f4713bf9f264190f2079227732dc88493518cb41d8fe8ec8a6f74535056eae60cb90f70302b36f42add9f37d444c70453d93443e282d25f6e390e6aafa8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/ca/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/ca/firefox-58.0b14.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "050107a08abf1740192d6362525f44ac342736e5d9353480b512a8e7d5f2aa1383c176dea7c29a3457f96e9b050c8243b30c581acca549b049b5930d67399ca8"; + sha512 = "3fe99c921d8e4ec9d175f6e00fc5332f22143fbcccde6228907322d6fc2f11382c4cb798edef4e4bfd0bd5ecc09def9295f9b4492fb63af94a1d69487b7476f4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/cak/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/cak/firefox-58.0b14.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "e79ca7fe3edbdd069a06d39f5f84b458e75d2ed441df1e8cf6968ca8abdb1711b16edbb383fb08a17aa2a6367681a79de745ccdc2eae7fdd3c60496bf4445c91"; + sha512 = "bf5f085304ae5f7f8b6f8b79b6384dea6286ac5caf6dda9cf5e2ae4a9680b1fe2eb697fc67965bd9a931ce93a2f3abb675a75be85b994b4101df39e5fc2c4466"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/cs/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/cs/firefox-58.0b14.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "800e4936aa71f49a63a7dc1f9c9fb4ddaa58343a2e29eabb5c8c50966a2b27ca176f1257532e420f758698b1b8f8ff81d60af3954937d1cfb8918c768b39587a"; + sha512 = "61fce5fbb9dfdb410a52336b12c6698cf152cf089f9d0d8b4bab06fc7ae0c4f888440e8a175f6048e97a77929aacd0580cec8f4423ab4d31350291d32044e576"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/cy/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/cy/firefox-58.0b14.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "a243fa148efad4b9fc62ad961d5b189c8d96957e4cd489f86aa12d53f94fa6676c338257801fe9a74253897935b1a132db79bdfe927a02c81723ac5422ae76c1"; + sha512 = "26359f623f91ba97fb51ff857d63295b5789998bbc99d733329e6d27a98ad27bbb040327ac20da230517ce4a605d788d66189900777c0295640ec56d4d40995b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/da/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/da/firefox-58.0b14.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "0a84f8b2dded01d7727bc55f7a65ebb8c13f9334ffe90755d591c0f33f9c1ea55595e473b40102836ecbbc8b855d575bc945c80712850f2afaa69dc4829dda1c"; + sha512 = "84b1caf3c73a79eb287a9f359c716a8af705c7c723e58c1b553cc662ee247ae6009e2a79c7975b758240143b28d0d349a1b2de6091d8fa340471c4ea8e194858"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/de/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/de/firefox-58.0b14.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "0842f43a01c38f20fe617668ab88c544328a874f36e9df1a6632a747fc21b6ae39c8181e29b6e007e8b4a8cb85f4dc75309a20d4913a35c03f29f94f279b12f4"; + sha512 = "bb517ed281881b57a54c3407f0ae28bfb6ded60e64b943a1b8efce4ab66b6c07f26af425ee63ac22919029255da4cd381e356ceb8256a26044c7b0c8d21776ca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/dsb/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/dsb/firefox-58.0b14.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "ca649871907003ba587db5d23179107bf319803255949d7600d1626371b3602d5d0c98beca5212998fdbb6c824e5693ca851a5d30da45acc3d06334cecc737ac"; + sha512 = "aed392401c82f9b8393e324f09f35040a65b5034c0fdc74ac20216f09464a2a8a11f1c3f915ae10bc1bf9b2fdcea5ab1e4a1e2ddd21b63fe87165035870f19f6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/el/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/el/firefox-58.0b14.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "9493ae07ba86723f8614ef2eb2b3bfbc7035648a9ff98b7e79b9dd86fbb9ddd1076e068a90a2f7f2e2bee7dc680a762c7e06f7f28448c2819f8dade671a57f6f"; + sha512 = "557bf78b2a61337da16356a0e83aa9e5b0170d0b3e48fd855e497b80b8a7cafc9fcac53536554ad8e82224868f07a15fe7411072a2908c2c993346bc2089ad9f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/en-GB/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/en-GB/firefox-58.0b14.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "a911fdfc11fb85a02625216b9c6c8bbd76f6b9e047c7dc56db6b14ceba607d2e4345a538a2f834b0dcede4c96ddf4c1ca02a77b7fa1d15687d8ba48df59a894f"; + sha512 = "57aa5f7cb79ce87a55311944a15154f2912c40cb2f0aae7a7343594c642679e0f777d35d6bfdbe8cf0a7a6656eddba68721141085287523316361689dda177b2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/en-US/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/en-US/firefox-58.0b14.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "c52b0b207be945c18196ef61da73f1d21871ebd99fa1322365740d64bb1061f1d4f2a354d9e8732b366cda00ac7f23c49bcdc1219fea5d0497da9f7f79dfe7a2"; + sha512 = "5b9c58b0b7e84339a6b3f738209d19cc59bb370dd4012dff5c040de1460320622ef417e7408ce07ee0009b3a849e7617590552a0c605bceb2eaa170cc1a55812"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/en-ZA/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/en-ZA/firefox-58.0b14.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "80c20d12c39737744a7aee28190038b074d0284a6d17302f87845fa75210b2ab36d2b8eb2b33c7d2850bd8731d8574f9562f4ab0b6aa9d1a541d28721339a7f8"; + sha512 = "d60f582a931621efa65db4da9098f8ccc70273fb1e9d10783d6840e2fe18188030dda606e88dacde91da9b5195bc5a7a9f6e25191619fb3bfdb77760eab7ee14"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/eo/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/eo/firefox-58.0b14.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "a41be4ad13521b92ba19c53edafcc3c4364600d5a8db346d41e69a537dbbeb2d77782912c3a0d0756c7f0e6088d6c5a92b1311fe35fd9511921f1773b6726ccf"; + sha512 = "451293c14f3cdf3e781431e34bdfc4fc74334eac198cf27beb86b329952524266b33dc6530eb67b8759376f9561b094c90059f98ab4ed6f289a571663a332b95"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/es-AR/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/es-AR/firefox-58.0b14.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "ca61a3bb44d655607bbea1515d98b3d797409dd0a2ccdfd57a5f90189066c7322b661e94f3b7cc29c33fd62a4e36985b696c20d195a1790f9273d3e8e1519976"; + sha512 = "71ab04476fe12d84ded74b60eb22732d2c0c459de6bd40beba853171f97d314037b8a510be299bc116f7edfefe28d712b8423f6798d45f995101e4bd07c4d562"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/es-CL/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/es-CL/firefox-58.0b14.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "dcddf236b23f541d5c684e3d9d0fab6c60107ec64f07e8a7860dd0d974e48993956c16ab7a76a27759064be8752ee2e75aa0f219661ed96beb12a408925adc3b"; + sha512 = "c1af356729db2bc96f5ba66c660ce04315cb51cbee29c25370a416a957b3477ffc5a89119ec6a09b9b1705b65e98dde5730b2110fa38e7ff81e05d25135a34dc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/es-ES/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/es-ES/firefox-58.0b14.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "112da59ed3cef9eeda9343a8f9e99152d800b39c774713dab4637f1b5b45f2dd8e3b930b61d4590e5842df8445169345c87d0d3c4803c2381213f061305fb782"; + sha512 = "435433ec803f558f4f10f1c4c696061c2e2dfb69703dfe58c221de9f676f297d69ec5f089faa340d0e4503175774993ac40413b2a2b09985a0522645fa974063"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/es-MX/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/es-MX/firefox-58.0b14.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "b478902fc4d721526a66b6d5c333dd449376ddf76e991b9748f5e04eae8e134db68a4aafdd42d06fa69a97206963cda4717b3896eae1aeee66c6e558f860fbda"; + sha512 = "2df56f9cd9e44164117e57d2d9e7f34fa2946d4175e2a0cb2c8747c0c3cb00fbf81970e4c37d83cac2468f57b1680f24825148902d25bbb0e942b58e76b73b0b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/et/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/et/firefox-58.0b14.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "5d868596039fc2f51be584d28346bef4222bb49c855e3b10f81b8114ab8992de59bb0285d0745dd95de1e85473fb9b8d95cd62e107ee7ad7a98131c3e73e15d8"; + sha512 = "bc1dba5e8353e6d544d7081244e706d376c892baf16fac2df44e37c684df456571dec80bc2db4899a4c3f90d790b42f61fd65c5f1fcf46a0a2974b44dbe29eec"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/eu/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/eu/firefox-58.0b14.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "d96cb4bf065734759f46eaf4b82c6baada3feb9469c9f6f10e4833e1ca77ecf74ecf55a000e81e72b8c7e6c514c270e4563eb2cb40868eda14fbf2a3bd986877"; + sha512 = "067f8c6d33220629e706a752c59db3554862c4a871f21a92f126e35abfd7a4e609fbba3c94de6031825e00e79c6f177135621293640880c88b59f10ae9e67ef8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/fa/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/fa/firefox-58.0b14.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "40e17f1201049ddb3611c77ce48cc4b3b97c4c23090e6eafdab9198eb9dceffecd769ef32c57af003217af56c7215a178a2902a75e54c9d1dd309bc594d6f227"; + sha512 = "15f47a2e46eec630211f98e117a61e91ea36aab5634a08f8a3f31c308967b4e0dd2d264493413e932f86a6ba0d64044e8c72ff220a17e0e3b3976fb53358441b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/ff/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/ff/firefox-58.0b14.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "249f43b5d3624eddd83b5051bc17ab6a0dac833bd7cd7f819045b895b5bf20d61d0f9df360aa198542ab7bb65a5fb8cee468cf1b76166abd44d8a61405452207"; + sha512 = "0015ef9f3b51bf65a7504befc1be5d83cac7ea7b0db47af40b8bcc84cfb3374b74781ae853269784b6aa897cd02bbc88511385b521fac835ad290e4650884917"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/fi/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/fi/firefox-58.0b14.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "8ba347da1d4334ac1871108fd148461e8e3102d06f182af994354cb93b460e2a356586d4a2847e88d16436cafe69b465dcaa00bbb2b06623a1ece842c4eb4a26"; + sha512 = "14b3716e4c36779653d865e6fa0e558ea23085342954620ba81f40ab9883ad17a6d03d64a3916f90795c8cfbade1afcbdef701e2905bc298209912cb71d6cb4f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/fr/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/fr/firefox-58.0b14.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "e6c13c1c20890d0ea53c54d18b17e7e79b8e791233967974c09b86187630a9e85bcc7b18f9450ff415b05a462cf1b1cafd1101e9a24e620e235e68f99460f8f7"; + sha512 = "63b3810e59d00107f63114ea15f61f0172bed765e48298a2a43c719ab9f1ec39eb92359a4c8a9afea023037d5fa1c6702f48d231f5fe543a68ab1e05b78ba00a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/fy-NL/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/fy-NL/firefox-58.0b14.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "850339d7d9a44611ce565bf1296c9bb84652ce5a02b5ff16442ffe7676eb5f431a7168c1e49649d693ec6238479dfeb5ab7736816fb4551a077e7e856f65e6b4"; + sha512 = "6d5611516b069968c4e49be3157aa5de7e00b063526d5ab08765d19c10eed31c0346e7590c130f7b7d82c79f4be6db0c3e95d3cec0f5b6e892f7b49010a30866"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/ga-IE/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/ga-IE/firefox-58.0b14.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "1060f6c46098df6cd8e64a5e855130054f5596b36cff366338eefd94b9ac14af4e6fe75cae1efcca665caf7ae51ff4e1551fe48e9baf1aa98dfa10cbf5592da6"; + sha512 = "676930b959af9e6fa3e7c33dd91112ec5ffa3a9d98126b7d73d2f816125f69fc639929124c07bf3fff3ccea4783c660a5b9de8e7cb8a60dad4ee2eda6e3a76ec"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/gd/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/gd/firefox-58.0b14.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "bc93f726ba38b3d738d7906d1c31387dac9c6383b832b7b353cb0130911ef3c186211fd2f61b8b0fd96137a30502724de2965a9d6511df366abbcd97cb3219ad"; + sha512 = "3f0fea73e52204c55208398ad8114029c2ed57b4f3b8d6d11cf22abc47116084a42d9e4ac3b78ec8711c6ef273fb002dde5c4691b3cf2e73c6ce2886877e8425"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/gl/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/gl/firefox-58.0b14.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "49cb38d1da839307bf1da9d2fc5130cf7f50c33fb37583226ec3ae14f70799b2432fbefdd662987f590768ad2d10054a3a724b42f1b22d5a9c08e1e1f37094f2"; + sha512 = "52b0508568d71cd6142ccbaefbb8694840f5f5236b03248c5e14e748c692a4fbcd6814e952abbf2b3fd149ce9fc31596bc79eca7c5b4490f8a6f387818d71ec8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/gn/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/gn/firefox-58.0b14.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "c11ab4aa879bc3c6803f3a884869dd8af3f29972f28d5abbe45aa61d61dee708a47027db6a99d5d097e1f5295821cda0fdb3d1a96c3ec1af26a17d614a02186e"; + sha512 = "20cef49120cdf0162432985e3363fa9d92e9e9ed9a3ef65f3a0b1ac5b810b65b7df118602e00e90290101097181fffa8cd72cae1c5873b2d3dc6a3cc7e2fd06d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/gu-IN/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/gu-IN/firefox-58.0b14.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "e59b39390b484f7f90dc735f2e02d2d44c3d882918d86b028bee9e451f23cff64e3336a508d27e0b59f51c5fba6e38cdb95e5514526cbc3969d2acf19141b05e"; + sha512 = "79eda3f6c5a1321d9013062728b7e5bb8da4f39a566d94e5000b87a34e5b66a21629ad8d9a2daed6575b015a474c7b435a78b4a958508c9331d9502530b336f2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/he/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/he/firefox-58.0b14.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "e7a2fc79481d427eb488b6172df628340401893ef59f0eb2780f74f8715e8226548698b980d5a89322d581abdbdbd4427b47dbeabf851f68c25746b8abd11392"; + sha512 = "255f40e78c0df93c891a90f4c0357b50469d98286a23960dd9719475f45b9ea11422b18e0c4d2b1f9b240f586d6b1b8c7a45897eb111326970dbb6041540e1d1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/hi-IN/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/hi-IN/firefox-58.0b14.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "282fc5beb91a33dd4e00dc56b6fb6923222a260ea00fd720b171a285bdcc20da1b3e617e305352a2f8f3b75a7bad8d98a6fa751248f7993d82d36ea5109a644f"; + sha512 = "54c9fe68c39492c22d5ed83bc1c19f62d9bc9fe3fbccad7b8ccfd38acea5d9841939f919c37888e08761055dfaf3f2ce7916eb2cda5793b725e0cf44d3437af4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/hr/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/hr/firefox-58.0b14.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "980c34f716d4ef0b298232fbfe57e2025e1a09c5e0a55dd4170106d7ce913f4b1bd03949b3bc6920ece171822f1e45aabc8b6123e5f8b992ad10bee6949f15d6"; + sha512 = "ee35b01708a215d362b3caa08ecd3d3311c87aa1b9a57f029c6f00f0c55ac98f5827d975978ac1c7b68d04598d03e657d75c5b3b5047e5b13598b7966a2c84c4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/hsb/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/hsb/firefox-58.0b14.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "a8f458e0b8eb94c8f013196f80d076de1ebbeedb82981ecfcd578d856f671910532e42510c1595e7dd4b67651182c953effcc49010b80593a5105a963dc720bc"; + sha512 = "3eee1c00f27e19f1c4b84a5f2fa7418204959a6417a4fb0815de1fb5d6af4535a3e9a7b96160510707816426c82fedba1c8a35ef74dc710d31fb52ce60ca22f0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/hu/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/hu/firefox-58.0b14.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "89f3f16e2ffbad60925d0e1427a5802c80c9db83f9b7bf79fa8ba4ed2ca067424c2aad259464b45acbb90b9957d4720b6b39bacaf09bab275b91331746bdfeff"; + sha512 = "26e35d962ff5419aa6f975bfd1a59d186098d1022450d6cbdec1d77cbc2340f9fd72719d52c94b0106c9ec084501ee2ac9e688e4ea8fcf2293413a175945b51f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/hy-AM/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/hy-AM/firefox-58.0b14.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "3ba35697575db1133d1cbaa76a0d2b8847775f78068d3a18b4b57a5ec9b34c972b66f7a43bf7bc7779adbc42ee2e83a738b568ef3a2094c73dacaa140dd74c48"; + sha512 = "ded576d7b8e4d3a9b2e27956b1077ac29fd8ac6cb86c9e41306d9b0e827812a8fa6c50c54652972e7af12db1592e63e95ec481e39b195ebb6f658ba0117a8d55"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/id/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/id/firefox-58.0b14.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "e35f5b44560edaaf27bdf4d5536dfb3a97024a382f4a004a176d968e400c5128accd8ff76f27b0f67c671386649ced4b79c0488288c8f2a17c0ec11348611528"; + sha512 = "d67b53e92819401b5f63e5061201548486653dcf3cca316626ed7759e48ce725308922ddce5043ca22a6e7a6df9dceea2d8b2ba0fb7fdb93680ff5d812d8602c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/is/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/is/firefox-58.0b14.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "390d8081320e129de4aaf5ffbcba3ed6b924a22c7a7fb92e311e7f583610ba59d7471bca2fc1855642a22e1c9e2ec9e4130601061b4e5518cd07f54dc952d470"; + sha512 = "ccf9190c072205d822c4820837392df85541d110c687abecebe473e9c8add483220602c74b85c6975a17281e0e8ee6c24e9a171b2bddd56e3f77088cbf821bf1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/it/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/it/firefox-58.0b14.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "7dfb54c0076484b798477a7aaf2828d4e1c70cb734cd9ce6be230d0ae7685287f7e1e93d3c0e500a1428b2efaa4c774d48c576e6407f44e98d796b3ac1f1d98b"; + sha512 = "8bb1f3e5b484fd1392b54f3b8c5dd4073a234b53c041d1de07b286f265251f9c8c83df053b15d12c508acceb77ab191106ed41b3db240c569dded0cb762ddb4d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/ja/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/ja/firefox-58.0b14.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "3dccf905e446790642020859059ecebff5d7e4438202f0a6b1f43db9c67110bd4160119ecc78c3b66b17b321a92846982a0040c4fd90a8cd92f42f496ed89077"; + sha512 = "98edf314b01d9682243cf1f0a2c3dcbdf835807e2a09a0edb3b3a19193458277fbcb2f09c5a1d2486d3f4d4a9f9692684ed09d96960787adb9adc3b932d1ce6b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/ka/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/ka/firefox-58.0b14.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "a6341595e4641a159bc59eacfae07bb72c71602c9d451dfdfc05a03829cf080048c79f7a774236386ddab48cfcaa2ec7a6f88e848fa365727a918b52bc14c5ed"; + sha512 = "4d708f00d87ddc6dfc05fcce6836432959313f7f6c2ba0a7e8903dee4e7fe43e8604bb34d7940b9bd5233db4234857995048f33d43e5ef82143cdcee056f32bb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/kab/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/kab/firefox-58.0b14.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "4dec81d752d7506cb36ca33028a0f7eed2ae6e54a22b82a0a2968f426496333a0411ce5b6c753b034890c5faf8f775291c3bf56f41f8f88b03ec31a4ce1c8949"; + sha512 = "3afc99bb21cd51a90577dec2b1e7d1ba10d7287ad389281b8841a8f49c694c5704c7aed4474b318b4a5d02a5052608e0279eecefc59aa4ab73ed05571d9966db"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/kk/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/kk/firefox-58.0b14.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "0cea956bc0216919b784e6002f1d9a2aded2c6f82d19c1902935c8f21ec8e0ccf914ab6717edaf314730ed5c0cf16d09039e1cc37675a7f908e7960aa96b335b"; + sha512 = "c4e1876ec0fee983366023ee860244c3a215af67aca9cc358ac42df74c2e83941ac9959279316bffad6efe56caa7396926a899290d66ff851be8d869b8af2a9a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/km/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/km/firefox-58.0b14.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "67553a4a9ce89f728d68bf3388c383e737db6454af0c2a0894ffd827a1ee4387f7c90bb64670469005f1e2d0fda6784b059688a731be2bf6a1cd0c3c5c2c0904"; + sha512 = "07982431dfadaf97cf8a5b0ef23ed5a55243ae30aadadc93c79bedd0d5304333b712c9dcf7dbfb88cc1fcd6c51af7cc5cb43e1c4ed1327cc28465c10b8dead41"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/kn/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/kn/firefox-58.0b14.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "36a109fa1fd65364368e2a7348185899b113698049dea13f6f1406f4ab55b2cd30d7d075b1f0a63d64a38b8f0ee8644b6ba23a89b4171807d86c7b8c37b3f27b"; + sha512 = "ced39effc21fb8e3c384ad57da5ccdc8c436649d1f0efa30784837dc6611be5a91138b2d0650097468e5ddb340a1a2d3ea784dee752e8ce1cd6bced67fe6f966"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/ko/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/ko/firefox-58.0b14.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "6c91cd9c7614e153ebdd9914965805662dedd219dbbf2d0821b398c2b07dfa8e33e8b19c7c8e30e370a3de0677301050f7f2ade905857bb0f42d4225e3391297"; + sha512 = "315a3cf8d19d976db2b9663713f6b8d69d69e6dec3696095e2d0fa43b351dda0ea5dbb63ff17317944ae189ef162a3e529848d1191b7bf4855e06f76d05f52ce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/lij/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/lij/firefox-58.0b14.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "970f134c6507062cbf8552e9f2007ebc573e0354622d38cb580468a4bae3e93033e56717ad6772c95f8e3b994d03073325f28a64bd6f53976dc6b667a64ee71e"; + sha512 = "65841de4b40382ccff9641ecc9556977c986aa792cd41b271ace6f580ddbb3aa6732451251c204b5f76c29cf2fb62be68f677142629b9ec7a73417472354c7b2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/lt/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/lt/firefox-58.0b14.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "c797a8d41184d483ebd7940539eedb22dce607fde7ba0c5414de44b7135e5640fa6fec67a58064bdf65e07af3f88c0014ae109f3c7561ebee3b8bb59c2116d19"; + sha512 = "69bdb7dcf27ead433d80c5b913916765863d4317cf7853e2c8e19f0de63f47fc141c9aa6ffaa6ebe074ea669f1ce7af29b5f5c4219a7a9783458986977d07eb8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/lv/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/lv/firefox-58.0b14.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "79e55092e312ed83b40986a52c15cea63a16559b52fc3fd055460e754a3d18dcfeef5b1fe44028fcc71018a58dbf412e795e45cb122ae6a76f6b32aa5c9ef255"; + sha512 = "49e13498a10c5640cd0e92cc30ae6ed065f8a162a6b08484ab2c6f0544026f19ea818937f61ba265eca0f826f8557750bea56a379a34a832955e9c3085e43372"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/mai/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/mai/firefox-58.0b14.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "794c62d335662caa4c44caa5805410238b872f616fb7730d77cbdf7676f3b20f04677afd1e3664ed029ee7f6f0ab4e8555a0590c671a8624d7301308f87fb3f1"; + sha512 = "976ab1ba864d7fe83edda057c81e67ed80b7b988bc3304e2b18692f74c4f0d05f9b0f56693233dfa861ac0a2de09364fef72542507974dac73c5c87657e03fd3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/mk/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/mk/firefox-58.0b14.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "8a24c34b49a87b48d57f4489a4be3e54e820b1355f688d022f205d05c1b9f123691ad2bb87c45989deb3d62d56a6e1d8f3c1b923cae2877a4ad321fc2c4f4e48"; + sha512 = "42bed5ff739e5156a05ef21408d0ecd7bc3c8ff44fe00acdd11cd29933b4279c0347aa85ceea8adbdd58081e761f291129bed75f66c447c3389f86c48fab6835"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/ml/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/ml/firefox-58.0b14.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "e523789e89b59d7974f7f6ce9f9e56e26719bf808aaef4f60d7d33f624d42ed690494dbf0c9d8621639c569506de0618c315cc6497641e3237f6d7ce4481b8ee"; + sha512 = "87cb2354e1b0a2aa2eca68c8c91823ba17c53a6e8063686460ab6c47a3d87be84f7ebc4e870333c1ad34022d62b659e007052580c0044a1b42e80b5d3152a6c5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/mr/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/mr/firefox-58.0b14.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "3cbe9571e2e4c9936e7a747970ab3b4fcf103cc46ad08fa695540e8a295ae9e0ddbde334c41d5eac0c42b9d9ab51a9719008a5be5836a48ab13898b10059f155"; + sha512 = "cc7f02cc28c468d7030e7a6e9011f312060547a532297b8cd6c54bea5a75113348272c88ab8bf03bb6b2e1fc4f203e21c9c3e13e9c967bc935a6d37b4b8c9bfc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/ms/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/ms/firefox-58.0b14.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "7715cdbdd5d47077e68fcfc91e80245850fc4af3fab5a212d20ffeead6f104b3ebe3115cc562416dd39bc7a77ac82a7130ac31008a5927ac1529b06ebdda3b1f"; + sha512 = "8888dc171c252378dd0e5141b651627f0bc40142c1b04abd359c5451bb8dd2fb08876039d2490f7dd3429a510ff312210c90dd5e54a605474925e3550be49d15"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/my/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/my/firefox-58.0b14.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "82cfe01adb2773dbbd0f116663af8550bf474260a85d3570272e13b272e74ba276fd261266abf7e47c44ea3738d2259c22aed38eb2e2e082ca0146d82dc0df6b"; + sha512 = "b9dc441c0e9870dab08fd05b9cee6e5091d3a97ff2c57759664d5b874129a48043c634b1571bf57533b4da1a68756592d8316ad618fdbe442e090ce970912a19"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/nb-NO/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/nb-NO/firefox-58.0b14.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "e35c7280fae242c4ca0da23250dd5e37921dfc446266b4d22f30315f63bb8c3253f9c8a1547388b1e1ec37e40a2b9f88dec7feedcccb8d9b76f023fc816fd90c"; + sha512 = "eec99f05ebe9dd5573bba034f123b0b2d7b61e64e733e769c83b3f59c685edd2cc1c63d72ff1df5cfcc6a36d5bc3b7f5957ca64eab3307ec11e0e79476a28172"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/ne-NP/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/ne-NP/firefox-58.0b14.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "ddb7ae547c76ea293ca6d73c46df33aa9b2c0055ca7726c32a12cc6936ba3b62ac2b38f9e977940f5ec50968cda48a4b3b282df6ae0b7384bc0c432b6db59242"; + sha512 = "8b39625e8294a7bf4c56da846c6d79639d442a4286bf0508edbb7be4055b62d3874134193c2b5177f96dc83472318dae3f64764f9b324981548468ec40e413af"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/nl/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/nl/firefox-58.0b14.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "3ffc357ac9d29f514bbd2b9a15c0718017bb99f81d49fed317e168f9e1f18bc99180e8958ef1437ac68b5f2613ec81203a595076fb95827565925691ea8a4f8d"; + sha512 = "05183c413c385c7fd063d6dc17f3c088729dc9363d05e492066cff9c76f4fa82802da403a97638b77ecba201f9e388305d29537dd7d1bcc0a0f1eea903916216"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/nn-NO/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/nn-NO/firefox-58.0b14.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "c6d9683187fe9cd86614718510977903a08c26b9dd3f23e6f716aabfc28687abbfd448c2a57ed1a44800352204e8008f263896da021b1ed20d6b814d7194b0e7"; + sha512 = "8de3ffb3576fd3b30c6852abd327204f8051d76cfdf581b057ccb7490c82c17434e51e0a3fc58798affa9aa01dbd68953543daf98a9be485a07ca5db842d8b0e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/or/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/or/firefox-58.0b14.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "7dc38724f002c9a8f37db24520340d3a57341934416fee586fad578ed138f591ae83ff988695fed26e665d312e860b88c785eda0c53db3db77578ef47800959e"; + sha512 = "02605c0042c65f51bb396086b8b2f1453ceec86d9bf71dfb6a1fa63cab80fe6d3de55db399eae5fb5c209e2388fb0233d5c9857466315497fcd1be0a39991096"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/pa-IN/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/pa-IN/firefox-58.0b14.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "d95e617fe8efcfc66d657d2ad63495054bb21a8e63a634192d7b1b5555808b200e7341b97058b31191e11fdbdea4d4e46a0e0aee1a2a84fc0d3694fbd328ccd5"; + sha512 = "78e41a7991b843860f19feadfece3bf62b07d90701d058d2d88010d147d2d2e7d41d9ab65004f7ad1d4519c0c68168431821ef666b31777d96acf0cd96150bcf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/pl/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/pl/firefox-58.0b14.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "dbb7414b386ca31d7423c41e3958ba491eb0c1123ff8936e5288924372cc314e8d5278c8c415b6e43d0582ea4e20c2ed1bdc89f0747853359f3689731cce73d2"; + sha512 = "2c069d5a5be80d6db2644db43f1611f384b2ef804a029271e6d94ee17ac4d2b4351c8b1ac96be4db9bf24c7aa3065b827f661226e48a2aa4dc6b4b1d05636eb6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/pt-BR/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/pt-BR/firefox-58.0b14.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "3f2f80e4475460410fd8926d9efeffbe50fc98f7015af4c165cd3192042fe6b2646f6426c5e30928b6a0ea76b3c02fe0520e255605bb8b7d0a7b11b3b4c83a69"; + sha512 = "d51b61de95e5d2e9210a89956154c3500f1961160c90ee98ed2864876cc284883b269f353ba056ca6bacd96991fb33b8c68db541474b409770afe7d257043da9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/pt-PT/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/pt-PT/firefox-58.0b14.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "d69b9cbb9338c490c9e104e3b515885163bf56ee1ee6aa6ed606dd3fcd3e48095238f76ad80bc87f9c770bad924cb265f7ee6e6b0fab688a2d554ec454c6e3cc"; + sha512 = "c7ba601ced5444bd5884b36a85b6710ed9b5a50d3e062c82075ad2bef0de273d4028e865f663b5319a92a8330181aa624488c94f993cb2f0492d6decd0602f82"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/rm/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/rm/firefox-58.0b14.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "d4432ca9d907579cd5bed7bf47543be1ecd57fe5402580b09a12d5afbafe8eb02e5dda9f2e1c9da1f5c5c5ac56990a2aa49f6af2787fe3769f83af83d1e32e24"; + sha512 = "d6b97bb574eda5f9e486771774701f4156a69c51870b010618f7dba6a6246a7c755048d9603fba5987ce8c60ce76b4dee219eeefc9d9201a1ffada5a70342c14"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/ro/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/ro/firefox-58.0b14.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "0847b576a5e23360e08b75d58080cc98e5021ea1c621cd703d300726721298c1f37ca95dd11a346ba133f2151abc4e19a64822176fb79ed64ed5abefd68f3ab1"; + sha512 = "902ef8af0d16bce9797fb0c4be65a59a4837f2bf46751626d9993f55bad15958f238e0c2f5247b6b649c3857bcac38785bfd15a2c3f94e7cef533042523efa85"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/ru/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/ru/firefox-58.0b14.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "09ca0af70b91b358746fc04a9982750c992f8025112c057640958e9c5d56c1a6cf1f66652084e95a738a70cd7c53ea3cb858c81c318b72aa543fd383d0b5918a"; + sha512 = "7387830c2924059b8aa04294672eb5c307c5ab6bf1acaea5cd128446ab032fdd29a22ba5eb1b95e3d6d1d5327001001a202f411e2ad2d99b5fa17733b35723f7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/si/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/si/firefox-58.0b14.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "2e47109078d5589e9e015558ea6c561aaee3315cd5225770c133740e04ac4a1e871208fdd177d6cefa505c97622dee88aea777e769a76f50e5d6b28fd480d4c2"; + sha512 = "5b6889a1b60cb5d0f5bd9efa6fdeb14a349d4aa82bb55c0915629a88307519322af1725dbd4413090ddf1cf906e92ab722c99821e12cc3516b23469bb3f83965"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/sk/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/sk/firefox-58.0b14.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "c6b6dae0e84e50762111e2bd40da14e58d1b0a20307b18c04984aed601b246d6de7a94f04326b3ffd34da5206dcd86c7d51ffda41a6f215fe5b6a2bcbcd40a0d"; + sha512 = "eb617da0e73232144dab6d97b6b5705a4bd56d88bcba08dec881f22d47f0722abc32057142c830808e65db997f511e6eef95973926c05e26108ee7e7203f9453"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/sl/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/sl/firefox-58.0b14.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "07f714c089ec905e047201e1b306c4c70aca3a1d1a4dcd0607c634a851d6027fc877e7de14522ede9f6482aa350bcb55ec352e2722027c32291107c0e3b85745"; + sha512 = "4b54276cf6a26904107ea7460d21cdf88fed2d4600b29a77b61e9e5fd722857d6c44ddb6192961c7207642e435df8ae7d84711f181fcbe558331c8a4315dc6f8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/son/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/son/firefox-58.0b14.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "84a4aa660415ff578f506851c608e68159665de18766983603e8cef6439b9e161f08a7c973cb7cb4d032493b13898a8d92a0c67622505f20e10d9a63822a0521"; + sha512 = "17e181bdbc506b0f2a70f3acb5c277eeebb4c8693f07e60c6b42f8d17c7f59dd964cd572ad6a63968048d624e9ef5bbce328b2079faede804855270aaa3e1858"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/sq/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/sq/firefox-58.0b14.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "d91f3285c649126cfc1bc111600231316ec72c3f833e7e75baa406576d9a32a631044fde793d2108d3c8e193748a99fb41f52a41d8644780d009f2a1b41ef65a"; + sha512 = "06282a7e2d47ac3b16ba2303068902a4affeac84270c2fba983868e1dbd5e1040dba39debe13081d805890b629e4c2107c361c50102bd3354139bfb491dc5006"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/sr/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/sr/firefox-58.0b14.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "9d18f08f7209540d586998c73a0f1690a1df870131d7e21b955d867abcfe359d36eb51d863afe84871a2e7b7eaa73ddcae23dd1d893f0eb6940041120552fb59"; + sha512 = "5a7a95051e29f87b622aa8724032e1af4301e490be2b462b627d9c6fd7022a61e2e45cd1274cfb17752ce6ee29bf412fd6b3cec73d1dab2a88bb90cb30343c65"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/sv-SE/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/sv-SE/firefox-58.0b14.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "50def9df5d56736fbf0689135f0f6135f7f34b25387ad7a281fa9b635d73ff462d4da425180106f802e5293f1da7115c72f66c3cd65090a7671e8800eba2458f"; + sha512 = "71e775e7a4536c0c4016a9f07c0351b22318884ee8586c35c5f799d3f6dd40df221ece24336553ae09446dd66e34b37f71186f806a883589932465476e3661db"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/ta/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/ta/firefox-58.0b14.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "9b8f05efbfb489355e6dbf1ccd6ad5364a8cbdae0448295d066c2a162243a6af1b63fccfa39fc73fa20d33364e496e9258532a9000219c8a3f67257c595b970e"; + sha512 = "e14275237c406ea6e648dbfe5bc9035e28b8ecafddfe67da50e18b4a58a8d1229e0a61fb6c0cd6d523e946e86f909eb8ab5e91b27dd828c9e691dbd1a37586e9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/te/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/te/firefox-58.0b14.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "af063db5ed419b85ee348902e15271d8e6120f323ab574682da6414e589227e559adf79718ebe7664b260882cfcc4c5df50279f91f5d4be5d68ed2835f87b115"; + sha512 = "ac42c6a83ccacc51b44ef8e5b1fb6eaf304863d240789858e542b9c90387d62376973a48c06ea7d470844c32bfe12917c2c5165a5a5481ce1da42bbed1a80117"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/th/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/th/firefox-58.0b14.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "ef29284c09d4ec2bb4a6d5e6999d2bb6007accdc368f4d7a10786cc77f44c6b318eae03c041d7befb63c15b5b61646aabdab5060b0150612c2730353ef9d0b7d"; + sha512 = "b3fbda7bfda0f13bc0c2317ca9c2f9ac0526b5716a921c08638a2369a86526e5c5ae845735de5c008243c98f6a3b6876efa77c2f64c055a7d7b2ded5e82de724"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/tr/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/tr/firefox-58.0b14.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "38075e0c1365dbbe1ac69690fcee5b2f3ed6afd8bd1131ebe9bebb14657e71e3c0d8b87e0d6f2f0208b22d3305e0593065825fc4b6cc73042cd681e30cf11e1e"; + sha512 = "773f6b6e9b2c7da0f7b3aa1d142f28033d3d144c51d01c76c8d06bd7daeceef5a0a99108f4170f2aae735cb2c1edc12b2c0d29cbe57837d90ebc201db33f3d66"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/uk/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/uk/firefox-58.0b14.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "05e6a54a41d9ac1716426769a209bd99a2636829e20b9074b70cbffe3d52ae7b7e75a27619b7f1c1ccb9e64f153cf94d80ced98cf5aa8fca33d9fa7deaed1750"; + sha512 = "c60d0f46e3b0e93d401e7718ceedb6ee275c2384806b8850f37afe20dec0ecd2be1749bbc7e6249d947e716e43678bae41a5c9e9f085b48acbebee337deaf66f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/ur/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/ur/firefox-58.0b14.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "77facd91b6fe4f394e9a87b8cddf89298ce6e7e1d85309bd55bb4574d1b951a34ef4be03b477e9682ed9c507c7982758c2ffba2a067baf9a84ced68890f4a06c"; + sha512 = "e38416e4be1b909fa704c085a61aabb36d2da7ed0a9a2633941a11ee8ccd759dfce3a0703e5fa37424e1b6b5fba15bcfb335e2e7dc455c1a86502780559f8e21"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/uz/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/uz/firefox-58.0b14.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "513928d10b7e4916bc62524b557a88ad117f32a68bf993cbbcd8aa87e26a2dfc03557735ba4bba17ba1d5a1fc8040dec5a67ac3c72419074de40c221cfdeca1e"; + sha512 = "a1fdca6c38a41f73cca3c93dab0bdc06bbfd28219aa417ee5b6f8a805d6c717684136257a2c6f601a946771e6b340073cfd66b84bf01aa2ac6c8185a5bd176a3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/vi/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/vi/firefox-58.0b14.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "8f5aacf004b0ab278ade6273679715d9c1cb4f8997637cdd1267fb371d37d682f1ce6efa50c8705a5c934e9b6b0abcc8ed6bd9da59d0183f9a24c7ebcca3aa0d"; + sha512 = "f96f901897410a491f0228b3b80ff501a2d57902da6a5f5de98f674cde3ab33d678b6d0994e5e64532e82e75d79689496a42792905d425510e2247647c7d092e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/xh/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/xh/firefox-58.0b14.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "b5788ee08158570c6546ef02d29d95b5a6f4c79ad9a3520bd474b5de6cd653faf930bc153dfb2680e0f445b86af994552e65a1bb02c88d0153e26266ec39a62f"; + sha512 = "2e5f9c812bfc62e62e2112c981092ed785f36da7b21d1649c24ac86e3743934dde1cfa07312f659a55b83c54c18d43ec596a99b1542478fad69a96f2ff503be5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/zh-CN/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/zh-CN/firefox-58.0b14.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "90b8c63acb26e68d540143ad60dcd0c4b79d32d76df0c4406ef1b8f0998c4a2c10520d878209441336c1232d936ab2241d0fcf032649f61a21c3b4d0c232075b"; + sha512 = "79a84ab7b33c2d648654cdc9a5ad45576812835d2090c8b62bdd005b9ec189fc1be9714530b03ae19fc8d2430647598df223ae62a80dbec14bf3511ea3a05b7c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b13/linux-i686/zh-TW/firefox-58.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b14/linux-i686/zh-TW/firefox-58.0b14.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "da36a00f6bba800d89c1dc68c5da0d8cf8dd84e146dd34a7bec4ac17e6729c812b03b7098b71414fc8c01e056e18c46bf3582c42bf9f974c0edd7d0848cda515"; + sha512 = "1543f12ce0ec5414c3da129f104b8128995ae9815b731f3be134169a6839b258f1d03c81e34dac6198f5588f9ac7be667fcfd24c6be1c9f0dbb8732914858f8d"; } ]; } From 805567b8231f09d87c2f0450c2a703d5a2d73664 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 5 Jan 2018 17:48:12 +0800 Subject: [PATCH 222/296] firefox-bin: 57.0.3 -> 57.0.4 --- .../browsers/firefox-bin/release_sources.nix | 762 +++++++++--------- 1 file changed, 381 insertions(+), 381 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 80f9c895f9a..c56d30a3ccb 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,955 +1,955 @@ { - version = "57.0.3"; + version = "57.0.4"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/ach/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/ach/firefox-57.0.4.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "7e783e4ecefefcc03eda1eea18216b95aa0473f6f911320c08c478dc68543f9ae1ddde67a6f5f4e6147633b72b416ef04f91c390b66c24eb7369b258721ea9ff"; + sha512 = "44b5cd0112f6d6a8577b831b55bff2df34ed86e7ba6e16f54d2ec8a738453b27fcd4cb0d2f1c6d64ebdf9492ab2d0dedf15e3a50c16eb1701e24ed7293708ae9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/af/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/af/firefox-57.0.4.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "615abeb7d8e4b3e9c40e1a97bb6b9e9a44e8d7d1430be3bda06fe89eedc67f8b01fdb6c7284a27b1a23ca9b367990b2e952e086b0cbd8f07a0f9c9b03e7b64e3"; + sha512 = "734b6f164ec97e366f5e747c2bdd104f48c33d39f4467438da9eb9483d285688040cd508e864d9e451a9cae3907b4cbf0738489c3697ea38dfbf5d8186b85068"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/an/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/an/firefox-57.0.4.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "12576dd70c416c33c464c43001f9a2e8896ffc41afe1b012178e6b5bea399ba4ed6812dae6a3f95c775a4e2989e21c8929de130c0c4fb80afc59b91e4bafae2b"; + sha512 = "1be1776853195dd56b83ed4e35ba96f263a72ba009311c48e59ed42b3206a3b9052805fa7573f7064307763396a3b10b44744dc38f11d767ea67c450aa33e129"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/ar/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/ar/firefox-57.0.4.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "b33f949093ba7ceb852ade0ef5f771fbeb9e225f66df152ee7079b56737a85bfb7e8bec1cc47e4b76a089e357878a37b6e94f82aac691d139410556c6496d528"; + sha512 = "87ead011bce9035004af52e6f25b1606d3061cd425c0deb19de91f166ac793b0d8689440aab6e45f469426ee4deddcfc5a9f4872f92121e404c4e69cc50eb22e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/as/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/as/firefox-57.0.4.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "a73bf7a1a35b83bcf28d0dabe1597b0c6f1c6a617e5193bd9177841b93ba02399fab6baad83268825c1dc753572e8eb2e3147afbba17a338bdce68742f80ae30"; + sha512 = "0cef33747c17bf4646aec1d231269ca2198009038ac2b666edabe2b85333c375c18e249402ce201683d5145292057ee38082ef81d92304ce34d8fb31e5d240cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/ast/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/ast/firefox-57.0.4.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "8671c892f024bb16ebec39aada71975f511642e6d38d22998b5224735e2030dca4b2b2507fb0426825f4ec238d3ce5d33770802fdd22c8ed383feb341b549694"; + sha512 = "ee98e03759f85a3a52571b83c4fd9eb43bc655bb17735197a6cf30b894f1875ca1905e5807cdece521f24d7ded98118ac0c157b9c981720d80bba208d67f423b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/az/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/az/firefox-57.0.4.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "8e6ec01b879abd9d6af2e39cca088b3c325242a214d64f27ac01320174316974b9900678c896f0c9a42ecf85692f998064d59a1db69ae9642663b5313d2a6ac8"; + sha512 = "78fdbdeb6ac24450f0c6a52e308edbb31f1cc2c6950fc25295315c4be953cf35e3ba220c8f8b9994be055d963f6a2f55775b743161c71e24552fd5882dcf0b57"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/be/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/be/firefox-57.0.4.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "33e097eb0c3750fdb85e19b30d6b760b693957b674c56cbb9130ce24786af23509e34d447a686a98f725ec326a0705cdd1403d19ed0579c5cec3b9b1e0d55cf7"; + sha512 = "07248a7ddf23657647d6e3f154be6325e04cc30b02a724a0b4c2c159060b7c11c2ebe4d7c4bd09313d1b37eea7e1bc45c666b9e19ae7d01e8e10f6392a70aa04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/bg/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/bg/firefox-57.0.4.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "33f6750887c2f86a10ac0d47f13addfe5a0de9b911fd06c7c7115f6e9dc94fb95c8cd6ad1ad11de9443d734f927a70d56bd35911076ee47f9afb9dc3fd94e612"; + sha512 = "6a05d69ec9e607bd1c7e48b882e90f2069522f99b8397c4daffe70d7e0ac2012287db2cf78d71df1a7e4f20ceaea1de86c61b857986cd3f785b4c55574346340"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/bn-BD/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/bn-BD/firefox-57.0.4.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "03a1662fe4aebbba790fcc859df9436e1d2eb2c5c8d2927119f7e1f629ce48aa355897f1fdd0cec74c00a0fcb9c9339b96aad1f71ab6e15d18f09a196b834141"; + sha512 = "441f56cc7eb513e20a89732745c1d3f56d82bccf09f2903d9f07547a018ec31fc95bf5b56b9875cba08f44bf5d9af0afb6314f72c5c4eb0f6546e06a6115fb4c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/bn-IN/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/bn-IN/firefox-57.0.4.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "0014a45b28c117549bb6d5ec77a4a7656fcac5924e30f2b2c5f28a583f3e4e68f8e81d622418c4586446b103f878862f75d8877fbadc58689ae4de036ab51db9"; + sha512 = "eded452d957d9bcc6c65e716e1271cc130ac76897a166f2507628e99b50d99dd970265e4e5ff276d509fcf2026d3c95f4ddbd7b0b09144495bd483af724c9636"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/br/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/br/firefox-57.0.4.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "0078d101f4a6dfefd9a3a1a35ac733aad43e3b6574e3a4cb1b0ee9b04ab2363f0c0fff52f019eb38a85c9e0dfb930900ee1e5264dd92e0aa40c58de0c6dbc692"; + sha512 = "7ccf63c946299241612875d220c613887dbd4cfe5db019db4a2626df2ad6de8c00564bcf28aba66566eb26cdaa5cd7ae15eb5c6a37d7959663609581c617dd0e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/bs/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/bs/firefox-57.0.4.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "4475c7cb7da700da33ff41708eef052ba634e8a1286444688ff61d721d55f98387038bf2c815b2c9c5e0fd5feea5f7e47c04a91447a9cf99532430af28e7d748"; + sha512 = "de319c64ef4a008d30dd1bd26e32c17a7fc5ed73a74af2029807004ee98393adeaba06ac9f02687e359ea0c41a5ec176630fc1cec1b87fbf789d2da68549dd35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/ca/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/ca/firefox-57.0.4.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "47d5e1feb1188bac57b36829fa458ac47eb4bee1c9bfd24b412f36bd3a8d7d12c755ebefba6f61cde1144e3586c99391ba8734e69ccd99c5f404ad5065e77a70"; + sha512 = "f90f57a74a082e1015d04e4992d3137d6cd92d15ad304a2eedd3c293babba3c4a2f352512c0d3971478cd3df353d29f9ae3b1fc09ffed19cc3c7ab4475129371"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/cak/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/cak/firefox-57.0.4.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "8e8bd52dc36d3df42e7ef6ba604c0401b7ab7f45d54803c16f1ceae89b2f1dcb08644a462d660ff53c6288319c19e34b261f0a06f0b0354daed7e7dcb617c3c0"; + sha512 = "0bf057c37cb1bfbad87dc79386dc13eca311399ddf1deaa625ba920c72f690f01e20ce3cf0d7d1afeb016e2f27c96dff405c1b168aa83bed0615e55f1eb259c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/cs/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/cs/firefox-57.0.4.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "78d3e4b2cb1f07a401c00e9e54ea65e33c7c4b74a8f3e71c0342cbd4933043d82c372600084455fa253d3cc6befa6f046740b1e47aa639577954db52cf86a319"; + sha512 = "609d94b2e7e920a70c2774c3ac9531c7b97492401a7860e43c3a8b0ff8870d9c51955dcc0eb9ab4f12eece415338e6a8a1f08f55f4c5ce5f15def081d03d783b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/cy/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/cy/firefox-57.0.4.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "cf89564ad1c1d8d346fd655cb27c219689fae63040ec2775d0a588551884fe75ebb80cb842840b7cb16d1d9b20d215f44e5e0f9287169d0b2a376586e33e31f2"; + sha512 = "c77903916d9cbb55eaaf6220dd8a1a101c90a338fc3c9b289cbdb1c0e2080dd9a839b00575e38014ddce4478f53711cd31834d6dc94deb517b0a3e8e674df7e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/da/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/da/firefox-57.0.4.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "f403324556a40d82b9fb52ab25e4ef92c6e65d44a5cbb6a3fbf581a4f0d189b716af031857137e665b8bd7c7c500a1403746a8c973c282776dad09df80fc5839"; + sha512 = "69486cfe520e313485eec89f64b446de50a87d5f94ff6bc76412c61c898177b0f7ff969bbcd7daca3bbde648394e2f82b2cd50be933f5ab6168157d18156d8da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/de/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/de/firefox-57.0.4.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "07cd39dd4fdd91ae6fc445727f35c42adaacc8a71c81e8d2f565f22b4d26d4e9d4108487626c28e982e551cbc65dc3eb3830cdef6163ee9a029d1592ee095910"; + sha512 = "c85ac2270f30c9516df4a1331df5fe4a28c79787a12e306185b78c30a0b74d655c1cfa3e2b17ea17acb5ae28e47dc1235948deb6eba1a8d744f6a3864806c869"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/dsb/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/dsb/firefox-57.0.4.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "07c8eac5714b7fbd5442e994168fd95f18260b6aaf74e97c664f750be699f2bbb61eb34d591788db45841f1df17c1f977d668acfb40004d2cc4716a705a4218c"; + sha512 = "24b96b1db0e5f5f1a20e63d80dc69e309daaccddc0327b40fc8aae20a2e18f2698bfa50d3dbbd8268b54d3e92ab5a07ce1fa04de8c4dee31dc261109274728cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/el/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/el/firefox-57.0.4.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "02add1f0db002936b8ae153dbfb04392fda5a8948d2008e86acebcabeba4734a36f8e3983c1c218fb87c26d0673e305bce031bf5b91fd8ce1448ce9119aed117"; + sha512 = "f22348ac3448a39472e427714136c51648f5bbf6979a402838b0c11dedb090b4c16397841cee5b2dc142fe942517386db0063ddc0e4b317e911110548a7805a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/en-GB/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/en-GB/firefox-57.0.4.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "799dda485a170ee5f4767385a2c7773fd6d8584d5d15058a18969ab81b11f6e06da0e12351c0cda80124ae683a8b82ff28c0bb052e6577ded1756b3ba29518dd"; + sha512 = "6f53f1aa5f788f4b05135b610e117fb368c100053620f8283d39a9bad6e9710978b7ebc638514a04fbb3025407fe728b3be4a80d2708ba0aadfa11485e012e30"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/en-US/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/en-US/firefox-57.0.4.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "9b9a795664c7d2aef7539b7ea6093af55883e4ab055b1cb5cfaae01cf8f87b6c295e9ad69903b67225ec750ca594f3eba836a502928470f86d277706bf1b58aa"; + sha512 = "c6e9841fa901f78593d5bd60c3c4616e9a8dff696a5b812bcc4fed52287fe7db6c7bfef85a7433f08b3b940de6418aaf1c7c90dde6cff1cc6c7e0efe439e0ddd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/en-ZA/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/en-ZA/firefox-57.0.4.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "82a1c617ffb51ce228f34d277ff466e1c37b8263c7b3817484c4513fcb7511e442eb449e3e53bcfd4c92eef94d19f0d810411d23831b6b28a3f12eeddea2547e"; + sha512 = "a980707b6b773c0e34f385ddce1be8c4ef3d5a378601ba3aa40890fb247a666cb8253aad8a64859527a7becc9925124c9eac1e13a19a932158aaa953bbe158ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/eo/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/eo/firefox-57.0.4.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "aeecd1a2169a8f1c61db4681363f95a523602be751288854f2469627fd603a9990c78123ca43d5a66bd2df92a08d7a09c13cf24f14f7afa63f8de928a9e304c1"; + sha512 = "6b23c8ddcd84c96993b4cf7f256df3485871e170068db563e5d0c649abd8e3b5869cbe8732d3a97e1927f45c7c8c18d697fdebab4ec1bef7de78496d06c1c0f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/es-AR/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/es-AR/firefox-57.0.4.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "539eb57257d82ce3d8bf3254560118da7d81a3cbbb877bd5db3ed10b7cf672a2d7fdf479f175f2b78f79003dfc2d9818d1034b063643c1307294e6da5dd3063c"; + sha512 = "985149e873bdeccffd6be63b35a56b3f93d3dc35cf04b055af8dafff68ce82bfb752a0d48e3ab43a9b197d15cc11748243bd2e9537a42f59c27a7868c2b95546"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/es-CL/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/es-CL/firefox-57.0.4.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "676b2199127683831f6112ff6847c4a46bb9aeee225cd08673a2d7d8a8a8b62a7aaed22d406653cb839500b0da7d26ebb22dcb4e3c00395eb462732f686a9477"; + sha512 = "4ec591554411410fb90215dfa229fe207bc3303a1bc68c4fc8894390386c07ebf958fcc894f2d17a9876c2da9b8424a00a62fd828921fa575ce0b0aeb037ea4d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/es-ES/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/es-ES/firefox-57.0.4.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "e76ca567c4f82f91bec00fc1d66b6aeaa0f91a62ed88d39337eb9017707c13099d0e98b7e2177c729f1af47a42273fa01128f7360fa5097c5bb4369abd84f7c0"; + sha512 = "751741292c0794916be2636b42d03671d408b5e1675544c44238cb28131e64eae07b9524b57e5cebcd491ac80960d2d60619a641f94d333b5622ab8cda812e8e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/es-MX/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/es-MX/firefox-57.0.4.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "07f481896b44b119b311c5c717bfb5567219bd78d3990c2dc7ea76dcc7a1d907f78907971dac71acc6b8efba519efbdd73951975ce953bb939196a433f103a83"; + sha512 = "b54419f6cd1d7bbbcee875cdcfc06b9b6d053a1f320e47ef575c6d11ee3dcdef0937adcd6889e0b45c592e51547b66e09ceaa9ddbbd901aac6fdba0aa09df9e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/et/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/et/firefox-57.0.4.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "38d0c69e6a8f86a4f7717fc73d4bf08bdcef0e7f7283da4712ef325f80f440d8e906877ca304d8ec92e11df14b42a9c0b70f33437d7b76634c892a860eedb942"; + sha512 = "fcbf4c77a053abbcf0e071edeec310db34a195c9b1d07fe75ada0dbee71854631756a148b9fb36aba96865c462b3efb6c5c6689cf094430c6b9704a2e3e57294"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/eu/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/eu/firefox-57.0.4.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "6ef281592e2ba0cb4d83956048535f070e18cc72f69b5e425ecb9172abe67055cdb81b182733f23cfc41e0e69d61c162c974a3ce221766b6f6ea1a3c7dae5864"; + sha512 = "6930dd5dba3b9d75d1ed998ee079a06b4222e130b7456851b2be8353d29bfc883439617a0bdbfadbf027a1c14d987b5ef4e15419190cc67c54d88d942f2ada42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/fa/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/fa/firefox-57.0.4.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "12353ec2052be27681828ed57ed3d40aee84ee6c370901b70ae8a391b06f7ce8ae771a90ab7cb7f6c3d190326548eba5488d9e7eab2e68de8eae481bddf71e33"; + sha512 = "967abdce15e37d3cad52a5eb6a3e929b0ef0c6c8e43d803c88c20b649dfae3ecc980ba64f0ebdf140938627e857a86d1cd4884a4db682bdb4c9601e6cf1b3efa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/ff/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/ff/firefox-57.0.4.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "0d425d4220eb45cfee960cee97ac6abc985c19d774283cb6eeb4cc51f4f26c781e1037f9360d85366a4cab85752e32feb1e37f40eaff896f3a0a8bab43a6fbaf"; + sha512 = "28ee8f395cd3d214cc67068a1421b466dfba935cc63f9156c258556c89ec74ca70d21bcaa627f4ed7bbe372fd1577b77e03230b2f031ff26e72c87b8889cad93"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/fi/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/fi/firefox-57.0.4.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "8e4e256390c026f6dc151ae39026b9dc232cc00a27b5ae62176add02404941e38801f9ab71a63a715a9257281bee2eade5d677e73e8a79786f3b4a37ca5ef685"; + sha512 = "bb3eff25215b09cd7789e80161b06c7a6e3929036895a9bd9d949b94233bfa98056ba2123602f06b2d7572857371390bb887c50c2c1a37c641b20e250b083a5d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/fr/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/fr/firefox-57.0.4.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "b0acb5c1729163c5fc28dd38da1cc99899bdfd861b79a1c886e09bc5cbbe677822196343800e62ea8ba3b02f9819e85af13c362d772d4bf301f93b122c21ec11"; + sha512 = "facac474073bcfceae7f1a1b8554e807136c277f31abc999b2abe33f2dd6f365cbe6549a5f9542982c3f5b80f42fc1c7e361a5402f74e359170c24570671802f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/fy-NL/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/fy-NL/firefox-57.0.4.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "ee936cd1431432767b51a628867f92f3ef0565f69e305856c55fa66ea00e5c930fb479e6032b64ecd60299e56b6d43f1b198fdf99db645505f76c7901ef719b2"; + sha512 = "84deb0e23a3d6a56cb2e52958c7ec4a650ed32a0302d51ba0f9b02f9f6d7f974402c7445d51a7be4cb22be0bf582af377653e2944829cc075a01804727bf0387"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/ga-IE/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/ga-IE/firefox-57.0.4.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "f5c41fab676f6007d218141ede1fc6f86d46998dd4b4c6be25061a19277bfd6cbd5ff2ba44b312360224cc12a1f56d4558edaec95cca198a877a45090b0432c4"; + sha512 = "41ca5151a5d76314255a9f772ae7483d8c67df84a5511ad78cb951c6d11c8b0b78d43f19d3047ddd8add13706303335058adc4be7779dbe3bfa5b3b60a1929ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/gd/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/gd/firefox-57.0.4.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "bf0bddd8a9849c6f406d1009317c9e93d82868e9d2a621524f2bf40e6f6b6586c368515f18e331c9a871a78339cdeca90686adb7ffb4edabb9e78951d91e2008"; + sha512 = "020921ef0e372eb1a9cff8c71133668f6a708436027a5d163188b8d2928fc8a264ffe5f7a1cbc40e109a711ed4a8bec26c333c29c84d4cef6c1985fdfa54a0f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/gl/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/gl/firefox-57.0.4.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "e50d6b80f7833b2e417bd6429b83b07e34c951a55eb8eb5df3a254976fff1e23c5dc3567263ee0a0830c65c9452830e488ebeda9e604e3eb099e09141596201c"; + sha512 = "40d1131d2f2a365bfa0432b8deefa8c705b508419ae3e1b764500fbe67cbe38ed9a9813031e37ccae2e835d1f9d6b6c18edab829bb24f0658a6885f197d108d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/gn/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/gn/firefox-57.0.4.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "00abd6b13e6bc65b4c69b0ba4ae7538c9a6e8a4e8545153ece51029504aab8ef77f3eec09272d3ea6c51da1e8e8c3a77589889ecedaa6cba57c4191e2b8acd35"; + sha512 = "fc16f7ae512a49f5af381e3952b9af0772393c1e0b917d3d946a8565733dd8ae9187bb1101bd9604a4e860b8e4d001ad3bbd8c3ec023207cca28e91f6ead19bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/gu-IN/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/gu-IN/firefox-57.0.4.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "5ea5297d8f7f1b6a78314579b4f11dcc792172f47773ca448e0818254b150d3c384ae2cda62b12d4388b2b19f352a526520636afdc44ebbf9d3fbf1ca79c07a0"; + sha512 = "693dca0183d8dc7962a4505925abb40d286b86fae206ad2c88153ceff02138e756a61615d9043bd65fe9a60ab990d5a79f2bd0fcce784c361488c3047282be17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/he/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/he/firefox-57.0.4.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "2a4300e271285f926657cc02c80f35d9e3f8c2c09efe6fff5976dfeedc4877219a4c7e3d45ddf77987ac24024df1a89a4b49fe85b2cf250c4ba1c980be5254e0"; + sha512 = "75c52bd15a6c3b7254981b82f9d5f0b9aaa43d2346bd1376913f6974b63d9f6929ef92fda0916103c643ecaa7f235b4268ecd956a4194ae41048d794029605d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/hi-IN/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/hi-IN/firefox-57.0.4.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "23213f41de69b819bb96b975f7698cd9ab662d9b8f6b77d69a127f70426873f28ae298836bffebe289a7eb6dc0493f5ad50bcfa364c76edcd10727a82cdc60e4"; + sha512 = "752852c1295153ceea9d55e49afcdd185ca34f31d38dc2a85252f5ef2b0dacd9a6b3a1828ed0d88314574241157dd90d1da33c6d19fe25d1180ee959bbd8ccf5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/hr/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/hr/firefox-57.0.4.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "b229241f8c3965baaabefae35c92b1faaee95aef4105b11a6af46e92f0999f37a6e61339c9ecabb3c1ee97c0582db5783d1f92d867a7298fda6476824c0b1bd4"; + sha512 = "01b29494db80f9483334bfe23d62859aa16dcd918b1acf308d765b9864304616182195d2c10e6ced4c7f1709ab2d5a3c5485614506ce727fefb2187b82a28895"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/hsb/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/hsb/firefox-57.0.4.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "b463568cef3931a3a290c37aaaaf91cf65d0dd1dcee8695054ada4bba0cd91e4fd0e88f797302a67f9610639504ea8f2f428b512258d49cdd6f8be564aa79c03"; + sha512 = "efb189a9daa8335e8d2b2b31194d808edcfc0f8b607a227daf0b74ae456600b7ecfc9fdb1340a17cdb6913735ade2eaccd552603737c4c9bf3abdd99bf438d63"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/hu/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/hu/firefox-57.0.4.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "21da18ed2c20bcf93aa1fac251762bffac5555562015116c38d2b3711c9ac4e16a3c3ea8ae5a882e1a9f8a72a6479215e65163516149037b8b1e7256ba0b3e70"; + sha512 = "4d6a08d3ea1cf72261aaffb7c1887fac28ee68f6e1bb5a540967164a4f7294f0a378b0cfe3dba867a5adfd21e4df3478a9bd5be057ce923c53fee39fdcbced4c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/hy-AM/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/hy-AM/firefox-57.0.4.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "babcdb2439d6de5c1ed85f8d5ede8c3bcff9a6dd448589d822c510aad350da580e26f37ab46891260244087c51ade46517a54fed76805a336d2b8e22d468dae1"; + sha512 = "c68660b7e1482e46ad66c86623d9252466b15eaa3d2c848392985db2932624e3d953ee48d6eab39c42dcafda174713fa148aab41cf04ff63db38eba563303c96"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/id/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/id/firefox-57.0.4.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "a2f68ca0a667f8c9d2777dbdbe6ef927fe296991daeda11ebfd50c84ae9343728e707b71265cbd0cd93506b2322cc09c7ab541bee15b918a292964061471592d"; + sha512 = "c93a02327cb8679b65c9770d6105bfdb6ad3bca90191f3d0fb1a5a35d3bfb1d4616ea54f3af5aeb76449de973d4acad0873e37674524d90010cb830247189652"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/is/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/is/firefox-57.0.4.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "316cb66e3101d297b771b211bd0e3a3c57abddafcb01f15e4a5821a45af0fcf8d70a97082815c43724c3954be63795747a4483011695ffef46713feb66d94e61"; + sha512 = "b7961afc123a574e656e98eb7b6f819517d3658a36303af89d36f03c9a32137984e047e4021d30d137294f41930645a62f5dfc06456ade330942a880aa4381a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/it/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/it/firefox-57.0.4.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "8998f85ae38c92722c87ab47ce257dfde4f713d167dbdf79983b3c8d979f9e47f14c44e520a266e8e58d31d2eb50270f56d5d395014a7037426fecf3d683db28"; + sha512 = "7ee154c376146c40828375072f0c5ecc652eff04f8df644a25f106963fb1ba6973aaa7e7d5b27918672fa42069d91d4207e8f779d684cb342c29d56a1a020ce0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/ja/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/ja/firefox-57.0.4.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "cae82ff29c8f228f4f5d50914520b4f962b322793fad4637540c471b367a2fa8809c3097e23f52e33c412571acb398d59dbd8acd6b641ed3ef50952f460ea534"; + sha512 = "ff5ccae9fedb3366319a6ee2afeb849720ef9aab9a25700e15871b01addb1bd18d6a1ce655e0ef0adf4a1f826f81b85ee2a3e21161e554b5a2e9050f72c13786"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/ka/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/ka/firefox-57.0.4.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "2e4534bbcfd879741ab0abfa5123ee112ff06cc9ea9fb5483d9f58f704b25db79b8acf1c09e2b9fa00584ee5331f964f07771951601f8f84e81ba507a320896a"; + sha512 = "fe165e0c5d4204209ee9a647272c73c28344bd16343338ae6b8261dca2b5ae4d05b7fc6cbd3a7b3871e693706b7e73a3b7ef3dcf40ee4dceabaeac12d5398a22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/kab/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/kab/firefox-57.0.4.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "cd7d7d7627ea3a9bfb2c9f04f37cecc79c80bfc5054a10b1fca41077bd9ef79b25fe7601915c16f2b6b92cd7cfba104a58e586819da4a76055554665f5f2d425"; + sha512 = "294d0980cc5f9d7feb628c797d260024d786e919d2872f3f5695ba7e4fbabdbfbe9bf5c7327645ad99771aae8902fb3fa6d6e5de1eb56746b32b36a24564501c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/kk/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/kk/firefox-57.0.4.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "19fb1b47c1512b7657a2b2e5381488cd3856518f41eb87429000be1a90e4463d30d2dd813e752d088ff366551a90a458dbb55e44f552dcfcdb37dec502755437"; + sha512 = "221497e9d38f2068f38ab37efd8818cfcb3f6281ada16436d7ed22be0c02806a0188ba5be52220ee632e575989e76fbf57263182281bf0bf736f203f6a048bd3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/km/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/km/firefox-57.0.4.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "f104e24c2499832e4e5393973aa4b1b2a8757b18ba1861cf3e105994e5865e236c92ab1f1f66e94896daf65660a0d1fc11b126e64b5ed7ca8d47ff307f6e820c"; + sha512 = "cce416868cfc51aaa334bc1fa5d7102177024bec64d98cc1034fd1741290876d4ab2244bb49befaaf7e198a4401e43b3010894226fbdf838aa3b8b8282577ff1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/kn/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/kn/firefox-57.0.4.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "66e159c7f6d8fccf316d9e06a9fbe43b9d37c54dac91a45605d5f43de943b1ad37c5a67fdab405d147346184d9360c90e7f2fbcabef2dc4152f384ee17a1e040"; + sha512 = "6f1039c079af325b6190e1a0396192270adc3aba374e7cfe2cb2deb39b86fe07d605c9a3d3b063c91abb8ec6348c324c419c212bcb79735ce8ccdb7ce4608fbd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/ko/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/ko/firefox-57.0.4.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "f609ccc5b9ef40a1fb5190440acc7ae5bb040944c535a86ba4e218cdafa587cbd4e7f34b8cb27815698af33a5cd0c59c17f71e911735e41c03c66a7663ff8872"; + sha512 = "425b023e7eecb9f550fdf96c544faf21aadd04388a4b57fc28cf9e43f82d58dd957983046399592b21099039bb5976d691512a93f4c1a94bc384126b8667e19f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/lij/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/lij/firefox-57.0.4.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "fdfdedddf2c05b6be1e1e36cb707ec1c0f93b1c989b540b025962bc09f777533b276c6cdce1ab60df68899f4b9c36da03bc2ab08cc8857f0dc5c8ec02da5ac14"; + sha512 = "2410a21d6158314076474318c2be450cb3b3397ffc5a9e9e8391218b16116371e2816c6fb1684b3fc3589a7a9834874bec01a2af39331dd592fe9fe54a3f90f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/lt/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/lt/firefox-57.0.4.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "7f7d3d627db0180c9aaf12795fcc52e1839c58545390cbc3bf656fc71a8eafaad158af833b74879cf37ee762e838369756c9b062697162fb3d03d2597847db94"; + sha512 = "78ec1d96aeee8f610c2637be20284fe85913cd885a46ecd3965ee0a8f62770307200e33505bbe67e192c38769d4614682536394186ad488b51593a7f6c7151f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/lv/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/lv/firefox-57.0.4.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "c996b2c766dcf866fc851ce8ff548ef5103af6fa6925c480fb91be5886abe5330f298bb8c5590918252b2fa0aad4f9666293e3f59ded03b17c6b0e0d7c374aeb"; + sha512 = "9a257cc93498e256c9b0a12ad8b8922cf749fdda789197285f0d1910eb50b3d601da46806dd50a4510ea3b3fb8e8f4e494ef87d1e5db2208993a9e3ed59e57e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/mai/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/mai/firefox-57.0.4.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "89bcc8b7b9fcb4318e0a5e80a9fdcc5aefe5ba42deb0d62bde813ee95ef5f32da1939e4816b7b92d47ad343e9ef89e7e73803394953df6cf9ca22b15af63ffc4"; + sha512 = "bfd02ab5efb92205dc649afb65263b15ff46e7fd0d32c560ec3977ea18d420c89782fae63596571155ae7a77a59a5c2e9d25a41d18b845e502784bfa264638a7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/mk/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/mk/firefox-57.0.4.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "c89c0c7ba6ecc1bdd2a36de4536fa32c1fa098faea7aa3aa44ba7d533a773d41b7d38d7d6ea749298e20a36cc26b0fc55a49028f50b39472e6e624a0d664cb54"; + sha512 = "29d5b2edae82aeea218625ed9175455bd3a3928886035e55f60b6d5fb717d632769ed57023b4e6d944d22e03c5169eb2887c09ee4c682a6882a5bf298ee0af23"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/ml/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/ml/firefox-57.0.4.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "a6fb93a79f54b58a2409f70a5ad08478a2b8f561876b29c07750ce84103186787fd842b5a850f91adb881dc9b1203ee5f1481af5bf891c09bc6f7026ed21dbd0"; + sha512 = "f247d859982459d3438310fd9d3c86ad1cb7448238a71dd81f0c8712b31da1fe27adf1821e7e91d52e68212d70826d11bd3728ad3642a206574cd278df734b05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/mr/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/mr/firefox-57.0.4.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "656ccbd9b8997e27a9cc35fc10d70b946e6e4a18c622c1b28fdbc16f07ba2f3b617a4b1e0513cb26a763f412deb1551754abb241cd3e186e3da3ecbf90d2f17f"; + sha512 = "63654388432e076ae5d28cffb969213cf875894b94354f652d40891d63dd0a25e6175c3b51417ba5b760a85584bce85457d742829603dee9084c4c21469aa02e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/ms/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/ms/firefox-57.0.4.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "ac06ccbfdd34fa1ef9f106d0127f0095d581bde5a07c3d85af08c9093c22919e1accb8d98b754392598d5a7c48d6d9b81222ffc228b7e93fe3bdfff1d8ab34de"; + sha512 = "bbaeecbb9d2f6d7a881f219120d9f3769abd5713a8d38a1cffac2dc3dcd7849b49098df20dcd84812bf4f3a55e70ca1199cc15e67ab248f4c5ab9d2ea91cfcc2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/my/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/my/firefox-57.0.4.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "651c57dfb2b11cef2226d28d372c58755e0a99d992537ea3d32250a478cf81b3048dbb916708d20482ac29c8303d9cb7e3756849974ea46f7dd2dd36824dd9bc"; + sha512 = "882e00804181821783617db75170650d5d8f36db1d32fa183a7d1ffbf04dbd7a7b2c9405520bc09973af800f8d5aa9859ead7f298fb9a18c2c0ffb0f18ab3542"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/nb-NO/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/nb-NO/firefox-57.0.4.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "ca1e488d2847bfb945e17d9bafad01d696b6dab2adb7e53c286c18041a3022a38f23b916a95f1645c8b8677964f0a0654a6c87c63f0fe8a3a120de595c862087"; + sha512 = "5203d4a39f9a3ea14d262ca13d2e940d8381337cbb1e9d92773d3ae086d9853bb3b5e9d9bee550655b15ac2cd6f0fbb3d6ee52a836e94cf6b133f6924d6eee83"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/nl/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/nl/firefox-57.0.4.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "3b41a4bd3177f56cfcb7fec27f8671984e8375673cd48e97a1a0c3d00c8ff2c2a591521b6fea6f5b1ac82e3e68da94b69dc835bf21348584a8ca7c97f9fae5c7"; + sha512 = "4ec42e236d0fd252300d2785f865e9d1991ba5230a5621798c74bd2802220ddaeacdb43ae44fdd365dee79e7e4b97cb50597713acc603c72c630aa0f409cc5c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/nn-NO/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/nn-NO/firefox-57.0.4.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "87ee51682fd0de072f24da52700a69e168540b566cb8d4aeddf243f83178b743f4841ab00cccebb12cc329a9be5d964e2e95df273aa53035125b3102162c0d0c"; + sha512 = "4a50223708c6a45869981bebdeb8b5192b3541eb54e57e29e60671d436e12ce688943936761a9033b03d069a3c09ee1cd5a2265c0173c30f581710a35f559e89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/or/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/or/firefox-57.0.4.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "421b7268ec03f0dfc64c85b7d4cf21b56809d32135261914824939a08783991329b3bcc11064df88bce4143cba7216c7bbb29ad552b9f6648007b63bc6275f6a"; + sha512 = "6439073c29b4d930a0b2365824bfdda5e1ae3ceadde8f1949c4eba55e9aee9f15a22ec7293e1c8dd7a5f0ec63914f8054d688dd3fafbbd70e6e9473821a482f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/pa-IN/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/pa-IN/firefox-57.0.4.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "28a1e054f493f0d9bf39283b5f5001b6479442b3cc00904f197fb76810cff9835dc80e78136947471a8efe40ec29233653180c418c1d1d24625ca5d22c642930"; + sha512 = "ee2ba2085c389d70312390926f523e9e39d030d5b0b261088fe9b0dcd752fc1560b80817844d60835a38ddc49df315aa9575cd5091ce346a97e5634f810ff4e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/pl/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/pl/firefox-57.0.4.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "757d79018c843a9740f44a0c1b034a669af98782dff3ce31f2ea57a09d74912c55984334f7ffa5a94637726561627f09b3477fee8f0b48697df29c000cb4f13f"; + sha512 = "b2c4b4ac6b2b70834787efab3bf6670ba4b9e378a3ea7a206877778a32a7acc51efc32376d8f358adf9f7756e0c784e436003b8f16366741c6c7f346344352c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/pt-BR/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/pt-BR/firefox-57.0.4.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "f145ebdb0a161b71c6c7515e39b54b3125c76625cee8a3e59b2a069ae3d5600b62eb4388d96a2527e40d453c05e3209066379639a49991e6345068504ff96807"; + sha512 = "3acee98821d5f24f8ead9f27233fa22372e2b5d36bad52616b5a59705992f816ef6b4cec3e2add96a76f3e50fbffca762fc88445b5fba12f058ba06fb3c7ba6b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/pt-PT/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/pt-PT/firefox-57.0.4.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "97a86780284eaf856ca69ccfee1a14f00ea9b92aad96f2172ddf6d3c26116287deb03971f7afa31b73def8257866586ad03d7d962fe1d22b0492f252e9c45a73"; + sha512 = "16ba9337bf8de3061d2d7fc9b609b02a61e7e33e5bacf5dc31f2b76bb281f8b298534f68b8bce4d5adfe87b0a18b660f71bf81bf556625b35a118630f2ef0d23"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/rm/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/rm/firefox-57.0.4.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "f06a3fe73e45d9e226572a6987a978623fd0c77a3da81819f22bf9d4d754dee3c12326287e1a2d12e87261f582f57d55d4b72143bb72b42ce24c0c035659c702"; + sha512 = "433b965bb97d00e81071d1732941021166088b55bada961f8dfb1bb1c8831f0df7f2b89879e52f992c781b33ed68e2fb6058c9ae71fc6827459ea3a854ff7af6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/ro/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/ro/firefox-57.0.4.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "f3a3d226f2666e11bf1e5dcfdd952cbbb9b087409732f219764a88de95d88789dc78cfefa6ddfacaaa005a2bf9215c9b33362d617789d4bf803927e4981ccd40"; + sha512 = "749c7351f99abe43f073eaf32fec454ff27e725e28eb6f2cb094570d1bde4fd772cca4f05ad3ca83803542c3d85dd2fe60c274c92a8339ab1b619e7fdfda7675"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/ru/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/ru/firefox-57.0.4.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "737d4f3d446a88dda0b2302ac775832d7127e3344b7a1392dbbb714619833f146b1696007cc079fab30f1c9227c0eeb0fc73d5d3ebad51543bd6bf7fa9b9bdab"; + sha512 = "430c7afe325707be3618d717bff3d9e5b39edf82b786d0060fe6f6df18d8c9145848f4a1e1daf61b4da83b548dc95d4e5766ec4c882a2cd016e934d7c179791e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/si/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/si/firefox-57.0.4.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "d01009524ccb39bf9ef751d80de5d9c52d5abb4a5d7c8e69875debdd9c06b9d699132a7a9883c65175eff1c78ff22a2e5bec4890d6335b75bc5bcc7f9dcf38bd"; + sha512 = "452c3fcc5466e49c6e56192476d0957aeb60328ac2d5b9284204f50b07dee7a4835f287cc86a52476160da38f68212ad2508aa4599b8c2824190017fe3567764"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/sk/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/sk/firefox-57.0.4.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "6d51939fac75d1cbc9d9ad11409e5a9cc75ad430cbf68253a31b97a932d27e235a900993d83875359d2a0d7030f3cc4f6a91ed37d528157dac328c7ec1017a96"; + sha512 = "cb67db6707e32c44eba532323ea16c55146a53621ed1c37a50f963ac3b4e66040a028defc175a16a0d4c0986fe67c966c56b5ee19db042e1aa93c92517e42761"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/sl/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/sl/firefox-57.0.4.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "f1661fe168d09cafaec34bc8d1367b97d5564eff3166e7a8212b2c2d9f9e52ab62f5f8148159f6446d91da3a20c8e1bbebea837cf518cd121fda529d86eb8561"; + sha512 = "f0269fbb62113370d23ef2ac9e26e602ec6457991e4b98335ddbb2df1e632604bccee27420ec4ff7910f936ac7518f7320ddc875c0bb3b95634ffed3cae5121a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/son/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/son/firefox-57.0.4.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "4ee61282564908f2d822a2ff34a0a086fbd954854080851e57690d39ec8479e4a809818141a78a89e705e565f868eff328f32ee687e0ffb1faa93c2aa67d716a"; + sha512 = "1b5c3c0d2cb42eb985d6c05ea6454b5880c2cf33a6c46d7993ea8793027a9d1414373a14cd756f2e991d2f744ff87972cf7c050390dd4dd7a497e5ead3ef29c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/sq/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/sq/firefox-57.0.4.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "429969333bfff2cb9c43132f1221d373dda9391c7cc0b669f490ca0c75afc889113dee7e369c395f722ac072ce46b692d206ba5b37215a02f5d4ef2c79e1eb58"; + sha512 = "646bccefc4e52e823d099521b75d6796905d1ae1241ca2f0066996ca4e3a70fae901c8f890b821694699f101dfbcfcfea1cb7c7cb6de048bd896a62ea20e1348"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/sr/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/sr/firefox-57.0.4.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "b5a97775f6d7c8c434fcf3c50f80f09dfcef3f327c6728d0eb74189ca53d853beb029de22fa02d0894de9cc660161516b525837b0ee3ba3e10f273ee60b69e87"; + sha512 = "15ae853a20c97c380f3f6280d370a821461c462b2af5496416c81fcb1c47a0cbd0bcb80eaa0f017dabcf630f42a886dd72e6d5738305b599f24c5320180650e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/sv-SE/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/sv-SE/firefox-57.0.4.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "20883637d383f87b9aa789b2d41de462990b5f4531a8cb205fc1350c0c2e7b473039ed176d3ba84d695f05ea8717eabee1d309481d210b1a01eb37943f3ee085"; + sha512 = "2dc41cfc4cacebdaee4ebda94064bf9e2cf7e66a95b57e66936b69c7420302d0c3100c5101646b91438493016521b45fa378913b463fc55abc7681a34e24c4d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/ta/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/ta/firefox-57.0.4.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "e5c084ac35f92d1bad2cd9a69d35904e313b5e36e9427d235c41ec98e1cfe05ff2a00b554b2fd0b202fba0f641b1437afad3c0cdedf12715ece2f6bae6cf2cee"; + sha512 = "9f1fb4fef04e8a5944bed3293b190845e668431bf6fe214166ec3bd2dd7dbe328ab8ff904627788b80a0c1d663f37662c47a07c5f8a3818a8d2a509a4648b72c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/te/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/te/firefox-57.0.4.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "38ce280f6b2f24edd6b5f8d8a4ce790b4462edc01f3189deb9a1b59ee65a4f2627ad040d94f79dea7f73d92c2f747adb4ee55f8946c41e104b3a2a2a3cf580e9"; + sha512 = "a874ea926cf495a26fd1fd621686f0a123e3cbd67e51699c34e4e5874c30c98f6e36739f2b214d6abbc483bdc0fa202a1d5153078fe69fe9d20b4a3a517dcd91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/th/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/th/firefox-57.0.4.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "502037d125ec37094254017853de4efd96a22d2993dac438fda625d04acef44ca0482913f654a742f12d97567e019d75f4a3533b55396b42350b50f7d1c21874"; + sha512 = "dca7e779ca59b49f51198860541a6e0034ab132de0781ae76cbb0688ed0b9d4277ba6200d22020720abf0bab25326783eda0560f1c2fa0b912a50cb9afbf5ce5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/tr/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/tr/firefox-57.0.4.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "f8017379c524949fd5a72c3be969ed7ce2fe0ba545e4f51c677bc270592cddfcb32ccd92c810e274021d354fa2f0a27d3f89fdb762961797bf03e8686cf59cc6"; + sha512 = "459051cee1bd3df7d9f2606006edcc134d701e9bae614b2baba6538b2fb738da5e671b7b79e65ee6996e5a35df45d285d9e354b635b12d860c926e0a167bf20e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/uk/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/uk/firefox-57.0.4.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "0c3c25769d58dd438e3cd363a43b09fee159c271d996debbfa34bca7538853c72d60eded3e913ad400733e9e0e761337064f5917b79257e0cd081301e9eac386"; + sha512 = "f3354ce8c703a3d204ebb1370aa561be7fd1fabcc7361a8f270156ca62863c04f74ef2acd25f56adb5c50a19f0256f1956a2cb38c25402ba046cc59b1096d35c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/ur/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/ur/firefox-57.0.4.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "3d8f09d6d8b098d88514cb0fff725a1bcaa9b84b786d68bdc502cdea8ab7b0e94b894e3cf28c9808c60cc201e5cf8eb1403e72ef22d22efc6ea91b1a6cc2bece"; + sha512 = "42f0d747bd8c5b3fe53a436472ccbd223ab9a23782065af2d4784e5ed075caf95cc0c4eb060fa1a2b11ade6dc12b99dc4ab497eba1339e2b8ddd99dbb5d286f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/uz/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/uz/firefox-57.0.4.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "cb7bab29b6f84b3bd3f7cfb162027f3801eed54291c6f3f2b7d56078e6729485478a0b77b0ab523aa2a74d8da4a69c2cafb115e9ce516ae79671ced4b88c2fcd"; + sha512 = "476a632365c53ce0c72503bfb7dfe9166c6a4cc389dc7b174823b9dff1717c9ffa91f95eb975ecbe13135d39b90c3f18d96a5a08501eaf32ceafba0c2203b990"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/vi/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/vi/firefox-57.0.4.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "774a7556cb81e6650758867612a1bd80b623a72ca42fca4e01060ab7251cc79feadc28921618cf5e2338d4b4b9ec4459f950685ebee67650baff54d23b284fa8"; + sha512 = "8f8146925562109cc1e21a6146203b16306931f03fd1451f679f3d345e589626669f35d5028b4189d175cec3b7c652a3d863cebbb521b72d9a04dd77e65a2c35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/xh/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/xh/firefox-57.0.4.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "87c114b73ffe949ea78eff0279c522406f95cab80bbde6e65435704e5c94b30f99dcf41be311b29491440de55fbd1af50d6bb8744e8f84cd0ed593c74153e2e6"; + sha512 = "b382942e20e4188b4ade8417d5e1d036e81dba87ad0e5250c0fd3e43fcac5134b11f02e4220ecafd5b1fcf2a7fd12d44efb595251fe8e9a9b48a93400f264632"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/zh-CN/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/zh-CN/firefox-57.0.4.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "dd12c41346fb17efa534505d3af6a114c8fc5efa047de05d1fce97a1afdedd8e6f27906fd922e1685eabbbd773baf4f4d3bdacabb154d95dbb794129d4c45adf"; + sha512 = "9fabab7faff2a166a001c91d65953c6dc80150ab6548c72bc180dcb87aba485b2d06efebf5518f43b740909616b1ac04de57e17bd60fc3e7843e4c7e54b63259"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-x86_64/zh-TW/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-x86_64/zh-TW/firefox-57.0.4.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "bc6c7b9bbd211d31c904c815b6c716441bd330d3f2490b333610f9208f95afe083e5b7e75438167d3e28e7a22a8c2c2f4a1b6b0143980b9d79e5cec0f0f4e9b3"; + sha512 = "a334f4904ff329ddea28cf1eb4416d0c665a8099b20673d40792f2bb653fa09f60b6efc09b6d22c25f8bbafc0aa1e1aed6615f1377da37f6f843adade51d881b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/ach/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/ach/firefox-57.0.4.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "8756fc8508f62a34a6609000e7a80ea094d44b160091c4ec8f967cd48699ae6673b5fb6518251f9153faebd6b707ab9e492398e3ac973f5921f3ddde05425f00"; + sha512 = "1bf24191ae24fb8bd553c97d2ce2bd9599f84b2b6d57162a5619821c3312e7671aa04fefece26aeb0786c48d5fb934b79adab513f3ab382ec1e71f44d7a3835e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/af/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/af/firefox-57.0.4.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "a47dcdca5a84d842111b45760dc139575652ef8b37ea0ef1ab7abb2f1602f11c78aa00a5c3b844fe1226c60a73ff96c2c873353c63b5841496672fabc7d3f81a"; + sha512 = "6fa02d454c375af8661826b23c0220d9dc402331c8739a8b09e2e4583dbc0d9d6e742f65509f69bdad2882265c51a956892a04b8d75f3885b722b0688eb87ab8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/an/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/an/firefox-57.0.4.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "2b1127ecb63f4e10be8dcfa9bde47a8071f3182d73b3f0f0a3b9661977cfccca21707f8eb783e8dc5211ee6e8d4f1b748547f58723e3e7299f1d7792f56c5548"; + sha512 = "c75a7318937244cd8f227f05b8cd8b13c948312fd692040125fea3bf3b8100e7c0912e0f4edd67ac7c9425e4a333ad091a8ddcd29acb9f045d4a0459f9d35342"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/ar/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/ar/firefox-57.0.4.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "d16d3397e025523fa0aec5c0b4856ff2afd0624fcba31c8e26f917c2609b359afe1d1929ad93b3a795c0803270652d6192cc2cd77518f6c7ab8c0d92c8e37ae3"; + sha512 = "baa36a5936edea572d6ffad24c968538baf5ec888be09c8ee8179993f0088f661fc9f275edf2b848fc17beb3799b50fd8ca5a5a76bb4d52360b9c1a2ad38b76d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/as/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/as/firefox-57.0.4.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "b5d740ce732c4265f198095cd8d6020af6d1c69f717e1e253d0ec6ddf997d0c84a109d1dadd2aac7e4bc501a5853d46a0d583133986e8d78c20e8f28a232bb13"; + sha512 = "8094dff31f7ac1de02f5e8af06bf64d8fda669c68556faba2f30de63f3954b3aa18ee130c76c6acea8e59fcd532cffac0ed822d3bbdce737ea4e01e9f2abc7b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/ast/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/ast/firefox-57.0.4.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "b43a307983ecd261b789d9335c65497c80ce65ba3fd5e594c326cb30a526eb2819777cf5f2f4bec0c481c850434b1ba376ae381f8d78f9a3ca469fa923b27cfb"; + sha512 = "0a5953952051dbf0aeb872593eb6efedc557d8e518393a4672d2fed5a327f2c56720c2c50f31ea64b0799722b30202c3df4c46bf4c8dd227333c42a9fcd2fbaf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/az/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/az/firefox-57.0.4.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "4a8102dcab4619d1b119afbcc6a3a35b421b570b9e387aeac730a2cb071b9eb123054a0daab6f32d238023311ea4436867b6d506091e271e59ae95f677687879"; + sha512 = "0eaa6a6d139868933b345b8ca62df9cd378c68053cca98d40f2cd83daf46bd9ac0dce4e91900eb447d1ab0ec8f76de293a65bd99913b560bd2f5b6794c565018"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/be/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/be/firefox-57.0.4.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "57747a6ce33486d8cc73c14124db8e3ca04d9f5598e7ab748bb57ad625052872423baef1b2d14c830476a6e2f49ef8c9c78b2d176a1b2ccaf4043007c76a422f"; + sha512 = "b76736401d8f20d9638e9808b7acb41f46a51f29eeac9eb7d7850a8b3c32974982e946f679c98f8e71b548e87589edf5c7127a20f7108e4e42deb0e0ed71fc1f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/bg/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/bg/firefox-57.0.4.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "f600f82587e327477cf1f35317516026d5fecaeccf45cbe8125ec2862789faa35b2450a29400507b57c92682248aacbae8df343b3f4916d58ecc1506fd3358f6"; + sha512 = "7a47b07dd0791f1cbab7f02645e1b97173630ebc44fb81b2308ceb539d92f0197e8a9aa24f640ddba6fa888fb71a979837d6bd19d0315cc8c8eb2a8cbf99af15"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/bn-BD/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/bn-BD/firefox-57.0.4.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "1288ec7872408a84760015d23cd249e2407ece44ae0adcc0c999db57e1412e355237bb4432fbf9fc4f1a7f15f798612069c9f0fdb24072da9d5c098c8b137af5"; + sha512 = "15ece8585166d99b9d52b1de03a909d1c38cceccae5547dc13267da223026f4be4fcbc2cb42a7c225a4a74147b014ad19173635fe4c3249f4180169b4a503bfc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/bn-IN/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/bn-IN/firefox-57.0.4.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "59d07361e4196270e8907cec0dd6e9368c51c374c71d6266d198cc76fd9e3ecc959b30384ff9430773f1d387aea63174378c0c9b0df750a359713b79cdf4509d"; + sha512 = "72df101c9d0c602542e65da9235dc63d17c220ff56d2d1008c285fc6c10e090bf343ef968e60a36664d0dec72d7bccfe016af542b014ab116c0f243920aae93d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/br/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/br/firefox-57.0.4.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "987369a0aec78602941df46cf3e15df5e3bb822e35e74dbf199e4cdf6010c2133efae9c5bc60fc3922a86a82f41243d8792bbde1a220e492f9b1d61f57cc4023"; + sha512 = "d0830fa2a0e4159d46c24e048767ac5c032910c6e73858eabff4a1ca0006189b3a4978c3e4822242883e6fb3abe639122ed76afeda5d9d2d5391806ea07f6796"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/bs/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/bs/firefox-57.0.4.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "d93a3f274dda1a8b30b902f0925211b9c4490014f0ddf9ffb33c6c77eedb0df1a0cdc4e0448311b23264ea07c7e32be954637b62c1e6b3f6e1f249ca0ed0d9f2"; + sha512 = "cf93ea42460de4e9c13392eb1bbe4c6053c049a18cfd7038d99c658cf076d9989648abbcc006e345fdb2fc66f56ff8abd044b527ca0ae29accd2b0f52dfcc2a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/ca/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/ca/firefox-57.0.4.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "a39ba910f7a9e97d0f51db2f1eb77f1c4111552cd70e619d564c241d28a9ea5b425f80123b0827f02c06c688a8f68da9e87253a9d92cfc0d31debcbfc227cc0d"; + sha512 = "3fbbfc5973384a0a6d65e02d5b82a6b5591ea8d610fec2ece24aa423550eebac1b25fd7d0080bae4300f64ae1955fc6dc881816f10edf33b07e0cb308260a4cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/cak/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/cak/firefox-57.0.4.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "845210b43958d4cdfe98f4f079b42c093e4e01fe6302fbf6d6cfcf32f156f3ac72d69dcaf88f1b4db50a509c7c9bbcc649d9a44e9e32ee8f9285844c1d354c88"; + sha512 = "0cf301895b2dab45cf487e41ba093e547bb4d42b997a9c7a90da2fbfcdb044e654cfc23e4bfb6de7065ecdb8e4923434f98e8b58313cd9ee7cf64dd5435951a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/cs/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/cs/firefox-57.0.4.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "4f75b07055ecf79a0ea5e9cdd531b17419fc56da891cd5ebcd1c70e544c311696f300066b7f1a670caad80856db05ab7463ab3c7f714e37119dd39cf0402e7ea"; + sha512 = "20011fd4567fb3112a75a07ae181ab7d3a85702b9583efeb007dfe7a3009c34f8632db631710105dd68ca579b44a83f53d84bd4768f0030ed106bbe12eda8f16"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/cy/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/cy/firefox-57.0.4.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "e03f8434b9e062e1854e51d10628a6c8b070fe54b9c437a971caf560cf2d076173c3ba70a06b79e3a2d8d90dddf95af11501001a29aa30e3df805450c533143e"; + sha512 = "1f9b31e5e36a581ba51737e5e1f85a2d6ce804de854585ad2919f7070305567883724fad9368529ebd98d3f428eeb36c555d2f7ccefcfedb877227969688f896"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/da/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/da/firefox-57.0.4.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "77656ac653e3aa31c6fa1d682468b22c2262d1c81c9413c3f498bccebceb21fd15f95f9230794eb102516b1a7f2def73f2296e8b86255df52d3389974a3f630d"; + sha512 = "a919e582953660fff4f438d58c8814cd5437f13fc42af9ddb383db163485754fac667b4e830e68cc827d7646436760bd6760ac4b2d7fca2a951c1d5f7d43be59"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/de/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/de/firefox-57.0.4.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "73b7ec4d7452ce1ec2501df01185c46678c41507adc5a94fec9b96d2f83775066826744404e6524a549146461ea5377d3868694164ed8c8eef4a2b846513ef19"; + sha512 = "c5f844f17a3201a7a62e1e9c9dab3ede7042ca33bc8d388d9677858ab289d1f0a823594701e7eedcf1f9ee015c2ff16cdb0d9bc0e6861701f065827c69204f90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/dsb/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/dsb/firefox-57.0.4.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "32ebc64e788801b01e4b9d9de6edc2f419a94c737ddc51258a6cc9a910603dde7869a051e05d771b4f0def34b72ea71763b66b38a0f4a71276428d6bd1d05992"; + sha512 = "fda1a2b51a3ae8d0d28629141575fe14263baef7d68f3bafed89a744a493382faba2bc7d263648d8ed809eca274dbaf0e1669b534a23281944135195593f0616"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/el/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/el/firefox-57.0.4.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "a9035ad5de2506f44e48b48a4a7eef316cfb8b90c9f8f255f34fbcdcb785a390365f87972379b666f857574c41f841019709ff7721cec5f7173034a35f66cbfb"; + sha512 = "0c48e342f0ec141f4a7512c0f1cb4826b9dfe77cf315d22365e4f3eee090f067a35215798ace57eaa38a80a5b62dde257992eed2084737dcd85b1d4d3f46740c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/en-GB/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/en-GB/firefox-57.0.4.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "7cce5795c2d91e8754504358672db85b3f20e1cf86659b5e4f5b2197728333c225f6a05bf675dcf9e390c727fe07b5f42e51bca096188777dcc937ecca7686b7"; + sha512 = "d9d24a97b0257bcd1a1b468e6f986ff4fe8d26ced92e3878123d8667957ab187d87bb01e8d389da6fbffde66e1714fe81a9e926a9f3f5c52ea5d38a8eb961d00"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/en-US/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/en-US/firefox-57.0.4.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "1399c978a800ccbe2b2e57e3acd65722ad423d0188073ff24d2d386479670b1616eca5cc3111dfc6c9ce4f9048112f610d6d00c510934fe5ca8745a5eda26fea"; + sha512 = "b641a671d7390c505577fa956bc1452f58f6cc8418b3ccaf25eb8b5bb08799a3a2e1e7113525ad720f710d7022b18901c5234be1a1c372881e4908d2ae419743"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/en-ZA/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/en-ZA/firefox-57.0.4.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "8613b67a20cd19a29141890933ab9a2fbff03d8f8e2c94ef1c298ad19a711ef29630ca46a43a5c5842d8ecc9eabb45f1d37e6496f48451a6702a67520a2e42ff"; + sha512 = "605b7027a57c75e90d8e7004c50415ebdd2e2e111ac679d6bb87f1c55f0ca022aa4b77394a04ed94aa634d9b05359d9384e428f8f9dd000ddb2da755bb5d797a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/eo/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/eo/firefox-57.0.4.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "1654635d26f67d34fa710d732afaed7344244f83c891078a10e15b5f154422a339d60f84232c09effc1e9f8feb5bb97e84caae4c689d5017f97dfaa0c91a8543"; + sha512 = "d5e81e82ffccb2538d94be4752d8bde9e5e84eaf06c5c29a34e0e16b13cc8df62ae17c88a50cdd846dc2ddf35c76355db39f39d74d1d9aac19c962d823d2a5d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/es-AR/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/es-AR/firefox-57.0.4.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "cfc1a7eafcdc2809020228dbe13656b4f99ccc73e630f15610ece0f4afe6100dc09d09c7d7c7e84f408b471839197a901140e8b613bf7f7ad46789df62b8bacb"; + sha512 = "27ad3f34bdb4f94a08043c699f2c9ce2a5de2cd297e9dc2edf777b78656902dcde7aeebe17463e3f7125d58a2cb5ac7de671695d46852bf15225cf201541eaf3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/es-CL/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/es-CL/firefox-57.0.4.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "e99ee28e7815434982013749bfcc9db359cb33f9ee71fa82594cf3e31f059cd56c167cda2e8356ff5ea0eaaeb737d8baa2a235003147d397d3d5f78f01db3d4a"; + sha512 = "e65607bb7e1f08a2f0aea512e384d44b7d219939c82cb98cdd8a3697b5d43e7fba7036d4529c102a2ddbdf660baac45e8f9358692293d0a5d0869f72c8ca677c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/es-ES/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/es-ES/firefox-57.0.4.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "536e87efce7e93c0461abba20230cc88ab838b5cb7f9b970f901b9186626c080fe92822b8a80c35235b55598e3ec617f4fb25e933347426bcad77ab208154a95"; + sha512 = "f486c0f40cd610540743546a188c434bf16c2482d88145841ec90974a819e7f82952cc6f9e8c8787665f28f47f1e8b7def418f0b08f9fbce73f9d1aabe62e91e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/es-MX/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/es-MX/firefox-57.0.4.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "9d0d41142fd2dbe89ddc6e7ac57617efce3f0f8c8631a708f0a0568f532518ebba36e6e7d6bcddd00fbc9d856adf785635702f7660c036a9e92fa30dbe7ba4ff"; + sha512 = "c4e45e86b5680cb9580948bf8db29c5f3a13d2b2c6a73753872ab2c77715ecb64f756522d4c1e50009d783cd4f589ae39e3bedf771ebb4b03ea6930506210a06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/et/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/et/firefox-57.0.4.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "e5d69d12669016c9466a48da3a67aedad13ee0290fe69225490ba9490a8cbee681a5cad1bce73fb9bcf4a1d72d140d24f892e4ea0e368cf83a74b2e1da9bab3b"; + sha512 = "181772128d6eb85141169208c283caa0f4658e3ef627b92f723694fa5f38be7fa8e4c6591901971cfbfb760cffd693a285589089436bb25e72ff95fad36c632d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/eu/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/eu/firefox-57.0.4.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "c916f3ed272661c34909deb58835323e55883acd6c941e52fdb398522d54f4fd91869140554954528a95e5e62d2576c2ff13691c5b2e99e4641902eb73e6fbe9"; + sha512 = "e582332c908c98b6eddefa04b223366442e61e231e9039e237e5d15007113d7986a0759e8b927262370ae61b103e749f96160a2596a7b79d2e7321a5416fa0b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/fa/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/fa/firefox-57.0.4.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "a8b6c52f80fb4719469e5992cd0b837c9d06ee4109089cb508f931a2723df585990b915c7f95086bdc483c354a948c76799542b8474ce55df6927b3b617b298b"; + sha512 = "118684887c685acf3fd2a9f0ab1b63bee19c29e285e1817d013202a9fb722b17a3e774db3afa4056618172d4ce741aa78952bf806752d52fda4b651a633139d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/ff/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/ff/firefox-57.0.4.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "c640bd0852970fb9910aaa187903bfd767992222525e7ee0ce80f485f6665391a18a8a36d482e8366310a1f3b655fcf04206afb12aa77b4130fed8497a2137ef"; + sha512 = "d4917fd09f789ae2ec456b4cef807ba17fd1e2a80f1cf9dd635c18dcebf87c9c5ccaa5937df7846ec24de943c8c58ba4a0c9282ed586958bb3275234fc9bd27c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/fi/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/fi/firefox-57.0.4.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "d1d85a118e05e36adb41708ae30103aa2e3aecbeba26d6308fdf3f362829af84416b4753df95958e6a82b7c7e46526e41bde663ecf235768db8902e81c479b10"; + sha512 = "891c8a01940d9896dba75de258ba7da71b5e1b03697fcc04c5919b6570fa8b7164d9f8fba6f5a52614e637c5fe859f59da7fba34d4387c9763b82e7dd4e4ffd0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/fr/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/fr/firefox-57.0.4.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "c7ca1e93b0ed5a81c288158f5257739f87b99b244bca7f52c6a81e49ad2f120708dc304720e27b482c11480a38f367e0cbd19f94af637b142d51bf5b2c9efb30"; + sha512 = "cb6bf51bd4362b21416dc82a2c52cbecf0afb2aa88d6ab96affac7668d3ff0d7f81f345ce3440b04e0b4df0740505c204efa0d7eaf43af0b5c99294e0170a357"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/fy-NL/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/fy-NL/firefox-57.0.4.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "805dd607f6f08df62e9145cd68e25bd58bfd27d0aaa14d8ad8ea2eb3a0c884853767f99c53c0cbd346b5bf26ecf25f0c2f4ffd47b838cf7f2497dcfbd6a71486"; + sha512 = "17e3030507c7cd0dccb2b94bb36414ad9e4c8248b671f438dce27ec849c06a2a98343520bd457b9157813e11f9360a1e38cd9dc3dda49ee039ed2757168e5d26"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/ga-IE/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/ga-IE/firefox-57.0.4.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "c25645d57a5c238ee848203a8b76b6be734cef1b72049688d34d0e873ef41319a0f71b477e46ee693b82612a1a7b4350fcf6eae64b33827ef19fde5901144632"; + sha512 = "18bf7782acd20cb9972e419ddd62be4c9b0d18d2f545bf728f1729f2a63e9f69353cf47b8e2fdf8525829fafa3c87cecc6bc272e899a2df6dd1ae4cf11b5bed4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/gd/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/gd/firefox-57.0.4.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "ca4c81d0b8e886ec0909e74888d0f575df1b0e8b26ff0f948981fb7d8006aa08ae486722a19cdb575c80f6bd98f2f713a2643b6815c62dbd9d32eb5c22965cb1"; + sha512 = "27d56b6d98b4478821e1697398aa0b39ed51123eb72a18f06f03bcca53c7017b4c55fbd32af626a52a74b5c53c9efbd7a20bb265af1d43140189f6f5d03168d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/gl/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/gl/firefox-57.0.4.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "30a4c10653edcf897c0f93b363a5012f55a1603bebf98c3769eae5c41fdf359017a79cf84ab98ad3fb3e4b2b3291c1a16d7f0608bc1072c32bcc3c470f519697"; + sha512 = "5a7c2e1faee64d224c8dcd822d0e3f0b064f4aa5617944aa048d32335fb2a45caefe7f6971058368493c483a5ac107808794289c68530d97f85d0e2438285a4c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/gn/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/gn/firefox-57.0.4.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "1fe4444e9d7431ba877b04c62f91cfb0838b92bb9d9be758b460ed2d25ab6bc840d6cb164508298c12cf340562d23760cf685d8b279a7060028ab84b70ab45e3"; + sha512 = "5c05eb1d50d0de7f7e25bc0821767ec916ff17a3499ed4cbbe53cb7d833fd43edaf3ec1c1c2db02b76523bad8a78043d7ac25be4d1a4076da942b09097949dd9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/gu-IN/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/gu-IN/firefox-57.0.4.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "2df2a7a88c5871116621a5847f193881228d89be2b7c6f9741ae689ee28303b2bbcb5a6c8cb0b7e4a187fe12959b475063b706a9af0fdcbc4ec168ffc0ce3725"; + sha512 = "43eaf8f5ff8f921ead14cc2a2a5d9a98ca674af49087407dff37afe4acd9c22a4d83e96750bb50e8e6fd4219beab08c8bf52831fe15b8320b5858d6c93c611f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/he/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/he/firefox-57.0.4.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "86b89434222c99d7485cd5df1e1597ecae5cca98704fcec4ef4467d89358e290d857fb18389af6f075d9c5369b62c0edf54c747b03eb73482d5c9a622cc870ae"; + sha512 = "9573f5d24af9f89abad0d46d99750b9380ce77c4c017143236178f3fbbfb2e43d1c1f1ae2223ae0d4c81b22688fc7da8c1fc2a19cb5619bdd42ca03ea7ef810e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/hi-IN/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/hi-IN/firefox-57.0.4.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "b0f992412f108226be8d632e860c74832a986a969fc27882f5a2ad1165923ad0fee1c40d9f2f58e0d2b676d3ba42d2fb83a58f4934787acd1a4ec032aadf793a"; + sha512 = "ac0d13b6d935f8b51379287f5ad5e434bec58eee0e29fdc786e43e7d7e270afea094b8af27c779e0f0c11e3f3582f84e2cac4e01fc69339aa569830d180fca6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/hr/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/hr/firefox-57.0.4.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "fcb6e3e3c35e80ce54cb9d1b7e28cb4e3119966e9fcae00123560837f62ada7fec5e2bc099daa9d75e5437405d4a41f89533ff425144a84c99e61e36ce88d579"; + sha512 = "3f17557b50fff4334a27885358cd1c91fcfbaab4394b5cb9a571c47a24bd45a2b807534c6645b58220b65285aef5014582ec6e1a04e57e54f7cdc5cbc4d0e1ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/hsb/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/hsb/firefox-57.0.4.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "7b201321e567455615fd0bd3cf04db132f78b8a196868897450c6b4f89c6c16ee2ec285457731589f74e715906c0a2492ab72563c35e3d9263d4d598c096b218"; + sha512 = "ea3cc8998fa736c27469efaa6aeef4263c1c23d62804721ef577d020295100bd99e6690336c29a0af7f274f8c0fd554d16ce39638b8c9de2132dc0fabe21b91e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/hu/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/hu/firefox-57.0.4.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "2ba67f65a06ae537b3d579b1a6c0b817bfc56148db4f51d44605dfcaf4267f8f06a2953342eedddff9913ac03bf43d7bdb05e674137ba68530a8f4ef2747f260"; + sha512 = "988721816865e6db32a4e874d7bcc67c0e7bfcf621bc9e8d6a8aa8732ac448930646891a53a6f66bdf64d625b1607ffcca4141ba8b011ec2b69803fb0eca32c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/hy-AM/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/hy-AM/firefox-57.0.4.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "66601e8af60c2d0d3e83fcfb1a4eb565101ef7db402154456876af725162487d1de74dc57765475c50e877574df2cf2a256bcd314f4cc6e95be6deade9a9fc5e"; + sha512 = "214105d839762ba56f8f30f9fd4e2b706ba2ab0ff4f76826661745505d2bf7b85481b17782182ee5250d82f0f233b9f3c7123669c2475d33bec40aa270cb83bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/id/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/id/firefox-57.0.4.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "61d3e8e598dc32c28c9f0396ef51d2f7ba919812d1e0eb8aa75aa5a25d3fdb39e398ad9ccb7fb0349d2b6fa6d184586a3228979a3ccd21344da5cc3d8bdac712"; + sha512 = "60af8126c39ee9b7bd9f9c06048677ce5e9ac1b4da28176c965064e6d937df3218d01c923fe6bda822ac9fcfd95904e4f01438b88e0659b7df6c5a4b7b475330"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/is/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/is/firefox-57.0.4.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "99738c5975e92e409d85e7a5861fac32ff9bde85758c9c19a8a630648746afd70f59e5f6c49744b56bc860964a994d3f127df11e79a697c2e163a2e95c0f9496"; + sha512 = "07230ab55805e4bc26c6aa427d43daef7d799115780d712db5b358a8d731296abb06baa8e21a200310922ac81e23a1e33584c1a25a76031c03a849e33aaabf0f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/it/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/it/firefox-57.0.4.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "c35609aa667d707893259b86b4a410cc258ae617b2736e75eb75aea4223634f0a44e0f32cac397320d60fd16cf0325641c1ea3ae9a75fbe64d382571c77aee5a"; + sha512 = "4e80d7f042dec9c9752a81f434520b4ea2605319fdbe26a4ffee8e01ff60163a9df9100f154d45690ea4a492953f09a9b602609b88a350250dd71b2f66029713"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/ja/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/ja/firefox-57.0.4.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "f53742b610ab338e0f7f2b76492979653f1243b8163076052ea450d66839c21fa860b2f9e9d412f9822f87050f4aae34158ddd0ee5a8220c4c7546ac28c066d5"; + sha512 = "a14fdbc6e2fb341d78878bbed3df456d3906a6f9721ed80764f8747faa82407ceb48a4a6e8b6c90c4164fcf231208b3f4f147d6465bc434496e991613c7cf250"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/ka/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/ka/firefox-57.0.4.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "020462ebf2e5a98822cd6fae5deed631afc112b7040b58542d4b1589af3ff0504affdf417e9d1568f74a12eee246c3b6498a0c2338575ab485c812182913e190"; + sha512 = "e411fd39ee928f4e66937f55589f7a7d77eb9ee64abb30d49622e18b20d2ed2eecc34a54bb32a40d28a83b43e822b526494227b7b1a8b3cef831dbe8d5573dcf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/kab/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/kab/firefox-57.0.4.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "a0e55697e83f2a9685669fc97656548bfafe88685df234cd61738e1338a76dceeea17f57eb0316c884c851d410a482731d01881525a6864ae2042a5503c1d6c0"; + sha512 = "b430ee1803556d791fdd19ffa21aa32d8245421c2e8a7dda7cda10d751cf9be125bc089de9149fe8b858db663397827b2e511a54a56053827c405b0fa2e17ad3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/kk/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/kk/firefox-57.0.4.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "a97362931d2979f1b3d8893688d6e1009dc05ce87a16eb63978b4bfbca5abd815a9691470c5f02c47b99c93a7bb1c71f298392cc45e5f00d2602f2e808eca3d5"; + sha512 = "24f142f4c9b85cefb404905317d1afcfb37868fa4061b5e4c659a3e172d86f2fd9d7c07672fc4a78283da27c534e2f0639d1c567350740d698aae6fa50846772"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/km/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/km/firefox-57.0.4.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "3c14ff4420c4a6c4ce8f4fe7979971ed252c1ead1bd50ec134a765403c1eba35c944fb5aa2cbbd6d8623107a7d2b319fd9739cc93373b23729fafebc83928445"; + sha512 = "226fa56eec9704baacf04e54a5f74ed4a6fb01eab2020badd61542f2059f47ddac605f69117d23635fe0562c02d86a088d695ee1a15071315ebe5e19100b965c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/kn/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/kn/firefox-57.0.4.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "2c06895f2fac1060b7794859f354ecc4ae8dd791d42d2639352226a6adb03725814d77101e232c6cc926966be3a6db0ff7eedb212f6612dae7adb61caba3c210"; + sha512 = "c0c5eb6887ab1e3fe7f8669ff1c09cb5cea4fdad9c8fa488412bb3aef33b7252526ce5069e1dc8a2186c0ab4aa48a6d223487ef62554f90a022287aaed31d09e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/ko/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/ko/firefox-57.0.4.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "0bd5f1e98d39447285503c73bfba2ec5839af9bfd1c8800f5023e5b26b77d0371366f9e5411ed273d0d560ce3943e606b58c020ce2ebb2f16054ffe6ba58e3a1"; + sha512 = "397063d49b248302df350e01bc87fbb691e63681371fd9b2180edd8cffa9d00ddaa68de320165e0414bdf89dba037ebf8decdc6801ae0f5134dfe81cbb3c7052"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/lij/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/lij/firefox-57.0.4.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "335b199471c7fdd43c4601a512eca015cf88c10dcb52850a6598b9970fe4300f3fcf59b78cf551af1469cfe085253e709a87341a3fcc669e3a7facb8ab6826f1"; + sha512 = "0c47e5568f5776829163ee5823c512d91e795478049ca0aa6239afc66c2ec0af940aaa32fb70473f41ddac3755c0dd32cd5b68207e94f095a033bf5accbe9675"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/lt/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/lt/firefox-57.0.4.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "b497abcdc0964fffdf05180064fd6df4d0a4187ace3070c3f6076c9c4db4a93cca48b14814ced2e94407885d294b3d6ec1c44dd92497912a390b1f97e8627576"; + sha512 = "3a18a2209fcc5adcfe4426b8acfafc7e6e781c01b7562d35cd02001f8469d93e1db4db400ba34844ad5296ac40a3540ebad5341457fcf00b7d33b9b672514a27"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/lv/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/lv/firefox-57.0.4.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "7877e07a97eeaa2e66b2be49a48eb5fbf2af64247230703f04fb80b960127e5cc39101ccdeb1ffe35b2e5ff01b64396c880dc145636f92661b47066e0cf3af0b"; + sha512 = "ec9938c819e98f3d1b7979b6e207cdf798af6e0f937f9ad7f23ceae9968272fb44c6d2d28c066b20d6aafcb7edddedb299fa32d0bba29f17e3c50db7bbbf6cc8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/mai/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/mai/firefox-57.0.4.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "24fbd2b86511aef229a16396cf954360a61f7377de53253d83e7fed81a22f5ae5196889337edfec488b48283d4fde8f9f8f072d1ee276a5b310973a2c1aaa837"; + sha512 = "ea5cce55b13cb8eaa652aef1cdc2883720397f872d63728c781805000835c41bbac1c2bef035700c72d1dff79ccb6a8d4980d6485f0774b3aa8c0424e94a3ce1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/mk/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/mk/firefox-57.0.4.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "2fc3df289505893490be4954309aadee8a6189488b1d99237f577bc61c8829d6a08f2cf18aed14518f2d40fa2744dc0061413811f7701438a4cf464b623f8b48"; + sha512 = "653d8d32d776fbc08126a25fa8a70b3826302e9cce01b8bb6f8abe958a79456df7cdfb8ae09a74b560594c29c515e50afc77bbc1ee260980028d1b1f10cfc1a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/ml/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/ml/firefox-57.0.4.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "3941b7516a0ad4d6308c9c7252a38ad26fd551b3bb09ccf973b71d8fbaaba3f420064b02b4ff30986f0cc54149d9df293aed0c05b31f8582bda07e52ee5c3418"; + sha512 = "e99a9acba626060fe8eea88a478879f3be751ba224ff1e1cfe28ae6c9eedc2d672329f67773f71edbb58d6c3e71be26f57b53504474c67dd65e7ffac79767fc9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/mr/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/mr/firefox-57.0.4.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "dc64a90547e7ddbc02715d774063d258da0873728691f2f39a5c6821fc918b41fb83277ee65ab88b6df657aaada87821dc2824fd3f13e2c317638c81bc0362a3"; + sha512 = "6f64740c424e77ce62270b80594915d3e2eb4cc2d3606791e6c9e3c8d3d8bd362ea4d46ed742b13aa427389150fe1a97af782ddd05190b0a5a84e8dfae04563f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/ms/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/ms/firefox-57.0.4.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "c4b10e0f4e200823b1c1a0d660811373c31b7e008df573d633499734a137c031799df162a06772eb087411912c955cb01f912b7849ed798ef40a65ce4298e77c"; + sha512 = "f3d2450ef0770ccac86b11e84a27c2e58d8a1c4133e874f9ae1cb7524ddb5f104d4bd42ca1fc37c20a8a3b297b386a1df0d2fb348616cbe9ef5d01c59b43ae3f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/my/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/my/firefox-57.0.4.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "e9e3dbb826645d272dc5432e921b8577037bfeaecefa92bb7cdaa3015b463e72475d9faa58f3a1bdb57393602843e186e132f9879f325b62bd6c6504c8d1d965"; + sha512 = "8398627bba83a1d0bb4929d1fd15c135bd35c8e8d0560ca804a49a0e36a083fe377652cdded198eef2b8ec1492cd1d7a33d6c660cf72081d090d40ea8b4cf7f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/nb-NO/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/nb-NO/firefox-57.0.4.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "d0f575f930d9943b8d926b03aaa919780c6218e4cc4279b319540f2807494a9af14e6fbda9e0673673c9abceb20d2152e499e879a906305af3d6d10c8f5dcf79"; + sha512 = "123552055f7838ea2215a379f97c82b5d2e4085dc8e2a9cfc12f0ef5f3550f7247c4f3e70c806baf7eb12e031ff8b857eee721366d480e959dc1acae1d9453cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/nl/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/nl/firefox-57.0.4.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "7ff62ae89ca5934e6efa6402ab73dcbbc4a968d49141760d36cf2b199ed081fb615cac7e0a90e67cafa372455ef2163407e5bbdb4910eb8038fdb138fe086c00"; + sha512 = "179c634792a96d8b3f5537273bff06d962cf5faf2ae7e299fa3e11aa4e5b08aba10759e17eaf656fb373c9a9a807590656f905b477c79a5f7da385b66f17a55a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/nn-NO/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/nn-NO/firefox-57.0.4.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "bedb7c2fde56acada9519ba0b82bca658fd8b169602c028473c84c421db169b807a9d13137c4be2ae3c6fe03887f619dd89f3d192e6f3f4e61411c2ae1873460"; + sha512 = "b71efed9fe95408710ef4a4e8d7040ddd2c3f9979567211c5ccb48dabc2eecc609f29c2bdae59ef96913d54f0c52ae432a2bec265cc5d7a9ed1b683cc83379a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/or/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/or/firefox-57.0.4.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "a43d11ed724709844b26ae50bc2ccd4c74368d3437eba883f56511094847985c2e6a10159da9d711ca2913bbccceda9ec2bea0631d601c88ef68e31f06016fe0"; + sha512 = "998b2d7a6c215a4634209d1f2e04f5e80858a4172276afe5f3440416212351093c1083e19c116dcf2480a09287749e55adb3d522f62ea4170bfa2610e3884e4b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/pa-IN/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/pa-IN/firefox-57.0.4.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "c66315bb44d02eede78d019c7c4f8384ba64b74e364c5849de034ac3c988dfac5664cb16d0ccadb06315f980bcf51f38d3eb8aada990d3bf69185e53dbf74f64"; + sha512 = "f15b76ba3fed7604b96315343e04b11823bcd9b1407c10678fb5a57193b37ca365bab3a41106f1113f2487ee5b81a14068a083243cb4a298aa53105c814b8b22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/pl/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/pl/firefox-57.0.4.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "6e8362e71b8ed437666c49215cd9bafee308073ce62022481948c6935ad51f4ab1558b7a1c5c19d0a69db79231879485e1a77b895fe61c040b19789ec2353077"; + sha512 = "cf10e29d8daee0ccca0a3260b97abc4c61f13716b209babed7dbac72809645a05f12ee0baa5ceb02a2b8cf283f27796697eb72bdaaeab5adb07cd89525da924c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/pt-BR/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/pt-BR/firefox-57.0.4.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "8ff7f3ff2d8d98ad374571ae4dc5b19bd19fb882a95965f6bde116a42fe09a94e2a6da65b6403a882aebb85b6c6da987a592dd4b80daa8cb09602f7fe124b467"; + sha512 = "0bcc63288bb18b5dcaf382857a65e408d802da8e703cbc376be828e512fe66ed6f12b5e3a46db8c5f883000dd0ce152ab387d25642878abc2660d4d3782c5a0e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/pt-PT/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/pt-PT/firefox-57.0.4.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "0c950dc7e68e163536abbabc7138425e126798fca19db2f3aecc4da90fd84846abb86fa6e830ccad4580131749d96f2d731fde13c608b57f4a14a57443447ae0"; + sha512 = "79969af79356540c274935741e00a0507ec2d7d7047bd03ab5420246daa0329b51320f0f2e92250e8e1c11491cd500a3112bcc7d4c61acebe079ffac8284e0ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/rm/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/rm/firefox-57.0.4.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "25f6187c98cad96f4c14872a0724979cb6051328dfff16bb9384dc59972e9bf41bb1e9bd7fffb58a0c0cad8dee4da817ddc86f6e40dea29758751fbcfe2e4abb"; + sha512 = "5ba523ff6ce9cf291b6d16c56eaa9688f8bab2fc43eb00d1c496cac9909187e781e0436a0afe47d8cd3808533a1f762e0e7dd417428ac7e5958487271b3e6d5f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/ro/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/ro/firefox-57.0.4.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "afabdbf4516aa1f9f6cc39025f867e507668609e9f2cb754a92ee00960d0d3628df3c931b25c63668e42f6647b733e6429b304405636477eece998ecf6078cb9"; + sha512 = "9575744e3f62b7803a93524e24baf9838488067df5dcdcbce2031fd735fa25223869f22de807d33217f8b541d2185a4a6dd62ada6bd37bf6386f1d6f6b776ff7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/ru/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/ru/firefox-57.0.4.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "6525efa101eab27af2f1e91576ac4ec4183d7f53fce1e08fbab683c9830634391f379606da588ec912f641898aa296ab6b252dc863e78f1410ae4a136440cae9"; + sha512 = "7529dc04a413c7ad5db86b199318bdf8bba0e8837b3f5e50840326301ebd84562d2a3cae2ae352e2625db85d652675bec20dad2de5db46ec520853789fc930f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/si/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/si/firefox-57.0.4.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "654e128ee1910a6f2e56c0216945981fafa39c1c12f18312ec1bb9616c83ff5ad64b1315497b6d313ebaf31f6c0a59ed7791836dc80ca1bbde2556665e9a6ca5"; + sha512 = "7ec9f3b071ca4b7436b81c81c847acc915d8cc6e4d147587cde63527ba5b3f7d177857af308c0d4dc4566e53b3e4cc2398b3dfd367cc4ceae6eb90582027dda4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/sk/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/sk/firefox-57.0.4.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "a6b27276e43fd74ef08087a3ee9e741fc492c3e04f04c37f496644393d0d49b3dd697beb04537ea5f2faf0ad41a0cf90cc6fbd06bc49d30340449b68c9d4812c"; + sha512 = "9fa5dc5cd172388bc61719e03fe7df5a2a6e56cd49ad3c7afd9622aca64ba25fbbe83f834431dc4c2a26b2873d80026769e7712c78dce550077cad4d84559dab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/sl/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/sl/firefox-57.0.4.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "e4e2eb23c4da496d8725902d82bb3fc8d96fec65bcca1bab839de1589378825203ba6d6ffdfbc1df6b82d8e3f49a3c2a271ce0cb659008b29cad4fa7c5fef8b6"; + sha512 = "3e142ce6878e9b01ee34e9a18152e4c869fdb9902a8f78810293d854e4196c8e0a43a8bfb7f7354dd27f2547792a48ac957bec96751aca050a3d65dc5e227f5b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/son/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/son/firefox-57.0.4.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "185dfe1f335d9d74de153c7083e739a48970b3abe970dab57ab5f50d813df0ddc4b5e592e394a2e7d61baab7032571f15ff9621a729c51a47b75a8ae7cd18f4d"; + sha512 = "b0bda73680d788b55526763306477504430b49b4ce465f091b5d3aa62f5e56618f8d6125cc1a68dc4b5403dbe28ae2c1dfa9e7d85e0bde9f06dc8735083d159d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/sq/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/sq/firefox-57.0.4.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "8772ad36a9e51fd413f0afbe4436f973ff6daeb6c062fb833b8387a6ca1960bc3b699aa730cd3e991aa39ce0d061e2b452c5d79ffd519fe05295cffb7cf4ba35"; + sha512 = "285d6f4b2f27c14642bd44c572776c49c80d4360a635da1e92161f665a6714b011bd0be2b37f3ec1b2c1726ea6627eb7a21879e2af72bb4c04560a1f701770a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/sr/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/sr/firefox-57.0.4.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "59c7ba1b9f0a1f45b2086fd6ed87a85c7bfc858a480c54972950fc4839109954d4e51e4dce864b3b23148b629e000e13d4ef49b718fbd5d8bb1d8cc7a738567a"; + sha512 = "14c451f7a3237e43bbd6f5fd9370224452a401f97732901c9796e40d313f4542d635984b5feaaba9d44be77e6e3e65a6c191d4081bc5d2d1b57bae12d432c414"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/sv-SE/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/sv-SE/firefox-57.0.4.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "3f4aac40aae1b2efd92a4c1f1f65ff75a7199b955edeab5eb4ffc58d8c899ab05d160e9f0468be6a5cbd5da67110b4fd703214a5ccd75392add3f833f09df670"; + sha512 = "70eb6083426d6e382934e7734718d6eaa4884a9ac24e36b1fd87a9c9405dce16353e8f6058912adc4fac0cb4ddecf7e2fdc8428e088b44d56508bc47f6c55abc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/ta/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/ta/firefox-57.0.4.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "698dc4daeda232bf73cc876c027b0398b6c26c7a65b5b5c403f275e275fe3399c66219c7d9916f2713342d04d8bc33186b68ec5b738ccac7665bad7ae073b408"; + sha512 = "615d3727a9efc2e14fefe093678cb83f83e1efaab9053a98391b7613754e40fa7929e4fa3de34da7aaef8053ea752e6ca00f83d114c90c1769f708742f492db5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/te/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/te/firefox-57.0.4.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "2e85fbadafd18140f75b7b1f9aef525c90f363dc5649aeee177cf86b24adb55cdb6c594457c5a7509177076b750a79e48785ed73343fe480ea33b696bb4d33b4"; + sha512 = "246c2699bbd27a318778f5517d62bc7c96dd6fdba0a8291f291b0e803d2a68710d96c4a11118fd105d00e4489924a62195c7752edc403b5b42a8a06a36962571"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/th/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/th/firefox-57.0.4.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "28236c8b7d3dacf156e65faa9d72cae11d8726dabd5b4408b556f9f2beb073469c4cb285721ed9ccb438df618f1be503717399d7e6669a308c45858a5962c0df"; + sha512 = "3b34c97e9e3b0ec436e299c45e4913fcb90c9a565687d587774adef2fb10bacf9fd8c576a15a5c8100e2f82cec2d3c4353e645acc9c20245e6fb6e2b73213011"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/tr/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/tr/firefox-57.0.4.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "4691739124c0ac4c5da2ff478f51205849e816428bc4dbdc5ea93abaae41b12d27ab316d4294d44b155378cd80370dff8da53a5bf2adbbaa44d6732607642aee"; + sha512 = "184b6e4f5a88fd7606868bba6860718d2dec0a6db123222195ea9bafd5ff3a391ee34a911591eff58c5ae7bc90b171aa1866d3d872349d4057ce72a709eea0b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/uk/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/uk/firefox-57.0.4.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "89483ebc8c4baab09c88a221bdf0740415cb80e376d6c8c0db449cf96d9283a9f43c4568bd9c67ee170173caa9a5e8b86ebf096acdc1f1b514de6747dc04aad7"; + sha512 = "bb343353890e94526ae5dab5c2dca510ddda25d0d808decdd5ed628af174e60e584f1a883e19f33be2b316e423ed1be7e8c30916eb10ed11c618a015beaa538c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/ur/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/ur/firefox-57.0.4.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "9df394814870aef097880ca8d5b012652968cc0832a5bc166d95a5adb52d996c4cac87e08f3543e704460e8165bcada3b03de36566b1772ba072cd61605bef4f"; + sha512 = "f54e1cb54992436bc78b1491214978aa7986153564bc93f9da2c64e038f4bbb77dbf3f44ab4cece5a02e1ff8e1c0d4bf5ed64815817fc908482f9ef203689cc3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/uz/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/uz/firefox-57.0.4.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "f3d28a80144fc542c9fe8f1c607c35c14fa561ba5c7030f9b69515eb29ad7fc87f8fe45406fc8c86e3428bed20e7c7c9714192720ec2ec29cc532206e510797d"; + sha512 = "832c7b687c1db9545ac9fd81ecf95d29eb329518dad9386541073f6834ba88e80ad9bc70d6ab7e12d820e8430064f638d1558c0559d6b410a8ebd81a7a82b245"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/vi/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/vi/firefox-57.0.4.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "506b68ead1facd94b90ef2b5096760748ba234c71f01c22cb202a9ef59aff3257eca92f238357ddc51ff0d21e72d2ec32371e7f4add4c0f8ce534447dd622dcc"; + sha512 = "e60023cc021263b402ffe829b24ec00f0c0e2e782fb0acba23b3527f612aed710a1c8c65cc28bcb03bbfa54a4450085adeff36be69bb21bbb175bddf4c5894c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/xh/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/xh/firefox-57.0.4.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "44ea4098952c2a289a25e90f2e8d12efa58294169f79c47a445d53fee0a0c8dffdb567b6745b55e581c70475855d2142e0cfd9c79faa354606a354a83a70e105"; + sha512 = "94ba86099376c14900fadef25a77b9b4422d8f50d26bcc3bf024dc5d6a35f4c08f897cb5dc1c94232798d9fff11e7b018c90ff7808bc7ee9c861e57f425e96e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/zh-CN/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/zh-CN/firefox-57.0.4.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "cc7a52f748adfea0366f02536f22c384fdd39cfd792a4995e0f7b85e6835df08780fe3b3779922eed6958082c8df8d471cf18f5e65a613d7aec4b27db9a0a863"; + sha512 = "a6cdd0d0553e84a727da33e8f06afe004f4a95d726982b32dc7f74f36182e8bd2b186dfd7f3a90760ab7b01f932fdfc8de4d1b154c5133151f29b7a4d78a409f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.3/linux-i686/zh-TW/firefox-57.0.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.4/linux-i686/zh-TW/firefox-57.0.4.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "eb5638f8a1f4a1b63d7c7681bba31b1fffd4826476442ee971e5844611b53bc3b070f8033c49f17d45d9cc9e7b9567805578cd3ced63ba186ac67d341544c0fe"; + sha512 = "a6ecdee1aefeb29b51861b011334346acf9816971c8b40196a06969c3e21e1a8ed96f1393f25e558f6fc6e5cf35b5a497de91df4764ad30c52d7ce06bd7d6732"; } ]; } From d7ffc7bf3d6d2c7398f0451893eb44aa89f81550 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Fri, 5 Jan 2018 11:03:57 +0100 Subject: [PATCH 223/296] hugo: 0.30.2 -> 0.32.2 --- pkgs/applications/misc/hugo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 183a609a31a..86b806a916c 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "hugo-${version}"; - version = "0.30.2"; + version = "0.32.2"; goPackagePath = "github.com/gohugoio/hugo"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "gohugoio"; repo = "hugo"; rev = "v${version}"; - sha256 = "12dii2d0pirkj264857d5y83bdllk1knk5sjf31v0m9c25fapci0"; + sha256 = "0k62sg9rvr4aqzh1r60m456cw8mj6kxjpri2nnj4c2dxmvll8qhr"; }; goDeps = ./deps.nix; From 62f7fc8c19ed4199356c3e2cc65c0adbd32c011d Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Fri, 5 Jan 2018 11:40:34 +0100 Subject: [PATCH 224/296] xcodebuild: fix to make it build against the 11.2 iphone SDK --- pkgs/development/mobile/xcodeenv/build-app.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/mobile/xcodeenv/build-app.nix b/pkgs/development/mobile/xcodeenv/build-app.nix index bbbe1728ee5..d208f26ab67 100644 --- a/pkgs/development/mobile/xcodeenv/build-app.nix +++ b/pkgs/development/mobile/xcodeenv/build-app.nix @@ -1,7 +1,7 @@ {stdenv, xcodewrapper}: { name , src -, sdkVersion ? "10.2" +, sdkVersion ? "11.2" , target ? null , configuration ? null , scheme ? null @@ -80,8 +80,10 @@ stdenv.mkDerivation { ''} # Do the building + export LD=clang # To avoid problem with -isysroot parameter that is unrecognized by the stock ld. Comparison with an impure build shows that it uses clang instead. Ugly, but it works + xcodebuild -target ${_target} -configuration ${_configuration} ${stdenv.lib.optionalString (scheme != null) "-scheme ${scheme}"} -sdk ${_sdk} TARGETED_DEVICE_FAMILY="1, 2" ONLY_ACTIVE_ARCH=NO CONFIGURATION_TEMP_DIR=$TMPDIR CONFIGURATION_BUILD_DIR=$out ${if generateXCArchive then "archive" else ""} ${xcodeFlags} ${if release then ''"CODE_SIGN_IDENTITY=${codeSignIdentity}" PROVISIONING_PROFILE=$PROVISIONING_PROFILE OTHER_CODE_SIGN_FLAGS="--keychain $HOME/Library/Keychains/$keychainName-db"'' else ""} - + ${stdenv.lib.optionalString release '' ${stdenv.lib.optionalString generateIPA '' # Produce an IPA file From 61a7f0bbf01f9c27b67487074f706d9fc0068b26 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Fri, 5 Jan 2018 11:47:30 +0100 Subject: [PATCH 225/296] xcodeenv: use 9.2 by default --- pkgs/development/mobile/xcodeenv/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/mobile/xcodeenv/default.nix b/pkgs/development/mobile/xcodeenv/default.nix index afe430df383..b3b9dbdf07a 100644 --- a/pkgs/development/mobile/xcodeenv/default.nix +++ b/pkgs/development/mobile/xcodeenv/default.nix @@ -1,4 +1,4 @@ -{stdenv, version ? "8.2.1", xcodeBaseDir ? "/Applications/Xcode.app"}: +{stdenv, version ? "9.2", xcodeBaseDir ? "/Applications/Xcode.app"}: rec { xcodewrapper = import ./xcodewrapper.nix { From bb06428818afeb006992b5e72302812835251e24 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Fri, 5 Jan 2018 11:57:49 +0100 Subject: [PATCH 226/296] nodePackages: move titanium from v4 to v6 package set --- .../node-packages/node-packages-v4.json | 1 - .../node-packages/node-packages-v4.nix | 895 +----- .../node-packages/node-packages-v6.json | 1 + .../node-packages/node-packages-v6.nix | 2756 ++++++++++++----- .../node-packages/node-packages-v8.nix | 65 +- 5 files changed, 2016 insertions(+), 1702 deletions(-) diff --git a/pkgs/development/node-packages/node-packages-v4.json b/pkgs/development/node-packages/node-packages-v4.json index c178f0fde82..b1349773a73 100644 --- a/pkgs/development/node-packages/node-packages-v4.json +++ b/pkgs/development/node-packages/node-packages-v4.json @@ -6,5 +6,4 @@ , "node-inspector" , "node-pre-gyp" , "npm" -, "titanium" ] diff --git a/pkgs/development/node-packages/node-packages-v4.nix b/pkgs/development/node-packages/node-packages-v4.nix index acb65b614fa..c86e76cda15 100644 --- a/pkgs/development/node-packages/node-packages-v4.nix +++ b/pkgs/development/node-packages/node-packages-v4.nix @@ -787,13 +787,13 @@ let sha512 = "0xgsjz9m3kg5pm36lcchblxk53qay59ya7wi5jgdmz0dsl5b0j2j7wcd48yyfaip1m70mj9aqf8kib02fn62k0hy0vxg2hng60yk4w7"; }; }; - "object.map-1.0.0" = { + "object.map-1.0.1" = { name = "object.map"; packageName = "object.map"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/object.map/-/object.map-1.0.0.tgz"; - sha1 = "92aef871cd6dcbced31fe29c0921db8395624597"; + url = "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz"; + sha1 = "cf83e59dc8fcc0ad5f4250e1f78b3b81bd801d37"; }; }; "rechoir-0.6.2" = { @@ -904,13 +904,13 @@ let sha1 = "51af7d614ad9a9f610ea1bafbb989d6b1c56890f"; }; }; - "extglob-2.0.2" = { + "extglob-2.0.3" = { name = "extglob"; packageName = "extglob"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/extglob/-/extglob-2.0.2.tgz"; - sha512 = "3bi96hlw84salahixd3vvyzzx1riqlfnrf44qnlhl46yqpl5rad97halvj3vybzvh970jyk50lagp9qys69qhayy25m337y25j9wkr3"; + url = "https://registry.npmjs.org/extglob/-/extglob-2.0.3.tgz"; + sha512 = "31zb5fc59ps76hnxlnrcmm3lkv4pjd3cw55h5h7r9pn1q259bs15hw0bn4gp8kn91qwabgbj0cwkx9pxp8fgsj3ljlvmfv0xijnsah3"; }; }; "fragment-cache-0.2.1" = { @@ -1111,40 +1111,31 @@ let sha512 = "0w73qlx9ynmv2iznw1kll86yd04z4rsz3788nzgh7amcnpsbyxbrs734im9dibqgps6pjyz61s8kp4lcsbjsdfrlc51m1pm2hrxgfba"; }; }; - "is-descriptor-1.0.1" = { + "is-descriptor-1.0.2" = { name = "is-descriptor"; packageName = "is-descriptor"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.1.tgz"; - sha512 = "1s669mqvckcwsqrnni08lac1anx00q82rkfplnq6zl9inaqzlq8n9ln8j8m49a9gaxjrwgkl8wjw4188whbj65yxspalzgaaiacaxqv"; + url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz"; + sha512 = "2v1a9mn2rzz52v8vs3i7njk9pv95fh971yc81xr0zkaw3dff4gbv1zv048xyjysfgwpajbyryk2px8hinwwh0wagblmw6chdbjsrs6r"; }; }; - "is-accessor-descriptor-0.1.6" = { + "is-accessor-descriptor-1.0.0" = { name = "is-accessor-descriptor"; packageName = "is-accessor-descriptor"; - version = "0.1.6"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz"; - sha1 = "a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"; + url = "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz"; + sha512 = "1qllik6fjwfq17ic0fxwqyll8mrhmcm36xfsq45xc57mq9ah4i4nn4f8fvgb0gx4kpl3jlpkzndp0xlmmf2mh0xmggw6mhw74fng64v"; }; }; - "is-data-descriptor-0.1.4" = { + "is-data-descriptor-1.0.0" = { name = "is-data-descriptor"; packageName = "is-data-descriptor"; - version = "0.1.4"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz"; - sha1 = "0b5ee648388e2c860282e793f1856fec3f301b56"; - }; - }; - "kind-of-5.1.0" = { - name = "kind-of"; - packageName = "kind-of"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz"; - sha512 = "0zk87sccrjx6pgf9n74v4msnqwq5siyhrkpaklx7yk85ygy5ypcgmyfhbd5mmcyd53x8zcw0gzvp9bhbglziqbhp7a6n5zsf6p08q9l"; + url = "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz"; + sha512 = "0ny6kxc752fg3z6fmj8a7fw2lai2y17d9fx0028nvyv1qj0sa30rfryhv9xd7b7is1yfs0val6amsy2b22rh589il10md36a75mgd4d"; }; }; "is-extendable-0.1.1" = { @@ -1210,6 +1201,33 @@ let sha512 = "0gbflcxmd30gzj91y19fylsfalirl6qg71sxjximc8lc2vxkg5h9scnahvxsczymchlx742i8ai489843ys431vyw73rp418jpxiw3a"; }; }; + "is-accessor-descriptor-0.1.6" = { + name = "is-accessor-descriptor"; + packageName = "is-accessor-descriptor"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz"; + sha1 = "a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"; + }; + }; + "is-data-descriptor-0.1.4" = { + name = "is-data-descriptor"; + packageName = "is-data-descriptor"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz"; + sha1 = "0b5ee648388e2c860282e793f1856fec3f301b56"; + }; + }; + "kind-of-5.1.0" = { + name = "kind-of"; + packageName = "kind-of"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz"; + sha512 = "0zk87sccrjx6pgf9n74v4msnqwq5siyhrkpaklx7yk85ygy5ypcgmyfhbd5mmcyd53x8zcw0gzvp9bhbglziqbhp7a6n5zsf6p08q9l"; + }; + }; "map-cache-0.2.2" = { name = "map-cache"; packageName = "map-cache"; @@ -1732,15 +1750,6 @@ let sha1 = "bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d"; }; }; - "for-own-0.1.5" = { - name = "for-own"; - packageName = "for-own"; - version = "0.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz"; - sha1 = "5265c681a4f294dabbf17c9509b6763aa84510ce"; - }; - }; "make-iterator-1.0.0" = { name = "make-iterator"; packageName = "make-iterator"; @@ -4009,510 +4018,6 @@ let sha1 = "104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"; }; }; - "adm-zip-0.4.7" = { - name = "adm-zip"; - packageName = "adm-zip"; - version = "0.4.7"; - src = fetchurl { - url = "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.7.tgz"; - sha1 = "8606c2cbf1c426ce8c8ec00174447fd49b6eafc1"; - }; - }; - "async-2.1.2" = { - name = "async"; - packageName = "async"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-2.1.2.tgz"; - sha1 = "612a4ab45ef42a70cde806bad86ee6db047e8385"; - }; - }; - "colors-1.1.2" = { - name = "colors"; - packageName = "colors"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz"; - sha1 = "168a4701756b6a7f51a12ce0c97bfa28c084ed63"; - }; - }; - "fields-0.1.24" = { - name = "fields"; - packageName = "fields"; - version = "0.1.24"; - src = fetchurl { - url = "https://registry.npmjs.org/fields/-/fields-0.1.24.tgz"; - sha1 = "bed93b1c2521f4705fe764f4209267fdfd89f5d3"; - }; - }; - "humanize-0.0.9" = { - name = "humanize"; - packageName = "humanize"; - version = "0.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/humanize/-/humanize-0.0.9.tgz"; - sha1 = "1994ffaecdfe9c441ed2bdac7452b7bb4c9e41a4"; - }; - }; - "longjohn-0.2.11" = { - name = "longjohn"; - packageName = "longjohn"; - version = "0.2.11"; - src = fetchurl { - url = "https://registry.npmjs.org/longjohn/-/longjohn-0.2.11.tgz"; - sha1 = "83736a15ae5f48711b625153e98012f2de659e69"; - }; - }; - "moment-2.16.0" = { - name = "moment"; - packageName = "moment"; - version = "2.16.0"; - src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.16.0.tgz"; - sha1 = "f38f2c97c9889b0ee18fc6cc392e1e443ad2da8e"; - }; - }; - "node-appc-0.2.41" = { - name = "node-appc"; - packageName = "node-appc"; - version = "0.2.41"; - src = fetchurl { - url = "https://registry.npmjs.org/node-appc/-/node-appc-0.2.41.tgz"; - sha1 = "f68cf5acb607c4903e2f63024383ae95ba1fdc52"; - }; - }; - "request-2.79.0" = { - name = "request"; - packageName = "request"; - version = "2.79.0"; - src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.79.0.tgz"; - sha1 = "4dfe5bf6be8b8cdc37fcf93e04b65577722710de"; - }; - }; - "sprintf-0.1.5" = { - name = "sprintf"; - packageName = "sprintf"; - version = "0.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/sprintf/-/sprintf-0.1.5.tgz"; - sha1 = "8f83e39a9317c1a502cb7db8050e51c679f6edcf"; - }; - }; - "temp-0.8.3" = { - name = "temp"; - packageName = "temp"; - version = "0.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/temp/-/temp-0.8.3.tgz"; - sha1 = "e0c6bc4d26b903124410e4fed81103014dfc1f59"; - }; - }; - "winston-1.1.2" = { - name = "winston"; - packageName = "winston"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/winston/-/winston-1.1.2.tgz"; - sha1 = "68edd769ff79d4f9528cf0e5d80021aade67480c"; - }; - }; - "fs-extra-2.1.2" = { - name = "fs-extra"; - packageName = "fs-extra"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-extra/-/fs-extra-2.1.2.tgz"; - sha1 = "046c70163cef9aad46b0e4a7fa467fb22d71de35"; - }; - }; - "lodash-4.17.4" = { - name = "lodash"; - packageName = "lodash"; - version = "4.17.4"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz"; - sha1 = "78203a4d1c328ae1d86dca6460e369b57f4055ae"; - }; - }; - "colors-0.6.2" = { - name = "colors"; - packageName = "colors"; - version = "0.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz"; - sha1 = "2423fe6678ac0c5dae8852e5d0e5be08c997abcc"; - }; - }; - "keypress-0.2.1" = { - name = "keypress"; - packageName = "keypress"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/keypress/-/keypress-0.2.1.tgz"; - sha1 = "1e80454250018dbad4c3fe94497d6e67b6269c77"; - }; - }; - "source-map-support-0.3.2" = { - name = "source-map-support"; - packageName = "source-map-support"; - version = "0.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.3.2.tgz"; - sha1 = "737d5c901e0b78fdb53aca713d24f23ccbb10be1"; - }; - }; - "source-map-0.1.32" = { - name = "source-map"; - packageName = "source-map"; - version = "0.1.32"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.1.32.tgz"; - sha1 = "c8b6c167797ba4740a8ea33252162ff08591b266"; - }; - }; - "amdefine-1.0.1" = { - name = "amdefine"; - packageName = "amdefine"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz"; - sha1 = "4a5282ac164729e93619bcfd3ad151f817ce91f5"; - }; - }; - "async-2.1.4" = { - name = "async"; - packageName = "async"; - version = "2.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-2.1.4.tgz"; - sha1 = "2d2160c7788032e4dd6cbe2502f1f9a2c8f6cde4"; - }; - }; - "diff-3.2.0" = { - name = "diff"; - packageName = "diff"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/diff/-/diff-3.2.0.tgz"; - sha1 = "c9ce393a4b7cbd0b058a725c93df299027868ff9"; - }; - }; - "node-uuid-1.4.7" = { - name = "node-uuid"; - packageName = "node-uuid"; - version = "1.4.7"; - src = fetchurl { - url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz"; - sha1 = "6da5a17668c4b3dd59623bda11cf7fa4c1f60a6f"; - }; - }; - "optimist-0.6.1" = { - name = "optimist"; - packageName = "optimist"; - version = "0.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz"; - sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686"; - }; - }; - "wrench-1.5.9" = { - name = "wrench"; - packageName = "wrench"; - version = "1.5.9"; - src = fetchurl { - url = "https://registry.npmjs.org/wrench/-/wrench-1.5.9.tgz"; - sha1 = "411691c63a9b2531b1700267279bdeca23b2142a"; - }; - }; - "uglify-js-2.7.5" = { - name = "uglify-js"; - packageName = "uglify-js"; - version = "2.7.5"; - src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.5.tgz"; - sha1 = "4612c0c7baaee2ba7c487de4904ae122079f2ca8"; - }; - }; - "wordwrap-0.0.3" = { - name = "wordwrap"; - packageName = "wordwrap"; - version = "0.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"; - sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107"; - }; - }; - "minimist-0.0.10" = { - name = "minimist"; - packageName = "minimist"; - version = "0.0.10"; - src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"; - sha1 = "de3f98543dbf96082be48ad1a0c7cda836301dcf"; - }; - }; - "async-0.2.10" = { - name = "async"; - packageName = "async"; - version = "0.2.10"; - src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-0.2.10.tgz"; - sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1"; - }; - }; - "uglify-to-browserify-1.0.2" = { - name = "uglify-to-browserify"; - packageName = "uglify-to-browserify"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz"; - sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7"; - }; - }; - "yargs-3.10.0" = { - name = "yargs"; - packageName = "yargs"; - version = "3.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz"; - sha1 = "f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"; - }; - }; - "camelcase-1.2.1" = { - name = "camelcase"; - packageName = "camelcase"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"; - sha1 = "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"; - }; - }; - "cliui-2.1.0" = { - name = "cliui"; - packageName = "cliui"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz"; - sha1 = "4b475760ff80264c762c3a1719032e91c7fea0d1"; - }; - }; - "window-size-0.1.0" = { - name = "window-size"; - packageName = "window-size"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz"; - sha1 = "5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"; - }; - }; - "center-align-0.1.3" = { - name = "center-align"; - packageName = "center-align"; - version = "0.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz"; - sha1 = "aa0d32629b6ee972200411cbd4461c907bc2b7ad"; - }; - }; - "right-align-0.1.3" = { - name = "right-align"; - packageName = "right-align"; - version = "0.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz"; - sha1 = "61339b722fe6a3515689210d24e14c96148613ef"; - }; - }; - "wordwrap-0.0.2" = { - name = "wordwrap"; - packageName = "wordwrap"; - version = "0.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"; - sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f"; - }; - }; - "align-text-0.1.4" = { - name = "align-text"; - packageName = "align-text"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz"; - sha1 = "0cd90a561093f35d0a99256c22b7069433fad117"; - }; - }; - "lazy-cache-1.0.4" = { - name = "lazy-cache"; - packageName = "lazy-cache"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz"; - sha1 = "a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"; - }; - }; - "longest-1.0.1" = { - name = "longest"; - packageName = "longest"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz"; - sha1 = "30a0b2da38f73770e8294a0d22e6625ed77d0097"; - }; - }; - "caseless-0.11.0" = { - name = "caseless"; - packageName = "caseless"; - version = "0.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz"; - sha1 = "715b96ea9841593cc33067923f5ec60ebda4f7d7"; - }; - }; - "har-validator-2.0.6" = { - name = "har-validator"; - packageName = "har-validator"; - version = "2.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz"; - sha1 = "cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d"; - }; - }; - "qs-6.3.2" = { - name = "qs"; - packageName = "qs"; - version = "6.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.3.2.tgz"; - sha1 = "e75bd5f6e268122a2a0e0bda630b2550c166502c"; - }; - }; - "tunnel-agent-0.4.3" = { - name = "tunnel-agent"; - packageName = "tunnel-agent"; - version = "0.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz"; - sha1 = "6373db76909fe570e08d73583365ed828a74eeeb"; - }; - }; - "commander-2.12.2" = { - name = "commander"; - packageName = "commander"; - version = "2.12.2"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.12.2.tgz"; - sha512 = "007wb3baahjcrv17kgxryqjlsyr3c3kl2y07p85m4ia78pba9xyjr3cgi95jjrwq8qq550s78hj06f7z0ab8ssrxk6w06afjsmxln84"; - }; - }; - "is-my-json-valid-2.17.1" = { - name = "is-my-json-valid"; - packageName = "is-my-json-valid"; - version = "2.17.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.17.1.tgz"; - sha512 = "2qkjhj6i3y40j35y8k722kklm1j8dfwk9506csa3vxr16vv7125v8jzpmkl551gsif98bzn205yj3sb99xi1i4bd6p5a1m81wvj2sa3"; - }; - }; - "generate-function-2.0.0" = { - name = "generate-function"; - packageName = "generate-function"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz"; - sha1 = "6858fe7c0969b7d4e9093337647ac79f60dfbe74"; - }; - }; - "generate-object-property-1.2.0" = { - name = "generate-object-property"; - packageName = "generate-object-property"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz"; - sha1 = "9c0e1c40308ce804f4783618b937fa88f99d50d0"; - }; - }; - "jsonpointer-4.0.1" = { - name = "jsonpointer"; - packageName = "jsonpointer"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz"; - sha1 = "4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"; - }; - }; - "is-property-1.0.2" = { - name = "is-property"; - packageName = "is-property"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"; - sha1 = "57fe1c4e48474edd65b09911f26b1cd4095dda84"; - }; - }; - "async-1.0.0" = { - name = "async"; - packageName = "async"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-1.0.0.tgz"; - sha1 = "f8fc04ca3a13784ade9e1641af98578cfbd647a9"; - }; - }; - "colors-1.0.3" = { - name = "colors"; - packageName = "colors"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz"; - sha1 = "0433f44d809680fdeb60ed260f1b0c262e82a40b"; - }; - }; - "cycle-1.0.3" = { - name = "cycle"; - packageName = "cycle"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz"; - sha1 = "21e80b2be8580f98b468f379430662b046c34ad2"; - }; - }; - "eyes-0.1.8" = { - name = "eyes"; - packageName = "eyes"; - version = "0.1.8"; - src = fetchurl { - url = "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"; - sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0"; - }; - }; - "pkginfo-0.3.1" = { - name = "pkginfo"; - packageName = "pkginfo"; - version = "0.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz"; - sha1 = "5b29f6a81f70717142e09e765bbeab97b4f81e21"; - }; - }; - "stack-trace-0.0.10" = { - name = "stack-trace"; - packageName = "stack-trace"; - version = "0.0.10"; - src = fetchurl { - url = "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz"; - sha1 = "547c70b347e8d32b4e108ea1a2a159e5fdde19c0"; - }; - }; - "jsonfile-2.4.0" = { - name = "jsonfile"; - packageName = "jsonfile"; - version = "2.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz"; - sha1 = "3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"; - }; - }; }; in { @@ -4778,27 +4283,10 @@ in }) (sources."define-property-1.0.0" // { dependencies = [ - (sources."is-descriptor-1.0.1" // { + (sources."is-descriptor-1.0.2" // { dependencies = [ - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - (sources."kind-of-3.2.2" // { - dependencies = [ - sources."is-buffer-1.1.6" - ]; - }) - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - (sources."kind-of-3.2.2" // { - dependencies = [ - sources."is-buffer-1.1.6" - ]; - }) - ]; - }) - sources."kind-of-5.1.0" + sources."is-accessor-descriptor-1.0.0" + sources."is-data-descriptor-1.0.0" ]; }) ]; @@ -4808,7 +4296,7 @@ in sources."is-extendable-0.1.1" ]; }) - (sources."extglob-2.0.2" // { + (sources."extglob-2.0.3" // { dependencies = [ (sources."expand-brackets-2.1.4" // { dependencies = [ @@ -5027,27 +4515,10 @@ in sources."component-emitter-1.2.1" (sources."define-property-1.0.0" // { dependencies = [ - (sources."is-descriptor-1.0.1" // { + (sources."is-descriptor-1.0.2" // { dependencies = [ - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - (sources."kind-of-3.2.2" // { - dependencies = [ - sources."is-buffer-1.1.6" - ]; - }) - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - (sources."kind-of-3.2.2" // { - dependencies = [ - sources."is-buffer-1.1.6" - ]; - }) - ]; - }) - sources."kind-of-5.1.0" + sources."is-accessor-descriptor-1.0.0" + sources."is-data-descriptor-1.0.0" ]; }) ]; @@ -5257,9 +4728,9 @@ in sources."isobject-3.0.1" ]; }) - (sources."object.map-1.0.0" // { + (sources."object.map-1.0.1" // { dependencies = [ - (sources."for-own-0.1.5" // { + (sources."for-own-1.0.0" // { dependencies = [ sources."for-in-1.0.2" ]; @@ -6824,258 +6295,4 @@ in production = true; bypassCache = false; }; - titanium = nodeEnv.buildNodePackage { - name = "titanium"; - packageName = "titanium"; - version = "5.0.14"; - src = fetchurl { - url = "https://registry.npmjs.org/titanium/-/titanium-5.0.14.tgz"; - sha1 = "140bd332624acae65113a3ffec10b8cbb940ad0b"; - }; - dependencies = [ - sources."adm-zip-0.4.7" - (sources."async-2.1.2" // { - dependencies = [ - sources."lodash-4.17.4" - ]; - }) - sources."colors-1.1.2" - (sources."fields-0.1.24" // { - dependencies = [ - sources."colors-0.6.2" - sources."keypress-0.2.1" - ]; - }) - sources."humanize-0.0.9" - (sources."longjohn-0.2.11" // { - dependencies = [ - (sources."source-map-support-0.3.2" // { - dependencies = [ - (sources."source-map-0.1.32" // { - dependencies = [ - sources."amdefine-1.0.1" - ]; - }) - ]; - }) - ]; - }) - sources."moment-2.16.0" - (sources."node-appc-0.2.41" // { - dependencies = [ - (sources."async-2.1.4" // { - dependencies = [ - sources."lodash-4.17.4" - ]; - }) - sources."diff-3.2.0" - sources."node-uuid-1.4.7" - (sources."optimist-0.6.1" // { - dependencies = [ - sources."wordwrap-0.0.3" - sources."minimist-0.0.10" - ]; - }) - sources."wrench-1.5.9" - (sources."uglify-js-2.7.5" // { - dependencies = [ - sources."async-0.2.10" - sources."source-map-0.5.7" - sources."uglify-to-browserify-1.0.2" - (sources."yargs-3.10.0" // { - dependencies = [ - sources."camelcase-1.2.1" - (sources."cliui-2.1.0" // { - dependencies = [ - (sources."center-align-0.1.3" // { - dependencies = [ - (sources."align-text-0.1.4" // { - dependencies = [ - (sources."kind-of-3.2.2" // { - dependencies = [ - sources."is-buffer-1.1.6" - ]; - }) - sources."longest-1.0.1" - sources."repeat-string-1.6.1" - ]; - }) - sources."lazy-cache-1.0.4" - ]; - }) - (sources."right-align-0.1.3" // { - dependencies = [ - (sources."align-text-0.1.4" // { - dependencies = [ - (sources."kind-of-3.2.2" // { - dependencies = [ - sources."is-buffer-1.1.6" - ]; - }) - sources."longest-1.0.1" - sources."repeat-string-1.6.1" - ]; - }) - ]; - }) - sources."wordwrap-0.0.2" - ]; - }) - sources."decamelize-1.2.0" - sources."window-size-0.1.0" - ]; - }) - ]; - }) - sources."xmldom-0.1.27" - ]; - }) - (sources."request-2.79.0" // { - dependencies = [ - sources."aws-sign2-0.6.0" - sources."aws4-1.6.0" - sources."caseless-0.11.0" - (sources."combined-stream-1.0.5" // { - dependencies = [ - sources."delayed-stream-1.0.0" - ]; - }) - sources."extend-3.0.1" - sources."forever-agent-0.6.1" - (sources."form-data-2.1.4" // { - dependencies = [ - sources."asynckit-0.4.0" - ]; - }) - (sources."har-validator-2.0.6" // { - dependencies = [ - (sources."chalk-1.1.3" // { - dependencies = [ - sources."ansi-styles-2.2.1" - sources."escape-string-regexp-1.0.5" - (sources."has-ansi-2.0.0" // { - dependencies = [ - sources."ansi-regex-2.1.1" - ]; - }) - (sources."strip-ansi-3.0.1" // { - dependencies = [ - sources."ansi-regex-2.1.1" - ]; - }) - sources."supports-color-2.0.0" - ]; - }) - sources."commander-2.12.2" - (sources."is-my-json-valid-2.17.1" // { - dependencies = [ - sources."generate-function-2.0.0" - (sources."generate-object-property-1.2.0" // { - dependencies = [ - sources."is-property-1.0.2" - ]; - }) - sources."jsonpointer-4.0.1" - sources."xtend-4.0.1" - ]; - }) - (sources."pinkie-promise-2.0.1" // { - dependencies = [ - sources."pinkie-2.0.4" - ]; - }) - ]; - }) - (sources."hawk-3.1.3" // { - dependencies = [ - sources."hoek-2.16.3" - sources."boom-2.10.1" - sources."cryptiles-2.0.5" - sources."sntp-1.0.9" - ]; - }) - (sources."http-signature-1.1.1" // { - dependencies = [ - sources."assert-plus-0.2.0" - (sources."jsprim-1.4.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - sources."extsprintf-1.3.0" - sources."json-schema-0.2.3" - (sources."verror-1.10.0" // { - dependencies = [ - sources."core-util-is-1.0.2" - ]; - }) - ]; - }) - (sources."sshpk-1.13.1" // { - dependencies = [ - sources."asn1-0.2.3" - sources."assert-plus-1.0.0" - sources."dashdash-1.14.1" - sources."getpass-0.1.7" - sources."jsbn-0.1.1" - sources."tweetnacl-0.14.5" - sources."ecc-jsbn-0.1.1" - sources."bcrypt-pbkdf-1.0.1" - ]; - }) - ]; - }) - sources."is-typedarray-1.0.0" - sources."isstream-0.1.2" - sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.17" // { - dependencies = [ - sources."mime-db-1.30.0" - ]; - }) - sources."oauth-sign-0.8.2" - sources."qs-6.3.2" - sources."stringstream-0.0.5" - (sources."tough-cookie-2.3.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) - sources."tunnel-agent-0.4.3" - sources."uuid-3.1.0" - ]; - }) - sources."semver-5.3.0" - sources."sprintf-0.1.5" - (sources."temp-0.8.3" // { - dependencies = [ - sources."os-tmpdir-1.0.2" - sources."rimraf-2.2.8" - ]; - }) - (sources."winston-1.1.2" // { - dependencies = [ - sources."async-1.0.0" - sources."colors-1.0.3" - sources."cycle-1.0.3" - sources."eyes-0.1.8" - sources."isstream-0.1.2" - sources."pkginfo-0.3.1" - sources."stack-trace-0.0.10" - ]; - }) - (sources."fs-extra-2.1.2" // { - dependencies = [ - sources."graceful-fs-4.1.11" - sources."jsonfile-2.4.0" - ]; - }) - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Appcelerator Titanium Command line"; - homepage = "https://github.com/appcelerator/titanium#readme"; - license = "Apache-2.0"; - }; - production = true; - bypassCache = false; - }; } \ No newline at end of file diff --git a/pkgs/development/node-packages/node-packages-v6.json b/pkgs/development/node-packages/node-packages-v6.json index 8f9e923fe2b..ae70c54f2c0 100644 --- a/pkgs/development/node-packages/node-packages-v6.json +++ b/pkgs/development/node-packages/node-packages-v6.json @@ -91,6 +91,7 @@ , "stylus" , "svgo" , "tern" +, "titanium" , "typescript" , "typings" , "uglify-js" diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix index 325ad4ce28e..138cbed81af 100644 --- a/pkgs/development/node-packages/node-packages-v6.nix +++ b/pkgs/development/node-packages/node-packages-v6.nix @@ -130,6 +130,15 @@ let sha1 = "3cf436dcc9f3477ef3d7fa55a5bdf6d893f1c6c6"; }; }; + "lodash-4.17.4" = { + name = "lodash"; + packageName = "lodash"; + version = "4.17.4"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz"; + sha1 = "78203a4d1c328ae1d86dca6460e369b57f4055ae"; + }; + }; "moment-2.17.1" = { name = "moment"; packageName = "moment"; @@ -202,15 +211,6 @@ let sha1 = "631fc07776efd84118bf25171b37ed4d075a0abc"; }; }; - "lodash-4.17.4" = { - name = "lodash"; - packageName = "lodash"; - version = "4.17.4"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz"; - sha1 = "78203a4d1c328ae1d86dca6460e369b57f4055ae"; - }; - }; "babel-code-frame-6.26.0" = { name = "babel-code-frame"; packageName = "babel-code-frame"; @@ -2137,13 +2137,13 @@ let sha512 = "2dfmfxr3xagmds2agz7g6rnj1s9lh29fgfwxbqsfpkkabh3qhcc7sznkaviilpzr59fks1401wy6sh9xyy3wsaqbm975vm5b2bj6cwf"; }; }; - "ms-rest-azure-2.4.5" = { + "ms-rest-azure-2.5.0" = { name = "ms-rest-azure"; packageName = "ms-rest-azure"; - version = "2.4.5"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-2.4.5.tgz"; - sha512 = "17n7vax0wim6r3x51vaib4yblfkm791vv1awqs6p16y3zbfxdhgk1sks1iw2519187mmw4njnrja6kxvms4ly8l8qf481qh87xnia1v"; + url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-2.5.0.tgz"; + sha512 = "22v7h9wa04laz1v40rq0wx3az880flfhz6xzjgk5pny3674kar5c0vj0ww1rjbsi891j9hvxvk9v51dykivirfjh5srqrjfmswzk3fw"; }; }; "node-forge-0.6.23" = { @@ -2704,13 +2704,13 @@ let sha1 = "0e3c4f24a3f052b231b12d5049085a0a099be782"; }; }; - "@types/node-8.5.2" = { + "@types/node-8.5.5" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "8.5.2"; + version = "8.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-8.5.2.tgz"; - sha512 = "1amd3742m7s65mqdd5fl3p0bxwl95rp916lsv46wf9m24w0nz2sfq7rc5lv0bvxslarhh660p3aqq5zc9c0k7kx23m7lpk0x8l0c3i8"; + url = "https://registry.npmjs.org/@types/node/-/node-8.5.5.tgz"; + sha512 = "2w96jm9hd4hlx65a5rmlxj7il0xi7ag42xhzh12c0his0rknfbfckw4zmakp9nyf9ipjd6wdf81vskh3yswbjl5k0jq35qb3nidy695"; }; }; "@types/request-2.0.9" = { @@ -3991,13 +3991,13 @@ let sha1 = "a52e1d138024c00b86b1c0c91f677918b8ae0a59"; }; }; - "module-deps-4.1.1" = { + "module-deps-5.0.0" = { name = "module-deps"; packageName = "module-deps"; - version = "4.1.1"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/module-deps/-/module-deps-4.1.1.tgz"; - sha1 = "23215833f1da13fd606ccb8087b44852dcb821fd"; + url = "https://registry.npmjs.org/module-deps/-/module-deps-5.0.0.tgz"; + sha512 = "23j70bns7rjajz5185sx3dvdrfws07cd5f6d807v579wl41bdjzj9d08v546c2q3bpqixqr2512mb4vl9bmz9n8xcs2bljs1282p3nd"; }; }; "os-browserify-0.3.0" = { @@ -4576,13 +4576,13 @@ let sha1 = "1b63be438a133e4b671cc1935197600175910d83"; }; }; - "detective-4.7.1" = { + "detective-5.0.1" = { name = "detective"; packageName = "detective"; - version = "4.7.1"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/detective/-/detective-4.7.1.tgz"; - sha512 = "259c687nsmq5ni5q79081s6lpd2srwn7xlwipxwbrqkq9bq0zsvwb0n1d99jc7c6kvpm95bhvvlncfb0l4hqy6vnlb5lrhwwmwyd8qz"; + url = "https://registry.npmjs.org/detective/-/detective-5.0.1.tgz"; + sha512 = "2k9749gg0b2s1mbys20ss7w9l6ln1vkd42j3yzww4pj1bfaq9rmf2pnib9hbabqgkzfxixrzxr6qj5j5c970hm81n896iq2iv6grzbl"; }; }; "stream-combiner2-1.1.1" = { @@ -4594,13 +4594,22 @@ let sha1 = "fb4d8a1420ea362764e21ad4780397bebcb41cbe"; }; }; - "acorn-5.2.1" = { + "acorn-5.3.0" = { name = "acorn"; packageName = "acorn"; - version = "5.2.1"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-5.2.1.tgz"; - sha512 = "3ryzhy30vzfnn2a0crafh3qsrx145ali8i88q1bc0lzl1dz0ycmjmmwh2yn9xfjs3vmjxl7nphpwcs4imgz3da5jb8fvjqbrvnjwvcc"; + url = "https://registry.npmjs.org/acorn/-/acorn-5.3.0.tgz"; + sha512 = "197zp88clmmxjyvhahqv32kv07q825hf87facxaq8qmvb1swfqnpyy4398dl56sr2fa44f7gjpzzlwy1szqzwww6746y3kmwb6gxs31"; + }; + }; + "acorn5-object-spread-5.0.0" = { + name = "acorn5-object-spread"; + packageName = "acorn5-object-spread"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn5-object-spread/-/acorn5-object-spread-5.0.0.tgz"; + sha1 = "922755b4e9dfda581e2664f177dc921804d2c1d4"; }; }; "path-platform-0.11.15" = { @@ -5440,13 +5449,13 @@ let sha1 = "9427bb96ff1263cc10a8414cedd51a18b919e8b3"; }; }; - "rusha-0.8.9" = { + "rusha-0.8.11" = { name = "rusha"; packageName = "rusha"; - version = "0.8.9"; + version = "0.8.11"; src = fetchurl { - url = "https://registry.npmjs.org/rusha/-/rusha-0.8.9.tgz"; - sha1 = "77bd0951608bf81cedb948cec9c44d8ce5662219"; + url = "https://registry.npmjs.org/rusha/-/rusha-0.8.11.tgz"; + sha1 = "caa8963b1dbfd229d90626dd3f2a784430d6058d"; }; }; "decompress-response-3.3.0" = { @@ -7195,6 +7204,15 @@ let sha1 = "bb35f8a519f600e0fa6b8485241c979d0141fb2d"; }; }; + "module-deps-4.1.1" = { + name = "module-deps"; + packageName = "module-deps"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/module-deps/-/module-deps-4.1.1.tgz"; + sha1 = "23215833f1da13fd606ccb8087b44852dcb821fd"; + }; + }; "os-browserify-0.1.2" = { name = "os-browserify"; packageName = "os-browserify"; @@ -7213,6 +7231,15 @@ let sha1 = "f3f7522f4ef782348da8161bad9ecfd51bf83a75"; }; }; + "detective-4.7.1" = { + name = "detective"; + packageName = "detective"; + version = "4.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/detective/-/detective-4.7.1.tgz"; + sha512 = "259c687nsmq5ni5q79081s6lpd2srwn7xlwipxwbrqkq9bq0zsvwb0n1d99jc7c6kvpm95bhvvlncfb0l4hqy6vnlb5lrhwwmwyd8qz"; + }; + }; "compression-1.7.1" = { name = "compression"; packageName = "compression"; @@ -9409,13 +9436,13 @@ let sha1 = "9a8eac8ff79866f3f9b4bb1443ca778f1598aeda"; }; }; - "sorted-array-functions-1.0.0" = { + "sorted-array-functions-1.1.0" = { name = "sorted-array-functions"; packageName = "sorted-array-functions"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/sorted-array-functions/-/sorted-array-functions-1.0.0.tgz"; - sha1 = "c0b554d9e709affcbe56d34c1b2514197fd38279"; + url = "https://registry.npmjs.org/sorted-array-functions/-/sorted-array-functions-1.1.0.tgz"; + sha512 = "209rl01n6lwbsxl40lmh1v38sad3d94s0mjb4mz6r3wwwhzcahibr8m2fhlqgsjgzf3dja9wyhz7qjkw39gxlwpapyid2whs4nrzbnf"; }; }; "hypercore-6.11.0" = { @@ -9571,13 +9598,13 @@ let sha512 = "1dqdzm0qjk1rwq62b010b649wdpvlzdxpmwc972p0dcwsc86wqfcm8lbdcxlrwypkn2jq5df1xpbxhxfphnpr993ac543p9s212si30"; }; }; - "sodium-native-2.1.2" = { + "sodium-native-2.1.4" = { name = "sodium-native"; packageName = "sodium-native"; - version = "2.1.2"; + version = "2.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/sodium-native/-/sodium-native-2.1.2.tgz"; - sha512 = "3rkm9fyndric0yxx4qsrxmj1wbz7q4ixm6735jlsvkyi8gvibszsc017660p4gdypcikwbzfyvcxl1bpjwnbcd60gbri5xnxqd1m0yl"; + url = "https://registry.npmjs.org/sodium-native/-/sodium-native-2.1.4.tgz"; + sha512 = "3d3bbjycbpplxgjpfz78vqr8g8hp62j37hr4c3vym7ax36qzxqan73fmqw2i3wd8ix65ysdlzbnzhrs3634ngp840gfpmm9alarc80j"; }; }; "blake2b-2.1.2" = { @@ -10997,13 +11024,13 @@ let sha1 = "cac328f7bee45730d404b692203fcb590e172d5e"; }; }; - "aws-sdk-2.173.0" = { + "aws-sdk-2.176.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.173.0"; + version = "2.176.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.173.0.tgz"; - sha1 = "2b29486f16e1d04159d0513aa47f5dd70370116d"; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.176.0.tgz"; + sha1 = "2723c14e1c623ac45c5b890a3fc736eee8085f67"; }; }; "buffer-4.9.1" = { @@ -11303,13 +11330,13 @@ let sha512 = "2pq14hxz6w4k5yvndrm1fv3iyscdqf5c4nja421gl2661didzh80r08zddd84zny94831qs44biamjhvwmqh40pfy3pjv3vwl2ap8np"; }; }; - "conf-1.3.1" = { + "conf-1.4.0" = { name = "conf"; packageName = "conf"; - version = "1.3.1"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/conf/-/conf-1.3.1.tgz"; - sha512 = "0s33rz07rq4r5kf3bgza6gz4157ph97cm2dh8ws0mj7b924prjaqwbsnljx61pvzkl3db82z51i2k41dpg0hqw6srhkx9qx4nb1yrs8"; + url = "https://registry.npmjs.org/conf/-/conf-1.4.0.tgz"; + sha512 = "07g80zfanxf96as7ikxbv6csskj2033zw2hj8jpii0s3wqxjyq1x73fk1bqnj833clsmmiz6khcvid668gji5vsnhgb67ck5mcmafbg"; }; }; "got-7.1.0" = { @@ -11564,13 +11591,22 @@ let sha1 = "ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"; }; }; - "p-limit-1.1.0" = { + "p-limit-1.2.0" = { name = "p-limit"; packageName = "p-limit"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/p-limit/-/p-limit-1.1.0.tgz"; - sha1 = "b07ff2d9a5d88bec806035895a2bab66a27988bc"; + url = "https://registry.npmjs.org/p-limit/-/p-limit-1.2.0.tgz"; + sha512 = "2g0r6r6bbcdp6lrxbj2zbcihr1byd55kycm1ijz80l2zvmcvhqsbd7rhmfqylp004d61fibvmwzk4ig89dbyk4azpwgll7dllhsvwv3"; + }; + }; + "p-try-1.0.0" = { + name = "p-try"; + packageName = "p-try"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz"; + sha1 = "cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"; }; }; "duplexer3-0.1.4" = { @@ -11924,6 +11960,15 @@ let sha1 = "3d63c3edfda02e06e01a452ad88caacc7cdcb6e8"; }; }; + "eslint-visitor-keys-1.0.0" = { + name = "eslint-visitor-keys"; + packageName = "eslint-visitor-keys"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz"; + sha512 = "02hr99x8cnc80p9hn5si7mngqpzvvjkxmdv8sch68z0qpqwjdlx3j1w6d9rhr6wgcnqf1mrxyji8wvfddbf7xr13z2nzihv29gvyfdb"; + }; + }; "espree-3.5.2" = { name = "espree"; packageName = "espree"; @@ -11942,15 +11987,6 @@ let sha1 = "cfba8b57d7fba93f17298a8a006a04cda13d80fa"; }; }; - "estraverse-4.2.0" = { - name = "estraverse"; - packageName = "estraverse"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz"; - sha1 = "0dee3fed31fcd469618ce7342099fc1afa0bdb13"; - }; - }; "file-entry-cache-2.0.0" = { name = "file-entry-cache"; packageName = "file-entry-cache"; @@ -12113,6 +12149,15 @@ let sha1 = "fa9568d98d3823f9a41d91e902dcab9ea6e5b163"; }; }; + "estraverse-4.2.0" = { + name = "estraverse"; + packageName = "estraverse"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz"; + sha1 = "0dee3fed31fcd469618ce7342099fc1afa0bdb13"; + }; + }; "acorn-jsx-3.0.1" = { name = "acorn-jsx"; packageName = "acorn-jsx"; @@ -12401,13 +12446,13 @@ let sha1 = "617997fc5f60576894c435f940d819e135b80762"; }; }; - "eslint-4.13.1" = { + "eslint-4.14.0" = { name = "eslint"; packageName = "eslint"; - version = "4.13.1"; + version = "4.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-4.13.1.tgz"; - sha512 = "1zhzyi5ajjmgx37845pnkkvq366jzpnfsq3q52ai98xg3jmf813yrf919r28j7gh3irnm921r553yrh0aghsx8srkcb3d0ikmbma8jh"; + url = "https://registry.npmjs.org/eslint/-/eslint-4.14.0.tgz"; + sha512 = "0jh5cxqg5w7zah8hra5wmm25nyky09lb7i8dbxpchhv2hj9q0ym3kn7wqw72g73sj1l6k6vv5fkdfmkim3zq5qdr82cfak3ci484pjj"; }; }; "supports-color-3.2.3" = { @@ -12464,13 +12509,13 @@ let sha512 = "3sy4za4hd6lczig5ah6ksh92i4ds0pk9b8nn4nwjwpsyyabywrnayf78zh41jf7amm6khqyjb3iknbp2mc3nfgvpkvphj3a993py6hf"; }; }; - "es6-promise-4.1.1" = { + "es6-promise-4.2.2" = { name = "es6-promise"; packageName = "es6-promise"; - version = "4.1.1"; + version = "4.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/es6-promise/-/es6-promise-4.1.1.tgz"; - sha512 = "2g2gkw8cxy2lww5lqjbv0imkxkhy684pagbq4qaw6np46xcx1r6rbkg7qy4wjv12b7jy7zs208iilim7clc9v6ws2dzy9g0g223b99r"; + url = "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.2.tgz"; + sha512 = "18ny66ql485risswmzx8r66ys0p4p48nznksxc407mgc36dc06212xd7pzb5mwcs0idzjzbhljw17v34h5gfps7khwa80rfzgkaq9id"; }; }; "extract-zip-1.6.6" = { @@ -13662,13 +13707,13 @@ let sha512 = "0xgsjz9m3kg5pm36lcchblxk53qay59ya7wi5jgdmz0dsl5b0j2j7wcd48yyfaip1m70mj9aqf8kib02fn62k0hy0vxg2hng60yk4w7"; }; }; - "object.map-1.0.0" = { + "object.map-1.0.1" = { name = "object.map"; packageName = "object.map"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/object.map/-/object.map-1.0.0.tgz"; - sha1 = "92aef871cd6dcbced31fe29c0921db8395624597"; + url = "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz"; + sha1 = "cf83e59dc8fcc0ad5f4250e1f78b3b81bd801d37"; }; }; "detect-file-1.0.0" = { @@ -13761,13 +13806,13 @@ let sha1 = "51af7d614ad9a9f610ea1bafbb989d6b1c56890f"; }; }; - "extglob-2.0.2" = { + "extglob-2.0.3" = { name = "extglob"; packageName = "extglob"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/extglob/-/extglob-2.0.2.tgz"; - sha512 = "3bi96hlw84salahixd3vvyzzx1riqlfnrf44qnlhl46yqpl5rad97halvj3vybzvh970jyk50lagp9qys69qhayy25m337y25j9wkr3"; + url = "https://registry.npmjs.org/extglob/-/extglob-2.0.3.tgz"; + sha512 = "31zb5fc59ps76hnxlnrcmm3lkv4pjd3cw55h5h7r9pn1q259bs15hw0bn4gp8kn91qwabgbj0cwkx9pxp8fgsj3ljlvmfv0xijnsah3"; }; }; "fragment-cache-0.2.1" = { @@ -13914,40 +13959,31 @@ let sha512 = "0w73qlx9ynmv2iznw1kll86yd04z4rsz3788nzgh7amcnpsbyxbrs734im9dibqgps6pjyz61s8kp4lcsbjsdfrlc51m1pm2hrxgfba"; }; }; - "is-descriptor-1.0.1" = { + "is-descriptor-1.0.2" = { name = "is-descriptor"; packageName = "is-descriptor"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.1.tgz"; - sha512 = "1s669mqvckcwsqrnni08lac1anx00q82rkfplnq6zl9inaqzlq8n9ln8j8m49a9gaxjrwgkl8wjw4188whbj65yxspalzgaaiacaxqv"; + url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz"; + sha512 = "2v1a9mn2rzz52v8vs3i7njk9pv95fh971yc81xr0zkaw3dff4gbv1zv048xyjysfgwpajbyryk2px8hinwwh0wagblmw6chdbjsrs6r"; }; }; - "is-accessor-descriptor-0.1.6" = { + "is-accessor-descriptor-1.0.0" = { name = "is-accessor-descriptor"; packageName = "is-accessor-descriptor"; - version = "0.1.6"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz"; - sha1 = "a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"; + url = "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz"; + sha512 = "1qllik6fjwfq17ic0fxwqyll8mrhmcm36xfsq45xc57mq9ah4i4nn4f8fvgb0gx4kpl3jlpkzndp0xlmmf2mh0xmggw6mhw74fng64v"; }; }; - "is-data-descriptor-0.1.4" = { + "is-data-descriptor-1.0.0" = { name = "is-data-descriptor"; packageName = "is-data-descriptor"; - version = "0.1.4"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz"; - sha1 = "0b5ee648388e2c860282e793f1856fec3f301b56"; - }; - }; - "kind-of-5.1.0" = { - name = "kind-of"; - packageName = "kind-of"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz"; - sha512 = "0zk87sccrjx6pgf9n74v4msnqwq5siyhrkpaklx7yk85ygy5ypcgmyfhbd5mmcyd53x8zcw0gzvp9bhbglziqbhp7a6n5zsf6p08q9l"; + url = "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz"; + sha512 = "0ny6kxc752fg3z6fmj8a7fw2lai2y17d9fx0028nvyv1qj0sa30rfryhv9xd7b7is1yfs0val6amsy2b22rh589il10md36a75mgd4d"; }; }; "expand-brackets-2.1.4" = { @@ -13986,6 +14022,33 @@ let sha512 = "0gbflcxmd30gzj91y19fylsfalirl6qg71sxjximc8lc2vxkg5h9scnahvxsczymchlx742i8ai489843ys431vyw73rp418jpxiw3a"; }; }; + "is-accessor-descriptor-0.1.6" = { + name = "is-accessor-descriptor"; + packageName = "is-accessor-descriptor"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz"; + sha1 = "a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"; + }; + }; + "is-data-descriptor-0.1.4" = { + name = "is-data-descriptor"; + packageName = "is-data-descriptor"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz"; + sha1 = "0b5ee648388e2c860282e793f1856fec3f301b56"; + }; + }; + "kind-of-5.1.0" = { + name = "kind-of"; + packageName = "kind-of"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz"; + sha512 = "0zk87sccrjx6pgf9n74v4msnqwq5siyhrkpaklx7yk85ygy5ypcgmyfhbd5mmcyd53x8zcw0gzvp9bhbglziqbhp7a6n5zsf6p08q9l"; + }; + }; "map-cache-0.2.2" = { name = "map-cache"; packageName = "map-cache"; @@ -14850,13 +14913,13 @@ let sha1 = "54dbf377e51440aca90a4cd274600d3ff2d888a9"; }; }; - "uglify-js-3.2.2" = { + "uglify-js-3.3.4" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.2.2"; + version = "3.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.2.2.tgz"; - sha512 = "22ibn4zyyrqi1gxr94xs4kaq1y402sxwp68z9w87r4g66wgkashr3fvgrp19w01aidqma2jgmghz5283rkj00x7gxb4f86rzhxlvvgv"; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.4.tgz"; + sha512 = "2xnm5j27ds49pw0jxr30vj79ib0l0g4sbpdy7l3jvcjxdrwy0g4g8w9h69fk7fr45bs0mm9xj9pv0d1jvcva53x7xbxkr880jw31wl5"; }; }; "xml-char-classes-1.0.0" = { @@ -15237,13 +15300,13 @@ let sha1 = "e2a75042a9551908bebd25b8523d5f9769d79181"; }; }; - "fs-minipass-1.2.3" = { + "fs-minipass-1.2.5" = { name = "fs-minipass"; packageName = "fs-minipass"; - version = "1.2.3"; + version = "1.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.3.tgz"; - sha512 = "3jin38c3wsayawcxqs83qk9072fxypi41y16zhkak9l0fxsn92d4cgbw5s4rwaf69n9ix8sarpsychdhy3vi0nfghjj3y7if04lfnmv"; + url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.5.tgz"; + sha512 = "2hpc9wbzrndi5bswg9q9hwxmg4yd99zbvssxnz6g04clj68qhd8c83zn282v3q7f9h1xi7c4lmnn341nlgfpwby2k14738pr796a416"; }; }; "minipass-2.2.1" = { @@ -15498,13 +15561,13 @@ let sha1 = "40d278beea417660a35dd9d3ee76511ffa911dcd"; }; }; - "rxjs-5.5.5" = { + "rxjs-5.5.6" = { name = "rxjs"; packageName = "rxjs"; - version = "5.5.5"; + version = "5.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/rxjs/-/rxjs-5.5.5.tgz"; - sha512 = "3j1cki70sa6rg0klw9jlz0k20a0mj44f2p91ayqrng42kqa65nci3519x2gvzy4a3fnxwdrq42rdrljq8dipw07y87ly1ncfd11zwqg"; + url = "https://registry.npmjs.org/rxjs/-/rxjs-5.5.6.tgz"; + sha512 = "293yj2n5f5bj8b8y9czwgm5l3bqa0g3bbghnxsxwdpiz6s2mxiw6a79w3sqq3c1by3avmb5bgk8xgi0yss5y09pxw87055l60f3k15z"; }; }; "semaphore-async-await-1.5.1" = { @@ -15777,13 +15840,13 @@ let sha1 = "59c128e0dc5ce410201151194eeb9cbf858650f6"; }; }; - "marked-0.3.7" = { + "marked-0.3.9" = { name = "marked"; packageName = "marked"; - version = "0.3.7"; + version = "0.3.9"; src = fetchurl { - url = "https://registry.npmjs.org/marked/-/marked-0.3.7.tgz"; - sha512 = "2yx1jx6vzjxzhhq2qcsrh0300d452bdl8pvsj0w1ajsxhcqvsba8mmx1lawxx025mzqbvwp5pvay8sff0pg3vbid5whlqdmlgi0y4fc"; + url = "https://registry.npmjs.org/marked/-/marked-0.3.9.tgz"; + sha512 = "0pwzm37c83y03v5kd0py5nd7bfzm8h07ibq73j6kx2sjyj62p9c3swp9nk64nb4w67gdq4i5xp05673k3vsxwvwj3gi2pv9vk8nwvlx"; }; }; "requizzle-0.2.1" = { @@ -15867,13 +15930,22 @@ let sha1 = "71789b3b7f5399bec8565dda38aa30d2a097efee"; }; }; - "graphlib-2.1.1" = { + "commander-2.11.0" = { + name = "commander"; + packageName = "commander"; + version = "2.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz"; + sha512 = "2yi2hwf0bghfnv1fdgd4wvh7s0acjrgqbgww97ncm6i6s6ffs1zahnj48f6gqpqj6fsf0jigvnr0civ25k2160c38281r80wvg7jkkg"; + }; + }; + "graphlib-2.1.5" = { name = "graphlib"; packageName = "graphlib"; - version = "2.1.1"; + version = "2.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/graphlib/-/graphlib-2.1.1.tgz"; - sha1 = "42352c52ba2f4d035cb566eb91f7395f76ebc951"; + url = "https://registry.npmjs.org/graphlib/-/graphlib-2.1.5.tgz"; + sha512 = "0w1lx3hms5mx84mlxsgpvjr42qba17wwqhma0np67c9l8smkd2nwx7gr8724a2q1z7x0hjdjnwzx81893mj2ax498wl7y1h4yl5pysy"; }; }; "native-promise-only-0.8.1" = { @@ -16020,13 +16092,13 @@ let sha1 = "4e8827a6bb915140ab093559d7014e3ebb837451"; }; }; - "yargs-10.0.3" = { + "yargs-10.1.0" = { name = "yargs"; packageName = "yargs"; - version = "10.0.3"; + version = "10.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-10.0.3.tgz"; - sha512 = "1vn6jsqrhybxddyhmvkh0d43n2lk1z8081glfq80zpjfs4xgwpk0mmgdiry9zgsihmv9a2qidmp5hhyqqq8mzzkr037wla0qd1nk80f"; + url = "https://registry.npmjs.org/yargs/-/yargs-10.1.0.tgz"; + sha512 = "0p5nja16hrpl08hyknccxdazyhaj2ha6gzzf2ab0f7w42brq3ms3bn8yhlkqx9x30x3pi0fhxxmqnal224mr5m1ag049v0lg8binykm"; }; }; "path-to-regexp-1.7.0" = { @@ -16254,13 +16326,13 @@ let sha1 = "4a6fa07399c26bba47f0b2496b4d0fb408c5550d"; }; }; - "cliui-3.2.0" = { + "cliui-4.0.0" = { name = "cliui"; packageName = "cliui"; - version = "3.2.0"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz"; - sha1 = "120601537a916d29940f934da3b48d585a39213d"; + url = "https://registry.npmjs.org/cliui/-/cliui-4.0.0.tgz"; + sha512 = "0mh539939k4z2nhj5h1m8kdr3bfy2f1kmdkss02cdbyabmpdkc6m22llyykymriahf54gpx6qg9v3vrs51gqgrrfhpsgbdndgjdd3cx"; }; }; "get-caller-file-1.0.2" = { @@ -16362,6 +16434,15 @@ let sha1 = "104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"; }; }; + "browserify-14.5.0" = { + name = "browserify"; + packageName = "browserify"; + version = "14.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/browserify/-/browserify-14.5.0.tgz"; + sha512 = "3p941rcrmn44115ylbnq53sdsnfm08rlvckdbkrnxvl00ibis5sxyhgrx33vm8sfyb5vgbk8x4b0fv3vwirvd7frwbdmzigsjqcx9w0"; + }; + }; "combine-lists-1.0.1" = { name = "combine-lists"; packageName = "combine-lists"; @@ -16416,13 +16497,13 @@ let sha1 = "4a3e974ec0cba9004d3fc6cde7209ea69368a621"; }; }; - "log4js-0.6.38" = { + "log4js-2.4.1" = { name = "log4js"; packageName = "log4js"; - version = "0.6.38"; + version = "2.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/log4js/-/log4js-0.6.38.tgz"; - sha1 = "2c494116695d6fb25480943d3fc872e662a522fd"; + url = "https://registry.npmjs.org/log4js/-/log4js-2.4.1.tgz"; + sha512 = "3xd40iy8j9s89j8hy5jr11v377rfcv0293p986r9i4rq0syypl1vv7rk8al99pqkhi3wdf2hs5ik9xg7fgh53cdzazcmz0lqm7lb20s"; }; }; "qjobs-1.1.5" = { @@ -16434,13 +16515,13 @@ let sha1 = "659de9f2cf8dcc27a1481276f205377272382e73"; }; }; - "socket.io-1.7.3" = { + "socket.io-2.0.4" = { name = "socket.io"; packageName = "socket.io"; - version = "1.7.3"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io/-/socket.io-1.7.3.tgz"; - sha1 = "b8af9caba00949e568e369f1327ea9be9ea2461b"; + url = "https://registry.npmjs.org/socket.io/-/socket.io-2.0.4.tgz"; + sha1 = "c1a4590ceff87ecf13c72652f046f716b29e6014"; }; }; "useragent-2.2.1" = { @@ -16524,76 +16605,634 @@ let sha1 = "c7a8d3236068362059a7e4651fc6884e8b1fb4ae"; }; }; - "debug-2.3.3" = { + "circular-json-0.4.0" = { + name = "circular-json"; + packageName = "circular-json"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/circular-json/-/circular-json-0.4.0.tgz"; + sha512 = "2iz1fwlb43dgp5bjapmlbqzanpss2r3z2db7y26drfw4nxfzbay2yjc13pxf6y3r2i5s2kbja6a05x21ra0ffmvvxcnz0h3c39pk9dl"; + }; + }; + "date-format-1.2.0" = { + name = "date-format"; + packageName = "date-format"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/date-format/-/date-format-1.2.0.tgz"; + sha1 = "615e828e233dd1ab9bb9ae0950e0ceccfa6ecad8"; + }; + }; + "streamroller-0.7.0" = { + name = "streamroller"; + packageName = "streamroller"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/streamroller/-/streamroller-0.7.0.tgz"; + sha512 = "26pp7m15rrddwfr1w83nhrws5k82ld1l8njiqvhm43vckr0zszhhb8jwps2bhzylfp7xmb8p2kr86y1g97knikrlwm3blrb5mzk64ar"; + }; + }; + "hipchat-notifier-1.1.0" = { + name = "hipchat-notifier"; + packageName = "hipchat-notifier"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hipchat-notifier/-/hipchat-notifier-1.1.0.tgz"; + sha1 = "b6d249755437c191082367799d3ba9a0f23b231e"; + }; + }; + "loggly-1.1.1" = { + name = "loggly"; + packageName = "loggly"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/loggly/-/loggly-1.1.1.tgz"; + sha1 = "0a0fc1d3fa3a5ec44fdc7b897beba2a4695cebee"; + }; + }; + "mailgun-js-0.7.15" = { + name = "mailgun-js"; + packageName = "mailgun-js"; + version = "0.7.15"; + src = fetchurl { + url = "https://registry.npmjs.org/mailgun-js/-/mailgun-js-0.7.15.tgz"; + sha1 = "ee366a20dac64c3c15c03d6c1b3e0ed795252abb"; + }; + }; + "nodemailer-2.7.2" = { + name = "nodemailer"; + packageName = "nodemailer"; + version = "2.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/nodemailer/-/nodemailer-2.7.2.tgz"; + sha1 = "f242e649aeeae39b6c7ed740ef7b061c404d30f9"; + }; + }; + "redis-2.8.0" = { + name = "redis"; + packageName = "redis"; + version = "2.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/redis/-/redis-2.8.0.tgz"; + sha512 = "3a3044ax6qdvss83xgjfx10h5q91ls0mwgs3wpsnxcdsiipq3cnmqzsh6glyq0r7vsmpw49jp84c2jnfrhi2bgycrkd9hhhf6ia8lrk"; + }; + }; + "slack-node-0.2.0" = { + name = "slack-node"; + packageName = "slack-node"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/slack-node/-/slack-node-0.2.0.tgz"; + sha1 = "de4b8dddaa8b793f61dbd2938104fdabf37dfa30"; + }; + }; + "axios-0.15.3" = { + name = "axios"; + packageName = "axios"; + version = "0.15.3"; + src = fetchurl { + url = "https://registry.npmjs.org/axios/-/axios-0.15.3.tgz"; + sha1 = "2c9d638b2e191a08ea1d6cc988eadd6ba5bdc053"; + }; + }; + "request-2.75.0" = { + name = "request"; + packageName = "request"; + version = "2.75.0"; + src = fetchurl { + url = "https://registry.npmjs.org/request/-/request-2.75.0.tgz"; + sha1 = "d2b8268a286da13eaa5d01adf5d18cc90f657d93"; + }; + }; + "form-data-2.0.0" = { + name = "form-data"; + packageName = "form-data"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/form-data/-/form-data-2.0.0.tgz"; + sha1 = "6f0aebadcc5da16c13e1ecc11137d85f9b883b25"; + }; + }; + "async-2.1.5" = { + name = "async"; + packageName = "async"; + version = "2.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-2.1.5.tgz"; + sha1 = "e587c68580994ac67fc56ff86d3ac56bdbe810bc"; + }; + }; + "debug-2.2.0" = { name = "debug"; packageName = "debug"; - version = "2.3.3"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz"; - sha1 = "40c453e67e6e13c901ddec317af8986cda9eff8c"; + url = "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz"; + sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da"; }; }; - "engine.io-1.8.3" = { - name = "engine.io"; - packageName = "engine.io"; - version = "1.8.3"; + "inflection-1.10.0" = { + name = "inflection"; + packageName = "inflection"; + version = "1.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io/-/engine.io-1.8.3.tgz"; - sha1 = "8de7f97895d20d39b85f88eeee777b2bd42b13d4"; + url = "https://registry.npmjs.org/inflection/-/inflection-1.10.0.tgz"; + sha1 = "5bffcb1197ad3e81050f8e17e21668087ee9eb2f"; }; }; - "has-binary-0.1.7" = { - name = "has-binary"; - packageName = "has-binary"; - version = "0.1.7"; + "path-proxy-1.0.0" = { + name = "path-proxy"; + packageName = "path-proxy"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/has-binary/-/has-binary-0.1.7.tgz"; - sha1 = "68e61eb16210c9545a0a5cce06a873912fe1e68c"; + url = "https://registry.npmjs.org/path-proxy/-/path-proxy-1.0.0.tgz"; + sha1 = "18e8a36859fc9d2f1a53b48dee138543c020de5e"; }; }; - "object-assign-4.1.0" = { - name = "object-assign"; - packageName = "object-assign"; - version = "4.1.0"; + "proxy-agent-2.0.0" = { + name = "proxy-agent"; + packageName = "proxy-agent"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz"; - sha1 = "7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0"; + url = "https://registry.npmjs.org/proxy-agent/-/proxy-agent-2.0.0.tgz"; + sha1 = "57eb5347aa805d74ec681cb25649dba39c933499"; }; }; - "socket.io-adapter-0.5.0" = { - name = "socket.io-adapter"; - packageName = "socket.io-adapter"; - version = "0.5.0"; + "tsscmp-1.0.5" = { + name = "tsscmp"; + packageName = "tsscmp"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.5.0.tgz"; - sha1 = "cb6d4bb8bec81e1078b99677f9ced0046066bb8b"; + url = "https://registry.npmjs.org/tsscmp/-/tsscmp-1.0.5.tgz"; + sha1 = "7dc4a33af71581ab4337da91d85ca5427ebd9a97"; }; }; - "socket.io-client-1.7.3" = { - name = "socket.io-client"; - packageName = "socket.io-client"; - version = "1.7.3"; - src = fetchurl { - url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.7.3.tgz"; - sha1 = "b30e86aa10d5ef3546601c09cde4765e381da377"; - }; - }; - "socket.io-parser-2.3.1" = { - name = "socket.io-parser"; - packageName = "socket.io-parser"; - version = "2.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.3.1.tgz"; - sha1 = "dd532025103ce429697326befd64005fcfe5b4a0"; - }; - }; - "ms-0.7.2" = { + "ms-0.7.1" = { name = "ms"; packageName = "ms"; - version = "0.7.2"; + version = "0.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz"; - sha1 = "ae25cf2512b3885a1d95d7f037868d8431124765"; + url = "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"; + sha1 = "9cd13c03adbff25b65effde7ce864ee952017098"; + }; + }; + "inflection-1.3.8" = { + name = "inflection"; + packageName = "inflection"; + version = "1.3.8"; + src = fetchurl { + url = "https://registry.npmjs.org/inflection/-/inflection-1.3.8.tgz"; + sha1 = "cbd160da9f75b14c3cc63578d4f396784bf3014e"; + }; + }; + "agent-base-2.1.1" = { + name = "agent-base"; + packageName = "agent-base"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/agent-base/-/agent-base-2.1.1.tgz"; + sha1 = "d6de10d5af6132d5bd692427d46fc538539094c7"; + }; + }; + "http-proxy-agent-1.0.0" = { + name = "http-proxy-agent"; + packageName = "http-proxy-agent"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-1.0.0.tgz"; + sha1 = "cc1ce38e453bf984a0f7702d2dd59c73d081284a"; + }; + }; + "https-proxy-agent-1.0.0" = { + name = "https-proxy-agent"; + packageName = "https-proxy-agent"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-1.0.0.tgz"; + sha1 = "35f7da6c48ce4ddbfa264891ac593ee5ff8671e6"; + }; + }; + "lru-cache-2.6.5" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "2.6.5"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.5.tgz"; + sha1 = "e56d6354148ede8d7707b58d143220fd08df0fd5"; + }; + }; + "pac-proxy-agent-1.1.0" = { + name = "pac-proxy-agent"; + packageName = "pac-proxy-agent"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-1.1.0.tgz"; + sha512 = "30jd44ckpmfj9prfhzc8bjvn5b5adxk93g9saif813id8mrvl3g1asrhz9l0bc2rp0i779wnhg1rjw80h2y7zk8v02ghq4bdh4hn4a0"; + }; + }; + "socks-proxy-agent-2.1.1" = { + name = "socks-proxy-agent"; + packageName = "socks-proxy-agent"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-2.1.1.tgz"; + sha512 = "33yfj0m61wn7g9s59m7mxhm6w91nkdrd7hcnnbacrj58zqgykpyr7f6lsggvc9xzysrf951ncxh4malqi11yf8z6909fasllxi6cnxh"; + }; + }; + "semver-5.0.3" = { + name = "semver"; + packageName = "semver"; + version = "5.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz"; + sha1 = "77466de589cd5d3c95f138aa78bc569a3cb5d27a"; + }; + }; + "get-uri-2.0.1" = { + name = "get-uri"; + packageName = "get-uri"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/get-uri/-/get-uri-2.0.1.tgz"; + sha512 = "10bm7v59d4pv7pk0smv9qwl8rp1iq60d20jdybycdpjqv85gdirf00kci8m5fz16gja9i5l60yxgiqzafj1195disavn21anrbab9zd"; + }; + }; + "pac-resolver-2.0.0" = { + name = "pac-resolver"; + packageName = "pac-resolver"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pac-resolver/-/pac-resolver-2.0.0.tgz"; + sha1 = "99b88d2f193fbdeefc1c9a529c1f3260ab5277cd"; + }; + }; + "data-uri-to-buffer-1.2.0" = { + name = "data-uri-to-buffer"; + packageName = "data-uri-to-buffer"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-1.2.0.tgz"; + sha512 = "18vh45y1sdi44vwca9js1hpy9mjwb641dwnc0fm9y2x3pgivzjndjksrlpk65kp5g99lsy2z2m8a4907bj11118c95m2dqg6h6kv95w"; + }; + }; + "ftp-0.3.10" = { + name = "ftp"; + packageName = "ftp"; + version = "0.3.10"; + src = fetchurl { + url = "https://registry.npmjs.org/ftp/-/ftp-0.3.10.tgz"; + sha1 = "9197d861ad8142f3e63d5a83bfe4c59f7330885d"; + }; + }; + "file-uri-to-path-1.0.0" = { + name = "file-uri-to-path"; + packageName = "file-uri-to-path"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz"; + sha512 = "0px1qliabg53lwfq4izc9vdll68sd08nlczi2ms5nvg7frm3y6zgy07vdvxywazab26jc723qpmh9a6h3bdp685iddzsmgvfarpx6yi"; + }; + }; + "xregexp-2.0.0" = { + name = "xregexp"; + packageName = "xregexp"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/xregexp/-/xregexp-2.0.0.tgz"; + sha1 = "52a63e56ca0b84a7f3a5f3d61872f126ad7a5943"; + }; + }; + "co-3.0.6" = { + name = "co"; + packageName = "co"; + version = "3.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/co/-/co-3.0.6.tgz"; + sha1 = "1445f226c5eb956138e68c9ac30167ea7d2e6bda"; + }; + }; + "degenerator-1.0.4" = { + name = "degenerator"; + packageName = "degenerator"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/degenerator/-/degenerator-1.0.4.tgz"; + sha1 = "fcf490a37ece266464d9cc431ab98c5819ced095"; + }; + }; + "thunkify-2.1.2" = { + name = "thunkify"; + packageName = "thunkify"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/thunkify/-/thunkify-2.1.2.tgz"; + sha1 = "faa0e9d230c51acc95ca13a361ac05ca7e04553d"; + }; + }; + "ip-1.0.1" = { + name = "ip"; + packageName = "ip"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ip/-/ip-1.0.1.tgz"; + sha1 = "c7e356cdea225ae71b36d70f2e71a92ba4e42590"; + }; + }; + "esprima-3.1.3" = { + name = "esprima"; + packageName = "esprima"; + version = "3.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz"; + sha1 = "fdca51cee6133895e3c88d535ce49dbff62a4633"; + }; + }; + "escodegen-1.9.0" = { + name = "escodegen"; + packageName = "escodegen"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/escodegen/-/escodegen-1.9.0.tgz"; + sha512 = "0il8dp1bh3n1am3xx5pazmpjb5m8wzdn9xg1lgh4j8axvsy8v24i1171c04qafx0j4xsaq76j29ljq2srf4i3kdl3qbrn9psjy1hhxz"; + }; + }; + "ast-types-0.10.1" = { + name = "ast-types"; + packageName = "ast-types"; + version = "0.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ast-types/-/ast-types-0.10.1.tgz"; + sha512 = "2wjsah372x6rjrrsq3bv915lccq4pjpyk4b0vb7kmc87ab5yjgac4rab0qclh6brhhyv95mbyy1k5sijfyx36676darz57k6gsgx3ji"; + }; + }; + "socks-1.1.10" = { + name = "socks"; + packageName = "socks"; + version = "1.1.10"; + src = fetchurl { + url = "https://registry.npmjs.org/socks/-/socks-1.1.10.tgz"; + sha1 = "5b8b7fc7c8f341c53ed056e929b7bf4de8ba7b5a"; + }; + }; + "smart-buffer-1.1.15" = { + name = "smart-buffer"; + packageName = "smart-buffer"; + version = "1.1.15"; + src = fetchurl { + url = "https://registry.npmjs.org/smart-buffer/-/smart-buffer-1.1.15.tgz"; + sha1 = "7f114b5b65fab3e2a35aa775bb12f0d1c649bf16"; + }; + }; + "libmime-3.0.0" = { + name = "libmime"; + packageName = "libmime"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/libmime/-/libmime-3.0.0.tgz"; + sha1 = "51a1a9e7448ecbd32cda54421675bb21bc093da6"; + }; + }; + "mailcomposer-4.0.1" = { + name = "mailcomposer"; + packageName = "mailcomposer"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mailcomposer/-/mailcomposer-4.0.1.tgz"; + sha1 = "0e1c44b2a07cf740ee17dc149ba009f19cadfeb4"; + }; + }; + "nodemailer-direct-transport-3.3.2" = { + name = "nodemailer-direct-transport"; + packageName = "nodemailer-direct-transport"; + version = "3.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/nodemailer-direct-transport/-/nodemailer-direct-transport-3.3.2.tgz"; + sha1 = "e96fafb90358560947e569017d97e60738a50a86"; + }; + }; + "nodemailer-shared-1.1.0" = { + name = "nodemailer-shared"; + packageName = "nodemailer-shared"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nodemailer-shared/-/nodemailer-shared-1.1.0.tgz"; + sha1 = "cf5994e2fd268d00f5cf0fa767a08169edb07ec0"; + }; + }; + "nodemailer-smtp-pool-2.8.2" = { + name = "nodemailer-smtp-pool"; + packageName = "nodemailer-smtp-pool"; + version = "2.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/nodemailer-smtp-pool/-/nodemailer-smtp-pool-2.8.2.tgz"; + sha1 = "2eb94d6cf85780b1b4725ce853b9cbd5e8da8c72"; + }; + }; + "nodemailer-smtp-transport-2.7.2" = { + name = "nodemailer-smtp-transport"; + packageName = "nodemailer-smtp-transport"; + version = "2.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/nodemailer-smtp-transport/-/nodemailer-smtp-transport-2.7.2.tgz"; + sha1 = "03d71c76314f14ac7dbc7bf033a6a6d16d67fb77"; + }; + }; + "socks-1.1.9" = { + name = "socks"; + packageName = "socks"; + version = "1.1.9"; + src = fetchurl { + url = "https://registry.npmjs.org/socks/-/socks-1.1.9.tgz"; + sha1 = "628d7e4d04912435445ac0b6e459376cb3e6d691"; + }; + }; + "iconv-lite-0.4.15" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.4.15"; + src = fetchurl { + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz"; + sha1 = "fe265a218ac6a57cfe854927e9d04c19825eddeb"; + }; + }; + "libbase64-0.1.0" = { + name = "libbase64"; + packageName = "libbase64"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/libbase64/-/libbase64-0.1.0.tgz"; + sha1 = "62351a839563ac5ff5bd26f12f60e9830bb751e6"; + }; + }; + "libqp-1.1.0" = { + name = "libqp"; + packageName = "libqp"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/libqp/-/libqp-1.1.0.tgz"; + sha1 = "f5e6e06ad74b794fb5b5b66988bf728ef1dedbe8"; + }; + }; + "buildmail-4.0.1" = { + name = "buildmail"; + packageName = "buildmail"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/buildmail/-/buildmail-4.0.1.tgz"; + sha1 = "877f7738b78729871c9a105e3b837d2be11a7a72"; + }; + }; + "addressparser-1.0.1" = { + name = "addressparser"; + packageName = "addressparser"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/addressparser/-/addressparser-1.0.1.tgz"; + sha1 = "47afbe1a2a9262191db6838e4fd1d39b40821746"; + }; + }; + "nodemailer-fetch-1.6.0" = { + name = "nodemailer-fetch"; + packageName = "nodemailer-fetch"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nodemailer-fetch/-/nodemailer-fetch-1.6.0.tgz"; + sha1 = "79c4908a1c0f5f375b73fe888da9828f6dc963a4"; + }; + }; + "smtp-connection-2.12.0" = { + name = "smtp-connection"; + packageName = "smtp-connection"; + version = "2.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/smtp-connection/-/smtp-connection-2.12.0.tgz"; + sha1 = "d76ef9127cb23c2259edb1e8349c2e8d5e2d74c1"; + }; + }; + "httpntlm-1.6.1" = { + name = "httpntlm"; + packageName = "httpntlm"; + version = "1.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/httpntlm/-/httpntlm-1.6.1.tgz"; + sha1 = "ad01527143a2e8773cfae6a96f58656bb52a34b2"; + }; + }; + "httpreq-0.4.24" = { + name = "httpreq"; + packageName = "httpreq"; + version = "0.4.24"; + src = fetchurl { + url = "https://registry.npmjs.org/httpreq/-/httpreq-0.4.24.tgz"; + sha1 = "4335ffd82cd969668a39465c929ac61d6393627f"; + }; + }; + "underscore-1.7.0" = { + name = "underscore"; + packageName = "underscore"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz"; + sha1 = "6bbaf0877500d36be34ecaa584e0db9fef035209"; + }; + }; + "nodemailer-wellknown-0.1.10" = { + name = "nodemailer-wellknown"; + packageName = "nodemailer-wellknown"; + version = "0.1.10"; + src = fetchurl { + url = "https://registry.npmjs.org/nodemailer-wellknown/-/nodemailer-wellknown-0.1.10.tgz"; + sha1 = "586db8101db30cb4438eb546737a41aad0cf13d5"; + }; + }; + "double-ended-queue-2.1.0-0" = { + name = "double-ended-queue"; + packageName = "double-ended-queue"; + version = "2.1.0-0"; + src = fetchurl { + url = "https://registry.npmjs.org/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz"; + sha1 = "103d3527fd31528f40188130c841efdd78264e5c"; + }; + }; + "redis-commands-1.3.1" = { + name = "redis-commands"; + packageName = "redis-commands"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/redis-commands/-/redis-commands-1.3.1.tgz"; + sha1 = "81d826f45fa9c8b2011f4cd7a0fe597d241d442b"; + }; + }; + "redis-parser-2.6.0" = { + name = "redis-parser"; + packageName = "redis-parser"; + version = "2.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/redis-parser/-/redis-parser-2.6.0.tgz"; + sha1 = "52ed09dacac108f1a631c07e9b69941e7a19504b"; + }; + }; + "requestretry-1.12.2" = { + name = "requestretry"; + packageName = "requestretry"; + version = "1.12.2"; + src = fetchurl { + url = "https://registry.npmjs.org/requestretry/-/requestretry-1.12.2.tgz"; + sha512 = "1gibp5f4n62642gyanvvyyskhzw5snx22d5wgy1ldcydbb605m83j863fb85jjyji2simmp9dy8b8rxm1axyvpawvnb5fm6i0gjfdn0"; + }; + }; + "when-3.7.8" = { + name = "when"; + packageName = "when"; + version = "3.7.8"; + src = fetchurl { + url = "https://registry.npmjs.org/when/-/when-3.7.8.tgz"; + sha1 = "c7130b6a7ea04693e842cdc9e7a1f2aa39a39f82"; + }; + }; + "follow-redirects-1.0.0" = { + name = "follow-redirects"; + packageName = "follow-redirects"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.0.0.tgz"; + sha1 = "8e34298cbd2e176f254effec75a1c78cc849fd37"; + }; + }; + "engine.io-3.1.4" = { + name = "engine.io"; + packageName = "engine.io"; + version = "3.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/engine.io/-/engine.io-3.1.4.tgz"; + sha1 = "3d0211b70a552ce841ffc7da8627b301a9a4162e"; + }; + }; + "socket.io-adapter-1.1.1" = { + name = "socket.io-adapter"; + packageName = "socket.io-adapter"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-1.1.1.tgz"; + sha1 = "2a805e8a14d6372124dd9159ad4502f8cb07f06b"; + }; + }; + "socket.io-client-2.0.4" = { + name = "socket.io-client"; + packageName = "socket.io-client"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.0.4.tgz"; + sha1 = "0918a552406dc5e540b380dcd97afc4a64332f8e"; + }; + }; + "socket.io-parser-3.1.2" = { + name = "socket.io-parser"; + packageName = "socket.io-parser"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.1.2.tgz"; + sha1 = "dbc2282151fc4faebbe40aeedc0772eba619f7f2"; }; }; "accepts-1.3.3" = { @@ -16614,22 +17253,22 @@ let sha1 = "47688cb99bb6804f0e06d3e763b1c32e57d8e6b6"; }; }; - "engine.io-parser-1.3.2" = { + "engine.io-parser-2.1.2" = { name = "engine.io-parser"; packageName = "engine.io-parser"; - version = "1.3.2"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.3.2.tgz"; - sha1 = "937b079f0007d0893ec56d46cb220b8cb435220a"; + url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.1.2.tgz"; + sha512 = "0rjbixsn5qvjwklnvvjdfz4wy85dk82zkvh6lk3znbd3p3isgr57a5kikgndr3xhhkv5zzvh4bfxbz7gqfsgijscyiiilgw78bwp2bl"; }; }; - "ws-1.1.2" = { - name = "ws"; - packageName = "ws"; - version = "1.1.2"; + "uws-0.14.5" = { + name = "uws"; + packageName = "uws"; + version = "0.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-1.1.2.tgz"; - sha1 = "8a244fa052401e08c9886cf44a85189e1fd4067f"; + url = "https://registry.npmjs.org/uws/-/uws-0.14.5.tgz"; + sha1 = "67aaf33c46b2a587a5f6666d00f7691328f149dc"; }; }; "after-0.8.2" = { @@ -16641,13 +17280,13 @@ let sha1 = "fedb394f9f0e02aa9768e702bda23b505fae7e1f"; }; }; - "arraybuffer.slice-0.0.6" = { + "arraybuffer.slice-0.0.7" = { name = "arraybuffer.slice"; packageName = "arraybuffer.slice"; - version = "0.0.6"; + version = "0.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz"; - sha1 = "f33b2159f0532a3f3107a272c0ccfbd1ad2979ca"; + url = "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz"; + sha512 = "2ifpj39fza01g4z9jhgl0shmh5f79czgfh7bf40n66v5p93nrf43kiqhsgic9az2jrwmj8n60dn7kav1rzvm41a9kwi4ypf0mahhrf0"; }; }; "base64-arraybuffer-0.1.5" = { @@ -16668,13 +17307,22 @@ let sha1 = "bcf13052ca54463f30f9fc7e95b9a47630a94921"; }; }; - "wtf-8-1.0.0" = { - name = "wtf-8"; - packageName = "wtf-8"; - version = "1.0.0"; + "has-binary2-1.0.2" = { + name = "has-binary2"; + packageName = "has-binary2"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/wtf-8/-/wtf-8-1.0.0.tgz"; - sha1 = "392d8ba2d0f1c34d1ee2d630f15d0efb68e1048a"; + url = "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.2.tgz"; + sha1 = "e83dba49f0b9be4d026d27365350d9f03f54be98"; + }; + }; + "isarray-2.0.1" = { + name = "isarray"; + packageName = "isarray"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz"; + sha1 = "a37d94ed9cda2d59865c9f76fe596ee1f338741e"; }; }; "backo2-1.0.2" = { @@ -16695,13 +17343,22 @@ let sha1 = "00c608ab7dcd93897c0009651b1d3a8e1e73bbd1"; }; }; - "engine.io-client-1.8.3" = { + "engine.io-client-3.1.4" = { name = "engine.io-client"; packageName = "engine.io-client"; - version = "1.8.3"; + version = "3.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.8.3.tgz"; - sha1 = "1798ed93451246453d4c6f635d7a201fe940d5ab"; + url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.1.4.tgz"; + sha1 = "4fcf1370b47163bd2ce9be2733972430350d4ea1"; + }; + }; + "has-cors-1.1.0" = { + name = "has-cors"; + packageName = "has-cors"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz"; + sha1 = "5e474793f7ea9843d1bb99c23eef49ff126fff39"; }; }; "object-component-0.0.3" = { @@ -16713,6 +17370,15 @@ let sha1 = "f0c69aa50efc95b866c186f400a33769cb2f1291"; }; }; + "parseqs-0.0.5" = { + name = "parseqs"; + packageName = "parseqs"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz"; + sha1 = "d5208a3738e46766e291ba2ea173684921a8b89d"; + }; + }; "parseuri-0.0.5" = { name = "parseuri"; packageName = "parseuri"; @@ -16740,40 +17406,13 @@ let sha1 = "645fc4adf58b72b649d5cae65135619db26ff143"; }; }; - "has-cors-1.1.0" = { - name = "has-cors"; - packageName = "has-cors"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz"; - sha1 = "5e474793f7ea9843d1bb99c23eef49ff126fff39"; - }; - }; - "parsejson-0.0.3" = { - name = "parsejson"; - packageName = "parsejson"; - version = "0.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/parsejson/-/parsejson-0.0.3.tgz"; - sha1 = "ab7e3759f209ece99437973f7d0f1f64ae0e64ab"; - }; - }; - "parseqs-0.0.5" = { - name = "parseqs"; - packageName = "parseqs"; - version = "0.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz"; - sha1 = "d5208a3738e46766e291ba2ea173684921a8b89d"; - }; - }; - "xmlhttprequest-ssl-1.5.3" = { + "xmlhttprequest-ssl-1.5.4" = { name = "xmlhttprequest-ssl"; packageName = "xmlhttprequest-ssl"; - version = "1.5.3"; + version = "1.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz"; - sha1 = "185a888c04eca46c3e4070d99f7b49de3528992d"; + url = "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.4.tgz"; + sha1 = "04f560915724b389088715cc0ed7813e9677bf57"; }; }; "yeast-0.1.2" = { @@ -16803,33 +17442,6 @@ let sha1 = "280398e5d664bd74038b6f0905153e6e8af1bc20"; }; }; - "debug-2.2.0" = { - name = "debug"; - packageName = "debug"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz"; - sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da"; - }; - }; - "json3-3.3.2" = { - name = "json3"; - packageName = "json3"; - version = "3.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz"; - sha1 = "3c0434743df93e2f5c42aee7b19bcb483575f4e1"; - }; - }; - "ms-0.7.1" = { - name = "ms"; - packageName = "ms"; - version = "0.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"; - sha1 = "9cd13c03adbff25b65effde7ce864ee952017098"; - }; - }; "lru-cache-2.2.4" = { name = "lru-cache"; packageName = "lru-cache"; @@ -17181,15 +17793,6 @@ let sha1 = "f33fe9cfb52bbfd520aa18323bc65db110a1b76c"; }; }; - "tsscmp-1.0.5" = { - name = "tsscmp"; - packageName = "tsscmp"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/tsscmp/-/tsscmp-1.0.5.tgz"; - sha1 = "7dc4a33af71581ab4337da91d85ca5427ebd9a97"; - }; - }; "uid-safe-2.1.4" = { name = "uid-safe"; packageName = "uid-safe"; @@ -17244,6 +17847,15 @@ let sha1 = "ded266556319c8b0e222812b9cf3b26fa7d947de"; }; }; + "ms-0.7.2" = { + name = "ms"; + packageName = "ms"; + version = "0.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz"; + sha1 = "ae25cf2512b3885a1d95d7f037868d8431124765"; + }; + }; "batch-0.5.3" = { name = "batch"; packageName = "batch"; @@ -17442,13 +18054,13 @@ let sha1 = "f5a6d70e8395e21c858fb0489d64df02424d506c"; }; }; - "is-ci-1.0.10" = { + "is-ci-1.1.0" = { name = "is-ci"; packageName = "is-ci"; - version = "1.0.10"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-ci/-/is-ci-1.0.10.tgz"; - sha1 = "f739336b2632365061a9d48270cd56ae3369318e"; + url = "https://registry.npmjs.org/is-ci/-/is-ci-1.1.0.tgz"; + sha512 = "0m66alrh568wj40xwshf8q99gsjfk1jr0czp4jc2sm519wfzzzprkl5zjvw2r5h49p72d50ywj9qg67dnyazq0ijy4flgny2b1ygd3k"; }; }; "load-json-file-3.0.0" = { @@ -17496,13 +18108,13 @@ let sha1 = "f7fb93758a69a571140181277eea0c2eb1301fa3"; }; }; - "temp-write-3.3.0" = { + "temp-write-3.4.0" = { name = "temp-write"; packageName = "temp-write"; - version = "3.3.0"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/temp-write/-/temp-write-3.3.0.tgz"; - sha1 = "c1a96de2b36061342eae81f44ff001aec8f615a9"; + url = "https://registry.npmjs.org/temp-write/-/temp-write-3.4.0.tgz"; + sha1 = "8cff630fb7e9da05f047c74ce4ce4d685457d492"; }; }; "write-json-file-2.3.0" = { @@ -17982,6 +18594,15 @@ let sha1 = "658535584861ec97d730d6cf41822e1f56684128"; }; }; + "cliui-3.2.0" = { + name = "cliui"; + packageName = "cliui"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz"; + sha1 = "120601537a916d29940f934da3b48d585a39213d"; + }; + }; "read-pkg-up-2.0.0" = { name = "read-pkg-up"; packageName = "read-pkg-up"; @@ -18144,22 +18765,13 @@ let sha1 = "d6f73da5276ded956861337189addf3d52b93558"; }; }; - "markdown-it-task-checkbox-1.0.5" = { + "markdown-it-task-checkbox-1.0.6" = { name = "markdown-it-task-checkbox"; packageName = "markdown-it-task-checkbox"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/markdown-it-task-checkbox/-/markdown-it-task-checkbox-1.0.5.tgz"; - sha512 = "0fcw45p4gcm7nqn091vj5bpds1qg866pqzrjr0l5br39nq26h7kl9h2c9ryz9f7g1kjfb8d5fnd57jpn9m46wnpl817f88q99ad7542"; - }; - }; - "socket.io-2.0.4" = { - name = "socket.io"; - packageName = "socket.io"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/socket.io/-/socket.io-2.0.4.tgz"; - sha1 = "c1a4590ceff87ecf13c72652f046f716b29e6014"; + url = "https://registry.npmjs.org/markdown-it-task-checkbox/-/markdown-it-task-checkbox-1.0.6.tgz"; + sha512 = "0knj35b20bkc34hpfv73p4m855ysgdshml07fhj18j62p09y2066l7nl28g9kr2rwqm9x8j0bw20d32vqrrhih5ifvynk7axcg6977f"; }; }; "linkify-it-2.0.3" = { @@ -18225,96 +18837,6 @@ let sha1 = "0df29351f0721163515dfb9e5543e5f6eed5162f"; }; }; - "engine.io-3.1.4" = { - name = "engine.io"; - packageName = "engine.io"; - version = "3.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/engine.io/-/engine.io-3.1.4.tgz"; - sha1 = "3d0211b70a552ce841ffc7da8627b301a9a4162e"; - }; - }; - "socket.io-adapter-1.1.1" = { - name = "socket.io-adapter"; - packageName = "socket.io-adapter"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-1.1.1.tgz"; - sha1 = "2a805e8a14d6372124dd9159ad4502f8cb07f06b"; - }; - }; - "socket.io-client-2.0.4" = { - name = "socket.io-client"; - packageName = "socket.io-client"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.0.4.tgz"; - sha1 = "0918a552406dc5e540b380dcd97afc4a64332f8e"; - }; - }; - "socket.io-parser-3.1.2" = { - name = "socket.io-parser"; - packageName = "socket.io-parser"; - version = "3.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.1.2.tgz"; - sha1 = "dbc2282151fc4faebbe40aeedc0772eba619f7f2"; - }; - }; - "engine.io-parser-2.1.1" = { - name = "engine.io-parser"; - packageName = "engine.io-parser"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.1.1.tgz"; - sha1 = "e0fb3f0e0462f7f58bb77c1a52e9f5a7e26e4668"; - }; - }; - "uws-0.14.5" = { - name = "uws"; - packageName = "uws"; - version = "0.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/uws/-/uws-0.14.5.tgz"; - sha1 = "67aaf33c46b2a587a5f6666d00f7691328f149dc"; - }; - }; - "has-binary2-1.0.2" = { - name = "has-binary2"; - packageName = "has-binary2"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.2.tgz"; - sha1 = "e83dba49f0b9be4d026d27365350d9f03f54be98"; - }; - }; - "isarray-2.0.1" = { - name = "isarray"; - packageName = "isarray"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz"; - sha1 = "a37d94ed9cda2d59865c9f76fe596ee1f338741e"; - }; - }; - "engine.io-client-3.1.4" = { - name = "engine.io-client"; - packageName = "engine.io-client"; - version = "3.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.1.4.tgz"; - sha1 = "4fcf1370b47163bd2ce9be2733972430350d4ea1"; - }; - }; - "xmlhttprequest-ssl-1.5.4" = { - name = "xmlhttprequest-ssl"; - packageName = "xmlhttprequest-ssl"; - version = "1.5.4"; - src = fetchurl { - url = "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.4.tgz"; - sha1 = "04f560915724b389088715cc0ed7813e9677bf57"; - }; - }; "connect-3.5.1" = { name = "connect"; packageName = "connect"; @@ -18540,15 +19062,6 @@ let sha1 = "f351d32969d32fa5d7a5567154263d928ae3bd1f"; }; }; - "commander-2.11.0" = { - name = "commander"; - packageName = "commander"; - version = "2.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz"; - sha512 = "2yi2hwf0bghfnv1fdgd4wvh7s0acjrgqbgww97ncm6i6s6ffs1zahnj48f6gqpqj6fsf0jigvnr0civ25k2160c38281r80wvg7jkkg"; - }; - }; "diff-3.3.1" = { name = "diff"; packageName = "diff"; @@ -19233,15 +19746,6 @@ let sha512 = "3apvpzjbs9vds18x8pxb8ysn94658xnajl5zfagr23xpbfhgbmlmajm0lnmz9h4jk99snzf51vcc1r0l0g4gmbdzcn574vvvzy3dxrv"; }; }; - "when-3.7.8" = { - name = "when"; - packageName = "when"; - version = "3.7.8"; - src = fetchurl { - url = "https://registry.npmjs.org/when/-/when-3.7.8.tgz"; - sha1 = "c7130b6a7ea04693e842cdc9e7a1f2aa39a39f82"; - }; - }; "ws-1.1.1" = { name = "ws"; packageName = "ws"; @@ -19305,15 +19809,6 @@ let sha1 = "92bad1f6d05bbb6bba22cca88bcd0ec894c2861e"; }; }; - "iconv-lite-0.4.15" = { - name = "iconv-lite"; - packageName = "iconv-lite"; - version = "0.4.15"; - src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz"; - sha1 = "fe265a218ac6a57cfe854927e9d04c19825eddeb"; - }; - }; "css-select-1.2.0" = { name = "css-select"; packageName = "css-select"; @@ -19602,15 +20097,6 @@ let sha1 = "ad3297c557069dea8bcfe7a4fa491b75c5ddeb91"; }; }; - "esprima-3.1.3" = { - name = "esprima"; - packageName = "esprima"; - version = "3.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz"; - sha1 = "fdca51cee6133895e3c88d535ce49dbff62a4633"; - }; - }; "commist-1.0.0" = { name = "commist"; packageName = "commist"; @@ -19863,24 +20349,6 @@ let sha1 = "e6c37f31885ab3080e7ded3cf528c4ad7e691398"; }; }; - "libbase64-0.1.0" = { - name = "libbase64"; - packageName = "libbase64"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/libbase64/-/libbase64-0.1.0.tgz"; - sha1 = "62351a839563ac5ff5bd26f12f60e9830bb751e6"; - }; - }; - "libqp-1.1.0" = { - name = "libqp"; - packageName = "libqp"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/libqp/-/libqp-1.1.0.tgz"; - sha1 = "f5e6e06ad74b794fb5b5b66988bf728ef1dedbe8"; - }; - }; "buildmail-2.0.0" = { name = "buildmail"; packageName = "buildmail"; @@ -19917,15 +20385,6 @@ let sha1 = "55832c2160cfb3086e1dcd87fd1c19fa61b7f536"; }; }; - "nodemailer-wellknown-0.1.10" = { - name = "nodemailer-wellknown"; - packageName = "nodemailer-wellknown"; - version = "0.1.10"; - src = fetchurl { - url = "https://registry.npmjs.org/nodemailer-wellknown/-/nodemailer-wellknown-0.1.10.tgz"; - sha1 = "586db8101db30cb4438eb546737a41aad0cf13d5"; - }; - }; "mimelib-0.3.1" = { name = "mimelib"; packageName = "mimelib"; @@ -19944,15 +20403,6 @@ let sha1 = "5d67d37030e66efebbb4b8aac46daf9b55befbf6"; }; }; - "addressparser-1.0.1" = { - name = "addressparser"; - packageName = "addressparser"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/addressparser/-/addressparser-1.0.1.tgz"; - sha1 = "47afbe1a2a9262191db6838e4fd1d39b40821746"; - }; - }; "utf7-1.0.2" = { name = "utf7"; packageName = "utf7"; @@ -20475,42 +20925,6 @@ let sha1 = "017b1eb8b26317ac36d2a2a8a932631880736a03"; }; }; - "buildmail-4.0.1" = { - name = "buildmail"; - packageName = "buildmail"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/buildmail/-/buildmail-4.0.1.tgz"; - sha1 = "877f7738b78729871c9a105e3b837d2be11a7a72"; - }; - }; - "libmime-3.0.0" = { - name = "libmime"; - packageName = "libmime"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/libmime/-/libmime-3.0.0.tgz"; - sha1 = "51a1a9e7448ecbd32cda54421675bb21bc093da6"; - }; - }; - "nodemailer-fetch-1.6.0" = { - name = "nodemailer-fetch"; - packageName = "nodemailer-fetch"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/nodemailer-fetch/-/nodemailer-fetch-1.6.0.tgz"; - sha1 = "79c4908a1c0f5f375b73fe888da9828f6dc963a4"; - }; - }; - "nodemailer-shared-1.1.0" = { - name = "nodemailer-shared"; - packageName = "nodemailer-shared"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/nodemailer-shared/-/nodemailer-shared-1.1.0.tgz"; - sha1 = "cf5994e2fd268d00f5cf0fa767a08169edb07ec0"; - }; - }; "rai-0.1.12" = { name = "rai"; packageName = "rai"; @@ -20556,15 +20970,6 @@ let sha1 = "cfd01e0fbba3d6caed049fbd758d40f65196f57c"; }; }; - "underscore-1.7.0" = { - name = "underscore"; - packageName = "underscore"; - version = "1.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz"; - sha1 = "6bbaf0877500d36be34ecaa584e0db9fef035209"; - }; - }; "underscore.string-2.4.0" = { name = "underscore.string"; packageName = "underscore.string"; @@ -20781,6 +21186,15 @@ let sha1 = "32607657e1bd47ca857ab4e9d98f0a0cff96bcea"; }; }; + "rc-config-loader-2.0.1" = { + name = "rc-config-loader"; + packageName = "rc-config-loader"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/rc-config-loader/-/rc-config-loader-2.0.1.tgz"; + sha512 = "2sp3cd5mzpc91g5c8k7xwdm9gnax4pf6wvg09scksc81bs5p0qpzjf6s7xi36b0lxfhs76jmm48jv23biy4b4q3d6ldx77vjvhgcyiq"; + }; + }; "semver-utils-1.1.1" = { name = "semver-utils"; packageName = "semver-utils"; @@ -20790,13 +21204,13 @@ let sha1 = "27d92fec34d27cfa42707d3b40d025ae9855f2df"; }; }; - "snyk-1.61.2" = { + "snyk-1.65.1" = { name = "snyk"; packageName = "snyk"; - version = "1.61.2"; + version = "1.65.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.61.2.tgz"; - sha1 = "c1426f84b68614999c6aec70ac6f08d8155a099b"; + url = "https://registry.npmjs.org/snyk/-/snyk-1.65.1.tgz"; + sha1 = "25a25e452399a0006b5ea2b5c973e25684afc5ab"; }; }; "spawn-please-0.3.0" = { @@ -20808,6 +21222,15 @@ let sha1 = "db338ec4cff63abc69f1d0e08cee9eb8bebd9d11"; }; }; + "require-from-string-2.0.1" = { + name = "require-from-string"; + packageName = "require-from-string"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.1.tgz"; + sha1 = "c545233e9d7da6616e9d59adfb39fc9f588676ff"; + }; + }; "es6-promise-3.3.1" = { name = "es6-promise"; packageName = "es6-promise"; @@ -20862,13 +21285,13 @@ let sha1 = "f27aec2498b24027ac719214026521591111508f"; }; }; - "snyk-go-plugin-1.4.3" = { + "snyk-go-plugin-1.4.5" = { name = "snyk-go-plugin"; packageName = "snyk-go-plugin"; - version = "1.4.3"; + version = "1.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.4.3.tgz"; - sha512 = "1g283c7pd9w1x0kr51i9rpgzks7l1lc5r73sj5zzl4mhwjpkx2w7lw2lps6g4raasa2c7gr2ifd79mcihcc896ws6z9ghldibxrfky5"; + url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.4.5.tgz"; + sha512 = "0m7m3yjv33vq1p6gwn30vxmacrahvw08j432pva601fm2b48j9f5hq8v6zdrzna2yw6xqg1dnhd7gxskpivvl4rzs3fji23yfvxgqxs"; }; }; "snyk-gradle-plugin-1.2.0" = { @@ -20898,22 +21321,22 @@ let sha512 = "3ar9rk77y39sydnriw6k9p5s15qpv1in81365l0yjbvn6qis7v4na98xfibsmfnnkjyblnd5qs2q1j6fabdfx4g2x5yi7ld6hdm6r3r"; }; }; - "snyk-nuget-plugin-1.3.6" = { + "snyk-nuget-plugin-1.3.7" = { name = "snyk-nuget-plugin"; packageName = "snyk-nuget-plugin"; - version = "1.3.6"; + version = "1.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.3.6.tgz"; - sha512 = "0wnflg1m0bsym4skxmjq8nsdxn4m1g7dqxix7yh2542azag7n6xhz9dc6r8l2cfg79rd7gcc9yyla2g0jpv2qqsls2mar9kq7aafbyz"; + url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.3.7.tgz"; + sha512 = "1yvj79ywqm14jgvgkjmaz9vqig14xrx8m44n3nbirzv3smxxzymngfmn6aip77wnzs1a0xlv5f84gk0v8kirdq4npmdyvhnv2ij9vkl"; }; }; - "snyk-php-plugin-1.3.0" = { + "snyk-php-plugin-1.3.1" = { name = "snyk-php-plugin"; packageName = "snyk-php-plugin"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-php-plugin/-/snyk-php-plugin-1.3.0.tgz"; - sha512 = "2bx4gvqyyq8343l28f1l8mm20bsqc7kxjbhg7fmwrwmim42z4985pp4naclnxgf22l6xx852a1fyiyaz9npks8navb5mwss7fa17i7g"; + url = "https://registry.npmjs.org/snyk-php-plugin/-/snyk-php-plugin-1.3.1.tgz"; + sha512 = "3hn0csviga8k4drlpqla54qk1n7v3d7sajzpr7bd022vvdgwg0dg9kajjlqzcc6m78xfmkncfvziwyhqfgf9q7khnamjzsp7w37426l"; }; }; "snyk-policy-1.10.1" = { @@ -20925,13 +21348,13 @@ let sha1 = "b1a26c8aef529c61604aca382111e535d511b763"; }; }; - "snyk-python-plugin-1.4.0" = { + "snyk-python-plugin-1.4.1" = { name = "snyk-python-plugin"; packageName = "snyk-python-plugin"; - version = "1.4.0"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.4.0.tgz"; - sha512 = "3ayb4vqwvz9srv07xfrzwwni6aabbxmmxq8gx55qkzbc7x912k7cvd4r8v96ij8ck45r89xhm2j60knmjhv6xj1gm2x9vhz20s325vk"; + url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.4.1.tgz"; + sha512 = "0j8raq38cjnapa9dbfdmndkl9jm1wh4wdf8h6ahx53p233fiyhlp9sf5zdc2k7sakixsqaic4241ql6r9j33ql0nfgnx67869kjfwzs"; }; }; "snyk-recursive-readdir-2.0.0" = { @@ -21549,13 +21972,13 @@ let sha1 = "07e30ad79531844179b642d2d8399435182c8727"; }; }; - "object.assign-4.0.4" = { + "object.assign-4.1.0" = { name = "object.assign"; packageName = "object.assign"; - version = "4.0.4"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/object.assign/-/object.assign-4.0.4.tgz"; - sha1 = "b1c9cc044ef1b9fe63606fc141abbb32e14730cc"; + url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz"; + sha512 = "3krdp08gvbxvipalq64qy7bm86znxxdb7ap6bjki235qs17i9fsn6hqd22ga31sqyqa6iyy5xjfnnqc7lsck1kaybwsh154mrxcj4bv"; }; }; "define-properties-1.1.2" = { @@ -21567,6 +21990,15 @@ let sha1 = "83a73f2fea569898fb737193c8f873caf6d45c94"; }; }; + "has-symbols-1.0.0" = { + name = "has-symbols"; + packageName = "has-symbols"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz"; + sha1 = "ba1a8f1af2a0fc39650f5c850367704122063b44"; + }; + }; "bunyan-1.8.12" = { name = "bunyan"; packageName = "bunyan"; @@ -22000,13 +22432,49 @@ let sha1 = "3c43c7fcb1896e17460436a9dd0b6ef1668e4f94"; }; }; - "engine.io-1.8.4" = { + "debug-2.3.3" = { + name = "debug"; + packageName = "debug"; + version = "2.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz"; + sha1 = "40c453e67e6e13c901ddec317af8986cda9eff8c"; + }; + }; + "engine.io-1.8.5" = { name = "engine.io"; packageName = "engine.io"; - version = "1.8.4"; + version = "1.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io/-/engine.io-1.8.4.tgz"; - sha1 = "77bce12b80e5d60429337fec3b0daf691ebc9003"; + url = "https://registry.npmjs.org/engine.io/-/engine.io-1.8.5.tgz"; + sha512 = "3ff3a0anvy48mmpay3jkzlrjvxmlclq823j8jmjfdhy48xpz1syz44bwr13zdh161x1vqzsclgwb6gvgrn9vymvq98qihrdr4hxcl4g"; + }; + }; + "has-binary-0.1.7" = { + name = "has-binary"; + packageName = "has-binary"; + version = "0.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/has-binary/-/has-binary-0.1.7.tgz"; + sha1 = "68e61eb16210c9545a0a5cce06a873912fe1e68c"; + }; + }; + "object-assign-4.1.0" = { + name = "object-assign"; + packageName = "object-assign"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz"; + sha1 = "7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0"; + }; + }; + "socket.io-adapter-0.5.0" = { + name = "socket.io-adapter"; + packageName = "socket.io-adapter"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.5.0.tgz"; + sha1 = "cb6d4bb8bec81e1078b99677f9ced0046066bb8b"; }; }; "socket.io-client-1.7.4" = { @@ -22018,22 +22486,76 @@ let sha1 = "ec9f820356ed99ef6d357f0756d648717bdd4281"; }; }; - "ws-1.1.4" = { - name = "ws"; - packageName = "ws"; - version = "1.1.4"; + "socket.io-parser-2.3.1" = { + name = "socket.io-parser"; + packageName = "socket.io-parser"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-1.1.4.tgz"; - sha1 = "57f40d036832e5f5055662a397c4de76ed66bf61"; + url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.3.1.tgz"; + sha1 = "dd532025103ce429697326befd64005fcfe5b4a0"; }; }; - "engine.io-client-1.8.4" = { + "engine.io-parser-1.3.2" = { + name = "engine.io-parser"; + packageName = "engine.io-parser"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.3.2.tgz"; + sha1 = "937b079f0007d0893ec56d46cb220b8cb435220a"; + }; + }; + "arraybuffer.slice-0.0.6" = { + name = "arraybuffer.slice"; + packageName = "arraybuffer.slice"; + version = "0.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz"; + sha1 = "f33b2159f0532a3f3107a272c0ccfbd1ad2979ca"; + }; + }; + "wtf-8-1.0.0" = { + name = "wtf-8"; + packageName = "wtf-8"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/wtf-8/-/wtf-8-1.0.0.tgz"; + sha1 = "392d8ba2d0f1c34d1ee2d630f15d0efb68e1048a"; + }; + }; + "engine.io-client-1.8.5" = { name = "engine.io-client"; packageName = "engine.io-client"; - version = "1.8.4"; + version = "1.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.8.4.tgz"; - sha1 = "9fe85dee25853ca6babe25bd2ad68710863e91c2"; + url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.8.5.tgz"; + sha512 = "1kfc2cmjw891x0i9cm9alm93db5s40h3n4a3zcpjha7nrvz0s7ggzpp2x2v8zmnhp9278amjdm0j5lfkn3qxan7nanzhl4m4wgy1101"; + }; + }; + "parsejson-0.0.3" = { + name = "parsejson"; + packageName = "parsejson"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/parsejson/-/parsejson-0.0.3.tgz"; + sha1 = "ab7e3759f209ece99437973f7d0f1f64ae0e64ab"; + }; + }; + "xmlhttprequest-ssl-1.5.3" = { + name = "xmlhttprequest-ssl"; + packageName = "xmlhttprequest-ssl"; + version = "1.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz"; + sha1 = "185a888c04eca46c3e4070d99f7b49de3528992d"; + }; + }; + "json3-3.3.2" = { + name = "json3"; + packageName = "json3"; + version = "3.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz"; + sha1 = "3c0434743df93e2f5c42aee7b19bcb483575f4e1"; }; }; "extract-zip-1.5.0" = { @@ -23579,13 +24101,13 @@ let sha1 = "64762c48618082518ac3df4ccf5d5886dae20347"; }; }; - "postcss-6.0.14" = { + "postcss-6.0.15" = { name = "postcss"; packageName = "postcss"; - version = "6.0.14"; + version = "6.0.15"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-6.0.14.tgz"; - sha512 = "2id33g6232s35n25daqrkz0bvzm2zmhlkfzmigkgia5q4jy9xg38spppmsdg0qswjankyi28wrbjsdwhczqfkx7h71gg8dmzz8p779l"; + url = "https://registry.npmjs.org/postcss/-/postcss-6.0.15.tgz"; + sha512 = "1axgxq4wrv5di6khmfzgadlgzwfpmlk5aprzqacb8z8k3z9hy4rh3pzni9l274yybq2lxfgmigal1icmbb52wwfhwkdjvnbrk4akx5z"; }; }; "srcset-1.0.0" = { @@ -23606,13 +24128,13 @@ let sha1 = "1958cc0b4c9426e9ed367fb1c8e854891b0fa3ff"; }; }; - "async-2.1.5" = { - name = "async"; - packageName = "async"; - version = "2.1.5"; + "supports-color-5.1.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-2.1.5.tgz"; - sha1 = "e587c68580994ac67fc56ff86d3ac56bdbe810bc"; + url = "https://registry.npmjs.org/supports-color/-/supports-color-5.1.0.tgz"; + sha512 = "04q31rfgx0r6jgs2r1k6kmzab1vw3qrikiv8wsl86rxll77vdalrag7r4ypww3qp6v8k3avsjc0jxd3ga45fb5f51akm30a9b100ba7"; }; }; "assert-plus-0.1.5" = { @@ -24254,6 +24776,150 @@ let sha1 = "7bcc6b629e3a43e871d7e29aca6ae8a7f15cbb20"; }; }; + "adm-zip-0.4.7" = { + name = "adm-zip"; + packageName = "adm-zip"; + version = "0.4.7"; + src = fetchurl { + url = "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.7.tgz"; + sha1 = "8606c2cbf1c426ce8c8ec00174447fd49b6eafc1"; + }; + }; + "async-2.1.2" = { + name = "async"; + packageName = "async"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-2.1.2.tgz"; + sha1 = "612a4ab45ef42a70cde806bad86ee6db047e8385"; + }; + }; + "fields-0.1.24" = { + name = "fields"; + packageName = "fields"; + version = "0.1.24"; + src = fetchurl { + url = "https://registry.npmjs.org/fields/-/fields-0.1.24.tgz"; + sha1 = "bed93b1c2521f4705fe764f4209267fdfd89f5d3"; + }; + }; + "humanize-0.0.9" = { + name = "humanize"; + packageName = "humanize"; + version = "0.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/humanize/-/humanize-0.0.9.tgz"; + sha1 = "1994ffaecdfe9c441ed2bdac7452b7bb4c9e41a4"; + }; + }; + "longjohn-0.2.11" = { + name = "longjohn"; + packageName = "longjohn"; + version = "0.2.11"; + src = fetchurl { + url = "https://registry.npmjs.org/longjohn/-/longjohn-0.2.11.tgz"; + sha1 = "83736a15ae5f48711b625153e98012f2de659e69"; + }; + }; + "moment-2.16.0" = { + name = "moment"; + packageName = "moment"; + version = "2.16.0"; + src = fetchurl { + url = "https://registry.npmjs.org/moment/-/moment-2.16.0.tgz"; + sha1 = "f38f2c97c9889b0ee18fc6cc392e1e443ad2da8e"; + }; + }; + "node-appc-0.2.41" = { + name = "node-appc"; + packageName = "node-appc"; + version = "0.2.41"; + src = fetchurl { + url = "https://registry.npmjs.org/node-appc/-/node-appc-0.2.41.tgz"; + sha1 = "f68cf5acb607c4903e2f63024383ae95ba1fdc52"; + }; + }; + "sprintf-0.1.5" = { + name = "sprintf"; + packageName = "sprintf"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/sprintf/-/sprintf-0.1.5.tgz"; + sha1 = "8f83e39a9317c1a502cb7db8050e51c679f6edcf"; + }; + }; + "winston-1.1.2" = { + name = "winston"; + packageName = "winston"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/winston/-/winston-1.1.2.tgz"; + sha1 = "68edd769ff79d4f9528cf0e5d80021aade67480c"; + }; + }; + "fs-extra-2.1.2" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-2.1.2.tgz"; + sha1 = "046c70163cef9aad46b0e4a7fa467fb22d71de35"; + }; + }; + "source-map-support-0.3.2" = { + name = "source-map-support"; + packageName = "source-map-support"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.3.2.tgz"; + sha1 = "737d5c901e0b78fdb53aca713d24f23ccbb10be1"; + }; + }; + "source-map-0.1.32" = { + name = "source-map"; + packageName = "source-map"; + version = "0.1.32"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.1.32.tgz"; + sha1 = "c8b6c167797ba4740a8ea33252162ff08591b266"; + }; + }; + "async-2.1.4" = { + name = "async"; + packageName = "async"; + version = "2.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-2.1.4.tgz"; + sha1 = "2d2160c7788032e4dd6cbe2502f1f9a2c8f6cde4"; + }; + }; + "diff-3.2.0" = { + name = "diff"; + packageName = "diff"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/diff/-/diff-3.2.0.tgz"; + sha1 = "c9ce393a4b7cbd0b058a725c93df299027868ff9"; + }; + }; + "wrench-1.5.9" = { + name = "wrench"; + packageName = "wrench"; + version = "1.5.9"; + src = fetchurl { + url = "https://registry.npmjs.org/wrench/-/wrench-1.5.9.tgz"; + sha1 = "411691c63a9b2531b1700267279bdeca23b2142a"; + }; + }; + "uglify-js-2.7.5" = { + name = "uglify-js"; + packageName = "uglify-js"; + version = "2.7.5"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.5.tgz"; + sha1 = "4612c0c7baaee2ba7c487de4904ae122079f2ca8"; + }; + }; "elegant-spinner-1.0.1" = { name = "elegant-spinner"; packageName = "elegant-spinner"; @@ -24434,49 +25100,13 @@ let sha1 = "6ab053a72573c10250ff416a3814c35178af39b9"; }; }; - "make-error-1.3.0" = { + "make-error-1.3.2" = { name = "make-error"; packageName = "make-error"; - version = "1.3.0"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/make-error/-/make-error-1.3.0.tgz"; - sha1 = "52ad3a339ccf10ce62b4040b708fe707244b8b96"; - }; - }; - "http-proxy-agent-1.0.0" = { - name = "http-proxy-agent"; - packageName = "http-proxy-agent"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-1.0.0.tgz"; - sha1 = "cc1ce38e453bf984a0f7702d2dd59c73d081284a"; - }; - }; - "https-proxy-agent-1.0.0" = { - name = "https-proxy-agent"; - packageName = "https-proxy-agent"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-1.0.0.tgz"; - sha1 = "35f7da6c48ce4ddbfa264891ac593ee5ff8671e6"; - }; - }; - "agent-base-2.1.1" = { - name = "agent-base"; - packageName = "agent-base"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/agent-base/-/agent-base-2.1.1.tgz"; - sha1 = "d6de10d5af6132d5bd692427d46fc538539094c7"; - }; - }; - "semver-5.0.3" = { - name = "semver"; - packageName = "semver"; - version = "5.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz"; - sha1 = "77466de589cd5d3c95f138aa78bc569a3cb5d27a"; + url = "https://registry.npmjs.org/make-error/-/make-error-1.3.2.tgz"; + sha512 = "1sw30dxbwvv9pa0871cyshryjqam7d0pl4m1f6zww2r81qv3sgmx5qz7aimhz2xhxlihy9fglnwc1sy7hwfbfwcvg2n4mbrk7gxmnlp"; }; }; "blueimp-md5-2.10.0" = { @@ -24785,15 +25415,6 @@ let sha1 = "67d080b9725291d7e389e34c26860dd97f1debaa"; }; }; - "adm-zip-0.4.7" = { - name = "adm-zip"; - packageName = "adm-zip"; - version = "0.4.7"; - src = fetchurl { - url = "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.7.tgz"; - sha1 = "8606c2cbf1c426ce8c8ec00174447fd49b6eafc1"; - }; - }; "kew-0.1.7" = { name = "kew"; packageName = "kew"; @@ -25307,13 +25928,13 @@ let sha1 = "7a549bbd9ffe1585b0cd0a191e203055bee574b4"; }; }; - "pino-4.10.2" = { + "pino-4.10.3" = { name = "pino"; packageName = "pino"; - version = "4.10.2"; + version = "4.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/pino/-/pino-4.10.2.tgz"; - sha512 = "2dvx5p741a807ch31jbaxsn1qkkqjnvv8zikzjrk6pnm9da0gayl7g0swpvf87limyi61d3xfhasjy0v4fmvai2wb54pngfx2047lw4"; + url = "https://registry.npmjs.org/pino/-/pino-4.10.3.tgz"; + sha512 = "2kg8qqb15pav0a2f16xmj5iqzkx28d0c6i1ydy3vzn71hfv7b7kvsbv917bwj68bh8m2mgy9j0kj8j4npy14hg2h09q4h85sz8wm990"; }; }; "postcss-6.0.11" = { @@ -25775,6 +26396,15 @@ let sha1 = "5b451b08cbd48e2eac54a2bbe0bf46165aa14be3"; }; }; + "pump-2.0.0" = { + name = "pump"; + packageName = "pump"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pump/-/pump-2.0.0.tgz"; + sha512 = "21jb2lq6ajsmcqs5j3yq4gpfzkpn9zfy514dmwd0rlh6r8c6iknng19c3kmpb607rk2xap7cw467qz5di30zki40phjbdmg6fk35ip8"; + }; + }; "quick-format-unescaped-1.1.1" = { name = "quick-format-unescaped"; packageName = "quick-format-unescaped"; @@ -25829,15 +26459,6 @@ let sha1 = "4f2194d6d8f99df3f531e6881f14f15d55faaf22"; }; }; - "fs-extra-2.1.2" = { - name = "fs-extra"; - packageName = "fs-extra"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-extra/-/fs-extra-2.1.2.tgz"; - sha1 = "046c70163cef9aad46b0e4a7fa467fb22d71de35"; - }; - }; "jetpack-id-1.0.0" = { name = "jetpack-id"; packageName = "jetpack-id"; @@ -26279,15 +26900,6 @@ let sha512 = "3da1hqkqhwx9xiw283nnq04pvsj1a69k7k0np5126v33dmpgxyhg19s99bz6djzd6sp713yg02h3h636wlgi9v2099rlrq2mrajvz8i"; }; }; - "p-try-1.0.0" = { - name = "p-try"; - packageName = "p-try"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz"; - sha1 = "cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"; - }; - }; "passwd-user-2.1.0" = { name = "passwd-user"; packageName = "passwd-user"; @@ -26297,13 +26909,13 @@ let sha1 = "fad9db6ae252f8b088e0c5decd20a7da0c5d9f1e"; }; }; - "p-some-2.0.0" = { + "p-some-2.0.1" = { name = "p-some"; packageName = "p-some"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/p-some/-/p-some-2.0.0.tgz"; - sha512 = "23lpz1jyj01f06bndx53w1k931l6ki6m94mgf9lqpxka3366q0w1ql0igm7bj5nc0imzdjv3x5825c05mjnhkgahw99hd0h1kk5ri0a"; + url = "https://registry.npmjs.org/p-some/-/p-some-2.0.1.tgz"; + sha1 = "65d87c8b154edbcf5221d167778b6d2e150f6f06"; }; }; "aggregate-error-1.0.0" = { @@ -26645,10 +27257,10 @@ in alloy = nodeEnv.buildNodePackage { name = "alloy"; packageName = "alloy"; - version = "1.10.10"; + version = "1.10.11"; src = fetchurl { - url = "https://registry.npmjs.org/alloy/-/alloy-1.10.10.tgz"; - sha512 = "130wmdphlwj27xss7wi4n3ygmcsl265k5qhv81s6njlhc9gkvx7j31iz5h0dcyckjdyl8sqqyk8vfbc55kr5q6k4xjc1lbz5chk2jg7"; + url = "https://registry.npmjs.org/alloy/-/alloy-1.10.11.tgz"; + sha512 = "27fw6d49zkpg07gr8wibkncnj9nijx8yqjijixkcihqrr65mspq19wwjswfvbwdb8zn19xswis87znvqmv70nfzqhwccwq8mqn0g8zp"; }; dependencies = [ sources."async-2.6.0" @@ -26679,6 +27291,7 @@ in sources."strip-ansi-0.1.1" ]; }) + sources."lodash-4.17.4" sources."moment-2.17.1" sources."node.extend-1.0.10" sources."pkginfo-0.2.2" @@ -26687,7 +27300,6 @@ in sources."walk-sync-0.3.2" sources."xml2tss-0.0.5" sources."xmldom-0.1.19" - sources."lodash-4.17.4" sources."babel-code-frame-6.26.0" sources."babel-helpers-6.24.1" sources."babel-messages-6.23.0" @@ -27083,7 +27695,7 @@ in sources."extend-3.0.1" ]; }) - (sources."ms-rest-azure-2.4.5" // { + (sources."ms-rest-azure-2.5.0" // { dependencies = [ sources."async-2.5.0" sources."adal-node-0.1.26" @@ -27206,7 +27818,7 @@ in sources."has-color-0.1.7" sources."ansi-styles-1.0.0" sources."strip-ansi-0.1.1" - sources."@types/node-8.5.2" + sources."@types/node-8.5.5" sources."@types/request-2.0.9" sources."@types/uuid-3.4.3" sources."is-buffer-1.1.6" @@ -27460,10 +28072,10 @@ in browserify = nodeEnv.buildNodePackage { name = "browserify"; packageName = "browserify"; - version = "14.5.0"; + version = "15.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserify/-/browserify-14.5.0.tgz"; - sha512 = "3p941rcrmn44115ylbnq53sdsnfm08rlvckdbkrnxvl00ibis5sxyhgrx33vm8sfyb5vgbk8x4b0fv3vwirvd7frwbdmzigsjqcx9w0"; + url = "https://registry.npmjs.org/browserify/-/browserify-15.0.0.tgz"; + sha512 = "17abx33xjyyd4ilaf2lsbq250gkc53622hqh4r65acmjhdp8i5g8jr5rm7s9shq8r5spby33h0lfl8caxamsy50rlaagjbq767p2i3l"; }; dependencies = [ sources."JSONStream-1.3.2" @@ -27506,9 +28118,10 @@ in sources."isarray-0.0.1" ]; }) - (sources."module-deps-4.1.1" // { + (sources."module-deps-5.0.0" // { dependencies = [ - sources."acorn-5.2.1" + sources."concat-stream-1.6.0" + sources."acorn-5.3.0" ]; }) sources."os-browserify-0.3.0" @@ -27606,8 +28219,9 @@ in sources."astw-2.2.0" sources."acorn-4.0.13" sources."stream-splicer-2.0.0" - sources."detective-4.7.1" + sources."detective-5.0.1" sources."stream-combiner2-1.1.1" + sources."acorn5-object-spread-5.0.0" sources."path-platform-0.11.15" sources."path-parse-1.0.5" sources."json-stable-stringify-0.0.1" @@ -27624,7 +28238,7 @@ in buildInputs = globalBuildInputs; meta = { description = "browser-side require() the node way"; - homepage = "https://github.com/substack/node-browserify#readme"; + homepage = "https://github.com/browserify/browserify#readme"; license = "MIT"; }; production = true; @@ -27834,7 +28448,7 @@ in sources."uniq-1.0.1" sources."bencode-1.0.0" sources."simple-sha1-2.1.0" - sources."rusha-0.8.9" + sources."rusha-0.8.11" sources."decompress-response-3.3.0" sources."once-1.4.0" sources."simple-concat-1.0.0" @@ -28180,7 +28794,7 @@ in (sources."cordova-js-4.2.2" // { dependencies = [ sources."isarray-0.0.1" - sources."acorn-5.2.1" + sources."acorn-5.3.0" ]; }) (sources."cordova-serve-2.0.0" // { @@ -28213,7 +28827,7 @@ in sources."browserify-transform-tools-1.7.0" sources."falafel-2.1.0" sources."through-2.3.8" - sources."acorn-5.2.1" + sources."acorn-5.3.0" sources."foreach-2.0.5" sources."isarray-0.0.1" sources."object-keys-1.0.11" @@ -28689,7 +29303,7 @@ in sources."safe-buffer-5.1.1" sources."simple-sha1-2.1.0" sources."k-rpc-socket-1.7.2" - sources."rusha-0.8.9" + sources."rusha-0.8.11" sources."varint-3.0.1" sources."nan-2.8.0" sources."node-gyp-build-3.2.2" @@ -28908,7 +29522,7 @@ in sources."esprima-1.1.1" sources."source-map-0.1.43" sources."amdefine-1.0.1" - sources."acorn-5.2.1" + sources."acorn-5.3.0" sources."foreach-2.0.5" sources."object-keys-1.0.11" sources."function-bind-1.1.1" @@ -28919,7 +29533,7 @@ in sources."is-property-1.0.2" sources."os-homedir-1.0.2" sources."abstract-random-access-1.1.2" - sources."sorted-array-functions-1.0.0" + sources."sorted-array-functions-1.1.0" sources."duplexify-3.5.1" (sources."hypercore-6.11.0" // { dependencies = [ @@ -28944,13 +29558,14 @@ in sources."unordered-array-remove-1.0.2" sources."sorted-indexof-1.0.0" sources."sodium-javascript-0.5.4" - sources."sodium-native-2.1.2" + sources."sodium-native-2.1.4" sources."blake2b-2.1.2" sources."nanoassert-1.1.0" sources."siphash24-1.1.0" sources."xsalsa20-1.0.2" sources."blake2b-wasm-1.1.4" sources."base64-to-uint8array-1.0.0" + sources."ini-1.3.5" sources."corsify-2.1.0" sources."directory-index-html-2.1.0" sources."mime-1.6.0" @@ -29333,7 +29948,7 @@ in sources."JSONStream-1.3.2" sources."async-2.6.0" sources."aws4-1.6.0" - sources."aws-sdk-2.173.0" + sources."aws-sdk-2.176.0" sources."ini-1.3.5" sources."optimist-0.6.1" (sources."request-2.83.0" // { @@ -29637,7 +30252,7 @@ in dependencies = [ sources."auto-bind-1.1.0" sources."clipboardy-1.2.2" - sources."conf-1.3.1" + sources."conf-1.4.0" sources."got-7.1.0" sources."has-ansi-3.0.0" (sources."import-jsx-1.3.0" // { @@ -29696,7 +30311,8 @@ in sources."locate-path-2.0.0" sources."p-locate-2.0.0" sources."path-exists-3.0.0" - sources."p-limit-1.1.0" + sources."p-limit-1.2.0" + sources."p-try-1.0.0" sources."graceful-fs-4.1.11" sources."imurmurhash-0.1.4" sources."decompress-response-3.3.0" @@ -29850,10 +30466,10 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "4.13.1"; + version = "4.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-4.13.1.tgz"; - sha512 = "1zhzyi5ajjmgx37845pnkkvq366jzpnfsq3q52ai98xg3jmf813yrf919r28j7gh3irnm921r553yrh0aghsx8srkcb3d0ikmbma8jh"; + url = "https://registry.npmjs.org/eslint/-/eslint-4.14.0.tgz"; + sha512 = "0jh5cxqg5w7zah8hra5wmm25nyky09lb7i8dbxpchhv2hj9q0ym3kn7wqw72g73sj1l6k6vv5fkdfmkim3zq5qdr82cfak3ci484pjj"; }; dependencies = [ sources."ajv-5.5.2" @@ -29874,9 +30490,9 @@ in sources."debug-3.1.0" sources."doctrine-2.0.2" sources."eslint-scope-3.7.1" + sources."eslint-visitor-keys-1.0.0" sources."espree-3.5.2" sources."esquery-1.0.0" - sources."estraverse-4.2.0" sources."esutils-2.0.2" sources."file-entry-cache-2.0.0" sources."functional-red-black-tree-1.0.1" @@ -29938,8 +30554,9 @@ in sources."isexe-2.0.0" sources."ms-2.0.0" sources."esrecurse-4.2.0" + sources."estraverse-4.2.0" sources."object-assign-4.1.1" - sources."acorn-5.2.1" + sources."acorn-5.3.0" (sources."acorn-jsx-3.0.1" // { dependencies = [ sources."acorn-3.3.0" @@ -30028,7 +30645,7 @@ in sources."supports-color-2.0.0" ]; }) - (sources."eslint-4.13.1" // { + (sources."eslint-4.14.0" // { dependencies = [ (sources."chalk-2.3.0" // { dependencies = [ @@ -30065,9 +30682,9 @@ in sources."debug-3.1.0" sources."doctrine-2.0.2" sources."eslint-scope-3.7.1" + sources."eslint-visitor-keys-1.0.0" sources."espree-3.5.2" sources."esquery-1.0.0" - sources."estraverse-4.2.0" sources."esutils-2.0.2" sources."file-entry-cache-2.0.0" sources."functional-red-black-tree-1.0.1" @@ -30118,8 +30735,9 @@ in sources."isexe-2.0.0" sources."ms-2.0.0" sources."esrecurse-4.2.0" + sources."estraverse-4.2.0" sources."object-assign-4.1.1" - sources."acorn-5.2.1" + sources."acorn-5.3.0" (sources."acorn-jsx-3.0.1" // { dependencies = [ sources."acorn-3.3.0" @@ -30293,7 +30911,7 @@ in sources."cli-spinners-1.1.0" sources."log-symbols-1.0.2" sources."mimic-fn-1.1.0" - sources."es6-promise-4.1.1" + sources."es6-promise-4.2.2" sources."extract-zip-1.6.6" sources."fs-extra-1.0.0" sources."hasha-2.2.0" @@ -30779,9 +31397,18 @@ in dependencies = [ sources."is-extendable-0.1.1" sources."is-descriptor-0.1.6" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) sources."has-values-0.1.4" sources."isarray-1.0.0" - sources."for-own-0.1.5" sources."kind-of-3.2.2" ]; }) @@ -30862,14 +31489,16 @@ in sources."extend-3.0.1" (sources."findup-sync-2.0.0" // { dependencies = [ - sources."is-descriptor-1.0.1" + sources."is-descriptor-1.0.2" + sources."is-accessor-descriptor-1.0.0" + sources."is-data-descriptor-1.0.0" sources."is-extendable-1.0.1" ]; }) sources."fined-1.1.0" sources."flagged-respawn-1.0.0" sources."is-plain-object-2.0.4" - sources."object.map-1.0.0" + sources."object.map-1.0.1" sources."rechoir-0.6.2" sources."resolve-1.5.0" sources."detect-file-1.0.0" @@ -30877,6 +31506,16 @@ in (sources."micromatch-3.1.4" // { dependencies = [ sources."is-descriptor-0.1.6" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) ]; }) sources."resolve-dir-1.0.1" @@ -30888,13 +31527,9 @@ in sources."kind-of-3.2.2" ]; }) - (sources."define-property-1.0.0" // { - dependencies = [ - sources."kind-of-5.1.0" - ]; - }) + sources."define-property-1.0.0" sources."extend-shallow-2.0.1" - (sources."extglob-2.0.2" // { + (sources."extglob-2.0.3" // { dependencies = [ sources."kind-of-5.1.0" ]; @@ -30940,17 +31575,9 @@ in sources."snapdragon-util-3.0.1" sources."assign-symbols-1.0.0" sources."is-extendable-1.0.1" - sources."is-descriptor-1.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) + sources."is-descriptor-1.0.2" + sources."is-accessor-descriptor-1.0.0" + sources."is-data-descriptor-1.0.0" (sources."expand-brackets-2.1.4" // { dependencies = [ sources."define-property-0.2.5" @@ -30965,7 +31592,7 @@ in dependencies = [ (sources."define-property-1.0.0" // { dependencies = [ - sources."kind-of-5.1.0" + sources."kind-of-6.0.2" ]; }) sources."kind-of-3.2.2" @@ -31189,10 +31816,10 @@ in html-minifier = nodeEnv.buildNodePackage { name = "html-minifier"; packageName = "html-minifier"; - version = "3.5.7"; + version = "3.5.8"; src = fetchurl { - url = "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.7.tgz"; - sha512 = "31dxgy9vqkpkkmxi45mlnp7ijqigjx1s1z9j7ngvklwp6n4rck5cs3ilw3qxz0glsgj2k9n884wrcad9433ljjsh7z8w3hamagrg10q"; + url = "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.8.tgz"; + sha512 = "29sg4r25g8awvmlyzjip0c216bjcd0nq730jd5vihagf3vpxw070gi5nd7z7333givgislxfylv4jrxn4ngqxgnwns5lg3xy3lc6zjr"; }; dependencies = [ sources."camel-case-3.0.0" @@ -31202,7 +31829,7 @@ in sources."ncname-1.0.0" sources."param-case-2.1.1" sources."relateurl-0.2.7" - (sources."uglify-js-3.2.2" // { + (sources."uglify-js-3.3.4" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -31467,7 +32094,7 @@ in sources."win-release-1.1.1" sources."is-fullwidth-code-point-2.0.0" sources."chownr-1.0.1" - sources."fs-minipass-1.2.3" + sources."fs-minipass-1.2.5" sources."minipass-2.2.1" sources."minizlib-1.1.0" sources."mkdirp-0.5.1" @@ -31632,7 +32259,7 @@ in sources."mz-2.7.0" sources."object-hash-1.2.0" sources."opentracing-0.14.1" - sources."rxjs-5.5.5" + sources."rxjs-5.5.6" sources."semaphore-async-await-1.5.1" sources."string-similarity-1.2.0" sources."typescript-2.4.2" @@ -31727,7 +32354,7 @@ in sources."escape-string-regexp-1.0.5" sources."js2xmlparser-3.0.0" sources."klaw-2.0.0" - sources."marked-0.3.7" + sources."marked-0.3.9" sources."mkdirp-0.5.1" (sources."requizzle-0.2.1" // { dependencies = [ @@ -31899,14 +32526,14 @@ in json-refs = nodeEnv.buildNodePackage { name = "json-refs"; packageName = "json-refs"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/json-refs/-/json-refs-3.0.2.tgz"; - sha512 = "0m7az6dvfn65fbak1y42663yxkachpj1fyyxxpdhkpny3bbsmgn0hpp8fb5sllmzbfyqspkqh1icpqb14pbsfnbsj7w665xmnj4a9g5"; + url = "https://registry.npmjs.org/json-refs/-/json-refs-3.0.3.tgz"; + sha512 = "3wagfrcaaj3vscma48jj349wbf838vi5fy0c02xfxd4k57qhf05mfw0i0624fvxfil9gfhx3sl35py85lfjx74hfkw6ra7kqw91p5cw"; }; dependencies = [ - sources."commander-2.12.2" - sources."graphlib-2.1.1" + sources."commander-2.11.0" + sources."graphlib-2.1.5" sources."js-yaml-3.10.0" sources."lodash-4.17.4" sources."native-promise-only-0.8.1" @@ -31990,9 +32617,8 @@ in sources."request-2.83.0" sources."server-destroy-1.0.1" sources."update-notifier-2.3.0" - (sources."yargs-10.0.3" // { + (sources."yargs-10.1.0" // { dependencies = [ - sources."strip-ansi-3.0.1" sources."is-fullwidth-code-point-1.0.0" sources."ansi-regex-2.1.1" ]; @@ -32170,11 +32796,7 @@ in sources."deep-extend-0.4.2" sources."minimist-1.2.0" sources."strip-json-comments-2.0.1" - (sources."cliui-3.2.0" // { - dependencies = [ - sources."string-width-1.0.2" - ]; - }) + sources."cliui-4.0.0" sources."decamelize-1.2.0" sources."find-up-2.1.0" sources."get-caller-file-1.0.2" @@ -32185,13 +32807,19 @@ in sources."which-module-2.0.0" sources."y18n-3.2.1" sources."yargs-parser-8.1.0" - sources."wrap-ansi-2.1.0" + (sources."wrap-ansi-2.1.0" // { + dependencies = [ + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + ]; + }) sources."code-point-at-1.1.0" sources."number-is-nan-1.0.1" sources."locate-path-2.0.0" sources."p-locate-2.0.0" sources."path-exists-3.0.0" - sources."p-limit-1.1.0" + sources."p-limit-1.2.0" + sources."p-try-1.0.0" sources."lcid-1.0.0" sources."mem-1.1.0" sources."invert-kv-1.0.0" @@ -32231,21 +32859,25 @@ in karma = nodeEnv.buildNodePackage { name = "karma"; packageName = "karma"; - version = "1.7.1"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/karma/-/karma-1.7.1.tgz"; - sha512 = "0g4s1b3k1485yxia2b8703zyw8dxjz9npijnkapv7q9jfw1piyaa2p4hsyqiajnc4n1djri6xk76q6y0jw0n9y7a5d4g6p1f26436lk"; + url = "https://registry.npmjs.org/karma/-/karma-2.0.0.tgz"; + sha512 = "0iyj9ic6sj94x4xdd6wy8zgabqbl2ydrsp8h76lwrcx27ns8pzd7bg8yibsjgddzkisb9p1gp6bn46b8g5m2lh3yj5vqx55q2ks7lib"; }; dependencies = [ sources."bluebird-3.5.1" sources."body-parser-1.18.2" - sources."chokidar-1.7.0" - sources."colors-1.1.2" - (sources."combine-lists-1.0.1" // { + (sources."browserify-14.5.0" // { dependencies = [ - sources."lodash-4.17.4" + sources."source-map-0.5.7" + sources."hash-base-2.0.2" + sources."isarray-0.0.1" + sources."acorn-5.3.0" ]; }) + sources."chokidar-1.7.0" + sources."colors-1.1.2" + sources."combine-lists-1.0.1" (sources."connect-3.6.5" // { dependencies = [ sources."statuses-1.3.1" @@ -32266,32 +32898,60 @@ in sources."graceful-fs-4.1.11" sources."http-proxy-1.16.2" sources."isbinaryfile-3.0.2" - sources."lodash-3.10.1" - (sources."log4js-0.6.38" // { + sources."lodash-4.17.4" + (sources."log4js-2.4.1" // { dependencies = [ - sources."readable-stream-1.0.34" - sources."isarray-0.0.1" + sources."debug-3.1.0" + sources."minimist-0.0.8" + sources."request-2.75.0" + sources."aws-sign2-0.6.0" + sources."caseless-0.11.0" + sources."form-data-2.0.0" + sources."har-validator-2.0.6" + sources."hawk-3.1.3" + sources."http-signature-1.1.1" + sources."qs-6.2.3" + sources."tunnel-agent-0.4.3" + sources."readable-stream-2.0.6" sources."string_decoder-0.10.31" + sources."hoek-2.16.3" + sources."boom-2.10.1" + sources."cryptiles-2.0.5" + sources."sntp-1.0.9" + sources."assert-plus-0.2.0" + sources."ms-0.7.1" + sources."isarray-0.0.1" + sources."co-3.0.6" + sources."source-map-0.5.7" + sources."ip-1.1.5" + sources."socks-1.1.9" + sources."iconv-lite-0.4.15" ]; }) sources."mime-1.6.0" sources."minimatch-3.0.4" - sources."optimist-0.6.1" + (sources."optimist-0.6.1" // { + dependencies = [ + sources."wordwrap-0.0.3" + sources."minimist-0.0.10" + ]; + }) sources."qjobs-1.1.5" sources."range-parser-1.2.0" sources."rimraf-2.6.2" sources."safe-buffer-5.1.1" - (sources."socket.io-1.7.3" // { + (sources."socket.io-2.0.4" // { dependencies = [ - sources."debug-2.3.3" - sources."ms-0.7.2" - sources."isarray-0.0.1" - sources."component-emitter-1.1.2" + sources."isarray-2.0.1" + ]; + }) + sources."source-map-0.6.1" + sources."tmp-0.0.33" + (sources."useragent-2.2.1" // { + dependencies = [ + sources."lru-cache-2.2.4" ]; }) - sources."source-map-0.5.7" - sources."tmp-0.0.31" - sources."useragent-2.2.1" sources."bytes-3.0.0" sources."content-type-1.0.4" sources."debug-2.6.9" @@ -32311,6 +32971,143 @@ in sources."media-typer-0.3.0" sources."mime-types-2.1.17" sources."mime-db-1.30.0" + sources."JSONStream-1.3.2" + sources."assert-1.4.1" + sources."browser-pack-6.0.2" + (sources."browser-resolve-1.11.2" // { + dependencies = [ + sources."resolve-1.1.7" + ]; + }) + sources."browserify-zlib-0.2.0" + sources."buffer-5.0.8" + sources."cached-path-relative-1.0.1" + (sources."concat-stream-1.5.2" // { + dependencies = [ + sources."readable-stream-2.0.6" + sources."string_decoder-0.10.31" + ]; + }) + sources."console-browserify-1.1.0" + sources."constants-browserify-1.0.0" + sources."crypto-browserify-3.12.0" + sources."defined-1.0.0" + sources."deps-sort-2.0.0" + sources."domain-browser-1.1.7" + sources."duplexer2-0.1.4" + sources."events-1.1.1" + sources."has-1.0.1" + sources."htmlescape-1.1.1" + sources."https-browserify-1.0.0" + sources."insert-module-globals-7.0.1" + sources."labeled-stream-splicer-2.0.0" + sources."module-deps-4.1.1" + sources."os-browserify-0.3.0" + sources."parents-1.0.1" + sources."path-browserify-0.0.0" + sources."process-0.11.10" + sources."punycode-1.4.1" + sources."querystring-es3-0.2.1" + sources."read-only-stream-2.0.0" + (sources."readable-stream-2.3.3" // { + dependencies = [ + sources."isarray-1.0.0" + ]; + }) + sources."resolve-1.5.0" + sources."shasum-1.0.2" + sources."shell-quote-1.6.1" + sources."stream-browserify-2.0.1" + sources."stream-http-2.7.2" + sources."string_decoder-1.0.3" + sources."subarg-1.0.0" + (sources."syntax-error-1.3.0" // { + dependencies = [ + sources."acorn-4.0.13" + ]; + }) + sources."through2-2.0.3" + sources."timers-browserify-1.4.2" + sources."tty-browserify-0.0.0" + (sources."url-0.11.0" // { + dependencies = [ + sources."punycode-1.3.2" + ]; + }) + (sources."util-0.10.3" // { + dependencies = [ + sources."inherits-2.0.1" + ]; + }) + sources."vm-browserify-0.0.4" + sources."xtend-4.0.1" + sources."jsonparse-1.3.1" + sources."through-2.3.8" + sources."combine-source-map-0.7.2" + sources."umd-3.0.1" + sources."convert-source-map-1.1.3" + sources."inline-source-map-0.6.2" + sources."lodash.memoize-3.0.4" + sources."pako-1.0.6" + sources."base64-js-1.2.1" + sources."ieee754-1.1.8" + sources."typedarray-0.0.6" + sources."core-util-is-1.0.2" + sources."isarray-1.0.0" + sources."process-nextick-args-1.0.7" + sources."util-deprecate-1.0.2" + sources."date-now-0.1.4" + sources."browserify-cipher-1.0.0" + sources."browserify-sign-4.0.4" + sources."create-ecdh-4.0.0" + sources."create-hash-1.1.3" + sources."create-hmac-1.1.6" + sources."diffie-hellman-5.0.2" + sources."pbkdf2-3.0.14" + sources."public-encrypt-4.0.0" + sources."randombytes-2.0.5" + sources."randomfill-1.0.3" + sources."browserify-aes-1.1.1" + sources."browserify-des-1.0.0" + sources."evp_bytestokey-1.0.3" + sources."buffer-xor-1.0.3" + sources."cipher-base-1.0.4" + sources."des.js-1.0.0" + sources."minimalistic-assert-1.0.0" + sources."md5.js-1.3.4" + sources."hash-base-3.0.4" + sources."bn.js-4.11.8" + sources."browserify-rsa-4.0.1" + sources."elliptic-6.4.0" + sources."parse-asn1-5.1.0" + sources."brorand-1.1.0" + sources."hash.js-1.1.3" + sources."hmac-drbg-1.0.1" + sources."minimalistic-crypto-utils-1.0.1" + sources."asn1.js-4.9.2" + sources."ripemd160-2.0.1" + sources."sha.js-2.4.9" + sources."miller-rabin-4.0.1" + sources."function-bind-1.1.1" + sources."is-buffer-1.1.6" + sources."lexical-scope-1.2.0" + sources."astw-2.2.0" + sources."acorn-4.0.13" + sources."stream-splicer-2.0.0" + sources."detective-4.7.1" + sources."stream-combiner2-1.1.1" + sources."path-platform-0.11.15" + sources."path-parse-1.0.5" + sources."json-stable-stringify-0.0.1" + sources."jsonify-0.0.0" + sources."array-filter-0.0.1" + sources."array-reduce-0.0.0" + sources."array-map-0.0.0" + sources."builtin-status-codes-3.0.0" + sources."to-arraybuffer-1.0.1" + sources."minimist-1.2.0" + sources."querystring-0.2.0" + sources."indexof-0.0.1" sources."anymatch-1.3.2" sources."async-each-1.0.1" sources."glob-parent-2.0.0" @@ -32353,8 +33150,6 @@ in ]; }) sources."repeat-string-1.6.1" - sources."isarray-1.0.0" - sources."is-buffer-1.1.6" sources."is-posix-bracket-0.1.1" sources."for-own-0.1.5" sources."is-extendable-0.1.1" @@ -32365,12 +33160,7 @@ in sources."is-primitive-2.0.0" sources."remove-trailing-separator-1.1.0" sources."binary-extensions-1.11.0" - sources."readable-stream-2.3.3" sources."set-immediate-shim-1.0.1" - sources."core-util-is-1.0.2" - sources."process-nextick-args-1.0.7" - sources."string_decoder-1.0.3" - sources."util-deprecate-1.0.2" sources."nan-2.8.0" sources."finalhandler-1.0.6" sources."parseurl-1.3.2" @@ -32388,55 +33178,198 @@ in sources."wrappy-1.0.2" sources."eventemitter3-1.2.0" sources."requires-port-1.0.0" - sources."semver-4.3.6" + sources."circular-json-0.4.0" + sources."date-format-1.2.0" + sources."semver-5.4.1" + sources."streamroller-0.7.0" + sources."hipchat-notifier-1.1.0" + sources."loggly-1.1.1" + (sources."mailgun-js-0.7.15" // { + dependencies = [ + sources."debug-2.2.0" + sources."form-data-2.1.4" + sources."semver-5.0.3" + ]; + }) + sources."nodemailer-2.7.2" + sources."redis-2.8.0" + sources."slack-node-0.2.0" + (sources."axios-0.15.3" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + ]; + }) + sources."mkdirp-0.5.1" + sources."request-2.83.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.6.0" + sources."caseless-0.12.0" + sources."combined-stream-1.0.5" + sources."forever-agent-0.6.1" + sources."form-data-2.3.1" + sources."har-validator-5.0.3" + sources."hawk-6.0.2" + sources."http-signature-1.2.0" + sources."is-typedarray-1.0.0" + sources."isstream-0.1.2" + sources."json-stringify-safe-5.0.1" + sources."oauth-sign-0.8.2" + sources."performance-now-2.1.0" + sources."stringstream-0.0.5" + sources."tough-cookie-2.3.3" + sources."tunnel-agent-0.6.0" + sources."uuid-3.1.0" + sources."delayed-stream-1.0.0" + sources."asynckit-0.4.0" + sources."ajv-5.5.2" + 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-4.3.1" + (sources."cryptiles-3.1.2" // { + dependencies = [ + sources."boom-5.2.0" + ]; + }) + 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."timespan-2.3.0" + sources."bl-1.1.2" + sources."node-uuid-1.4.8" + sources."chalk-1.1.3" + sources."commander-2.12.2" + sources."is-my-json-valid-2.17.1" + sources."pinkie-promise-2.0.1" + sources."ansi-styles-2.2.1" + sources."escape-string-regexp-1.0.5" + sources."has-ansi-2.0.0" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + sources."ansi-regex-2.1.1" + sources."generate-function-2.0.0" + sources."generate-object-property-1.2.0" + sources."jsonpointer-4.0.1" + sources."is-property-1.0.2" + sources."pinkie-2.0.4" + sources."async-2.1.5" + sources."inflection-1.10.0" + sources."is-stream-1.1.0" + (sources."path-proxy-1.0.0" // { + dependencies = [ + sources."inflection-1.3.8" + ]; + }) + sources."proxy-agent-2.0.0" + sources."q-1.4.1" + sources."tsscmp-1.0.5" + sources."agent-base-2.1.1" + sources."http-proxy-agent-1.0.0" + sources."https-proxy-agent-1.0.0" + sources."lru-cache-2.6.5" + sources."pac-proxy-agent-1.1.0" + sources."socks-proxy-agent-2.1.1" + sources."get-uri-2.0.1" + sources."pac-resolver-2.0.0" + sources."data-uri-to-buffer-1.2.0" + (sources."ftp-0.3.10" // { + dependencies = [ + sources."readable-stream-1.1.14" + ]; + }) + sources."file-uri-to-path-1.0.0" + sources."xregexp-2.0.0" + sources."netmask-1.0.6" + sources."degenerator-1.0.4" + sources."thunkify-2.1.2" + sources."ip-1.0.1" + sources."esprima-3.1.3" + sources."escodegen-1.9.0" + sources."ast-types-0.10.1" + sources."estraverse-4.2.0" + sources."esutils-2.0.2" + sources."optionator-0.8.2" + sources."prelude-ls-1.1.2" + sources."deep-is-0.1.3" + sources."wordwrap-1.0.0" + sources."type-check-0.3.2" + sources."levn-0.3.0" + sources."fast-levenshtein-2.0.6" + sources."socks-1.1.10" + sources."smart-buffer-1.1.15" + sources."libmime-3.0.0" + sources."mailcomposer-4.0.1" + sources."nodemailer-direct-transport-3.3.2" + sources."nodemailer-shared-1.1.0" + sources."nodemailer-smtp-pool-2.8.2" + sources."nodemailer-smtp-transport-2.7.2" + sources."libbase64-0.1.0" + sources."libqp-1.1.0" + sources."buildmail-4.0.1" + sources."addressparser-1.0.1" + sources."nodemailer-fetch-1.6.0" + sources."smtp-connection-2.12.0" + sources."httpntlm-1.6.1" + sources."httpreq-0.4.24" + sources."underscore-1.7.0" + sources."nodemailer-wellknown-0.1.10" + sources."double-ended-queue-2.1.0-0" + sources."redis-commands-1.3.1" + sources."redis-parser-2.6.0" + sources."requestretry-1.12.2" + sources."when-3.7.8" + sources."follow-redirects-1.0.0" sources."brace-expansion-1.1.8" sources."balanced-match-1.0.0" sources."concat-map-0.0.1" - sources."wordwrap-0.0.3" - sources."minimist-0.0.10" - sources."engine.io-1.8.3" - sources."has-binary-0.1.7" - sources."object-assign-4.1.0" - sources."socket.io-adapter-0.5.0" - sources."socket.io-client-1.7.3" - (sources."socket.io-parser-2.3.1" // { - dependencies = [ - sources."debug-2.2.0" - sources."ms-0.7.1" - ]; - }) + sources."engine.io-3.1.4" + sources."socket.io-adapter-1.1.1" + sources."socket.io-client-2.0.4" + sources."socket.io-parser-3.1.2" sources."accepts-1.3.3" sources."base64id-1.0.0" - sources."engine.io-parser-1.3.2" - sources."ws-1.1.2" + sources."engine.io-parser-2.1.2" + sources."ws-3.3.3" sources."cookie-0.3.1" + sources."uws-0.14.5" sources."negotiator-0.6.1" sources."after-0.8.2" - sources."arraybuffer.slice-0.0.6" + sources."arraybuffer.slice-0.0.7" sources."base64-arraybuffer-0.1.5" sources."blob-0.0.4" - sources."wtf-8-1.0.0" - sources."options-0.0.6" - sources."ultron-1.0.2" + sources."has-binary2-1.0.2" + sources."async-limiter-1.0.0" + sources."ultron-1.1.1" sources."backo2-1.0.2" sources."component-bind-1.0.0" sources."component-emitter-1.2.1" - sources."engine.io-client-1.8.3" - sources."indexof-0.0.1" + sources."engine.io-client-3.1.4" + sources."has-cors-1.1.0" sources."object-component-0.0.3" + sources."parseqs-0.0.5" sources."parseuri-0.0.5" sources."to-array-0.1.4" sources."component-inherit-0.0.3" - sources."has-cors-1.1.0" - sources."parsejson-0.0.3" - sources."parseqs-0.0.5" - sources."xmlhttprequest-ssl-1.5.3" + sources."xmlhttprequest-ssl-1.5.4" sources."yeast-0.1.2" sources."better-assert-1.0.2" sources."callsite-1.0.0" - sources."json3-3.3.2" sources."os-tmpdir-1.0.2" - sources."lru-cache-2.2.4" ]; buildInputs = globalBuildInputs; meta = { @@ -32651,7 +33584,7 @@ in sources."ansi-regex-3.0.0" ]; }) - sources."is-ci-1.0.10" + sources."is-ci-1.1.0" (sources."load-json-file-3.0.0" // { dependencies = [ sources."parse-json-3.0.0" @@ -32690,8 +33623,9 @@ in sources."minimist-0.1.0" ]; }) - (sources."temp-write-3.3.0" // { + (sources."temp-write-3.4.0" // { dependencies = [ + sources."pify-3.0.0" sources."uuid-3.1.0" ]; }) @@ -32855,7 +33789,8 @@ in sources."path-key-2.0.1" sources."locate-path-2.0.0" sources."p-locate-2.0.0" - sources."p-limit-1.1.0" + sources."p-limit-1.2.0" + sources."p-try-1.0.0" sources."jsonfile-4.0.0" sources."universalify-0.1.1" sources."fs.realpath-1.0.0" @@ -32918,11 +33853,7 @@ in sources."byline-5.0.0" sources."duplexer-0.1.1" sources."moment-2.20.1" - (sources."make-dir-1.1.0" // { - dependencies = [ - sources."pify-3.0.0" - ]; - }) + sources."make-dir-1.1.0" sources."temp-dir-1.0.0" sources."imurmurhash-0.1.4" sources."detect-indent-5.0.0" @@ -33103,7 +34034,7 @@ in sources."markdown-it-8.4.0" sources."markdown-it-emoji-1.4.0" sources."markdown-it-github-headings-1.1.0" - sources."markdown-it-task-checkbox-1.0.5" + sources."markdown-it-task-checkbox-1.0.6" sources."minimist-1.2.0" sources."opn-5.1.0" sources."request-2.83.0" @@ -33289,11 +34220,11 @@ in sources."socket.io-client-2.0.4" sources."socket.io-parser-3.1.2" sources."base64id-1.0.0" - sources."engine.io-parser-2.1.1" + sources."engine.io-parser-2.1.2" sources."ws-3.3.3" sources."uws-0.14.5" sources."after-0.8.2" - sources."arraybuffer.slice-0.0.6" + sources."arraybuffer.slice-0.0.7" sources."base64-arraybuffer-0.1.5" sources."blob-0.0.4" sources."has-binary2-1.0.2" @@ -33521,10 +34452,10 @@ in mocha = nodeEnv.buildNodePackage { name = "mocha"; packageName = "mocha"; - version = "4.0.1"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-4.0.1.tgz"; - sha512 = "07hbr2w894az0s1hi6lglls00nwb941ymwm580q4917kwcmsg3ngagqf9cfxyjdwwivm956dpwzsrkbk4i7a404i56w1y809a3fdw3s"; + url = "https://registry.npmjs.org/mocha/-/mocha-4.1.0.tgz"; + sha512 = "0s6517vczlh2vm9syq4kpwkwrr7panih1cip6aq8qjn9cw2gvbl14lql0y81dh10ims8p1f2qm4vkbifcrs2hw1v7cca9j71n76f5fi"; }; dependencies = [ sources."browser-stdout-1.3.0" @@ -33575,7 +34506,7 @@ in sources."argparse-1.0.9" sources."esprima-4.0.0" sources."sprintf-js-1.0.3" - sources."graphlib-2.1.1" + sources."graphlib-2.1.5" sources."native-promise-only-0.8.1" sources."path-loader-1.0.4" sources."slash-1.0.0" @@ -34341,10 +35272,10 @@ in nodemon = nodeEnv.buildNodePackage { name = "nodemon"; packageName = "nodemon"; - version = "1.14.1"; + version = "1.14.7"; src = fetchurl { - url = "https://registry.npmjs.org/nodemon/-/nodemon-1.14.1.tgz"; - sha512 = "16bny3b6b2rj8x1kskp3yviwxpz81pzs2v99pfxqjc0hjjl0dvpp6zn6227gkisvfrvszgf1bnxrq7w9bnbdm2aj4i5wv7y1ad17mry"; + url = "https://registry.npmjs.org/nodemon/-/nodemon-1.14.7.tgz"; + sha512 = "1p1rk5nr91gr6dcg6v3njabi8i74i8cgqia8hhv67jgn5mkwwiivd1k0b7rs8ccn36kpcizw6l0gff3dw1v6z2p9lw8jh7yv8n2wj5q"; }; dependencies = [ sources."chokidar-1.7.0" @@ -35288,10 +36219,10 @@ in npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "2.13.0"; + version = "2.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.13.0.tgz"; - sha512 = "3gqr04g6asacfpr7bmz0mqn3mga6vyq106wmjiyz7p4z1m58ia6zk3541s35hpf5g6wmkv52pmal8wnzxair9286jsr722lxrnn78f2"; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.14.0.tgz"; + sha512 = "1yk2hf3npvf7kjmiapbq8np5dsb9sx8iiinnfm69vabh55ahzxdv3m14s2sbbsx5q0n269jyz3qhiqx5krhvmbpgqpihas5nvwwlras"; }; dependencies = [ sources."bluebird-3.5.1" @@ -35311,9 +36242,10 @@ in sources."semver-4.3.6" ]; }) + sources."rc-config-loader-2.0.1" sources."semver-5.4.1" sources."semver-utils-1.1.1" - (sources."snyk-1.61.2" // { + (sources."snyk-1.65.1" // { dependencies = [ sources."update-notifier-0.5.0" sources."minimist-1.2.0" @@ -35368,6 +36300,16 @@ in sources."pinkie-promise-2.0.1" sources."pinkie-2.0.4" sources."jju-1.3.0" + sources."debug-2.6.9" + sources."js-yaml-3.10.0" + sources."json5-0.5.1" + sources."object-assign-4.1.1" + sources."object-keys-1.0.11" + sources."require-from-string-2.0.1" + sources."ms-2.0.0" + sources."argparse-1.0.9" + sources."esprima-4.0.0" + sources."sprintf-js-1.0.3" sources."abbrev-1.1.1" sources."ansi-escapes-1.4.0" (sources."configstore-1.4.0" // { @@ -35375,7 +36317,6 @@ in sources."uuid-2.0.3" ]; }) - sources."debug-2.6.9" sources."es6-promise-3.3.1" sources."hasbin-1.2.3" sources."inquirer-1.0.3" @@ -35384,23 +36325,23 @@ in sources."os-name-1.0.3" sources."proxy-from-env-1.0.0" sources."snyk-config-1.0.1" - sources."snyk-go-plugin-1.4.3" + sources."snyk-go-plugin-1.4.5" sources."snyk-gradle-plugin-1.2.0" sources."snyk-module-1.8.1" sources."snyk-mvn-plugin-1.1.0" - (sources."snyk-nuget-plugin-1.3.6" // { + (sources."snyk-nuget-plugin-1.3.7" // { dependencies = [ sources."debug-3.1.0" - sources."es6-promise-4.1.1" + sources."es6-promise-4.2.2" ]; }) - (sources."snyk-php-plugin-1.3.0" // { + (sources."snyk-php-plugin-1.3.1" // { dependencies = [ sources."debug-3.1.0" ]; }) sources."snyk-policy-1.10.1" - sources."snyk-python-plugin-1.4.0" + sources."snyk-python-plugin-1.4.1" sources."snyk-recursive-readdir-2.0.0" sources."snyk-resolve-1.0.0" (sources."snyk-resolve-deps-1.7.0" // { @@ -35424,7 +36365,6 @@ in sources."uuid-3.1.0" sources."graceful-fs-4.1.11" sources."mkdirp-0.5.1" - sources."object-assign-4.1.1" sources."os-tmpdir-1.0.2" sources."osenv-0.1.4" sources."write-file-atomic-1.3.4" @@ -35433,7 +36373,6 @@ in sources."os-homedir-1.0.2" sources."imurmurhash-0.1.4" sources."slide-1.1.6" - sources."ms-2.0.0" sources."async-1.5.2" sources."cli-cursor-1.0.2" sources."cli-width-2.2.0" @@ -35470,7 +36409,7 @@ in sources."longest-1.0.1" sources."repeat-string-1.6.1" sources."is-buffer-1.1.6" - sources."graphlib-2.1.1" + sources."graphlib-2.1.5" sources."toml-2.3.3" sources."clone-deep-0.3.0" sources."for-own-1.0.0" @@ -35493,11 +36432,7 @@ in sources."base64-js-0.0.2" sources."to-utf8-0.0.1" sources."email-validator-1.1.1" - sources."js-yaml-3.10.0" sources."lodash.clonedeep-4.5.0" - sources."argparse-1.0.9" - sources."esprima-4.0.0" - sources."sprintf-js-1.0.3" sources."minimatch-3.0.2" sources."brace-expansion-1.1.8" sources."balanced-match-1.0.0" @@ -35677,7 +36612,7 @@ in sources."agent-base-4.1.2" sources."debug-3.1.0" sources."es6-promisify-5.0.0" - sources."es6-promise-4.1.1" + sources."es6-promise-4.2.2" sources."ms-2.0.0" sources."ansi-escapes-3.0.0" sources."cli-cursor-2.1.0" @@ -35740,7 +36675,8 @@ in sources."locate-path-2.0.0" sources."p-locate-2.0.0" sources."path-exists-3.0.0" - sources."p-limit-1.1.0" + sources."p-limit-1.2.0" + sources."p-try-1.0.0" sources."load-json-file-2.0.0" sources."normalize-package-data-2.4.0" sources."path-type-2.0.0" @@ -35930,7 +36866,7 @@ in sources."glob-6.0.4" sources."graceful-fs-4.1.11" sources."handlebars-4.0.11" - sources."object.assign-4.0.4" + sources."object.assign-4.1.0" sources."promise-7.3.1" sources."inflight-1.0.6" sources."minimatch-3.0.4" @@ -35963,9 +36899,10 @@ in sources."longest-1.0.1" sources."repeat-string-1.6.1" sources."is-buffer-1.1.6" - sources."function-bind-1.1.1" - sources."object-keys-1.0.11" sources."define-properties-1.1.2" + sources."function-bind-1.1.1" + sources."has-symbols-1.0.0" + sources."object-keys-1.0.11" sources."foreach-2.0.5" sources."argparse-1.0.9" sources."esprima-4.0.0" @@ -36275,7 +37212,7 @@ in sources."uniq-1.0.1" sources."bencode-1.0.0" sources."simple-sha1-2.1.0" - sources."rusha-0.8.9" + sources."rusha-0.8.11" sources."decompress-response-3.3.0" sources."simple-concat-1.0.0" sources."mimic-response-1.0.0" @@ -36411,7 +37348,6 @@ in sources."accepts-1.3.3" sources."cookie-0.3.1" sources."negotiator-0.6.1" - sources."ws-1.1.2" sources."component-emitter-1.1.2" ]; }) @@ -36563,7 +37499,7 @@ in sources."flatten-0.0.1" sources."bencode-0.7.0" sources."simple-sha1-2.1.0" - sources."rusha-0.8.9" + sources."rusha-0.8.11" sources."form-data-0.0.10" sources."hawk-0.10.2" sources."node-uuid-1.4.8" @@ -36580,7 +37516,7 @@ in sources."boom-0.3.8" sources."cryptiles-0.1.3" sources."sntp-0.1.4" - sources."engine.io-1.8.4" + sources."engine.io-1.8.5" sources."has-binary-0.1.7" sources."object-assign-4.1.0" sources."socket.io-adapter-0.5.0" @@ -36593,7 +37529,7 @@ in }) sources."base64id-1.0.0" sources."engine.io-parser-1.3.2" - sources."ws-1.1.4" + sources."ws-1.1.5" sources."after-0.8.2" sources."arraybuffer.slice-0.0.6" sources."base64-arraybuffer-0.1.5" @@ -36604,7 +37540,7 @@ in sources."backo2-1.0.2" sources."component-bind-1.0.0" sources."component-emitter-1.2.1" - sources."engine.io-client-1.8.4" + sources."engine.io-client-1.8.5" sources."indexof-0.0.1" sources."object-component-0.0.3" sources."parseuri-0.0.5" @@ -36861,7 +37797,7 @@ in }) sources."hash-base-2.0.2" sources."isarray-0.0.1" - sources."acorn-5.2.1" + sources."acorn-5.3.0" ]; }) (sources."browserify-incremental-3.1.1" // { @@ -37410,7 +38346,7 @@ in sources."private-0.1.8" sources."q-1.5.1" sources."recast-0.11.23" - sources."acorn-5.2.1" + sources."acorn-5.3.0" sources."defined-1.0.0" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -38209,7 +39145,7 @@ in sources."lodash.clonedeep-4.5.0" sources."lodash.escaperegexp-4.1.2" sources."lodash.mergewith-4.6.0" - sources."postcss-6.0.14" + sources."postcss-6.0.15" sources."srcset-1.0.0" sources."xtend-4.0.1" sources."domelementtype-1.3.0" @@ -38224,8 +39160,12 @@ in sources."process-nextick-args-1.0.7" sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" - sources."chalk-2.3.0" - sources."supports-color-4.5.0" + (sources."chalk-2.3.0" // { + dependencies = [ + sources."supports-color-4.5.0" + ]; + }) + sources."supports-color-5.1.0" sources."ansi-styles-3.2.0" sources."escape-string-regexp-1.0.5" sources."color-convert-1.9.1" @@ -38442,7 +39382,7 @@ in sources."ms-2.0.0" sources."accepts-1.3.3" sources."base64id-1.0.0" - sources."engine.io-parser-2.1.1" + sources."engine.io-parser-2.1.2" sources."ws-3.3.3" sources."cookie-0.3.1" sources."uws-0.14.5" @@ -38450,7 +39390,7 @@ in sources."negotiator-0.6.1" sources."mime-db-1.30.0" sources."after-0.8.2" - sources."arraybuffer.slice-0.0.6" + sources."arraybuffer.slice-0.0.7" sources."base64-arraybuffer-0.1.5" sources."blob-0.0.4" sources."has-binary2-1.0.2" @@ -38713,6 +39653,159 @@ in production = true; bypassCache = false; }; + titanium = nodeEnv.buildNodePackage { + name = "titanium"; + packageName = "titanium"; + version = "5.0.14"; + src = fetchurl { + url = "https://registry.npmjs.org/titanium/-/titanium-5.0.14.tgz"; + sha1 = "140bd332624acae65113a3ffec10b8cbb940ad0b"; + }; + dependencies = [ + sources."adm-zip-0.4.7" + sources."async-2.1.2" + sources."colors-1.1.2" + (sources."fields-0.1.24" // { + dependencies = [ + sources."colors-0.6.2" + ]; + }) + sources."humanize-0.0.9" + sources."longjohn-0.2.11" + sources."moment-2.16.0" + (sources."node-appc-0.2.41" // { + dependencies = [ + sources."async-2.1.4" + sources."source-map-0.5.7" + sources."wordwrap-0.0.2" + ]; + }) + sources."request-2.79.0" + sources."semver-5.3.0" + sources."sprintf-0.1.5" + sources."temp-0.8.3" + (sources."winston-1.1.2" // { + dependencies = [ + sources."async-1.0.0" + sources."colors-1.0.3" + ]; + }) + sources."fs-extra-2.1.2" + sources."lodash-4.17.4" + sources."keypress-0.2.1" + sources."source-map-support-0.3.2" + sources."source-map-0.1.32" + sources."amdefine-1.0.1" + sources."diff-3.2.0" + sources."node-uuid-1.4.7" + sources."optimist-0.6.1" + sources."wrench-1.5.9" + (sources."uglify-js-2.7.5" // { + dependencies = [ + sources."async-0.2.10" + ]; + }) + sources."xmldom-0.1.27" + sources."wordwrap-0.0.3" + sources."minimist-0.0.10" + sources."uglify-to-browserify-1.0.2" + sources."yargs-3.10.0" + sources."camelcase-1.2.1" + sources."cliui-2.1.0" + sources."decamelize-1.2.0" + sources."window-size-0.1.0" + sources."center-align-0.1.3" + sources."right-align-0.1.3" + sources."align-text-0.1.4" + sources."lazy-cache-1.0.4" + sources."kind-of-3.2.2" + sources."longest-1.0.1" + sources."repeat-string-1.6.1" + sources."is-buffer-1.1.6" + sources."aws-sign2-0.6.0" + sources."aws4-1.6.0" + sources."caseless-0.11.0" + sources."combined-stream-1.0.5" + sources."extend-3.0.1" + sources."forever-agent-0.6.1" + sources."form-data-2.1.4" + sources."har-validator-2.0.6" + sources."hawk-3.1.3" + sources."http-signature-1.1.1" + sources."is-typedarray-1.0.0" + sources."isstream-0.1.2" + sources."json-stringify-safe-5.0.1" + sources."mime-types-2.1.17" + sources."oauth-sign-0.8.2" + sources."qs-6.3.2" + sources."stringstream-0.0.5" + sources."tough-cookie-2.3.3" + sources."tunnel-agent-0.4.3" + sources."uuid-3.1.0" + sources."delayed-stream-1.0.0" + sources."asynckit-0.4.0" + sources."chalk-1.1.3" + sources."commander-2.12.2" + sources."is-my-json-valid-2.17.1" + sources."pinkie-promise-2.0.1" + sources."ansi-styles-2.2.1" + sources."escape-string-regexp-1.0.5" + sources."has-ansi-2.0.0" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + sources."ansi-regex-2.1.1" + sources."generate-function-2.0.0" + sources."generate-object-property-1.2.0" + sources."jsonpointer-4.0.1" + sources."xtend-4.0.1" + sources."is-property-1.0.2" + sources."pinkie-2.0.4" + sources."hoek-2.16.3" + sources."boom-2.10.1" + sources."cryptiles-2.0.5" + sources."sntp-1.0.9" + sources."assert-plus-0.2.0" + (sources."jsprim-1.4.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."sshpk-1.13.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."extsprintf-1.3.0" + sources."json-schema-0.2.3" + sources."verror-1.10.0" + sources."core-util-is-1.0.2" + 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."os-tmpdir-1.0.2" + sources."rimraf-2.2.8" + sources."cycle-1.0.3" + sources."eyes-0.1.8" + sources."pkginfo-0.3.1" + sources."stack-trace-0.0.10" + sources."graceful-fs-4.1.11" + sources."jsonfile-2.4.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Appcelerator Titanium Command line"; + homepage = "https://github.com/appcelerator/titanium#readme"; + license = "Apache-2.0"; + }; + production = true; + bypassCache = false; + }; typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; @@ -38839,7 +39932,7 @@ in sources."is-unc-path-0.1.2" sources."unc-path-regex-0.1.2" sources."any-promise-1.3.0" - sources."make-error-1.3.0" + sources."make-error-1.3.2" sources."isobject-3.0.1" sources."error-ex-1.3.1" sources."is-arrayish-0.2.1" @@ -38941,10 +40034,10 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.2.2"; + version = "3.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.2.2.tgz"; - sha512 = "22ibn4zyyrqi1gxr94xs4kaq1y402sxwp68z9w87r4g66wgkashr3fvgrp19w01aidqma2jgmghz5283rkj00x7gxb4f86rzhxlvvgv"; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.4.tgz"; + sha512 = "2xnm5j27ds49pw0jxr30vj79ib0l0g4sbpdy7l3jvcjxdrwy0g4g8w9h69fk7fr45bs0mm9xj9pv0d1jvcva53x7xbxkr880jw31wl5"; }; dependencies = [ sources."commander-2.12.2" @@ -38962,10 +40055,10 @@ in ungit = nodeEnv.buildNodePackage { name = "ungit"; packageName = "ungit"; - version = "1.3.3"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/ungit/-/ungit-1.3.3.tgz"; - sha512 = "2ddzxzxfrgv9ihk65g4jj0qkfnr5g4akc5snb9xrhk5fmlglkas8b5bjbzvr6aazmp1idgmwqdwjsyiwd4v5s1pggkzyd605f4n03dq"; + url = "https://registry.npmjs.org/ungit/-/ungit-1.4.1.tgz"; + sha512 = "0cwk2hmqfs9j3h1r7x8sq83bca1p9njjk54m8wi70srb43lsvn1jisdcmcwdiw929m66savxbvyp37shzwmnb1dcm53czc86wbyrj61"; }; dependencies = [ sources."async-2.5.0" @@ -39274,11 +40367,11 @@ in sources."socket.io-client-2.0.4" sources."socket.io-parser-3.1.2" sources."base64id-1.0.0" - sources."engine.io-parser-2.1.1" + sources."engine.io-parser-2.1.2" sources."ws-3.3.3" sources."uws-0.14.5" sources."after-0.8.2" - sources."arraybuffer.slice-0.0.6" + sources."arraybuffer.slice-0.0.7" sources."base64-arraybuffer-0.1.5" sources."blob-0.0.4" sources."has-binary2-1.0.2" @@ -39338,7 +40431,8 @@ in sources."locate-path-2.0.0" sources."p-locate-2.0.0" sources."path-exists-3.0.0" - sources."p-limit-1.1.0" + sources."p-limit-1.2.0" + sources."p-try-1.0.0" sources."load-json-file-2.0.0" sources."path-type-2.0.0" sources."parse-json-2.2.0" @@ -39350,7 +40444,7 @@ in meta = { description = "Git made easy"; homepage = "https://github.com/FredrikNoren/ungit#readme"; - license = "SEE LICENSE IN LICENSE.md"; + license = "MIT"; }; production = true; bypassCache = false; @@ -39511,7 +40605,7 @@ in sha512 = "0n3rl5qq259csi0x5qh12wzyaypfds5wy0zrzky19wqsa0mjibrn19fdfgbabply2l576vlj8j69nzkb23jqfy6a36xb3cwi1g4l73z"; }; dependencies = [ - sources."acorn-5.2.1" + sources."acorn-5.3.0" (sources."acorn-dynamic-import-2.0.2" // { dependencies = [ sources."acorn-4.0.13" @@ -39773,7 +40867,8 @@ in sources."locate-path-2.0.0" sources."p-locate-2.0.0" sources."path-exists-3.0.0" - sources."p-limit-1.1.0" + sources."p-limit-1.2.0" + sources."p-try-1.0.0" sources."load-json-file-2.0.0" sources."normalize-package-data-2.4.0" sources."path-type-2.0.0" @@ -40016,7 +41111,7 @@ in sources."esprima-3.1.3" sources."first-chunk-stream-2.0.0" sources."jed-1.1.1" - (sources."pino-4.10.2" // { + (sources."pino-4.10.3" // { dependencies = [ sources."chalk-2.3.0" ]; @@ -40103,7 +41198,7 @@ in sources."safe-buffer-5.1.1" sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" - sources."@types/node-8.5.2" + sources."@types/node-8.5.5" sources."wcwidth-1.0.1" sources."defaults-1.0.3" sources."clone-1.0.3" @@ -40245,7 +41340,8 @@ in sources."locate-path-2.0.0" sources."p-locate-2.0.0" sources."path-exists-3.0.0" - sources."p-limit-1.1.0" + sources."p-limit-1.2.0" + sources."p-try-1.0.0" sources."load-json-file-2.0.0" sources."normalize-package-data-2.4.0" sources."path-type-2.0.0" @@ -40285,7 +41381,7 @@ in sources."typedarray-0.0.6" sources."esrecurse-4.2.0" sources."object-assign-4.1.1" - sources."acorn-5.2.1" + sources."acorn-5.3.0" (sources."acorn-jsx-3.0.1" // { dependencies = [ sources."acorn-3.3.0" @@ -40356,7 +41452,7 @@ in sources."fast-json-parse-1.0.3" sources."fast-safe-stringify-1.2.1" sources."flatstr-1.0.5" - sources."pump-1.0.3" + sources."pump-2.0.0" sources."quick-format-unescaped-1.1.1" sources."split2-2.2.0" sources."end-of-stream-1.4.0" @@ -40376,7 +41472,7 @@ in sources."moment-2.20.1" sources."nan-2.8.0" sources."ncp-2.0.0" - sources."es6-promise-4.1.1" + sources."es6-promise-4.2.2" sources."adm-zip-0.4.7" sources."archiver-1.3.0" sources."fs-extra-2.1.2" @@ -40763,7 +41859,7 @@ in sources."strip-eof-1.0.0" sources."path-key-2.0.1" sources."mimic-fn-1.1.0" - sources."p-some-2.0.0" + sources."p-some-2.0.1" sources."aggregate-error-1.0.0" sources."clean-stack-1.3.0" sources."indent-string-3.2.0" @@ -40929,7 +42025,7 @@ in sources."is-supported-regexp-flag-1.0.0" sources."locate-path-2.0.0" sources."p-locate-2.0.0" - sources."p-limit-1.1.0" + sources."p-limit-1.2.0" sources."downgrade-root-1.2.2" sources."sudo-block-1.2.0" sources."default-uid-1.0.0" diff --git a/pkgs/development/node-packages/node-packages-v8.nix b/pkgs/development/node-packages/node-packages-v8.nix index 8c7ab1d7a2e..a035e0921f0 100644 --- a/pkgs/development/node-packages/node-packages-v8.nix +++ b/pkgs/development/node-packages/node-packages-v8.nix @@ -517,13 +517,13 @@ let sha512 = "02w1ih1lh86i5ap7c3dy2ml7g5a11r0w300iyxdf6v02qr0j1x3vf78hx5q9dgg3drifab018mgm851m457zzzi05i2z2r1s3zlflc3"; }; }; - "rusha-0.8.9" = { + "rusha-0.8.11" = { name = "rusha"; packageName = "rusha"; - version = "0.8.9"; + version = "0.8.11"; src = fetchurl { - url = "https://registry.npmjs.org/rusha/-/rusha-0.8.9.tgz"; - sha1 = "77bd0951608bf81cedb948cec9c44d8ce5662219"; + url = "https://registry.npmjs.org/rusha/-/rusha-0.8.11.tgz"; + sha1 = "caa8963b1dbfd229d90626dd3f2a784430d6058d"; }; }; "varint-3.0.1" = { @@ -2056,13 +2056,13 @@ let sha1 = "4a5282ac164729e93619bcfd3ad151f817ce91f5"; }; }; - "acorn-5.2.1" = { + "acorn-5.3.0" = { name = "acorn"; packageName = "acorn"; - version = "5.2.1"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-5.2.1.tgz"; - sha512 = "3ryzhy30vzfnn2a0crafh3qsrx145ali8i88q1bc0lzl1dz0ycmjmmwh2yn9xfjs3vmjxl7nphpwcs4imgz3da5jb8fvjqbrvnjwvcc"; + url = "https://registry.npmjs.org/acorn/-/acorn-5.3.0.tgz"; + sha512 = "197zp88clmmxjyvhahqv32kv07q825hf87facxaq8qmvb1swfqnpyy4398dl56sr2fa44f7gjpzzlwy1szqzwww6746y3kmwb6gxs31"; }; }; "foreach-2.0.5" = { @@ -2209,13 +2209,13 @@ let sha1 = "9a8eac8ff79866f3f9b4bb1443ca778f1598aeda"; }; }; - "sorted-array-functions-1.0.0" = { + "sorted-array-functions-1.1.0" = { name = "sorted-array-functions"; packageName = "sorted-array-functions"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/sorted-array-functions/-/sorted-array-functions-1.0.0.tgz"; - sha1 = "c0b554d9e709affcbe56d34c1b2514197fd38279"; + url = "https://registry.npmjs.org/sorted-array-functions/-/sorted-array-functions-1.1.0.tgz"; + sha512 = "209rl01n6lwbsxl40lmh1v38sad3d94s0mjb4mz6r3wwwhzcahibr8m2fhlqgsjgzf3dja9wyhz7qjkw39gxlwpapyid2whs4nrzbnf"; }; }; "duplexify-3.5.1" = { @@ -2416,13 +2416,13 @@ let sha512 = "1dqdzm0qjk1rwq62b010b649wdpvlzdxpmwc972p0dcwsc86wqfcm8lbdcxlrwypkn2jq5df1xpbxhxfphnpr993ac543p9s212si30"; }; }; - "sodium-native-2.1.2" = { + "sodium-native-2.1.4" = { name = "sodium-native"; packageName = "sodium-native"; - version = "2.1.2"; + version = "2.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/sodium-native/-/sodium-native-2.1.2.tgz"; - sha512 = "3rkm9fyndric0yxx4qsrxmj1wbz7q4ixm6735jlsvkyi8gvibszsc017660p4gdypcikwbzfyvcxl1bpjwnbcd60gbri5xnxqd1m0yl"; + url = "https://registry.npmjs.org/sodium-native/-/sodium-native-2.1.4.tgz"; + sha512 = "3d3bbjycbpplxgjpfz78vqr8g8hp62j37hr4c3vym7ax36qzxqan73fmqw2i3wd8ix65ysdlzbnzhrs3634ngp840gfpmm9alarc80j"; }; }; "blake2b-2.1.2" = { @@ -2479,6 +2479,15 @@ let sha512 = "01a4ip2ivflpjsx4flnww5fqvdcsy2sqnjgp2cii6b2gnkkccr02vbf2y8r2wlcab4pb8x47qb3jpahca61v584bmz9xcwyqx0xdf3n"; }; }; + "ini-1.3.5" = { + name = "ini"; + packageName = "ini"; + version = "1.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz"; + sha512 = "1rjbvf1rg5ywhnba08sgagn2qf23lab330qrqmh7d891zap3xpxcyfyj1cblpf0f0rypglcfacybzyrpd4996aa1mbc820awa33k5j5"; + }; + }; "corsify-2.1.0" = { name = "corsify"; packageName = "corsify"; @@ -3361,15 +3370,6 @@ let sha1 = "48b699c27e334bf89f10892be432f6e4c7d34a7f"; }; }; - "ini-1.3.5" = { - name = "ini"; - packageName = "ini"; - version = "1.3.5"; - src = fetchurl { - url = "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz"; - sha512 = "1rjbvf1rg5ywhnba08sgagn2qf23lab330qrqmh7d891zap3xpxcyfyj1cblpf0f0rypglcfacybzyrpd4996aa1mbc820awa33k5j5"; - }; - }; "strip-json-comments-2.0.1" = { name = "strip-json-comments"; packageName = "strip-json-comments"; @@ -3755,7 +3755,7 @@ in sources."safe-buffer-5.1.1" sources."simple-sha1-2.1.0" sources."k-rpc-socket-1.7.2" - sources."rusha-0.8.9" + sources."rusha-0.8.11" sources."varint-3.0.1" sources."nan-2.8.0" sources."node-gyp-build-3.2.2" @@ -3974,7 +3974,7 @@ in sources."esprima-1.1.1" sources."source-map-0.1.43" sources."amdefine-1.0.1" - sources."acorn-5.2.1" + sources."acorn-5.3.0" sources."foreach-2.0.5" sources."object-keys-1.0.11" sources."function-bind-1.1.1" @@ -3985,7 +3985,7 @@ in sources."is-property-1.0.2" sources."os-homedir-1.0.2" sources."abstract-random-access-1.1.2" - sources."sorted-array-functions-1.0.0" + sources."sorted-array-functions-1.1.0" sources."duplexify-3.5.1" (sources."hypercore-6.11.0" // { dependencies = [ @@ -4010,13 +4010,14 @@ in sources."unordered-array-remove-1.0.2" sources."sorted-indexof-1.0.0" sources."sodium-javascript-0.5.4" - sources."sodium-native-2.1.2" + sources."sodium-native-2.1.4" sources."blake2b-2.1.2" sources."nanoassert-1.1.0" sources."siphash24-1.1.0" sources."xsalsa20-1.0.2" sources."blake2b-wasm-1.1.4" sources."base64-to-uint8array-1.0.0" + sources."ini-1.3.5" sources."corsify-2.1.0" sources."directory-index-html-2.1.0" sources."mime-1.6.0" @@ -4116,10 +4117,10 @@ in mocha = nodeEnv.buildNodePackage { name = "mocha"; packageName = "mocha"; - version = "4.0.1"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-4.0.1.tgz"; - sha512 = "07hbr2w894az0s1hi6lglls00nwb941ymwm580q4917kwcmsg3ngagqf9cfxyjdwwivm956dpwzsrkbk4i7a404i56w1y809a3fdw3s"; + url = "https://registry.npmjs.org/mocha/-/mocha-4.1.0.tgz"; + sha512 = "0s6517vczlh2vm9syq4kpwkwrr7panih1cip6aq8qjn9cw2gvbl14lql0y81dh10ims8p1f2qm4vkbifcrs2hw1v7cca9j71n76f5fi"; }; dependencies = [ sources."browser-stdout-1.3.0" From fb346c34023bc30f43ac14e7d7da25be48dcf4f4 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Fri, 5 Jan 2018 12:34:03 +0100 Subject: [PATCH 227/296] titaniumenv: upgrade to 6.3 and remove deprecated old versions --- .../mobile/titaniumenv/build-app.nix | 16 +++---- .../mobile/titaniumenv/default.nix | 8 ++-- .../mobile/titaniumenv/examples/default.nix | 6 +-- .../examples/kitchensink/default.nix | 17 ++++---- .../mobile/titaniumenv/titaniumsdk-5.1.nix | 42 ------------------- .../mobile/titaniumenv/titaniumsdk-5.2.nix | 42 ------------------- ...itaniumsdk-6.0.nix => titaniumsdk-6.3.nix} | 12 +++--- 7 files changed, 31 insertions(+), 112 deletions(-) delete mode 100644 pkgs/development/mobile/titaniumenv/titaniumsdk-5.1.nix delete mode 100644 pkgs/development/mobile/titaniumenv/titaniumsdk-5.2.nix rename pkgs/development/mobile/titaniumenv/{titaniumsdk-6.0.nix => titaniumsdk-6.3.nix} (70%) diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix index 0c9c3e3f42c..96ffaa00f9a 100644 --- a/pkgs/development/mobile/titaniumenv/build-app.nix +++ b/pkgs/development/mobile/titaniumenv/build-app.nix @@ -1,7 +1,7 @@ -{stdenv, androidsdk, titaniumsdk, titanium, alloy, xcodewrapper, jdk, python, nodejs, which, xcodeBaseDir}: -{ name, src, target, androidPlatformVersions ? [ "23" ], androidAbiVersions ? [ "armeabi" "armeabi-v7a" ], tiVersion ? null +{stdenv, androidsdk, titaniumsdk, titanium, alloy, xcodewrapper, jdk, python, nodejs, which, file, xcodeBaseDir}: +{ name, src, preBuild ? "", target, androidPlatformVersions ? [ "25" ], androidAbiVersions ? [ "armeabi" "armeabi-v7a" ], tiVersion ? null , release ? false, androidKeyStore ? null, androidKeyAlias ? null, androidKeyStorePassword ? null -, iosMobileProvisioningProfile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null, iosVersion ? "10.2" +, iosMobileProvisioningProfile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null, iosVersion ? "11.2" , enableWirelessDistribution ? false, installURL ? null }: @@ -47,9 +47,11 @@ stdenv.mkDerivation { name = stdenv.lib.replaceChars [" "] [""] name; inherit src; - buildInputs = [ nodejs titanium alloy jdk python which ] ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") xcodewrapper; + buildInputs = [ nodejs titanium alloy jdk python which file ] ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") xcodewrapper; buildPhase = '' + ${preBuild} + export HOME=$TMPDIR ${stdenv.lib.optionalString (tiVersion != null) '' @@ -77,9 +79,9 @@ stdenv.mkDerivation { export JAVA_HOME=${javaVersionFixWrapper} javac -version ''} - - titanium config --config-file $TMPDIR/config.json --no-colors android.sdk ${androidsdkComposition}/libexec - + + titanium config --config-file $TMPDIR/config.json --no-colors android.sdkPath ${androidsdkComposition}/libexec + export PATH=$(echo ${androidsdkComposition}/libexec/tools):$(echo ${androidsdkComposition}/libexec/build-tools/android-*):$PATH ${if release then diff --git a/pkgs/development/mobile/titaniumenv/default.nix b/pkgs/development/mobile/titaniumenv/default.nix index 6ca4c441e64..af3fe3592db 100644 --- a/pkgs/development/mobile/titaniumenv/default.nix +++ b/pkgs/development/mobile/titaniumenv/default.nix @@ -9,9 +9,7 @@ rec { } else null; titaniumsdk = let - titaniumSdkFile = if tiVersion == "5.1.2.GA" then ./titaniumsdk-5.1.nix - else if tiVersion == "5.2.3.GA" then ./titaniumsdk-5.2.nix - else if tiVersion == "6.0.2.GA" then ./titaniumsdk-6.0.nix + titaniumSdkFile = if tiVersion == "6.3.1.GA" then ./titaniumsdk-6.3.nix else throw "Titanium version not supported: "+tiVersion; in import titaniumSdkFile { @@ -19,8 +17,8 @@ rec { }; buildApp = import ./build-app.nix { - inherit (pkgs) stdenv python which jdk nodejs; - inherit (pkgs.nodePackages_4_x) titanium alloy; + inherit (pkgs) stdenv python which file jdk nodejs; + inherit (pkgs.nodePackages_6_x) alloy titanium; inherit (androidenv) androidsdk; inherit (xcodeenv) xcodewrapper; inherit titaniumsdk xcodeBaseDir; diff --git a/pkgs/development/mobile/titaniumenv/examples/default.nix b/pkgs/development/mobile/titaniumenv/examples/default.nix index 3c5d3a018ec..5753c8d7da9 100644 --- a/pkgs/development/mobile/titaniumenv/examples/default.nix +++ b/pkgs/development/mobile/titaniumenv/examples/default.nix @@ -1,10 +1,10 @@ { nixpkgs ? , systems ? [ "x86_64-linux" "x86_64-darwin" ] -, xcodeVersion ? "8.2.1" +, xcodeVersion ? "9.2" , xcodeBaseDir ? "/Applications/Xcode.app" -, tiVersion ? "6.0.2.GA" +, tiVersion ? "6.3.1.GA" , rename ? false -, newBundleId ? "com.example.kitchensink", iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? "Example", iosCertificatePassword ? "", iosVersion ? "10.2" +, newBundleId ? "com.example.kitchensink", iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? "Example", iosCertificatePassword ? "", iosVersion ? "11.2" , enableWirelessDistribution ? false, installURL ? null }: diff --git a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix index 4abf650ebee..5849ee368c1 100644 --- a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix +++ b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix @@ -1,5 +1,5 @@ -{ titaniumenv, fetchgit, target, androidPlatformVersions ? [ "23" ], tiVersion ? "5.1.2.GA", release ? false -, rename ? false, stdenv ? null, newBundleId ? null, iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? null, iosCertificatePassword ? null, iosVersion ? "8.1" +{ titaniumenv, fetchgit, target, androidPlatformVersions ? [ "25" "26" ], tiVersion ? "6.3.1.GA", release ? false +, rename ? false, stdenv ? null, newBundleId ? null, iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? null, iosCertificatePassword ? null, iosVersion ? "11.2" , enableWirelessDistribution ? false, installURL ? null }: @@ -9,9 +9,9 @@ let src = fetchgit { url = https://github.com/appcelerator/KitchenSink.git; rev = "ec9edebf35030f61368000a8a9071dd7a0773884"; - sha256 = "1j41w4nhcbl40x550pjgabqrach80f9dybv7ya32771wnw2000iy"; + sha256 = "3e020004b73c9c2386f2672fdf9203083295f1524f5e504a07842e062de181c8"; }; - + # Rename the bundle id to something else renamedSrc = stdenv.mkDerivation { name = "KitchenSink-renamedsrc"; @@ -29,14 +29,17 @@ in titaniumenv.buildApp { name = "KitchenSink-${target}-${if release then "release" else "debug"}"; src = if rename then renamedSrc else src; + preBuild = '' + sed -i -e "s|23|25|" tiapp.xml + ''; # Raise minimum android SDK from 23 to 25 inherit tiVersion; - + inherit target androidPlatformVersions release; - + androidKeyStore = ./keystore; androidKeyAlias = "myfirstapp"; androidKeyStorePassword = "mykeystore"; - + inherit iosMobileProvisioningProfile iosCertificate iosCertificateName iosCertificatePassword iosVersion; inherit enableWirelessDistribution installURL; } diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-5.1.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-5.1.nix deleted file mode 100644 index 670e55e0f30..00000000000 --- a/pkgs/development/mobile/titaniumenv/titaniumsdk-5.1.nix +++ /dev/null @@ -1,42 +0,0 @@ -{stdenv, fetchurl, unzip, makeWrapper, python, jdk}: - -stdenv.mkDerivation { - name = "mobilesdk-5.1.2.GA"; - src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { - url = http://builds.appcelerator.com/mobile/5_1_X/mobilesdk-5.1.2.v20151216190036-linux.zip; - sha256 = "013ipqwkfqj60mn09jbbf6a9mc4pjrn0kr0ix906whzb888zz6bv"; - } - else if stdenv.system == "x86_64-darwin" then fetchurl { - url = http://builds.appcelerator.com/mobile/5_1_X/mobilesdk-5.1.2.v20151216190036-osx.zip; - sha256 = "1ylwh7zxa5yfyckzn3a9zc4cmh8gdndgb3jyr61s3j7zb1whn9ww"; - } - else throw "Platform: ${stdenv.system} not supported!"; - - buildInputs = [ unzip makeWrapper ]; - - buildCommand = '' - mkdir -p $out - cd $out - (yes y | unzip $src) || true - - # Rename ugly version number - cd mobilesdk/* - mv * 5.1.2.GA - cd * - - # Hack to make dx.jar work with new build-tools - sed -i -e "s|path.join(dir, 'platform-tools', 'lib', 'dx.jar')|path.join(dir, 'build-tools', 'android-6.0', 'lib', 'dx.jar')|" $out/mobilesdk/*/*/node_modules/titanium-sdk/lib/android.js - - # Patch some executables - - ${if stdenv.system == "i686-linux" then - '' - patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 android/titanium_prep.linux32 - '' - else if stdenv.system == "x86_64-linux" then - '' - patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 android/titanium_prep.linux64 - '' - else ""} - ''; -} diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-5.2.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-5.2.nix deleted file mode 100644 index 511e8f0301b..00000000000 --- a/pkgs/development/mobile/titaniumenv/titaniumsdk-5.2.nix +++ /dev/null @@ -1,42 +0,0 @@ -{stdenv, fetchurl, unzip, makeWrapper, python, jdk}: - -stdenv.mkDerivation { - name = "mobilesdk-5.2.3.GA"; - src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { - url = http://builds.appcelerator.com/mobile/5_2_X/mobilesdk-5.2.3.v20160404160237-linux.zip; - sha256 = "1acvkj3nrkgf9ch4js0pnjnwq5x6ddc15pkcanshp1zlc41z16gj"; - } - else if stdenv.system == "x86_64-darwin" then fetchurl { - url = http://builds.appcelerator.com/mobile/5_2_X/mobilesdk-5.2.3.v20160404160237-osx.zip; - sha256 = "04l7mrwiy3il2kzxz6sbfmczkqlkcrnwwndfzi8h5dzgh1672b7d"; - } - else throw "Platform: ${stdenv.system} not supported!"; - - buildInputs = [ unzip makeWrapper ]; - - buildCommand = '' - mkdir -p $out - cd $out - (yes y | unzip $src) || true - - # Rename ugly version number - cd mobilesdk/* - mv * 5.2.3.GA - cd * - - # Hack to make dx.jar work with new build-tools - #sed -i -e "s|path.join(dir, 'platform-tools', 'lib', 'dx.jar')|path.join(dir, 'build-tools', 'android-6.0', 'lib', 'dx.jar')|" $out/mobilesdk/*/*/node_modules/titanium-sdk/lib/android.js - - # Patch some executables - - ${if stdenv.system == "i686-linux" then - '' - patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 android/titanium_prep.linux32 - '' - else if stdenv.system == "x86_64-linux" then - '' - patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 android/titanium_prep.linux64 - '' - else ""} - ''; -} diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-6.0.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-6.3.nix similarity index 70% rename from pkgs/development/mobile/titaniumenv/titaniumsdk-6.0.nix rename to pkgs/development/mobile/titaniumenv/titaniumsdk-6.3.nix index fdaaff39453..fac8af2b6f7 100644 --- a/pkgs/development/mobile/titaniumenv/titaniumsdk-6.0.nix +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-6.3.nix @@ -1,14 +1,14 @@ {stdenv, fetchurl, unzip, makeWrapper, python, jdk}: stdenv.mkDerivation { - name = "mobilesdk-6.0.2.GA"; + name = "mobilesdk-6.3.1.GA"; src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { - url = http://builds.appcelerator.com/mobile/6_0_X/mobilesdk-6.0.2.v20170123140026-linux.zip; - sha256 = "1yjhr4fgjnxfxzwmgw71yynrfzhsjqj2cirjr5rd14zlp4q9751q"; + url = http://builds.appcelerator.com/mobile/6_3_X/mobilesdk-6.3.1.v20171101154403-linux.zip; + sha256 = "0g8dqqf5ffa7ll3rqm5naywipnv2vvfxcj9fmqg1wnvvxf0rflqj"; } else if stdenv.system == "x86_64-darwin" then fetchurl { - url = http://builds.appcelerator.com/mobile/6_0_X/mobilesdk-6.0.2.v20170123140026-osx.zip; - sha256 = "1ijd1wp56ygy238xpcffy112akim208wbv5zm901dvych83ibw1c"; + url = http://builds.appcelerator.com/mobile/6_3_X/mobilesdk-6.3.1.v20171101154403-osx.zip; + sha256 = "00bm8vv70mg4kd7jvmxd1bfqafv6zdpdx816i0hvf801zwnak4nj"; } else throw "Platform: ${stdenv.system} not supported!"; @@ -21,7 +21,7 @@ stdenv.mkDerivation { # Rename ugly version number cd mobilesdk/* - mv * 6.0.2.GA + mv * 6.3.1.GA cd * # Patch some executables From 23984e78c977bf9d17aaaee9915ba6630d76541f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 5 Jan 2018 11:59:51 +0000 Subject: [PATCH 228/296] rescuetime: use patchelf to avoid LD_PRELOAD hack --- pkgs/applications/misc/rescuetime/default.nix | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/misc/rescuetime/default.nix b/pkgs/applications/misc/rescuetime/default.nix index 7ad8a85a419..57cdfd08d5b 100644 --- a/pkgs/applications/misc/rescuetime/default.nix +++ b/pkgs/applications/misc/rescuetime/default.nix @@ -11,33 +11,26 @@ let url = "https://www.rescuetime.com/installers/rescuetime_current_amd64.deb"; sha256 = "0b56iglg8g45biddwsdn1hmx9gsz4kxr64civwyy7f69f022ppab"; }; - -in - -stdenv.mkDerivation { +in stdenv.mkDerivation { # https://www.rescuetime.com/updates/linux_release_notes.html name = "rescuetime-2.10.0.1322"; inherit src; buildInputs = [ dpkg makeWrapper ]; + # avoid https://github.com/NixOS/patchelf/issues/99 + dontStrip = true; unpackPhase = '' mkdir pkg dpkg-deb -x $src pkg sourceRoot=pkg ''; - installPhase = let - - lib = p: stdenv.lib.makeLibraryPath [ p ]; - - in '' + installPhase = '' mkdir -p $out/bin cp usr/bin/rescuetime $out/bin ${patchelf}/bin/patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${lib.makeLibraryPath [ qt4 libXtst libXext libX11 libXScrnSaver ]}" \ $out/bin/rescuetime - - wrapProgram $out/bin/rescuetime \ - --prefix LD_PRELOAD : ${lib qt4}/libQtGui.so.4:${lib qt4}/libQtCore.so.4:${lib libXtst}/libXtst.so.6:${lib libXext}/libXext.so.6:${lib libX11}/libX11.so.6:${lib libXScrnSaver}/libXss.so.1 ''; meta = with lib; { description = "Helps you understand your daily habits so you can focus and be more productive"; From b48118189721cfb58b74fb11d8d1cdb22b355955 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Fri, 5 Jan 2018 13:50:05 +0100 Subject: [PATCH 229/296] titaniumenv: bump default versions of the SDK and Xcode --- pkgs/development/mobile/titaniumenv/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/mobile/titaniumenv/default.nix b/pkgs/development/mobile/titaniumenv/default.nix index af3fe3592db..031fe3b18c6 100644 --- a/pkgs/development/mobile/titaniumenv/default.nix +++ b/pkgs/development/mobile/titaniumenv/default.nix @@ -1,4 +1,4 @@ -{pkgs, pkgs_i686, xcodeVersion ? "8.2.1", xcodeBaseDir ? "/Applications/Xcode.app", tiVersion ? "6.0.2.GA"}: +{pkgs, pkgs_i686, xcodeVersion ? "9.2", xcodeBaseDir ? "/Applications/Xcode.app", tiVersion ? "6.3.1.GA"}: rec { androidenv = pkgs.androidenv; From d99321cf68a2b200112f384f311de2c1f87d39d8 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Fri, 5 Jan 2018 13:15:50 +0100 Subject: [PATCH 230/296] blueman: add `gobjectIntrospection` as native build dependency `gobjectIntrospection` provides a hook to fixup GI_TYPELIB_PATH. Before this change all blueman tools fail to start because they are unable to discover the Gtk3 libraries. --- pkgs/tools/bluetooth/blueman/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix index 9027bdf9c5f..71df4a1b5a5 100644 --- a/pkgs/tools/bluetooth/blueman/default.nix +++ b/pkgs/tools/bluetooth/blueman/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, intltool, pkgconfig, pythonPackages, bluez, polkit, gtk3 , obex_data_server, xdg_utils, libnotify, dnsmasq, dhcp -, hicolor_icon_theme, librsvg, wrapGAppsHook +, hicolor_icon_theme, librsvg, wrapGAppsHook, gobjectIntrospection , withPulseAudio ? true, libpulseaudio }: let @@ -15,7 +15,10 @@ in stdenv.mkDerivation rec { sha256 = "03s305mbc57nl3sq5ywh9casz926k4aqnylgaidli8bmgz1djbg9"; }; - nativeBuildInputs = [ intltool pkgconfig pythonPackages.wrapPython pythonPackages.cython wrapGAppsHook ]; + nativeBuildInputs = [ + gobjectIntrospection intltool pkgconfig pythonPackages.cython + pythonPackages.wrapPython wrapGAppsHook + ]; buildInputs = [ bluez gtk3 pythonPackages.python libnotify librsvg hicolor_icon_theme ] ++ pythonPath From c9b46ccea17ca550932c30e9a72ea979c3fe9f0a Mon Sep 17 00:00:00 2001 From: Jaakko Luttinen Date: Tue, 2 Jan 2018 21:54:11 +0200 Subject: [PATCH 231/296] nixos/service.tt-rss: fix #27048 --- nixos/modules/services/web-apps/tt-rss.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix index 76b0ee6da96..35457a1cdb8 100644 --- a/nixos/modules/services/web-apps/tt-rss.nix +++ b/nixos/modules/services/web-apps/tt-rss.nix @@ -479,7 +479,6 @@ let fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_pass unix:${phpfpmSocketName}; fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME ${cfg.root}/$fastcgi_script_name; ''; }; }; From 13eaae161006f21ca50821111d70ebaddbc843fc Mon Sep 17 00:00:00 2001 From: Jaakko Luttinen Date: Tue, 2 Jan 2018 21:45:42 +0200 Subject: [PATCH 232/296] nixos/service.tt-rss: use tt_rss user - Add tt_rss system user. - Use tt_rss as the user by default. - Create tt_rss user and group automatically if used. --- nixos/modules/misc/ids.nix | 2 ++ nixos/modules/services/web-apps/tt-rss.nix | 17 +++++++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index c6440dd906f..f44d9a7e09d 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -301,6 +301,7 @@ pykms = 282; kodi = 283; restya-board = 284; + tt_rss = 285; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -570,6 +571,7 @@ pykms = 282; kodi = 283; restya-board = 284; + tt_rss = 285; # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix index 35457a1cdb8..a94c71a95dd 100644 --- a/nixos/modules/services/web-apps/tt-rss.nix +++ b/nixos/modules/services/web-apps/tt-rss.nix @@ -99,8 +99,8 @@ let user = mkOption { type = types.str; - default = "nginx"; - example = "nginx"; + default = "tt_rss"; + example = "tt_rss"; description = '' User account under which both the update daemon and the web-application run. ''; @@ -553,5 +553,18 @@ let requires = ["${dbService}"]; after = ["network.target" "${dbService}"]; }; + + users = optionalAttrs (cfg.user == "tt_rss") { + extraUsers = singleton { + name = "tt_rss"; + group = "tt_rss"; + uid = config.ids.uids.tt_rss; + }; + extraGroups = singleton { + name = "tt_rss"; + gid = config.ids.gids.tt_rss; + }; + }; + }; } From 68855595cec81624bf3264c9adf55c5a5c8a328f Mon Sep 17 00:00:00 2001 From: Jaakko Luttinen Date: Tue, 2 Jan 2018 21:48:00 +0200 Subject: [PATCH 233/296] nixos/service.tt-rss: enable nginx automatically --- nixos/modules/services/web-apps/tt-rss.nix | 29 ++++++++++++---------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix index a94c71a95dd..df9ebf769c7 100644 --- a/nixos/modules/services/web-apps/tt-rss.nix +++ b/nixos/modules/services/web-apps/tt-rss.nix @@ -466,25 +466,28 @@ let ''; }; - services.nginx.virtualHosts = mkIf (cfg.virtualHost != null) { - "${cfg.virtualHost}" = { - root = "${cfg.root}"; + services.nginx = { + enable = true; + # NOTE: No configuration is done if not using virtual host + virtualHosts = mkIf (cfg.virtualHost != null) { + "${cfg.virtualHost}" = { + root = "${cfg.root}"; - locations."/" = { - index = "index.php"; - }; + locations."/" = { + index = "index.php"; + }; - locations."~ \.php$" = { - extraConfig = '' - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass unix:${phpfpmSocketName}; - fastcgi_index index.php; - ''; + locations."~ \.php$" = { + extraConfig = '' + fastcgi_split_path_info ^(.+\.php)(/.+)$; + fastcgi_pass unix:${phpfpmSocketName}; + fastcgi_index index.php; + ''; + }; }; }; }; - systemd.services.tt-rss = let dbService = if cfg.database.type == "pgsql" then "postgresql.service" else "mysql.service"; in { From c26ff439055faacac38e66b62817c019c0711f0f Mon Sep 17 00:00:00 2001 From: Jaakko Luttinen Date: Tue, 2 Jan 2018 21:48:40 +0200 Subject: [PATCH 234/296] nixos/service.tt-rss: improve mysql automatic setup If the user chooses MySQL, it is enabled by default. Also, the used database is created automatically along with the user and permissions. --- nixos/modules/services/web-apps/tt-rss.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix index df9ebf769c7..03565085da3 100644 --- a/nixos/modules/services/web-apps/tt-rss.nix +++ b/nixos/modules/services/web-apps/tt-rss.nix @@ -557,6 +557,20 @@ let after = ["network.target" "${dbService}"]; }; + services.mysql = optionalAttrs (cfg.database.type == "mysql") { + enable = true; + package = mkDefault pkgs.mariadb; + ensureDatabases = [ cfg.database.name ]; + ensureUsers = [ + { + name = cfg.user; + ensurePermissions = { + "${cfg.database.name}.*" = "ALL PRIVILEGES"; + }; + } + ]; + }; + users = optionalAttrs (cfg.user == "tt_rss") { extraUsers = singleton { name = "tt_rss"; From cfed96ca5188d834f1dcd71c9160293f44f9362d Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Fri, 5 Jan 2018 14:17:35 +0100 Subject: [PATCH 235/296] nixos/service.tt-rss: improve pgsql support, do not use static uid/gid --- nixos/modules/misc/ids.nix | 2 -- nixos/modules/services/web-apps/tt-rss.nix | 28 ++++++++++++---------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index f44d9a7e09d..c6440dd906f 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -301,7 +301,6 @@ pykms = 282; kodi = 283; restya-board = 284; - tt_rss = 285; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -571,7 +570,6 @@ pykms = 282; kodi = 283; restya-board = 284; - tt_rss = 285; # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix index 03565085da3..c784f4756d1 100644 --- a/nixos/modules/services/web-apps/tt-rss.nix +++ b/nixos/modules/services/web-apps/tt-rss.nix @@ -498,7 +498,7 @@ let callSql = e: if cfg.database.type == "pgsql" then '' ${optionalString (cfg.database.password != null) "PGPASSWORD=${cfg.database.password}"} \ - ${pkgs.postgresql95}/bin/psql \ + ${pkgs.sudo}/bin/sudo -u ${cfg.user} ${config.services.postgresql.package}/bin/psql \ -U ${cfg.database.user} \ ${optionalString (cfg.database.host != null) "-h ${cfg.database.host} --port ${toString dbPort}"} \ -c '${e}' \ @@ -523,6 +523,14 @@ let '' + (optionalString (cfg.database.type == "pgsql") '' + ${optionalString (cfg.database.host == null && cfg.database.password == null) '' + if ! [ -e ${cfg.root}/.db-created ]; then + ${pkgs.sudo}/bin/sudo -u ${config.services.postgresql.superUser} ${config.services.postgresql.package}/bin/createuser ${cfg.database.user} + ${pkgs.sudo}/bin/sudo -u ${config.services.postgresql.superUser} ${config.services.postgresql.package}/bin/createdb -O ${cfg.database.user} ${cfg.database.name} + touch ${cfg.root}/.db-created + fi + ''} + exists=$(${callSql "select count(*) > 0 from pg_tables where tableowner = user"} \ | tail -n+3 | head -n-2 | sed -e 's/[ \n\t]*//') @@ -559,7 +567,7 @@ let services.mysql = optionalAttrs (cfg.database.type == "mysql") { enable = true; - package = mkDefault pkgs.mariadb; + package = mkDefault pkgs.mysql; ensureDatabases = [ cfg.database.name ]; ensureUsers = [ { @@ -571,17 +579,13 @@ let ]; }; - users = optionalAttrs (cfg.user == "tt_rss") { - extraUsers = singleton { - name = "tt_rss"; - group = "tt_rss"; - uid = config.ids.uids.tt_rss; - }; - extraGroups = singleton { - name = "tt_rss"; - gid = config.ids.gids.tt_rss; - }; + services.postgresql = optionalAttrs (cfg.database.type == "pgsql") { + enable = mkDefault true; }; + users = optionalAttrs (cfg.user == "tt_rss") { + extraUsers.tt_rss.group = "tt_rss"; + extraGroups.tt_rss = {}; + }; }; } From 944376bc32da1265385e551e54db1bc0e63f9026 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Fri, 5 Jan 2018 14:41:41 +0100 Subject: [PATCH 236/296] tt-rss: 17.4 -> 2018-01-05 tt-rss switched to a rolling release model --- pkgs/servers/tt-rss/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/tt-rss/default.nix b/pkgs/servers/tt-rss/default.nix index 8724adfdad6..a6c75439ca9 100644 --- a/pkgs/servers/tt-rss/default.nix +++ b/pkgs/servers/tt-rss/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchgit }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "tt-rss-${version}"; - version = "17.4"; + version = "2018-01-05"; + rev = "c30f5e18119d1935e8fe6d422053b127e8f4f1b3"; - src = fetchgit { - url = "https://git.tt-rss.org/git/tt-rss.git"; - rev = "refs/tags/${version}"; - sha256 = "07ng21n4pva56cxnxkzd6vzs381zn67psqpm51ym5wnl644jqh08"; + src = fetchurl { + url = "https://git.tt-rss.org/git/tt-rss/archive/${rev}.tar.gz"; + sha256 = "18pc1l0dbjr7d5grcrb70y6j7cr2zb9575yqmy6zfwzrlvw0pa0l"; }; installPhase = '' @@ -19,8 +19,7 @@ stdenv.mkDerivation rec { description = "Web-based news feed (RSS/Atom) aggregator"; license = licenses.gpl2Plus; homepage = http://tt-rss.org; - maintainers = with maintainers; [ zohl ]; + maintainers = with maintainers; [ globin zohl ]; platforms = platforms.all; }; } - From b41e5ece146a6357364ca2dd1a95ece6c22d257a Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Fri, 5 Jan 2018 14:16:08 +0000 Subject: [PATCH 237/296] mysql.connector-c: fix build on Darwin Broken by #30546. --- pkgs/servers/sql/mariadb/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 66125b35378..655996986a6 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -178,6 +178,8 @@ connector-c = stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; propagatedBuildInputs = [ openssl zlib ]; + # FIXME: move libiconv outside isDarwin on staging. + buildInputs = stdenv.lib.optional stdenv.isDarwin libiconv; enableParallelBuilding = true; From f16431b0e2b07cb17fc2dd07923a1b228193c04a Mon Sep 17 00:00:00 2001 From: Ollie Charles Date: Fri, 5 Jan 2018 14:48:00 +0000 Subject: [PATCH 238/296] prometheus-rabbitmq-exporter: init at 0.25.2 --- .../prometheus/rabbitmq-exporter.nix | 26 +++ .../prometheus/rabbitmq-exporter_deps.nix | 165 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 3 files changed, 192 insertions(+) create mode 100644 pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix create mode 100644 pkgs/servers/monitoring/prometheus/rabbitmq-exporter_deps.nix diff --git a/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix b/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix new file mode 100644 index 00000000000..34120ad3fda --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix @@ -0,0 +1,26 @@ +# This file was generated by https://github.com/kamilchm/go2nix v2.0-dev +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "rabbitmq_exporter-${version}"; + version = "0.25.2"; + + goPackagePath = "github.com/kbudde/rabbitmq_exporter"; + + src = fetchFromGitHub { + owner = "kbudde"; + repo = "rabbitmq_exporter"; + rev = "8238c5d9ad509dab94e631cdecf3d75155fbdee4"; + sha256 = "1zb21jms2wlmiw5vhk1wyhv0xrv5a9y08y9q6x92hv727kjqjr6w"; + }; + + goDeps = ./rabbitmq-exporter_deps.nix; + + meta = with stdenv.lib; { + description = "Prometheus exporter for RabbitMQ"; + homepage = https://github.com/kbudde/rabbitmq_exporter; + license = licenses.mit; + maintainers = with maintainers; [ ocharles ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/monitoring/prometheus/rabbitmq-exporter_deps.nix b/pkgs/servers/monitoring/prometheus/rabbitmq-exporter_deps.nix new file mode 100644 index 00000000000..7a15a6a7b68 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/rabbitmq-exporter_deps.nix @@ -0,0 +1,165 @@ +# This file was generated by https://github.com/kamilchm/go2nix v2.0-dev +[ + { + goPackagePath = "github.com/Sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/Sirupsen/logrus"; + rev = "95cd2b9c79aa5e72ab0bc69b7ccc2be15bf850f6"; + sha256 = "1rkkhl68iw523bwxmp2prdrp8pk62xfp52wifzvbmqf8v1svwsqv"; + }; + } + { + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9"; + sha256 = "1hrybsql68xw57brzj805xx2mghydpdiysv3gbhr7f5wlxj2514y"; + }; + } + { + goPackagePath = "github.com/cenk/backoff"; + fetch = { + type = "git"; + url = "https://github.com/cenk/backoff"; + rev = "61153c768f31ee5f130071d08fc82b85208528de"; + sha256 = "08x77mgb9zsj047n74rx6c16jjx985lmy4s6fl58mdgxgxjv54y5"; + }; + } + { + goPackagePath = "github.com/fsouza/go-dockerclient"; + fetch = { + type = "git"; + url = "https://github.com/fsouza/go-dockerclient"; + rev = "1d4f4ae73768d3ca16a6fb964694f58dc5eba601"; + sha256 = "1s3m8jq8z1cm5rkn7dmjacf38n6ihkkzbdfang2aa2cgs5wl28y0"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "1e59b77b52bf8e4b449a57e6f79f21226d571845"; + sha256 = "19bkh81wnp6njg3931wky6hsnnl2d1ig20vfjxpv450sd3k6yys8"; + }; + } + { + goPackagePath = "github.com/kbudde/gobert"; + fetch = { + type = "git"; + url = "https://github.com/kbudde/gobert"; + rev = "a6daecb9ddeb548b7cfb3f5ac9deef9ded522730"; + sha256 = "06g036w4dny8wdjwvprjjcdh0vx851qphgrvilrn5lghv3jdr29z"; + }; + } + { + goPackagePath = "github.com/kylelemons/godebug"; + fetch = { + type = "git"; + url = "https://github.com/kylelemons/godebug"; + rev = "d65d576e9348f5982d7f6d83682b694e731a45c6"; + sha256 = "0bc8j9kwkp0hrsz0sm7hav7cm5jp9d6ql8r2b3mz78xb1g65xhbc"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "3247c84500bff8d9fb6d579d800f20b3e091582c"; + sha256 = "12hcych25wf725zxdkpnyx4wa0gyxl8v4m8xmhdmmaki9bbmqd0d"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "645ef00459ed84a119197bfb8d8205042c6df63d"; + sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "c5b7fccd204277076155f10851dad72b76a49317"; + sha256 = "1xqny3147g12n4j03kxm8s9mvdbs3ln6i56c655mybrn9jjy48kd"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c"; + sha256 = "19y4ywsivhpxj7ikf2j0gm9k3cmyw37qcbfi78n526jxcc7kw998"; + }; + } + { + goPackagePath = "github.com/prometheus/common"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/common"; + rev = "2e54d0b93cba2fd133edc32211dcc32c06ef72ca"; + sha256 = "14kn5w7imcxxlfdqxl21fsnlf1ms7200g3ldy29hwamldv8qlm7j"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "a6e9df898b1336106c743392c48ee0b71f5c4efa"; + sha256 = "0zyprdp9bnpywcb6b9dzwyiji60mgf0s9wnw98zndfg3xrgnkasz"; + }; + } + { + goPackagePath = "github.com/streadway/amqp"; + fetch = { + type = "git"; + url = "https://github.com/streadway/amqp"; + rev = "ff791c2d22d3f1588b4e2cc71a9fba5e1da90654"; + sha256 = "1drridn4k1n7qy82msvw9r18w4pmrah1nip36wixz098nzalz55x"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "94eea52f7b742c7cbe0b03b22f0c4c8631ece122"; + sha256 = "095zyvjb0m2pz382500miqadhk7w3nis8z3j941z8cq4rdafijvi"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "a8b9294777976932365dabb6640cf1468d95c70f"; + sha256 = "112v83jfwd1brwaanjijvb7da4dx1iqk8b4bf9ahx0hvir56c2g8"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "8b4580aae2a0dd0c231a45d3ccb8434ff533b840"; + sha256 = "1w66xqnpkskvj22a3f841qg4rgf0lzcrxp8678s6n07yw8qdh92p"; + }; + } + { + goPackagePath = "gopkg.in/ory-am/dockertest.v3"; + fetch = { + type = "git"; + url = "https://gopkg.in/ory-am/dockertest.v3"; + rev = "a7951f7a8442f0e70d36e499ed4d744f00af2963"; + sha256 = "13qv0vl79m2wirhbjs0k2a3cjl6ib7sw6rg98v95xxpn8r39ijzw"; + }; + } +] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2074d9986ee..0572fbc0293 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12131,6 +12131,7 @@ with pkgs; prometheus-node-exporter = callPackage ../servers/monitoring/prometheus/node-exporter.nix { }; prometheus-openvpn-exporter = callPackage ../servers/monitoring/prometheus/openvpn-exporter.nix { }; prometheus-pushgateway = callPackage ../servers/monitoring/prometheus/pushgateway.nix { }; + prometheus-rabbitmq-exporter = callPackage ../servers/monitoring/prometheus/rabbitmq-exporter.nix { }; prometheus-snmp-exporter = callPackage ../servers/monitoring/prometheus/snmp-exporter.nix { }; prometheus-statsd-exporter = callPackage ../servers/monitoring/prometheus/statsd-bridge.nix { }; prometheus-unifi-exporter = callPackage ../servers/monitoring/prometheus/unifi-exporter { }; From 4f5aa9bc25f1c21ecfd5cee575f2aa0eace77f71 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Fri, 5 Jan 2018 14:52:58 +0000 Subject: [PATCH 239/296] mariadb: fix eval --- pkgs/servers/sql/mariadb/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 655996986a6..f212a268a45 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, pkgconfig, ncurses, zlib, xz, lzo, lz4, bzip2, snappy -, openssl, pcre, boost, judy, bison, libxml2 +, libiconv, openssl, pcre, boost, judy, bison, libxml2 , libaio, libevent, groff, jemalloc, cracklib, systemd, numactl, perl , fixDarwinDylibNames, cctools, CoreServices }: From d1204e65c4f4d0edfe6d395805e33abee3837439 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Fri, 5 Jan 2018 15:09:02 +0000 Subject: [PATCH 240/296] ttfautohint: fix build on Darwin Broken by #33294. --- pkgs/tools/misc/ttfautohint/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/ttfautohint/default.nix b/pkgs/tools/misc/ttfautohint/default.nix index 38dac37aa7d..decbddcd477 100644 --- a/pkgs/tools/misc/ttfautohint/default.nix +++ b/pkgs/tools/misc/ttfautohint/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "1yflnydzdfkr8bi29yf42hb6h6525a4rdid3w8qjfk8rpqh53pqj"; }; - postPatch = '' + postAutoreconf = '' substituteInPlace configure --replace "macx-g++" "macx-clang" ''; From 19eb5d6c273d0d31ff4e3e6954d8ff2fc6f3c686 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 5 Jan 2018 16:28:08 +0100 Subject: [PATCH 241/296] linux: 4.9.74 -> 4.9.75 --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 1c7cc7b2f15..3b8fe6d7619 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.9.74"; + version = "4.9.75"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1ivhzmsa8n5ns8igryzb9dyaakq2p51j23f6j9kpqyby7842i1y8"; + sha256 = "1pyan45647wnliwhhp3dlmyvz7ibl1i56qplf3ilfh4dcsvk2v6y"; }; } // (args.argsOverride or {})) From ad4d26f5365b34ff86e34e2e4b3a72013ca87e29 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Fri, 5 Jan 2018 23:24:02 +0800 Subject: [PATCH 242/296] pyusb: fix reference to correct libusb1 --- 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 b356c1005bc..43f18723423 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -19818,7 +19818,7 @@ EOF unidecode = callPackage ../development/python-modules/unidecode {}; - pyusb = callPackage ../development/python-modules/pyusb {}; + pyusb = callPackage ../development/python-modules/pyusb { libusb1 = pkgs.libusb1; }; BlinkStick = buildPythonPackage rec { name = "BlinkStick-${version}"; From b5ce60228d92781c5d18fd11a05a55ffde6c238d Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 5 Jan 2018 10:33:29 -0500 Subject: [PATCH 243/296] linux: 4.14.11 -> 4.14.12 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 4fc15a9219b..550890b3557 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; import ./generic.nix (args // rec { - version = "4.14.11"; + version = "4.14.12"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); @@ -13,6 +13,6 @@ import ./generic.nix (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "02kdp2k27gqqfxjv78wqlvqn1niin72masxs97mlw79za5m9as3p"; + sha256 = "1bsn73h3ilf7msyiqm5ny2zdj30b9r7k9sc8i03w3iggh3agf236"; }; } // (args.argsOverride or {})) From 6960541eb8952d540652601b5c9fdff1c9a5e673 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 5 Jan 2018 10:34:12 -0500 Subject: [PATCH 244/296] linux: 4.4.109 -> 4.4.110 --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index ec3f81b815c..e2887b70d51 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.4.109"; + version = "4.4.110"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1i73xn85p6c62rafipmf9ja9ya149aaz6lbgnhl989fyyyh2bjd2"; + sha256 = "0n6v872ahny9j29lh60c7ha5fa1as9pdag7jsb5fcy2nmid1g6fh"; }; } // (args.argsOverride or {})) From 2edf41e6bbf1f39beaecc2716463f03e0027a79d Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 5 Jan 2018 10:32:40 -0600 Subject: [PATCH 245/296] tigervnc: build in parallel --- pkgs/tools/admin/tigervnc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index 5ba53c75371..0867a303cae 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { --with-xkb-path=${xkeyboard_config}/share/X11/xkb \ --with-xkb-bin-directory=${xorg.xkbcomp}/bin \ --with-xkb-output=$out/share/X11/xkb/compiled - make TIGERVNC_SRCDIR=`pwd`/../.. + make TIGERVNC_SRCDIR=`pwd`/../.. -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES popd ''; From 30b5b0d48b9701c1db377f3c57581d25f8982859 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 5 Jan 2018 10:34:21 -0600 Subject: [PATCH 246/296] tigervnc: enable composite (required by glx, which we enable) --- pkgs/tools/admin/tigervnc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index 0867a303cae..e4b206f5448 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { --disable-xorg --disable-xnest --disable-xvfb --disable-dmx \ --disable-xwin --disable-xephyr --disable-kdrive --with-pic \ --disable-xorgcfg --disable-xprint --disable-static \ - --disable-composite --disable-xtrap --enable-xcsecurity \ + --enable-composite --disable-xtrap --enable-xcsecurity \ --disable-{a,c,m}fb \ --disable-xwayland \ --disable-config-dbus --disable-config-udev --disable-config-hal \ From ef7ba094883dbc7b8677f5b85029b8c1bf1429ed Mon Sep 17 00:00:00 2001 From: Marcus Medom Ryding Date: Fri, 5 Jan 2018 18:06:13 +0100 Subject: [PATCH 247/296] yadm: 1.07 -> 1.12.0 --- pkgs/applications/version-management/yadm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/yadm/default.nix b/pkgs/applications/version-management/yadm/default.nix index f0185e187bb..8b2d6fcc8c3 100644 --- a/pkgs/applications/version-management/yadm/default.nix +++ b/pkgs/applications/version-management/yadm/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchFromGitHub }: -let version = "1.07"; in +let version = "1.12.0"; in stdenv.mkDerivation { name = "yadm-${version}"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { owner = "TheLocehiliosan"; repo = "yadm"; rev = "${version}"; - sha256 = "0kkxrvw17pmrx1dq0dq53jb9pm545firakrxc48znfw54n2036fw"; + sha256 = "0873jgks7dpfkj5km1jchxdrhf7lia70p0f8zsrh9p4crj5f4pc6"; }; buildCommand = '' From f106e5f101e45bbe5ef3f71de32d5a67c038f31a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 5 Jan 2018 09:33:58 +0100 Subject: [PATCH 248/296] newsboat: init at 2.10.2 --- .../feedreaders/newsboat/default.nix | 37 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/applications/networking/feedreaders/newsboat/default.nix diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix new file mode 100644 index 00000000000..22f9f7822dd --- /dev/null +++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl, stfl, sqlite, curl, gettext, pkgconfig, libxml2, json_c, ncurses +, asciidoc, docbook_xml_dtd_45, libxslt, docbook_xml_xslt, makeWrapper }: + +stdenv.mkDerivation rec { + name = "newsboat-${version}"; + version = "2.10.2"; + + src = fetchurl { + url = "https://newsboat.org/releases/${version}/${name}.tar.xz"; + sha256 = "1x4nxx1kvmrcm8jy73dvg56h4z15y3sach2vr13cw8rsbi7v99px"; + }; + + prePatch = '' + substituteInPlace Makefile --replace "|| true" "" + ''; + + nativeBuildInputs = [ pkgconfig asciidoc docbook_xml_dtd_45 libxslt docbook_xml_xslt ] + ++ stdenv.lib.optional stdenv.isDarwin makeWrapper; + + buildInputs = [ stfl sqlite curl gettext libxml2 json_c ncurses ]; + + installFlags = [ "DESTDIR=$(out)" "prefix=" ]; + + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + for prog in $out/bin/*; do + wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${stfl}/lib" + done + ''; + + meta = with stdenv.lib; { + homepage = https://newsboat.org/; + description = "A fork of Newsbeuter, an RSS/Atom feed reader for the text console."; + maintainers = with maintainers; [ dotlambda ]; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0572fbc0293..7a4fa484438 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3644,6 +3644,8 @@ with pkgs; newsbeuter = callPackage ../applications/networking/feedreaders/newsbeuter { }; + newsboat = callPackage ../applications/networking/feedreaders/newsboat { }; + nextcloud = callPackage ../servers/nextcloud { }; nextcloud-client = libsForQt5.callPackage ../applications/networking/nextcloud-client { }; From a15bd7816a87ab1331f36dd03469d03d2800d460 Mon Sep 17 00:00:00 2001 From: Yurii Rashkovskii Date: Fri, 5 Jan 2018 09:52:11 -0800 Subject: [PATCH 249/296] ponyc: 0.21.0 -> 0.21.2 --- pkgs/development/compilers/ponyc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index af9057e2cf3..e65c8438ed7 100644 --- a/pkgs/development/compilers/ponyc/default.nix +++ b/pkgs/development/compilers/ponyc/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation ( rec { name = "ponyc-${version}"; - version = "0.21.0"; + version = "0.21.2"; src = fetchFromGitHub { owner = "ponylang"; repo = "ponyc"; rev = version; - sha256 = "0kpnmgxhha22nhl2bmch47cpr0d9h5718h3w9h7qqwd994xcfk9z"; + sha256 = "0gdkm1mihn266km3q5ma7nhvjpzwdzmy39cxb7kkz8aal2nmvwri"; }; buildInputs = [ llvm makeWrapper which ]; From fdaab47d58865068afc0a1b63b9c3f9486a1e64c Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Thu, 28 Dec 2017 20:42:23 +0100 Subject: [PATCH 250/296] rust: fix sandbox build on darwin --- .../compilers/rust/binaryBuild.nix | 56 +++++++++---------- pkgs/development/compilers/rust/rustc.nix | 3 +- 2 files changed, 28 insertions(+), 31 deletions(-) diff --git a/pkgs/development/compilers/rust/binaryBuild.nix b/pkgs/development/compilers/rust/binaryBuild.nix index 8dfe26f72f4..c8af0d979e2 100644 --- a/pkgs/development/compilers/rust/binaryBuild.nix +++ b/pkgs/development/compilers/rust/binaryBuild.nix @@ -12,26 +12,6 @@ let bootstrapping = versionType == "bootstrap"; - patchBootstrapCargo = '' - ${optionalString (stdenv.isLinux && bootstrapping) '' - patchelf \ - --set-rpath "${stdenv.lib.makeLibraryPath [ curl zlib ]}" \ - --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - "$out/bin/cargo" - ''} - ${optionalString (stdenv.isDarwin && bootstrapping) '' - install_name_tool \ - -change /usr/lib/libiconv.2.dylib '${getLib libiconv}/lib/libiconv.2.dylib' \ - "$out/bin/cargo" - install_name_tool \ - -change /usr/lib/libcurl.4.dylib '${getLib curl}/lib/libcurl.4.dylib' \ - "$out/bin/cargo" - install_name_tool \ - -change /usr/lib/libz.1.dylib '${getLib zlib}/lib/libz.1.dylib' \ - "$out/bin/cargo" - ''} - ''; - installComponents = "rustc,rust-std-${platform}" + (optionalString bootstrapping ",rust-docs,cargo") @@ -56,7 +36,7 @@ rec { phases = ["unpackPhase" "installPhase" "fixupPhase"]; - propagatedBuildInputs = stdenv.lib.optional stdenv.isDarwin Security; + buildInputs = stdenv.lib.optional stdenv.isDarwin Security; installPhase = '' ./install.sh --prefix=$out \ @@ -69,14 +49,21 @@ rec { patchelf \ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ "$out/bin/rustdoc" - ''} - ${optionalString (stdenv.isDarwin && bootstrapping) '' - install_name_tool -change /usr/lib/libiconv.2.dylib '${darwin.libiconv}/lib/libiconv.2.dylib' "$out/bin/cargo" - install_name_tool -change /usr/lib/libcurl.4.dylib '${stdenv.lib.getLib curl}/lib/libcurl.4.dylib' "$out/bin/cargo" - install_name_tool -change /usr/lib/libz.1.dylib '${stdenv.lib.getLib zlib}/lib/libz.1.dylib' "$out/bin/cargo" + patchelf \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + "$out/bin/cargo" ''} - ${patchBootstrapCargo} + ${optionalString (stdenv.isDarwin && bootstrapping) '' + install_name_tool -change /usr/lib/libresolv.9.dylib '${darwin.libresolv}/lib/libresolv.9.dylib' "$out/bin/rustc" + install_name_tool -change /usr/lib/libresolv.9.dylib '${darwin.libresolv}/lib/libresolv.9.dylib' "$out/bin/rustdoc" + install_name_tool -change /usr/lib/libiconv.2.dylib '${darwin.libiconv}/lib/libiconv.2.dylib' "$out/bin/cargo" + install_name_tool -change /usr/lib/libresolv.9.dylib '${darwin.libresolv}/lib/libresolv.9.dylib' "$out/bin/cargo" + install_name_tool -change /usr/lib/libcurl.4.dylib '${stdenv.lib.getLib curl}/lib/libcurl.4.dylib' "$out/bin/cargo" + for f in $out/lib/lib*.dylib; do + install_name_tool -change /usr/lib/libresolv.9.dylib '${darwin.libresolv}/lib/libresolv.9.dylib' "$f" + done + ''} # Do NOT, I repeat, DO NOT use `wrapProgram` on $out/bin/rustc # (or similar) here. It causes strange effects where rustc loads @@ -101,14 +88,23 @@ rec { phases = ["unpackPhase" "installPhase" "fixupPhase"]; - buildInputs = [ makeWrapper ]; - propagatedBuildInputs = stdenv.lib.optional stdenv.isDarwin Security; + buildInputs = [ makeWrapper ] ++ stdenv.lib.optional stdenv.isDarwin Security; installPhase = '' ./install.sh --prefix=$out \ --components=cargo - ${patchBootstrapCargo} + ${optionalString (stdenv.isLinux && bootstrapping) '' + patchelf \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + "$out/bin/cargo" + ''} + + ${optionalString (stdenv.isDarwin && bootstrapping) '' + install_name_tool -change /usr/lib/libiconv.2.dylib '${darwin.libiconv}/lib/libiconv.2.dylib' "$out/bin/cargo" + install_name_tool -change /usr/lib/libresolv.9.dylib '${darwin.libresolv}/lib/libresolv.9.dylib' "$out/bin/cargo" + install_name_tool -change /usr/lib/libcurl.4.dylib '${stdenv.lib.getLib curl}/lib/libcurl.4.dylib' "$out/bin/cargo" + ''} wrapProgram "$out/bin/cargo" \ --suffix PATH : "${rustc}/bin" diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index ec0f100fb56..d93d8a906e0 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -17,13 +17,13 @@ let inherit (stdenv.lib) optional optionalString; + inherit (darwin.apple_sdk.frameworks) Security; procps = if stdenv.isDarwin then darwin.ps else args.procps; llvmShared = llvm.override { enableSharedLibraries = true; }; target = builtins.replaceStrings [" "] [","] (builtins.toString targets); - in stdenv.mkDerivation { @@ -141,6 +141,7 @@ stdenv.mkDerivation { ++ optional (!stdenv.isDarwin) gdb; buildInputs = [ ncurses ] ++ targetToolchains + ++ optional stdenv.isDarwin Security ++ optional (!forceBundledLLVM) llvmShared; outputs = [ "out" "man" "doc" ]; From 716194de5051165892b9362c1d863ff7ef2a8cb2 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Sun, 10 Dec 2017 10:14:24 -0500 Subject: [PATCH 251/296] aws-sdk-cpp: Enable cross-compilation --- pkgs/development/libraries/aws-sdk-cpp/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 40df40480f3..47d9e7dba4c 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -28,7 +28,8 @@ in stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; separateDebugInfo = stdenv.isLinux; - buildInputs = [ cmake curl ]; + nativeBuildInputs = [ cmake curl ]; + buildInputs = [ zlib curl openssl ]; cmakeFlags = lib.optional (!customMemoryManagement) "-DCUSTOM_MEMORY_MANAGEMENT=0" @@ -51,10 +52,6 @@ in stdenv.mkDerivation rec { rm aws-cpp-sdk-core-tests/aws/auth/AWSCredentialsProviderTest.cpp ''; - NIX_LDFLAGS = lib.concatStringsSep " " ( - (map (pkg: "-rpath ${lib.getOutput "lib" pkg}/lib")) - [ curl openssl zlib stdenv.cc.cc ]); - meta = { description = "A C++ interface for Amazon Web Services"; homepage = https://github.com/awslabs/aws-sdk-cpp; From 845632557f473a71c15b2d0ca26deb974a4c10e0 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 5 Jan 2018 20:10:08 +0100 Subject: [PATCH 252/296] colm: loosen platform restrictions Seems to build on aarch64 and i686 Linux. --- pkgs/development/compilers/colm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/colm/default.nix b/pkgs/development/compilers/colm/default.nix index ee9224b380c..06c4b62e294 100644 --- a/pkgs/development/compilers/colm/default.nix +++ b/pkgs/development/compilers/colm/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { description = "A programming language for the analysis and transformation of computer languages"; homepage = http://www.colm.net/open-source/colm; license = licenses.gpl2; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; + platforms = platforms.unix; maintainers = with maintainers; [ pSub ]; }; } From 7b97c8c0c8c450bcce24113d9a2bf2bfff1b75c9 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Fri, 5 Jan 2018 14:42:46 -0500 Subject: [PATCH 253/296] treewide: homepage+src updates (found by repology, #33263) --- pkgs/applications/audio/jackmeter/default.nix | 4 ++-- pkgs/applications/audio/mopidy/default.nix | 2 +- pkgs/applications/audio/mpc/default.nix | 2 +- pkgs/applications/audio/musescore/default.nix | 2 +- pkgs/applications/audio/ncmpc/default.nix | 2 +- .../display-managers/lightdm-gtk-greeter/default.nix | 2 +- pkgs/applications/editors/geany/default.nix | 2 +- pkgs/applications/editors/rstudio/default.nix | 2 +- pkgs/applications/editors/vbindiff/default.nix | 4 ++-- pkgs/applications/graphics/displaycal/default.nix | 2 +- pkgs/applications/graphics/meh/default.nix | 2 +- pkgs/applications/graphics/photoqt/default.nix | 4 ++-- pkgs/applications/misc/airspy/default.nix | 2 +- pkgs/applications/misc/jekyll/default.nix | 2 +- pkgs/applications/misc/octoprint/default.nix | 2 +- pkgs/applications/misc/redis-desktop-manager/default.nix | 2 +- pkgs/applications/misc/terminator/default.nix | 2 +- pkgs/applications/misc/timewarrior/default.nix | 2 +- pkgs/applications/misc/urlview/default.nix | 2 +- pkgs/applications/misc/vifm/default.nix | 4 ++-- pkgs/applications/misc/wmname/default.nix | 2 +- pkgs/applications/misc/xfontsel/default.nix | 4 ++-- pkgs/applications/misc/zathura/wrapper.nix | 2 +- pkgs/applications/networking/browsers/vimb/default.nix | 2 +- pkgs/applications/networking/irc/ii/default.nix | 2 +- pkgs/applications/networking/irc/quassel/default.nix | 2 +- pkgs/applications/networking/irc/sic/default.nix | 2 +- pkgs/applications/networking/p2p/ncdc/default.nix | 2 +- pkgs/applications/networking/p2p/qbittorrent/default.nix | 2 +- pkgs/applications/networking/p2p/tribler/default.nix | 2 +- pkgs/applications/office/ledger/default.nix | 2 +- pkgs/applications/office/mmex/default.nix | 2 +- pkgs/applications/office/mytetra/default.nix | 2 +- pkgs/applications/office/tagainijisho/default.nix | 2 +- pkgs/applications/office/tudu/default.nix | 4 ++-- pkgs/applications/science/electronics/verilator/default.nix | 2 +- pkgs/applications/search/doodle/default.nix | 4 ++-- pkgs/applications/video/minitube/default.nix | 2 +- pkgs/applications/video/ogmtools/default.nix | 4 ++-- pkgs/applications/virtualization/virtualbox/default.nix | 2 +- pkgs/applications/window-managers/dwm/default.nix | 2 +- pkgs/applications/window-managers/oroborus/default.nix | 2 +- pkgs/data/documentation/zeal/default.nix | 2 +- pkgs/data/fonts/gentium/default.nix | 4 ++-- pkgs/data/fonts/open-dyslexic/default.nix | 2 +- pkgs/desktops/gnome-3/core/sushi/default.nix | 2 +- pkgs/desktops/lxde/core/lxappearance/default.nix | 2 +- pkgs/development/compilers/coreclr/default.nix | 2 +- pkgs/development/compilers/mentor/default.nix | 2 +- pkgs/development/compilers/nim/default.nix | 4 ++-- pkgs/development/compilers/rust/rustc.nix | 2 +- pkgs/development/libraries/curlcpp/default.nix | 2 +- pkgs/development/libraries/ignition-math/default.nix | 2 +- pkgs/development/libraries/libmysqlconnectorcpp/default.nix | 2 +- pkgs/development/libraries/libserialport/default.nix | 4 ++-- pkgs/development/libraries/libsexy/default.nix | 2 +- pkgs/development/libraries/libsrs2/default.nix | 4 ++-- pkgs/development/libraries/libstatgrab/default.nix | 2 +- pkgs/development/libraries/libsvm/default.nix | 4 ++-- pkgs/development/libraries/libvdpau/default.nix | 4 ++-- pkgs/development/libraries/libvorbis/default.nix | 2 +- pkgs/development/libraries/libvpx/default.nix | 2 +- pkgs/development/libraries/libzip/default.nix | 4 ++-- pkgs/development/libraries/lightstep-tracer-cpp/default.nix | 2 +- pkgs/development/libraries/mesa/default.nix | 2 +- pkgs/development/libraries/mlt/qt-5.nix | 2 +- pkgs/development/libraries/mps/default.nix | 4 ++-- pkgs/development/libraries/ndpi/default.nix | 2 +- pkgs/development/libraries/netcdf-cxx4/default.nix | 2 +- pkgs/development/libraries/ogre/default.nix | 2 +- pkgs/development/libraries/opencv/default.nix | 2 +- pkgs/development/libraries/speex/default.nix | 2 +- pkgs/development/libraries/theft/default.nix | 2 +- pkgs/development/libraries/tremor/default.nix | 2 +- pkgs/development/libraries/vaapi-intel/default.nix | 2 +- pkgs/development/libraries/vaapi-vdpau/default.nix | 2 +- pkgs/development/libraries/vigra/default.nix | 2 +- pkgs/development/libraries/vmime/default.nix | 2 +- pkgs/development/libraries/vmmlib/default.nix | 2 +- pkgs/development/libraries/wayland/default.nix | 4 ++-- pkgs/development/libraries/websocket++/default.nix | 2 +- pkgs/development/libraries/wxsqlite3/default.nix | 2 +- pkgs/development/libraries/xapian/default.nix | 2 +- pkgs/development/libraries/xcb-util-cursor/HEAD.nix | 2 +- pkgs/development/ocaml-modules/cpdf/default.nix | 2 +- pkgs/development/tools/build-managers/pants/default.nix | 2 +- pkgs/development/tools/misc/opengrok/default.nix | 2 +- pkgs/development/tools/misc/sloccount/default.nix | 4 ++-- pkgs/development/tools/misc/teensy-loader-cli/default.nix | 2 +- pkgs/development/tools/ocaml/ocaml-top/default.nix | 2 +- pkgs/development/tools/ocaml/ocp-build/default.nix | 2 +- pkgs/games/mnemosyne/default.nix | 2 +- pkgs/games/moon-buggy/default.nix | 2 +- pkgs/games/neverball/default.nix | 4 ++-- pkgs/games/teeworlds/default.nix | 2 +- pkgs/games/tome4/default.nix | 4 ++-- pkgs/games/unnethack/default.nix | 2 +- pkgs/misc/drivers/xboxdrv/default.nix | 2 +- pkgs/misc/emulators/gens-gs/default.nix | 2 +- pkgs/misc/screensavers/xscreensaver/default.nix | 6 +++--- pkgs/misc/vim-plugins/default.nix | 2 +- pkgs/os-specific/linux/netatop/default.nix | 2 +- pkgs/os-specific/linux/pam_krb5/default.nix | 2 +- pkgs/os-specific/linux/sinit/default.nix | 2 +- pkgs/os-specific/linux/upower/default.nix | 4 ++-- pkgs/os-specific/linux/xf86-video-nested/default.nix | 2 +- pkgs/servers/dns/pdns-recursor/default.nix | 2 +- pkgs/servers/monitoring/nagios/default.nix | 2 +- pkgs/servers/monitoring/sensu/default.nix | 2 +- pkgs/servers/monitoring/zabbix/default.nix | 4 ++-- pkgs/servers/sql/mysql/5.5.x.nix | 2 +- pkgs/shells/nix-bash-completions/default.nix | 2 +- pkgs/tools/X11/sselp/default.nix | 2 +- pkgs/tools/X11/xdg-utils/default.nix | 2 +- pkgs/tools/archivers/cromfs/default.nix | 2 +- pkgs/tools/compression/xz/default.nix | 4 ++-- pkgs/tools/filesystems/mp3fs/default.nix | 2 +- pkgs/tools/filesystems/ntfs-3g/default.nix | 2 +- pkgs/tools/graphics/wkhtmltopdf/default.nix | 2 +- pkgs/tools/misc/keychain/default.nix | 2 +- pkgs/tools/misc/mrtg/default.nix | 4 ++-- pkgs/tools/misc/testdisk/default.nix | 2 +- pkgs/tools/misc/tmate/default.nix | 2 +- pkgs/tools/misc/vmtouch/default.nix | 2 +- pkgs/tools/networking/megatools/default.nix | 4 ++-- pkgs/tools/networking/miredo/default.nix | 2 +- pkgs/tools/networking/mitmproxy/default.nix | 2 +- pkgs/tools/networking/netrw/default.nix | 2 +- pkgs/tools/networking/nss-pam-ldapd/default.nix | 4 ++-- pkgs/tools/networking/openresolv/default.nix | 2 +- pkgs/tools/networking/stun/default.nix | 2 +- pkgs/tools/networking/swec/default.nix | 2 +- pkgs/tools/networking/trickle/default.nix | 2 +- pkgs/tools/networking/vpnc/default.nix | 2 +- pkgs/tools/security/fpm2/default.nix | 4 ++-- pkgs/tools/security/mkpasswd/default.nix | 2 +- pkgs/tools/security/polkit-gnome/default.nix | 2 +- pkgs/tools/security/sudo/default.nix | 4 ++-- pkgs/tools/security/tboot/default.nix | 2 +- pkgs/tools/security/tpm-tools/default.nix | 2 +- pkgs/tools/system/ctop/default.nix | 2 +- pkgs/tools/system/lshw/default.nix | 2 +- pkgs/tools/text/replace/default.nix | 2 +- pkgs/tools/text/txt2tags/default.nix | 2 +- pkgs/tools/typesetting/pdf2odt/default.nix | 2 +- pkgs/tools/virtualization/awsebcli/default.nix | 2 +- pkgs/top-level/dotnet-packages.nix | 4 ++-- 147 files changed, 178 insertions(+), 178 deletions(-) diff --git a/pkgs/applications/audio/jackmeter/default.nix b/pkgs/applications/audio/jackmeter/default.nix index 060b7f703a3..e44dfddd37b 100644 --- a/pkgs/applications/audio/jackmeter/default.nix +++ b/pkgs/applications/audio/jackmeter/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "jackmeter-0.4"; src = fetchurl { - url = "http://www.aelius.com/njh/jackmeter/${name}.tar.gz"; + url = "https://www.aelius.com/njh/jackmeter/${name}.tar.gz"; sha256 = "1cnvgx3jv0yvxlqy0l9k285zgvazmh5k8m4l7lxckjfm5bn6hm1r"; }; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Console jack loudness meter"; - homepage = http://www.aelius.com/njh/jackmeter/; + homepage = https://www.aelius.com/njh/jackmeter/; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index 7de8f6941c2..8541ec6e272 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -33,7 +33,7 @@ pythonPackages.buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = http://www.mopidy.com/; + homepage = https://www.mopidy.com/; description = '' An extensible music server that plays music from local disk, Spotify, SoundCloud, Google Play Music, and more diff --git a/pkgs/applications/audio/mpc/default.nix b/pkgs/applications/audio/mpc/default.nix index 73352b65092..220e72b568a 100644 --- a/pkgs/applications/audio/mpc/default.nix +++ b/pkgs/applications/audio/mpc/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A minimalist command line interface to MPD"; - homepage = http://www.musicpd.org/clients/mpc/; + homepage = https://www.musicpd.org/clients/mpc/; license = licenses.gpl2; maintainers = with maintainers; [ algorith ]; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index 9d6f2fc9c8f..f56ca009f1e 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Music notation and composition software"; - homepage = http://musescore.org/; + homepage = https://musescore.org/; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.vandenoever ]; diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/applications/audio/ncmpc/default.nix index 09c718c63e9..ca147ffc735 100644 --- a/pkgs/applications/audio/ncmpc/default.nix +++ b/pkgs/applications/audio/ncmpc/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Curses-based interface for MPD (music player daemon)"; - homepage = http://www.musicpd.org/clients/ncmpc/; + homepage = https://www.musicpd.org/clients/ncmpc/; license = licenses.gpl2Plus; platforms = platforms.all; maintainers = with maintainers; [ fpletz ]; diff --git a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix index 89ccb08b169..13740dd9dfd 100644 --- a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://launchpad.net/lightdm-gtk-greeter; + homepage = https://launchpad.net/lightdm-gtk-greeter; platforms = platforms.linux; license = licenses.gpl3; maintainers = with maintainers; [ ocharles wkennington ]; diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix index 5ff5c0845d0..9288d293b91 100644 --- a/pkgs/applications/editors/geany/default.nix +++ b/pkgs/applications/editors/geany/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { - Simple project management - Plugin interface ''; - homepage = http://www.geany.org/; + homepage = https://www.geany.org/; license = "GPL"; maintainers = []; platforms = platforms.all; diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index b508521790b..bf2363d3939 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -124,7 +124,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Set of integrated tools for the R language"; - homepage = http://www.rstudio.com/; + homepage = https://www.rstudio.com/; license = licenses.agpl3; maintainers = with maintainers; [ ehmry changlinli ciil ]; platforms = platforms.linux; diff --git a/pkgs/applications/editors/vbindiff/default.nix b/pkgs/applications/editors/vbindiff/default.nix index becb5ccc29a..3a3a0d1a781 100644 --- a/pkgs/applications/editors/vbindiff/default.nix +++ b/pkgs/applications/editors/vbindiff/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses ]; src = fetchurl { - url = "http://www.cjmweb.net/vbindiff/${name}.tar.gz"; + url = "https://www.cjmweb.net/vbindiff/${name}.tar.gz"; sha256 = "0gcqy4ggp60qc6blq1q1gc90xmhip1m6yvvli4hdqlz9zn3mlpbx"; }; meta = { description = "A terminal visual binary diff viewer"; - homepage = http://www.cjmweb.net/vbindiff/; + homepage = https://www.cjmweb.net/vbindiff/; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/applications/graphics/displaycal/default.nix b/pkgs/applications/graphics/displaycal/default.nix index 80d2b290367..a845bc63a38 100644 --- a/pkgs/applications/graphics/displaycal/default.nix +++ b/pkgs/applications/graphics/displaycal/default.nix @@ -49,7 +49,7 @@ buildPythonPackage { meta = { description = "Display Calibration and Characterization powered by Argyll CMS"; - homepage = http://displaycal.net/; + homepage = https://displaycal.net/; license = stdenv.lib.licenses.gpl3; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/graphics/meh/default.nix b/pkgs/applications/graphics/meh/default.nix index ac2a194b7ca..c25c1277ee0 100644 --- a/pkgs/applications/graphics/meh/default.nix +++ b/pkgs/applications/graphics/meh/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "A minimal image viewer using raw XLib"; - homepage = http://www.johnhawthorn.com/meh/; + homepage = https://www.johnhawthorn.com/meh/; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/graphics/photoqt/default.nix b/pkgs/applications/graphics/photoqt/default.nix index 82e8793199b..01affbbbd94 100644 --- a/pkgs/applications/graphics/photoqt/default.nix +++ b/pkgs/applications/graphics/photoqt/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "1.5.1"; src = fetchurl { - url = "http://photoqt.org/pkgs/photoqt-${version}.tar.gz"; + url = "https://photoqt.org/pkgs/photoqt-${version}.tar.gz"; sha256 = "17kkpzkmzfnigs26jjyd75iy58qffjsclif81cmviq73lzmqy0b1"; }; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = http://photoqt.org/; + homepage = https://photoqt.org/; description = "Simple, yet powerful and good looking image viewer"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/applications/misc/airspy/default.nix b/pkgs/applications/misc/airspy/default.nix index c015a701ab0..9b6771a3925 100644 --- a/pkgs/applications/misc/airspy/default.nix +++ b/pkgs/applications/misc/airspy/default.nix @@ -26,7 +26,7 @@ in lib.optionals stdenv.isLinux [ "-DINSTALL_UDEV_RULES=ON" ]; meta = with stdenv.lib; { - homepage = http://github.com/airspy/airspyone_host; + homepage = https://github.com/airspy/airspyone_host; description = "Host tools and driver library for the AirSpy SDR"; license = licenses.free; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/applications/misc/jekyll/default.nix b/pkgs/applications/misc/jekyll/default.nix index f3661030a2b..ad8b7b262e5 100644 --- a/pkgs/applications/misc/jekyll/default.nix +++ b/pkgs/applications/misc/jekyll/default.nix @@ -11,7 +11,7 @@ bundlerEnv rec { meta = with lib; { description = "Simple, blog aware, static site generator"; - homepage = http://jekyllrb.com/; + homepage = https://jekyllrb.com/; license = licenses.mit; maintainers = with maintainers; [ pesterhazy ]; platforms = platforms.unix; diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index a6d40c75c1c..972fbfb7b07 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -101,7 +101,7 @@ in pythonPackages.buildPythonApplication rec { checkPhase = "nosetests"; meta = with stdenv.lib; { - homepage = http://octoprint.org/; + homepage = https://octoprint.org/; description = "The snappy web interface for your 3D printer"; license = licenses.agpl3; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/applications/misc/redis-desktop-manager/default.nix b/pkgs/applications/misc/redis-desktop-manager/default.nix index ca65e4bf7f8..169d6951d45 100644 --- a/pkgs/applications/misc/redis-desktop-manager/default.nix +++ b/pkgs/applications/misc/redis-desktop-manager/default.nix @@ -76,7 +76,7 @@ EOF meta = with lib; { description = "Cross-platform open source Redis DB management tool"; - homepage = http://redisdesktop.com/; + homepage = https://redisdesktop.com/; license = licenses.lgpl21; platforms = platforms.linux; maintainers = with maintainers; [ cstrahan ]; diff --git a/pkgs/applications/misc/terminator/default.nix b/pkgs/applications/misc/terminator/default.nix index 3959ad88ece..e4b1d7f8c1b 100644 --- a/pkgs/applications/misc/terminator/default.nix +++ b/pkgs/applications/misc/terminator/default.nix @@ -32,7 +32,7 @@ pythonPackages.buildPythonApplication rec { quadkonsole, etc. in that the main focus is arranging terminals in grids (tabs is the most common default method, which Terminator also supports). ''; - homepage = http://gnometerminator.blogspot.no/p/introduction.html; + homepage = https://gnometerminator.blogspot.no/p/introduction.html; license = licenses.gpl2; maintainers = with maintainers; [ bjornfor globin ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/timewarrior/default.nix b/pkgs/applications/misc/timewarrior/default.nix index d417140b29b..f5201f8061f 100644 --- a/pkgs/applications/misc/timewarrior/default.nix +++ b/pkgs/applications/misc/timewarrior/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A command-line time tracker"; - homepage = http://tasktools.org/projects/timewarrior.html; + homepage = https://tasktools.org/projects/timewarrior.html; license = licenses.mit; maintainers = with maintainers; [ matthiasbeyer ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/urlview/default.nix b/pkgs/applications/misc/urlview/default.nix index daf93e8c469..8764c41c8a4 100644 --- a/pkgs/applications/misc/urlview/default.nix +++ b/pkgs/applications/misc/urlview/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "Extract URLs from text"; - homepage = http://packages.qa.debian.org/u/urlview.html; + homepage = https://packages.qa.debian.org/u/urlview.html; license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; linux ++ darwin; }; diff --git a/pkgs/applications/misc/vifm/default.nix b/pkgs/applications/misc/vifm/default.nix index ffeca99cf9c..c43ec5efbaf 100644 --- a/pkgs/applications/misc/vifm/default.nix +++ b/pkgs/applications/misc/vifm/default.nix @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ raskin garbas ]; platforms = platforms.linux; license = licenses.gpl2; - downloadPage = "http://vifm.info/downloads.shtml"; - homepage = http://vifm.info/; + downloadPage = "https://vifm.info/downloads.shtml"; + homepage = https://vifm.info/; inherit version; updateWalker = true; }; diff --git a/pkgs/applications/misc/wmname/default.nix b/pkgs/applications/misc/wmname/default.nix index dfd3c487713..fe0348cad21 100644 --- a/pkgs/applications/misc/wmname/default.nix +++ b/pkgs/applications/misc/wmname/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { description = "Prints or set the window manager name property of the root window"; - homepage = http://tools.suckless.org/wmname; + homepage = https://tools.suckless.org/wmname; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/applications/misc/xfontsel/default.nix b/pkgs/applications/misc/xfontsel/default.nix index 7d22a160574..b152badcda4 100644 --- a/pkgs/applications/misc/xfontsel/default.nix +++ b/pkgs/applications/misc/xfontsel/default.nix @@ -1,5 +1,5 @@ # This program used to come with xorg releases, but now I could only find it -# at http://www.x.org/releases/individual/. +# at https://www.x.org/releases/individual/. # That is why this expression is not inside pkgs.xorg {stdenv, fetchurl, makeWrapper, libX11, pkgconfig, libXaw}: @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.x.org/; + homepage = https://www.x.org/; description = "Allows testing the fonts available in an X server"; license = stdenv.lib.licenses.free; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/applications/misc/zathura/wrapper.nix b/pkgs/applications/misc/zathura/wrapper.nix index 55ac9bd187a..0f12251a3df 100644 --- a/pkgs/applications/misc/zathura/wrapper.nix +++ b/pkgs/applications/misc/zathura/wrapper.nix @@ -16,7 +16,7 @@ in symlinkJoin { ''; meta = with lib; { - homepage = http://pwmt.org/projects/zathura/; + homepage = https://pwmt.org/projects/zathura/; description = "A highly customizable and functional PDF viewer"; longDescription = '' Zathura is a highly customizable and functional PDF viewer based on the diff --git a/pkgs/applications/networking/browsers/vimb/default.nix b/pkgs/applications/networking/browsers/vimb/default.nix index c654723f4c2..ce06dea7010 100644 --- a/pkgs/applications/networking/browsers/vimb/default.nix +++ b/pkgs/applications/networking/browsers/vimb/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { editor and also easily configurable during runtime. Vimb is mostly keyboard driven and does not detract you from your daily work. ''; - homepage = http://fanglingsu.github.io/vimb/; + homepage = https://fanglingsu.github.io/vimb/; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.rickynils ]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/applications/networking/irc/ii/default.nix b/pkgs/applications/networking/irc/ii/default.nix index c6bb2479bfc..5e65c0dfeaf 100644 --- a/pkgs/applications/networking/irc/ii/default.nix +++ b/pkgs/applications/networking/irc/ii/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://tools.suckless.org/ii/; + homepage = https://tools.suckless.org/ii/; license = stdenv.lib.licenses.mit; description = "Irc it, simple FIFO based irc client"; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index 78646f7a8b2..7c685b9df6b 100644 --- a/pkgs/applications/networking/irc/quassel/default.nix +++ b/pkgs/applications/networking/irc/quassel/default.nix @@ -74,7 +74,7 @@ in with stdenv; mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://quassel-irc.org/; + homepage = https://quassel-irc.org/; description = "Qt/KDE distributed IRC client suppporting a remote daemon"; longDescription = '' Quassel IRC is a cross-platform, distributed IRC client, diff --git a/pkgs/applications/networking/irc/sic/default.nix b/pkgs/applications/networking/irc/sic/default.nix index 6f48f44214c..975715ed7fc 100644 --- a/pkgs/applications/networking/irc/sic/default.nix +++ b/pkgs/applications/networking/irc/sic/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { description = "Simple IRC client"; - homepage = http://tools.suckless.org/sic/; + homepage = https://tools.suckless.org/sic/; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/applications/networking/p2p/ncdc/default.nix b/pkgs/applications/networking/p2p/ncdc/default.nix index 6d204de9ac4..400600751a2 100644 --- a/pkgs/applications/networking/p2p/ncdc/default.nix +++ b/pkgs/applications/networking/p2p/ncdc/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Modern and lightweight direct connect client with a friendly ncurses interface"; - homepage = http://dev.yorhel.nl/ncdc; + homepage = https://dev.yorhel.nl/ncdc; license = licenses.mit; platforms = platforms.linux; # arbitrary maintainers = with maintainers; [ ehmry ]; diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index a2b72ea99dc..59c48c0a3d3 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { description = "Free Software alternative to µtorrent"; - homepage = http://www.qbittorrent.org/; + homepage = https://www.qbittorrent.org/; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ viric ]; diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix index 9d26a74f8bb..d8e0c76dc49 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/pkgs/applications/networking/p2p/tribler/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { maintainers = with maintainers; [ xvapx ]; - homepage = http://www.tribler.org/; + homepage = https://www.tribler.org/; description = "A completely decentralised P2P filesharing client based on the Bittorrent protocol"; license = licenses.lgpl21; platforms = platforms.linux; diff --git a/pkgs/applications/office/ledger/default.nix b/pkgs/applications/office/ledger/default.nix index 2d66fe4b309..bb6e529f5d2 100644 --- a/pkgs/applications/office/ledger/default.nix +++ b/pkgs/applications/office/ledger/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://ledger-cli.org/; + homepage = https://ledger-cli.org/; description = "A double-entry accounting system with a command-line reporting interface"; license = licenses.bsd3; diff --git a/pkgs/applications/office/mmex/default.nix b/pkgs/applications/office/mmex/default.nix index 30b8809f224..3ddca8fe762 100644 --- a/pkgs/applications/office/mmex/default.nix +++ b/pkgs/applications/office/mmex/default.nix @@ -17,7 +17,7 @@ in meta = { description = "Easy-to-use personal finance software"; - homepage = http://www.moneymanagerex.org/; + homepage = https://www.moneymanagerex.org/; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/applications/office/mytetra/default.nix b/pkgs/applications/office/mytetra/default.nix index 9f54f2df6bf..b752f552ba9 100644 --- a/pkgs/applications/office/mytetra/default.nix +++ b/pkgs/applications/office/mytetra/default.nix @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Smart manager for information collecting"; - homepage = http://webhamster.ru/site/page/index/articles/projectcode/138; + homepage = https://webhamster.ru/site/page/index/articles/projectcode/138; license = licenses.gpl3; maintainers = [ maintainers.gnidorah ]; platforms = platforms.linux; diff --git a/pkgs/applications/office/tagainijisho/default.nix b/pkgs/applications/office/tagainijisho/default.nix index bd7d537a2c6..24542041cc8 100644 --- a/pkgs/applications/office/tagainijisho/default.nix +++ b/pkgs/applications/office/tagainijisho/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A free, open-source Japanese dictionary and kanji lookup tool"; - homepage = http://www.tagaini.net/; + homepage = https://www.tagaini.net/; license = with licenses; [ /* program */ gpl3Plus /* data */ cc-by-sa-30 diff --git a/pkgs/applications/office/tudu/default.nix b/pkgs/applications/office/tudu/default.nix index 76ad47950c4..a957cd6eee6 100644 --- a/pkgs/applications/office/tudu/default.nix +++ b/pkgs/applications/office/tudu/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.10"; src = fetchurl { - url = "http://code.meskio.net/tudu/${name}.tar.gz"; + url = "https://code.meskio.net/tudu/${name}.tar.gz"; sha256 = "0571wh5hn0hgadyx34zq1zi35pzd7vpwkavm7kzb9hwgn07443x4"; }; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "ncurses-based hierarchical todo list manager with vim-like keybindings"; - homepage = http://code.meskio.net/tudu/; + homepage = https://code.meskio.net/tudu/; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix index 31c2d4f6475..e3438386557 100644 --- a/pkgs/applications/science/electronics/verilator/default.nix +++ b/pkgs/applications/science/electronics/verilator/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "Fast and robust (System)Verilog simulator/compiler"; - homepage = "http://www.veripool.org/wiki/verilator"; + homepage = "https://www.veripool.org/wiki/verilator"; license = stdenv.lib.licenses.lgpl3; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; diff --git a/pkgs/applications/search/doodle/default.nix b/pkgs/applications/search/doodle/default.nix index 3a9df150574..ba9fbee5d96 100644 --- a/pkgs/applications/search/doodle/default.nix +++ b/pkgs/applications/search/doodle/default.nix @@ -6,12 +6,12 @@ stdenv.mkDerivation rec { buildInputs = [ libextractor gettext ]; src = fetchurl { - url = "http://grothoff.org/christian/doodle/download/${name}.tar.gz"; + url = "https://grothoff.org/christian/doodle/download/${name}.tar.gz"; sha256 = "0ayx5q7chzll9sv3miq35xl36r629cvgdzphf379kxzlzhjldy3j"; }; meta = { - homepage = http://grothoff.org/christian/doodle/; + homepage = https://grothoff.org/christian/doodle/; description = "Tool to quickly index and search documents on a computer"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/applications/video/minitube/default.nix b/pkgs/applications/video/minitube/default.nix index f70c142ab41..bef3a78d782 100644 --- a/pkgs/applications/video/minitube/default.nix +++ b/pkgs/applications/video/minitube/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { you an endless video stream. Minitube is not about cloning the YouTube website, it aims to create a new TV-like experience. ''; - homepage = http://flavio.tordini.org/minitube; + homepage = https://flavio.tordini.org/minitube; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ nckx ]; diff --git a/pkgs/applications/video/ogmtools/default.nix b/pkgs/applications/video/ogmtools/default.nix index 83e69495b03..221f4fc0e5c 100644 --- a/pkgs/applications/video/ogmtools/default.nix +++ b/pkgs/applications/video/ogmtools/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "ogmtools-1.5"; src = fetchurl { - url = "http://www.bunkus.org/videotools/ogmtools/${name}.tar.bz2"; + url = "https://www.bunkus.org/videotools/ogmtools/${name}.tar.bz2"; sha256 = "1spx81p5wf59ksl3r3gvf78d77sh7gj8a6lw773iv67bphfivmn8"; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { (ogmdemux) or creation of (ogmmerge) OGG media streams. Includes dvdxchap tool for extracting chapter information from DVD. ''; - homepage = http://www.bunkus.org/videotools/ogmtools/; + homepage = https://www.bunkus.org/videotools/ogmtools/; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index d46702d6205..3e9322ddeaf 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -207,7 +207,7 @@ in stdenv.mkDerivation { meta = { description = "PC emulator"; license = licenses.gpl2; - homepage = http://www.virtualbox.org/; + homepage = https://www.virtualbox.org/; maintainers = with maintainers; [ flokli sander ]; platforms = [ "x86_64-linux" "i686-linux" ]; }; diff --git a/pkgs/applications/window-managers/dwm/default.nix b/pkgs/applications/window-managers/dwm/default.nix index 9f6c8937518..76352753db1 100644 --- a/pkgs/applications/window-managers/dwm/default.nix +++ b/pkgs/applications/window-managers/dwm/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { buildPhase = " make "; meta = { - homepage = http://suckless.org/; + homepage = https://suckless.org/; description = "Dynamic window manager for X"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/applications/window-managers/oroborus/default.nix b/pkgs/applications/window-managers/oroborus/default.nix index d2bf1e5a96d..13eef1c045a 100644 --- a/pkgs/applications/window-managers/oroborus/default.nix +++ b/pkgs/applications/window-managers/oroborus/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "A really minimalistic X window manager"; - homepage = http://www.oroborus.org/; + homepage = https://www.oroborus.org/; license = licenses.gpl2Plus; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix index 1951429fa90..68a1fb92cc8 100644 --- a/pkgs/data/documentation/zeal/default.nix +++ b/pkgs/data/documentation/zeal/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { Zeal is a simple offline API documentation browser inspired by Dash (macOS app), available for Linux and Windows. ''; - homepage = http://zealdocs.org/; + homepage = https://zealdocs.org/; license = licenses.gpl3; maintainers = with maintainers; [ skeidel peterhoeg ]; platforms = platforms.linux; diff --git a/pkgs/data/fonts/gentium/default.nix b/pkgs/data/fonts/gentium/default.nix index 2e2ffdeb5bb..829eca8c06f 100644 --- a/pkgs/data/fonts/gentium/default.nix +++ b/pkgs/data/fonts/gentium/default.nix @@ -18,7 +18,7 @@ in fetchzip rec { sha256 = "1qr2wjdmm93167b0w9cidlf3wwsyjx4838ja9jmm4jkyian5whhp"; meta = with stdenv.lib; { - homepage = http://software.sil.org/gentium/; + homepage = https://software.sil.org/gentium/; description = "A high-quality typeface family for Latin, Cyrillic, and Greek"; longDescription = '' Gentium is a typeface family designed to enable the diverse ethnic groups @@ -35,7 +35,7 @@ in fetchzip rec { This package contains the regular and italic styles for the Gentium Plus font family, along with documentation. ''; - downloadPage = "http://software.sil.org/gentium/download/"; + downloadPage = "https://software.sil.org/gentium/download/"; maintainers = with maintainers; [ raskin rycee ]; license = licenses.ofl; platforms = platforms.all; diff --git a/pkgs/data/fonts/open-dyslexic/default.nix b/pkgs/data/fonts/open-dyslexic/default.nix index 9b132463972..40a9be3282e 100644 --- a/pkgs/data/fonts/open-dyslexic/default.nix +++ b/pkgs/data/fonts/open-dyslexic/default.nix @@ -16,7 +16,7 @@ in fetchzip { sha256 = "045xc7kj56q4ygnjppm8f8fwqqvf21x1piabm4nh8hwgly42a3w2"; meta = with stdenv.lib; { - homepage = http://opendyslexic.org/; + homepage = https://opendyslexic.org/; description = "Font created to increase readability for readers with dyslexia"; license = "Bitstream Vera License (https://www.gnome.org/fonts/#Final_Bitstream_Vera_Fonts)"; platforms = platforms.all; diff --git a/pkgs/desktops/gnome-3/core/sushi/default.nix b/pkgs/desktops/gnome-3/core/sushi/default.nix index 638c0cbe7dc..37b311256bd 100644 --- a/pkgs/desktops/gnome-3/core/sushi/default.nix +++ b/pkgs/desktops/gnome-3/core/sushi/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = "http://en.wikipedia.org/wiki/Sushi_(software)"; + homepage = "https://en.wikipedia.org/wiki/Sushi_(software)"; description = "A quick previewer for Nautilus"; maintainers = gnome3.maintainers; license = licenses.gpl2Plus; diff --git a/pkgs/desktops/lxde/core/lxappearance/default.nix b/pkgs/desktops/lxde/core/lxappearance/default.nix index aece5fefaec..c06a99eb36c 100644 --- a/pkgs/desktops/lxde/core/lxappearance/default.nix +++ b/pkgs/desktops/lxde/core/lxappearance/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "A lightweight program for configuring the theme and fonts of gtk applications"; - homepage = http://lxde.org/; + homepage = https://lxde.org/; maintainers = [ stdenv.lib.maintainers.hinton ]; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/development/compilers/coreclr/default.nix b/pkgs/development/compilers/coreclr/default.nix index 17d91f36875..0681e8210a6 100644 --- a/pkgs/development/compilers/coreclr/default.nix +++ b/pkgs/development/compilers/coreclr/default.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://dotnet.github.io/core/; + homepage = https://dotnet.github.io/core/; description = ".NET is a general purpose development platform"; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ kuznero ]; diff --git a/pkgs/development/compilers/mentor/default.nix b/pkgs/development/compilers/mentor/default.nix index 74905c6ffae..7cd3c179366 100644 --- a/pkgs/development/compilers/mentor/default.nix +++ b/pkgs/development/compilers/mentor/default.nix @@ -46,7 +46,7 @@ let meta = with stdenv.lib; { inherit description; - homepage = http://www.mentor.com/embedded-software/sourcery-tools/sourcery-codebench/editions/lite-edition/; + homepage = https://www.mentor.com/embedded-software/sourcery-tools/sourcery-codebench/editions/lite-edition/; license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix index fde4861e982..a49b1b82439 100644 --- a/pkgs/development/compilers/nim/default.nix +++ b/pkgs/development/compilers/nim/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.17.2"; src = fetchurl { - url = "http://nim-lang.org/download/${name}.tar.xz"; + url = "https://nim-lang.org/download/${name}.tar.xz"; sha256 = "1gc2xk3ygmz9y4pm75pligssgw995a7gvnfpy445fjpw4d81pzxa"; }; @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Statically typed, imperative programming language"; - homepage = http://nim-lang.org/; + homepage = https://nim-lang.org/; license = licenses.mit; maintainers = with maintainers; [ ehmry peterhoeg ]; platforms = with platforms; linux ++ darwin; # arbitrary diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index d93d8a906e0..a33b035669f 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -169,7 +169,7 @@ stdenv.mkDerivation { # enableParallelBuilding = false; meta = with stdenv.lib; { - homepage = http://www.rust-lang.org/; + homepage = https://www.rust-lang.org/; description = "A safe, concurrent, practical language"; maintainers = with maintainers; [ madjar cstrahan wizeman globin havvy wkennington ]; license = [ licenses.mit licenses.asl20 ]; diff --git a/pkgs/development/libraries/curlcpp/default.nix b/pkgs/development/libraries/curlcpp/default.nix index c1579b71748..c1c867abcdf 100644 --- a/pkgs/development/libraries/curlcpp/default.nix +++ b/pkgs/development/libraries/curlcpp/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake curl ]; meta = with stdenv.lib; { - homepage = http://josephp91.github.io/curlcpp/; + homepage = https://josephp91.github.io/curlcpp/; description = "Object oriented C++ wrapper for CURL"; platforms = platforms.unix; license = licenses.mit; diff --git a/pkgs/development/libraries/ignition-math/default.nix b/pkgs/development/libraries/ignition-math/default.nix index 66b21b6fae6..867ce024d2f 100644 --- a/pkgs/development/libraries/ignition-math/default.nix +++ b/pkgs/development/libraries/ignition-math/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://ignitionrobotics.org/libraries/math; + homepage = https://ignitionrobotics.org/libraries/math; description = "Math library by Ingition Robotics, created for the Gazebo project"; license = licenses.asl20; maintainers = with maintainers; [ pxc ]; diff --git a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix index 3905ba1b271..c184e647d28 100644 --- a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix +++ b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DMYSQL_LIB_DIR=${mysql}/lib" ]; meta = { - homepage = http://dev.mysql.com/downloads/connector/cpp/; + homepage = https://dev.mysql.com/downloads/connector/cpp/; description = "C++ library for connecting to mysql servers."; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/libserialport/default.nix b/pkgs/development/libraries/libserialport/default.nix index 812847ea123..90f0afa5796 100644 --- a/pkgs/development/libraries/libserialport/default.nix +++ b/pkgs/development/libraries/libserialport/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libserialport-0.1.1"; src = fetchurl { - url = "http://sigrok.org/download/source/libserialport/${name}.tar.gz"; + url = "https://sigrok.org/download/source/libserialport/${name}.tar.gz"; sha256 = "17ajlwgvyyrap8z7f16zcs59pksvncwbmd3mzf98wj7zqgczjaja"; }; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Cross-platform shared library for serial port access"; - homepage = http://sigrok.org/; + homepage = https://sigrok.org/; license = licenses.gpl3Plus; # macOS, Windows and Android is also supported (according to upstream). platforms = platforms.linux; diff --git a/pkgs/development/libraries/libsexy/default.nix b/pkgs/development/libraries/libsexy/default.nix index c8751c3e5dd..49cdb2c95ba 100644 --- a/pkgs/development/libraries/libsexy/default.nix +++ b/pkgs/development/libraries/libsexy/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A collection of GTK+ widgets"; - homepage = http://blog.chipx86.com/tag/libsexy/; + homepage = https://blog.chipx86.com/tag/libsexy/; license = licenses.lgpl21; maintainers = with maintainers; [ ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libsrs2/default.nix b/pkgs/development/libraries/libsrs2/default.nix index a2e94c33ce3..7d9ea25e9d2 100644 --- a/pkgs/development/libraries/libsrs2/default.nix +++ b/pkgs/development/libraries/libsrs2/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { version = "1.0.18"; src = fetchurl { - url = "http://www.libsrs2.org/srs/libsrs2-${version}.tar.gz"; + url = "https://www.libsrs2.org/srs/libsrs2-${version}.tar.gz"; sha256 = "9d1191b705d7587a5886736899001d04168392bbb6ed6345a057ade50943a492"; }; meta = { description = "The next generation SRS library from the original designer of SRS"; license = with lib.licenses; [ gpl2 bsd3 ]; - homepage = http://www.libsrs2.org/; + homepage = https://www.libsrs2.org/; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libstatgrab/default.nix b/pkgs/development/libraries/libstatgrab/default.nix index 036bb806f68..72d73e35848 100644 --- a/pkgs/development/libraries/libstatgrab/default.nix +++ b/pkgs/development/libraries/libstatgrab/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [] ++ stdenv.lib.optional stdenv.isDarwin IOKit; meta = with stdenv.lib; { - homepage = http://www.i-scream.org/libstatgrab/; + homepage = https://www.i-scream.org/libstatgrab/; description = "A library that provides cross platforms access to statistics about the running system"; license = licenses.gpl2; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libsvm/default.nix b/pkgs/development/libraries/libsvm/default.nix index a366baf27e3..8d3d2f4c60c 100644 --- a/pkgs/development/libraries/libsvm/default.nix +++ b/pkgs/development/libraries/libsvm/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "3.20"; src = fetchurl { - url = "http://www.csie.ntu.edu.tw/~cjlin/libsvm/libsvm-${version}.tar.gz"; + url = "https://www.csie.ntu.edu.tw/~cjlin/libsvm/libsvm-${version}.tar.gz"; sha256 = "1gj5v5zp1qnsnv0iwxq0ikhf8262d3s5dq6syr6yqkglps0284hg"; }; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library for support vector machines"; - homepage = http://www.csie.ntu.edu.tw/~cjlin/libsvm/; + homepage = https://www.csie.ntu.edu.tw/~cjlin/libsvm/; license = licenses.bsd3; maintainers = [ maintainers.spwhitt ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libvdpau/default.nix b/pkgs/development/libraries/libvdpau/default.nix index ceb42fe2bfc..eccee83fa85 100644 --- a/pkgs/development/libraries/libvdpau/default.nix +++ b/pkgs/development/libraries/libvdpau/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libvdpau-1.1.1"; src = fetchurl { - url = "http://people.freedesktop.org/~aplattner/vdpau/${name}.tar.bz2"; + url = "https://people.freedesktop.org/~aplattner/vdpau/${name}.tar.bz2"; sha256 = "857a01932609225b9a3a5bf222b85e39b55c08787d0ad427dbd9ec033d58d736"; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { installFlags = [ "moduledir=$(out)/lib/vdpau" ]; meta = with stdenv.lib; { - homepage = http://people.freedesktop.org/~aplattner/vdpau/; + homepage = https://people.freedesktop.org/~aplattner/vdpau/; description = "Library to use the Video Decode and Presentation API for Unix (VDPAU)"; license = licenses.mit; # expat version platforms = platforms.unix; diff --git a/pkgs/development/libraries/libvorbis/default.nix b/pkgs/development/libraries/libvorbis/default.nix index 682fcca98a3..f8d61536bef 100644 --- a/pkgs/development/libraries/libvorbis/default.nix +++ b/pkgs/development/libraries/libvorbis/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - homepage = http://xiph.org/vorbis/; + homepage = https://xiph.org/vorbis/; license = licenses.bsd3; maintainers = [ maintainers.ehmry ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix index 4b50fe090e3..1e96ff9bb1a 100644 --- a/pkgs/development/libraries/libvpx/default.nix +++ b/pkgs/development/libraries/libvpx/default.nix @@ -173,7 +173,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "WebM VP8/VP9 codec SDK"; - homepage = http://www.webmproject.org/; + homepage = https://www.webmproject.org/; license = licenses.bsd3; maintainers = with maintainers; [ codyopel ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/libzip/default.nix b/pkgs/development/libraries/libzip/default.nix index 850bb27e364..131b64c1c7f 100644 --- a/pkgs/development/libraries/libzip/default.nix +++ b/pkgs/development/libraries/libzip/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.3.0"; src = fetchurl { - url = "http://www.nih.at/libzip/${name}.tar.gz"; + url = "https://www.nih.at/libzip/${name}.tar.gz"; sha256 = "1633dvjc08zwwhzqhnv62rjf1abx8y5njmm8y16ik9iwd07ka6d9"; }; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.nih.at/libzip; + homepage = https://www.nih.at/libzip; description = "A C library for reading, creating and modifying zip archives"; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/lightstep-tracer-cpp/default.nix b/pkgs/development/libraries/lightstep-tracer-cpp/default.nix index 9aea42082c5..f5660e93d79 100644 --- a/pkgs/development/libraries/lightstep-tracer-cpp/default.nix +++ b/pkgs/development/libraries/lightstep-tracer-cpp/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Distributed tracing system built on top of the OpenTracing standard"; - homepage = "http://lightstep.com/"; + homepage = "https://lightstep.com/"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ cstrahan ]; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 4c00df4c17d..e1fe061a965 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -214,7 +214,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "An open source implementation of OpenGL"; - homepage = http://www.mesa3d.org/; + homepage = https://www.mesa3d.org/; license = licenses.mit; # X11 variant, in most files platforms = platforms.mesaPlatforms; maintainers = with maintainers; [ eduarrrd vcunat ]; diff --git a/pkgs/development/libraries/mlt/qt-5.nix b/pkgs/development/libraries/mlt/qt-5.nix index f3bdc005247..7111a78381d 100644 --- a/pkgs/development/libraries/mlt/qt-5.nix +++ b/pkgs/development/libraries/mlt/qt-5.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open source multimedia framework, designed for television broadcasting"; - homepage = http://www.mltframework.org/; + homepage = https://www.mltframework.org/; license = licenses.gpl3; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/mps/default.nix b/pkgs/development/libraries/mps/default.nix index 4e4ddfb6389..5a841f165ca 100644 --- a/pkgs/development/libraries/mps/default.nix +++ b/pkgs/development/libraries/mps/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.116.0"; src = fetchurl { - url = "http://www.ravenbrook.com/project/mps/release/${version}/mps-kit-${version}.tar.gz"; + url = "https://www.ravenbrook.com/project/mps/release/${version}/mps-kit-${version}.tar.gz"; sha256 = "1k7vnanpgawnj84x2xs6md57pfib9p7c3acngqzkl3c2aqw8qay0"; }; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { description = "A flexible memory management and garbage collection library"; - homepage = "http://www.ravenbrook.com/project/mps"; + homepage = "https://www.ravenbrook.com/project/mps"; license = stdenv.lib.licenses.sleepycat; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; diff --git a/pkgs/development/libraries/ndpi/default.nix b/pkgs/development/libraries/ndpi/default.nix index f1232d7d253..c84cddc897c 100644 --- a/pkgs/development/libraries/ndpi/default.nix +++ b/pkgs/development/libraries/ndpi/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { longDescription = '' nDPI is a library for deep-packet inspection based on OpenDPI. ''; - homepage = http://www.ntop.org/products/deep-packet-inspection/ndpi/; + homepage = https://www.ntop.org/products/deep-packet-inspection/ndpi/; license = with licenses; lgpl3; maintainers = with maintainers; [ takikawa ]; platforms = with platforms; unix; diff --git a/pkgs/development/libraries/netcdf-cxx4/default.nix b/pkgs/development/libraries/netcdf-cxx4/default.nix index de9023a5710..d67fdc110f0 100644 --- a/pkgs/development/libraries/netcdf-cxx4/default.nix +++ b/pkgs/development/libraries/netcdf-cxx4/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "C++ API to manipulate netcdf files"; - homepage = http://www.unidata.ucar.edu/software/netcdf/; + homepage = https://www.unidata.ucar.edu/software/netcdf/; license = stdenv.lib.licenses.free; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix index aba02827665..a12d23ed5b1 100644 --- a/pkgs/development/libraries/ogre/default.nix +++ b/pkgs/development/libraries/ogre/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { meta = { description = "A 3D engine"; - homepage = http://www.ogre3d.org/; + homepage = https://www.ogre3d.org/; maintainers = [ stdenv.lib.maintainers.raskin ]; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.mit; diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix index aadd108620a..cbac7210a10 100644 --- a/pkgs/development/libraries/opencv/default.nix +++ b/pkgs/development/libraries/opencv/default.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open Computer Vision Library with more than 500 algorithms"; - homepage = http://opencv.org/; + homepage = https://opencv.org/; license = licenses.bsd3; maintainers = with maintainers; [ viric ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/libraries/speex/default.nix b/pkgs/development/libraries/speex/default.nix index 602359965f1..173b460a0ab 100644 --- a/pkgs/development/libraries/speex/default.nix +++ b/pkgs/development/libraries/speex/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://www.speex.org/; + homepage = https://www.speex.org/; description = "An Open Source/Free Software patent-free audio compression format designed for speech"; license = licenses.bsd3; platforms = platforms.unix; diff --git a/pkgs/development/libraries/theft/default.nix b/pkgs/development/libraries/theft/default.nix index a0110c5f22b..2a1180533ce 100644 --- a/pkgs/development/libraries/theft/default.nix +++ b/pkgs/development/libraries/theft/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "A C library for property-based testing"; platforms = stdenv.lib.platforms.linux; - homepage = "http://github.com/silentbicycle/theft/"; + homepage = "https://github.com/silentbicycle/theft/"; license = stdenv.lib.licenses.isc; maintainers = [ stdenv.lib.maintainers.kquick ]; }; diff --git a/pkgs/development/libraries/tremor/default.nix b/pkgs/development/libraries/tremor/default.nix index fec256e703f..5e08a61cd1b 100644 --- a/pkgs/development/libraries/tremor/default.nix +++ b/pkgs/development/libraries/tremor/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://xiph.org/tremor/; + homepage = https://xiph.org/tremor/; description = "Fixed-point version of the Ogg Vorbis decoder"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/vaapi-intel/default.nix b/pkgs/development/libraries/vaapi-intel/default.nix index edb2a8214dd..7bd036cf2e5 100644 --- a/pkgs/development/libraries/vaapi-intel/default.nix +++ b/pkgs/development/libraries/vaapi-intel/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://cgit.freedesktop.org/vaapi/intel-driver/; + homepage = https://cgit.freedesktop.org/vaapi/intel-driver/; license = licenses.mit; description = "Intel driver for the VAAPI library"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/vaapi-vdpau/default.nix b/pkgs/development/libraries/vaapi-vdpau/default.nix index 4522ecc1bb6..f0089110c3c 100644 --- a/pkgs/development/libraries/vaapi-vdpau/default.nix +++ b/pkgs/development/libraries/vaapi-vdpau/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { - homepage = http://cgit.freedesktop.org/vaapi/vdpau-driver/; + homepage = https://cgit.freedesktop.org/vaapi/vdpau-driver/; license = stdenv.lib.licenses.gpl2Plus; description = "VDPAU driver for the VAAPI library"; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix index 324d977c72e..438b4eda454 100644 --- a/pkgs/development/libraries/vigra/default.nix +++ b/pkgs/development/libraries/vigra/default.nix @@ -28,7 +28,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Novel computer vision C++ library with customizable algorithms and data structures"; - homepage = http://hci.iwr.uni-heidelberg.de/vigra; + homepage = https://hci.iwr.uni-heidelberg.de/vigra; license = licenses.mit; maintainers = [ maintainers.viric ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/vmime/default.nix b/pkgs/development/libraries/vmime/default.nix index 9bef1b27e9c..e0398487abc 100644 --- a/pkgs/development/libraries/vmime/default.nix +++ b/pkgs/development/libraries/vmime/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; meta = { - homepage = http://www.vmime.org/; + homepage = https://www.vmime.org/; description = "Free mail library for C++"; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/development/libraries/vmmlib/default.nix b/pkgs/development/libraries/vmmlib/default.nix index ccdf2b05e7e..18b9278539f 100644 --- a/pkgs/development/libraries/vmmlib/default.nix +++ b/pkgs/development/libraries/vmmlib/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { computations and frustum culling classes, and spatial data structures''; license = licenses.bsd2; - homepage = http://github.com/VMML/vmmlib/; + homepage = https://github.com/VMML/vmmlib/; maintainers = [ maintainers.adev ]; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix index 5def37b791c..a5b7a6a99ce 100644 --- a/pkgs/development/libraries/wayland/default.nix +++ b/pkgs/development/libraries/wayland/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { version = "1.14.0"; src = fetchurl { - url = "http://wayland.freedesktop.org/releases/${name}.tar.xz"; + url = "https://wayland.freedesktop.org/releases/${name}.tar.xz"; sha256 = "1f3sla6h0bw15fz8pjc67jhwj7pwmfdc7qlj42j5k9v116ycm07d"; }; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Reference implementation of the wayland protocol"; - homepage = http://wayland.freedesktop.org/; + homepage = https://wayland.freedesktop.org/; license = lib.licenses.mit; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ codyopel wkennington ]; diff --git a/pkgs/development/libraries/websocket++/default.nix b/pkgs/development/libraries/websocket++/default.nix index fbfc460db96..8a0ec2523b9 100644 --- a/pkgs/development/libraries/websocket++/default.nix +++ b/pkgs/development/libraries/websocket++/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake ]; meta = with stdenv.lib; { - homepage = http://www.zaphoyd.com/websocketpp/; + homepage = https://www.zaphoyd.com/websocketpp/; description = "C++/Boost Asio based websocket client/server library"; license = licenses.bsd3; platforms = platforms.unix; diff --git a/pkgs/development/libraries/wxsqlite3/default.nix b/pkgs/development/libraries/wxsqlite3/default.nix index a0600399784..49f12842533 100644 --- a/pkgs/development/libraries/wxsqlite3/default.nix +++ b/pkgs/development/libraries/wxsqlite3/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa darwin.stubs.setfile darwin.stubs.rez darwin.stubs.derez ]; meta = with stdenv.lib; { - homepage = http://utelle.github.io/wxsqlite3/ ; + homepage = https://utelle.github.io/wxsqlite3/ ; description = "A C++ wrapper around the public domain SQLite 3.x for wxWidgets"; platforms = platforms.unix; maintainers = with maintainers; [ vrthra ]; diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix index 36a73bc6d2b..482c765dcda 100644 --- a/pkgs/development/libraries/xapian/default.nix +++ b/pkgs/development/libraries/xapian/default.nix @@ -27,7 +27,7 @@ let meta = with stdenv.lib; { description = "Search engine library"; - homepage = http://xapian.org/; + homepage = https://xapian.org/; license = licenses.gpl2Plus; maintainers = with maintainers; [ chaoflow ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix index 4ccdcb19f81..17f8646b517 100644 --- a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix +++ b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "XCB cursor library (libxcursor port)"; - homepage = http://cgit.freedesktop.org/xcb/util-cursor; + homepage = https://cgit.freedesktop.org/xcb/util-cursor; license = licenses.mit; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/ocaml-modules/cpdf/default.nix b/pkgs/development/ocaml-modules/cpdf/default.nix index 07909d1a465..dc6cf491eb4 100644 --- a/pkgs/development/ocaml-modules/cpdf/default.nix +++ b/pkgs/development/ocaml-modules/cpdf/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://www.coherentpdf.com/; + homepage = https://www.coherentpdf.com/; platforms = ocaml.meta.platforms or []; description = "PDF Command Line Tools"; maintainers = with stdenv.lib.maintainers; [ vbgl ]; diff --git a/pkgs/development/tools/build-managers/pants/default.nix b/pkgs/development/tools/build-managers/pants/default.nix index 8ce495557e7..abb32f25760 100644 --- a/pkgs/development/tools/build-managers/pants/default.nix +++ b/pkgs/development/tools/build-managers/pants/default.nix @@ -32,7 +32,7 @@ in buildPythonApplication rec { meta = { description = "A build system for software projects in a variety of languages"; - homepage = "http://www.pantsbuild.org/"; + homepage = "https://www.pantsbuild.org/"; license = licenses.asl20; maintainers = with maintainers; [ copumpkin ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/misc/opengrok/default.nix b/pkgs/development/tools/misc/opengrok/default.nix index c2268ba8da2..cdfa51d6f2b 100644 --- a/pkgs/development/tools/misc/opengrok/default.nix +++ b/pkgs/development/tools/misc/opengrok/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Source code search and cross reference engine"; - homepage = http://opengrok.github.io/OpenGrok/; + homepage = https://opengrok.github.io/OpenGrok/; license = licenses.cddl; maintainers = [ maintainers.lethalman ]; }; diff --git a/pkgs/development/tools/misc/sloccount/default.nix b/pkgs/development/tools/misc/sloccount/default.nix index cf143f7d9e9..28500ee08ee 100644 --- a/pkgs/development/tools/misc/sloccount/default.nix +++ b/pkgs/development/tools/misc/sloccount/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "sloccount-2.26"; src = fetchurl { - url = "http://www.dwheeler.com/sloccount/${name}.tar.gz"; + url = "https://www.dwheeler.com/sloccount/${name}.tar.gz"; sha256 = "0ayiwfjdh1946asah861ah9269s5xkc8p5fv1wnxs9znyaxs4zzs"; }; @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; - homepage = http://www.dwheeler.com/sloccount/; + homepage = https://www.dwheeler.com/sloccount/; maintainers = [ ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/tools/misc/teensy-loader-cli/default.nix b/pkgs/development/tools/misc/teensy-loader-cli/default.nix index 7b360655c4f..4263b80789a 100644 --- a/pkgs/development/tools/misc/teensy-loader-cli/default.nix +++ b/pkgs/development/tools/misc/teensy-loader-cli/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { license = licenses.gpl3; description = "Firmware uploader for the Teensy microcontroller boards"; - homepage = http://www.pjrc.com/teensy/; + homepage = https://www.pjrc.com/teensy/; maintainers = with maintainers; [ the-kenny ]; platforms = platforms.linux; }; diff --git a/pkgs/development/tools/ocaml/ocaml-top/default.nix b/pkgs/development/tools/ocaml/ocaml-top/default.nix index e9331d078cf..3cf70d66ddb 100644 --- a/pkgs/development/tools/ocaml/ocaml-top/default.nix +++ b/pkgs/development/tools/ocaml/ocaml-top/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { inherit (jbuilder) installPhase; meta = { - homepage = http://www.typerex.org/ocaml-top.html; + homepage = https://www.typerex.org/ocaml-top.html; license = stdenv.lib.licenses.gpl3; description = "A simple cross-platform OCaml code editor built for top-level evaluation"; platforms = ocamlPackages.ocaml.meta.platforms or []; diff --git a/pkgs/development/tools/ocaml/ocp-build/default.nix b/pkgs/development/tools/ocaml/ocp-build/default.nix index 2a9a634d0a4..8da0f781a8b 100644 --- a/pkgs/development/tools/ocaml/ocp-build/default.nix +++ b/pkgs/development/tools/ocaml/ocp-build/default.nix @@ -22,7 +22,7 @@ buildOcaml { ''; meta = with stdenv.lib; { - homepage = http://www.typerex.org/ocp-build.html; + homepage = https://www.typerex.org/ocp-build.html; description = "A build tool for OCaml"; longDescription = '' ocp-build is a build system for OCaml application, based on simple diff --git a/pkgs/games/mnemosyne/default.nix b/pkgs/games/mnemosyne/default.nix index 03052c52f7f..02bd0ba78d1 100644 --- a/pkgs/games/mnemosyne/default.nix +++ b/pkgs/games/mnemosyne/default.nix @@ -26,7 +26,7 @@ in pythonPackages.buildPythonApplication rec { rm -r $out/lib/python2.7/site-packages/nix ''; meta = { - homepage = http://mnemosyne-proj.org/; + homepage = https://mnemosyne-proj.org/; description = "Spaced-repetition software"; longDescription = '' The Mnemosyne Project has two aspects: diff --git a/pkgs/games/moon-buggy/default.nix b/pkgs/games/moon-buggy/default.nix index 8ea8dfccb16..d0c07b71e2e 100644 --- a/pkgs/games/moon-buggy/default.nix +++ b/pkgs/games/moon-buggy/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2; maintainers = [stdenv.lib.maintainers.rybern]; platforms = stdenv.lib.platforms.linux; - homepage = http://www.seehuhn.de/pages/moon-buggy; + homepage = https://www.seehuhn.de/pages/moon-buggy; }; } diff --git a/pkgs/games/neverball/default.nix b/pkgs/games/neverball/default.nix index 0006f895809..62d89c7c31e 100644 --- a/pkgs/games/neverball/default.nix +++ b/pkgs/games/neverball/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "neverball-1.6.0"; src = fetchurl { - url = "http://neverball.org/${name}.tar.gz"; + url = "https://neverball.org/${name}.tar.gz"; sha256 = "184gm36c6p6vaa6gwrfzmfh86klhnb03pl40ahsjsvprlk667zkk"; }; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = http://neverball.org/; + homepage = https://neverball.org/; description = "Tilt the floor to roll a ball"; license = "GPL"; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/games/teeworlds/default.nix b/pkgs/games/teeworlds/default.nix index 504353afebe..bd37ba0f01f 100644 --- a/pkgs/games/teeworlds/default.nix +++ b/pkgs/games/teeworlds/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { Flag. You can even design your own maps! ''; - homepage = http://teeworlds.com/; + homepage = https://teeworlds.com/; license = "BSD-style, see `license.txt'"; maintainers = with stdenv.lib.maintainers; [ astsmtl ]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/games/tome4/default.nix b/pkgs/games/tome4/default.nix index ad9b5f7dc6c..f07fd88fbaf 100644 --- a/pkgs/games/tome4/default.nix +++ b/pkgs/games/tome4/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "1.4.9"; name = "tome4-${version}"; src = fetchurl { - url = "http://te4.org/dl/t-engine/t-engine4-src-${version}.tar.bz2"; + url = "https://te4.org/dl/t-engine/t-engine4-src-${version}.tar.bz2"; sha256 = "0c82m0g1ps64zghgdrp78m6bvfngcb75whhknqiailld7kz1g9xl"; }; nativeBuildInputs = [ premake4 ]; @@ -34,7 +34,7 @@ EOF cp -r game $out/opt/tome4 ''; meta = with stdenv.lib; { - homepage = http://te4.org/; + homepage = https://te4.org/; description = "Tales of Maj'eyal (rogue-like game)"; maintainers = [ maintainers.chattered ]; license = licenses.gpl3; diff --git a/pkgs/games/unnethack/default.nix b/pkgs/games/unnethack/default.nix index 57749c4f228..a1a8272fd0f 100644 --- a/pkgs/games/unnethack/default.nix +++ b/pkgs/games/unnethack/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Fork of NetHack"; - homepage = http://unnethack.wordpress.com/; + homepage = https://unnethack.wordpress.com/; license = "nethack"; platforms = platforms.all; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/misc/drivers/xboxdrv/default.nix b/pkgs/misc/drivers/xboxdrv/default.nix index ffb2052ca0c..8262eea48b4 100644 --- a/pkgs/misc/drivers/xboxdrv/default.nix +++ b/pkgs/misc/drivers/xboxdrv/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation { buildInputs = [ scons libX11 libusb1 boost glib dbus_glib]; meta = with stdenv.lib; { - homepage = http://pingus.seul.org/~grumbel/xboxdrv/; + homepage = https://pingus.seul.org/~grumbel/xboxdrv/; description = "Xbox/Xbox360 (and more) gamepad driver for Linux that works in userspace"; license = licenses.gpl3Plus; maintainers = [ maintainers.fuuzetsu ]; diff --git a/pkgs/misc/emulators/gens-gs/default.nix b/pkgs/misc/emulators/gens-gs/default.nix index bfe43403bc6..74aa29e84ef 100644 --- a/pkgs/misc/emulators/gens-gs/default.nix +++ b/pkgs/misc/emulators/gens-gs/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = "-UGTK_DISABLE_DEPRECATED -UGSEAL_ENABLE"; meta = { - homepage = http://segaretro.org/Gens/GS; + homepage = https://segaretro.org/Gens/GS; description = "A Genesis/Mega Drive emulator"; platforms = [ "i686-linux" ]; maintainers = [ stdenv.lib.maintainers.eelco ]; diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix index 87b55e3948b..d77526775a5 100644 --- a/pkgs/misc/screensavers/xscreensaver/default.nix +++ b/pkgs/misc/screensavers/xscreensaver/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { name = "xscreensaver-${version}"; src = fetchurl { - url = "http://www.jwz.org/xscreensaver/${name}.tar.gz"; + url = "https://www.jwz.org/xscreensaver/${name}.tar.gz"; sha256 = "1ng5ddzb4k2h1w54pvk9hzxvnxxmc54bc4a2ibk974nzjjjaxivs"; }; @@ -47,12 +47,12 @@ stdenv.mkDerivation rec { ; meta = { - homepage = http://www.jwz.org/xscreensaver/; + homepage = https://www.jwz.org/xscreensaver/; description = "A set of screensavers"; maintainers = with stdenv.lib.maintainers; [ raskin ]; platforms = with stdenv.lib.platforms; allBut cygwin; inherit version; - downloadPage = "http://www.jwz.org/xscreensaver/download.html"; + downloadPage = "https://www.jwz.org/xscreensaver/download.html"; updateWalker = true; }; } diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 05bcf62beec..d50667e80e6 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -1786,7 +1786,7 @@ rec { meta = { description = "Fastest non utf-8 aware word and C completion engine for Vim"; - homepage = http://github.com/Valloric/YouCompleteMe; + homepage = https://github.com/Valloric/YouCompleteMe; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [marcweber jagajaga]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/os-specific/linux/netatop/default.nix b/pkgs/os-specific/linux/netatop/default.nix index 0498f5cf37e..8dbacc46154 100644 --- a/pkgs/os-specific/linux/netatop/default.nix +++ b/pkgs/os-specific/linux/netatop/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { meta = { description = "Network monitoring module for atop"; - homepage = http://www.atoptool.nl/downloadnetatop.php; + homepage = https://www.atoptool.nl/downloadnetatop.php; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/os-specific/linux/pam_krb5/default.nix b/pkgs/os-specific/linux/pam_krb5/default.nix index 40e7e1216a6..abbf3398ced 100644 --- a/pkgs/os-specific/linux/pam_krb5/default.nix +++ b/pkgs/os-specific/linux/pam_krb5/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ pam kerberos ]; meta = with stdenv.lib; { - homepage = http://www.eyrie.org/~eagle/software/pam-krb5/; + homepage = https://www.eyrie.org/~eagle/software/pam-krb5/; description = "PAM module allowing PAM-aware applications to authenticate users by performing an AS exchange with a Kerberos KDC"; longDescription = '' pam_krb5 can optionally convert Kerberos 5 credentials to Kerberos IV diff --git a/pkgs/os-specific/linux/sinit/default.nix b/pkgs/os-specific/linux/sinit/default.nix index 9207a6b3511..46abb6ccc66 100644 --- a/pkgs/os-specific/linux/sinit/default.nix +++ b/pkgs/os-specific/linux/sinit/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.mit ; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = http://tools.suckless.org/sinit; + homepage = https://tools.suckless.org/sinit; downloadPage = "http://git.suckless.org/sinit"; }; } diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index 490df3e1abe..b1a8ac7d518 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { name = "upower-0.99.4"; src = fetchurl { - url = "http://upower.freedesktop.org/releases/${name}.tar.xz"; + url = "https://upower.freedesktop.org/releases/${name}.tar.xz"; sha256 = "1c1ph1j1fnrf3vipxb7ncmdfc36dpvcvpsv8n8lmal7grjk2b8ww"; }; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { installFlags = "historydir=$(TMPDIR)/foo"; meta = { - homepage = http://upower.freedesktop.org/; + homepage = https://upower.freedesktop.org/; description = "A D-Bus service for power management"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/os-specific/linux/xf86-video-nested/default.nix b/pkgs/os-specific/linux/xf86-video-nested/default.nix index 8d3e490db87..54d16473770 100644 --- a/pkgs/os-specific/linux/xf86-video-nested/default.nix +++ b/pkgs/os-specific/linux/xf86-video-nested/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { CFLAGS = "-I${pixman}/include/pixman-1"; meta = { - homepage = http://cgit.freedesktop.org/xorg/driver/xf86-video-nested; + homepage = https://cgit.freedesktop.org/xorg/driver/xf86-video-nested; description = "A driver to run Xorg on top of Xorg or something else"; maintainers = [ stdenv.lib.maintainers.goibhniu ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix index 1750a574af7..ae023649bc3 100644 --- a/pkgs/servers/dns/pdns-recursor/default.nix +++ b/pkgs/servers/dns/pdns-recursor/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "A recursive DNS server"; - homepage = http://www.powerdns.com/; + homepage = https://www.powerdns.com/; platforms = platforms.linux; license = licenses.gpl2; maintainers = with maintainers; [ rnhmjoj ]; diff --git a/pkgs/servers/monitoring/nagios/default.nix b/pkgs/servers/monitoring/nagios/default.nix index 5d7becb1652..b0e2f29a3b4 100644 --- a/pkgs/servers/monitoring/nagios/default.nix +++ b/pkgs/servers/monitoring/nagios/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "A host, service and network monitoring program"; - homepage = http://www.nagios.org/; + homepage = https://www.nagios.org/; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ thoughtpolice relrod ]; diff --git a/pkgs/servers/monitoring/sensu/default.nix b/pkgs/servers/monitoring/sensu/default.nix index c0a2c3ca49e..dba0c32b353 100644 --- a/pkgs/servers/monitoring/sensu/default.nix +++ b/pkgs/servers/monitoring/sensu/default.nix @@ -9,7 +9,7 @@ bundlerEnv rec { meta = with lib; { description = "A monitoring framework that aims to be simple, malleable, and scalable"; - homepage = http://sensuapp.org/; + homepage = https://sensuapp.org/; license = licenses.mit; maintainers = with maintainers; [ theuni peterhoeg ]; platforms = platforms.unix; diff --git a/pkgs/servers/monitoring/zabbix/default.nix b/pkgs/servers/monitoring/zabbix/default.nix index cd541f82d23..be52698ed83 100644 --- a/pkgs/servers/monitoring/zabbix/default.nix +++ b/pkgs/servers/monitoring/zabbix/default.nix @@ -44,7 +44,7 @@ in meta = { description = "An enterprise-class open source distributed monitoring solution"; - homepage = http://www.zabbix.com/; + homepage = https://www.zabbix.com/; license = "GPL"; maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.linux; @@ -60,7 +60,7 @@ in meta = with stdenv.lib; { description = "An enterprise-class open source distributed monitoring solution (client-side agent)"; - homepage = http://www.zabbix.com/; + homepage = https://www.zabbix.com/; license = licenses.gpl2; maintainers = [ maintainers.eelco ]; platforms = platforms.linux; diff --git a/pkgs/servers/sql/mysql/5.5.x.nix b/pkgs/servers/sql/mysql/5.5.x.nix index 8f6ccd8c0d5..5a747fb85ab 100644 --- a/pkgs/servers/sql/mysql/5.5.x.nix +++ b/pkgs/servers/sql/mysql/5.5.x.nix @@ -68,7 +68,7 @@ self = stdenv.mkDerivation rec { }; meta = { - homepage = http://www.mysql.com/; + homepage = https://www.mysql.com/; description = "The world's most popular open source database"; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/shells/nix-bash-completions/default.nix b/pkgs/shells/nix-bash-completions/default.nix index f9cd97e9735..fb27cf5ea9f 100644 --- a/pkgs/shells/nix-bash-completions/default.nix +++ b/pkgs/shells/nix-bash-completions/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://github.com/hedning/nix-bash-completions; + homepage = https://github.com/hedning/nix-bash-completions; description = "Bash completions for Nix, NixOS, and NixOps"; license = licenses.bsd3; platforms = platforms.all; diff --git a/pkgs/tools/X11/sselp/default.nix b/pkgs/tools/X11/sselp/default.nix index 33a0deedafa..10b0dfff9bf 100644 --- a/pkgs/tools/X11/sselp/default.nix +++ b/pkgs/tools/X11/sselp/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://tools.suckless.org/sselp; + homepage = https://tools.suckless.org/sselp; description = "Prints the X selection to stdout, useful in scripts"; license = stdenv.lib.licenses.mit; maintainers = [stdenv.lib.maintainers.magnetophon ]; diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix index 717ad327c67..f71bcdef9f4 100644 --- a/pkgs/tools/X11/xdg-utils/default.nix +++ b/pkgs/tools/X11/xdg-utils/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://portland.freedesktop.org/wiki/; + homepage = https://portland.freedesktop.org/wiki/; description = "A set of command line tools that assist applications with a variety of desktop integration tasks"; license = if mimiSupport then licenses.gpl2 else licenses.free; maintainers = [ maintainers.eelco ]; diff --git a/pkgs/tools/archivers/cromfs/default.nix b/pkgs/tools/archivers/cromfs/default.nix index 00de2c2ec46..77536a7ad30 100644 --- a/pkgs/tools/archivers/cromfs/default.nix +++ b/pkgs/tools/archivers/cromfs/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "FUSE Compressed ROM filesystem with lzma"; - homepage = http://bisqwit.iki.fi/source/cromfs.html; + homepage = https://bisqwit.iki.fi/source/cromfs.html; maintainers = [ stdenv.lib.maintainers.viric ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/tools/compression/xz/default.nix index 48c58434acd..05cc672ab15 100644 --- a/pkgs/tools/compression/xz/default.nix +++ b/pkgs/tools/compression/xz/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "xz-5.2.3"; src = fetchurl { - url = "http://tukaani.org/xz/${name}.tar.bz2"; + url = "https://tukaani.org/xz/${name}.tar.bz2"; sha256 = "1ha08wxcldgcl81021x5nhknr47s1p95ljfkka4sqah5w5ns377x"; }; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { postInstall = "rm -rf $out/share/doc"; meta = with stdenv.lib; { - homepage = http://tukaani.org/xz/; + homepage = https://tukaani.org/xz/; description = "XZ, general-purpose data compression software, successor of LZMA"; longDescription = diff --git a/pkgs/tools/filesystems/mp3fs/default.nix b/pkgs/tools/filesystems/mp3fs/default.nix index 77207cb8b3a..3a0e8e2fd46 100644 --- a/pkgs/tools/filesystems/mp3fs/default.nix +++ b/pkgs/tools/filesystems/mp3fs/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { which only understands the MP3 format, or transcode files through simple drag-and-drop in a file browser. ''; - homepage = http://khenriks.github.io/mp3fs/; + homepage = https://khenriks.github.io/mp3fs/; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ nckx ]; diff --git a/pkgs/tools/filesystems/ntfs-3g/default.nix b/pkgs/tools/filesystems/ntfs-3g/default.nix index 0cf439c9fe9..6acf5e221d4 100644 --- a/pkgs/tools/filesystems/ntfs-3g/default.nix +++ b/pkgs/tools/filesystems/ntfs-3g/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.tuxera.com/community/open-source-ntfs-3g/; + homepage = https://www.tuxera.com/community/open-source-ntfs-3g/; description = "FUSE-based NTFS driver with full write support"; maintainers = with maintainers; [ dezgeg ]; platforms = platforms.linux; diff --git a/pkgs/tools/graphics/wkhtmltopdf/default.nix b/pkgs/tools/graphics/wkhtmltopdf/default.nix index b513115c68f..3ecd91aaca1 100644 --- a/pkgs/tools/graphics/wkhtmltopdf/default.nix +++ b/pkgs/tools/graphics/wkhtmltopdf/default.nix @@ -129,7 +129,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://wkhtmltopdf.org/; + homepage = https://wkhtmltopdf.org/; description = "Tools for rendering web pages to PDF or images"; longDescription = '' wkhtmltopdf and wkhtmltoimage are open source (LGPL) command line tools diff --git a/pkgs/tools/misc/keychain/default.nix b/pkgs/tools/misc/keychain/default.nix index f5b1b950c13..b8b7666934b 100644 --- a/pkgs/tools/misc/keychain/default.nix +++ b/pkgs/tools/misc/keychain/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = { description = "Keychain management tool"; - homepage = http://www.funtoo.org/Keychain; + homepage = https://www.funtoo.org/Keychain; license = stdenv.lib.licenses.gpl2; # other platforms are untested (AFAIK) platforms = diff --git a/pkgs/tools/misc/mrtg/default.nix b/pkgs/tools/misc/mrtg/default.nix index 5a427888857..7657b072aa8 100644 --- a/pkgs/tools/misc/mrtg/default.nix +++ b/pkgs/tools/misc/mrtg/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "mrtg-${version}"; src = fetchurl { - url = "http://oss.oetiker.ch/mrtg/pub/${name}.tar.gz"; + url = "https://oss.oetiker.ch/mrtg/pub/${name}.tar.gz"; sha256 = "0r93ipscfp7py0b1dcx65s58q7dlwndqhprf8w4945a0h2p7zyjy"; }; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "The Multi Router Traffic Grapher"; - homepage = http://oss.oetiker.ch/mrtg/; + homepage = https://oss.oetiker.ch/mrtg/; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.robberer ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/misc/testdisk/default.nix b/pkgs/tools/misc/testdisk/default.nix index 312c0ae6db5..b428205fcd0 100644 --- a/pkgs/tools/misc/testdisk/default.nix +++ b/pkgs/tools/misc/testdisk/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; meta = { - homepage = http://www.cgsecurity.org/wiki/TestDisk; + homepage = https://www.cgsecurity.org/wiki/TestDisk; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.eelco ]; diff --git a/pkgs/tools/misc/tmate/default.nix b/pkgs/tools/misc/tmate/default.nix index a528f5f394f..de6c1612396 100644 --- a/pkgs/tools/misc/tmate/default.nix +++ b/pkgs/tools/misc/tmate/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://tmate.io/; + homepage = https://tmate.io/; description = "Instant Terminal Sharing"; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/tools/misc/vmtouch/default.nix b/pkgs/tools/misc/vmtouch/default.nix index 9fea1b85f6a..820c5a65c74 100644 --- a/pkgs/tools/misc/vmtouch/default.nix +++ b/pkgs/tools/misc/vmtouch/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Portable file system cache diagnostics and control"; longDescription = "vmtouch is a tool for learning about and controlling the file system cache of unix and unix-like systems."; - homepage = http://hoytech.com/vmtouch/; + homepage = https://hoytech.com/vmtouch/; license = stdenv.lib.licenses.bsd3; maintainers = [ stdenv.lib.maintainers.garrison ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/networking/megatools/default.nix b/pkgs/tools/networking/megatools/default.nix index 7c7c63ef230..a59aee83b93 100644 --- a/pkgs/tools/networking/megatools/default.nix +++ b/pkgs/tools/networking/megatools/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "1.9.98"; src = fetchurl { - url = "http://megatools.megous.com/builds/${name}.tar.gz"; + url = "https://megatools.megous.com/builds/${name}.tar.gz"; sha256 = "0vx1farp0dpg4zwvxdbfdnzjk9qx3sn109p1r1zl3g3xsaj221cv"; }; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Command line client for Mega.co.nz"; - homepage = http://megatools.megous.com/; + homepage = https://megatools.megous.com/; license = licenses.gpl2Plus; maintainers = [ maintainers.viric maintainers.AndersonTorres ]; platforms = platforms.linux; diff --git a/pkgs/tools/networking/miredo/default.nix b/pkgs/tools/networking/miredo/default.nix index efe2847ae35..a1a2b79b86a 100644 --- a/pkgs/tools/networking/miredo/default.nix +++ b/pkgs/tools/networking/miredo/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Teredo IPv6 Tunneling Daemon"; - homepage = http://www.remlab.net/miredo/; + homepage = https://www.remlab.net/miredo/; license = licenses.gpl2; maintainers = [ maintainers.volth ]; platforms = platforms.unix; diff --git a/pkgs/tools/networking/mitmproxy/default.nix b/pkgs/tools/networking/mitmproxy/default.nix index 36874a81281..131021704a2 100644 --- a/pkgs/tools/networking/mitmproxy/default.nix +++ b/pkgs/tools/networking/mitmproxy/default.nix @@ -53,7 +53,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Man-in-the-middle proxy"; - homepage = http://mitmproxy.org/; + homepage = https://mitmproxy.org/; license = licenses.mit; maintainers = with maintainers; [ fpletz kamilchm ]; }; diff --git a/pkgs/tools/networking/netrw/default.nix b/pkgs/tools/networking/netrw/default.nix index e19b8ba7f64..bd5190767d1 100644 --- a/pkgs/tools/networking/netrw/default.nix +++ b/pkgs/tools/networking/netrw/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "Simple tool for transporting data over the network"; license = stdenv.lib.licenses.gpl2; - homepage = http://mamuti.net/netrw/index.en.html; + homepage = https://mamuti.net/netrw/index.en.html; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/networking/nss-pam-ldapd/default.nix b/pkgs/tools/networking/nss-pam-ldapd/default.nix index 93646d58cd3..e5fde0f8038 100644 --- a/pkgs/tools/networking/nss-pam-ldapd/default.nix +++ b/pkgs/tools/networking/nss-pam-ldapd/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.9.7"; src = fetchurl { - url = "http://arthurdejong.org/nss-pam-ldapd/${name}.tar.gz"; + url = "https://arthurdejong.org/nss-pam-ldapd/${name}.tar.gz"; sha256 = "1sw36w6zkzvabvjckqick032j5p5xi0qi3sgnh0znzxz31jqvf0d"; }; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "LDAP identity and authentication for NSS/PAM"; - homepage = http://arthurdejong.org/nss-pam-ldapd/; + homepage = https://arthurdejong.org/nss-pam-ldapd/; license = licenses.lgpl21; platforms = platforms.linux; }; diff --git a/pkgs/tools/networking/openresolv/default.nix b/pkgs/tools/networking/openresolv/default.nix index f22ad32aaa4..209e1f64c72 100644 --- a/pkgs/tools/networking/openresolv/default.nix +++ b/pkgs/tools/networking/openresolv/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = { description = "A program to manage /etc/resolv.conf"; - homepage = http://roy.marples.name/projects/openresolv; + homepage = https://roy.marples.name/projects/openresolv; license = stdenv.lib.licenses.bsd2; maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/networking/stun/default.nix b/pkgs/tools/networking/stun/default.nix index 8f9636041ff..7ba4a0d8936 100644 --- a/pkgs/tools/networking/stun/default.nix +++ b/pkgs/tools/networking/stun/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Stun server and test client"; - homepage = http://sourceforge.net/projects/stun/; + homepage = https://sourceforge.net/projects/stun/; license = licenses.vsl10; maintainers = with maintainers; [ marcweber obadz ]; platforms = platforms.linux; diff --git a/pkgs/tools/networking/swec/default.nix b/pkgs/tools/networking/swec/default.nix index 5b7f8f114df..4af7e1eb5ba 100644 --- a/pkgs/tools/networking/swec/default.nix +++ b/pkgs/tools/networking/swec/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { checkPhase = "make test"; meta = { - homepage = http://random.zerodogg.org/swec/; + homepage = https://random.zerodogg.org/swec/; description = "Simple Web Error Checker (SWEC)"; diff --git a/pkgs/tools/networking/trickle/default.nix b/pkgs/tools/networking/trickle/default.nix index 1c8829a07b2..52bb418fc0d 100644 --- a/pkgs/tools/networking/trickle/default.nix +++ b/pkgs/tools/networking/trickle/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { description = "Lightweight userspace bandwidth shaper"; license = stdenv.lib.licenses.bsd3; - homepage = http://monkey.org/~marius/pages/?page=trickle; + homepage = https://monkey.org/~marius/pages/?page=trickle; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/vpnc/default.nix b/pkgs/tools/networking/vpnc/default.nix index 496c01c02fc..86e483114a3 100644 --- a/pkgs/tools/networking/vpnc/default.nix +++ b/pkgs/tools/networking/vpnc/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.unix-ag.uni-kl.de/~massar/vpnc/; + homepage = https://www.unix-ag.uni-kl.de/~massar/vpnc/; description = "Virtual private network (VPN) client for Cisco's VPN concentrators"; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/tools/security/fpm2/default.nix b/pkgs/tools/security/fpm2/default.nix index 69b4b36fb9b..66a50e268a5 100644 --- a/pkgs/tools/security/fpm2/default.nix +++ b/pkgs/tools/security/fpm2/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { version = "0.79"; src = fetchurl { - url = "http://als.regnet.cz/fpm2/download/fpm2-${version}.tar.bz2"; + url = "https://als.regnet.cz/fpm2/download/fpm2-${version}.tar.bz2"; sha256 = "d55e9ce6be38a44fc1053d82db2d117cf3991a51898bd86d7913bae769f04da7"; }; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "FPM2 is GTK2 port from Figaro's Password Manager originally developed by John Conneely, with some new enhancements."; - homepage = http://als.regnet.cz/fpm2/; + homepage = https://als.regnet.cz/fpm2/; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ hce ]; diff --git a/pkgs/tools/security/mkpasswd/default.nix b/pkgs/tools/security/mkpasswd/default.nix index 88aa71810dc..b8da305c36d 100644 --- a/pkgs/tools/security/mkpasswd/default.nix +++ b/pkgs/tools/security/mkpasswd/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { installPhase = "make install-mkpasswd"; meta = with stdenv.lib; { - homepage = http://packages.qa.debian.org/w/whois.html; + homepage = https://packages.qa.debian.org/w/whois.html; description = "Overfeatured front-end to crypt, from the Debian whois package"; license = licenses.gpl2; maintainers = with maintainers; [ cstrahan fpletz ]; diff --git a/pkgs/tools/security/polkit-gnome/default.nix b/pkgs/tools/security/polkit-gnome/default.nix index e8709130015..bfb3fb63b14 100644 --- a/pkgs/tools/security/polkit-gnome/default.nix +++ b/pkgs/tools/security/polkit-gnome/default.nix @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { ''; meta = { - homepage = http://hal.freedesktop.org/docs/PolicyKit/; + homepage = https://hal.freedesktop.org/docs/PolicyKit/; description = "A dbus session bus service that is used to bring up authentication dialogs"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ phreedom ]; diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index 26311cce73c..1238a920760 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -70,9 +70,9 @@ stdenv.mkDerivation rec { providing an audit trail of the commands and their arguments. ''; - homepage = http://www.sudo.ws/; + homepage = https://www.sudo.ws/; - license = http://www.sudo.ws/sudo/license.html; + license = https://www.sudo.ws/sudo/license.html; maintainers = [ stdenv.lib.maintainers.eelco ]; diff --git a/pkgs/tools/security/tboot/default.nix b/pkgs/tools/security/tboot/default.nix index 534ff3fd0ff..a07a374c5d8 100644 --- a/pkgs/tools/security/tboot/default.nix +++ b/pkgs/tools/security/tboot/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A pre-kernel/VMM module that uses Intel(R) TXT to perform a measured and verified launch of an OS kernel/VMM"; - homepage = http://sourceforge.net/projects/tboot/; + homepage = https://sourceforge.net/projects/tboot/; license = licenses.bsd3; maintainers = with maintainers; [ ak ]; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/tools/security/tpm-tools/default.nix b/pkgs/tools/security/tpm-tools/default.nix index 8c68787db25..1944cf236e1 100644 --- a/pkgs/tools/security/tpm-tools/default.nix +++ b/pkgs/tools/security/tpm-tools/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { application enablement of Trusted Computing using a Trusted Platform Module (TPM), similar to a smart card environment. ''; - homepage = http://sourceforge.net/projects/trousers/files/tpm-tools/; + homepage = https://sourceforge.net/projects/trousers/files/tpm-tools/; license = licenses.cpl10; maintainers = [ maintainers.ak ]; platforms = platforms.unix; diff --git a/pkgs/tools/system/ctop/default.nix b/pkgs/tools/system/ctop/default.nix index 5ff4e7220ab..533f0ab11e4 100644 --- a/pkgs/tools/system/ctop/default.nix +++ b/pkgs/tools/system/ctop/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Concise commandline monitoring for containers"; - homepage = http://ctop.sh/; + homepage = https://ctop.sh/; license = licenses.mit; maintainers = with maintainers; [ apeyroux ]; }; diff --git a/pkgs/tools/system/lshw/default.nix b/pkgs/tools/system/lshw/default.nix index 499f7c46154..f6e09b6816f 100644 --- a/pkgs/tools/system/lshw/default.nix +++ b/pkgs/tools/system/lshw/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://ezix.org/project/wiki/HardwareLiSter; + homepage = https://ezix.org/project/wiki/HardwareLiSter; description = "Provide detailed information on the hardware configuration of the machine"; license = licenses.gpl2; maintainers = with maintainers; [ phreedom jgeerds ]; diff --git a/pkgs/tools/text/replace/default.nix b/pkgs/tools/text/replace/default.nix index 18ef074c8a5..2719a4c8191 100644 --- a/pkgs/tools/text/replace/default.nix +++ b/pkgs/tools/text/replace/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { patches = [./malloc.patch]; meta = { - homepage = http://replace.richardlloyd.org.uk/; + homepage = https://replace.richardlloyd.org.uk/; description = "A tool to replace verbatim strings"; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/tools/text/txt2tags/default.nix b/pkgs/tools/text/txt2tags/default.nix index 6aad3c7b23d..592f9b8f188 100644 --- a/pkgs/tools/text/txt2tags/default.nix +++ b/pkgs/tools/text/txt2tags/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { }; meta = { - homepage = http://txt2tags.org/; + homepage = https://txt2tags.org/; description = "A KISS markup language"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ kovirobi ]; diff --git a/pkgs/tools/typesetting/pdf2odt/default.nix b/pkgs/tools/typesetting/pdf2odt/default.nix index 902cf9a5f83..3e40c9caf28 100644 --- a/pkgs/tools/typesetting/pdf2odt/default.nix +++ b/pkgs/tools/typesetting/pdf2odt/default.nix @@ -40,7 +40,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "PDF to ODT format converter"; - homepage = http://github.com/gutschke/pdf2odt; + homepage = https://github.com/gutschke/pdf2odt; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ peterhoeg ]; diff --git a/pkgs/tools/virtualization/awsebcli/default.nix b/pkgs/tools/virtualization/awsebcli/default.nix index 72e3cb0ed2d..25752afd995 100644 --- a/pkgs/tools/virtualization/awsebcli/default.nix +++ b/pkgs/tools/virtualization/awsebcli/default.nix @@ -101,7 +101,7 @@ in with localPython.pkgs; buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = http://aws.amazon.com/elasticbeanstalk/; + homepage = https://aws.amazon.com/elasticbeanstalk/; description = "A command line interface for Elastic Beanstalk."; maintainers = with maintainers; [ eqyiel ]; license = licenses.asl20; diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix index b082bce11b7..1a37d58c70d 100644 --- a/pkgs/top-level/dotnet-packages.nix +++ b/pkgs/top-level/dotnet-packages.nix @@ -715,7 +715,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { meta = { description = "Math.NET Numerics is an opensource numerical library for .Net, Silverlight and Mono"; - homepage = http://numerics.mathdotnet.com/; + homepage = https://numerics.mathdotnet.com/; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ obadz ]; platforms = with stdenv.lib.platforms; linux; @@ -872,7 +872,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { meta = { description = "Popular high-performance JSON framework for .NET"; - homepage = "http://www.newtonsoft.com/json"; + homepage = "https://www.newtonsoft.com/json"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ obadz ]; platforms = with stdenv.lib.platforms; linux; From fa6538fbc474ff98c4bb4d181cb6bbd95a211efd Mon Sep 17 00:00:00 2001 From: Thomas Mader Date: Fri, 5 Jan 2018 20:50:30 +0100 Subject: [PATCH 254/296] dmd: 2.075.1 -> 2.078.0 --- pkgs/development/compilers/dmd/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix index 875e60dd6dc..e8e6b5224de 100644 --- a/pkgs/development/compilers/dmd/default.nix +++ b/pkgs/development/compilers/dmd/default.nix @@ -3,10 +3,10 @@ , curl, tzdata, gdb, darwin , callPackage , bootstrapVersion ? false -, version ? "2.075.1" -, dmdSha256 ? "0kq6r8rcghvzk5jcphg89l85rg734s29bssd2rcw3fygx0k9a9k5" -, druntimeSha256 ? "0idn2v1lmp7hl637g3i7pdfj9mjk4sclkz4cm77nl8873k2fhk8j" -, phobosSha256 ? "1a7q5fd15yspgs5plxgx54jyrcwgzlyw3rahmz04jd2s5h56dj04" +, version ? "2.078.0" +, dmdSha256 ? "1ia4swyq0xqppnpmcalh2yxywdk2gv3kvni2abx1mq6wwqgmwlcr" +, druntimeSha256 ? "0inyvcjc5qn8277d1zlfvgdgiss86rkjg9mhkw5l31hix8yan372" +, phobosSha256 ? "1vb5xnysja9l8hvv9gy4c05vihmblz7ga005761jbazxkmlfirj4" }: let @@ -125,10 +125,6 @@ let # Use proper C++ compiler substituteInPlace ${dmdPath}/posix.mak \ --replace g++ $CXX - - # TODO - substituteInPlace druntime/src/core/memory.d \ - --replace "assert(z is null);" "//assert(z is null);" '' + stdenv.lib.optionalString (!bootstrapVersion) '' From 80de99b46be38bff27ce97b7ecbaf462958e9391 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Fri, 5 Jan 2018 23:18:51 +0100 Subject: [PATCH 255/296] sierra-shared-test: fix build Using 500 libraries started failing with clang++: Argument list too long This is enough to reproduce the issue. --- pkgs/test/macos-sierra-shared/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/test/macos-sierra-shared/default.nix b/pkgs/test/macos-sierra-shared/default.nix index 51e8ae53736..73b359ffe6a 100644 --- a/pkgs/test/macos-sierra-shared/default.nix +++ b/pkgs/test/macos-sierra-shared/default.nix @@ -3,7 +3,7 @@ let makeBigExe = stdenv: prefix: rec { - count = 500; + count = 320; sillyLibs = lib.genList (i: stdenv.mkDerivation rec { name = "${prefix}-fluff-${toString i}"; @@ -75,13 +75,14 @@ in stdenvNoCC.mkDerivation { buildInputs = [ good.finalExe bad.finalExe ]; # TODO(@Ericson2314): Be impure or require exact MacOS version of builder? buildCommand = '' - if bad-asdf - then echo "bad-asdf can succeed on non-sierra, OK" >&2 + if bad-asdf &> /dev/null + then echo "WARNING: bad-asdf did not fail, not running on sierra?" >&2 else echo "bad-asdf should fail on sierra, OK" >&2 fi # Must succeed on all supported MacOS versions good-asdf + echo "good-asdf should succeed on sierra, OK" touch $out ''; From ef5e2cac7e397c8c4efa6da356cd16e52c2f78c6 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Fri, 5 Jan 2018 23:08:53 +0100 Subject: [PATCH 256/296] jack_capture: 0.9.69 -> 0.9.73 --- pkgs/applications/audio/jack-capture/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/jack-capture/default.nix b/pkgs/applications/audio/jack-capture/default.nix index f1e00e87673..e4d20db7868 100644 --- a/pkgs/applications/audio/jack-capture/default.nix +++ b/pkgs/applications/audio/jack-capture/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jack_capture-${version}"; - version = "0.9.69"; + version = "0.9.73"; src = fetchurl { url = "http://archive.notam02.no/arkiv/src/${name}.tar.gz"; - sha256 = "0sk7b92my1v1g7rhkpl1c608rb0rdb28m9zqfll95kflxajd16zv"; + sha256 = "1pji0zdwm3kxjrkbzj7fnxhr8ncrc8pyqnwyrh47fhypgqjv1br1"; }; nativeBuildInputs = [ pkgconfig ]; From f14baf268646deaed1fc3a74c01f71ba5504e756 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Fri, 5 Jan 2018 23:09:50 +0100 Subject: [PATCH 257/296] setbfree: 0.8.0 -> 0.8.5 --- pkgs/applications/audio/setbfree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/setbfree/default.nix b/pkgs/applications/audio/setbfree/default.nix index 0eaa9bde14f..63705d40c3f 100644 --- a/pkgs/applications/audio/setbfree/default.nix +++ b/pkgs/applications/audio/setbfree/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "setbfree-${version}"; - version = "0.8.0"; + version = "0.8.5"; src = fetchurl { url = "https://github.com/pantherb/setBfree/archive/v${version}.tar.gz"; - sha256 = "1lfylai4gyk512dknj16w2aq9ka8hvqca46nmq5b4rfjmi6dkxf6"; + sha256 = "0qfccny0hh9lq54272mzmxvfz2jmzcgigjkjwn6v9h6n00gi5bw4"; }; patchPhase = '' From 3fc9b54c62001530b886f9b8394cd422a6edba27 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Fri, 5 Jan 2018 23:10:51 +0100 Subject: [PATCH 258/296] yoshimi: 1.5.5 -> 1.5.6 --- pkgs/applications/audio/yoshimi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index 379a3ebbd4a..27d82942d34 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -6,11 +6,11 @@ assert stdenv ? glibc; stdenv.mkDerivation rec { name = "yoshimi-${version}"; - version = "1.5.5"; + version = "1.5.6"; src = fetchurl { url = "mirror://sourceforge/yoshimi/${name}.tar.bz2"; - sha256 = "0h71x9742bswifwll7bma1fz648fd5xd0yfp7byvsczy6zhjz5pf"; + sha256 = "0bjfhfslpa2hjrc9h38m7dlr62953w9n4cvkgvfy495cbym12dak"; }; buildInputs = [ From 60f62b512df7a0b6abae31f7b7fa8960e8dd4ec0 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Fri, 5 Jan 2018 23:13:32 +0100 Subject: [PATCH 259/296] jackaudio: 1.9.11-RC1 -> 1.9.12 --- pkgs/misc/jackaudio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index 20da91efede..a242f0261c7 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -27,13 +27,13 @@ let in stdenv.mkDerivation rec { name = "${prefix}jack2-${version}"; - version = "1.9.11-RC1"; + version = "1.9.12"; src = fetchFromGitHub { owner = "jackaudio"; repo = "jack2"; rev = "v${version}"; - sha256 = "0i708ar3ll5p8yj0h7ffg84nrn49ap47l2yy75rxyw30cyywhxp4"; + sha256 = "0ynpyn0l77m94b50g7ysl795nvam3ra65wx5zb46nxspgbf6wnkh"; }; nativeBuildInputs = [ pkgconfig python makeWrapper ]; From 80f13dc31db89a365a38d2dd723f892dd7599591 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Fri, 5 Jan 2018 22:43:16 +0000 Subject: [PATCH 260/296] fixup! buildkite-agent: change hooksPath type to 'path' (and prevent it from hitting the store) --- .../modules/services/continuous-integration/buildkite-agent.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/continuous-integration/buildkite-agent.nix b/nixos/modules/services/continuous-integration/buildkite-agent.nix index ac6514dfb37..1b0198ac93f 100644 --- a/nixos/modules/services/continuous-integration/buildkite-agent.nix +++ b/nixos/modules/services/continuous-integration/buildkite-agent.nix @@ -124,7 +124,7 @@ in name="${cfg.name}" meta-data="${cfg.meta-data}" build-path="${cfg.dataDir}/builds" - hooks-path="${cfg.hooks-path}" + hooks-path="${cfg.hooksPath}" bootstrap-script="${pkgs.buildkite-agent}/share/bootstrap.sh" EOF ''; From 22e0a3c1b8163dc499791ec669b2f9f3d8d97110 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 5 Jan 2018 18:31:34 -0600 Subject: [PATCH 261/296] ffmpeg: fix cross compile eval --- pkgs/development/libraries/ffmpeg/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index e8eab4827e6..906a15c419d 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -175,7 +175,7 @@ stdenv.mkDerivation rec { configureFlags = configureFlags ++ [ "--cross-prefix=${stdenv.cc.targetPrefix}" "--enable-cross-compile" - "--target_os=${hostPlatform.parsed.kernel}" + "--target_os=${hostPlatform.parsed.kernel.name}" "--arch=${hostPlatform.arch}" ]; }; From 5ead12ca20595c837bd4efd574789e055894232a Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 5 Jan 2018 18:38:50 -0600 Subject: [PATCH 262/296] release-small: remove dead attribute aterm25, removed early 2016 (Removed in 393977d800b5a1be040e111fd6da3d52b007ee0d) --- pkgs/top-level/release-small.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index be055ccb285..8e95bdd9231 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -19,7 +19,6 @@ with import ./release-lib.nix { inherit supportedSystems; }; aspell = all; at = linux; atlas = linux; - aterm25 = all; autoconf = all; automake = all; avahi = allBut cygwin; # Cygwin builds fail From 40b2647b694ef6bf20fce5df02d4115ce6430b3b Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 5 Jan 2018 18:51:41 -0600 Subject: [PATCH 263/296] gcc-wrapper-old: grab name of dynamicLinker for bintools --- .../build-support/gcc-wrapper-old/default.nix | 27 ++----------------- 1 file changed, 2 insertions(+), 25 deletions(-) diff --git a/pkgs/build-support/gcc-wrapper-old/default.nix b/pkgs/build-support/gcc-wrapper-old/default.nix index ae17989d932..2c2b2c0e1d5 100644 --- a/pkgs/build-support/gcc-wrapper-old/default.nix +++ b/pkgs/build-support/gcc-wrapper-old/default.nix @@ -8,7 +8,7 @@ { name ? "", stdenv, lib, nativeTools, nativeLibc, nativePrefix ? "" , gcc ? null, libc ? null, binutils ? null, coreutils ? null, shell ? stdenv.shell , zlib ? null -, hostPlatform, targetPlatform +, hostPlatform, targetPlatform, targetPackages }: assert nativeTools -> nativePrefix != ""; @@ -58,18 +58,6 @@ stdenv.mkDerivation { zlib = if gcc != null && gcc ? langVhdl then zlib else null; shell = shell + shell.shellPath or ""; - crossAttrs = { - # - # This is not the best way to do this. I think the reference should be - # the style in the gcc-cross-wrapper, but to keep a stable stdenv now I - # do this sufficient if/else. - dynamicLinker = - (if hostPlatform.arch == "arm" then "ld-linux.so.3" else - if hostPlatform.arch == "mips" then "ld.so.1" else - if stdenv.lib.hasSuffix "pc-gnu" hostPlatform.config then "ld.so.1" else - abort "don't know the name of the dynamic linker for this platform"); - }; - preferLocalBuild = true; meta = @@ -83,17 +71,6 @@ stdenv.mkDerivation { # The dynamic linker has different names on different platforms. dynamicLinker = if !nativeLibc then - (if targetPlatform.system == "i686-linux" then "ld-linux.so.2" else - if targetPlatform.system == "x86_64-linux" then "ld-linux-x86-64.so.2" else - # ARM with a wildcard, which can be "" or "-armhf". - if targetPlatform.isArm then "ld-linux*.so.3" else - if targetPlatform.system == "aarch64-linux" then "ld-linux-aarch64.so.1" else - if targetPlatform.system == "powerpc-linux" then "ld.so.1" else - if targetPlatform.system == "mips64el-linux" then "ld.so.1" else - if targetPlatform.system == "x86_64-darwin" then "/usr/lib/dyld" else - if stdenv.lib.hasSuffix "pc-gnu" targetPlatform.config then "ld.so.1" else - builtins.trace - "Don't know the name of the dynamic linker for platform ${targetPlatform.config}, so guessing instead." - null) + targetPackages.stdenv.cc.bintools.dynamicLinker else ""; } From 8e84172b2d298055af41ebca903794dce8f575d8 Mon Sep 17 00:00:00 2001 From: Anthony Cowley Date: Fri, 5 Jan 2018 20:32:04 -0500 Subject: [PATCH 264/296] opencv3: fix enableFfmpeg on darwin The VideoDecodeAcceleration framework and bzip2 library are needed when enableFfmpeg is set to true on darwin. --- pkgs/development/libraries/opencv/3.x.nix | 4 +++- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index a9b3c85d396..bcb3bde5ad7 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -24,7 +24,7 @@ , enableTesseract ? false, tesseract, leptonica , enableDocs ? false, doxygen, graphviz-nox -, AVFoundation, Cocoa, QTKit +, AVFoundation, Cocoa, QTKit, VideoDecodeAcceleration, bzip2 }: let @@ -168,6 +168,8 @@ stdenv.mkDerivation rec { ++ lib.optionals enableEXR [ openexr ilmbase ] ++ lib.optional enableJPEG2K jasper ++ lib.optional enableFfmpeg ffmpeg + ++ lib.optionals (enableFfmpeg && stdenv.isDarwin) + [ VideoDecodeAcceleration bzip2 ] ++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base ]) ++ lib.optional enableEigen eigen ++ lib.optional enableOpenblas openblas diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7e602c00e26..a219d00abf2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10295,7 +10295,7 @@ with pkgs; opencv3 = callPackage ../development/libraries/opencv/3.x.nix { enableCuda = config.cudaSupport or false; cudatoolkit = cudatoolkit8; - inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa QTKit; + inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa QTKit VideoDecodeAcceleration; }; # this ctl version is needed by openexr_viewers From d0eb40b311e7e6b474ac34c9b981cbdb09f1aa30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 24 Dec 2017 11:21:18 -0200 Subject: [PATCH 265/296] lightdm-gtk-greater: add configuration options for clock format and indicators --- nixos/doc/manual/release-notes/rl-1803.xml | 45 +++++++++++++++++++ .../display-managers/lightdm-greeters/gtk.nix | 31 +++++++++++++ 2 files changed, 76 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-1803.xml b/nixos/doc/manual/release-notes/rl-1803.xml index 0ab119232ee..c8549e7c4ad 100644 --- a/nixos/doc/manual/release-notes/rl-1803.xml +++ b/nixos/doc/manual/release-notes/rl-1803.xml @@ -189,6 +189,51 @@ following incompatible changes: corrupted blocks. + + + displayManager.lightdm.greeters.gtk.clock-format. + has been added, the clock format string (as expected by + strftime, e.g. %H:%M) to use with the lightdm + gtk greeter panel. + + + If set to null the default clock format is used. + + + + + displayManager.lightdm.greeters.gtk.indicators + has been added, a list of allowed indicator modules to use with + the lightdm gtk greeter panel. + + + Built-in indicators include ~a11y, + ~language, ~session, + ~power, ~clock, + ~host, ~spacer. Unity + indicators can be represented by short name + (e.g. sound, power), + service file name, or absolute path. + + + If set to null the default indicators are + used. + + + In order to have the previous default configuration add + + services.xserver.displayManager.lightdm.greeters.gtk.indicators = [ + "~host" "~spacer" + "~clock" "~spacer" + "~session" + "~language" + "~a11y" + "~power" + ]; + + to your configuration.nix. + + diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix index 1d5dcb2c7cb..35b715b98fc 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix @@ -45,6 +45,8 @@ let theme-name = ${cfg.theme.name} icon-theme-name = ${cfg.iconTheme.name} background = ${ldmcfg.background} + ${optionalString (cfg.clock-format != null) "clock-format = ${cfg.clock-format}"} + ${optionalString (cfg.indicators != null) "indicators = ${concatStringsSep ";" cfg.indicators}"} ${cfg.extraConfig} ''; @@ -104,6 +106,35 @@ in }; + clock-format = mkOption { + type = types.nullOr types.str; + default = null; + example = "%F"; + description = '' + Clock format string (as expected by strftime, e.g. "%H:%M") + to use with the lightdm gtk greeter panel. + + If set to null the default clock format is used. + ''; + }; + + indicators = mkOption { + type = types.nullOr (types.listOf types.str); + default = null; + example = [ "~host" "~spacer" "~clock" "~spacer" "~session" "~language" "~a11y" "~power" ]; + description = '' + List of allowed indicator modules to use for the lightdm gtk + greeter panel. + + Built-in indicators include "~a11y", "~language", "~session", + "~power", "~clock", "~host", "~spacer". Unity indicators can be + represented by short name (e.g. "sound", "power"), service file name, + or absolute path. + + If set to null the default indicators are used. + ''; + }; + extraConfig = mkOption { type = types.lines; default = ""; From 7920785860e8bbf3ceef8b77b56013a24e2ec085 Mon Sep 17 00:00:00 2001 From: Dmitry Moskowski Date: Thu, 4 Jan 2018 01:30:15 +0000 Subject: [PATCH 266/296] aircrack-ng: wrap airmon-ng with needed tools Fixes #9901 --- pkgs/tools/networking/aircrack-ng/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/aircrack-ng/default.nix b/pkgs/tools/networking/aircrack-ng/default.nix index 5a56430c20e..d7e1b2289dc 100644 --- a/pkgs/tools/networking/aircrack-ng/default.nix +++ b/pkgs/tools/networking/aircrack-ng/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, libpcap, openssl, zlib, wirelesstools, libnl, pkgconfig }: +{ stdenv, fetchurl, libpcap, openssl, zlib, wirelesstools +, iw, ethtool, pciutils, libnl, pkgconfig, makeWrapper }: stdenv.mkDerivation rec { name = "aircrack-ng-1.2-rc4"; @@ -8,13 +9,19 @@ stdenv.mkDerivation rec { sha256 = "0dpzx9kddxpgzmgvdpl3rxn0jdaqhm5wxxndp1xd7d75mmmc2fnr"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libpcap openssl zlib libnl ]; + nativeBuildInputs = [ pkgconfig makeWrapper ]; + buildInputs = [ libpcap openssl zlib libnl iw ethtool pciutils ]; patchPhase = '' sed -e 's@^prefix.*@prefix = '$out@ -i common.mak sed -e 's@/usr/local/bin@'${wirelesstools}@ -i src/osdep/linux.c - ''; + ''; + + postFixup = '' + wrapProgram $out/bin/airmon-ng --prefix PATH : ${stdenv.lib.makeBinPath [ + ethtool iw pciutils + ]} + ''; meta = with stdenv.lib; { description = "Wireless encryption cracking tools"; From 4ba754774312dc42d1b7cef2be030af8b7c5c2ad Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sat, 30 Dec 2017 20:04:44 +0300 Subject: [PATCH 267/296] percona-xtrabackup: init at 2.4.9 --- .../backup/percona-xtrabackup/default.nix | 46 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 50 insertions(+) create mode 100644 pkgs/tools/backup/percona-xtrabackup/default.nix diff --git a/pkgs/tools/backup/percona-xtrabackup/default.nix b/pkgs/tools/backup/percona-xtrabackup/default.nix new file mode 100644 index 00000000000..6899ba88a22 --- /dev/null +++ b/pkgs/tools/backup/percona-xtrabackup/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig +, boost, bison, curl, ncurses, openssl, readline, xxd +, libaio, libev, libgcrypt, libgpgerror, libtool, zlib +}: + +stdenv.mkDerivation rec { + name = "percona-xtrabackup-${version}"; + version = "2.4.9"; + + src = fetchFromGitHub { + owner = "percona"; + repo = "percona-xtrabackup"; + rev = name; + sha256 = "11w87wj2jasrnygzjg3b59q9x0m6lhyg1wzdvclmgbmqsk9bvqv4"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + + buildInputs = [ + boost bison curl ncurses openssl readline xxd + libaio libev libgcrypt libgpgerror libtool zlib + ]; + + cmakeFlags = [ + "-DBUILD_CONFIG=xtrabackup_release" + "-DINSTALL_MYSQLTESTDIR=OFF" + "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock" + "-DWITH_SSL=system" + "-DWITH_ZLIB=system" + "-DWITH_MECAB=system" + "-DWITH_EXTRA_CHARSETS=all" + "-DWITH_INNODB_MEMCACHED=1" + "-DWITH_MAN_PAGES=OFF" + "-DWITH_HTML_DOCS=OFF" + "-DWITH_LATEX_DOCS=OFF" + "-DWITH_PDF_DOCS=OFF" + ]; + + meta = with stdenv.lib; { + description = "Non-blocking backup tool for MySQL"; + homepage = http://www.percona.com/software/percona-xtrabackup; + license = licenses.lgpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ izorkin ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7a4fa484438..753870bee01 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3926,6 +3926,10 @@ with pkgs; pepper = callPackage ../tools/admin/salt/pepper { }; + percona-xtrabackup = callPackage ../tools/backup/percona-xtrabackup { + boost = boost159; + }; + pick = callPackage ../tools/misc/pick { }; pitivi = callPackage ../applications/video/pitivi { From c8c94a22ae53d15c52ed11fbac04d0846794b756 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Fri, 5 Jan 2018 23:26:11 +0100 Subject: [PATCH 268/296] Simplescreenrecorder: 0.3.8 -> 0.3.9 --- .../video/simplescreenrecorder/default.nix | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix index 447518d008b..75bd398b208 100644 --- a/pkgs/applications/video/simplescreenrecorder/default.nix +++ b/pkgs/applications/video/simplescreenrecorder/default.nix @@ -1,22 +1,19 @@ { stdenv, fetchurl, alsaLib, ffmpeg, libjack2, libX11, libXext -, libXfixes, mesa, pkgconfig, libpulseaudio, qt4 +, libXfixes, mesa, pkgconfig, libpulseaudio, qt4, cmake, ninja }: stdenv.mkDerivation rec { name = "simplescreenrecorder-${version}"; - version = "0.3.8"; + version = "0.3.9"; src = fetchurl { url = "https://github.com/MaartenBaert/ssr/archive/${version}.tar.gz"; - sha256 = "0v8w35n8w772s08w7k0icynqdsdakbrcanbgx6j847bfqfsg21gg"; + sha256 = "1gnf9wbiq2fcbqcn1a5nfmp8r0nxrrlgh2wly2mfkkwymynhx0pk"; }; patches = [ ./fix-paths.patch ]; postPatch = '' - # #455 - sed '1i#include ' -i src/Benchmark.cpp - for i in scripts/ssr-glinject src/AV/Input/GLInjectInput.cpp; do substituteInPlace $i \ --subst-var out \ @@ -24,14 +21,12 @@ stdenv.mkDerivation rec { done ''; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ + nativeBuildInputs = [ pkgconfig cmake ninja ]; + buildInputs = [ alsaLib ffmpeg libjack2 libX11 libXext libXfixes mesa libpulseaudio qt4 ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "A screen recorder for Linux"; homepage = http://www.maartenbaert.be/simplescreenrecorder; From d630be51ab617356ca9817f935636ac48dd5b745 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 5 Jan 2018 19:27:02 -0600 Subject: [PATCH 269/296] tcpdump: fix eval if no kernelMajor specified, assume compat --- pkgs/tools/networking/tcpdump/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix index 8dba4b373a3..5c6920487b7 100644 --- a/pkgs/tools/networking/tcpdump/default.nix +++ b/pkgs/tools/networking/tcpdump/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { crossAttrs = { LDFLAGS = if enableStatic then "-static" else ""; configureFlags = [ "ac_cv_linux_vers=2" ] ++ (stdenv.lib.optional - (hostPlatform.platform.kernelMajor == "2.4") "--disable-ipv6"); + (hostPlatform.platform.kernelMajor or null == "2.4") "--disable-ipv6"); }; meta = { From 443687c31a2ac7e2b9522c163abaa58a945449ab Mon Sep 17 00:00:00 2001 From: Victor Calvert Date: Fri, 5 Jan 2018 23:21:04 -0500 Subject: [PATCH 270/296] wordgrinder: 0.6 -> 0.7.1 --- .../office/wordgrinder/default.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/office/wordgrinder/default.nix b/pkgs/applications/office/wordgrinder/default.nix index 67f7e2816a4..da096acc27f 100644 --- a/pkgs/applications/office/wordgrinder/default.nix +++ b/pkgs/applications/office/wordgrinder/default.nix @@ -1,24 +1,32 @@ { stdenv, fetchFromGitHub, pkgconfig, makeWrapper -, lua52Packages, libXft, ncurses, readline, zlib }: +, lua52Packages, libXft, ncurses, ninja, readline, zlib }: stdenv.mkDerivation rec { name = "wordgrinder-${version}"; - version = "0.6-db14181"; + version = "0.7.1"; src = fetchFromGitHub { repo = "wordgrinder"; owner = "davidgiven"; - rev = "db141815e8bd1da6e684a1142a59492e516f3041"; - sha256 = "1l1jqzcqiwnc8r1igfi7ay4pzzhdhss81znnmfr4rc1ia8bpdjc2"; + rev = "${version}"; + sha256 = "19n4vn8zyvcvgwygm63d3jcmiwh6a2ikrrqqmkm8fvhdvwkqgr9k"; }; makeFlags = [ "PREFIX=$(out)" "LUA_INCLUDE=${lua52Packages.lua}/include" "LUA_LIB=${lua52Packages.lua}/lib/liblua.so" + "XFT_PACKAGE=--libs=\{-lX11 -lXft\}" ]; - nativeBuildInputs = [ pkgconfig makeWrapper ]; + dontUseNinjaBuild = true; + dontUseNinjaInstall = true; + + nativeBuildInputs = [ + pkgconfig + makeWrapper + ninja + ]; buildInputs = [ libXft From b7d216e51c1b43aa89697f8d37585fe177ad49dd Mon Sep 17 00:00:00 2001 From: Alex Brandt Date: Fri, 5 Jan 2018 22:42:44 -0600 Subject: [PATCH 271/296] add alunduil as maintainer of network-arbitrary --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 71b1d9b93b4..56e79f86d7f 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2759,6 +2759,7 @@ package-maintainers: - lambdabot alunduil: - collection-json + - network-arbitrary - network-uri-json - siren-json From c77e0539e0bbf051281e13f611705e02b9fb7938 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Fri, 5 Jan 2018 20:08:20 +0100 Subject: [PATCH 272/296] wireshark-gtk: explicitly disable the Qt build when building Gtk In a recent Cmake(?) or wireshark release the default behaviour did change. A failing build log can be seen at hydra [1]. [1] https://hydra.nixos.org/build/67179559/nixlog/1 --- pkgs/applications/networking/sniffers/wireshark/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 5fe818a506b..7c17fb715a7 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -23,7 +23,7 @@ in stdenv.mkDerivation { sha256 = "0bpiby916k3k8bm7q8b1dflva6zs0a4ircskrck0d538dfcrb50q"; }; - cmakeFlags = optional withGtk "-DBUILD_wireshark_gtk=TRUE"; + cmakeFlags = optional withGtk "-DBUILD_wireshark_gtk=TRUE -DBUILD_wireshark=OFF"; nativeBuildInputs = [ bison cmake extra-cmake-modules flex pkgconfig From 969d61dd429b7798c12eeed8ca2d9bbd54aa4b08 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Sat, 6 Jan 2018 05:45:23 +0100 Subject: [PATCH 273/296] wireshark: en- & disable Gtk/Qt separately This should also fix the wireshark-cli variant --- pkgs/applications/networking/sniffers/wireshark/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 7c17fb715a7..f91c0de9c8d 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -23,7 +23,10 @@ in stdenv.mkDerivation { sha256 = "0bpiby916k3k8bm7q8b1dflva6zs0a4ircskrck0d538dfcrb50q"; }; - cmakeFlags = optional withGtk "-DBUILD_wireshark_gtk=TRUE -DBUILD_wireshark=OFF"; + cmakeFlags = [ + "-DBUILD_wireshark_gtk=${if withGtk then "ON" else "OFF"}" + "-DBUILD_wireshark=${if withQt then "ON" else "OFF"}" + ]; nativeBuildInputs = [ bison cmake extra-cmake-modules flex pkgconfig From f5c7b937cd26f84f3b76a2a1244ff5360d752bf4 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Sat, 6 Jan 2018 07:15:08 +0000 Subject: [PATCH 274/296] transmission_gtk: rename to transmission-gtk --- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 2c249f73d6c..a33768911a5 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -154,6 +154,7 @@ mapAliases (rec { system_config_printer = system-config-printer; # added 2016-01-03 telepathy_qt5 = libsForQt5.telepathy; # added 2015-12-19 tftp_hpa = tftp-hpa; # added 2015-04-03 + transmission_gtk = transmission-gtk; # added 2018-01-06 ucsFonts = ucs-fonts; # added 2016-07-15 ultrastardx-beta = ultrastardx; # added 2017-08-12 usb_modeswitch = usb-modeswitch; # added 2016-05-10 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ff1f0df9b9b..ac8a2449070 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17227,7 +17227,7 @@ with pkgs; transcribe = callPackage ../applications/audio/transcribe { }; transmission = callPackage ../applications/networking/p2p/transmission { }; - transmission_gtk = transmission.override { enableGTK3 = true; }; + transmission-gtk = transmission.override { enableGTK3 = true; }; transmission-remote-cli = callPackage ../applications/networking/p2p/transmission-remote-cli {}; transmission_remote_gtk = callPackage ../applications/networking/p2p/transmission-remote-gtk {}; From eaf661e15fdf826a7362ba7ca121c61871d3e67a Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 6 Jan 2018 08:21:57 +0100 Subject: [PATCH 275/296] php56: 5.6.32 -> 5.6.33 --- pkgs/development/interpreters/php/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 40c01b15e5a..76db873edc0 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -338,8 +338,8 @@ let in { php56 = generic { - version = "5.6.32"; - sha256 = "0lfbmdkvijkm6xc4p9sykv66y8xwhws0vsmka8v5cax4bxx4xr1y"; + version = "5.6.33"; + sha256 = "1k1ip1slk89hkp57qiqp8k2m5yrg9lx5rja542g87k8xfslrdxh7"; }; php70 = generic { From b5e422583ebd7f50cae94ec45dd731bf041ebe7b Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 6 Jan 2018 08:32:12 +0100 Subject: [PATCH 276/296] php70: 7.0.25 -> 7.0.27 --- pkgs/development/interpreters/php/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 76db873edc0..6a5c009317f 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -343,8 +343,8 @@ in { }; php70 = generic { - version = "7.0.25"; - sha256 = "09fc2lj447phprvilvq2sb6n0r1snj142f8faphrd896s6b4v8lm"; + version = "7.0.27"; + sha256 = "0ca174kp2l3fjcp8z0mqnkbjfhijjzz7rs7bkzg1qk2cpdijbylr"; }; php71 = generic { From 2739b1093ec8c0878bb3869d94da185cba2c3057 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Sat, 6 Jan 2018 08:24:12 +0000 Subject: [PATCH 277/296] transmission_remote_gtk: rename to transmission-remote-gtk --- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a33768911a5..a93350f52f4 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -155,6 +155,7 @@ mapAliases (rec { telepathy_qt5 = libsForQt5.telepathy; # added 2015-12-19 tftp_hpa = tftp-hpa; # added 2015-04-03 transmission_gtk = transmission-gtk; # added 2018-01-06 + transmission_remote_gtk = transmission-remote-gtk; # added 2018-01-06 ucsFonts = ucs-fonts; # added 2016-07-15 ultrastardx-beta = ultrastardx; # added 2017-08-12 usb_modeswitch = usb-modeswitch; # added 2016-05-10 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac8a2449070..50ea8df6e7f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17230,7 +17230,7 @@ with pkgs; transmission-gtk = transmission.override { enableGTK3 = true; }; transmission-remote-cli = callPackage ../applications/networking/p2p/transmission-remote-cli {}; - transmission_remote_gtk = callPackage ../applications/networking/p2p/transmission-remote-gtk {}; + transmission-remote-gtk = callPackage ../applications/networking/p2p/transmission-remote-gtk {}; transgui = callPackage ../applications/networking/p2p/transgui { }; From 5e85657ba5763b496388b9820519ec99a238f613 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 6 Jan 2018 16:52:58 +0800 Subject: [PATCH 278/296] rsync: Fix CVE-2017-17433 and CVE-2017-17434 --- pkgs/applications/networking/sync/rsync/base.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/applications/networking/sync/rsync/base.nix b/pkgs/applications/networking/sync/rsync/base.nix index f6224b0f48f..69613c489e1 100644 --- a/pkgs/applications/networking/sync/rsync/base.nix +++ b/pkgs/applications/networking/sync/rsync/base.nix @@ -18,6 +18,21 @@ rec { url = "https://git.samba.org/rsync.git/?p=rsync.git;a=commitdiff_plain;h=47a63d90e71d3e19e0e96052bb8c6b9cb140ecc1;hp=bc112b0e7feece62ce98708092306639a8a53cce"; sha256 = "1dcdnfhbc5gd0ph7pds0xr2v8rpb2a4p7l9c1wml96nhnyww1pg1"; }) + (fetchpatch { + name = "CVE-2017-17433.patch"; + url = "https://git.samba.org/?p=rsync.git;a=patch;h=3e06d40029cfdce9d0f73d87cfd4edaf54be9c51"; + sha256 = "1kvnh6znp37a447h9fm2pk7v4phx20bk60j4wbsd92xlpp7vck52"; + }) + (fetchpatch { + name = "CVE-2017-17434-patch1.patch"; + url = "https://git.samba.org/?p=rsync.git;a=patch;h=5509597decdbd7b91994210f700329d8a35e70a1"; + sha256 = "16gg670s6b4gn3fywkkagixkpkpf31a3fiqx2a544640pblbgvyx"; + }) + (fetchpatch { + name = "CVE-2017-17434-patch2.patch"; + url = "https://git.samba.org/?p=rsync.git;a=patch;h=70aeb5fddd1b2f8e143276f8d5a085db16c593b9"; + sha256 = "182pc5bk1i57ganyn51bcs6vi2fib7zcw4kz3iyqkzihnjds10a6"; + }) ]; meta = with stdenv.lib; { From ab86148a220ca6dcab1c654da021ca76e7a62248 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 6 Jan 2018 10:34:04 +0100 Subject: [PATCH 279/296] php71: 7.1.11 -> 7.1.13 --- pkgs/development/interpreters/php/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 6a5c009317f..e1ca8fba744 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -348,8 +348,8 @@ in { }; php71 = generic { - version = "7.1.11"; - sha256 = "0ww5493w8w3jlks0xqlfm3v6mm53vpnv5vjy63inkj8zf3gdfikn"; + version = "7.1.13"; + sha256 = "18cqry8jy7q9fp82p3n9ndxffyba6f6q3maz3100jq245lfsbz9m"; }; php72 = generic { From ddb2b97c3c386bd131ae79a00ce64dc23034f10e Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 6 Jan 2018 10:46:52 +0100 Subject: [PATCH 280/296] php72: 7.2.0 -> 7.2.1 --- pkgs/development/interpreters/php/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index e1ca8fba744..c547e3d8ada 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -353,7 +353,7 @@ in { }; php72 = generic { - version = "7.2.0"; - sha256 = "0jn642bm4ah6a5cjavpz8mzw3ddxa270fcwxkj3rg6vb4bjgmzib"; + version = "7.2.1"; + sha256 = "0ygbcilbp3fiswd240ib2mvnhy0yy0az8kjzpjfd4kca4qzpj1py"; }; } From 9202bef08598c811e3f0ca56bd076c8bd2856559 Mon Sep 17 00:00:00 2001 From: Shaun Sharples Date: Sat, 6 Jan 2018 12:02:07 +0200 Subject: [PATCH 281/296] unifi: 5.6.22 -> 5.6.29 --- pkgs/servers/unifi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index 71bc0de6d91..d4a0145e9b9 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "unifi-controller-${version}"; - version = "5.6.22"; + version = "5.6.29"; src = fetchurl { url = "https://dl.ubnt.com/unifi/${version}/unifi_sysvinit_all.deb"; - sha256 = "1ffphdi4df3jhlcl68amb90f5pj7cwyrql4qwbswynh9d623880l"; + sha256 = "05na94mrd1dy95vnwd1ycqx4i38wf0lg67sjg263ilq5l1prdmz8"; }; buildInputs = [ dpkg ]; From 5d56434e561afeb7cea708db6d85296c6704989e Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Fri, 5 Jan 2018 08:45:54 -0500 Subject: [PATCH 282/296] hindent: needs new haskell-src-exts --- pkgs/development/haskell-modules/configuration-common.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 5e04bf5a846..3a1e733a63d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -653,7 +653,9 @@ self: super: { ln -s $lispdir $data/share/emacs/site-lisp ''; doCheck = false; # https://github.com/chrisdone/hindent/issues/299 - })); + })).override { + haskell-src-exts = self.haskell-src-exts_1_20_1; + }; # https://github.com/bos/configurator/issues/22 configurator = dontCheck super.configurator; From 3bf1c3f9618e9bb3d0c87487e8658edd500af833 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 6 Jan 2018 02:30:32 +0100 Subject: [PATCH 283/296] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.7.2 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/5de0e510e98b4c611d77d1dd60a4eaed710758be. --- .../haskell-modules/hackage-packages.nix | 268 +++++++++++++++--- 1 file changed, 234 insertions(+), 34 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 7c6f472b879..a0140b59083 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -753,8 +753,8 @@ self: { pname = "Agda"; version = "2.5.3"; sha256 = "0r80vw7vnvbgq47y50v050malv7zvv2p2kg6f47i04r0b2ix855a"; - revision = "2"; - editedCabalFile = "1vh1v5410wji5r8445rf9h0qd94kz7dkq4pmqcrk3ra75klp4sc9"; + revision = "3"; + editedCabalFile = "1hd1viy4wj7fyskjmmf5hqziyvk5qxjr0zcnbp5zdyacng0yyafi"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -4727,14 +4727,14 @@ self: { license = "unknown"; }) {}; - "EdisonCore_1_3_2" = callPackage + "EdisonCore_1_3_2_1" = callPackage ({ mkDerivation, array, base, containers, EdisonAPI, mtl , QuickCheck }: mkDerivation { pname = "EdisonCore"; - version = "1.3.2"; - sha256 = "03ra7xsgdyy7nmy6dlspbzddzfpx1cqv75pn0qk6hdxwnabvnbl1"; + version = "1.3.2.1"; + sha256 = "0fgj5iwiv3v2gdgx7kjcr15dcs4x1kvmjspp3p99wyhh0x6h3ikk"; libraryHaskellDepends = [ array base containers EdisonAPI mtl QuickCheck ]; @@ -9107,6 +9107,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "HappyTree" = callPackage + ({ mkDerivation, base, constraints, generics-sop, singletons }: + mkDerivation { + pname = "HappyTree"; + version = "0.2018.1.5"; + sha256 = "14w7dicsirzmz016vbhc6kzzps5fg036xz42myi4jdkfinl5vzk9"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base constraints generics-sop singletons + ]; + executableHaskellDepends = [ + base constraints generics-sop singletons + ]; + testHaskellDepends = [ base constraints generics-sop singletons ]; + homepage = "https://github.com/MarisaKirisame/HappyTree#readme"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "HarmTrace" = callPackage ({ mkDerivation, array, base, binary, cmdargs, deepseq, Diff , directory, filepath, ghc-prim, HarmTrace-Base, instant-generics @@ -41596,10 +41615,8 @@ self: { ({ mkDerivation, alg, base }: mkDerivation { pname = "category"; - version = "0.2.0.0"; - sha256 = "1zl7jsc99wqdw6fibxr9l3zf7xprkh5q1681gx6d5kvj9cfahcav"; - revision = "1"; - editedCabalFile = "0j24ymqy443wx7r5w8xklqsp1x133pwlwfni92qm0im66flfdb44"; + version = "0.2.0.1"; + sha256 = "0v5b15lgbdjrqpln532kw2d4isl5lf633jbld3clcp7c71vb7l07"; libraryHaskellDepends = [ alg base ]; description = "Categorical types and classes"; license = stdenv.lib.licenses.bsd3; @@ -51447,17 +51464,20 @@ self: { }) {}; "crdt" = callPackage - ({ mkDerivation, base, containers, mtl, QuickCheck, tasty - , tasty-discover, tasty-quickcheck + ({ mkDerivation, base, binary, bytestring, containers, mtl + , network-info, QuickCheck, quickcheck-instances, safe, tasty + , tasty-discover, tasty-quickcheck, time }: mkDerivation { pname = "crdt"; - version = "4.0"; - sha256 = "16lsyvcnz8qjy5lakf4dxzz9b4rcgz8bk6wzf3cmxn51kpxyc0rn"; - libraryHaskellDepends = [ base containers mtl ]; + version = "4.2"; + sha256 = "0hfhxq5dn78nqc49d55452ar2lh3xzxpgxdxq1jd9dyslmaqhnaj"; + libraryHaskellDepends = [ + base binary bytestring containers mtl network-info safe time + ]; testHaskellDepends = [ - base containers mtl QuickCheck tasty tasty-discover - tasty-quickcheck + base containers QuickCheck quickcheck-instances tasty + tasty-discover tasty-quickcheck ]; homepage = "https://github.com/cblp/crdt#readme"; description = "Conflict-free replicated data types"; @@ -65626,6 +65646,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "emoji" = callPackage + ({ mkDerivation, aeson, base, bytestring, template-haskell, text + , unordered-containers + }: + mkDerivation { + pname = "emoji"; + version = "0.1.0.2"; + sha256 = "1307phy81cki9ijpsl8hfczxm5wi1lrmmvmyxxn9a109nz9aqfla"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring template-haskell text unordered-containers + ]; + executableHaskellDepends = [ base ]; + homepage = "https://github.com/nakaji-dayo/hs-emoji#readme"; + description = "emoji utility"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "empty" = callPackage ({ mkDerivation }: mkDerivation { @@ -75763,12 +75802,12 @@ self: { }) {}; "fx" = callPackage - ({ mkDerivation, base, base-prelude, transformers }: + ({ mkDerivation, base }: mkDerivation { pname = "fx"; - version = "0.7"; - sha256 = "114psjyz9jvda86gk29x9xl2h1r6a6lxxhpl4zw5wkf3zszjsylc"; - libraryHaskellDepends = [ base base-prelude transformers ]; + version = "0.10"; + sha256 = "0nki5nb55qahjf3f2dqrfvrx77i3kba6aqiv1pwwkinnlv3k7n7i"; + libraryHaskellDepends = [ base ]; homepage = "https://github.com/nikita-volkov/fx"; description = "Horizontally composable effects"; license = stdenv.lib.licenses.mit; @@ -76012,6 +76051,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "gauge_0_2_0" = callPackage + ({ mkDerivation, base, basement, bytestring, deepseq, directory + , HUnit, math-functions, mwc-random, process, tasty, tasty-hunit + , vector + }: + mkDerivation { + pname = "gauge"; + version = "0.2.0"; + sha256 = "05sq8lgg7a7y5wpvsvx847whwdznsarxf41vndjx264v8x61jv86"; + libraryHaskellDepends = [ + base basement deepseq directory math-functions mwc-random process + vector + ]; + testHaskellDepends = [ + base bytestring deepseq directory HUnit tasty tasty-hunit + ]; + benchmarkHaskellDepends = [ base ]; + homepage = "https://github.com/vincenthz/hs-gauge"; + description = "small framework for performance measurement and analysis"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gbu" = callPackage ({ mkDerivation, base, containers, fgl, Graphalyze, haskell98, mtl , regex-posix @@ -101614,17 +101676,17 @@ self: { , bytestring, concurrentoutput, containers, cryptonite, data-fix , deepseq, directory, exceptions, filepath, foldl, hnix , http-client, http-types, lens, lens-aeson, lifted-base, memory - , mtl, neat-interpolation, network, network-uri, optional-args - , optparse-applicative, optparse-generic, pooled-io, pureMD5 - , scientific, tar, tasty, tasty-golden, tasty-hunit + , mtl, neat-interpolation, network, network-uri, nix-paths + , optional-args, optparse-applicative, optparse-generic, pooled-io + , pureMD5, scientific, tar, tasty, tasty-golden, tasty-hunit , tasty-quickcheck, tasty-smallcheck, temporary, text, time , transformers, turtle, unordered-containers, uri-bytestring , vector, wreq, zlib }: mkDerivation { pname = "hocker"; - version = "1.0.3"; - sha256 = "1cwd6d3m8d2zrinll5jdm50nnasb75i19172jjaw018figj3cf96"; + version = "1.0.4"; + sha256 = "1lf8m6cd54vc436krl3j4kanmnd86r4ri45a1qp7y4qqlpplcnpf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -101632,9 +101694,9 @@ self: { concurrentoutput containers cryptonite data-fix deepseq directory exceptions filepath foldl hnix http-client http-types lens lens-aeson lifted-base memory mtl neat-interpolation network - network-uri optparse-applicative optparse-generic pooled-io pureMD5 - scientific tar temporary text time transformers turtle - unordered-containers uri-bytestring vector wreq zlib + network-uri nix-paths optparse-applicative optparse-generic + pooled-io pureMD5 scientific tar temporary text time transformers + turtle unordered-containers uri-bytestring vector wreq zlib ]; executableHaskellDepends = [ base bytestring cryptonite data-fix filepath hnix lens mtl network @@ -105864,8 +105926,8 @@ self: { }: mkDerivation { pname = "hsimport"; - version = "0.8.4"; - sha256 = "1xngy3qnk6nr0yvvkq7cqay0kkhnp0v4ah27w8r5v3q4malraa1l"; + version = "0.8.5"; + sha256 = "05gdzl4h67rjpw2nhk6dvd9l8lmx1kdg4cy9hmk5l36vrk8s9ic6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -116162,6 +116224,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "iri" = callPackage + ({ mkDerivation, attoparsec, base, base-prelude, bug, bytestring + , contravariant, ip, profunctors, ptr, punycode, QuickCheck + , quickcheck-instances, rerebase, semigroups, tasty, tasty-hunit + , tasty-quickcheck, template-haskell, text, text-builder, th-lift + , th-lift-instances, unordered-containers, vector, vector-builder + }: + mkDerivation { + pname = "iri"; + version = "0.2"; + sha256 = "0rldjjfdrg5sv96aig5y4yb13633yy3dcxq659i2drmipyll8iw0"; + libraryHaskellDepends = [ + attoparsec base base-prelude bug bytestring contravariant ip + profunctors ptr punycode semigroups template-haskell text + text-builder th-lift th-lift-instances unordered-containers vector + vector-builder + ]; + testHaskellDepends = [ + QuickCheck quickcheck-instances rerebase tasty tasty-hunit + tasty-quickcheck + ]; + homepage = "https://github.com/nikita-volkov/iri"; + description = "RFC-based International Resource Identifier library"; + license = stdenv.lib.licenses.mit; + }) {}; + "iridium" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, Cabal, containers , extra, foldl, http-conduit, lifted-base, monad-control @@ -124349,6 +124437,8 @@ self: { pname = "lens-family-th"; version = "0.5.0.1"; sha256 = "00rpx75hh8p2991m36jp1cb91m048xjn8f02kj2zqsfwfhimfdzs"; + revision = "1"; + editedCabalFile = "190jxqskd61irc97zb95h08zlkszlhpik4zmb7y4vk7x06zz00m6"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base hspec lens-family template-haskell ]; homepage = "http://github.com/DanBurton/lens-family-th#readme"; @@ -144864,6 +144954,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "nvvm_0_8_0_2" = callPackage + ({ mkDerivation, base, bytestring, c2hs, Cabal, cuda, directory + , filepath, template-haskell + }: + mkDerivation { + pname = "nvvm"; + version = "0.8.0.2"; + sha256 = "05px0bxqqxph5ancvklg1fmp6p7c15vghzrwq8alsfjg7lvrd933"; + setupHaskellDepends = [ + base Cabal cuda directory filepath template-haskell + ]; + libraryHaskellDepends = [ base bytestring cuda template-haskell ]; + libraryToolDepends = [ c2hs ]; + homepage = "https://github.com/tmcdonell/nvvm"; + description = "FFI bindings to NVVM"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "nyan" = callPackage ({ mkDerivation, base, bytestring, mtl, ncurses, text }: mkDerivation { @@ -145135,8 +145244,8 @@ self: { }: mkDerivation { pname = "ocaml-export"; - version = "0.2.0.0"; - sha256 = "043vpjj3y8s0jyg5dfbbmxl6hypywn97m4f7ka7svkr84clzpjc7"; + version = "0.3.0.0"; + sha256 = "1hxi2dij5qgpa0njvvgda0zvz5xjl16jba3aw8y0ma5bqvhl7hp4"; libraryHaskellDepends = [ aeson base bytestring containers directory file-embed filepath formatting hspec-golden-aeson mtl QuickCheck @@ -164038,6 +164147,38 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "rattletrap_4_0_1" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, binary, binary-bits + , bytestring, containers, filepath, http-client, http-client-tls + , HUnit, template-haskell, temporary, text, transformers + }: + mkDerivation { + pname = "rattletrap"; + version = "4.0.1"; + sha256 = "01dvidlby3k6i7nnh0az3xmmdpvrx594jy6zq6ccf14cjb0m95kv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty base binary binary-bits bytestring containers + filepath http-client http-client-tls template-haskell text + transformers + ]; + executableHaskellDepends = [ + aeson aeson-pretty base binary binary-bits bytestring containers + filepath http-client http-client-tls template-haskell text + transformers + ]; + testHaskellDepends = [ + aeson aeson-pretty base binary binary-bits bytestring containers + filepath http-client http-client-tls HUnit template-haskell + temporary text transformers + ]; + homepage = "https://github.com/tfausak/rattletrap#readme"; + description = "Parse and generate Rocket League replays"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "raven-haskell" = callPackage ({ mkDerivation, aeson, base, bytestring, hspec, http-conduit, mtl , network, random, resourcet, text, time, unordered-containers @@ -176780,6 +176921,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "serverless-haskell" = callPackage + ({ mkDerivation, aeson, aeson-casing, aeson-qq, amazonka-core + , amazonka-kinesis, amazonka-s3, base, bytestring, hspec + , hspec-discover, lens, text, time, unix, unordered-containers + }: + mkDerivation { + pname = "serverless-haskell"; + version = "0.0.0"; + sha256 = "0ck8zxwx6qb171jasz6pg1wr8z01l3pcvkj0wplf26yi6g6vzi5n"; + libraryHaskellDepends = [ + aeson aeson-casing amazonka-core amazonka-kinesis amazonka-s3 base + bytestring lens text time unix unordered-containers + ]; + testHaskellDepends = [ + aeson aeson-casing aeson-qq amazonka-core amazonka-kinesis + amazonka-s3 base bytestring hspec hspec-discover lens text time + unix unordered-containers + ]; + homepage = "https://github.com/seek-oss/serverless-haskell#readme"; + description = "Deploying Haskell code onto AWS Lambda using Serverless"; + license = stdenv.lib.licenses.mit; + }) {}; + "serversession" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , containers, data-default, hashable, hspec, nonce, path-pieces @@ -208197,6 +208361,42 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vty_5_19_1" = callPackage + ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers + , deepseq, directory, filepath, hashable, HUnit, microlens + , microlens-mtl, microlens-th, mtl, parallel, parsec, QuickCheck + , quickcheck-assertions, random, smallcheck, stm, string-qq + , terminfo, test-framework, test-framework-hunit + , test-framework-smallcheck, text, transformers, unix, utf8-string + , vector + }: + mkDerivation { + pname = "vty"; + version = "5.19.1"; + sha256 = "13vip07b1mgr8qgxl97ni87910lrl1yjg5lvnfjzyvfyn0vw47zl"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base blaze-builder bytestring containers deepseq directory filepath + hashable microlens microlens-mtl microlens-th mtl parallel parsec + stm terminfo text transformers unix utf8-string vector + ]; + executableHaskellDepends = [ + base containers microlens microlens-mtl mtl + ]; + testHaskellDepends = [ + base blaze-builder bytestring Cabal containers deepseq HUnit + microlens microlens-mtl mtl QuickCheck quickcheck-assertions random + smallcheck stm string-qq terminfo test-framework + test-framework-hunit test-framework-smallcheck text unix + utf8-string vector + ]; + homepage = "https://github.com/jtdaugherty/vty"; + description = "A simple terminal UI library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "vty-examples" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, containers , data-default, deepseq, lens, mtl, parallel, parsec, QuickCheck @@ -212399,8 +212599,8 @@ self: { }: mkDerivation { pname = "wolf"; - version = "0.3.38"; - sha256 = "1csd52wflvxv8iaaflw44wxr6ycmrf1k5d1r5yv9c7skswarnmk3"; + version = "0.3.39"; + sha256 = "0n7575l5sy4slzf0v15g7nlrxcq1lslgzzldsxlfaibk0j71xw08"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ From 8c859b4cc98720f5d9df83777cfb802e8fcaa9c8 Mon Sep 17 00:00:00 2001 From: Ruben Maher Date: Sat, 6 Jan 2018 23:09:22 +1030 Subject: [PATCH 284/296] ocaml-modules/dtoa: disable hardening (strictoverflow) on darwin (#33443) * ocaml-modules/dtoa: disable hardening (strictoverflow) on darwin This prevents a compile-time error on macOS: clang-4.0: error: argument unused during compilation: '-fno-strict-overflow' [-Werror,-Wunused-command-line-argument] * ocaml-modules/dtoa: remove unnecessary createFindLibDestdir * ocaml-modules/dtoa: remove ounit from build inputs --- pkgs/development/ocaml-modules/dtoa/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/dtoa/default.nix b/pkgs/development/ocaml-modules/dtoa/default.nix index 47d761894d5..9b6e5626614 100644 --- a/pkgs/development/ocaml-modules/dtoa/default.nix +++ b/pkgs/development/ocaml-modules/dtoa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, jbuilder, ounit }: +{ stdenv, fetchurl, ocaml, findlib, jbuilder }: assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.01"; @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { unpackCmd = "tar xjf $src"; - buildInputs = [ ocaml findlib jbuilder ounit ]; + buildInputs = [ ocaml findlib jbuilder ]; buildPhase = "jbuilder build -p dtoa"; inherit (jbuilder) installPhase; - createFindLibDestdir = true; + hardeningDisable = stdenv.lib.optional stdenv.isDarwin "strictoverflow"; meta = with stdenv.lib; { homepage = https://github.com/flowtype/ocaml-dtoa; From 10e22d53ad1d60bd078cb33bbc55bfb462a8613f Mon Sep 17 00:00:00 2001 From: dywedir Date: Sat, 6 Jan 2018 11:22:49 +0200 Subject: [PATCH 285/296] carnix: 0.5.0 -> 0.5.2 --- pkgs/build-support/rust/carnix.nix | 34 +++++++++++++++--------------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/pkgs/build-support/rust/carnix.nix b/pkgs/build-support/rust/carnix.nix index 80c0903369a..adb7139758c 100644 --- a/pkgs/build-support/rust/carnix.nix +++ b/pkgs/build-support/rust/carnix.nix @@ -70,11 +70,11 @@ let kernel = buildPlatform.parsed.kernel.name; sha256 = "0p4b3nr0s5nda2qmm7xdhnvh4lkqk3xd8l9ffmwbvqw137vx7mj1"; inherit dependencies buildDependencies features; }; - carnix_0_5_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + carnix_0_5_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "carnix"; - version = "0.5.0"; + version = "0.5.2"; authors = [ "pe@pijul.org " ]; - sha256 = "0mrprfa9l6q351ci77zr305jk5wdii8gamaphd2iars4xwn26lj4"; + sha256 = "1znj345jziksxxkq7ap3i8p3fp3x4794qggac35d0banj7ml3fv8"; inherit dependencies buildDependencies features; }; cc_1_0_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { @@ -521,22 +521,22 @@ rec { features = mkFeatures bitflags_1_0_1_features; }; bitflags_1_0_1_features."example_generated".self_default = hasDefault bitflags_1_0_1_features; - carnix_0_5_0 = carnix_0_5_0_ rec { + carnix_0_5_2 = carnix_0_5_2_ rec { dependencies = [ clap_2_28_0 env_logger_0_4_3 error_chain_0_11_0 itertools_0_7_3 log_0_3_8 nom_3_2_1 regex_0_2_2 rusqlite_0_13_0 serde_1_0_21 serde_derive_1_0_21 serde_json_1_0_6 tempdir_0_3_5 toml_0_4_5 ]; }; - clap_2_28_0_features."default".from_carnix_0_5_0__default = true; - env_logger_0_4_3_features."default".from_carnix_0_5_0__default = true; - error_chain_0_11_0_features."default".from_carnix_0_5_0__default = true; - itertools_0_7_3_features."default".from_carnix_0_5_0__default = true; - log_0_3_8_features."default".from_carnix_0_5_0__default = true; - nom_3_2_1_features."default".from_carnix_0_5_0__default = true; - regex_0_2_2_features."default".from_carnix_0_5_0__default = true; - rusqlite_0_13_0_features."default".from_carnix_0_5_0__default = true; - serde_1_0_21_features."default".from_carnix_0_5_0__default = true; - serde_derive_1_0_21_features."default".from_carnix_0_5_0__default = true; - serde_json_1_0_6_features."default".from_carnix_0_5_0__default = true; - tempdir_0_3_5_features."default".from_carnix_0_5_0__default = true; - toml_0_4_5_features."default".from_carnix_0_5_0__default = true; + clap_2_28_0_features."default".from_carnix_0_5_2__default = true; + env_logger_0_4_3_features."default".from_carnix_0_5_2__default = true; + error_chain_0_11_0_features."default".from_carnix_0_5_2__default = true; + itertools_0_7_3_features."default".from_carnix_0_5_2__default = true; + log_0_3_8_features."default".from_carnix_0_5_2__default = true; + nom_3_2_1_features."default".from_carnix_0_5_2__default = true; + regex_0_2_2_features."default".from_carnix_0_5_2__default = true; + rusqlite_0_13_0_features."default".from_carnix_0_5_2__default = true; + serde_1_0_21_features."default".from_carnix_0_5_2__default = true; + serde_derive_1_0_21_features."default".from_carnix_0_5_2__default = true; + serde_json_1_0_6_features."default".from_carnix_0_5_2__default = true; + tempdir_0_3_5_features."default".from_carnix_0_5_2__default = true; + toml_0_4_5_features."default".from_carnix_0_5_2__default = true; cc_1_0_3 = cc_1_0_3_ rec { dependencies = []; features = mkFeatures cc_1_0_3_features; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 50ea8df6e7f..2e37d68902b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6403,7 +6403,7 @@ with pkgs; buildRustCrate = callPackage ../build-support/rust/build-rust-crate.nix { }; - carnix = (callPackage ../build-support/rust/carnix.nix { }).carnix_0_5_0; + carnix = (callPackage ../build-support/rust/carnix.nix { }).carnix_0_5_2; defaultCrateOverrides = callPackage ../build-support/rust/default-crate-overrides.nix { }; From eddf30cc93e1b778b6bc10d0eb1bb175385d034f Mon Sep 17 00:00:00 2001 From: zimbatm Date: Sat, 6 Jan 2018 13:52:51 +0000 Subject: [PATCH 286/296] nixos: introduce boot.growPartition (#33521) Move it from being a profile --- nixos/modules/module-list.nix | 1 + nixos/modules/rename.nix | 3 ++ nixos/modules/system/boot/grow-partition.nix | 43 ++++++++++++++++ nixos/modules/virtualisation/amazon-image.nix | 4 +- .../virtualisation/google-compute-image.nix | 3 +- .../modules/virtualisation/grow-partition.nix | 51 ++----------------- nixos/modules/virtualisation/nova-config.nix | 4 +- .../virtualisation/virtualbox-image.nix | 4 +- pkgs/tools/misc/cloud-utils/default.nix | 2 +- 9 files changed, 57 insertions(+), 58 deletions(-) create mode 100644 nixos/modules/system/boot/grow-partition.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 45e4279fecb..d4e4b965a2d 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -680,6 +680,7 @@ ./system/activation/top-level.nix ./system/boot/coredump.nix ./system/boot/emergency-mode.nix + ./system/boot/grow-partition.nix ./system/boot/initrd-network.nix ./system/boot/initrd-ssh.nix ./system/boot/kernel.nix diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 5e207a9509e..562be13a3f6 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -186,6 +186,9 @@ with lib; (mkRenamedOptionModule [ "config" "fonts" "fontconfig" "ultimate" "forceAutohint" ] [ "config" "fonts" "fontconfig" "forceAutohint" ]) (mkRenamedOptionModule [ "config" "fonts" "fontconfig" "ultimate" "renderMonoTTFAsBitmap" ] [ "config" "fonts" "fontconfig" "renderMonoTTFAsBitmap" ]) + # Profile splitting + (mkRenamedOptionModule [ "virtualization" "growPartition" ] [ "boot" "growPartition" ]) + # Options that are obsolete and have no replacement. (mkRemovedOptionModule [ "boot" "initrd" "luks" "enable" ] "") (mkRemovedOptionModule [ "programs" "bash" "enable" ] "") diff --git a/nixos/modules/system/boot/grow-partition.nix b/nixos/modules/system/boot/grow-partition.nix new file mode 100644 index 00000000000..c4c6d82dc5c --- /dev/null +++ b/nixos/modules/system/boot/grow-partition.nix @@ -0,0 +1,43 @@ +# This module automatically grows the root partition. +# This allows an instance to be created with a bigger root filesystem +# than provided by the machine image. + +{ config, lib, pkgs, ... }: + +with lib; + +{ + + options = { + boot.growPartition = mkEnableOption "grow the root partition on boot"; + }; + + config = mkIf config.boot.growPartition { + + boot.initrd.extraUtilsCommands = '' + copy_bin_and_libs ${pkgs.gawk}/bin/gawk + copy_bin_and_libs ${pkgs.gnused}/bin/sed + copy_bin_and_libs ${pkgs.utillinux}/sbin/sfdisk + copy_bin_and_libs ${pkgs.utillinux}/sbin/lsblk + + substitute "${pkgs.cloud-utils}/bin/.growpart-wrapped" "$out/bin/growpart" \ + --replace "${pkgs.bash}/bin/sh" "/bin/sh" \ + --replace "awk" "gawk" \ + --replace "sed" "gnused" + + ln -s sed $out/bin/gnused + ''; + + boot.initrd.postDeviceCommands = '' + rootDevice="${config.fileSystems."/".device}" + if [ -e "$rootDevice" ]; then + rootDevice="$(readlink -f "$rootDevice")" + parentDevice="$(lsblk -npo PKNAME "$rootDevice")" + TMPDIR=/run sh $(type -P growpart) "$parentDevice" "''${rootDevice#$parentDevice}" + udevadm settle + fi + ''; + + }; + +} diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix index 6cb9e07ae82..f74c42a777f 100644 --- a/nixos/modules/virtualisation/amazon-image.nix +++ b/nixos/modules/virtualisation/amazon-image.nix @@ -11,7 +11,7 @@ with lib; let cfg = config.ec2; in { - imports = [ ../profiles/headless.nix ./ec2-data.nix ./grow-partition.nix ./amazon-init.nix ]; + imports = [ ../profiles/headless.nix ./ec2-data.nix ./amazon-init.nix ]; config = { @@ -21,7 +21,7 @@ let cfg = config.ec2; in } ]; - virtualisation.growPartition = cfg.hvm; + boot.growPartition = cfg.hvm; fileSystems."/" = { device = "/dev/disk/by-label/nixos"; diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix index e3b3e6a5f4a..75717e08ab2 100644 --- a/nixos/modules/virtualisation/google-compute-image.nix +++ b/nixos/modules/virtualisation/google-compute-image.nix @@ -6,7 +6,7 @@ let gce = pkgs.google-compute-engine; in { - imports = [ ../profiles/headless.nix ../profiles/qemu-guest.nix ./grow-partition.nix ]; + imports = [ ../profiles/headless.nix ../profiles/qemu-guest.nix ]; system.build.googleComputeImage = import ../../lib/make-disk-image.nix { name = "google-compute-image"; @@ -29,6 +29,7 @@ in autoResize = true; }; + boot.growPartition = true; boot.kernelParams = [ "console=ttyS0" "panic=1" "boot.panic_on_fail" ]; boot.initrd.kernelModules = [ "virtio_scsi" ]; boot.kernelModules = [ "virtio_pci" "virtio_net" ]; diff --git a/nixos/modules/virtualisation/grow-partition.nix b/nixos/modules/virtualisation/grow-partition.nix index 2cb932d208f..444c0bc1630 100644 --- a/nixos/modules/virtualisation/grow-partition.nix +++ b/nixos/modules/virtualisation/grow-partition.nix @@ -1,48 +1,3 @@ -# This module automatically grows the root partition on virtual machines. -# This allows an instance to be created with a bigger root filesystem -# than provided by the machine image. - -{ config, lib, pkgs, ... }: - -with lib; - -{ - - options = { - - virtualisation.growPartition = mkOption { - type = types.bool; - default = true; - }; - - }; - - config = mkIf config.virtualisation.growPartition { - - boot.initrd.extraUtilsCommands = '' - copy_bin_and_libs ${pkgs.gawk}/bin/gawk - copy_bin_and_libs ${pkgs.gnused}/bin/sed - copy_bin_and_libs ${pkgs.utillinux}/sbin/sfdisk - copy_bin_and_libs ${pkgs.utillinux}/sbin/lsblk - - substitute "${pkgs.cloud-utils}/bin/.growpart-wrapped" "$out/bin/growpart" \ - --replace "${pkgs.bash}/bin/sh" "/bin/sh" \ - --replace "awk" "gawk" \ - --replace "sed" "gnused" - - ln -s sed $out/bin/gnused - ''; - - boot.initrd.postDeviceCommands = '' - rootDevice="${config.fileSystems."/".device}" - if [ -e "$rootDevice" ]; then - rootDevice="$(readlink -f "$rootDevice")" - parentDevice="$(lsblk -npo PKNAME "$rootDevice")" - TMPDIR=/run sh $(type -P growpart) "$parentDevice" "''${rootDevice#$parentDevice}" - udevadm settle - fi - ''; - - }; - -} +# This profile is deprecated, use boot.growPartition directly. +builtins.trace "the profile is deprecated, use boot.growPartition instead" +{ } diff --git a/nixos/modules/virtualisation/nova-config.nix b/nixos/modules/virtualisation/nova-config.nix index c865cf451e4..c1d2a314daf 100644 --- a/nixos/modules/virtualisation/nova-config.nix +++ b/nixos/modules/virtualisation/nova-config.nix @@ -6,7 +6,6 @@ with lib; imports = [ ../profiles/qemu-guest.nix ../profiles/headless.nix - ./grow-partition.nix ]; config = { @@ -15,8 +14,7 @@ with lib; autoResize = true; }; - virtualisation.growPartition = true; - + boot.growPartition = true; boot.kernelParams = [ "console=ttyS0" ]; boot.loader.grub.device = "/dev/vda"; boot.loader.timeout = 0; diff --git a/nixos/modules/virtualisation/virtualbox-image.nix b/nixos/modules/virtualisation/virtualbox-image.nix index d68b3bb7390..00381c426d2 100644 --- a/nixos/modules/virtualisation/virtualbox-image.nix +++ b/nixos/modules/virtualisation/virtualbox-image.nix @@ -8,8 +8,6 @@ let in { - imports = [ ./grow-partition.nix ]; - options = { virtualbox = { baseImageSize = mkOption { @@ -23,7 +21,6 @@ in { }; config = { - system.build.virtualBoxOVA = import ../../lib/make-disk-image.nix { name = "nixos-ova-${config.system.nixosLabel}-${pkgs.stdenv.system}"; @@ -71,6 +68,7 @@ in { autoResize = true; }; + boot.growPartition = true; boot.loader.grub.device = "/dev/sda"; virtualisation.virtualbox.guest.enable = true; diff --git a/pkgs/tools/misc/cloud-utils/default.nix b/pkgs/tools/misc/cloud-utils/default.nix index 9894813d955..fd6df64e5e7 100644 --- a/pkgs/tools/misc/cloud-utils/default.nix +++ b/pkgs/tools/misc/cloud-utils/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { # NOTICE: if you bump this, make sure to run # $ nix-build nixos/release-combined.nix -A nixos.tests.ec2-nixops - # growpart is needed in initrd in nixos/modules/virtualisation/grow-partition.nix + # growpart is needed in initrd in nixos/system/boot/grow-partition.nix name = "cloud-utils-${version}"; version = "0.30"; src = fetchurl { From 7e8e582e0c148e3e5241813613324d4f256cf9f3 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sat, 6 Jan 2018 21:42:33 +0800 Subject: [PATCH 287/296] virtmanager-qt: 0.45.75 -> 0.48.79 --- .../applications/virtualization/virt-manager/qt.nix | 13 +++++++------ pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/virtualization/virt-manager/qt.nix b/pkgs/applications/virtualization/virt-manager/qt.nix index f386b457fc5..4c5000f0208 100644 --- a/pkgs/applications/virtualization/virt-manager/qt.nix +++ b/pkgs/applications/virtualization/virt-manager/qt.nix @@ -1,27 +1,27 @@ { mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig , qtbase, qtmultimedia, qtsvg -, lxqt, libvncserver, libvirt, pcre, pixman, spice_gtk, spice_protocol +, libvncserver, libvirt, pcre, pixman, qtermwidget, spice_gtk, spice_protocol }: mkDerivation rec { name = "virt-manager-qt-${version}"; - version = "0.45.75"; + version = "0.48.79"; src = fetchFromGitHub { owner = "F1ash"; repo = "qt-virt-manager"; rev = "${version}"; - sha256 = "1s59g7kkz8481y8yyf89f549xwbg1978zj9ds61iy94mwz80b38n"; + sha256 = "1mzncca9blc742vb77gyfza0sd1rby3qy5yl4x19nkllid92jn6k"; }; cmakeFlags = [ "-DBUILD_QT_VERSION=5" + "-DQTERMWIDGET_INCLUDE_DIRS=${qtermwidget}/include/qtermwidget5" ]; buildInputs = [ - # virt-manager-qt currently does not compile with qtermwidget-0.8.0 - qtbase qtmultimedia qtsvg lxqt.qtermwidget_0_7_1 - libvirt libvncserver pixman spice_gtk spice_protocol + qtbase qtmultimedia qtsvg + libvirt libvncserver pcre pixman qtermwidget spice_gtk spice_protocol ]; nativeBuildInputs = [ cmake pkgconfig ]; @@ -38,5 +38,6 @@ mkDerivation rec { ''; license = licenses.gpl2; maintainers = with maintainers; [ peterhoeg ]; + inherit (qtbase.meta) platforms; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2e37d68902b..cd5bd4eae85 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17367,7 +17367,9 @@ with pkgs; system-libvirt = libvirt; }; - virtmanager-qt = libsForQt5.callPackage ../applications/virtualization/virt-manager/qt.nix { }; + virtmanager-qt = libsForQt5.callPackage ../applications/virtualization/virt-manager/qt.nix { + qtermwidget = lxqt.qtermwidget; + }; virtinst = callPackage ../applications/virtualization/virtinst {}; From e016a68bf1aa623ba2eb6095a9a38414aacd51ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Sun, 31 Dec 2017 04:03:28 +0100 Subject: [PATCH 288/296] clamsmtp: init at 1.10 --- pkgs/servers/mail/clamsmtp/default.nix | 20 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 pkgs/servers/mail/clamsmtp/default.nix diff --git a/pkgs/servers/mail/clamsmtp/default.nix b/pkgs/servers/mail/clamsmtp/default.nix new file mode 100644 index 00000000000..9386be321b4 --- /dev/null +++ b/pkgs/servers/mail/clamsmtp/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "clamsmtp-" + version; + version = "1.10"; + + src = fetchurl { + url = "http://thewalter.net/stef/software/clamsmtp/${name}.tar.gz"; + sha256 = "0apr1pxifw6f1rbbsdrrwzs1dnhybg4hda3qqhqcw7p14r5xnbx5"; + }; + + meta = with stdenv.lib; { + description = "SMTP filter that allows to check for viruses using the ClamAV + anti-virus software"; + homepage = http://thewalter.net/stef/software/clamsmtp/; + license = licenses.bsd3; + maintainers = [ maintainers.ekleog ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dbfb5e92ba8..a2f1f967d77 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11728,7 +11728,9 @@ with pkgs; cayley = callPackage ../servers/cayley { }; - charybdis = callPackage ../servers/irc/charybdis {}; + charybdis = callPackage ../servers/irc/charybdis { }; + + clamsmtp = callPackage ../servers/mail/clamsmtp { }; clickhouse = callPackage ../servers/clickhouse { }; From cb506e6e2ed9133b43eb0c54699b8df4c9957cdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Sun, 31 Dec 2017 04:09:23 +0100 Subject: [PATCH 289/296] nixos/clamsmtp: init --- nixos/modules/module-list.nix | 1 + nixos/modules/services/mail/clamsmtp.nix | 179 +++++++++++++++++++++++ 2 files changed, 180 insertions(+) create mode 100644 nixos/modules/services/mail/clamsmtp.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index d4e4b965a2d..bea7d96ef09 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -260,6 +260,7 @@ ./services/logging/rsyslogd.nix ./services/logging/syslog-ng.nix ./services/logging/syslogd.nix + ./services/mail/clamsmtp.nix ./services/mail/dkimproxy-out.nix ./services/mail/dovecot.nix ./services/mail/dspam.nix diff --git a/nixos/modules/services/mail/clamsmtp.nix b/nixos/modules/services/mail/clamsmtp.nix new file mode 100644 index 00000000000..8f4f39aa728 --- /dev/null +++ b/nixos/modules/services/mail/clamsmtp.nix @@ -0,0 +1,179 @@ +{ config, lib, pkgs, ... }: + +with lib; +let + cfg = config.services.clamsmtp; + clamdSocket = "/run/clamav/clamd.ctl"; # See services/security/clamav.nix +in +{ + ##### interface + options = { + services.clamsmtp = { + enable = mkOption { + type = types.bool; + default = false; + description = "Whether to enable clamsmtp."; + }; + + instances = mkOption { + description = "Instances of clamsmtp to run."; + type = types.listOf (types.submodule { options = { + action = mkOption { + type = types.enum [ "bounce" "drop" "pass" ]; + default = "drop"; + description = + '' + Action to take when a virus is detected. + + Note that viruses often spoof sender addresses, so bouncing is + in most cases not a good idea. + ''; + }; + + header = mkOption { + type = types.str; + default = ""; + example = "X-Virus-Scanned: ClamAV using ClamSMTP"; + description = + '' + A header to add to scanned messages. See clamsmtpd.conf(5) for + more details. Empty means no header. + ''; + }; + + keepAlives = mkOption { + type = types.int; + default = 0; + description = + '' + Number of seconds to wait between each NOOP sent to the sending + server. 0 to disable. + + This is meant for slow servers where the sending MTA times out + waiting for clamd to scan the file. + ''; + }; + + listen = mkOption { + type = types.str; + example = "127.0.0.1:10025"; + description = + '' + Address to wait for incoming SMTP connections on. See + clamsmtpd.conf(5) for more details. + ''; + }; + + quarantine = mkOption { + type = types.bool; + default = false; + description = + '' + Whether to quarantine files that contain viruses by leaving them + in the temporary directory. + ''; + }; + + maxConnections = mkOption { + type = types.int; + default = 64; + description = "Maximum number of connections to accept at once."; + }; + + outAddress = mkOption { + type = types.str; + description = + '' + Address of the SMTP server to send email to once it has been + scanned. + ''; + }; + + tempDirectory = mkOption { + type = types.str; + default = "/tmp"; + description = + '' + Temporary directory that needs to be accessible to both clamd + and clamsmtpd. + ''; + }; + + timeout = mkOption { + type = types.int; + default = 180; + description = "Time-out for network connections."; + }; + + transparentProxy = mkOption { + type = types.bool; + default = false; + description = "Enable clamsmtp's transparent proxy support."; + }; + + virusAction = mkOption { + type = with types; nullOr path; + default = null; + description = + '' + Command to run when a virus is found. Please see VIRUS ACTION in + clamsmtpd(8) for a discussion of this option and its safe use. + ''; + }; + + xClient = mkOption { + type = types.bool; + default = false; + description = + '' + Send the XCLIENT command to the receiving server, for forwarding + client addresses and connection information if the receiving + server supports this feature. + ''; + }; + };}); + }; + }; + }; + + ##### implementation + config = let + configfile = conf: pkgs.writeText "clamsmtpd.conf" + '' + Action: ${conf.action} + ClamAddress: ${clamdSocket} + Header: ${conf.header} + KeepAlives: ${toString conf.keepAlives} + Listen: ${conf.listen} + Quarantine: ${if conf.quarantine then "on" else "off"} + MaxConnections: ${toString conf.maxConnections} + OutAddress: ${conf.outAddress} + TempDirectory: ${conf.tempDirectory} + TimeOut: ${toString conf.timeout} + TransparentProxy: ${if conf.transparentProxy then "on" else "off"} + User: clamav + ${optionalString (conf.virusAction != null) "VirusAction: ${conf.virusAction}"} + XClient: ${if conf.xClient then "on" else "off"} + ''; + in + mkIf cfg.enable { + assertions = [ + { assertion = config.services.clamav.daemon.enable; + message = "clamsmtp requires clamav to be enabled"; + } + ]; + + systemd.services = listToAttrs (imap1 (i: conf: + nameValuePair "clamsmtp-${toString i}" { + description = "ClamSMTP instance ${toString i}"; + wantedBy = [ "multi-user.target" ]; + script = "exec ${pkgs.clamsmtp}/bin/clamsmtpd -f ${configfile conf}"; + after = [ "clamav-daemon.service" ]; + requires = [ "clamav-daemon.service" ]; + serviceConfig.Type = "forking"; + serviceConfig.PrivateTmp = "yes"; + unitConfig.JoinsNamespaceOf = "clamav-daemon.service"; + } + ) cfg.instances); + }; +} From a05e7a56d3b4ab797f1203e55183175ed7c2bce3 Mon Sep 17 00:00:00 2001 From: Alex Griffin Date: Sat, 6 Jan 2018 08:58:17 -0600 Subject: [PATCH 290/296] maintainers: add ajgrf --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 14c78f919d8..5e20148ec4b 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -29,6 +29,7 @@ aherrmann = "Andreas Herrmann "; ahmedtd = "Taahir Ahmed "; aij = "Ivan Jager "; + ajgrf = "Alex Griffin "; ak = "Alexander Kjeldaas "; akaWolf = "Artjom Vejsel "; akc = "Anders Claesson "; From 8cd5391806b2df6cdf4a0d34d298cb63129b87c7 Mon Sep 17 00:00:00 2001 From: Alex Griffin Date: Sat, 6 Jan 2018 08:59:36 -0600 Subject: [PATCH 291/296] mblaze: init at 0.2 --- .../networking/mailreaders/mblaze/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/applications/networking/mailreaders/mblaze/default.nix diff --git a/pkgs/applications/networking/mailreaders/mblaze/default.nix b/pkgs/applications/networking/mailreaders/mblaze/default.nix new file mode 100644 index 00000000000..0d73f161249 --- /dev/null +++ b/pkgs/applications/networking/mailreaders/mblaze/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "mblaze-${version}"; + version = "0.2"; + + src = fetchFromGitHub { + owner = "chneukirchen"; + repo = "mblaze"; + rev = "v${version}"; + sha256 = "0p97zfl35ilrnrx9ynj82igsb698m9klikfaicw5jhjpf6qp2n3y"; + }; + + makeFlags = "PREFIX=$(out)"; + + meta = with stdenv.lib; { + homepage = https://github.com/chneukirchen/mblaze; + description = "Unix utilities to deal with Maildir"; + license = licenses.cc0; + platforms = platforms.all; + maintainers = [ maintainers.ajgrf ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dbfb5e92ba8..b2f17067d63 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15895,6 +15895,8 @@ with pkgs; matchbox = callPackage ../applications/window-managers/matchbox { }; + mblaze = callPackage ../applications/networking/mailreaders/mblaze { }; + mcpp = callPackage ../development/compilers/mcpp { }; mda_lv2 = callPackage ../applications/audio/mda-lv2 { }; From 106d87b6c6c59918fe57924ceba8f8c5be5ada40 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sat, 6 Jan 2018 11:17:59 +0100 Subject: [PATCH 292/296] mariadb: fix darwin build --- pkgs/servers/sql/mariadb/clang-isfinite.patch | 17 +++++++++++++++++ pkgs/servers/sql/mariadb/default.nix | 9 ++++++--- 2 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 pkgs/servers/sql/mariadb/clang-isfinite.patch diff --git a/pkgs/servers/sql/mariadb/clang-isfinite.patch b/pkgs/servers/sql/mariadb/clang-isfinite.patch new file mode 100644 index 00000000000..8da527d5784 --- /dev/null +++ b/pkgs/servers/sql/mariadb/clang-isfinite.patch @@ -0,0 +1,17 @@ +diff --git a/include/my_global.h b/include/my_global.h +index cb31ae2..2866f87 100644 +--- a/include/my_global.h ++++ b/include/my_global.h +@@ -803,12 +803,6 @@ inline unsigned long long my_double2ulonglong(double d) + #endif + + #ifndef isfinite +-#ifdef HAVE_FINITE +-#define isfinite(x) finite(x) +-#else +-#define finite(x) (1.0 / fabs(x) > 0.0) +-#endif /* HAVE_FINITE */ +-#elif (__cplusplus >= 201103L) + #include + static inline bool isfinite(double x) { return std::isfinite(x); } + #endif /* isfinite */ diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index e2c4133a379..547edafa8ad 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -34,7 +34,8 @@ common = rec { # attributes common to both builds sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt ''; - patches = [ ./cmake-includedir.patch ]; + patches = [ ./cmake-includedir.patch ] + ++ stdenv.lib.optional stdenv.cc.isClang ./clang-isfinite.patch; cmakeFlags = [ "-DBUILD_CONFIG=mysql_release" @@ -121,7 +122,8 @@ everything = stdenv.mkDerivation (common // { buildInputs = common.buildInputs ++ [ xz lzo lz4 bzip2 snappy libxml2 boost judy libevent cracklib - ] ++ optionals (stdenv.isLinux && !stdenv.isArm) [ numactl ]; + ] ++ optional (stdenv.isLinux && !stdenv.isArm) numactl + ++ optional stdenv.isDarwin libiconv; cmakeFlags = common.cmakeFlags ++ [ "-DMYSQL_DATADIR=/var/lib/mysql" @@ -159,7 +161,8 @@ everything = stdenv.mkDerivation (common // { rm "$out"/bin/rcmysql ''; - CXXFLAGS = optionalString stdenv.isi686 "-fpermissive"; + CXXFLAGS = optionalString stdenv.isi686 "-fpermissive" + + optionalString stdenv.isDarwin " -std=c++11"; }); connector-c = stdenv.mkDerivation rec { From c589bdd66d072314a92f11267892ab18f650f97f Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 6 Jan 2018 17:39:17 +0200 Subject: [PATCH 293/296] iw: 4.9 -> 4.14 --- pkgs/os-specific/linux/iw/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/iw/default.nix b/pkgs/os-specific/linux/iw/default.nix index ac064d9647a..7e50babc80a 100644 --- a/pkgs/os-specific/linux/iw/default.nix +++ b/pkgs/os-specific/linux/iw/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, libnl, pkgconfig}: stdenv.mkDerivation rec { - name = "iw-4.9"; + name = "iw-4.14"; src = fetchurl { url = "https://www.kernel.org/pub/software/network/iw/${name}.tar.xz"; - sha256 = "1klpvv98bnx1zm6aqalnri2vd7w80scmdaxr2qnblb6mz82whk1j"; + sha256 = "12ddd6vh6vs97135bnlyr0szv7hvpbnmfh48584frzab0z0725ph"; }; nativeBuildInputs = [ pkgconfig ]; From 6989369c88cab9edb1db86a779ce7f485eefec5e Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 6 Jan 2018 17:39:40 +0200 Subject: [PATCH 294/296] nano: 2.9.1 -> 2.9.2 --- pkgs/applications/editors/nano/default.nix | 6 ++---- pkgs/applications/editors/nano/nano-2.9.1-darwin.patch | 9 --------- 2 files changed, 2 insertions(+), 13 deletions(-) delete mode 100644 pkgs/applications/editors/nano/nano-2.9.1-darwin.patch diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index dcb124bcb12..87ead669b70 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -20,15 +20,13 @@ let in stdenv.mkDerivation rec { name = "nano-${version}"; - version = "2.9.1"; + version = "2.9.2"; src = fetchurl { url = "mirror://gnu/nano/${name}.tar.xz"; - sha256 = "0z5sxji8jh8sh0g3inbzndhsrbm4qyqlvjrxl5wkxbr61lnxa5k3"; + sha256 = "0m9xm085pi0fhmmshgppipjimr1jkxksbyg8pa5cwaap3d2vgk2f"; }; - patches = [ ./nano-2.9.1-darwin.patch ]; - nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext; buildInputs = [ ncurses ]; diff --git a/pkgs/applications/editors/nano/nano-2.9.1-darwin.patch b/pkgs/applications/editors/nano/nano-2.9.1-darwin.patch deleted file mode 100644 index d3a630d4486..00000000000 --- a/pkgs/applications/editors/nano/nano-2.9.1-darwin.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- a/lib/stat.c -+++ b/lib/stat.c -@@ -48,4 +48,6 @@ orig_stat (const char *filename, struct stat *buf) - #include "sys/stat.h" - -+#include "stat-time.h" -+ - #include - #include From 71dd57f081ee5cb28dd2f3b0f5ff8b75d8113d37 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sat, 6 Jan 2018 16:45:26 +0100 Subject: [PATCH 295/296] icmake: 9.02.03 -> 9.02.04 --- pkgs/development/tools/build-managers/icmake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/icmake/default.nix b/pkgs/development/tools/build-managers/icmake/default.nix index 11caff8ddab..ac9bfee815e 100644 --- a/pkgs/development/tools/build-managers/icmake/default.nix +++ b/pkgs/development/tools/build-managers/icmake/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "icmake-${version}"; - version = "9.02.03"; + version = "9.02.04"; src = fetchFromGitHub { - sha256 = "1g3pdcd2i8n29rqwrdg6bd7qnsii55hi0rnma86hy0pm5cshpwi5"; + sha256 = "0dkqdm7nc3l9kgwkkf545hfbxj7ibkxl7n49wz9m1rcq9pvpmrw3"; rev = version; repo = "icmake"; owner = "fbb-git"; From b2d2b3777126d9695f5f8d79132b210c47a113a9 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sat, 6 Jan 2018 23:42:52 +0800 Subject: [PATCH 296/296] lastpass-cli: 1.2.1 -> 1.2.2 --- pkgs/tools/security/lastpass-cli/default.nix | 21 ++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/security/lastpass-cli/default.nix b/pkgs/tools/security/lastpass-cli/default.nix index ce59ddca7c0..9395d4acb8b 100644 --- a/pkgs/tools/security/lastpass-cli/default.nix +++ b/pkgs/tools/security/lastpass-cli/default.nix @@ -1,24 +1,29 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig -, openssl, curl, libxml2, libxslt, asciidoc, docbook_xsl }: +{ stdenv, lib, fetchFromGitHub, asciidoc, cmake, docbook_xsl, pkgconfig +, bash-completion, openssl, curl, libxml2, libxslt }: stdenv.mkDerivation rec { name = "lastpass-cli-${version}"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "lastpass"; repo = "lastpass-cli"; rev = "v${version}"; - sha256 = "0nrsrd5cqyv2zydzzl1vryrnj1p0x17cx1rmrp4kmzh83bzgcfvv"; + sha256 = "0041z2awpmwq2fk8lbgp4fcia0r6wss2csvq5bxps0cx7fq69wc1"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ asciidoc cmake docbook_xsl pkgconfig ]; + buildInputs = [ - openssl curl libxml2 asciidoc docbook_xsl libxslt + bash-completion curl openssl libxml2 libxslt ]; - makeFlags = "PREFIX=$(out)"; + enableParallelBuilding = true; + + cmakeFlags = [ + "-DBASH_COMPLETION_COMPLETIONSDIR=./share/bash-completion/completions" + ]; installTargets = "install install-doc"; @@ -26,7 +31,7 @@ stdenv.mkDerivation rec { description = "Stores, retrieves, generates, and synchronizes passwords securely"; homepage = "https://github.com/lastpass/lastpass-cli"; license = licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; maintainers = with maintainers; [ cstrahan ]; }; }