diff options
Diffstat (limited to 'pkgs')
303 files changed, 6662 insertions, 5703 deletions
diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index f4a49e79f6a..95d79a8650f 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -1,4 +1,4 @@ -{ callPackage, boost155, boost165, openssl_1_1_0, haskellPackages, darwin, libsForQt5, miniupnpc_2, python3 }: +{ callPackage, boost155, boost165, openssl_1_1_0, haskellPackages, darwin, libsForQt5, miniupnpc_2, python3, buildGo110Package }: rec { @@ -51,10 +51,13 @@ rec { freicoin = callPackage ./freicoin.nix { boost = boost155; }; go-ethereum = callPackage ./go-ethereum.nix { + buildGoPackage = buildGo110Package; inherit (darwin) libobjc; inherit (darwin.apple_sdk.frameworks) IOKit; }; - go-ethereum-classic = callPackage ./go-ethereum-classic { }; + go-ethereum-classic = callPackage ./go-ethereum-classic { + buildGoPackage = buildGo110Package; + }; litecoin = callPackage ./litecoin.nix { withGui = true; }; litecoind = callPackage ./litecoin.nix { withGui = false; }; diff --git a/pkgs/applications/altcoins/nano-wallet/default.nix b/pkgs/applications/altcoins/nano-wallet/default.nix index 76ee914bd3d..7491e830628 100644 --- a/pkgs/applications/altcoins/nano-wallet/default.nix +++ b/pkgs/applications/altcoins/nano-wallet/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "nano-wallet-${version}"; - version = "14.2"; + version = "15.2"; src = fetchFromGitHub { owner = "nanocurrency"; repo = "raiblocks"; rev = "V${version}"; - sha256 = "0jbv5a8sz403a1pqcgl32idk6y0z510h7ikjg1dcxla0rsch6ipl"; + sha256 = "0ngsnaczw5y709zk52flp6m2c83q3kxfgz0bzi8rzfjxp10ncnz3"; fetchSubmodules = true; }; diff --git a/pkgs/applications/altcoins/particl/particl-core.nix b/pkgs/applications/altcoins/particl/particl-core.nix index 331e169cf3f..a06f373683a 100644 --- a/pkgs/applications/altcoins/particl/particl-core.nix +++ b/pkgs/applications/altcoins/particl/particl-core.nix @@ -16,11 +16,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "particl-core-${version}"; - version = "0.16.1.0"; + version = "0.16.2.0"; src = fetchurl { url = "https://github.com/particl/particl-core/archive/v${version}.tar.gz"; - sha256 = "0rfqywyrl6cgxn3ba91zsa88ph2yf9d1vn706xpyz19pfb6mjfbg"; + sha256 = "1d2vvg7avlhsg0rcpd5pbzafnk1w51a2y29xjjkpafi6iqs2l617"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; diff --git a/pkgs/applications/audio/deadbeef/plugins/headerbar-gtk3.nix b/pkgs/applications/audio/deadbeef/plugins/headerbar-gtk3.nix new file mode 100644 index 00000000000..dab3a97f6e7 --- /dev/null +++ b/pkgs/applications/audio/deadbeef/plugins/headerbar-gtk3.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, libxml2, deadbeef, glib, gtk3 }: + +stdenv.mkDerivation rec { + name = "deadbeef-headerbar-gtk3-plugin-${version}"; + version = "1.2"; + + src = fetchFromGitHub { + owner = "saivert"; + repo = "ddb_misc_headerbar_GTK3"; + rev = "v${version}"; + sha256 = "1v1schvnps7ypjqgcbqi74a45w8r2gbhrawz7filym22h1qr9wn0"; + }; + + nativeBuildInputs = [ autoconf automake libtool pkgconfig libxml2 ]; + buildInputs = [ deadbeef glib gtk3 ]; + + # Choose correct installation path + # https://github.com/saivert/ddb_misc_headerbar_GTK3/commit/50ff75f76aa9d40761e352311670a894bfcd5cf6#r30319680 + makeFlags = [ "pkglibdir=$(out)/lib/deadbeef" ]; + + preConfigure = "./autogen.sh"; + + meta = with stdenv.lib; { + description = "Plug-in that adds GTK 3 header bar to the DeaDBeeF music player"; + homepage = https://github.com/saivert/ddb_misc_headerbar_GTK3; + license = licenses.gpl2Plus; + maintainers = [ maintainers.jtojnar ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/distrho/default.nix b/pkgs/applications/audio/distrho/default.nix index 3aa8aa371e6..5885e0f73f5 100644 --- a/pkgs/applications/audio/distrho/default.nix +++ b/pkgs/applications/audio/distrho/default.nix @@ -2,13 +2,14 @@ , pkgconfig, premake3, xorg, ladspa-sdk }: stdenv.mkDerivation rec { - name = "distrho-ports-unstable-2018-01-01"; + name = "distrho-ports-${version}"; + version = "2018-04-16"; src = fetchFromGitHub { owner = "DISTRHO"; repo = "DISTRHO-Ports"; - rev = "b200e7409aa9f6612c4d948932f6ce6f0a087f5a"; - sha256 = "0672r0a9s6skzkxpjdraziwh5k8ivrfzvi4zcpkcg3zrv2hia2vz"; + rev = version; + sha256 = "0l4zwl4mli8jzch32a1fh7c88r9q17xnkxsdw17ds5hadnxlk12v"; }; patchPhase = '' @@ -46,6 +47,6 @@ stdenv.mkDerivation rec { TAL-Vocoder-2 TheFunction ThePilgrim Vex Wolpertinger ''; maintainers = [ maintainers.goibhniu ]; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/audio/faust/faustlive.nix b/pkgs/applications/audio/faust/faustlive.nix new file mode 100644 index 00000000000..b8ff73f2cb3 --- /dev/null +++ b/pkgs/applications/audio/faust/faustlive.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub +, llvm, qt48Full, libqrencode, libmicrohttpd, libjack2, alsaLib, faust, curl +, bc, coreutils, which +}: + +stdenv.mkDerivation rec { + name = "faustlive-${version}"; + version = "2017-12-05"; + src = fetchFromGitHub { + owner = "grame-cncm"; + repo = "faustlive"; + rev = "281fcb852dcd94f8c57ade1b2a7a3937542e1b2d"; + sha256 = "0sw44yd9928rid9ib0b5mx2x129m7zljrayfm6jz6hrwdc5q3k9a"; + }; + + buildInputs = [ + llvm qt48Full libqrencode libmicrohttpd libjack2 alsaLib faust curl + bc coreutils which + ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + preBuild = "patchShebangs Build/Linux/buildversion"; + + meta = with stdenv.lib; { + description = "A standalone just-in-time Faust compiler"; + longDescription = '' + FaustLive is a standalone just-in-time Faust compiler. It tries to bring + together the convenience of a standalone interpreted language with the + efficiency of a compiled language. It's ideal for fast prototyping. + ''; + homepage = http://faust.grame.fr/; + license = licenses.gpl3; + }; +} diff --git a/pkgs/applications/audio/google-play-music-desktop-player/default.nix b/pkgs/applications/audio/google-play-music-desktop-player/default.nix index 6c7d6dba455..5951572dd24 100644 --- a/pkgs/applications/audio/google-play-music-desktop-player/default.nix +++ b/pkgs/applications/audio/google-play-music-desktop-player/default.nix @@ -1,10 +1,10 @@ { stdenv, alsaLib, atk, cairo, cups, dbus, dpkg, expat, fontconfig, freetype -, fetchurl, GConf, gdk_pixbuf, glib, gtk2, libpulseaudio, makeWrapper, nspr +, fetchurl, GConf, gdk_pixbuf, glib, gtk2, gtk3, libpulseaudio, makeWrapper, nspr , nss, pango, udev, xorg }: let - version = "4.5.0"; + version = "4.6.1"; deps = [ alsaLib @@ -19,6 +19,7 @@ let gdk_pixbuf glib gtk2 + gtk3 libpulseaudio nspr nss @@ -46,7 +47,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://github.com/MarshallOfSound/Google-Play-Music-Desktop-Player-UNOFFICIAL-/releases/download/v${version}/google-play-music-desktop-player_${version}_amd64.deb"; - sha256 = "06h9g1yhd5q7gg8v55q143fr65frxg0khfgckr03gsaw0swin51q"; + sha256 = "0dyn2fxhcri9d9nmcprszs6yg79gsr09bjfzzb1p10yjmi77cj2g"; }; dontBuild = true; diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index dc59ba6e01a..ffaa9457527 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/pkgs/applications/audio/lollypop/default.nix @@ -3,14 +3,14 @@ , python36Packages, gnome3, glib, gst_all_1 }: stdenv.mkDerivation rec { - version = "0.9.521"; + version = "0.9.522"; name = "lollypop-${version}"; src = fetchgit { url = "https://gitlab.gnome.org/World/lollypop"; rev = "refs/tags/${version}"; fetchSubmodules = true; - sha256 = "1iwv0fj50h0xynv152anisbq29jfbmb9hpm60kaa9a9hdiypskcc"; + sha256 = "0f2brwv884cvmxj644jcj9sg5hix3wvnjy2ndg0fh5cxyqz0kwn5"; }; nativeBuildInputs = with python36Packages; [ diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix index 60a0695ffec..746e306d377 100644 --- a/pkgs/applications/audio/mixxx/default.nix +++ b/pkgs/applications/audio/mixxx/default.nix @@ -1,34 +1,24 @@ -{ stdenv, fetchurl, chromaprint, fetchpatch, fftw, flac, faad2, mp4v2 +{ stdenv, fetchFromGitHub, chromaprint, fetchpatch, fftw, flac, faad2, mp4v2 , libid3tag, libmad, libopus, libshout, libsndfile, libusb1, libvorbis , pkgconfig, portaudio, portmidi, protobuf, qt4, rubberband, scons, sqlite -, taglib, vampSDK +, taglib, upower, vampSDK }: stdenv.mkDerivation rec { name = "mixxx-${version}"; - version = "2.0.0"; + version = "2.1.3"; - src = fetchurl { - url = "https://downloads.mixxx.org/${name}/${name}-src.tar.gz"; - sha256 = "0vb71w1yq0xwwsclrn2jj9bk8w4n14rfv5c0aw46c11mp8xz7f71"; + src = fetchFromGitHub { + owner = "mixxxdj"; + repo = "mixxx"; + rev = "release-${version}"; + sha256 = "1fm8lkbnxka4haidf6yr8mb3r6vaxmc97hhrp8pcx0fvq2mnzvy2"; }; - patches = [ - (fetchpatch { - url = "https://sources.debian.net/data/main/m/mixxx/2.0.0~dfsg-7.1/debian/patches/0007-fix_gcc6_issue.patch"; - sha256 = "0kpyv10wcjcvbijk6vpq54gx9sqzrq4kq2qilc1czmisp9qdy5sd"; - }) - (fetchpatch { - url = "https://622776.bugs.gentoo.org/attachment.cgi?id=487284"; - name = "sqlite.patch"; - sha256 = "1qqbd8nrxrjcc1dwvyqfq1k2yz3l071sfcgd2dmpk6j8d4j5kx31"; - }) - ]; - buildInputs = [ chromaprint fftw flac faad2 mp4v2 libid3tag libmad libopus libshout libsndfile libusb1 libvorbis pkgconfig portaudio portmidi protobuf qt4 - rubberband scons sqlite taglib vampSDK + rubberband scons sqlite taglib upower vampSDK ]; sconsFlags = [ @@ -56,7 +46,7 @@ stdenv.mkDerivation rec { homepage = https://mixxx.org; description = "Digital DJ mixing software"; license = licenses.gpl2Plus; - maintainers = [ maintainers.aszlig maintainers.goibhniu ]; + maintainers = [ maintainers.aszlig maintainers.goibhniu maintainers.bfortz ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix index 01d7befddd6..482e3652ec0 100644 --- a/pkgs/applications/audio/mopidy/iris.nix +++ b/pkgs/applications/audio/mopidy/iris.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonApplication rec { pname = "Mopidy-Iris"; - version = "3.23.2"; + version = "3.25.1"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "1zf4ck19z3nh1x9a847ay1qnkyvi6s6866kp6q6dh1xpn7i9rmx7"; + sha256 = "148ksv87lw3l3dwncmlq8qzv6xik29axdgaljdcp0g4pd98a7dlk"; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index 8d49c49f0c6..d322553fdaa 100644 --- a/pkgs/applications/audio/praat/default.nix +++ b/pkgs/applications/audio/praat/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "praat-${version}"; - version = "6.0.40"; + version = "6.0.42"; src = fetchurl { url = "https://github.com/praat/praat/archive/v${version}.tar.gz"; - sha256 = "168qrrr59qxii265vba7pj6f61lzq5lk9c43zcda0wmmjp87bq1x"; + sha256 = "1llcj1cq4k60lnr6jkdshd4l9nkg9yc2xmaqiinqryxrb58jmpcv"; }; configurePhase = '' diff --git a/pkgs/applications/audio/setbfree/default.nix b/pkgs/applications/audio/setbfree/default.nix index 905de343117..1047734a2c1 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.7"; + version = "0.8.8"; src = fetchurl { url = "https://github.com/pantherb/setBfree/archive/v${version}.tar.gz"; - sha256 = "07s320r67cz0cdjdsbcwn0fw3xs0wz7lgrybqpws2skvkbls228q"; + sha256 = "1ldxwds99azingkjh246kz7x3j7307jhr0fls5rjjbcfchpg7v99"; }; patchPhase = '' diff --git a/pkgs/applications/audio/split2flac/default.nix b/pkgs/applications/audio/split2flac/default.nix new file mode 100644 index 00000000000..372e507ed0e --- /dev/null +++ b/pkgs/applications/audio/split2flac/default.nix @@ -0,0 +1,62 @@ +{ stdenv, fetchFromGitHub, makeWrapper +, shntool, cuetools +, flac, faac, mp4v2, wavpack, mac +, imagemagick, libiconv, enca, lame, pythonPackages, vorbis-tools +, aacgain, mp3gain, vorbisgain +}: + +let + wrapSplit2flac = format: '' + makeWrapper $out/bin/.split2flac-wrapped $out/bin/split2${format} \ + --set SPLIT2FLAC_FORMAT ${format} \ + --prefix PATH : ${stdenv.lib.makeBinPath [ + shntool cuetools + flac faac mp4v2 wavpack mac + imagemagick libiconv enca lame pythonPackages.mutagen vorbis-tools + aacgain mp3gain vorbisgain + ]} + ''; + +in stdenv.mkDerivation rec { + name = "split2flac-${version}"; + version = "122"; + + src = fetchFromGitHub { + owner = "ftrvxmtrx"; + repo = "split2flac"; + rev = version; + sha256 = "1a71amamip25hhqx7wwzfcl3d5snry9xsiha0kw73iq2m83r2k63"; + }; + + dontBuild = true; + + nativeBuildInputs = [ makeWrapper ]; + + patchPhase = '' + substituteInPlace split2flac \ + --replace 'FORMAT="''${0##*split2}"' 'FORMAT=''${SPLIT2FLAC_FORMAT:-flac}' + ''; + + installPhase = '' + mkdir -p $out/share/bash-completion/completions + cp split2flac-bash-completion.sh \ + $out/share/bash-completion/completions/split2flac-bash-completion.sh + + mkdir -p $out/bin + cp split2flac $out/bin/.split2flac-wrapped + + ${wrapSplit2flac "flac"} + ${wrapSplit2flac "mp3"} + ${wrapSplit2flac "ogg"} + ${wrapSplit2flac "m4a"} + ${wrapSplit2flac "wav"} + ''; + + meta = with stdenv.lib; { + description = "Split flac/ape/wv/wav + cue sheet into separate tracks"; + homepage = https://github.com/ftrvxmtrx/split2flac; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ jfrankenau ]; + }; +} diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 2ae7d421bba..199793a44fb 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -13,14 +13,14 @@ let sha256Hash = "0xx6yprylmcb32ipmwdcfkgddlm1nrxi1w68miclvgrbk015brf2"; }; betaVersion = { - version = "3.2.0.22"; # "Android Studio 3.2 Beta 5" - build = "181.4913314"; - sha256Hash = "016nyn1pqviy089hg0dq7m4cqb39fdxdcy4zknkaq7dmgv1dj6x9"; + version = "3.2.0.24"; # "Android Studio 3.2 RC 2" + build = "181.4974118"; + sha256Hash = "0sj848pzpsbmnfi2692gg73v6m72hr1pwlk5x8q912w60iypi3pz"; }; latestVersion = { # canary & dev - version = "3.3.0.5"; # "Android Studio 3.3 Canary 6" - build = "182.4954005"; - sha256Hash = "0b8ias75f3p5nrmgp7iqz4n4r4dbwhgagqmyc1fqfd36wbglyaf4"; + version = "3.3.0.7"; # "Android Studio 3.3 Canary 8" + build = "182.4978721"; + sha256Hash = "0xa19wrw1a6y7f2jdv8699yqv7g34h3zdw3wc0ql0447afzwg9a9"; }; in rec { # Old alias diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index bc3f8baf510..d5e0259d2ad 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -73,13 +73,13 @@ let }; in stdenv.lib.mapAttrs common { atom = { - version = "1.29.0"; - sha256 = "0f0qpn8aw2qlqk8ah71xvk4vcmwsnsf2f3g4hz0rvaqnhb9ri9fz"; + version = "1.30.0"; + sha256 = "1hqizfn9c249l51rlpfgk0h374maqgw6pagswlh4xa278qzb6qzs"; }; atom-beta = { - version = "1.30.0"; - beta = 1; - sha256 = "0ygqj81xlwhzmmci0d0rd2q7xfskxd1k7h6db3zvvjdxjcnyqp1z"; + version = "1.31.0"; + beta = 0; + sha256 = "11nlaz89rg6lgzsxp83qdqk4bnn2cij2p5aqjd9a3phd7v70xmy5"; }; } diff --git a/pkgs/applications/editors/jupyter/default.nix b/pkgs/applications/editors/jupyter/default.nix new file mode 100644 index 00000000000..2bca120c1de --- /dev/null +++ b/pkgs/applications/editors/jupyter/default.nix @@ -0,0 +1,18 @@ +# Jupyter notebook with the given kernel definitions + +{ python3 +, jupyter-kernel +, definitions ? jupyter-kernel.default +}: + +let + + jupyterPath = (jupyter-kernel.create { inherit definitions; }); + +in + +with python3.pkgs; toPythonModule ( + notebook.overridePythonAttrs(oldAttrs: { + makeWrapperArgs = ["--set JUPYTER_PATH ${jupyterPath}"]; + }) +) diff --git a/pkgs/applications/editors/jupyter/kernel.nix b/pkgs/applications/editors/jupyter/kernel.nix new file mode 100644 index 00000000000..cdb6b6212bd --- /dev/null +++ b/pkgs/applications/editors/jupyter/kernel.nix @@ -0,0 +1,74 @@ +{ lib, stdenv, python3}: + +let + + default = { + python3 = let + env = (python3.withPackages (ps: with ps; [ ipykernel ])); + in { + displayName = "Python 3"; + argv = [ + "${env.interpreter}" + "-m" + "ipykernel_launcher" + "-f" + "{connection_file}" + ]; + language = "python"; + logo32 = "${env.sitePackages}/ipykernel/resources/logo-32x32.png"; + logo64 = "${env.sitePackages}/ipykernel/resources/logo-64x64.png"; + }; + }; + +in +{ + inherit default; + + # Definitions is an attribute set. + + create = { definitions ? default }: with lib; stdenv.mkDerivation rec { + + name = "jupyter-kernels"; + + src = "/dev/null"; + + unpackCmd = "mkdir jupyter_kernels"; + + installPhase = '' + mkdir kernels + + ${concatStringsSep "\n" (mapAttrsToList (kernelName: kernel: + let + config = builtins.toJSON { + display_name = if (kernel.displayName != "") + then kernel.displayName + else kernelName; + argv = kernel.argv; + language = kernel.language; + }; + logo32 = + if (kernel.logo32 != null) + then "ln -s ${kernel.logo32} 'kernels/${kernelName}/logo-32x32.png';" + else ""; + logo64 = + if (kernel.logo64 != null) + then "ln -s ${kernel.logo64} 'kernels/${kernelName}/logo-64x64.png';" + else ""; + in '' + mkdir 'kernels/${kernelName}'; + echo '${config}' > 'kernels/${kernelName}/kernel.json'; + ${logo32} + ${logo64} + '') definitions)} + + mkdir $out + cp -r kernels $out + ''; + + meta = { + description = "Wrapper to create jupyter notebook kernel definitions"; + homepage = http://jupyter.org/; + maintainers = with maintainers; [ aborsu ]; + }; + }; +} diff --git a/pkgs/applications/editors/kdevelop5/kdevelop.nix b/pkgs/applications/editors/kdevelop5/kdevelop.nix index 41d1a6262ed..f0ac79e2d22 100644 --- a/pkgs/applications/editors/kdevelop5/kdevelop.nix +++ b/pkgs/applications/editors/kdevelop5/kdevelop.nix @@ -1,23 +1,23 @@ { mkDerivation, lib, fetchurl, cmake, gettext, pkgconfig, extra-cmake-modules -, qtquickcontrols, qtwebkit, qttools, kde-cli-tools +, qtquickcontrols, qtwebkit, qttools, kde-cli-tools, qtbase , kconfig, kdeclarative, kdoctools, kiconthemes, ki18n, kitemmodels, kitemviews , kjobwidgets, kcmutils, kio, knewstuff, knotifyconfig, kparts, ktexteditor , threadweaver, kxmlgui, kwindowsystem, grantlee, kcrash, karchive, kguiaddons -, plasma-framework, krunner, kdevplatform, kdevelop-pg-qt, shared-mime-info -, libksysguard, konsole, llvmPackages, makeWrapper +, plasma-framework, krunner, kdevelop-pg-qt, shared-mime-info, libkomparediff2 +, libksysguard, konsole, llvmPackages, makeWrapper, kpurpose, boost }: let pname = "kdevelop"; - version = "5.1.2"; - + version = "5.2.4"; + qtVersion = "5.${lib.versions.minor qtbase.version}"; in mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; - sha256 = "af54e807847d145fe5f3eb55962ed0d22e6363c2bc6c32167e51ca4823c00ac7"; + sha256 = "1jbks7nh9rybz4kg152l39hfj2x0p6mjins8x9mz03bbv8jf8gic"; }; nativeBuildInputs = [ @@ -30,20 +30,22 @@ mkDerivation rec { ]; propagatedBuildInputs = [ - qtquickcontrols qtwebkit + qtquickcontrols qtwebkit boost libkomparediff2 kconfig kdeclarative kdoctools kiconthemes ki18n kitemmodels kitemviews kjobwidgets kcmutils kio knewstuff knotifyconfig kparts ktexteditor threadweaver kxmlgui kwindowsystem grantlee plasma-framework krunner - kdevplatform shared-mime-info libksysguard konsole kcrash karchive kguiaddons + shared-mime-info libksysguard konsole kcrash karchive kguiaddons kpurpose ]; postInstall = '' # The kdevelop! script (shell environment) needs qdbus and kioclient5 in PATH. - wrapProgram "$out/bin/kdevelop!" --prefix PATH ":" "${lib.makeBinPath [ qttools kde-cli-tools ]}" + wrapProgram "$out/bin/kdevelop!" \ + --prefix PATH ":" "${lib.makeBinPath [ qttools kde-cli-tools ]}" + + wrapProgram "$out/bin/kdevelop" \ + --prefix QT_PLUGIN_PATH : $out/lib/qt-${qtVersion}/plugins # Fix the (now wrapped) kdevelop! to find things in right places: - # - Make KDEV_BASEDIR point to bin directory of kdevplatform. - kdev_fixup_sed="s|^export KDEV_BASEDIR=.*$|export KDEV_BASEDIR=${kdevplatform}/bin|" # - Fixup the one use where KDEV_BASEDIR is assumed to contain kdevelop. kdev_fixup_sed+=";s|\\\$KDEV_BASEDIR/kdevelop|$out/bin/kdevelop|" sed -E -i "$kdev_fixup_sed" "$out/bin/.kdevelop!-wrapped" diff --git a/pkgs/applications/editors/kdevelop5/kdevplatform.nix b/pkgs/applications/editors/kdevelop5/kdevplatform.nix deleted file mode 100644 index 88164c2c458..00000000000 --- a/pkgs/applications/editors/kdevelop5/kdevplatform.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ stdenv, fetchurl, cmake, gettext, pkgconfig, extra-cmake-modules -, boost, subversion, apr, aprutil, kwindowsystem -, qtscript, qtwebkit, grantlee, karchive, kconfig, kcoreaddons, kguiaddons, kiconthemes, ki18n -, kitemmodels, kitemviews, kio, kparts, sonnet, kcmutils, knewstuff, knotifications -, knotifyconfig, ktexteditor, threadweaver, kdeclarative, libkomparediff2 }: - -let - pname = "kdevplatform"; - version = "5.1.2"; - -in -stdenv.mkDerivation rec { - name = "${pname}-${version}"; - - src = fetchurl { - url = "mirror://kde/stable/kdevelop/${version}/src/${name}.tar.xz"; - sha256 = "e622ddad552a678baaf1166d5cbdc5fd1192d2324300c52ef2d25f1c6778664a"; - }; - - nativeBuildInputs = [ cmake gettext pkgconfig extra-cmake-modules ]; - - buildInputs = [ - boost subversion apr aprutil kwindowsystem - qtscript qtwebkit grantlee karchive kconfig kcoreaddons kguiaddons kiconthemes - ki18n kitemmodels kitemviews kio kparts sonnet kcmutils knewstuff - knotifications knotifyconfig ktexteditor threadweaver kdeclarative - libkomparediff2 - ]; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - maintainers = [ maintainers.ambrop72 ]; - platforms = platforms.linux; - description = "KDE libraries for IDE-like programs"; - longDescription = '' - A free, opensource set of libraries that can be used as a foundation for - IDE-like programs. It is programing-language independent, and is planned - to be used by programs like: KDevelop, Quanta, Kile, KTechLab ... etc." - ''; - homepage = https://www.kdevelop.org; - license = with stdenv.lib.licenses; [ gpl2Plus lgpl2Plus ]; - }; -} diff --git a/pkgs/applications/editors/micro/default.nix b/pkgs/applications/editors/micro/default.nix index f1c1e3dcac7..fab3646efdf 100644 --- a/pkgs/applications/editors/micro/default.nix +++ b/pkgs/applications/editors/micro/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "micro-${version}"; - version = "1.4.0"; + version = "1.4.1"; goPackagePath = "github.com/zyedidia/micro"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "zyedidia"; repo = "micro"; rev = "v${version}"; - sha256 = "0w1rmh81h28n1jlb05k89i751h498i6p883hrsjr70hvrwq5zjpb"; + sha256 = "0m9p6smb5grdazsgr3m1x4rry9ihhlgl9ildhvfp53czrifbx0m5"; fetchSubmodules = true; }; diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index 86134687ba3..64b8e48b288 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -14,8 +14,8 @@ let nixSyntaxHighlight = fetchFromGitHub { owner = "seitz"; repo = "nanonix"; - rev = "17e0de65e1cbba3d6baa82deaefa853b41f5c161"; - sha256 = "1g51h65i31andfs2fbp1v3vih9405iknqn11fzywjxji00kjqv5s"; + rev = "7483fd8b79f1f3f2179dbbd46aa400df4320ba10"; + sha256 = "10pv75kfrgnziz8sr83hdbb0c3klm2fmsdw3i5cpqqf5va1fzb8h"; }; in stdenv.mkDerivation rec { diff --git a/pkgs/applications/editors/neovim/qt.nix b/pkgs/applications/editors/neovim/qt.nix index d17d5c1e85d..baeb3879735 100644 --- a/pkgs/applications/editors/neovim/qt.nix +++ b/pkgs/applications/editors/neovim/qt.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "neovim-qt-${version}"; - version = "0.2.8"; + version = "0.2.9"; src = fetchFromGitHub { owner = "equalsraf"; repo = "neovim-qt"; rev = "v${version}"; - sha256 = "190yg6kkw953h8wajlqr2hvs2fz65y6z0blmywlg1nff724allaq"; + sha256 = "014zqfbbv7q85z64h1iw88l37vhrvhjv7xxd0a76j7d1m2769kqs"; }; cmakeFlags = [ diff --git a/pkgs/applications/editors/vanubi/default.nix b/pkgs/applications/editors/vanubi/default.nix deleted file mode 100644 index 98f45f6be02..00000000000 --- a/pkgs/applications/editors/vanubi/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, vala_0_28, which, autoconf, automake -, libtool, glib, gtk3, gnome3, libwnck3, asciidoc, python3Packages }: - -stdenv.mkDerivation rec { - name = "vanubi-${version}"; - version = "0.0.16"; - - src = fetchurl { - url = "https://github.com/vanubi/vanubi/archive/v${version}.tar.gz"; - sha256 = "145zxgaky5bcq5bxm4z7h0pvviq7k1nrgnf40q6nax6ik616ybjq"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ vala_0_28 which autoconf automake - libtool glib gtk3 libwnck3 asciidoc - gnome3.gtksourceview gnome3.vte_290 python3Packages.pygments ]; - - configureScript = "./autogen.sh"; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - homepage = http://vanubi.github.io/vanubi; - description = "Programming editor for GTK+ inspired by Emacs"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = [ maintainers.lethalman ]; - }; -} diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index 3711b3cdcee..7ee28adfa47 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -1,7 +1,7 @@ # TODO tidy up eg The patchelf code is patching gvim even if you don't build it.. # but I have gvim with python support now :) - Marc -args@{ source ? "default", callPackage, fetchurl, stdenv, ncurses, pkgconfig, gettext -, writeText, lib, config, glib, gtk2, gtk3, python, perl, tcl, ruby +{ source ? "default", callPackage, fetchurl, stdenv, ncurses, pkgconfig, gettext +, writeText, config, glib, gtk2, gtk3, lua, python, perl, tcl, ruby , libX11, libXext, libSM, libXpm, libXt, libXaw, libXau, libXmu , libICE , vimPlugins @@ -13,7 +13,7 @@ args@{ source ? "default", callPackage, fetchurl, stdenv, ncurses, pkgconfig, ge , features ? "huge" # One of tiny, small, normal, big or huge , wrapPythonDrv ? false -, guiSupport ? config.vim.gui or "auto" +, guiSupport ? config.vim.gui or "gtk3" , luaSupport ? config.vim.lua or true , perlSupport ? config.vim.perl or false # Perl interpreter , pythonSupport ? config.vim.python or true # Python interpreter @@ -24,11 +24,10 @@ args@{ source ? "default", callPackage, fetchurl, stdenv, ncurses, pkgconfig, ge , cscopeSupport ? config.vim.cscope or true # Enable cscope interface , netbeansSupport ? config.netbeans or true # Enable NetBeans integration support. , ximSupport ? config.vim.xim or true # less than 15KB, needed for deadkeys -# By default, compile with darwin support if we're compiling on darwin, but -# allow this to be disabled by setting config.vim.darwin to false -, darwinSupport ? stdenv.isDarwin && (config.vim.darwin or true) # Enable Darwin support +, darwinSupport ? config.vim.darwin or false # Enable Darwin support , ftNixSupport ? config.vim.ftNix or true # Add .nix filetype detection and minimal syntax highlighting support -, ... }: with args; +, ... +}: let @@ -99,8 +98,10 @@ in stdenv.mkDerivation rec { "--disable-carbon_check" "--disable-gtktest" ] + ++ stdenv.lib.optional stdenv.isDarwin + (if darwinSupport then "--enable-darwin" else "--disable-darwin") ++ stdenv.lib.optionals luaSupport [ - "--with-lua-prefix=${args.lua}" + "--with-lua-prefix=${lua}" "--enable-luainterp" ] ++ stdenv.lib.optionals pythonSupport [ @@ -128,7 +129,8 @@ in stdenv.mkDerivation rec { buildInputs = [ ncurses libX11 libXext libSM libXpm libXt libXaw libXau libXmu glib libICE ] - ++ (if guiSupport == "gtk3" then [gtk3] else [gtk2]) + ++ stdenv.lib.optional (guiSupport == "gtk2") gtk2 + ++ stdenv.lib.optional (guiSupport == "gtk3") gtk3 ++ stdenv.lib.optionals darwinSupport [ CoreServices CoreData Cocoa Foundation libobjc cf-private ] ++ stdenv.lib.optional luaSupport lua ++ stdenv.lib.optional pythonSupport python @@ -142,22 +144,36 @@ in stdenv.mkDerivation rec { cp ${vimPlugins.vim-nix.src}/syntax/nix.vim runtime/syntax/nix.vim ''; - NIX_LDFLAGS = stdenv.lib.optionalString (darwinSupport && stdenv.isDarwin) - "/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation"; - postInstall = '' '' + stdenv.lib.optionalString stdenv.isLinux '' patchelf --set-rpath \ - "$(patchelf --print-rpath $out/bin/vim):${lib.makeLibraryPath buildInputs}" \ + "$(patchelf --print-rpath $out/bin/vim):${stdenv.lib.makeLibraryPath buildInputs}" \ "$out"/bin/{vim,gvim} ln -sfn '${nixosRuntimepath}' "$out"/share/vim/vimrc '' + stdenv.lib.optionalString wrapPythonDrv '' wrapProgram "$out/bin/vim" --prefix PATH : "${python}/bin" '' + stdenv.lib.optionalString (guiSupport == "gtk3") '' - rm "$out/bin/gvim" - echo -e '#!${stdenv.shell}\n"'"$out/bin/vim"'" -g "$@"' > "$out/bin/gvim" - chmod a+x "$out/bin/gvim" + + rewrap () { + rm -f "$out/bin/$1" + echo -e '#!${stdenv.shell}\n"'"$out/bin/vim"'" '"$2"' "$@"' > "$out/bin/$1" + chmod a+x "$out/bin/$1" + } + + rewrap ex -e + rewrap view -R + rewrap gvim -g + rewrap gex -eg + rewrap gview -Rg + rewrap rvim -Z + rewrap rview -RZ + rewrap rgvim -gZ + rewrap rgview -RgZ + rewrap evim -y + rewrap eview -yR + rewrap vimdiff -d + rewrap gvimdiff -gd ''; preInstall = '' diff --git a/pkgs/applications/gis/openorienteering-mapper/default.nix b/pkgs/applications/gis/openorienteering-mapper/default.nix index 7b79cd062a8..6ed6326f16e 100644 --- a/pkgs/applications/gis/openorienteering-mapper/default.nix +++ b/pkgs/applications/gis/openorienteering-mapper/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "OpenOrienteering-Mapper-${version}"; - version = "0.8.1.2"; + version = "0.8.2"; buildInputs = [ gdal qtbase qttools qtlocation qtimageformats qtsensors clipper zlib proj doxygen cups]; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { owner = "OpenOrienteering"; repo = "mapper"; rev = "v${version}"; - sha256 = "0f7zxzl2n46qy86k6n3f6a7l1nhba58i28l8ngp3drf74qffaa33"; + sha256 = "02lga6nlal4c7898zc3lv1pcwyv1wpkn7v2xji2kgq68r6aw6j59"; }; cmakeFlags = diff --git a/pkgs/applications/graphics/imgcat/default.nix b/pkgs/applications/graphics/imgcat/default.nix new file mode 100644 index 00000000000..ad2cb4198d2 --- /dev/null +++ b/pkgs/applications/graphics/imgcat/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, autoconf, automake, libtool, ncurses }: + +stdenv.mkDerivation rec { + name = "imgcat-${version}"; + version = "2.3.0"; + + buildTools = [ autoconf automake libtool ncurses ]; + + preConfigure = '' + ${autoconf}/bin/autoconf + sed -i -e "s|-ltermcap|-L ${ncurses}/lib -lncurses|" Makefile + ''; + + preInstall = '' + makeFlagsArray=(PREFIX="$out"); + ''; + + src = fetchFromGitHub { + owner = "eddieantonio"; + repo = "imgcat"; + rev = "3d854c72f785dce0eecd9485767a7f972d54890c"; + sha256 = "0m83c33rzxvs0w214njql2c7q3fg06wnyijch3l2s88i7frl121f"; + }; + + meta = with stdenv.lib; { + description = "It's like cat, but for images"; + homepage = https://github.com/eddieantonio/imgcat; + license = licenses.isc; + maintainers = with maintainers; [ jwiegley ]; + platforms = platforms.unix; + }; +} + diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index f995abf2836..072b66e5563 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -113,6 +113,7 @@ let kidentitymanagement = callPackage ./kidentitymanagement.nix {}; kig = callPackage ./kig.nix {}; kimap = callPackage ./kimap.nix {}; + kitinerary = callPackage ./kitinerary.nix {}; kio-extras = callPackage ./kio-extras.nix {}; kldap = callPackage ./kldap.nix {}; kleopatra = callPackage ./kleopatra.nix {}; @@ -132,6 +133,7 @@ let kpimtextedit = callPackage ./kpimtextedit.nix {}; ksmtp = callPackage ./ksmtp {}; kqtquickcharts = callPackage ./kqtquickcharts.nix {}; + kpkpass = callPackage ./kpkpass.nix {}; krdc = callPackage ./krdc.nix {}; krfb = callPackage ./krfb.nix {}; kruler = callPackage ./kruler.nix {}; diff --git a/pkgs/applications/kde/dolphin.nix b/pkgs/applications/kde/dolphin.nix index 6a4635c26fb..dcc79774303 100644 --- a/pkgs/applications/kde/dolphin.nix +++ b/pkgs/applications/kde/dolphin.nix @@ -21,4 +21,8 @@ mkDerivation { phonon solid ]; outputs = [ "out" "dev" ]; + # We need the RPATH for linking, because the `libkdeinit5_dolphin.so` links + # private against its dependencies and without the correct RPATH, these + # dependencies are not found. + cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF" ]; } diff --git a/pkgs/applications/kde/eventviews.nix b/pkgs/applications/kde/eventviews.nix index cc1e83f6581..495491f6d3c 100644 --- a/pkgs/applications/kde/eventviews.nix +++ b/pkgs/applications/kde/eventviews.nix @@ -1,7 +1,8 @@ { mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, - akonadi, calendarsupport, kcalutils, kdiagram, libkdepim, qtbase, qttools, + akonadi, calendarsupport, kcalutils, + kdiagram, libkdepim, qtbase, qttools, kholidays }: mkDerivation { @@ -12,7 +13,8 @@ mkDerivation { }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - akonadi calendarsupport kcalutils kdiagram libkdepim qtbase qttools + akonadi calendarsupport kcalutils kdiagram + libkdepim qtbase qttools kholidays ]; outputs = [ "out" "dev" ]; } diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh index 181bf54ce8c..c7cc617f163 100644 --- a/pkgs/applications/kde/fetch.sh +++ b/pkgs/applications/kde/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/applications/18.04.3/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/applications/18.08.0/ -A '*.tar.xz' ) diff --git a/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch b/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch index fe8b15febf2..ebb81248475 100644 --- a/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch +++ b/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch @@ -1,82 +1,8 @@ -Index: grantleetheme-17.04.0/src/grantleetheme_p.h -=================================================================== ---- grantleetheme-17.04.0.orig/src/grantleetheme_p.h -+++ grantleetheme-17.04.0/src/grantleetheme_p.h -@@ -47,7 +47,7 @@ public: - QString description; - QString name; - QString dirName; -- QString absolutePath; -+ QStringList absolutePaths; - QString author; - QString email; - -Index: grantleetheme-17.04.0/src/grantleetheme.h -=================================================================== ---- grantleetheme-17.04.0.orig/src/grantleetheme.h -+++ grantleetheme-17.04.0/src/grantleetheme.h -@@ -50,11 +50,14 @@ public: - QStringList displayExtraVariables() const; - QString dirName() const; - QString absolutePath() const; -+ QStringList absolutePaths() const; - QString author() const; - QString authorEmail() const; - - QString render(const QString &templateName, const QVariantHash &data, const QByteArray &applicationDomain = QByteArray()); - -+ void addThemeDir(const QString&); -+ - static void addPluginPath(const QString &path); - - private: -Index: grantleetheme-17.04.0/src/grantleethememanager.cpp -=================================================================== ---- grantleetheme-17.04.0.orig/src/grantleethememanager.cpp -+++ grantleetheme-17.04.0/src/grantleethememanager.cpp -@@ -142,25 +142,18 @@ public: - - for (const QString &directory : qAsConst(themesDirectories)) { - QDirIterator dirIt(directory, QStringList(), QDir::AllDirs | QDir::NoDotAndDotDot); -- QStringList alreadyLoadedThemeName; - while (dirIt.hasNext()) { - dirIt.next(); - const QString dirName = dirIt.fileName(); - GrantleeTheme::Theme theme = q->loadTheme(dirIt.filePath(), dirName, defaultDesktopFileName); - if (theme.isValid()) { - QString themeName = theme.name(); -- if (alreadyLoadedThemeName.contains(themeName)) { -- int i = 2; -- const QString originalName(theme.name()); -- while (alreadyLoadedThemeName.contains(themeName)) { -- themeName = originalName + QStringLiteral(" (%1)").arg(i); -- ++i; -- } -- theme.d->name = themeName; -+ QMap<QString, GrantleeTheme::Theme>::iterator i = themes.find(dirName); -+ if (i != themes.end()) { -+ i.value().addThemeDir(dirIt.filePath()); -+ } else { -+ themes.insert(dirName, theme); - } -- alreadyLoadedThemeName << themeName; -- themes.insert(dirName, theme); -- //qDebug()<<" theme.name()"<<theme.name(); - } - } - watch->addDir(directory); -@@ -374,7 +367,7 @@ QString ThemeManager::pathFromThemes(con - GrantleeTheme::Theme theme = loadTheme(dirIt.filePath(), dirName, defaultDesktopFileName); - if (theme.isValid()) { - if (dirName == themeName) { -- return theme.absolutePath(); -+ return theme.absolutePaths().first(); - } - } - } ---- src/grantleetheme.cpp.orig 2017-12-22 16:11:39.863598126 +0300 -+++ ./src/grantleetheme.cpp 2017-12-22 16:16:14.045664607 +0300 -@@ -46,7 +46,7 @@ ThemePrivate::ThemePrivate(const ThemePr +diff --git a/src/grantleetheme.cpp b/src/grantleetheme.cpp +index 27d5bc8..8d43140 100644 +--- a/src/grantleetheme.cpp ++++ b/src/grantleetheme.cpp +@@ -46,7 +46,7 @@ ThemePrivate::ThemePrivate(const ThemePrivate &other) , description(other.description) , name(other.name) , dirName(other.dirName) @@ -105,7 +31,7 @@ Index: grantleetheme-17.04.0/src/grantleethememanager.cpp loader->setTheme(dirName); if (!sEngine) { -@@ -121,7 +124,7 @@ Theme::Theme(const QString &themePath, c +@@ -121,7 +124,7 @@ Theme::Theme(const QString &themePath, const QString &dirName, const QString &de KConfigGroup group(&config, QStringLiteral("Desktop Entry")); if (group.isValid()) { d->dirName = dirName; @@ -137,7 +63,7 @@ Index: grantleetheme-17.04.0/src/grantleethememanager.cpp } QString Theme::author() const -@@ -223,6 +231,13 @@ QString Theme::render(const QString &tem +@@ -223,6 +231,13 @@ QString Theme::render(const QString &templateName, const QVariantHash &data, con return result; } @@ -151,3 +77,79 @@ Index: grantleetheme-17.04.0/src/grantleethememanager.cpp void Theme::addPluginPath(const QString &path) { if (!ThemePrivate::sEngine) { +diff --git a/src/grantleetheme.h b/src/grantleetheme.h +index a25c27b..be38299 100644 +--- a/src/grantleetheme.h ++++ b/src/grantleetheme.h +@@ -48,11 +48,14 @@ public: + Q_REQUIRED_RESULT QStringList displayExtraVariables() const; + Q_REQUIRED_RESULT QString dirName() const; + Q_REQUIRED_RESULT QString absolutePath() const; ++ Q_REQUIRED_RESULT QStringList absolutePaths() const; + Q_REQUIRED_RESULT QString author() const; + Q_REQUIRED_RESULT QString authorEmail() const; + + Q_REQUIRED_RESULT QString render(const QString &templateName, const QVariantHash &data, const QByteArray &applicationDomain = QByteArray()); + ++ void addThemeDir(const QString&); ++ + static void addPluginPath(const QString &path); + + private: +diff --git a/src/grantleetheme_p.h b/src/grantleetheme_p.h +index eb73dcb..00510e9 100644 +--- a/src/grantleetheme_p.h ++++ b/src/grantleetheme_p.h +@@ -43,7 +43,7 @@ public: + QString description; + QString name; + QString dirName; +- QString absolutePath; ++ QStringList absolutePaths; + QString author; + QString email; + +diff --git a/src/grantleethememanager.cpp b/src/grantleethememanager.cpp +index 606d717..dc99041 100644 +--- a/src/grantleethememanager.cpp ++++ b/src/grantleethememanager.cpp +@@ -125,25 +125,18 @@ public: + + for (const QString &directory : qAsConst(themesDirectories)) { + QDirIterator dirIt(directory, QStringList(), QDir::AllDirs | QDir::NoDotAndDotDot); +- QStringList alreadyLoadedThemeName; + while (dirIt.hasNext()) { + dirIt.next(); + const QString dirName = dirIt.fileName(); + GrantleeTheme::Theme theme = q->loadTheme(dirIt.filePath(), dirName, defaultDesktopFileName); + if (theme.isValid()) { + QString themeName = theme.name(); +- if (alreadyLoadedThemeName.contains(themeName)) { +- int i = 2; +- const QString originalName(theme.name()); +- while (alreadyLoadedThemeName.contains(themeName)) { +- themeName = originalName + QStringLiteral(" (%1)").arg(i); +- ++i; +- } +- theme.d->name = themeName; ++ QMap<QString, GrantleeTheme::Theme>::iterator i = themes.find(dirName); ++ if (i != themes.end()) { ++ i.value().addThemeDir(dirIt.filePath()); ++ } else { ++ themes.insert(dirName, theme); + } +- alreadyLoadedThemeName << themeName; +- themes.insert(dirName, theme); +- //qDebug()<<" theme.name()"<<theme.name(); + } + } + watch->addDir(directory); +@@ -366,7 +359,7 @@ QString ThemeManager::pathFromThemes(const QString &themesRelativePath, const QS + GrantleeTheme::Theme theme = loadTheme(dirIt.filePath(), dirName, defaultDesktopFileName); + if (theme.isValid()) { + if (dirName == themeName) { +- return theme.absolutePath(); ++ return theme.absolutePaths().first(); + } + } + } diff --git a/pkgs/applications/kde/kdepim-addons.nix b/pkgs/applications/kde/kdepim-addons.nix index 5be3d881b0c..75c1bf5be8b 100644 --- a/pkgs/applications/kde/kdepim-addons.nix +++ b/pkgs/applications/kde/kdepim-addons.nix @@ -4,7 +4,8 @@ akonadi-import-wizard, akonadi-notes, calendarsupport, eventviews, incidenceeditor, kcalcore, kcalutils, kconfig, kdbusaddons, kdeclarative, kdepim-apps-libs, kholidays, ki18n, kmime, ktexteditor, ktnef, libgravatar, - libksieve, mailcommon, mailimporter, messagelib, poppler, prison + libksieve, mailcommon, mailimporter, messagelib, poppler, prison, kpkpass, + kitinerary }: mkDerivation { @@ -18,6 +19,7 @@ mkDerivation { akonadi-import-wizard akonadi-notes calendarsupport eventviews incidenceeditor kcalcore kcalutils kconfig kdbusaddons kdeclarative kdepim-apps-libs kholidays ki18n kmime ktexteditor ktnef libgravatar - libksieve mailcommon mailimporter messagelib poppler prison + libksieve mailcommon mailimporter messagelib poppler prison kpkpass + kitinerary ]; } diff --git a/pkgs/applications/kde/kitinerary.nix b/pkgs/applications/kde/kitinerary.nix new file mode 100644 index 00000000000..8112460549b --- /dev/null +++ b/pkgs/applications/kde/kitinerary.nix @@ -0,0 +1,19 @@ +{ + mkDerivation, lib, extra-cmake-modules +, qtbase, qtdeclarative, ki18n, kmime, kpkpass +, poppler, kcontacts, kcalcore +}: + +mkDerivation { + name = "kitinerary"; + meta = { + license = with lib.licenses; [ lgpl21 ]; + maintainers = [ lib.maintainers.bkchr ]; + }; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ + qtbase qtdeclarative ki18n kmime kpkpass poppler + kcontacts kcalcore + ]; + outputs = [ "out" "dev" ]; +} diff --git a/pkgs/applications/kde/kleopatra.nix b/pkgs/applications/kde/kleopatra.nix index a19fef9c9ed..c15c6eb78d6 100644 --- a/pkgs/applications/kde/kleopatra.nix +++ b/pkgs/applications/kde/kleopatra.nix @@ -2,7 +2,7 @@ mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, boost, gpgme, kcmutils, kdbusaddons, kiconthemes, kitemmodels, kmime, - knotifications, kwindowsystem, kxmlgui, libkleo + knotifications, kwindowsystem, kxmlgui, libkleo, kcrash }: mkDerivation { @@ -14,6 +14,6 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ boost gpgme kcmutils kdbusaddons kiconthemes kitemmodels kmime - knotifications kwindowsystem kxmlgui libkleo + knotifications kwindowsystem kxmlgui libkleo kcrash ]; } diff --git a/pkgs/applications/kde/kmailtransport.nix b/pkgs/applications/kde/kmailtransport.nix index c4b7c0ab432..703f62aa72c 100644 --- a/pkgs/applications/kde/kmailtransport.nix +++ b/pkgs/applications/kde/kmailtransport.nix @@ -1,7 +1,9 @@ { mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, - akonadi, akonadi-mime, cyrus_sasl, kcmutils, ki18n, kio, kmime, kwallet, ksmtp + akonadi, akonadi-mime, cyrus_sasl, kcmutils, + ki18n, kio, kmime, kwallet, ksmtp, libkgapi, + kcalcore, kcontacts }: mkDerivation { @@ -11,7 +13,7 @@ mkDerivation { maintainers = kdepimTeam; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ akonadi kcmutils ki18n kio ksmtp ]; + buildInputs = [ akonadi kcmutils ki18n kio ksmtp libkgapi kcalcore kcontacts ]; propagatedBuildInputs = [ akonadi-mime cyrus_sasl kmime kwallet ]; outputs = [ "out" "dev" ]; } diff --git a/pkgs/applications/kde/kpkpass.nix b/pkgs/applications/kde/kpkpass.nix new file mode 100644 index 00000000000..e9505a72e85 --- /dev/null +++ b/pkgs/applications/kde/kpkpass.nix @@ -0,0 +1,15 @@ +{ + mkDerivation, lib, extra-cmake-modules +, qtbase, karchive, shared-mime-info +}: + +mkDerivation { + name = "kpkpass"; + meta = { + license = with lib.licenses; [ lgpl21 ]; + maintainers = [ lib.maintainers.bkchr ]; + }; + nativeBuildInputs = [ extra-cmake-modules shared-mime-info ]; + buildInputs = [ qtbase karchive ]; + outputs = [ "out" "dev" ]; +} diff --git a/pkgs/applications/kde/libkgapi.nix b/pkgs/applications/kde/libkgapi.nix index 7ff3a1f04b0..998e65f2834 100644 --- a/pkgs/applications/kde/libkgapi.nix +++ b/pkgs/applications/kde/libkgapi.nix @@ -1,7 +1,8 @@ { mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, - qtwebengine, kio, kcalcore, kcontacts + qtwebengine, kio, kcalcore, kcontacts, + cyrus_sasl }: mkDerivation { @@ -11,5 +12,5 @@ mkDerivation { maintainers = kdepimTeam; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ qtwebengine kio kcalcore kcontacts ]; + buildInputs = [ qtwebengine kio kcalcore kcontacts cyrus_sasl ]; } diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix index f50afbcc371..decf0f4a314 100644 --- a/pkgs/applications/kde/srcs.nix +++ b/pkgs/applications/kde/srcs.nix @@ -3,1699 +3,1715 @@ { akonadi = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/akonadi-18.04.3.tar.xz"; - sha256 = "0x232a4rm8vz0vqs1v08p77zmcdjhjn9aicb3pvn4mqlgzz2q8x5"; - name = "akonadi-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/akonadi-18.08.0.tar.xz"; + sha256 = "06a1n84w4bfljyariyajzpn1sajkn4dwpsrr47pz38vf1m6dp7mz"; + name = "akonadi-18.08.0.tar.xz"; }; }; akonadi-calendar = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/akonadi-calendar-18.04.3.tar.xz"; - sha256 = "1jaigydsk1albvgqblrj0chxqzgpg3nmxihy7yf5wdmnkrkzpqlm"; - name = "akonadi-calendar-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/akonadi-calendar-18.08.0.tar.xz"; + sha256 = "1qlqvsv4gs50v9dd3nbw8wyq0vgvxvslhnk1hnqpyvh0skcwslh5"; + name = "akonadi-calendar-18.08.0.tar.xz"; }; }; akonadi-calendar-tools = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/akonadi-calendar-tools-18.04.3.tar.xz"; - sha256 = "06azzv80gisiiq1g8a1lm0hmadck38zsvylz8mwwir5s8nah9v09"; - name = "akonadi-calendar-tools-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/akonadi-calendar-tools-18.08.0.tar.xz"; + sha256 = "1d5kr7nxfy7y9ybi4qnfbfci5kc44ya916j9wgb18r6rfdhdwsxr"; + name = "akonadi-calendar-tools-18.08.0.tar.xz"; }; }; akonadiconsole = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/akonadiconsole-18.04.3.tar.xz"; - sha256 = "12yl23hdyyj3k5b59nkmj1ykr79srx901x16jakwqzx4n07nc30x"; - name = "akonadiconsole-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/akonadiconsole-18.08.0.tar.xz"; + sha256 = "0qrwgjdmqa5jj8vcbs6n733v462sxnf4jcmh2khjddf2h5na6q86"; + name = "akonadiconsole-18.08.0.tar.xz"; }; }; akonadi-contacts = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/akonadi-contacts-18.04.3.tar.xz"; - sha256 = "0g6vq1k95lvzljl54zafgcg3wmjayn49ihzpyyyxv1dxn7nfdngq"; - name = "akonadi-contacts-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/akonadi-contacts-18.08.0.tar.xz"; + sha256 = "0jqs0llpxq34j4glgzsfifk5yd24x6smky550s66bjzkyg3j2s2m"; + name = "akonadi-contacts-18.08.0.tar.xz"; }; }; akonadi-import-wizard = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/akonadi-import-wizard-18.04.3.tar.xz"; - sha256 = "0by9h35gag4ygxna661gg72hmnng235dhc2q1pl6x5mb5gkpnwmp"; - name = "akonadi-import-wizard-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/akonadi-import-wizard-18.08.0.tar.xz"; + sha256 = "00my9ja8clz758s3x2jjlsxlpc8zfs8vlq4vh9i2vmsacqwrfy24"; + name = "akonadi-import-wizard-18.08.0.tar.xz"; }; }; akonadi-mime = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/akonadi-mime-18.04.3.tar.xz"; - sha256 = "1kk5nxh0dn1rmi1qasqf6kpa9ihg0lkajkj6r7widkh14ssz8sn0"; - name = "akonadi-mime-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/akonadi-mime-18.08.0.tar.xz"; + sha256 = "0jj9l1zjh72crj8gfifpn73c5xiyycjgv0cm1qalf370cd1sdx80"; + name = "akonadi-mime-18.08.0.tar.xz"; }; }; akonadi-notes = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/akonadi-notes-18.04.3.tar.xz"; - sha256 = "0dir0mlch002l9wx6cgzkywh9nkjgvwm09gzpiz9h9d62q8a5wzc"; - name = "akonadi-notes-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/akonadi-notes-18.08.0.tar.xz"; + sha256 = "0x2v8ylnli29ld6y9vqj18a4bph4zm34zymdmrp3swll1j6xib7q"; + name = "akonadi-notes-18.08.0.tar.xz"; }; }; akonadi-search = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/akonadi-search-18.04.3.tar.xz"; - sha256 = "15a94g4zrq021zaabsi97lcb5lrm9nar9wjakga8xgy9jf48fq23"; - name = "akonadi-search-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/akonadi-search-18.08.0.tar.xz"; + sha256 = "0fsn7mm1h9m9h3zm2z2fdghbw7m6wdbgfhg7b4iish2br375qh1s"; + name = "akonadi-search-18.08.0.tar.xz"; }; }; akregator = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/akregator-18.04.3.tar.xz"; - sha256 = "0xhsrx0yf4kggi4cjrg5g3if5n1m3injqfy9zyy891kzgfsybnaj"; - name = "akregator-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/akregator-18.08.0.tar.xz"; + sha256 = "1s044m9l8z6safqcarjplmlksappjkx7iry3k8s2p6ld4w377w3c"; + name = "akregator-18.08.0.tar.xz"; }; }; analitza = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/analitza-18.04.3.tar.xz"; - sha256 = "1yva0j9c8wagzp68qi4hg7lniigz1b61jr6jayw98lnkdvsg7y5f"; - name = "analitza-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/analitza-18.08.0.tar.xz"; + sha256 = "1sqr94mbblqry9a1nkmg6py2w0p1wlnbim99kadmp56ypf483rw7"; + name = "analitza-18.08.0.tar.xz"; }; }; ark = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/ark-18.04.3.tar.xz"; - sha256 = "02dv1mv8sim2qb1xm7nni5z6nx4jsdihagmj2y5v48nlvf229k75"; - name = "ark-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/ark-18.08.0.tar.xz"; + sha256 = "0dp7lrc0nqwwshcsi1408lqyycqhxgx18bmnf1sq7ysh6d1w6i75"; + name = "ark-18.08.0.tar.xz"; }; }; artikulate = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/artikulate-18.04.3.tar.xz"; - sha256 = "1dvinnbcm6lgjsjjsv9gl1s99xgcgpld10v3nn32ak8h7v89in9m"; - name = "artikulate-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/artikulate-18.08.0.tar.xz"; + sha256 = "12bkfxpaz352823c639q3bal9j6fcaamypv2ql08rn44h9zdjvk8"; + name = "artikulate-18.08.0.tar.xz"; }; }; audiocd-kio = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/audiocd-kio-18.04.3.tar.xz"; - sha256 = "08kzy6nj14qwm3gd7m6idn3s34i7bx5galhbish0xqmg6wnfxpzl"; - name = "audiocd-kio-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/audiocd-kio-18.08.0.tar.xz"; + sha256 = "0mh1cfz0dn28i9hqyjmz2cm50qkxzj0qkrvar59p03i2r8vqybf8"; + name = "audiocd-kio-18.08.0.tar.xz"; }; }; baloo-widgets = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/baloo-widgets-18.04.3.tar.xz"; - sha256 = "01qx2wyiaa00ixyfy0mak8xz7cnpqrxnxn5hzhrf8v9zar1d04ap"; - name = "baloo-widgets-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/baloo-widgets-18.08.0.tar.xz"; + sha256 = "026lm8m7bp8q1akwgfvzsyyam7jknndif3vmij4x5ra7yy5xa0s9"; + name = "baloo-widgets-18.08.0.tar.xz"; }; }; blinken = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/blinken-18.04.3.tar.xz"; - sha256 = "0rv9v678cqhnamz46996pwgw9d4nwa2kg92d2mpvyd790ax5fdrz"; - name = "blinken-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/blinken-18.08.0.tar.xz"; + sha256 = "0ivpv27vgzchm0r8zlb02w6l0a8xsi7q173660bjv1ynwalgn3bm"; + name = "blinken-18.08.0.tar.xz"; }; }; bomber = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/bomber-18.04.3.tar.xz"; - sha256 = "0a7l103ddgn648ijlwf1fgvvma7mg0vz7pqdy50k1vm3gkkvqh03"; - name = "bomber-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/bomber-18.08.0.tar.xz"; + sha256 = "0z83hkvs7h0pg91sczmvkkn7yc8xfch5hl7l25b7kac4c9qznzix"; + name = "bomber-18.08.0.tar.xz"; }; }; bovo = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/bovo-18.04.3.tar.xz"; - sha256 = "047f4k6h3z7yl4f5ggs3jlrcpgp5li4kgkssa2vcy93jsgb4a8wz"; - name = "bovo-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/bovo-18.08.0.tar.xz"; + sha256 = "0bbkm0c801rcvk8z0idbasn1m7cdd2mpbpb1ap9ghgv2vjbln7va"; + name = "bovo-18.08.0.tar.xz"; }; }; calendarsupport = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/calendarsupport-18.04.3.tar.xz"; - sha256 = "14rasrmxsx4d3ap4ifihfd8nm9bydng753xi59xkx86fvxb3qg5r"; - name = "calendarsupport-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/calendarsupport-18.08.0.tar.xz"; + sha256 = "0ps4963c2wbmlwp7aks16jw2pz74fqlxarhsnjj3r339575inzw2"; + name = "calendarsupport-18.08.0.tar.xz"; }; }; cantor = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/cantor-18.04.3.tar.xz"; - sha256 = "0ix8vcjrdw1bssmhhc5a0vp8ywfrznhqpfcxvs9d1p4bxl48bblc"; - name = "cantor-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/cantor-18.08.0.tar.xz"; + sha256 = "08sqr1nxn9a24z4jicmjn9zn64xv3yyy054rzblr2h2hi3n6fqdy"; + name = "cantor-18.08.0.tar.xz"; }; }; cervisia = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/cervisia-18.04.3.tar.xz"; - sha256 = "0lbcdjjpr56vq14m8zk3fzna6mcz74dqzlkmc1zxn6gijjv89zqf"; - name = "cervisia-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/cervisia-18.08.0.tar.xz"; + sha256 = "1avc18vv2lb27w5ybiajsr65c65zpvbv43ihz4gcjv7awqf754w7"; + name = "cervisia-18.08.0.tar.xz"; }; }; dolphin = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/dolphin-18.04.3.tar.xz"; - sha256 = "1im39knramhxdpw7bsnm2f533iz81fb47lac99vq9jc3c9zn7za1"; - name = "dolphin-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/dolphin-18.08.0.tar.xz"; + sha256 = "1r3g3qssawhav3dx9a9qdd7dqcjj1ynm6ravj5wx39h4qdflrysy"; + name = "dolphin-18.08.0.tar.xz"; }; }; dolphin-plugins = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/dolphin-plugins-18.04.3.tar.xz"; - sha256 = "1fccbnr1b05sbqmfz6v09sq1v8dvbkw2jzyk8nqd9cmc2zbymwga"; - name = "dolphin-plugins-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/dolphin-plugins-18.08.0.tar.xz"; + sha256 = "1j96bkc3xah4ca3a9asplpf152dp234r2bzs5wg25b3aw7zp5siv"; + name = "dolphin-plugins-18.08.0.tar.xz"; }; }; dragon = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/dragon-18.04.3.tar.xz"; - sha256 = "1dhzbyk87xd0bm89b1rs540rrixh16z9pm26003xl640imwbwy57"; - name = "dragon-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/dragon-18.08.0.tar.xz"; + sha256 = "020vnnzd7crvrv8dbcf41h04hpr2ayrfk6ayxhxpazrzic1sxxx6"; + name = "dragon-18.08.0.tar.xz"; }; }; eventviews = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/eventviews-18.04.3.tar.xz"; - sha256 = "02v57ini7qi9y5ijljhxfsq2b5hqg9jdbgihdkq8vy2dlcg30mfd"; - name = "eventviews-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/eventviews-18.08.0.tar.xz"; + sha256 = "1ca499dzqsy2n6c0s0vrwvjykc4vd5s4m2bkn0vdg2dbyyx9fncj"; + name = "eventviews-18.08.0.tar.xz"; }; }; ffmpegthumbs = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/ffmpegthumbs-18.04.3.tar.xz"; - sha256 = "0wj403wahlirr2nv380z2s4fcgny446frv5xdxlqgg3b176ydcp6"; - name = "ffmpegthumbs-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/ffmpegthumbs-18.08.0.tar.xz"; + sha256 = "1rbfbwnyync4j15qzdhn47gksr6jm97pgkld2x3p564gi98w0vrn"; + name = "ffmpegthumbs-18.08.0.tar.xz"; }; }; filelight = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/filelight-18.04.3.tar.xz"; - sha256 = "1m02si6pz6rb8arjd50s277xnj5f8alkl8r3p8f4cgmx2gs3rymn"; - name = "filelight-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/filelight-18.08.0.tar.xz"; + sha256 = "1wx6q0gq4zlg95a93sg7zqkbaka1pcn99jsjkdncq1z4lfphppk9"; + name = "filelight-18.08.0.tar.xz"; }; }; granatier = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/granatier-18.04.3.tar.xz"; - sha256 = "0i7f4pbj43vcav9ncxznddhvy0fph0z8xv3hb1wf5rncfxbc0kh0"; - name = "granatier-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/granatier-18.08.0.tar.xz"; + sha256 = "06nzgpwvgvbh6hf5yxmcxigh3n72qa0mbiv7k56157yyvxigk62q"; + name = "granatier-18.08.0.tar.xz"; }; }; grantlee-editor = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/grantlee-editor-18.04.3.tar.xz"; - sha256 = "0796ihix37igawic7bpva1ca3hzhcz89k7aqd3pwcz220ky6y0fy"; - name = "grantlee-editor-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/grantlee-editor-18.08.0.tar.xz"; + sha256 = "06m2n5rcgp63xgnr5jdzly7fda8zx5r3ki07ldxz1xivd985zmfp"; + name = "grantlee-editor-18.08.0.tar.xz"; }; }; grantleetheme = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/grantleetheme-18.04.3.tar.xz"; - sha256 = "1n69wmxs9bsa37swxv8gl1ji6w696mxpg9g5z945il7ai6zwi8av"; - name = "grantleetheme-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/grantleetheme-18.08.0.tar.xz"; + sha256 = "1mk80hfra4nmrcb0ff3n7l33pbw6j5lypb3ip7g4c1p8qik6imfv"; + name = "grantleetheme-18.08.0.tar.xz"; }; }; gwenview = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/gwenview-18.04.3.tar.xz"; - sha256 = "187l75ppnsnl7bi9p6zyxg95qm3syhpmga6zl22ky0g9mqz6s3nx"; - name = "gwenview-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/gwenview-18.08.0.tar.xz"; + sha256 = "1nv9a7pj0h2m3wxzy03jw3pi5ps3xqvq9sx7mblq8p4klga2pcnl"; + name = "gwenview-18.08.0.tar.xz"; }; }; incidenceeditor = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/incidenceeditor-18.04.3.tar.xz"; - sha256 = "0zwrr6rgvardpxr5czh1jwrb2wvnxyfk3psgk6marr2sg5nm10km"; - name = "incidenceeditor-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/incidenceeditor-18.08.0.tar.xz"; + sha256 = "1s88i1l30b30an8lwc8sdlzfm1cvmb9n5786bs9y0jfgw01wdl7j"; + name = "incidenceeditor-18.08.0.tar.xz"; }; }; juk = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/juk-18.04.3.tar.xz"; - sha256 = "1zbh03mckj32003padxzlghpc6dqry8z72aflv873if986wzw0dk"; - name = "juk-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/juk-18.08.0.tar.xz"; + sha256 = "1lzw9ih4771vdxqngc0ja57v9y6wlgf8dbmnjax74ryi232py1d9"; + name = "juk-18.08.0.tar.xz"; }; }; k3b = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/k3b-18.04.3.tar.xz"; - sha256 = "0wh0l7f9ngyq40p506pmnb3a8irb7wzz8pcncy6br3lcgg9yx0wx"; - name = "k3b-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/k3b-18.08.0.tar.xz"; + sha256 = "1lm9140xc5mq1szyc4vkms6b3qhl4b3yn74kqp942b8k9djn17md"; + name = "k3b-18.08.0.tar.xz"; }; }; kaccounts-integration = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kaccounts-integration-18.04.3.tar.xz"; - sha256 = "0883l8dzs21h8y2xw8vxnln3m4fwp01ifncmwb7vil9yllf6c6jw"; - name = "kaccounts-integration-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kaccounts-integration-18.08.0.tar.xz"; + sha256 = "0wvqhf9br8nqqacyn6j4k2323w6nixkfzlajkmx872d31d7aqf11"; + name = "kaccounts-integration-18.08.0.tar.xz"; }; }; kaccounts-providers = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kaccounts-providers-18.04.3.tar.xz"; - sha256 = "0nvwdmmz3lajaj0p624mqi0mpnqv23npk2sbcxhc504gp25bki9i"; - name = "kaccounts-providers-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kaccounts-providers-18.08.0.tar.xz"; + sha256 = "1zxyqwdrf9pp5b1vnd8p4wz21ciavffjxd68vcjjyj8bba30c51l"; + name = "kaccounts-providers-18.08.0.tar.xz"; }; }; kaddressbook = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kaddressbook-18.04.3.tar.xz"; - sha256 = "02rqcmbcvl4brzy33vljppad3k50hxsm7g0j96wjrlaj06p2rmfl"; - name = "kaddressbook-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kaddressbook-18.08.0.tar.xz"; + sha256 = "1wgqqnikv9qyrb4nvkm7h91r1iqfkmbpdp67lcw4jkglqghnn2qc"; + name = "kaddressbook-18.08.0.tar.xz"; }; }; kajongg = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kajongg-18.04.3.tar.xz"; - sha256 = "1f16w02sqzsmjcfvqijgrvgpjmym7nf9hgc1rxldc1hwi772kcgq"; - name = "kajongg-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kajongg-18.08.0.tar.xz"; + sha256 = "0dfrwzq1p9ikff52qi50ckb769pfij7gzn61r6pdkkfjgy86364y"; + name = "kajongg-18.08.0.tar.xz"; }; }; kalarm = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kalarm-18.04.3.tar.xz"; - sha256 = "1dlf25p66kcw55vk0xmrcd900ar2wxn9416qqji711n6wnx3xqrf"; - name = "kalarm-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kalarm-18.08.0.tar.xz"; + sha256 = "0415yq61q700slmm6vskd92pc2sp1027flghgans80i29617zgaq"; + name = "kalarm-18.08.0.tar.xz"; }; }; kalarmcal = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kalarmcal-18.04.3.tar.xz"; - sha256 = "1blzbccdk3zf5fgy4n5l59c5cagy1v7rjs53npjxgmdng7lxb8kl"; - name = "kalarmcal-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kalarmcal-18.08.0.tar.xz"; + sha256 = "0ss56dy451lbbq872sarqcyapf4g6kgw78s88hgs7z5mlyj8xnll"; + name = "kalarmcal-18.08.0.tar.xz"; }; }; kalgebra = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kalgebra-18.04.3.tar.xz"; - sha256 = "0x1a24k2p02s755kmpv0zanfv7ys50kkwyvc68g76b9z1yjb02dc"; - name = "kalgebra-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kalgebra-18.08.0.tar.xz"; + sha256 = "0fv4v7xnspqjbc7x6n2gcyjssm15apszbvj4gs1w2lwlbbr3i224"; + name = "kalgebra-18.08.0.tar.xz"; }; }; kalzium = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kalzium-18.04.3.tar.xz"; - sha256 = "1lqw77xcxjkc3a1g046i1rdb0bk29p0kcnqfyjkm03kp8819gbgg"; - name = "kalzium-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kalzium-18.08.0.tar.xz"; + sha256 = "0bjpiir1xxwvhs4xgnvbhphw24iif9g4kj9zg61bqcvq5zxf821x"; + name = "kalzium-18.08.0.tar.xz"; }; }; kamera = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kamera-18.04.3.tar.xz"; - sha256 = "11b2b3fgi73f2vw97qdvh8kk92bcn7h513plcvpiv2vw1qh6bwm7"; - name = "kamera-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kamera-18.08.0.tar.xz"; + sha256 = "169vsxnpcgxws27hcap2l5wjbfyxxi30321c8r3p8fm2klvbc8nw"; + name = "kamera-18.08.0.tar.xz"; }; }; kamoso = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kamoso-18.04.3.tar.xz"; - sha256 = "0vjhdkx874v9gzm7yla7pxwiphdrf8aj21641xslf5qn4kcx55p1"; - name = "kamoso-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kamoso-18.08.0.tar.xz"; + sha256 = "1a8azx7rdbzznh9qwzg0x6w50vb5bc6cmd442j2hhdwkl15dqpwd"; + name = "kamoso-18.08.0.tar.xz"; }; }; kanagram = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kanagram-18.04.3.tar.xz"; - sha256 = "033mzwirfc7p7xphvyh9h135pq17rqnz5vw8d7rn893z1lwzm8xj"; - name = "kanagram-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kanagram-18.08.0.tar.xz"; + sha256 = "02v3xlkfphkk86y8yrw10lq7f4wc7gmh02ms2w00aqrllkpja4vn"; + name = "kanagram-18.08.0.tar.xz"; }; }; kapman = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kapman-18.04.3.tar.xz"; - sha256 = "0w6xcp5lqzlcmgyvr76mgnbnvhabzhmjmlkab6zfgrrph0w4lnba"; - name = "kapman-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kapman-18.08.0.tar.xz"; + sha256 = "03fhxn8zckidkab56fzgwai0d1ac5k3il32w881gq5z012ms013h"; + name = "kapman-18.08.0.tar.xz"; }; }; kapptemplate = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kapptemplate-18.04.3.tar.xz"; - sha256 = "0gsv6mam7jmix7wx7rq3xyqs1c0c15kcpbcj1ps6qzbf33w73crl"; - name = "kapptemplate-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kapptemplate-18.08.0.tar.xz"; + sha256 = "10fyvwxf6xmn8jdc4p3m3jpb8ykaga1jmwx2hzhf8c6a3rrcxvvb"; + name = "kapptemplate-18.08.0.tar.xz"; }; }; kate = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kate-18.04.3.tar.xz"; - sha256 = "1w1bn0qbj8hxkh9cn6zx2h6hm82y07czzzvjm6gak90wi23lbb74"; - name = "kate-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kate-18.08.0.tar.xz"; + sha256 = "1licprflzcsrfap7klr1ia2kl2z2cp16zgznphrqkkn9n6x7xz67"; + name = "kate-18.08.0.tar.xz"; }; }; katomic = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/katomic-18.04.3.tar.xz"; - sha256 = "0928xwbm7c3d0jc5zg5nkdkl7kfrsn441i40b7z2np4v13y7bf1i"; - name = "katomic-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/katomic-18.08.0.tar.xz"; + sha256 = "07d9irgqrawll18fi3b2mrjj416gpkn43bsriifkraqf8yrn3m4s"; + name = "katomic-18.08.0.tar.xz"; }; }; kbackup = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kbackup-18.04.3.tar.xz"; - sha256 = "0m4dxrlm5807azm7bvy06r0nj1pfbfy31gkl37m7pg4z9svx5hp9"; - name = "kbackup-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kbackup-18.08.0.tar.xz"; + sha256 = "14nmk7dwrmkfv7kz4r64vzy46n48g3l1iqj0937qnpbqk12yvak9"; + name = "kbackup-18.08.0.tar.xz"; }; }; kblackbox = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kblackbox-18.04.3.tar.xz"; - sha256 = "08sm7h7d16l79isqi2hwr54dsnv3lbikj1zcyq0bwngkyqr49cmh"; - name = "kblackbox-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kblackbox-18.08.0.tar.xz"; + sha256 = "0nd4nsx7yyiy1g1g4v0gaw0m6r3kb07gnn8236bch6xxy9xcdzhb"; + name = "kblackbox-18.08.0.tar.xz"; }; }; kblocks = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kblocks-18.04.3.tar.xz"; - sha256 = "1bf4d8s9xm28qn4qv2i18gwh25fi0f06h03blk7bjw9hvr7wfaja"; - name = "kblocks-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kblocks-18.08.0.tar.xz"; + sha256 = "1pnxzfp3bd089bjbdsi0iwjpw60p36lb110yb61cv0vb54g1sia1"; + name = "kblocks-18.08.0.tar.xz"; }; }; kblog = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kblog-18.04.3.tar.xz"; - sha256 = "1fh96i9y45abp4cp2bjhkldxax9qjgsxb14ahqivp2qam41rpnnz"; - name = "kblog-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kblog-18.08.0.tar.xz"; + sha256 = "00q7266lx29bfgzhfmb192l8h3qwgpj3yyfc0lykkbhjf6d9w783"; + name = "kblog-18.08.0.tar.xz"; }; }; kbounce = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kbounce-18.04.3.tar.xz"; - sha256 = "025nfdnv8ssmln0q6lwkd8ppflv2cimd1x8yf6kqh5jd5ynx73vh"; - name = "kbounce-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kbounce-18.08.0.tar.xz"; + sha256 = "0x07lxqip9l2k9mdpan03yh17ammkd1f242l2p3qq3j1s71bpznm"; + name = "kbounce-18.08.0.tar.xz"; }; }; kbreakout = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kbreakout-18.04.3.tar.xz"; - sha256 = "11pbd76h5cll7kcb7dcnhckmknj5gm0igq0w1dx2pxdpna1i4p6z"; - name = "kbreakout-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kbreakout-18.08.0.tar.xz"; + sha256 = "1jrix92p48zcpgwvfxn484bw1k8ynfacm4iww14splx2d9skj489"; + name = "kbreakout-18.08.0.tar.xz"; }; }; kbruch = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kbruch-18.04.3.tar.xz"; - sha256 = "0d888539cmhxrcyy90iqw83aa8x1w2v5r351xncqw34gfq1k1nj3"; - name = "kbruch-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kbruch-18.08.0.tar.xz"; + sha256 = "1gkij27hl847bc2jdnjqvigncdmb11spj2rsy825rsnpiqxbqv8f"; + name = "kbruch-18.08.0.tar.xz"; }; }; kcachegrind = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kcachegrind-18.04.3.tar.xz"; - sha256 = "1zdcarqgb1yxql6z3hmnmam2abg44r3z7sy33y9yqa9wimzq4w13"; - name = "kcachegrind-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kcachegrind-18.08.0.tar.xz"; + sha256 = "13nqcxh21apxpzg51alsgn34hps21nr7aqyh60kd4fbmmsxrqll0"; + name = "kcachegrind-18.08.0.tar.xz"; }; }; kcalc = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kcalc-18.04.3.tar.xz"; - sha256 = "02kadbv874azlqm1i52y680iyp29jg683cjnjw3bgh1p6la7ssrx"; - name = "kcalc-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kcalc-18.08.0.tar.xz"; + sha256 = "04bdbdyc9lky6i0dkm6w9f2k3gvr9zq5b9yc6qhl4smdiivlqjb6"; + name = "kcalc-18.08.0.tar.xz"; }; }; kcalcore = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kcalcore-18.04.3.tar.xz"; - sha256 = "1l2g8m35dahmpwnrhmq1dr7iqcdw9pg51v4q5a39ashcsvv1bpzj"; - name = "kcalcore-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kcalcore-18.08.0.tar.xz"; + sha256 = "0sdzx0ygq89np2cj22v06m9j00nwbqn97rm43nffgixwvrlf1wy5"; + name = "kcalcore-18.08.0.tar.xz"; }; }; kcalutils = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kcalutils-18.04.3.tar.xz"; - sha256 = "1mycr1nhy2b2nk2izka8ck3sfyblfjqqjqn40g3lhssn4ps2z2jb"; - name = "kcalutils-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kcalutils-18.08.0.tar.xz"; + sha256 = "12s2anmwi3q95kjl197jis90vi5gzpxs0b4xj4m6n4lzmnyjvfxl"; + name = "kcalutils-18.08.0.tar.xz"; }; }; kcharselect = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kcharselect-18.04.3.tar.xz"; - sha256 = "1yqrsiq68kzx4incb5imra7s49byln85bq047w6r7fmp2ypyxklm"; - name = "kcharselect-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kcharselect-18.08.0.tar.xz"; + sha256 = "1gfzzzk5admdclw75qhnsf3271p2lr0fgqzxvclcxppwmv5j56aq"; + name = "kcharselect-18.08.0.tar.xz"; }; }; kcolorchooser = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kcolorchooser-18.04.3.tar.xz"; - sha256 = "1ilgsgy5zdfmx8bgdsf9s9wxpl3pmgjb6jh96sy1gca0d4kbkrnv"; - name = "kcolorchooser-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kcolorchooser-18.08.0.tar.xz"; + sha256 = "1sxlx6cnpm0yfbrbk1pqaf0lsf1mgzdnkszr30hwz6z5lvvzj73l"; + name = "kcolorchooser-18.08.0.tar.xz"; }; }; kcontacts = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kcontacts-18.04.3.tar.xz"; - sha256 = "0rwh1p98hx3ybf4gxxp1dkgkrhmzli23fi9hk8m9k2mgr97yiqni"; - name = "kcontacts-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kcontacts-18.08.0.tar.xz"; + sha256 = "0cil96cd383gvqa2dw1lhaw3vi3m04y4rpjqmiapzwnn4ck0v1ii"; + name = "kcontacts-18.08.0.tar.xz"; }; }; kcron = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kcron-18.04.3.tar.xz"; - sha256 = "0m0pna8hqkk2ab78yxchyc3pjzgrb37ldkhwa5r2zwg2n9y4k0xq"; - name = "kcron-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kcron-18.08.0.tar.xz"; + sha256 = "14lkaz1b6hnpwvxnnx3mgv3fg86vm1g45fggfx25x6x72kiihhzq"; + name = "kcron-18.08.0.tar.xz"; }; }; kdav = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kdav-18.04.3.tar.xz"; - sha256 = "0m987fbbnm6xwagsmsn4x6v5zm4b7d0jzab5gi5vw97qkx9rs82h"; - name = "kdav-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kdav-18.08.0.tar.xz"; + sha256 = "13jwc4623f9mx64i7fb3ha5gwbqgfd54dirbvcyyglrzipxmgja1"; + name = "kdav-18.08.0.tar.xz"; }; }; kdebugsettings = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kdebugsettings-18.04.3.tar.xz"; - sha256 = "0c7fgfp31kj5mar2pmjnfhxb16f33xhp22iwk1vkagy07bl145r9"; - name = "kdebugsettings-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kdebugsettings-18.08.0.tar.xz"; + sha256 = "1ddqcfq2icsk2xmfr02jawdgxyydhx4yyhrfd7pk8cfw66rm23br"; + name = "kdebugsettings-18.08.0.tar.xz"; }; }; kde-dev-scripts = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kde-dev-scripts-18.04.3.tar.xz"; - sha256 = "0azf5xcnwzyqc5bwxwjnakf7vln74faxq40myhj12hhhg5vckz06"; - name = "kde-dev-scripts-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kde-dev-scripts-18.08.0.tar.xz"; + sha256 = "1glnm91wn3xdd6zqqy2p178f05z5wn3gr1i6jyqb0zkl8ansy3yi"; + name = "kde-dev-scripts-18.08.0.tar.xz"; }; }; kde-dev-utils = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kde-dev-utils-18.04.3.tar.xz"; - sha256 = "172479qp82vrlnlqnbbl01xkap6v0gva78qcbzmizww0b085q4vk"; - name = "kde-dev-utils-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kde-dev-utils-18.08.0.tar.xz"; + sha256 = "1dk510kgjgvycdyzr5mwq9z1b3xr8hlpm4ahfwlfn299gl563fwf"; + name = "kde-dev-utils-18.08.0.tar.xz"; }; }; kdeedu-data = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kdeedu-data-18.04.3.tar.xz"; - sha256 = "0qg79cv5lkpswhywcgixbmyqfbviwb3yj3nc1iwsrwn4gqff082g"; - name = "kdeedu-data-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kdeedu-data-18.08.0.tar.xz"; + sha256 = "1ph3bw4xgmgh28j9vnj9v1amgisy3f44whpwwhzin9zgzz0cw3gw"; + name = "kdeedu-data-18.08.0.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kdegraphics-mobipocket-18.04.3.tar.xz"; - sha256 = "06c8vn5ga7xkxzsashri86ic14dcpa15c79kb57p4qm168afm8vi"; - name = "kdegraphics-mobipocket-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kdegraphics-mobipocket-18.08.0.tar.xz"; + sha256 = "0p3bci612qbqnbps4g4yb2kd1rs6kx2ppcls6vpfb035c28ygf7a"; + name = "kdegraphics-mobipocket-18.08.0.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kdegraphics-thumbnailers-18.04.3.tar.xz"; - sha256 = "1p8dfmh7hi3sxlqpahkcpl06x0flf94jam85l3n8r8f00kb9rq5a"; - name = "kdegraphics-thumbnailers-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kdegraphics-thumbnailers-18.08.0.tar.xz"; + sha256 = "0dwfphz70y0g43a9nxfda78qwsv7y4llx1f51x6n8jl64kpxnijw"; + name = "kdegraphics-thumbnailers-18.08.0.tar.xz"; }; }; kdenetwork-filesharing = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kdenetwork-filesharing-18.04.3.tar.xz"; - sha256 = "1wg2c4a4p3h3i6pqisrjhicllzm3vxd3qp1sxvny54algywqyz66"; - name = "kdenetwork-filesharing-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kdenetwork-filesharing-18.08.0.tar.xz"; + sha256 = "0l5f9ffwsk0s9r87kid9k1a7j2v4lcdzbn2w4qb2pg22k92k8p67"; + name = "kdenetwork-filesharing-18.08.0.tar.xz"; }; }; kdenlive = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kdenlive-18.04.3.tar.xz"; - sha256 = "0ps33l6wq594p7x82c03hd959bmifhfwq34ghqmr6629bwpaq1cm"; - name = "kdenlive-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kdenlive-18.08.0.tar.xz"; + sha256 = "06d0viqma7kivzv3hbsiirkfhbj28mdr2nr3f5ic56381q3ps923"; + name = "kdenlive-18.08.0.tar.xz"; }; }; kdepim-addons = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kdepim-addons-18.04.3.tar.xz"; - sha256 = "04cjwql3mc1arm55v8h8r3fwrq42sa5cpfqqwwyhlpcbbh917hvv"; - name = "kdepim-addons-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kdepim-addons-18.08.0.tar.xz"; + sha256 = "05141013jdaascsb7ihbmd4f1lh1r6ah5w39wp5vky6ma35zv2l1"; + name = "kdepim-addons-18.08.0.tar.xz"; }; }; kdepim-apps-libs = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kdepim-apps-libs-18.04.3.tar.xz"; - sha256 = "1lizw9x5z9byg88s3dpj6hbx89sn8sjaywa3l79h03v5hc5wxi7l"; - name = "kdepim-apps-libs-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kdepim-apps-libs-18.08.0.tar.xz"; + sha256 = "0zpx3nilrsvgmgx5visppyx3kn2g5k8fnhfy649k6wa35p846495"; + name = "kdepim-apps-libs-18.08.0.tar.xz"; }; }; kdepim-runtime = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kdepim-runtime-18.04.3.tar.xz"; - sha256 = "16xi4i7f9hh9wgbqi4dp6vha278mhkgmxr884d0p9bpa7rcriwb5"; - name = "kdepim-runtime-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kdepim-runtime-18.08.0.tar.xz"; + sha256 = "0b1jbksxks32s8gjzrjhh4nja089j5dq75yaiil99w11f7nfpkar"; + name = "kdepim-runtime-18.08.0.tar.xz"; }; }; kdesdk-kioslaves = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kdesdk-kioslaves-18.04.3.tar.xz"; - sha256 = "0f3xjklc4h3ly6lcvaywh3gi8mlyffbhknpqn1b4g0arvvnymlsl"; - name = "kdesdk-kioslaves-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kdesdk-kioslaves-18.08.0.tar.xz"; + sha256 = "1fpg4sdbgzvlc9z7wwxxbp466fhybphvmcdpplbr7ws3588792cb"; + name = "kdesdk-kioslaves-18.08.0.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kdesdk-thumbnailers-18.04.3.tar.xz"; - sha256 = "1rq1g0wwnmp1hzid4g8b36liyl7nd8qp85cmikli6x1ph5g93zi6"; - name = "kdesdk-thumbnailers-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kdesdk-thumbnailers-18.08.0.tar.xz"; + sha256 = "047rnzn2lsbhfll0fp4vdf4jsyixg7vmpl2xyvi1y85df5nvv2pc"; + name = "kdesdk-thumbnailers-18.08.0.tar.xz"; }; }; kdf = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kdf-18.04.3.tar.xz"; - sha256 = "0nqw3ahhigsyp15r7blm3nijn6dil1awqi7y11sszl1kr3wln1nz"; - name = "kdf-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kdf-18.08.0.tar.xz"; + sha256 = "1flv6qjb936fcj5crshy26qy9y2p7j9i3hlidr9lsk81wsyjkqqg"; + name = "kdf-18.08.0.tar.xz"; }; }; kdialog = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kdialog-18.04.3.tar.xz"; - sha256 = "178xp72yd5wm5aanvkv2mxqzcganxw2z9q0aribs2x54z3ccj27c"; - name = "kdialog-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kdialog-18.08.0.tar.xz"; + sha256 = "04xhp4pdn7gv69gwydz9afml27qj9mrqz2hnrhcsf29pw3vq0hli"; + name = "kdialog-18.08.0.tar.xz"; }; }; kdiamond = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kdiamond-18.04.3.tar.xz"; - sha256 = "1ikha8fpxmcbm3kncv0jb6hzm0413w3v0yrk0y7866xdaanb5491"; - name = "kdiamond-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kdiamond-18.08.0.tar.xz"; + sha256 = "14c5i2fj9scvkqffz95lrqj49vfg7yh7gfc4s3zzg2sl91j7hwzq"; + name = "kdiamond-18.08.0.tar.xz"; }; }; keditbookmarks = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/keditbookmarks-18.04.3.tar.xz"; - sha256 = "1y0y668ablpp596x77rxblw89pfx2ak533yhdj8khlj1mhzkagiq"; - name = "keditbookmarks-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/keditbookmarks-18.08.0.tar.xz"; + sha256 = "1zsfmcyb9s782k6knlv56mrssazdid6i70g74is46s59sgfdd9fl"; + name = "keditbookmarks-18.08.0.tar.xz"; }; }; kfind = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kfind-18.04.3.tar.xz"; - sha256 = "1f0civprab0y5f76kn1zs1g9iz0xhs4p633x2jh0s2nhb79m5p4a"; - name = "kfind-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kfind-18.08.0.tar.xz"; + sha256 = "1bvln7iq2ikcrzaa53wskpqwzmndjvc84a2jdjqzirmh6pqzlf3h"; + name = "kfind-18.08.0.tar.xz"; }; }; kfloppy = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kfloppy-18.04.3.tar.xz"; - sha256 = "0q6z0ppxmllzcwz6fsjfz8qq1a12ya62j526pnfy22fvqw4qwyjw"; - name = "kfloppy-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kfloppy-18.08.0.tar.xz"; + sha256 = "1clz5651d11pm77mi57nzr274zwshx2qhglfn6jxiif9yz6s9dfp"; + name = "kfloppy-18.08.0.tar.xz"; }; }; kfourinline = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kfourinline-18.04.3.tar.xz"; - sha256 = "1img467nzvpzqr0piji76ykvz2r0ji05gp3cfpxp7vjn8mbzwc00"; - name = "kfourinline-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kfourinline-18.08.0.tar.xz"; + sha256 = "1agmzlwy4izrmi58cf08cg34h155inmws3ghp524jz1li6rqvzfr"; + name = "kfourinline-18.08.0.tar.xz"; }; }; kgeography = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kgeography-18.04.3.tar.xz"; - sha256 = "1vkyghvibnslp45pabld063f762g4g9y0l7kxs287c3fblwpj23m"; - name = "kgeography-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kgeography-18.08.0.tar.xz"; + sha256 = "0nj3lg8q84wvh1pypix619bdr9xm6s9s5vywciq8ggskqa2qrdc5"; + name = "kgeography-18.08.0.tar.xz"; }; }; kget = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kget-18.04.3.tar.xz"; - sha256 = "1j6p8rwjsb34919rlf1i236xc2r0yf5pl432bkpxrcavxvp3f565"; - name = "kget-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kget-18.08.0.tar.xz"; + sha256 = "0vpphsfgqa4h1bsj0k6lz591ymd5zy3ng86fl4l1qv36kh5b3sr4"; + name = "kget-18.08.0.tar.xz"; }; }; kgoldrunner = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kgoldrunner-18.04.3.tar.xz"; - sha256 = "1xj0269qk2pdxah5lk6cp0lgssi6qlczgsxcm97idyp3knrmnxr0"; - name = "kgoldrunner-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kgoldrunner-18.08.0.tar.xz"; + sha256 = "13i3b8z2pbvh90ykv365s30az9r33is8wp8ys33kz88z26260rsv"; + name = "kgoldrunner-18.08.0.tar.xz"; }; }; kgpg = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kgpg-18.04.3.tar.xz"; - sha256 = "1a1kc1nin0agrrqh4wysm019p02gcyj75xw0rx53db96xim1iczx"; - name = "kgpg-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kgpg-18.08.0.tar.xz"; + sha256 = "12d6vqfcrgmqajk383p9gx9l49digm51km00slwkb15yjzgsjckx"; + name = "kgpg-18.08.0.tar.xz"; }; }; khangman = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/khangman-18.04.3.tar.xz"; - sha256 = "1yi1b15kh5z24bp10af2pgl029bbbgkn8gyzh3p5jy7qrykxqxj1"; - name = "khangman-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/khangman-18.08.0.tar.xz"; + sha256 = "0vcyak1pqq894d10jn4s8948fz8py6kjhgrbvjk2ksp28fzsb1q2"; + name = "khangman-18.08.0.tar.xz"; }; }; khelpcenter = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/khelpcenter-18.04.3.tar.xz"; - sha256 = "079yjhsi9nihn792ab03rg4far8l66v6ky7dhfrvrk78rv974ww6"; - name = "khelpcenter-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/khelpcenter-18.08.0.tar.xz"; + sha256 = "1ykw91s1w5953646ylxm49bq0bjgxd8yp29r09644q12qmi1w9ay"; + name = "khelpcenter-18.08.0.tar.xz"; }; }; kidentitymanagement = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kidentitymanagement-18.04.3.tar.xz"; - sha256 = "0yz435r86vm2w3b6bwdwxn7shwafpam0fh7qs3slmdlli60wgw8z"; - name = "kidentitymanagement-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kidentitymanagement-18.08.0.tar.xz"; + sha256 = "1rrdxbil0z0vmv0h0d6jdlwa3sfs3nncq39wmydhwx09phk7db85"; + name = "kidentitymanagement-18.08.0.tar.xz"; }; }; kig = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kig-18.04.3.tar.xz"; - sha256 = "0d459jkpc5x54w4gsrny7sx2103y5kpx6hm0zfyq7fiq1vsy57r4"; - name = "kig-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kig-18.08.0.tar.xz"; + sha256 = "0kgsar7sp3a7x72gnagi2hwajbl1yaaj493qjnwzlwidjjrlzmhb"; + name = "kig-18.08.0.tar.xz"; }; }; kigo = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kigo-18.04.3.tar.xz"; - sha256 = "1w4z04h072c7kf190r8h50rv3q7h6fwqcmckn83mfi9z0lbr9mqc"; - name = "kigo-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kigo-18.08.0.tar.xz"; + sha256 = "1ws0diq3kb8f15v30cj0hc0ii4d14dca7fb3p8vvm8r4ly7gqbdr"; + name = "kigo-18.08.0.tar.xz"; }; }; killbots = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/killbots-18.04.3.tar.xz"; - sha256 = "0vi2i1zaqfnni6608j46ppxsmzi44wcawbpp0l8cdb8bgbjbd1xd"; - name = "killbots-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/killbots-18.08.0.tar.xz"; + sha256 = "165g1zll7wq6gyz1lzaf1x17j2nagd66lj015qxifjpn9fd475mm"; + name = "killbots-18.08.0.tar.xz"; }; }; kimagemapeditor = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kimagemapeditor-18.04.3.tar.xz"; - sha256 = "1cdgfb4r4r3xpyw1dbk1alfyzgqdi718c2nrg30a1g8f450zh2zb"; - name = "kimagemapeditor-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kimagemapeditor-18.08.0.tar.xz"; + sha256 = "1r3hngzvidv1yz7kd7l8l78gqdhjvw9smciv1vkzf7dk9qarlyfq"; + name = "kimagemapeditor-18.08.0.tar.xz"; }; }; kimap = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kimap-18.04.3.tar.xz"; - sha256 = "13k46xna99gg5h445xxkipv3dhyi8d1daj6c6kf28x8lvwrxpf1c"; - name = "kimap-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kimap-18.08.0.tar.xz"; + sha256 = "12lslmprwmibijlpwng4acmmhdfhm1dgvqsazbyvsr8jagkryxmq"; + name = "kimap-18.08.0.tar.xz"; }; }; kio-extras = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kio-extras-18.04.3.tar.xz"; - sha256 = "0k034a684wajs7b0j9vhkhd6aabn5b34y050m0s9xlnmi6xk2agj"; - name = "kio-extras-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kio-extras-18.08.0.tar.xz"; + sha256 = "1k5azz26zwsflnsgv4r0i8z8jph060wpksyqfpkz0vfsf3lv0k3n"; + name = "kio-extras-18.08.0.tar.xz"; }; }; kiriki = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kiriki-18.04.3.tar.xz"; - sha256 = "1vz9br7qi4amcpp1g0lxn90822n4da9n4svxm2inj70p0mr59bpf"; - name = "kiriki-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kiriki-18.08.0.tar.xz"; + sha256 = "1fciiq490iwcz86g9pqp8g0s40zf7a3zan132iqmscpl71hsv01b"; + name = "kiriki-18.08.0.tar.xz"; }; }; kiten = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kiten-18.04.3.tar.xz"; - sha256 = "1k21pwxg4wb6jph9a6srgas55xxfkix66qqz4hrpnapc7c18qh6p"; - name = "kiten-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kiten-18.08.0.tar.xz"; + sha256 = "1gzgfj0p0s5yjhwx6hldc8s0cs6p2bn5gd8sy29sicg13wjvhkmj"; + name = "kiten-18.08.0.tar.xz"; + }; + }; + kitinerary = { + version = "18.08.0"; + src = fetchurl { + url = "${mirror}/stable/applications/18.08.0/src/kitinerary-18.08.0.tar.xz"; + sha256 = "14jwlkfy9z6q2pnjmlcy5gihc75n6qnsck05zycs4qsxa4srpn0l"; + name = "kitinerary-18.08.0.tar.xz"; }; }; kjumpingcube = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kjumpingcube-18.04.3.tar.xz"; - sha256 = "0927j5k4pk03j2a7zf07w0594g5dagcb2hraf7b8dpjpzqxrjpv9"; - name = "kjumpingcube-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kjumpingcube-18.08.0.tar.xz"; + sha256 = "001a2ayl74hi89j8i3553qx0cs8w7f4myskq3qa01rg3w4pb3wl2"; + name = "kjumpingcube-18.08.0.tar.xz"; }; }; kldap = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kldap-18.04.3.tar.xz"; - sha256 = "1vjwial1v15f30bsjsi9z6hyr7a833z5hi6d2wim1cc7h1cl1p2v"; - name = "kldap-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kldap-18.08.0.tar.xz"; + sha256 = "1825146vi1lq1383qmn8ix70d2rc2cfwp95vpn4divf9aqwmc4x0"; + name = "kldap-18.08.0.tar.xz"; }; }; kleopatra = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kleopatra-18.04.3.tar.xz"; - sha256 = "0v70rqag7ljgcmny1fa6hlhmsc1g6965gh39gmcz1li61k6hb1ib"; - name = "kleopatra-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kleopatra-18.08.0.tar.xz"; + sha256 = "1wwjn2p2vblr6fdfcy1s5gf3h5cnclc4lj5vsi5cxyp7d86ij49c"; + name = "kleopatra-18.08.0.tar.xz"; }; }; klettres = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/klettres-18.04.3.tar.xz"; - sha256 = "0hky4wallpi2a8klwrmc2ln9lh5d3cnvdrn7kmw6prb7j7pwnm6g"; - name = "klettres-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/klettres-18.08.0.tar.xz"; + sha256 = "1g84swzlynyl7r2ln52n7w9q0yf6540dd9hj3j0zsp1y2hb9fns8"; + name = "klettres-18.08.0.tar.xz"; }; }; klickety = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/klickety-18.04.3.tar.xz"; - sha256 = "0d53d4ajh1lpban2jp06bjhrvrmg2fl7jg40mdga9wwrv8g01bs1"; - name = "klickety-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/klickety-18.08.0.tar.xz"; + sha256 = "1jrxabmnv0s38i255x7xycn12fgpkmr4p1y0ydk5x98zrv4vn8y0"; + name = "klickety-18.08.0.tar.xz"; }; }; klines = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/klines-18.04.3.tar.xz"; - sha256 = "0hz3id6sf85cdram42niqzrpynnx8xc4bj7imnl5dylhwdbxphhw"; - name = "klines-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/klines-18.08.0.tar.xz"; + sha256 = "14ks53xh6hhlrmiqa7a1f7z42i035qw3v72dpbc8bw20vg53bzpy"; + name = "klines-18.08.0.tar.xz"; }; }; kmag = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kmag-18.04.3.tar.xz"; - sha256 = "00rs414p40002y68py1bdf08xcdib3x9zsinkv1iq07mbmr6smb1"; - name = "kmag-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kmag-18.08.0.tar.xz"; + sha256 = "00ni6clpgwcr6b2yanmgplsb5jqmqxjiymd3572fkj7q8m17ak7f"; + name = "kmag-18.08.0.tar.xz"; }; }; kmahjongg = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kmahjongg-18.04.3.tar.xz"; - sha256 = "05bzk6rsfvpis0gqrxqhlwc77jclk6xhljlzyhs07qbm3ii7jmpc"; - name = "kmahjongg-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kmahjongg-18.08.0.tar.xz"; + sha256 = "0lflx8jxk2yv7bsywwmbk5l54gyhbyv65996fg82z6lw9hrr5wrb"; + name = "kmahjongg-18.08.0.tar.xz"; }; }; kmail = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kmail-18.04.3.tar.xz"; - sha256 = "09a2s8w5i80x7h1rigl5a642fqp2xsmv53qm4hfajawn66mqfyz5"; - name = "kmail-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kmail-18.08.0.tar.xz"; + sha256 = "1xj2z4ix9zba6k3cdnakr7f0nfij1z925j3vp0gimkgyvbcb28vr"; + name = "kmail-18.08.0.tar.xz"; }; }; kmail-account-wizard = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kmail-account-wizard-18.04.3.tar.xz"; - sha256 = "09g4r10vbkzz9gab4ihz95bah7qba10zbm57m8wdjbfr4nxm09sc"; - name = "kmail-account-wizard-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kmail-account-wizard-18.08.0.tar.xz"; + sha256 = "1hc6zqys2qncljvsl9j48ns77kkq5zabj5a2kzg953dgcdv5x25r"; + name = "kmail-account-wizard-18.08.0.tar.xz"; }; }; kmailtransport = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kmailtransport-18.04.3.tar.xz"; - sha256 = "0anmzg87amrxig58ax4jqv7m976cm5x8dr3cwcxwv5mwgp9zczz2"; - name = "kmailtransport-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kmailtransport-18.08.0.tar.xz"; + sha256 = "0dfws0pzq3jf1h6j5qzjm96fz1ci4v57j4s9fbry10vyn4racpq8"; + name = "kmailtransport-18.08.0.tar.xz"; }; }; kmbox = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kmbox-18.04.3.tar.xz"; - sha256 = "1mdshr9xll1sw5dr99jl4rfcwvghj4c2f39fs4x4c72dnkrijrw5"; - name = "kmbox-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kmbox-18.08.0.tar.xz"; + sha256 = "11dh1lgjhiy4bvpvrk1rw23fgjil45ch3lazqc4jp21d1skrr1v4"; + name = "kmbox-18.08.0.tar.xz"; }; }; kmime = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kmime-18.04.3.tar.xz"; - sha256 = "1gf6a9kn88jnqrj7kj556yjk25anlaqcz8xrlffvg7b1y813wpcq"; - name = "kmime-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kmime-18.08.0.tar.xz"; + sha256 = "0kci9b2c67hzbl4hjwkkzk9j7g1l5wy1d8qrm1jwk8s7ccndindw"; + name = "kmime-18.08.0.tar.xz"; }; }; kmines = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kmines-18.04.3.tar.xz"; - sha256 = "0659cxj89mb1gd7ikxqrghb3ylp8wsp07jcp2hbj842zmgy0wl65"; - name = "kmines-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kmines-18.08.0.tar.xz"; + sha256 = "0z0fidlcp0kf9vmdgfyzrwi9yk5mfwhkzlqlbfy1631xisz158yn"; + name = "kmines-18.08.0.tar.xz"; }; }; kmix = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kmix-18.04.3.tar.xz"; - sha256 = "0gcfy4p4csxdqscyclm3z5ahbrlpyrlbw8p7kci6h0gjpv605fv1"; - name = "kmix-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kmix-18.08.0.tar.xz"; + sha256 = "084l5dpms26jwd894xnqr054hxjzlxcp2wm2rq37y3cbriia2xgh"; + name = "kmix-18.08.0.tar.xz"; }; }; kmousetool = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kmousetool-18.04.3.tar.xz"; - sha256 = "106hqam2fhnhdzvsb79171v3fjw8rlcb04j9w5xs7q3j9avwk044"; - name = "kmousetool-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kmousetool-18.08.0.tar.xz"; + sha256 = "0lcr8hpflaw5lrfydwi5sf069hfb19qifb7wh7qxh7j1b2z8w4gf"; + name = "kmousetool-18.08.0.tar.xz"; }; }; kmouth = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kmouth-18.04.3.tar.xz"; - sha256 = "0hffqqcz4j3mp4vp5kc280ywq36r3y80q24i37swiqdd3fzyrlzq"; - name = "kmouth-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kmouth-18.08.0.tar.xz"; + sha256 = "0naqn9pl7jldfna9l3i3kdv8rkw0nky4ppsvqghlrb9jf4dy8lfm"; + name = "kmouth-18.08.0.tar.xz"; }; }; kmplot = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kmplot-18.04.3.tar.xz"; - sha256 = "0j9ax6b2v0w7crjy8c9a84a2zcph7zx0ap0wwq7lnw45xwhynllv"; - name = "kmplot-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kmplot-18.08.0.tar.xz"; + sha256 = "0lvw351iz2gdzkphrf8hxgqbjqi4pqvxqk2zjbly4fzwbgk261bd"; + name = "kmplot-18.08.0.tar.xz"; }; }; knavalbattle = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/knavalbattle-18.04.3.tar.xz"; - sha256 = "1i6c5i0r2icpbn010k5jc6cb45ha7dgqhhvbbcgcsdqjcq042czx"; - name = "knavalbattle-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/knavalbattle-18.08.0.tar.xz"; + sha256 = "0b21z3qqhsyafsa6rx9mc560hrw0046npqjmi5jpmczl6y9mr78q"; + name = "knavalbattle-18.08.0.tar.xz"; }; }; knetwalk = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/knetwalk-18.04.3.tar.xz"; - sha256 = "1r17c8hfj6qh1rx7apmpmb0cca0gsnq7jvjhz98if3kyy9m1fk50"; - name = "knetwalk-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/knetwalk-18.08.0.tar.xz"; + sha256 = "04yfxxihfdqhrs126796k498v8valhd73q2bagcx59lj7iymxszj"; + name = "knetwalk-18.08.0.tar.xz"; }; }; knotes = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/knotes-18.04.3.tar.xz"; - sha256 = "02lx0vm34kcr6mix5d1i0dcaf229yafx58b915y3vjwml8n5v17w"; - name = "knotes-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/knotes-18.08.0.tar.xz"; + sha256 = "0dvjafmf57z10lx8fb4y4na73qq3dfmqfa2w01b3sdzns0nzaqig"; + name = "knotes-18.08.0.tar.xz"; }; }; kolf = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kolf-18.04.3.tar.xz"; - sha256 = "1k3z3nk6bgl9rlwjvc9jxwpyhd88amc2l1yg8f4rs6w0pbaldmwb"; - name = "kolf-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kolf-18.08.0.tar.xz"; + sha256 = "0bcd4k7v5sid98h95xbqm5l0dcjkv367mdgzhr6yizlqpyg6c132"; + name = "kolf-18.08.0.tar.xz"; }; }; kollision = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kollision-18.04.3.tar.xz"; - sha256 = "11czb7j0dzla5c9c4nk1qb5ljgci7x6ggyn6ffm2wvff4lm880m8"; - name = "kollision-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kollision-18.08.0.tar.xz"; + sha256 = "029pwgwmsm9m284m1sbi2zzhhwbz6rlq68jd783ir6cq2z3llvjp"; + name = "kollision-18.08.0.tar.xz"; }; }; kolourpaint = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kolourpaint-18.04.3.tar.xz"; - sha256 = "17jkyih99pqs2nqsf0rq35iks3y2kmnya71ihnw8930qgjakggxp"; - name = "kolourpaint-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kolourpaint-18.08.0.tar.xz"; + sha256 = "0p08xc8ai1cllbdwmv46xzcpv70mn6zwd4f62xsh71hhpg8fbqpi"; + name = "kolourpaint-18.08.0.tar.xz"; }; }; kompare = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kompare-18.04.3.tar.xz"; - sha256 = "1csjhnsic7h943kjrzixc0k79kn6w9ck29kw9qaz29khpi5bmn6v"; - name = "kompare-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kompare-18.08.0.tar.xz"; + sha256 = "0md4qw29q5mnsz0k4a3dl6fdgff33w4kg59qy02kp3pvqav9r1zx"; + name = "kompare-18.08.0.tar.xz"; }; }; konqueror = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/konqueror-18.04.3.tar.xz"; - sha256 = "08sw3vz57klr6wp1k2kjfj8hj02k4si39ncngvy005x2dkprkgc2"; - name = "konqueror-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/konqueror-18.08.0.tar.xz"; + sha256 = "12zw4bgmmc35vghi8phm93x9lmhfgpxxfvz0grxa4gxcxqjyzzcq"; + name = "konqueror-18.08.0.tar.xz"; }; }; konquest = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/konquest-18.04.3.tar.xz"; - sha256 = "0pd3yxj3fmjp9p4gm4a3r107cx0rwgqg2pnwyfrdlrvppcc4is0g"; - name = "konquest-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/konquest-18.08.0.tar.xz"; + sha256 = "0pvx4ss8dpxd6q4jnxim3pwyxjvhcy1xihn7s3513hy0h4wabv6s"; + name = "konquest-18.08.0.tar.xz"; }; }; konsole = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/konsole-18.04.3.tar.xz"; - sha256 = "00m0z9fjprnnnp7blr9nyz8s8xb781ry7qxd68c261ar5fajys1p"; - name = "konsole-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/konsole-18.08.0.tar.xz"; + sha256 = "1p119ky78zxi8l08xnfklrg21c6124q1fbjvbybf6l0qq3mzwy77"; + name = "konsole-18.08.0.tar.xz"; }; }; kontact = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kontact-18.04.3.tar.xz"; - sha256 = "1h8a9mdldq8hai3f2al56rs063s46lnsnmgbvd8dyk51si084aab"; - name = "kontact-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kontact-18.08.0.tar.xz"; + sha256 = "0027zinl9s92vxhlzv9mak9fgzygqw5ml6i6x659pl3mc889fr7j"; + name = "kontact-18.08.0.tar.xz"; }; }; kontactinterface = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kontactinterface-18.04.3.tar.xz"; - sha256 = "194g0y5kkax4c9ivc5yll5rqzpvd97s897agkzmr05wvk82gjrz6"; - name = "kontactinterface-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kontactinterface-18.08.0.tar.xz"; + sha256 = "0mcvpmvczqpsqj83vqfv9zwz7jj3az65nq45xg1l476j8sva278n"; + name = "kontactinterface-18.08.0.tar.xz"; }; }; kopete = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kopete-18.04.3.tar.xz"; - sha256 = "0c2s3qq9k4654q38q4gy6j3mkj1nnrc6jb4sk04hz3w5d9i6c82b"; - name = "kopete-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kopete-18.08.0.tar.xz"; + sha256 = "0g79zv187pj7c2p33qsnkpmvrxpcx1iiy9lcrdz3acgzgvpfh5dk"; + name = "kopete-18.08.0.tar.xz"; }; }; korganizer = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/korganizer-18.04.3.tar.xz"; - sha256 = "1bcmqki7491g8q9gaif346afrsn5k2zxp6xzwllaifxrbckzqaj1"; - name = "korganizer-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/korganizer-18.08.0.tar.xz"; + sha256 = "0qifd6l93jjj7sxf3kllm3dq13p738zlvbpxg24wzc3gllyq4ip1"; + name = "korganizer-18.08.0.tar.xz"; }; }; kpat = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kpat-18.04.3.tar.xz"; - sha256 = "0adx0720k296k0fzzsv4k32i0yii9snczsiir8gl3jj5ngk5hias"; - name = "kpat-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kpat-18.08.0.tar.xz"; + sha256 = "0dm9alimp2ibf5fpgbafiaz3lh9irvq2539jp6l61jqcv7801fml"; + name = "kpat-18.08.0.tar.xz"; }; }; kpimtextedit = { - version = "18.04.3"; + version = "18.08.0"; + src = fetchurl { + url = "${mirror}/stable/applications/18.08.0/src/kpimtextedit-18.08.0.tar.xz"; + sha256 = "0ciivvpfcsjzpc620zalx7k5ybh6bf53y19lvr1dgad29j6j871q"; + name = "kpimtextedit-18.08.0.tar.xz"; + }; + }; + kpkpass = { + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kpimtextedit-18.04.3.tar.xz"; - sha256 = "0fqlf4l05iybdnrzpp48wrg7qj9x303cfq2105d3p2zvwwkyrr41"; - name = "kpimtextedit-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kpkpass-18.08.0.tar.xz"; + sha256 = "1wgycyx8nn9kaqbxvlps44g1nzr2qpr6mb7m22q5qcykly0i5wzl"; + name = "kpkpass-18.08.0.tar.xz"; }; }; kqtquickcharts = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kqtquickcharts-18.04.3.tar.xz"; - sha256 = "0zjy05kvl30j8nlwfpqyf4qqimbfagk9s3f92b9bxk7njnxjzhd9"; - name = "kqtquickcharts-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kqtquickcharts-18.08.0.tar.xz"; + sha256 = "0ykf5xfzjsanj5rmn5qrhhqfb93i19mrwzsqq8pngaimcqb70cdk"; + name = "kqtquickcharts-18.08.0.tar.xz"; }; }; krdc = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/krdc-18.04.3.tar.xz"; - sha256 = "0r57nfskwn1gwm4ig7z6cv04y4rhy5mq9bdd4ci8d9gq0s1rc13x"; - name = "krdc-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/krdc-18.08.0.tar.xz"; + sha256 = "03j3cn088mr8cd6vjkv19k5ayrhgh9mbyr0lkj9rr16z6861avmr"; + name = "krdc-18.08.0.tar.xz"; }; }; kreversi = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kreversi-18.04.3.tar.xz"; - sha256 = "09zcl0vzzwc4crzlrrvi7kmbk9xh0h5hy9yyv9bk661pw66nv980"; - name = "kreversi-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kreversi-18.08.0.tar.xz"; + sha256 = "18qqfaxb34b0z6cdz9h2z0hkmr1vv85j7ra8gzhy35k40dgvhgqm"; + name = "kreversi-18.08.0.tar.xz"; }; }; krfb = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/krfb-18.04.3.tar.xz"; - sha256 = "0i36lj7lggl83khds009wp12d21rin60ai2a24isyplvcq8p2slk"; - name = "krfb-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/krfb-18.08.0.tar.xz"; + sha256 = "1zaran8lbhrnlr2nz12xis4b7q0krynzqyix14diiiysrfsmnwqm"; + name = "krfb-18.08.0.tar.xz"; }; }; kross-interpreters = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kross-interpreters-18.04.3.tar.xz"; - sha256 = "04wrary04sznjaw2n3d2fjnnhzf1fykj9l3r9dry1irj9ysx45yd"; - name = "kross-interpreters-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kross-interpreters-18.08.0.tar.xz"; + sha256 = "1g3fgva8h0s1ld38m38iawjr04bsh572lazizr9a460nwk60nmsi"; + name = "kross-interpreters-18.08.0.tar.xz"; }; }; kruler = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kruler-18.04.3.tar.xz"; - sha256 = "014c0m388kjfpynvh14m463jl3vj288lcdiz3xfphlmxqlhhvhcd"; - name = "kruler-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kruler-18.08.0.tar.xz"; + sha256 = "0fv3186xhyvfi9zz48r4facy9x8m8y53qfl7x1rs0y1hq2d2k3nh"; + name = "kruler-18.08.0.tar.xz"; }; }; kshisen = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kshisen-18.04.3.tar.xz"; - sha256 = "04xzg2v957wx68wmf1ri30vajd5pr9xz2fh7f5xg394m134cxc9r"; - name = "kshisen-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kshisen-18.08.0.tar.xz"; + sha256 = "11q717m7m37902bchbgpdgsward4w2c9bwjns3xs4c3pyx1w7mg4"; + name = "kshisen-18.08.0.tar.xz"; }; }; ksirk = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/ksirk-18.04.3.tar.xz"; - sha256 = "1p08f9w3vi1z31fydnvp9d069z82kv8fn9lwlw1mxkqaggv54jhs"; - name = "ksirk-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/ksirk-18.08.0.tar.xz"; + sha256 = "1wxf1g5vfcnvz9n28ja17iawc1997vhz6p75bq84jmls51pxjkzn"; + name = "ksirk-18.08.0.tar.xz"; }; }; ksmtp = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/ksmtp-18.04.3.tar.xz"; - sha256 = "0p8rnqpb0q26iwjk4k9pj4krfqipijg90bv0hd4wa3d2plkvzmcy"; - name = "ksmtp-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/ksmtp-18.08.0.tar.xz"; + sha256 = "13jkxrlycgk9qqw5v16i1rax8lwany7fd1n6m2875saxmjm9qi0s"; + name = "ksmtp-18.08.0.tar.xz"; }; }; ksnakeduel = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/ksnakeduel-18.04.3.tar.xz"; - sha256 = "1mhgdd0hnv0y36af3rikdibc0hgp1sjdxbx543vlxi25l8dfsw6q"; - name = "ksnakeduel-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/ksnakeduel-18.08.0.tar.xz"; + sha256 = "0ixbv4b9ngb82f4s58hzjvmmifkjy5v59g76kpb5dv9nqb9x8833"; + name = "ksnakeduel-18.08.0.tar.xz"; }; }; kspaceduel = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kspaceduel-18.04.3.tar.xz"; - sha256 = "06mzg1hmhwisd0vc99qdrxp7jgay4cqda2x142i2a1v5qs48ilk4"; - name = "kspaceduel-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kspaceduel-18.08.0.tar.xz"; + sha256 = "0qw3lkiwwrzicyqqr6fs78ljhn5z4vsvcvcn9l5j18qkmi2fd2dk"; + name = "kspaceduel-18.08.0.tar.xz"; }; }; ksquares = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/ksquares-18.04.3.tar.xz"; - sha256 = "1w4x8br9g5dlw7mc8n118lqq0g5p4n2lqijp17xcgznbllivf79g"; - name = "ksquares-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/ksquares-18.08.0.tar.xz"; + sha256 = "01g9jkd5cq1ga9k9brr8yiny3idmj88c4n1cm2qi10d9n1vd4fja"; + name = "ksquares-18.08.0.tar.xz"; }; }; ksudoku = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/ksudoku-18.04.3.tar.xz"; - sha256 = "095i8s3ggl51xncra66vhdrz494r5q55d57j53pqnc4cwnfl5glj"; - name = "ksudoku-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/ksudoku-18.08.0.tar.xz"; + sha256 = "0fc7d6bs0ba51nypx4bn5hylfx9h6xlam7wjw1i7fr2yr8fdv9id"; + name = "ksudoku-18.08.0.tar.xz"; }; }; ksystemlog = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/ksystemlog-18.04.3.tar.xz"; - sha256 = "117gxwlimqp7sslrkaf6jazhprplqqkbqrfrjdwm54l84dldfi34"; - name = "ksystemlog-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/ksystemlog-18.08.0.tar.xz"; + sha256 = "1m5y8rawhi03vnpdw75npdd7hc830a5b2kkrz1112g959psv00ah"; + name = "ksystemlog-18.08.0.tar.xz"; }; }; kteatime = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kteatime-18.04.3.tar.xz"; - sha256 = "12fikkj87yz8xj8l3girsfqkbngvg0jjw661hihgnjz6jg7jdq0k"; - name = "kteatime-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kteatime-18.08.0.tar.xz"; + sha256 = "18pm15s7q4xwzi61m2l8k6qplf948lq36iv9nh5sf4p6vp6syay2"; + name = "kteatime-18.08.0.tar.xz"; }; }; ktimer = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/ktimer-18.04.3.tar.xz"; - sha256 = "1bf3r4kfg85hgmsszpz57fhws7mw79wxkb6qigfcq4vv165axjd2"; - name = "ktimer-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/ktimer-18.08.0.tar.xz"; + sha256 = "0g81daqdmfsmbnzjq74zxrbnjxjbi6nd6kl0acmjg7832l30m4js"; + name = "ktimer-18.08.0.tar.xz"; }; }; ktnef = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/ktnef-18.04.3.tar.xz"; - sha256 = "08zdl982gkk619gi05xvs28q26xjsrvawgpbmrmkwikj5m80asf4"; - name = "ktnef-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/ktnef-18.08.0.tar.xz"; + sha256 = "007gjmjyi5r8110w4fv7n5gl67ddn1dg0pb119qr3r82iba8qiqi"; + name = "ktnef-18.08.0.tar.xz"; }; }; ktouch = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/ktouch-18.04.3.tar.xz"; - sha256 = "1j6byxhprwrsd4bb3g3mwps5v1cc73h447dxzrd84ghk3jv687jl"; - name = "ktouch-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/ktouch-18.08.0.tar.xz"; + sha256 = "0pgckza5cn52aapa39d12dighx698jzb877iiml2n9870whifkms"; + name = "ktouch-18.08.0.tar.xz"; }; }; ktp-accounts-kcm = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/ktp-accounts-kcm-18.04.3.tar.xz"; - sha256 = "0dlgammp5j1idlmv69dq54fyc2dm6cd2gv5spimydznxp5bcfl3v"; - name = "ktp-accounts-kcm-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/ktp-accounts-kcm-18.08.0.tar.xz"; + sha256 = "16k7dprj75g2lgsmnnmn9n6zgwnp64zsjci5y2vk0cp8ndlr1j54"; + name = "ktp-accounts-kcm-18.08.0.tar.xz"; }; }; ktp-approver = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/ktp-approver-18.04.3.tar.xz"; - sha256 = "0f2y86khv4ps2xnh8aizf3q52s0c1nxnvkrpii5qm9vk8agp8yfz"; - name = "ktp-approver-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/ktp-approver-18.08.0.tar.xz"; + sha256 = "1nh75yzprhbn0af33qsrs81vxk1brlxjf1jal7p8fpr47qdwhzvd"; + name = "ktp-approver-18.08.0.tar.xz"; }; }; ktp-auth-handler = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/ktp-auth-handler-18.04.3.tar.xz"; - sha256 = "07apdk2zf0mqii8khphf6whblwals8p1yqjs6vxry89mmr5znni7"; - name = "ktp-auth-handler-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/ktp-auth-handler-18.08.0.tar.xz"; + sha256 = "0akmbrn9z0ind3jmz2azixyvr9glai66j6dynszn59svvjxp0fiz"; + name = "ktp-auth-handler-18.08.0.tar.xz"; }; }; ktp-call-ui = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/ktp-call-ui-18.04.3.tar.xz"; - sha256 = "1zkvkskfparc1bfvn1xhymz2pm50iws6k098bxrz86a6cgrqxw75"; - name = "ktp-call-ui-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/ktp-call-ui-18.08.0.tar.xz"; + sha256 = "0z23vcvz6nyc6klqqys4ivh33j21kww4fgcm5dvvlf940cc9gr3h"; + name = "ktp-call-ui-18.08.0.tar.xz"; }; }; ktp-common-internals = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/ktp-common-internals-18.04.3.tar.xz"; - sha256 = "1j5avk09xakh0g84lnxz3p11fhjb5lf1sxic423hamwgwlr181nl"; - name = "ktp-common-internals-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/ktp-common-internals-18.08.0.tar.xz"; + sha256 = "1sj1k8x8d2lk8xsqckjzg6zz01gqh3yj52yar56lngn1cjnnf6ak"; + name = "ktp-common-internals-18.08.0.tar.xz"; }; }; ktp-contact-list = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/ktp-contact-list-18.04.3.tar.xz"; - sha256 = "0zyl1d4k74lrdx3hsib7miijjk2zj3x1yakryrym4lk3pmllrd78"; - name = "ktp-contact-list-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/ktp-contact-list-18.08.0.tar.xz"; + sha256 = "0yx64rz6k5dv6s4wsadjqc0fcx6j7blhy15cbnh8r2pbwf0ilk2w"; + name = "ktp-contact-list-18.08.0.tar.xz"; }; }; ktp-contact-runner = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/ktp-contact-runner-18.04.3.tar.xz"; - sha256 = "1nzz88m8mb2xwpl5fzh7srslzrci2265n759kczjlzj7w1wym504"; - name = "ktp-contact-runner-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/ktp-contact-runner-18.08.0.tar.xz"; + sha256 = "0i4zc6bksnb4iajz91wbw140dh7p0rg3hzhi563pn3siy9id442s"; + name = "ktp-contact-runner-18.08.0.tar.xz"; }; }; ktp-desktop-applets = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/ktp-desktop-applets-18.04.3.tar.xz"; - sha256 = "1y0g3922km9a71splnx91nhvpwi2gj1jqxbzzsqsckblh2gzf0m3"; - name = "ktp-desktop-applets-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/ktp-desktop-applets-18.08.0.tar.xz"; + sha256 = "0i5sniidcgkvq2scf76pkshrj89gvkzjjslgqaxvqrgvyagsaski"; + name = "ktp-desktop-applets-18.08.0.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/ktp-filetransfer-handler-18.04.3.tar.xz"; - sha256 = "165mfk1ld1py2rp3j0xah1zi2f5b73ic53a043mmhs4lws5fw3f9"; - name = "ktp-filetransfer-handler-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/ktp-filetransfer-handler-18.08.0.tar.xz"; + sha256 = "15mifrbxxr8lvq7nflxwsz46ywnqmjv1d3irzq1xfcpl47907qhg"; + name = "ktp-filetransfer-handler-18.08.0.tar.xz"; }; }; ktp-kded-module = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/ktp-kded-module-18.04.3.tar.xz"; - sha256 = "1z2103q6lx4f51ipm2kmla5h8civhf0wy0yk0zg4akynshqjhr6n"; - name = "ktp-kded-module-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/ktp-kded-module-18.08.0.tar.xz"; + sha256 = "12rnnf2nm2kn2904b475qh9ql50yx583jga31389l012whm4gqqf"; + name = "ktp-kded-module-18.08.0.tar.xz"; }; }; ktp-send-file = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/ktp-send-file-18.04.3.tar.xz"; - sha256 = "1d1ha9nigipr7khaymp7jiixj27d18qk7ghf1zaywyrrf2sav286"; - name = "ktp-send-file-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/ktp-send-file-18.08.0.tar.xz"; + sha256 = "0m8p8w4hqanccf7g0za5yh30z2nxv8dxi09mg1fniypqaw4cp2n7"; + name = "ktp-send-file-18.08.0.tar.xz"; }; }; ktp-text-ui = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/ktp-text-ui-18.04.3.tar.xz"; - sha256 = "0xglzifmqcrjxd3iz0v8a0rv2kaldsz12rn0hjh905j53s69xqic"; - name = "ktp-text-ui-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/ktp-text-ui-18.08.0.tar.xz"; + sha256 = "04ygny9m823h30hi5qgjz1nk7dj44hdqa9ga0ai9cazxnavvsx57"; + name = "ktp-text-ui-18.08.0.tar.xz"; }; }; ktuberling = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/ktuberling-18.04.3.tar.xz"; - sha256 = "0a7i3k386nr5gmmgpqp2gjpca8qh6w30x69w2w46mcw9qffm3s4b"; - name = "ktuberling-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/ktuberling-18.08.0.tar.xz"; + sha256 = "1m9mdv7hdsrnzjcdnmqrl82mafa9psbr5k7b6m3llh95f61b4jpn"; + name = "ktuberling-18.08.0.tar.xz"; }; }; kturtle = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kturtle-18.04.3.tar.xz"; - sha256 = "1iaklkzfcrqhxh7jwgxg8kvpcxhia8l0hm6q14wc4nf3k72cgz8l"; - name = "kturtle-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kturtle-18.08.0.tar.xz"; + sha256 = "0mwhnsbwj92zrgyjdfi18pxsfyaxa8pzdmh5k20m0jrh76gkhjr0"; + name = "kturtle-18.08.0.tar.xz"; }; }; kubrick = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kubrick-18.04.3.tar.xz"; - sha256 = "1da3n4sgpx1k90cn90558yjfqp8wyirvmi1dzicy8l0jfl4rwr1d"; - name = "kubrick-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kubrick-18.08.0.tar.xz"; + sha256 = "1affzpwq45r1cqb9ra8w24rrszvvzxiik4ng6jf54dik8sk7wrnn"; + name = "kubrick-18.08.0.tar.xz"; }; }; kwalletmanager = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kwalletmanager-18.04.3.tar.xz"; - sha256 = "1n5f150mxx4i3aq62xi67c99p68nwwsiih3i36i1rrmy87w44iyi"; - name = "kwalletmanager-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kwalletmanager-18.08.0.tar.xz"; + sha256 = "10yri44d68n6hc4dn78wgqzw394krwjqr6azwd6qgxjp6asc8n69"; + name = "kwalletmanager-18.08.0.tar.xz"; }; }; kwave = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kwave-18.04.3.tar.xz"; - sha256 = "1h6lqyxzccbsprap2lypan2bs451vyp1z0d4ipbim1ayqyqi5zw9"; - name = "kwave-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kwave-18.08.0.tar.xz"; + sha256 = "0aimhn8hgjnwhv0j2hiyiqgh5bslm7rs13yc8sk0kh1vix6909mp"; + name = "kwave-18.08.0.tar.xz"; }; }; kwordquiz = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kwordquiz-18.04.3.tar.xz"; - sha256 = "0vl8afd3186w51p3bhlqzi0wipm0p6bl40vm298473ixgpbxbaj6"; - name = "kwordquiz-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kwordquiz-18.08.0.tar.xz"; + sha256 = "1aghybg72anwj6vz3s3zr5i5wflackvfwl9n39mvxddm4ajnw1km"; + name = "kwordquiz-18.08.0.tar.xz"; }; }; libgravatar = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/libgravatar-18.04.3.tar.xz"; - sha256 = "0s8y6v5b6b5lmyjxwhwl3fnn94z8v17q765xiq0g73i7lp5jz0bq"; - name = "libgravatar-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/libgravatar-18.08.0.tar.xz"; + sha256 = "0yqd99lax1w5r1fy4rmbv9lk988zvq2yydkrdgh8vymxjljg5xa4"; + name = "libgravatar-18.08.0.tar.xz"; }; }; libkcddb = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/libkcddb-18.04.3.tar.xz"; - sha256 = "0nk7d6apl57rdnfma525yn3xrgw01hhj08gb3cylvysl5nf8nn0m"; - name = "libkcddb-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/libkcddb-18.08.0.tar.xz"; + sha256 = "1ns90vcbp21mwsbvndmk97fpd8n7152iw783q7bqfy1n3ggzkz5x"; + name = "libkcddb-18.08.0.tar.xz"; }; }; libkcompactdisc = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/libkcompactdisc-18.04.3.tar.xz"; - sha256 = "00xw6ggc4lgyw88jv52wxw2kig7ass1f7fbdd644cbhq2dvx7khd"; - name = "libkcompactdisc-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/libkcompactdisc-18.08.0.tar.xz"; + sha256 = "0pgn65knay7fgk2zdgqd29wfhqk9x4zlpp4ywjwb2zsvzz51j9f8"; + name = "libkcompactdisc-18.08.0.tar.xz"; }; }; libkdcraw = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/libkdcraw-18.04.3.tar.xz"; - sha256 = "1mkrr0bb89k13chy1y9r6aqsjrdvm125k0ms3pjf7gc3xa6g7vk7"; - name = "libkdcraw-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/libkdcraw-18.08.0.tar.xz"; + sha256 = "0xpkkgxsmvrldnprzqrxaz67jb5cv6vndg8flbkagvp0s7mnw56x"; + name = "libkdcraw-18.08.0.tar.xz"; }; }; libkdegames = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/libkdegames-18.04.3.tar.xz"; - sha256 = "0nnr9rnsgpc13hj4ii126lpss8d7d18wnrr9n85yf6ngcg9h3gk7"; - name = "libkdegames-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/libkdegames-18.08.0.tar.xz"; + sha256 = "1jl3snqyg3p3l4hddg7ag2mkgi49qvzml8p82zdn3sf5fhka1g70"; + name = "libkdegames-18.08.0.tar.xz"; }; }; libkdepim = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/libkdepim-18.04.3.tar.xz"; - sha256 = "0mqrjhmv1g2ch4jgihcg1d8fn7qxjkxnw2fh6a2cnn4b827n3v2l"; - name = "libkdepim-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/libkdepim-18.08.0.tar.xz"; + sha256 = "1gfwfmr5iqkwb490d3mm32892q47pc73b6c8zygm7mn5cjb5376l"; + name = "libkdepim-18.08.0.tar.xz"; }; }; libkeduvocdocument = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/libkeduvocdocument-18.04.3.tar.xz"; - sha256 = "1x2dpbpd7f71ws11zrrinyydg25728niglypa4dwvl09d5v0lhwz"; - name = "libkeduvocdocument-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/libkeduvocdocument-18.08.0.tar.xz"; + sha256 = "1i5vmjfczd71654cpxd11djwk852aqg5lkn98pa8qvjy7v85jynn"; + name = "libkeduvocdocument-18.08.0.tar.xz"; }; }; libkexiv2 = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/libkexiv2-18.04.3.tar.xz"; - sha256 = "095ijxk55zw07j5y678dz1pipd0va4p57r9zvkqlfzd41bsi0a3c"; - name = "libkexiv2-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/libkexiv2-18.08.0.tar.xz"; + sha256 = "0cdh5wd2lvm9m4nyz2yv5ksszk1pc8ajzwq9c467m74lvb1p2had"; + name = "libkexiv2-18.08.0.tar.xz"; }; }; libkgapi = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/libkgapi-18.04.3.tar.xz"; - sha256 = "0ixpnmli4z8qahw9br931b6py3wybqzlrnm3n7gms287phc11yjc"; - name = "libkgapi-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/libkgapi-18.08.0.tar.xz"; + sha256 = "1aax7djyp1104b8sbrpfhf5c8j30g3hac973lpblfqg0yhkd9lw0"; + name = "libkgapi-18.08.0.tar.xz"; }; }; libkgeomap = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/libkgeomap-18.04.3.tar.xz"; - sha256 = "0kicd6s6gfz3q1q45adnp6ri03sd69phs7ag3pnssyagk0y51igl"; - name = "libkgeomap-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/libkgeomap-18.08.0.tar.xz"; + sha256 = "00hjz7amg2rf5s74465s44ac6kd33q4mvsa9ynpljisll5avlhan"; + name = "libkgeomap-18.08.0.tar.xz"; }; }; libkipi = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/libkipi-18.04.3.tar.xz"; - sha256 = "1lyh9kg9s17nrc61bv6xzal5fd5y2shwn2d69xrlxh17akajbi7i"; - name = "libkipi-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/libkipi-18.08.0.tar.xz"; + sha256 = "1g34ryzr4vx5657c4j4w3b57n5ir6miwp1k60qk7av73qsik7a7d"; + name = "libkipi-18.08.0.tar.xz"; }; }; libkleo = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/libkleo-18.04.3.tar.xz"; - sha256 = "0m9sgksxr47lhh7810n3fprj08vk62cradl5zwf0c89dsbicap5a"; - name = "libkleo-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/libkleo-18.08.0.tar.xz"; + sha256 = "0vscfz794yp9hnrn4r4phbip2mqi3jvi41m5mpjd5pw11644d66c"; + name = "libkleo-18.08.0.tar.xz"; }; }; libkmahjongg = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/libkmahjongg-18.04.3.tar.xz"; - sha256 = "16m1jid7d920bn1s1zbd44mhl07db4n921fcxv95j5rswndb7lwn"; - name = "libkmahjongg-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/libkmahjongg-18.08.0.tar.xz"; + sha256 = "0xzv7vawwq0gm10h9mfrsy5m5zpk1n3s338al0h9vskvhznphy83"; + name = "libkmahjongg-18.08.0.tar.xz"; }; }; libkomparediff2 = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/libkomparediff2-18.04.3.tar.xz"; - sha256 = "1ks9cajyvwnfxr829arkz8ajf3j2vw2rqfj2mfha6l0hap6ha6p1"; - name = "libkomparediff2-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/libkomparediff2-18.08.0.tar.xz"; + sha256 = "0nx66198vn6zrv012i4p2ghc2slxqccfb3fhd9zszzpnyd08zs27"; + name = "libkomparediff2-18.08.0.tar.xz"; }; }; libksane = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/libksane-18.04.3.tar.xz"; - sha256 = "0qfal3d8bbq61v7zfcb8hqiki6z6qx7p59xnkbgqfaif77nhnwwj"; - name = "libksane-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/libksane-18.08.0.tar.xz"; + sha256 = "09wx6haaw0rjcjdh2c05b2zrpz57zlhx9x9jy9hw28byrf71i0k0"; + name = "libksane-18.08.0.tar.xz"; }; }; libksieve = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/libksieve-18.04.3.tar.xz"; - sha256 = "0ckncvccf02agvs0m7s9xxjmcjwh3fpywig25pk2ji8va1y5z5yl"; - name = "libksieve-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/libksieve-18.08.0.tar.xz"; + sha256 = "0xnjw2q1hlmrlzdi776459v5w3l88bxpzzpqc93xmq39xh7xqq7b"; + name = "libksieve-18.08.0.tar.xz"; }; }; lokalize = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/lokalize-18.04.3.tar.xz"; - sha256 = "052aqw0z3ap34c9r7r0imidn9iqn0fd2vg7yjpqvi4yy3zv8wjc4"; - name = "lokalize-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/lokalize-18.08.0.tar.xz"; + sha256 = "17h634abxzg3kx182qxdx6gyz0knl61yn32nlf76l0cv0bqc2xz5"; + name = "lokalize-18.08.0.tar.xz"; }; }; lskat = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/lskat-18.04.3.tar.xz"; - sha256 = "1qi8d06qjjz16ra6svmcl6dfvknls0r42man20nm439nchk4m58y"; - name = "lskat-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/lskat-18.08.0.tar.xz"; + sha256 = "05ckhh8270hjj94ks9zg6pypa2dm1d2r4l219gq456rrhyj9zv13"; + name = "lskat-18.08.0.tar.xz"; }; }; mailcommon = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/mailcommon-18.04.3.tar.xz"; - sha256 = "0g2skri3kajyb5hh0c6qakhbqapnd1zh5labrpi38cygq8b6pnfh"; - name = "mailcommon-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/mailcommon-18.08.0.tar.xz"; + sha256 = "06j66326wbvgnmacmbhvszbhdcw6h3pzxwcnbbz66n0zz2y4m5gd"; + name = "mailcommon-18.08.0.tar.xz"; }; }; mailimporter = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/mailimporter-18.04.3.tar.xz"; - sha256 = "1pzib2m8048x174wzf1r67x0mjqwhpkv2jsbirlvwiwsyvvia7ix"; - name = "mailimporter-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/mailimporter-18.08.0.tar.xz"; + sha256 = "0gywzd882mkjf9q07wg2hi4js4gqvyjxf3y0lgq22k5bd5gpfxbs"; + name = "mailimporter-18.08.0.tar.xz"; }; }; marble = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/marble-18.04.3.tar.xz"; - sha256 = "1psg2qyzmqg1yvxn33rb10ybby0fs3njmrcjbjw58yvqv9q78lkz"; - name = "marble-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/marble-18.08.0.tar.xz"; + sha256 = "1ylcdnf0rw0a51jcy183p9xcir4j7jlm6dmhk4k13zvzv16pcwvf"; + name = "marble-18.08.0.tar.xz"; }; }; mbox-importer = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/mbox-importer-18.04.3.tar.xz"; - sha256 = "0jjdrl5a1jp3al2vqilaba5239vi3l3s5f0rwk853k0c2gqsm79j"; - name = "mbox-importer-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/mbox-importer-18.08.0.tar.xz"; + sha256 = "08n46q2xxvjbbcr4754x7qw4p3yffmrpvzxi7k2i48ifxhs2awqj"; + name = "mbox-importer-18.08.0.tar.xz"; }; }; messagelib = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/messagelib-18.04.3.tar.xz"; - sha256 = "025b2ldpayasa6hyfd0zy5hca1cq6xs3pc7j992rv9xwkgmb47wn"; - name = "messagelib-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/messagelib-18.08.0.tar.xz"; + sha256 = "0d1bb0n9izwlk9fbwyf1hvwkrng1b6im574fxpkgk73ivb72ppfx"; + name = "messagelib-18.08.0.tar.xz"; }; }; minuet = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/minuet-18.04.3.tar.xz"; - sha256 = "1r4ipkda2jibs0p1xq1s8aggzr5fz0sll94dqrqb7hgfihhmz052"; - name = "minuet-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/minuet-18.08.0.tar.xz"; + sha256 = "0gvla9ig912wrg6vvdmqv2hyybr08a45crx69l31hcd13h9pmyg6"; + name = "minuet-18.08.0.tar.xz"; }; }; okular = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/okular-18.04.3.tar.xz"; - sha256 = "0jjmqbwwbrg2svy487dln1lgc0ch80qpnsx8z1ksai3i015ns7f5"; - name = "okular-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/okular-18.08.0.tar.xz"; + sha256 = "11wwh0vb1l2dw2zhcg6f92y7vb5i5kaqwi8kszz8sd874ydpp8pn"; + name = "okular-18.08.0.tar.xz"; }; }; palapeli = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/palapeli-18.04.3.tar.xz"; - sha256 = "08llmn4g119fr0ar733xsjwfznk62qz0d0cxjz5h06nz4l06rzzz"; - name = "palapeli-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/palapeli-18.08.0.tar.xz"; + sha256 = "1a1k44q62raw1kxkyg8cspvwxzr1islbwzcb7sj63cmzsmwfhkg1"; + name = "palapeli-18.08.0.tar.xz"; }; }; parley = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/parley-18.04.3.tar.xz"; - sha256 = "1ynwlzj20vybzmgxb50v7dxkm7hjjc58lw82lvwhh94igklq6mjv"; - name = "parley-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/parley-18.08.0.tar.xz"; + sha256 = "1cy58fs1jaz1zga4dwfr80m0p6cgzc5ip26ds2x2lpygx7pbjcc6"; + name = "parley-18.08.0.tar.xz"; }; }; picmi = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/picmi-18.04.3.tar.xz"; - sha256 = "0x3mg8s0dm0p2vzqvcc9ini7af8pdg3y28y02bqs7v2z9gml0hfl"; - name = "picmi-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/picmi-18.08.0.tar.xz"; + sha256 = "1x2ya0vwxwc56rfskl3l83nw0vpdh1lzshh0sdal3rfw0s8w895x"; + name = "picmi-18.08.0.tar.xz"; }; }; pimcommon = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/pimcommon-18.04.3.tar.xz"; - sha256 = "0v3glgpvymddmdkfs1gcqmlh4ifk9kyhsqz2nyvyr7b8f38drjdj"; - name = "pimcommon-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/pimcommon-18.08.0.tar.xz"; + sha256 = "1j6pj7f52ya0jgzq97g65zl3mpv7hn002flv35qlg5srzdllm3pd"; + name = "pimcommon-18.08.0.tar.xz"; }; }; pim-data-exporter = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/pim-data-exporter-18.04.3.tar.xz"; - sha256 = "1ky6igdfr15vhfpjg1nv60zbc4fwi8b5vwkign911qimk9alga7j"; - name = "pim-data-exporter-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/pim-data-exporter-18.08.0.tar.xz"; + sha256 = "1spbkwv9kqzky958nymr5plz8rgzxbn6xzgy7k9pkpvynd1a54hz"; + name = "pim-data-exporter-18.08.0.tar.xz"; }; }; pim-sieve-editor = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/pim-sieve-editor-18.04.3.tar.xz"; - sha256 = "1pa4z67chyacds6adi53ccdfmr5jhsd3vgpgk0wdmkn82353nvzn"; - name = "pim-sieve-editor-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/pim-sieve-editor-18.08.0.tar.xz"; + sha256 = "0nqv530rlamlngxwy3cpbyjj75akx3k9lcifgymlbm4ipp9k125c"; + name = "pim-sieve-editor-18.08.0.tar.xz"; }; }; poxml = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/poxml-18.04.3.tar.xz"; - sha256 = "0wi7m1021vj2lama6iqkpsdzx5d4s5h0sbwnf7y5p5k59g7la7rf"; - name = "poxml-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/poxml-18.08.0.tar.xz"; + sha256 = "04sy8v3n12asz8hfh107y5irhxzlpkzgc3zjw8qfygflzg9a48cz"; + name = "poxml-18.08.0.tar.xz"; }; }; print-manager = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/print-manager-18.04.3.tar.xz"; - sha256 = "1ml3jdpz60dhgrcpd05bzs736a65mqkglvvzikkaai0r9wwv4n3k"; - name = "print-manager-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/print-manager-18.08.0.tar.xz"; + sha256 = "1mi2aqsh5irlnlgkajkkxhazyafhpndrxckcc2kmrh00d4cxhivn"; + name = "print-manager-18.08.0.tar.xz"; }; }; rocs = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/rocs-18.04.3.tar.xz"; - sha256 = "1wx5h09vkpkyg4h3wcnkq8ks6mg9f1h7l5dzv1dpq8shyr9bnnr8"; - name = "rocs-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/rocs-18.08.0.tar.xz"; + sha256 = "1c3i11mg6xs64wjyph51hqr6j428hh71ljdq4ajhysql7l5kbhhx"; + name = "rocs-18.08.0.tar.xz"; }; }; signon-kwallet-extension = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/signon-kwallet-extension-18.04.3.tar.xz"; - sha256 = "1f8x0lf0zy18mxkjc11k1j0llqnc3mrn0fnd4ag6qfvx7bhz16fd"; - name = "signon-kwallet-extension-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/signon-kwallet-extension-18.08.0.tar.xz"; + sha256 = "024ay0z9inbf7k54iq5v78cxh4q8x1ypvd8r3w80dyygjw2dw743"; + name = "signon-kwallet-extension-18.08.0.tar.xz"; }; }; spectacle = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/spectacle-18.04.3.tar.xz"; - sha256 = "1qjvq5df0syl7syqdwfl3xh38gz1fysib2a0mnigv1hnln1w0p2b"; - name = "spectacle-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/spectacle-18.08.0.tar.xz"; + sha256 = "1gc2qza529jld1zngzs98zmd3734h13phviswqpg93qnbr9hxskr"; + name = "spectacle-18.08.0.tar.xz"; }; }; step = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/step-18.04.3.tar.xz"; - sha256 = "0a370sp71xk8s091qsal3jg4f23wydfy4fccf38craz0wdy6km4q"; - name = "step-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/step-18.08.0.tar.xz"; + sha256 = "15hjbisv3adsn0vavlcl3iy3vz6mf1fv0qj4ykmxckblcyhm1mgg"; + name = "step-18.08.0.tar.xz"; }; }; svgpart = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/svgpart-18.04.3.tar.xz"; - sha256 = "1c2j3p2blvzwlaipgjby7pzaflpzp0pbnnda81lgwbh7blin9k0k"; - name = "svgpart-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/svgpart-18.08.0.tar.xz"; + sha256 = "0q71nn1xsdh7ag60szl836lif9ywnv3dlv8w0sn3zfa7yv0cbraa"; + name = "svgpart-18.08.0.tar.xz"; }; }; sweeper = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/sweeper-18.04.3.tar.xz"; - sha256 = "0v86pil9krziz2wbvzj6x7ivq505iy4lx4zjrgpxw2dxmyyp338c"; - name = "sweeper-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/sweeper-18.08.0.tar.xz"; + sha256 = "1j87cb9bbfn42f2xn9k6j8ailgn18b5ribjf4sgglx2h1l3vpq51"; + name = "sweeper-18.08.0.tar.xz"; }; }; syndication = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/syndication-18.04.3.tar.xz"; - sha256 = "1gfimm9x1j079j4q4d51z9nz4x3khlwzjywrip2paxmfrsjcca0g"; - name = "syndication-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/syndication-18.08.0.tar.xz"; + sha256 = "17j3ks7bmr3p71lvrm8bzbfai5sw3frwrwl0ckbg1rwhkbsi3d71"; + name = "syndication-18.08.0.tar.xz"; }; }; umbrello = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/umbrello-18.04.3.tar.xz"; - sha256 = "1w46dys13cl29xh3d1fjp2xh09vmsq45bdifwsa1zjlqi0iiw0h1"; - name = "umbrello-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/umbrello-18.08.0.tar.xz"; + sha256 = "0rs92l6disjha8w5nx05qjbidib4a9yyab7f4cd4sjnjfcw3i1px"; + name = "umbrello-18.08.0.tar.xz"; }; }; zeroconf-ioslave = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/zeroconf-ioslave-18.04.3.tar.xz"; - sha256 = "0mi0kx6gklddj37qzz04n399ijqpzl536z9x1al427mxi53h1xbw"; - name = "zeroconf-ioslave-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/zeroconf-ioslave-18.08.0.tar.xz"; + sha256 = "05j8k8la4gcydazzhhxq8700w1l4q57yylcar1wzs108icp03rkm"; + name = "zeroconf-ioslave-18.08.0.tar.xz"; }; }; } diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 15d894b0413..d66a778c1cd 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "3.29.0"; + version = "3.30.0"; name = "calibre-${version}"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz"; - sha256 = "1r29vi8j51r0nnzpjbg34ryvizzkn31sq1iz7z748wjfgr87wmyh"; + sha256 = "0j7w63kniqnpr8v1aldzbim2dyrk79n23mzw9y56jqd0k47m8zfz"; }; patches = [ diff --git a/pkgs/applications/misc/clipmenu/default.nix b/pkgs/applications/misc/clipmenu/default.nix index 679724ed062..6dd68123b13 100644 --- a/pkgs/applications/misc/clipmenu/default.nix +++ b/pkgs/applications/misc/clipmenu/default.nix @@ -4,13 +4,13 @@ let in stdenv.mkDerivation rec { name = "clipmenu-${version}"; - version = "5.4.0"; + version = "5.5.0"; src = fetchFromGitHub { owner = "cdown"; repo = "clipmenu"; rev = version; - sha256 = "1qbpca0wny6i222vbikfl2znn3fynhbl4100qs8v4wn27ra5p0mi"; + sha256 = "15if7bwqviyynbrcwrn04r418cfnxf2mkmq112696np24bggvljg"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index b8eff972ebd..35698a32331 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "dbeaver-ce-${version}"; - version = "5.1.5"; + version = "5.1.6"; desktopItem = makeDesktopItem { name = "dbeaver"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "17ai2gxnz1wj5m282sib9qhvy3665km2ig1ixxdklmk8apgdl1xr"; + sha256 = "1zypadnyhinm6mfv91s7zs2s55bhzgkqhl6ai6x3yqwhvayc02nn"; }; installPhase = '' diff --git a/pkgs/applications/misc/finalterm/default.nix b/pkgs/applications/misc/finalterm/default.nix deleted file mode 100644 index 2c024b9fe0e..00000000000 --- a/pkgs/applications/misc/finalterm/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ stdenv, fetchFromGitHub, makeWrapper -, pkgconfig, cmake, libxml2, vala_0_26, intltool, libmx, gnome3, gtk3, gtk-doc -, keybinder3, clutter-gtk, libnotify -, libxkbcommon, xorg, udev -, bashInteractive -}: - -with stdenv.lib; - -stdenv.mkDerivation { - name = "finalterm-git-2014-11-15"; - - src = fetchFromGitHub { - owner = "p-e-w"; - repo = "finalterm"; - rev = "39b078b2a96a5c3c9e74f92b1929f383d220ca8b"; - sha256 = "14viln5nabr39lafg1lzf6ydibz1h5d9346drp435ljxc6wsh21i"; - }; - - nativeBuildInputs = [ pkgconfig cmake intltool makeWrapper ]; - buildInputs = [ - vala_0_26 gtk3 gnome3.gnome-common gnome3.libgee - gtk-doc clutter-gtk libmx keybinder3 libxml2 libnotify - xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence - libxkbcommon - ] ++ optionals stdenv.isLinux [ udev ]; - - preConfigure = '' - substituteInPlace data/org.gnome.finalterm.gschema.xml \ - --replace "/bin/bash" "${bashInteractive}/bin/bash" - - cmakeFlagsArray=( - -DMINIMAL_FLAGS=ON - ) - ''; - - postInstall = '' - mkdir -p $out/share/gsettings-schemas/$name - mv $out/share/glib-2.0 $out/share/gsettings-schemas/$name/ - ''; - - postFixup = '' - wrapProgram "$out/bin/finalterm" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix GIO_EXTRA_MODULES : "${getLib gnome3.dconf}/lib/gio/modules" \ - --prefix XDG_DATA_DIRS : "${gnome3.defaultIconTheme}/share:${gnome3.gtk.out}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = { - homepage = http://finalterm.org; - description = "A new breed of terminal emulator"; - longDescription = '' - Final Term is a new breed of terminal emulator. - - It goes beyond mere emulation and understands what is happening inside the shell it is hosting. This allows it to offer features no other terminal can, including: - - - Semantic text menus - - Smart command completion - - GUI terminal controls - ''; - license = licenses.gpl3Plus; - maintainers = [ maintainers.cstrahan ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/misc/navit/CMakeLists.txt.patch b/pkgs/applications/misc/navit/CMakeLists.txt.patch new file mode 100644 index 00000000000..7f8a75f319b --- /dev/null +++ b/pkgs/applications/misc/navit/CMakeLists.txt.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 763f75b..defa74a 100755 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -212,7 +212,7 @@ CHECK_INCLUDE_FILES(endian.h HAVE_ENDIAN_H) + CHECK_INCLUDE_FILES(stdint.h HAVE_STDINT_H) + CHECK_INCLUDE_FILES(byteswap.h HAVE_BYTESWAP_H) + CHECK_LIBRARY_EXISTS(gypsy gypsy_control_get_default "" GYPSY_FOUND) +-CHECK_INCLUDE_FILES(libspeechd.h HAVE_LIBSPEECHD) ++CHECK_INCLUDE_FILES(speech-dispatcher/libspeechd.h HAVE_LIBSPEECHD) + CHECK_INCLUDE_FILES(sys/socket.h HAVE_SOCKET) + CHECK_INCLUDE_FILES(sys/shm.h HAVE_SHMEM) + CHECK_FUNCTION_EXISTS(snprintf HAVE_SNPRINTF) diff --git a/pkgs/applications/misc/navit/default.nix b/pkgs/applications/misc/navit/default.nix index 4db5ed4f8eb..5d591243f50 100644 --- a/pkgs/applications/misc/navit/default.nix +++ b/pkgs/applications/misc/navit/default.nix @@ -1,9 +1,21 @@ -{ stdenv, fetchFromGitHub, pkgconfig, gtk2, SDL, fontconfig, freetype, imlib2, SDL_image, libGLU_combined, -libXmu, freeglut, pcre, dbus-glib, glib, librsvg, freeimage, libxslt, -qtbase, qtquickcontrols, qtsvg, qtdeclarative, qtlocation, qtsensors, qtmultimedia, qtspeech, espeak, -cairo, gdk_pixbuf, pango, atk, patchelf, fetchurl, bzip2, -python, gettext, quesoglc, gd, postgresql, cmake, shapelib, SDL_ttf, fribidi}: +{ stdenv, fetchFromGitHub, pkgconfig, gtk2, fontconfig, freetype, imlib2 +, SDL_image, libGLU_combined, libXmu, freeglut, pcre, dbus, dbus-glib, glib +, librsvg, freeimage, libxslt, cairo, gdk_pixbuf, pango +, atk, patchelf, fetchurl, bzip2, python, gettext, quesoglc +, gd, cmake, shapelib, SDL_ttf, fribidi, makeWrapper +, qtquickcontrols, qtmultimedia, qtspeech, qtsensors +, qtlocation, qtdeclarative, qtsvg +, qtSupport ? false, qtbase #need to fix qt_qpainter +, sdlSupport ? true, SDL +, xkbdSupport ? true, xkbd +, espeakSupport ? true, espeak +, postgresqlSupport ? false, postgresql +, speechdSupport ? false, speechd ? null +}: +assert speechdSupport -> speechd != null; + +with stdenv.lib; stdenv.mkDerivation rec { name = "navit-${version}"; version = "0.5.1"; @@ -21,34 +33,53 @@ stdenv.mkDerivation rec { sha256 = "0vg6b6rhsa2cxqj4rbhfhhfss71syhnfa6f1jg2i2d7l88dm5x7d"; }; - #hardeningDisable = [ "format" ]; - NIX_CFLAGS_COMPILE = [ "-I${SDL.dev}/include/SDL" ]; + patches = [ ./CMakeLists.txt.patch ]; + + NIX_CFLAGS_COMPILE = optional sdlSupport "-I${SDL.dev}/include/SDL" + ++ optional speechdSupport "-I${speechd}/include/speech-dispatcher"; - # TODO: fix speech options. - cmakeFlags = [ "-DSAMPLE_MAP=n " "-DCMAKE_BUILD_TYPE=RelWithDebInfo" "-Dsupport/espeak=FALSE" "-Dspeech/qt5_espeak=FALSE" ]; + # we choose only cmdline and speech-dispatcher speech options. + # espeak builtins is made for non-cmdline OS as winCE + cmakeFlags = [ + "-DSAMPLE_MAP=n " "-DCMAKE_BUILD_TYPE=RelWithDebInfo" + "-Dspeech/qt5_espeak=FALSE" "-Dsupport/espeak=FALSE" + ]; - buildInputs = [ gtk2 SDL fontconfig freetype imlib2 SDL_image libGLU_combined freeimage libxslt - libXmu freeglut python gettext quesoglc gd postgresql qtbase SDL_ttf fribidi pcre qtquickcontrols - espeak qtmultimedia qtspeech qtsensors qtlocation qtdeclarative qtsvg dbus-glib librsvg shapelib glib - cairo gdk_pixbuf pango atk ]; + buildInputs = [ + gtk2 fontconfig freetype imlib2 libGLU_combined freeimage + libxslt libXmu freeglut python gettext quesoglc gd + fribidi pcre dbus dbus-glib librsvg shapelib glib + cairo gdk_pixbuf pango atk + ] ++ optionals sdlSupport [ SDL SDL_ttf SDL_image ] + ++ optional postgresqlSupport postgresql + ++ optional speechdSupport speechd + ++ optionals qtSupport [ + qtquickcontrols qtmultimedia qtspeech qtsensors + qtbase qtlocation qtdeclarative qtsvg + ]; - nativeBuildInputs = [ pkgconfig cmake patchelf bzip2 ]; + nativeBuildInputs = [ makeWrapper pkgconfig cmake patchelf bzip2 ]; # we dont want blank screen by defaut postInstall = '' # emulate DSAMPLE_MAP - mkdir -p $out/share/navit/maps/maps + mkdir -p $out/share/navit/maps/ bzcat "${sample_map}" | $out/bin/maptool "$out/share/navit/maps/osm_bbox_11.3,47.9,11.7,48.2.bin" ''; # TODO: fix upstream? postFixup = '' for lib in $(find "$out/lib/navit/" -iname "*.so" ); do - patchelf --set-rpath ${stdenv.lib.makeLibraryPath buildInputs} $lib + patchelf --set-rpath ${makeLibraryPath buildInputs} $lib done + wrapProgram $out/bin/navit \ + --prefix PATH : ${makeBinPath ( + optional xkbdSupport xkbd + ++ optional espeakSupport espeak + ++ optional speechdSupport speechd ) } ''; - meta = with stdenv.lib; { + meta = { homepage = http://www.navit-project.org; description = "Car navigation system with routing engine using OSM maps"; license = licenses.gpl2; diff --git a/pkgs/applications/misc/sequeler/default.nix b/pkgs/applications/misc/sequeler/default.nix index be4a0388daa..35242822d4a 100644 --- a/pkgs/applications/misc/sequeler/default.nix +++ b/pkgs/applications/misc/sequeler/default.nix @@ -4,7 +4,7 @@ let - version = "0.5.9"; + version = "0.6.0"; sqlGda = libgda.override { mysqlSupport = true; postgresSupport = true; @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { owner = "Alecaddd"; repo = "sequeler"; rev = "v${version}"; - sha256 = "08dgir1prjfh7kxdxksabia5093gcjyy2yy7s57yizszplw2v07v"; + sha256 = "04x3fg665201g3zy66sicfna4vac4n1pmrahbra90gvfzaia1cai"; }; nativeBuildInputs = [ meson ninja pkgconfig vala gobjectIntrospection gettext wrapGAppsHook desktop-file-utils ]; diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix index 5e1e7bf3225..1b998c48580 100644 --- a/pkgs/applications/misc/subsurface/default.nix +++ b/pkgs/applications/misc/subsurface/default.nix @@ -4,14 +4,14 @@ }: let - version = "4.7.5"; + version = "4.8.1"; libdc = stdenv.mkDerivation rec { name = "libdivecomputer-ssrf-${version}"; src = fetchurl { url = "https://subsurface-divelog.org/downloads/libdivecomputer-subsurface-branch-${version}.tgz"; - sha256 = "1xsgnmgc7yb46lflx8ynkbdxg2f6sny6xg6caqgx7rf0x1jmjj4x"; + sha256 = "1x6z08gfp9jldv7vcsdasjcarns43qns9cm8s9w27n0c2lvchjvy"; }; nativeBuildInputs = [ autoreconfHook ]; @@ -70,7 +70,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://subsurface-divelog.org/downloads/Subsurface-${version}.tgz"; - sha256 = "0qqmnrmj2alr4rc2nqkv8sbdp92xb6j4j468wn6yqvgb23n77b82"; + sha256 = "0758sw05gjy8sckvaqc0hmbh2kibmzapgp0hlk8rsp1vsldq4vd2"; }; buildInputs = [ diff --git a/pkgs/applications/misc/urlscan/default.nix b/pkgs/applications/misc/urlscan/default.nix index 5f5754a6605..6b0c4670544 100644 --- a/pkgs/applications/misc/urlscan/default.nix +++ b/pkgs/applications/misc/urlscan/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "urlscan"; - version = "0.8.9"; + version = "0.9.0"; src = fetchFromGitHub { owner = "firecat53"; repo = pname; rev = version; - sha256 = "18wvfayib79lylv3g9ay3f85qanhrljvnfarwl9snfzklj4gkf2v"; + sha256 = "0vad1g234r9agvkdsry9xb6hmn6lg4mygfcy0mg68gibmrg7h1ji"; }; propagatedBuildInputs = [ python3Packages.urwid ]; diff --git a/pkgs/applications/misc/xkbd/default.nix b/pkgs/applications/misc/xkbd/default.nix new file mode 100644 index 00000000000..ccbb88bd1a8 --- /dev/null +++ b/pkgs/applications/misc/xkbd/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, freetype, libXrender, libXft, xextproto +, xinput, libXi, libXext, libXtst, libXpm, libX11, xproto, autoreconfHook +}: + +stdenv.mkDerivation rec { + name = "xkbd-${version}"; + version = "0.8.18"; + + src = fetchFromGitHub { + owner = "mahatma-kaganovich"; + repo = "xkbd"; + rev = name; + sha256 = "05ry6q75jq545kf6p20nhfywaqf2wdkfiyp6iwdpv9jh238hf7m9"; + }; + + buildInputs = [ + freetype libXrender libXft libXext libXtst libXpm libX11 + libXi xextproto xinput xproto + ]; + + nativeBuildInputs = [ autoreconfHook ]; + + meta = with stdenv.lib; { + homepage = https://github.com/mahatma-kaganovich/xkbd; + description = "onscreen soft keyboard for X11"; + license = licenses.gpl2Plus; + maintainers = [ maintainers.genesis ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/xpad/default.nix b/pkgs/applications/misc/xpad/default.nix index 01df5d32ab1..fdd468a9c06 100644 --- a/pkgs/applications/misc/xpad/default.nix +++ b/pkgs/applications/misc/xpad/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "xpad-${version}"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { url = "https://launchpad.net/xpad/trunk/${version}/+download/xpad-${version}.tar.bz2"; - sha256 = "02yikxg6z9bwla09ka001ppjlpbv5kbza3za9asazm5aiz376mkb"; + sha256 = "0l0g5x8g6dwhf5ksnqqrjjsycy57kcvdslkmsr6bl3vrsjd7qml3"; }; nativeBuildInputs = [ autoreconfHook pkgconfig wrapGAppsHook ]; diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 47389e21328..f3a8ca6f289 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,995 +1,995 @@ { - version = "62.0b17"; + version = "62.0b20"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ach/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/ach/firefox-62.0b20.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "7e32f8fae2e8a863fabed1ca2da1d13d89873aa6450687021cf77fbdf8b8f7a589590ffe7dfb20fc6f4fda8bfd21cbb50e7d2ceb1fcebb32765926e85532a56c"; + sha512 = "bcc42abc76f41f5fe32a1bf1e824be451d15686c05adfb58b85df6eeff39e29aac3aa18878023469e85bcd8e9d4f55cea9cd96d7b40a5b6918ec2fa572e32b7c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/af/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/af/firefox-62.0b20.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "b20b67c44eca5b615febb4983479f3ae4d8ebcc2b014b30445974d3a0f47672439f2121f4665cabc8ecefc955ee6f70651af24d46c7f324f898715565ba49864"; + sha512 = "f371acf6a9435d6c673768270be5a950ac369cb04e91b77f8422feb77cb09e65731c6842e933aa5012402a69bfa4c01373419caf029e133408105b71d218a3f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/an/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/an/firefox-62.0b20.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "120ee79642bb4695b9b7ca7c1bf21e6774031be52a271da7042f6c45710d2bcf4405a4bb322245814c82c8f891067cc39309c69c5a61b40b908eedd804d9fdfb"; + sha512 = "79fa43b710bb99cb94ed463b845d7eaa993a2d35b27eecafac0e387f5781b77415375fb3d19256d3097f314d0891020ac929877635d3f26ab3fd808bd105cf1e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ar/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/ar/firefox-62.0b20.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "85f16989d0f80aa21df59270d98306eaf260fd74c3e28c00a15f546c5fef9eabb39a079645cfb7c51b1edeec63433cd62d8871d75728489220a3def049b47b78"; + sha512 = "66b40adacfa9e36e61d9f4f77fb85db08cbce2eb162201fd65db48bee54c38f4749c7375d893727796c8954a71004e4f163fde8a3f701dec712d271f808c40fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/as/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/as/firefox-62.0b20.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "2a7d134b7f50d8ada8772daed52825f008a5efa7759de29393c6fe578c03e5952221fd9108e751671d3849492e2a567c1f1cd614d356fded4b3b11a7dd21a4e7"; + sha512 = "090f4b517d242f67b43bdce75e586cfd0eb58abb076cccae9c5cffc74d14b04ba06018764bb7696f2b43049ff8311f3a6b6d7207d3ac0f3432904f4ecf39e96a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ast/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/ast/firefox-62.0b20.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "522785be0747916af7d77cf93a5d9c8917f7b0b244497ee2dde9c2abdc49ab1bf916393865211db42b2118086b0e114d228ef8ecb95384bdc2818f08487c6a57"; + sha512 = "309b5feeffbe980b06bd04b4a6db6f4677d131c7ccdd138cb8d43eebfec61b423e30d5f7d5776827f973f6c7fd995f091263839e811e1496b7d4def2f97ea922"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/az/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/az/firefox-62.0b20.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "1bb6022ffeb6d0c6f263dc2bb2e111733baa00a7a06e0830a0e8103505a016a68c3b88244fe6f1764dab12c9b7682eebd547b62c38d3cd974fd4a0ede49a63b9"; + sha512 = "6b64a0346ce7a5854c878317a34dd91c044456f823fc5e55e8dcfea55663600a2bd1c9471f01732426397674303919125f69ef0d61d77fddcaca0d462cd8e084"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/be/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/be/firefox-62.0b20.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "8197ecf380fcadda666d71cdb45eef73dae713b73268fca1f1f3cab152c08cf4f8f923c5878d5f4e07c55ecc564080db31f64d8ad26ec2ad9bf1c0bde47b3b18"; + sha512 = "9553685556a1def24354972fafe785ca9ad180b0cda48a928b39a47011fae41660a4d046f6a38c11c148ac2b6a883c1f8a56d6aa4b6ada75365df2b985cbe473"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/bg/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/bg/firefox-62.0b20.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "e6039c1291ebd11c37ac233f105778e8bb19b3b7e3fe9622a01c6a9f3bdbeff74b24569284b7083da29febda260fa71429ac105f656e4c9f599deb132f497cd9"; + sha512 = "531e0f09ba97828a039f796b6166753a9e35ee902258b9318fb91838b956d92de6d0f86168f2945eb2ed6352307f60bcfb81740dbe3e3ebd0988c9a8fa59ff18"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/bn-BD/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/bn-BD/firefox-62.0b20.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "5d9a8af84b4944fb962da196ec065349b2109461506630625211d234ce7339e47bdcefdbf1c590a14c21cf740c10f31c1b5e6bf374dd696ecf2bbf5bbbeb232e"; + sha512 = "545525b698e0bd93f6036b92e3723a452e8083cfb0cf7462c8c077ddcbc0210d25ab53d3b41b67dcc1dbaa14d1923fd0b56b3097b98bf84164ca367f1c07413a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/bn-IN/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/bn-IN/firefox-62.0b20.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "df7d1ccc455bbb55358da614f72ad878bb28f882ef82e2a007b743ce94f218cf3f469ac0b7ee968814e9fe87dac1c5c41b8b380f76f78f358e621077b2266a98"; + sha512 = "95ceade2812bd3ffc084167280d4154331fe5239f167f79b9c29a43646c2c9f5c7a4e22cf6d814985dd01e8d60661007c66ebec27bae9e19a85895ae9610f9dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/br/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/br/firefox-62.0b20.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "ee172b89d05b727d895998c42af19d7d5a1f9040bdaf323a780dbe9b39937ccd91a721409ef34276cbf81fe3bb0a43bc6534335fb68bb38de8f50194fccc887f"; + sha512 = "15153f5e0222d3d0bd716e7595e2d5ad7b84595bd14971153ca809fd62955c55ef99b01b8687e32e3e3ba65b030f4e93beae90938efeda3b5bdedc9a2a012c1c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/bs/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/bs/firefox-62.0b20.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "2ea8db7e182744d607d683aa55a482ce0da78d3c035b841597c8d7382cdf843e3afe274cc82b97b3244e5306f03b7b34f1964e772bfbdaa42cf98bd960d45872"; + sha512 = "6f7b1f882ae6b9d95fccee972962e98c9c722194bb08c466071333cbcf5ff56b149c07daf1d6abf808fe0e07e22af78a915c94268fa356412c88a9f35fe5364b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ca/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/ca/firefox-62.0b20.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "aa0b2eabba996fd8073a09898a9e42f2d5c8fabd81ed02bd74a14bc5d9f9e00ea4f20dc647f461e5bd44b8783f12449de6407c440a6435796610ddd709fe4578"; + sha512 = "dfc0cfb8f95421e8b60b91716a68c6a5db1c0630c298c2b76c80b3a24308d852e056e552530b034f9889b87c72e581590ad018ef0b0657baf14895f383a594ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/cak/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/cak/firefox-62.0b20.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "e93b043f81d8f3e559f732b2b667774fabbee643a5ebc8fd6fdbaf1ffbdf33b8bb0d85035f2233a40da2c611cfeb7740230bf53de57bc4db65bb96046d29eb1d"; + sha512 = "7561a94f9bf8edd5693c9e961aabc316056a76f19c8b3d0490f94d74ee1bd8cd0b49aecf71b48c7e90435a2ea2efd716cde53303c73a68a1a6230e51445f719a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/cs/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/cs/firefox-62.0b20.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "6fa2edd2ed70b4ed8a37e3b5e61f1130bb2c69c5a34b03d2a28d7840834c0db51ba7239be548dc792df03f4832344376bfea9dc542fbd8771a10bb5ef05968eb"; + sha512 = "cf2f2b8cff2951cb71454f3d0351e157606af1bb306b65f0fb8930a9257e16ed5f7704be09114bbeb37c5c92d12feec1371339b2fb126c8766aa8bc8034d07c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/cy/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/cy/firefox-62.0b20.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "dc4f02881550ce4f77cbb66c7f3033c41d0697c5d86b8ee52396955b3d3f81fb870c60f82728cc4a8d7e647af7f08c1deda4d1f30b8c140c58786576c3460d56"; + sha512 = "05e3f84109a47790bd88cdf248c32eddece4c95ef9c5cc46cf67b013063441106eb0b4022cfaf8501593c6c4e13f84684ae1b8f48ddd3704ea52d520d1f9a185"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/da/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/da/firefox-62.0b20.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "df887b8627e3587fd1fa94055a9e39bd3b42ff5d0d9b2d3ad761a674700c0081f769fded2e9b5262316c81020d4ad58b421185851fbb1c770a023ff94b2b26c5"; + sha512 = "cc8dbabf299e1009b180ed8201699ebc773351e4969587df146b977da3a7a1bedadd0366e765488d2e16aa81e768c3fb0892972346d6611c29a1d6eda921e672"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/de/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/de/firefox-62.0b20.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "6195000ee4013587a2f4cceb368b8283a99094f2617b0a350c62ec3e562a049b49c01691a876dbfce77c7d26c3354c00b9340bb0f8fe822000f012fecf19b842"; + sha512 = "a69c1786b2b5455fece6d49ae0a8408cbb448c4b6c3f394401c2eee20a5f7d80db09d982ac50e4893877d876123586b1e1cf844e72495d5b1a5ed2349300adbd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/dsb/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/dsb/firefox-62.0b20.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "c44a694a85b2f443faa78fbd2ca9cbbd94a91fe1f33c2438a0d027767896f842edbbe668bfeaa9f79a00e98d7ad89b45173273a13b9b0825952f39ffac256397"; + sha512 = "b464c71a4dddb8fd864f1a4c7ab2ed6e870e0cbbf3213255965f3534b2b776d7da03e997d78c9f4e794da7201c92f0e9f85bf5b5631131a2355224452112ab0a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/el/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/el/firefox-62.0b20.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "f20f82982b59b223e8bd2f62c6c0fd38517799cb425619104e38e28526aec8b21eefb9b76fe9f6c7be6282a902144ccbf1033cfdc2202d927336cbac9d9c8c58"; + sha512 = "9578203045825c12c8efba6f3488771efb52452f3a1f57b8a3084fd0c83998f0733520f1d646b1b847ffb76cbcd4d3e184cc0fee0ca01684429396dadd09757f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/en-CA/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/en-CA/firefox-62.0b20.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "163c3cb96fd01bfe1cf06f3f725f612f966903ed64f8f924008288e040402e252a490b7153b9a916040c25c074856b179eae4a89d511f4d7bc73dcd985367406"; + sha512 = "d316262b3c08730782a741177224e3aa269843e1d65ba7f1487e947be73ebbd4fb88f0734bc98e840951d89ecca8ef0a62cb5b8c456e4203da1d11a8a4a1451c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/en-GB/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/en-GB/firefox-62.0b20.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "147b7d01424a53245d0f73440961280bdcbca765b2580594db60fb0a398daa483f913d799543e97903393dec2e09d66ae437f1ce2d64a70c6ec74fe0017511d2"; + sha512 = "fd43c18250362b0f18140d123eec2d87578e29acb864ea1513498ec47b7696f0138424e8be33f8af2b77cefa11d7a5ba368b3fbfc85205272d9ed848ce2a9f1f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/en-US/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/en-US/firefox-62.0b20.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "e822437b28e12d38bd701afab12c77d3667bb30e40420db8bee9e7ab85a77b8e3fbf00300ec2711753b25503aa7d2fb870c646ce652335cdde9fca436e04324d"; + sha512 = "f5c6b847ea22bed95aec68a6e4316e0217fab7a4d7426d4b6b57ec0f7f4a6fb3b07e9aa330ce41f0a2c24d500425696bd475583c849556a6011b2b9169581f29"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/en-ZA/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/en-ZA/firefox-62.0b20.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "f0a5a20d9f99ab7815834ef58ded2900f32bfc84f998894b0098e22e33eb192f906c6d8eb95aa6f16e23df6413a841c681284796a85af85d9d8787c9dcd20b17"; + sha512 = "5bed0853937d3777307f2a432e8b05f7fd919ee0f781fd88381e6cb81c43711c2c12b9fe05d85c22eeb70b217710ea3d44e1f599e447c2212209135f796eccdf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/eo/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/eo/firefox-62.0b20.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "722e579e85603f959488b98c45904e65f87d424d914b90df79e1e763cc84602d03dc25891c46c7ff2abb37f296c97193f08e6f90de01b64cc15b6da48678da6a"; + sha512 = "3881270a0874ca0094b27361cdf228e50c01c326f931062a54b5ff774e0c88e36b3df7087f11faa3f7f6add2d4156d385fbf30be4ce30f73102b47e280b3f006"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/es-AR/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/es-AR/firefox-62.0b20.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "f0533cc71133daaf7de1fb200b7f6394e8cf7aa0113f4816096674b588c1d393381cea1607e94311a85621bc58197a923af2772a32b424966b1e5187c9a3aec0"; + sha512 = "44191518ade9f6c7c5f72296886d90b2c649d59a0f64ce7e7b23896f858b95ca12f3d1c91e4dfabe94bfe1dfb91dbeaac536cb121d7e497efc77f1316c323385"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/es-CL/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/es-CL/firefox-62.0b20.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "a12837c9698e04b697fee3b7fbbfba1d69ec795b80bd05e64e0db90e53faded0201fdf9808c8302b7b5cd15c1dc8f092a9a3ad2084da7de58dc1248e03c2f5bf"; + sha512 = "628e49819bb7e98f685412ed024e980a7934c1dcd3968709b8a1f23f449c493a0c8a0edd646f80e131d49d0b22e87a93c6671f892684e677e77207085cc84b79"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/es-ES/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/es-ES/firefox-62.0b20.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "8ed88af39e201686a3c2f6bb42690726b1fb727d1978568f9968d588272f0c90565f69c2ba39ff0d24ea7855206d1ed6b8cb924e5079007ac205ca9962222af0"; + sha512 = "ca0edb153550ffa62cb56686bca81970a6e15ed0f982db35f82e69068e1c28452f69ea09df674aa26171e05832dfe39b47d48d0b25205b689455b282b679c6bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/es-MX/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/es-MX/firefox-62.0b20.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "aa40c774af32560d751b938bd002a42dc144de9ab1f2f250e8c19fd564a5087d635662a50c052b14cdcb845a682b25c805b0ea54b7957dc0f36ca9b26803a081"; + sha512 = "28c26551beb43276c8bcab443e88d52921a6861796bf2c0fe5519bc2e26cb6fdd28e3be54575e300a53186e96238749c61394aeb7a71f6c196ea6e4f51cb73de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/et/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/et/firefox-62.0b20.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "43599868abe6827f8f17cc01157c5ab0a942654be65ad9285282da314dad3e22210a98b3039e8f35e9e3db49af0a18551c4f98f0b2bb1829a3987f0e00d525f6"; + sha512 = "f26a59f6b75d1b85da6e13d02a206a41754e7e8214b41240839f0852b3fb4d38aa75a22556239262ec5551f551582ee7a374121dc57ef32fbb466a089e8bf98c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/eu/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/eu/firefox-62.0b20.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "a9f7cbc0253b10430c0c24648fb2ed5a0a20504ba306e1247a432f7d77d8b2ec9ad9ec2cd3c28079733e4b9ebddfe7488b1db8e3a835f1404e6b579066384d2b"; + sha512 = "60ea439cb2d5ec6dad00e6ea597d5ca78e0f56001703e4f4e8099f695b5e557ff945cd83e48356fd7e78c7a054030d0f23fd85ebc15fd72030e32db1d78b7b5c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/fa/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/fa/firefox-62.0b20.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "51135e2c5303d0d237a7b1016cec133bc2c490ace618eee703a49c0c9dd9f08a8af563a6a864ebc985b8962645f05750690e3a554da2194de42dae397ab97d1b"; + sha512 = "7d0454ecb645438b79137acfba79d8d03cc9d44a3a70edcbf72b628f430b83d5eaaf7bf6d5a5f04f2f592cf6750dfd7667a39907a29de398a926e40b2a36b31b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ff/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/ff/firefox-62.0b20.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "64b32c975093e936e938daca63944ab118df082d04f84567beb081b413844181d574dac1d858084f33abc4bb79d3c154f661775ec0918a052ca59ab2679ecd0e"; + sha512 = "c1f5e4d7df8590fc18844e5bc67e28bb2d5e88c3eca8b1dc8d3103d49f333ce9dfca7bdee432e190d01688ce7b8c58fb1a2a3fea0cc71e5a007d11e411611d53"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/fi/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/fi/firefox-62.0b20.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "a4510c29801a4ca7609ab61dc1429a1f3034a61544a9a59ef4d8b64db7269f8d6f9c25f500a13da4af7741d035a7b29e064da457aa8c3beaea57e8b134ce66ab"; + sha512 = "a848315e5f0b259e6770fff8e275f29946a0daa8f432135ae2d7d94ebaaf0f7bbbae7566c87f20cca78ae0fb512c7c4434dffb322df78e568095ef3b166f7f37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/fr/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/fr/firefox-62.0b20.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "09547877fdb386abd306081d764df6aa4ccc0218aff9f84453f97e79609004bfee2f3d702fcbaef5eaad1194acac7788514da21903dbfa59d5bb54d70bf705aa"; + sha512 = "1a65ba7d442436ef0a8de3c7ea18b765eb933c59a211652a4a472f10e73db987aa2888a9e0b33f69586c6152da5213f1ea1d9a0bf6919a3a5a4b0a352f35e421"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/fy-NL/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/fy-NL/firefox-62.0b20.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "a9d150098a3adeb0a88587e66594c297ea3b16d17a4c7331707ed94ab6c0565c9a9045d5cd863a97ff2d98464bc728701501fe57a50fd7ce6e3d36697be1fc58"; + sha512 = "0871b3adc369c1125e3b4532122610de49a9a4a8a309eed73e4b76a86e4c0f25510c6ab5b37e87090e68d6d72c07519f1044403fea7144c84b6e003294f86e64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ga-IE/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/ga-IE/firefox-62.0b20.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "babe69b1a9b9a469db354546822c9fddb52e17fb6aa196eaf05de24e51cb8a1337994f4d92e412fe4c92de5a79f4561c799cc44cae039e0de6c8ea25a91516c6"; + sha512 = "c99aa21fe8e3f835047c3d9caa167401f7b692ba4be1b7c43a4b22d61eeac1a2e2e5a8ad2567730f310ebff73dbd5cbcf1032a13ff454477a80b30421e1b4abc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/gd/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/gd/firefox-62.0b20.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "68a5ddfb2c450e034a8491ccfb5de00a807f89ee9d65f4fe42bc9bb7dfb7c2b26c3a0eb79039992c7989105549f177f087599ca84a50257417a1aee0920d2f2a"; + sha512 = "8906f71ad07f89647eb43940da7ffcaf97d10845d7ff0a9a89e60601004aba148a5f49d8343190f9b559741213cfbfd840d17e68c3b67a61183647b8caa7d6ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/gl/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/gl/firefox-62.0b20.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "22aa041a0f076ba986f13e835909bbdc0958a61d6ea92933a392b17335e9698b398fb4534f9c830dac3fdf94e8633cbdf1fb9348199b6e60de1a0a97047a8144"; + sha512 = "8865ea0724ea9359e07f59ce65c0a9953710ef963a440ca86e0fb2bd612b0129c86436f1c53b803ae0eb87ea4a710cd49f8fce9ba128dfa36b2af703c274bf33"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/gn/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/gn/firefox-62.0b20.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "a8bed372475435fa95e387ca23189f3d3130055a1ca211e7a51fa74b47835bcf04503bfd65f31747fa30e370ffac644cdadd0df3a25e097d56b909bf8c2651ec"; + sha512 = "dd9e201889a78f8c779aab5da5112c11bb57fcc2e1294bfb078c90ce7f4b81010fe014d5af3ad4a3ae9ae3af7260c1d33a19f5c9282577e5ac562e4493102fd4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/gu-IN/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/gu-IN/firefox-62.0b20.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "067d16fa5afd8fd83f5e27d26b282c80b4793e85f53c12436730b6577b5ff5de009e2da8305a65883b04149f9120dc365de9b2681e3fa4479f1e201cc7ce2385"; + sha512 = "53a97afb17c1a64248c7c0fda8f2a412fac892b075d9b956fc92974dcb6fb2f5fc25377d215cc565d10e353b2e34554a0d4cebe73ce45780e2d5bc93a0af4451"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/he/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/he/firefox-62.0b20.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "d7ae260f75f7d7931849fc55811e26ed51169870d4e3f574a692b92d5454de69428b803c5c9f9d3e090c79857577b02a82820ac75c52306a12eabd2ef72ab38d"; + sha512 = "084ac6281fc2bae1efca509e3f1c2306640c54ae976cb747b6a8bbf6c9f5a962e9a37a3e1219df29acb8f25436782f72e2b388b4d1eac69dccbd628bd4304956"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/hi-IN/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/hi-IN/firefox-62.0b20.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "f508a9889691484120c457b3838b1a6de00af0f7ddd23a736cfb8efa9db1886b8cdb9cdd2e9e134aa44af86e8ff8efa4b4f967ce31abf8d283488e379d01665e"; + sha512 = "05d91b4e6b8411e9a979222d42c82b7772a39653e621339c30698fc5a41d58696614c5677cb41c20b9224d3fcb77501ac436b1681b38c104ff505b1d1ed95945"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/hr/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/hr/firefox-62.0b20.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "ed40057ccbd2da2a675b83f28ee69759921dbefe2490573269fce6b2b671ee1e1b480dd75a773e22ab594381996f1e1f5aab6b0145a8a4612cfcae601439dc9b"; + sha512 = "6b497998cd3d038cddf0b1bb3e940da7993b95c711bcc369a0aef7f4e8b757a3c606fd5c0f109adf4f0648acd770327a5c4550338afe065ba6f85f18aecdc62c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/hsb/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/hsb/firefox-62.0b20.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "ef4c1b377ccd898585b7aefa02bceac1d9d8ecbcd02f0679ad029743222c479f3dc57c211ec9872d5bf2f58e50336d5f248c46ce4d46536da7b0aff03cbaf135"; + sha512 = "6a06093a377b8ec417edb4183bd19707971d35bd1792ba83cbf7ed801f4ab050f7859f4e47278d39340c25b15ca2506594ab70210d62905f45a764e28adf81d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/hu/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/hu/firefox-62.0b20.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "fadf57fe984884b4caa678cff5ccaefcdfc9f560ccb33c8f449ad87df19d3177ab0205bf5ceaa60e5e874d05c1262f3cf465a0723c24453655e60280b7f06b19"; + sha512 = "2fb808e6938b525e5c5af4fdbc4da7a4191ad8bb5f488d50245662427e4295898a7495b4e94066ea04e4f68a4fca8b09b621b5503d4e51949dcfd682f7bce1b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/hy-AM/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/hy-AM/firefox-62.0b20.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "53f7db4751de67b40d31de66228ad0deeafe8216a217661069a1931de3dc7d050f4e8d9a4721df5680a5d784203709fea5851f887b9c22f2b232150b2b969cf5"; + sha512 = "b17e2ae6e42676ee01016f2e90d73d4e43968224669b1a9c63aef86ebab479bf7d10ba29d6102e38db7317ad4befa3d66eff472905a9372aaa7b1519e2c71189"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ia/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/ia/firefox-62.0b20.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "58ad97f682f24ebfafdef3641c59410b6e252bb4e30fcee3c7b51bad7081fd76eaa15e116759e2a6844cf50ce0b597ac8fb7be8eb48618d1615d3654af2a8bdb"; + sha512 = "8cbf136b34e180efc01d2dd21bbec2a5802ed0fe3cfe742a3f4760668cb165bfbba009eef26944a186b1ca8b3bd7b2a4d467eb0665be8a5ea0bf7e57bf9c97c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/id/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/id/firefox-62.0b20.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "e5e8a41fddfff24b958310dc89945d2a89455f00dc04906c0604e153350c99a49b1c051da60ca139928a380db6d51408d8de9299248caa7319e9e2bfab6d4e8b"; + sha512 = "ef9a54d8895242d75b6f0346df227ae3b819a85de4a4c6fd658533fb2e5f32a465374a80e70ab0614c9e833cefebefe44413767ce0295982c062633dda81b466"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/is/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/is/firefox-62.0b20.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "cb2a6793fc7c08d8e6727a12b5449e4afef224b4f764b14cbaece7d9c78abaedb0eadde140becf9a8e5eecf0359e4d365f502545838683a5bdb49a844a1e60f4"; + sha512 = "ec2e9056cecc69516637d8a8d5da90a199dd4f287f85af19dd6fd8cb4d29cd85802b5c578c44a9fb1aae8f7f3e742ca071a2f09354b41e113f64dcbdf78cd82f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/it/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/it/firefox-62.0b20.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "607fb8a8267d125a639e0ae6c906df579874df537fcaa54aaf7d5dd42d17fe1e7b3aac680fd25a18fa4c2dd8cd68bd7dc168bf59df28d7aac80082982cabe8ee"; + sha512 = "1e70e9bfdd3b9346fb8815b1457ae89466c97b22150afd32d60a92c2c51e72ec7e151780398399d4d3a410a3e7d0871b6107018e8ed629476bb6fa23e2cb0c61"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ja/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/ja/firefox-62.0b20.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "2e803d9c3a633f2daba2768299dc3c8f52b67f4a511c20bbcb608962e28189768d242af3797fa06cdabf8a89c3179ce229e690b19eb2f3baab754f30595761bb"; + sha512 = "83e5d827c447081e073daf51a1c842c42a86ed984dc0961548b04b4353e1384b6bf6dd75f60b0058a31281b51401441bc79c0d0acbac9407af6fd6fb62b08752"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ka/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/ka/firefox-62.0b20.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "c6d559bbc1eeec0e26e7b374e867bb9bce9663310578ebe518150e977a46fb9fdf5f23446d37e64141c6fd4da89c6f79edd08bba7c450c78cb07c3e66e5c0771"; + sha512 = "036c2a3ce2342ec50c3c2227f49c4708785ca4b7afaa9324d2708b1653ff09cf97b08be9c7e8ec5cf9713badb0db9ac3b2b1f36fd5e941cc5cff8c8ec9a72f4c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/kab/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/kab/firefox-62.0b20.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "8e7e979c3abfc711f3cb48c5baa61839f1e3973fd35a74964400d402cfdea31a69310a94e49dffff63411a94b169e19a9d508c83553541fd42f307652a72d5bd"; + sha512 = "fced42ab596fa0eed255e895a115fc117acaeed0c32204c9625ad37fba62b64f9199a97bd0794d5d91c432776abbf533cac651ab6156c5e7d1d34998ed97d760"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/kk/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/kk/firefox-62.0b20.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "e13112297a1d154866d9933d1bf6daaeeb4de05f149ad0737268ad7f4fd42c8be1af9c111a2604368c1c633a2e50f009153845b688fd8c7f42e6d94a429c6607"; + sha512 = "89c23113f22f4a16977c91bd5728514b31bdc5ef8c75c7946caba06c7db64a7c1dcbbaea194addccc203365b91d284066f5a68be585873a1d05aad176cd9f3db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/km/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/km/firefox-62.0b20.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "fa9bc4df90efe92d0b803ae0d88cbab6008d8312bc3d3bdb79913eca7fd6864c9141520772f0ca17f85d7763186630410238dd1a3fe8f62915d0beebd8d3027b"; + sha512 = "2b97795dd8ca4ce7d934df392c6863ae7a1824b63e8c8a97ea923d0b7324a1feb42c39cf259b83302240e7ab2f0fc84ec65aa5b72ef36ff98e9316a85eeb348c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/kn/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/kn/firefox-62.0b20.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "10fedd6b5e5f2fc7a3160c7ae8e7d48e336534a2a9c5133621166ffe9bb8ea81cb08dd44df8e92a2db9638df0b6aa7861dafafa436b63c9b509cfcf4e4c26ed1"; + sha512 = "b53454c825088debd764988e3217052039ebb516b1e9df4a06d411d4b69270303a8617fc83eddfd48064dd35f9712369f5cef2e12e4c01e35da20aaa9f53ab5e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ko/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/ko/firefox-62.0b20.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "88a76d6c3dff55eef87b380594ee64367e60b3a42ca8b8a7d76f7d4dce8d7b1e51bf7a06dfd6d2f43e804ac5840f1748a275210abef98dab5f6ba3819a674b10"; + sha512 = "5f40c6f0cab40af75c473e4579510847ffc69b1364af264ab90c9cab97872d685dd62d57839ded440dd34fc6b431c668fdb927d9a58c76f2540239c490bbf465"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/lij/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/lij/firefox-62.0b20.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "9e4bf43b24577d60113455d52eb6363a3372d5fdcc22e63dc173dd1455a6385391f5a676a499f22809b883d18b78c1abe186d328fb2357a464e891d7d27434db"; + sha512 = "772d20d98fe64cae50ac856e2a0d085cc823cd90e8d4824ba51106d473ee3eb530cc49e8e77960ab5585439b9d82bb809ff1c899b3984274525d0cf0f07c6769"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/lt/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/lt/firefox-62.0b20.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "9a56ccd577e112b072a42a65e99a35a5404d7127b438b6522e9787f5b75dcdd20e4d42f8f370d218e48554514059bc3d625f1b13395cc1b3e79fd7069c276057"; + sha512 = "62c55ce5dfbfb14124b24e7462b18e61a7a4e6b5afb2d5da3c79ea9069b3875cbf71c2d9d28f499630ab4c1603bdb0d71a90d30c39beee17c70f4de5931324df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/lv/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/lv/firefox-62.0b20.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "67d2ad4f29ca504ad1b515af5de47eefa48678d70b67b7853273bd98944a4a6398822c2cc0e2135e0fc1a8c45152c939a4bbb06dea36d6917a854431bae62f75"; + sha512 = "d01e28e410b7325b2710c04127666fd69e047ff78046b518d3000271a89d9536ece6ec365248bd3a925e13078ba0b750b469a082b7273bbb02356c3318c46c6d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/mai/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/mai/firefox-62.0b20.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "d969b4adfc93dc808c41ebeeb0b44668d09fc4ae47b6f324a3bac7c4c304ba914785fa1bfe38bcd0467935665e7853e1fc38621b70c2e6dbb3004c9e67c78ec4"; + sha512 = "501a76a99b28dd3d33c1023c95dd1203f321e9ea82a789f56c27fb63ac2b0dc1c4a758535b81cd38fa2a6f9234f5a854899c5c9af70b6afe0db0011d1ed144f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/mk/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/mk/firefox-62.0b20.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "289a00ebb4070dfd94230b6bbc1fa3db40b96f9f10d2062d81fcd8b34b6f950ef87a68a50270220052246adefa046b00e38f63b79200143fbb0c8be7f65872b5"; + sha512 = "734804d2b15cdb34bfb1e3e51d3b4475d0b23ddcb0bc7e5de536c6098e9f5c2debcc53bcaf9ac76bfe49522ceb345c44d45721d4440b3763054c2e0e195ce68b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ml/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/ml/firefox-62.0b20.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "6c85958a7f09075f3c271b62c20a6d02bf18ec36da494f884b3a18b7ec5fc0df91c5ec5a3b14d1ca7501f6a804acd8b56888c331b55c565511a41caba8a8bd8c"; + sha512 = "97eaeb4382199859ee8c8d5f92322bc30eac9aecbea4a00fdebb63ec93172be9225d7269b99d7284edb93bd2b98ed6542cda6e5d65b45f97044c1a117cba53ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/mr/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/mr/firefox-62.0b20.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "8b63d0b332ea5c7328df9dee470010ebc9dd17ae342ef43961e5f87f685646a7cec18a114a028bf0bba0df15e5eb2a04794ee28aacaacf50f75294a9268e9b77"; + sha512 = "1d1677c48b3d829673fb5140891d1b52ac9b9f075b2348c527c5e364d0a3fcb6eb5cae2c0fb255a834e7d94bcb7af03b928151ad397a1fec13d629a2cf37d44a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ms/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/ms/firefox-62.0b20.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "8639a93a8fa49c7ab3d0ee9c9e966bd7a5b6e99d93ee4c675e307c9720f09a485add3f81e936ee4aa1928fadc427e157e86d9497d67d3a06e15a9b7012087073"; + sha512 = "70524b569d00964c9773560996972a6f96079e749389849ae6615a90f55ebe458d0d857a1ea7df89b51d39b5cd8e0bfd65bec6b98ba5500419c8e17e269713fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/my/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/my/firefox-62.0b20.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "3220272d6a6c8d853d5caa4e18351cb9565f0fe806cd67f7206251f0d3d0118b0a8e5469d8b170aad07d0f6ccb805068a5dae79f6c9f18958b68839470adcff2"; + sha512 = "19fb98e2f9622ee33d828df12b2f2ed035abc7c66b8d8c4cc5bcb5d985ebc0a7a42d5d793b102e247da395d8257f9070f3896531e507d50c21575b3287792f80"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/nb-NO/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/nb-NO/firefox-62.0b20.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "c6c166d486eef5540e4b6f0ceed6a1ff638f4aa5e87efa680e03b0108b23679e91dac02eb06ee933981411770967a1dcdbb35afadb1269f8b46faabad92faf9e"; + sha512 = "a5073203319b7e778975c86dda8930fc5f7676b1cd124d461ae0d01d9fd7290a8a87f2303bdb2ceac78eb562955b06eaa86a4111098a241513023cd005cc450c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ne-NP/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/ne-NP/firefox-62.0b20.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "b59dd15e2f89ebe15a361c3a175ee763773d9ef7d85f58aabf775bd16f016f857ab01c094e271e5b8e56ce77114de57e31cc617b1c58a38a521b9c8a21ca000a"; + sha512 = "432b527c41424d34b61bc9ea3c691349397efbf26fd5b9ff85b1e1701d768be7f5f61f621d1f920a696579f5e4d0dacc0e3f91642e2c24b725cb0be16e0f4283"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/nl/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/nl/firefox-62.0b20.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "d363573109c810116b4f9efd2b3f87b456ff3d825808be21754ea34659b5ed8ea5fe87018149178e7f91433b2a7b8c61f7c4a59264fdccaae5acec2344597f1f"; + sha512 = "27bf6e9aa084cf7ff041c0d4d9e380f9becf909309317bfc2fb8f99af81a849975575f8e12c83b4abcf0b1706987f29ad313b352f5bee7a73d76b3c8ce5eb95c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/nn-NO/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/nn-NO/firefox-62.0b20.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "457a86dbd230cb5f87955ac01af4fa58c2b4b625d67bb8657dc3fe01ac625935469b3d72f6065fdbb18a18af1db9b402b4d2540457e8c54bf2816a0a7b667db9"; + sha512 = "62a187309f01f6d0d7c2b89ae77fac381d14d91ebc864990f897ffdc45d068a7d51a5af3371e4319c0719dbf126f25ee4445a8cf30badf02c89a8a756c44f83f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/oc/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/oc/firefox-62.0b20.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "662e3e3fcf70c90d95fed5864a5807ca1ff64058d3d0ea31542a66985f19c9783ecbe0b4becd018ce2760318477a01ce1c6c5a1ef0077293f3fbdb5244b2db45"; + sha512 = "a5d2fa30167f19b9a7d6f05ddc2e374cbf9918da0eb2d12a121c442f48106ac369133d42bf9ad4de83379c315d0e4ee4820365d43191563da07e3908937bee01"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/or/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/or/firefox-62.0b20.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "81d954f0b5e1b8fa820cb9b860a7a09ea5ef4702febbee123c0cedea11360b84fd06d3f9ca79c008e734fa5a7021c6c276b31a864e30a3b91f8a239854feefb6"; + sha512 = "9aa6f12da9a63cd135b7196fcd579b2115a6a3d0fd7dbcd3896d5c76caa021f64e5622ccc298bada1bbf1eeb78dd5905efc79e779c4e46ce96acda18b0f54576"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/pa-IN/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/pa-IN/firefox-62.0b20.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "8bc73c2fa797acb388950921eecae58d4f499f78d6f51afd62218f974e6763b2ee3ee366fcd5acfbce759bafcc03798726d38ad0dbc9c33c2026d6bb6c0fcd4a"; + sha512 = "c90b483004ea2ebd3da65f4b8832990894cd20230aba256ce01b38148378831a7950ad9366ce420d961a72c4bca682bbb5f9ceb027021cb7527530d7260a7e75"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/pl/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/pl/firefox-62.0b20.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "30391e5e9c34347997ba8824a77c60a3ca6fcef1039275c8147eabe8ca7f79849ce4320deb7b2e8610e83942b968e90b484483c9ceb2b9d0dba012aab26668a5"; + sha512 = "35b67fe4b6a526256e0c7b0669a99409064dc7e2f8a1e7d46cf71751b6c2074207a592e8fe263ec3634601a793f56d76b09de8233b94fa410ea391d72db5174f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/pt-BR/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/pt-BR/firefox-62.0b20.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "69d450c2370320e6ed9541185fdb53ac8ebfbfd3a2806525950c5e97d1cdc4c1c587b5bda9f290673e83529aa0cacc5f282650b7d38a43cdc9d179239e39ed93"; + sha512 = "ef30ece766447105ac86da1e324c7a9818ebf7c0a5ea93a31f20ee0e22e3663593824be9db040f02f424cdb6e9ff4e4bb121a57505b0019a0d7579a12ef7fc0b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/pt-PT/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/pt-PT/firefox-62.0b20.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "e731b618af837016e58034014ca6c183215b3ad3aed2cdf21b41b14d4a807f690ef7f642c73906ac72a76cef0f89484261b46b25f6761d6367bc39a4f0ff4d9a"; + sha512 = "b6a571f6c019522d49824554881684f38fdd5df7c518daa35950fdfb7f481ab8ac03d90ce89909e4c6a9112c8b965ce321ece7e317d176394f700c4e0d24adc2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/rm/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/rm/firefox-62.0b20.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "95e5d85c77e752ca569ea48b79c0e1dd99e77532a8176ba61e3737a770a717863485230bc50ee3e2c09a6c441c6d98b7e8ecd432ce281247202631e16c7397dd"; + sha512 = "d72c24d58c415f02b85b9312709050cdbd975f0febae57e39db118d88741c5691f82412e6607cf8c440295ef2c55805512d60a05013ba3020afb4c6723c9419b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ro/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/ro/firefox-62.0b20.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "a61cadb8a75051f93c4f644f6c5a0a03fdf7f8ec376a712a9999755bceb343140ea670df6df643e77900b2b8e164e9a4214a12bf15f5e805d0f30bb03f68c30c"; + sha512 = "e881440fceaabe3bac8b038e3bd4569019c1f85a27586f4b4e16a7b2d2f55f47f520b317ab5e1df238ad41529f00b004b65b104ffdd4ca6055cb07e2de439801"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ru/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/ru/firefox-62.0b20.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "47a4a306eac7388e71a1ce7ebc4714e0934d676315d97f0ba94675fe746eedbf0e3daee7b5605a9fd7109eb6aa8ac3fa4331f5064043ac1b9e859a26989270ed"; + sha512 = "777d3c168580d3686f9b58fa6ce83b3941c3fcfd17eaa84ec31193192019c76345ffa2b416d081e974f050c14d485eaa5862245bb4464c239290c27bf9cf8299"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/si/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/si/firefox-62.0b20.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "36c021da18c2d95d24144b18ba878e6b068abc465c056a913d1693bf2973be628a68f7f4bbd3e8cd822c97e674d61b3ce8251e1e98c1f7e97b98ea93cd89450e"; + sha512 = "aee6dc0e73a06f3aa2cc7ede2890cee4a72d3711510eef89420cc6cdc09380e30706ca3706b14823fa7c7b53d57f7257aa5f5692bf49834178322015b828a969"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/sk/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/sk/firefox-62.0b20.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "c2dfecdd93932eac75af5dcee4e75b7ff0dc5d09cb391f113205b05b4e0bb345606f1e1be1a1dacb46eca9f39d5fd0987d2d4d53ad5f71e771f9ba3703dc2f45"; + sha512 = "6063a5ef564f2cc7b54f89002a67a2e8488a6b62051a61e545c43ea123c95d3a51fde6eef2165a983266423af421d1c915bcb5a80c63aa4bd16a27eb59c27245"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/sl/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/sl/firefox-62.0b20.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "3247716a11ee8b140219a8825298eba191a7c07bbb18decf8284d7a14a7583e80766d2580133d506a3235fec4494e3322635654ed4d1e624990e0a45649d780b"; + sha512 = "76fe24bb152e4d89e9d4a4409bee5c2555e42ef2dc49beae13cf9f26b4ab5c3ac2d7d8bea9d1d257f2a7ac4e68e520f9e7c00529aef46dfc7436cc9de0b6eedf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/son/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/son/firefox-62.0b20.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "d2354d10182ab21d951dde2c2d714f30f855a199a198be64ec81d00f6089cd32000efe0ae074f24d46daf7c99eac7ba88538838eb3df30ca4a59968cacac43d1"; + sha512 = "f641b6ac0915678b88e18d8a4d4ba49f9a303252024ffbc21641ca5c337c8d3d4317aefc889e9ee9c647fe51a10c3755146d1b859955efcce2ea2d2f5e9e4a11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/sq/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/sq/firefox-62.0b20.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "667a8eefa2188422848a8f6af0ed424adb6b8e815c11e3660cea18ea1568d4097342f0d094d8e39e3ab264b87ae451b7873f1a53ae129582b6ed00a45eaad417"; + sha512 = "773904cae848afc33b0b88fa835db0e0ccb62476ae71628cf5edc1190b70edfb2e91fa6583ea473c6632b8809f485e34bc55a5a86f61380cdba5ea4e99880ce0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/sr/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/sr/firefox-62.0b20.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "aaa74d3a4bb948e63e5c0f7ce049822a9add2c30bc69d6c9d96b54fd35212b999affb0c76b6ce52c5142cda992bf7a2a8b33e47e81540a481ef91896c1b86ded"; + sha512 = "dbc995e9a6c690d66e6cecea3012ba6c0825124bcd1f49073ad0c70e740c7bcf7b07a565360a881fa31d13988dc88a7e2038e13f229894d532ba44d0f7f36f82"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/sv-SE/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/sv-SE/firefox-62.0b20.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "f20617ddad0974675faf5872ed5959d9d903d80926a39a8065739a997164e3eecc51c3c5eebb4564916993e1915b88544dc4a2c3fda9c73cba956d65fa8431d3"; + sha512 = "94664f3b8a5090c71d7bf5d66534567af5e88aaefb1b96bfe68398c1726dfd3d139f1b106f1fe743d480c857828bba7877c0d77d3b1a582e9f39762e2f2600e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ta/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/ta/firefox-62.0b20.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "07758ae74963a24c2315e72333a98abc212e1e6d0cb58a8fb7385c224dfdeb76f6af06159a74a0dd3669ac75de5396952dc87220cf0840c2570937331fc031c7"; + sha512 = "05f938e3f3d380e991ea61b774c0afa60681cd90e193dcf3ba99c2d8f783c265f6094b0a3f088639ab2b060b07a9d1f90396b65cd9bfa2480dcd366f3f05a2b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/te/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/te/firefox-62.0b20.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "152dfd4cd0ea7b39bf1eb79ee61ffb77289274049e9b760a5e05001265d3a2029b13db764fbabef6c8b6736f592f55b047cf01330e7e1cd3f058689942095ec0"; + sha512 = "48aab49101dceacc974792ba8b355bacd40569a6571c9e7fedb72574b09b019ae3e78fb8ffaf1f7809f121e7cad7ff581b5555847bfa8067cd7441f131d9b973"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/th/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/th/firefox-62.0b20.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "88ee9a99415036a4a1623575d574bc3fbe23c69acceed6fb174a73ffb9e728aeb85cc80f9ddd3b1a8da302e1fdcef5c1d5501a21e816eed5b19e76bc3b868fce"; + sha512 = "1d6dac041ffabef622b1e71b1473a8acade169f567e98906795c14146f8ec800ae4ec5e5a4ef06a800dbc18a41400dbea6892a9a0cfc902d9d7348a201ae3548"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/tr/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/tr/firefox-62.0b20.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "361201558aab5800fdc3686522fa02222e41271357cddc21c8d89e1ac78b21222cf06ac41189c2eb870fd89e6066f6324b6450a274a25fab273a6d6964d96aac"; + sha512 = "0f6e4854a5f6a9540d78e14090b4204bca5de037fa15077bc6417bc422f6f7cac6f0655b61f9062be6545515a1eb38a54ef5e7d0fe347426424b48686d6928bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/uk/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/uk/firefox-62.0b20.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "1314249f6c869c75888dfdc24a7decb66923760ed10b1db63a245a0843864a928b66b3a831e2e5d137a09f63dc099f8f19c16da5a6e622a50a3907155ed2550c"; + sha512 = "2288d8d209a6392646f10f0fdd2229b281eca6ed9e830ef4102127b74f9f314b9f3d67f03d68aea57c8c99814e46c87a2c27c6d1ce5b31e43e427ade1ea7535c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ur/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/ur/firefox-62.0b20.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "9f7d9c144bec3644d469672840f8854210832a5a47fd8d6454f35257f52de21b760a9e1f70c5ff4042c145c14fa10bce23a080b577060b868f779d85b01b8c0d"; + sha512 = "a1cdd10df63e2306a0907686de28066c7c5c6241dc594350eea456a9684a288be20bb1625aa7017e320d3f5bdc961d8f0945220126448c54ee57699e67f5aac0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/uz/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/uz/firefox-62.0b20.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "be28cb4dba902e706f10ca3db8eddcd18a95ae6ad742686591997cfa7909de2c2d37f4b3a9154708a8ef1cca062b6f5275fe566fe1a33f2e6d56e4ad1b62a56f"; + sha512 = "70905785d613426e585ef75989f90d4ead06f267e49a668c986df0bca93ca5bc409cd1f62d1b4b23de0659c18155075e05aca5122fd2ca7d22c748f94b34dfc7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/vi/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/vi/firefox-62.0b20.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "b576d962621a5c8ff5ce61d67b7a3d08f22cf7cc1a48edaee1fafbadaac4d2633d89385d3d9f57d00a12ad38eda41c6c1428ebf2b9884dc9cb9437c1a84456d9"; + sha512 = "9ff2e67f2be33356054615abe599acb7d192f6fa7525ff20307818c7cef25cef649ef7f26c231d75afcb7e0babdbf4df9ed4f56d5b749a884a0eb17335bc1919"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/xh/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/xh/firefox-62.0b20.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "eb8dd68eb51c7f19f52f23819e934891b06565376b13accd0da0074619cd35ae74ec2f1476a7319f4746a136fb734bd94e8c8faa8db40eaa03ec001db79f7373"; + sha512 = "39b0d603092198f6b06fb0fceb9de7f5787bcb24d3f8129888b00ad5b22e171c396c679a945dae43e8088a662ef2abb2aa94c2cba0bd1037a7f4f5dd3ca2df1b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/zh-CN/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/zh-CN/firefox-62.0b20.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "3982dfaa8067642470e47ac27ab47cd8a2e21b76e972786c333ff7035879ad186e4b8bb95acf70dd7a77d5a65059c0e9f00c47da0a81b0c720f16dfa900d1062"; + sha512 = "f0ae1486ea7155521095dbb2ed764365cd01bca16e7a9520810950699e3a6d0b191488c929a2b9980783976b90e0df7c5999f1df8b67b8f851e133fb93dc600d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/zh-TW/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/zh-TW/firefox-62.0b20.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "ee934bff4c51fe60838457054449d4ca438d4ef163535e583c8692e8e3f3dbfe1d7affe0ecb89e544c22bd7afc775966bd0438094d538451a919ce3da48b7e96"; + sha512 = "7d970407678c320e731de0a4f00438ad7faad0dbc375e0eb12c3956a543279ef379b8f1e009b3f866680ee2122f6383da232f2bd1bf06ababed3ba04e453d065"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ach/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/ach/firefox-62.0b20.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "7036e33fde1fb0b9bf5b39874604fbac9c17d4cd635b2ce473088def9007256d0096cdadc3182a9707ae547777af5638186962170e5e11cfa484df194923c9a0"; + sha512 = "04da51cb7580a716ce70f46ed48b6332342a7c54548280d2c2a82bcac01534bf6ec638bf6090f61794b78fc3a1445dec98fbb420103f2b942314d9aa3db85263"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/af/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/af/firefox-62.0b20.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "1ff3092cafcd0a6d0774d6f8cba93c47db3a0ee7001af8c3f06286059cd5ab34ff8715440a7b8a57eda6bbdbab8ed2230c02117e250ae6cc28297d97680ce61b"; + sha512 = "1acf9dfca2cb878c4fc3ee1ca56a87daac9248a42295d0d0ae11e829768dc4dec8655fcaf4c0843fc916e58927a417b9ccca4ee8886ac5238c37cfdebf8d4608"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/an/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/an/firefox-62.0b20.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "1b1a33f4c826d6e9238db6a7e24e028a2ce06092bc7efad9ce708a06ef8f4e33fb2520e35c899dc703ae81ab12fe9e89813d3603bffb1ee3acd52bf44fbfc526"; + sha512 = "81897f7babf614ce6951f402104bd829e770fe88f6f64335181fc4283e73c6c01c45d4078b70a933525a20d8ab1f4c3b3b23eb9fad5304f0b35513e43b79d15a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ar/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/ar/firefox-62.0b20.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "ff57419c24d73a6c4dedcfd02be88bbca1c78f3f43fb0d1a8ab8eb464eb38a15889d126fa553301ee3a66d50d77f2b8ef88e1809ff7cfce8dd4132c00ef1128c"; + sha512 = "67beeb695048bb70f2e613a4d08e00d2d5ea5d7748e6c8606ac7ead43a9d2f870e72c3ca1dbbc3c7244068ec29a916354ead91391d3cc77b1bee5184c25bd75b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/as/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/as/firefox-62.0b20.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "1c5b21bd57a3d064eafade32ff89070a46f6c13797f504e0aca3990f298062a5ebe074e1bb821253e81a06d9492d902cbd5b9e0ed981aa66bc18d85bbf82d30e"; + sha512 = "6d39b86898ea8169d47f801058874a07a32c2da59d59c0f101fa020b4c118be720fc221cfb59fbe124aa278edd49c828142616b714be0053b1d74beb8dd88b33"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ast/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/ast/firefox-62.0b20.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "5869edce6bbb1984e15c84cde58c77c88732c7b04aa2ce52195857b2a549c04d4ef9af1a90c80845d2beff8f6a6ec1331ec789d7ffd6f7848d2e9a67e76fc43c"; + sha512 = "552d79448ad366770d1f759793f1f792265d1630ecadd87a011eae75f2a17243a1636ddf483afc10e1a59874f1466e8a9bcce5b2b8e31f2ec72be831c9e2d7b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/az/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/az/firefox-62.0b20.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "6b035d2d0ec5b9d2bdba120cc76823970edbe2193a95a5b55d869418213e03d6dca58dbf555400592ab3626c06700f5910869b1a459ecc0bfc69c8f49bdfdd81"; + sha512 = "16eaf530b848b2291fe2ee03489b9414d538693024ee12be223dfca2980ef3536d560b698ff8f99744bf6101138fd1303ffd42002d2272b2dc5fbc5f97dd4138"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/be/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/be/firefox-62.0b20.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "02e0903e940890924f6f5622fceff812c73576c3c7efb965c9ae32dbca50f7b9ec44dce69d127ab9a6ac5b0a4d3bad8fb7b5b5f7a4f7840859b221f5132243f8"; + sha512 = "47565829a3f5859fe1e640263d4c46e2584666fd5e388c4e831b6411c5af0fadbf4e69c14c730ff2adeb14d732ad71031a2f903e86a1c0ebc26eee3126739ae5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/bg/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/bg/firefox-62.0b20.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "2acbe46e29bd576c287add7bbec292a2c306f40402d525611c9572b7751f2122753acaecc441b1f121d24dea922e493a8e0c86180c6eea98beced8c0df986ccf"; + sha512 = "5ba29e660effe660301e9c9f009e3c88c12aca3b79553f8480dc01f99f5858cd838fa9a7fbd0105070f5186a10476719c753514f0005957fe774d845e182801a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/bn-BD/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/bn-BD/firefox-62.0b20.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "baf4938003380adf8136aa00c0f8d0bb08d84714b12bcef2f3403f73d1540e9a289c65991b39be53ca6a329d72f5ea93960e3801ddadcf0f3aabecd64f4a1495"; + sha512 = "ad81b92e79e754b1d88a2292643699d6b66c34259ba66f460017cdfd4739326ef97610ab2be3168d0db88cbd1885a2161f708e2c1b889e5b5f1680ab2ff4a1b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/bn-IN/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/bn-IN/firefox-62.0b20.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "e9ef2861c948286acca6fe8600eddc9adf95af26f9b12349f60896b4aea62c838be784ae44da5a175b2458ce4b1b29894ce45c4b927bc777844aa76d745473bb"; + sha512 = "960b40181a3f4a31844a7b1d63b2211c296b1337d4c072f259e80a368fc5b6554808683eac530068e0b0a155f72292d6a4ebb717d3693e367142841fe325a827"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/br/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/br/firefox-62.0b20.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "0f90520613ac75a78720786a6b1bed17a3765081ef5c7f398286270c92b92940b98b566b40233192f968375c61e285257776ccbee22280a9c807eb7f7e198d19"; + sha512 = "4e1fb7c0155bf06af57abf0dcd10989199063030378ef6864ff5f4cb7410fa1af780c038dabdf3ff6fee5a26aa27592dfb01911e353dd300faae04a8782e4408"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/bs/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/bs/firefox-62.0b20.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "de03884b41c072bea3950d8d920fb6eeec6bdefba4f28295639567050d4ca89efa29f9ab169ee6c7dc2cee2b8127a83853124c25e282bfe7ede5bab9cacdea1d"; + sha512 = "7af74277d78647ff61ad05aaafd1d9cec295f63198bebab083c5bd8817f3c00de6f5ff49d7548fe8b6d2d7e06663255864e6bd6852ee769c465577217366d074"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ca/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/ca/firefox-62.0b20.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "157d6179152e33d85eced2dbda53294d94ef1b217f469bc63483de254d66cddae0d4a378c3d13bffc6f7ca07e669fa2755b82cfc66e5ac09bdcc2f075c3713fd"; + sha512 = "fa050db4fea78126bab3c2ec2db4514f826a22a98e2986c8a779c933641bbb722b223e76b6d7b533cc43f5186a8c978af34603ae4ba1987ee1fe383004079232"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/cak/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/cak/firefox-62.0b20.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "37bb3290f6a5f54ecf505faac44651f8c0566ef2a5e47f0aee4084931afd1226651eb35b66bb9cb2a8e41afd06b2163433fc3435a415fbfda7e81e0f7f3a779f"; + sha512 = "c69d394ef30975c4e546978dc9e64266236727bc1703c5224e721b12476d73e1455197380dca29e4d71b741116a29ecd441423422d398004cade9b009deecb7d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/cs/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/cs/firefox-62.0b20.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "e5098770cc159925e4d89bf27d5d72dcedbac6fbee42ffcdf26694f9d3a0710e5be4dc198241a3236fe06109e4b6e4d86b1dfa3d669effe42adb574141e16fdf"; + sha512 = "b5d4a689fe6b475fc87083ef7be7a31bac3569063baa160b0c6ab8847a12807f8a1e9c3e6d0c2c3b49ba74f3b93514211c084a99b9406bee369d0bbb78678b71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/cy/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/cy/firefox-62.0b20.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "ddfbe195d60b949637f33c627aa9a4c9e2ad1f04788ee5f35040e251aac303f8876bba7d350aeebef11ae5bada037e31f96b8f46771ade8fa425b70d2a4a759b"; + sha512 = "baffd6932c5fef0b4e9a652ff4c892be693abecdaa0757d8ed1ebf5aaccfab34d0856a8a156db252892b8721093302a03dda65ec510837cb31713c3a803a11cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/da/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/da/firefox-62.0b20.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "40df7ffa3472e2bcdd35a2549e6ba52a7846417c92eb058a84e32dd355e7c6724b6b75fe617956b970ee0c3565450f9a84458d86eb282b1f1de8b789c6eca2fd"; + sha512 = "bc4a2a7eec60f6d4ef8436538ff4067a34fa6ead9d75b4f88b24ebb6d3e7712facad4386423b3c2dcef6ae183891bc71d0e9062421fe5ce7725ff564ac042b70"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/de/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/de/firefox-62.0b20.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "3702da040d3478a4562a30f8758eaf5e574ff664c1b2a4a7b676a436e4172b294fdcc120b1cc043c3d060315c10c40a2f0f9506eed6cbb9dbfc80279d65f76cd"; + sha512 = "470d8758e2407781308814bb581b68ef6d46bd918c2a7e2eb2cade73012c79ae01796fc2df8848ce92ffc3953d180a0d742d1da315025190d1795e450004cef5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/dsb/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/dsb/firefox-62.0b20.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "54a5c5d242579314997c41b0e26fb7751f19c97ea9b43c8ba1f3a7dcb5b6681123aef82159c4be9600564062b20667dfd1197be0d44e6b9ac3064d682c7eb2c3"; + sha512 = "14f9beced9df9de025550b06a9a418e4d37b8978025068570b955ab80dc1a5a87e43f93b92e145287668082024eaef91916232ec1736070af6e415bfad9f6c56"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/el/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/el/firefox-62.0b20.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "cd76f6f7d54818e8ade65147921a0160948500d7bc9cebfaefd1c8a2dada91a2c5bf277222fbef1421ea9748ff799cc2213e300dd1c767c56b4b0ef977dac556"; + sha512 = "a52072b717f8d557fee3e4536cbfa436ccc87fa9568837b58494ffa6f2b3d153ee43378ac871f99b7afe62ec6adb831805ac7e1348b2b395360b79d94042b35e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/en-CA/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/en-CA/firefox-62.0b20.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "046c5fabaac28242019b208ed66a71d1824f6e055042576cfb8ef026906dcd7b25ad75aa962ec609884967288bb58b78e915865d858b8620123c0168637c3364"; + sha512 = "71cadf96c97c236d0c9d4bc8886368ea5a9220f5fcd63a4e54ccea90de606391037bf87e4fb8deab4ff3043c2a0c8d641ade107f60ac5e7793ef1e85c031c525"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/en-GB/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/en-GB/firefox-62.0b20.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "852c4763231c2fa64330b417a1eb710e8fb04fc11821e2881697e8c3a42d375478a37156efb0e23839f147074b8116e29ecd6dff04e77a4a9b9fad57d73fe5c9"; + sha512 = "0b7a55f1172239857ddc9d75a14061e7b5feb5855fe8d5e07088300f64a1e4c0c1521d1db5a8b7b05837223d1ab43ec5730d8e706953a14c9fd13ec3c73020a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/en-US/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/en-US/firefox-62.0b20.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "68dd635f30b450c6501617fabdfd0104ac9ecd89a9c400acb1ea7481782c4fd4da601531cb13d0ca3a79be34adbb62d35b70ea9d275339319da39915e51be6e2"; + sha512 = "1622748e3b656c8703ebb276f7a8bef4b2f6a593590eef50bf0e9722466d49a33ea31be107e3879073dd7b2c4e7ee3e2eedfa89b3e723108ced6a34ec3007868"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/en-ZA/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/en-ZA/firefox-62.0b20.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "1e287c91c6451284a62c27d91916aaa2adae0d66bd7b2fa77003b8a5ff5030fd7219a42b9cfe6b1d100303a7758f591e88489f09ce9c4c6240b8f3dab7ce3044"; + sha512 = "d5186d4172f636ecc4c39c60d32c80592deffbbcbdbe518e88eb67d3c56d8095ba440ee82af3efe138e78d3ae40b8367f5281fcf2900b913557734978f741354"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/eo/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/eo/firefox-62.0b20.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "71466b5a790cb8eded34971266c2d8d21204b4caeee5b6497d0bbaba176417f1b89a2644902942b47e10a4656bc522339db2a0852470cfeba5e9d6daca731dc6"; + sha512 = "e0686beaaeb880be30604a8a5ab0acc541df1020dc2de3757d5fe5e43a1ad6a7de603d5c137569cb42f5dd1f2845c75392cd276815512231116991a5e54f1af7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/es-AR/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/es-AR/firefox-62.0b20.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "90c6a17bedee44faca5e01f6982a67afd65bc05ca604c056c427ec4c52b7d96e19de8d98751e73dca840e33902080b36bbadcbba7cd1e89c8147f89d324d3893"; + sha512 = "5816049b91462845cbc4eed891aed168836e86ac2935bfb8d27485de30a7dacf83bd765016b528465b7aa559dda30034ef2195a98756aa5b17a25b96906b4573"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/es-CL/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/es-CL/firefox-62.0b20.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "da66ec9771e13333a5def77cfe3a744d05ba9153ee21f604005340aa2b880273bc1c38066107733d4e0abc0ed828afd1bc77f6ee2be5e790f15a6e369fdc8b89"; + sha512 = "cf1b7bdb35d5bc8d30c805c98e3a0843f714cdc2f79ef8478277356032bf8eaa4c013901f46662712b4b628d62e2f6b1e9520e868f39badcb0dfa56581862699"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/es-ES/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/es-ES/firefox-62.0b20.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "4daa9db65e3c4ef3479ba4e0ac8819e8df0b711d87e9457ed3a2025fc9a0ca7de06f2b5f7224364798eaf3b0d56ab81b44ba5e2245cc8f52dd465312818f4c6a"; + sha512 = "ff873d670ce9b20b8ff63bb8727a338b3bc0818f0568675f1a3fc6bda13e8f4097d1bdcf6cbaf651ca89163c8676f9492103bab682a8f9956b43c2686a51df13"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/es-MX/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/es-MX/firefox-62.0b20.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "1da64fe7c723606ff7b2d3502b7d4cfc2f0866a78649bef876ed8e357612a2bb2eb37f85f0e909f5809937584259c5aa92db2976a5e358d70ed3a05f294f41ea"; + sha512 = "253c140c390c3107ce16a9c2f73c41a71e4b080eabd049a5c1f65c8fe895bd3ec669eb653c8bad55b00bd65e97108d85be18e1edd1ba7457374fdc0b9d82d616"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/et/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/et/firefox-62.0b20.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "fda5d73cb75dcde2f131eb0036f3275761709dbbf5839cbe282566d5370c4daf81966250b59bd3b5db6bd768d939062f35e88c3cd454cbc10f2b575878324f26"; + sha512 = "cec92b0815fd530f3dbbf195104c6699e4d078a4a35353cfce2425050bf62811b093e4276052622eefb60d4f670fdef28919f8d83e273a27c7c9cd6b9725f064"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/eu/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/eu/firefox-62.0b20.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "21f80e21f4f2fb496298883df334768c096f834c5dd82a71720e63a11d94d64515ae692f192bf540c13bf245497cf8c37776bd1c53fa57158e751865a0947dad"; + sha512 = "6cf19489fccc70da26bb2b28f8d036a402214ee785e082e2be7b065f8420fd1057e3caeacb42436955a84467228fbcf2cbc62f871fbec959a4461d9555ee4fc2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/fa/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/fa/firefox-62.0b20.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "f254bf9b8715217a62fc9b604db47aaa2985864a7cbe925591cdf4233b81bd73acf5e7eb34daa7506400d5efc86c9eecb8ee9ba6dfaef4e43c03142ca595ab3a"; + sha512 = "5d540a7f403ec92a884656279cd4e7bcf7bcca72f25246894295f2f0d7271b756b6851d68d925f1853e16be14c4f9607b2284a642f4438725384a2ed18e8def0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ff/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/ff/firefox-62.0b20.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "0c0b97a0297e886feb7b18e3081e460fc3f237365ed04280a1587814631261dd1c8c35a0610659d43e70a36927413ef20e46067c13d0daa6e47b9c3f058bfef6"; + sha512 = "65b32a30ab5bbe626cbd1276eb0fe4bffb60ac5651ca6437b0887a0bcbbf5201aebc74c3a80c92baa1a56e60a6852b32fe7ec7228de99e9296deea976c6c238b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/fi/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/fi/firefox-62.0b20.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "318e324647c847d6a12ef0bb74dcf2d75367b423a9c2d89222ae4a193f9f775ce85617e9cc72d3b960ed216a9f48fb67fd0f51dd36e2ab8330208866a852b04d"; + sha512 = "00515a094f79ef0817bc3bc392ab9d4effabd68748d0de0f6c0cb14e7996b97fa48df200e1444ccfc2810c80252ceb22b6e87037efc476dc58330f9af712bb05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/fr/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/fr/firefox-62.0b20.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "c9f7033354260a72a24f94f481f5cc67bf91fbcc9170a63eddc48307972de57b937d4fa31e1eab4db1ecb9dc1f05dc56b2e38c35a946445a1d77535a1d41b433"; + sha512 = "2a1f2b26f3f8031e2da3778e375b889793bcd87cc2e21b3f26f16a3aa2f4043225472e9be3c8e914578a59277f7bf42c929a2f0d5475041eeebbd8d722a67c3e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/fy-NL/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/fy-NL/firefox-62.0b20.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "08a6c18f6b4beaef405e9e9292a197c42510ef50a3071fd3c20687a94ecb2bcd52076a234fbafc4b9be82c8111498d1fd35468bc604def726e3187e9119f496b"; + sha512 = "669f1c45e9382b81aac5c612fc111c9be716e662f0a87c7b0c9f536277d010203438c09ecaeba58c87cb91f979427ce389c5de9d55adab8366d36273a4926ce1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ga-IE/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/ga-IE/firefox-62.0b20.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "f23c2be81ad724862b4408560c8b28b28a9133290a1f2af37db4afbdeedb713cba0bfb23cb436c671ef1d4b42fb10c2398416e347d75afe3e77d215a9f0349d2"; + sha512 = "c6977760950f0121cfc61e7d130f89965df9cb6d319389811bfc08b6acbce34eb6d644b3926f4b2fe4fcc735aad1a1be447dad8a160a85bc543d95d2db3d2b36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/gd/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/gd/firefox-62.0b20.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "46f1069551fb83ba5502438f27082d591f1ec4d24e689c825115553baa6d39eb026203de30bd6a50ff082a65b73514e7007f0419375a05bc2acebd38d323fd6d"; + sha512 = "cd1d2369a9609969f52d08012bab63ff82a795438ddaeca2c17f0df69a713df209b455eba32112cd571769f0a7a8cf8f8eab718a597b5f795f05b6867e88a382"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/gl/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/gl/firefox-62.0b20.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "6864803363c3f61cbb8bf903da7275c90f8fcd0d8997a9828392e4fa2199d75e46d5690c55fa8980437a999af3322cc5927cd576d675602c049fa15b605ede1d"; + sha512 = "a0a3bce700746a50651a982ac7dfbdbaf192f10f0e443974ae088c9bcf0e2fe6eb96d3c406138bb236512bd6b1460b0e9005ed370f38520d4f618d090e58201e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/gn/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/gn/firefox-62.0b20.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "9932f1f2ca3b0646bd63aaae3bf118e91f39957581ec03fcd6ee4138abe00b9142acde3afef6ef31f802f9a5ce5e64755af912fb6e70d49f9baf4abf497fb82f"; + sha512 = "d609256292a297f959793c39da5d91ceab2a409abe9a560b47fa51e8856fdef2d1af2bfc6a4b2fe870f4fb8ca175c369e9ad9029df6070b7ca12205b712a6e21"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/gu-IN/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/gu-IN/firefox-62.0b20.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "b0a216cc4194990b993ad31156325ea5296d16901a0b6cbb3e792142ddd7e38b728331b68d73d2878b24042d0015ba7a0550d3ddb1c5898119a9cc4a5e91bb7c"; + sha512 = "c014f45aa1a46558a67d80b177f8f22a01f250b5658149c64056ffcc2f1f7953f43a0e6eb21b7c8ec5d4e7ce677f6620fd87454a7d65d145a3609e29c7b2dfc1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/he/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/he/firefox-62.0b20.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "123a4d8b8be454276ed6003051adbe2c87f0222d96c20902fce3820efb5149c4a1d8af13763974339936d5d1b25695ccab68f7d13d773899f19c2346735ebf2a"; + sha512 = "e65683aa8ffd57fe3563c8b7d13087fc473eaf240d1acad36a23be418cbf41a543ad4a2226df16ba65dd3bd6d309fd7cee162b60485c58ff5c4b61a1b2e25b5c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/hi-IN/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/hi-IN/firefox-62.0b20.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "030dd5862dd46ea72079f0dcccd4439bd766b98072d7e0d92d1260a1c2e2f2f2e48cd7a8ffe0be25449c5598a308a18093e273338eda2bb49502a3e8afe6f670"; + sha512 = "2125df51d6209b702c1445935ed44de5fc13b218e44f199300bbfd1efe51fcfa5123c47063f5e465a542f34f5a8f7643ace65aac433f76a2db9ce17a4a727c70"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/hr/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/hr/firefox-62.0b20.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "c7ce79360d517ce4012ffc0c472e04139e2e65a068a97e38677e327cbeca054f54973dbc1344e1cfd36155e17d5a3e9a13b118fae0a3251d1f6de36bf45359af"; + sha512 = "85067ec21e29bf7a055c5a089c829412a703985e0fa699579edad4f4e01a2212d5068212b93455965f469d71b99e374aeb512cbb8f83228b5bf66e392a5c26e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/hsb/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/hsb/firefox-62.0b20.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "397902ace1c3e21d564e55dbf86a218408df70fcf185a4b30406abfaed6bf8e1184fb8077d9b606a350100ae471484bb4a48c433bd889cc38f9655e7475a2949"; + sha512 = "5eacc1b187016d1d9202fc0755dc5eafded40552ceb34ba6391a15785a720bd13b01b5e451b5fa013d3047e572e460195236c6acd98c041c31e50b5f7ae1c0c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/hu/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/hu/firefox-62.0b20.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "982a9b5aeb1ef8762828d0cc974d8a7b77d457591f662a35f3d0f56c158aafe6b026bbb75b8f58746f4389afe08a90240238fac7994ddcf7ad1edc8567f3e547"; + sha512 = "b820778f6ede465d2047c2a8ef6e509983647fc0ce8d829ac38a269fd0c7ce9eba0c9ea6f1ff53debfe934531794e78a71c3c212a716a85c6f3cd866f832a841"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/hy-AM/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/hy-AM/firefox-62.0b20.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "32d842954afccfd9433621e9d9a7fc7c4ac3915b07b0e85e7caa10dad55e338768bef50077d129368059621d3af3354b5033077517089c1aa70c8d21043735bf"; + sha512 = "6859c52b6a7265a14feee8c41d969d79c9e347a297dae320e6fd7ed17e8d306dbb4775df49d907003ba2c506c00ce774239cf3afddaeec78bf8d4738af555fd7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ia/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/ia/firefox-62.0b20.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "d165c88b6288f10eb7b5f11402528a077b22cde681738d9371c4ecc5fa01c691593b7599cd605224631aaa3d93eb05d89923a939aa025a929fbc35bb9f09ae1b"; + sha512 = "20fcbce5d73e2cdc53f715876d5863725cd2645025ecc468f9b5a9c73aed58676965279834c2ac3daf9fd439fff6952ed398afb356ed210221e6c4cba0803601"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/id/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/id/firefox-62.0b20.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "1324b6c140db320d6ac43521091b9b77d52800e76f3f9741c83a7382bdad8522b8467c75d82c48b61d0018c40671e0bb23870b112a8957cf8256a72c009886c5"; + sha512 = "b7308aec549714ddd570fc0347db65ed8692df6c9ba8a98b01f51671976232c6ab6b3deadfe952a6371b05525a49e480fa34cefae6b11a11a81e0bd8c80e8563"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/is/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/is/firefox-62.0b20.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "6b10cda6efae14942aadf96b3d1a2b7ae58790be601ea46e04225d356c5ad1109eb9ac7a6983dfa21d8c2e6710219f8d3a05605b2a80a498fc6bddbf2abbee09"; + sha512 = "1a4b499fa6a14f2556456a2aca27a636a5396d01f5be9ffd324228c2f7c1a63e200320e33852436187cb3a301a0992b4d4ce52d40dd3b62360bf1aaa572007b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/it/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/it/firefox-62.0b20.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "f43b85b59581eec108f882f8bdf2886b658a00b46c9f651a28d9cfd09af02f4c49b70ca72dae5cedb26c5ba246e8b01dd483dba6de42da170f12a73a6f02e87d"; + sha512 = "86bcde5aa926466b1c49c3b0e1fe54b011816a08772582b35b7d35c091809c4db9b8d63630029949172709302e65b4a7ef50a8ef60dcc31fa97696b08d3e7b37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ja/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/ja/firefox-62.0b20.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "3f2e08852c9400ec7e7402b5d9dc97e0002ca4d3099e0b101697f8581e8ef318ecc77f286aff1d33d945cabac20e7af4296327a25bfdac44293362ec416d59e2"; + sha512 = "af6b46c0c452f38a66333b022191a37f25d24792bef794a34a1f3f5aeb9ec88aca4f7764e4221b4f05a7148b37214e1f8121058f30ce85ec639d56132e6f85c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ka/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/ka/firefox-62.0b20.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "a9d68aee2257e50220d739053c6ff18d8fc18b8ed56e49e5b3bc49694805575ca427c7f00f4267f52700d0880f1bbd39c9e9b18a6b0706454024e46f4de34de4"; + sha512 = "3d7e18abd78e4525803ea45e7d47fd9157c1577179a449aa9224704a467afe4cea4b9c2c25117c05e91c8d4cdf096e5a3d9e478fe0b391695b535df74ad5dfa4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/kab/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/kab/firefox-62.0b20.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "01b17ffa5140f86e5d51bf8093e99fbd50cae29e7ffe6813b61c6788a0363b7edb2680cb922e9172c7f9e2f1a8fd934938a3883184f9a9cff99c597b65663919"; + sha512 = "a8221b5079837075511af6e94a99a0bf3b30930683956ffc862966f4f3637afe11ad67ded04e98f609b885dee65c2f885daab91d4150585d0199ffc8cc5c9958"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/kk/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/kk/firefox-62.0b20.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "8403cb0799b57a5dcb703f5aeb2c75acdf1e141785bcc91097eee8daacd51cda79c31755fc71c608794440146a8762ea53f20ab39a62870cdefbe5f59448b930"; + sha512 = "720813df718cb5a6a6fa464950857ca262ff6784d53c85debe1e172a992efc9d46092b55bda7a13df46ac453a4c65024c9fcb78d544ac19976afcd4169600e93"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/km/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/km/firefox-62.0b20.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "75fa171c93bcbffaefa44b5c8e66ea049e6234f4a97d51260cdd14a2beb9c9a62a1bf05453253afe6de5f7cee5677ad3ea96cf151d7632809f2e50fbf21d7fa8"; + sha512 = "1da32f65cb39f0289f3b68ed645dc6dba1604d0cdafcfbc41ee05af0d9468b49af8f0479d1391150284b0175bcdb5c0386137850afb7f026883597662f2c69d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/kn/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/kn/firefox-62.0b20.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "0a6ad18cbe339f925d6254a314ef0cdf3c3b007765eabb96c3decf3b17b359c7122bd4346c5e3b0539236defbb7f31cf23dc0b7971af2d008618bfc60d932047"; + sha512 = "997e6a75633829c6a981f647a550a716232f72e385bb02da03e52533a719bf702db2f4d5972237611ce0c6ea320dff071094e8b10f6bcfbf4bf17613257853d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ko/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/ko/firefox-62.0b20.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "2daee318ce7984a519abdbdd7cb86fe87689c21af736b25c6e942518a50ed8e83178d2a16a81c61d829cfd5c87a657f357b6d23d6301368ed4bf886f07f75b97"; + sha512 = "28bac11d194b40f94ac2e951a5a96fe05d21624d72b1210669c8cf2ca094b3c017388205072b90a8bb94207f9fd9d8beee93b61ca557837ae96a4c567704083e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/lij/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/lij/firefox-62.0b20.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "aa64a352d7179b95f95a3a5dc39bedbcfa96a7c77686065b0ee5bde8eacbe684cad1231cbaa9755c4476a3a9a4187ef97fbeb6741f18afd2430ef43a6f9a8cc7"; + sha512 = "c3c3a6ae74919acad82a9c796c36bcda9c25627a173897f67f9270adfe2a6b44ce2f1c3dfe7dd76e05b9bd772df2f88b40c0d6794e4b355bea1e40b83b48688a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/lt/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/lt/firefox-62.0b20.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "4505b712e03bae127f5168c221360543f29681aeeffa088ad66631dfb6c268c3ca24bad11c84439f690ed4a4d67138812ee74117644a803b1345d548638eaf89"; + sha512 = "30d70a30c0140e89696e457ea799b5575e3be75ca02954c46158aac96f8b30e94180715608535c8e8c43f09506d218e253a5713463bceb03267004c5b82a6aa8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/lv/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/lv/firefox-62.0b20.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "bfc47b18ad8ee9c65c8520c8b57214d3493c897d0d1bfbec32ad961aa740217247755610b029039c0282932b8c1de19e9b34d801ceb96b3d4969829944de1858"; + sha512 = "4c089810bef9c3ef475a178d9e64c379ebb2f120f336240e8d004586ddac300050dd46671ee4f3872e0e6ce84cea09438f7035685362f8f66b3c2748194fa61a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/mai/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/mai/firefox-62.0b20.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "1d96dcbf58668827b055be628160c90f4e2d1a3e8178cf953e89e30e9bb041ecd5c1d409be905f6bd6d1780dd278ae105d1a82ec7226196614faee83f333f7a3"; + sha512 = "cfe6c4676bbf009256c3cf9e7b4533236ef48404664a27f8767a37b40046eb3f418921f9c5c4789c8db5930dfd940628e026ce1dd8ba4ca245dfdd97fd5f564b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/mk/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/mk/firefox-62.0b20.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "71a561df96f60272e7dded20f30ec8632d8df0a675ffa0730b1e2c61e131d30f70f710958fa38d5bf647cb372b763975cabbf11b81f187b154af3416aab8d2c0"; + sha512 = "bcfef6667c8e7a7fa8695483d8da79c2cee101c6001f24a10ae1d1558422d4f250ab1c1c55370daf5c913742e2655ab826e0302cc91117d134fd124c51b18a00"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ml/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/ml/firefox-62.0b20.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "563beafe7aacaeeac411aae9b2fe2706d9ecc497984322caa6ba4e44957c24f16e06e1db90605b4085c708f563a416eaee15d2b7daf9ac481c947957ec25b5fb"; + sha512 = "a199e177f361dacc07aebfcfa6ed5e28a07cbcafc766c7f7e86f83d42e33680d219ee79d3df3c55f0025aa3ee4ac2ef0ace1af1f83ee6ee536876aa9fa904015"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/mr/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/mr/firefox-62.0b20.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "bc728d67aee3f0e831316dda5415efdcd5835d3c4f29a575cc0c2772703551b4752ace541d9535f9da56132f94fe8ce116ca19c5ae07b70958fdd934f74c151a"; + sha512 = "795079bc0cb4ed0d6ff7e4dbffd9ffc5cda8f5045402a22e10689f88a63e0684d99d74d896317dbaa7cf2f1b3c2a4701bbfef3fec1b5bb8f1e132b7848064a00"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ms/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/ms/firefox-62.0b20.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "b368091fb415d2397e95029728a5e97e07b78c2d2119b5e3d2b0d00fb0fbd3484b397e7efa1976adf61cb8de3cacd63f7984b0b9341979a9e3b2e1b61a4563c8"; + sha512 = "919828730ee86c893563673c27cc81ff99a9831bcf20f5d12b630b89306f7bcec3395c289b39d9bc41804e45c66addf8307dc6de5777f0138f397d9cf4d01048"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/my/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/my/firefox-62.0b20.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "ad489157ff5ee3932162741e4c1746112c161cea1780e8c7764798b765aa1a821cf794f259d9ce5c3c852f575af6bf0112ce2ef90259b9432cb9c57a76508cfe"; + sha512 = "9d0a31384a9cf43999b4edfe0904449e5c86c5f7a55f83403f5b612a3df260a24f78d8a077f27560d9c95a83680aa58fd1f0dc43b57de1f9f9eaf5d7125f1f0b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/nb-NO/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/nb-NO/firefox-62.0b20.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "ade119bcef7a54c05fb81ecaa30b4543225d78490f93611988d9df10992aedecae962d9d50cf6ecb09e9e83466423da8714c5dd9ec2d5588f0ca2d3fabe38fa5"; + sha512 = "0bf6caf24367e8a86692b3bab88a740f3aeeaaaddab7c9f475daae259c6348a6b61f20b01c2d8c611aa26ed61e87fb158bae8baeddf335849ec4168531306877"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ne-NP/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/ne-NP/firefox-62.0b20.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "a375b759aedbb9aeaee233b2bcc0d9c7958d2aa989ccc6cb7e6100de6c10b1957fd0a73ad24620db1c0380f455e06559bf6b991f6616591bb547ad247d15703c"; + sha512 = "9a871db32e0ffc5126536b1de4647aac0e081126ca0c7a042188eac8ae3dc80d3912377714e42f2d5d851ccca3afa995249dbf58e9a4e2203dc228aab50f84de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/nl/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/nl/firefox-62.0b20.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "06dc4e376936fa64ea081d047c224baf43dfe14eef8a6f27ef9ae0d475f5dda5bdf171432061e31bdf368da0eb2ab6b694d31df868a86c9ac0636ee701da9fcd"; + sha512 = "4a5e884f833ad8d7d66050f95fbf7f856513ed6d2fa3481df3b1ad71ba78c0711412890414dd8581a080156d05ef08118fde9ef2c13717cf4af4bfb67c7312d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/nn-NO/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/nn-NO/firefox-62.0b20.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "6bb9bf90a1e0e747568f97b82f3b35eb6f552025a6d2e052b359e667451e336583c6bdfc6a3746d24a3bc5ccacf72301cf079811046a4adbb221003a70e89da5"; + sha512 = "3f2b4e57ad161cdcf31512b0207c0c3d7ca810bf897be5d6b9fbf41f4f84898b960e61cf881f19e5ebd886bcaec95612e11aebf78d4894b6c6cb6c6c1c7651bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/oc/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/oc/firefox-62.0b20.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "9991b32bdea0e392a955178f9b64dd243e74da3ec95c52a9dd5b42e399534893503840cecec8329cbf2478b58b08b94b15c53288a02a12b2a41e0af12bc0ff08"; + sha512 = "a4747101315a61f7b2f04b58ef36540adb1ec941eeee86ccdaa515f408b15b0f300f8edd3c7e81ac6845a80aeed596b0577c35d64e626f90c981002886747604"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/or/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/or/firefox-62.0b20.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "e61e0d63ae95aefaa17ec5ba1b128bf0bdd3de1a81037ccd61d746021a32d7274530acfc332c1b25b08708f03e0d15fbacea1c9d9c196f19c77fee2305e255f9"; + sha512 = "93e76f3f570bf6a053551bf24fc1dd04e13e3032271122ee159d1bc72828a932c0ba45d8dd7f80d5f0638f39d5966a836276b2655e3e33d1c141dd038fbb196f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/pa-IN/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/pa-IN/firefox-62.0b20.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "49149c7636028e69c61dd8129fa149037c5cd13aedf1e83f137ff5cbb4a368b0a222c225dacc213f31ccaee323f31831b5271cd8adc04ffcdadbe6d71943963c"; + sha512 = "7fcbbd0526596f106f062cdc48ad61989074ca3357aa725df9e32254a74208f8b3604569c0ee66e1c9556fba19bc7c38958d1b779c1a2444527b92bafae0e021"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/pl/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/pl/firefox-62.0b20.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "a1827c77ba0d48903f9e4ac2ffbaff2bd404db41335313f27dc1e024cb2b5d724f67456f01d01c0eb0406141259e351e1d19184ee6bf61660b8204d518c7fb4a"; + sha512 = "d8e86a809ad774eb43a20f2aaeafd35f0dfc0710716a41338bbb0e75cc9a2bef5dc92e671d1912a902d484a77a5d0f578633d180718653ac421d0b744c3db567"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/pt-BR/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/pt-BR/firefox-62.0b20.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "c8dc8882a7f465a51813c09e46a07cf0ba42b4be3e40c7adfeda22238e8f492c74c224fc54965cc9a1145fe82a0eaab61ecd64503c1870f341825c3054cbf01c"; + sha512 = "0b02882448b1c2c1b164ee5a8b79582e84e989aa42e03d127cde10087097db57887a31d7ffdf6960bbd29e8ab7316fad38dab61f7bca58893adac25e898f703d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/pt-PT/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/pt-PT/firefox-62.0b20.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "b0376a03c13d892b4484ea207eb31cc2e7db1333d7fec82654a96cca1ca2a724f74f552f1baea2aa9c2580055a9aa934d1a2ad3d4ca41b50ac554a9f65b7146a"; + sha512 = "82b714e304f0f358b66c2b8ec76d93aab65225c16afdeb2041e1eb6e2617e969dd7fb123158f186194a36c57a41eb9e7b25642cb60cd1ab6faa7c56f031736ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/rm/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/rm/firefox-62.0b20.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "f356ecf9f19a8fb314340851f101375e7667d8c99792398ad5e5c17745db181c1a1e3513ac56597f2d75bd915a4c6a6c12f3ac71682aeaa13aaa952eaad9477c"; + sha512 = "997e8d1311efce4fbe0b4ee9d76e7a9f6fb52eed6f64aa89928d62f251b38e4e7deee42312d6b06e417db7932b3990e9936f8ee2306e66d4bcc0200c747af2b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ro/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/ro/firefox-62.0b20.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "549a9b2e1e6e7935434186ca3d3c4b97520b0261fd9c3f95253ace286021e43785237ff7d3afda5d497dce366eaea09e11e172cb1271031f3c1cab0c55a07772"; + sha512 = "9a658f5d770fa0192374e29b82a209895b7f684e61133d6c7f83347087d85de291f8566fa4597cede1a8f8a5bd90b491c7a87392578ade07da911ee9dc4bfc8f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ru/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/ru/firefox-62.0b20.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "79256f61f98035dcb063e45ee27c06eeb1e088e2dbe4429b1a5feb2664b8b37b2851f23c836d57e0272b9fed73be22ee029373107b2fd19813f7d9466ebc5900"; + sha512 = "fae3452c17b0b7b4b309e1fc57c027b1c1ea24f3722c6e15bc3907d239891cef6f3696fbb901b76811cfafe566dd94b0f16c9f9335edeaf547caaa940f57c2b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/si/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/si/firefox-62.0b20.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "907241d6ba61f53ead341cba2de045a8e6c31805954469a84792035472b9dfa6f8175716f765d332590259651fb5e17a96d1fa3d4fb0f12279b6cda9d1f0c5a8"; + sha512 = "a2b5133a8f8efcbc5ab1a6c36b95afcd21a89e048c3f3782760ab9608ebdcb0afa72d8eaf451579c0bca196346d4642ae96b885d084921388240eafab580a80f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/sk/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/sk/firefox-62.0b20.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "a8932f837cbe336fe74a223196f2f3d4383be4b1c8f53d793fdf9a9fb66a65527fb65321160df2eaf1328c8b1cafc7558c3e14a06d7d49bd93f24657e24deb76"; + sha512 = "ceec1a45af1c9e05f327acb520ba6df722e0fa416a98821350cbf71f73e2fc9ff3172edc472772441236bd66d9ba08918dbf76e864dd87c9a028eb3d274350d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/sl/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/sl/firefox-62.0b20.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "f1a76d7a77f1ff67a0defdd51fc2ed246e06ee00e11a80e58e35f4d35e081e1a0520f3f11fbdf3314a722c0f4c033cf6915ee792b8d98bc75b5552f92527dd4e"; + sha512 = "ba63d313cd3b75e341322ba40b38bf7da4b447f5e05c26a1ef6503ce8603ffc8a5c4b486d86a9061fd153f2997fc339241118344e54e75f6436dd8575bf4c191"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/son/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/son/firefox-62.0b20.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "f31660a7c3e85f759611d695fd44db021fe004f990e5c2680906f60b8650eedbc6d624cd54f5a6f17ab0c46d27bfc260789b2f294908a9c77d1cbcbfbf90baea"; + sha512 = "b938397f1825f9200c7dc490b59c6c649765c94a99670ca4604a0a1040bf307f259dd52235ae045ddc85fec1558dae1382858fd59a5b82c63b5a0e87a12233fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/sq/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/sq/firefox-62.0b20.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "823d671493e005bf7311dc563916d28e9fb6c04378366a5be8a9ea39a0b5e6606a299682b0e58599a02853c6be592f1778dcbecf42650d200b5e8d4a9883ea50"; + sha512 = "66d7582888e7b8c6d5322955558009d15d243c5feb14cbd36a6d76e2308ed229255bf19104381e284859a85272e901a6a3185988c97a28d3b9c2ece77c36fcda"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/sr/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/sr/firefox-62.0b20.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "c397bf56d12ff28b36ffbfd132c3d304017069cb12415a085bcb7f27898136bd8363c8366ee75324aa136442d93733223e1493204163aefc792eaa531a50c3b9"; + sha512 = "ad28930d33084df204283f7ea1312510f02dfe4915018e7101873cd773291275de8e8307df6f099b9f6bbb946a49fe930a65bf6ed2791a4bae3477bd44da7809"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/sv-SE/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/sv-SE/firefox-62.0b20.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "7fff653a86fa12dff883366b0d76898ee3fc0b6c93ec91617e0b27254df873f7c5b8b3b5217f0082e474808a465fbc254ab682c521b36f031eda75c5558128b2"; + sha512 = "42a9f3612c5e2fcef7c67c04faf6279bd8d9de0144e03ea2325f2bb2b59d72dba78c69d3c3ea9768d2b7e8483c6a9676e53b6458e29ff05d215aa698d6df901b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ta/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/ta/firefox-62.0b20.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "9b7d327e5e72135bcc4591d7ed2aa606dabb2e292b6ccc480c8665b247a24fa0721ed23ecfe242cb50604f7f211435be63915c1bbdc828e4590a91802d277155"; + sha512 = "8e9c36dda61507c313396a70ac2959f500b761a51d2423956ec4343a79b688d8a845358f880443d123260134627ed08f280c422129c4c87196ce4111d64f7c3c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/te/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/te/firefox-62.0b20.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "0067469eadde18e120645a55701454381010530fe7cea3370efdee5e728b2b0258771ab3c39ada75727c796d44be5bc1487479103649964aa4926f8e23ba9c69"; + sha512 = "1d97795b7b4e0a26f742db20de34a2551cfe9c0077560e4886e710d12fa9ed932e7bc532f66b9be9df438fdfb3d67b1a7dac481f66b778d32cb9772688048c12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/th/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/th/firefox-62.0b20.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "3157d512fac92eb23db2774128d509277ac8047e525b14c98f9b7b291c2697fb4917144605451b1acbc76cf9f104e0c39d8a4b9c0e90d8bb206613802c2edd91"; + sha512 = "d9769f7a21189104cf53f6a837b3e30b8954b963c4d5b6751012ee1e0800de27321248a5c2d1b44bfc3fc28a2d7204659bf006b6681f8067799e94688e7777e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/tr/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/tr/firefox-62.0b20.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "38e928345d279831f5c7ed1c6c4e618377d5a92e69b65f7b3d9bcfd16f24c32018bcdd8fe384350a6e846996de783897619ce8d6b734dd92cdf3f1308b9cb582"; + sha512 = "c12bd30cb85a2140c4e342e4996c8dc32c34cb14d64441901774313c3384aa1765fc9277f67bb2966f6509ed67fe5cab938eac18881f4ae003b354c381e146a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/uk/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/uk/firefox-62.0b20.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "14745f76dcaf57d2a365a0eafa253e7849ab1eb168877de7a9d20a142228581190766eb7c0064edd966301d63c728aea63190d2a2fa6d2e803a96f28f15bf9ad"; + sha512 = "5ae83fe9bc6e92d19048c6f3f4e9832d21be4ed4b648036a792f08af813e9dabfa48cb2450a3e49fd227bbf379784dd225b03a654fd54214a71ab9cfaff200b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ur/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/ur/firefox-62.0b20.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "7fc7d0ab990b64dbd611ea3e76939ed438a1a63360e746beab30a057fa053717e92c35706ab8f2ac81c52a9bd92d62cffbbf99d3ac85cfb092bbb2868f47a092"; + sha512 = "bbd4e1ee235bb61dd7380e22818f692710d2354abc7d3b895ffd750bb5ead6d3e5127088c2dd11ee38f7f8ab4f89ef710eb1c84385b4e9fb4f7342ab333dd93e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/uz/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/uz/firefox-62.0b20.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "256b8c553e61796b439ae3d4f90248ae07bd7c13b9a32ce3baeb24901941ff8d6ec6ab810122b6a6da713c0a1b3737ad66e6d798d6cf62fea87885541920f6ce"; + sha512 = "116a7914da2659bb40fcd8e06d12fc715d78bfe17fe8409756aae1d72010780f25d6b2234ab1e13a3fe69037b682b68e2cb9ccd5c156405426a959d9d3d954e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/vi/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/vi/firefox-62.0b20.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "152a826f7ca28351a6395728ca6ae1fea3623bf154e00e2bd0e56ef14ef819225a65d12dd7cb6a483b2a2e1e08a3da39082d9997a7116b2a05c66b45f8cd77bc"; + sha512 = "e661ae440c5e01e77110a0f5969df213d33236589c9d6a7e5be2da2e5b0efb6d67dddf9d6f209e0fb5d0ba99badadc3460f4ff61e58de1f0a2fb0fbca5c7c85a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/xh/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/xh/firefox-62.0b20.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "b5aa2d4450c34eedaadd120da155622590e053e2b5bce0328e1e314be339a7e9def21417d18c094602cadf5fcb674fef0ec6691fecc00e2f92336c393cbc0f66"; + sha512 = "4c4841775946ddaebefeb930cb1277a800b814a6896d46b329c6550f5e1e9d1d1ec2041e7ec192f9053775bcda81f663e196968c6b916f1e5ffa962ba2935f10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/zh-CN/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/zh-CN/firefox-62.0b20.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "9c4d18c8cd48e63a0142ac2af142e75581cb57d242e779b4fb6d18fb3e90fa748952275409fa174261ca8fbebdf4d69251b0681a4b4a0aa03cf03240bd97e855"; + sha512 = "d14b19d5566b7b2ff85c692091576d0e343fbb8aa2be3141693e8185ccf3e492cfde0e9eefe4aec1fc8773063438f1e65f6cb00486f7f95090df726563375ca4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/zh-TW/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/zh-TW/firefox-62.0b20.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "13238f853646c2249e3eb13e140507ed2e3551151ebf0c5db3c8146239bf1a943c794d77beda40e97d93ce0eca955ba3a1b618431fd34180d2adebd8c405a137"; + sha512 = "71c96ebbb527ad8a83be94bc718d2eb928b78420335170e9f2dbdd3ed9de50b6229f27ce1d11131f4f35d931a95836c65b3a74c200f4c8f247df93027b6c6126"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index fc24898b964..c0ba8e5e822 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,995 +1,995 @@ { - version = "62.0b17"; + version = "62.0b20"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ach/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/ach/firefox-62.0b20.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "e039e831474ad897e02025413a582b55b27c67fa7e4745042f4f8be5f6c9fa7f40e4d82d05597629ffc11e8f02568ac5ba80dab6028f58ab56663d54c2e15a73"; + sha512 = "47f6ffba22960f16caa981e72d58c28f5308581c0740c15a6e2107431761e90f6751fbffbf79f2a03efbe7edc3e9f7078835d60a79de603aac1f06b09b0eee5e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/af/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/af/firefox-62.0b20.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "51d6b84e6ace621c670e443a75565e18a6aaab48e3f19598d3710bb4545cd317a753cf07090fe9dcbb8f11ad905900b3fc6d6b020218717ccd4666f4b791743b"; + sha512 = "a7b1e73f5f6de78b73654a153a34648fc6c65559f7489b6fcb88f763f8aaa6ea0238dcf71a19f3f97c72c4cf16a919fd1b47bf4dfeab0cbc96db8b22ee4cb932"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/an/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/an/firefox-62.0b20.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "9bd7222734ab1ebbbe196baf7c21ff0a6d4e2a60f31f870d02310a9d79f63ad5cc423da0b96f2f5026f59d8dc2a1ca10612faf680e2b39c75da8305b3de733ce"; + sha512 = "626b63a3a550c92e6b8c8df8db925c3b0790cc835e7f76274bd8b2a12179d300fb2659fc47d394c8868c89f2291fdd7c865b034464a84fa454825d84e53f1fd5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ar/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/ar/firefox-62.0b20.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "b8ce2b0cbb18c9bbd9efe40859b65b9f0bc3c98b3085f90619ed84aa13a949adf46862d6cfc5d2e519e198a5b4659ee7c6658cc07904ab71990e20d1147c3b4a"; + sha512 = "14385896811e1b6e53d204caa9a3b8e56758c494376cf87309a25c4af795b34a906b959963fb96926143bc5bcd8c658e3558c5083642150fdfa3501feed67392"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/as/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/as/firefox-62.0b20.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "3f1db020f7dc88dadf13b12b3c5c74ef5ee4cf61f1a0e1faa49e403ef7c5307420118c049288cdc0151b47f075781a5164a9b4539f2b0e3072cedfbcadfcf076"; + sha512 = "859413e14cdc432fb92e02d94212dea896c28a26d86972501aed1fee38610917ae70a0d2f749f4ef1432d543819f1b403d85ac3ba6563639bb1a6e6bbfb75978"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ast/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/ast/firefox-62.0b20.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "6a91664c66d275c5adc08c22f611905b2e15d5739ef0af9514e923c8ad4baae479cf5bb2240861ff9075ce99180f6a9cb136968e65367dbf53a0ad9621720ea9"; + sha512 = "139a2995639bc2fc6331f47cf1fc5d5e1df2c4f7c1d582c125c5320a54fa20f58bc0d8fcf94ef07eccb32cce6839b6e8ddc8044c2166242dddc40e861954df37"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/az/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/az/firefox-62.0b20.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "83db2d53eb86da5e409645812b1bd48c0f315e0afd6047567c62685b62efa7362cb46374defdfd935ecaef8e83b469ad5f27b99d12eee286f7cb12efbee4ae9f"; + sha512 = "b7785f29b4b6dd0dfbd325e6c51c9ea66f6fc34a6151a991506863f9169d4051af6847dbeabe4db04a7db70049b0b964ce9038c363749c3c728144037d7ae821"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/be/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/be/firefox-62.0b20.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "13bd2cc3266c63ec87bd7cf1d843b4d93c6178a2501d5b19e797493da20b7b4963d224553aa9b246d49cd444c394127c91e2fb772f9fb60135b798d9ff856e52"; + sha512 = "f246128a4473237afd5881eb088d334b086d2c49c79eeb051f9365f0f0bb5eefec7d0e06a67ad1d3771d81a3bffa7a665d270242155cad5b099b9d5890b7d71e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/bg/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/bg/firefox-62.0b20.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "2ba3401663f896b58aee0f19ffb088429765627852f0406d6c60c2285d441f17639d4cf102101f2be7a29ea0d15f615db4fa3b3584466b06d8ed52096ee98178"; + sha512 = "262eae9674709dba572674214ba2626c6e36b372c99ef8f278b1edd900c0a75854fce26f3cff80b669e56cb70b592d92b070582cb82ff47526c956d45f2f1936"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/bn-BD/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/bn-BD/firefox-62.0b20.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "e39d0760ad12719b0919659bd0976a362a6df65bb2c035a7e0f6e3e58f771e821b8ce02fcbf32b7cdd5d2ffc0de6b4b40ed7301f1be0293596b509a09a2c4c4f"; + sha512 = "69f03e13c99f621bd83061bf1cc8ddf9e761e05eb5a11c35e8a1e4a7d82cf258fa32292dde088ef5c383320ee59a05da8e46ddce6e6283aad3463a7ebfe68394"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/bn-IN/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/bn-IN/firefox-62.0b20.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "7929ca419228b0c3aeca4131b1952fa1b754278d77134abc4c1b4ee2e91f8b6349f5e6a4f1a721506262ab321196cd977cd446787c9ee2a3b2d84dc2610bed0e"; + sha512 = "1fc385ea3e38dee112329e72b7397c031b4bff02bd1e3e863d673f96c98366115d2112ee5364da93a34ce3de631e81b156e0f51895f64c1fe84bcf3724b744c8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/br/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/br/firefox-62.0b20.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "750ca92294db2f3180e0bbe2c449b42b5ebb28ed71a5b5f0fde1a0f033867cc642d244bacc3578eae5dffb787b9732510f7790c4ffaf2c742916550e5193c30c"; + sha512 = "45ee27e4889203ac4b6267388e5dc9a557713e044c5ede07dfe039358ddd9c91c4b79f5205f3b9c0f5c770232ac4ad16aa87c26d4a436a5f4e58f44c861649c4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/bs/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/bs/firefox-62.0b20.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "585b4cd4d7ef1d9cc2930f9b3fe12509468b52ba0f99efce40e56e28e3fb53c60248bf6362edcdca518a49e9667b07a1ddcd6bbb33487673137246b404a0fd02"; + sha512 = "a190925733374f1abd35c974b2bf4ff091d208c274ae59f04f6efe2cd904e607829212d23efec2f6ed1c297b1ee8eedb797b460b815800f18b4a3969589b33c8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ca/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/ca/firefox-62.0b20.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "65c5de7ede82ee5c92903e37935a08be96b164c20031d389205171de6d4afbd37b87acde1717c0c26fc4bfa942fffca97a03023de5c4a6b8b4e9ead07c8b3528"; + sha512 = "35fd9322687c3a7bd4163f5b6493bf4385b4a08c8060ae4be47b9d1aef18b7847977d32bc67579f7543549cb803a1a3a06d655c9e02e9203860316c9364bb26b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/cak/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/cak/firefox-62.0b20.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "f4aeb3ed7fde6c2efc50c4170fd52af33d223352df99fe80ae7f9ffc79281bd6cca55540060724ed237f81f083a1052e389003cc66fc910f1d70beacd59b2b65"; + sha512 = "ec3e12bc71fa7976dc4ed73eca01b4e38c3e4c69d257ed2a51c913ab1c7f24e14b1ab0cd6da90c76d432f2efda02c350f752293c41d62ca4fdac74ed7f94b179"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/cs/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/cs/firefox-62.0b20.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "2bc2db8f32b38c4fd6176f674bc2b6fd01a0b743c7a9b1a882f37357a22eceff62f55207aff17f8fe61808ecc2ca5b813471c3bb3e0accd840bb45e34f05edc0"; + sha512 = "73af384a8a5f0efd33954e6dcd4cf1043dd7fd4accca1aaa93f58bd3742488e01ed4c4911694c21f45cfd4d2b4e1b213d7d18b233360a1eafbdc14e63cf8d515"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/cy/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/cy/firefox-62.0b20.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "42a7ca67d0f882adf403384634e84c8606b6b155af5afe463829a791f5605969ebb2569c74d84bdf4b45f7bf1b0297b1b3b68c2a404bf8c4487dae06b43564a3"; + sha512 = "07c8c875b8c3b8b613d4405de0cbbbaa5b1a3808e754e6135bd2ed368f674bec3033e5cc069dee811cb4b57ba884437a1607c9d1c0277b2d8aae6904b0dca007"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/da/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/da/firefox-62.0b20.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "942836a33ed6044ea8de524ff235614f7b05cb4efc09b04782154497b19d8dd548dc46f630fa49a4da619c09e88a337359c9102f605139369d1682c9b408cbf1"; + sha512 = "7c65fa62a1f0fd65da54f8ddbd33b4df1f375a567c7c5daed49d28be1ce738c9fa7689fc7302ed3ac865db53aee7a287702936a9db623815febb20b7c04a627d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/de/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/de/firefox-62.0b20.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "c11ff6ce36a730b00a42eb134209ecf18759894074c8956062d82135540bc3e6667df228ef680b8b7a04be8d3c55b808fa65c8b4f55f41874319d93da1db0012"; + sha512 = "0fa1128a70b4658a7a32cdb0002ecd069486192b2fec14664da94333627028e08d9d942d1d04a14c672210da3612170d7122dd91744c18e41cc0a67f5e333071"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/dsb/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/dsb/firefox-62.0b20.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "568f5b808c9038668e1c1c42b6fb5097d016dfd62192219fa8cb42613206e6814cd58308cf9967c634a332b135a9303e5e27e85768ac0f2cae482ac0566e440b"; + sha512 = "4b79c34b4a56033a885837a74c9a7bd10a6117f7f184a0b9b0801300ccda5cebe94b7f19eebbf17cd12c86406df2485340cfc30fbd1dbcd7e1ba7ec6c62b567f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/el/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/el/firefox-62.0b20.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "9ecf0d27ce9f4f5f7ddf5d9ccaff82cccb47f4083ac0113175a909657362bab7ce80812752ae425de9adb7e87daadd6d3f512543b636bdf9d7bbfa8a908e248d"; + sha512 = "16695437f4a137f57c2ddd5b88cc0148737a419dedf09e16e0395a4595490bf4021f7c37726beda11b8144cc9b8ea194e82bfac379198f59b2f0e4097093fbd6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/en-CA/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/en-CA/firefox-62.0b20.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "1a9e0bc564d36ecdc8e906eb079bf6d3368007cc5e8fbeee7520eeb75d9299e111a556745d594274bb7882e8a513ca0894d3018ddd6ac9177dc2c1d336804dce"; + sha512 = "6ce532e57b68579117c41299fd0dfc08ddd5dc4ed963d4a70260d801e4a07553199d87cdbe5f2742d09153b18fdd5c1b06948a990e1793a32ec718e46a62f281"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/en-GB/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/en-GB/firefox-62.0b20.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "b3cb6de9a31029cf019db888eb5c4680fa20f4d21f0dd9afca02b35ad039c4c0d844bd0ec8d9790aee0b583951874846d30b6f506f21db2617af4ccf5ab98304"; + sha512 = "f830812530c75a6d916196c445f494c77bea33419abda526abdeb534c533553387e156a43c749bfa3425f1233235f96b174abb7fc2bfca75956325816a7714a0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/en-US/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/en-US/firefox-62.0b20.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "6a4cccd98f9bbd25ffe07087c847e22d62e467baeadc467b33c057b96a94b93e2821b13f8d6d9773ac7c182e06ec2b42b9c6abfe9b20fa869b72d2d7873ab213"; + sha512 = "ba546c700ca987f07d05eb363e81c1a30ff31873643898f54a6dbe76647071dae4e0a189069066ad854383b39460f273358b2aac1d9c6b627eb89de089ca7bbe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/en-ZA/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/en-ZA/firefox-62.0b20.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "b7246ad58dda67f3b8958a54817bc80610427f2978d0a8398fcf38164f8f9c96137fdaa2305be3830a42143b5549b1a3a017adaec9c5c9a2d07060daa85c5e92"; + sha512 = "ef5e08dc45f8f111a22753e52baa0c91991fe363ea774df0617afabf6805aae2d508d3d9c29afb0d30e8e81661ca283115b71155b5fac725fe85134813b06a2f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/eo/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/eo/firefox-62.0b20.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "fcf8915c6cbbc578c81888459db625236a3f3ceee7eb0076c43427731aa9ccd4476b4d1a5dc5656ccbc5d5a75cec550d4e4c39c894529651a499db4fd8137c81"; + sha512 = "7bc3e96d300ea64f6e871b04e980aee436451df9995c562fde3592c829b9f3824e534793d506bded7b7f82e7c6367ed4e09010d3b1bb845d5d3e0801230a7e6b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/es-AR/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/es-AR/firefox-62.0b20.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "9cb80b1d9182e7f9e24d1ab71c6dad4d283b11f0c8fc1074c5e20a7b847d008575edae6ac1d48eaf64c9acb239198348a08b930231dad156b3209149571f6a0e"; + sha512 = "39a25d45317f7783b9f960c59435ac2c846142a272020dea9ad5c46a91dac8c4621b2d8b400b23d15bcc58673a1df9ec1129fc68fb06c39368a670705ce125fa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/es-CL/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/es-CL/firefox-62.0b20.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "633e9ca0911086309b6fdb15389fbacc88f32a3db0fa8d7420d7eec3cf11fbbf1f548f050e3e88ad0cd397f055a94aa9516a2e2c4fc2eb793f0e8e38a096ef3f"; + sha512 = "fd2229ef1d2f64f2f602b15894322163cc4067a72d580c13eb8ac6113dbce4a2eb5e4a17a833ee13ac68e30bfefa24fe83739d7c820b48232af841b24e9c0c97"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/es-ES/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/es-ES/firefox-62.0b20.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "ffbb61dc9fb1902c334d7d4cd023fbe09d3cf1e2b44bd1a1d5f286ecae5b8612b40b498ccfd01c86ce6d3e5b986adb9a6a889909095d182e003f06bc0df3bbe6"; + sha512 = "c65a840ff3e3b5be0a3c74ba82f17d2a65f3071d91e71cfaa634bfdc92531fdbc7f6865aa8e3621d94eea626c4483736705ef7363907dccc3d7ee2ea643ff629"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/es-MX/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/es-MX/firefox-62.0b20.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "489e1b834bc02fb54500e9521ef18971e5a17f03be582447bb68330e6cd679a3f8fa59655e46f7f9f8c8d6093d8b9a17a5500b53a75e8e2f48670b9f0560ba56"; + sha512 = "8a964e8832a9fecb6124cb1453ebccb0b8064a6d9306a92a6646fccf8ca23a058e3e2d99d3e3e10bce4de9f2f75bd32ad94f3486d1cf9597c2bc93ed70ef4c9a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/et/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/et/firefox-62.0b20.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "7e6c9888adb48210b40b7652e5d02d4bceab9f11e4b83df43d334cf0dee6eb4da408d1a9e63c6fab0ceef5995476c0534555096e91c59456104634eca3851bb3"; + sha512 = "13c7521af9e6ff3b6c1058c93ae84c3fa7e46482938a90f5aa489b3db99a87a6d25143d244c8c0e493a22e84cfbe831f5438f1537f78699a90aea476bba221a4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/eu/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/eu/firefox-62.0b20.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "d17b5e9810428a4268497fbe94b529b8151dd38e44a15e99b9e2bdfb756da2f9a9d02d3905a4b6314076281a87a2a687827cc81cb98dd9eebf7a6bd73f9406ba"; + sha512 = "b28e45e45a91c732db3fbef5ac249ecf6b6880d3f25d3151e9e0981556eefd4e98bb27b2312b9d4b0ec50e63ee8176401ceb6dbe36046b7ffb3ac80c3e09aa32"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/fa/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/fa/firefox-62.0b20.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "2a4eda4aff30d19d855015451cf1ac20540d6b462d6435d9d36a7aef6c5cc986991f84e8e24ab0c2dd19cb2556a15d96e8e28cc05c72ea028f91f98749945e79"; + sha512 = "abde704eee0fdafa637ed4ac52f605c81cb6f4a4563ed4cd2cbbb7af31b40148ebb3614ffb6b3312f19eb05b026833f32485006e79ad577f4f1de3fa6ea83398"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ff/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/ff/firefox-62.0b20.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "dfca1b04004b51a8ddd77c68be9e85e0ece4147d074c53f912029934163e56e3e09cac1281f8bb4514393c3f5aaa9acea27d45a59707a80b75fab933e25f51c3"; + sha512 = "2a16ba87e145740d055df33201510cb33ff2dbd6faaa30b894f71b960ab5daf7a24f1c3ecfcb984a5e20d525a70c2e72f4ccbf32ceb66c7879c8a238f5618a82"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/fi/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/fi/firefox-62.0b20.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "bf28291a72fde1f62799b5b4794774ae3df1596d1a07678696781949e6f1c05f9751f5c43b1cb21191e7c16d4c8c67f295c53358d9995da41d086b4ce907607c"; + sha512 = "06aafd066c312ec6d8163cb5cc773c0622432424516e70b84716c662e36ab68a2e4923b0a5ebd184a3ec50bc2db27a3eb98dce2a3d6046a929e1c499303b55e4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/fr/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/fr/firefox-62.0b20.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "7ab5d5b2ac6dffc0cbffa22971eaa72999475bdaa5baf3dbffd5ce4c2b01027a4c6ef517d4369f86f692395721d9032dff667c0b07ca402ca8d1ffc3e96febd2"; + sha512 = "044c2ec838104a7abdce0a9f4dbf3cdc0238505fb15ed7de36f197863afb606e4f1749df31bc1d2777acb7df874a8a1d4900b29a51877c53c5174608c330ed1b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/fy-NL/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/fy-NL/firefox-62.0b20.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "7fd419e89cefa2b387b0fb23cfc252ce3a1a628c0313eea8153a8e82da2f74abe069c8c88a3ff80e0bd3c38ec91ca7b6ea7a41251aed3077cbb69d10ca398ae4"; + sha512 = "3023d86731d6a2174a638e3f20c4922447eb904e7b6350664eb6402724841197d19e1755c514710a46bf60b27ce107fd9f41bcff894a86918ab6bc3451f88e98"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ga-IE/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/ga-IE/firefox-62.0b20.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "73676ef0c8568d1d97a7725bb4e4334581bd0e09c3d4d93b276ef9345626841c83659791046872dc04631ada4facec7386e07969b9d6a5b8fd37aeaedbf82a6d"; + sha512 = "a901fd3e728500244de17055d7c9c543ce0899d3c8d0e6b0b16436d45c3a66db43c2b59368d23a1ad3681b365e07cb47e9414124cfcefa98251533e75789b7e5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/gd/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/gd/firefox-62.0b20.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "fa8bec8df767f62bd361e346deba0de6d994f7d84334a2adc18cac6c8b4454ef2be6e772e34fad41b5c608b9b2e82802acf171c50acc3dd75a5b16bc66768105"; + sha512 = "d96c4f74fc2c76e1012b98a75bfd70c17fd22966c6d4e2ca0174fdfbeaeb5500f55637df7851d23b34b4e1330fd010bff0da0ede28029a3fc92714bb14eeb30e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/gl/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/gl/firefox-62.0b20.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "f58e80c8cda4777bf49ec736dd1cb17e25b7efeaa791d385ad8af63ddf0f6ff01fb4935f8e006b73555c2c351d32566a13164ecc00ca611bd2a6e5403a2a5fdd"; + sha512 = "6f20c7966d71bda681412b3c9e3a782e3a6fe71e096759b8fcaf443f7671a94565de0fa8222fa8b2c430a1fbc28146567f47523e96e23a94c6ded0022d8b04e6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/gn/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/gn/firefox-62.0b20.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "9665884890f6512e5f460ae7ffad24340a545df9f14fe20a39ff6e8363dbabf095bada881239b57203a0b4da1bba9b16551c60d09510a9fd2cd7fc6d5c1d74cd"; + sha512 = "bb5e2c63b2a48c3ec8746997a57d88b9a7f001e2b9b9f3c3e4d2913935cbe34931d9426d528d6336dc60ede140afb24487ecd3c93547113455e28928336169f5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/gu-IN/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/gu-IN/firefox-62.0b20.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "92bf250acc6e0fac999ed4adde4d5412ec87bfd4b70478dc0313a322be55ced401aeffbe3fa1fc77b8fcf8c8da5e47490147e49565eca9c0a0ac37e50b31cdbc"; + sha512 = "8139f6f236b5ac5d082c2c01f3e7950d312e6e241f2a1bc29e22a71238056546dba1ae7d5dab494662d82ac53b7617ab1dfb50375cf77eb565cadb3f4b074280"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/he/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/he/firefox-62.0b20.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "be1157e943bfca4e516dd442ac697cb7182590ce15bb7cad3ea11ae438c5fbdd8b86b3102bcbde78f7a2dcdee54ef0886b130276c5897e3eb55f364ad0c0bf34"; + sha512 = "a311fb555c096a5c69c174da176881d390dc187147c46722bb3ef073e4bac236e36e307c22d856036bf52bf87bddfd02ebf3f90dc3cb9b7c707ecf13fa27e251"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/hi-IN/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/hi-IN/firefox-62.0b20.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "30616cd4e6ba7fd9d98bb7b4b95a86bbb956e58d6403aa9646009d26dff2a2f9e743d4807cc178babd083b5725454384fc646a266b0b036a1ee03d9f6380ba53"; + sha512 = "56758751511dbf42d04a772a6567fe436030d4a272123fa8da8aaa7e8ed26f06bea6a32b35cc195674eb93be9f7b46b280e140dbe906292dd346912b433a2867"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/hr/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/hr/firefox-62.0b20.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "5736c7ad3467dd7cb01128184ee4de44fde57add1df07d0538387f527b1ba7e0c02a1d50a3e90610d368ec6bcc86b12a63a2aaa6fa37b842ca258b604e0648d9"; + sha512 = "da29589e3f62f2e2d4441059393e84f79cf973179db7bda8ca9e632d6c0e2d83e30a32f93f02fde21fa74a4899d89afd4871cd1d3341b2b8ddbde8a10743f755"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/hsb/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/hsb/firefox-62.0b20.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "74cde3231acba2627134639efece862877eb66b6852b64d3477069258bc9f6cd333d602f5e6f4216515268acc8e264a54e24b6139aee0564275b74c424847e4a"; + sha512 = "9846523a1d026b04ecebcee3534bc17093ae8ab891e7090b45c397355506d41da1261e69073d7b1a9e228be0909bacd8f6aaeb877f23aba0d2c84ed8303c9aa0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/hu/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/hu/firefox-62.0b20.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "2ac18b1795fb09d39a6dfd4a60d1e99f0107309868a90c8aeb29e721408b886dfc8a53f8fce0572ae91b004586e4752cbf2fcb5a5f907557599cb588fbe8ea19"; + sha512 = "1966565f1cb52a30aa941a28db6da2dd6232e8eda91d1f54d996da884dfe46b172a85606c3c33b8c5160667719d30fe710e9620b5332421742072debdd56e410"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/hy-AM/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/hy-AM/firefox-62.0b20.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "a58c8aba9a0ba03adc349bb75a236c06a31d9e627b85ad46b112e1a34b77b9d14d4ee6636fab0b3b1eeedfb494db7129371928e638540393bb9dc468f13bb7e1"; + sha512 = "367d11c62740213ad5161e708dd7a2cb3396a1f09e9e8b9426cc25ae3b32d70dc3ccf70b50542503818d50e62fbbe1f373f1328779f2be0d2ddfb143288187f4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ia/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/ia/firefox-62.0b20.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "02b3134b0e46c3029732876017b87464d9c5e69fb298381cedd70dae789c4a79c6948f0b0650cb567eec989fbdc1c0cac077a084627e858a5449dd5196ce39de"; + sha512 = "6a0eaca21a2d110a12ac3e5ad8a453d8b07b122335da4ed7f33e5e20ccab69f01eb1b7365136de20aca83b670ecbd6b44dc3a750809cebdc2c9d9c76c9c55613"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/id/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/id/firefox-62.0b20.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "4ab61d1f55f29c7657183e514c90b58f7be50e6e421a579bf95efe03257d58d9c751e8bcfcf35dd5116a7c898b61fa56c3ddd39150d38fa99b7f0608f2d42c3e"; + sha512 = "d821c322c2f40fa726692d54d393a29569f38f66cdc0c9991d4800f7d2fc9366e9cff0123a47259274681b0a67b01501ae0dbaf9c7f96207170b92cdb91fe77d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/is/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/is/firefox-62.0b20.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "c226d9cc2481c199973efb047f98a92b47d325cef30513756bf62d2df10cef578b21a182d36c8bc8f3510c48f143229139f3e2758e916944bc1f0c8fdf56230a"; + sha512 = "d5b2ab8bddac3fb0dc3351cd130c77249e4f5ca79815c96b41cce075298a181be79b27a1ea09bac48b79d8d35ddc710f3d7382ec036effafd974f17c7e44bd10"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/it/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/it/firefox-62.0b20.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "99bb797482557cdbcca6a1ac50c4214d807ca6db2248e39e6c98b6d2d627763652f21654b937a380f521530186de602e0dc8ecd0eb1a2f11dd99904aa2f9719a"; + sha512 = "aba0b87b3605077cbb7362c2dd23514f8a31a61a69d7a054753e2e89b5388541fa7d356a13e7fb3d21540381d5b244645d305c88932854ff91e45acc75bbfaca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ja/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/ja/firefox-62.0b20.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "8d15ca85b7754529bfb275acc46f61129031a7a9cba7c7caad31e9608c677e2049f4a09bbdcf1f6d3c1b550dd4a8196349bff8937eafbbfdb190e8606ac0aeb2"; + sha512 = "ec5377009d64d2e2d625ba9f364e456c4a6d576cec8633164a3ea21a73cc643c31f74a27a64aa8cc9b2ec6313b6a5e25a78612566a11ad5833308eb69e5c4a2f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ka/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/ka/firefox-62.0b20.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "df10d32090a66973e4dda4d94d9c736e0a18f00c701235a20e58164914e3de59653903aba094558f7d7b3ba05b8d5abaa06ca0469437fef8d9d97f868b0ae776"; + sha512 = "7362eadc3fc6cb0ab78948474570641a8f78a6d311a8035211e08dcdef9d035177eb25f679d4ffa9b6411ae4e2a3fd389814b0ea724e05320762539761cf1cae"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/kab/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/kab/firefox-62.0b20.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "29199f1589d24d982561fc41087b94999d4c0baa352188501b7cdfe50b110892b33cd2ab9f6fa3bf8420b58b2d7a9416a74e9cb553888dc16c1365ac0ae8eb5d"; + sha512 = "b45027c2fe7eeefe582868ff307330e9691c9796a3fc792967399edce5d5cfc9387ca6e50c1d623743eff3350476eb2db7588eecaa00407a69fd5c5ec2aa3e81"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/kk/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/kk/firefox-62.0b20.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "92d552f5757576f2c9c3be7c7fd283a179c47f1b8c51675a4f8269235a29a3d887bd2ea6a8a30633c132223223d50e0e2ce65a50003df2638f537d18d09c9705"; + sha512 = "f2f79ea3415f8f9db46d7a4c86be44e5d055133f0eeb2231c8f15171aa27133aeb7d7aca5e475af839e68cb09218ca96e0176b19111589ae643353fa7bb08b38"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/km/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/km/firefox-62.0b20.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "5dcf9ad9af1685968c011fd22436ce226884967a51c9ff2b05f54d90f853d95b3e586137f5c2e24922f685d7c709cb8077a23365b5c226639ee4c89a21f61767"; + sha512 = "fc573a0131b6e0ceb6e7d49347178aebcd902b61f870c8855e08eb7f4da29bacc9a22edaf612e4c00287415bcc18a8a8d5577e08ec324a68440f8f224819ae93"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/kn/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/kn/firefox-62.0b20.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "8f7730140f816d6ed4abf7a61a89c8e6ce8fb1242b3bdfa9d8209c87c3e2c7f592f946789aee57eef33176671748b04615d3d8f433c39a3c5e92501bb663e00f"; + sha512 = "1fdb48b0e5a270182e337efb03819fec21f55f9542fbf6f9607d6b4f205742017d63531555244ab89b8171e141e600b6209508eb1b619062ea43c01719c28aa8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ko/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/ko/firefox-62.0b20.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "267f33b76df130d1dd06750d547db570a68539a05c9e6a1795ec02898d78fd54cf72a1dbfa8b74c71882472b11929b7eb35cc5c792e374d803236db7be64d5d7"; + sha512 = "6d101bb20570c5ec2229079982070da0338fb4b77694f3a6e75e0336cd645ec95eb085b9d0223e43ea14561c269b1c58d382a0128e4149bb6a04ad640d159845"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/lij/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/lij/firefox-62.0b20.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "3f55b56575eefc2b515d540f6be6f907b215c244381cdc858231b85e8687f8bffb6dfb25cbdaee38ab536055a134a206816afb71307c61e343e5ee473189df48"; + sha512 = "970a52aef535b3ae87f295c3326d0217edef7c5e19fd8f155fac71d86b9eaa0c18c9f8f393ea4dae5811a6801caa38ba03cb432e690fc19d5ee559f576098540"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/lt/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/lt/firefox-62.0b20.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "4af80a0b429fd1800fc6979384ebbaa3e9b13c136f48d12b2cb25a13f10886d85f864aa8a635b59e827ad8d203a91b7c2200278bb04ced4db20e5c68984a150d"; + sha512 = "a9acdc7f4a94118f115d9cafcda0960adb82fef5fdbfb7916ae785cea3b541057052a027b0831bcedef43014a088b6ad3d3570bbcb467cb62411513f877a91f0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/lv/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/lv/firefox-62.0b20.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "2ecf95f3334eb40af526e40018021cae7a4ceec929e02f97dad31d468231691b7e4bb29f4bc0a6699a90b45c8ac7df59699ab3c75c7e4dd1c76746b4dc62c542"; + sha512 = "47d690d3e12c718d67877d4f37951a31114f6a3fe7bf49b0813ca0acc5d3c5c8f60b6c0b572e0e7e7e77c3d9e68f8d2f28d407ea62bf1976350ec4e05f05aeae"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/mai/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/mai/firefox-62.0b20.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "833466d1d6eaf4352a1488e104cdeaac1fe7d05e96836a2187f71c9fe81653a7e26d0a488605d79918c8004a9776c86d1f29ef22df14f505dc58415f89f7dd6e"; + sha512 = "1fbbf72a08f98df105b47c21c07ad98270e9b4bca21bc5d9a940780db040c3d51b7531dd00aedfc8f7c946359749a5718f40744695086c25f9ba0d6641ca26b6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/mk/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/mk/firefox-62.0b20.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "76813a7bb7e01d8d0c9d4ac1c3069af5cead2447480490605797459944e8280c9350fe9df7f12a8dae491710d0d374021b99c0d4b902cb734619b9863b4d3ab2"; + sha512 = "64047802b567ad586cd3dac1a444f5fd510f9bf06a883cdd60d3bac9dee4fac12cced932d927b39fd579d60a256dd4a7c2cc52561edf477eb2d48f29a111f159"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ml/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/ml/firefox-62.0b20.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "9e30775adf279cbde154f0fd392acb4592b9c75dce0532435753bda755120c2d2eb61f6b968dc5de7e70856339a6238f36cdf413029d92e8fe2b537f00866154"; + sha512 = "f98cf7854193dba3ea520eaf0e2c0c0f60f4965b3aa5d1ad442dae5aeb518d334ccf0edbefe9c4c1dfe2f7372188d64d17ba7cfdf41d7a1d715318a4aacf51d4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/mr/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/mr/firefox-62.0b20.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "65ef02670895f237303184e90d06bdb6373af3f0282209588937be77c859db483843638080c35c112c2206f927b2f4221d3cd1adcc3f16d0c2d5b0a1aff7f225"; + sha512 = "abb1425003da6faea70157e01c733a757c8a46b1a22304f86ea93a84ad3fd5777754e44873b70668ff2baaaf0402631e5b9272bb0a0711c6c03fb46a3ac2b607"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ms/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/ms/firefox-62.0b20.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "8419e15179296fc16a5d5f5d09cfe65aa0b678756c7e27faaae14b7f2bcbc724e43d5f7b710d3e79ca67beee60e5c5f452e9596779e208f58c77883e1693ed66"; + sha512 = "a96e18eef12d7067d4808e0b680773b192017dad2c95798c541ab2b97cb94990e010b227982b6bd83ea595ea5ee33fcb644fcce995131a5d7a46c880e27aa9ee"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/my/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/my/firefox-62.0b20.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "50f99e38d85d59addabe4f2437e09c82f5e6e8a8fcaf3d42fbc234cca0c541c735d930d3cfaf7b5b6e3d7c51f1ce82cc06450fae52cfd6ac5e0ccce9e518f166"; + sha512 = "53e6e08640443f40285f372b53cfb9dbd3c44757693a2a575479f71333951c5dcf9ef5f8b948fe493c40ad789233a17e89efe2d91a132b414e7809635a78311a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/nb-NO/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/nb-NO/firefox-62.0b20.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "c9b27b683ad5b3a015843aab9b1cc73bf1bb216d5a762c273631c04306b8710cd9570109eb9d81366adec16b1138c3a4d860f2dc2497d537185fd60409676322"; + sha512 = "fb3883a509ce36e8d24a0f0fc7aa9774c2ecad35d66d37f093cc20af8efa8516a8ff75c5f8fc410cc4c3e616757ff7136869b218735ecc7ea9ea20265331f491"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ne-NP/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/ne-NP/firefox-62.0b20.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "e4c6ea3b5e8e895ba9311ff16413323ff982b93583be3751a2a004a855d3174f85fd3898c9f95aa88e00d307e59c474b995f3be99ba52d73759fd4b13ca6cc99"; + sha512 = "f12033fa6a5c2b18c2ceb96ca22cee6dd7842223c7baac09d235c8bbb75e638d38c6160750ae9a0cb9e5ecf04301c9da873dcea1891b436fea9ba0d9466faba3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/nl/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/nl/firefox-62.0b20.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "cb79da779d9a27177923b211b99f06eba1b769b9419beefd9140ccd538628dc8ded5f40d87c1393093f6a7873f24d6e8b8e18b23e691e583859ba79b8fb5caa4"; + sha512 = "37126248ec02b357837f22909b6dbcfa7979ca3b3907e339558d8f213f92c5a7c8b89a4e9d7d069a99dd494fbc41c52bf66a4b8c2910f48eced058098927c6c0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/nn-NO/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/nn-NO/firefox-62.0b20.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "6a7bf35979b1fc27816551429cd90cbd24c391d26aa322ab0e7267bf5202181c0a07092878be6a558f767e9c51e91ee9ee2d53a89d4a005b0f0a3ceac1859f41"; + sha512 = "746da9da5138c7c9d0c0252aa4a679a3d8ae2e3ae53695cdf59355c7e943a4d0598bd691cd55e580b01536ef6779dc86ef17b1a5481e0a8d8d551695fb5fea19"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/oc/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/oc/firefox-62.0b20.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "299a816776656628638a5c59dc165e8edbd3e84213059ad829615fb246a6de78a6a0db53585d0f27b23e1f4aea83eed4b216f7851fb918c46484550f203accd7"; + sha512 = "ac454a4fd62dcc0c8436e691e103859bc5767e679d876c445ad3e553f5afb4741460dc80e647ef82f006b34aa44436469fe66978917a6cd852fb0a47ced85fff"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/or/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/or/firefox-62.0b20.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "9a915f6f438937142ed1664b142e2d45663f56384c2be35cc1597762d6b0d681bad5456c9fad947c7b552855086a7055691e8a33e74faa486879e4fda0d594a5"; + sha512 = "ac11a4b4927eccbb5a3b0c823cba907dc32ad228e8f147d1d84f5670b1fb12638a1ce858ce628b486f41eb0e98ef8b7d8757facfa9d592c3edde03123a79a703"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/pa-IN/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/pa-IN/firefox-62.0b20.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "251657a065f5de9ac28e4425310048cf7960835704586530b201bb69f790c7513ec5b9590fd00b2e1b92992b3574892e311b5955bb3e725908dbd2d76ee5851b"; + sha512 = "396a14508013d7b6b8dd396d7d48fc26c68da3c1ad57952213a0e01a859445201dcef08d824ffeba6958f8a79b5c1af59b4f6c30e539f80ffe5568d6a09406e7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/pl/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/pl/firefox-62.0b20.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "129b1b986d3bbd8f3c0895ac1705cc488f5de652cde35be767996825523a65533fd7f75564897722976e6b8be67a0711e3819056f36917048ef97306440e6c66"; + sha512 = "67a17f065011d6a84cd455c614804351e1d9de4be361aab3bec5f34db43db378f1f594b4f76c35967181aa62f484aa84b49a05e129e6dc00b67caf68ececed60"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/pt-BR/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/pt-BR/firefox-62.0b20.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "f15f4bb22322a95aa2cd10b33cf3e7c74a6cca22a229260118993c08fa7e3f1643a54efe9fa4d6c2241d5c1fcb60b430bf88ef963cca8a2f98c3ec9172866eed"; + sha512 = "caf1805b852a6f8b19251450d72701cacfd1f0c20ffe23cd65378fc2f99109246ff9f237c120f273902d6b9cb67d7db54a0bd5ebf4cbe0217ee13ee28a390136"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/pt-PT/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/pt-PT/firefox-62.0b20.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "b46124a50862d268c25cba907f1788bc0b22ce926e3ea76c17bcc32b00b07cce53c3502b927d208a664c04c93405a2d199c26f56075c0c0e0e0c639ac86b249b"; + sha512 = "6119fd1ce5695c4c3aa8d61cbc6748d656a591ca7ba6e3aa8bf52fd7da68633155897fbb739568c816c78b1c7d291544d747dbfa70a346d93acac951f21c33da"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/rm/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/rm/firefox-62.0b20.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "b28faa2983476e110cec7fa1bbee4ee65b064d84a18908f7698c40f2d551b3e1796358b14fac9a1de32336566e15d7684572435015c4e5ee874a8e96210e483b"; + sha512 = "04ce2405adb0be7f8a1c2fd9f5df38f648f704abf342ad7b7854cddda69b2ceb1d0f4925390f2a96d349c62af3f486cd587fabc5f42e555e83874d1b76b52922"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ro/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/ro/firefox-62.0b20.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "676a127961cfc1a68d65c05266da3debab12441a642f6f98f3b52db5cb830efb25d7ca2bcd4ff88efd606437f5aa729c152a5a616ccca65aa51060197691a4ee"; + sha512 = "d4add282f611ca37aab7a43c9d5bc284b77384b87f941df77123a869ad1a9ac8a4de3db540167e1b67b61531441fe1ebe3bb01bab95abb60c483dc666365cdc1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ru/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/ru/firefox-62.0b20.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "68351211b3ef98f1930f90b807c114065b675d81f84d07cec5ffdcca5e3a9b41eb0390b7e88c0a2942056bd08e4cd5ab340abe11563886c85118c799e0acf1cc"; + sha512 = "0ddac21be61e70542bc94e3c2541b5ff91991bce26596d4c7330557353db6d9d0670ec394a88c49ddbe08f862e5c53d74ee3ba23a1ba0d6cce2500873fde4756"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/si/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/si/firefox-62.0b20.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "34a4af9561360c154e2e9ffd0556f3e87cff6cf2cab90459916c88967678c6b410690607b9a131c0b0aecafe418a6e368666defb5d3b16df7c0d2641e95c42a7"; + sha512 = "f74c8063bac884db58ee847f2f9d2ee366d72e4335c07e268b3aa22d33bee4dfb1c8ead9a02592178924bbf056d75ba05b12b8e79f2b10b5cf91e55d1b08d15a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/sk/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/sk/firefox-62.0b20.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "450bb4c94f380ea801679c8d4e44cbd520a3137486572ab7bb3e521ae9dfed55568c460f83f1383fcf30c581a526c9d03801cb3175e2fe70796ba88428aa729b"; + sha512 = "2020c4c9115ff890757620a2f3fd2da39ba989feeb2baf83af50627e9d22cc9f68a44f3f442d846910458f14523a59df78cccb238095feaea76bcee93fb066d9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/sl/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/sl/firefox-62.0b20.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "dc7aab2a519419a4d0b14a4ac5e137440569e35af383fc88638d6aa1c91a5c722b62bdaded5cb18f2cc66f88115a7ec74590f9c98edf18736c6d2833e435ff8f"; + sha512 = "338b4ea7cb5c4ed7773eb7ed45c464da01e63768a9eba76b7c50ff2ca9a78c9580ad067f94e01b6e2d55f9b3dd76d7db9e8f0b5d3cdf023ba8e76a0a5060ab5d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/son/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/son/firefox-62.0b20.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "d1d676333f6ebd8ba564e1aa49a003b0ae901646c86d4d58649fa92db92bf67d0d93d6a2f4878361a704553a2fe922bcb0c657872f5e759f0358d0e44a6d2539"; + sha512 = "e2bc04b99f98b1c22e92bc326de8278dfa57d9b54be24d8b3f0efd27ad4cace395565816f7ba265409f66f06c0ca60fadf37acf4abe21729b68113206d389f9b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/sq/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/sq/firefox-62.0b20.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "736f0f8b577bdd2934d306a1674b1342590b62fb472d79d1eae65741dd0c670a400edf7e7d5caacdb2bace402b37fd3f86076a03088ef1343ee1fac02343f4e2"; + sha512 = "e430eb8296d46986ea536ada48db5bc3444eb381d3caaa44b22e17be1a8b6f05c06df85a8c90827d0bb87cf4864d1ab3c20ba43de8ea0622d8c6753fdecd187e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/sr/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/sr/firefox-62.0b20.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "74fd745b38a39d562f5c8a2a410dc67b3fa2bd82f30e9155b00eff81b1f85d18fb2604a1730cab6a440390fcea9cb66c018d0a2b008870b443c3bc08f776ea5f"; + sha512 = "9a6558c6c21cf211b5d52c713a2136d55a39146954a580b6e9f304b63d28cd8c8fb9f88beab95998edf12cea87578ab6941a9e7b793d50eccb4678b57e283b21"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/sv-SE/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/sv-SE/firefox-62.0b20.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "a411a89b0289ab47674efbf7bd43a9f80ab79c25b826ceb21ea7968067a78c9e10dcd8fbb101dca57492d5167fd8b604d15aa1fdee7a458b34843815b2880dae"; + sha512 = "55aa7f899a770bcfe0690df0bf61a209a5f55a90524f6bbe7ead517947a3884a48ea19f887bc4ac227e0396f6704b15eae9ae992b3314899372f4e41d8ab8f43"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ta/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/ta/firefox-62.0b20.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "88efc962145833472bcfedb760f85dd9099b596d574509df7eb982a41ee4eead4b336eee60ea79ea0a376f7fa625db1236b730b690ddb13259c8a06fd03c17d4"; + sha512 = "61b6d93e433575fe3b5d2982cf558f165e11f02ea2009375b8da468efc641455ea028afb0c0c5e6e26048832fb9274344a607713350b6afdccc5b95cac3d318c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/te/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/te/firefox-62.0b20.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "6be44084b417b0dc52917524317081c7bf1f75398518b7a9be939b2f539c28bad563b7adfa9b42e875daeef80075c5d5aa728dc8dabded1ef7457cba7a601e5a"; + sha512 = "fd67b31ef7d18af1786c966cc011a909367b9700eb22130246f0bb66b3f3e2ee266612f1993e65b79bd8f9e7aa6e7daf7c50e678e0e7f0c67aa63adde0c155d9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/th/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/th/firefox-62.0b20.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "7216aa7d6cc26fe7c98539d0dac48c68530971d8bc99385379d250b5cef3838215f9eefb10b5b05a4d18ce949beed47b75c755880a1a1601faf3feee17967894"; + sha512 = "35d657b0e14853def56ca6c15331cc8aeba7ba1f230f8b8669b6466ae257c362a4a97a1853d9b32bdc62902f3de71001e17d2859cda77642283c6f8a41e7702b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/tr/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/tr/firefox-62.0b20.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "9b8078a149e85a8c13af01280f248e2713c4e83e9d0999a5fb0f0eed539355ce6bac3a9a2d4122db06d96206b02a34f6b51a8e5198d3046c3547ff1be85069c6"; + sha512 = "1b562046ac23fd3a34b450042773afcaa255025972ae251855403865b4d2ce96e958f6a2de9d96267d17ecabea9a9e02d48314ffcd9986f1cc3f58f24fed310e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/uk/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/uk/firefox-62.0b20.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "f018e84596c981b135638dcbdcb8d4424bc1626ba48eeb26b83713c45afca5f0a90b38841ab0c08196acd91981090d20e63ec0810a8f6f9b51cd2e5302ae9062"; + sha512 = "7adca8260cfa16067d0df3270602d01b19df2bb9a7e5a373fc39a0ad846239ebf1ab868e13f3240381465ab7e950898f4664cefc7907af4d66698ea8eebcc4d9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ur/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/ur/firefox-62.0b20.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "96fc4019d827bfce46684b2e447197e6a22b09843967c25e2dbc7c38341117c4f55bc2d16d4b5a63445b29ae08efde697c93bc4f677d3498bbc2bfc8f346a8f7"; + sha512 = "b492ef2bc8447460f02db4646e8a489e9e0e880660fee94077306ed9de0642498c46a1a81681692a5cda8ceafbb1a5788dbfe7c46ae949d4a0b1d1e4be695576"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/uz/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/uz/firefox-62.0b20.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "ed6c25d7f4205999816c2cc7f2cfb7ce682087656f1721af8a8f4530217dd79f23032830252be629bbea0d6a19422ca7b307dcda341dbf287a7dd9b901ccb197"; + sha512 = "b45916a341b82f95e983bb796d2316b77480982e3158d07c05b87dd8096385a9e8100995fa4aaa9b8fe1feb140c672e87b01cadc7861c8a057ad5b01f23fd295"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/vi/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/vi/firefox-62.0b20.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "6e5a6a59694fe9a2b386e79b874cfe92282d177959c447c7f500f9ea805d9e07cb7c1d57eb10f1c8e3426f142f28c1db03cd7935321fe81f6548d4331197b259"; + sha512 = "c04fdd2751851bfaa7d61a6dfa405820f422f456a6768feac95061e7fa24f05380c0808a7637b54a344fcc237cd135bf0a32e7d697d9252abea8bfe31e2659e9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/xh/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/xh/firefox-62.0b20.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "628ee5f3b03527e222a55f434b6c266d98b10d7fd41249641e478233fc877f28c84825366d5151e43f3c604a0c3df6e7a0753b3a04213e88b169daee7da71c26"; + sha512 = "aa754dbf9f04586c60e6406b26649955a273395c130c5955e6b83c2a5d7714de1f0afcc0c6904f01bfa5acf50cb03e848244a62214d4db241eed18f049320f6d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/zh-CN/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/zh-CN/firefox-62.0b20.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "e47cd677d2278c5a6bea963c2d38c8f3505ea295481cd934a5534e4b6f1cd2b5ad81fb7f8dfab1f2a1dcb4face3ad514f56e1c7824f559946a5fbe5cb4022ce1"; + sha512 = "2b58c6806c8ae4e476add919f5f4d5e380252cd2a822dc0ebcc5caaf20f1797430fc8ea4747f998953f41e612491e41c6c00a9eafa98299f4a10571a89d6128a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/zh-TW/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/zh-TW/firefox-62.0b20.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "cdcac4355ded1ae2fe0900a44e077e2f9a768cb0207dcff57f9559721338e1e9f62d4688dd2397f84cba6c7e010c1431302f91e42c9d2c7bb24a732674d73957"; + sha512 = "8d744785056b3c423f42e337befec9983c1e914475eccef8ed43e8db87aa80514003fc20976a60fdeabae3ac95b8c1a4d8701e31158f2f811ecec1e003cb03c6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ach/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/ach/firefox-62.0b20.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "a0f0c7bbc8ce8861cd3ace0acaf3c92a9da788d0583ab7c83557d6431623f80e729faeae14ac3807853d95883466a5cdb2ff25a72b255b84a3cae00dd5536904"; + sha512 = "b89b8af1e22c88e1e6140e46953e15f25673bf0f3645a8af40a9c1be3f44e621ab469fc171538cc2d009d50c3bb9fee9d1653ea9a3291f3c535e3918fe25ccc8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/af/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/af/firefox-62.0b20.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "04d5e91ca8d227fd3790d36e7eb846cea50b0328bda59f0751b57fd8befc6dc9c74937b4a77ab0acf9c57b62283e4df22cc457c21283f37eb857deb77c428b63"; + sha512 = "cb217f4fc3d817f25f76691abf459fde2b9d55e41318600ed822ead6ee1492396441bcecb898386fc5e6e6ed8a95736562d241b05b186dd0497bc0100cfec6ab"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/an/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/an/firefox-62.0b20.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "d4531e9ece8dc30b47aab6053ece67241ff052ed3b4f31d8cf4ffb9a3ace48abbfd2dee6d6632e3f963955d6b352f09bde2a2012d8c48ff0bc12c961763fd70a"; + sha512 = "298f2737835faf98e688d2cca5c12f6c121e83ecad52f0fa6af06a1a0a823a5b1c9713742524b1495452bf099e82b3e1fc8faa30c9c8fc5221f11b514b165ab3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ar/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/ar/firefox-62.0b20.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "4b5d1c3b2f9b8c8bfe8a8ffad3a62cbeda296ccd521c8e937967031434cc74ca3f7e431d4a1b852907d07ab35e5fe11f9fb74eb592bb317cf67bb93ece5b8787"; + sha512 = "659908189fcefe7cb5c3a0dba1938d8dcd23336be2a728b0d96641a410fd9bf723e4ca4978649b5e01e13c3545ca3d8348a5a1451496c690efb663640961f6dc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/as/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/as/firefox-62.0b20.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "7b6b5795882034bc8e790ec42930cbe8f52f2f0daf63ab8a7b9eac27ca7cc4e0ea604ca08faa8dc8e560d550bf6400b27b2e70f9b8597c011e0c59b56101ae25"; + sha512 = "e655389c4dea4d9db66549256ec05443a7bfedf508db46ab8943ad644229cabe2ec1edf8ab40b55bb2b53cdbc83832c3a39aa5c42950fe15fbce1152eb9ce8bd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ast/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/ast/firefox-62.0b20.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "e4995dadc334deb20c0892f2f980cba5ecc9c06191580308a462c23cb972486891a981e81db7ae54f230aaafafb0608bb231d8a4c272bfb570674d8babebd57f"; + sha512 = "7be4c535d4d63ae1c5f98e49b58c57af0adafc95553a505fb60d5a83523422e6b71054f1bbf02a060510d59a8f85f905830a02c2837fa3c3e5008494e3bbe74a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/az/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/az/firefox-62.0b20.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "59b0cb8fc86339608550188866198ede84cacec5f82593fde8368c379feb68152611e6129fd2dad8e00f07bb183455f9201849b22c38599078873cc3ea352e53"; + sha512 = "2b13f55b90997e245c69b16f6c0fdc1df6f1f7cbeaf4af72cade86866aa7c4b1afdca46a705e5203b74b0db645a514995f6554c59094c2f21c13aef1f126b27e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/be/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/be/firefox-62.0b20.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "bfb82a8b580eb42939b00ff2d92cc83d0d2471d195a8f7aac5e808496a9e8a078f974093301dfcbcd16759b1f8b69134e911de35043062fec9f7ce2612315bb4"; + sha512 = "d7bf4a8aad2adb1dc5c9c0fe474aca23b8f3b3e66374ef36f28cb3818c74932aa4c5c92b8c06c384dd4f200fc1215a8a5fc7a2c22693224d5955965b239754a3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/bg/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/bg/firefox-62.0b20.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "d878c71266f98a4778840f1f1766180edc7c40ff7ba976d984ec0307fd3c69ac945c343f7a440c592b04c11be68acaaff2d99fef39adacb66fa82cd2213ec858"; + sha512 = "f1d9bdff18573cc004b8172c96f2766b42b0f0759a756e7dbea0aa46fc8957675a556e6b952b3a7562421a6ebb33d825a886c1cc96ad627e806ad7f0a097799a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/bn-BD/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/bn-BD/firefox-62.0b20.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "856e9755cab299753252a67c8d0eeba489a2ce7a87af032c5b55105f90ea1de28db3e99cd4aa09ac251ca3e5babcb53934a26ae57f1231656611773b3c988da5"; + sha512 = "aa1509462dcf6c8f2718a85bc6fa00c572fa3f41856b50a7bc0e2fe1f50a7c6717c05ee674e7594c4d07ef0ff23395bf9cfb23caebf707e0d8b4112687caadfd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/bn-IN/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/bn-IN/firefox-62.0b20.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "c121a4b4f468ab4a015c2fe4d2470a2c61f4c7d001df6501dac8ae9dfa3f939c36e7764e822aef94f172725b03df7c48e9d5ed46b658c7bbe69d5b1de534c10f"; + sha512 = "e71b318b693a256dceecea4ea1ee494f5ffb9af08d72fb14a76c21a51b8f8796659a7f9a087e2b732f72cc8787217f14d17776c658c0affbcebd5e2208160a7e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/br/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/br/firefox-62.0b20.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "b2904226d994c9c699f24c39fb8b0f50f8cf192efda15a3ddc3915a60728fcb50b4942df514214a46ce29695f3c3c044bd33d55bf74ba965af729c85124caddf"; + sha512 = "1c33e290074d0dae9654d30b21592360f3f7199069b070a791974f665388ce290d36bc7cd9518d8bf855bdfac97acaa90430f4cc4627e9033c169dc75bd79700"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/bs/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/bs/firefox-62.0b20.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "6f0f553c749072dbcfcd5da45da7bd1fb2276a10770938a0c14070b2093be2eceb0684b6c53b67e07ccf1d8b7e61b60021abeeba57d4a13e2b9d62deef012051"; + sha512 = "a92dcbdc514f3b593f5c222f093f88953558388e03e71f851cb2c242b67f3d51ce7c891a8f183fa554752d13ad93152171233b81aa727c9c20a341e558b39229"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ca/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/ca/firefox-62.0b20.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "707bb26b6cc24ce9267a813f266cdfb5ea788dfbea502fadac5cf49a54440c8d9831e87d5e5bd49e8002a4622d2545becc2452e2536387c70e25c1d7147a0848"; + sha512 = "ecd961e322ba0b9b8477a52bcd1e31084a18109937ac50cac68d73333c3d62efeced2fb11ba63fa97e144c0b711f5e9e15ba346d957bdd4506dd9a7a85400e1e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/cak/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/cak/firefox-62.0b20.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "717c98a64fbec95ef1763a86a35466cedcba7b657309b3bce7a833ccdfb3f278922909fe74e8a875ee0387db76a8f9f4182de8dc1e7eb17ee59b2e424ef6a871"; + sha512 = "d49f167dfac2e4ce2a3f5cdfe7b5651347e90f7a04d52cea92c05ec0325f67993ec3ed97ecab501d973f16da856e474321307719842da958496e07d07dea2b64"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/cs/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/cs/firefox-62.0b20.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "54a1163d642b77210d3127b56dbbf0cac60b3afee6f8b5884f85be8c81570445e74e3e7709aa8bfa1d5e132e05d2c6899ad854a38d42389d553206b7284e3c64"; + sha512 = "04829e46c4d84745abac063114ea1abeaea8ec7f596e7e3850ecb8702134aa2164ccd11c98da7a22adcccc9bc21fee5886bc7c80652f4ef3682ce907f7e5ccdc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/cy/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/cy/firefox-62.0b20.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "f160ce85f5430bafe9f43275a7bd0c1f420c767983b5f25580e63de7d962a61259067628dd73381f18ffd7b9bb70f297a744d2af5fad96ada80e03619fd23984"; + sha512 = "b211eaee0ca7f2faf073762e9b0e47a6fb1249d20f0ec96345104b75367066c5b671d3fd16cd1387fc773152c1f22f26784df14146e5b3ef41db61810d6ce317"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/da/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/da/firefox-62.0b20.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "18f2f42819bb23f5690ba64153c4c4acab1519138fb2ca9150ac923d69a4495f171abf3a5cddb429ad09a090221df6461628ad8184c5bd05182108a7a2120cd0"; + sha512 = "46c7f949b5d306f1511ee68d624a276b4635edd21cbbc9f3b19dcb8f6fe7842acfbeb55307dbfb6bbe19461f093752d1d27abe908b394a013cdbbc68b36caa09"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/de/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/de/firefox-62.0b20.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "ef480f7d900f45800060984543b4eb3bd7308cd8b8f032eff06bba5506654fc96921752da72b73986ca55125ab16a2aefac97d5996f705be9ce9b47d6faab726"; + sha512 = "d53f3ed49d59945ac711cca09a49460f82a74afeea3848605b0375778f3d94e2b0f8e473ca567a9a3326d847de97a83374b37c012b94d96bdff7482cadd45139"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/dsb/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/dsb/firefox-62.0b20.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "8c05ebe73ed32e25b11d36800b9e1103605f4963e02b1b72a1ac35a8ae10aef2f516431cdf4aa32ab376c15b4bf07bb927daad020a7693949687ec46904e2aee"; + sha512 = "e9274015c9a150ca2518358ed9847f060dce50f5aae902ba107eb07071b7be1255e3f034a8c3f8d9c29a4825d17d124da76b4072da20082364fca5ff874a9a19"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/el/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/el/firefox-62.0b20.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "80da58193df534fdd8bc2886dca3f21986a32b8b940bdc1077f259edcdaed353a8f1437f968cb9dad5b46e06f94356354fea17c66781834be4b22d4775bb72ff"; + sha512 = "8631f28be76ad3e16c521cbbc263f3c58df6e73cbcc9b4a5528934f9411faca0ed28f821004c901c97d925abb95fd597a34b901f97f33fdc508e99a3d8c4f689"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/en-CA/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/en-CA/firefox-62.0b20.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "6cf787b5b646ffbb43442a2066985dbbd2a99aa0959dea691bccf4d0a727213f4eef3bdc232ddb1e4c58411c3412ea06d11f3f3f985ffcf646b44f2015bab4b2"; + sha512 = "1f70a550b4f7a6dd2578fd0a385a68b153954002d1a4d7e66ef58f86a1b5c9f33e153ce04a32737113f974e7caea5c2c6d338b69da94ced49a56dfbe61a99d68"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/en-GB/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/en-GB/firefox-62.0b20.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "bccbc642ac8f4dea2365c9d2d4efea2987d06c1708dbc51ce6293c5c2ae02568dbcad6b101ca1c8c4cf1e0e43d8fa8e6ef60a2a9e811e13544ae1579658530a6"; + sha512 = "473dc2bfc05fa24f4a5c88321d087604b81245b08e3813dc45a2a7bd62e2c7012f0d2ca1dcbedeaceab7549ef5f53d47208c04b0bbc9f9267f4319b2720a14b9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/en-US/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/en-US/firefox-62.0b20.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "5e7c6a524ffab57954ca30ce717aeb0aec555d933d5584f530c8dc3194b6ed8fc8a57e2d4d1c48539aab2b6bf7bbea51617a0faa0c4a9441ea42bc19902cc874"; + sha512 = "317db45661d149e6ad123241b9b335f34a2852921a97ac0caddc7c49dbb1d105091990e99d538255359c42c5f12057fa728dd546019e710168f696b88ca202c2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/en-ZA/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/en-ZA/firefox-62.0b20.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "e214e1f6d179ea4ff2b6bcb79c58625d269e1e41c17f506fb3e80f5cf33f7e24851baf9c28c7f1792555b576913009ef3b7c648e91725e75cd47711ef280b471"; + sha512 = "dda42571be54e4955cad1db913579ae7e5b002dea09eef65c47da53adeff0631667d34339bf102d2c779d5601066b7d403da03349dffb60efb9205cbf92678b3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/eo/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/eo/firefox-62.0b20.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "ca05ac344bb68941ef82926cd9548036a3ecdb0fafbd71aff1d75b6c90b82e55ed8f3a9f00800656c146356a4a59624835e23ef572e5a04872c7966d9019e661"; + sha512 = "c52807336eb6a7acefd83053b13b9e5e6a8ce746466fc8a117e29b3293317d8d8aad86fa5f893b57713ae6e2d1a86e63ac3a8e00079542bb9d171d0297b46a39"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/es-AR/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/es-AR/firefox-62.0b20.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "7ad38902eea68a200b4da512580840d54f6457515d7c3d763619cbc021315dd0b153e224c448ae99e7122e9dfcf53cb6f059aeaaa6319d8911e092e6bcc5d6d0"; + sha512 = "822524e73b1f49037b0e94b297fca1239dd8db130661bd791c1e5e213c9d3cc8f433af205b9cb3a2b3b983bc1470471f558d5e49e908ca582921b0f04d429472"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/es-CL/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/es-CL/firefox-62.0b20.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "19dfac04335e93ca66cb3767e7547224df13c278043bcece2a437ca1b63ca30e9930232f6aa8314d063557d4ed6889780ce5d0807b056e97d49a767aff495ce7"; + sha512 = "24e6938f719b0f369db6d2277017e976e3db83ad342ebfe3caee1c266e4832c0fe306018746e3b45bcf6a7a430c9083fd56cd22e57945966ff4f2943b828299d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/es-ES/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/es-ES/firefox-62.0b20.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "f7d72327058245c76b8e577bbe62cee4b1c6333836386ae5a473e56ed825cdad023c3af9038ba23b1527c1f0beb4815765b8309321984bc9f13d67987ab0d03f"; + sha512 = "7d97797796becc35a27bdcc461aed9f0165e49ff8010234ac9d2fa0274ce9270b2b69657d841545fd2b6b4cf7727ebea76ba3d5c2bab8c2f1a4612fa678828d0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/es-MX/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/es-MX/firefox-62.0b20.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "c9c637305140f02d26a1d0bcb99d3419e7f30f12d46c39e611ad8893d918b770633d08b4a82c6f5d11b06621e32a530ff7a065deaa958eca6787fc4f0024192b"; + sha512 = "bcba9c47bf13b77679374f077024b62e6f4e6048980b71901f576492629ee4e6074f9e5f33b9260eb67476823a604803194f668c4ce1ad09bfe78aa5017ad9e3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/et/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/et/firefox-62.0b20.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "585df3ec775bccb61a602a3e62cf7faadf0091d2fc328c74b0aa8810cbf3d614edb418f95873c56eedb5cd2ad3efb211cc972f6425404f10b0f43b5bb1480152"; + sha512 = "ef00d5c331d377d544c3f8acf87ed78c658a5e076db36a025a9c004366b27d95f2c82971ce45f2d48eda4cf34f57adb95c646ad21d2000e5d631aa2a8c2355ce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/eu/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/eu/firefox-62.0b20.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "071688f8e892d8deb70f65f0176a4909b337e1350fe0d0fb9cf1a66ff69bd6979083ed99543f14212f0936ccac084afc98979655645fdd9cb37250f2639e86ec"; + sha512 = "7d83cca4b0f6de980d5e66b152bcbc72286cc7a241ac1869cc5999a7007f7b632d35b9319425fe1391cf0b16188709fc62c05e81fbf9d1bad0a338509cc7c529"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/fa/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/fa/firefox-62.0b20.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "efaa758e950f1ca0f4c011ff1da8ffa5d6d3c9c23784ab3a2cf253bae95d6d25ad8fbdb05167118099ef6ea0037ae341c4c4356cb5af849db2f63b923e616e6c"; + sha512 = "aaf6b7583a9c9219c4967b34c2d89d58766261178efa2d89f4cb7c9bf8018d908887ec04bafaa0ec464c243d301cf09734cfe6150d40952df532579c35abd517"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ff/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/ff/firefox-62.0b20.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "1b30f20f6959803c6f105588d612d2d0d88209f2103d829d56f4788b43c4faedc827fcd150a0af0c4987532bd4bc7ccd7591afc34e6e22d18ec304841d9c450c"; + sha512 = "3cfb4321724a30c49e735b001dcc3b3b1fe2ea2872793b5287adaaf89b6821f8b81669761d8296111b574be14eb6bce7d0467a945dd22ed652f82d2ddc29a46a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/fi/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/fi/firefox-62.0b20.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "97157deb509825073d484222b5402d8c8aa239285b9af7f12e92649672c1fe1d9454ad5a88d38424272956fbcddf069ffff2b8d80da809ad65f65ac185d50e8c"; + sha512 = "2acdfd29ad1213c8fa5ffde258737ba2232ec1d2fbdd5285c913b7c383f4e30a2cda65a16e1f597c81f9ae0ea1b7fe492625eac48a92fc2f428d5fb0ecd5ef83"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/fr/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/fr/firefox-62.0b20.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "49e01d81c93f464e1b028af91113123513af7d0f4cff5f76f7ea1b32201a962c49f0744545ec82e0314aa2c74004199d2734a8aa236d057c6673cb2f8df37b32"; + sha512 = "4f18a80f38d2f8b2e828e58171a10bf0509275dcb5321867c52a818ce82b56ee564973f13fb222b049e0df3aad1d7b0f68a6ca24e88181553bd3ae125577eb04"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/fy-NL/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/fy-NL/firefox-62.0b20.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "e121aa2fcb0c023ce339d2764f58ae489b1fddaecdd4751d76c6ddfaa2297e071a5cc0901e36fd089dbf3db2eba74ecee57e379d7b2bf0e71a887b87a4fb9425"; + sha512 = "c7b18de94816353897423bcb35b5f5d88e998c5dac3d37b417e2887f5fcc7ea2c4233a5e603596e742e2710e345edad14a48f45b74a91810e126a14be803b7f2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ga-IE/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/ga-IE/firefox-62.0b20.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "719d35a8d603dee4be8806dedb253979d89cb8eb912fb389b6b7889c5bada5cfd5c797eddb3612b9ff57147df1ee2e55df9272619e7f88ee63944bdf9697c050"; + sha512 = "e1b070d63012e494a0fb380d7e97f8ca32e93dc3e8df5e2f5347cf829b6a94fa886dabd46285110b4e83c807f49fbdc7f792061ca36246b1f7c1c4260dc3d927"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/gd/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/gd/firefox-62.0b20.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "63a247caa38e0a9fb34c99f6949272fb1139db5944a4fb2f13b3ad1ea19fffedacbe70c3a409c1189de5d89790cfb03ac69c22bb224f6318010b752f520ac4fb"; + sha512 = "218450b49eafb3e13dee8d96cef0374423c0fd9ed9f3700428fdf0234a7f921138b4188dbdef60013062c6aa62fe2e13a6bbc219c756b8085e4b87f1a7400ab2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/gl/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/gl/firefox-62.0b20.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "93a3feda1be1d74eab798e60532b99196ed343999d7b7b49ddb5de98663657cdc894e310e705cdd8e0f1a1e0333292014fa47e787f15908d691ccd3e51fe27e5"; + sha512 = "e841e13d8f9aff9c00e3d78f01c6a6145d87f9c6fa5fd6390080b1f0002cd6ae2e1d45a14624151f7d2a075a479281c534b06bea6f03d022dcdcf330858fb212"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/gn/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/gn/firefox-62.0b20.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "d8b94e55d6770646ea47ace57364c0eafe47d62a2dc57a40a2c7db7e74109b04478e7e8cad08d29a553eeb2c23bac896476b049f9ba99f62f1b0e585f7f6f403"; + sha512 = "00b1242cd074fa385757a2059719fe680d52bed9ff74ba913f50fd3c7a6e2bdb16a2c0b63343bef47dd0fe2a7b55b5bb089e801feb3d4e537048840b453b9464"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/gu-IN/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/gu-IN/firefox-62.0b20.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "1361f71c0a98fdfe727e8cdcde445c01244d63520a37036c95abaa2175b450fa029a634e6b0b044771ddaca310a92db2d5526eb8111bbf3dda7e605d95e6cfc8"; + sha512 = "a1ba413e9f9f9167d15f37854d91620cee806edc1d3aef95fcc8b067384632d07789ed7fbb90255e572de0de73096fe08147082e24fbad9373717d1388f275dc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/he/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/he/firefox-62.0b20.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "0468b5ccca77ce311059cb204caa3f9fabba2218a33c6d1accb3adeafbc9523bd21611a2c0d2ba926c3bd9c1026323a054de2bb6017344013535665da9ae2d4e"; + sha512 = "6ee67f5d621666c3d1fe3bea325499f21be3c5b51b76dac0ce04986e4a780b2da6abfdd2ca2b0e135abbd5c085b6a58da3bdebd9aac2daac3921e36b5c823027"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/hi-IN/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/hi-IN/firefox-62.0b20.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "76900afd9f8bbf8d8aded010695fefb9b45a7fe06908e55b39f7447c850716f5c4139cff722aec342ec88fd3b84f81bdde607d30e7d6dcfcc4e6a37b5a7ea973"; + sha512 = "a6c674a0303589372f0f065509977a7233a0a64ec3eae0d6c33321a3f8ef39e8bb0c06fab28114c620560a5dd7748801aa01c59feb785250455ea5d3683aa324"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/hr/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/hr/firefox-62.0b20.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "59f5dcad6e28a127dc702458d15f094ec106013f996a136e07b6a7214751cfdb9e50dbb46bd3eb202156612a8e67e4ee6bc82843dc0868a7595e9cc9afd48b9c"; + sha512 = "49491d5cfbdb63a0ce5dfeab0041f3ac188eea65d9804ad204eee826a745e7274b59119545278a76e1a69f239b2350835ce69aade82195f2c9e3d926849b0732"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/hsb/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/hsb/firefox-62.0b20.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "62496712ebfd4813c428639f05d936c9444e59725a4f1b43ea2eb164468d90f8a3f8c4b20280f61a4049bda348f4fb973647f921c3da384e05313bf748230917"; + sha512 = "94a1b14a0307be3946abf0291be752d90ffb004742e27ecabeaf340c8a291a203a71152dfefb0ac8614f029763d0f7748c20a9e254763745e74bba7e00dbb752"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/hu/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/hu/firefox-62.0b20.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "51d0c976525fb2beeb53b83254d8b1a3211618e65f44a2e9dfc02eba6bdea229aec340242615481e4170a182316242986f09efcb7db14f83c86710ab13688981"; + sha512 = "ad13f2c9b2e233b63685e5d259e189c42e03c20fa4635b1e3549bc993aa84b6b6f60db765d3d754d4077df71482db8a410b78255525a98484af90963d7bd46b8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/hy-AM/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/hy-AM/firefox-62.0b20.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "d131287920a31ab5daca21708204e405681c7e1e6c860cb10b16b475e42ce1160cb7084e31833bffe317e47710729027fe2f77bcffd35e715b661ac81bb1748e"; + sha512 = "af60b06dccac40856fd7553853ea27f084db076ab544e02bb85608f54b7fa91b05eafc878ff453f5392a2dc642e1f8bf7792ea2393233814e23e65f4eecd39e8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ia/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/ia/firefox-62.0b20.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "50434e6bfcea74603cd9a5d8f660295e8c433423abaa5e27b192522936fb88d93a27ad6ee64fa136d120af6ab1183a7d21bd85bb3577291863f0b4509d8ec8b4"; + sha512 = "f1a8b6d609ffebb5152f0156ee2dda7452f56321852988ccc5f0f644c96477a0bdb8bf1645f5049bc404b0ebe17627b53db7467c208b7f2c8406f7742e90a9ca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/id/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/id/firefox-62.0b20.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "e3d73385e4120d91dd08fb3abc4f6268f6d10cce23ebd34553e3037c176f27f39c90f8fce59a0416cee210e73b1cf57b2c92596b3b4634700d8287a89dc3e014"; + sha512 = "8b90571b48108e99021594d517e07cbbc897c96a84dbb8547c29a674f875fa7cdf01432af3a8133a524fe43640b7d6e6b6603627789b01b6cdcda0e3dc6be431"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/is/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/is/firefox-62.0b20.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "775d84a419e24914f31cc4d34dbfde547e42c35e41397f4ff462a80ed7f91cb87ebdda4a248735d402ad57bb00cd8d7084618a381c89f53d6ed17bdeccd93762"; + sha512 = "85f59ccc1812b98df3a7ade05998e997180ff5e1fff189dcc08a6ce65d5f020d3fa1a364e36d363d92bdd9cbd8c30af38a159b304c100f65fae619371ea817c9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/it/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/it/firefox-62.0b20.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "27e315aeea864d91b422c4e6c698e9de06fe14867c12fe8b455ef284ebfa80c3a00774df7003150ec24abb05f8717577092feb4a41931071836a09fceeb3893c"; + sha512 = "c6ad61d891ea8d26a18da6d53d60216ad51fb236a4e011d99dccb06fbc79cbe983310c406dc9aedd1cb6b9c15212bafdc3db23f4b63a05343509cef1f5e309a4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ja/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/ja/firefox-62.0b20.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "966d8519de5579a30a1cf8cbd275602cf39d3390ae9f70bc56709ffe71b0937c7ac4ec6788c3b972739376f76114037da6b54d94c091e035a8fdb5c3832cd4a5"; + sha512 = "0b802cbeba1f5ea66818f3eb4738e43f0c448bf7a33d02a656a1c5116b218c5e7ee915f788d8de19e9599a544ac335b2a2dd3734ceb1bf927517f55a331a9ff0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ka/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/ka/firefox-62.0b20.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "029b687417bd612ef8d26e209795c8691ba310d95c2d6ef4603a71a0c334a96c12e54b79ef1b02f35385f28f2d7d399b7c8bda494d3c8e8aa7041f6a9e9771a4"; + sha512 = "2b71658317f90bbb6beda188cb347e2ff413476e429709da08b094eb60363b658f3eb84dc58d96ccb2f16c9d7a692bbc0f282d28020dfe6de3ffdf554636f437"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/kab/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/kab/firefox-62.0b20.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "bf07ffe28d321b12435f441674d28d26cc076f0f3bf5a4c74b481581bb2bd1204c66a7ff76698759c22436cbe9c101b337a007c7d44530f6d2d87e89dbd5d95e"; + sha512 = "129ff0155fea5269dc0d655633d6b807aef97a626e338b4d6a0accac675b0c7cda99a95a5989990ccc69cfd9137f4c2f907b833f650f4b789c7beb707a634f18"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/kk/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/kk/firefox-62.0b20.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "2fe956a4f39c6e42beabe512ce45406ba586b462a604bafe3ed325e7625ff1558bcd0e200c147438741a6dc010d9fdbdd1728391ec660600e60883f91fe0f203"; + sha512 = "8cf6ec86d8c60fac299eaacc9f046beb497205f1414334980e0d6ef2576a043f731df5610c3ad918b5fce0993410ea5125efdb769300387ec0ee6fc5c5beab9a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/km/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/km/firefox-62.0b20.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "abc5c7b2bea6d67f7ad229a00859740c37675a584f3835608bbc6e9b0e1a267f81cb4e29436dbaa67035fc1824f2a8c8d25de59b328fed512a4c6741fe737448"; + sha512 = "2b5a8415796d16a386de7c82201449c2929b7f75e96ca84b5adc25bb52ed27e76fd5f510d6cba14b04be26866d17b0cad026bf9dfbe49094cae2fbed984873a6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/kn/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/kn/firefox-62.0b20.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "a26e3c8ebb41f40bf8211da74f8057bf058dcff95606a9614ad75340b9a1f1bb2c21f368beadcdf953a43a837d7ffa899a3869fbaac0464136216c9351a8173f"; + sha512 = "2d6f3384708ac2275c5b372d33daa0e80b6b253d69e80e0f2ff755bac99dd8eb2dea9585e3aaf20c2efd6528f020089b0a29a1eb8fc9719958edec806557232b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ko/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/ko/firefox-62.0b20.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "1b6d2dec4f3cfdd1e6f80c7bd35007d17394e7cfc16f8e5c469f3c8dfffddd9917dc775f0adf3e86d2956caedacae98d78b25961061dc7e214394fdff3737d33"; + sha512 = "dcbfc97a8f6f5292e519995becb41065c561395b7cd24f76b6717e8c920c910a5456ba382e079641988de82871b7c4545cc1d9b044157222db780cdfeefd9949"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/lij/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/lij/firefox-62.0b20.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "6749c691ce78968dff64f124b992c9e45882cfb245f6e406c8ec2a74278828d419beed30ecb8762f2330590474db5a209f0720c574f1eb4f1fb0739c80f040ec"; + sha512 = "fddd4b5a341405ce2d7598768d53a51c37c54c6486286569d4ad06965f27b4c7249d769507b586f5c880ea994e67b0e51a2bca9746c54501939c4717dbbdcd80"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/lt/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/lt/firefox-62.0b20.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "cceb2c1dcd6146194fc6f542b901723d9101ae03157567b4b6f0a9ce680a7c3d18e7ea959a4b772a75e138ef19e0c6ae7aa70e2c51304ef8568264c1e1e5a5d8"; + sha512 = "e6a11b4709c0578aea57330e43f9e7f15d7c1c9401a2fa04d909e373be7a6c80123f05ede39a9e72a33c8824b211e42483a96a9620de419b7748080cc9a7e998"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/lv/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/lv/firefox-62.0b20.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "1f9a6f75d4f4cf44f6bf3244e9b0fde13358914602579a25b8e8146010321b0fd31de81aa55aecf759163ab54d4c48b580272d3261b1d534da26c1ab8664beaf"; + sha512 = "f1c6e3422d6cbba13d9ad137523f06be5efbaefc60490f67456d5a604c4e9083a172c3299ab1d41efdd76884ebc1fafaed6a083493c00abe81888a23b2dc0c87"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/mai/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/mai/firefox-62.0b20.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "de067af17fc6460fbe046fa661eb85e609061e68975ef8f3ba22492a6ada228a09ad92933a385ce184688a4d40477995d54cd548ae03ef37c73d53039599e97c"; + sha512 = "5e7368d6a098f90c6b550e0700342c1e036f69c7d2a28edef7511ac88601b5befae37f2fd279c22e383050ec5fe0f5109f22309af34914c98e120144f94a0345"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/mk/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/mk/firefox-62.0b20.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "9c2033a0403b76301559a306c76cb29ed0a5267db915bb0771c0c808b16bf95e822e2c5e7dbade943eef1b3789ad5ac1bdbdfd01fdc0c18b49f08b35e6bca983"; + sha512 = "4294fbcd18dc778ac641cb29c64d242570c018eeac33bf21445dbea4f9abcdbb31a384ab2a73817be265f6cbb6e509b86b9fd132b7cdf09258cee191821d1796"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ml/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/ml/firefox-62.0b20.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "a0f606071b04b1822b7a8d51f46b989dd7520b7cf1330fcefed1c8e6d09b095e11c176f9f94f123acbf9eb61293e8b765f3ab4f303442b4a10993418e25cdcc9"; + sha512 = "050f90fdb97edde5a75b798af02a10f7fc5bda28a07bf5f0b883c5039d855cabff160b0fb7411726c5852584f96ca4135878ba7ea8c3298de2fb3af85b7e99a4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/mr/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/mr/firefox-62.0b20.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "67b307e0a45dd6f2bea45377a22ba6dfd5437dac5ad3ac0995ee14091608bae6b86a3489b8dab9cfd87879d763271d70d7e7683b4cbbef5c1bc488ef94ef553a"; + sha512 = "a005fa90f6d301d1dad2175d58bd9de698f061226a6776dd5da82195eba19b004252b02fb464f004b6aaeb13232e8d80d511bec3cf955911f087ee40cfcc0015"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ms/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/ms/firefox-62.0b20.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "099133a0a252f2b123328c66c6530fbe98280ac1fc5cbe8b2da4537fad4b5bd265e972843d9dc4bc937ec03329ac258e9dd7c931843d8d8859a75ccccc2802a8"; + sha512 = "4ddf2b483f24b16a08b293a3c76049e62fb7326d3da7287bf0493eb838220cac3ba5a81473a0278c72a5c5e5391edb17304c0140e81c43c1b943b9135ada3b9f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/my/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/my/firefox-62.0b20.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "857b59f4c1613e4243345ef9819f88932918b4cb708f94bcfdb2537145e19c2825cc6fe2166073606ac282c10250c552f1d4c482d991a33f1224cecb5186811e"; + sha512 = "23f2c208eca6472879e47a5bf3c4fbe04a2feaac0d220cdcd1985001665f65e8992a97998630e65cde02c6c87dee34fa10bb78b99beb5c8968c99b410b226a68"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/nb-NO/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/nb-NO/firefox-62.0b20.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "edd41419b95e5ca51eed3562207240db6cdf85965bd77e85e8a6cb7395e292cdd6c5af444934d922cd5495000f8c46d22774fc7fa7d371236b22147fecbc4560"; + sha512 = "22461cd2fae62819fe9a44a1b947d63ccea61d5b5ccfbc949644518d3c65c242e91770a10405fbcde24b2f6eef794b3014e9b6396eb6a945c904e762792e2634"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ne-NP/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/ne-NP/firefox-62.0b20.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "6eae78f9e49cc61a6cd217b4059b0aa91942b3122207c716fd35a726ef9402a11bf35e2ec84fe51e0548e286bd0f447019b3f1190411662252fd7d96e0de6ada"; + sha512 = "b499cb8cc7d5486d368b381ac6c0416861846568fe6b8cf83dd2105427d87fe12a648da5b36c42a4a22b64db48c9016828c14f61d4c6ccfce347095ac275deb5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/nl/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/nl/firefox-62.0b20.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "c5005b61225e26940a30b6f49f6d92dccb976c324a4422812e9414170961e60933754da76f50ae4b0f6cfddc3ca300ed4439376545d1770331da619af89c3673"; + sha512 = "3107acdb8fcbba9629c0e3ba940de4df42d7b2d57328ae3b2b67cfba280ae2f97499d248c1c909630e795fe1f8b8c096a60e273dee3ba1bacecac8244612ecaa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/nn-NO/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/nn-NO/firefox-62.0b20.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "03ebe1aca85db5d5c0886f08adf3c5d0b8e6a9576eb1941f28123a87440297cbb0fc0957cf847d59d85dbd1aee4ffae8a9ee11b3d9005258a1ecc89c6c2692dd"; + sha512 = "bb5f4ee13acbed4dabf349fe8373a6dd36df5980c6ce4c4d8a2f59cc2a7e53c0da33370ecdb394c80e3e0738d9330690664e4702776a3d5faccd6fb041fcebc2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/oc/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/oc/firefox-62.0b20.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "8629f8ce3d89472be12f321658e7de12c652c540b116ce6e8e192f4f697d08159298e977eb09fc5e24243d73e679f54d586a444d99542f6b35e1018d9a9c74f4"; + sha512 = "fb0ae7f6c96a5c3dab3c8b205532cf0963f58bdb6b5be335af6e04c583101d7e0769ebbe7af5a25eb8c8e0e52d29762660d1325bfb36f52ff118c3443b9c503a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/or/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/or/firefox-62.0b20.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "f9af314dd17d16f981124117bd3705c9d20b0ee75552356d1b6423a07b6620dffc05e516490f435407647d7ff800411f2118a5d190090fba5da33d59cc3dae92"; + sha512 = "3a096af1920f5882a3c14623855a62bb21812a342ce8202dab99937c95bf2bb25ee95d6e8d8f83efb3a4a6576cbedc08fb1990f32aa2ff95e9db109b3e246a70"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/pa-IN/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/pa-IN/firefox-62.0b20.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "14e472a2db37fdd16d092741df7300aac32670bfcced278a1f2d4c19750ecc9b7342b5f8f100d7a4c92a8bd2788da90ce9f7c3c9de65963daba0398f292a2d4a"; + sha512 = "c078b293d2ed28fc1780ef5a245650e88f64f806b6beaf593da3f34e554e77e239626699e959c681f652a14143b46b13146a7d4fa04d3e71bbb9a55c0d487e0e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/pl/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/pl/firefox-62.0b20.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "6d303012540dff3d0d62037893559099cb015d4a4ae491f9a30ae5586b5ce747233fb9ce85aff018b3f675782ba20cc50de5ed8137dc0fee43fd50a4d0db208d"; + sha512 = "6c528057f326285a7b41a12f5b60f6dc0c659d8475d1766b577bf3967bb0111bdbdc43a4c5dfdee20a215d12b9768cd080d33b7fde31633f41edb9019ff87a50"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/pt-BR/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/pt-BR/firefox-62.0b20.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "172b1ed2481a2c42f22fae52333e254c9240062d2b197682f056a9782ae8405b8d33aaecc580b4a2418449d7af99d2f95da0b6929195e2f81e0d5af84bceedf7"; + sha512 = "e8fc71862f83004c660168b0e955a1043384dbab038f3e959087c799088bb3307c102097f627925249a5ce3f316c102a0ccc871e313cf7efbd4d10c91b2eaea7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/pt-PT/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/pt-PT/firefox-62.0b20.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "646f0c2d24028bf02af352b0cee3118c37890a013cd17a37d8c260c8b8d2ecdbe1a258177b2e82057ee1b0ee18748b3c22e5d10b454626f560e63b0d95b28fc2"; + sha512 = "6c7881edfe14ad6cce5241e4de562e137f44abf23bec6c49e801c1fce5f1c417f88939a97f4484c37061063f7b13d64eab55777c6852634d3bcfb69954ca3837"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/rm/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/rm/firefox-62.0b20.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "25a2049dbc5d0bb7223989bd8cd3cbda0bb31a1a41a72fdb2d094f8f31977929e22dabcb792e72152c40fd45ad4b82efa1f4023a4e1ee2ab26c3dd6b0c06047a"; + sha512 = "1516fe15becfeccdc63f3014fa1e776662777f303e66f1d7aa48a39905eeab20dd646832bbdbd1e3b61275f02dd338255e0e6db6b0fddb159d480be4c89dc1e8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ro/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/ro/firefox-62.0b20.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "1e718ddd6e94769e7de9a458b9b4c914061a6902100f9a941b49d8f6a2f128d5460a9b932b4efaa7a8036ff64792e05713d11bc9c90022ea06639ca704a392cd"; + sha512 = "ac6e751c4d2be30c6e918ccc1562a8aefd0e02ac672e2bd3a3f6b9bd2c153ecb172674aeb6ac9607210250e6b9058e007626bd541c4c164316c77d98e7e77c8f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ru/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/ru/firefox-62.0b20.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "575675c09aa212a8952808238b783b7728ba973981c1d91af7178a8f80be26a64edfa0ac2ea8ef8ed99d3d7b0fbdc88113f6b8e56dc4ba77e75e40cd7fe30013"; + sha512 = "92a7cec3b0e4783cf2bd66a2afc0db069b9e26b0359bf376abc36db8c461b68690a789c06275d7cf3407802e961bbe6d6779497a158872f3676419cbcb1fa864"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/si/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/si/firefox-62.0b20.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "a8457d36199a6bc80b40747e553d97921fe670b5bd5b23b74163788ccce8c2b5c978da0d20e8ccb4546f76ed6697b7833b30132008d85a6d26e1056ab17e4f23"; + sha512 = "d0cbce1d70714e8c4b5d61caf7f6e02b1caf43530b3a8d5db775bf164b74c273ab458262502cfcd6f0aa4a77a69b0fa3c6ec7bf9d3485c7ab447b07d8e534a28"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/sk/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/sk/firefox-62.0b20.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "4db245112df4feff3a9683e5cd451935dc43044e07c5e44d60dd8e425dc3fee3fabfee0b2478045cdef3bb69a7a948f0bf5bdb894c3104c41a1ad2a2c3d5b2fd"; + sha512 = "89033347ffc61f42d9dd9a2b50a24623f7e8b96e58b8f6baffb9f751e3b6b64041ebf4080fa7fe872f72e65982e860b04004b42b5c51aeeffef4129a3a593c8f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/sl/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/sl/firefox-62.0b20.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "08c3774a94dfeb9d9f984aafc298336e8785f06d4fde3ef9b260e53a8c6f21c9531d5d52a9e09a81b68a17275d6b1d725f3fb894df0366a7b4e2de1669fe94a7"; + sha512 = "ee4ddbedb3c5b0b7c11d277f84028c867b17bf7a1559b276340312415105c80aaac8ce468cfaf99368d55ab4b9171e0555b5ff6949bce306ef72dd029464d479"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/son/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/son/firefox-62.0b20.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "f30bab848220c3969c572783f7fad6395a2c6933b57383146bc1799dd5e5dcbeaf679af9ccac90a72cb607360f2adf8b20c75503c314cdc9cf99a0d18eca2c93"; + sha512 = "19a7e802542421b3147c2c0acf379d5bb8fe444b1dbf3ea41eac08065e11bbaf4467fd2bf0eec2fbcbcdeb8a24677b665035bc6c7e892bc762b5f8e01f9b9cf3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/sq/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/sq/firefox-62.0b20.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "cd07a455109ac035f3adcb81bce85dc7ca9fd871498e808dc91c4eed3775fb1b4b752b769769ac79a2e8bdb781c1425c3990bf3a6df40cdfc2b6dce6e99b7c70"; + sha512 = "32baacb624f9060d34b76d8aece1c52bb4dcef3d99f01d5160878666bb0b7a79501fbbcac8db57a2be1f8bcb243f323b52510934dfed36a96efcf0a23664619d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/sr/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/sr/firefox-62.0b20.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "e5e2c694f464d781ce67e6e5738784538e22f8fbbf02853a6dad9d6d31ee4914b2ab9e2fc2a609eb353c4a040d58ade875f9b64f061cef97e2c5de1e386ec469"; + sha512 = "307d847f3a8fa5dbf8ef3bf8fd4750b508fd0e01694d1b7312919335247274323806f70e7863a1cc66fd368192c8b7d3df53f5c0993fb7defa2723f50eb59ee2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/sv-SE/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/sv-SE/firefox-62.0b20.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "b714ca1dfe8aa648fa9fce2a5b1c35d01d7f5bd8088afb91b18ee02a60bc9063183c5e93044bbfb88bbe5a7274cdb0a9c20aa9a044195febaeb2156ccf10a650"; + sha512 = "e7c257a6bfdf9d946174a274ff41fbb2043978f4263e78a7c4af67f030b70ac9fe3ff0944d71b002478c9fdf033ea4a252400819e425dcd707adb40d249a2df1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ta/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/ta/firefox-62.0b20.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "18d93447e531436500f6ac56a60f7e550e2677c8a0fef730c44ffb62a6c36c3a9de81b37dd6636c687a2ebaae3a1594e8ad522b9fad4c7233c6f51c2fe1c3a04"; + sha512 = "a47b5ba62065cfe25fb0bb650c46fe1b7f92b1c87ef99e9cec15cc9d46b7cd7eb33c74065a9becbc0555604020f7a3e61588e29f920c8a926fe90991260c4cc0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/te/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/te/firefox-62.0b20.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "a4f06d18f8bd33707f0ab7fe68ed169ca14be68800c69a7264b9b30e4f563a349f9e5af357f20af5ad1382323699b74219f95c00187558d0b923a28583204b18"; + sha512 = "0e54ec5597f42d4e6b04841bb0bced5e6129c966ae917912d3b91dc0314fef006a1929af6a04b126564713ee2a810a4bb9c1957803519ff7a64a9a05512b737a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/th/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/th/firefox-62.0b20.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "8d7a09e43f4f184f07b5d67a49fd2d48691166cdd4bbfb4338d5f9f721cafa0a0d9a4cad3b886bf883764edbef592a11acef1028b06e1d023d7a86827c861cc0"; + sha512 = "c8ab7bdb4b1a95f08620a2788ce00c3c4c054826026966a2fb6407035e26fcdb685337dbd5187235683e7ea08234d685540f541b6a1c52f3e9f2a1fb5d2a7db5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/tr/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/tr/firefox-62.0b20.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "aa390ed3142e80a089b6363a41e674f62f7b423cf01d8a49f89f9646d5e3e3b79a7d14b044386b9a2bc11ae7648668b502d31f27561937e94c4cba057f5e8499"; + sha512 = "35a4b18c459898b470a35ecbdcfe863ea66755de4f51842f2a368300e542eedcf92914d9630b9bb32c2c0381406b3656ec1860d9eaafb2d2ca1f7e315593b17a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/uk/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/uk/firefox-62.0b20.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "b878a398a0cb21b53176da0ab40f9bcc29fc31dfe82639ab266c6d6aafae4ead7d7914d17d916eb0e3a733d9eb45fae1c1534ed473cb64b145325253afe7d999"; + sha512 = "854153f02ac9500858aa9da1f153b231ff71e372e2c9d2ad87282ac0fe981d959103847a5688be87b01b2c3032e486ecc39fc76d3e495c395c2cb88240b5d32f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ur/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/ur/firefox-62.0b20.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "c828613d82a1df96fc5045539e173633761b24339a1386dc2528d275519b2b511dfaf83baa560ce0e34a05e5db192f2cbfd8595eecaf3ce922de1d8bf1555216"; + sha512 = "0434852668d46ae5a85e9a1ec6a4db9ccb801b4d870b28e500690be33171b1596c7004f23ba643d88183edd524a6d558f0f105b65d1356147648003a0b6b9355"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/uz/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/uz/firefox-62.0b20.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "9bd604b913c7ade0a61e5244ccd8d0fddc209d8bd7dcf232ccaef3019a31d416f2ff0da0a267349a5f1458e2d80f1af1eb98969904708a486b9ac06b917e60ed"; + sha512 = "51e106c354bf253319107ee772619139413b4ef569ef3c97abc0fd26a5cc1c0eeada6a2924c3838f320fab51225e05e7ec170d61151baf018f9ad39f3de83f5a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/vi/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/vi/firefox-62.0b20.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "93ed4c1d8e394d549bca34177ae5180390ce8a9d469ef0fc5fd858a0e61bc8f9f7184917826b72269f28f79793040286bb94760c5a06609325f41e2baf22d7cf"; + sha512 = "bd3d7a34c737e2b165de9bd893932e117d993c1ac396f7161221aa84c25e8f7bc5e528c0de710da46324bc05c18762994107b08291dec49e5d8fba58b4c10dd9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/xh/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/xh/firefox-62.0b20.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "fa28b9e1f6f3598e0936c916a7d9b93866caecaecb9c07f497d63b57dbd2ca37f6110ca2e2b63361e30c2ff2961d97dc2eb9b88b9deeee6ea3a6969a46cdada8"; + sha512 = "3c339ca6230783dfec8df3b14709af1a849986fdcc05546447d698f84e3e8d1b006e0885ef90321cab8d44dfb0222e6ebf936d1f3934bd8b487ad941699392e3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/zh-CN/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/zh-CN/firefox-62.0b20.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "7f5d84e863a76c2ecc53b0b7ce1cae5f48818586ce8f7ce14c42a423f0d3336ece9a84c35d89613df286f7f0165b63de0a38079a007fb40f7b3bd12f16ec5afd"; + sha512 = "8c699af29bdcf3955c4570dbff4f3449b033360892cf8c1b86bb00fe6bbb778f6a80293627ddd0fdda8198e2f8cc89649e66f3f37bb0d2cc9a2730210ac0506b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/zh-TW/firefox-62.0b17.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/zh-TW/firefox-62.0b20.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "0f904bb2d25dd1f481dc7a5579a64c6bc3e14d4f6038a9ffda0ac8b24549cd1cf2f3bf337f4221c15532e25372c1eaf76a243485434551ae12ad569e26cb4fb1"; + sha512 = "93ab2022e6fd50266e201352e37a158d2eb65c00ed76cbba5940d852af182e401a6ed85aff4b7e50ac62a461afe21654526b158787fef15f9ba4c71cae91a8a1"; } ]; } diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix index 6e2089f9935..8cff2494bf8 100644 --- a/pkgs/applications/networking/cluster/mesos/default.nix +++ b/pkgs/applications/networking/cluster/mesos/default.nix @@ -4,6 +4,7 @@ , leveldb, glog, perf, utillinux, libnl, iproute, openssl, libevent , ethtool, coreutils, which, iptables, maven , bash, autoreconfHook +, utf8proc, lz4 , withJava ? !stdenv.isDarwin }: @@ -50,6 +51,7 @@ in stdenv.mkDerivation rec { makeWrapper curl sasl python wrapPython boto setuptools leveldb subversion apr glog openssl libevent + utf8proc lz4 ] ++ lib.optionals stdenv.isLinux [ libnl ] ++ lib.optionals withJava [ diff --git a/pkgs/applications/networking/davmail/default.nix b/pkgs/applications/networking/davmail/default.nix index b491f287e70..31493e46f53 100644 --- a/pkgs/applications/networking/davmail/default.nix +++ b/pkgs/applications/networking/davmail/default.nix @@ -1,17 +1,19 @@ -{ fetchurl, stdenv, jre, glib, libXtst, gtk2, makeWrapper }: +{ fetchurl, stdenv, jre, glib, libXtst, gtk2, makeWrapper, unzip }: stdenv.mkDerivation rec { - name = "davmail-4.8.0"; + name = "davmail-4.8.6"; src = fetchurl { - url = "mirror://sourceforge/davmail/4.8.0/davmail-linux-x86_64-4.8.0-2479.tgz"; - sha256 = "0e650c4a060d64fd2b270ddb00baa906aac617865d5e60c9f526a281cdb27b62"; + url = "mirror://sourceforge/davmail/4.8.6/davmail-4.8.6-2600.zip"; + sha256 = "1wk4jxb46qlyipxj57flqadgm4mih243rhqq9sp9m5pifjqrw9dp"; }; - nativeBuildInputs = [ makeWrapper ]; + sourceRoot = "."; + + nativeBuildInputs = [ makeWrapper unzip ]; installPhase = '' mkdir -p $out/share/davmail - cp -R ./* $out/share/davmail + cp -vR ./* $out/share/davmail makeWrapper $out/share/davmail/davmail.sh $out/bin/davmail \ --prefix PATH : ${jre}/bin \ --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ glib gtk2 libXtst ]} diff --git a/pkgs/applications/networking/firehol/default.nix b/pkgs/applications/networking/firehol/default.nix index 9efe20b3ee9..335f393bc07 100644 --- a/pkgs/applications/networking/firehol/default.nix +++ b/pkgs/applications/networking/firehol/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { name = "firehol-${version}"; - version = "3.1.5"; + version = "3.1.6"; src = fetchFromGitHub { owner = "firehol"; repo = "firehol"; rev = "v${version}"; - sha256 = "15cy1zxfpprma2zkmhj61zzhmw1pfnyhln7pca5lzvr1ifn2d0y0"; + sha256 = "0l7sjpsb300kqv21hawd26a7jszlmafplacpn5lfj64m4yip93fd"; }; patches = [ diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 87c7bddab6f..53ee46e2060 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -36,11 +36,11 @@ with python'.pkgs; buildPythonApplication rec { pname = "FlexGet"; - version = "2.14.9"; + version = "2.14.18"; src = fetchPypi { inherit pname version; - sha256 = "1a8nxfr0rzwwd7b0nxr7zmw04ygbqvnzbi4w4nw2w8xiy46zid3q"; + sha256 = "1pyvm1d23qy71rg7fzxcal8978kni7sn09zw4s4dsq56g8w80ay9"; }; postPatch = '' diff --git a/pkgs/applications/networking/gopher/gopherclient/default.nix b/pkgs/applications/networking/gopher/gopherclient/default.nix index b233ca4ab47..d36533fc9e5 100644 --- a/pkgs/applications/networking/gopher/gopherclient/default.nix +++ b/pkgs/applications/networking/gopher/gopherclient/default.nix @@ -40,5 +40,6 @@ buildGoPackage rec { license = licenses.mit; maintainers = with maintainers; [ orivej ]; platforms = platforms.linux; + broken = true; }; } diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix index 73346888a33..2d3a10cec5e 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, pidgin, intltool, libxml2, nss, nspr }: -let version = "1.23.2"; in +let version = "1.23.3"; in stdenv.mkDerivation { name = "pidgin-sipe-${version}"; src = fetchurl { url = "mirror://sourceforge/sipe/pidgin-sipe-${version}.tar.gz"; - sha256 = "1xj4nn5h103q4agar167xwcp98qf8knrgs918nl07qaxp9g4558w"; + sha256 = "0aaiblnagncb0lhdwb8qbps6hxxmyfjg7sdi15lrkl98i3fahg4n"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/beta.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/beta.nix deleted file mode 100644 index 7d6854460d6..00000000000 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/beta.nix +++ /dev/null @@ -1,92 +0,0 @@ -{ stdenv, lib, fetchurl, dpkg, gnome2, atk, cairo, gdk_pixbuf, glib, freetype, -fontconfig, dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr, -libXcomposite, libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, -nspr, alsaLib, cups, expat, udev -}: -let - rpath = lib.makeLibraryPath [ - alsaLib - atk - cairo - cups - dbus - expat - fontconfig - freetype - gdk_pixbuf - glib - gnome2.GConf - gnome2.gtk - gnome2.pango - libX11 - libXScrnSaver - libXcomposite - libXcursor - libXdamage - libXext - libXfixes - libXi - libXrandr - libXrender - libXtst - nspr - nss - stdenv.cc.cc - udev - xorg.libxcb - ]; - -in - stdenv.mkDerivation rec { - name = "signal-desktop-${version}"; - - version = "1.1.0-beta.5"; - - src = - if stdenv.system == "x86_64-linux" then - fetchurl { - url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop-beta/signal-desktop-beta_${version}_amd64.deb"; - sha256 = "1kllym2iazp9i5afrh0vmsqqlh5b8i6f929p5yhl8bl4zd17zwpx"; - } - else - throw "Signal for Desktop is not currently supported on ${stdenv.system}"; - - phases = [ "unpackPhase" "installPhase" ]; - nativeBuildInputs = [ dpkg ]; - unpackPhase = "dpkg-deb -x $src ."; - installPhase = '' - mkdir -p $out - cp -R opt $out - cp -R usr/share $out/share - - chmod -R g-w $out - - # Patch signal - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${rpath}:$out/opt/Signal Beta" \ - "$out/opt/Signal Beta/signal-desktop-beta" - - # Symlink to bin - mkdir -p $out/bin - ln -s "$out/opt/Signal Beta/signal-desktop-beta" $out/bin/signal-desktop-beta - - # Fix the desktop link - substituteInPlace $out/share/applications/signal-desktop-beta.desktop \ - --replace "/opt/Signal Beta/signal-desktop-beta" $out/bin/signal-desktop-beta - ''; - - meta = { - description = "Signal Private Messenger for the Desktop (Beta version)"; - homepage = https://signal.org/; - license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ ixmatus benley ]; - platforms = [ - "x86_64-linux" - ]; - # Marked as broken on 2018-04-17. Reason: The most recent version is - # 1.8.0-beta.1, while this is still 1.1.0-beta.5 (2017-12-09). The stable - # package (signal-desktop) should be used instead (currently at version - # 1.7.1, i.e. up-to-date). - broken = true; - }; - } diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 9fe03b274cf..d728c8d95cc 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -6,7 +6,7 @@ let # Please keep the version x.y.0.z and do not update to x.y.76.z because the # source of the latter disappears much faster. - version = "8.24.0.2"; + version = "8.28.0.41"; rpath = stdenv.lib.makeLibraryPath [ alsaLib @@ -56,7 +56,7 @@ let if stdenv.system == "x86_64-linux" then fetchurl { url = "https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"; - sha256 = "079bv0wilwwd9gqykcyfs4bj8za140788dxi058k4275h1jlvrww"; + sha256 = "1kydf71qbz35dx4674h3nxfx8a88k620217906i54ic4qq2mgy2x"; } else throw "Skype for linux is not supported on ${stdenv.system}"; diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index e1ced2df9f3..5d8e2c52c21 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -4,8 +4,8 @@ let mkTelegram = args: qt5.callPackage (import ./generic.nix args) { }; stableVersion = { stable = true; - version = "1.3.10"; - sha256Hash = "0i1lzks8pf627658w6p7dz87d6cl4g98031qm166npkc40f89bpr"; + version = "1.3.14"; + sha256Hash = "107m9iqw78b691pcq65s3m3zhamn8slh0wiyipwbbp0w13rqna3v"; # svn log svn://svn.archlinux.org/community/telegram-desktop/trunk archPatchesRevision = "359861"; archPatchesHash = "15xybfs9k6dww747if8z6m9sh7anvqi76zsx2gxyna2j1z36i0r0"; @@ -14,7 +14,5 @@ in { stable = mkTelegram stableVersion; preview = mkTelegram (stableVersion // { stable = false; - version = "1.3.12"; - sha256Hash = "00z4ljs4fvbk7sf8wv1v50kln26gv8q12x6q41ai9gfzkvq5f69a"; }); } diff --git a/pkgs/applications/networking/instant-messengers/weechat-matrix-bridge/default.nix b/pkgs/applications/networking/instant-messengers/weechat-matrix-bridge/default.nix index 85faebf95a3..4a8ffaaa261 100644 --- a/pkgs/applications/networking/instant-messengers/weechat-matrix-bridge/default.nix +++ b/pkgs/applications/networking/instant-messengers/weechat-matrix-bridge/default.nix @@ -1,12 +1,12 @@ { stdenv, curl, fetchFromGitHub, cjson, olm, luaffi }: stdenv.mkDerivation { - name = "weechat-matrix-bridge-2018-01-10"; + name = "weechat-matrix-bridge-2018-05-29"; src = fetchFromGitHub { owner = "torhve"; repo = "weechat-matrix-protocol-script"; - rev = "a8e4ce04665c09ee7f24d6b319cd85cfb56dfbd7"; - sha256 = "0822xcxvwanwm8qbzqhn3f1m6hhxs29pyf8lnv6v29bl8136vcq3"; + rev = "ace3fefc0e35a627f8a528032df2e3111e41eb1b"; + sha256 = "1snf8vn5n9wzrnqnvdrcli4199s5p114jbjlgrj5c27i53173wqw"; }; patches = [ diff --git a/pkgs/applications/networking/irc/konversation/default.nix b/pkgs/applications/networking/irc/konversation/default.nix index c41b6116b29..ccee78a64da 100644 --- a/pkgs/applications/networking/irc/konversation/default.nix +++ b/pkgs/applications/networking/irc/konversation/default.nix @@ -30,13 +30,13 @@ let pname = "konversation"; - version = "1.7.4"; + version = "1.7.5"; in mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; - sha256 = "0y4rj4fcl1wsi3y1fhnzad9nf4llwrnipfm9mfm55kqnx1zmpvqp"; + sha256 = "0h098yhlp36ls6pdvs2r93ig8dv4fys62m0h6wxccprb0qrpbgv0"; }; buildInputs = [ @@ -70,13 +70,6 @@ in mkDerivation rec { kdoctools ]; - patches = [ - (fetchpatch { - url = "https://cgit.kde.org/konversation.git/patch/?id=20018b3d0798421c9cb8a9d983e5a5b34bd88e8d"; - sha256 = "0y5m5zimfhc0d1xnkzs05c8ig11lhwdn04fk76vi7966hx8wggnn"; - }) - ]; - meta = { description = "Integrated IRC client for KDE"; license = with lib.licenses; [ gpl2 ]; diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix index 057c051c625..47cb83dee76 100644 --- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -3,7 +3,6 @@ , libarchive, libcanberra-gtk2, libetpan, libnotify, libsoup, libxml2, networkmanager , openldap, perl, pkgconfig, poppler, python, shared-mime-info, webkitgtk24x-gtk2 , glib-networking, gsettings-desktop-schemas, libSM, libytnef - # Build options # TODO: A flag to build the manual. # TODO: Plugins that complain about their missing dependencies, even when @@ -32,11 +31,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "claws-mail-${version}"; - version = "3.16.0"; + version = "3.17.1"; src = fetchurl { url = "http://www.claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz"; - sha256 = "1awpr3s7n8bq8p3w10a4j6lg5bizjxyiqp4rqzc2j8cn7lyi64n2"; + sha256 = "1wknxbwyzm5xjh3cqmddcxmvp1rkp301qga5n5rgfi7vcd0myyvm"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/applications/networking/mailreaders/mblaze/default.nix b/pkgs/applications/networking/mailreaders/mblaze/default.nix index ff4507991e4..86f945f369a 100644 --- a/pkgs/applications/networking/mailreaders/mblaze/default.nix +++ b/pkgs/applications/networking/mailreaders/mblaze/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "mblaze-${version}"; - version = "0.3.2"; + version = "0.4"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "chneukirchen"; repo = "mblaze"; rev = "v${version}"; - sha256 = "0sgzcf7lpgdix7x4p6wp1jjv9h62rrkca6325c7a9j8r0dbg1fdg"; + sha256 = "15ac213a17mxni3bqvzxhiln65s4almrlmv72bbcgi7cymb303rp"; }; makeFlags = "PREFIX=$(out)"; diff --git a/pkgs/applications/office/cb2bib/default.nix b/pkgs/applications/office/cb2bib/default.nix index 1dd095e577e..e4dc86ebd8d 100644 --- a/pkgs/applications/office/cb2bib/default.nix +++ b/pkgs/applications/office/cb2bib/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { name = pname + "-" + version; pname = "cb2bib"; - version = "1.9.7"; + version = "1.9.8"; src = fetchurl { url = "https://www.molspaces.com/dl/progs/${name}.tar.gz"; - sha256 = "0gr8vmlz1ikw0jiwwac2ays20z26cdv3bjdx9m1nc450hl6m5s7s"; + sha256 = "0fpa0znlabk0nrzgj4c0l6qbg8l16lp9d7lvb9ijv1y0ih9igf0f"; }; buildInputs = [ qtbase qtwebkit qtx11extras lzo libX11 ]; nativeBuildInputs = [ qmake ]; diff --git a/pkgs/applications/office/kexi/default.nix b/pkgs/applications/office/kexi/default.nix index 2aa19dea1c2..66fde2497e3 100644 --- a/pkgs/applications/office/kexi/default.nix +++ b/pkgs/applications/office/kexi/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, fetchurl, extra-cmake-modules, kdoctools, + mkDerivation, lib, fetchurl, fetchpatch, extra-cmake-modules, kdoctools, boost, qttools, qtwebkit, breeze-icons, karchive, kcodecs, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kcrash, kguiaddons, ki18n, kiconthemes, kitemviews, kio, ktexteditor, ktextwidgets, @@ -29,6 +29,13 @@ mkDerivation rec { propagatedUserEnvPkgs = [ kproperty ]; + patches = [ + (fetchpatch { + url = "https://phabricator.kde.org/file/data/6iwzltiifyqwjnzbvyo6/PHID-FILE-li4a7j35wkdkm2qdtnp4/D11503.diff"; + sha256 = "0yj717m4x1zb4xjy1ayhz78xkxpawxgsvjgvf5iw81jnlr8absq9"; + }) + ]; + meta = with lib; { description = "A open source visual database applications creator, a long-awaited competitor for programs like MS Access or Filemaker"; longDescription = '' diff --git a/pkgs/applications/office/todoman/default.nix b/pkgs/applications/office/todoman/default.nix new file mode 100644 index 00000000000..a7d93c3b0cb --- /dev/null +++ b/pkgs/applications/office/todoman/default.nix @@ -0,0 +1,57 @@ +{ stdenv, python3, glibcLocales }: + +let + inherit (python3.pkgs) buildPythonApplication fetchPypi; +in +buildPythonApplication rec { + pname = "todoman"; + version = "3.4.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "09441fdrwz2irsbrxnpwys51372z6rn6gnxn87p95r3fv9gmh0fw"; + }; + + LOCALE_ARCHIVE = stdenv.lib.optionalString stdenv.isLinux + "${glibcLocales}/lib/locale/locale-archive"; + LANG = "en_US.UTF-8"; + LC_TYPE = "en_US.UTF-8"; + + buildInputs = [ glibcLocales ]; + propagatedBuildInputs = with python3.pkgs; + [ atomicwrites click click-log configobj humanize icalendar parsedatetime + python-dateutil pyxdg tabulate urwid ]; + + checkInputs = with python3.pkgs; + [ flake8 flake8-import-order freezegun hypothesis pytest pytestrunner pytestcov ]; + + makeWrapperArgs = [ "--set LOCALE_ARCHIVE ${glibcLocales}/lib/locale/locale-archive" + "--set CHARSET en_us.UTF-8" ]; + + preCheck = '' + # Remove one failing test that only checks whether the command line works + rm tests/test_main.py + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/pimutils/todoman; + description = "Standards-based task manager based on iCalendar"; + longDescription = '' + Todoman is a simple, standards-based, cli todo (aka: task) manager. Todos + are stored into icalendar files, which means you can sync them via CalDAV + using, for example, vdirsyncer. + + Todos are read from individual ics files from the configured directory. + This matches the vdir specification. There’s support for the most common TODO + features for now (summary, description, location, due date and priority) for + now. Runs on any Unix-like OS. It’s been tested on GNU/Linux, BSD and macOS. + Unsupported fields may not be shown but are never deleted or altered. + + Todoman is part of the pimutils project + ''; + license = licenses.isc; + maintainers = with maintainers; [ leenaars ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix index 956bfe1d811..7bc8729c3fe 100644 --- a/pkgs/applications/science/math/gmsh/default.nix +++ b/pkgs/applications/science/math/gmsh/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, cmake, blas, liblapack, gfortran, gmm, fltk, libjpeg , zlib, libGLU_combined, libGLU, xorg }: -let version = "3.0.6"; in +let version = "4.0.0"; in stdenv.mkDerivation { name = "gmsh-${version}"; src = fetchurl { url = "http://gmsh.info/src/gmsh-${version}-source.tgz"; - sha256 = "0ywqhr0zmdhn8dvi6l8z1vkfycyv67fdrz6b95mb39np832bq04p"; + sha256 = "0pqm0ippj0j07919hld3f3rgq0p1x4j32fxb2m1nyp226zx8l37v"; }; # The original CMakeLists tries to use some version of the Lapack lib diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 096f2212cc4..7fd49fe205c 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -136,6 +136,13 @@ stdenv.mkDerivation rec { url = "https://git.sagemath.org/sage.git/patch?id2=8.4.beta0&id=8bef4fd2876a61969b516fe4eb3b8ad7cc076c5e"; sha256 = "00p3hfsfn3w2vxgd9fjd23mz7xfxjfravf8ysjxkyd657jbkpjmk"; }) + + # https://trac.sagemath.org/ticket/26117 + (fetchpatch { + name = "sympy-1.2.patch"; + url = "https://git.sagemath.org/sage.git/patch?id2=8.4.beta2&id=d94a0a3a3fb4aec05a6f4d95166d90c284f05c36"; + sha256 = "0an2xl1pp3jg36kgg2m1vb7sns7rprk1h3d0qy1gxwdab6i7qnvi"; + }) ]; patches = nixPatches ++ packageUpgradePatches ++ [ diff --git a/pkgs/applications/science/robotics/apmplanner2/default.nix b/pkgs/applications/science/robotics/apmplanner2/default.nix index 7ae44418fff..2d579a80369 100644 --- a/pkgs/applications/science/robotics/apmplanner2/default.nix +++ b/pkgs/applications/science/robotics/apmplanner2/default.nix @@ -23,8 +23,12 @@ stdenv.mkDerivation rec { qmakeFlags = [ "apm_planner.pro" ]; # this ugly hack is necessary, as `bin/apmplanner2` needs the contents of `share/APMPlanner2` inside of `bin/` - preFixup = "ln --relative --symbolic $out/share/APMPlanner2/* $out/bin/"; - + preFixup = '' + ln --relative --symbolic $out/share/APMPlanner2/* $out/bin/ + substituteInPlace $out/share/applications/apmplanner2.desktop \ + --replace /usr $out + ''; + enableParallelBuilding = true; meta = { diff --git a/pkgs/applications/version-management/git-and-tools/hub/default.nix b/pkgs/applications/version-management/git-and-tools/hub/default.nix index 12b7b8965ef..113d7f78b90 100644 --- a/pkgs/applications/version-management/git-and-tools/hub/default.nix +++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "hub-${version}"; - version = "2.5.0"; + version = "2.5.1"; goPackagePath = "github.com/github/hub"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "github"; repo = "hub"; rev = "v${version}"; - sha256 = "03nj3b17m700l3pib9jlzxz2vh8w54srv6x63l53sb4dff3izfsz"; + sha256 = "0a5i351v998vdwf883qhh39c15x56db01fr9hscz4ha7r9550pqg"; }; buildInputs = [ groff ronn ruby utillinux ] ++ diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix index 031202ad646..96e0bb04031 100644 --- a/pkgs/applications/video/clipgrab/default.nix +++ b/pkgs/applications/video/clipgrab/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "clipgrab-${version}"; - version = "3.6.8"; + version = "3.6.9"; src = fetchurl { - sha256 = "0agp97g79mlqcwfz2xk5rdxw4kx0hm92xikdspbpxlfji1mkh10p"; + sha256 = "16r0h286vqw1bns29sx5x2919pj3y8gxf1k7dpf9xrz0vm2zrc3v"; # The .tar.bz2 "Download" link is a binary blob, the source is the .tar.gz! url = "https://download.clipgrab.org/${name}.tar.gz"; }; diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 1ff61129b0f..f9058ef89b6 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -22,8 +22,6 @@ with stdenv.lib; let - version = "2.12.1"; - sha256 = "1jp5y56682bgpfjapagxjfrjdvqkal34pj9qzn6kj8fqaad80l21"; audio = optionalString (hasSuffix "linux" stdenv.system) "alsa," + optionalString pulseSupport "pa," + optionalString sdlSupport "sdl,"; @@ -36,6 +34,7 @@ let in stdenv.mkDerivation rec { + version = "3.0.0"; name = "qemu-" + stdenv.lib.optionalString xenSupport "xen-" + stdenv.lib.optionalString hostCpuOnly "host-cpu-only-" @@ -43,8 +42,8 @@ stdenv.mkDerivation rec { + version; src = fetchurl { - url = "http://wiki.qemu.org/download/qemu-${version}.tar.bz2"; - inherit sha256; + url = "https://wiki.qemu.org/download/qemu-${version}.tar.bz2"; + sha256 = "1s7bm2xhcxbc9is0rg8xzwijx7azv67skq7mjc58spsgc2nn4glk"; }; buildInputs = diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index c7d86ad9fd6..40395568f4b 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, python2Packages, intltool, file -, wrapGAppsHook, gtkvnc, vte, avahi, dconf +, wrapGAppsHook, gtk-vnc, vte, avahi, dconf , gobjectIntrospection, libvirt-glib, system-libvirt , gsettings-desktop-schemas, glib, libosinfo, gnome3, gtk3 , spiceSupport ? true, spice-gtk ? null @@ -24,7 +24,7 @@ python2Packages.buildPythonApplication rec { ]; buildInputs = - [ libvirt-glib vte dconf gtkvnc gnome3.defaultIconTheme avahi + [ libvirt-glib vte dconf gtk-vnc gnome3.defaultIconTheme avahi gsettings-desktop-schemas libosinfo gtk3 ] ++ optional spiceSupport spice-gtk; diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix index beecf72fd0b..cbdecb32288 100644 --- a/pkgs/applications/virtualization/virt-viewer/default.nix +++ b/pkgs/applications/virtualization/virt-viewer/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, libxml2, gtk3, gtkvnc, gmp +{ stdenv, fetchurl, pkgconfig, intltool, glib, libxml2, gtk3, gtk-vnc, gmp , libgcrypt, gnupg, cyrus_sasl, shared-mime-info, libvirt, yajl, xen -, gsettings-desktop-schemas, makeWrapper, libvirt-glib, libcap_ng, numactl +, gsettings-desktop-schemas, wrapGAppsHook, libvirt-glib, libcap_ng, numactl , libapparmor, gst_all_1 , spiceSupport ? true , spice-gtk ? null, spice-protocol ? null, libcap ? null, gdbm ? null @@ -21,10 +21,10 @@ stdenv.mkDerivation rec { sha256 = "00y9vi69sja4pkrfnvrkwsscm41bqrjzvp8aijb20pvg6ymczhj7"; }; - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ]; buildInputs = [ - glib libxml2 gtk3 gtkvnc gmp libgcrypt gnupg cyrus_sasl shared-mime-info - libvirt yajl gsettings-desktop-schemas makeWrapper libvirt-glib + glib libxml2 gtk3 gtk-vnc gmp libgcrypt gnupg cyrus_sasl shared-mime-info + libvirt yajl gsettings-desktop-schemas libvirt-glib libcap_ng numactl libapparmor ] ++ optionals stdenv.isx86_64 [ xen @@ -33,14 +33,6 @@ stdenv.mkDerivation rec { gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ]; - postInstall = '' - for f in "$out"/bin/*; do - wrapProgram "$f" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ - --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" - done - ''; - meta = { description = "A viewer for remote virtual machines"; maintainers = [ maintainers.raskin ]; diff --git a/pkgs/applications/window-managers/awesome/3.5.nix b/pkgs/applications/window-managers/awesome/3.5.nix deleted file mode 100644 index f3d43d15efb..00000000000 --- a/pkgs/applications/window-managers/awesome/3.5.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ stdenv, fetchurl, luaPackages, cairo, cmake, imagemagick, pkgconfig, gdk_pixbuf -, xorg, libstartup_notification, libxdg_basedir, libpthreadstubs -, xcb-util-cursor, makeWrapper, pango, gobjectIntrospection, unclutter -, compton, procps, iproute, coreutils, curl, alsaUtils, findutils, xterm -, which, dbus, nettools, git, asciidoc, doxygen -, xmlto, docbook_xml_dtd_45, docbook_xsl, findXMLCatalogs -}: - -let - version = "3.5.9"; -in with luaPackages; - -stdenv.mkDerivation rec { - name = "awesome-${version}"; - - src = fetchurl { - url = "http://awesome.naquadah.org/download/awesome-${version}.tar.xz"; - sha256 = "0kynair1ykr74b39a4gcm2y24viial64337cf26nhlc7azjbby67"; - }; - - meta = with stdenv.lib; { - description = "Highly configurable, dynamic window manager for X"; - homepage = http://awesome.naquadah.org/; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.linux; - }; - - nativeBuildInputs = [ - asciidoc - cmake - doxygen - imagemagick - makeWrapper - pkgconfig - xmlto docbook_xml_dtd_45 docbook_xsl findXMLCatalogs - ]; - - buildInputs = [ - cairo - dbus - gdk_pixbuf - gobjectIntrospection - git - lgi - libpthreadstubs - libstartup_notification - libxdg_basedir - lua - nettools - pango - xcb-util-cursor - xorg.libXau - xorg.libXdmcp - xorg.libxcb - xorg.libxshmfence - xorg.xcbutil - xorg.xcbutilimage - xorg.xcbutilkeysyms - xorg.xcbutilrenderutil - xorg.xcbutilwm - ]; - - #cmakeFlags = "-DGENERATE_MANPAGES=ON"; - - LD_LIBRARY_PATH = "${stdenv.lib.makeLibraryPath [ cairo pango gobjectIntrospection ]}"; - GI_TYPELIB_PATH = "${pango.out}/lib/girepository-1.0"; - LUA_CPATH = "${lgi}/lib/lua/${lua.luaversion}/?.so"; - LUA_PATH = "${lgi}/share/lua/${lua.luaversion}/?.lua;${lgi}/share/lua/${lua.luaversion}/lgi/?.lua"; - - postInstall = '' - wrapProgram $out/bin/awesome \ - --prefix LUA_CPATH ";" "${lgi}/lib/lua/${lua.luaversion}/?.so" \ - --prefix LUA_PATH ";" "${lgi}/share/lua/${lua.luaversion}/?.lua;${lgi}/share/lua/${lua.luaversion}/lgi/?.lua" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH" \ - --prefix PATH : "${stdenv.lib.makeBinPath [ compton unclutter procps iproute coreutils curl alsaUtils findutils xterm ]}" - - wrapProgram $out/bin/awesome-client \ - --prefix PATH : "${which}/bin" - ''; - - passthru = { - inherit lua; - }; -} diff --git a/pkgs/applications/window-managers/compton/default.nix b/pkgs/applications/window-managers/compton/default.nix index d79d8c3325d..e5faf084a42 100644 --- a/pkgs/applications/window-managers/compton/default.nix +++ b/pkgs/applications/window-managers/compton/default.nix @@ -3,59 +3,77 @@ , dbus, libconfig, libdrm, libGL, pcre, libX11, libXcomposite, libXdamage , libXinerama, libXrandr, libXrender, libXext, xwininfo }: -stdenv.mkDerivation rec { - name = "compton-0.1_beta2.5"; - - src = fetchFromGitHub { - owner = "chjj"; - repo = "compton"; - rev = "b7f43ee67a1d2d08239a2eb67b7f50fe51a592a8"; - sha256 = "1p7ayzvm3c63q42na5frznq3rlr1lby2pdgbvzm1zl07wagqss18"; - }; +let + common = source: stdenv.mkDerivation (source // rec { + name = "${source.pname}-${source.version}"; + + buildInputs = [ + dbus libX11 libXcomposite libXdamage libXrender libXrandr libXext + libXinerama libdrm pcre libxml2 libxslt libconfig libGL + ]; + + nativeBuildInputs = [ + pkgconfig + asciidoc + docbook_xml_dtd_45 + docbook_xsl + makeWrapper + ]; - buildInputs = [ - libX11 - libXcomposite - libXdamage - libXrender - libXrandr - libXext - libXinerama - libdrm - pcre - libconfig - dbus - libGL - ]; - - nativeBuildInputs = [ - pkgconfig - asciidoc - libxml2 - docbook_xml_dtd_45 - docbook_xsl - libxslt - makeWrapper - ]; - - installFlags = [ "PREFIX=$(out)" ]; - - postInstall = '' - wrapProgram $out/bin/compton-trans \ - --prefix PATH : ${lib.makeBinPath [ xwininfo ]} - ''; - - meta = with stdenv.lib; { - homepage = https://github.com/chjj/compton/; - description = "A fork of XCompMgr, a sample compositing manager for X servers"; - longDescription = '' - A fork of XCompMgr, which is a sample compositing manager for X - servers supporting the XFIXES, DAMAGE, RENDER, and COMPOSITE - extensions. It enables basic eye-candy effects. This fork adds - additional features, such as additional effects, and a fork at a - well-defined and proper place. + installFlags = [ "PREFIX=$(out)" ]; + + postInstall = '' + wrapProgram $out/bin/compton-trans \ + --prefix PATH : ${lib.makeBinPath [ xwininfo ]} ''; - license = licenses.mit; - platforms = platforms.linux; + + meta = with lib; { + description = "A fork of XCompMgr, a sample compositing manager for X servers"; + longDescription = '' + A fork of XCompMgr, which is a sample compositing manager for X + servers supporting the XFIXES, DAMAGE, RENDER, and COMPOSITE + extensions. It enables basic eye-candy effects. This fork adds + additional features, such as additional effects, and a fork at a + well-defined and proper place. + ''; + license = licenses.mit; + maintainers = with maintainers; [ ertes enzime twey ]; + platforms = platforms.linux; + }; + }); + + stableSource = { + pname = "compton"; + version = "0.1_beta2.5"; + + src = fetchFromGitHub { + owner = "chjj"; + repo = "compton"; + rev = "b7f43ee67a1d2d08239a2eb67b7f50fe51a592a8"; + sha256 = "1p7ayzvm3c63q42na5frznq3rlr1lby2pdgbvzm1zl07wagqss18"; + }; + + meta = { + homepage = https://github.com/chjj/compton/; + }; + }; + + gitSource = { + pname = "compton-git"; + version = "2018-08-14"; + + src = fetchFromGitHub { + owner = "yshui"; + repo = "compton"; + rev = "cac8094ce12cd40706fb48f9ab35354d9ee7c48f"; + sha256 = "0qif3nx8vszlr06bixasna13pzfaikp86xax9miwnba50517y7v5"; + }; + + meta = { + homepage = https://github.com/yshui/compton/; + }; }; +in { + compton = common stableSource; + compton-git = common gitSource; } diff --git a/pkgs/applications/window-managers/compton/git.nix b/pkgs/applications/window-managers/compton/git.nix deleted file mode 100644 index 90ae043fba3..00000000000 --- a/pkgs/applications/window-managers/compton/git.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ stdenv, fetchFromGitHub, asciidoc, dbus, docbook_xml_dtd_45, - docbook_xsl, libconfig, libdrm, libxml2, libxslt, libGLU_combined, pcre, - pkgconfig, libXcomposite, libXdamage, libXext, libXfixes, libXinerama, - libXrandr, libXrender, xwininfo }: - -stdenv.mkDerivation rec { - name = "compton-git-${version}"; - version = "2018-05-21"; - - src = fetchFromGitHub { - owner = "yshui"; - repo = "compton"; - rev = "9b24550814b7c69065f90039b0a5d0a2281b9f81"; - sha256 = "09nn0q9lgv59chfxljips0n8vnwwxi1yz6hmcsiggsl3zvpabpxl"; - }; - - nativeBuildInputs = [ - asciidoc - docbook_xml_dtd_45 - docbook_xsl - pkgconfig - ]; - - buildInputs = [ - dbus - libXcomposite - libXdamage - libXext - libXfixes - libXinerama - libXrandr - libXrender - libconfig - libdrm - libxml2 - libxslt - libGLU_combined - pcre - ]; - - propagatedBuildInputs = [ xwininfo ]; - - installFlags = "PREFIX=$(out)"; - - meta = with stdenv.lib; { - description = - "A fork of XCompMgr, a sample compositing manager for X servers (git version)"; - homepage = https://github.com/yshui/compton/; - license = licenses.mit; - longDescription = '' - A fork of XCompMgr, which is a sample compositing manager for X - servers supporting the XFIXES, DAMAGE, RENDER, and COMPOSITE - extensions. It enables basic eye-candy effects. This fork adds - additional features, such as additional effects, and a fork at a - well-defined and proper place. - ''; - maintainers = [ maintainers.ertes maintainers.twey ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/window-managers/dwm/git.nix b/pkgs/applications/window-managers/dwm/git.nix new file mode 100644 index 00000000000..aaa32dd6b11 --- /dev/null +++ b/pkgs/applications/window-managers/dwm/git.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchgit, libX11, libXinerama, libXft, patches ? [], conf ? null }: + +let + name = "dwm-git-20180602"; +in + +stdenv.mkDerivation { + inherit name; + + src = fetchgit { + url = "git://git.suckless.org/dwm"; + rev = "b69c870a3076d78ab595ed1cd4b41cf6b03b2610"; + sha256 = "10i079h79l4gdch1qy2vrrb2xxxkgkjmgphr5r9a75jbbagwvz0k"; + }; + + buildInputs = [ libX11 libXinerama libXft ]; + + prePatch = ''sed -i "s@/usr/local@$out@" config.mk''; + + # Allow users set their own list of patches + inherit patches; + + # Allow users to override the entire config file AFTER appying the patches + postPatch = stdenv.lib.optionalString (conf!=null) '' + echo -n '${conf}' > config.def.h + ''; + + buildPhase = "make"; + + meta = with stdenv.lib; { + homepage = https://suckless.org/; + description = "Dynamic window manager for X, development version"; + license = licenses.mit; + maintainers = with maintainers; [xeji]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/window-managers/herbstluftwm/default.nix b/pkgs/applications/window-managers/herbstluftwm/default.nix index 6f3505056c3..d49c893ca14 100644 --- a/pkgs/applications/window-managers/herbstluftwm/default.nix +++ b/pkgs/applications/window-managers/herbstluftwm/default.nix @@ -1,18 +1,19 @@ { stdenv, fetchurl, pkgconfig, glib, libX11, libXext, libXinerama }: stdenv.mkDerivation rec { - name = "herbstluftwm-0.7.0"; + name = "herbstluftwm-0.7.1"; src = fetchurl { url = "https://herbstluftwm.org/tarballs/${name}.tar.gz"; - sha256 = "09xfs213vg1dpird61wik5bqb9yf8kh63ssy18ihf54inwqgqbvy"; + sha256 = "0d47lbjxxqd8d96hby47bdhyn9mlih7h28712j1vckiz05ig63nw"; }; patchPhase = '' substituteInPlace config.mk \ --replace "/usr/local" "$out" \ --replace "/etc" "$out/etc" \ - --replace "/zsh/functions/Completion/X" "/zsh/site-functions" + --replace "/zsh/functions/Completion/X" "/zsh/site-functions" \ + --replace "/usr/share" "\$(PREFIX)/share" ''; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/window-managers/ratpoison/default.nix b/pkgs/applications/window-managers/ratpoison/default.nix index ced8e2e0b9d..fded0ee24a5 100644 --- a/pkgs/applications/window-managers/ratpoison/default.nix +++ b/pkgs/applications/window-managers/ratpoison/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { cripples Emacs and other quality pieces of software. ''; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.AndersonTorres ]; }; } diff --git a/pkgs/build-support/make-desktopitem/default.nix b/pkgs/build-support/make-desktopitem/default.nix index f5b4e5af93a..f8c31ed5c1d 100644 --- a/pkgs/build-support/make-desktopitem/default.nix +++ b/pkgs/build-support/make-desktopitem/default.nix @@ -1,36 +1,48 @@ -{stdenv}: +{stdenv, lib}: { name , type ? "Application" , exec -, icon ? "" -, comment ? "" +, icon ? null +, comment ? null , terminal ? "false" , desktopName -, genericName -, mimeType ? "" +, genericName ? null +, mimeType ? null , categories ? "Application;Other;" , startupNotify ? null -, extraEntries ? "" +, extraEntries ? null }: stdenv.mkDerivation { name = "${name}.desktop"; - buildCommand = '' + + buildCommand = let + + optionalEntriesList = [{k="Icon"; v=icon;} + {k="Comment"; v=comment;} + {k="GenericName"; v=genericName;} + {k="MimeType"; v=mimeType;} + {k="StartupNotify"; v=startupNotify;}]; + + valueNotNull = {k, v}: v != null; + entriesToKeep = builtins.filter valueNotNull optionalEntriesList; + + mkEntry = {k, v}: k + "=" + v; + optionalEntriesString = lib.concatMapStringsSep "\n" mkEntry entriesToKeep; + + in + '' mkdir -p $out/share/applications cat > $out/share/applications/${name}.desktop <<EOF [Desktop Entry] Type=${type} Exec=${exec} - Icon=${icon} - Comment=${comment} Terminal=${terminal} Name=${desktopName} - GenericName=${genericName} - MimeType=${mimeType} Categories=${categories} + ${optionalEntriesString} + ${if extraEntries == null then ''EOF'' else '' ${extraEntries} - ${if startupNotify == null then ''EOF'' else '' - StartupNotify=${startupNotify} EOF''} ''; } diff --git a/pkgs/build-support/setup-hooks/make-wrapper.sh b/pkgs/build-support/setup-hooks/make-wrapper.sh index f75b285bacf..5d5ddcaa8d7 100644 --- a/pkgs/build-support/setup-hooks/make-wrapper.sh +++ b/pkgs/build-support/setup-hooks/make-wrapper.sh @@ -11,15 +11,18 @@ assertExecutable() { # makeWrapper EXECUTABLE ARGS # ARGS: -# --argv0 NAME : set name of executed process to NAME -# (otherwise it’s called …-wrapped) -# --set VAR VAL : add VAR with value VAL to the executable’s environment -# --unset VAR : remove VAR from the environment -# --run COMMAND : run command before the executable -# The command can push extra flags to a magic list variable -# extraFlagsArray, which are then added to the invocation -# of the executable -# --add-flags FLAGS : add FLAGS to invocation of executable +# --argv0 NAME : set name of executed process to NAME +# (otherwise it’s called …-wrapped) +# --set VAR VAL : add VAR with value VAL to the executable’s +# environment +# --set-default VAR VAL : like --set, but only adds VAR if not already set in +# the environment +# --unset VAR : remove VAR from the environment +# --run COMMAND : run command before the executable +# The command can push extra flags to a magic list +# variable extraFlagsArray, which are then added to +# the invocation of the executable +# --add-flags FLAGS : add FLAGS to invocation of executable # --prefix ENV SEP VAL : suffix/prefix ENV with VAL, separated by SEP # --suffix diff --git a/pkgs/data/misc/media-player-info/default.nix b/pkgs/data/misc/media-player-info/default.nix index dbf92ad066f..6d00f34e978 100644 --- a/pkgs/data/misc/media-player-info/default.nix +++ b/pkgs/data/misc/media-player-info/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, python3, udev, systemd }: let - name = "media-player-info-23"; + name = "media-player-info-24"; in stdenv.mkDerivation { @@ -9,7 +9,7 @@ in src = fetchurl { url = "https://www.freedesktop.org/software/media-player-info/${name}.tar.gz"; - sha256 = "1jy8xh4xjgjc4wj4qrw6sx2j3606zsj4bgiczhzf3xlpnkh6vax9"; + sha256 = "0d0i7av8v369hzvlynwlrbickv1brlzsmiky80lrjgjh1gdldkz6"; }; buildInputs = [ udev systemd ]; diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix index 6d55cbe8ee7..aee315124f8 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, meson, ninja, wrapGAppsHook, pkgconfig, gettext, itstool, libvirt-glib -, glib, gobjectIntrospection, libxml2, gtk3, gtkvnc, libvirt, spice-gtk +, glib, gobjectIntrospection, libxml2, gtk3, gtk-vnc, libvirt, spice-gtk , spice-protocol, libsoup, libosinfo, systemd, tracker, tracker-miners, vala , libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg, desktop-file-utils , mtools, cdrkit, libcdio, libusb, libarchive, acl, libgudev, qemu, libsecret @@ -28,7 +28,7 @@ in stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ spice-gtk ]; buildInputs = [ - libvirt-glib glib gtk3 gtkvnc libxml2 + libvirt-glib glib gtk3 gtk-vnc libxml2 libvirt spice-gtk spice-protocol libsoup json-glib webkitgtk libosinfo systemd tracker tracker-miners libcap yajl gmp gdbm cyrus_sasl libusb libarchive gnome3.defaultIconTheme librsvg acl libgudev libsecret diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix index a7d4288c9eb..9948f9d909b 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix @@ -2,17 +2,17 @@ , pkgconfig, gtk3, glib, tracker, tracker-miners , itstool, libxslt, webkitgtk, libgdata , gnome-desktop, libzapojit, libgepub -, gnome3, gdk_pixbuf, libsoup, docbook_xsl +, gnome3, gdk_pixbuf, libsoup, docbook_xsl, docbook_xml_dtd_42 , gobjectIntrospection, inkscape, poppler_utils , desktop-file-utils, wrapGAppsHook }: stdenv.mkDerivation rec { name = "gnome-documents-${version}"; - version = "3.28.1"; + version = "3.28.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-documents/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1i0s246bg9xcjxgbajph744pn65bq5gk6r9kkl3f5iwdq3rjc0pm"; + sha256 = "0aannnq39gjg6jnjm4kr8fqigg5npjvd8dyxw7k4hy4ny0ffxwjq"; }; doCheck = true; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dgetting-started=true" ]; nativeBuildInputs = [ - meson ninja pkgconfig gettext itstool libxslt desktop-file-utils docbook_xsl wrapGAppsHook + meson ninja pkgconfig gettext itstool libxslt desktop-file-utils docbook_xsl docbook_xml_dtd_42 wrapGAppsHook inkscape poppler_utils # building getting started ]; buildInputs = [ diff --git a/pkgs/desktops/gnome-3/apps/vinagre/default.nix b/pkgs/desktops/gnome-3/apps/vinagre/default.nix index 566624431dc..a8fe76ee03f 100644 --- a/pkgs/desktops/gnome-3/apps/vinagre/default.nix +++ b/pkgs/desktops/gnome-3/apps/vinagre/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, vte, libxml2, gtkvnc, intltool -, libsecret, itstool, makeWrapper, librsvg }: +{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, vte, libxml2, gtk-vnc, intltool +, libsecret, itstool, wrapGAppsHook, librsvg }: stdenv.mkDerivation rec { name = "vinagre-${version}"; @@ -10,25 +10,25 @@ stdenv.mkDerivation rec { sha256 = "cd1cdbacca25c8d1debf847455155ee798c3e67a20903df8b228d4ece5505e82"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "vinagre"; attrPath = "gnome3.vinagre"; }; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk3 vte libxml2 gtkvnc intltool libsecret - itstool makeWrapper gnome3.defaultIconTheme librsvg ]; + nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook ]; + buildInputs = [ + gtk3 vte libxml2 gtk-vnc libsecret gnome3.defaultIconTheme librsvg + ]; NIX_CFLAGS_COMPILE = "-Wno-format-nonliteral"; - preFixup = '' - wrapProgram "$out/bin/vinagre" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share" - ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = "vinagre"; + attrPath = "gnome3.vinagre"; + }; + }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Vinagre; description = "Remote desktop viewer for GNOME"; - platforms = platforms.linux; + homepage = https://wiki.gnome.org/Apps/Vinagre; + license = licenses.gpl2Plus; maintainers = gnome3.maintainers; + platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/core/caribou/default.nix b/pkgs/desktops/gnome-3/core/caribou/default.nix index 48be01faf33..acfd6dfb374 100644 --- a/pkgs/desktops/gnome-3/core/caribou/default.nix +++ b/pkgs/desktops/gnome-3/core/caribou/default.nix @@ -1,11 +1,11 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, clutter, dbus, python3Packages, libxml2 +{ fetchurl, stdenv, pkgconfig, gnome3, glib, gtk3, clutter, dbus, python3, libxml2 , libxklavier, libXtst, gtk2, intltool, libxslt, at-spi2-core, autoreconfHook , wrapGAppsHook }: let pname = "caribou"; version = "0.4.21"; - pythonEnv = python3Packages.python.withPackages ( ps: with ps; [ pygobject3 ] ); + pythonEnv = python3.withPackages ( ps: with ps; [ pygobject3 ] ); in stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -14,11 +14,21 @@ in stdenv.mkDerivation rec { sha256 = "0mfychh1q3dx0b96pjz9a9y112bm9yqyim40yykzxx1hppsdjhww"; }; + patches = [ + # Fix crash in GNOME Flashback + # https://bugzilla.gnome.org/show_bug.cgi?id=791001 + (fetchurl { + url = https://bugzilla.gnome.org/attachment.cgi?id=364774; + sha256 = "15k1455grf6knlrxqbjnk7sals1730b0whj30451scp46wyvykvd"; + }) + ]; + nativeBuildInputs = [ pkgconfig intltool libxslt libxml2 autoreconfHook wrapGAppsHook ]; - buildInputs = with gnome3; - [ glib gtk clutter at-spi2-core dbus pythonEnv python3Packages.pygobject3 - libXtst gtk2 ]; + buildInputs = [ + glib gtk3 clutter at-spi2-core dbus pythonEnv python3.pkgs.pygobject3 + libXtst gtk2 + ]; propagatedBuildInputs = [ gnome3.libgee libxklavier ]; @@ -37,9 +47,8 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An input assistive technology intended for switch and pointer users"; homepage = https://wiki.gnome.org/Projects/Caribou; - platforms = platforms.linux; license = licenses.lgpl21; maintainers = gnome3.maintainers; + platforms = platforms.linux; }; - } diff --git a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix index d65f282e03b..e7acbe8706e 100644 --- a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix @@ -1,28 +1,47 @@ { stdenv, fetchurl, gnome3, meson, ninja, pkgconfig, gtk3, intltool, glib -, udev, itstool, libxml2, wrapGAppsHook, libnotify, libcanberra-gtk3, gobjectIntrospection }: +, udev, itstool, libxml2, wrapGAppsHook, libnotify, libcanberra-gtk3, gobjectIntrospection +, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }: -stdenv.mkDerivation rec { - name = "gnome-bluetooth-${version}"; - version = "3.28.1"; +let + pname = "gnome-bluetooth"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; + version = "3.28.2"; + + # TODO: split out "lib" + outputs = [ "out" "dev" "devdoc" "man" ]; src = fetchurl { - url = "mirror://gnome/sources/gnome-bluetooth/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1g3yrq5792qvc5rxnf26cgciawrca27hqn6wxfcf63bpa2dsjcsn"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0ch7lll5n8v7m26y6y485gnrik19ml42rsh1drgcxydm6fn62j8z"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-bluetooth"; attrPath = "gnome3.gnome-bluetooth"; }; - }; + nativeBuildInputs = [ + meson ninja intltool itstool pkgconfig libxml2 wrapGAppsHook gobjectIntrospection + gtk-doc docbook_xsl docbook_xml_dtd_43 + ]; + buildInputs = [ + glib gtk3 udev libnotify libcanberra-gtk3 + gnome3.defaultIconTheme gnome3.gsettings-desktop-schemas + ]; - nativeBuildInputs = [ meson ninja intltool itstool pkgconfig libxml2 wrapGAppsHook gobjectIntrospection ]; - buildInputs = [ glib gtk3 udev libnotify libcanberra-gtk3 - gnome3.defaultIconTheme gnome3.gsettings-desktop-schemas ]; + mesonFlags = [ + "-Dicon_update=false" + "-Dgtk_doc=true" + ]; postPatch = '' chmod +x meson_post_install.py # patchShebangs requires executable file patchShebangs meson_post_install.py ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; + meta = with stdenv.lib; { homepage = https://help.gnome.org/users/gnome-bluetooth/stable/index.html.en; description = "Application that let you manage Bluetooth in the GNOME destkop"; diff --git a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix index dc55fa9a7b4..67c43311123 100644 --- a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix +++ b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix @@ -1,24 +1,24 @@ -{ stdenv, fetchurl, substituteAll, intltool, itstool, libxslt, makeWrapper +{ stdenv, fetchurl, substituteAll, intltool, itstool, libxslt , meson, ninja, pkgconfig, vala, wrapGAppsHook, bzip2, dbus, evolution-data-server , exempi, flac, giflib, glib, gnome3, gst_all_1, icu, json-glib, libcue, libexif -, libgsf, libiptcdata, libjpeg, libpng, libseccomp, libsoup, libtiff, libuuid +, libgrss, libgsf, libiptcdata, libjpeg, libpng, libseccomp, libsoup, libtiff, libuuid , libvorbis, libxml2, poppler, taglib, upower }: -stdenv.mkDerivation rec { - name = "${pname}-${version}"; +let pname = "tracker-miners"; - version = "2.0.5"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; + version = "2.1.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "00k8nb8dbkjnqjk12gcs5n2cm6yny553qildsm5b2c8nfs1w16b4"; + sha256 = "107638773mihxdi194wf3saacqrr4cp9xn3qjfmx60bwq5451ma0"; }; nativeBuildInputs = [ intltool itstool libxslt - makeWrapper meson ninja pkgconfig @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { wrapGAppsHook ]; - # TODO: add libgrss, libenca, libosinfo + # TODO: add libenca, libosinfo buildInputs = [ bzip2 dbus @@ -44,6 +44,7 @@ stdenv.mkDerivation rec { json-glib libcue libexif + libgrss libgsf libiptcdata libjpeg @@ -60,7 +61,8 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - "-Dminer_rss=false" # needs libgrss + # TODO: tests do not like our sandbox + "-Dfunctional_tests=false" ]; patches = [ @@ -75,13 +77,7 @@ stdenv.mkDerivation rec { }) ]; - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "gnome3.${pname}"; - }; - }; - + # Symlinks require absolute path and we still cannot use placeholders # https://github.com/NixOS/nixpkgs/pull/39534#discussion_r184339131 # https://github.com/NixOS/nixpkgs/pull/37693 preConfigure = '' @@ -92,10 +88,13 @@ stdenv.mkDerivation rec { ${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas ''; - # https://bugzilla.gnome.org/show_bug.cgi?id=796145 - postFixup = '' - rm $out/share/tracker/miners/org.freedesktop.Tracker1.Miner.RSS.service - ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + versionPolicy = "none"; + }; + }; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Projects/Tracker; diff --git a/pkgs/desktops/gnome-3/core/tracker-miners/fix-paths.patch b/pkgs/desktops/gnome-3/core/tracker-miners/fix-paths.patch index 847e3bf204d..74da929c564 100644 --- a/pkgs/desktops/gnome-3/core/tracker-miners/fix-paths.patch +++ b/pkgs/desktops/gnome-3/core/tracker-miners/fix-paths.patch @@ -1,3 +1,25 @@ +--- a/meson.build ++++ b/meson.build +@@ -37,15 +37,15 @@ + # + # This check acts as a guard to make sure we are being configured with the + # right prefix, among other things. +- tracker_store = find_program(join_paths(get_option('prefix'), get_option('libexecdir'), 'tracker-store')) ++ tracker_store = find_program(join_paths(tracker_miner.get_pkgconfig_variable('prefix'), 'libexec', 'tracker-store')) + tracker_store_path = tracker_store.path() + + # If we are building against an installed version of tracker core rather than + # having it as a subproject, these 'uninstalled' locations point to the actual + # installed locations. +- tracker_uninstalled_domain_rule = join_paths(get_option('prefix'), get_option('datadir'), 'tracker', 'domain-ontologies', 'default.rule') +- tracker_uninstalled_nepomuk_ontologies_dir = join_paths(get_option('prefix'), get_option('datadir'), 'tracker', 'ontologies', 'nepomuk') +- tracker_uninstalled_stop_words_dir = join_paths(get_option('prefix'), get_option('datadir'), 'tracker', 'stop-words', 'default.rule') ++ tracker_uninstalled_domain_rule = join_paths(tracker_miner.get_pkgconfig_variable('prefix'), 'share', 'tracker', 'domain-ontologies', 'default.rule') ++ tracker_uninstalled_nepomuk_ontologies_dir = join_paths(tracker_miner.get_pkgconfig_variable('prefix'), 'share', 'tracker', 'ontologies', 'nepomuk') ++ tracker_uninstalled_stop_words_dir = join_paths(tracker_miner.get_pkgconfig_variable('prefix'), 'share', 'tracker', 'stop-words', 'default.rule') + endif + + avcodec = dependency('libavcodec', version: '>= 0.8.4', required: false) --- a/src/libtracker-miners-common/tracker-domain-ontology.c +++ b/src/libtracker-miners-common/tracker-domain-ontology.c @@ -313,7 +313,7 @@ @@ -9,7 +31,7 @@ DEFAULT_RULE, NULL); if (!g_file_test (path, G_FILE_TEST_IS_REGULAR)) { -@@ -372,7 +372,7 @@ +@@ -378,7 +378,7 @@ if (!priv->ontology_location) { gchar *ontology_path; diff --git a/pkgs/desktops/gnome-3/core/tracker/default.nix b/pkgs/desktops/gnome-3/core/tracker/default.nix index 649960c0bf3..a0da1b7147d 100644 --- a/pkgs/desktops/gnome-3/core/tracker/default.nix +++ b/pkgs/desktops/gnome-3/core/tracker/default.nix @@ -1,39 +1,53 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gobjectIntrospection -, libxml2, upower, glib, wrapGAppsHook, vala, sqlite, libxslt +{ stdenv, fetchurl, intltool, meson, ninja, pkgconfig, gobjectIntrospection, python2 +, gtk-doc, docbook_xsl, docbook_xml_dtd_412, docbook_xml_dtd_43, glibcLocales +, libxml2, upower, glib, wrapGAppsHook, vala, sqlite, libxslt, libstemmer , gnome3, icu, libuuid, networkmanager, libsoup, json-glib }: let pname = "tracker"; - version = "2.0.4"; + version = "2.1.2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1mfc5lv820kr7ssi7hldn25gmshh65k19kh478qjsnb64sshsbyf"; + sha256 = "1sf923f3ya3gj5s90da8qkqqvjj3fdll7xrjgscpb6yhgv0kzqsi"; }; - enableParallelBuilding = true; + nativeBuildInputs = [ + meson ninja vala pkgconfig intltool libxslt wrapGAppsHook gobjectIntrospection + gtk-doc docbook_xsl docbook_xml_dtd_412 docbook_xml_dtd_43 glibcLocales + python2 # for data-generators + ]; - nativeBuildInputs = [ vala pkgconfig intltool libxslt wrapGAppsHook gobjectIntrospection ]; - # TODO: add libstemmer buildInputs = [ - glib libxml2 sqlite upower icu networkmanager libsoup libuuid json-glib + glib libxml2 sqlite upower icu networkmanager libsoup libuuid json-glib libstemmer ]; - # TODO: figure out wrapping unit tests, some of them fail on missing gsettings-desktop-schemas - configureFlags = [ "--disable-unit-tests" ]; + LC_ALL = "en_US.UTF-8"; + + mesonFlags = [ + "-Ddbus_services=share/dbus-1/services" + # TODO: figure out wrapping unit tests, some of them fail on missing gsettings-desktop-schemas + "-Dfunctional_tests=false" + ]; postPatch = '' patchShebangs utils/g-ir-merge/g-ir-merge + patchShebangs utils/data-generators/cc/generate + ''; + + postInstall = '' + ${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas ''; passthru = { updateScript = gnome3.updateScript { packageName = pname; attrPath = "gnome3.${pname}"; + versionPolicy = "none"; }; }; diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 18db0e5ba81..d90440d5f55 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -43,7 +43,7 @@ lib.makeScope pkgs.newScope (self: with self; { inherit (pkgs) atk glib gobjectIntrospection gspell webkitgtk gtk3 gtkmm3 libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceview4 easytag meld orca rhythmbox shotwell gnome-usage - clutter clutter-gst clutter-gtk cogl gtkvnc libdazzle; + clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle; libsoup = pkgs.libsoup.override { gnomeSupport = true; }; libchamplain = pkgs.libchamplain.override { libsoup = libsoup; }; @@ -399,6 +399,8 @@ lib.makeScope pkgs.newScope (self: with self; { gnome-packagekit = callPackage ./misc/gnome-packagekit { }; + # TODO: remove this after 18.09 has forked off + gconf = throw "gconf is deprecated since 2009 and has been removed from the package set. Use gnome2.GConf instead. For more details see https://github.com/NixOS/nixpkgs/pull/43268"; } // lib.optionalAttrs (config.allowAliases or true) { #### Legacy aliases diff --git a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix index 7390108953f..c871fbbf916 100644 --- a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix @@ -4,29 +4,31 @@ stdenv.mkDerivation rec { name = "gnome-nibbles-${version}"; - version = "3.24.0"; + version = "3.24.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-nibbles/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "0ddc1fe03483958dd5513d04f5919ade991902d12da18a4c2d3307f818a5cb4f"; + sha256 = "19g44cnrb191v50bdvy2qkrfhvyfsahd0kx9hz95x9gkjfn2nn35"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-nibbles"; attrPath = "gnome3.gnome-nibbles"; }; - }; - - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool itstool libxml2 ]; buildInputs = [ - gtk3 wrapGAppsHook intltool itstool libxml2 - librsvg libcanberra-gtk3 clutter-gtk gnome3.defaultIconTheme + gtk3 librsvg libcanberra-gtk3 clutter-gtk gnome3.defaultIconTheme libgee libgnome-games-support ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = "gnome-nibbles"; + attrPath = "gnome3.gnome-nibbles"; + }; + }; + meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Nibbles; description = "Guide a worm around a maze"; - maintainers = gnome3.maintainers; + homepage = https://wiki.gnome.org/Apps/Nibbles; license = licenses.gpl2; + maintainers = gnome3.maintainers; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/games/quadrapassel/default.nix b/pkgs/desktops/gnome-3/games/quadrapassel/default.nix index b0572f981de..7ae226b3f8e 100644 --- a/pkgs/desktops/gnome-3/games/quadrapassel/default.nix +++ b/pkgs/desktops/gnome-3/games/quadrapassel/default.nix @@ -2,8 +2,10 @@ , librsvg, libcanberra-gtk3 , intltool, itstool, libxml2, clutter, clutter-gtk, wrapGAppsHook }: -stdenv.mkDerivation rec { - name = "quadrapassel-${version}"; +let + pname = "quadrapassel"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; version = "3.22.0"; src = fetchurl { @@ -11,22 +13,26 @@ stdenv.mkDerivation rec { sha256 = "0ed44ef73c8811cbdfc3b44c8fd80eb6e2998d102d59ac324e4748f5d9dddb55"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "quadrapassel"; attrPath = "gnome3.quadrapassel"; }; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg - libcanberra-gtk3 itstool intltool clutter - libxml2 clutter-gtk wrapGAppsHook ]; + nativeBuildInputs = [ pkgconfig itstool intltool wrapGAppsHook ]; + buildInputs = [ + gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg + libcanberra-gtk3 clutter libxml2 clutter-gtk + ]; enableParallelBuilding = true; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; + meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Quadrapassel; description = "Classic falling-block game, Tetris"; - maintainers = gnome3.maintainers; + homepage = https://wiki.gnome.org/Apps/Quadrapassel; license = licenses.gpl2; + maintainers = gnome3.maintainers; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/misc/california/default.nix b/pkgs/desktops/gnome-3/misc/california/default.nix index 91aeb7ca00a..7c90d8fa4e4 100644 --- a/pkgs/desktops/gnome-3/misc/california/default.nix +++ b/pkgs/desktops/gnome-3/misc/california/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala_0_32, libgee, wrapGAppsHook, itstool, gobjectIntrospection +{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala_0_34, libgee, wrapGAppsHook, itstool, gobjectIntrospection , gnome-online-accounts, evolution-data-server, gnome3, glib, libsoup, libgdata, sqlite, xdg_utils }: let @@ -12,7 +12,7 @@ in stdenv.mkDerivation rec { sha256 = "1dky2kllv469k8966ilnf4xrr7z35pq8mdvs7kwziy59cdikapxj"; }; - nativeBuildInputs = [ intltool itstool vala_0_32 pkgconfig wrapGAppsHook gobjectIntrospection ]; + nativeBuildInputs = [ intltool itstool vala_0_34 pkgconfig wrapGAppsHook gobjectIntrospection ]; buildInputs = [ glib gtk3 libgee libsoup libgdata gnome-online-accounts evolution-data-server sqlite xdg_utils gnome3.gsettings-desktop-schemas ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/misc/libgda/default.nix b/pkgs/desktops/gnome-3/misc/libgda/default.nix index a10675ab803..069c769efaa 100644 --- a/pkgs/desktops/gnome-3/misc/libgda/default.nix +++ b/pkgs/desktops/gnome-3/misc/libgda/default.nix @@ -1,4 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3, openssl, gnome3 +, overrideCC, gcc6 , mysqlSupport ? false, mysql ? null , postgresSupport ? false, postgresql ? null }: @@ -6,7 +7,7 @@ assert mysqlSupport -> mysql != null; assert postgresSupport -> postgresql != null; -stdenv.mkDerivation rec { +(if stdenv.isAarch64 then overrideCC stdenv gcc6 else stdenv).mkDerivation rec { name = "libgda-${version}"; version = "5.2.4"; diff --git a/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix b/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix index 7e28c90813a..9a55864dfcc 100644 --- a/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix +++ b/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix @@ -3,13 +3,13 @@ let pname = "libgnome-games-support"; - version = "1.4.1"; + version = "1.4.2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1j7lfcnc29lgn8ppn13wkn9w2y1n3lsapagwp91zh3bf0h2h4hv1"; + sha256 = "02hirpk885jndwarbl3cl5fk7w2z5ziv677csyv1wi2n6rmpn088"; }; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/desktops/mate/eom/default.nix b/pkgs/desktops/mate/eom/default.nix index ee297237f6e..4f338051449 100644 --- a/pkgs/desktops/mate/eom/default.nix +++ b/pkgs/desktops/mate/eom/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "eom-${version}"; - version = "1.21.0"; + version = "1.21.2"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "165n314hxapq8glzlv7vs5x44z13wjmpysl5p7q3ckrsxy5pczww"; + sha256 = "08idw219mw0v0nkaphy0jvxi67gqm4nzbbnhnwjksxbma2gmpvss"; }; nativeBuildInputs = [ diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index 26bed216acf..c5be1c78a55 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -42,7 +42,7 @@ let buildMix = callPackage ./build-mix.nix {}; # BEAM-based languages. - elixir = elixir_1_6; + elixir = elixir_1_7; elixir_1_7 = lib.callElixir ../interpreters/elixir/1.7.nix { inherit rebar erlang; diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index a0f37973ccd..ce487c3c0e2 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -1,27 +1,27 @@ { stdenv, fetchurl, makeWrapper -, boehmgc, libatomic_ops, pcre, libevent, libiconv, llvm, clang }: +, boehmgc, libatomic_ops, pcre, libevent, libiconv, llvm, clang, which }: stdenv.mkDerivation rec { name = "crystal-${version}"; - version = "0.25.1"; + version = "0.26.0"; src = fetchurl { url = "https://github.com/crystal-lang/crystal/archive/${version}.tar.gz"; - sha256 = "1ikzly6vs28ilqvqm4kxzhqs8mp6l4l344rhak63dav7vv97nnlv"; + sha256 = "18vv47xvnf3hl5js5sk58wj2khqq36kcs851i3lgr0ji7m0g3379"; }; - prebuiltName = "crystal-0.25.1-1"; + prebuiltName = "crystal-0.26.0-1"; prebuiltSrc = let arch = { "x86_64-linux" = "linux-x86_64"; "i686-linux" = "linux-i686"; "x86_64-darwin" = "darwin-x86_64"; }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); in fetchurl { - url = "https://github.com/crystal-lang/crystal/releases/download/0.25.1/${prebuiltName}-${arch}.tar.gz"; + url = "https://github.com/crystal-lang/crystal/releases/download/0.26.0/${prebuiltName}-${arch}.tar.gz"; sha256 = { - "x86_64-linux" = "0zjmbvbhi11p7s99jmvb3pac6zzsr792bxcfanrx503fjxxafgll"; - "i686-linux" = "0i0hgsq7xa53594blqw5qi6jrqja18spifmalg7df2mj3h13h3pz"; - "x86_64-darwin" = "1h369hzis1cigxbb6fgpahyq4d13gfgjc6adf300zc38yh8rvyy0"; + "x86_64-linux" = "1xban102yiiwmlklxvn3xp3q546bp8hlxxpakayajkhhnpl6yv45"; + "i686-linux" = "1igspf1lrv7wpmz0pfrkbx8m1ykvnv4zhic53cav4nicppm2v0ic"; + "x86_64-darwin" = "0hzc65ccajr0yhmvi5vbdgbzbp1gbjy56da24ds3zwwkam1ddk0k"; }."${stdenv.system}"; }; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { libiconv ]; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ which makeWrapper ]; buildInputs = libs ++ [ llvm ]; @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { description = "A compiled language with Ruby like syntax and type inference"; homepage = https://crystal-lang.org/; license = stdenv.lib.licenses.asl20; - maintainers = with stdenv.lib.maintainers; [ sifmelcara david50407 ]; + maintainers = with stdenv.lib.maintainers; [ manveru david50407 ]; platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; }; } diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index 6a8d5f11b75..93deb4a90af 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -1,14 +1,56 @@ -{ lib, stdenv, buildEnv, haskell, nodejs, fetchurl, makeWrapper }: +{ lib, stdenv, buildEnv, haskell, nodejs, fetchurl, makeWrapper, git }: # To update: -# 1) Update versions in ./update-elm.rb and run it. -# 2) Checkout elm-reactor and run `elm-package install -y` inside. -# 3) Run ./elm2nix.rb in elm-reactor's directory. -# 4) Move the resulting 'package.nix' to 'packages/elm-reactor-elm.nix'. + +# 1) Modify ./update.sh and run it + +# 2) to generate versions.dat: +# 2.1) git clone https://github.com/elm/compiler.git +# 2.2) cd compiler +# 2.3) cabal2nix --shell . | sed 's/"default",/"ghc822",/' > shell.nix +# 2.4) nix-shell +# 2.5) mkdir .elm +# 2.6) export ELM_HOME=$(pwd)/.elm +# 2.7) cabal build +# 2.8) cp .elm/0.19.0/package/versions.dat ... + +# 3) generate a template for elm-elm.nix with: +# ( +# echo "{"; +# jq '.dependencies | .direct, .indirect | to_entries | .[] | { (.key) : { version : .value, sha256: "" } } ' \ +# < ui/browser/elm.json \ +# | sed 's/:/ =/' \ +# | sed 's/^[{}]//' \ +# | sed -E 's/(["}]),?$/\1;/' \ +# | sed -E 's/"(version|sha256)"/\1/' \ +# | grep -v '^$'; +# echo "}" +# ) +# +# ... then fill in the sha256s + +# Notes: + +# the elm binary embeds a piece of pre-compiled elm code, used by 'elm +# reactor'. this means that the build process for 'elm' effectively +# executes 'elm make'. that in turn expects to retrieve the elm +# dependencies of that code (elm/core, etc.) from +# package.elm-lang.org, as well as a cached bit of metadata +# (versions.dat). + +# the makeDotElm function lets us retrieve these dependencies in the +# standard nix way. we have to copy them in (rather than symlink) and +# make them writable because the elm compiler writes other .dat files +# alongside the source code. versions.dat was produced during an +# impure build of this same code; the build complains that it can't +# update this cache, but continues past that warning. + +# finally, we set ELM_HOME to point to these pre-fetched artifacts so +# that the default of ~/.elm isn't used. let - makeElmStuff = deps: - let json = builtins.toJSON (lib.mapAttrs (name: info: info.version) deps); + makeDotElm = ver: deps: + let versionsDat = ./versions.dat; cmds = lib.mapAttrsToList (name: info: let pkg = stdenv.mkDerivation { @@ -29,80 +71,61 @@ let }; in '' - mkdir -p elm-stuff/packages/${name} - ln -s ${pkg} elm-stuff/packages/${name}/${info.version} + mkdir -p .elm/${ver}/package/${name} + cp -R ${pkg} .elm/${ver}/package/${name}/${info.version} '') deps; - in '' - export HOME=/tmp - mkdir elm-stuff - cat > elm-stuff/exact-dependencies.json <<EOF - ${json} - EOF - '' + lib.concatStrings cmds; - - hsPkgs = haskell.packages.ghc802.override { - overrides = self: super: - let hlib = haskell.lib; - elmRelease = import ./packages/release.nix { inherit (self) callPackage; }; - elmPkgs' = elmRelease.packages; - elmPkgs = elmPkgs' // { - - elm-reactor = hlib.overrideCabal elmPkgs'.elm-reactor (drv: { - buildTools = drv.buildTools or [] ++ [ self.elm-make ]; - preConfigure = makeElmStuff (import ./packages/elm-reactor-elm.nix); - }); + in (lib.concatStrings cmds) + '' + mkdir -p .elm/${ver}/package; + cp ${versionsDat} .elm/${ver}/package/versions.dat; + chmod -R +w .elm + ''; - elm-repl = hlib.overrideCabal elmPkgs'.elm-repl (drv: { - doCheck = false; + hsPkgs = haskell.packages.ghc822.override { + overrides = self: super: with haskell.lib; + let elmPkgs = { + elm = overrideCabal (self.callPackage ./packages/elm.nix { }) (drv: { + # sadly with parallelism most of the time breaks compilation + enableParallelBuilding = false; + preConfigure = '' + export ELM_HOME=`pwd`/.elm + '' + (makeDotElm "0.19.0" (import ./packages/elm-elm.nix)); buildTools = drv.buildTools or [] ++ [ makeWrapper ]; - postInstall = - let bins = lib.makeBinPath [ nodejs self.elm-make ]; - in '' - wrapProgram $out/bin/elm-repl \ - --prefix PATH ':' ${bins} - ''; + postInstall = '' + wrapProgram $out/bin/elm \ + --prefix PATH ':' ${lib.makeBinPath [ nodejs ]} + ''; }); + + /* This is not a core Elm package, and it's hosted on GitHub. To update, run: cabal2nix --jailbreak --revision refs/tags/foo http://github.com/avh4/elm-format > packages/elm-format.nix - where foo is a tag for a new version, for example "0.3.1-alpha". + where foo is a tag for a new version, for example "0.8.0". */ - elm-format = self.callPackage ./packages/elm-format.nix { }; - elm-interface-to-json = self.callPackage ./packages/elm-interface-to-json.nix { - aeson-pretty = self.aeson-pretty_0_7_2; - either = hlib.overrideCabal self.either (drv :{ - jailbreak = true; - version = "4.4.1.1"; - sha256 = "1lrlwqqnm6ibfcydlv5qvvssw7bm0c6yypy0rayjzv1znq7wp1xh"; - libraryHaskellDepends = drv.libraryHaskellDepends or [] ++ [ - self.exceptions self.free self.mmorph self.monad-control - self.MonadRandom self.profunctors self.transformers - self.transformers-base - ]; - }); - }; + elm-format = overrideCabal (self.callPackage ./packages/elm-format.nix { }) (drv: { + # https://github.com/avh4/elm-format/issues/529 + patchPhase = '' + cat >Setup.hs <<EOF + import Distribution.Simple + main = defaultMain + EOF + + sed -i '/Build_elm_format/d' elm-format.cabal + sed -i 's/Build_elm_format.gitDescribe/""/' src/ElmFormat/Version.hs + sed -i '/Build_elm_format/d' src/ElmFormat/Version.hs + ''; + }); }; in elmPkgs // { inherit elmPkgs; - elmVersion = elmRelease.version; - # https://github.com/elm-lang/elm-compiler/issues/1566 - indents = hlib.overrideCabal super.indents (drv: { - version = "0.3.3"; - #test dep tasty has a version mismatch - doCheck = false; - sha256 = "16lz21bp9j14xilnq8yym22p3saxvc9fsgfcf5awn2a6i6n527xn"; - libraryHaskellDepends = drv.libraryHaskellDepends ++ [super.concatenative]; - }); + elmVersion = elmPkgs.elm.version; + + # Needed for elm-format + indents = self.callPackage ./packages/indents.nix {}; }; }; -in hsPkgs.elmPkgs // { - elm = lib.hiPrio (buildEnv { - name = "elm-${hsPkgs.elmVersion}"; - paths = lib.mapAttrsToList (name: pkg: pkg) hsPkgs.elmPkgs; - pathsToLink = [ "/bin" ]; - }); -} +in hsPkgs.elmPkgs diff --git a/pkgs/development/compilers/elm/packages/elm-compiler.nix b/pkgs/development/compilers/elm/packages/elm-compiler.nix deleted file mode 100644 index 1242f556838..00000000000 --- a/pkgs/development/compilers/elm/packages/elm-compiler.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ mkDerivation, aeson, aeson-pretty_0_7_2, ansi-terminal, ansi-wl-pprint -, base, binary, bytestring, containers, directory, edit-distance -, fetchgit, filemanip, filepath, HUnit, indents -, language-ecmascript, language-glsl, mtl, parsec, pretty, process -, QuickCheck, stdenv, test-framework, test-framework-hunit -, test-framework-quickcheck2, text, union-find -}: -mkDerivation { - pname = "elm-compiler"; - version = "0.18"; - src = fetchgit { - url = "https://github.com/elm-lang/elm-compiler"; - sha256 = "09fmrbfpc1kzc3p9h79w57b9qjhajdswc4jfm9gyjw95vsiwasgh"; - rev = "eb97f2a5dd5421c708a91b71442e69d02453cc80"; - }; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson aeson-pretty_0_7_2 ansi-terminal ansi-wl-pprint base binary - bytestring containers directory edit-distance filepath indents - language-ecmascript language-glsl mtl parsec pretty process text - union-find - ]; - executableHaskellDepends = [ - aeson base binary directory filepath process text - ]; - testHaskellDepends = [ - aeson aeson-pretty_0_7_2 ansi-terminal ansi-wl-pprint base binary - bytestring containers directory edit-distance filemanip filepath - HUnit indents language-ecmascript language-glsl mtl parsec pretty - process QuickCheck test-framework test-framework-hunit - test-framework-quickcheck2 text union-find - ]; - jailbreak = true; - homepage = http://elm-lang.org; - description = "Values to help with elm-package, elm-make, and elm-lang.org."; - license = stdenv.lib.licenses.bsd3; - # added manually since tests are not passing - # https://travis-ci.org/elm-lang/elm-compiler/builds/176845852 - doCheck = false; -} diff --git a/pkgs/development/compilers/elm/packages/elm-elm.nix b/pkgs/development/compilers/elm/packages/elm-elm.nix new file mode 100644 index 00000000000..a38e21daa06 --- /dev/null +++ b/pkgs/development/compilers/elm/packages/elm-elm.nix @@ -0,0 +1,50 @@ +{ + "elm/browser" = { + version = "1.0.0"; + sha256 = "1apmvyax93nvmagwj00y16zx10kfv640cxpi64xgqbgy7d2wphy4"; + }; + "elm/core" = { + version = "1.0.0"; + sha256 = "10kr86h4v5h4p0586q406a5wbl8xvr1jyrf6097zp2wb8sv21ylw"; + }; + "elm/html" = { + version = "1.0.0"; + sha256 = "1n3gpzmpqqdsldys4ipgyl1zacn0kbpc3g4v3hdpiyfjlgh8bf3k"; + }; + "elm/http" = { + version = "1.0.0"; + sha256 = "1igmm89ialzrjib1j8xagkxalq1x2gj4l0hfxcd66mpwmvg7psl8"; + }; + "elm/json" = { + version = "1.0.0"; + sha256 = "1g0hafkqf2q633r7ir9wxpb1lnlzskhpsyi0h5bkzj0gl072zfnb"; + }; + "elm/project-metadata-utils" = { + version = "1.0.0"; + sha256 = "1d4rd4grrnbdvj9gf00h7dr6hbkjzawgkzpizfrkp1z1pyr3mvq9"; + }; + "elm/svg" = { + version = "1.0.0"; + sha256 = "08x0v8p9wm699jjmsnbq69pxv3jh60j4f6fg7y6hyr7xxj85y390"; + }; + "elm-explorations/markdown" = { + version = "1.0.0"; + sha256 = "0k3110ixa4wwf3vkkdplagwah9ypr965qxr1y147rnsc1xsxmr6y"; + }; + "elm/parser" = { + version = "1.0.0"; + sha256 = "0k4zlq30lrvawqvzwbvsl0hrmwf9s832mb41z7fdspm4549dj7wc"; + }; + "elm/time" = { + version = "1.0.0"; + sha256 = "0vch7i86vn0x8b850w1p69vplll1bnbkp8s383z7pinyg94cm2z1"; + }; + "elm/url" = { + version = "1.0.0"; + sha256 = "0av8x5syid40sgpl5vd7pry2rq0q4pga28b4yykn9gd9v12rs3l4"; + }; + "elm/virtual-dom" = { + version = "1.0.0"; + sha256 = "0hm8g92h7z39km325dlnhk8n00nlyjkqp3r3jppr37k2k13md6aq"; + }; +} diff --git a/pkgs/development/compilers/elm/packages/elm-format.nix b/pkgs/development/compilers/elm/packages/elm-format.nix index 56db835ac10..86d99abab5a 100644 --- a/pkgs/development/compilers/elm/packages/elm-format.nix +++ b/pkgs/development/compilers/elm/packages/elm-format.nix @@ -6,14 +6,12 @@ }: mkDerivation { pname = "elm-format"; - version = "0.7.0"; + version = "0.8.0"; src = fetchgit { url = "http://github.com/avh4/elm-format"; - sha256 = "1snl2lrrzdwgzi68agi3sdw84aslj04pzzxpm1mam9ic6dzhn3jf"; - rev = "da4b415c6a2b7e77b7d9f00beca3e45230e603fb"; + sha256 = "1w79xvsyq98vfz3jb4sv8433vdh6pcg8s7yh54lcxzr1p08yhsb6"; + rev = "f19ac28046d7e83ff95f845849c033cc616f1bd6"; }; - - doHaddock = false; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal directory filepath process ]; @@ -27,15 +25,10 @@ mkDerivation { base cmark containers HUnit mtl parsec QuickCheck quickcheck-io split tasty tasty-golden tasty-hunit tasty-quickcheck text ]; + doHaddock = false; jailbreak = true; - postInstall = '' - ln -s $out/bin/elm-format-0.18 $out/bin/elm-format - ''; - postPatch = '' - sed -i "s|desc <-.*||" ./Setup.hs - sed -i "s|gitDescribe = .*|gitDescribe = \\\\\"da4b415c\\\\\"\"|" ./Setup.hs - ''; - homepage = http://elm-lang.org; + doCheck = false; + homepage = "http://elm-lang.org"; description = "A source code formatter for Elm"; license = stdenv.lib.licenses.bsd3; } diff --git a/pkgs/development/compilers/elm/packages/elm-interface-to-json.nix b/pkgs/development/compilers/elm/packages/elm-interface-to-json.nix deleted file mode 100644 index 3f797b7a236..00000000000 --- a/pkgs/development/compilers/elm/packages/elm-interface-to-json.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ mkDerivation, aeson, aeson-pretty, base, binary, bytestring -, concatenative, containers, directory, either, elm-compiler -, filemanip, filepath, indents, optparse-applicative, parsec -, stdenv, text, transformers, fetchgit -}: -mkDerivation { - pname = "elm-interface-to-json"; - version = "0.1.0.0"; - src = fetchgit { - url = "https://github.com/stoeffel/elm-interface-to-json"; - sha256 = "1izc78w91m7nrc9i2b3lgy3kyjsy4d5mkkblx96ws0bp3dpm5f9k"; - rev = "9884c1c997a55f11cf7c3d99a8afa72cf2e97323"; - }; - isLibrary = false; - isExecutable = true; - jailbreak = true; - executableHaskellDepends = [ - aeson aeson-pretty base binary bytestring concatenative containers - directory either elm-compiler filemanip filepath indents - optparse-applicative parsec text transformers - ]; - homepage = "https://github.com/githubuser/elm-interface-to-json#readme"; - license = stdenv.lib.licenses.bsd3; -} diff --git a/pkgs/development/compilers/elm/packages/elm-make.nix b/pkgs/development/compilers/elm/packages/elm-make.nix deleted file mode 100644 index 98e57ac9b7c..00000000000 --- a/pkgs/development/compilers/elm/packages/elm-make.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base, binary -, blaze-html, blaze-markup, bytestring, containers, directory -, elm-compiler, elm-package, fetchgit, filepath, mtl -, optparse-applicative, raw-strings-qq, stdenv, text, time -}: -mkDerivation { - pname = "elm-make"; - version = "0.18"; - src = fetchgit { - url = "https://github.com/elm-lang/elm-make"; - sha256 = "1yq4w4yqignlc2si5ns53pmz0a99gix5d2qgi6x7finf7i6sxyw2"; - rev = "1a554833a70694ab142b9179bfac996143f68d9e"; - }; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - aeson ansi-terminal ansi-wl-pprint base binary blaze-html - blaze-markup bytestring containers directory elm-compiler - elm-package filepath mtl optparse-applicative raw-strings-qq text - time - ]; - jailbreak = true; - homepage = http://elm-lang.org; - description = "A build tool for Elm projects"; - license = stdenv.lib.licenses.bsd3; -} diff --git a/pkgs/development/compilers/elm/packages/elm-package.nix b/pkgs/development/compilers/elm/packages/elm-package.nix deleted file mode 100644 index 49eddb58a14..00000000000 --- a/pkgs/development/compilers/elm/packages/elm-package.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ mkDerivation, aeson, aeson-pretty_0_7_2, ansi-wl-pprint, base, binary -, bytestring, containers, directory, edit-distance, elm-compiler -, fetchgit, fetchurl, filepath, HTTP, http-client, http-client-tls -, http-types, mtl, network, optparse-applicative, parallel-io -, pretty, stdenv, text, time, unordered-containers, vector -, zip-archive -}: -mkDerivation { - pname = "elm-package"; - version = "0.18"; - src = fetchgit { - url = "https://github.com/elm-lang/elm-package"; - sha256 = "19krnkjvfk02gmmic5h5i1i0lw7s30927bnd5g57cj8nqbigysv7"; - rev = "8bd150314bacab5b6fc451927aa01deec2276fbf"; - }; - patches = fetchurl { - url = https://github.com/jerith666/elm-package/commit/40bab60c2fbff70812cc24cdd97f5e09db3844ad.patch; - sha256 = "0j6pi6cv3h9s6vz68bh0c73fysvk83yhhk56kgshvnrmnpcb3jib"; - }; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson aeson-pretty_0_7_2 ansi-wl-pprint base binary bytestring containers - directory edit-distance elm-compiler filepath HTTP http-client - http-client-tls http-types mtl network parallel-io text time - unordered-containers vector zip-archive - ]; - executableHaskellDepends = [ - aeson aeson-pretty_0_7_2 ansi-wl-pprint base binary bytestring containers - directory edit-distance elm-compiler filepath HTTP http-client - http-client-tls http-types mtl network optparse-applicative - parallel-io pretty text time unordered-containers vector - zip-archive - ]; - jailbreak = true; - homepage = https://github.com/elm-lang/elm-package; - description = "Package manager for Elm libraries"; - license = stdenv.lib.licenses.bsd3; -} diff --git a/pkgs/development/compilers/elm/packages/elm-reactor-elm.nix b/pkgs/development/compilers/elm/packages/elm-reactor-elm.nix deleted file mode 100644 index 90c8956323b..00000000000 --- a/pkgs/development/compilers/elm/packages/elm-reactor-elm.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ - "elm-lang/virtual-dom" = { - version = "2.0.1"; - sha256 = "19nfjx072m7a7bx8flc50vbmiww172jmscyq9x91cr2kby5hvbw3"; - }; - "evancz/elm-markdown" = { - version = "3.0.1"; - sha256 = "144lzpcapf2mhqiz90mkllmm4skrcs0iha1daps42qn3xps7hvmj"; - }; - "elm-lang/html" = { - version = "2.0.0"; - sha256 = "05sqjd5n8jnq4lv5v0ipcg98b8im1isnnl4wns1zzn4w5nbrjjzi"; - }; - "elm-lang/svg" = { - version = "2.0.0"; - sha256 = "1c7p967n1yhynravqwgh80vprwz7r2r1n0x3icn5wzk9iaqs069l"; - }; - "elm-lang/core" = { - version = "5.0.0"; - sha256 = "0gqyc09bh43pi7r2cizyjm5y0zpgarv3is17dl325qvxb9s1y2gn"; - }; -} diff --git a/pkgs/development/compilers/elm/packages/elm-reactor.nix b/pkgs/development/compilers/elm/packages/elm-reactor.nix deleted file mode 100644 index 41611b3cdd0..00000000000 --- a/pkgs/development/compilers/elm/packages/elm-reactor.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring -, cmdargs, containers, directory, elm-compiler, elm-package -, fetchgit, file-embed, filepath, fsnotify, mtl, process, snap-core -, snap-server, stdenv, template-haskell, text, time, transformers -, unordered-containers, utf8-string, websockets, websockets-snap -}: -mkDerivation { - pname = "elm-reactor"; - version = "0.18"; - src = fetchgit { - url = "https://github.com/elm-lang/elm-reactor"; - sha256 = "0lpidsckyfcr8d6bln735d98dx7ga7j1vyssw0qsv8ijj18gxx65"; - rev = "c519d4ec0aaf2f043a416fe858346b0181eca516"; - }; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - aeson base blaze-html blaze-markup bytestring cmdargs containers - directory elm-compiler elm-package file-embed filepath fsnotify mtl - process snap-core snap-server template-haskell text time - transformers unordered-containers utf8-string websockets - websockets-snap - ]; - jailbreak = true; - homepage = http://elm-lang.org; - description = "Interactive development tool for Elm programs"; - license = stdenv.lib.licenses.bsd3; -} diff --git a/pkgs/development/compilers/elm/packages/elm-repl.nix b/pkgs/development/compilers/elm/packages/elm-repl.nix deleted file mode 100644 index 8c168dedc75..00000000000 --- a/pkgs/development/compilers/elm/packages/elm-repl.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ mkDerivation, base, binary, bytestring, bytestring-trie, cmdargs -, containers, directory, elm-compiler, elm-package, fetchgit -, filepath, haskeline, HUnit, mtl, parsec, QuickCheck, stdenv -, test-framework, test-framework-hunit, test-framework-quickcheck2 -, text -}: -mkDerivation { - pname = "elm-repl"; - version = "0.18"; - src = fetchgit { - url = "https://github.com/elm-lang/elm-repl"; - sha256 = "112fzykils4lqz4pc44q4mwvxg0px0zfwx511bfvblrxkwwqlfb5"; - rev = "85f0bcfc28ea6c8a99a360d55c21ff25a556f9fe"; - }; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base binary bytestring bytestring-trie cmdargs containers directory - elm-compiler elm-package filepath haskeline mtl parsec text - ]; - testHaskellDepends = [ - base bytestring bytestring-trie cmdargs directory elm-compiler - elm-package filepath haskeline HUnit mtl parsec QuickCheck - test-framework test-framework-hunit test-framework-quickcheck2 - ]; - jailbreak = true; - homepage = https://github.com/elm-lang/elm-repl; - description = "a REPL for Elm"; - license = stdenv.lib.licenses.bsd3; -} diff --git a/pkgs/development/compilers/elm/packages/elm.nix b/pkgs/development/compilers/elm/packages/elm.nix new file mode 100644 index 00000000000..1097c8a1e19 --- /dev/null +++ b/pkgs/development/compilers/elm/packages/elm.nix @@ -0,0 +1,30 @@ +{ mkDerivation, ansi-terminal, ansi-wl-pprint, base, binary +, bytestring, containers, directory, edit-distance, fetchgit +, file-embed, filepath, ghc-prim, haskeline, HTTP, http-client +, http-client-tls, http-types, language-glsl, logict, mtl, network +, parsec, process, raw-strings-qq, scientific, SHA, snap-core +, snap-server, stdenv, template-haskell, text, time +, unordered-containers, utf8-string, vector, zip-archive +}: +mkDerivation { + pname = "elm"; + version = "0.19.0"; + src = fetchgit { + url = "https://github.com/elm/compiler"; + sha256 = "0s93z9vr0vp5w894ghc5s34nsq09sg1msf59zfiba87sid5vgjqy"; + rev = "32059a289d27e303fa1665e9ada0a52eb688f302"; + }; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + ansi-terminal ansi-wl-pprint base binary bytestring containers + directory edit-distance file-embed filepath ghc-prim haskeline HTTP + http-client http-client-tls http-types language-glsl logict mtl + network parsec process raw-strings-qq scientific SHA snap-core + snap-server template-haskell text time unordered-containers + utf8-string vector zip-archive + ]; + homepage = "http://elm-lang.org"; + description = "The `elm` command line interface"; + license = stdenv.lib.licenses.bsd3; +} diff --git a/pkgs/development/compilers/elm/packages/indents.nix b/pkgs/development/compilers/elm/packages/indents.nix new file mode 100644 index 00000000000..6bf7fa7890e --- /dev/null +++ b/pkgs/development/compilers/elm/packages/indents.nix @@ -0,0 +1,11 @@ +{ mkDerivation, base, concatenative, mtl, parsec, stdenv }: +mkDerivation { + pname = "indents"; + version = "0.3.3"; + sha256 = "b61f51ac894609cb5571cc3ded12db5de97185a8de236c69ec24c87457109f9a"; + libraryHaskellDepends = [ base concatenative mtl parsec ]; + doCheck = false; + homepage = "http://patch-tag.com/r/salazar/indents"; + description = "indentation sensitive parser-combinators for parsec"; + license = stdenv.lib.licenses.bsd3; +} diff --git a/pkgs/development/compilers/elm/packages/release.nix b/pkgs/development/compilers/elm/packages/release.nix deleted file mode 100644 index fd4e08fff09..00000000000 --- a/pkgs/development/compilers/elm/packages/release.nix +++ /dev/null @@ -1,13 +0,0 @@ -# This file is auto-generated by ./update-elm.rb. -# Please, do not modify it by hand! -{ callPackage }: -{ - version = "0.18.0"; - packages = { - elm-compiler = callPackage ./elm-compiler.nix { }; - elm-package = callPackage ./elm-package.nix { }; - elm-make = callPackage ./elm-make.nix { }; - elm-reactor = callPackage ./elm-reactor.nix { }; - elm-repl = callPackage ./elm-repl.nix { }; - }; -} diff --git a/pkgs/development/compilers/elm/update-elm.rb b/pkgs/development/compilers/elm/update-elm.rb deleted file mode 100755 index 5169ff3fd29..00000000000 --- a/pkgs/development/compilers/elm/update-elm.rb +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env ruby - -# Take those from https://github.com/elm-lang/elm-platform/blob/master/installers/BuildFromSource.hs -$elm_version = "0.18.0" -$elm_packages = { "elm-compiler" => "0.18.0", - "elm-package" => "0.18.0", - "elm-make" => "0.18.0", - "elm-reactor" => "0.18.0", - "elm-repl" => "0.18.0" - } - -for pkg, ver in $elm_packages - system "cabal2nix https://github.com/elm-lang/#{pkg} --revision refs/tags/#{ver} --jailbreak > packages/#{pkg}.nix" -end - -File.open("packages/release.nix", 'w') do |file| - file.puts "# This file is auto-generated by ./update-elm.rb." - file.puts "# Please, do not modify it by hand!" - file.puts "{ callPackage }:" - file.puts "{" - file.puts " version = \"#{$elm_version}\";" - file.puts " packages = {" - for pkg, ver in $elm_packages - file.puts " #{pkg} = callPackage ./#{pkg}.nix { };" - end - file.puts " };" - file.puts "}" -end diff --git a/pkgs/development/compilers/elm/update.sh b/pkgs/development/compilers/elm/update.sh new file mode 100755 index 00000000000..02e5bdc9b58 --- /dev/null +++ b/pkgs/development/compilers/elm/update.sh @@ -0,0 +1,3 @@ +cabal2nix https://github.com/elm/compiler --revision 32059a289d27e303fa1665e9ada0a52eb688f302 > packages/elm.nix +cabal2nix --no-check cabal://indents-0.3.3 > packages/indents.nix +cabal2nix --no-haddock --no-check --jailbreak --revision refs/tags/0.8.0 http://github.com/avh4/elm-format > packages/elm-format.nix diff --git a/pkgs/development/compilers/elm/versions.dat b/pkgs/development/compilers/elm/versions.dat new file mode 100644 index 00000000000..824ab383057 --- /dev/null +++ b/pkgs/development/compilers/elm/versions.dat Binary files differdiff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 101a6feeeae..3e9ddacac1b 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -24,7 +24,6 @@ , name ? "gcc" , libcCross ? null , crossStageStatic ? false -, libpthread ? null, libpthreadCross ? null # required for GNU/Hurd , # Strip kills static libs of other archs (hence no cross) stripped ? hostPlatform == buildPlatform && targetPlatform == hostPlatform , gnused ? null @@ -181,39 +180,7 @@ stdenv.mkDerivation ({ libc_dev = stdenv.cc.libc_dev; postPatch = - if targetPlatform.isHurd - then - # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not - # in glibc, so add the right `-I' flags to the default spec string. - assert libcCross != null -> libpthreadCross != null; - let - libc = if libcCross != null then libcCross else stdenv.glibc; - gnu_h = "gcc/config/gnu.h"; - extraCPPDeps = - libc.propagatedBuildInputs - ++ stdenv.lib.optional (libpthreadCross != null) libpthreadCross - ++ stdenv.lib.optional (libpthread != null) libpthread; - extraCPPSpec = - concatStrings (intersperse " " - (map (x: "-I${x.dev or x}/include") extraCPPDeps)); - extraLibSpec = - if libpthreadCross != null - then "-L${libpthreadCross}/lib ${libpthreadCross.TARGET_LDFLAGS}" - else "-L${libpthread}/lib"; - in - '' echo "augmenting \`CPP_SPEC' in \`${gnu_h}' with \`${extraCPPSpec}'..." - sed -i "${gnu_h}" \ - -es'|CPP_SPEC *"\(.*\)$|CPP_SPEC "${extraCPPSpec} \1|g' - - echo "augmenting \`LIB_SPEC' in \`${gnu_h}' with \`${extraLibSpec}'..." - sed -i "${gnu_h}" \ - -es'|LIB_SPEC *"\(.*\)$|LIB_SPEC "${extraLibSpec} \1|g' - - echo "setting \`NATIVE_SYSTEM_HEADER_DIR' and \`STANDARD_INCLUDE_DIR' to \`${libc.dev}/include'..." - sed -i "${gnu_h}" \ - -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc.dev}/include"|g' - '' - else if targetPlatform != hostPlatform || stdenv.cc.libc != null then + if targetPlatform != hostPlatform || stdenv.cc.libc != null then # On NixOS, use the right path to the dynamic linker instead of # `/lib/ld*.so'. let @@ -379,21 +346,13 @@ stdenv.mkDerivation ({ ++ optional langJava boehmgc ++ optionals javaAwtGtk xlibs ++ optionals javaAwtGtk [ gmp mpfr ] - ++ optional (libpthread != null) libpthread - ++ optional (libpthreadCross != null) libpthreadCross - - # On GNU/Hurd glibc refers to Mach & Hurd - # headers. - ++ optionals (libcCross != null && libcCross ? propagatedBuildInputs) - libcCross.propagatedBuildInputs )); LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath ([] ++ optional (zlib != null) zlib ++ optional langJava boehmgc ++ optionals javaAwtGtk xlibs - ++ optionals javaAwtGtk [ gmp mpfr ] - ++ optional (libpthread != null) libpthread) + ++ optionals javaAwtGtk [ gmp mpfr ]) ); EXTRA_TARGET_FLAGS = optionals @@ -413,10 +372,7 @@ stdenv.mkDerivation ({ ] else [ "-Wl,-rpath,${libcCross.out}/lib" "-Wl,-rpath-link,${libcCross.out}/lib" - ]) ++ optionals (libpthreadCross != null) [ - "-L${libpthreadCross}/lib" - "-Wl,${libpthreadCross.TARGET_LDFLAGS}" - ]); + ])); passthru = { inherit langC langCC langObjC langObjCpp langFortran langGo version; diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 1df87cc3d42..9b4444b905d 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -24,7 +24,6 @@ , name ? "gcc" , libcCross ? null , crossStageStatic ? false -, libpthread ? null, libpthreadCross ? null # required for GNU/Hurd , # Strip kills static libs of other archs (hence no cross) stripped ? hostPlatform == buildPlatform && targetPlatform == hostPlatform , gnused ? null @@ -190,39 +189,7 @@ stdenv.mkDerivation ({ libc_dev = stdenv.cc.libc_dev; postPatch = - if targetPlatform.isHurd - then - # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not - # in glibc, so add the right `-I' flags to the default spec string. - assert libcCross != null -> libpthreadCross != null; - let - libc = if libcCross != null then libcCross else stdenv.glibc; - gnu_h = "gcc/config/gnu.h"; - extraCPPDeps = - libc.propagatedBuildInputs - ++ stdenv.lib.optional (libpthreadCross != null) libpthreadCross - ++ stdenv.lib.optional (libpthread != null) libpthread; - extraCPPSpec = - concatStrings (intersperse " " - (map (x: "-I${x.dev or x}/include") extraCPPDeps)); - extraLibSpec = - if libpthreadCross != null - then "-L${libpthreadCross}/lib ${libpthreadCross.TARGET_LDFLAGS}" - else "-L${libpthread}/lib"; - in - '' echo "augmenting \`CPP_SPEC' in \`${gnu_h}' with \`${extraCPPSpec}'..." - sed -i "${gnu_h}" \ - -es'|CPP_SPEC *"\(.*\)$|CPP_SPEC "${extraCPPSpec} \1|g' - - echo "augmenting \`LIB_SPEC' in \`${gnu_h}' with \`${extraLibSpec}'..." - sed -i "${gnu_h}" \ - -es'|LIB_SPEC *"\(.*\)$|LIB_SPEC "${extraLibSpec} \1|g' - - echo "setting \`NATIVE_SYSTEM_HEADER_DIR' and \`STANDARD_INCLUDE_DIR' to \`${libc.dev}/include'..." - sed -i "${gnu_h}" \ - -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc.dev}/include"|g' - '' - else if targetPlatform != hostPlatform || stdenv.cc.libc != null then + if targetPlatform != hostPlatform || stdenv.cc.libc != null then # On NixOS, use the right path to the dynamic linker instead of # `/lib/ld*.so'. let @@ -401,22 +368,13 @@ stdenv.mkDerivation ({ ++ optional langJava boehmgc ++ optionals javaAwtGtk xlibs ++ optionals javaAwtGtk [ gmp mpfr ] - ++ optional (libpthread != null) libpthread - ++ optional (libpthreadCross != null) libpthreadCross - - # On GNU/Hurd glibc refers to Mach & Hurd - # headers. - ++ optionals (libcCross != null && libcCross ? propagatedBuildInputs) - libcCross.propagatedBuildInputs )); LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath ([] ++ optional (zlib != null) zlib ++ optional langJava boehmgc ++ optionals javaAwtGtk xlibs - ++ optionals javaAwtGtk [ gmp mpfr ] - ++ optional (libpthread != null) libpthread) - ); + ++ optionals javaAwtGtk [ gmp mpfr ])); EXTRA_TARGET_FLAGS = optionals (targetPlatform != hostPlatform && libcCross != null) @@ -435,10 +393,7 @@ stdenv.mkDerivation ({ ] else [ "-Wl,-rpath,${libcCross.out}/lib" "-Wl,-rpath-link,${libcCross.out}/lib" - ]) ++ optionals (libpthreadCross != null) [ - "-L${libpthreadCross}/lib" - "-Wl,${libpthreadCross.TARGET_LDFLAGS}" - ]); + ])); passthru = { inherit langC langCC langObjC langObjCpp langFortran langGo version; isGNU = true; }; diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index 1215c971f23..3fdec1ec310 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -24,7 +24,6 @@ , name ? "gcc" , libcCross ? null , crossStageStatic ? false -, libpthread ? null, libpthreadCross ? null # required for GNU/Hurd , # Strip kills static libs of other archs (hence no cross) stripped ? hostPlatform == buildPlatform && targetPlatform == hostPlatform , gnused ? null @@ -188,39 +187,7 @@ stdenv.mkDerivation ({ ''; postPatch = - if targetPlatform.isHurd - then - # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not - # in glibc, so add the right `-I' flags to the default spec string. - assert libcCross != null -> libpthreadCross != null; - let - libc = if libcCross != null then libcCross else stdenv.glibc; - gnu_h = "gcc/config/gnu.h"; - extraCPPDeps = - libc.propagatedBuildInputs - ++ stdenv.lib.optional (libpthreadCross != null) libpthreadCross - ++ stdenv.lib.optional (libpthread != null) libpthread; - extraCPPSpec = - concatStrings (intersperse " " - (map (x: "-I${x.dev or x}/include") extraCPPDeps)); - extraLibSpec = - if libpthreadCross != null - then "-L${libpthreadCross}/lib ${libpthreadCross.TARGET_LDFLAGS}" - else "-L${libpthread}/lib"; - in - '' echo "augmenting \`CPP_SPEC' in \`${gnu_h}' with \`${extraCPPSpec}'..." - sed -i "${gnu_h}" \ - -es'|CPP_SPEC *"\(.*\)$|CPP_SPEC "${extraCPPSpec} \1|g' - - echo "augmenting \`LIB_SPEC' in \`${gnu_h}' with \`${extraLibSpec}'..." - sed -i "${gnu_h}" \ - -es'|LIB_SPEC *"\(.*\)$|LIB_SPEC "${extraLibSpec} \1|g' - - echo "setting \`NATIVE_SYSTEM_HEADER_DIR' and \`STANDARD_INCLUDE_DIR' to \`${libc.dev}/include'..." - sed -i "${gnu_h}" \ - -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc.dev}/include"|g' - '' - else if targetPlatform != hostPlatform || stdenv.cc.libc != null then + if targetPlatform != hostPlatform || stdenv.cc.libc != null then # On NixOS, use the right path to the dynamic linker instead of # `/lib/ld*.so'. let @@ -302,7 +269,7 @@ stdenv.mkDerivation ({ ] ++ optional (libelf != null) "--with-libelf=${libelf}" ++ optional (!(crossMingw && crossStageStatic)) - "--with-native-system-header-dir=${getDev stdenv.cc.libc}/include" ++ + "--with-native-system-header-dir=${getDev stdenv.cc.libc}/include" ++ # Basic configuration [ @@ -400,13 +367,6 @@ stdenv.mkDerivation ({ ++ optional langJava boehmgc ++ optionals javaAwtGtk xlibs ++ optionals javaAwtGtk [ gmp mpfr ] - ++ optional (libpthread != null) libpthread - ++ optional (libpthreadCross != null) libpthreadCross - - # On GNU/Hurd glibc refers to Mach & Hurd - # headers. - ++ optionals (libcCross != null && libcCross ? propagatedBuildInputs) - libcCross.propagatedBuildInputs )); LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath ([] @@ -414,8 +374,7 @@ stdenv.mkDerivation ({ ++ optional langJava boehmgc ++ optionals javaAwtGtk xlibs ++ optionals javaAwtGtk [ gmp mpfr ] - ++ optional (libpthread != null) libpthread) - ); + )); EXTRA_TARGET_FLAGS = optionals (targetPlatform != hostPlatform && libcCross != null) @@ -434,10 +393,7 @@ stdenv.mkDerivation ({ ] else [ "-Wl,-rpath,${libcCross.out}/lib" "-Wl,-rpath-link,${libcCross.out}/lib" - ]) ++ optionals (libpthreadCross != null) [ - "-L${libpthreadCross}/lib" - "-Wl,${libpthreadCross.TARGET_LDFLAGS}" - ]); + ])); passthru = { inherit langC langCC langObjC langObjCpp langFortran langGo version; isGNU = true; }; diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index 0fb39075895..099e26375f4 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -24,7 +24,6 @@ , name ? "gcc" , libcCross ? null , crossStageStatic ? false -, libpthread ? null, libpthreadCross ? null # required for GNU/Hurd , # Strip kills static libs of other archs (hence no cross) stripped ? hostPlatform == buildPlatform && targetPlatform == hostPlatform , gnused ? null @@ -192,39 +191,7 @@ stdenv.mkDerivation ({ ''; postPatch = - if targetPlatform.isHurd - then - # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not - # in glibc, so add the right `-I' flags to the default spec string. - assert libcCross != null -> libpthreadCross != null; - let - libc = if libcCross != null then libcCross else stdenv.glibc; - gnu_h = "gcc/config/gnu.h"; - extraCPPDeps = - libc.propagatedBuildInputs - ++ stdenv.lib.optional (libpthreadCross != null) libpthreadCross - ++ stdenv.lib.optional (libpthread != null) libpthread; - extraCPPSpec = - concatStrings (intersperse " " - (map (x: "-I${x.dev or x}/include") extraCPPDeps)); - extraLibSpec = - if libpthreadCross != null - then "-L${libpthreadCross}/lib ${libpthreadCross.TARGET_LDFLAGS}" - else "-L${libpthread}/lib"; - in - '' echo "augmenting \`CPP_SPEC' in \`${gnu_h}' with \`${extraCPPSpec}'..." - sed -i "${gnu_h}" \ - -es'|CPP_SPEC *"\(.*\)$|CPP_SPEC "${extraCPPSpec} \1|g' - - echo "augmenting \`LIB_SPEC' in \`${gnu_h}' with \`${extraLibSpec}'..." - sed -i "${gnu_h}" \ - -es'|LIB_SPEC *"\(.*\)$|LIB_SPEC "${extraLibSpec} \1|g' - - echo "setting \`NATIVE_SYSTEM_HEADER_DIR' and \`STANDARD_INCLUDE_DIR' to \`${libc.dev}/include'..." - sed -i "${gnu_h}" \ - -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc.dev}/include"|g' - '' - else if targetPlatform != hostPlatform || stdenv.cc.libc != null then + if targetPlatform != hostPlatform || stdenv.cc.libc != null then # On NixOS, use the right path to the dynamic linker instead of # `/lib/ld*.so'. let @@ -408,22 +375,13 @@ stdenv.mkDerivation ({ ++ optional langJava boehmgc ++ optionals javaAwtGtk xlibs ++ optionals javaAwtGtk [ gmp mpfr ] - ++ optional (libpthread != null) libpthread - ++ optional (libpthreadCross != null) libpthreadCross - - # On GNU/Hurd glibc refers to Mach & Hurd - # headers. - ++ optionals (libcCross != null && libcCross ? propagatedBuildInputs) - libcCross.propagatedBuildInputs )); LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath ([] ++ optional (zlib != null) zlib ++ optional langJava boehmgc ++ optionals javaAwtGtk xlibs - ++ optionals javaAwtGtk [ gmp mpfr ] - ++ optional (libpthread != null) libpthread) - ); + ++ optionals javaAwtGtk [ gmp mpfr ])); EXTRA_TARGET_FLAGS = optionals (targetPlatform != hostPlatform && libcCross != null) @@ -442,10 +400,7 @@ stdenv.mkDerivation ({ ] else [ "-Wl,-rpath,${libcCross.out}/lib" "-Wl,-rpath-link,${libcCross.out}/lib" - ]) ++ optionals (libpthreadCross != null) [ - "-L${libpthreadCross}/lib" - "-Wl,${libpthreadCross.TARGET_LDFLAGS}" - ]); + ])); passthru = { inherit langC langCC langObjC langObjCpp langFortran langGo version; isGNU = true; }; diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index c5541da0790..60e429cc4da 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -17,7 +17,6 @@ , name ? "gcc" , libcCross ? null , crossStageStatic ? false -, libpthread ? null, libpthreadCross ? null # required for GNU/Hurd , # Strip kills static libs of other archs (hence no cross) stripped ? hostPlatform == buildPlatform && targetPlatform == hostPlatform , gnused ? null @@ -165,39 +164,7 @@ stdenv.mkDerivation ({ patchShebangs $configureScript done '' + ( - if targetPlatform.isHurd - then - # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not - # in glibc, so add the right `-I' flags to the default spec string. - assert libcCross != null -> libpthreadCross != null; - let - libc = if libcCross != null then libcCross else stdenv.glibc; - gnu_h = "gcc/config/gnu.h"; - extraCPPDeps = - libc.propagatedBuildInputs - ++ stdenv.lib.optional (libpthreadCross != null) libpthreadCross - ++ stdenv.lib.optional (libpthread != null) libpthread; - extraCPPSpec = - concatStrings (intersperse " " - (map (x: "-I${x.dev or x}/include") extraCPPDeps)); - extraLibSpec = - if libpthreadCross != null - then "-L${libpthreadCross}/lib ${libpthreadCross.TARGET_LDFLAGS}" - else "-L${libpthread}/lib"; - in - '' echo "augmenting \`CPP_SPEC' in \`${gnu_h}' with \`${extraCPPSpec}'..." - sed -i "${gnu_h}" \ - -es'|CPP_SPEC *"\(.*\)$|CPP_SPEC "${extraCPPSpec} \1|g' - - echo "augmenting \`LIB_SPEC' in \`${gnu_h}' with \`${extraLibSpec}'..." - sed -i "${gnu_h}" \ - -es'|LIB_SPEC *"\(.*\)$|LIB_SPEC "${extraLibSpec} \1|g' - - echo "setting \`NATIVE_SYSTEM_HEADER_DIR' and \`STANDARD_INCLUDE_DIR' to \`${libc.dev}/include'..." - sed -i "${gnu_h}" \ - -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc.dev}/include"|g' - '' - else if targetPlatform != hostPlatform || stdenv.cc.libc != null then + if targetPlatform != hostPlatform || stdenv.cc.libc != null then # On NixOS, use the right path to the dynamic linker instead of # `/lib/ld*.so'. let @@ -357,19 +324,9 @@ stdenv.mkDerivation ({ CPATH = optionals (targetPlatform == hostPlatform) (makeSearchPathOutput "dev" "include" ([] ++ optional (zlib != null) zlib - ++ optional (libpthread != null) libpthread - ++ optional (libpthreadCross != null) libpthreadCross - - # On GNU/Hurd glibc refers to Mach & Hurd - # headers. - ++ optionals (libcCross != null && libcCross ? propagatedBuildInputs) - libcCross.propagatedBuildInputs )); - LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath ([] - ++ optional (zlib != null) zlib - ++ optional (libpthread != null) libpthread) - ); + LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath (optional (zlib != null) zlib)); EXTRA_TARGET_FLAGS = optionals (targetPlatform != hostPlatform && libcCross != null) @@ -388,10 +345,7 @@ stdenv.mkDerivation ({ ] else [ "-Wl,-rpath,${libcCross.out}/lib" "-Wl,-rpath-link,${libcCross.out}/lib" - ]) ++ optionals (libpthreadCross != null) [ - "-L${libpthreadCross}/lib" - "-Wl,${libpthreadCross.TARGET_LDFLAGS}" - ]); + ])); passthru = { inherit langC langCC langObjC langObjCpp langFortran langGo version; isGNU = true; }; diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix index 5d7be163783..a05c1c71812 100644 --- a/pkgs/development/compilers/gcc/8/default.nix +++ b/pkgs/development/compilers/gcc/8/default.nix @@ -17,7 +17,6 @@ , name ? "gcc" , libcCross ? null , crossStageStatic ? false -, libpthread ? null, libpthreadCross ? null # required for GNU/Hurd , # Strip kills static libs of other archs (hence no cross) stripped ? hostPlatform == buildPlatform && targetPlatform == hostPlatform , gnused ? null @@ -160,39 +159,7 @@ stdenv.mkDerivation ({ patchShebangs $configureScript done '' + ( - if targetPlatform.isHurd - then - # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not - # in glibc, so add the right `-I' flags to the default spec string. - assert libcCross != null -> libpthreadCross != null; - let - libc = if libcCross != null then libcCross else stdenv.glibc; - gnu_h = "gcc/config/gnu.h"; - extraCPPDeps = - libc.propagatedBuildInputs - ++ stdenv.lib.optional (libpthreadCross != null) libpthreadCross - ++ stdenv.lib.optional (libpthread != null) libpthread; - extraCPPSpec = - concatStrings (intersperse " " - (map (x: "-I${x.dev or x}/include") extraCPPDeps)); - extraLibSpec = - if libpthreadCross != null - then "-L${libpthreadCross}/lib ${libpthreadCross.TARGET_LDFLAGS}" - else "-L${libpthread}/lib"; - in - '' echo "augmenting \`CPP_SPEC' in \`${gnu_h}' with \`${extraCPPSpec}'..." - sed -i "${gnu_h}" \ - -es'|CPP_SPEC *"\(.*\)$|CPP_SPEC "${extraCPPSpec} \1|g' - - echo "augmenting \`LIB_SPEC' in \`${gnu_h}' with \`${extraLibSpec}'..." - sed -i "${gnu_h}" \ - -es'|LIB_SPEC *"\(.*\)$|LIB_SPEC "${extraLibSpec} \1|g' - - echo "setting \`NATIVE_SYSTEM_HEADER_DIR' and \`STANDARD_INCLUDE_DIR' to \`${libc.dev}/include'..." - sed -i "${gnu_h}" \ - -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc.dev}/include"|g' - '' - else if targetPlatform != hostPlatform || stdenv.cc.libc != null then + if targetPlatform != hostPlatform || stdenv.cc.libc != null then # On NixOS, use the right path to the dynamic linker instead of # `/lib/ld*.so'. let @@ -346,19 +313,9 @@ stdenv.mkDerivation ({ CPATH = optionals (targetPlatform == hostPlatform) (makeSearchPathOutput "dev" "include" ([] ++ optional (zlib != null) zlib - ++ optional (libpthread != null) libpthread - ++ optional (libpthreadCross != null) libpthreadCross - - # On GNU/Hurd glibc refers to Mach & Hurd - # headers. - ++ optionals (libcCross != null && libcCross ? propagatedBuildInputs) - libcCross.propagatedBuildInputs )); - LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath ([] - ++ optional (zlib != null) zlib - ++ optional (libpthread != null) libpthread) - ); + LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath (optional (zlib != null) zlib)); EXTRA_TARGET_FLAGS = optionals (targetPlatform != hostPlatform && libcCross != null) @@ -377,10 +334,7 @@ stdenv.mkDerivation ({ ] else [ "-Wl,-rpath,${libcCross.out}/lib" "-Wl,-rpath-link,${libcCross.out}/lib" - ]) ++ optionals (libpthreadCross != null) [ - "-L${libpthreadCross}/lib" - "-Wl,${libpthreadCross.TARGET_LDFLAGS}" - ]); + ])); passthru = { inherit langC langCC langObjC langObjCpp langFortran langGo version; isGNU = true; }; diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix index 124fdbcdf9d..275b380e90f 100644 --- a/pkgs/development/compilers/gcc/snapshot/default.nix +++ b/pkgs/development/compilers/gcc/snapshot/default.nix @@ -17,7 +17,6 @@ , name ? "gcc" , libcCross ? null , crossStageStatic ? false -, libpthread ? null, libpthreadCross ? null # required for GNU/Hurd , # Strip kills static libs of other archs (hence no cross) stripped ? hostPlatform == buildPlatform && targetPlatform == hostPlatform , gnused ? null @@ -134,39 +133,7 @@ stdenv.mkDerivation ({ hardeningDisable = [ "format" ]; postPatch = - if targetPlatform.isHurd - then - # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not - # in glibc, so add the right `-I' flags to the default spec string. - assert libcCross != null -> libpthreadCross != null; - let - libc = if libcCross != null then libcCross else stdenv.glibc; - gnu_h = "gcc/config/gnu.h"; - extraCPPDeps = - libc.propagatedBuildInputs - ++ stdenv.lib.optional (libpthreadCross != null) libpthreadCross - ++ stdenv.lib.optional (libpthread != null) libpthread; - extraCPPSpec = - concatStrings (intersperse " " - (map (x: "-I${x.dev or x}/include") extraCPPDeps)); - extraLibSpec = - if libpthreadCross != null - then "-L${libpthreadCross}/lib ${libpthreadCross.TARGET_LDFLAGS}" - else "-L${libpthread}/lib"; - in - '' echo "augmenting \`CPP_SPEC' in \`${gnu_h}' with \`${extraCPPSpec}'..." - sed -i "${gnu_h}" \ - -es'|CPP_SPEC *"\(.*\)$|CPP_SPEC "${extraCPPSpec} \1|g' - - echo "augmenting \`LIB_SPEC' in \`${gnu_h}' with \`${extraLibSpec}'..." - sed -i "${gnu_h}" \ - -es'|LIB_SPEC *"\(.*\)$|LIB_SPEC "${extraLibSpec} \1|g' - - echo "setting \`NATIVE_SYSTEM_HEADER_DIR' and \`STANDARD_INCLUDE_DIR' to \`${libc.dev}/include'..." - sed -i "${gnu_h}" \ - -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc.dev}/include"|g' - '' - else if targetPlatform != hostPlatform || stdenv.cc.libc != null then + if targetPlatform != hostPlatform || stdenv.cc.libc != null then # On NixOS, use the right path to the dynamic linker instead of # `/lib/ld*.so'. let @@ -314,19 +281,9 @@ stdenv.mkDerivation ({ CPATH = optionals (targetPlatform == hostPlatform) (makeSearchPathOutput "dev" "include" ([] ++ optional (zlib != null) zlib - ++ optional (libpthread != null) libpthread - ++ optional (libpthreadCross != null) libpthreadCross - - # On GNU/Hurd glibc refers to Mach & Hurd - # headers. - ++ optionals (libcCross != null && libcCross ? propagatedBuildInputs) - libcCross.propagatedBuildInputs )); - LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath ([] - ++ optional (zlib != null) zlib - ++ optional (libpthread != null) libpthread) - ); + LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath (optional (zlib != null) zlib)); EXTRA_TARGET_FLAGS = optionals (targetPlatform != hostPlatform && libcCross != null) @@ -345,10 +302,7 @@ stdenv.mkDerivation ({ ] else [ "-Wl,-rpath,${libcCross.out}/lib" "-Wl,-rpath-link,${libcCross.out}/lib" - ]) ++ optionals (libpthreadCross != null) [ - "-L${libpthreadCross}/lib" - "-Wl,${libpthreadCross.TARGET_LDFLAGS}" - ]); + ])); passthru = { inherit langC langCC langObjC langObjCpp langFortran langGo version; isGNU = true; }; diff --git a/pkgs/development/compilers/go/1.11.nix b/pkgs/development/compilers/go/1.11.nix new file mode 100644 index 00000000000..eddd16dc199 --- /dev/null +++ b/pkgs/development/compilers/go/1.11.nix @@ -0,0 +1,194 @@ +{ stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin +, perl, which, pkgconfig, patch, procps +, pcre, cacert, llvm +, Security, Foundation +, makeWrapper, git, subversion, mercurial, bazaar }: + +let + + inherit (stdenv.lib) optionals optionalString; + + clangHack = writeScriptBin "clang" '' + #!${stdenv.shell} + exec ${stdenv.cc}/bin/clang "$@" 2> >(sed '/ld: warning:.*ignoring unexpected dylib file/ d' 1>&2) + ''; + + goBootstrap = runCommand "go-bootstrap" {} '' + mkdir $out + cp -rf ${go_bootstrap}/* $out/ + chmod -R u+w $out + find $out -name "*.c" -delete + cp -rf $out/bin/* $out/share/go/bin/ + ''; + +in + +stdenv.mkDerivation rec { + name = "go-${version}"; + version = "1.11"; + + src = fetchFromGitHub { + owner = "golang"; + repo = "go"; + rev = "go${version}"; + sha256 = "1k18d6rkijlgzn1zw4wphzcv6a6w9hb1msgrsh1102jb18644f2q"; + }; + + GOCACHE = "off"; + + # perl is used for testing go vet + nativeBuildInputs = [ perl which pkgconfig patch makeWrapper procps ]; + buildInputs = [ cacert pcre ] + ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ] + ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; + propagatedBuildInputs = optionals stdenv.isDarwin [ Security Foundation ]; + + hardeningDisable = [ "all" ]; + + prePatch = '' + patchShebangs ./ # replace /bin/bash + + # This source produces shell script at run time, + # and thus it is not corrected by patchShebangs. + substituteInPlace misc/cgo/testcarchive/carchive_test.go \ + --replace '#!/usr/bin/env bash' '#!${stdenv.shell}' + + # Disabling the 'os/http/net' tests (they want files not available in + # chroot builds) + rm src/net/{listen,parse}_test.go + rm src/syscall/exec_linux_test.go + + # !!! substituteInPlace does not seems to be effective. + # The os test wants to read files in an existing path. Just don't let it be /usr/bin. + sed -i 's,/usr/bin,'"`pwd`", src/os/os_test.go + sed -i 's,/bin/pwd,'"`type -P pwd`", src/os/os_test.go + # Disable the unix socket test + sed -i '/TestShutdownUnix/areturn' src/net/net_test.go + # Disable the hostname test + sed -i '/TestHostname/areturn' src/os/os_test.go + # ParseInLocation fails the test + sed -i '/TestParseInSydney/areturn' src/time/format_test.go + # Remove the api check as it never worked + sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go + # Remove the coverage test as we have removed this utility + sed -i '/TestCoverageWithCgo/areturn' src/cmd/go/go_test.go + # Remove the timezone naming test + sed -i '/TestLoadFixed/areturn' src/time/time_test.go + # Remove disable setgid test + sed -i '/TestRespectSetgidDir/areturn' src/cmd/go/internal/work/build_test.go + # Remove cert tests that conflict with NixOS's cert resolution + sed -i '/TestEnvVars/areturn' src/crypto/x509/root_unix_test.go + # TestWritevError hangs sometimes + sed -i '/TestWritevError/areturn' src/net/writev_test.go + # TestVariousDeadlines fails sometimes + sed -i '/TestVariousDeadlines/areturn' src/net/timeout_test.go + + sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go + sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go + + # Disable cgo lookup tests not works, they depend on resolver + rm src/net/cgo_unix_test.go + + '' + optionalString stdenv.isLinux '' + sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go + '' + optionalString stdenv.isAarch32 '' + echo '#!${stdenv.shell}' > misc/cgo/testplugin/test.bash + '' + optionalString stdenv.isDarwin '' + substituteInPlace src/race.bash --replace \ + "sysctl machdep.cpu.extfeatures | grep -qv EM64T" true + sed -i 's,strings.Contains(.*sysctl.*,true {,' src/cmd/dist/util.go + sed -i 's,"/etc","'"$TMPDIR"'",' src/os/os_test.go + sed -i 's,/_go_os_test,'"$TMPDIR"'/_go_os_test,' src/os/path_test.go + + sed -i '/TestChdirAndGetwd/areturn' src/os/os_test.go + sed -i '/TestCredentialNoSetGroups/areturn' src/os/exec/exec_posix_test.go + sed -i '/TestRead0/areturn' src/os/os_test.go + sed -i '/TestSystemRoots/areturn' src/crypto/x509/root_darwin_test.go + + sed -i '/TestGoInstallRebuildsStalePackagesInOtherGOPATH/areturn' src/cmd/go/go_test.go + sed -i '/TestBuildDashIInstallsDependencies/areturn' src/cmd/go/go_test.go + + sed -i '/TestDisasmExtld/areturn' src/cmd/objdump/objdump_test.go + + sed -i 's/unrecognized/unknown/' src/cmd/link/internal/ld/lib.go + + touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd + ''; + + patches = [ + ./remove-tools-1.11.patch + ./ssl-cert-file-1.9.patch + ./remove-test-pie.patch + ./creds-test.patch + ./go-1.9-skip-flaky-19608.patch + ./go-1.9-skip-flaky-20072.patch + ./remove-fhs-test-references.patch + ./skip-external-network-tests.patch + ./skip-nohup-tests.patch + ]; + + postPatch = optionalString stdenv.isDarwin '' + echo "substitute hardcoded dsymutil with ${llvm}/bin/llvm-dsymutil" + substituteInPlace "src/cmd/link/internal/ld/lib.go" --replace dsymutil ${llvm}/bin/llvm-dsymutil + ''; + + GOOS = if stdenv.isDarwin then "darwin" else "linux"; + GOARCH = if stdenv.isDarwin then "amd64" + else if stdenv.system == "i686-linux" then "386" + else if stdenv.system == "x86_64-linux" then "amd64" + else if stdenv.isAarch32 then "arm" + else if stdenv.isAarch64 then "arm64" + else throw "Unsupported system"; + GOARM = optionalString (stdenv.system == "armv5tel-linux") "5"; + GO386 = 387; # from Arch: don't assume sse2 on i686 + CGO_ENABLED = 1; + GOROOT_BOOTSTRAP = "${goBootstrap}/share/go"; + # Hopefully avoids test timeouts on Hydra + GO_TEST_TIMEOUT_SCALE = 3; + + # The go build actually checks for CC=*/clang and does something different, so we don't + # just want the generic `cc` here. + CC = if stdenv.isDarwin then "clang" else "cc"; + + configurePhase = '' + # Indicate that we are running on build infrastructure + # Some tests assume things like home directories and users exists + export GO_BUILDER_NAME=nix + + mkdir -p $out/share/go/bin + export GOROOT=$out/share/go + export GOBIN=$GOROOT/bin + export PATH=$GOBIN:$PATH + ulimit -a + ''; + + postConfigure = optionalString stdenv.isDarwin '' + export PATH=${clangHack}/bin:$PATH + ''; + + installPhase = '' + cp -r . $GOROOT + ( cd $GOROOT/src && ./all.bash ) + + # (https://github.com/golang/go/wiki/GoGetTools) + wrapProgram $out/share/go/bin/go --prefix PATH ":" "${stdenv.lib.makeBinPath [ git subversion mercurial bazaar ]}" + ''; + + preFixup = '' + rm -r $out/share/go/pkg/bootstrap + ln -s $out/share/go/bin $out/bin + ''; + + setupHook = ./setup-hook.sh; + + disallowedReferences = [ go_bootstrap ]; + + meta = with stdenv.lib; { + branch = "1.9"; + homepage = http://golang.org/; + description = "The Go Programming language"; + license = licenses.bsd3; + maintainers = with maintainers; [ cstrahan orivej velovix mic92 ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/pkgs/development/compilers/go/remove-fhs-test-references.patch b/pkgs/development/compilers/go/remove-fhs-test-references.patch new file mode 100644 index 00000000000..1ea7f85d529 --- /dev/null +++ b/pkgs/development/compilers/go/remove-fhs-test-references.patch @@ -0,0 +1,13 @@ +diff --git a/src/cmd/vendor/golang.org/x/sys/unix/syscall_unix_test.go b/src/cmd/vendor/golang.org/x/sys/unix/syscall_unix_test.go +index d694990..87fa259 100644 +--- a/src/cmd/vendor/golang.org/x/sys/unix/syscall_unix_test.go ++++ b/src/cmd/vendor/golang.org/x/sys/unix/syscall_unix_test.go +@@ -452,7 +452,7 @@ func TestGetwd(t *testing.T) { + defer fd.Close() + // These are chosen carefully not to be symlinks on a Mac + // (unlike, say, /var, /etc) +- dirs := []string{"/", "/usr/bin"} ++ dirs := []string{"/"} + switch runtime.GOOS { + case "android": + dirs = []string{"/", "/system/bin"} diff --git a/pkgs/development/compilers/go/remove-tools-1.11.patch b/pkgs/development/compilers/go/remove-tools-1.11.patch new file mode 100644 index 00000000000..cff35999a83 --- /dev/null +++ b/pkgs/development/compilers/go/remove-tools-1.11.patch @@ -0,0 +1,35 @@ +diff --git a/src/go/build/build.go b/src/go/build/build.go +index b68a712..b60bf19 100644 +--- a/src/go/build/build.go ++++ b/src/go/build/build.go +@@ -1708,7 +1708,7 @@ func init() { + } + + // ToolDir is the directory containing build tools. +-var ToolDir = getToolDir() ++var ToolDir = runtime.GOTOOLDIR() + + // IsLocalImport reports whether the import path is + // a local import path, like ".", "..", "./foo", or "../foo". +diff --git a/src/runtime/extern.go b/src/runtime/extern.go +index 7171b13..18a942c 100644 +--- a/src/runtime/extern.go ++++ b/src/runtime/extern.go +@@ -229,6 +229,17 @@ func GOROOT() string { + return sys.DefaultGoroot + } + ++// GOTOOLDIR returns the root of the Go tree. ++// It uses the GOTOOLDIR environment variable, if set, ++// or else the root used during the Go build. ++func GOTOOLDIR() string { ++ s := gogetenv("GOTOOLDIR") ++ if s != "" { ++ return s ++ } ++ return GOROOT() + "/pkg/tool/" + GOOS + "_" + GOARCH ++} ++ + // Version returns the Go tree's version string. + // It is either the commit hash and date at the time of the build or, + // when possible, a release tag like "go1.3". diff --git a/pkgs/development/compilers/go/skip-external-network-tests.patch b/pkgs/development/compilers/go/skip-external-network-tests.patch new file mode 100644 index 00000000000..5791b213cb5 --- /dev/null +++ b/pkgs/development/compilers/go/skip-external-network-tests.patch @@ -0,0 +1,26 @@ +diff --git a/src/cmd/go/go_test.go b/src/cmd/go/go_test.go +index 85cae90..94b4edd 100644 +--- a/src/cmd/go/go_test.go ++++ b/src/cmd/go/go_test.go +@@ -4946,6 +4946,8 @@ func TestBuildmodePIE(t *testing.T) { + } + + func TestExecBuildX(t *testing.T) { ++ t.Skipf("skipping, test requires networking") ++ + tooSlow(t) + if !canCgo { + t.Skip("skipping because cgo not enabled") +diff --git a/src/net/dial_test.go b/src/net/dial_test.go +index 00a84d1..27f9ec9 100644 +--- a/src/net/dial_test.go ++++ b/src/net/dial_test.go +@@ -968,6 +968,8 @@ func TestDialerControl(t *testing.T) { + // mustHaveExternalNetwork is like testenv.MustHaveExternalNetwork + // except that it won't skip testing on non-iOS builders. + func mustHaveExternalNetwork(t *testing.T) { ++ t.Skipf("Nix sandbox does not have networking") ++ + t.Helper() + ios := runtime.GOOS == "darwin" && (runtime.GOARCH == "arm" || runtime.GOARCH == "arm64") + if testenv.Builder() == "" || ios { diff --git a/pkgs/development/compilers/go/skip-nohup-tests.patch b/pkgs/development/compilers/go/skip-nohup-tests.patch new file mode 100644 index 00000000000..1da07407d04 --- /dev/null +++ b/pkgs/development/compilers/go/skip-nohup-tests.patch @@ -0,0 +1,22 @@ +diff --git a/src/os/signal/signal_test.go b/src/os/signal/signal_test.go +index 3d79c7a..6e0f7b4 100644 +--- a/src/os/signal/signal_test.go ++++ b/src/os/signal/signal_test.go +@@ -217,6 +217,8 @@ var checkSighupIgnored = flag.Bool("check_sighup_ignored", false, "if true, Test + + // Test that Ignored(SIGHUP) correctly detects whether it is being run under nohup. + func TestDetectNohup(t *testing.T) { ++ t.Skip("Fails in nix build environment") ++ + if *checkSighupIgnored { + if !Ignored(syscall.SIGHUP) { + t.Fatal("SIGHUP is not ignored.") +@@ -306,6 +308,8 @@ func TestStop(t *testing.T) { + // Test that when run under nohup, an uncaught SIGHUP does not kill the program, + // but a + func TestNohup(t *testing.T) { ++ t.Skip("Fails in nix build environment") ++ + // Ugly: ask for SIGHUP so that child will not have no-hup set + // even if test is running under nohup environment. + // We have no intention of reading from c. diff --git a/pkgs/development/compilers/hhvm/default.nix b/pkgs/development/compilers/hhvm/default.nix index 749e4125a0b..010dacd0c71 100644 --- a/pkgs/development/compilers/hhvm/default.nix +++ b/pkgs/development/compilers/hhvm/default.nix @@ -63,5 +63,6 @@ stdenv.mkDerivation rec { license = "PHP/Zend"; platforms = [ "x86_64-linux" ]; maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + broken = true; # Since 2018-04-21, see https://hydra.nixos.org/build/73059373 }; } diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index 03891c9c6c8..757773eed52 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, makeWrapper, jre, unzip }: let - version = "1.2.60"; + version = "1.2.61"; in stdenv.mkDerivation rec { inherit version; name = "kotlin-${version}"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha256 = "0gb29a8ayj12g4g10dcasw3d3csphq5rv9jn9c6m02myr6azcygz"; + sha256 = "1gsvilsbgwdvyvxjnlvs0rhrgm6x9dapziwgwgg9kbi9a0w4avdy"; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/compilers/mint/default.nix b/pkgs/development/compilers/mint/default.nix index 6552f5f44e3..2896c0c0913 100644 --- a/pkgs/development/compilers/mint/default.nix +++ b/pkgs/development/compilers/mint/default.nix @@ -1,4 +1,9 @@ -{stdenv, lib, fetchFromGitHub, crystal, zlib, openssl, duktape}: +# Updating the dependencies for this package: +# +# wget https://github.com/mint-lang/mint/blob/0.2.1/shard.lock +# nix-shell -p crystal libyaml --run 'crystal run crystal2nix.cr' +# +{stdenv, lib, fetchFromGitHub, crystal, zlib, openssl, duktape, which }: let crystalPackages = lib.mapAttrs (name: src: stdenv.mkDerivation { @@ -28,15 +33,16 @@ let }; in stdenv.mkDerivation rec { - version = "0.2.0"; + version = "0.2.1"; name = "mint-${version}"; src = fetchFromGitHub { owner = "mint-lang"; repo = "mint"; - rev = "0.2.0"; - sha256 = "1ds9zrvbmnfy744i9ri6v4w37aw7ccmdxzxmy8l97h045hzz9cp3"; + rev = version; + sha256 = "0r8hv2j5yz0rlvrbpnybihj44562pkmsssa8f0hjs45m1ifvf4b1"; }; + nativeBuildInputs = [ which ]; buildInputs = [ crystal zlib openssl duktape ]; buildPhase = '' diff --git a/pkgs/development/compilers/mint/shards.nix b/pkgs/development/compilers/mint/shards.nix index 808b4710048..069df52ba12 100644 --- a/pkgs/development/compilers/mint/shards.nix +++ b/pkgs/development/compilers/mint/shards.nix @@ -2,8 +2,8 @@ admiral = { owner = "jwaldrip"; repo = "admiral.cr"; - rev = "v1.7.2"; - sha256 = "1j2cr4p3d44848v0gfl97p9kw2dslscnb1piyb7b3374iy345i0k"; + rev = "v1.7.3"; + sha256 = "0b98qjy43wsrc08am7lkhcdsxc7gplf9hcmbvd4p3dw4g107rk91"; }; ameba = { owner = "veelenga"; @@ -14,8 +14,8 @@ baked_file_system = { owner = "schovi"; repo = "baked_file_system"; - rev = "24dbaf2180b872c0f0fc777b34e3759108959e6e"; - sha256 = "01p7hzsvms9cywdgs0rcs6mxdi94491wk55823fw2vxv24hvxnvk"; + rev = "v0.9.7"; + sha256 = "1fi6zag1a6h4xwrfizy01dls3hhraqw0cmpwj7rjv1qcddjgig5z"; }; diff = { owner = "MakeNowJust"; @@ -38,8 +38,8 @@ kemal = { owner = "kemalcr"; repo = "kemal"; - rev = "09bb1fcd4073a374b3a61c99e48e05a866b23c08"; - sha256 = "0yyb59i897gr8cqjbf48d6s0znq68ibpxarxkxkgrqk7lbvrqqr7"; + rev = "v0.24.0"; + sha256 = "0sg7gy1lbhid9y9wh77m9sd00jygk92njm4mpb7w1fq8bjnm738k"; }; kilt = { owner = "jeromegn"; diff --git a/pkgs/development/compilers/obliv-c/default.nix b/pkgs/development/compilers/obliv-c/default.nix index f5bd3430ae7..0d171a474a2 100644 --- a/pkgs/development/compilers/obliv-c/default.nix +++ b/pkgs/development/compilers/obliv-c/default.nix @@ -1,15 +1,15 @@ { stdenv, libgcrypt, fetchFromGitHub, ocamlPackages, perl }: stdenv.mkDerivation rec { name = "obliv-c-${version}"; - version = "0.0pre20170827"; + version = "0.0pre20180624"; buildInputs = [ perl ] ++ (with ocamlPackages; [ ocaml findlib ocamlbuild ]); propagatedBuildInputs = [ libgcrypt ]; src = fetchFromGitHub { owner = "samee"; repo = "obliv-c"; - rev = "9a6be5a5f44d341bc357055e11922f6a4c4c3b65"; - sha256 = "0jz2ayadx62zv2b5ji947bkvw63axl4a2q70lwli86zgmcl390gf"; + rev = "3d6804ca0fd85868207a0ccbd2509ec064723ac2"; + sha256 = "1ib21ngn7zr58xxq4sjigrpaxb0wx35x3k9l4qvwflzrmvnman20"; }; patches = [ ./ignore-complex-float128.patch ]; diff --git a/pkgs/development/compilers/openjdk/darwin/10.nix b/pkgs/development/compilers/openjdk/darwin/10.nix new file mode 100644 index 00000000000..95c96c345c2 --- /dev/null +++ b/pkgs/development/compilers/openjdk/darwin/10.nix @@ -0,0 +1,59 @@ +{ stdenv, fetchurl, unzip, setJavaClassPath, freetype }: +let + jce-policies = fetchurl { + # Ugh, unversioned URLs... I hope this doesn't change often enough to cause pain before we move to a Darwin source build of OpenJDK! + url = "http://cdn.azul.com/zcek/bin/ZuluJCEPolicies.zip"; + sha256 = "0nk7m0lgcbsvldq2wbfni2pzq8h818523z912i7v8hdcij5s48c0"; + }; + + jdk = stdenv.mkDerivation { + name = "zulu10.1+11-jdk10"; + + src = fetchurl { + url = "https://cdn.azul.com/zulu/bin/zulu10.1+11-jdk10-macosx_x64.zip"; + sha256 = "1c5ib136nv6gz7ij31mg15nhzrl6zr7kp8spm17zwm1ib82bc73y"; + curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/zulu-linux/"; + }; + + buildInputs = [ unzip freetype ]; + + installPhase = '' + mkdir -p $out + mv * $out + + unzip ${jce-policies} + mv -f ZuluJCEPolicies/*.jar $out/lib/security/ + + # jni.h expects jni_md.h to be in the header search path. + ln -s $out/include/darwin/*_md.h $out/include/ + + if [ -f $out/LICENSE ]; then + install -D $out/LICENSE $out/share/zulu/LICENSE + rm $out/LICENSE + fi + ''; + + preFixup = '' + # Propagate the setJavaClassPath setup hook from the JRE so that + # any package that depends on the JRE has $CLASSPATH set up + # properly. + mkdir -p $out/nix-support + printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs + + install_name_tool -change /usr/X11/lib/libfreetype.6.dylib ${freetype}/lib/libfreetype.6.dylib $out/lib/libfontmanager.dylib + + # Set JAVA_HOME automatically. + cat <<EOF >> $out/nix-support/setup-hook + if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi + EOF + ''; + + passthru = { + jre = jdk; + home = jdk; + }; + + meta.platforms = stdenv.lib.platforms.darwin; + + }; +in jdk diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 510688ef416..a4a8aa980b6 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -43,25 +43,6 @@ let }; in rec { - - vala_0_26 = generic { - major = "0.26"; - minor = "2"; - sha256 = "1i03ds1z5hivqh4nhf3x80fg7n0zd22908w5minkpaan1i1kzw9p"; - }; - - vala_0_28 = generic { - major = "0.28"; - minor = "1"; - sha256 = "0isg327w6rfqqdjja6a8pc3xcdkj7pqrkdhw48bsyxab2fkaw3hw"; - }; - - vala_0_32 = generic { - major = "0.32"; - minor = "1"; - sha256 = "1ab1l44abf9fj1wznzq5956431ia136rl5049cggnk5393jlf3fx"; - }; - vala_0_34 = generic { major = "0.34"; minor = "17"; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 61c2da2b419..ef55272d6e9 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -672,6 +672,9 @@ self: super: { # https://github.com/bos/bloomfilter/issues/7 bloomfilter = appendPatch super.bloomfilter ./patches/bloomfilter-fix-on-32bit.patch; + # https://github.com/ashutoshrishi/hunspell-hs/pull/3 + hunspell-hs = addPkgconfigDepend (dontCheck (appendPatch super.hunspell-hs ./patches/hunspell.patch)) pkgs.hunspell; + # https://github.com/pxqr/base32-bytestring/issues/4 base32-bytestring = dontCheck super.base32-bytestring; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 6057538125a..3aee4857f99 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -43,7 +43,7 @@ core-packages: default-package-overrides: # Newer versions require contravariant-1.5.*, which many builds refuse at the moment. - base-compat-batteries ==0.10.1 - # LTS Haskell 12.6 + # LTS Haskell 12.7 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -76,7 +76,7 @@ default-package-overrides: - alarmclock ==0.5.0.2 - alerts ==0.1.0.0 - alex ==3.2.4 - - alg ==0.2.5.0 + - alg ==0.2.6.0 - algebra ==4.3.1 - Allure ==0.8.3.0 - almost-fix ==0.0.2 @@ -244,7 +244,7 @@ default-package-overrides: - bench ==1.0.11 - bencode ==0.6.0.0 - between ==0.11.0.0 - - bhoogle ==0.1.3.4 + - bhoogle ==0.1.3.5 - bibtex ==0.1.0.6 - bifunctors ==5.5.3 - bimap ==0.3.3 @@ -333,7 +333,7 @@ default-package-overrides: - cabal2spec ==2.1.1 - cabal-doctest ==1.0.6 - cabal-rpm ==0.12.5 - - cache ==0.1.1.0 + - cache ==0.1.1.1 - cachix ==0.1.1 - cachix-api ==0.1.0.1 - cairo ==0.13.5.0 @@ -410,7 +410,7 @@ default-package-overrides: - codo-notation ==0.5.2 - coercible-utils ==0.0.0 - colonnade ==1.2.0.1 - - colorful-monoids ==0.2.1.1 + - colorful-monoids ==0.2.1.2 - colorize-haskell ==1.0.1 - colour ==2.3.4 - combinatorial ==0.1 @@ -670,7 +670,7 @@ default-package-overrides: - errors ==2.3.0 - errors-ext ==0.4.2 - error-util ==0.0.1.2 - - ersatz ==0.4.3 + - ersatz ==0.4.4 - etc ==0.4.0.3 - event ==0.1.4 - eventful-core ==0.2.0 @@ -870,9 +870,9 @@ default-package-overrides: - graph-wrapper ==0.2.5.1 - gravatar ==0.8.0 - graylog ==0.1.0.1 - - greskell ==0.2.0.3 + - greskell ==0.2.1.0 - greskell-core ==0.1.2.2 - - greskell-websocket ==0.1.0.0 + - greskell-websocket ==0.1.1.0 - groom ==0.1.2.1 - groups ==0.4.1.0 - gtk ==0.14.10 @@ -900,7 +900,7 @@ default-package-overrides: - hashmap ==1.3.3 - hashtables ==1.2.3.1 - haskeline ==0.7.4.3 - - haskell-gi ==0.21.3 + - haskell-gi ==0.21.4 - haskell-gi-base ==0.21.1 - haskell-gi-overloading ==1.0 - haskell-lexer ==1.0.1 @@ -1065,7 +1065,7 @@ default-package-overrides: - hvect ==0.4.0.0 - hvega ==0.1.0.3 - hw-balancedparens ==0.2.0.2 - - hw-bits ==0.7.0.2 + - hw-bits ==0.7.0.3 - hw-conduit ==0.2.0.3 - hw-diagnostics ==0.0.0.5 - hweblib ==0.6.3 @@ -1079,7 +1079,7 @@ default-package-overrides: - hw-mquery ==0.1.0.1 - hworker ==0.1.0.1 - hw-parser ==0.0.0.3 - - hw-prim ==0.6.2.3 + - hw-prim ==0.6.2.9 - hw-rankselect ==0.10.0.3 - hw-rankselect-base ==0.3.2.1 - hw-string-parse ==0.0.0.4 @@ -1098,7 +1098,7 @@ default-package-overrides: - hybrid-vectors ==0.2.2 - hyperloglog ==0.4.2 - hyphenation ==0.7.1 - - hyraxAbif ==0.2.3.9 + - hyraxAbif ==0.2.3.10 - iconv ==0.4.1.3 - identicon ==0.2.2 - ieee754 ==0.8.0 @@ -1134,7 +1134,7 @@ default-package-overrides: - interpolation ==0.1.0.2 - IntervalMap ==0.6.0.0 - intervals ==0.8.1 - - intro ==0.3.1.0 + - intro ==0.3.2.0 - invariant ==0.5.1 - invertible ==0.2.0.5 - invertible-grammar ==0.1.1 @@ -1354,7 +1354,7 @@ default-package-overrides: - mmorph ==1.1.2 - mnist-idx ==0.1.2.8 - mockery ==0.3.5 - - modern-uri ==0.2.1.0 + - modern-uri ==0.2.2.0 - moesocks ==1.0.0.44 - monad-control ==1.0.2.3 - monad-control-aligned ==0.0.1.1 @@ -1399,7 +1399,7 @@ default-package-overrides: - mtl-prelude ==2.0.3.1 - multiarg ==0.30.0.10 - multimap ==1.2.1 - - multipart ==0.1.2 + - multipart ==0.1.3 - multistate ==0.8.0.0 - murmur-hash ==0.1.0.9 - MusicBrainz ==0.4 @@ -1493,7 +1493,7 @@ default-package-overrides: - open-browser ==0.2.1.0 - openexr-write ==0.1.0.1 - OpenGL ==3.0.2.2 - - OpenGLRaw ==3.3.0.2 + - OpenGLRaw ==3.3.1.0 - openpgp-asciiarmor ==0.1.1 - opensource ==0.1.0.0 - openssl-streams ==1.2.1.3 @@ -1687,7 +1687,7 @@ default-package-overrides: - range-set-list ==0.1.3 - rank1dynamic ==0.4.0 - rank2classes ==1.1.0.1 - - Rasterific ==0.7.3 + - Rasterific ==0.7.4 - rasterific-svg ==0.3.3.1 - ratel ==1.0.5 - ratel-wai ==1.0.3 @@ -1743,7 +1743,7 @@ default-package-overrides: - rest-stringmap ==0.2.0.7 - result ==0.2.6.0 - rethinkdb-client-driver ==0.0.25 - - retry ==0.7.6.2 + - retry ==0.7.6.3 - rev-state ==0.1.2 - rfc5051 ==0.1.0.3 - rhine ==0.4.0.1 @@ -1774,7 +1774,7 @@ default-package-overrides: - sampling ==0.3.3 - sandi ==0.4.2 - sandman ==0.2.0.1 - - say ==0.1.0.0 + - say ==0.1.0.1 - sbp ==2.3.17 - scalendar ==1.2.0 - SCalendar ==1.1.0 @@ -1838,7 +1838,7 @@ default-package-overrides: - servant-tracing ==0.1.0.2 - servant-websockets ==1.1.0 - servant-yaml ==0.1.0.0 - - serverless-haskell ==0.6.6 + - serverless-haskell ==0.6.7 - serversession ==1.0.1 - serversession-frontend-wai ==1.0 - servius ==1.2.3.0 @@ -1918,7 +1918,7 @@ default-package-overrides: - state-codes ==0.1.3 - stateref ==0.3 - statestack ==0.2.0.5 - - StateVar ==1.1.1.0 + - StateVar ==1.1.1.1 - static-canvas ==0.2.0.3 - static-text ==0.2.0.2 - statistics ==0.14.0.2 @@ -2033,7 +2033,7 @@ default-package-overrides: - texmath ==0.11.0.1 - text ==1.2.3.0 - text-binary ==0.2.1.1 - - text-builder ==0.5.3 + - text-builder ==0.5.3.1 - text-conversions ==0.3.0 - text-icu ==0.7.0.1 - text-latin1 ==0.3.1 @@ -2113,7 +2113,7 @@ default-package-overrides: - tuple-sop ==0.3.1.0 - tuple-th ==0.2.5 - turtle ==1.5.10 - - typed-process ==0.2.2.0 + - typed-process ==0.2.3.0 - type-fun ==0.1.1 - type-hint ==0.1 - type-level-integers ==0.0.1 @@ -2220,7 +2220,7 @@ default-package-overrides: - wai-conduit ==3.0.0.4 - wai-cors ==0.2.6 - wai-eventsource ==3.0.0 - - wai-extra ==3.0.24.0 + - wai-extra ==3.0.24.1 - wai-handler-launch ==3.0.2.4 - wai-logger ==2.3.2 - wai-middleware-caching ==0.1.0.2 @@ -2265,8 +2265,8 @@ default-package-overrides: - with-location ==0.1.0 - witness ==0.4 - wizards ==1.0.2 - - wl-pprint-annotated ==0.1.0.0 - - wl-pprint-console ==0.1.0.1 + - wl-pprint-annotated ==0.1.0.1 + - wl-pprint-console ==0.1.0.2 - wl-pprint-extras ==3.5.0.5 - wl-pprint-terminfo ==3.7.1.4 - wl-pprint-text ==1.2.0.0 @@ -2281,8 +2281,8 @@ default-package-overrides: - writer-cps-full ==0.1.0.0 - writer-cps-lens ==0.1.0.1 - writer-cps-morph ==0.1.0.2 - - writer-cps-mtl ==0.1.1.4 - - writer-cps-transformers ==0.1.1.3 + - writer-cps-mtl ==0.1.1.5 + - writer-cps-transformers ==0.1.1.4 - ws ==0.0.4 - wuss ==1.1.10 - X11 ==1.9 @@ -4742,7 +4742,6 @@ dont-distribute-packages: gi-gtkosxapplication: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-notify: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-poppler: [ i686-linux, x86_64-linux, x86_64-darwin ] - gi-vte: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-wnck: [ i686-linux, x86_64-linux, x86_64-darwin ] giak: [ i686-linux, x86_64-linux, x86_64-darwin ] Gifcurry: [ i686-linux, x86_64-linux, x86_64-darwin ] diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 37916c0bba2..0786238040b 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -46,6 +46,10 @@ in , isExecutable ? false, isLibrary ? !isExecutable , jailbreak ? false , license +# We cannot enable -j<n> parallelism for libraries because GHC is far more +# likely to generate a non-determistic library ID in that case. Further +# details are at <https://github.com/peti/ghc-library-id-bug>. +, enableParallelBuilding ? (stdenv.lib.versionOlder "7.8" ghc.version && !isLibrary) || stdenv.lib.versionOlder "8.0.1" ghc.version , maintainers ? [] , doCoverage ? false , doHaddock ? !(ghc.isHaLVM or false) @@ -112,11 +116,6 @@ let main = defaultMain ''; - # We cannot enable -j<n> parallelism for libraries because GHC is far more - # likely to generate a non-determistic library ID in that case. Further - # details are at <https://github.com/peti/ghc-library-id-bug>. - enableParallelBuilding = (versionOlder "7.8" ghc.version && !isLibrary) || versionOlder "8.0.1" ghc.version; - crossCabalFlags = [ "--with-ghc=${ghc.targetPrefix}ghc" "--with-ghc-pkg=${ghc.targetPrefix}ghc-pkg" diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index df117d1a554..c1fb70ee2e6 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -5401,6 +5401,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Fin_0_2_5_0" = callPackage + ({ mkDerivation, alg, base, foldable1, natural-induction, peano }: + mkDerivation { + pname = "Fin"; + version = "0.2.5.0"; + sha256 = "0jh64an111k7a3limqc03irk914s8asy6h4iik7layw4pagpsiyc"; + libraryHaskellDepends = [ + alg base foldable1 natural-induction peano + ]; + description = "Finite totally-ordered sets"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "Finance-Quote-Yahoo" = callPackage ({ mkDerivation, base, bytestring, http-conduit, network , old-locale, time @@ -9921,8 +9935,8 @@ self: { pname = "HsYAML"; version = "0.1.1.2"; sha256 = "1100yzyxbvin48q3dgmzpnhz1gbqaxnkpnwy7ywzj2wrvwrr8hjx"; - revision = "1"; - editedCabalFile = "1hnp2sqjvn524040m0dzvzyrr8kp4i49gdyrzwym66j71xi6ynkl"; + revision = "2"; + editedCabalFile = "0kxfvp899l06x3y6zhnnfjx7kw1mjb3c7g0flnkllndp9i9a3pkl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -10950,6 +10964,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "Kulitta" = callPackage + ({ mkDerivation, array, base, deepseq, Euterpea, parallel, random + , UISF + }: + mkDerivation { + pname = "Kulitta"; + version = "2.2.1"; + sha256 = "1r5pjlv4a99dpbqqnixyw8s99z5h1fgw6rdc8bdhjij1bj6dc5qw"; + libraryHaskellDepends = [ + array base deepseq Euterpea parallel random UISF + ]; + description = "Library for automated composition and musical learning"; + license = "unknown"; + }) {}; + "KyotoCabinet" = callPackage ({ mkDerivation, base, bytestring, extensible-exceptions , kyotocabinet @@ -13670,22 +13699,6 @@ self: { }: mkDerivation { pname = "OpenGLRaw"; - version = "3.3.0.2"; - sha256 = "1jnn4v32qyf0xfy4s2pgrzca2bnr855m4vkzbmwr7dwam2xckcpq"; - libraryHaskellDepends = [ - base bytestring containers fixed half text transformers - ]; - librarySystemDepends = [ libGL ]; - description = "A raw binding for the OpenGL graphics system"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) libGL;}; - - "OpenGLRaw_3_3_1_0" = callPackage - ({ mkDerivation, base, bytestring, containers, fixed, half, libGL - , text, transformers - }: - mkDerivation { - pname = "OpenGLRaw"; version = "3.3.1.0"; sha256 = "1x8w3x308jldj2c1xqcq3a3sc2jc06pdpgqkgjsmixi1skv4a1vb"; libraryHaskellDepends = [ @@ -13694,7 +13707,6 @@ self: { librarySystemDepends = [ libGL ]; description = "A raw binding for the OpenGL graphics system"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libGL;}; "OpenGLRaw21" = callPackage @@ -14536,6 +14548,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "Prelude" = callPackage + ({ mkDerivation, base-noprelude }: + mkDerivation { + pname = "Prelude"; + version = "0.1.0.0"; + sha256 = "0wcacpbqphb635pblqzbv44fhjwdnv0l90zr5i6c8x7mymqpcixj"; + libraryHaskellDepends = [ base-noprelude ]; + description = "A Prelude module replacement"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "PrimitiveArray" = callPackage ({ mkDerivation, aeson, base, binary, bits, cereal, cereal-vector , containers, deepseq, DPutils, hashable, log-domain, OrderedBits @@ -15397,23 +15420,6 @@ self: { }: mkDerivation { pname = "Rasterific"; - version = "0.7.3"; - sha256 = "0y92h3mjsr1vjcxc06lh1lvszicf53l1bzdaci5mjb5gmiq8f2px"; - libraryHaskellDepends = [ - base bytestring containers dlist FontyFruity free JuicyPixels mtl - primitive transformers vector vector-algorithms - ]; - description = "A pure haskell drawing engine"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "Rasterific_0_7_4" = callPackage - ({ mkDerivation, base, bytestring, containers, dlist, FontyFruity - , free, JuicyPixels, mtl, primitive, transformers, vector - , vector-algorithms - }: - mkDerivation { - pname = "Rasterific"; version = "0.7.4"; sha256 = "13f5ay9wmva9k15a6pk4imxz6rj80gwc1f16906m7a6rm9vgwvlq"; libraryHaskellDepends = [ @@ -15422,7 +15428,6 @@ self: { ]; description = "A pure haskell drawing engine"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ReadArgs" = callPackage @@ -15706,8 +15711,8 @@ self: { ({ mkDerivation, base, Cabal, SDL, SDL_gfx }: mkDerivation { pname = "SDL-gfx"; - version = "0.6.1.0"; - sha256 = "0sicq48cp9j5b5hpa1s53y505ny0snn2k73f15a4gwh1n5abdxzm"; + version = "0.6.2.0"; + sha256 = "1y49wzy71ns7gwczmwvrx8d026y5nabqzvh8ymxxcy3brhay0shr"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base SDL ]; @@ -17088,23 +17093,11 @@ self: { ({ mkDerivation, base, stm, transformers }: mkDerivation { pname = "StateVar"; - version = "1.1.1.0"; - sha256 = "102f4x240zj3jwa7gx6vp813j76cjhlc3zbi9i5kiz6268kcv28s"; - libraryHaskellDepends = [ base stm transformers ]; - description = "State variables"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "StateVar_1_1_1_1" = callPackage - ({ mkDerivation, base, stm, transformers }: - mkDerivation { - pname = "StateVar"; version = "1.1.1.1"; sha256 = "08r2iw0gdmfs4f6wraaq19vfmkjdbics3dbhw39y7mdjd98kcr7b"; libraryHaskellDepends = [ base stm transformers ]; description = "State variables"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "StateVar-transformer" = callPackage @@ -21755,6 +21748,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "aeson-generic-compat_0_0_1_3" = callPackage + ({ mkDerivation, aeson, base }: + mkDerivation { + pname = "aeson-generic-compat"; + version = "0.0.1.3"; + sha256 = "1kr3waa46k3619yvif0zh4lx7s0zhyghlr1c5kkrvg432i8wmdm6"; + libraryHaskellDepends = [ aeson base ]; + description = "Compatible generic class names of Aeson"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "aeson-injector" = callPackage ({ mkDerivation, aeson, base, bifunctors, containers, deepseq , hashable, HUnit, lens, QuickCheck, quickcheck-text, scientific @@ -22916,23 +22921,11 @@ self: { ({ mkDerivation, base, util }: mkDerivation { pname = "alg"; - version = "0.2.5.0"; - sha256 = "014wrh4f58lq50n5ybdksr2k5lygs5qxsyxg48zpbzzz3p3494yx"; - libraryHaskellDepends = [ base util ]; - description = "Algebraic structures"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "alg_0_2_6_0" = callPackage - ({ mkDerivation, base, util }: - mkDerivation { - pname = "alg"; version = "0.2.6.0"; sha256 = "0y0qhhmyjzd8sf6v74066yx41nl1zsnsmk8scjvdym8j8k8mvrpk"; libraryHaskellDepends = [ base util ]; description = "Algebraic structures"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "alga" = callPackage @@ -26870,8 +26863,8 @@ self: { }: mkDerivation { pname = "antiope-athena"; - version = "6.0.0"; - sha256 = "13l8biwl66pn3n8jbbc2fbj3vk1w6rjnzrdmiimxl0nd7zm6vk4r"; + version = "6.0.1"; + sha256 = "0y8a3rs5sy2qv2pwqb6ap6bl64qhp7x0jqqy1q237vfm2w6vrj6v"; libraryHaskellDepends = [ amazonka amazonka-athena amazonka-core base lens resourcet text unliftio-core @@ -26890,8 +26883,8 @@ self: { }: mkDerivation { pname = "antiope-core"; - version = "6.0.0"; - sha256 = "1cmfda3dfg282a8rg6hkqv17fzfia5c7vm4gh0jdib4ggl5yxcrv"; + version = "6.0.1"; + sha256 = "1h7yd3p5dqkq118xvmp9ifydgak311pfibkpgy3il0qj4gj2g8sa"; libraryHaskellDepends = [ amazonka amazonka-core base bytestring generic-lens http-client lens monad-logger mtl resourcet transformers unliftio-core @@ -26911,8 +26904,8 @@ self: { }: mkDerivation { pname = "antiope-dynamodb"; - version = "6.0.0"; - sha256 = "1i45fvxn75yd7fpypzz183j7q3n0kvrrxw78kr310a08fdngapn8"; + version = "6.0.1"; + sha256 = "1f8ixkvh7f5dgxl76823f275c3r6f1xmwhx4rfcmd6z90dn8damm"; libraryHaskellDepends = [ amazonka amazonka-core amazonka-dynamodb antiope-core base generic-lens lens text unliftio-core unordered-containers @@ -26932,8 +26925,8 @@ self: { }: mkDerivation { pname = "antiope-messages"; - version = "6.0.0"; - sha256 = "1km57vpm8q77lpxyvmpvgj6csrixf8kdxqnwxkg065ylk0cp1hw7"; + version = "6.0.1"; + sha256 = "1ib2j0jlcfzq89a4vs7r282hpmqnqg2gw8l1ibfiahl4ac91z7zn"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-s3 amazonka-sqs antiope-s3 base generic-lens lens lens-aeson monad-loops network-uri text @@ -26956,8 +26949,8 @@ self: { }: mkDerivation { pname = "antiope-s3"; - version = "6.0.0"; - sha256 = "1s4cixqkflf3s8g6x75783wwrr5973wls2axjj8raspa4qfl2zsn"; + version = "6.0.1"; + sha256 = "1cjvzd47vprn916d1fks6lf08plns326xircfhc69qblkzvqzljs"; libraryHaskellDepends = [ amazonka amazonka-core amazonka-s3 base bytestring conduit conduit-extra exceptions generic-lens http-types lens monad-logger @@ -26978,8 +26971,8 @@ self: { }: mkDerivation { pname = "antiope-sns"; - version = "6.0.0"; - sha256 = "0fbkd7r8iq8sjfa0k6kv8clld323i1xhib5k7kpl2zlan4xfk2k9"; + version = "6.0.1"; + sha256 = "0hqvh3vzpdr9g6v778qn17nfrqvg8i2lszqgss9fb8290mlm8x01"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-sns base generic-lens lens text unliftio-core @@ -26999,8 +26992,8 @@ self: { }: mkDerivation { pname = "antiope-sqs"; - version = "6.0.0"; - sha256 = "0xfaayajlzb9wvqnmlfwh990kzsy738qnscsyqnn07zp61047wxf"; + version = "6.0.1"; + sha256 = "0pfhhgc7dkp4dn2k0dxy2pkmbml9js351ab2y2hln5jpsni9qfc0"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-s3 amazonka-sqs antiope-messages antiope-s3 base generic-lens lens lens-aeson @@ -27735,6 +27728,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "appendmap" = callPackage + ({ mkDerivation, base, containers, hspec }: + mkDerivation { + pname = "appendmap"; + version = "0.1.3"; + sha256 = "1jssrwbsk0z9y4ialw9ly7vc95jrc64dr1idycwz1spgvn03adp6"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ base containers hspec ]; + description = "Map with a Semigroup and Monoid instances delegating to Semigroup of the elements"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "applicative-extras" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -31746,6 +31751,8 @@ self: { pname = "axel"; version = "0.0.4"; sha256 = "0gg1q7nfwsdh0wr5mqyrjcrfga4i87j8q2f4n9nvpq6hmwnphpc3"; + revision = "1"; + editedCabalFile = "0ff8pi6x26wv6bp2hx92h3cs9iln1yj6230am1c2ygjhr16wfwna"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -33994,25 +34001,6 @@ self: { }: mkDerivation { pname = "bhoogle"; - version = "0.1.3.4"; - sha256 = "06b2fc8667axzk58hpgb5wdbxd0lj1xrgkxvygsksq4q9wdwc8qn"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base brick bytestring containers directory filepath hoogle lens - process protolude text time typed-process vector vty - ]; - description = "Simple terminal GUI for local hoogle"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "bhoogle_0_1_3_5" = callPackage - ({ mkDerivation, base, brick, bytestring, containers, directory - , filepath, hoogle, lens, process, protolude, text, time - , typed-process, vector, vty - }: - mkDerivation { - pname = "bhoogle"; version = "0.1.3.5"; sha256 = "1gig9w1k1w2kw6y3wx6ckmc7kamwwzzq7mbaxil0rmb5ms0p1rf9"; isLibrary = false; @@ -34023,7 +34011,6 @@ self: { ]; description = "Simple terminal GUI for local hoogle"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bibdb" = callPackage @@ -35706,6 +35693,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bins" = callPackage + ({ mkDerivation, base, containers, finite-typelits + , ghc-typelits-knownnat, ghc-typelits-natnormalise, math-functions + , profunctors, reflection, tagged, vector-sized + }: + mkDerivation { + pname = "bins"; + version = "0.1.1.0"; + sha256 = "067df9dpb7kvn7v9y2mw0y3zb4jmxas27yd3ybrb9h94f9j8p9jk"; + libraryHaskellDepends = [ + base containers finite-typelits ghc-typelits-knownnat + ghc-typelits-natnormalise math-functions profunctors reflection + tagged vector-sized + ]; + description = "Aggregate continuous values into discrete bins"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "bio" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , directory, mtl, parallel, parsec, QuickCheck, random, tagsoup @@ -35814,8 +35819,8 @@ self: { }: mkDerivation { pname = "biohazard"; - version = "1.0.2"; - sha256 = "0g954m7ch3lzcc2j49qcmpb7v4apdijq9km8d4r08qr9w6xq5pc8"; + version = "1.0.3"; + sha256 = "19pk2c52w300jxcnrxlnvc6m8qr4jj19vwppdz37c9nppm6q2252"; libraryHaskellDepends = [ async attoparsec base base-prelude bytestring containers exceptions hashable primitive stm text transformers unix unordered-containers @@ -38559,16 +38564,16 @@ self: { "brainheck" = callPackage ({ mkDerivation, base, containers, criterion, lens, megaparsec, mtl - , optparse-applicative, recursion-schemes, text, vector + , optparse-applicative, recursion, text, vector }: mkDerivation { pname = "brainheck"; - version = "0.1.0.8"; - sha256 = "01jz6j37rjdj3jcs8j27xgwcqykx3sarkb9759qn63v1ln5kv5nj"; + version = "0.1.0.9"; + sha256 = "0wmkkamgzassvc63wrk7bmm3ljq056zbxqbgs223454iswk35hc8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers lens megaparsec mtl recursion-schemes text vector + base containers lens megaparsec mtl recursion text vector ]; executableHaskellDepends = [ base optparse-applicative text ]; benchmarkHaskellDepends = [ base criterion text ]; @@ -39468,10 +39473,10 @@ self: { }: mkDerivation { pname = "bulletproofs"; - version = "0.1.0"; - sha256 = "1axm943r0hx5g8a36s4166sf1ifppbd8m6nx25xn7lf27fvsbw9q"; + version = "0.2.0"; + sha256 = "0njc7wd1vn6i9zw35vjzm73gzv20b6qn3zci61lpnp3zclbclnmb"; revision = "1"; - editedCabalFile = "08wgmhrlfv99zcgwd7mqjaz5hnhz4h3a3afzdxnclvzmmqd30njv"; + editedCabalFile = "0im8y3699rvl0ak3smwry3rafyvrypxan9jb5d39xanwmny2qnky"; libraryHaskellDepends = [ arithmoi base containers cryptonite memory protolude text ]; @@ -40163,8 +40168,8 @@ self: { ({ mkDerivation, base, bytestring, deepseq, QuickCheck }: mkDerivation { pname = "bytestring-short"; - version = "0.1.0.0"; - sha256 = "19pwr57imsdvjkjhmnaj9lxmv1lk3d8f8j3gcb7qsx832jah7crr"; + version = "0.1.0.2"; + sha256 = "04y2yfsvicgs5bf0q2cyyg939g09q212rmnj9n11vh5fr86m1gsm"; libraryHaskellDepends = [ base bytestring deepseq ]; testHaskellDepends = [ base bytestring QuickCheck ]; description = "Backport copy of ShortByteString"; @@ -40862,35 +40867,36 @@ self: { "cabal-helper" = callPackage ({ mkDerivation, base, bytestring, Cabal, cabal-install, cabal-plan - , containers, directory, filepath, ghc, ghc-paths, mtl, process - , semigroupoids, template-haskell, temporary, transformers, unix - , unix-compat, utf8-string + , containers, directory, filepath, ghc, ghc-paths, mtl, pretty-show + , process, semigroupoids, template-haskell, temporary, text + , transformers, unix, unix-compat, utf8-string }: mkDerivation { pname = "cabal-helper"; - version = "0.8.1.0"; - sha256 = "098jjdjzkzpr4lgb78fhy9k80r5m96shyj39km69m5x4ls16cj4g"; + version = "0.8.1.2"; + sha256 = "1pxyba12m9kyzfm4nn8qfd19fqwnq6kjy1967wic2xaz151x6nil"; isLibrary = true; isExecutable = true; + setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base Cabal cabal-plan containers directory filepath mtl process semigroupoids transformers unix unix-compat ]; executableHaskellDepends = [ - base bytestring Cabal directory filepath mtl process - template-haskell temporary transformers unix unix-compat - utf8-string + base bytestring Cabal cabal-plan containers directory filepath mtl + pretty-show process template-haskell temporary text transformers + unix unix-compat utf8-string ]; executableToolDepends = [ cabal-install ]; testHaskellDepends = [ - base bytestring Cabal directory filepath ghc ghc-paths mtl process - template-haskell temporary transformers unix unix-compat - utf8-string + base bytestring Cabal cabal-plan containers directory filepath ghc + ghc-paths mtl pretty-show process template-haskell temporary text + transformers unix unix-compat utf8-string ]; testToolDepends = [ cabal-install ]; doCheck = false; description = "Simple interface to some of Cabal's configuration state, mainly used by ghc-mod"; - license = stdenv.lib.licenses.agpl3; + license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -41449,8 +41455,8 @@ self: { }: mkDerivation { pname = "cabal2nix"; - version = "2.10.2"; - sha256 = "15yvw4wnbsjir0rniwkwi3snyg6laynvacqcn66idcffx8pffy4g"; + version = "2.11"; + sha256 = "1wsxris61139j0bvrmzjmjqn186nmr5gvpddv098154d2w8hqn41"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -41667,22 +41673,6 @@ self: { }: mkDerivation { pname = "cache"; - version = "0.1.1.0"; - sha256 = "1zvq5dwckkngf6kzh04pa59kgxf44fx9kli0c7zaz4g9hf1nyx8l"; - libraryHaskellDepends = [ - base clock hashable stm transformers unordered-containers - ]; - testHaskellDepends = [ base clock hspec stm transformers ]; - description = "An in-memory key/value store with expiration support"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "cache_0_1_1_1" = callPackage - ({ mkDerivation, base, clock, hashable, hspec, stm, transformers - , unordered-containers - }: - mkDerivation { - pname = "cache"; version = "0.1.1.1"; sha256 = "04azn2g1rndfpf6zl3sachzz471hhxykxh4clrz0vl5da8frja8h"; libraryHaskellDepends = [ @@ -41691,7 +41681,6 @@ self: { testHaskellDepends = [ base clock hspec stm transformers ]; description = "An in-memory key/value store with expiration support"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cached-io" = callPackage @@ -42459,6 +42448,42 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "capnp" = callPackage + ({ mkDerivation, array, base, binary, bytes, bytestring, cereal + , containers, cpu, data-default, data-default-instances-vector + , deepseq, directory, dlist, exceptions, filepath, heredoc, HUnit + , mtl, pretty-show, primitive, process, process-extras, QuickCheck + , quickcheck-instances, quickcheck-io, reinterpret-cast, resourcet + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , text, transformers, utf8-string, vector, wl-pprint-text + }: + mkDerivation { + pname = "capnp"; + version = "0.1.0.0"; + sha256 = "14my9py7vjvxq51cd7sys8bxzyvwm2196qwjp2027daqbh7975vl"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base bytes bytestring cpu data-default + data-default-instances-vector exceptions mtl primitive + reinterpret-cast text transformers vector + ]; + executableHaskellDepends = [ + array base binary bytes bytestring cereal containers directory + dlist exceptions filepath mtl primitive reinterpret-cast text + transformers utf8-string vector wl-pprint-text + ]; + testHaskellDepends = [ + array base binary bytes bytestring data-default deepseq directory + exceptions heredoc HUnit mtl pretty-show primitive process + process-extras QuickCheck quickcheck-instances quickcheck-io + reinterpret-cast resourcet test-framework test-framework-hunit + test-framework-quickcheck2 text transformers vector + ]; + description = "Cap'n Proto for Haskell"; + license = stdenv.lib.licenses.mit; + }) {}; + "capped-list" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -46706,15 +46731,12 @@ self: { }) {}; "cli-setup" = callPackage - ({ mkDerivation, base, bytestring, directory, file-embed, process - }: + ({ mkDerivation, base, bytestring, directory, process }: mkDerivation { pname = "cli-setup"; - version = "0.2.0.4"; - sha256 = "0mkxm1kpbfsiv3khp8d96j9bcq7j4zbidd5ks89r69bxsmrp1z7i"; - libraryHaskellDepends = [ - base bytestring directory file-embed process - ]; + version = "0.2.0.5"; + sha256 = "08lqx6nvwbjydjrb2gnjis1bfq9xcrhqvilzmbkbzq17lxcaax2c"; + libraryHaskellDepends = [ base bytestring directory process ]; description = "Helper setup scripts for packaging command-line tools"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -47444,6 +47466,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cmark-gfm_0_1_5" = callPackage + ({ mkDerivation, base, blaze-html, bytestring, cheapskate + , criterion, discount, HUnit, markdown, sundown, text + }: + mkDerivation { + pname = "cmark-gfm"; + version = "0.1.5"; + sha256 = "13b0mqks5c1q989slgsa3ixr5vvkfyic4ynzgv00kgl5qrs7hqk7"; + libraryHaskellDepends = [ base bytestring text ]; + testHaskellDepends = [ base HUnit text ]; + benchmarkHaskellDepends = [ + base blaze-html cheapskate criterion discount markdown sundown text + ]; + description = "Fast, accurate GitHub Flavored Markdown parser and renderer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cmark-highlight" = callPackage ({ mkDerivation, base, blaze-html, cmark, highlighting-kate, text }: @@ -47490,8 +47530,8 @@ self: { }: mkDerivation { pname = "cmark-sections"; - version = "0.3.0"; - sha256 = "1zc7gcncmbq5ph17hlwxdikjvx6ccywkbs60523ybp7dagch4cfs"; + version = "0.3.0.1"; + sha256 = "0k8mv6fa2xzm3ppirhxr2l7vrq1jhb4mp20fdy2pliy4n93rfvlv"; libraryHaskellDepends = [ base base-prelude cmark containers microlens split text ]; @@ -48368,25 +48408,12 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "colorful-monoids"; - version = "0.2.1.1"; - sha256 = "0n1f9x6kyb3fcg1fbs80wrlm3c897l089ma4cxm47v1dcgczix8b"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base ]; - description = "Styled console text output using ANSI escape sequences"; - license = stdenv.lib.licenses.mit; - }) {}; - - "colorful-monoids_0_2_1_2" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "colorful-monoids"; version = "0.2.1.2"; sha256 = "0y35f21n8xh1xq8i0anbfx034m5wnwhp2ka47vvi3w0iw13zyhhb"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Styled console text output using ANSI escape sequences"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "colorize-haskell" = callPackage @@ -49608,6 +49635,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "composition-prelude_1_5_3_1" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "composition-prelude"; + version = "1.5.3.1"; + sha256 = "0dq4znxr3qy2avmv68lzw4xrbfccap19ri2hxmlkl6r8p2850k7d"; + libraryHaskellDepends = [ base ]; + description = "Higher-order function combinators"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "composition-tree" = callPackage ({ mkDerivation, base, doctest, QuickCheck }: mkDerivation { @@ -51026,6 +51065,42 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "configuration-tools_0_4_0" = callPackage + ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base + , base-unicode-symbols, base64-bytestring, bytestring, Cabal + , case-insensitive, connection, data-default, deepseq, directory + , dlist, enclosed-exceptions, filepath, http-client + , http-client-tls, http-types, monad-control, mtl, network-uri + , optparse-applicative, process, profunctors, semigroups, text, tls + , transformers, unordered-containers, wai, warp, warp-tls, x509 + , x509-system, x509-validation, yaml + }: + mkDerivation { + pname = "configuration-tools"; + version = "0.4.0"; + sha256 = "0bsxvbdhcgrhz9dm32bs5fb7ywdjb68xii74wdli4s0axs4q5dpx"; + setupHaskellDepends = [ + base bytestring Cabal directory filepath process + ]; + libraryHaskellDepends = [ + aeson ansi-wl-pprint attoparsec base base-unicode-symbols + base64-bytestring bytestring Cabal case-insensitive connection + data-default deepseq directory dlist enclosed-exceptions filepath + http-client http-client-tls http-types monad-control mtl + network-uri optparse-applicative process profunctors semigroups + text tls transformers unordered-containers x509 x509-system + x509-validation yaml + ]; + testHaskellDepends = [ + base base-unicode-symbols bytestring Cabal enclosed-exceptions + http-types monad-control mtl text transformers unordered-containers + wai warp warp-tls yaml + ]; + description = "Tools for specifying and parsing configurations"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "configurator" = callPackage ({ mkDerivation, attoparsec, base, bytestring, directory, filepath , hashable, HUnit, test-framework, test-framework-hunit, text @@ -51561,12 +51636,14 @@ self: { }) {}; "container" = callPackage - ({ mkDerivation, base, containers, convert, lens, text }: + ({ mkDerivation, base, containers, convert, lens, text, vector }: mkDerivation { pname = "container"; - version = "1.1.1"; - sha256 = "1kmi57bx9bahr2vc0b89rgy68r26vn0y531m53fs4avdcadnjl9q"; - libraryHaskellDepends = [ base containers convert lens text ]; + version = "1.1.2"; + sha256 = "1i2zf7hn5pg0dmgq93w0i2v3vjsdryn6895za6mzfpdk7vyxsxsj"; + libraryHaskellDepends = [ + base containers convert lens text vector + ]; description = "Containers abstraction and utilities"; license = stdenv.lib.licenses.asl20; }) {}; @@ -52602,6 +52679,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "corecursive-main" = callPackage + ({ mkDerivation, base, process, unix }: + mkDerivation { + pname = "corecursive-main"; + version = "0.1.0.0"; + sha256 = "14ckdqmy3r06kqhlp7mpapmx01369vcfmaj78gjywlqznchpw6dk"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base process ]; + executableHaskellDepends = [ base process unix ]; + testHaskellDepends = [ base process ]; + description = "Write your main like it can call itself back"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "corenlp-parser" = callPackage ({ mkDerivation, aeson, async, base, cryptonite, data-default , directory, process, raw-strings-qq, rocksdb, rocksdb-haskell @@ -52960,7 +53052,7 @@ self: { description = "high-level CPLEX interface"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {cplex = null;}; + }) {inherit (pkgs) cplex;}; "cplusplus-th" = callPackage ({ mkDerivation, base, bytestring, containers, process, QuickCheck @@ -53177,6 +53269,34 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "cql-io_1_0_1_1" = callPackage + ({ mkDerivation, async, auto-update, base, bytestring, containers + , cql, cryptohash, data-default-class, Decimal, exceptions + , hashable, HsOpenSSL, iproute, lens, monad-control, mtl + , mwc-random, network, raw-strings-qq, retry, semigroups, stm + , tasty, tasty-hunit, text, time, tinylog, transformers + , transformers-base, unordered-containers, uuid, vector + }: + mkDerivation { + pname = "cql-io"; + version = "1.0.1.1"; + sha256 = "1kdv00fv21s8vbb3dfgzlgsrr0xxl4p2h655ga3q5cg47by564xc"; + libraryHaskellDepends = [ + async auto-update base bytestring containers cql cryptohash + data-default-class exceptions hashable HsOpenSSL iproute lens + monad-control mtl mwc-random network retry semigroups stm text time + tinylog transformers transformers-base unordered-containers uuid + vector + ]; + testHaskellDepends = [ + base containers cql Decimal iproute mtl raw-strings-qq tasty + tasty-hunit text time tinylog uuid + ]; + description = "Cassandra CQL client"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cqrs" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -53577,23 +53697,23 @@ self: { "creatur" = callPackage ({ mkDerivation, array, base, binary, bytestring, cereal, cond , directory, exceptions, filepath, gray-extended, hdaemonize - , hsyslog, HUnit, MonadRandom, mtl, old-locale, process, QuickCheck - , random, split, temporary, test-framework, test-framework-hunit - , test-framework-quickcheck2, time, transformers, unix, zlib + , hsyslog, HUnit, MonadRandom, mtl, QuickCheck, random, split + , temporary, test-framework, test-framework-hunit + , test-framework-quickcheck2, time, transformers, unix }: mkDerivation { pname = "creatur"; - version = "5.9.23"; - sha256 = "04f66vjl1bpfgsf0j5dpz7wjvkvw22ia0f1d375mzhp5xmv4qw46"; + version = "5.9.25"; + sha256 = "00bhszbjz7in5z1bilb1m3ld5sdd6xk5s95h6cw882qz0i1dmlp5"; libraryHaskellDepends = [ array base binary bytestring cereal cond directory exceptions - filepath gray-extended hdaemonize hsyslog MonadRandom mtl - old-locale process random split time transformers unix zlib + filepath gray-extended hdaemonize hsyslog MonadRandom mtl random + split time transformers unix ]; testHaskellDepends = [ - array base binary cereal directory filepath hsyslog HUnit - MonadRandom mtl QuickCheck temporary test-framework - test-framework-hunit test-framework-quickcheck2 + base cereal directory filepath HUnit MonadRandom mtl QuickCheck + temporary test-framework test-framework-hunit + test-framework-quickcheck2 ]; description = "Framework for artificial life experiments"; license = stdenv.lib.licenses.bsd3; @@ -54840,6 +54960,38 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "csg_0_1_0_5" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers + , criterion, doctest, doctest-driver-gen, gloss, gloss-raster + , QuickCheck, simple-vec3, strict, system-filepath, tasty + , tasty-hunit, tasty-quickcheck, transformers, turtle, vector + }: + mkDerivation { + pname = "csg"; + version = "0.1.0.5"; + sha256 = "12zwf2xiqiq4snwqhwvk1k3fl1bzlfbcd2vc2hsnv6v61ci6shq9"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base bytestring containers QuickCheck simple-vec3 strict + transformers + ]; + executableHaskellDepends = [ + base gloss gloss-raster QuickCheck simple-vec3 strict + system-filepath turtle + ]; + testHaskellDepends = [ + base bytestring doctest doctest-driver-gen simple-vec3 tasty + tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + base criterion simple-vec3 strict vector + ]; + description = "Analytical CSG (Constructive Solid Geometry) library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "csound-catalog" = callPackage ({ mkDerivation, base, csound-expression, csound-sampler , sharc-timbre, transformers @@ -59185,6 +59337,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "debian-build_0_10_1_2" = callPackage + ({ mkDerivation, base, directory, filepath, process, split + , transformers + }: + mkDerivation { + pname = "debian-build"; + version = "0.10.1.2"; + sha256 = "0h8nxk9pir6ic65vh5y29jnlz7jrnq8inqg22h7nvlphk7qbblqw"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base directory filepath process split transformers + ]; + executableHaskellDepends = [ base filepath transformers ]; + description = "Debian package build sequence tools"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "debug" = callPackage ({ mkDerivation, aeson, base, bytestring, clock, containers , deepseq, directory, extra, filepath, ghc-prim, hashable, Hoed @@ -60865,6 +61036,8 @@ self: { pname = "dhall-json"; version = "1.2.2"; sha256 = "13vap0x53c9i2cyggh3riq8fza46c2d9rqmbxmsjvsawxz2jfm9d"; + revision = "1"; + editedCabalFile = "0vkn5kivqjl640f4ifjgy3mgmlqhz8ir48n04lklr4mra7z95qw2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -61173,8 +61346,8 @@ self: { }: mkDerivation { pname = "diagrams-braille"; - version = "0.1.0.1"; - sha256 = "11xq2mx4mmg12cyhs2r7brjn00jy7rh7rwh15gr7piynmx723xhl"; + version = "0.1.0.2"; + sha256 = "1jrhc8k0n9jabhg6rz22js9k3nj3v6r6klxskiksf6ajbqbzqg69"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -63102,6 +63275,8 @@ self: { pname = "distributed-process"; version = "0.7.4"; sha256 = "01ck0vhy8rrilyph6ijpxdmh9jijfbx2ri7k2hmacbblwj4bzafq"; + revision = "1"; + editedCabalFile = "02b499kz94v9ls6l95q9wxh0f56nzfyq7rslq3jf6xp94ydcnhwy"; libraryHaskellDepends = [ base binary bytestring containers data-accessor deepseq distributed-static exceptions hashable mtl network-transport random @@ -63834,6 +64009,8 @@ self: { pname = "djinn-lib"; version = "0.0.1.3"; sha256 = "0r1kby67flpyizj117r5q0q3sj61csqxd44za5r9292hj3cacd9v"; + revision = "1"; + editedCabalFile = "0zz4q631wpxdm4h499j0m1kin4n1ahnwzb0x2jh6vd463i89xlbk"; libraryHaskellDepends = [ base containers mtl pretty ]; description = "Generate Haskell code from a type. Library extracted from djinn package."; license = stdenv.lib.licenses.bsd3; @@ -68014,6 +68191,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "emacs-module" = callPackage + ({ mkDerivation, base, bytestring, deepseq, exceptions + , monad-control, mtl, prettyprinter, resourcet + , safe-exceptions-checked, template-haskell, text + , transformers-base, vector, void + }: + mkDerivation { + pname = "emacs-module"; + version = "0.1.1"; + sha256 = "1m6rcvhgdhlzzq86b4qhanbmymwl87r705jx9ih8s89fvsfgvq0y"; + libraryHaskellDepends = [ + base bytestring deepseq exceptions monad-control mtl prettyprinter + resourcet safe-exceptions-checked template-haskell text + transformers-base vector void + ]; + description = "Utilities to write Emacs dynamic modules"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "email" = callPackage ({ mkDerivation, array, base, bytestring, encoding, HaskellNet , hsemail, old-locale, old-time, parsec, process, time @@ -68217,8 +68413,8 @@ self: { }: mkDerivation { pname = "emd"; - version = "0.1.3.0"; - sha256 = "0p8ww7bxdrv5xpy9gslzp1c25iqamsdy0rfm4y2n0p71l7w960rw"; + version = "0.1.4.0"; + sha256 = "0mrkyy6fn4jsy6h4acqjkkq1bvp7c8yjpw5zyk9ycnk2izb7a9zw"; libraryHaskellDepends = [ base binary containers data-default-class finite-typelits ghc-typelits-knownnat ghc-typelits-natnormalise transformers @@ -69340,33 +69536,6 @@ self: { }: mkDerivation { pname = "ersatz"; - version = "0.4.3"; - sha256 = "0c0yrh342682k47phy5xwc0gya4h9d07j53dakkwhnx0r4p6gjfn"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - array attoparsec base bytestring containers data-default lens mtl - process semigroups temporary transformers unordered-containers - ]; - executableHaskellDepends = [ - array base containers lens mtl parsec semigroups - ]; - testHaskellDepends = [ array base directory doctest filepath mtl ]; - description = "A monad for expressing SAT or QSAT problems using observable sharing"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "ersatz_0_4_4" = callPackage - ({ mkDerivation, array, attoparsec, base, bytestring, Cabal - , cabal-doctest, containers, data-default, directory, doctest - , filepath, lens, mtl, parsec, process, semigroups, temporary - , transformers, unordered-containers - }: - mkDerivation { - pname = "ersatz"; version = "0.4.4"; sha256 = "06d0fc5s5yxk1q54fsbnnhmvf25m5g86fqdzb42f0ckc0h3sbp22"; isLibrary = true; @@ -69695,8 +69864,8 @@ self: { }: mkDerivation { pname = "eternity"; - version = "0.1.2"; - sha256 = "0rjjdhr9cnpgm55mjvhlkgdvqvi5dmmzrr4vj0jmn9pg7zra34y6"; + version = "0.1.3"; + sha256 = "02kwd0zad4p762pk75784bbiv6klhy47g64lpxg8kscfryxrd3ma"; libraryHaskellDepends = [ attoparsec base cereal directory foldl potoki potoki-cereal text ]; @@ -69716,8 +69885,8 @@ self: { }: mkDerivation { pname = "eternity-timestamped"; - version = "0.4"; - sha256 = "150xqf7kg4131qxnbjhly4ryy251gni1z6vyqcsy477hig2yv5gr"; + version = "0.4.1"; + sha256 = "09s26v4gi6w5am0nn7nwqkja7g74jddjfzsqjq2bbafng4dxnmwy"; libraryHaskellDepends = [ attoparsec base cereal directory eternity generic-random hashable potoki QuickCheck text time timestamp @@ -71683,6 +71852,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "extrapolate_0_3_2" = callPackage + ({ mkDerivation, base, leancheck, speculate, template-haskell }: + mkDerivation { + pname = "extrapolate"; + version = "0.3.2"; + sha256 = "1scfcjqz1q9pv37rvygbpdwx8j22469f5p2vf5ay68hd62d592gj"; + libraryHaskellDepends = [ + base leancheck speculate template-haskell + ]; + testHaskellDepends = [ base leancheck speculate ]; + description = "generalize counter-examples of test properties"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ez-couch" = callPackage ({ mkDerivation, aeson, attoparsec, attoparsec-conduit, base , blaze-builder, bytestring, classy-prelude, classy-prelude-conduit @@ -74408,8 +74592,8 @@ self: { }: mkDerivation { pname = "fitspec"; - version = "0.4.5"; - sha256 = "0s4rifky7rswajc5z7a0kmmqyws3q6ryqca2h7riyh7xzkbxqfvk"; + version = "0.4.7"; + sha256 = "0ski62ndgl5ay9kbgx2v590pvfsn0wn0cx9h70fhvcrlsam01p5q"; libraryHaskellDepends = [ base cmdargs leancheck template-haskell ]; @@ -75090,6 +75274,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "flick-duration" = callPackage + ({ mkDerivation, base, clock, hspec, QuickCheck }: + mkDerivation { + pname = "flick-duration"; + version = "1.0.0"; + sha256 = "0lhfbdhgz1m5cw4d5bkzb0igk5d240k4zrxdyd7kw64qr8pvvkfy"; + libraryHaskellDepends = [ base clock ]; + testHaskellDepends = [ base clock hspec QuickCheck ]; + description = "work with durations of time using the Flick as the smallest unit"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "flickr" = callPackage ({ mkDerivation, base, filepath, HTTP, mime, network, random , utf8-string, xhtml, xml @@ -80351,6 +80547,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "genvalidity-bytestring_0_3_0_0" = callPackage + ({ mkDerivation, base, bytestring, deepseq, genvalidity + , genvalidity-hspec, hspec, QuickCheck, validity + , validity-bytestring + }: + mkDerivation { + pname = "genvalidity-bytestring"; + version = "0.3.0.0"; + sha256 = "1jmy41mqjh3zj512fjikn6vqjvx81cdvi9llc9f0yp2h2rkmw4hf"; + libraryHaskellDepends = [ + base bytestring genvalidity QuickCheck validity validity-bytestring + ]; + testHaskellDepends = [ + base bytestring deepseq genvalidity genvalidity-hspec hspec + QuickCheck + ]; + description = "GenValidity support for ByteString"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "genvalidity-containers" = callPackage ({ mkDerivation, base, containers, genvalidity, genvalidity-hspec , hspec, QuickCheck, validity, validity-containers @@ -80468,8 +80685,8 @@ self: { }: mkDerivation { pname = "genvalidity-hspec-optics"; - version = "0.0.0.0"; - sha256 = "0nx1qfi6dq0vikpbab4spkhmpm7lyvbvg5k7ni9lh71ijqjynyv8"; + version = "0.1.0.0"; + sha256 = "08p7hv1wr6df8sng906rvys0998nk8j331r2q5v2abw2rg2609m5"; libraryHaskellDepends = [ base genvalidity genvalidity-hspec hspec microlens QuickCheck ]; @@ -80575,6 +80792,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "genvalidity-text_0_5_1_0" = callPackage + ({ mkDerivation, array, base, genvalidity, genvalidity-hspec, hspec + , QuickCheck, text, validity, validity-text + }: + mkDerivation { + pname = "genvalidity-text"; + version = "0.5.1.0"; + sha256 = "0j7fx2zzv6ljqk87148h1rq3yg6vvy0dsl7kfl3f2p6ghnz7wggg"; + libraryHaskellDepends = [ + array base genvalidity QuickCheck text validity validity-text + ]; + testHaskellDepends = [ + base genvalidity genvalidity-hspec hspec QuickCheck text + ]; + description = "GenValidity support for Text"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "genvalidity-time" = callPackage ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec , QuickCheck, time, validity-time @@ -81952,17 +82188,18 @@ self: { "ghc-typelits-presburger" = callPackage ({ mkDerivation, base, containers, equational-reasoning, ghc - , ghc-tcplugins-extra, pretty, reflection, singletons + , ghc-tcplugins-extra, mtl, pretty, reflection, singletons, syb + , transformers }: mkDerivation { pname = "ghc-typelits-presburger"; - version = "0.2.0.3"; - sha256 = "15lywyh7sdfgqhz0bpi2hap1ix2s8dsfvn7vwzsci8l0w5vl5bn2"; + version = "0.2.0.5"; + sha256 = "03n6ddvn6p1nk6yw141zdw60iqda7k3sbaacc9s04mmnmshvia1n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers equational-reasoning ghc ghc-tcplugins-extra pretty - reflection singletons + base containers equational-reasoning ghc ghc-tcplugins-extra mtl + pretty reflection singletons syb transformers ]; description = "Presburger Arithmetic Solver for GHC Type-level natural numbers"; license = stdenv.lib.licenses.bsd3; @@ -83067,24 +83304,24 @@ self: { "gi-vte" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk, gi-pango, haskell-gi - , haskell-gi-base, haskell-gi-overloading, text, transformers, vte + , haskell-gi-base, haskell-gi-overloading, text, transformers + , vte_291 }: mkDerivation { pname = "gi-vte"; - version = "2.91.18"; - sha256 = "0rixrkw0k2vz59y20lsd8zw54n7l069mij0n76dnmah2bjjk1r7w"; + version = "2.91.19"; + sha256 = "1hnhidjr7jh7i826lj6kdn264i592sfl5kwvymnpiycmcb37dd4y"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-atk gi-gdk gi-gio gi-glib gi-gobject gi-gtk gi-pango haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; - libraryPkgconfigDepends = [ vte ]; + libraryPkgconfigDepends = [ vte_291 ]; doHaddock = false; description = "Vte bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome2) vte;}; + }) {vte_291 = pkgs.gnome3.vte;}; "gi-webkit" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk @@ -83371,19 +83608,19 @@ self: { }) {}; "git" = callPackage - ({ mkDerivation, base, byteable, bytedump, bytestring, containers - , cryptonite, hourglass, memory, patience, random, system-fileio - , system-filepath, tasty, tasty-quickcheck, unix-compat - , utf8-string, vector, zlib, zlib-bindings + ({ mkDerivation, base, basement, byteable, bytedump, bytestring + , containers, cryptonite, hourglass, memory, patience, random + , system-fileio, system-filepath, tasty, tasty-quickcheck + , unix-compat, utf8-string, vector, zlib, zlib-bindings }: mkDerivation { pname = "git"; - version = "0.2.1"; - sha256 = "0j0hzlxb58g0q8fibg09ppag6bnhk7ym3nyzmqpwjbr6hxkdidsz"; + version = "0.2.2"; + sha256 = "18sn3rvmrqw8xy7xaqpv82inqj981z79sm6h1aw4jvvzsf6llzwa"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base byteable bytestring containers cryptonite hourglass memory - patience random system-fileio system-filepath unix-compat + base basement byteable bytestring containers cryptonite hourglass + memory patience random system-fileio system-filepath unix-compat utf8-string vector zlib zlib-bindings ]; testHaskellDepends = [ @@ -84834,15 +85071,16 @@ self: { }) {}; "gll" = callPackage - ({ mkDerivation, array, base, containers, pretty, regex-applicative - , text, TypeCompose + ({ mkDerivation, array, base, containers, pretty, random-strings + , regex-applicative, text, time, TypeCompose }: mkDerivation { pname = "gll"; - version = "0.4.0.5"; - sha256 = "09z7i4h5zwgyh3gg5w0l6p0ch1lhzmsnbmk1yfbc9b21gbxna5js"; + version = "0.4.0.11"; + sha256 = "0vxi750q11q1ggf0s2yyjpr47fmpfvmqm5mjdh6i4z6bf5vlhfd8"; libraryHaskellDepends = [ - array base containers pretty regex-applicative text TypeCompose + array base containers pretty random-strings regex-applicative text + time TypeCompose ]; description = "GLL parser with simple combinator interface"; license = stdenv.lib.licenses.bsd3; @@ -84985,6 +85223,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "gloss_1_13_0_1" = callPackage + ({ mkDerivation, base, bmp, bytestring, containers, ghc-prim + , gloss-rendering, GLUT, OpenGL + }: + mkDerivation { + pname = "gloss"; + version = "1.13.0.1"; + sha256 = "1f19vlx32nkgply25p83n7498lwdpshiibqg7nzkhb2kv7n0y71q"; + libraryHaskellDepends = [ + base bmp bytestring containers ghc-prim gloss-rendering GLUT OpenGL + ]; + description = "Painless 2D vector graphics, animations and simulations"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gloss-accelerate" = callPackage ({ mkDerivation, accelerate, base, gloss, gloss-rendering }: mkDerivation { @@ -85000,8 +85254,8 @@ self: { ({ mkDerivation, base, containers, ghc-prim, gloss }: mkDerivation { pname = "gloss-algorithms"; - version = "1.12.0.0"; - sha256 = "00vji2mlakawarqsywgvl10yk32jmlxcj2d058a6psjqb0pkq0wb"; + version = "1.13.0.1"; + sha256 = "0vbqcsvyicb409a60fab0c0shixny4l5z2l15n8hrrr1dsvisf95"; libraryHaskellDepends = [ base containers ghc-prim gloss ]; description = "Data structures and algorithms for working with 2D graphics"; license = stdenv.lib.licenses.mit; @@ -85040,8 +85294,8 @@ self: { }: mkDerivation { pname = "gloss-examples"; - version = "1.12.0.0"; - sha256 = "1iimmphkq89h4k8iny52kgz1a0cq6lp8dzr0lkj4j5qnfaj65lhl"; + version = "1.13.0.1"; + sha256 = "071b75qlppjff9q7b8312wb382gry4dnz1b8p84sb8lxmxr2848w"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -85097,6 +85351,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "gloss-raster_1_13_0_1" = callPackage + ({ mkDerivation, base, containers, ghc-prim, gloss, gloss-rendering + , repa + }: + mkDerivation { + pname = "gloss-raster"; + version = "1.13.0.1"; + sha256 = "1dyj8r0b3gal54dgyq9jb4s5sqjhp152q63r8nkpzjh1c9d3cp9x"; + libraryHaskellDepends = [ + base containers ghc-prim gloss gloss-rendering repa + ]; + description = "Parallel rendering of raster images"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gloss-raster-accelerate" = callPackage ({ mkDerivation, accelerate, base, colour-accelerate, gloss , gloss-accelerate @@ -85128,6 +85398,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "gloss-rendering_1_13_0_2" = callPackage + ({ mkDerivation, base, bmp, bytestring, containers, GLUT, OpenGL }: + mkDerivation { + pname = "gloss-rendering"; + version = "1.13.0.2"; + sha256 = "0ivzijqkxn0r4iqk0rmq0bzdzzgv9a8fgwy3gwnfibmvhhm9jfq0"; + libraryHaskellDepends = [ + base bmp bytestring containers GLUT OpenGL + ]; + description = "Gloss picture data types and rendering functions"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gloss-sodium" = callPackage ({ mkDerivation, base, gloss, sodium }: mkDerivation { @@ -88681,27 +88965,6 @@ self: { }: mkDerivation { pname = "greskell"; - version = "0.2.0.3"; - sha256 = "13nqmpga35ri45rvssfj6mhzafkgdbg5077s8m847ny1sz10xg0x"; - libraryHaskellDepends = [ - aeson base greskell-core semigroups text transformers - unordered-containers vector - ]; - testHaskellDepends = [ - aeson base bytestring doctest doctest-discover greskell-core hint - hspec text unordered-containers - ]; - description = "Haskell binding for Gremlin graph query language"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "greskell_0_2_1_0" = callPackage - ({ mkDerivation, aeson, base, bytestring, doctest, doctest-discover - , greskell-core, hint, hspec, semigroups, text, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "greskell"; version = "0.2.1.0"; sha256 = "03a3rgrzmhc3rh8hwz2pmq3w2q6yf8ypcfzbmqm8cwkix5xx1h8z"; libraryHaskellDepends = [ @@ -88714,7 +88977,6 @@ self: { ]; description = "Haskell binding for Gremlin graph query language"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "greskell-core" = callPackage @@ -88745,28 +89007,6 @@ self: { }: mkDerivation { pname = "greskell-websocket"; - version = "0.1.0.0"; - sha256 = "171pr07dlsvkmj0jqr60dc6a4g8sfqaz0hvwwfagzklg31m961mq"; - libraryHaskellDepends = [ - aeson async base base64-bytestring bytestring greskell-core - hashtables safe-exceptions stm text unordered-containers uuid - vector websockets - ]; - testHaskellDepends = [ - aeson base bytestring greskell-core hspec unordered-containers uuid - vector - ]; - description = "Haskell client for Gremlin Server using WebSocket serializer"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "greskell-websocket_0_1_1_0" = callPackage - ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring - , greskell-core, hashtables, hspec, safe-exceptions, stm, text - , unordered-containers, uuid, vector, websockets - }: - mkDerivation { - pname = "greskell-websocket"; version = "0.1.1.0"; sha256 = "1c3n222ihaqb2gls0c9f4zc8pgbwgan7j1n4h5p7xhp7csg34p13"; libraryHaskellDepends = [ @@ -88780,7 +89020,6 @@ self: { ]; description = "Haskell client for Gremlin Server using WebSocket serializer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "grid" = callPackage @@ -91781,8 +92020,8 @@ self: { }: mkDerivation { pname = "hadolint"; - version = "1.11.1"; - sha256 = "07mgv88whga78x6sa7c1iw8l6k6p5yb0b38wpvy6cs3rzk4x2dx2"; + version = "1.11.2"; + sha256 = "0xfhghpy0jmgmlyzc6plcg3nq26afbwp36bjjdc156rcwzsm9qyx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -93165,8 +93404,34 @@ self: { pname = "hapistrano"; version = "0.3.5.9"; sha256 = "1jyzjj9m6vj9rlpvadaxnfxxl8ynrn8jp9xzyp3kwkzyv6cdi1ha"; - revision = "1"; - editedCabalFile = "0g48v24byay41jxhyszy9j00s77r9gsfdh3x6dvwv5shb558w95k"; + revision = "2"; + editedCabalFile = "1gfs133dm21jwv48v4wlr1dbr993fz49b9lviaahkymlv1d3j8gd"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base filepath formatting gitrev mtl path process time transformers + ]; + executableHaskellDepends = [ + aeson async base formatting gitrev optparse-applicative path + path-io stm yaml + ]; + testHaskellDepends = [ + base directory filepath hspec mtl path path-io process temporary + ]; + description = "A deployment library for Haskell applications"; + license = stdenv.lib.licenses.mit; + }) {}; + + "hapistrano_0_3_5_10" = callPackage + ({ mkDerivation, aeson, async, base, directory, filepath + , formatting, gitrev, hspec, mtl, optparse-applicative, path + , path-io, process, stm, temporary, time, transformers, yaml + }: + mkDerivation { + pname = "hapistrano"; + version = "0.3.5.10"; + sha256 = "1pkgbcpddk5ik0b1b684nnvwil68kla1w7660c1751dyhhh78ikw"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -93182,6 +93447,7 @@ self: { ]; description = "A deployment library for Haskell applications"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "happindicator" = callPackage @@ -95430,33 +95696,6 @@ self: { }: mkDerivation { pname = "haskell-gi"; - version = "0.21.3"; - sha256 = "09smnzg6kqjyb7m281k8w3y6vabws41snp9wkh8449s0ya3ndbn0"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - attoparsec base bytestring Cabal containers directory filepath - haskell-gi-base mtl pretty-show process regex-tdfa safe text - transformers xdg-basedir xml-conduit - ]; - libraryPkgconfigDepends = [ glib gobjectIntrospection ]; - executableHaskellDepends = [ - base containers directory filepath haskell-gi-base pretty-show text - ]; - testHaskellDepends = [ base doctest process ]; - description = "Generate Haskell bindings for GObject Introspection capable libraries"; - license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs) glib; - inherit (pkgs.gnome3) gobjectIntrospection;}; - - "haskell-gi_0_21_4" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, Cabal, containers - , directory, doctest, filepath, glib, gobjectIntrospection - , haskell-gi-base, mtl, pretty-show, process, regex-tdfa, safe - , text, transformers, xdg-basedir, xml-conduit - }: - mkDerivation { - pname = "haskell-gi"; version = "0.21.4"; sha256 = "0rjb7pg8v0kjx115n0bksw705g6yg9vn8krxrakhvds5hvmb9caw"; isLibrary = true; @@ -95473,7 +95712,6 @@ self: { testHaskellDepends = [ base doctest process ]; description = "Generate Haskell bindings for GObject Introspection capable libraries"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) glib; inherit (pkgs.gnome3) gobjectIntrospection;}; @@ -99813,6 +100051,8 @@ self: { pname = "hdocs"; version = "0.5.3.0"; sha256 = "0gkv4xy7jr2ic22gn5fpj3vd6avgd1xqblv96gg1m0fhfsj92y5h"; + revision = "1"; + editedCabalFile = "0dy2jamwd0jxai8hcfq506xqczi0hn9c8p7z4dbmq62d29fm79yb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -100236,6 +100476,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hedis_0_10_4" = callPackage + ({ mkDerivation, async, base, bytestring, bytestring-lexing + , deepseq, doctest, errors, HTTP, HUnit, mtl, network, network-uri + , resource-pool, scanner, slave-thread, stm, test-framework + , test-framework-hunit, text, time, tls, unordered-containers + , vector + }: + mkDerivation { + pname = "hedis"; + version = "0.10.4"; + sha256 = "1xsa6wgakmjhwz9s9fybbwsx6gxy6630bqyrai0sb4vmd9lnbxfx"; + libraryHaskellDepends = [ + async base bytestring bytestring-lexing deepseq errors HTTP mtl + network network-uri resource-pool scanner stm text time tls + unordered-containers vector + ]; + testHaskellDepends = [ + async base bytestring doctest HUnit mtl slave-thread stm + test-framework test-framework-hunit text time + ]; + benchmarkHaskellDepends = [ base mtl time ]; + description = "Client library for the Redis datastore: supports full command set, pipelining"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hedis-config" = callPackage ({ mkDerivation, aeson, base, bytestring, hedis, scientific, text , time @@ -101667,8 +101933,8 @@ self: { }: mkDerivation { pname = "hfmt"; - version = "0.2.2"; - sha256 = "0xjh952djxb490nig2aj9y5461ka33d3qdlrfkxb7iz7pqmmr6fs"; + version = "0.2.3.1"; + sha256 = "178nr4k4jgl3xxlvds7cqg18qfmsak1zhwlkks6syviypbg5wb07"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -101716,6 +101982,8 @@ self: { pname = "hformat"; version = "0.3.3.0"; sha256 = "0g9kjfssaksjj3cp0qiwk7v85yy3sb2ryhjnlrdznhm3mnkvp35j"; + revision = "1"; + editedCabalFile = "00924yrjyzy3v5l13f03v1qw45ra2600f98r9bgswjqrrn87m79i"; libraryHaskellDepends = [ ansi-terminal base base-unicode-symbols text ]; @@ -102246,20 +102514,19 @@ self: { "hid-examples" = callPackage ({ mkDerivation, base, blaze-html, bytestring, cassava, Chart - , Chart-diagrams, fmt, hint, optparse-applicative, safe, text, time + , Chart-diagrams, extra, fmt, hint, mtl, optparse-applicative + , random, safe, text, time }: mkDerivation { pname = "hid-examples"; - version = "0.1.0.0"; - sha256 = "0x8i9532w5gxlajx4pw7n31qf6hbqf5335lsqwvwvk12igww7mg8"; - revision = "1"; - editedCabalFile = "0ifcgqm81vh7qidpxzgkx5g3wcyif0zgclz7svsnvw5vvpij350p"; + version = "0.2"; + sha256 = "1rp6v40z8i2slnsacw42adkqp98bg8fml573lpz9mz7ipn05gi9x"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ - base blaze-html bytestring cassava Chart Chart-diagrams fmt hint - optparse-applicative safe text time + base blaze-html bytestring cassava Chart Chart-diagrams extra fmt + hint mtl optparse-applicative random safe text time ]; description = "Examples to accompany the book \"Haskell in Depth\""; license = stdenv.lib.licenses.bsd3; @@ -103808,8 +104075,8 @@ self: { }: mkDerivation { pname = "hledger-iadd"; - version = "1.3.5"; - sha256 = "0mp8jhvf48173ixypqfm9vmsb2bsykfygxrxxfjpry6m5xqfh09c"; + version = "1.3.6"; + sha256 = "04gy5pvbcgkr3jg1a2dav3kcd7ih46knn0d39l8670bmwhx3y5br"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -106139,8 +106406,8 @@ self: { ({ mkDerivation, base, Cabal, containers, directory, filepath }: mkDerivation { pname = "hoppy-runtime"; - version = "0.5.0"; - sha256 = "089dqnnczknir9q9mwdh5z9jzb5wsw4bmqqi8spibxk8lna4cvqs"; + version = "0.5.1"; + sha256 = "0gh6kjfy9wcdppbq9ml5i2iz7bi12pbvnzqhj25sg9dy77iwc7cp"; libraryHaskellDepends = [ base Cabal containers directory filepath ]; @@ -106416,6 +106683,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hourglass_0_2_12" = callPackage + ({ mkDerivation, base, bytestring, deepseq, gauge, mtl, old-locale + , tasty, tasty-hunit, tasty-quickcheck, time + }: + mkDerivation { + pname = "hourglass"; + version = "0.2.12"; + sha256 = "0jnay5j13vpz6i1rkaj3j0d9v8jfpri499xn3l7wd01f81f5ncs4"; + libraryHaskellDepends = [ base deepseq ]; + testHaskellDepends = [ + base deepseq mtl old-locale tasty tasty-hunit tasty-quickcheck time + ]; + benchmarkHaskellDepends = [ + base bytestring deepseq gauge mtl old-locale time + ]; + description = "simple performant time related library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hourglass-fuzzy-parsing" = callPackage ({ mkDerivation, base, hourglass, parsec }: mkDerivation { @@ -107439,8 +107726,8 @@ self: { }: mkDerivation { pname = "hriemann"; - version = "0.3.2.0"; - sha256 = "1b0vyxkyz8qqzvdrb0nyni6x490rxqh5zlydjrn9pbqc6npz7m8p"; + version = "0.3.3.0"; + sha256 = "0apji56rwh1did67z9z0bcy5r9k2m6rrfkiv18rp4mbd863skg25"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -112516,16 +112803,16 @@ self: { "http-conduit-downloader" = callPackage ({ mkDerivation, base, bytestring, conduit, connection , data-default, HsOpenSSL, http-client, http-conduit, http-types - , lifted-base, mtl, network, network-uri, resourcet, time, zlib + , mtl, network, network-uri, resourcet, text, time, zlib }: mkDerivation { pname = "http-conduit-downloader"; - version = "1.0.30"; - sha256 = "1m0wwi34fcsppn8sj46jaaxdpdf3jzl1bhf9q1gxg9p1r9xgvv5a"; + version = "1.0.31"; + sha256 = "1ng41s2y176223blzxdywlv7hmbdh7i5nwr63la7jfnd9rcdr83c"; libraryHaskellDepends = [ base bytestring conduit connection data-default HsOpenSSL - http-client http-conduit http-types lifted-base mtl network - network-uri resourcet time zlib + http-client http-conduit http-types mtl network network-uri + resourcet text time zlib ]; description = "HTTP downloader tailored for web-crawler needs"; license = stdenv.lib.licenses.bsd3; @@ -112620,6 +112907,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "http-io-streams" = callPackage + ({ mkDerivation, attoparsec, base, base64-bytestring, blaze-builder + , bytestring, case-insensitive, containers, directory, HsOpenSSL + , io-streams, mtl, network, network-uri, openssl-streams, text + , transformers + }: + mkDerivation { + pname = "http-io-streams"; + version = "0.1.0.0"; + sha256 = "0fxz7p5n7gd99xjq9rwm6x74qzpfp4wdmhj1hm08c7hkinizdvgv"; + libraryHaskellDepends = [ + attoparsec base base64-bytestring blaze-builder bytestring + case-insensitive containers directory HsOpenSSL io-streams mtl + network network-uri openssl-streams text transformers + ]; + description = "HTTP client based on io-streams"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "http-kinder" = callPackage ({ mkDerivation, aeson, base, bytestring, case-insensitive , containers, http-media, http-types, HUnit, QuickCheck, singletons @@ -113102,15 +113408,16 @@ self: { "http2-client-grpc" = callPackage ({ mkDerivation, base, binary, bytestring, data-default-class - , http2, http2-client, proto-lens, proto-lens-protoc, text, zlib + , http2, http2-client, http2-grpc-types, proto-lens + , proto-lens-protoc, text, zlib }: mkDerivation { pname = "http2-client-grpc"; - version = "0.1.0.0"; - sha256 = "11ckgp56k6ypk4smc91909gs8cvlbqji8blsr48k8fbclhi5cqwv"; + version = "0.2.0.0"; + sha256 = "1bg4p6fy09mbi5r355vvrbmc0al7mcwbr3mx2lpkjkzm9cg53x2z"; libraryHaskellDepends = [ base binary bytestring data-default-class http2 http2-client - proto-lens proto-lens-protoc text zlib + http2-grpc-types proto-lens proto-lens-protoc text zlib ]; testHaskellDepends = [ base ]; description = "Implement gRPC-over-HTTP2 clients"; @@ -113118,6 +113425,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "http2-grpc-types" = callPackage + ({ mkDerivation, base, binary, bytestring, proto-lens, zlib }: + mkDerivation { + pname = "http2-grpc-types"; + version = "0.1.0.0"; + sha256 = "0qj9bffznw8fawalj6hlvx8r0sj9smgks88wdqjq5ran02b6i2dl"; + libraryHaskellDepends = [ base binary bytestring proto-lens zlib ]; + description = "Types for gRPC over HTTP2 common for client and servers"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "httpd-shed" = callPackage ({ mkDerivation, base, network, network-uri }: mkDerivation { @@ -113538,17 +113856,17 @@ self: { }) {}; "hunspell-hs" = callPackage - ({ mkDerivation, base, criterion, hspec, hunspell, stm }: + ({ mkDerivation, base, criterion, deepseq, hspec, hunspell, stm }: mkDerivation { pname = "hunspell-hs"; - version = "0.1.0.0"; - sha256 = "0jiqgs4akny8kcpl3hdkj08hyknw2p0z96dci6lwq2fv5qprj77i"; + version = "0.2.0.0"; + sha256 = "0wifkv8i83lhi348l1rkjqidpr81zss02zn6brxlva938ir2ncp8"; libraryHaskellDepends = [ base stm ]; - librarySystemDepends = [ hunspell ]; + libraryPkgconfigDepends = [ hunspell ]; testHaskellDepends = [ base hspec stm ]; - testSystemDepends = [ hunspell ]; - benchmarkHaskellDepends = [ base criterion stm ]; - benchmarkSystemDepends = [ hunspell ]; + testPkgconfigDepends = [ hunspell ]; + benchmarkHaskellDepends = [ base criterion deepseq stm ]; + benchmarkPkgconfigDepends = [ hunspell ]; description = "Hunspell thread-safe FFI bindings for spell checking"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -113855,27 +114173,6 @@ self: { }: mkDerivation { pname = "hw-bits"; - version = "0.7.0.2"; - sha256 = "1s0as4d1a80hzx47zpa7qjiwdbgwzg1j4lgqd0grri5scq0iwqiq"; - revision = "1"; - editedCabalFile = "1gvv5ryx1lrgb3hk362fkqz98rggdxfmjp7fy0id7mqvdz6lk2av"; - libraryHaskellDepends = [ - base bytestring hw-int hw-prim hw-string-parse safe vector - ]; - testHaskellDepends = [ - base bytestring hspec hw-prim QuickCheck vector - ]; - benchmarkHaskellDepends = [ base criterion hw-prim vector ]; - description = "Bit manipulation"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hw-bits_0_7_0_3" = callPackage - ({ mkDerivation, base, bytestring, criterion, hspec, hw-int - , hw-prim, hw-string-parse, QuickCheck, safe, vector - }: - mkDerivation { - pname = "hw-bits"; version = "0.7.0.3"; sha256 = "1z6h8ljws92jdchzbkv7siig859b21ck04xnp2fka2j8p97d437w"; libraryHaskellDepends = [ @@ -113887,7 +114184,6 @@ self: { benchmarkHaskellDepends = [ base criterion hw-prim vector ]; description = "Bit manipulation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-conduit" = callPackage @@ -114085,6 +114381,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hw-ip_0_2_0_2" = callPackage + ({ mkDerivation, attoparsec, base, generic-lens, hedgehog, hspec + , hw-bits, hw-hspec-hedgehog, text + }: + mkDerivation { + pname = "hw-ip"; + version = "0.2.0.2"; + sha256 = "0c2nz9iq5x7mys90zy29ka4zkdggqngz77wjm51kv1jp7rsnpqn7"; + libraryHaskellDepends = [ + attoparsec base generic-lens hw-bits text + ]; + testHaskellDepends = [ + attoparsec base generic-lens hedgehog hspec hw-bits + hw-hspec-hedgehog text + ]; + description = "Library for manipulating IP addresses and CIDR blocks"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-json" = callPackage ({ mkDerivation, ansi-wl-pprint, array, attoparsec, base , bytestring, conduit, containers, criterion, dlist, hspec @@ -114316,36 +114632,36 @@ self: { "hw-prim" = callPackage ({ mkDerivation, base, bytestring, criterion, directory, exceptions - , hedgehog, hspec, hw-hspec-hedgehog, mmap, QuickCheck + , hedgehog, hspec, hw-hspec-hedgehog, mmap, QuickCheck, semigroups , transformers, vector }: mkDerivation { pname = "hw-prim"; - version = "0.6.2.3"; - sha256 = "10sxa42bkrwfbqlkdhv62m1g2dy4zqpsp5iqyd1jx0hal1wlblfm"; + version = "0.6.2.9"; + sha256 = "1c2ykdxvrg0i1wbjgfc0mank5z7466crqcs5hdyddjc833xhmv2d"; libraryHaskellDepends = [ - base bytestring mmap transformers vector + base bytestring mmap semigroups transformers vector ]; testHaskellDepends = [ base bytestring directory exceptions hedgehog hspec - hw-hspec-hedgehog mmap QuickCheck transformers vector + hw-hspec-hedgehog mmap QuickCheck semigroups transformers vector ]; benchmarkHaskellDepends = [ - base bytestring criterion mmap transformers vector + base bytestring criterion mmap semigroups transformers vector ]; description = "Primitive functions and data types"; license = stdenv.lib.licenses.bsd3; }) {}; - "hw-prim_0_6_2_12" = callPackage + "hw-prim_0_6_2_13" = callPackage ({ mkDerivation, base, bytestring, criterion, directory, exceptions , hedgehog, hspec, hw-hspec-hedgehog, mmap, QuickCheck, semigroups , transformers, vector }: mkDerivation { pname = "hw-prim"; - version = "0.6.2.12"; - sha256 = "10nbmpq8zm5j1jmn45w379rrmjvcssl213pmwh9p4zbnas71ba67"; + version = "0.6.2.13"; + sha256 = "0cvg99v9c86fzf76i4z3lilss0qgs1i91v1hsk2n22a79rmhpvnb"; libraryHaskellDepends = [ base bytestring mmap semigroups transformers vector ]; @@ -115687,29 +116003,6 @@ self: { }: mkDerivation { pname = "hyraxAbif"; - version = "0.2.3.9"; - sha256 = "0y9n5mz5hkbbdkw2h979y274x6y45pa9cw9wzbfnfczsjqgxgxs1"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base binary bytestring directory filepath protolude text - ]; - executableHaskellDepends = [ - base bytestring hscolour pretty-show protolude text - ]; - testHaskellDepends = [ - base binary bytestring hedgehog protolude text - ]; - description = "Modules for parsing, generating and manipulating AB1 files"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hyraxAbif_0_2_3_10" = callPackage - ({ mkDerivation, base, binary, bytestring, directory, filepath - , hedgehog, hscolour, pretty-show, protolude, text - }: - mkDerivation { - pname = "hyraxAbif"; version = "0.2.3.10"; sha256 = "1x800gx7l3wj0xphip8fhzh9pbhc374p2pgjdvhw5qq5wbxc7r3b"; isLibrary = true; @@ -115725,7 +116018,6 @@ self: { ]; description = "Modules for parsing, generating and manipulating AB1 files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hzaif" = callPackage @@ -119154,28 +119446,6 @@ self: { }: mkDerivation { pname = "intro"; - version = "0.3.1.0"; - sha256 = "14kl6nx62qkm19fjn593m62iy4myjwg94yyr38kkbna438n5wpns"; - libraryHaskellDepends = [ - base binary bytestring containers deepseq dlist extra hashable mtl - safe text transformers unordered-containers writer-cps-mtl - ]; - testHaskellDepends = [ - base binary bytestring containers deepseq dlist extra hashable lens - mtl QuickCheck safe text transformers unordered-containers - writer-cps-mtl - ]; - description = "\"Fixed Prelude\" - Mostly total and safe, provides Text and Monad transformers"; - license = stdenv.lib.licenses.mit; - }) {}; - - "intro_0_3_2_0" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, deepseq - , dlist, extra, hashable, lens, mtl, QuickCheck, safe, text - , transformers, unordered-containers, writer-cps-mtl - }: - mkDerivation { - pname = "intro"; version = "0.3.2.0"; sha256 = "0nffkv59ws5ls8smafsvbgnpfhs6bbf6balwn23za1dlb5982ky3"; libraryHaskellDepends = [ @@ -119189,7 +119459,6 @@ self: { ]; description = "\"Fixed Prelude\" - Mostly total and safe, provides Text and Monad transformers"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "intro-prelude" = callPackage @@ -119682,18 +119951,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ip_1_4_0" = callPackage + "ip_1_4_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion - , doctest, hashable, hspec, HUnit, primitive, QuickCheck + , deepseq, doctest, hashable, hspec, HUnit, primitive, QuickCheck , quickcheck-classes, test-framework, test-framework-hunit , test-framework-quickcheck2, text, vector }: mkDerivation { pname = "ip"; - version = "1.4.0"; - sha256 = "12y9ym7gjdwlixp727z4hf0hmi8x021shvrv6vhg4s4bgn3rvch5"; + version = "1.4.1"; + sha256 = "0nzc2xb6xha2sql3aiwhchl2hhfzndlvdm1hc8pbrjw27jcz3hpi"; libraryHaskellDepends = [ - aeson attoparsec base bytestring hashable primitive text vector + aeson attoparsec base bytestring deepseq hashable primitive text + vector ]; testHaskellDepends = [ attoparsec base bytestring doctest hspec HUnit QuickCheck @@ -120708,6 +120978,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "ival" = callPackage + ({ mkDerivation, alg, base, smallcheck, tasty, tasty-smallcheck }: + mkDerivation { + pname = "ival"; + version = "0.1.0.0"; + sha256 = "16iffzyhqm160sy6qskfxr0wrbjic9bxrm8y9f1ych7gmzp3cdwk"; + libraryHaskellDepends = [ alg base ]; + testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ]; + description = "Intervals"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ivar-simple" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -121832,8 +122114,8 @@ self: { ({ mkDerivation, base, haskeline, hspec, HUnit }: mkDerivation { pname = "jord"; - version = "0.3.1.0"; - sha256 = "09wf9yzf9jzh4w2iqs0r33hi80ralbriipydbqpb0gx0i2sgwqay"; + version = "0.4.0.0"; + sha256 = "0sa19hr49l71dlvm1wpkw6901zzws12higd4xksk8b81cwrgp8l2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -121966,6 +122248,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "jps" = callPackage + ({ mkDerivation, base, containers, fingertree, lens, vector }: + mkDerivation { + pname = "jps"; + version = "0.1.0.0"; + sha256 = "0k31r994cw1w79v2zqkj64jhbfyym1j96vawvqc5pvw2mjk1f5in"; + libraryHaskellDepends = [ base containers fingertree lens vector ]; + description = "Jump point search for Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "js-flot" = callPackage ({ mkDerivation, base, HTTP }: mkDerivation { @@ -122662,6 +122955,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "json-rpc-generic_0_2_1_5" = callPackage + ({ mkDerivation, aeson, aeson-generic-compat, base, containers + , dlist, QuickCheck, quickcheck-simple, scientific, text + , transformers, unordered-containers, vector + }: + mkDerivation { + pname = "json-rpc-generic"; + version = "0.2.1.5"; + sha256 = "1h1spyiq5xix3rbjdk37a28l6l46zygvxafdhaa466hyn2j7p4cz"; + libraryHaskellDepends = [ + aeson aeson-generic-compat base containers dlist scientific text + transformers unordered-containers vector + ]; + testHaskellDepends = [ + aeson base QuickCheck quickcheck-simple text + ]; + description = "Generic encoder and decode for JSON-RPC"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "json-rpc-server" = callPackage ({ mkDerivation, aeson, base, bytestring, deepseq, HUnit, mtl , test-framework, test-framework-hunit, text, unordered-containers @@ -126342,10 +126656,8 @@ self: { }: mkDerivation { pname = "language-ats"; - version = "1.7.0.2"; - sha256 = "1x5nm59nx2dwjxqrz8r0f6wg5szxcsvidqd9pjzh1znlxbzy3s6i"; - revision = "1"; - editedCabalFile = "0dzijl82zynk73ahd3rzkv7x86qpbn36hp558vwmcvd84qq0hbqf"; + version = "1.7.0.3"; + sha256 = "0lmqic0pwn1f5l5zm3830ipyfjv6cj799kzgx0ia0mdy9wh8pfg9"; enableSeparateDataOutput = true; libraryHaskellDepends = [ ansi-wl-pprint array base composition-prelude containers deepseq @@ -126545,6 +126857,8 @@ self: { pname = "language-docker"; version = "6.0.4"; sha256 = "1brlqlxa1h7iv2p17h4nb6ly7nr4dr9j815z3yiz0gbj91bgj4c1"; + revision = "1"; + editedCabalFile = "0la3l8m32zmgb4nk4fwchy1abip0k1b0x1i9205dih136g1iaq62"; libraryHaskellDepends = [ base bytestring containers free megaparsec mtl prettyprinter split template-haskell text th-lift time @@ -127147,6 +127461,51 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "language-puppet_1_3_20_1" = callPackage + ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base + , base16-bytestring, bytestring, case-insensitive, containers + , cryptonite, directory, exceptions, filecache, filepath + , formatting, Glob, hashable, hruby, hslogger, hspec + , hspec-megaparsec, http-api-data, http-client, lens, lens-aeson + , megaparsec, memory, mtl, operational, optparse-applicative + , parallel-io, parsec, pcre-utils, process, protolude, random + , regex-pcre-builtin, scientific, servant, servant-client, split + , stm, strict-base-types, temporary, text, time, transformers, unix + , unordered-containers, vector, yaml + }: + mkDerivation { + pname = "language-puppet"; + version = "1.3.20.1"; + sha256 = "0gak1v8p6fnrac7br2gvz3wg8mymm82gyv4wbdcp5rkj7ncm19vs"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson ansi-wl-pprint attoparsec base base16-bytestring bytestring + case-insensitive containers cryptonite directory exceptions + filecache filepath formatting hashable hruby hslogger hspec + http-api-data http-client lens lens-aeson megaparsec memory mtl + operational parsec pcre-utils process protolude random + regex-pcre-builtin scientific servant servant-client split stm + strict-base-types text time transformers unix unordered-containers + vector yaml + ]; + executableHaskellDepends = [ + aeson ansi-wl-pprint base bytestring containers Glob hslogger + http-client lens megaparsec mtl optparse-applicative parallel-io + regex-pcre-builtin strict-base-types text transformers + unordered-containers vector yaml + ]; + testHaskellDepends = [ + base Glob hslogger hspec hspec-megaparsec lens megaparsec mtl + pcre-utils protolude scientific strict-base-types temporary text + transformers unordered-containers vector + ]; + description = "Tools to parse and evaluate the Puppet DSL"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "language-python" = callPackage ({ mkDerivation, alex, array, base, containers, happy, monads-tf , pretty, transformers, utf8-string @@ -128178,6 +128537,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "leancheck_0_7_3" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "leancheck"; + version = "0.7.3"; + sha256 = "0lvyf82qsiprvhk40870c6pz13z9fv2qml1cvvw3ryc7y8xh89v9"; + libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ base ]; + description = "Enumerative property-based testing"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "leankit-api" = callPackage ({ mkDerivation, aeson, base, bytestring, colour, curl, split }: mkDerivation { @@ -132329,8 +132701,8 @@ self: { ({ mkDerivation, base, containers, doctest, hedgehog }: mkDerivation { pname = "loc"; - version = "0.1.3.2"; - sha256 = "1p8df8jyddma3mk54azgiqf6adlq0l4g00cjffdvx8bk30xnrank"; + version = "0.1.3.3"; + sha256 = "0vnnw8ix38r441czsgmcwn7iavvmy6v5c12qflhz0ah055ahl8xa"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers doctest hedgehog ]; description = "Types representing line and column positions and ranges in text files"; @@ -132342,8 +132714,8 @@ self: { ({ mkDerivation, base, containers, hedgehog, loc }: mkDerivation { pname = "loc-test"; - version = "0.1.3.2"; - sha256 = "06yccmyxk7cvkxjra28ardxc61h6h59w0rw08d27llppfjh5bn01"; + version = "0.1.3.3"; + sha256 = "148nc6qy4afrw707kvq7k1052pfj717apsmr2b98x8w5xcc7f567"; libraryHaskellDepends = [ base containers hedgehog loc ]; description = "Test-related utilities related to the /loc/ package"; license = stdenv.lib.licenses.asl20; @@ -134697,8 +135069,8 @@ self: { }: mkDerivation { pname = "mackerel-client"; - version = "0.1.0"; - sha256 = "0x1i311281pswpcgwgjfhk4x2576h8ycg1i3ira29hyph1q0r7a0"; + version = "0.2.0"; + sha256 = "05x0c05h3k8c1qrxmmi4dlj1wxpmfqj6n3man5cqpqp0sxayxv9c"; libraryHaskellDepends = [ aeson base bytestring data-default directory filepath htoml http-client http-client-tls http-types parsec split text @@ -134764,8 +135136,8 @@ self: { }: mkDerivation { pname = "madlang"; - version = "4.0.2.11"; - sha256 = "1s924yvbk89xsl0zlm1shpc942q6nzi7fqqki8mlhj3ymqrgsv1k"; + version = "4.0.2.12"; + sha256 = "0g3nciqjfqkhi6j5kcyp4zwrzbik3v9qrj0jpl374g4r1sw3piq9"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cli-setup ]; @@ -136592,6 +136964,8 @@ self: { pname = "matrix"; version = "0.3.6.1"; sha256 = "0b1v17rc9q7ni44gkzp124kmc5d6xmlpiqvskgjrq54qpjinr5zs"; + revision = "1"; + editedCabalFile = "0iy0gdgg68ldhgm4lzvzl5pmzflx0r4brdbdkq75rkarm7cigawn"; libraryHaskellDepends = [ base deepseq loop primitive semigroups vector ]; @@ -138557,6 +138931,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "microlens-ghc_0_4_9_1" = callPackage + ({ mkDerivation, array, base, bytestring, containers, microlens + , transformers + }: + mkDerivation { + pname = "microlens-ghc"; + version = "0.4.9.1"; + sha256 = "03iwgg8zww9irv59l70c8yy7vzxir1zf66y12210xk91k5hq6jrj"; + libraryHaskellDepends = [ + array base bytestring containers microlens transformers + ]; + description = "microlens + array, bytestring, containers, transformers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "microlens-mtl" = callPackage ({ mkDerivation, base, microlens, mtl, transformers , transformers-compat @@ -138605,6 +138995,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "microlens-th_0_4_2_2" = callPackage + ({ mkDerivation, base, containers, microlens, template-haskell + , th-abstraction, transformers + }: + mkDerivation { + pname = "microlens-th"; + version = "0.4.2.2"; + sha256 = "02nj7lnl61yffi3c6wn341arxhld5r0vj6nzcb5zmqjhnqsv8c05"; + libraryHaskellDepends = [ + base containers microlens template-haskell th-abstraction + transformers + ]; + testHaskellDepends = [ base microlens ]; + description = "Automatic generation of record lenses for microlens"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "micrologger" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, hspec, lens , text, text-format, time, transformers @@ -139620,6 +140028,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "mixpanel-client" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, bytestring, hspec + , hspec-discover, http-client, http-client-tls, markdown-unlit + , servant, servant-client, string-conv, text, time + }: + mkDerivation { + pname = "mixpanel-client"; + version = "0.1.0.0"; + sha256 = "0m3l68b3mvpzsxr61rfvn89i5lym9yd3akvmwn001zdzqxk4l9v7"; + libraryHaskellDepends = [ + aeson base base64-bytestring bytestring http-client http-client-tls + servant servant-client string-conv text time + ]; + testHaskellDepends = [ + aeson base base64-bytestring bytestring hspec http-client + http-client-tls servant servant-client string-conv text time + ]; + testToolDepends = [ hspec-discover markdown-unlit ]; + description = "Mixpanel client"; + license = stdenv.lib.licenses.asl20; + }) {}; + "mkbndl" = callPackage ({ mkDerivation, base, directory, filepath, haskell98 }: mkDerivation { @@ -139730,8 +140160,8 @@ self: { pname = "mmark"; version = "0.0.5.6"; sha256 = "0d0jxxj0b1jy9mym6389dmm6biiw8kzdh06zj2j0gsjczn2n60zw"; - revision = "5"; - editedCabalFile = "1m4l42g519hnzjaafsnbjcfr0nrf28x1lmc1kjh5swrg6qd3kf29"; + revision = "6"; + editedCabalFile = "13cn8nkqj0zl26rgs01rspb2mz6gq1a6ax3g5bygdphvwzraswc5"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base case-insensitive containers data-default-class deepseq @@ -139946,33 +140376,6 @@ self: { "modern-uri" = callPackage ({ mkDerivation, base, bytestring, containers, contravariant - , criterion, deepseq, exceptions, hspec, hspec-megaparsec - , megaparsec, mtl, profunctors, QuickCheck, reflection, tagged - , template-haskell, text, weigh - }: - mkDerivation { - pname = "modern-uri"; - version = "0.2.1.0"; - sha256 = "06lqkx91s0lvkamxxf070l990kh8g0c5f5yshh2lffjbk5zclnp6"; - revision = "5"; - editedCabalFile = "089smjciwx6iav6wqpxhwdzlm0d1jdmgcgjv0r2c4vqrwdd1wb4h"; - libraryHaskellDepends = [ - base bytestring containers contravariant deepseq exceptions - megaparsec mtl profunctors QuickCheck reflection tagged - template-haskell text - ]; - testHaskellDepends = [ - base bytestring hspec hspec-megaparsec megaparsec QuickCheck text - ]; - benchmarkHaskellDepends = [ - base bytestring criterion deepseq megaparsec text weigh - ]; - description = "Modern library for working with URIs"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "modern-uri_0_2_2_0" = callPackage - ({ mkDerivation, base, bytestring, containers, contravariant , criterion, deepseq, exceptions, hspec, hspec-discover , hspec-megaparsec, megaparsec, mtl, profunctors, QuickCheck , reflection, tagged, template-haskell, text, weigh @@ -139995,7 +140398,6 @@ self: { ]; description = "Modern library for working with URIs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "modify-fasta" = callPackage @@ -143363,17 +143765,6 @@ self: { }) {}; "multipart" = callPackage - ({ mkDerivation, base, bytestring, parsec }: - mkDerivation { - pname = "multipart"; - version = "0.1.2"; - sha256 = "0g04jhyw1ib1s7c9bcldyyn4n90qd9x7dmvic4vgq57bgcqgnhz5"; - libraryHaskellDepends = [ base bytestring parsec ]; - description = "HTTP multipart split out of the cgi package"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "multipart_0_1_3" = callPackage ({ mkDerivation, base, bytestring, parsec, stringsearch }: mkDerivation { pname = "multipart"; @@ -143382,7 +143773,6 @@ self: { libraryHaskellDepends = [ base bytestring parsec stringsearch ]; description = "HTTP multipart split out of the cgi package"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "multipart-names" = callPackage @@ -144251,8 +144641,8 @@ self: { }: mkDerivation { pname = "mvc"; - version = "1.1.6"; - sha256 = "1n7mdyz781cr0mmfcrj8agx3zdd6qh7hlb98kd63bz9msri4zfrz"; + version = "1.1.7"; + sha256 = "1887z2im418rzkqin2mk7f839qgvv4snnxm2qzlcnym89hspz37w"; libraryHaskellDepends = [ async base contravariant foldl managed mmorph pipes pipes-concurrency transformers @@ -144941,11 +145331,11 @@ self: { }) {}; "nakadi-client" = callPackage - ({ mkDerivation, aeson, aeson-casing, async, async-timer, base - , bytestring, classy-prelude, conduit, conduit-extra, containers - , exceptions, fast-logger, hashable, http-client, http-client-tls - , http-conduit, http-types, iso8601-time, lens, lens-aeson - , lifted-async, monad-control, monad-logger, mtl, random, resourcet + ({ mkDerivation, aeson, aeson-casing, aeson-qq, async, async-timer + , base, bytestring, classy-prelude, conduit, conduit-extra + , containers, exceptions, fast-logger, hashable, http-client + , http-client-tls, http-conduit, http-types, iso8601-time, lens + , lens-aeson, monad-control, monad-logger, mtl, random, resourcet , retry, safe-exceptions, say, scientific, split, stm, stm-chans , stm-conduit, tasty, tasty-hunit, template-haskell, text, time , transformers, transformers-base, unliftio, unliftio-core @@ -144953,24 +145343,24 @@ self: { }: mkDerivation { pname = "nakadi-client"; - version = "0.5.1.0"; - sha256 = "1g8jddskklbcirgb35b71lbgkm492rfhbx50kipi5wrnh0r4zh67"; + version = "0.6.0.0"; + sha256 = "15hcaccm25frzar2fwyrrhai9kpja7xdcpi2ibl6gf3drp6z65jy"; libraryHaskellDepends = [ - aeson aeson-casing async-timer base bytestring conduit + aeson aeson-casing async async-timer base bytestring conduit conduit-extra containers exceptions hashable http-client http-client-tls http-conduit http-types iso8601-time lens monad-control monad-logger mtl resourcet retry safe-exceptions - scientific split stm template-haskell text time transformers - transformers-base unliftio unliftio-core unordered-containers uuid - vector + scientific split stm stm-chans template-haskell text time + transformers transformers-base unliftio unliftio-core + unordered-containers uuid vector ]; testHaskellDepends = [ - aeson aeson-casing async async-timer base bytestring classy-prelude - conduit conduit-extra containers exceptions fast-logger hashable - http-client http-client-tls http-conduit http-types iso8601-time - lens lens-aeson lifted-async monad-control monad-logger mtl random - resourcet retry safe-exceptions say scientific split stm stm-chans - stm-conduit tasty tasty-hunit template-haskell text time + aeson aeson-casing aeson-qq async async-timer base bytestring + classy-prelude conduit conduit-extra containers exceptions + fast-logger hashable http-client http-client-tls http-conduit + http-types iso8601-time lens lens-aeson monad-control monad-logger + mtl random resourcet retry safe-exceptions say scientific split stm + stm-chans stm-conduit tasty tasty-hunit template-haskell text time transformers transformers-base unliftio unliftio-core unordered-containers uuid vector wai warp ]; @@ -146459,8 +146849,8 @@ self: { pname = "network"; version = "2.7.0.2"; sha256 = "1fsdcwz7w1g1gznr62a6za8jc2g8cq5asrcq2vc14x9plf31s2vf"; - revision = "1"; - editedCabalFile = "06pc3iybcn9dyvx7q3qh6cczalb0bfinbay8pjhcahg6mwvgf32s"; + revision = "2"; + editedCabalFile = "04h5wq6116brd2r3182g65crrbidn43wi43qz1n99gl042ydgf3w"; libraryHaskellDepends = [ base bytestring unix ]; testHaskellDepends = [ base bytestring directory doctest hspec HUnit @@ -147879,23 +148269,23 @@ self: { }) {}; "nirum" = callPackage - ({ mkDerivation, base, blaze-html, blaze-markup, bytestring, cmark - , containers, directory, email-validate, filepath, fsnotify - , heterocephalus, hlint, hspec, hspec-core, hspec-meta, htoml - , interpolatedstring-perl6, megaparsec, mtl, optparse-applicative - , parsec, pretty, process, semigroups, semver, shakespeare, stm - , string-qq, template-haskell, temporary, text, turtle - , unordered-containers, uri + ({ mkDerivation, base, blaze-html, blaze-markup, bytestring + , cmark-gfm, containers, directory, email-validate, filepath + , fsnotify, heterocephalus, hlint, hspec, hspec-core, hspec-meta + , htoml, hxt, interpolatedstring-perl6, megaparsec, mtl + , optparse-applicative, parsec, pretty, process, semigroups, semver + , shakespeare, stm, string-qq, template-haskell, temporary, text + , turtle, unordered-containers, uri }: mkDerivation { pname = "nirum"; - version = "0.3.3"; - sha256 = "0ilrhkfv1q2w49wsj27dssaavw8v5w77vyf2mynb5aam1yax3d3v"; + version = "0.5.0"; + sha256 = "1d754gn0ndfns4490ffiygiwqym8i8ikfabd5mf6yg86arimmvjc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base blaze-html blaze-markup bytestring cmark containers directory - email-validate filepath fsnotify heterocephalus htoml + base blaze-html blaze-markup bytestring cmark-gfm containers + directory email-validate filepath fsnotify heterocephalus htoml interpolatedstring-perl6 megaparsec mtl optparse-applicative parsec pretty semver shakespeare stm template-haskell text unordered-containers uri @@ -147907,7 +148297,7 @@ self: { ]; testHaskellDepends = [ base blaze-html bytestring containers directory email-validate - filepath hlint hspec hspec-core hspec-meta htoml + filepath hlint hspec hspec-core hspec-meta htoml hxt interpolatedstring-perl6 megaparsec mtl parsec pretty process semigroups semver string-qq temporary text turtle unordered-containers @@ -151508,6 +151898,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "opentok" = callPackage + ({ mkDerivation, aeson, aeson-casing, aeson-compat, base + , base-compat, base64-string, bytestring, containers, convertible + , either, hscolour, http-client, http-client-tls, http-conduit + , http-types, iproute, jose, lens, monad-time, SHA, strings, text + , time, transformers, unordered-containers, utf8-string, uuid + }: + mkDerivation { + pname = "opentok"; + version = "0.0.4"; + sha256 = "1wzl7ra1y3998kp54j9hpnv58kzk1ysx9qivi4fsg0psyvhqf17j"; + libraryHaskellDepends = [ + aeson aeson-casing aeson-compat base base-compat base64-string + bytestring containers convertible either hscolour http-client + http-client-tls http-conduit http-types iproute jose lens + monad-time SHA strings text time transformers unordered-containers + utf8-string uuid + ]; + description = "An OpenTok SDK for Haskell"; + license = stdenv.lib.licenses.mit; + }) {}; + "opentype" = callPackage ({ mkDerivation, base, binary, bytestring, containers, ghc , microlens, microlens-th, mtl, pretty-hex, time @@ -153026,6 +153438,8 @@ self: { pname = "pandoc"; version = "2.2.1"; sha256 = "1dqin92w513l7whg5wdgrngnxsj5mb8gppfvn7kjgyv2pdgpy0zy"; + revision = "1"; + editedCabalFile = "16f2c7awxbs17xycl3z1x11h7gc7rfzvw7i3pslsn9nms7rz3s3v"; configureFlags = [ "-fhttps" "-f-trypandoc" ]; isLibrary = true; isExecutable = true; @@ -153211,22 +153625,22 @@ self: { "pandoc-emphasize-code" = callPackage ({ mkDerivation, base, filepath, hashable, lucid, mtl, pandoc-types - , process, tasty, tasty-discover, tasty-hspec, tasty-hunit, text - , unordered-containers + , process, semigroups, tasty, tasty-discover, tasty-hspec + , tasty-hunit, text, unordered-containers }: mkDerivation { pname = "pandoc-emphasize-code"; - version = "0.2.3"; - sha256 = "09jk13binvv6yqpdgkadx54npngn4vbg6z7k2q78cj4ypirbcpl0"; + version = "0.2.4"; + sha256 = "0fz0pkxx64d8bvrsg9s704mhhw9djq74x56dbv5w3y65nch8p3a5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base filepath hashable lucid mtl pandoc-types process text - unordered-containers + base filepath hashable lucid mtl pandoc-types process semigroups + text unordered-containers ]; executableHaskellDepends = [ base pandoc-types ]; testHaskellDepends = [ - base pandoc-types tasty tasty-discover tasty-hspec tasty-hunit + base pandoc-types tasty tasty-discover tasty-hspec tasty-hunit text unordered-containers ]; testToolDepends = [ tasty-discover ]; @@ -155216,10 +155630,8 @@ self: { ({ mkDerivation, base, bytestring, path, safe-exceptions, text }: mkDerivation { pname = "path-text-utf8"; - version = "0.0.1.0"; - sha256 = "0z7k6wj4p9192blrxnnmq79km4f6sm8lagp01vznc1gmy1p0w4cg"; - revision = "1"; - editedCabalFile = "1m04dyqqamh9lkkmcbf2dg7ivd5kb2dxqh9b844lr7mk5qganar6"; + version = "0.0.1.1"; + sha256 = "0c572nkkanz9n862q87q5jfpmg17v6flhl4201i67r7fp5icihwr"; libraryHaskellDepends = [ base bytestring path safe-exceptions text ]; @@ -156896,6 +157308,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "persistent-mysql-haskell_0_4_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, conduit, containers + , io-streams, monad-logger, mysql-haskell, network, persistent + , persistent-template, resource-pool, resourcet, text, time, tls + , transformers, unliftio-core + }: + mkDerivation { + pname = "persistent-mysql-haskell"; + version = "0.4.2"; + sha256 = "012vnfxjqlp352jm5s8glvypgyjligsqfrhb3y0kpzvxlsw4a653"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring conduit containers io-streams monad-logger + mysql-haskell network persistent resource-pool resourcet text time + tls transformers unliftio-core + ]; + executableHaskellDepends = [ + base monad-logger persistent persistent-template transformers + ]; + 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 @@ -157096,6 +157533,35 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {inherit (pkgs) sqlite;}; + "persistent-sqlite_2_8_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, conduit, containers + , hspec, microlens-th, monad-logger, old-locale, persistent + , persistent-template, resource-pool, resourcet, sqlite, temporary + , text, time, transformers, unliftio-core, unordered-containers + }: + mkDerivation { + pname = "persistent-sqlite"; + version = "2.8.2"; + sha256 = "1chbmvjz46smhgnzhha3bbkhys3fys6dip1jr4v7xp1jf78zbyp6"; + configureFlags = [ "-fsystemlib" ]; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring conduit containers microlens-th monad-logger + old-locale persistent resource-pool resourcet text time + transformers unliftio-core unordered-containers + ]; + librarySystemDepends = [ sqlite ]; + testHaskellDepends = [ + base hspec persistent persistent-template temporary text time + transformers + ]; + description = "Backend for the persistent library using sqlite3"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ psibi ]; + }) {inherit (pkgs) sqlite;}; + "persistent-template" = callPackage ({ mkDerivation, aeson, aeson-compat, base, bytestring, containers , ghc-prim, hspec, http-api-data, monad-control, monad-logger @@ -160331,8 +160797,8 @@ self: { }: mkDerivation { pname = "pointfree-fancy"; - version = "1.1.1.8"; - sha256 = "16n1yzjnfhwkdps8lcjhpnrmbbrvw2n6qsi90vzjxswkwsvp4hi3"; + version = "1.1.1.11"; + sha256 = "0kxk9kxqlxl0j1cq5jvcsgcfggc3xz0qi7a1qw6w1l83gs2vjjrk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -161626,9 +162092,9 @@ self: { "postgresql-query" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring - , containers, data-default, derive, exceptions, file-embed - , haskell-src-meta, hreader, hset, inflections, monad-control - , monad-logger, mtl, postgresql-simple, QuickCheck + , containers, data-default, exceptions, file-embed + , generic-arbitrary, haskell-src-meta, hreader, hset, inflections + , monad-control, monad-logger, mtl, postgresql-simple, QuickCheck , quickcheck-assertions, quickcheck-instances, resource-pool , semigroups, tasty, tasty-hunit, tasty-quickcheck, tasty-th , template-haskell, text, th-lift, th-lift-instances, time @@ -161636,8 +162102,8 @@ self: { }: mkDerivation { pname = "postgresql-query"; - version = "3.4.0"; - sha256 = "1f69rjwhww6knivk8gkx82b8xp8hkg0mhb9z2lm69vv3k5fxv8mb"; + version = "3.5.0"; + sha256 = "1sh8kgfqy1kipz99v74xkxzfggbxxjq2gwswa94m1spy6r7k7avp"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder bytestring containers data-default exceptions file-embed haskell-src-meta hreader hset @@ -161647,7 +162113,7 @@ self: { transformers-compat type-fun ]; testHaskellDepends = [ - attoparsec base derive postgresql-simple QuickCheck + attoparsec base generic-arbitrary postgresql-simple QuickCheck quickcheck-assertions quickcheck-instances tasty tasty-hunit tasty-quickcheck tasty-th text time ]; @@ -161912,43 +162378,44 @@ self: { }) {}; "postgrest" = callPackage - ({ mkDerivation, aeson, aeson-qq, ansi-wl-pprint, async, base - , base64-bytestring, bytestring, case-insensitive, cassava - , configurator-ng, containers, contravariant, cookie, either - , gitrev, hasql, hasql-pool, hasql-transaction, heredoc - , hjsonschema, hspec, hspec-wai, hspec-wai-json, HTTP, http-types + ({ mkDerivation, aeson, aeson-qq, ansi-wl-pprint, async + , auto-update, base, base64-bytestring, bytestring + , case-insensitive, cassava, configurator-ng, containers + , contravariant, contravariant-extras, cookie, either, gitrev + , hasql, hasql-pool, hasql-transaction, heredoc, hjsonschema, hspec + , hspec-wai, hspec-wai-json, HTTP, http-types , insert-ordered-containers, interpolatedstring-perl6, jose, lens , lens-aeson, monad-control, network-uri, optparse-applicative , parsec, process, protolude, Ranged-sets, regex-tdfa, retry, safe - , scientific, swagger2, text, transformers-base, unix + , scientific, swagger2, text, time, transformers-base, unix , unordered-containers, vector, wai, wai-cors, wai-extra , wai-middleware-static, warp }: mkDerivation { pname = "postgrest"; - version = "0.4.4.0"; - sha256 = "1dj0gzwjq5psxqmjx0jhbvwa0jlf52dvsbdmbx6ry0yqhsa0yvjr"; + version = "0.5.0.0"; + sha256 = "1sixscxpx6dl7hj87yk6zz4a8rg4qwlcchqrxxg1m0gjhln0aqx3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson ansi-wl-pprint base base64-bytestring bytestring case-insensitive cassava configurator-ng containers contravariant - cookie either gitrev hasql hasql-pool hasql-transaction heredoc - HTTP http-types insert-ordered-containers interpolatedstring-perl6 - jose lens lens-aeson network-uri optparse-applicative parsec - protolude Ranged-sets regex-tdfa safe scientific swagger2 text - unordered-containers vector wai wai-cors wai-extra - wai-middleware-static + contravariant-extras cookie either gitrev hasql hasql-pool + hasql-transaction heredoc HTTP http-types insert-ordered-containers + interpolatedstring-perl6 jose lens lens-aeson network-uri + optparse-applicative parsec protolude Ranged-sets regex-tdfa safe + scientific swagger2 text time unordered-containers vector wai + wai-cors wai-extra wai-middleware-static ]; executableHaskellDepends = [ - base base64-bytestring bytestring hasql hasql-pool protolude retry - text unix warp + auto-update base base64-bytestring bytestring hasql hasql-pool + protolude retry text time unix warp ]; testHaskellDepends = [ - aeson aeson-qq async base base64-bytestring bytestring + aeson aeson-qq async auto-update base base64-bytestring bytestring case-insensitive cassava containers contravariant hasql hasql-pool heredoc hjsonschema hspec hspec-wai hspec-wai-json http-types lens - lens-aeson monad-control process protolude regex-tdfa + lens-aeson monad-control process protolude regex-tdfa time transformers-base wai wai-extra ]; description = "REST API for any Postgres database"; @@ -162084,8 +162551,8 @@ self: { ({ mkDerivation, potoki-core }: mkDerivation { pname = "potoki"; - version = "2.0.5"; - sha256 = "1ik30rjpz5hr0n83nq0xdc381lrwir7z1iqcjmlwp3zan9hrnbk2"; + version = "2.0.6"; + sha256 = "1gjjs03kpvq544pada5a1r9vjv3dwiqkkgp7hb6ync41mpwvhssl"; libraryHaskellDepends = [ potoki-core ]; description = "Simple streaming in IO"; license = stdenv.lib.licenses.mit; @@ -162124,8 +162591,8 @@ self: { }: mkDerivation { pname = "potoki-core"; - version = "2.2.7"; - sha256 = "0pb20brgfc427gig317iyq6ln9z565aqanfm3cmkvgrzbvl9gf9q"; + version = "2.2.8.2"; + sha256 = "11d75dm2y1fw5kzbkf5vx55b0xa2sn1picbykfl6zypqbqmpa86g"; libraryHaskellDepends = [ acquire attoparsec base bytestring directory foldl hashable primitive profunctors ptr scanner stm text transformers @@ -162793,8 +163260,8 @@ self: { ({ mkDerivation, base, containers }: mkDerivation { pname = "preludeplus"; - version = "0.1.0.3"; - sha256 = "0fbxydbkf8j7v0gb6an5p1phd637xpzipiyq4nwlzdlpkdbpkaav"; + version = "0.1.0.5"; + sha256 = "08sxfgr8xh0rbg9nv3k93970mjcqgjyv1qy0kmwksl11fsih6sr3"; libraryHaskellDepends = [ base containers ]; description = "Generalizes List functions and replaces partials with NonEmpty equivalents"; license = stdenv.lib.licenses.bsd3; @@ -163323,6 +163790,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "prim-instances" = callPackage + ({ mkDerivation, base, base-orphans, primitive, QuickCheck + , quickcheck-classes, quickcheck-instances, tasty, tasty-quickcheck + }: + mkDerivation { + pname = "prim-instances"; + version = "0.1.0.0"; + sha256 = "1l2dvq5mrbxghzrcfd1ik49lzfvly3bq15jrmn1hilvjrsscx7nf"; + libraryHaskellDepends = [ base primitive ]; + testHaskellDepends = [ + base base-orphans primitive QuickCheck quickcheck-classes + quickcheck-instances tasty tasty-quickcheck + ]; + description = "prim typeclass instances"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "prim-ref" = callPackage ({ mkDerivation, base, ghc-prim, primitive, semigroups }: mkDerivation { @@ -164164,6 +164648,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "product-isomorphic_0_0_3_3" = callPackage + ({ mkDerivation, base, template-haskell, th-data-compat }: + mkDerivation { + pname = "product-isomorphic"; + version = "0.0.3.3"; + sha256 = "1fy1a7xvnz47120z7vq5hrdllgard7cd1whkwwmgpwdsmhn3my8y"; + libraryHaskellDepends = [ base template-haskell th-data-compat ]; + testHaskellDepends = [ base template-haskell ]; + description = "Weaken applicative functor on products"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "product-profunctors" = callPackage ({ mkDerivation, base, bifunctors, contravariant, criterion , deepseq, profunctors, tagged, template-haskell @@ -164591,20 +165088,20 @@ self: { ({ mkDerivation, base, bifunctors, binary, comonad, cond, container , convert, data-default, deepseq, deriving-compat, either, errors , exceptions, functor-utils, ghc-prim, impossible, lens, lens-utils - , monoid, mtl, neat-interpolation, placeholders, pointed + , monoid, mtl, neat-interpolation, placeholders, pointed, pretty , pretty-show, primitive, raw-strings-qq, recursion-schemes , semigroupoids, string-qq, template-haskell, text, transformers , transformers-base, typelevel, vector }: mkDerivation { pname = "prologue"; - version = "3.2.3"; - sha256 = "1a69283vmxr3ksak6b8hb8ys52gi5r7f1d59l32xfq1ilaswxxwm"; + version = "3.2.4"; + sha256 = "0smh3g9k2l4ic9gh1i7aq541nnacipvvc9c0v04xq5rk0rzrswmv"; libraryHaskellDepends = [ base bifunctors binary comonad cond container convert data-default deepseq deriving-compat either errors exceptions functor-utils ghc-prim impossible lens lens-utils monoid mtl neat-interpolation - placeholders pointed pretty-show primitive raw-strings-qq + placeholders pointed pretty pretty-show primitive raw-strings-qq recursion-schemes semigroupoids string-qq template-haskell text transformers transformers-base typelevel vector ]; @@ -164764,14 +165261,16 @@ self: { }) {}; "pronounce" = callPackage - ({ mkDerivation, base, binary, containers, filepath, mtl, text }: + ({ mkDerivation, base, binary, containers, filepath, mtl, safe + , text + }: mkDerivation { pname = "pronounce"; - version = "1.1.0.3"; - sha256 = "1agxmm426v8520vbw8maibrsa3qpzf8h8x3i61fk2fflyb45yx8z"; + version = "1.2.0.0"; + sha256 = "10jhkgawgzddqgw1m8hfhzb35szmxy5smy0bapm5vjmqc90b6zw9"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base binary containers filepath mtl text + base binary containers filepath mtl safe text ]; description = "A library for interfacing with the CMU Pronouncing Dictionary"; license = stdenv.lib.licenses.bsd3; @@ -164986,6 +165485,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "proto-lens-arbitrary_0_1_2_2" = callPackage + ({ mkDerivation, base, bytestring, containers, lens-family + , proto-lens, QuickCheck, text + }: + mkDerivation { + pname = "proto-lens-arbitrary"; + version = "0.1.2.2"; + sha256 = "128r7g82yx4rs38yd9s4bwcpyiqm5yr4lyci3z88bhqsvkn4438i"; + libraryHaskellDepends = [ + base bytestring containers lens-family proto-lens QuickCheck text + ]; + description = "Arbitrary instances for proto-lens"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "proto-lens-combinators" = callPackage ({ mkDerivation, base, Cabal, data-default-class, HUnit , lens-family, lens-family-core, proto-lens, proto-lens-protoc @@ -165008,6 +165523,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "proto-lens-combinators_0_1_0_11" = callPackage + ({ mkDerivation, base, Cabal, data-default-class, HUnit + , lens-family, lens-family-core, proto-lens, proto-lens-protoc + , test-framework, test-framework-hunit, transformers + }: + mkDerivation { + pname = "proto-lens-combinators"; + version = "0.1.0.11"; + sha256 = "1i2rbvhdvglqg6b4iwr5a0pk7iq78nap491bqg77y4dwd45ipcpb"; + setupHaskellDepends = [ base Cabal proto-lens-protoc ]; + libraryHaskellDepends = [ + base data-default-class lens-family proto-lens-protoc transformers + ]; + testHaskellDepends = [ + base HUnit lens-family lens-family-core proto-lens + proto-lens-protoc test-framework test-framework-hunit + ]; + description = "Utilities functions to proto-lens"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "proto-lens-descriptors" = callPackage ({ mkDerivation, base, bytestring, containers, data-default-class , lens-family, lens-labels, proto-lens, text @@ -165038,6 +165575,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "proto-lens-optparse_0_1_1_2" = callPackage + ({ mkDerivation, base, optparse-applicative, proto-lens, text }: + mkDerivation { + pname = "proto-lens-optparse"; + version = "0.1.1.2"; + sha256 = "1hagdb7m3wqv6w8m0aaf8cfsj4lryqighj2ah5qpmi8hspy1mg55"; + libraryHaskellDepends = [ + base optparse-applicative proto-lens text + ]; + description = "Adapting proto-lens to optparse-applicative ReadMs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "proto-lens-protobuf-types_0_2_2_0" = callPackage ({ mkDerivation, base, Cabal, lens-family, proto-lens , proto-lens-protoc, protobuf, text @@ -165073,6 +165624,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) protobuf;}; + "proto-lens-protobuf-types_0_3_0_2" = callPackage + ({ mkDerivation, base, Cabal, lens-labels, proto-lens + , proto-lens-protoc, protobuf, text + }: + mkDerivation { + pname = "proto-lens-protobuf-types"; + version = "0.3.0.2"; + sha256 = "0vslpjrhvkyz10g4fg1fbfkqggg7x0jd3vp68419aflgk293pgsx"; + setupHaskellDepends = [ base Cabal proto-lens-protoc ]; + libraryHaskellDepends = [ + base lens-labels proto-lens proto-lens-protoc text + ]; + libraryToolDepends = [ protobuf ]; + description = "Basic protocol buffer message types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) protobuf;}; + "proto-lens-protoc_0_2_2_3" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers , data-default-class, directory, filepath, haskell-src-exts @@ -165126,6 +165695,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) protobuf;}; + "proto-lens-protoc_0_3_1_2" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers + , data-default-class, deepseq, directory, filepath + , haskell-src-exts, lens-family, lens-labels, pretty, process + , proto-lens, protobuf, temporary, text + }: + mkDerivation { + pname = "proto-lens-protoc"; + version = "0.3.1.2"; + sha256 = "15qypl2z5mccmxhq2bl86frzdalpcnsjiw6vypvnr6gxlr7mwhm7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring Cabal containers data-default-class deepseq + directory filepath haskell-src-exts lens-family lens-labels pretty + process proto-lens temporary text + ]; + libraryToolDepends = [ protobuf ]; + executableHaskellDepends = [ + base bytestring containers data-default-class deepseq filepath + haskell-src-exts lens-family proto-lens text + ]; + description = "Protocol buffer compiler for the proto-lens library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) protobuf;}; + "protobuf" = callPackage ({ mkDerivation, base, base-orphans, bytestring, cereal, containers , data-binary-ieee754, deepseq, hex, HUnit, mtl, QuickCheck, tagged @@ -165276,6 +165872,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "protocol-radius_0_0_1_1" = callPackage + ({ mkDerivation, base, bytestring, cereal, containers, cryptonite + , dlist, memory, template-haskell, text, transformers + }: + mkDerivation { + pname = "protocol-radius"; + version = "0.0.1.1"; + sha256 = "0cd1qr5c2s25136lljqj2xfl8anrrc6m1yf8dpscjil2y4r27629"; + libraryHaskellDepends = [ + base bytestring cereal containers cryptonite dlist memory + template-haskell text transformers + ]; + description = "parser and printer for radius protocol packet"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "protocol-radius-test" = callPackage ({ mkDerivation, base, bytestring, cereal, containers , protocol-radius, QuickCheck, quickcheck-simple, transformers @@ -165632,6 +166245,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "publicsuffix_0_20180825" = callPackage + ({ mkDerivation, base, criterion, filepath, hspec, random + , template-haskell + }: + mkDerivation { + pname = "publicsuffix"; + version = "0.20180825"; + sha256 = "0wyni1f9v647zb7hg70da4s30dplv6whywd0jwghph1vqdlzlbma"; + libraryHaskellDepends = [ base filepath template-haskell ]; + testHaskellDepends = [ base hspec ]; + benchmarkHaskellDepends = [ base criterion random ]; + description = "The publicsuffix list exposed as proper Haskell types"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "publicsuffixlist" = callPackage ({ mkDerivation, base, bytestring, cereal, containers, data-default , HUnit, idna, text, utf8-string @@ -166145,13 +166774,26 @@ self: { }) {}; "purescript-iso" = callPackage - ({ mkDerivation, aeson, base, QuickCheck }: + ({ mkDerivation, aeson, async, attoparsec-uri, base, bytestring + , containers, monad-control, mtl, QuickCheck, quickcheck-instances + , stm, strict, tasty, tasty-quickcheck, text, time, utf8-string + , uuid, zeromq4-haskell, zeromq4-simple + }: mkDerivation { pname = "purescript-iso"; - version = "0.0.0"; - sha256 = "1vjq778l24waa24br59d3j4wdc3ajw1vk1fbi222vvkqvmcx5x9h"; - libraryHaskellDepends = [ aeson base QuickCheck ]; - testHaskellDepends = [ aeson base QuickCheck ]; + version = "0.0.1.2"; + sha256 = "0mlrj4q40d71r61lc5h9a7wfycmj1kgn6appaqbffrdjz64hmrfh"; + libraryHaskellDepends = [ + aeson async attoparsec-uri base bytestring containers monad-control + mtl QuickCheck quickcheck-instances stm strict text time + utf8-string uuid zeromq4-haskell zeromq4-simple + ]; + testHaskellDepends = [ + aeson async attoparsec-uri base bytestring containers monad-control + mtl QuickCheck quickcheck-instances stm strict tasty + tasty-quickcheck text time utf8-string uuid zeromq4-haskell + zeromq4-simple + ]; description = "Isomorphic trivial data type definitions over JSON"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -167660,21 +168302,32 @@ self: { }) {}; "quickcheck-state-machine" = callPackage - ({ mkDerivation, ansi-wl-pprint, async, base, containers - , lifted-async, lifted-base, monad-control, mtl, QuickCheck - , quickcheck-with-counterexamples, random, stm, template-haskell - , th-abstraction + ({ mkDerivation, ansi-wl-pprint, async, base, bytestring + , containers, directory, exceptions, filelock, filepath + , http-client, lifted-async, lifted-base, matrix, monad-control + , monad-logger, mtl, network, persistent, persistent-postgresql + , persistent-template, pretty-show, process, QuickCheck + , quickcheck-instances, random, resourcet, servant, servant-client + , servant-server, split, stm, strict, string-conversions, tasty + , tasty-quickcheck, text, tree-diff, vector, wai, warp }: mkDerivation { pname = "quickcheck-state-machine"; - version = "0.3.1"; - sha256 = "141rs0m67p830n2v30jkpvbqpygqc7i8cka9c9bbycxnwdax5jj4"; + version = "0.4.0"; + sha256 = "1dzkqpl873hj2by15hlkf61x6a7fjzkhl6h4cwhg9krj2bh2lv5q"; libraryHaskellDepends = [ - ansi-wl-pprint async base containers lifted-async lifted-base - monad-control mtl QuickCheck quickcheck-with-counterexamples random - stm template-haskell th-abstraction + ansi-wl-pprint async base containers exceptions lifted-async + lifted-base matrix monad-control mtl pretty-show QuickCheck random + split stm tree-diff vector + ]; + testHaskellDepends = [ + base bytestring directory filelock filepath http-client + lifted-async matrix monad-control monad-logger mtl network + persistent persistent-postgresql persistent-template process + QuickCheck quickcheck-instances random resourcet servant + servant-client servant-server strict string-conversions tasty + tasty-quickcheck text tree-diff vector wai warp ]; - testHaskellDepends = [ base ]; description = "Test monadic programs using state machine based models"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -168294,6 +168947,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "radix-tree" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, gauge + , hashtables, HUnit, primitive, QuickCheck, tasty, tasty-hunit + , tasty-quickcheck, text, unordered-containers + }: + mkDerivation { + pname = "radix-tree"; + version = "0.1"; + sha256 = "0hdlj97gzqb5rgyj5ybb4kki9b6xrlavcbz7i9w8q81vwjyv8cka"; + libraryHaskellDepends = [ + base bytestring containers deepseq primitive + ]; + testHaskellDepends = [ + base bytestring containers HUnit QuickCheck tasty tasty-hunit + tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + base bytestring containers deepseq gauge hashtables text + unordered-containers + ]; + description = "Radix tree data structive over short byte-strings"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "radixtree" = callPackage ({ mkDerivation, attoparsec, base, containers, criterion, deepseq , microlens, mtl, parsers, QuasiText, smallcheck, store, tasty @@ -169053,6 +169730,8 @@ self: { pname = "rank1dynamic"; version = "0.4.0"; sha256 = "07dbfp0sc32q1p8xh4ap8m3b287r9hh4r8vfsrppdm5pabz4nhiw"; + revision = "1"; + editedCabalFile = "1idh1iz15pzdhrhy19584i9ahz41ijbmf56wbb2wns2kipy6w9lr"; libraryHaskellDepends = [ base binary ]; testHaskellDepends = [ base HUnit test-framework test-framework-hunit @@ -169982,8 +170661,8 @@ self: { }: mkDerivation { pname = "reactive-banana-automation"; - version = "0.5.0"; - sha256 = "10lg4s6c29xb1j9icda1aywh64ybnk7d3hw3wl69rcwlqp52635a"; + version = "0.5.1"; + sha256 = "0wflw7rpknjj6qpf2ma1cxd03xg5v25rmfrmnli472h55jdcwdnz"; libraryHaskellDepends = [ base reactive-banana stm time transformers ]; @@ -170528,6 +171207,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "record-encode" = callPackage + ({ mkDerivation, base, generics-sop, hspec, QuickCheck, vector }: + mkDerivation { + pname = "record-encode"; + version = "0.2.2"; + sha256 = "1wdrvj2ilf5kqchfcfd3pnqgprc86fri7ajc5r0xqf6zc61s1fgk"; + libraryHaskellDepends = [ base generics-sop vector ]; + testHaskellDepends = [ base generics-sop hspec QuickCheck vector ]; + description = "Generic encoding of records"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "record-gl" = callPackage ({ mkDerivation, base, base-prelude, containers, GLUtil, HUnit , linear, OpenGL, record, tagged, template-haskell, test-framework @@ -170648,8 +171339,8 @@ self: { ({ mkDerivation, base, composition-prelude }: mkDerivation { pname = "recursion"; - version = "1.1.0.0"; - sha256 = "02ibnagyll2zgr4v472rbmaj9vsp1amvhvd9pvd8d76nj99xwr9j"; + version = "1.2.0.1"; + sha256 = "1j36fyyfml7i0dxxfammaaqmg6yg1whdar1ffsvpkjg4b8lkxlr4"; libraryHaskellDepends = [ base composition-prelude ]; description = "A recursion schemes library for GHC"; license = stdenv.lib.licenses.bsd3; @@ -172624,6 +173315,8 @@ self: { pname = "relude"; version = "0.1.1"; sha256 = "034hldd9rsqqhhxmnpfabh6v2by47qc5kx1qv77bl8k73fybf9a0"; + revision = "1"; + editedCabalFile = "18vil2wa8xzpf0y5r5zdfylsqmphlappzc7a2ac9lmxngfkbzwyc"; libraryHaskellDepends = [ base bytestring containers deepseq ghc-prim hashable mtl stm text transformers unordered-containers utf8-string @@ -172649,6 +173342,8 @@ self: { pname = "relude"; version = "0.2.0"; sha256 = "097kiflrwvkb3mxpkydh6a6x84azv4xla9nlm5qscacl4kn5z3q5"; + revision = "1"; + editedCabalFile = "10zqh8j0k7q6l5ag009c432has7zpwbi57drr12dpyqa1ldrk6h0"; libraryHaskellDepends = [ base bytestring containers deepseq ghc-prim hashable mtl stm text transformers unordered-containers utf8-string @@ -174327,26 +175022,6 @@ self: { }: mkDerivation { pname = "retry"; - version = "0.7.6.2"; - sha256 = "0bmrp2h6pf43hr7sd6562qixw755h2xgszj700157pk2hxcz16ad"; - libraryHaskellDepends = [ - base data-default-class exceptions ghc-prim random transformers - ]; - testHaskellDepends = [ - base data-default-class exceptions ghc-prim hedgehog HUnit mtl - random stm tasty tasty-hedgehog tasty-hunit time transformers - ]; - description = "Retry combinators for monadic actions that may fail"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "retry_0_7_6_3" = callPackage - ({ mkDerivation, base, data-default-class, exceptions, ghc-prim - , hedgehog, HUnit, mtl, random, stm, tasty, tasty-hedgehog - , tasty-hunit, time, transformers - }: - mkDerivation { - pname = "retry"; version = "0.7.6.3"; sha256 = "19h3y5j2wim32cail0pix11vjhfbj3xiivlw2kyz1iqv4fxx8mby"; libraryHaskellDepends = [ @@ -174358,7 +175033,6 @@ self: { ]; description = "Retry combinators for monadic actions that may fail"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "retryer" = callPackage @@ -174731,13 +175405,13 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "rhine_0_4_0_3" = callPackage + "rhine_0_4_0_4" = callPackage ({ mkDerivation, base, containers, dunai, free, time, transformers }: mkDerivation { pname = "rhine"; - version = "0.4.0.3"; - sha256 = "1s88dga75c835ixw1j59chswiv512sdwwg09p0r5jgsl8lqjp6h7"; + version = "0.4.0.4"; + sha256 = "00s2rsj3h7wamlrh2p7a600pwqlrrishxy2q2f6av0pzyc8dkc89"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -174753,8 +175427,8 @@ self: { ({ mkDerivation, base, dunai, gloss, rhine }: mkDerivation { pname = "rhine-gloss"; - version = "0.4.0.1"; - sha256 = "054f7x6d2gi3ph9iw5fs8qxyl2jwv8q93794zhdkcnyz15371piq"; + version = "0.4.0.4"; + sha256 = "0xbmqhznacmxvcrx1gaq4cy6f98fb2p4f07g16qp50zhs9mb2a63"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base dunai gloss rhine ]; @@ -177055,6 +177729,113 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "safe-money_0_7" = callPackage + ({ mkDerivation, base, binary, bytestring, constraints, deepseq + , hashable, QuickCheck, tasty, tasty-hunit, tasty-quickcheck, text + , vector-space + }: + mkDerivation { + pname = "safe-money"; + version = "0.7"; + sha256 = "1cwha4s0dckdb7xrh1snxrismzr5gq586l9vmih9gmy2nrrw69y9"; + libraryHaskellDepends = [ + base binary constraints deepseq hashable QuickCheck text + vector-space + ]; + testHaskellDepends = [ + base binary bytestring constraints deepseq hashable tasty + tasty-hunit tasty-quickcheck text vector-space + ]; + description = "Type-safe and lossless encoding and manipulation of money, fiat currencies, crypto currencies and precious metals"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "safe-money-aeson" = callPackage + ({ mkDerivation, aeson, base, bytestring, safe-money, tasty + , tasty-hunit, tasty-quickcheck, text + }: + mkDerivation { + pname = "safe-money-aeson"; + version = "0.1"; + sha256 = "0qifhkyjgxfnfmbmysc4ma3hvyi2l0c238c75wlf5x1hz8q1ka8p"; + libraryHaskellDepends = [ aeson base safe-money text ]; + testHaskellDepends = [ + aeson base bytestring safe-money tasty tasty-hunit tasty-quickcheck + text + ]; + description = "Instances from the aeson library for the safe-money library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "safe-money-cereal" = callPackage + ({ mkDerivation, base, bytestring, cereal, safe-money, tasty + , tasty-hunit, tasty-quickcheck + }: + mkDerivation { + pname = "safe-money-cereal"; + version = "0.1"; + sha256 = "02bzl1r4vymnb0xyagzrcgb2kxr892wivyasp7dkn41shgafaqzb"; + libraryHaskellDepends = [ base cereal safe-money ]; + testHaskellDepends = [ + base bytestring cereal safe-money tasty tasty-hunit + tasty-quickcheck + ]; + description = "Instances from the cereal library for the safe-money library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "safe-money-serialise" = callPackage + ({ mkDerivation, base, bytestring, safe-money, serialise, tasty + , tasty-hunit, tasty-quickcheck + }: + mkDerivation { + pname = "safe-money-serialise"; + version = "0.1"; + sha256 = "16h8yf622szzc3v5xa2s7fsjaxk7cx9hqngjn796sdcg681g7xf5"; + libraryHaskellDepends = [ base bytestring safe-money serialise ]; + testHaskellDepends = [ + base bytestring safe-money serialise tasty tasty-hunit + tasty-quickcheck + ]; + description = "Instances from the serialise library for the safe-money library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "safe-money-store" = callPackage + ({ mkDerivation, base, bytestring, safe-money, store, tasty + , tasty-hunit, tasty-quickcheck, text + }: + mkDerivation { + pname = "safe-money-store"; + version = "0.1"; + sha256 = "0hbqichsmxd3xw1abcdyyyg1rrzfkfmywgj47f4yv6pmmvihrkh8"; + libraryHaskellDepends = [ base bytestring safe-money store ]; + testHaskellDepends = [ + base bytestring safe-money store tasty tasty-hunit tasty-quickcheck + text + ]; + description = "Instances from the store library for the safe-money library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "safe-money-xmlbf" = callPackage + ({ mkDerivation, base, bytestring, safe-money, tasty, tasty-hunit + , tasty-quickcheck, text, xmlbf + }: + mkDerivation { + pname = "safe-money-xmlbf"; + version = "0.1"; + sha256 = "022mcl1gwvwjpjv56938bpklc15r9m6xvsyjhxmnb6d8apjzhpxk"; + libraryHaskellDepends = [ base safe-money text xmlbf ]; + testHaskellDepends = [ + base bytestring safe-money tasty tasty-hunit tasty-quickcheck text + xmlbf + ]; + description = "Instances from the xmlbf library for the safe-money library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "safe-plugins" = callPackage ({ mkDerivation, base, directory, filepath, haskell-src-exts , plugins, Unixutils @@ -177115,15 +177896,16 @@ self: { "safecopy-migrate" = callPackage ({ mkDerivation, base, base-prelude, cereal, containers, extra - , haskell-src-meta, microlens, safecopy, template-haskell, uniplate + , haskell-src-meta, microlens, safecopy, template-haskell + , th-abstraction, uniplate }: mkDerivation { pname = "safecopy-migrate"; - version = "0.1.0.0"; - sha256 = "1bs41w8zkgsidns68xv4finsnwici6wrfc6xiy9vk0la96i4wcv5"; + version = "0.2.0"; + sha256 = "14v1zg78v16gs3m4wch134z8qi7bgiadq9f7mvk8vrhajcipjz2a"; libraryHaskellDepends = [ base base-prelude cereal containers extra haskell-src-meta - microlens safecopy template-haskell uniplate + microlens safecopy template-haskell th-abstraction uniplate ]; description = "Making SafeCopy migrations easier"; license = stdenv.lib.licenses.publicDomain; @@ -177883,23 +178665,6 @@ self: { }) {}; "say" = callPackage - ({ mkDerivation, base, bytestring, criterion, hspec, temporary - , text, transformers - }: - mkDerivation { - pname = "say"; - version = "0.1.0.0"; - sha256 = "0h7w49v9manw7yml2bms11sf6znsfkmdr87c7d8ax8l1xnadnvzj"; - libraryHaskellDepends = [ base bytestring text transformers ]; - testHaskellDepends = [ base bytestring hspec temporary text ]; - benchmarkHaskellDepends = [ - base bytestring criterion temporary text - ]; - description = "Initial project template from stack"; - license = stdenv.lib.licenses.mit; - }) {}; - - "say_0_1_0_1" = callPackage ({ mkDerivation, base, bytestring, gauge, hspec, text, transformers , unliftio }: @@ -177916,7 +178681,6 @@ self: { ]; description = "Send textual messages to a Handle in a thread-friendly way"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sbp" = callPackage @@ -177945,6 +178709,33 @@ self: { license = stdenv.lib.licenses.lgpl3; }) {}; + "sbp_2_4_0" = callPackage + ({ mkDerivation, aeson, array, base, base64-bytestring + , basic-prelude, binary, binary-conduit, bytestring, conduit + , conduit-extra, data-binary-ieee754, lens, lens-aeson, monad-loops + , resourcet, tasty, tasty-hunit, template-haskell, text, time, yaml + }: + mkDerivation { + pname = "sbp"; + version = "2.4.0"; + sha256 = "13g14lj3ihn55v3cf40hzhp8ypzrl9a6lzarlsmqhr76g6szlpg8"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson array base base64-bytestring basic-prelude binary bytestring + data-binary-ieee754 lens lens-aeson monad-loops template-haskell + text + ]; + executableHaskellDepends = [ + aeson base basic-prelude binary-conduit bytestring conduit + conduit-extra resourcet time yaml + ]; + testHaskellDepends = [ base basic-prelude tasty tasty-hunit ]; + description = "SwiftNav's SBP Library"; + license = stdenv.lib.licenses.lgpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "sbp2udp" = callPackage ({ mkDerivation, base, basic-prelude, binary, binary-conduit , bytestring, conduit, conduit-extra, network, optparse-generic @@ -182263,6 +183054,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-ruby_0_8_0_2" = callPackage + ({ mkDerivation, base, casing, doctest, QuickCheck, servant-foreign + , text + }: + mkDerivation { + pname = "servant-ruby"; + version = "0.8.0.2"; + sha256 = "11h70gpar931qh3v1llp8zzk5922p31bmmfp5ynp7nzxv3zdrim6"; + libraryHaskellDepends = [ base casing servant-foreign text ]; + testHaskellDepends = [ base doctest QuickCheck ]; + description = "Generate a Ruby client from a Servant API with Net::HTTP"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-scotty" = callPackage ({ mkDerivation, aeson, base, http-types, scotty, servant , servant-response, text, transformers @@ -182829,8 +183635,8 @@ self: { }: mkDerivation { pname = "serverless-haskell"; - version = "0.6.6"; - sha256 = "068pjw05kn4wq3c7bh29c0kf7h19jz55fwxg9c0jnv0ygmw6k0bi"; + version = "0.6.7"; + sha256 = "0p34wd3g1gg7c6yp018164ky1rqz67wq5fcax6fis0hn3g8qgjm9"; libraryHaskellDepends = [ aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis amazonka-s3 base bytestring case-insensitive http-types iproute @@ -183280,6 +184086,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "setlocale_1_0_0_8" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "setlocale"; + version = "1.0.0.8"; + sha256 = "0sdrsmkhw08483d73ysgm2926fdbhii61br03lqpqw0lfzj4ilbd"; + libraryHaskellDepends = [ base ]; + description = "Haskell bindings to setlocale"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "setoid" = callPackage ({ mkDerivation, base, containers, mtl, smallcheck, tasty , tasty-discover, tasty-hunit, tasty-quickcheck, tasty-smallcheck @@ -183806,8 +184624,8 @@ self: { ({ mkDerivation, base, shake }: mkDerivation { pname = "shake-elm"; - version = "0.1.0.0"; - sha256 = "1pd2ga35kjcx5zfkvmdwr4rjlcm5b5r8h0kjmjadk4qf5219rwc1"; + version = "0.2.0.1"; + sha256 = "057ph5ai8pswzymln8l6i2hdn1vgi3hwyji1z6s4bh71xnc0sn5r"; libraryHaskellDepends = [ base shake ]; description = "Elm builds in shake"; license = stdenv.lib.licenses.bsd3; @@ -183817,8 +184635,8 @@ self: { ({ mkDerivation, base, directory, shake }: mkDerivation { pname = "shake-ext"; - version = "3.0.1.0"; - sha256 = "15n94922a4l74n65w59dj8jjpsv2vamm5lwnkii2hq6s1rpgccnm"; + version = "3.1.0.0"; + sha256 = "1lbdz4bv95d0rwfpk1l494lrfd5qp029awbfiv1wpydbvvspdvx6"; libraryHaskellDepends = [ base directory shake ]; description = "Helper functions for linting with shake"; license = stdenv.lib.licenses.bsd3; @@ -184471,8 +185289,8 @@ self: { ({ mkDerivation, base, hspec, megaparsec, text }: mkDerivation { pname = "shellwords"; - version = "0.1.2.0"; - sha256 = "0w3fv5fv6ccd8r0rfl5i6cjnfkv4vbk8gcssn2inr8hihwg88kmy"; + version = "0.1.2.1"; + sha256 = "0r4a3m16bn60xg08439ikq99m6xz8vl3yxqmp7dij1xxijx8wwzn"; libraryHaskellDepends = [ base megaparsec text ]; testHaskellDepends = [ base hspec ]; description = "Parse strings into words, like a shell would"; @@ -184550,8 +185368,8 @@ self: { }: mkDerivation { pname = "shift"; - version = "0.2.0.3"; - sha256 = "1k4fcb7j66fvdl1nqmx7315s6b9jmzv3dmcvc2sbkfh8m5wm2bby"; + version = "0.2.1.0"; + sha256 = "04949ljq0xi1s0k5llq56idykn6myr4l2hqai9vlqmcj47m5f23j"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -185492,6 +186310,8 @@ self: { pname = "simple-log"; version = "0.9.6"; sha256 = "0cbzc5ib63x2m4xz88ks6xfg99c2plp2y6y7bzx3i3rrhd3y1pjn"; + revision = "1"; + editedCabalFile = "0qifmlqxd2pwh5rm7pzfwn6nq09yvjs7nfg8si4b3q7xlgal2sbx"; libraryHaskellDepends = [ async base base-unicode-symbols containers data-default deepseq directory exceptions filepath hformat microlens microlens-platform @@ -186451,8 +187271,8 @@ self: { }: mkDerivation { pname = "sized-grid"; - version = "0.1.1.0"; - sha256 = "0qbn160pq5yz1916iir1s9hy1h4pkar8z50gh7i8v7j4nwhgiisk"; + version = "0.1.1.1"; + sha256 = "0v3350z1p9bmwancn205jbbqj1wwi7f6415jzz3fcypkmyq90bav"; libraryHaskellDepends = [ adjunctions aeson base comonad constraints distributive generics-sop lens mtl random vector vector-space @@ -189515,6 +190335,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "softfloat-hs" = callPackage + ({ mkDerivation, base, softfloat }: + mkDerivation { + pname = "softfloat-hs"; + version = "0.1.0"; + sha256 = "03ipzfr46gp6rz6vm8y3gwdpbpa6mxxmskcaz5ng8jpj570qq88k"; + libraryHaskellDepends = [ base ]; + librarySystemDepends = [ softfloat ]; + description = "Haskell bindings for SoftFloat"; + license = stdenv.lib.licenses.bsd3; + }) {softfloat = null;}; + "solga" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, hashable , hspec, hspec-wai, hspec-wai-json, http-types, QuickCheck @@ -190186,8 +191018,8 @@ self: { }: mkDerivation { pname = "spatial-math"; - version = "0.5.0.0"; - sha256 = "0hkvpr9l5x7gjwzskr0ci62mr3mzg0yfdbvdsjwrn37201cajmg2"; + version = "0.5.0.1"; + sha256 = "0454q9laaasdqrd74cjcxfcl5z7jcfvnzpdg81gl58y2ay8z4769"; libraryHaskellDepends = [ base binary cereal ghc-prim lens linear TypeCompose ]; @@ -190359,12 +191191,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "speculate_0_3_3" = callPackage + "speculate_0_3_4" = callPackage ({ mkDerivation, base, cmdargs, containers, leancheck }: mkDerivation { pname = "speculate"; - version = "0.3.3"; - sha256 = "1x0vikgx09j842h1q4gzmndq16yr5514np17qaqfrc8578g9wfkf"; + version = "0.3.4"; + sha256 = "10b6ka8rws62byxi4whncs77hl2jcx6pr3gibbh804v07dnl2dnv"; libraryHaskellDepends = [ base cmdargs containers leancheck ]; testHaskellDepends = [ base leancheck ]; benchmarkHaskellDepends = [ base leancheck ]; @@ -191742,8 +192574,8 @@ self: { pname = "stache"; version = "1.2.1"; sha256 = "0fqipjyin2hpklm0gaab4qhcfj9gzkpb2g948sqzf1n6alkxvyvb"; - revision = "7"; - editedCabalFile = "08i636hsi0znrm3ma7z2wknma06aa4xzfqwy0z4x9d7vn7fscm48"; + revision = "8"; + editedCabalFile = "0jz9cg3w71nvxc4y6hrwjayxl2291q5xm5r4qrhz1ag1lvzk26yn"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers deepseq directory filepath @@ -193292,8 +194124,8 @@ self: { }: mkDerivation { pname = "stitch"; - version = "0.5.0.0"; - sha256 = "0dk9h9arldzwsfg8cad374w7lipi4w43ady7dsmima4jyg4724h9"; + version = "0.6.0.0"; + sha256 = "1pk2snnvdn9f7xpnhgffzdqxps4spgvmcrbhjdfwpjxrlnxgviq9"; libraryHaskellDepends = [ base containers text transformers ]; testHaskellDepends = [ base Cabal hspec text ]; benchmarkHaskellDepends = [ base criterion ]; @@ -194002,6 +194834,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "stratosphere_0_25_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers + , hashable, hspec, hspec-discover, lens, template-haskell, text + , unordered-containers + }: + mkDerivation { + pname = "stratosphere"; + version = "0.25.0"; + sha256 = "0blrdrqhjh3cfddx8y3ra3vzicrcp8zin8fxnjk8hpz546d3a5a4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty base bytestring containers hashable lens + template-haskell text unordered-containers + ]; + testHaskellDepends = [ + aeson aeson-pretty base bytestring containers hashable hspec + hspec-discover lens template-haskell text unordered-containers + ]; + testToolDepends = [ hspec-discover ]; + description = "EDSL for AWS CloudFormation"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "stratum-tool" = callPackage ({ mkDerivation, aeson, async, base, bytestring, bytestring-builder , cmdargs, connection, containers, curl, curl-aeson, network, stm @@ -194720,8 +195577,8 @@ self: { }: mkDerivation { pname = "strelka"; - version = "2.0.2.1"; - sha256 = "0wh702y5m7045jlr3qf2k852x68d7ylr16hanb6jjw2f476fnc7i"; + version = "2.0.2.2"; + sha256 = "14n4wk7xzqrl795flxvks7kzf9mm93b626r2x657xjsy7rwkw7y3"; libraryHaskellDepends = [ attoparsec attoparsec-data base base-prelude base64-bytestring bifunctors bytestring bytestring-tree-builder hashable http-media @@ -196462,8 +197319,8 @@ self: { }: mkDerivation { pname = "sv-core"; - version = "0.2.1"; - sha256 = "00xzsx7ssii7i8h7m2g99vq54q8xb1191vi0sn8cg6a2bdfl74hd"; + version = "0.2.2"; + sha256 = "08wd9ajzzhkqg5ghqr3vilq1w8h8vypd3yy63ql6amnqdnjw02mf"; libraryHaskellDepends = [ attoparsec base bifunctors bytestring containers contravariant deepseq lens mtl parsec profunctors readable semigroupoids @@ -199837,6 +200694,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tax" = callPackage + ({ mkDerivation, base, dollaridoos, profunctors, semigroups }: + mkDerivation { + pname = "tax"; + version = "0.2.0.0"; + sha256 = "13911rksr268v2jbdm7kkwlglni7s8lb417lryr7m2x9vfg31jqb"; + libraryHaskellDepends = [ + base dollaridoos profunctors semigroups + ]; + description = "Types and combinators for taxes"; + license = stdenv.lib.licenses.agpl3; + }) {}; + "tbox" = callPackage ({ mkDerivation, array, base, binary, cautious-file, containers , directory, filepath, IfElse, monad-loops, mtl, random @@ -201063,8 +201933,8 @@ self: { }: mkDerivation { pname = "termonad"; - version = "0.2.0.0"; - sha256 = "0y5f4k6f2cs6x7p8qrfi7nwy46arap8v87algxg3iixw30c325lc"; + version = "0.2.1.0"; + sha256 = "1js9sj0gj4igigdnbc5ygbn5l2wfhbrm1k565y3advi99imidsd3"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -201875,8 +202745,8 @@ self: { }: mkDerivation { pname = "text-builder"; - version = "0.5.3"; - sha256 = "0488dy3x2gvwvnsmjs7g35pra9m1yqvqzw0klkhijsiaxnc4x95f"; + version = "0.5.3.1"; + sha256 = "04vqh30m4vi9d4b4g311fb861qijbmf9zmn9ldsrdb1rrgjk2y9q"; libraryHaskellDepends = [ base base-prelude bytestring semigroups text ]; @@ -201890,15 +202760,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "text-builder_0_5_3_1" = callPackage + "text-builder_0_5_4_1" = callPackage ({ mkDerivation, base, base-prelude, bytestring, criterion , QuickCheck, quickcheck-instances, rerebase, semigroups, tasty , tasty-hunit, tasty-quickcheck, text }: mkDerivation { pname = "text-builder"; - version = "0.5.3.1"; - sha256 = "04vqh30m4vi9d4b4g311fb861qijbmf9zmn9ldsrdb1rrgjk2y9q"; + version = "0.5.4.1"; + sha256 = "1ipmfnjbkp2qllqdahdf9jwbks6vhalaw65clv9izbhp7d20gjai"; libraryHaskellDepends = [ base base-prelude bytestring semigroups text ]; @@ -202149,6 +203019,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "text-ldap_0_1_1_13" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers, dlist + , memory, QuickCheck, quickcheck-simple, random, transformers + }: + mkDerivation { + pname = "text-ldap"; + version = "0.1.1.13"; + sha256 = "0d1a7932999yx98hjvnrap1lpm9jcfg34m2m0hdy4j1m6cq4q5zc"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base bytestring containers dlist memory transformers + ]; + executableHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ + base bytestring QuickCheck quickcheck-simple random + ]; + description = "Parser and Printer for LDAP text data stream"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "text-lens" = callPackage ({ mkDerivation, base, extra, hspec, lens, text }: mkDerivation { @@ -202355,6 +203247,8 @@ self: { pname = "text-region"; version = "0.3.1.0"; sha256 = "1zy5zb7xg1343hlkwawnbca7f6gal9028ps1kp83fg2vmq1aqk57"; + revision = "1"; + editedCabalFile = "1z5l1hv8sc4ida5s4r03ihak612lrq0rf7sdfkw7gf05f67c622p"; libraryHaskellDepends = [ aeson base base-unicode-symbols bytestring groups lens text ]; @@ -202916,6 +203810,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "th-data-compat_0_0_2_7" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "th-data-compat"; + version = "0.0.2.7"; + sha256 = "0yjfz9iwz0n2wx2c7wjazhwh23ny43fmnjp7dn7m37p320jgzahk"; + libraryHaskellDepends = [ base template-haskell ]; + description = "Compatibility for data definition template of TH"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "th-desugar" = callPackage ({ mkDerivation, base, containers, hspec, HUnit, mtl, syb , template-haskell, th-expand-syns, th-lift, th-orphans @@ -203104,6 +204010,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "th-lift_0_7_11" = callPackage + ({ mkDerivation, base, ghc-prim, template-haskell, th-abstraction + }: + mkDerivation { + pname = "th-lift"; + version = "0.7.11"; + sha256 = "131360zxb0hazbqwbkk6ab2p77jkxr79bwwm618mrwrwkm3x2g6m"; + libraryHaskellDepends = [ + base ghc-prim template-haskell th-abstraction + ]; + testHaskellDepends = [ base ghc-prim template-haskell ]; + description = "Derive Template Haskell's Lift class for datatypes"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "th-lift-instances" = callPackage ({ mkDerivation, base, bytestring, containers, QuickCheck , template-haskell, text, th-lift, vector @@ -203216,6 +204138,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "th-reify-compat_0_0_1_5" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "th-reify-compat"; + version = "0.0.1.5"; + sha256 = "171m4fibjq4ml33xvbb0qdm625adknsdgz8flb4xhag075z2w6xg"; + libraryHaskellDepends = [ base template-haskell ]; + description = "Compatibility for the result type of TH reify"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "th-reify-many" = callPackage ({ mkDerivation, base, containers, mtl, safe, template-haskell , th-expand-syns @@ -204106,16 +205040,16 @@ self: { "tidal" = callPackage ({ mkDerivation, base, colour, containers, hashable, hosc - , mersenne-random-pure64, mtl, parsec, safe, tasty, tasty-hunit - , text, time, websockets + , mersenne-random-pure64, monad-loops, mtl, parsec, safe, tasty + , tasty-hunit, text, time, websockets }: mkDerivation { pname = "tidal"; - version = "0.9.9"; - sha256 = "1zpbnn1kw2ybmlg6g9yj39jhfp6sl12335rxqns0nfi8l2jjgbgr"; + version = "0.9.10"; + sha256 = "1fgana79fwmn2s3b50vs9wlri6z4f2b8lad5m4n4ggc4rginvlkw"; libraryHaskellDepends = [ - base colour containers hashable hosc mersenne-random-pure64 mtl - parsec safe text time websockets + base colour containers hashable hosc mersenne-random-pure64 + monad-loops mtl parsec safe text time websockets ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "Pattern language for improvised music"; @@ -204440,6 +205374,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "time-locale-compat_0_1_1_5" = callPackage + ({ mkDerivation, base, old-locale, time }: + mkDerivation { + pname = "time-locale-compat"; + version = "0.1.1.5"; + sha256 = "0b2hmj8wwrfkndwzgm11qr496ca2ahwdxcj3m0ii91bxvrk1bzq7"; + libraryHaskellDepends = [ base old-locale time ]; + description = "Compatibile module for time-format locale"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "time-locale-vietnamese" = callPackage ({ mkDerivation, base, time }: mkDerivation { @@ -205891,6 +206837,33 @@ self: { license = stdenv.lib.licenses.mpl20; }) {}; + "tomland_0_4_0" = callPackage + ({ mkDerivation, base, hashable, hedgehog, hspec-megaparsec + , megaparsec, mtl, parser-combinators, tasty, tasty-discover + , tasty-hedgehog, tasty-hspec, text, time, transformers + , unordered-containers + }: + mkDerivation { + pname = "tomland"; + version = "0.4.0"; + sha256 = "1rkdlq6js5ia807wh9hga6y9r92bxj8j5g7nynba1ilc3x70znfr"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base hashable megaparsec mtl parser-combinators text time + transformers unordered-containers + ]; + executableHaskellDepends = [ base text time unordered-containers ]; + testHaskellDepends = [ + base hedgehog hspec-megaparsec megaparsec tasty tasty-hedgehog + tasty-hspec text time unordered-containers + ]; + testToolDepends = [ tasty-discover ]; + description = "Bidirectional TOML parser"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tomlcheck" = callPackage ({ mkDerivation, base, htoml-megaparsec, megaparsec , optparse-generic, text @@ -209524,25 +210497,6 @@ self: { }: mkDerivation { pname = "typed-process"; - version = "0.2.2.0"; - sha256 = "0c6gvgvjyncbni9a5bvpbglknd4yclr3d3hfg9bhgahmkj40dva2"; - libraryHaskellDepends = [ - async base bytestring process stm transformers - ]; - testHaskellDepends = [ - async base base64-bytestring bytestring hspec process stm temporary - transformers - ]; - description = "Run external processes, with strong typing of streams"; - license = stdenv.lib.licenses.mit; - }) {}; - - "typed-process_0_2_3_0" = callPackage - ({ mkDerivation, async, base, base64-bytestring, bytestring, hspec - , process, stm, temporary, transformers - }: - mkDerivation { - pname = "typed-process"; version = "0.2.3.0"; sha256 = "0j36vrc9w841m5qbwqra1lwiznx31xfnhin1sm8x2c2739csbpn0"; libraryHaskellDepends = [ @@ -209554,7 +210508,6 @@ self: { ]; description = "Run external processes, with strong typing of streams"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "typed-spreadsheet" = callPackage @@ -209781,8 +210734,10 @@ self: { }: mkDerivation { pname = "typerep-map"; - version = "0.2.0"; - sha256 = "14r8rnx3akx1sr48ksmp2g88dyy73innn9bwbw2yjb7n76k5kfa4"; + version = "0.3.0"; + sha256 = "0d5a2zfb75fallp9q8sz1av8ncvsnmqg6dfjqcghz0grfpwmn7bf"; + revision = "1"; + editedCabalFile = "102lwg5rl1628j3v331xj93cgvr9ppmphyjlqli4gm5vxgrkwsfv"; libraryHaskellDepends = [ base containers ghc-prim primitive vector ]; @@ -209833,8 +210788,8 @@ self: { }: mkDerivation { pname = "typesafe-precure"; - version = "0.6.3.1"; - sha256 = "16jysdh7v8336xkhl6vzni5zj301jsgawwxy8fcrd74p87am2k05"; + version = "0.7.0.1"; + sha256 = "1v8kzhjyxznj9xj4x5n34ybhzy5nmldsscawnmcaqf96f4w0i178"; libraryHaskellDepends = [ aeson aeson-pretty autoexporter base bytestring dlist monad-skeleton template-haskell text th-data-compat @@ -211472,6 +212427,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "unix-compat_0_5_1" = callPackage + ({ mkDerivation, base, unix }: + mkDerivation { + pname = "unix-compat"; + version = "0.5.1"; + sha256 = "0llwl7rp63fy2ychwdclz1afj45pbin5pfl01dvn6rwhvmwhr7d3"; + libraryHaskellDepends = [ base unix ]; + description = "Portable POSIX-compatibility layer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "unix-fcntl" = callPackage ({ mkDerivation, base, foreign-var }: mkDerivation { @@ -212504,6 +213471,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "urlpath_9_0_0_1" = callPackage + ({ mkDerivation, attoparsec-uri, base, exceptions, mmorph + , monad-control, monad-control-aligned, monad-logger, mtl, path + , path-extra, resourcet, split, strict, text, transformers + , transformers-base, vector + }: + mkDerivation { + pname = "urlpath"; + version = "9.0.0.1"; + sha256 = "009836gw2gmmjb08nqqdklpr967gfnnnk1r5lpy3wjyspky03vgv"; + libraryHaskellDepends = [ + attoparsec-uri base exceptions mmorph monad-control + monad-control-aligned monad-logger mtl path path-extra resourcet + split strict text transformers transformers-base vector + ]; + description = "Painfully simple URL deployment"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "urn" = callPackage ({ mkDerivation, base, hspec, parsec }: mkDerivation { @@ -212849,6 +213836,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "util_0_1_11_0" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "util"; + version = "0.1.11.0"; + sha256 = "16qi0w19hy7y4az4dxnsvn5cjc7lg5zb9vv0jjzifky9dkssbicb"; + libraryHaskellDepends = [ base ]; + description = "Utilities"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "util-exception" = callPackage ({ mkDerivation, base, basic, control, lifted-base-tf, util }: mkDerivation { @@ -212876,6 +213875,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "util-primitive" = callPackage + ({ mkDerivation, base, primitive }: + mkDerivation { + pname = "util-primitive"; + version = "0.1.0.0"; + sha256 = "193y0fvr0szpdhg7ysvj99mfm983yvrmvpq77gv994vyjigq4y6w"; + libraryHaskellDepends = [ base primitive ]; + description = "Primitive memory-related utilities"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "utility-ht" = callPackage ({ mkDerivation, base, QuickCheck }: mkDerivation { @@ -213541,6 +214551,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "validity-bytestring_0_4_0_0" = callPackage + ({ mkDerivation, base, bytestring, validity }: + mkDerivation { + pname = "validity-bytestring"; + version = "0.4.0.0"; + sha256 = "0zf722rm2s5p64bs1vl7fw1swa2svz2lk8w51bh235zds8bg11jc"; + libraryHaskellDepends = [ base bytestring validity ]; + description = "Validity instances for bytestring"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "validity-containers" = callPackage ({ mkDerivation, base, containers, validity }: mkDerivation { @@ -213568,6 +214590,34 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "validity-path_0_3_0_2" = callPackage + ({ mkDerivation, base, filepath, genvalidity-hspec, hspec, path + , validity + }: + mkDerivation { + pname = "validity-path"; + version = "0.3.0.2"; + sha256 = "0ip1qm6sip1yxbrcx9zn2saipd6bfs88cgn5jd3pw9ffkydxm74p"; + libraryHaskellDepends = [ base filepath path validity ]; + testHaskellDepends = [ + base filepath genvalidity-hspec hspec path validity + ]; + description = "Validity instances for Path"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "validity-primitive" = callPackage + ({ mkDerivation, base, primitive, validity }: + mkDerivation { + pname = "validity-primitive"; + version = "0.0.0.0"; + sha256 = "05y5zbirqyqjpdvvxhkaai60hzzwmvshzvkk7j376yjsg8sas4x0"; + libraryHaskellDepends = [ base primitive validity ]; + description = "Validity instances for primitive"; + license = stdenv.lib.licenses.mit; + }) {}; + "validity-scientific" = callPackage ({ mkDerivation, base, scientific, validity }: mkDerivation { @@ -213579,6 +214629,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "validity-scientific_0_2_0_2" = callPackage + ({ mkDerivation, base, scientific, validity }: + mkDerivation { + pname = "validity-scientific"; + version = "0.2.0.2"; + sha256 = "1hcdv8s7qfcrgc8hn335dzxx3q5qqbviwp4bf4lwnzbw611slcl1"; + libraryHaskellDepends = [ base scientific validity ]; + description = "Validity instances for scientific"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "validity-text" = callPackage ({ mkDerivation, base, bytestring, text, validity }: mkDerivation { @@ -213590,6 +214652,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "validity-text_0_3_1_0" = callPackage + ({ mkDerivation, base, bytestring, text, validity }: + mkDerivation { + pname = "validity-text"; + version = "0.3.1.0"; + sha256 = "0r22pipimzlznkv164n3pw3063v7yxz2l04m74y5j1zajxpg5lzd"; + libraryHaskellDepends = [ base bytestring text validity ]; + description = "Validity instances for text"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "validity-time" = callPackage ({ mkDerivation, base, time, validity }: mkDerivation { @@ -213601,6 +214675,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "validity-time_0_2_0_2" = callPackage + ({ mkDerivation, base, time, validity }: + mkDerivation { + pname = "validity-time"; + version = "0.2.0.2"; + sha256 = "0rg28pgicn8ycdswszbc070587pblbxdzl6mc082l9rgz3g4mcji"; + libraryHaskellDepends = [ base time validity ]; + description = "Validity instances for time"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "validity-unordered-containers" = callPackage ({ mkDerivation, base, hashable, unordered-containers, validity }: mkDerivation { @@ -213614,6 +214700,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "validity-unordered-containers_0_2_0_2" = callPackage + ({ mkDerivation, base, hashable, unordered-containers, validity }: + mkDerivation { + pname = "validity-unordered-containers"; + version = "0.2.0.2"; + sha256 = "06qq6rdzcb0l145653fdrbyf18fci49v85mq8c0sjhhfr22pwm2h"; + libraryHaskellDepends = [ + base hashable unordered-containers validity + ]; + description = "Validity instances for unordered-containers"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "validity-uuid" = callPackage ({ mkDerivation, base, uuid, validity }: mkDerivation { @@ -213625,6 +214725,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "validity-uuid_0_1_0_2" = callPackage + ({ mkDerivation, base, uuid, validity }: + mkDerivation { + pname = "validity-uuid"; + version = "0.1.0.2"; + sha256 = "0k2nkkc69m2j4aj3fjfd1i0cg4nli1g44nxdf5liv59hhvk33p4m"; + libraryHaskellDepends = [ base uuid validity ]; + description = "Validity instances for uuid"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "validity-vector" = callPackage ({ mkDerivation, base, hashable, validity, vector }: mkDerivation { @@ -213636,6 +214748,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "validity-vector_0_2_0_2" = callPackage + ({ mkDerivation, base, hashable, validity, vector }: + mkDerivation { + pname = "validity-vector"; + version = "0.2.0.2"; + sha256 = "0y6fhcdyd42nynf2lavdx9pnhy8ylqfkq1yickx2ap4w5hc61k57"; + libraryHaskellDepends = [ base hashable validity vector ]; + description = "Validity instances for vector"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "valor" = callPackage ({ mkDerivation, base, hspec, text, transformers }: mkDerivation { @@ -214165,6 +215289,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vector-algorithms_0_7_0_4" = callPackage + ({ mkDerivation, base, bytestring, containers, primitive + , QuickCheck, vector + }: + mkDerivation { + pname = "vector-algorithms"; + version = "0.7.0.4"; + sha256 = "0mfa8ig9v69l41p2vb5jl4qmaln5y1rlzarr2mlgm8g1nvq8qqdg"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base bytestring primitive vector ]; + testHaskellDepends = [ + base bytestring containers QuickCheck vector + ]; + description = "Efficient algorithms for vector arrays"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "vector-binary" = callPackage ({ mkDerivation, base, binary, vector }: mkDerivation { @@ -214531,8 +215674,8 @@ self: { }: mkDerivation { pname = "vector-text"; - version = "1.1.3"; - sha256 = "00x35fv78vp8rffvd7hsccl8vdxzzdzjrqzwvj0mr6g1wmg3p4i3"; + version = "1.1.5"; + sha256 = "1gd7dg9icr1211rf298ny60yjgyyxbxa62l16q28yd5z160sr3ir"; libraryHaskellDepends = [ base binary prologue text vector vector-binary-instances ]; @@ -214700,14 +215843,34 @@ self: { ({ mkDerivation, aeson, base, bytestring, hspec, semigroupoids }: mkDerivation { pname = "versioning"; - version = "0.2.0.0"; - sha256 = "1c35s0hv6wgyr40ky7yh7ajv0jhphfb8m53zn9a59v7nibp476mq"; + version = "0.3.0.0"; + sha256 = "12d5xxc8i0ldbsb6y22f9gvk0d61nrgjz3yf7ppvqrzhilgs6yyf"; libraryHaskellDepends = [ aeson base bytestring semigroupoids ]; testHaskellDepends = [ aeson base bytestring hspec ]; description = "Type-safe data versioning"; license = stdenv.lib.licenses.asl20; }) {}; + "versioning-servant" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, hspec + , hspec-wai, http-media, servant, servant-server, versioning, wai + , wai-extra + }: + mkDerivation { + pname = "versioning-servant"; + version = "0.1.0.0"; + sha256 = "14a1fk2mgcjjlb1z01xb5ngf496kpfr2y588265zn72q54a7l08k"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring http-media servant versioning + ]; + testHaskellDepends = [ + aeson base bytestring hspec hspec-wai servant servant-server + versioning wai wai-extra + ]; + description = "Servant combinators for the versioning library"; + license = stdenv.lib.licenses.asl20; + }) {}; + "versions" = callPackage ({ mkDerivation, base, base-prelude, checkers, deepseq, hashable , megaparsec, microlens, QuickCheck, tasty, tasty-hunit @@ -215948,8 +217111,8 @@ self: { }: mkDerivation { pname = "wai-extra"; - version = "3.0.24.0"; - sha256 = "0dxqvfnm7yr3dvsxr8jdfxaw46as4g6n1jniz2b0gfsjs59h3hkf"; + version = "3.0.24.1"; + sha256 = "0bb6837cgq4p9sn3mkaf6p9kf57k0mvkdjcc1vsnj87nvphls604"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -215967,7 +217130,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "wai-extra_3_0_24_1" = callPackage + "wai-extra_3_0_24_2" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring , bytestring, case-insensitive, containers, cookie , data-default-class, deepseq, directory, fast-logger, hspec @@ -215978,8 +217141,8 @@ self: { }: mkDerivation { pname = "wai-extra"; - version = "3.0.24.1"; - sha256 = "0bb6837cgq4p9sn3mkaf6p9kf57k0mvkdjcc1vsnj87nvphls604"; + version = "3.0.24.2"; + sha256 = "07gcgq59dki5drkjci9ka34xjsy3bqilbsx0lsc4905w9jlyfbci"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -218844,8 +220007,8 @@ self: { }: mkDerivation { pname = "weeder"; - version = "1.0.6"; - sha256 = "07i84ypb0n1qnfcv5y2aksicl36lmxd2bmlmdn2riqj9bhy98vij"; + version = "1.0.8"; + sha256 = "1ylwq1087x6ppn5y5krvl6q6fxcln58y8fwbah3ygp0cpgm4w816"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -219612,22 +220775,6 @@ self: { }: mkDerivation { pname = "wl-pprint-annotated"; - version = "0.1.0.0"; - sha256 = "0c2996x5gdrif1l0lfwlqnka7xp5diac74rckv0jasv2i0333kmp"; - libraryHaskellDepends = [ base containers deepseq text ]; - testHaskellDepends = [ - base containers deepseq tasty tasty-hunit text - ]; - description = "Wadler/Leijen pretty printer with annotations and slightly modernized API"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "wl-pprint-annotated_0_1_0_1" = callPackage - ({ mkDerivation, base, containers, deepseq, tasty, tasty-hunit - , text - }: - mkDerivation { - pname = "wl-pprint-annotated"; version = "0.1.0.1"; sha256 = "1br7qyf27iza213inwhf9bm2k6in0zbmfw6w4clqlc9f9cj2nrkb"; libraryHaskellDepends = [ base containers deepseq text ]; @@ -219636,7 +220783,6 @@ self: { ]; description = "Pretty printer with annotation support"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wl-pprint-ansiterm" = callPackage @@ -219662,23 +220808,6 @@ self: { }: mkDerivation { pname = "wl-pprint-console"; - version = "0.1.0.1"; - sha256 = "1z3h7g5ws83m0h42yfdifyrvzy3j711jk9p1malgd2zp2jmgdix7"; - revision = "1"; - editedCabalFile = "1mlbjjk5mhv3jxzqvfspm07di09pns0xfalhx68k2r39z4lj1fa5"; - libraryHaskellDepends = [ - base bytestring colorful-monoids text wl-pprint-annotated - ]; - description = "Wadler/Leijen pretty printer supporting colorful console output"; - license = stdenv.lib.licenses.mit; - }) {}; - - "wl-pprint-console_0_1_0_2" = callPackage - ({ mkDerivation, base, bytestring, colorful-monoids, text - , wl-pprint-annotated - }: - mkDerivation { - pname = "wl-pprint-console"; version = "0.1.0.2"; sha256 = "05dq90zh2ywmaz0z9vr7114f4c6gacp7b7hlbl3sx31km92v8xnb"; libraryHaskellDepends = [ @@ -219686,7 +220815,6 @@ self: { ]; description = "Wadler/Leijen pretty printer supporting colorful console output"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wl-pprint-extras" = callPackage @@ -220556,20 +221684,6 @@ self: { }: mkDerivation { pname = "writer-cps-mtl"; - version = "0.1.1.4"; - sha256 = "0w2843z499d4nvx8jkq398rzp0zwqp4aydwqidpdrh2xdavv78v2"; - libraryHaskellDepends = [ - base mtl transformers writer-cps-transformers - ]; - description = "MonadWriter orphan instances for writer-cps-transformers"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "writer-cps-mtl_0_1_1_5" = callPackage - ({ mkDerivation, base, mtl, transformers, writer-cps-transformers - }: - mkDerivation { - pname = "writer-cps-mtl"; version = "0.1.1.5"; sha256 = "09snvqwwhp39vmiiz3jpnfyjfhvpcj8ykbnhmii0yclxxsjgamqm"; libraryHaskellDepends = [ @@ -220577,30 +221691,17 @@ self: { ]; description = "MonadWriter orphan instances for writer-cps-transformers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "writer-cps-transformers" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { pname = "writer-cps-transformers"; - version = "0.1.1.3"; - sha256 = "1bjarnjz4v07wnkaqn46mrhxvy2f9anq6aw6lq3cf4xlzlr2i8la"; - libraryHaskellDepends = [ base transformers ]; - description = "WriteT and RWST monad transformers"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "writer-cps-transformers_0_1_1_4" = callPackage - ({ mkDerivation, base, transformers }: - mkDerivation { - pname = "writer-cps-transformers"; version = "0.1.1.4"; sha256 = "1zc5048spzf52gvski34ffvapw5s5yfdj7znv29yr71r4178pw6n"; libraryHaskellDepends = [ base transformers ]; description = "WriteT and RWST monad transformers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wryte" = callPackage @@ -222587,8 +223688,8 @@ self: { }: mkDerivation { pname = "xmobar"; - version = "0.27"; - sha256 = "0agx490q6sbmv3vfq33ys8dsrgwizj3bmha4i1pkxz5wp5q8cx3l"; + version = "0.28"; + sha256 = "1xh87asg8y35srvp7d3gyyy4bkxsw122liihxgzgm8pqv2z3h4zd"; configureFlags = [ "-fwith_alsa" "-fwith_conduit" "-fwith_datezone" "-fwith_dbus" "-fwith_inotify" "-fwith_iwlib" "-fwith_mpd" "-fwith_mpris" @@ -222621,30 +223722,25 @@ self: { "xmonad" = callPackage ({ mkDerivation, base, containers, data-default, directory , extensible-exceptions, filepath, mtl, process, QuickCheck - , semigroups, setlocale, unix, utf8-string, X11 + , setlocale, unix, utf8-string, X11 }: mkDerivation { pname = "xmonad"; - version = "0.14"; - sha256 = "0lq3k0ap7jxrrswpd954mqa6h8diccbif5srcgbmr39y6y8x0mm4"; - revision = "1"; - editedCabalFile = "0jkqbbm8allsaa412h8kdb6v64qcwqnpr2p6qxy21zy0jqdkhkp5"; + version = "0.14.2"; + sha256 = "0gqyivpw8z1x73p1l1fpyq1wc013a1c07r6xn1a82liijs91b949"; isLibrary = true; isExecutable = true; - enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers data-default directory extensible-exceptions - filepath mtl process semigroups setlocale unix utf8-string X11 + filepath mtl process setlocale unix utf8-string X11 ]; executableHaskellDepends = [ base mtl unix X11 ]; testHaskellDepends = [ base containers extensible-exceptions QuickCheck X11 ]; postInstall = '' - shopt -s globstar - mkdir -p $doc/share/man/man1 - mv "$data/"**"/man/"*[0-9] $doc/share/man/man1/ - rm "$data/"**"/man/"* + install -D man/xmonad.1 $doc/share/man/man1/xmonad.1 + install -D man/xmonad.hs $doc/share/doc/$name/sample-xmonad.hs ''; description = "A tiling window manager"; license = stdenv.lib.licenses.bsd3; @@ -222788,6 +223884,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "xmonad-spotify" = callPackage + ({ mkDerivation, base, containers, dbus, X11, xmonad + , xmonad-contrib + }: + mkDerivation { + pname = "xmonad-spotify"; + version = "0.1.0.0"; + sha256 = "1sl26ffaklasgyns8iz4jwm4736vfkflcv3gayn9bvb1kfr6g7rm"; + libraryHaskellDepends = [ + base containers dbus X11 xmonad xmonad-contrib + ]; + description = "Bind media keys to work with Spotify"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "xmonad-utils" = callPackage ({ mkDerivation, base, ghc, random, unix, X11 }: mkDerivation { @@ -222802,21 +223913,22 @@ self: { }) {}; "xmonad-vanessa" = callPackage - ({ mkDerivation, base, composition-prelude, containers, hspec - , process, X11, xmonad, xmonad-contrib + ({ mkDerivation, alsa-mixer, base, composition-prelude, containers + , hspec, process, X11, xmonad, xmonad-contrib, xmonad-spotify + , xmonad-volume }: mkDerivation { pname = "xmonad-vanessa"; - version = "1.0.0.0"; - sha256 = "0ng624nf879da2skkw00m5x1v6kavcb7pkb57sxbq0dbyhpic50f"; + version = "2.0.0.0"; + sha256 = "1j1sd4lvhcg2g5s4bx9pmjnvsj495lksm3v6p4v8y8g5gc488njf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base composition-prelude containers process X11 xmonad + alsa-mixer base composition-prelude containers process X11 xmonad xmonad-contrib ]; executableHaskellDepends = [ - base containers xmonad xmonad-contrib + base containers xmonad xmonad-contrib xmonad-spotify xmonad-volume ]; testHaskellDepends = [ base hspec xmonad ]; description = "Custom xmonad, which builds with stack or cabal"; @@ -222824,6 +223936,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "xmonad-volume" = callPackage + ({ mkDerivation, alsa-mixer, base, composition-prelude, containers + , X11, xmonad + }: + mkDerivation { + pname = "xmonad-volume"; + version = "0.1.0.0"; + sha256 = "0n517ddbjpy6ylg3d1amz7asgc6sww2yy0bxasp0xsd40jc77cfx"; + libraryHaskellDepends = [ + alsa-mixer base composition-prelude containers X11 xmonad + ]; + description = "XMonad volume controls"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "xmonad-wallpaper" = callPackage ({ mkDerivation, base, magic, mtl, random, unix, xmonad }: mkDerivation { @@ -223498,9 +224625,9 @@ self: { "yaml" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring - , conduit, containers, directory, filepath, hspec, HUnit, mockery - , resourcet, scientific, semigroups, template-haskell, temporary - , text, transformers, unordered-containers, vector + , conduit, containers, directory, filepath, hspec, HUnit, libyaml + , mockery, resourcet, scientific, semigroups, template-haskell + , temporary, text, transformers, unordered-containers, vector }: mkDerivation { pname = "yaml"; @@ -223514,6 +224641,7 @@ self: { filepath resourcet scientific semigroups template-haskell text transformers unordered-containers vector ]; + librarySystemDepends = [ libyaml ]; testHaskellDepends = [ aeson attoparsec base base-compat bytestring conduit containers directory filepath hspec HUnit mockery resourcet scientific @@ -223522,36 +224650,38 @@ self: { ]; description = "Support for parsing and rendering YAML documents"; license = stdenv.lib.licenses.bsd3; - }) {}; + }) {inherit (pkgs) libyaml;}; - "yaml_0_9_0" = callPackage + "yaml_0_10_0" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring - , conduit, containers, directory, filepath, hspec, HUnit, mockery - , resourcet, scientific, semigroups, template-haskell, temporary - , text, transformers, unordered-containers, vector + , conduit, containers, directory, filepath, hspec, HUnit, libyaml + , mockery, mtl, raw-strings-qq, resourcet, scientific, semigroups + , template-haskell, temporary, text, transformers + , unordered-containers, vector }: mkDerivation { pname = "yaml"; - version = "0.9.0"; - sha256 = "05mw3d6k2dahdsajghgbqhlk84x6iym6bci1g1qhpy4k2cfjyjzc"; + version = "0.10.0"; + sha256 = "0kyfzcp3hlb44rpf28ipz0m5cpanj91hlhvr9kidvg71826s9xcm"; configureFlags = [ "-fsystem-libyaml" ]; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson attoparsec base bytestring conduit containers directory - filepath resourcet scientific semigroups template-haskell text + filepath mtl resourcet scientific semigroups template-haskell text transformers unordered-containers vector ]; + librarySystemDepends = [ libyaml ]; testHaskellDepends = [ aeson attoparsec base base-compat bytestring conduit containers - directory filepath hspec HUnit mockery resourcet scientific - semigroups template-haskell temporary text transformers + directory filepath hspec HUnit mockery mtl raw-strings-qq resourcet + scientific semigroups template-haskell temporary text transformers unordered-containers vector ]; description = "Support for parsing and rendering YAML documents"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + }) {inherit (pkgs) libyaml;}; "yaml-combinators" = callPackage ({ mkDerivation, aeson, base, bytestring, doctest, generics-sop @@ -224678,8 +225808,8 @@ self: { pname = "yesod-bin"; version = "1.6.0.3"; sha256 = "1p5f6bl4gynm47m1xg1x1xh9nz913i83iprh2xd207359idjknz4"; - revision = "2"; - editedCabalFile = "0h4nam6zkhz7km0z5z3zngnrgif7a42llvh013iava171kadn8xp"; + revision = "3"; + editedCabalFile = "0v3bwg26ghxa1wdvwyvrffd8wwxhv1qk9g8f64ax1n8gz53k6an7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -227494,6 +228624,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "zeromq4-simple" = callPackage + ({ mkDerivation, aeson, base, bytestring, constraints, hashable + , uuid, zeromq4-haskell + }: + mkDerivation { + pname = "zeromq4-simple"; + version = "0.0.0"; + sha256 = "04i8ksdyf19yywjb0gfkbc0mx90vzvrld5ba7lbnlxvx6iwmah66"; + libraryHaskellDepends = [ + aeson base bytestring constraints hashable uuid zeromq4-haskell + ]; + description = "More constrained extensions to zeromq4-haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "zeroth" = callPackage ({ mkDerivation, base, Cabal, derive, directory, filepath , haskell-src-exts, hskeleton, monoid-record, process, syb diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix index 54616abc4ba..106b66c6b41 100644 --- a/pkgs/development/haskell-modules/lib.nix +++ b/pkgs/development/haskell-modules/lib.nix @@ -234,6 +234,7 @@ rec { */ justStaticExecutables = drv: overrideCabal drv (drv: { enableSharedExecutables = false; + enableLibraryProfiling = false; isLibrary = false; doHaddock = false; postFixup = "rm -rf $out/lib $out/nix-support $out/share/doc"; diff --git a/pkgs/development/haskell-modules/patches/hunspell.patch b/pkgs/development/haskell-modules/patches/hunspell.patch new file mode 100644 index 00000000000..cc115029a7a --- /dev/null +++ b/pkgs/development/haskell-modules/patches/hunspell.patch @@ -0,0 +1,30 @@ +diff -Naur hunspell-hs-0.1.0.0.orig/hunspell-hs.cabal hunspell-hs-0.1.0.0/hunspell-hs.cabal +--- hunspell-hs-0.1.0.0.orig/hunspell-hs.cabal 2018-08-26 20:23:33.053763300 +0200 ++++ hunspell-hs-0.1.0.0/hunspell-hs.cabal 2018-08-26 20:42:05.886074510 +0200 +@@ -37,7 +37,7 @@ + base >=4.7 && <5 + , stm + if os(linux) +- extra-libraries: ++ pkgconfig-depends: + hunspell + if os(darwin) + include-dirs: +@@ -63,7 +63,7 @@ + , hunspell-hs + , stm + if os(linux) +- extra-libraries: ++ pkgconfig-depends: + hunspell + if os(darwin) + include-dirs: +@@ -88,7 +88,7 @@ + , hunspell-hs + , stm + if os(linux) +- extra-libraries: ++ pkgconfig-depends: + hunspell + if os(darwin) + include-dirs: diff --git a/pkgs/development/haskell-modules/patches/xmonad-nix.patch b/pkgs/development/haskell-modules/patches/xmonad-nix.patch index 2a9ec4bfedf..cce011347f4 100644 --- a/pkgs/development/haskell-modules/patches/xmonad-nix.patch +++ b/pkgs/development/haskell-modules/patches/xmonad-nix.patch @@ -1,8 +1,8 @@ diff --git a/src/XMonad/Core.hs b/src/XMonad/Core.hs -index 138d735..65b5a84 100644 +index 7810522..3262934 100644 --- a/src/XMonad/Core.hs +++ b/src/XMonad/Core.hs -@@ -51,6 +51,7 @@ import System.Posix.Types (ProcessID) +@@ -53,6 +53,7 @@ import System.Posix.Types (ProcessID) import System.Process import System.Directory import System.Exit @@ -10,7 +10,7 @@ index 138d735..65b5a84 100644 import Graphics.X11.Xlib import Graphics.X11.Xlib.Extras (getWindowAttributes, WindowAttributes, Event) import Data.Typeable -@@ -571,6 +572,7 @@ recompile force = io $ do +@@ -601,6 +602,7 @@ recompile force = io $ do lib = cfgdir </> "lib" buildscript = cfgdir </> "build" @@ -18,7 +18,7 @@ index 138d735..65b5a84 100644 libTs <- mapM getModTime . Prelude.filter isSource =<< allFiles lib srcT <- getModTime src binT <- getModTime bin -@@ -586,7 +588,7 @@ recompile force = io $ do +@@ -643,7 +645,7 @@ recompile force = io $ do status <- bracket (openFile err WriteMode) hClose $ \errHandle -> waitForProcess =<< if useBuildscript then compileScript bin cfgdir buildscript errHandle @@ -27,24 +27,24 @@ index 138d735..65b5a84 100644 -- re-enable SIGCHLD: installSignalHandlers -@@ -594,6 +596,7 @@ recompile force = io $ do - -- now, if it fails, run xmessage to let the user know: - when (status /= ExitSuccess) $ do - ghcErr <- readFile err -+ xmessage <- fromMaybe "xmessage" <$> liftIO (lookupEnv "XMONAD_XMESSAGE") - let msg = unlines $ - ["Error detected while loading xmonad configuration file: " ++ src] - ++ lines (if null ghcErr then show status else ghcErr) -@@ -601,7 +604,7 @@ recompile force = io $ do - -- nb, the ordering of printing, then forking, is crucial due to - -- lazy evaluation - hPutStrLn stderr msg -- forkProcess $ executeFile "xmessage" True ["-default", "okay", replaceUnicode msg] Nothing -+ forkProcess $ executeFile xmessage True ["-default", "okay", replaceUnicode msg] Nothing - return () +@@ -653,6 +655,7 @@ recompile force = io $ do + then trace "XMonad recompilation process exited with success!" + else do + ghcErr <- readFile err ++ xmessage <- fromMaybe "xmessage" <$> liftIO (lookupEnv "XMONAD_XMESSAGE") + let msg = unlines $ + ["Error detected while loading xmonad configuration file: " ++ src] + ++ lines (if null ghcErr then show status else ghcErr) +@@ -660,7 +663,7 @@ recompile force = io $ do + -- nb, the ordering of printing, then forking, is crucial due to + -- lazy evaluation + hPutStrLn stderr msg +- forkProcess $ executeFile "xmessage" True ["-default", "okay", replaceUnicode msg] Nothing ++ forkProcess $ executeFile xmessage True ["-default", "okay", replaceUnicode msg] Nothing + return () return (status == ExitSuccess) else return True -@@ -619,16 +622,16 @@ recompile force = io $ do +@@ -678,16 +681,16 @@ recompile force = io $ do '\8216' -> '`' -- ‘ '\8217' -> '`' -- ’ _ -> c diff --git a/pkgs/development/interpreters/elixir/1.7.nix b/pkgs/development/interpreters/elixir/1.7.nix index 321a41f50e1..d97d416bc27 100644 --- a/pkgs/development/interpreters/elixir/1.7.nix +++ b/pkgs/development/interpreters/elixir/1.7.nix @@ -1,7 +1,7 @@ { mkDerivation }: mkDerivation rec { - version = "1.7.2"; - sha256 = "0wnrx6wlpmr23ypm8za0c4dl952nj4rjylcsdzz0xrma92ylrqfq"; + version = "1.7.3"; + sha256 = "0d7rj4khmvy76z12njzwzknm1j9rhjadgj9k1chjd4gnjffkb1aa"; minimumOTPVersion = "19"; } diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index d002f6eb31c..e8b6cc93c2c 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -36,7 +36,7 @@ in stdenv.mkDerivation rec { name = "racket-${version}"; - version = "6.12"; + version = "7.0"; src = (stdenv.lib.makeOverridable ({ name, sha256 }: fetchurl rec { @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { } )) { inherit name; - sha256 = "0cwcypzjfl9py1s695mhqkiapff7c1w29llsmdj7qgn58wl0apk5"; + sha256 = "1glv5amsp9xp480d4yr63hhm9kkyav06yl3a6p489nkr4cln0j9a"; }; FONTCONFIG_FILE = fontsConf; diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index c61e960e051..16ba6b32382 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, cmake, openblasCompat, superlu, hdf5 }: stdenv.mkDerivation rec { - version = "8.600.0"; + version = "9.100.5"; name = "armadillo-${version}"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "0h3bj93s7pr7nfwgjx6c49hgf6jlp5ninp921a8krhkzx4swf02z"; + sha256 = "1ka1vd9fcmvp12qkcm4888dkfqwnalvv00x04wy29f3nx3qwczby"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 9f41bf1af47..9afb03e0d0c 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -15,13 +15,13 @@ let else throw "Unsupported system!"; in stdenv.mkDerivation rec { name = "aws-sdk-cpp-${version}"; - version = "1.4.82"; + version = "1.5.17"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-sdk-cpp"; rev = version; - sha256 = "1m5xylcwx5vhz0q3srlq9rbr4x9kydd77mf45agd60clq25sxs69"; + sha256 = "0mmzf3js6090kk9vdwrmib5cjny43mqf044iynkhkglzvwhadc8z"; }; # FIXME: might be nice to put different APIs in different outputs diff --git a/pkgs/development/libraries/cmrt/default.nix b/pkgs/development/libraries/cmrt/default.nix new file mode 100644 index 00000000000..8044d7165f7 --- /dev/null +++ b/pkgs/development/libraries/cmrt/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, autoreconfHook, pkgconfig, libdrm, libva }: + +stdenv.mkDerivation rec { + name = "cmrt-${version}"; + version = "1.0.6"; + + src = fetchurl { + url = "https://github.com/intel/cmrt/archive/${version}.tar.gz"; + sha256 = "1q7651nvvcqhph5rgfhklm71zqd0c405mrh3wx0cfzvil82yj8na"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + + buildInputs = [ libdrm libva ]; + + meta = with stdenv.lib; { + homepage = https://01.org/linuxmedia; + description = "Intel C for Media Runtime"; + longDescription = "Media GPU kernel manager for Intel G45 & HD Graphics family"; + license = licenses.mit; + maintainers = with maintainers; [ tadfisher ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/granite/default.nix b/pkgs/development/libraries/granite/default.nix index b8f35c8539a..1ee0970ffad 100644 --- a/pkgs/development/libraries/granite/default.nix +++ b/pkgs/development/libraries/granite/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "granite-${version}"; - version = "5.0"; + version = "5.1.0"; src = fetchFromGitHub { owner = "elementary"; repo = "granite"; rev = version; - sha256 = "015hkclcxirssg7a8s6mkns5xdk77m1jnkshlyfdw041nzyc5jh1"; + sha256 = "1v1yhz6rp616xi417m9r8072s6mpz5i8vkdyj264b73p0lgjwh40"; }; cmakeFlags = [ diff --git a/pkgs/development/libraries/hamlib/default.nix b/pkgs/development/libraries/hamlib/default.nix index 9825d6ed64a..b9cd31432fc 100644 --- a/pkgs/development/libraries/hamlib/default.nix +++ b/pkgs/development/libraries/hamlib/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { pname = "hamlib"; - version = "3.2"; + version = "3.3"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/${pname}/${name}.tar.gz"; - sha256 = "07ddsykbliiv0p717z1h5vzmvsx6lm75j32rhvmwqxp8m3kbap5m"; + sha256 = "10788mgrhbc57zpzakcxv5aqnr2819pcshml6fbh8zvnkja562y9"; }; buildInputs = [ perl perlPackages.ExtUtilsMakeMaker python2 swig gd libxml2 diff --git a/pkgs/development/libraries/ilmbase/default.nix b/pkgs/development/libraries/ilmbase/default.nix index 156b4f72749..3989e941b6b 100644 --- a/pkgs/development/libraries/ilmbase/default.nix +++ b/pkgs/development/libraries/ilmbase/default.nix @@ -1,16 +1,18 @@ { stdenv, fetchurl, automake, autoconf, libtool, which }: stdenv.mkDerivation rec { - name = "ilmbase-2.2.1"; + name = "ilmbase-${version}"; + version = "2.3.0"; src = fetchurl { - url = "http://download.savannah.nongnu.org/releases/openexr/${name}.tar.gz"; - sha256 = "17k0hq19wplx9s029kjrq6c51x2ryrfmaavcappkd0g67gk0dhna"; + url = "https://github.com/openexr/openexr/releases/download/v${version}/${name}.tar.gz"; + sha256 = "0qiq5bqq9rxhqjiym2k36sx4vq8adgrz6xf6qwizi9bqm78phsa5"; }; outputs = [ "out" "dev" ]; preConfigure = '' + patchShebangs ./bootstrap ./bootstrap ''; diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index d780fc30a4c..ea8f30f0bba 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -173,6 +173,7 @@ let kxmlgui = callPackage ./kxmlgui.nix {}; kxmlrpcclient = callPackage ./kxmlrpcclient.nix {}; plasma-framework = callPackage ./plasma-framework.nix {}; + kpurpose = callPackage ./purpose.nix {}; # TIER 4 frameworkintegration = callPackage ./frameworkintegration.nix {}; diff --git a/pkgs/development/libraries/kde-frameworks/purpose.nix b/pkgs/development/libraries/kde-frameworks/purpose.nix new file mode 100644 index 00000000000..147c4123a10 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks/purpose.nix @@ -0,0 +1,14 @@ +{ + mkDerivation, lib, extra-cmake-modules, qtbase +, qtdeclarative, kconfig, kcoreaddons, ki18n, kio +}: + +mkDerivation { + name = "purpose"; + meta = { maintainers = [ lib.maintainers.bkchr ]; }; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ + qtbase qtdeclarative kconfig kcoreaddons + ki18n kio + ]; +} diff --git a/pkgs/development/libraries/lensfun/default.nix b/pkgs/development/libraries/lensfun/default.nix index 21cdd9cd096..824c685ce93 100644 --- a/pkgs/development/libraries/lensfun/default.nix +++ b/pkgs/development/libraries/lensfun/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, glib, zlib, libpng, gnumake3, cmake }: stdenv.mkDerivation rec { - version = "0.3.2"; + version = "0.3.95"; name = "lensfun-${version}"; src = fetchurl { url = "mirror://sourceforge/lensfun/${version}/${name}.tar.gz"; - sha256 = "0cfk8jjhs9nbfjfdy98plrj9ayi59aph0nx6ppslgjhlcvacm2xf"; + sha256 = "0218f3xrlln0jmh4gcf1zbpvi2bidgl3b2mblf6c810n7j1rrhl2"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libgrss/default.nix b/pkgs/development/libraries/libgrss/default.nix new file mode 100644 index 00000000000..548114b642f --- /dev/null +++ b/pkgs/development/libraries/libgrss/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl, pkgconfig, vala, gobjectIntrospection, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, libxml2, libsoup, gnome3 }: + +let + version = "0.7.0"; + pname = "libgrss"; +in +stdenv.mkDerivation { + name = "${pname}-${version}"; + + outputs = [ "out" "dev" "devdoc" ]; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1nalslgyglvhpva3px06fj6lv5zgfg0qmj0sbxyyl5d963vc02b7"; + }; + + nativeBuildInputs = [ pkgconfig vala gobjectIntrospection gtk-doc docbook_xsl docbook_xml_dtd_412 ]; + buildInputs = [ glib libxml2 libsoup ]; + + configureFlags = [ + "--enable-gtk-doc" + ]; + + doCheck = true; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + + meta = with stdenv.lib; { + description = "Glib abstaction to handle feeds in RSS, Atom and other formats"; + homepage = https://wiki.gnome.org/Projects/Libgrss; + license = licenses.lgpl3Plus; + maintainers = gnome3.maintainers; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/libmanette/default.nix b/pkgs/development/libraries/libmanette/default.nix new file mode 100644 index 00000000000..51d2e49eb35 --- /dev/null +++ b/pkgs/development/libraries/libmanette/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, ninja, meson, pkgconfig, vala, gobjectIntrospection +, glib, libgudev, libevdev, gnome3 }: + +let + version = "0.2.1"; + pname = "libmanette"; +in +stdenv.mkDerivation { + name = "${pname}-${version}"; + + outputs = [ "out" "dev" ]; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "14vqz30p4693yy3yxs0gj858x25sl2kawib1g9lj8g5frgl0hd82"; + }; + + nativeBuildInputs = [ meson ninja pkgconfig vala gobjectIntrospection ]; + buildInputs = [ glib libgudev libevdev ]; + + doCheck = true; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + + meta = with stdenv.lib; { + description = "A simple GObject game controller library"; + homepage = https://wiki.gnome.org/Apps/Builder; + license = licenses.lgpl21Plus; + maintainers = gnome3.maintainers; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/libndtypes/default.nix b/pkgs/development/libraries/libndtypes/default.nix new file mode 100644 index 00000000000..685518efbd2 --- /dev/null +++ b/pkgs/development/libraries/libndtypes/default.nix @@ -0,0 +1,25 @@ +{ lib +, stdenv +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + name = "libndtypes-${version}"; + version = "0.2.0dev3"; + + src = fetchFromGitHub { + owner = "plures"; + repo = "ndtypes"; + rev = "v${version}"; + sha256 = "0dpvv13mrid8l5zkjlz18qvirz3nr0v98agx9bcvkqbiahlfgjli"; + }; + + makeFlags = [ "CONFIGURE_LDFLAGS='-shared'" ]; + + meta = { + description = "Dynamic types for data description and in-memory computations"; + homepage = https://xnd.io/; + license = lib.licenses.bsdOriginal; + maintainers = with lib.maintainers; [ costrouc ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/libraries/libtensorflow/default.nix b/pkgs/development/libraries/libtensorflow/default.nix index e6cd140c4e4..b4e616409c4 100644 --- a/pkgs/development/libraries/libtensorflow/default.nix +++ b/pkgs/development/libraries/libtensorflow/default.nix @@ -31,19 +31,19 @@ let in stdenv.mkDerivation rec { pname = "libtensorflow"; - version = "1.9.0"; + version = "1.10.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://storage.googleapis.com/tensorflow/${pname}/${pname}-${tfType}-${system}-${version}.tar.gz"; sha256 = if system == "linux-x86_64" then if cudaSupport - then "1q3mh06x344im25z7r3vgrfksfdsi8fh8ldn6y2mf86h4d11yxc3" - else "0l9ps115ng5ffzdwphlqmj3jhidps2v5afppdzrbpzmy41xz0z21" + then "0v66sscxpyixjrf9yjshl001nix233i6chc61akx0kx7ial4l1wn" + else "11sbpcbgdzj8v17mdppfv7v1fn3nbzkdad60gc42y2j6knjbmwxb" else if system == "darwin-x86_64" then if cudaSupport then unavailable - else "1qj0v1706w6mczycdsh38h2glyv5d25v62kdn98wxd5rw8f9v657" + else "11p0f77m4wycpc024mh7jx0kbdhgm0wp6ir6dsa8lkcpdb59bn59" else unavailable; }; diff --git a/pkgs/development/libraries/libxnd/default.nix b/pkgs/development/libraries/libxnd/default.nix new file mode 100644 index 00000000000..c99c3f42bfc --- /dev/null +++ b/pkgs/development/libraries/libxnd/default.nix @@ -0,0 +1,31 @@ +{ lib +, stdenv +, fetchFromGitHub +, libndtypes +}: + +stdenv.mkDerivation rec { + name = "libxnd-${version}"; + version = "0.2.0dev3"; + + src = fetchFromGitHub { + owner = "plures"; + repo = "xnd"; + rev = "v${version}"; + sha256 = "0byq7jspyr2wxrhihw4q7nf0y4sb6j5ax0ndd5dnq5dz88c7qqm2"; + }; + + buildInputs = [ libndtypes ]; + + configureFlags = [ "XND_INCLUDE='-I${libndtypes}/include'" + "XND_LINK='-L${libndtypes}/lib'" ]; + + makeFlags = [ "CONFIGURE_LDFLAGS='-shared'" ]; + + meta = { + description = "General container that maps a wide range of Python values directly to memory"; + homepage = https://xnd.io/; + license = lib.licenses.bsdOriginal; + maintainers = with lib.maintainers; [ costrouc ]; + }; +} diff --git a/pkgs/development/libraries/libyaml/default.nix b/pkgs/development/libraries/libyaml/default.nix index 45e15c82966..671c077b034 100644 --- a/pkgs/development/libraries/libyaml/default.nix +++ b/pkgs/development/libraries/libyaml/default.nix @@ -1,16 +1,31 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, fetchpatch }: + let - # 0.2.1 broke the tests of pythonPackages.pyyaml 3.13 - version = "0.1.7"; + + version = "0.2.1"; + + # https://github.com/yaml/pyyaml/issues/214 + p1 = fetchpatch { + url = https://github.com/yaml/libyaml/commit/8ee83c0da22fe9aa7dea667be8f899a7e32ffb83.patch; + sha256 = "00jh39zww6s4gyhxfmlxwb6lz90nl3p51k5h1qm6z3ymik5vljmz"; + }; + p2 = fetchpatch { + url = https://github.com/yaml/libyaml/commit/56f4b17221868593d6903ee58d6d679b690cf4df.patch; + sha256 = "0najcay1y4kgfpsidj7dnyafnwjbav5jyawhyv215zl9gg3386n0"; + }; + in + stdenv.mkDerivation { name = "libyaml-${version}"; src = fetchurl { url = "https://pyyaml.org/download/libyaml/yaml-${version}.tar.gz"; - sha256 = "0a87931cx5m14a1x8rbjix3nz7agrcgndf4h392vm62a4rby9240"; + sha256 = "1karpcfgacgppa82wm2drcfn2kb6q2wqfykf5nrhy20sci2i2a3q"; }; + patches = [ p1 p2 ]; # remove when the next release comes out + meta = with stdenv.lib; { homepage = https://pyyaml.org/; description = "A YAML 1.1 parser and emitter written in C"; diff --git a/pkgs/development/libraries/mac/default.nix b/pkgs/development/libraries/mac/default.nix new file mode 100644 index 00000000000..8a8a004a5e6 --- /dev/null +++ b/pkgs/development/libraries/mac/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, fetchpatch, yasm }: + +stdenv.mkDerivation rec { + name = "mac-${version}"; + version = "4.11-u4-b5-s7"; + + src = fetchurl { + url = "https://www.deb-multimedia.org/pool/main/m/monkeys-audio/monkeys-audio_${version}.orig.tar.gz"; + sha256 = "16i96cw5r3xbsivjigqp15vv32wa38k86mxq11qx1pzmpryqpqkk"; + }; + + patches = [ + (fetchpatch { + name = "mac-4.11.4.5.7-gcc6.patch"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-sound/mac/files/mac-4.11.4.5.7-gcc6.patch?id=1bd4e0e30e4d8a8862217d7067323851b34c7fe4"; + sha256 = "093b8m8p8s6dmc62fc8vb4hlmjc2ncb4rdgc82g0a8gg6w5kcj8x"; + }) + (fetchpatch { + name = "mac-4.11.4.5.7-output.patch"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-sound/mac/files/mac-4.11.4.5.7-output.patch?id=1bd4e0e30e4d8a8862217d7067323851b34c7fe4"; + sha256 = "0njmwj6d9jqi4pz4fax02w37gk22vda0grszrs2nn97zzmjl36zk"; + }) + ]; + + CXXFLAGS = "-DSHNTOOL"; + + nativeBuildInputs = [ yasm ]; + + meta = with stdenv.lib; { + description = "APE codec and decompressor"; + homepage = http://www.deb-multimedia.org/dists/testing/main/binary-amd64/package/monkeys-audio.php; + license = licenses.unfreeRedistributable; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ jfrankenau ]; + }; +} diff --git a/pkgs/development/libraries/nlohmann_json/default.nix b/pkgs/development/libraries/nlohmann_json/default.nix index 8db3a3d92ff..0221722e487 100644 --- a/pkgs/development/libraries/nlohmann_json/default.nix +++ b/pkgs/development/libraries/nlohmann_json/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "nlohmann_json-${version}"; - version = "3.1.2"; + version = "3.2.0"; src = fetchFromGitHub { owner = "nlohmann"; repo = "json"; rev = "v${version}"; - sha256 = "1mpr781fb2dfbyscrr7nil75lkxsazg4wkm749168lcf2ksrrbfi"; + sha256 = "0585r6ai9x1bhspffn5w5620wxfl1q1gj476brsnaf7wwnr60hwk"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/opencolorio/default.nix b/pkgs/development/libraries/opencolorio/default.nix index 3b0e60fca39..751d845f773 100644 --- a/pkgs/development/libraries/opencolorio/default.nix +++ b/pkgs/development/libraries/opencolorio/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "opencolorio-${version}"; - version = "1.0.9"; + version = "1.1.0"; src = fetchurl { url = "https://github.com/imageworks/OpenColorIO/archive/v1.0.9.zip"; - sha256 = "14j80dgbb6f09z63aqh2874vhzpga6zksz8jmqnj1zh87x15pqnr"; + sha256 = "1vi5pcgj7gv8fp6cdnhszwfh7lh38rl2rk4c5yzsvmgcb7xf48bx"; }; outputs = [ "bin" "out" "dev" ]; diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix index 293274a5776..bb9d163dc4a 100644 --- a/pkgs/development/libraries/openexr/default.nix +++ b/pkgs/development/libraries/openexr/default.nix @@ -1,11 +1,12 @@ { lib, stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, zlib, ilmbase }: stdenv.mkDerivation rec { - name = "openexr-${lib.getVersion ilmbase}"; + name = "openexr-${version}"; + version = lib.getVersion ilmbase; src = fetchurl { - url = "http://download.savannah.nongnu.org/releases/openexr/${name}.tar.gz"; - sha256 = "1kdf2gqznsdinbd5vcmqnif442nyhdf9l7ckc51410qm2gv5m6lg"; + url = "https://github.com/openexr/openexr/releases/download/v${version}/${name}.tar.gz"; + sha256 = "19jywbs9qjvsbkvlvzayzi81s976k53wg53vw4xj66lcgylb6v7x"; }; patches = [ @@ -15,6 +16,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "doc" ]; preConfigure = '' + patchShebangs ./bootstrap ./bootstrap ''; diff --git a/pkgs/development/libraries/opensubdiv/default.nix b/pkgs/development/libraries/opensubdiv/default.nix index 51270427397..614df6fb063 100644 --- a/pkgs/development/libraries/opensubdiv/default.nix +++ b/pkgs/development/libraries/opensubdiv/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "opensubdiv-${version}"; - version = "3.3.2"; + version = "3.3.3"; src = fetchFromGitHub { owner = "PixarAnimationStudios"; repo = "OpenSubdiv"; rev = "v${lib.replaceChars ["."] ["_"] version}"; - sha256 = "0j3vh52w1pnld2a2cm6z7iicni1f617qzg0d8xh3p7l0s2dxjibh"; + sha256 = "1rld4hgl9yrbnk5sd6bhvnm8jdnqq09hq93hrmx0nhccccximi9z"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/openvdb/default.nix b/pkgs/development/libraries/openvdb/default.nix index be28c84e3e4..c11a93373dd 100644 --- a/pkgs/development/libraries/openvdb/default.nix +++ b/pkgs/development/libraries/openvdb/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "openvdb-${version}"; - version = "5.1.0"; + version = "5.2.0"; src = fetchFromGitHub { owner = "dreamworksanimation"; repo = "openvdb"; rev = "v${version}"; - sha256 = "1als53dnbnwa66k16vy95h1rhpdzz6i80c0gc2g3i17qbasl6ni5"; + sha256 = "1yykrbc3nnnmpmmk0dz4b4y5xl4hl3ayjpqw0baq8yx2614r46b5"; }; outputs = [ "out" ]; diff --git a/pkgs/development/libraries/pkcs11helper/default.nix b/pkgs/development/libraries/pkcs11helper/default.nix index 3667aa69635..5cf5d34b9af 100644 --- a/pkgs/development/libraries/pkcs11helper/default.nix +++ b/pkgs/development/libraries/pkcs11helper/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "pkcs11-helper-${version}"; - version = "1.25"; + version = "1.25.1"; src = fetchFromGitHub { owner = "OpenSC"; repo = "pkcs11-helper"; rev = "${name}"; - sha256 = "1m7vd3f9dphcwnwz4vn2gh7byxzjfc836z0lg440yrilww20yhpy"; + sha256 = "1nvj6kdbps860kw64m2rz3v2slyn7jkagfdmskrl6966n99iy2ns"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix index 0aa39532325..79deb482161 100644 --- a/pkgs/development/libraries/qpdf/default.nix +++ b/pkgs/development/libraries/qpdf/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, fetchpatch, libjpeg, zlib, perl }: -let version = "8.1.0"; +let version = "8.2.1"; in stdenv.mkDerivation rec { name = "qpdf-${version}"; src = fetchurl { url = "mirror://sourceforge/qpdf/qpdf/${version}/${name}.tar.gz"; - sha256 = "1m3hcgip6bzjx4gd7wq1328p8zi3pq5savzncdyln6l0lcklh7vx"; + sha256 = "1jdb0jj72fjdp6xip4m7yz31r5x13zs7h4smnxsycgw3vbmx6igl"; }; nativeBuildInputs = [ perl ]; diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index 7d342330491..aae15c62d73 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -13,6 +13,7 @@ , systemd , enableProprietaryCodecs ? true , gn, darwin, openbsm +, ffmpeg ? null , lib, stdenv # lib.optional, needsPax }: @@ -115,7 +116,9 @@ EOF fi ''; - qmakeFlags = optional enableProprietaryCodecs "-- -proprietary-codecs"; + qmakeFlags = if stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64 + then [ "--" "-system-ffmpeg" ] ++ optional enableProprietaryCodecs "-proprietary-codecs" + else optional enableProprietaryCodecs "-- -proprietary-codecs"; propagatedBuildInputs = [ # Image formats @@ -131,6 +134,8 @@ EOF harfbuzz icu libevent + ] ++ optionals (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) [ + ffmpeg ] ++ optionals (!stdenv.isDarwin) [ dbus zlib minizip snappy nss protobuf jsoncpp diff --git a/pkgs/development/libraries/qtkeychain/default.nix b/pkgs/development/libraries/qtkeychain/default.nix index 15be8490c1e..220c6241096 100644 --- a/pkgs/development/libraries/qtkeychain/default.nix +++ b/pkgs/development/libraries/qtkeychain/default.nix @@ -9,13 +9,13 @@ assert stdenv.isDarwin -> darwin != null; stdenv.mkDerivation rec { name = "qtkeychain-${if withQt5 then "qt5" else "qt4"}-${version}"; - version = "0.9.0"; # verify after nix-build with `grep -R "set(PACKAGE_VERSION " result/` + version = "0.9.1"; # verify after nix-build with `grep -R "set(PACKAGE_VERSION " result/` src = fetchFromGitHub { owner = "frankosterfeld"; repo = "qtkeychain"; rev = "v${version}"; - sha256 = "1vff0jrycq6c204ch0w7fix5bsv90aw8pl9yiicx9r5ady0i29m7"; # v0.9.0 + sha256 = "0h4wgngn2yl35hapbjs24amkjfbzsvnna4ixfhn87snjnq5lmjbc"; # v0.9.1 }; cmakeFlags = [ "-DQT_TRANSLATIONS_DIR=share/qt/translations" ] diff --git a/pkgs/development/libraries/udunits/default.nix b/pkgs/development/libraries/udunits/default.nix index b02ac885237..664bc29a72d 100644 --- a/pkgs/development/libraries/udunits/default.nix +++ b/pkgs/development/libraries/udunits/default.nix @@ -1,22 +1,26 @@ -{ stdenv, fetchurl, - bison, flex, expat, file +{ stdenv, fetchFromGitHub, autoreconfHook, + texinfo, bison, flex, expat, file }: stdenv.mkDerivation rec { - name = "udunits-2.2.26"; - src = fetchurl { - url = "ftp://ftp.unidata.ucar.edu/pub/udunits/${name}.tar.gz"; - sha256 = "0v9mqw4drnkzkm57331ail6yvs9485jmi37s40lhvmf7r5lli3rn"; - }; + name = "udunits-${version}"; + version = "2.2.27.6"; + + src = fetchFromGitHub { + owner = "Unidata"; + repo = "UDUNITS-2"; + rev = "v${version}"; + sha256 = "0621pac24c842dyipzaa59rh6pza9phdqi3snd4cq4pib0wjw6gm"; + }; - nativeBuildInputs = [ bison flex file ]; - buildInputs = [ expat ]; + nativeBuildInputs = [ autoreconfHook texinfo bison flex file ]; + buildInputs = [ expat ]; - meta = with stdenv.lib; { - homepage = https://www.unidata.ucar.edu/software/udunits/; - description = "A C-based package for the programatic handling of units of physical quantities"; - license = licenses.bsdOriginal; - platforms = platforms.linux; - maintainers = with maintainers; [ pSub ]; - }; + meta = with stdenv.lib; { + homepage = https://www.unidata.ucar.edu/software/udunits/; + description = "A C-based package for the programatic handling of units of physical quantities"; + license = licenses.bsdOriginal; + platforms = platforms.linux; + maintainers = with maintainers; [ pSub ]; + }; } diff --git a/pkgs/development/libraries/vaapi-intel-hybrid/default.nix b/pkgs/development/libraries/vaapi-intel-hybrid/default.nix new file mode 100644 index 00000000000..56ded2c5644 --- /dev/null +++ b/pkgs/development/libraries/vaapi-intel-hybrid/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchurl, autoreconfHook, pkgconfig, cmrt, libdrm, libva, libX11, libGL, wayland }: + +stdenv.mkDerivation rec { + name = "intel-hybrid-driver-${version}"; + version = "1.0.2"; + + src = fetchurl { + url = "https://github.com/01org/intel-hybrid-driver/archive/${version}.tar.gz"; + sha256 = "0ywdhbvzwzzrq4qhylnw1wc8l3j67h26l0cs1rncwhw05s3ndk8n"; + }; + + patches = [ + # driver_init: load libva-x11.so for any ABI version + (fetchurl { + url = https://github.com/01org/intel-hybrid-driver/pull/26.diff; + sha256 = "1ql4mbi5x1d2a5c8mkjvciaq60zj8nhx912992winbhfkyvpb3gx"; + }) + ]; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + + buildInputs = [ cmrt libdrm libva libX11 libGL wayland ]; + + enableParallelBuilding = true; + + configureFlags = [ + "--enable-drm" + "--enable-x11" + "--enable-wayland" + ]; + + postPatch = '' + patchShebangs ./src/shaders/gpp.py + ''; + + preConfigure = '' + sed -i -e "s,LIBVA_DRIVERS_PATH=.*,LIBVA_DRIVERS_PATH=$out/lib/dri," configure + ''; + + meta = with stdenv.lib; { + homepage = https://01.org/linuxmedia; + description = "Intel driver for the VAAPI library with partial HW acceleration"; + license = licenses.mit; + maintainers = with maintainers; [ tadfisher ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/vaapi-intel/default.nix b/pkgs/development/libraries/vaapi-intel/default.nix index 4e729db4671..ba763e33490 100644 --- a/pkgs/development/libraries/vaapi-intel/default.nix +++ b/pkgs/development/libraries/vaapi-intel/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook, gnum4, pkgconfig, python2 , intel-gpu-tools, libdrm, libva, libX11, libGL, wayland, libXext +, enableHybridCodec ? false, vaapi-intel-hybrid }: stdenv.mkDerivation rec { @@ -7,8 +8,8 @@ stdenv.mkDerivation rec { inherit (libva) version; src = fetchFromGitHub { - owner = "01org"; - repo = "libva-intel-driver"; + owner = "intel"; + repo = "intel-vaapi-driver"; rev = version; sha256 = "15ag4al9h6b8f8sw1zpighyhsmr5qfqp1882q7r3gsh5g4cnj763"; }; @@ -21,20 +22,25 @@ stdenv.mkDerivation rec { sed -i -e "s,LIBVA_DRIVERS_PATH=.*,LIBVA_DRIVERS_PATH=$out/lib/dri," configure ''; + postInstall = stdenv.lib.optionalString enableHybridCodec '' + ln -s ${vaapi-intel-hybrid}/lib/dri/* $out/lib/dri/ + ''; + configureFlags = [ "--enable-drm" "--enable-x11" "--enable-wayland" - ]; + ] ++ stdenv.lib.optional enableHybridCodec "--enable-hybrid-codec"; nativeBuildInputs = [ autoreconfHook gnum4 pkgconfig python2 ]; - buildInputs = [ intel-gpu-tools libdrm libva libX11 libXext libGL wayland ]; + buildInputs = [ intel-gpu-tools libdrm libva libX11 libXext libGL wayland ] + ++ stdenv.lib.optional enableHybridCodec vaapi-intel-hybrid; enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://cgit.freedesktop.org/vaapi/intel-driver/; + homepage = https://01.org/linuxmedia; license = licenses.mit; description = "Intel driver for the VAAPI library"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/wt/default.nix b/pkgs/development/libraries/wt/default.nix index 99f73add795..aec64c9c33c 100644 --- a/pkgs/development/libraries/wt/default.nix +++ b/pkgs/development/libraries/wt/default.nix @@ -43,12 +43,12 @@ let }; in { wt3 = generic { - version = "3.3.10"; - sha256 = "1y25mhghgbgjgycpny0x4z95xn98q0wraab1c5gkwnay097bgwdy"; + version = "3.3.11"; + sha256 = "1s1bwg3s7brnspr9ya1vg5mr29dbvhf05s606fiv409b7ladqvxq"; }; wt4 = generic { - version = "4.0.3"; - sha256 = "01xch5dkpcanwhr515236wa9mdmnq2a2j13dn7smyhwzqgbpknsg"; + version = "4.0.4"; + sha256 = "17kq9fxc0xqx7q7kyryiph3mg0d3hnd3jw0rl55zvzfsdd71220w"; }; } diff --git a/pkgs/development/python-modules/django/1_11.nix b/pkgs/development/python-modules/django/1_11.nix index ada73a7e818..ba65297dbb9 100644 --- a/pkgs/development/python-modules/django/1_11.nix +++ b/pkgs/development/python-modules/django/1_11.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "Django"; - version = "1.11.13"; + version = "1.11.15"; disabled = pythonOlder "2.7"; src = fetchurl { url = "http://www.djangoproject.com/m/releases/1.11/${pname}-${version}.tar.gz"; - sha256 = "19d4c1rlbhmbvbxvskvqjb2aw4dnf2cqi1hhdh11ykdy1a7gxba6"; + sha256 = "0h2sl02x2mxr3rl3dy750pzm5kvmx77116fys8rrgw164kc3b0mi"; }; patches = stdenv.lib.optionals withGdal [ diff --git a/pkgs/development/python-modules/django/2_0.nix b/pkgs/development/python-modules/django/2_0.nix index 3c35b74bab6..0bfe43a20e1 100644 --- a/pkgs/development/python-modules/django/2_0.nix +++ b/pkgs/development/python-modules/django/2_0.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "Django"; - version = "2.0.7"; + version = "2.0.8"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "97886b8a13bbc33bfeba2ff133035d3eca014e2309dff2b6da0bdfc0b8656613"; + sha256 = "12z3b9v0zl7w9bm5sl7dpkk5w35ypalizfmnaj9jac41k8vfmbk8"; }; patches = stdenv.lib.optionals withGdal [ diff --git a/pkgs/development/python-modules/django/2_1.nix b/pkgs/development/python-modules/django/2_1.nix new file mode 100644 index 00000000000..f63822f363a --- /dev/null +++ b/pkgs/development/python-modules/django/2_1.nix @@ -0,0 +1,43 @@ +{ stdenv, buildPythonPackage, fetchPypi, substituteAll, + isPy3k, + geos, gdal, pytz, + withGdal ? false +}: + +buildPythonPackage rec { + pname = "Django"; + version = "2.1"; + + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "0dv184lgp7scq8cr4422rrvkd8npyiqww0zw50ygcim5smw6093z"; + }; + + patches = stdenv.lib.optionals withGdal [ + (substituteAll { + src = ./1.10-gis-libs.template.patch; + geos = geos; + gdal = gdal; + extension = stdenv.hostPlatform.extensions.sharedLibrary; + }) + ]; + + # patch only $out/bin to avoid problems with starter templates (see #3134) + postFixup = '' + wrapPythonProgramsIn $out/bin "$out $pythonPath" + ''; + + propagatedBuildInputs = [ pytz ]; + + # too complicated to setup + doCheck = false; + + meta = with stdenv.lib; { + description = "A high-level Python Web framework"; + homepage = https://www.djangoproject.com/; + license = licenses.bsd3; + maintainers = with maintainers; [ georgewhewell ]; + }; +} diff --git a/pkgs/development/python-modules/elasticsearch-curator/default.nix b/pkgs/development/python-modules/elasticsearch-curator/default.nix index 4b0aba45cd7..1ea6e4cabad 100644 --- a/pkgs/development/python-modules/elasticsearch-curator/default.nix +++ b/pkgs/development/python-modules/elasticsearch-curator/default.nix @@ -1,8 +1,10 @@ { stdenv , buildPythonPackage , fetchPypi +, boto3 , click , certifi +, requests-aws4auth , voluptuous , pyyaml , elasticsearch @@ -22,17 +24,17 @@ buildPythonPackage rec { sha256 = "e75abeb7f7be939b1c64c071898760dc10ab5f08307c253fc074abf8a41a76f0"; }; - # The integration tests require a running elasticsearch cluster. - postUnpackPhase = '' - rm -r test/integration - ''; + # The test hangs so we disable it. + doCheck = false; propagatedBuildInputs = [ click certifi + requests-aws4auth voluptuous pyyaml elasticsearch + boto3 ]; checkInputs = [ diff --git a/pkgs/development/python-modules/libkeepass/default.nix b/pkgs/development/python-modules/libkeepass/default.nix new file mode 100644 index 00000000000..b707b343056 --- /dev/null +++ b/pkgs/development/python-modules/libkeepass/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchPypi, buildPythonPackage +, lxml, pycryptodome, colorama }: + +buildPythonPackage rec { + pname = "libkeepass"; + version = "0.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "3ed79ea786f7020b14b83c082612ed8fbcc6f8edf65e1697705837ab9e40e9d7"; + }; + + propagatedBuildInputs = [ lxml pycryptodome colorama ]; + + # No tests on PyPI + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/libkeepass/libkeepass; + description = "A library to access KeePass 1.x/KeePassX (v3) and KeePass 2.x (v4) files"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ jqueiroz ]; + }; +} diff --git a/pkgs/development/python-modules/python-efl/default.nix b/pkgs/development/python-modules/python-efl/default.nix new file mode 100644 index 00000000000..8e3e9d9a584 --- /dev/null +++ b/pkgs/development/python-modules/python-efl/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl, buildPythonPackage, pkgconfig, python, enlightenment }: + +# Should be bumped along with EFL! + +buildPythonPackage rec { + name = "python-efl-${version}"; + version = "1.21.0"; + + src = fetchurl { + url = "http://download.enlightenment.org/rel/bindings/python/${name}.tar.xz"; + sha256 = "08x2cv8hnf004c3711250wrax21ffj5y8951pvk77h98als4pq47"; + }; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ enlightenment.efl ]; + + propagatedBuildInputs = [ python.pkgs.dbus-python ]; + + preConfigure = '' + export NIX_CFLAGS_COMPILE="$(pkg-config --cflags efl) -I${python.pkgs.dbus-python}/include/dbus-1.0 $NIX_CFLAGS_COMPILE" + ''; + + preBuild = "${python.interpreter} setup.py build_ext"; + + installPhase= "${python.interpreter} setup.py install --prefix=$out"; + + doCheck = false; + + meta = with stdenv.lib; { + description = "Python bindings for EFL and Elementary"; + homepage = https://phab.enlightenment.org/w/projects/python_bindings_for_efl/; + platforms = platforms.linux; + license = with licenses; [ gpl3 lgpl3 ]; + maintainers = with maintainers; [ matejc tstrobel ftrvxmtrx ]; + }; +} diff --git a/pkgs/development/python-modules/requests-aws4auth/default.nix b/pkgs/development/python-modules/requests-aws4auth/default.nix new file mode 100644 index 00000000000..b7010eccf0b --- /dev/null +++ b/pkgs/development/python-modules/requests-aws4auth/default.nix @@ -0,0 +1,28 @@ +{ lib, buildPythonPackage, fetchPypi, fetchzip, isPy3k, requests }: +with lib; +buildPythonPackage rec { + pname = "requests-aws4auth"; + version = "0.9"; + + src = fetchPypi { + inherit pname version; + sha256 = "0g52a1pm53aqkc9qb5q1m918c1qy6q47c1qz63p5ilynfbs3m5y9"; + }; + + postPatch = optionalString isPy3k '' + sed "s/path_encoding_style/'path_encoding_style'/" \ + -i requests_aws4auth/service_parameters.py + ''; + + propagatedBuildInputs = [ requests ]; + + # The test fail on Python >= 3 because of module import errors. + doCheck = !isPy3k; + + meta = { + description = "Amazon Web Services version 4 authentication for the Python Requests library."; + homepage = https://github.com/sam-washington/requests-aws4auth; + license = licenses.mit; + maintainers = [ maintainers.basvandijk ]; + }; +} diff --git a/pkgs/development/python-modules/sympy/default.nix b/pkgs/development/python-modules/sympy/default.nix index f41f2e7b4fa..fb702e046a4 100644 --- a/pkgs/development/python-modules/sympy/default.nix +++ b/pkgs/development/python-modules/sympy/default.nix @@ -8,44 +8,36 @@ buildPythonPackage rec { pname = "sympy"; - version = "1.1.1"; + version = "1.2"; # Upgrades may break sage. Please test. src = fetchPypi { inherit pname version; - sha256 = "ac5b57691bc43919dcc21167660a57cc51797c28a4301a6144eff07b751216a4"; + sha256 = "0pr2v7dl51ngch1cfs423qsb472l9ys1m8m7vrhhh99fsxqa0v18"; }; checkInputs = [ glibcLocales ]; propagatedBuildInputs = [ mpmath ]; - # Bunch of failures including transients. + # some tests fail: https://github.com/sympy/sympy/issues/15149 doCheck = false; - preCheck = '' - export LANG="en_US.UTF-8" - ''; - patches = [ - # see https://trac.sagemath.org/ticket/20204 and https://github.com/sympy/sympy/issues/12825 - # There is also an upstream patch for this, included in the next release (PR #128826). - # However that doesn't quite fix the issue yet. Apparently some changes by sage are required. - # TODO re-evaluate the change once a new sympy version is released (open a sage trac ticket about - # it). + # to be fixed by https://github.com/sympy/sympy/pull/13476 (fetchpatch { url = "https://git.sagemath.org/sage.git/plain/build/pkgs/sympy/patches/03_undeffun_sage.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; sha256 = "1mh2va1rlgizgvx8yzqwgvbf5wvswarn511002b361mc8yy0bnhr"; }) - (fetchpatch { - url = "https://github.com/sympy/sympy/pull/13276.patch"; - sha256 = "1rz74b5c74vwh3pj9axxgh610i02l3555vvsvr4a15ya7siw7zxh"; - }) ]; + preCheck = '' + export LANG="en_US.UTF-8" + ''; + meta = { description = "A Python library for symbolic mathematics"; homepage = http://www.sympy.org/; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ lovek323 ]; + maintainers = with lib.maintainers; [ lovek323 timokau ]; }; } diff --git a/pkgs/development/ruby-modules/solargraph/Gemfile.lock b/pkgs/development/ruby-modules/solargraph/Gemfile.lock index 54a27076b7d..ed670c11c92 100644 --- a/pkgs/development/ruby-modules/solargraph/Gemfile.lock +++ b/pkgs/development/ruby-modules/solargraph/Gemfile.lock @@ -25,8 +25,8 @@ GEM rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) unicode-display_width (~> 1.0, >= 1.0.1) - ruby-progressbar (1.9.0) - solargraph (0.23.6) + ruby-progressbar (1.10.0) + solargraph (0.25.1) coderay (~> 1.1) eventmachine (~> 1.2, >= 1.2.5) htmlentities (~> 4.3, >= 4.3.4) @@ -40,7 +40,7 @@ GEM thor (0.20.0) tilt (2.0.8) unicode-display_width (1.4.0) - yard (0.9.15) + yard (0.9.16) PLATFORMS ruby @@ -49,4 +49,4 @@ DEPENDENCIES solargraph! BUNDLED WITH - 1.16.2 + 1.16.3 diff --git a/pkgs/development/ruby-modules/solargraph/gemset.nix b/pkgs/development/ruby-modules/solargraph/gemset.nix index f78f359e158..00395518af4 100644 --- a/pkgs/development/ruby-modules/solargraph/gemset.nix +++ b/pkgs/development/ruby-modules/solargraph/gemset.nix @@ -118,19 +118,19 @@ ruby-progressbar = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1igh1xivf5h5g3y5m9b4i4j2mhz2r43kngh4ww3q1r80ch21nbfk"; + sha256 = "1cv2ym3rl09svw8940ny67bav7b2db4ms39i4raaqzkf59jmhglk"; type = "gem"; }; - version = "1.9.0"; + version = "1.10.0"; }; solargraph = { dependencies = ["coderay" "eventmachine" "htmlentities" "kramdown" "parser" "reverse_markdown" "rubocop" "thor" "tilt" "yard"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "01lh5vibr277vhhrgk6zl09ivb262c1qpk54ahzhc40zs309842b"; + sha256 = "1b5dljgskjpkpv2l0jpb6i8j73hidskcbp2v7fhjp7kpx94x6php"; type = "gem"; }; - version = "0.23.6"; + version = "0.25.1"; }; thor = { source = { @@ -159,9 +159,9 @@ yard = { source = { remotes = ["https://rubygems.org"]; - sha256 = "145pbc0x95s6x296kh1wp5ykwy6srfcz946dgj83s35g8p52z4q4"; + sha256 = "0lmmr1839qgbb3zxfa7jf5mzy17yjl1yirwlgzdhws4452gqhn67"; type = "gem"; }; - version = "0.9.15"; + version = "0.9.16"; }; } \ No newline at end of file diff --git a/pkgs/development/tools/analysis/kcov/aarch64_nt_prstatus.patch b/pkgs/development/tools/analysis/kcov/aarch64_nt_prstatus.patch deleted file mode 100644 index d5c3662e9ab..00000000000 --- a/pkgs/development/tools/analysis/kcov/aarch64_nt_prstatus.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/engines/ptrace.cc b/src/engines/ptrace.cc -index 59b615f..e02cddf 100644 ---- a/src/engines/ptrace.cc -+++ b/src/engines/ptrace.cc -@@ -21,6 +21,7 @@ - - #if defined(__aarch64__) - # include <sys/uio.h> -+# include <elf.h> - #endif - - #include <map> diff --git a/pkgs/development/tools/analysis/kcov/default.nix b/pkgs/development/tools/analysis/kcov/default.nix index 7d75d9a34e1..af20165d155 100644 --- a/pkgs/development/tools/analysis/kcov/default.nix +++ b/pkgs/development/tools/analysis/kcov/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "kcov-${version}"; - version = "35"; + version = "36"; src = fetchFromGitHub { owner = "SimonKagstrom"; repo = "kcov"; rev = "v${version}"; - sha256 = "1da9vm87pi5m9ika0q1f1ai85w3vwlap8yln147yr9sc37jp5jcw"; + sha256 = "1q1mw5mxz041lr6qc2v4280rmx13pg1bx5r3bxz9bzs941r405r3"; }; preConfigure = "patchShebangs src/bin-to-c-source.py"; @@ -16,8 +16,6 @@ stdenv.mkDerivation rec { buildInputs = [ zlib curl elfutils python libiberty libopcodes ]; - patches = [ ./aarch64_nt_prstatus.patch ]; - enableParallelBuilding = true; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/build-managers/alibuild/default.nix b/pkgs/development/tools/build-managers/alibuild/default.nix new file mode 100644 index 00000000000..eb805dcce7a --- /dev/null +++ b/pkgs/development/tools/build-managers/alibuild/default.nix @@ -0,0 +1,27 @@ +{ stdenv, lib, python}: + +python.pkgs.buildPythonApplication rec { + pname = "alibuild"; + version = "1.5.4rc3"; + + src = python.pkgs.fetchPypi { + inherit pname version; + sha256 = "1mnh0h9m96p78b9ln1gbl4lw1mgl16qbyfi9fj2l13p3nxaq1sib"; + }; + + argparse = null; + + doCheck = false; + propagatedBuildInputs = [ + python.pkgs.requests + python.pkgs.argparse + python.pkgs.pyyaml + ]; + + meta = with lib; { + homepage = "https://alisw.github.io/alibuild/"; + description = "Build tool for ALICE experiment software"; + license = licenses.gpl3; + maintainers = with maintainers; [ ktf ]; + }; +} diff --git a/pkgs/development/tools/build-managers/apache-maven/default.nix b/pkgs/development/tools/build-managers/apache-maven/default.nix index 19ca5b9c078..455cd0a3fe8 100644 --- a/pkgs/development/tools/build-managers/apache-maven/default.nix +++ b/pkgs/development/tools/build-managers/apache-maven/default.nix @@ -2,7 +2,7 @@ assert jdk != null; -let version = "3.5.3"; in +let version = "3.5.4"; in stdenv.mkDerivation rec { name = "apache-maven-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://apache/maven/maven-3/${version}/binaries/${name}-bin.tar.gz"; - sha256 = "0244mpziz4rw35x2cahsqlxpnygvi6qpll16g4kx87db7wvmcadm"; + sha256 = "0kd1jzlz3b2kglppi85h7286vdwjdmm7avvpwgppgjv42g4v2l6f"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index 8d4b95c8808..6a25aef8b36 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, runCommand, makeWrapper +{ stdenv, lib, fetchurl, fetchpatch, runCommand, makeWrapper , jdk, zip, unzip, bash, writeCBin, coreutils , which, python, perl, gnused, gnugrep, findutils # Always assume all markers valid (don't redownload dependencies). @@ -26,7 +26,7 @@ let in stdenv.mkDerivation rec { - version = "0.15.2"; + version = "0.16.0"; meta = with lib; { homepage = "https://github.com/bazelbuild/bazel/"; @@ -40,12 +40,19 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - sha256 = "1w83zi6d9npi1jmiy022v92xp1cwdvn2qqgghlnl2v9sprryqlxz"; + sha256 = "1ca9pncnj6v4r1kvgxys7607wpz4d2ic6g0i7lpsc2zg2qwmjc67"; }; sourceRoot = "."; - patches = lib.optional enableNixHacks ./nix-hacks.patch; + patches = + lib.optional enableNixHacks ./nix-hacks.patch + # patch perl out of the bash completions + # should land in 0.18 + ++ [(fetchpatch { + url = "https://github.com/bazelbuild/bazel/commit/27be70979b54d7510bf401d9581fb4075737ef34.patch"; + sha256 = "04rip46lnibrsdyzjpi29wf444b49cbwb1xjcbrr3kdqsdj4d8h5"; + })]; # Bazel expects several utils to be available in Bash even without PATH. Hence this hack. @@ -121,10 +128,10 @@ stdenv.mkDerivation rec { echo "build --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\"" >> .bazelrc echo "build --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\"" >> .bazelrc echo "build --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\"" >> .bazelrc - sed -i -e "361 a --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh - sed -i -e "361 a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh - sed -i -e "361 a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh - sed -i -e "361 a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh + sed -i -e "362 a --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh + sed -i -e "362 a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh + sed -i -e "362 a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh + sed -i -e "362 a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh # --experimental_strict_action_env (which will soon become the # default, see bazelbuild/bazel#2574) hardcodes the default @@ -139,11 +146,6 @@ stdenv.mkDerivation rec { cat tools/bash/runfiles/runfiles.bash >> runfiles.bash.tmp mv runfiles.bash.tmp tools/bash/runfiles/runfiles.bash - # the bash completion requires perl - # https://github.com/bazelbuild/bazel/issues/5943 - substituteInPlace scripts/bazel-complete-template.bash \ - --replace "perl" "${perl}/bin/perl" - patchShebangs . ''; in lib.optionalString stdenv.hostPlatform.isDarwin darwinPatches diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index f5ca69e59c8..566694e06b0 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -52,12 +52,12 @@ rec { }; gradle_latest = gradleGen rec { - name = "gradle-4.9"; + name = "gradle-4.10"; nativeVersion = "0.14"; src = fetchurl { url = "http://services.gradle.org/distributions/${name}-bin.zip"; - sha256 = "0a0dkdzmz0ynf73inii8djy2hihqd9c97fir9c0d4g8px3f6jvp6"; + sha256 = "064zyli00cj3clbn631kivg5izhkyyf31f6x65a2rqac229gv314"; }; }; diff --git a/pkgs/development/tools/flatpak-builder/default.nix b/pkgs/development/tools/flatpak-builder/default.nix index b4a35b3a21c..33f9ade4681 100644 --- a/pkgs/development/tools/flatpak-builder/default.nix +++ b/pkgs/development/tools/flatpak-builder/default.nix @@ -36,7 +36,7 @@ }: let - version = "0.99.3"; + version = "1.0.0"; in stdenv.mkDerivation rec { name = "flatpak-builder-${version}"; @@ -44,7 +44,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/flatpak/flatpak-builder/releases/download/${version}/${name}.tar.xz"; - sha256 = "0sq3rcy3vwa36p6wq63wdvkk0hrs3qj1ngk26j9947nc14z39plk"; + sha256 = "0ysnz0dwc8wfd31afwssg9prvaqdga7z4mybnrzy8sgm0hi5p2l5"; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/hcloud/default.nix b/pkgs/development/tools/hcloud/default.nix index 2ef6b4a1d54..877080508d4 100644 --- a/pkgs/development/tools/hcloud/default.nix +++ b/pkgs/development/tools/hcloud/default.nix @@ -2,14 +2,14 @@ buildGoPackage rec { name = "hcloud-${version}"; - version = "1.6.0"; + version = "1.6.1"; goPackagePath = "github.com/hetznercloud/cli"; src = fetchFromGitHub { owner = "hetznercloud"; repo = "cli"; rev = "v${version}"; - sha256 = "0iswy8xjqvshwk9w2vz3miph953qdh21xga9hl6aili84x25xzbx"; + sha256 = "0v5n7y8vb23iva51kb15da198yk7glc1fix193icrk3pvcbj5bjr"; }; buildFlagsArray = [ "-ldflags=" "-w -X github.com/hetznercloud/cli/cli.Version=${version}" ]; diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index ae59f85a211..1c2efbeea76 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -11,9 +11,6 @@ , pythonSupport ? hostPlatform == buildPlatform && !hostPlatform.isCygwin, python ? null , guile ? null -# Additional dependencies for GNU/Hurd. -, mig ? null, hurd ? null - }: let @@ -21,7 +18,6 @@ let version = "8.1.1"; in -assert targetPlatform.isHurd -> mig != null && hurd != null; assert pythonSupport -> python != null; stdenv.mkDerivation rec { @@ -38,13 +34,10 @@ stdenv.mkDerivation rec { patches = [ ./debug-info-from-env.patch ] ++ stdenv.lib.optional stdenv.isDarwin ./darwin-target-match.patch; - nativeBuildInputs = [ pkgconfig texinfo perl setupDebugInfoDirs ] - # TODO(@Ericson2314) not sure if should be host or target - ++ stdenv.lib.optional targetPlatform.isHurd mig; + nativeBuildInputs = [ pkgconfig texinfo perl setupDebugInfoDirs ]; buildInputs = [ ncurses readline gmp mpfr expat zlib guile ] ++ stdenv.lib.optional pythonSupport python - ++ stdenv.lib.optional targetPlatform.isHurd hurd ++ stdenv.lib.optional doCheck dejagnu; propagatedNativeBuildInputs = [ setupDebugInfoDirs ]; diff --git a/pkgs/development/tools/misc/kibana/6.x.nix b/pkgs/development/tools/misc/kibana/6.x.nix deleted file mode 100644 index 1fd52f43557..00000000000 --- a/pkgs/development/tools/misc/kibana/6.x.nix +++ /dev/null @@ -1,75 +0,0 @@ -{ elk6Version -, enableUnfree ? true -, stdenv -, makeWrapper -, fetchzip -, fetchurl -, nodejs -, coreutils -, which -}: - -with stdenv.lib; -let - inherit (builtins) elemAt; - info = splitString "-" stdenv.system; - arch = elemAt info 0; - plat = elemAt info 1; - shas = - if enableUnfree - then { - "x86_64-linux" = "1kk97ggpzmblhqm6cfd2sv5940f58h323xcyg6rba1njj7lzanv0"; - "x86_64-darwin" = "1xvwffk8d8br92h0laf4b1m76kvki6cj0pbgcvirfcj1r70vk6c3"; - } - else { - "x86_64-linux" = "0m81ki1v61gpwb3s6zf84azqrirlm9pdfx65g3xmvdp3d3wii5ly"; - "x86_64-darwin" = "0zh9p6vsq1d0gh6ks7z6bh8sbhn6rm4jshjcfp3c9k7n2qa8vv9b"; - }; - - # For the correct phantomjs version see: - # https://github.com/elastic/kibana/blob/master/x-pack/plugins/reporting/server/browsers/phantom/paths.js - phantomjs = rec { - name = "phantomjs-${version}-linux-x86_64"; - version = "2.1.1"; - src = fetchzip { - inherit name; - url = "https://github.com/Medium/phantomjs/releases/download/v${version}/${name}.tar.bz2"; - sha256 = "0g2dqjzr2daz6rkd6shj6rrlw55z4167vqh7bxadl8jl6jk7zbfv"; - }; - }; - -in stdenv.mkDerivation rec { - name = "kibana-${optionalString (!enableUnfree) "oss-"}${version}"; - version = elk6Version; - - src = fetchurl { - url = "https://artifacts.elastic.co/downloads/kibana/${name}-${plat}-${arch}.tar.gz"; - sha256 = shas."${stdenv.system}" or (throw "Unknown architecture"); - }; - - buildInputs = [ makeWrapper ]; - - installPhase = '' - mkdir -p $out/libexec/kibana $out/bin - mv * $out/libexec/kibana/ - rm -r $out/libexec/kibana/node - makeWrapper $out/libexec/kibana/bin/kibana $out/bin/kibana \ - --prefix PATH : "${stdenv.lib.makeBinPath [ nodejs coreutils which ]}" - sed -i 's@NODE=.*@NODE=${nodejs}/bin/node@' $out/libexec/kibana/bin/kibana - '' + - # phantomjs is needed in the unfree version. When phantomjs doesn't exist in - # $out/libexec/kibana/data kibana will try to download and unpack it during - # runtime which will fail because the nix store is read-only. So we make sure - # it already exist in the nix store. - optionalString enableUnfree '' - ln -s ${phantomjs.src} $out/libexec/kibana/data/${phantomjs.name} - ''; - - meta = { - description = "Visualize logs and time-stamped data"; - homepage = http://www.elasticsearch.org/overview/kibana; - license = if enableUnfree then licenses.elastic else licenses.asl20; - maintainers = with maintainers; [ offline rickynils basvandijk ]; - platforms = with platforms; unix; - }; -} diff --git a/pkgs/development/tools/misc/kibana/default.nix b/pkgs/development/tools/misc/kibana/default.nix index fc1ac932338..1fd52f43557 100644 --- a/pkgs/development/tools/misc/kibana/default.nix +++ b/pkgs/development/tools/misc/kibana/default.nix @@ -1,26 +1,49 @@ -{ stdenv, makeWrapper, fetchurl, nodejs, coreutils, which }: +{ elk6Version +, enableUnfree ? true +, stdenv +, makeWrapper +, fetchzip +, fetchurl +, nodejs +, coreutils +, which +}: with stdenv.lib; let inherit (builtins) elemAt; - archOverrides = { - "i686" = "x86"; - }; info = splitString "-" stdenv.system; - arch = (elemAt info 0); - elasticArch = archOverrides."${arch}" or arch; + arch = elemAt info 0; plat = elemAt info 1; - shas = { - "x86_64-linux" = "1wnnrhhpgc58s09p99cmi8r2jmwsd5lmh2inb0k8nmizz5v1sjz0"; - "i686-linux" = "0sdx59jlfrf7r9793xpn2vxaxjdczgn3qfw8yny03dcs6fjaxi2y"; - "x86_64-darwin" = "0rmp536kn001g52lxngpj6x6d0j3qj0r11d4djbz7h6s5ml03kza"; + shas = + if enableUnfree + then { + "x86_64-linux" = "1kk97ggpzmblhqm6cfd2sv5940f58h323xcyg6rba1njj7lzanv0"; + "x86_64-darwin" = "1xvwffk8d8br92h0laf4b1m76kvki6cj0pbgcvirfcj1r70vk6c3"; + } + else { + "x86_64-linux" = "0m81ki1v61gpwb3s6zf84azqrirlm9pdfx65g3xmvdp3d3wii5ly"; + "x86_64-darwin" = "0zh9p6vsq1d0gh6ks7z6bh8sbhn6rm4jshjcfp3c9k7n2qa8vv9b"; + }; + + # For the correct phantomjs version see: + # https://github.com/elastic/kibana/blob/master/x-pack/plugins/reporting/server/browsers/phantom/paths.js + phantomjs = rec { + name = "phantomjs-${version}-linux-x86_64"; + version = "2.1.1"; + src = fetchzip { + inherit name; + url = "https://github.com/Medium/phantomjs/releases/download/v${version}/${name}.tar.bz2"; + sha256 = "0g2dqjzr2daz6rkd6shj6rrlw55z4167vqh7bxadl8jl6jk7zbfv"; + }; }; + in stdenv.mkDerivation rec { - name = "kibana-${version}"; - version = "4.6.5"; + name = "kibana-${optionalString (!enableUnfree) "oss-"}${version}"; + version = elk6Version; src = fetchurl { - url = "https://download.elastic.co/kibana/kibana/${name}-${plat}-${elasticArch}.tar.gz"; + url = "https://artifacts.elastic.co/downloads/kibana/${name}-${plat}-${arch}.tar.gz"; sha256 = shas."${stdenv.system}" or (throw "Unknown architecture"); }; @@ -33,13 +56,20 @@ in stdenv.mkDerivation rec { makeWrapper $out/libexec/kibana/bin/kibana $out/bin/kibana \ --prefix PATH : "${stdenv.lib.makeBinPath [ nodejs coreutils which ]}" sed -i 's@NODE=.*@NODE=${nodejs}/bin/node@' $out/libexec/kibana/bin/kibana + '' + + # phantomjs is needed in the unfree version. When phantomjs doesn't exist in + # $out/libexec/kibana/data kibana will try to download and unpack it during + # runtime which will fail because the nix store is read-only. So we make sure + # it already exist in the nix store. + optionalString enableUnfree '' + ln -s ${phantomjs.src} $out/libexec/kibana/data/${phantomjs.name} ''; meta = { description = "Visualize logs and time-stamped data"; homepage = http://www.elasticsearch.org/overview/kibana; - license = licenses.asl20; - maintainers = with maintainers; [ offline rickynils ]; + license = if enableUnfree then licenses.elastic else licenses.asl20; + maintainers = with maintainers; [ offline rickynils basvandijk ]; platforms = with platforms; unix; }; } diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index 1e449d722c3..33a46e16a3a 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = stdenv.lib.optional libunwind.supportsHost libunwind; # support -k - configureFlags = stdenv.lib.optional (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isRiscV) "--enable-mpers=check"; + configureFlags = stdenv.lib.optional (!stdenv.hostPlatform.isx86) "--enable-mpers=check"; # fails 1 out of 523 tests with # "strace-k.test: failed test: ../../strace -e getpid -k ../stack-fcall output mismatch" diff --git a/pkgs/development/tools/misc/tokei/default.nix b/pkgs/development/tools/misc/tokei/default.nix index 0059c10afe0..831a9ec6278 100644 --- a/pkgs/development/tools/misc/tokei/default.nix +++ b/pkgs/development/tools/misc/tokei/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { name = "tokei-${version}"; - version = "7.0.3"; + version = "8.0.0"; src = fetchFromGitHub { owner = "Aaronepower"; repo = "tokei"; rev = "v${version}"; - sha256 = "1n2ddwmyd414p6a98khq8y0bmljwcclw30wy5zy5b6z1l40yxcza"; + sha256 = "1sfwmjlvjrd8r0ynnayw7g3514mfiky2j30byphaagdw4jkxbd7c"; }; - cargoSha256 = "0ngqk8nnw00s25y91vgsl37j26xl2ws75l3lvklf9gbd4bi01crv"; + cargoSha256 = "0v29gych757h7vv5jsg7rpl705gpqn0ya8ai53582qd2cc6yz4c3"; meta = with stdenv.lib; { description = "Count code, quickly"; diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index ae624c549eb..851c6f01b20 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/pkgs/development/tools/packer/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "packer-${version}"; - version = "1.2.4"; + version = "1.2.5"; goPackagePath = "github.com/hashicorp/packer"; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "hashicorp"; repo = "packer"; rev = "v${version}"; - sha256 = "06prn2mq199476zlxi5hxk5yn21mqzbqk8v0fy8s6h91g8h6205n"; + sha256 = "0wbf0iqfqphwy2snspf34j16ar4ghk0f1zsw8n8vj8gviiivlr7p"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index fe75c9fd208..f247a20b1b2 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -38,6 +38,7 @@ in buildRubyGem rec { patches = [ ./unofficial-installation-nowarn.patch + ./use-system-bundler-version.patch ]; # PATH additions: diff --git a/pkgs/development/tools/vagrant/use-system-bundler-version.patch b/pkgs/development/tools/vagrant/use-system-bundler-version.patch new file mode 100644 index 00000000000..c386acf4a1c --- /dev/null +++ b/pkgs/development/tools/vagrant/use-system-bundler-version.patch @@ -0,0 +1,13 @@ +diff --git i/lib/vagrant/bundler.rb w/lib/vagrant/bundler.rb +index 301e40e37..e361ab510 100644 +--- i/lib/vagrant/bundler.rb ++++ w/lib/vagrant/bundler.rb +@@ -217,7 +217,7 @@ module Vagrant + source_list = {} + system_plugins = plugins.map do |plugin_name, plugin_info| + plugin_name if plugin_info["system"] +- end.compact ++ end.compact << "bundler" + installer_set = VagrantSet.new(:both) + installer_set.system_plugins = system_plugins + diff --git a/pkgs/development/web/twitter-bootstrap/default.nix b/pkgs/development/web/twitter-bootstrap/default.nix index 1057e970865..461a81db857 100644 --- a/pkgs/development/web/twitter-bootstrap/default.nix +++ b/pkgs/development/web/twitter-bootstrap/default.nix @@ -1,31 +1,26 @@ -{ stdenv, fetchFromGitHub, lessc, closurecompiler }: +{ stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "twitter-bootstrap-${version}"; - version = "2.3.2"; + name = "bootstrap-${version}"; + version = "3.3.7"; - src = fetchFromGitHub { - owner = "twitter"; - repo = "bootstrap"; - rev = "v${version}"; - sha256 = "0b4dsk9sqlkwwfgqqjlgi6p05qz2jssmmz4adm83f31sx70lgh4g"; - }; - - buildInputs = [ lessc closurecompiler ]; + src = fetchurl { + url = "https://github.com/twbs/bootstrap/releases/download/v${version}/bootstrap-${version}-dist.zip"; + sha256 = "0yqvg72knl7a0rlszbpk7xf7f0cs3aqf9xbl42ff41yh5pzsi67l"; + }; - phases = [ "installPhase" ]; + buildInputs = [ unzip ]; + dontBuild = true; installPhase = '' - mkdir -p $out/css $out/js $out/img - cp $src/img/* $out/img/ - closure-compiler --js $src/js/*.js > $out/js/bootstrap.js - lessc $src/less/bootstrap.less -O2 -x > $out/css/bootstrap.css - ''; + mkdir $out + cp -r * $out/ + ''; meta = { description = "Front-end framework for faster and easier web development"; homepage = http://getbootstrap.com/; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.mit; }; + } diff --git a/pkgs/development/web/twitter-bootstrap/v3.nix b/pkgs/development/web/twitter-bootstrap/v3.nix deleted file mode 100644 index 461a81db857..00000000000 --- a/pkgs/development/web/twitter-bootstrap/v3.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl, unzip }: - -stdenv.mkDerivation rec { - name = "bootstrap-${version}"; - version = "3.3.7"; - - src = fetchurl { - url = "https://github.com/twbs/bootstrap/releases/download/v${version}/bootstrap-${version}-dist.zip"; - sha256 = "0yqvg72knl7a0rlszbpk7xf7f0cs3aqf9xbl42ff41yh5pzsi67l"; - }; - - buildInputs = [ unzip ]; - - dontBuild = true; - installPhase = '' - mkdir $out - cp -r * $out/ - ''; - - meta = { - description = "Front-end framework for faster and easier web development"; - homepage = http://getbootstrap.com/; - license = stdenv.lib.licenses.mit; - }; - -} diff --git a/pkgs/games/20kly/default.nix b/pkgs/games/20kly/default.nix new file mode 100644 index 00000000000..37cb96f2cfd --- /dev/null +++ b/pkgs/games/20kly/default.nix @@ -0,0 +1,40 @@ +{ stdenv +, fetchurl +, python }: + +python.pkgs.buildPythonApplication rec { + pname = "20kly"; + version = "1.4"; + format = "other"; + disabled = !(python.isPy2 or false); + + src = fetchurl { + url = "http://jwhitham.org.uk/20kly/lightyears-${version}.tar.bz2"; + sha256 = "13h73cmfjqkipffimfc4iv0hf89if490ng6vd6xf3wcalpgaim5d"; + }; + + patchPhase = '' + substituteInPlace lightyears \ + --replace \ + "LIGHTYEARS_DIR = \".\"" \ + "LIGHTYEARS_DIR = \"$out/share\"" + ''; + + propagatedBuildInputs = with python.pkgs; [ pygame ]; + + buildPhase = "python -O -m compileall ."; + + installPhase = '' + mkdir -p "$out/share" + cp -r audio code data lightyears "$out/share" + install -Dm755 lightyears "$out/bin/lightyears" + ''; + + meta = with stdenv.lib; { + description = "A steampunk-themed strategy game where you have to manage a steam supply network"; + homepage = http://jwhitham.org.uk/20kly/; + license = licenses.gpl2; + maintainers = with maintainers; [ fgaz ]; + }; +} + diff --git a/pkgs/games/endgame-singularity/default.nix b/pkgs/games/endgame-singularity/default.nix new file mode 100644 index 00000000000..8b259bad88d --- /dev/null +++ b/pkgs/games/endgame-singularity/default.nix @@ -0,0 +1,56 @@ +{ stdenv, fetchurl, unzip, python2 }: + +python2.pkgs.buildPythonApplication rec { + pname = "endgame-singularity"; + version = "0.30c"; + format = "other"; + + srcs = [ + (fetchurl { + url = "http://www.emhsoft.com/singularity/singularity-${version}-src.tar.gz"; + sha256 = "13zjhf67gmla67nkfpxb01rxs8j9n4hs0s4n9lnnq4zgb709yxgl"; + }) + (fetchurl { + url = "http://www.emhsoft.com/singularity/endgame-singularity-music-007.zip"; + sha256 = "0vf2qaf66jh56728pq1zbnw50yckjz6pf6c6qw6dl7vk60kkqnpb"; + }) + ]; + sourceRoot = "."; + + nativeBuildInputs = [ unzip ]; # The music is zipped + propagatedBuildInputs = with python2.pkgs; [ pygame numpy ]; + + # This is not an error: it needs both compilation rounds + buildPhase = '' + ${python2.interpreter} -m compileall "singularity-${version}" + ${python2.interpreter} -O -m compileall "singularity-${version}" + ''; + + installPhase = '' + install -Dm755 "singularity-${version}/singularity.py" "$out/share/singularity.py" + install -Dm644 "singularity-${version}/singularity.pyo" "$out/share/singularity.pyo" + install -Dm644 "singularity-${version}/singularity.pyc" "$out/share/singularity.pyc" + cp -R "singularity-${version}/code" "singularity-${version}/data" "$out/share/" + cp -R "endgame-singularity-music-007" "$out/share/music" + ''; + + # Tell it where to find python libraries + # Also cd to the same directory as the code, since it uses relative paths + postFixup = '' + makeWrapper "${python2.interpreter}" "$out/bin/endgame-singularity" \ + --set PYTHONPATH "$PYTHONPATH" \ + --run "cd \"$out/share\"" \ + --add-flags "$out/share/singularity.py" + ''; + + meta = { + homepage = http://www.emhsoft.com/singularity/; + description = "A simulation game about strong AI"; + longDescription = '' + A simulation of a true AI. Go from computer to computer, pursued by the + entire world. Keep hidden, and you might have a chance + ''; + license = stdenv.lib.licenses.gpl2; + maintainers = with stdenv.lib.maintainers; [ fgaz ]; + }; +} diff --git a/pkgs/games/vitetris/default.nix b/pkgs/games/vitetris/default.nix new file mode 100644 index 00000000000..3ed5700954a --- /dev/null +++ b/pkgs/games/vitetris/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, lib }: + +stdenv.mkDerivation rec { + name = "vitetris-${version}"; + version = "0.57.2"; + + src = fetchFromGitHub { + owner = "vicgeralds"; + repo = "vitetris"; + rev = "v${version}"; + sha256 = "0px0h4zrpzr6xd1vz7w9gr6rh0z74y66jfzschkcvj84plld10k6"; + }; + + hardeningDisable = [ "format" ]; + + makeFlags = "INSTALL=install"; + + meta = { + description = "Terminal-based Tetris clone by Victor Nilsson"; + homepage = http://www.victornils.net/tetris/; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ siers ]; + + longDescription = '' + vitetris is a terminal-based Tetris clone by Victor Nilsson. Gameplay is much + like the early Tetris games by Nintendo. + + Features include: configurable keys, highscore table, two-player mode with + garbage, network play, joystick (gamepad) support on Linux or with Allegro. + ''; + }; +} diff --git a/pkgs/misc/logging/beats/5.x.nix b/pkgs/misc/logging/beats/5.x.nix index 94d5449100d..e92613025ff 100644 --- a/pkgs/misc/logging/beats/5.x.nix +++ b/pkgs/misc/logging/beats/5.x.nix @@ -23,10 +23,10 @@ let beat = package : extraArgs : buildGoPackage (rec { }; } // extraArgs); in { - filebeat = beat "filebeat" {meta.description = "Lightweight shipper for logfiles";}; - heartbeat = beat "heartbeat" {meta.description = "Lightweight shipper for uptime monitoring";}; - metricbeat = beat "metricbeat" {meta.description = "Lightweight shipper for metrics";}; - packetbeat = beat "packetbeat" { + filebeat5 = beat "filebeat" {meta.description = "Lightweight shipper for logfiles";}; + heartbeat5 = beat "heartbeat" {meta.description = "Lightweight shipper for uptime monitoring";}; + metricbeat5 = beat "metricbeat" {meta.description = "Lightweight shipper for metrics";}; + packetbeat5 = beat "packetbeat" { buildInputs = [ libpcap ]; meta.description = "Network packet analyzer that ships data to Elasticsearch"; meta.longDescription = '' diff --git a/pkgs/misc/logging/beats/6.x.nix b/pkgs/misc/logging/beats/6.x.nix index 111bc449d88..59d7379e06c 100644 --- a/pkgs/misc/logging/beats/6.x.nix +++ b/pkgs/misc/logging/beats/6.x.nix @@ -23,10 +23,10 @@ let beat = package : extraArgs : buildGoPackage (rec { }; } // extraArgs); in { - filebeat = beat "filebeat" {meta.description = "Lightweight shipper for logfiles";}; - heartbeat = beat "heartbeat" {meta.description = "Lightweight shipper for uptime monitoring";}; - metricbeat = beat "metricbeat" {meta.description = "Lightweight shipper for metrics";}; - packetbeat = beat "packetbeat" { + filebeat6 = beat "filebeat" {meta.description = "Lightweight shipper for logfiles";}; + heartbeat6 = beat "heartbeat" {meta.description = "Lightweight shipper for uptime monitoring";}; + metricbeat6 = beat "metricbeat" {meta.description = "Lightweight shipper for metrics";}; + packetbeat6 = beat "packetbeat" { buildInputs = [ libpcap ]; meta.description = "Network packet analyzer that ships data to Elasticsearch"; meta.longDescription = '' diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 5944dfc991d..f32c1795409 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -2762,6 +2762,17 @@ self = rec { }; + vim-fireplace = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-fireplace-2018-06-01"; + src = fetchgit { + url = "https://github.com/tpope/vim-fireplace"; + rev = "1ef0f0726cadd96547a5f79103b66339f170da02"; + sha256 = "0ihhd34bl98xssa602386ji013pjj6xnkgww3y2wg73sx2nk6qc4"; + }; + dependencies = []; + + }; + vim-flagship = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-flagship-2018-07-24"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 32a9a621601..f2a46ee8a80 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -233,6 +233,7 @@ "github:tpope/vim-commentary" "github:tpope/vim-dispatch" "github:tpope/vim-eunuch" +"github:tpope/vim-fireplace" "github:tpope/vim-flagship" "github:tpope/vim-fugitive" "github:tpope/vim-pathogen" diff --git a/pkgs/os-specific/gnu/default.nix b/pkgs/os-specific/gnu/default.nix deleted file mode 100644 index d5760003525..00000000000 --- a/pkgs/os-specific/gnu/default.nix +++ /dev/null @@ -1,113 +0,0 @@ -# Packages that make up the GNU/Hurd operating system (aka. GNU). - -args@{ fetchgit, stdenv, autoconf, automake, automake111x, libtool -, texinfo, glibcCross, hurdPartedCross, libuuid, samba -, gccCrossStageStatic, gcc -, pkgsi686Linux, newScope, config -, targetPlatform, buildPlatform -, overrides ? {} -, buildPackages, pkgs -}: - -with args; - -let - callPackage = newScope gnu; - - forcedNativePackages = - if stdenv.hostPlatform == stdenv.buildPlatform - then pkgs - else buildPackages; - - gnu = { - hurdCross = forcedNativePackages.callPackage ./hurd { - inherit fetchgit stdenv autoconf libtool texinfo - glibcCross hurdPartedCross; - inherit (gnu) machHeaders mig; - libuuid = libuuid.crossDrv; - automake = automake111x; - headersOnly = false; - cross = assert targetPlatform != buildPlatform; targetPlatform; - gccCross = gcc; - }; - - hurdCrossIntermediate = forcedNativePackages.callPackage ./hurd { - inherit fetchgit stdenv autoconf libtool texinfo glibcCross; - inherit (gnu) machHeaders mig; - hurdPartedCross = null; - libuuid = null; - automake = automake111x; - headersOnly = false; - cross = assert targetPlatform != buildPlatform; targetPlatform; - - # The "final" GCC needs glibc and the Hurd libraries (libpthread in - # particular) so we first need an intermediate Hurd built with the - # intermediate GCC. - gccCross = gccCrossStageStatic; - - # This intermediate Hurd is only needed to build libpthread, which needs - # libihash, and to build Parted, which needs libstore and - # libshouldbeinlibc. - buildTarget = "libihash libstore libshouldbeinlibc"; - installTarget = "libihash-install libstore-install libshouldbeinlibc-install"; - }; - - hurdHeaders = callPackage ./hurd { - automake = automake111x; - headersOnly = true; - gccCross = null; - glibcCross = null; - libuuid = null; - hurdPartedCross = null; - }; - - libpthreadHeaders = callPackage ./libpthread { - headersOnly = true; - hurd = null; - }; - - libpthreadCross = forcedNativePackages.callPackage ./libpthread { - inherit fetchgit stdenv autoconf automake libtool glibcCross; - inherit (gnu) machHeaders hurdHeaders; - hurd = gnu.hurdCrossIntermediate; - gccCross = gccCrossStageStatic; - cross = assert targetPlatform != buildPlatform; targetPlatform; - }; - - # In theory GNU Mach doesn't have to be cross-compiled. However, since it - # has to be built for i586 (it doesn't work on x86_64), one needs a cross - # compiler for that host. - mach = callPackage ./mach { - automake = automake111x; - }; - - machHeaders = callPackage ./mach { - automake = automake111x; - headersOnly = true; - mig = null; - }; - - mig = callPackage ./mig { - # Build natively, but force use of a 32-bit environment because we're - # targeting `i586-pc-gnu'. - stdenv = pkgsi686Linux.stdenv; - }; - - # XXX: Use this one for its `.crossDrv'. Using the one above from - # `x86_64-linux' leads to building a different cross-toolchain because of - # the `forceSystem'. - mig_raw = callPackage ./mig {}; - - smbfs = callPackage ./smbfs { - hurd = gnu.hurdCross; - }; - - unionfs = callPackage ./unionfs { - hurd = gnu.hurdCross; - }; - } - - # Allow callers to override elements of this attribute set. - // overrides; - -in gnu # we trust! diff --git a/pkgs/os-specific/gnu/hurd/default.nix b/pkgs/os-specific/gnu/hurd/default.nix deleted file mode 100644 index a0c4be0ff45..00000000000 --- a/pkgs/os-specific/gnu/hurd/default.nix +++ /dev/null @@ -1,91 +0,0 @@ -{ fetchgit, stdenv, autoconf, automake, libtool, texinfo -, machHeaders, mig, headersOnly ? true -, cross ? null, gccCross ? null, glibcCross ? null -, hurdPartedCross ? null, libuuid ? null -, buildTarget ? "all", installTarget ? "install" }: - -assert (cross != null) -> (gccCross != null); -assert (hurdPartedCross != null) -> (libuuid != null); - -let - # Unfortunately we can't use `master@{DATE}', see - # <http://www.bramschoenmakers.nl/en/node/645>. - date = "20111115"; - rev = "969fbb646ffd89a482302e303eaded79781c3331"; - suffix = if headersOnly - then "-headers" - else (if buildTarget != "all" - then "-minimal" - else ""); -in -stdenv.mkDerivation ({ - name = "hurd${suffix}-${date}"; - - src = fetchgit { - url = "git://git.sv.gnu.org/hurd/hurd.git"; - sha256 = "b7f57ec2c6dcaf35ec03fb7979eb5506180ce4c6e2edf60a587f12ac5b11f004"; - inherit rev; - }; - - buildInputs = [ autoconf automake libtool texinfo mig ] - ++ stdenv.lib.optional (hurdPartedCross != null) hurdPartedCross - ++ stdenv.lib.optional (libuuid != null) libuuid - ++ stdenv.lib.optional (gccCross != null) gccCross - ++ stdenv.lib.optional (glibcCross != null) glibcCross; - - propagatedBuildInputs = [ machHeaders ]; - - configureFlags = stdenv.lib.optionals headersOnly [ "--build=i586-pc-gnu" ] - ++ (if hurdPartedCross != null - then [ "--with-parted" ] - else [ "--without-parted" ]); - - # Use `preConfigure' only for `autoreconf', so that users know they can - # simply clear it when the autoconf phase is unneeded. - preConfigure = "autoreconf -vfi"; - - postConfigure = - '' echo "removing \`-o root' from makefiles..." - for mf in {utils,daemons}/Makefile - do - sed -i "$mf" -e's/-o root//g' - done - ''; - - # Not needed after https://github.com/NixOS/nixpkgs/pull/43833 - dontPatchShebangs = stdenv.hostPlatform != stdenv.buildPlatform; - - meta = { - description = "The GNU Hurd, GNU project's replacement for the Unix kernel"; - - longDescription = - '' The GNU Hurd is the GNU project's replacement for the Unix kernel. - It is a collection of servers that run on the Mach microkernel to - implement file systems, network protocols, file access control, and - other features that are implemented by the Unix kernel or similar - kernels (such as Linux). - ''; - - license = stdenv.lib.licenses.gpl2Plus; - - homepage = http://www.gnu.org/software/hurd/; - - maintainers = [ stdenv.lib.maintainers.ludo ]; - }; -} - -// - -stdenv.lib.optionalAttrs (!headersOnly && buildTarget != null) { - # Use the default `buildPhase' and `installPhase' so that the usual hooks - # can still be used. - buildFlags = buildTarget; - installTargets = assert installTarget != null; installTarget; -} - -// - -stdenv.lib.optionalAttrs headersOnly { - dontBuild = true; - installPhase = "make install-headers"; -}) diff --git a/pkgs/os-specific/gnu/libpthread/default.nix b/pkgs/os-specific/gnu/libpthread/default.nix deleted file mode 100644 index a2e1081a1e8..00000000000 --- a/pkgs/os-specific/gnu/libpthread/default.nix +++ /dev/null @@ -1,81 +0,0 @@ -{ fetchgit, stdenv, autoconf, automake, libtool -, machHeaders, hurdHeaders, hurd, headersOnly ? false -, cross ? null, gccCross ? null, glibcCross ? null }: - -assert (cross != null) -> (gccCross != null) && (glibcCross != null); -assert (!headersOnly) -> (hurd != null); - -let - date = "20111020"; - - # Use the `tschwinge/Peter_Herbolzheimer' branch as prescribed in - # <http://www.gnu.org/software/hurd/hurd/building/cross-compiling.html>. - rev = "a7b82c3302bf9c47176648eb802a61ae2d9a16f5"; -in -stdenv.mkDerivation ({ - name = "libpthread-hurd-${if headersOnly then "headers-" else ""}${date}"; - - src = fetchgit { - url = "git://git.sv.gnu.org/hurd/libpthread.git"; - sha256 = "e8300762914d927c0da4168341a5982a1057613e1af363ee68942087b2570b3d"; - inherit rev; - }; - - nativeBuildInputs = [ autoconf automake libtool ]; - buildInputs = [ machHeaders hurdHeaders ] - ++ stdenv.lib.optional (!headersOnly) hurd - ++ stdenv.lib.optional (gccCross != null) gccCross; - - preConfigure = "autoreconf -vfi"; - - meta = { - description = "GNU Hurd's libpthread"; - - license = stdenv.lib.licenses.lgpl2Plus; - - maintainers = [ stdenv.lib.maintainers.ludo ]; - }; -} - -// - -(if headersOnly - then { - configureFlags = - [ "--build=i586-pc-gnu" - "ac_cv_lib_ihash_hurd_ihash_create=yes" - ]; - - dontBuild = true; - installPhase = "make install-data-local-headers"; - } - else { }) - -// - -(if cross != null - then { - # Tell gcc where to find `crt1.o' et al. This is specified in two - # different ways: one for gcc as run from `configure', and one for linking - # libpthread.so (by default `libtool --mode=link' swallows `-B', hence - # this workaround; see - # <http://lists.gnu.org/archive/html/bug-libtool/2010-05/msg00012.html>.) - LDFLAGS = "-B${glibcCross}/lib"; - makeFlags = [ "LDFLAGS=-Wc,-B${glibcCross}/lib" ]; - - # Help the linker find glibc. - CPATH = "${glibcCross}/include"; - LIBRARY_PATH = "${glibcCross}/lib"; - - passthru = { - # Extra target LDFLAGS to allow the cross-linker to find the - # dependencies of the cross libpthread.so, namely libihash.so. - # Note: these are raw `ld' flags, so `-Wl,' must be prepended when using - # `gcc'. - # - # This is actually only useful while building the final cross-gcc, since - # afterwards gcc-cross-wrapper should add the relevant flags. - TARGET_LDFLAGS = "-rpath-link=${hurd}/lib"; - }; - } - else { })) diff --git a/pkgs/os-specific/gnu/mach/default.nix b/pkgs/os-specific/gnu/mach/default.nix deleted file mode 100644 index 852b400ccb1..00000000000 --- a/pkgs/os-specific/gnu/mach/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ fetchgit, stdenv, mig ? null, autoconf, automake, texinfo -, headersOnly ? false }: - -assert (!headersOnly) -> (mig != null); - -let - date = "20120303"; - rev = "2a603e88f86bee88e013c2451eacf076fbcaed81"; -in -stdenv.mkDerivation ({ - name = "gnumach${if headersOnly then "-headers" else ""}-${date}"; - - src = fetchgit { - url = "git://git.sv.gnu.org/hurd/gnumach.git"; - sha256 = "1q8zk8xzbiwpnvvmfgkylj4gwkvkn5n2ydy9j054qv5plnaczj1c"; - inherit rev; - }; - - configureFlags = - stdenv.lib.optional headersOnly "--build=i586-pc-gnu" # cheat - - # Always enable dependency tracking. See - # <http://lists.gnu.org/archive/html/bug-hurd/2010-05/msg00137.html>. - ++ [ "--enable-dependency-tracking" ]; - - nativeBuildInputs = [ autoconf automake texinfo ] - ++ stdenv.lib.optional (mig != null) mig; - - preConfigure = "autoreconf -vfi"; - - meta = { - description = "GNU Mach, the microkernel used by the GNU Hurd"; - - longDescription = - '' GNU Mach is the microkernel that the GNU Hurd system is based on. - - It is maintained by the Hurd developers for the GNU project and - remains compatible with Mach 3.0. - - The majority of GNU Mach's device drivers are from Linux 2.0. They - were added using glue code, i.e., a Linux emulation layer in Mach. - ''; - - license = stdenv.lib.licenses.gpl2Plus; - - homepage = http://www.gnu.org/software/hurd/microkernel/mach/gnumach.html; - - maintainers = [ stdenv.lib.maintainers.ludo ]; - platforms = [ "i586-gnu" ]; - }; -} - -// - -(if headersOnly - then { dontBuild = true; installPhase = "make install-data"; } - else {})) diff --git a/pkgs/os-specific/gnu/mig/default.nix b/pkgs/os-specific/gnu/mig/default.nix deleted file mode 100644 index d138011d595..00000000000 --- a/pkgs/os-specific/gnu/mig/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ fetchgit, stdenv, autoconf, automake, flex, bison, machHeaders, bash }: - -let - date = "20100512"; - rev = "4fee6a5652f609cb68cdbd9049d4da7a194f15f8"; -in -stdenv.mkDerivation { - name = "mig-${date}"; - - src = fetchgit { - url = "git://git.sv.gnu.org/hurd/mig.git"; - sha256 = "d6958d9b60925d4600aac133c9505bc873a16b203c69260bd0fb228922ee9273"; - inherit rev; - }; - - patches = [ ./noyywrap.patch ]; - - nativeBuildInputs = [ autoconf automake flex bison machHeaders ]; - - preConfigure = "autoreconf -vfi"; - - doCheck = true; - - # Fix the shebang to point to the cross-built shell. Won't be needed - # after #43833. - postInstall = '' - sed -i "$out/bin/mig" -e 's|^#!/.*|#!${bash}/bin/sh|g' - ''; - - meta = { - description = "GNU MIG, the Mach interface generator"; - - longDescription = - '' GNU MIG is the GNU distribution of the Mach 3.0 interface generator - MIG, as maintained by the GNU Hurd developers for the GNU project. - - You need this tool to compile the GNU Mach and GNU Hurd - distributions, and to compile the GNU C library for the Hurd. Also, - you will need it for other software in the GNU system that uses - Mach-based inter-process communication. - ''; - - license = stdenv.lib.licenses.gpl2Plus; - - homepage = http://www.gnu.org/software/hurd/microkernel/mach/mig/gnu_mig.html; - - # platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # really GNU/Hurd - maintainers = [ stdenv.lib.maintainers.ludo ]; - }; -} diff --git a/pkgs/os-specific/gnu/mig/noyywrap.patch b/pkgs/os-specific/gnu/mig/noyywrap.patch deleted file mode 100644 index 40ca6171f64..00000000000 --- a/pkgs/os-specific/gnu/mig/noyywrap.patch +++ /dev/null @@ -1,12 +0,0 @@ -Fix undefined reference to `yywrap'. - -diff --git a/lexxer.l b/lexxer.l -index 9725d0b..15264bc 100644 ---- a/lexxer.l -+++ b/lexxer.l -@@ -1,4 +1,5 @@ - %option nounput -+%option noyywrap - - %k 10000 - %n 5000 diff --git a/pkgs/os-specific/gnu/smbfs/default.nix b/pkgs/os-specific/gnu/smbfs/default.nix deleted file mode 100644 index 6f3d719d816..00000000000 --- a/pkgs/os-specific/gnu/smbfs/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ fetchcvs, stdenv, hurd, machHeaders, samba }: - -let - date = "2012-03-15"; - samba_patched = stdenv.lib.overrideDerivation samba (attrs: { - patches = attrs.patches ++ [ ./samba-without-byte-range-locks.patch ]; - }); -in -stdenv.mkDerivation rec { - name = "smbfs-${date}"; - - src = fetchcvs { - cvsRoot = ":pserver:anonymous@cvs.savannah.nongnu.org:/sources/hurdextras"; - module = "smbfs"; - sha256 = "5941d1a5da4488cbf0efe9aa0b41fe4ff5ba57b84ed24f7ff7c0feda4501d3e3"; - inherit date; - }; - - patchPhase = - '' sed -i "Makefile" \ - -e 's|gcc|i586-pc-gnu-gcc|g ; - s|^LDFLAGS=\(.*\)$|LDFLAGS=\1 -pthread|g' - ''; - - buildInputs = [ hurd machHeaders samba_patched ]; - - installPhase = - '' mkdir -p "$out/hurd" - cp -v smbfs "$out/hurd" - - mkdir -p "$out/share/doc/${name}" - cp -v README "$out/share/doc/${name}" - ''; - - meta = { - description = "SMB/CIFS file system translator for GNU/Hurd"; - - homepage = http://www.nongnu.org/hurdextras/; - - license = stdenv.lib.licenses.gpl3Plus; - - maintainers = [ stdenv.lib.maintainers.ludo ]; - }; -} diff --git a/pkgs/os-specific/gnu/smbfs/samba-without-byte-range-locks.patch b/pkgs/os-specific/gnu/smbfs/samba-without-byte-range-locks.patch deleted file mode 100644 index 893a29c7539..00000000000 --- a/pkgs/os-specific/gnu/smbfs/samba-without-byte-range-locks.patch +++ /dev/null @@ -1,14 +0,0 @@ -Since GNU/Hurd doesn't support byte-range file locks, shamelessly -disable them to allow the SMB client library to work (it uses TDB -to access /etc/samba/private/secrets.tdb, for instance.) - ---- samba/lib/tdb/common/lock.c 2010-02-08 16:12:57.000000000 +0100 -+++ samba/lib/tdb/common/lock.c 2012-03-01 23:39:02.000000000 +0100 -@@ -48,7 +48,7 @@ int tdb_brlock(struct tdb_context *tdb, - struct flock fl; - int ret; - -- if (tdb->flags & TDB_NOLOCK) { -+ if (1) { - return 0; - } diff --git a/pkgs/os-specific/gnu/unionfs/default.nix b/pkgs/os-specific/gnu/unionfs/default.nix deleted file mode 100644 index 5e2f428130c..00000000000 --- a/pkgs/os-specific/gnu/unionfs/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ fetchgit, stdenv, hurd, machHeaders, mig }: - -let - date = "20120313"; - rev = "64dfa4e12d93c13b676d1cd7d86f4f4004ebfafa"; -in -stdenv.mkDerivation rec { - name = "unionfs-${date}"; - - src = fetchgit { - url = "git://git.sv.gnu.org/hurd/unionfs.git"; - sha256 = "1c3d71112cb25f8f82719a16df936e43abcb1adb77af96c1bb100a8ad0889d65"; - inherit rev; - }; - - patchPhase = - '' sed -i "Makefile" \ - -e 's|gcc|i586-pc-gnu-gcc|g ; - s|-std=gnu99|-std=gnu99 -fgnu89-inline|g' - ''; - - makeFlags = [ "CC=i586-pc-gnu-gcc" ]; - buildInputs = [ hurd machHeaders ]; - nativeBuildInputs = [ mig ]; - - installPhase = - '' mkdir -p "$out/hurd" - cp -v unionfs "$out/hurd" - - mkdir -p "$out/share/doc/${name}" - cp -v [A-Z]* "$out/share/doc/${name}" - ''; - - meta = { - description = "Union file system translator for GNU/Hurd"; - - homepage = http://www.gnu.org/software/hurd/hurd/translator/unionfs.html; - - license = stdenv.lib.licenses.gpl2Plus; - - maintainers = [ stdenv.lib.maintainers.ludo ]; - }; -} diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index c5f63d6671c..69fe94a1fe4 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -32,14 +32,14 @@ let in stdenv.mkDerivation rec { - name = "busybox-1.29.1"; + name = "busybox-1.29.2"; # Note to whoever is updating busybox: please verify that: # nix-build pkgs/stdenv/linux/make-bootstrap-tools.nix -A test # still builds after the update. src = fetchurl { url = "https://busybox.net/downloads/${name}.tar.bz2"; - sha256 = "1hqlr5b3bsyb6avadz1z4za6pyl32r1krnpcpwwqilhnx8q0f9gw"; + sha256 = "0qax9926qx9lpxiw75f4hkknz1pg0zcn5pkjx5gqfibs2ipgmlk7"; }; hardeningDisable = [ "format" ] ++ lib.optionals enableStatic [ "fortify" ]; diff --git a/pkgs/os-specific/linux/cifs-utils/default.nix b/pkgs/os-specific/linux/cifs-utils/default.nix index 7b6dd6fba35..7d98e51c1c7 100644 --- a/pkgs/os-specific/linux/cifs-utils/default.nix +++ b/pkgs/os-specific/linux/cifs-utils/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig, kerberos, keyutils, pam, talloc }: +{ stdenv, fetchurl, autoreconfHook, docutils, pkgconfig +, kerberos, keyutils, pam, talloc }: stdenv.mkDerivation rec { name = "cifs-utils-${version}"; @@ -9,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0ygz3pagjpaj5ky11hzh4byyymb7fpmqiqkprn11zwj31h2zdlg7"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook docutils pkgconfig ]; + buildInputs = [ kerberos keyutils pam talloc ]; makeFlags = "root_sbindir=$(out)/sbin"; diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix index 5211fd2a61b..178fc7d9140 100644 --- a/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/pkgs/os-specific/linux/cryptsetup/default.nix @@ -5,21 +5,15 @@ assert enablePython -> python2 != null; stdenv.mkDerivation rec { - name = "cryptsetup-2.0.3"; + name = "cryptsetup-2.0.4"; + + outputs = [ "out" "dev" "man" ]; src = fetchurl { url = "mirror://kernel/linux/utils/cryptsetup/v2.0/${name}.tar.xz"; - sha256 = "1m01wl8njjraz69fsk97l3nqfc32nbpr1la5s1l4mzzmq42clv2d"; + sha256 = "0d2p9g2wqcv6l3671gvw96p16jadbgyh21ddy2bhqgi96dq3qflx"; }; - patches = [ - # NOTE: Patch to support LibreSSL-2.7. It is from upstream, and can be removed when cryptsetup is next updated. - (fetchpatch { - url = "https://gitlab.com/cryptsetup/cryptsetup/commit/5fcf430c8105fbeeb07a8cacbae84f941d2a3d55.patch"; - sha256 = "1d3ycsqszq0frlv9r7kmfdfmnk4qa4b4mv25iivmayvpgc8yja7m"; - }) - ]; - postPatch = '' patchShebangs tests ''; diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index f018b5c2a7d..e29dd2e6ee5 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -79,6 +79,19 @@ in stdenv.mkDerivation { FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file + # TODO: wrapGAppsHook wraps efi capsule even though it is not elf + dontWrapGApps = true; + # so we need to wrap the executables manually + postFixup = '' + find -L "$out/bin" "$out/libexec" -type f -executable -print0 \ + | while IFS= read -r -d ''' file; do + if [[ "''${file}" != *.efi ]]; then + echo "Wrapping program ''${file}" + wrapProgram "''${file}" "''${gappsWrapperArgs[@]}" + fi + done + ''; + # /etc/fwupd/uefi.conf is created by the services.hardware.fwupd NixOS module passthru = { filesInstalledToEtc = [ diff --git a/pkgs/os-specific/linux/firmware/fwupdate/default.nix b/pkgs/os-specific/linux/firmware/fwupdate/default.nix index fd0d222eaac..5b14546c90f 100644 --- a/pkgs/os-specific/linux/firmware/fwupdate/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupdate/default.nix @@ -1,16 +1,14 @@ { efivar, fetchurl, gettext, gnu-efi, libsmbios, pkgconfig, popt, stdenv }: let - version = "10"; + version = "12"; in stdenv.mkDerivation { name = "fwupdate-${version}"; src = fetchurl { url = "https://github.com/rhinstaller/fwupdate/releases/download/${version}/fwupdate-${version}.tar.bz2"; - sha256 = "0fpk3q0msq2l0bs2mvk0cqp8jbwnmi17ggc81r4v96h4jxh2rx3k"; + sha256 = "00w7jsg7wrlq4cpfz26m9rbv2jwyf0sansf343vfq02fy5lxars1"; }; patches = [ - # https://github.com/rhboot/fwupdate/pull/99 - ./fix-paths.patch ./do-not-create-sharedstatedir.patch ]; diff --git a/pkgs/os-specific/linux/firmware/fwupdate/fix-paths.patch b/pkgs/os-specific/linux/firmware/fwupdate/fix-paths.patch deleted file mode 100644 index b01dfa355ef..00000000000 --- a/pkgs/os-specific/linux/firmware/fwupdate/fix-paths.patch +++ /dev/null @@ -1,116 +0,0 @@ ---- a/Make.defaults -+++ b/Make.defaults -@@ -18,19 +18,20 @@ - ABIDIFF := abidiff - ABIDW := abidw - prefix ?= /usr/ --prefix := $(abspath $(prefix))/ -+prefix := $(abspath $(prefix)) -+exec_prefix ?= $(prefix) - ARCH = $(shell $(CC) -dumpmachine | cut -f1 -d- | sed s,i[3456789]86,ia32,) - ifeq ($(ARCH),x86_64) -- LIBDIR ?= $(prefix)lib64 -+ LIBDIR ?= $(exec_prefix)/lib64 - endif - ifeq ($(ARCH),ia32) -- LIBDIR ?= $(prefix)lib -+ LIBDIR ?= $(exec_prefix)/lib - endif - ifeq ($(ARCH),aarch64) -- LIBDIR ?= $(prefix)lib64 -+ LIBDIR ?= $(exec_prefix)/lib64 - endif - ifeq ($(ARCH),arm) -- LIBDIR ?= $(prefix)lib -+ LIBDIR ?= $(exec_prefix)/lib - endif - LIBDIR ?= unknown - ifeq ($(LIBDIR),unknown) -@@ -45,13 +46,13 @@ - GNUEFIDIR ?= $(LIBDIR)/gnuefi - libdir ?= $(LIBDIR) - pcdir ?= $(libdir)/pkgconfig --mandir ?= $(prefix)share/man --includedir ?= $(prefix)include --bindir ?= $(prefix)bin --datadir ?= $(prefix)share -+mandir ?= $(prefix)/share/man -+includedir ?= $(prefix)/include -+bindir ?= $(exec_prefix)/bin -+datadir ?= $(prefix)/share - localedir ?= $(datadir)/locale --libexecdir ?= $(prefix)libexec --libdatadir ?= $(prefix)lib -+libexecdir ?= $(exec_prefix)/libexec -+libdatadir ?= $(exec_prefix)/lib - sharedstatedir ?= /var/lib - - EFIDIR ?= $(shell x=$$(which --skip-alias --skip-functions git 2>/dev/null) ; [ -n "$$x" ] && git config --get fwupdate.efidir) -@@ -63,8 +64,8 @@ - ESPMOUNTPOINT = "/boot/efi" - endif - --DEBUGINFO ?= $(prefix)lib/debug --DEBUGSOURCE ?= $(prefix)src/debug -+DEBUGINFO ?= $(exec_prefix)/lib/debug -+DEBUGSOURCE ?= $(prefix)/src/debug - TARGETDIR ?= $(ESPMOUNTPOINT)/EFI/$(EFIDIR) - - .PHONY: check_efidir_error ---- a/linux/Makefile -+++ b/linux/Makefile -@@ -93,16 +93,19 @@ - sed -e "s,@@VERSION@@,$(VERSION),g" \ - -e "s,@@FWUP_MAJOR_VERSION@@,$(MAJOR_VERSION),g" \ - -e "s,@@FWUP_MINOR_VERSION@@,$(MINOR_VERSION),g" \ -+ -e "s,@@PREFIX@@,$(prefix),g" \ -+ -e "s,@@EXEC_PREFIX@@,$(exec_prefix),g" \ - -e "s,@@SHAREDSTATEDIR@@,$(sharedstatedir),g" \ - -e "s,@@ESPMOUNTPOINT@@,$(ESPMOUNTPOINT),g" \ - -e "s,@@EFIDIR@@,$(EFIDIR),g" \ - -e "s,@@LIBDIR@@,$(libdir),g" \ - -e "s,@@LIBEXECDIR@@,$(libexecdir),g" \ -+ -e "s,@@INCLUDEDIR@@,$(includedir),g" \ - $< > $@ - - tester : tester.c -- $(CC) -Wall -Werror -ggdb -L. -I./include -I/usr/include/efivar \ -- -lefivar -lfwup -o $@ $^ -+ $(CC) -Wall -Werror -ggdb -L. -I./include $(shell $(PKG_CONFIG) --cflags efivar) \ -+ $(shell $(PKG_CONFIG) --libs efivar) -lfwup -o $@ $^ - - test : tester - LD_LIBRARY_PATH=$(shell pwd) ./tester -@@ -134,6 +137,6 @@ - $(INSTALL) -d -m 755 $(DESTDIR)$(libdatadir)/systemd/system - $(INSTALL) -m 644 cleanup.service \ - $(DESTDIR)$(libdatadir)/systemd/system/fwupdate-cleanup.service -- $(INSTALL) -d -m 755 $(DESTDIR)/usr/share/bash-completion/completions/ -+ $(INSTALL) -d -m 755 $(DESTDIR)$(datadir)/bash-completion/completions/ - $(INSTALL) -m 755 $(VPATH)/bash-completion \ -- $(DESTDIR)/usr/share/bash-completion/completions/fwupdate -+ $(DESTDIR)$(datadir)/bash-completion/completions/fwupdate ---- a/linux/fwup.pc.in -+++ b/linux/fwup.pc.in -@@ -1,7 +1,7 @@ --prefix=/usr --exec_prefix=/usr -+prefix=@@PREFIX@@ -+exec_prefix=@@EXEC_PREFIX@@ - libdir=@@LIBDIR@@ --includedir=/usr/include -+includedir=@@INCLUDEDIR@@ - - Name: fwup - Description: Library for deployment of UEFI firmware updates. ---- a/linux/libfwup.c -+++ b/linux/libfwup.c -@@ -35,7 +35,7 @@ - - #include <dell-wmi-smi.h> - #ifdef FWUPDATE_HAVE_LIBSMBIOS__ --#include </usr/include/smbios_c/token.h> -+#include <smbios_c/token.h> - #include <smbios_c/smi.h> - #endif - diff --git a/pkgs/os-specific/linux/fscrypt/default.nix b/pkgs/os-specific/linux/fscrypt/default.nix index 267e31d427c..da787d84d79 100644 --- a/pkgs/os-specific/linux/fscrypt/default.nix +++ b/pkgs/os-specific/linux/fscrypt/default.nix @@ -4,7 +4,7 @@ buildGoPackage rec { name = "fscrypt-${version}"; - version = "0.2.3"; + version = "0.2.4"; goPackagePath = "github.com/google/fscrypt"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "google"; repo = "fscrypt"; rev = "v${version}"; - sha256 = "126bbxim4nj56kplvyv528i88mfray50r2rc6ysblkmaw6x0fd9c"; + sha256 = "10gbyqzgi30as1crvqbb4rc5p8zzbzk1q5j080h1gnz56qzwivr8"; }; buildInputs = [ pam ]; diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix index 833609f9fc2..79179f3fcbb 100644 --- a/pkgs/os-specific/linux/iwd/default.nix +++ b/pkgs/os-specific/linux/iwd/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchgit, autoreconfHook, readline, python3Packages }: +{ stdenv, fetchgit, autoreconfHook, coreutils, readline, python3Packages }: let ell = fetchgit { url = https://git.kernel.org/pub/scm/libs/ell/ell.git; - rev = "0.7"; - sha256 = "095psnpfdy107z5qgi5zw0icqxa44dfx02lza3pd8j4ybj57n0l7"; + rev = "0.9"; + sha256 = "1kg7cx7ir8bvz33n624ncrq9r4fh7rg9z22fly894a3mk1imq22p"; }; in stdenv.mkDerivation rec { name = "iwd-${version}"; - version = "0.4"; + version = "0.7"; src = fetchgit { url = https://git.kernel.org/pub/scm/network/wireless/iwd.git; rev = version; - sha256 = "1hib256jm70k6jlx486jrcv0iip52divbzhvb0f455yh28qfk0hs"; + sha256 = "0q76fh6fcl7nxyjl8z2n4plp2qaxc1fqx575by6xqf1rnv4nk0ab"; }; nativeBuildInputs = [ @@ -35,8 +35,9 @@ in stdenv.mkDerivation rec { configureFlags = [ "--with-dbus-datadir=$(out)/etc/" - "--localstatedir=/var" - "--disable-systemd-service" + "--with-dbus-busdir=$(out)/usr/share/dbus-1/system-services/" + "--with-systemd-unitdir=$(out)/lib/systemd/system/" + "--localstatedir=/var/" ]; postUnpack = '' @@ -55,6 +56,11 @@ in stdenv.mkDerivation rec { wrapPythonPrograms ''; + postFixup = '' + substituteInPlace $out/usr/share/dbus-1/system-services/net.connman.iwd.service \ + --replace /bin/false ${coreutils}/bin/false + ''; + meta = with stdenv.lib; { homepage = https://git.kernel.org/pub/scm/network/wireless/iwd.git; description = "Wireless daemon for Linux"; diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 548c66e87e6..68b5e7c21a8 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -146,6 +146,14 @@ let # needed for iwd WPS support (wpa_supplicant replacement) KEY_DH_OPERATIONS = whenAtLeast "4.7" yes; + + # needed for nftables + NF_TABLES_INET = whenAtLeast "4.17" yes; + NF_TABLES_NETDEV = whenAtLeast "4.17" yes; + NF_TABLES_IPV4 = whenAtLeast "4.17" yes; + NF_TABLES_ARP = whenAtLeast "4.17" yes; + NF_TABLES_IPV6 = whenAtLeast "4.17" yes; + NF_TABLES_BRIDGE = whenAtLeast "4.17" yes; }; wireless = { @@ -294,7 +302,7 @@ let CIFS_XATTR = yes; CIFS_POSIX = yes; CIFS_FSCACHE = yes; - CIFS_STATS = yes; + CIFS_STATS = whenOlder "4.19" yes; CIFS_WEAK_PW_HASH = yes; CIFS_UPCALL = yes; CIFS_ACL = yes; diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index de983418b7b..bbc98592503 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; buildLinux (args // rec { - version = "4.14.66"; + version = "4.14.67"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "04q48syzmz84s045bqwyzrr37wcria8waggb5fki2kc69k563053"; + sha256 = "1fkha288nv5vk2l13dj0xj09c2pxvipysdaaga7sfcvjq9nhajrz"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.17.nix b/pkgs/os-specific/linux/kernel/linux-4.17.nix index 126c3284d05..c9a79fd23cb 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.17.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.17.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.17.18"; + version = "4.17.19"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "03wvnw4xl48na08c29qq57a39kgvb67ayxfqqv4n06vpf8vmx2sd"; + sha256 = "05wz76qq70bfhfwd1zwzfmzq4rlgz40jpi9plb31njx1y7vkx6xs"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.18.nix b/pkgs/os-specific/linux/kernel/linux-4.18.nix index 768a4c96542..bbd0bbfbb21 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.18.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.18.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.18.4"; + version = "4.18.5"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0hm8id6nv3j2g7l1fzkl4vr9wfx43s8hdspg1yc4fz6vbdxwinqj"; + sha256 = "1ga7ys6s5d9dk1ly9722sbik1y6kbc3w6nw9pw86zpzdh0v0l2gv"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 31f489c4faf..a4433cc434c 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.151"; + version = "4.4.153"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1s49h2my2jysh1i38vygqlcj9bz8fzg6vsv9k3ln3pi6hqqqrsjz"; + sha256 = "00jlajwbq7w5cxzzaa5mib5qvihqab3ysfq401b71ji2bi8ma8qg"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 9b9072d302e..8fa710a0e46 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.123"; + version = "4.9.124"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0wahbq08cixh63099n13wal3xkw48gnka6w8biax1gwckymww4ld"; + sha256 = "04a3iqy6divkd9bamn60d0v8jkls2jbip7qn0m82dlcdikab19jw"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix b/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix index 53d8accb185..2bce56e1e52 100644 --- a/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix @@ -1,10 +1,10 @@ { stdenv, buildPackages, hostPlatform, fetchFromGitHub, perl, buildLinux, libelf, utillinux, ... } @ args: buildLinux (args // rec { - version = "4.14.55-146"; + version = "4.14.66-147"; # modDirVersion needs to be x.y.z. - modDirVersion = "4.14.55"; + modDirVersion = "4.14.66"; # branchVersion needs to be x.y. extraMeta.branch = "4.14"; @@ -13,7 +13,7 @@ buildLinux (args // rec { owner = "hardkernel"; repo = "linux"; rev = version; - sha256 = "1bm1njng4rwfylgnqv06vabkvybm9rikqj1lsb7p9qcs3y1kw6mh"; + sha256 = "06v38jl4i7l8gl8zcpyp9vmjjhaqhbp7by15f82rxa724zppxi9x"; }; defconfig = "odroidxu4_defconfig"; diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index ec3baaf1e0a..c2feeceb072 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args: buildLinux (args // rec { - version = "4.18-rc8"; - modDirVersion = "4.18.0-rc8"; - extraMeta.branch = "4.18"; + version = "4.19-rc1"; + modDirVersion = "4.19.0-rc1"; + extraMeta.branch = "4.19"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "0rqyqms63c15iwcwy40yqd9fvlvh3ah09gddv0wf45z9dqp7id1m"; + sha256 = "14c9xg9sv0jrdri36das97vdbybi7vmcy59mj9wmgaz81cdk3wg5"; }; # Should the testing kernels ever be built on Hydra? diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index 3c158e228f3..ab84c4d9bf9 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -9,11 +9,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "lxc-${version}"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { url = "https://linuxcontainers.org/downloads/lxc/lxc-${version}.tar.gz"; - sha256 = "1nyml98k28sc5sda0260cmby4irkpnhpwgmx4yhqy10wpr4nr625"; + sha256 = "0p1gy553cm4mhwxi85fl6qiwz61rjmvysm8c8pd20qh62xxi3dva"; }; nativeBuildInputs = [ diff --git a/pkgs/os-specific/linux/lxcfs/default.nix b/pkgs/os-specific/linux/lxcfs/default.nix index 2bdec70b6f9..5760db290a9 100644 --- a/pkgs/os-specific/linux/lxcfs/default.nix +++ b/pkgs/os-specific/linux/lxcfs/default.nix @@ -3,13 +3,13 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "lxcfs-3.0.1"; + name = "lxcfs-3.0.2"; src = fetchFromGitHub { owner = "lxc"; repo = "lxcfs"; rev = name; - sha256 = "0rwk1nbcjnp2d2zbyng8ix9dmww211aiqq8870r9p4j11xv9mgx4"; + sha256 = "0llfvml9ww8gxa4g2a7b1gnxf9g5473pq1inrhvi4xkjx76x602k"; }; nativeBuildInputs = [ pkgconfig help2man autoreconfHook ]; diff --git a/pkgs/os-specific/linux/microcode/intel.nix b/pkgs/os-specific/linux/microcode/intel.nix index 403824fb3a4..8362392e0bf 100644 --- a/pkgs/os-specific/linux/microcode/intel.nix +++ b/pkgs/os-specific/linux/microcode/intel.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "microcode-intel-${version}"; - version = "20180807"; + version = "20180807a"; src = fetchurl { - url = "https://downloadmirror.intel.com/28039/eng/microcode-${version}.tgz"; - sha256 = "0h4ygwx5brnrjz8v47aikrwhf0q3jhizxmzcii4bdjg64zffiy99"; + url = "https://downloadmirror.intel.com/28087/eng/microcode-${version}.tgz"; + sha256 = "0dw1akgzdqk95pwmc8gfdmv7kabw9pn4c67f076bcbn4krliias6"; }; nativeBuildInputs = [ iucode-tool libarchive ]; diff --git a/pkgs/os-specific/linux/nss_ldap/default.nix b/pkgs/os-specific/linux/nss_ldap/default.nix index ef0bdc4f126..c23eb19a482 100644 --- a/pkgs/os-specific/linux/nss_ldap/default.nix +++ b/pkgs/os-specific/linux/nss_ldap/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation { preConfigure = '' patchShebangs ./vers_string sed -i s,vers_string,./vers_string, Makefile* + substituteInPlace vers_string --replace "cvslib.pl" "./cvslib.pl" ''; patches = [ ./crashes.patch ]; diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 6fcb28a985c..16bab9979d0 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -17,11 +17,11 @@ in rec { # Policy: use the highest stable version as the default (on our master). stable = generic { - version = "390.67"; - sha256_32bit = "01c8fa80njyyr39c1pyf7ssmfq65ci8mapbs94fd6gnhwc7gfjkg"; - sha256_64bit = "0np6xj93fali2hss8xsdlmy5ykjgn4hx6mzjr8dpbdi0fhdcmwkd"; - settingsSha256 = "1wk4587czysnbj5yxijmv3bldcffzwp4yvfx133apsr31dqca0s7"; - persistencedSha256 = "1zia1r97lyj6fbmvsw4hv5qfcj84x3sz971m4430d8qyks2c4sdw"; + version = "390.77"; + sha256_32bit = "1yd313ghh2qbn07d5wbkshfwgkm4mh49vcqkydds3b3xk0mx4i8l"; + sha256_64bit = "10kjccrkdn360035lh985cadhwy6lk9xrw3wlmww2wqfaa25f775"; + settingsSha256 = "1wvxldpjkrx0ldjm5l6ycm6paxpcw89h0n6hfkznfkahkq7fwxdj"; + persistencedSha256 = "1gklmc0v17m018cwpdlzwdyd45y4sjvjhj8a3l44baygix5zn30f"; }; beta = stable; # not enough interest to maintain beta ATM diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index eeb5a3588e3..0ededc08050 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -84,7 +84,6 @@ let platforms = [ "i686-linux" "x86_64-linux" ]; maintainers = [ maintainers.vcunat ]; priority = 4; # resolves collision with xorg-server's "lib/xorg/modules/extensions/libglx.so" - broken = stdenv.lib.versionAtLeast kernel.version "4.18"; }; }; diff --git a/pkgs/os-specific/linux/pam_ldap/default.nix b/pkgs/os-specific/linux/pam_ldap/default.nix index e7f2c8278e1..5b34a8bc82b 100644 --- a/pkgs/os-specific/linux/pam_ldap/default.nix +++ b/pkgs/os-specific/linux/pam_ldap/default.nix @@ -10,6 +10,7 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs ./vers_string + substituteInPlace vers_string --replace "cvslib.pl" "./cvslib.pl" ''; preInstall = " diff --git a/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix b/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix index 720e3fbbc9f..703d13126a3 100644 --- a/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix +++ b/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix @@ -1,10 +1,10 @@ { stdenv, systemd, cryptsetup }: -stdenv.lib.overrideDerivation systemd (p: { +systemd.overrideAttrs (p: { version = p.version; name = "systemd-cryptsetup-generator-${p.version}"; - nativeBuildInputs = p.nativeBuildInputs ++ [ cryptsetup ]; + buildInputs = p.buildInputs ++ [ cryptsetup ]; outputs = [ "out" ]; buildPhase = '' diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix index 65c995558a4..78ab6b37532 100644 --- a/pkgs/os-specific/linux/udisks/2-default.nix +++ b/pkgs/os-specific/linux/udisks/2-default.nix @@ -6,7 +6,7 @@ }: let - version = "2.7.7"; + version = "2.8.0"; in stdenv.mkDerivation rec { name = "udisks-${version}"; @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { owner = "storaged-project"; repo = "udisks"; rev = name; - sha256 = "13a7810izfhz729kwij584vsrzz9jdyfzvbl9magl0nfyj8zj8m8"; + sha256 = "110g3vyai3p6vjzy01yd0bbvxk7n7dl5glxf54f3jvqf0zmaqipx"; }; outputs = [ "out" "man" "dev" "devdoc" ]; diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix index b5a2c61e23e..2dcbf6737e6 100644 --- a/pkgs/servers/clickhouse/default.nix +++ b/pkgs/servers/clickhouse/default.nix @@ -1,31 +1,32 @@ { stdenv, fetchFromGitHub, cmake, libtool , boost, capnproto, cctz, clang-unwrapped, double-conversion, gperftools, icu , libcpuid, libxml2, lld, llvm, lz4 , mysql, openssl, poco, re2, rdkafka -, readline, sparsehash, unixODBC, zstd, ninja +, readline, sparsehash, unixODBC, zstd, ninja, jemalloc }: stdenv.mkDerivation rec { name = "clickhouse-${version}"; - version = "18.5.1"; + version = "18.10.3"; src = fetchFromGitHub { owner = "yandex"; repo = "ClickHouse"; rev = "v${version}-stable"; - sha256 = "1bw1hx3ssd1jcg6jj85nmp6dnyhvaaphjpcr6x4xs410k140qx31"; + sha256 = "1fm7jh9cxalvlic6pw58gblisvmvb6j0jzf3vr8p6cv7iw9238sp"; }; nativeBuildInputs = [ cmake libtool ninja ]; buildInputs = [ boost capnproto cctz clang-unwrapped double-conversion gperftools icu libcpuid libxml2 lld llvm lz4 mysql.connector-c openssl poco re2 rdkafka - readline sparsehash unixODBC zstd + readline sparsehash unixODBC zstd jemalloc ]; cmakeFlags = [ "-DENABLE_TESTS=OFF" "-DUNBUNDLED=ON" "-DUSE_STATIC_LIBRARIES=OFF" + "-DUSE_INTERNAL_SSL_LIBRARY=False" ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/servers/irc/charybdis/default.nix b/pkgs/servers/irc/charybdis/default.nix index 332372830d6..dc053f4581c 100644 --- a/pkgs/servers/irc/charybdis/default.nix +++ b/pkgs/servers/irc/charybdis/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, autoreconfHook, bison, flex, openssl, gnutls }: stdenv.mkDerivation rec { - name = "charybdis-4.1"; + name = "charybdis-4.1.1"; src = fetchFromGitHub { owner = "charybdis-ircd"; repo = "charybdis"; rev = name; - sha256 = "1j0fjf4rdiyvakxqa97x272xra64rzjhbj8faciyb4b13pyrdsmw"; + sha256 = "0wvssc8b1xq6svcqrwxrpc1ga8ip0sksv73wwbk8na0pmysdvpg0"; }; postPatch = '' diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix index 8bf9da22e72..2fec42edff3 100644 --- a/pkgs/servers/monitoring/munin/default.nix +++ b/pkgs/servers/monitoring/munin/default.nix @@ -52,6 +52,9 @@ stdenv.mkDerivation rec { perlPackages.IOStringy ]; + # needs to find a local perl module during build + PERL_USE_UNSAFE_INC = stdenv.lib.optionalString (stdenv.lib.versionAtLeast (stdenv.lib.getVersion perl) "5.26") "1"; + # TODO: tests are failing http://munin-monitoring.org/ticket/1390#comment:1 # NOTE: important, test command always exits with 0, think of a way to abort the build once tests pass doCheck = false; diff --git a/pkgs/servers/monitoring/nagios/default.nix b/pkgs/servers/monitoring/nagios/default.nix index 64fd55f9e5a..9d79e8422ee 100644 --- a/pkgs/servers/monitoring/nagios/default.nix +++ b/pkgs/servers/monitoring/nagios/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "nagios-${version}"; - version = "4.4.1"; + version = "4.4.2"; src = fetchurl { url = "mirror://sourceforge/nagios/nagios-4.x/${name}/${name}.tar.gz"; - sha256 = "0j09jawjrbp5n7gwyb5mkq7l2dmg6fl03695salral66fs95s8nq"; + sha256 = "0lv8fgqbxza0rwd0gy3jsy85ljgsi3vhvzacr346va3a68zr461l"; }; patches = [ ./nagios.patch ]; diff --git a/pkgs/servers/monitoring/zabbix/3.4.nix b/pkgs/servers/monitoring/zabbix/3.4.nix index 047ce0a5130..72e6fa55b00 100644 --- a/pkgs/servers/monitoring/zabbix/3.4.nix +++ b/pkgs/servers/monitoring/zabbix/3.4.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pcre, libiconv }: +{ stdenv, fetchurl, pcre, libiconv, openssl }: let @@ -23,8 +23,9 @@ in "--enable-agent" "--with-libpcre=${pcre.dev}" "--with-iconv=${libiconv}" + "--with-openssl=${openssl.dev}" ]; - buildInputs = [ pcre libiconv ]; + buildInputs = [ pcre libiconv openssl ]; meta = with stdenv.lib; { inherit branch; diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix index 6f7f9e74ec5..88a8d0e8707 100644 --- a/pkgs/servers/plex/default.nix +++ b/pkgs/servers/plex/default.nix @@ -6,9 +6,9 @@ let plexPass = throw "Plex pass has been removed at upstream's request; please unset nixpkgs.config.plex.pass"; plexpkg = if enablePlexPass then plexPass else { - version = "1.13.4.5271"; - vsnHash = "200287a06"; - sha256 = "c8aa459f680ad9db92f285dae2f3dcffbf082324e1b7ea2f356bdbe745fe6b8e"; + version = "1.13.5.5291"; + vsnHash = "6fa5e50a8"; + sha256 = "1h0r7hxxw5jf2dn8w4cnj71dm873y2j0l87rg8pf0r3cyx6rhxnx"; }; in stdenv.mkDerivation rec { diff --git a/pkgs/servers/search/elasticsearch/2.x.nix b/pkgs/servers/search/elasticsearch/2.x.nix deleted file mode 100644 index 28244d1b3dc..00000000000 --- a/pkgs/servers/search/elasticsearch/2.x.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, jre, utillinux }: - -with stdenv.lib; - -stdenv.mkDerivation rec { - version = "2.4.4"; - name = "elasticsearch-${version}"; - - src = fetchurl { - url = "https://download.elasticsearch.org/elasticsearch/release/org/elasticsearch/distribution/tar/elasticsearch/${version}/${name}.tar.gz"; - sha256 = "1qjq04sfqb35pf2xpvr8j5p27chfxpjp8ymrp1h5bfk5rbk9444q"; - }; - - patches = [ ./es-home-2.x.patch ./es-classpath-2.x.patch ]; - - buildInputs = [ makeWrapper jre utillinux ]; - - installPhase = '' - mkdir -p $out - cp -R bin config lib modules $out - - # don't want to have binary with name plugin - mv $out/bin/plugin $out/bin/elasticsearch-plugin - wrapProgram $out/bin/elasticsearch \ - --prefix ES_CLASSPATH : "$out/lib/${name}.jar":"$out/lib/*" \ - --prefix PATH : "${utillinux}/bin" \ - --set JAVA_HOME "${jre}" - wrapProgram $out/bin/elasticsearch-plugin --set JAVA_HOME "${jre}" - ''; - - meta = { - description = "Open Source, Distributed, RESTful Search Engine"; - license = licenses.asl20; - platforms = platforms.unix; - maintainers = [ - maintainers.offline - maintainers.markWot - ]; - }; -} diff --git a/pkgs/servers/search/elasticsearch/6.x.nix b/pkgs/servers/search/elasticsearch/6.x.nix deleted file mode 100644 index 84872649c49..00000000000 --- a/pkgs/servers/search/elasticsearch/6.x.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ elk6Version -, enableUnfree ? true -, stdenv -, fetchurl -, makeWrapper -, jre_headless -, utillinux -, autoPatchelfHook -, zlib -}: - -with stdenv.lib; - -stdenv.mkDerivation (rec { - version = elk6Version; - name = "elasticsearch-${optionalString (!enableUnfree) "oss-"}${version}"; - - src = fetchurl { - url = "https://artifacts.elastic.co/downloads/elasticsearch/${name}.tar.gz"; - sha256 = - if enableUnfree - then "0960ak602pm95p2mha9cb1mrwdky8pfw3y89r2v4zpr5n730hmnh" - else "1i4i1ai75bf8k0zd1qf8x0bavrm8rcw13xdim443zza09w95ypk4"; - }; - - patches = [ ./es-home-6.x.patch ]; - - postPatch = '' - sed -i "s|ES_CLASSPATH=\"\$ES_HOME/lib/\*\"|ES_CLASSPATH=\"$out/lib/*\"|" ./bin/elasticsearch-env - ''; - - buildInputs = [ makeWrapper jre_headless utillinux ]; - - installPhase = '' - mkdir -p $out - cp -R bin config lib modules plugins $out - - chmod -x $out/bin/*.* - - wrapProgram $out/bin/elasticsearch \ - --prefix PATH : "${utillinux}/bin/" \ - --set JAVA_HOME "${jre_headless}" - - wrapProgram $out/bin/elasticsearch-plugin --set JAVA_HOME "${jre_headless}" - ''; - - passthru = { inherit enableUnfree; }; - - meta = { - description = "Open Source, Distributed, RESTful Search Engine"; - license = if enableUnfree then licenses.elastic else licenses.asl20; - platforms = platforms.unix; - maintainers = with maintainers; [ apeschar basvandijk ]; - }; -} // optionalAttrs enableUnfree { - dontPatchELF = true; - nativeBuildInputs = [ autoPatchelfHook ]; - runtimeDependencies = [ zlib ]; - postFixup = '' - for exe in $(find $out/modules/x-pack/x-pack-ml/platform/linux-x86_64/bin -executable -type f); do - echo "patching $exe..." - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$exe" - done - ''; -}) diff --git a/pkgs/servers/search/elasticsearch/default.nix b/pkgs/servers/search/elasticsearch/default.nix index f4780603f50..84872649c49 100644 --- a/pkgs/servers/search/elasticsearch/default.nix +++ b/pkgs/servers/search/elasticsearch/default.nix @@ -1,40 +1,65 @@ -{ stdenv, fetchurl, makeWrapper, jre, utillinux }: +{ elk6Version +, enableUnfree ? true +, stdenv +, fetchurl +, makeWrapper +, jre_headless +, utillinux +, autoPatchelfHook +, zlib +}: with stdenv.lib; -stdenv.mkDerivation rec { - name = "elasticsearch-1.7.2"; +stdenv.mkDerivation (rec { + version = elk6Version; + name = "elasticsearch-${optionalString (!enableUnfree) "oss-"}${version}"; src = fetchurl { - url = "https://download.elastic.co/elasticsearch/elasticsearch/${name}.tar.gz"; - sha256 = "1lix4asvx1lbc227gzsrws3xqbcbqaal7v10w60kch0c4xg970bg"; + url = "https://artifacts.elastic.co/downloads/elasticsearch/${name}.tar.gz"; + sha256 = + if enableUnfree + then "0960ak602pm95p2mha9cb1mrwdky8pfw3y89r2v4zpr5n730hmnh" + else "1i4i1ai75bf8k0zd1qf8x0bavrm8rcw13xdim443zza09w95ypk4"; }; - patches = [ ./es-home.patch ]; + patches = [ ./es-home-6.x.patch ]; - buildInputs = [ makeWrapper jre utillinux ]; + postPatch = '' + sed -i "s|ES_CLASSPATH=\"\$ES_HOME/lib/\*\"|ES_CLASSPATH=\"$out/lib/*\"|" ./bin/elasticsearch-env + ''; + + buildInputs = [ makeWrapper jre_headless utillinux ]; installPhase = '' mkdir -p $out - cp -R bin config lib $out + cp -R bin config lib modules plugins $out - # don't want to have binary with name plugin - mv $out/bin/plugin $out/bin/elasticsearch-plugin + chmod -x $out/bin/*.* - # set ES_CLASSPATH and JAVA_HOME wrapProgram $out/bin/elasticsearch \ - --prefix ES_CLASSPATH : "$out/lib/${name}.jar":"$out/lib/*":"$out/lib/sigar/*" \ - --prefix PATH : "${utillinux}/bin" \ - --set JAVA_HOME "${jre}" - wrapProgram $out/bin/elasticsearch-plugin \ - --prefix ES_CLASSPATH : "$out/lib/${name}.jar":"$out/lib/*":"$out/lib/sigar/*" \ - --set JAVA_HOME "${jre}" + --prefix PATH : "${utillinux}/bin/" \ + --set JAVA_HOME "${jre_headless}" + + wrapProgram $out/bin/elasticsearch-plugin --set JAVA_HOME "${jre_headless}" ''; + passthru = { inherit enableUnfree; }; + meta = { description = "Open Source, Distributed, RESTful Search Engine"; - license = licenses.asl20; + license = if enableUnfree then licenses.elastic else licenses.asl20; platforms = platforms.unix; - maintainers = [ maintainers.offline ]; + maintainers = with maintainers; [ apeschar basvandijk ]; }; -} +} // optionalAttrs enableUnfree { + dontPatchELF = true; + nativeBuildInputs = [ autoPatchelfHook ]; + runtimeDependencies = [ zlib ]; + postFixup = '' + for exe in $(find $out/modules/x-pack/x-pack-ml/platform/linux-x86_64/bin -executable -type f); do + echo "patching $exe..." + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$exe" + done + ''; +}) diff --git a/pkgs/servers/search/elasticsearch/es-classpath-2.x.patch b/pkgs/servers/search/elasticsearch/es-classpath-2.x.patch deleted file mode 100644 index 46a3f0be71b..00000000000 --- a/pkgs/servers/search/elasticsearch/es-classpath-2.x.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -rupN a/bin/elasticsearch b/bin/elasticsearch ---- a/bin/elasticsearch 2017-02-08 18:32:28.000298543 -0500 -+++ b/bin/elasticsearch 2017-02-08 19:10:45.692916675 -0500 -@@ -81,12 +81,7 @@ ES_HOME=`cd "$ES_HOME"; pwd` - # If an include wasn't specified in the environment, then search for one... - if [ "x$ES_INCLUDE" = "x" ]; then - # Locations (in order) to use when searching for an include file. -- for include in /usr/share/elasticsearch/elasticsearch.in.sh \ -- /usr/local/share/elasticsearch/elasticsearch.in.sh \ -- /opt/elasticsearch/elasticsearch.in.sh \ -- ~/.elasticsearch.in.sh \ -- "$ES_HOME/bin/elasticsearch.in.sh" \ -- "`dirname "$0"`"/elasticsearch.in.sh; do -+ for include in "`dirname "$0"`"/elasticsearch.in.sh; do - if [ -r "$include" ]; then - . "$include" - break -diff -rupN a/bin/elasticsearch.in.sh b/bin/elasticsearch.in.sh ---- a/bin/elasticsearch.in.sh 2017-02-08 18:32:28.000298543 -0500 -+++ b/bin/elasticsearch.in.sh 2017-02-08 18:33:46.816634599 -0500 -@@ -1,17 +1,5 @@ - #!/bin/sh - --# check in case a user was using this mechanism --if [ "x$ES_CLASSPATH" != "x" ]; then -- cat >&2 << EOF --Error: Don't modify the classpath with ES_CLASSPATH. Best is to add --additional elements via the plugin mechanism, or if code must really be --added to the main classpath, add jars to lib/ (unsupported). --EOF -- exit 1 --fi -- --ES_CLASSPATH="$ES_HOME/lib/elasticsearch-2.4.4.jar:$ES_HOME/lib/*" -- - if [ "x$ES_MIN_MEM" = "x" ]; then - ES_MIN_MEM=256m - fi diff --git a/pkgs/servers/search/elasticsearch/es-home-2.x.patch b/pkgs/servers/search/elasticsearch/es-home-2.x.patch deleted file mode 100644 index 0c80e865114..00000000000 --- a/pkgs/servers/search/elasticsearch/es-home-2.x.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -rupN a/bin/elasticsearch b/bin/elasticsearch ---- a/bin/elasticsearch 2015-11-18 21:48:18.000000000 +0100 -+++ b/bin/elasticsearch 2015-12-04 00:52:21.032475098 +0100 -@@ -72,7 +72,11 @@ while [ -h "$SCRIPT" ] ; do - done - - # determine elasticsearch home --ES_HOME=`dirname "$SCRIPT"`/.. -+ -+if [ -z "$ES_HOME" ]; then -+ echo "You must set the ES_HOME var" >&2 -+ exit 1 -+fi - - # make ELASTICSEARCH_HOME absolute - ES_HOME=`cd "$ES_HOME"; pwd` -diff -rupN a/bin/plugin b/bin/plugin ---- a/bin/plugin 2015-11-18 21:48:18.000000000 +0100 -+++ b/bin/plugin 2015-12-04 00:52:55.947453619 +0100 -@@ -17,7 +17,10 @@ while [ -h "$SCRIPT" ] ; do - done - - # determine elasticsearch home --ES_HOME=`dirname "$SCRIPT"`/.. -+if [ -z "$ES_HOME" ]; then -+ echo "You must set the ES_HOME var" >&2 -+ exit 1 -+fi - - # make ELASTICSEARCH_HOME absolute - ES_HOME=`cd "$ES_HOME"; pwd` diff --git a/pkgs/servers/search/elasticsearch/es-home.patch b/pkgs/servers/search/elasticsearch/es-home.patch deleted file mode 100644 index 2f2018fd69f..00000000000 --- a/pkgs/servers/search/elasticsearch/es-home.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -rupN a/bin/elasticsearch b/bin/elasticsearch ---- a/bin/elasticsearch 2015-08-05 17:52:05.740819671 +0200 -+++ b/bin/elasticsearch 2015-08-05 17:22:34.664657364 +0200 -@@ -83,7 +83,10 @@ while [ -h "$SCRIPT" ] ; do - done - - # determine elasticsearch home --ES_HOME=`dirname "$SCRIPT"`/.. -+if [ -z "$ES_HOME" ]; then -+ echo "You must set the ES_HOME var" >&2 -+ exit 1 -+fi - - # make ELASTICSEARCH_HOME absolute - ES_HOME=`cd "$ES_HOME"; pwd` -diff -rupN a/bin/plugin b/bin/plugin ---- a/bin/plugin 2015-08-05 17:57:07.903088815 +0200 -+++ b/bin/plugin 2015-08-05 17:57:38.979808139 +0200 -@@ -16,7 +16,10 @@ while [ -h "$SCRIPT" ] ; do - done - - # determine elasticsearch home --ES_HOME=`dirname "$SCRIPT"`/.. -+if [ -z "$ES_HOME" ]; then -+ echo "You must set the ES_HOME var" >&2 -+ exit 1 -+fi - - # make ELASTICSEARCH_HOME absolute - ES_HOME=`cd "$ES_HOME"; pwd` -@@ -105,4 +105,4 @@ - - export HOSTNAME=`hostname -s` - --eval "$JAVA" $JAVA_OPTS $ES_JAVA_OPTS -Xmx64m -Xms16m -Delasticsearch -Des.path.home=\""$ES_HOME"\" $properties -cp \""$ES_HOME/lib/*"\" org.elasticsearch.plugins.PluginManager $args -\ No newline at end of file -+eval "$JAVA" $JAVA_OPTS $ES_JAVA_OPTS -Xmx64m -Xms16m -Delasticsearch -Des.path.home="$ES_HOME" $properties -cp "$ES_CLASSPATH/lib/*" org.elasticsearch.plugins.PluginManager $args diff --git a/pkgs/servers/search/elasticsearch/plugins.nix b/pkgs/servers/search/elasticsearch/plugins.nix index b93d8c2203d..b3141ee807d 100644 --- a/pkgs/servers/search/elasticsearch/plugins.nix +++ b/pkgs/servers/search/elasticsearch/plugins.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, fetchurl, unzip, elasticsearch }: +{ pkgs, stdenv, fetchurl, unzip, elasticsearch-oss, javaPackages, elk6Version }: with pkgs.lib; @@ -6,8 +6,9 @@ let esPlugin = a@{ pluginName, installPhase ? '' - mkdir -p $out/bin - ES_HOME=$out ${elasticsearch}/bin/elasticsearch-plugin --install ${pluginName} --url file://$src + mkdir -p $out/config + mkdir -p $out/plugins + ES_HOME=$out ${elasticsearch-oss}/bin/elasticsearch-plugin install --batch -v file://$src '', ... }: @@ -16,33 +17,19 @@ let unpackPhase = "true"; buildInputs = [ unzip ]; meta = a.meta // { - platforms = elasticsearch.meta.platforms; + platforms = elasticsearch-oss.meta.platforms; maintainers = (a.meta.maintainers or []) ++ [ maintainers.offline ]; }; }); in { - elasticsearch_river_jdbc = esPlugin rec { - name = "elasticsearch-river-jdbc-${version}"; - pluginName = "elasticsearch-river-jdbc"; - version = "1.5.0.5"; - src = fetchurl { - url = "http://xbib.org/repository/org/xbib/elasticsearch/plugin/elasticsearch-river-jdbc/${version}/${name}-plugin.zip"; - sha256 = "1p75l3vcnb90ar4j3dci2xf8dqnqyy31kc1r075fa2xqlsxgigcp"; - }; - meta = { - homepage = https://github.com/jprante/elasticsearch-river-jdbc; - description = "Plugin to fetch data from JDBC sources for indexing into Elasticsearch"; - license = licenses.asl20; - }; - }; elasticsearch_analysis_lemmagen = esPlugin rec { name = "elasticsearch-analysis-lemmagen-${version}"; pluginName = "elasticsearch-analysis-lemmagen"; - version = "0.1"; + version = "${elk6Version}"; src = fetchurl { url = "https://github.com/vhyza/elasticsearch-analysis-lemmagen/releases/download/v${version}/${name}-plugin.zip"; - sha256 = "bf7bf5ce3ccdd3afecd0e18cd6fce1ef56f824e41f4ef50553ae598caa5c366d"; + sha256 = "1m4z05wixjrq4nlbdjyhvprkrwxjym8aba18scmzfn25fhbjgvkz"; }; meta = { homepage = https://github.com/vhyza/elasticsearch-analysis-lemmagen; @@ -51,68 +38,28 @@ in { }; }; - elasticsearch_http_basic = stdenv.mkDerivation rec { - name = "elasticsearch-http-basic-${version}"; - version = "1.5.0"; - - src = fetchurl { - url = "https://github.com/Asquera/elasticsearch-http-basic/releases/download/v${version}/${name}.jar"; - sha256 = "0fif6sbn2ich39lrgm039y9d5bxkylx9pvly04wss8rdhspvdskb"; - }; - - phases = ["installPhase"]; - installPhase = "install -D $src $out/plugins/http-basic/${name}.jar"; - - meta = { - homepage = https://github.com/Asquera/elasticsearch-http-basic; - description = "HTTP Basic Authentication for Elasticsearch"; - license = licenses.mit; - platforms = elasticsearch.meta.platforms; - }; - }; - - elasticsearch_river_twitter = esPlugin rec { - name = pname + "-" + version; - pname = "elasticsearch-river-twitter"; - pluginName = "elasticsearch/" + pname + "/" + version; - version = "2.5.0"; - - src = fetchurl { - url = "http://download.elasticsearch.org/elasticsearch/${pname}/${name}.zip"; - sha256 = "0851yrmyrpp6whyxk34ykcj7b28f90w0nvkrhvl49dwqgr5s4mn4"; + discovery-ec2 = esPlugin { + name = "elasticsearch-discovery-ec2-${version}"; + pluginName = "discovery-ec2"; + version = "${elk6Version}"; + src = pkgs.fetchurl { + url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/discovery-ec2/discovery-ec2-${elk6Version}.zip"; + sha256 = "1i7ksy69132sr84h51lamgq967yz3a3dw0b54nckxpqwad9pcpj0"; }; - meta = { - homepage = https://github.com/elasticsearch/elasticsearch-river-twitter; - description = "Twitter River Plugin for ElasticSearch"; + homepage = https://github.com/elastic/elasticsearch/tree/master/plugins/discovery-ec2; + description = "The EC2 discovery plugin uses the AWS API for unicast discovery."; license = licenses.asl20; - maintainers = [ maintainers.edwtjo ]; - platforms = elasticsearch.meta.platforms; - }; - }; - - elasticsearch_kopf = esPlugin rec { - name = "elasticsearch-kopf-${version}"; - pluginName = "elasticsearch-kopf"; - version = "2.1.1"; - src = fetchurl { - url = "https://github.com/lmenezes/elasticsearch-kopf/archive/v${version}.zip"; - sha256 = "1nwwd92g0jxhfpkxb1a9z5a62naa1y7hvlx400dm6mwwav3mrf4v"; - }; - meta = { - homepage = https://github.com/lmenezes/elasticsearch-kopf; - description = "Web administration tool for ElasticSearch"; - license = licenses.mit; }; }; search_guard = esPlugin rec { name = "elastic-search-guard-${version}"; pluginName = "search-guard"; - version = "0.5"; - src = fetchurl { - url = "https://github.com/floragunncom/search-guard/releases/download/v${version}/${pluginName}-${version}.zip"; - sha256 = "1zima4jmq1rrcqxhlrp2xian80vp244d2splby015n5cgqrp39fl"; + version = "${elk6Version}-22.3"; + src = fetchurl rec { + url = "mirror://maven/com/floragunn/search-guard-6/${version}/search-guard-6-${version}.zip"; + sha256 = "1r71h4h9bmxak1mq5gpm19xq5ji1gry1kp3sjmm8azy4ykdqdncx"; }; meta = { homepage = https://github.com/floragunncom/search-guard; diff --git a/pkgs/servers/web-apps/shaarli/default.nix b/pkgs/servers/web-apps/shaarli/default.nix index 247270f67c5..bfb98add943 100644 --- a/pkgs/servers/web-apps/shaarli/default.nix +++ b/pkgs/servers/web-apps/shaarli/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "shaarli-${version}"; - version = "0.10.0"; + version = "0.10.2"; src = fetchurl { url = "https://github.com/shaarli/Shaarli/releases/download/v${version}/shaarli-v${version}-full.tar.gz"; - sha256 = "0j7i8ifzjg1s9y8nw4j0as0wdns06zdsjgr99137y9rz5w223pp6"; + sha256 = "0h8sspj7siy3vgpi2i3gdrjcr5935fr4dfwq2zwd70sjx2sh9s78"; }; outputs = [ "out" "doc" ]; diff --git a/pkgs/servers/web-apps/virtlyst/default.nix b/pkgs/servers/web-apps/virtlyst/default.nix index c6245f9b40d..0c51b6b13cd 100644 --- a/pkgs/servers/web-apps/virtlyst/default.nix +++ b/pkgs/servers/web-apps/virtlyst/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "virtlyst-${version}"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "cutelyst"; repo = "Virtlyst"; rev = "v${version}"; - sha256 = "1rqv93dys666wsqbg1lvl3pjl8gpdx3dc3y71m3r8apalgr11ikw"; + sha256 = "1vgjai34hqppkpl0ryxkyhpm9dsx1chs3bii3wc3h40hl80n6dgy"; }; nativeBuildInputs = [ cmake pkgconfig autoPatchelfHook ]; diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index b3934c88ed2..c661b2e1e4c 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -121,7 +121,7 @@ let # Utility flags to test the type of platform. inherit (hostPlatform) - isDarwin isLinux isSunOS isHurd isCygwin isFreeBSD isOpenBSD + isDarwin isLinux isSunOS isCygwin isFreeBSD isOpenBSD isi686 isx86_64 is64bit isAarch32 isAarch64 isMips isBigEndian; isArm = builtins.trace "stdenv.isArm is deprecated after 18.03" hostPlatform.isArm; diff --git a/pkgs/tools/X11/dex/default.nix b/pkgs/tools/X11/dex/default.nix index d147ef4a70c..2a3a406135b 100644 --- a/pkgs/tools/X11/dex/default.nix +++ b/pkgs/tools/X11/dex/default.nix @@ -3,16 +3,17 @@ stdenv.mkDerivation rec { program = "dex"; name = "${program}-${version}"; - version = "0.7"; + version = "0.8.0"; src = fetchFromGitHub { owner = "jceb"; repo = program; rev = "v${version}"; - sha256 = "041ms01snalapapaniabr92d8iim1qrxian626nharjmp2rd69v5"; + sha256 = "13dkjd1373mbvskrdrp0865llr3zvdr90sc6a6jqswh3crmgmz4k"; }; propagatedBuildInputs = [ python3 ]; + nativeBuildInputs = [ python3.pkgs.sphinx ]; makeFlags = [ "PREFIX=$(out)" "VERSION=$(version)" ]; meta = { diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 55ab3422826..6d6fee0a2d3 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -12,11 +12,11 @@ let inherit (python2Packages) cython buildPythonApplication; in buildPythonApplication rec { name = "xpra-${version}"; - version = "2.3.2"; + version = "2.3.3"; src = fetchurl { url = "https://xpra.org/src/${name}.tar.xz"; - sha256 = "02wpnlx43dwacaahpm8db5kbnjw2msm3ycq71gib0n2zamd71ni6"; + sha256 = "1azvvddjfq7lb5kmbn0ilgq2nf7pmymsc3b9lhbjld6w156qdv01"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/admin/gtk-vnc/default.nix b/pkgs/tools/admin/gtk-vnc/default.nix index cd6cf90a5aa..bd3b2392c7e 100644 --- a/pkgs/tools/admin/gtk-vnc/default.nix +++ b/pkgs/tools/admin/gtk-vnc/default.nix @@ -1,49 +1,42 @@ { stdenv, fetchurl, gobjectIntrospection , gnutls, cairo, libtool, glib, pkgconfig -, libffi, cyrus_sasl, intltool, perl, perlPackages, libpulseaudio -, libgcrypt, gtk3, vala_0_32 -, libogg, libgpgerror, pythonPackages }: +, cyrus_sasl, intltool, libpulseaudio +, libgcrypt, gtk3, vala, gnome3 +, python3 }: -let - inherit (pythonPackages) pygobject3 python; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "gtk-vnc-${version}"; - version = "0.7.0"; + version = "0.9.0"; + + outputs = [ "out" "bin" "man" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/gtk-vnc/${stdenv.lib.strings.substring 0 3 version}/${name}.tar.xz"; - sha256 = "0gj8dpy3sj4dp810gy67spzh5f0jd8aqg69clcwqjcskj1yawbiw"; + url = "mirror://gnome/sources/gtk-vnc/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + sha256 = "1dya1wc9vis8h0fv625pii1n70cckf1xjg1m2hndz989d118i6is"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ + python3 pkgconfig intltool libtool gobjectIntrospection vala + ]; buildInputs = [ - python gnutls cairo libtool glib libffi libgcrypt - intltool cyrus_sasl libpulseaudio perl perlPackages.TextCSV - gobjectIntrospection libogg libgpgerror - gtk3 vala_0_32 pygobject3 + gnutls cairo glib libgcrypt cyrus_sasl libpulseaudio gtk3 ]; - NIX_CFLAGS_COMPILE = "-fstack-protector-all"; configureFlags = [ - "--with-python" "--with-examples" ]; - # Fix broken .la files - preFixup = '' - sed 's,-lgpg-error,-L${libgpgerror.out}/lib -lgpg-error,' -i $out/lib/*.la - ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = "gtk-vnc"; + }; + }; meta = with stdenv.lib; { description = "A GTK VNC widget"; + homepage = https://wiki.gnome.org/Projects/gtk-vnc; + license = licenses.lgpl21; maintainers = with maintainers; [ raskin offline ]; platforms = platforms.linux; - license = licenses.lgpl21; - }; - - passthru = { - updateInfo = { - downloadPage = "http://ftp.gnome.org/pub/GNOME/sources/gtk-vnc"; - }; }; } diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index ee14f2d6781..e0c3ea4cf01 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -2,11 +2,11 @@ python2Packages.buildPythonApplication rec { name = "duplicity-${version}"; - version = "0.7.17"; + version = "0.7.18"; src = fetchurl { url = "http://code.launchpad.net/duplicity/${stdenv.lib.versions.majorMinor version}-series/${version}/+download/${name}.tar.gz"; - sha256 = "0jmh3h09680xyf33hzxxxl74bwz66zqhzvjlj7j89r9rz3qwa91p"; + sha256 = "1qlika4l1k1nx8zr657ihcy0yzr1c1cdnjlbs325l5krvc3zbc5b"; }; buildInputs = [ librsync makeWrapper python2Packages.wrapPython ]; diff --git a/pkgs/tools/compression/upx/default.nix b/pkgs/tools/compression/upx/default.nix index ea363ae8cc2..60023d028a9 100644 --- a/pkgs/tools/compression/upx/default.nix +++ b/pkgs/tools/compression/upx/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "upx-${version}"; - version = "3.94"; + version = "3.95"; src = fetchurl { - url = "https://github.com/upx/upx/releases/download/v3.94/upx-3.94-src.tar.xz"; - sha256 = "08anybdliqsbsl6x835iwzljahnm9i7v26icdjkcv33xmk6p5vw1"; + url = "https://github.com/upx/upx/releases/download/v${version}/${name}-src.tar.xz"; + sha256 = "14jmgy7hvx4zqra20w8260wrcxmjf2h6ba2yrw7pcp18im35a3rv"; }; CXXFLAGS = "-Wno-unused-command-line-argument"; diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index 0f712853f24..ef3e36ff627 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -1,12 +1,12 @@ { callPackage, fetchgit, fetchpatch, ... } @ args: callPackage ./generic.nix (args // rec { - version = "12.2.2"; + version = "12.2.7"; src = fetchgit { url = "https://github.com/ceph/ceph.git"; rev = "refs/tags/v${version}"; - sha256 = "01anqxyffa8l2lzgyb0dj6fjicfjdx2cq9y1klh24x69gxwkdh00"; + sha256 = "031nfw2g2fdpxxx39g862phgmdx68hj9r54axazandghfhc1bzrl"; }; }) diff --git a/pkgs/tools/filesystems/nixpart/0.4/parted.nix b/pkgs/tools/filesystems/nixpart/0.4/parted.nix index f356727e64b..f7071e45232 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/parted.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/parted.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, lvm2, libuuid, gettext, readline -, utillinux, check, enableStatic ? false, hurd ? null }: +, utillinux, check, enableStatic ? false }: stdenv.mkDerivation rec { name = "parted-3.1"; @@ -12,8 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ libuuid ] ++ stdenv.lib.optional (readline != null) readline ++ stdenv.lib.optional (gettext != null) gettext - ++ stdenv.lib.optional (lvm2 != null) lvm2 - ++ stdenv.lib.optional (hurd != null) hurd; + ++ stdenv.lib.optional (lvm2 != null) lvm2; configureFlags = (if (readline != null) diff --git a/pkgs/tools/filesystems/sshfs-fuse/default.nix b/pkgs/tools/filesystems/sshfs-fuse/default.nix index 187e77533f5..183cfb2ddbe 100644 --- a/pkgs/tools/filesystems/sshfs-fuse/default.nix +++ b/pkgs/tools/filesystems/sshfs-fuse/default.nix @@ -1,20 +1,22 @@ -{ stdenv, fetchFromGitHub, meson, pkgconfig, ninja, glib, fuse3 -, docutils, which, python3Packages +{ stdenv, fetchFromGitHub, meson, pkgconfig, ninja, docutils +, fuse3, glib +, which, python3Packages }: stdenv.mkDerivation rec { - version = "3.4.0"; + version = "3.5.0"; name = "sshfs-fuse-${version}"; src = fetchFromGitHub { owner = "libfuse"; repo = "sshfs"; rev = "sshfs-${version}"; - sha256 = "1mbhjgw6797bln579pfwmn79gs8isnv57z431lbfw7j8xkh75awl"; + sha256 = "1mczf13ic5ycfhcxmxma50n5h32vygcll0d8m39vam237s95aqy6"; }; nativeBuildInputs = [ meson pkgconfig ninja docutils ]; buildInputs = [ fuse3 glib ]; + checkInputs = [ which python3Packages.pytest ]; NIX_CFLAGS_COMPILE = stdenv.lib.optional (stdenv.system == "i686-linux") @@ -25,9 +27,15 @@ stdenv.mkDerivation rec { ln -sf $out/bin/sshfs $out/sbin/mount.sshfs ''; - checkInputs = [ which ] ++ (with python3Packages; [ python pytest ]); - + #doCheck = true; checkPhase = '' + # The tests need fusermount: + mkdir bin && cp ${fuse3}/bin/fusermount3 bin/fusermount + export PATH=bin:$PATH + # Can't access /dev/fuse within the sandbox: "FUSE kernel module does not seem to be loaded" + substituteInPlace test/util.py --replace "/dev/fuse" "/dev/null" + # TODO: "fusermount executable not setuid, and we are not root" + # We should probably use a VM test instead python3 -m pytest test/ ''; diff --git a/pkgs/tools/filesystems/udftools/default.nix b/pkgs/tools/filesystems/udftools/default.nix index b912bab6826..f17f9e0d2de 100644 --- a/pkgs/tools/filesystems/udftools/default.nix +++ b/pkgs/tools/filesystems/udftools/default.nix @@ -1,14 +1,17 @@ -{ stdenv, fetchurl, ncurses, readline }: +{ stdenv, fetchFromGitHub, ncurses, readline, autoreconfHook }: stdenv.mkDerivation rec { name = "udftools-${version}"; - version = "1.0.0b3"; - src = fetchurl { - url = "mirror://sourceforge/linux-udf/udftools/${version}/${name}.tar.gz"; - sha256 = "180414z7jblby64556i8p24rcaas937zwnyp1zg073jdin3rw1y5"; + version = "2.0"; + src = fetchFromGitHub { + owner = "pali"; + repo = "udftools"; + rev = "${version}"; + sha256 = "0mz04h3rki6ljwfs15z83gf4vv816w7xgz923waiqgmfj9xpvx87"; }; buildInputs = [ ncurses readline ]; + nativeBuildInputs = [ autoreconfHook ]; hardeningDisable = [ "fortify" ]; @@ -21,6 +24,12 @@ stdenv.mkDerivation rec { sed -e '38i#include <string.h>' -i wrudf/wrudf-cdrw.c sed -e '12i#include <string.h>' -i wrudf/wrudf-cdr.c sed -e '37i#include <stdlib.h>' -i wrudf/ide-pc.c + + sed -e "s@\$(DESTDIR)/lib/udev/rules.d@$out/lib/udev/rules.d@" -i pktsetup/Makefile.am + ''; + + postFixup = '' + sed -i -e "s@/usr/sbin/pktsetup@$out/sbin/pktsetup@" $out/lib/udev/rules.d/80-pktsetup.rules ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/bat/default.nix b/pkgs/tools/misc/bat/default.nix index b8a2b391395..6503dadf457 100644 --- a/pkgs/tools/misc/bat/default.nix +++ b/pkgs/tools/misc/bat/default.nix @@ -2,17 +2,17 @@ rustPlatform.buildRustPackage rec { name = "bat-${version}"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = "bat"; rev = "v${version}"; - sha256 = "0ms1hmv6qx15p47l07h7szwq0bgphhskc0xca2l641159h55r6dg"; + sha256 = "04ip0h1n7wavd7j7r7ppcy3v4987yv44mgw8qm8d56pcw67f9vwk"; fetchSubmodules = true; }; - cargoSha256 = "1dzm44kcx3plh74qr4wghl3wqwr62hcxzlcv7mhh0vvk3z36c8d4"; + cargoSha256 = "062vvpj514h85h9gm3jipp6z256cnnbxbjy7ja6bm7i6bpglyvvi"; nativeBuildInputs = [ cmake pkgconfig zlib ]; diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix index ca078c16ab6..a3c30c15e5f 100644 --- a/pkgs/tools/misc/gparted/default.nix +++ b/pkgs/tools/misc/gparted/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "gparted-0.31.0"; + name = "gparted-0.32.0"; src = fetchurl { url = "mirror://sourceforge/gparted/${name}.tar.gz"; - sha256 = "1fh7rpgb4xxdhgyjsirb83zvjfc5mfngb8a1pjbv7r6r6jj4jyrv"; + sha256 = "1fjp4c8jc0kjbbih1x1vs9v40d9lncma642kflnmy0bixxnvh7df"; }; configureFlags = [ "--disable-doc" ]; diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix index 6ec9729438c..8137379a4da 100644 --- a/pkgs/tools/misc/lf/default.nix +++ b/pkgs/tools/misc/lf/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { name = "lf-${version}"; - version = "7"; + version = "8"; src = fetchFromGitHub { owner = "gokcehan"; repo = "lf"; rev = "r${version}"; - sha256 = "11n5svxhc2781ss7v15w40ac81mchhcvkszhb2r70zry7sa15li1"; + sha256 = "0rmcac9wx9lldl57m1cim1adf2fqkva1yi4v6934jgccqhlqvk58"; }; goPackagePath = "github.com/gokcehan/lf"; diff --git a/pkgs/tools/misc/lf/deps.nix b/pkgs/tools/misc/lf/deps.nix index c372b0d669c..57877822b08 100644 --- a/pkgs/tools/misc/lf/deps.nix +++ b/pkgs/tools/misc/lf/deps.nix @@ -4,8 +4,8 @@ fetch = { type = "git"; url = "https://github.com/nsf/termbox-go"; - rev = "5c94acc5e6eb520f1bcd183974e01171cc4c23b3"; # master - sha256 = "1fi8imdgwvlsgifw2qfl3ww0lsrgkfsimkzz7bnrq41nar78s0fw"; + rev = "b66b20ab708e289ff1eb3e218478302e6aec28ce"; # master + sha256 = "0wrgnwfdxrspni5q15vzr5q1bxnzb7m6q4xjhllcyddgn2zqprsa"; }; } { @@ -13,8 +13,8 @@ fetch = { type = "git"; url = "https://github.com/mattn/go-runewidth"; - rev = "9e777a8366cce605130a531d2cd6363d07ad7317"; # v0.0.2 - sha256 = "0vkrfrz3fzn5n6ix4k8s0cg0b448459sldq8bp4riavsxm932jzb"; + rev = "ce7b0b5c7b45a81508558cd1dba6bb1e4ddb51bb"; # v0.0.3 + sha256 = "0lc39b6xrxv7h3v3y1kgz49cgi5qxwlygs715aam6ba35m48yi7g"; }; } ] diff --git a/pkgs/tools/misc/libcpuid/default.nix b/pkgs/tools/misc/libcpuid/default.nix index 5941b8056b1..b0f20c1d387 100644 --- a/pkgs/tools/misc/libcpuid/default.nix +++ b/pkgs/tools/misc/libcpuid/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { description = "A small C library for x86 CPU detection and feature extraction"; license = licenses.bsd2; maintainers = with maintainers; [ orivej artuuge ]; - platforms = platforms.all; + platforms = platforms.x86; }; } diff --git a/pkgs/tools/misc/logstash/6.x.nix b/pkgs/tools/misc/logstash/6.x.nix deleted file mode 100644 index 4f15ba90d39..00000000000 --- a/pkgs/tools/misc/logstash/6.x.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ elk6Version -, enableUnfree ? true -, stdenv -, fetchurl -, makeWrapper -, jre -}: - -with stdenv.lib; - -stdenv.mkDerivation rec { - version = elk6Version; - name = "logstash-${optionalString (!enableUnfree) "oss-"}${version}"; - - src = fetchurl { - url = "https://artifacts.elastic.co/downloads/logstash/${name}.tar.gz"; - sha256 = - if enableUnfree - then "0yx9hpiav4d5z1b52x2h5i0iknqs9lmxy8vmz0wkb23mjiz8njdr" - else "1ir8pbq706mxr56k5cgc9ajn2jp603zrqj66dimx6xxf2nfamw0w"; - }; - - dontBuild = true; - dontPatchELF = true; - dontStrip = true; - dontPatchShebangs = true; - - buildInputs = [ - makeWrapper jre - ]; - - installPhase = '' - mkdir -p $out - cp -r {Gemfile*,modules,vendor,lib,bin,config,data,logstash-core,logstash-core-plugin-api} $out - - patchShebangs $out/bin/logstash - patchShebangs $out/bin/logstash-plugin - - wrapProgram $out/bin/logstash \ - --set JAVA_HOME "${jre}" - - wrapProgram $out/bin/logstash-plugin \ - --set JAVA_HOME "${jre}" - ''; - - meta = with stdenv.lib; { - description = "Logstash is a data pipeline that helps you process logs and other event data from a variety of systems"; - homepage = https://www.elastic.co/products/logstash; - license = if enableUnfree then licenses.elastic else licenses.asl20; - platforms = platforms.unix; - maintainers = with maintainers; [ wjlroe offline basvandijk ]; - }; -} diff --git a/pkgs/tools/misc/logstash/default.nix b/pkgs/tools/misc/logstash/default.nix index 079e5c7a93b..4f15ba90d39 100644 --- a/pkgs/tools/misc/logstash/default.nix +++ b/pkgs/tools/misc/logstash/default.nix @@ -1,12 +1,23 @@ -{ stdenv, fetchurl, makeWrapper, jre }: +{ elk6Version +, enableUnfree ? true +, stdenv +, fetchurl +, makeWrapper +, jre +}: + +with stdenv.lib; stdenv.mkDerivation rec { - version = "2.4.0"; - name = "logstash-${version}"; + version = elk6Version; + name = "logstash-${optionalString (!enableUnfree) "oss-"}${version}"; src = fetchurl { - url = "https://download.elasticsearch.org/logstash/logstash/logstash-${version}.tar.gz"; - sha256 = "1k27hb6q1r26rp3y9pb2ry92kicw83mi352dzl2y4h0gbif46b32"; + url = "https://artifacts.elastic.co/downloads/logstash/${name}.tar.gz"; + sha256 = + if enableUnfree + then "0yx9hpiav4d5z1b52x2h5i0iknqs9lmxy8vmz0wkb23mjiz8njdr" + else "1ir8pbq706mxr56k5cgc9ajn2jp603zrqj66dimx6xxf2nfamw0w"; }; dontBuild = true; @@ -20,12 +31,12 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out - cp -r {Gemfile*,vendor,lib,bin} $out + cp -r {Gemfile*,modules,vendor,lib,bin,config,data,logstash-core,logstash-core-plugin-api} $out - wrapProgram $out/bin/logstash \ - --set JAVA_HOME "${jre}" + patchShebangs $out/bin/logstash + patchShebangs $out/bin/logstash-plugin - wrapProgram $out/bin/rspec \ + wrapProgram $out/bin/logstash \ --set JAVA_HOME "${jre}" wrapProgram $out/bin/logstash-plugin \ @@ -35,8 +46,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Logstash is a data pipeline that helps you process logs and other event data from a variety of systems"; homepage = https://www.elastic.co/products/logstash; - license = licenses.asl20; + license = if enableUnfree then licenses.elastic else licenses.asl20; platforms = platforms.unix; - maintainers = [ maintainers.wjlroe maintainers.offline ]; + maintainers = with maintainers; [ wjlroe offline basvandijk ]; }; } diff --git a/pkgs/tools/misc/mandoc/default.nix b/pkgs/tools/misc/mandoc/default.nix index 8a62ccffa49..f485cb95f5d 100644 --- a/pkgs/tools/misc/mandoc/default.nix +++ b/pkgs/tools/misc/mandoc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mandoc-${version}"; - version = "1.13.4"; + version = "1.14.4"; src = fetchurl { - url = "http://mdocml.bsd.lv/snapshots/mdocml-${version}.tar.gz"; - sha256 = "1vz0g5nvjbz1ckrg9cn6ivlnb13bcl1r6nc4yzb7300qvfnw2m8a"; + url = "https://mandoc.bsd.lv/snapshots/mandoc-${version}.tar.gz"; + sha256 = "24eb72103768987dcc63b53d27fdc085796330782f44b3b40c4660b1e1ee9b9c"; }; buildInputs = [ zlib ]; @@ -19,17 +19,23 @@ stdenv.mkDerivation rec { HAVE_MANPATH=1 LD_OHASH="-lutil" BUILD_DB=0 + CC=${stdenv.cc.targetPrefix}cc ''; + patches = [ + ./remove-broken-cc-check.patch + ]; + preConfigure = '' echo $configureLocal > configure.local ''; meta = with stdenv.lib; { - homepage = http://mdocml.bsd.lv/; + homepage = https://mandoc.bsd.lv/; description = "suite of tools compiling mdoc and man"; + downloadPage = "http://mandoc.bsd.lv/snapshots/"; license = licenses.bsd3; platforms = platforms.all; - maintainers = with maintainers; [ ramkromberg ]; + maintainers = with maintainers; [ bb010g ramkromberg ]; }; } diff --git a/pkgs/tools/misc/mandoc/remove-broken-cc-check.patch b/pkgs/tools/misc/mandoc/remove-broken-cc-check.patch new file mode 100644 index 00000000000..580226d165b --- /dev/null +++ b/pkgs/tools/misc/mandoc/remove-broken-cc-check.patch @@ -0,0 +1,11 @@ +--- mandoc-1.14.4.org/configure 2018-08-08 15:51:51.000000000 +0100 ++++ mandoc-1.14.4/configure 2018-08-27 08:19:40.391912427 +0100 +@@ -40,7 +40,7 @@ + OSNAME= + UTF8_LOCALE= + +-CC=`printf "all:\\n\\t@echo \\\$(CC)\\n" | env -i make -sf -` ++CC= + CFLAGS= + LDADD= + LDFLAGS= diff --git a/pkgs/tools/misc/parted/default.nix b/pkgs/tools/misc/parted/default.nix index 643a3bafc66..709246269f8 100644 --- a/pkgs/tools/misc/parted/default.nix +++ b/pkgs/tools/misc/parted/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, lvm2, libuuid, gettext, readline, perl, python2 -, utillinux, check, enableStatic ? false, hurd ? null }: +, utillinux, check, enableStatic ? false }: stdenv.mkDerivation rec { name = "parted-3.2"; @@ -30,8 +30,7 @@ stdenv.mkDerivation rec { buildInputs = [ libuuid ] ++ stdenv.lib.optional (readline != null) readline ++ stdenv.lib.optional (gettext != null) gettext - ++ stdenv.lib.optional (lvm2 != null) lvm2 - ++ stdenv.lib.optional (hurd != null) hurd; + ++ stdenv.lib.optional (lvm2 != null) lvm2; configureFlags = (if (readline != null) diff --git a/pkgs/tools/misc/pg_top/default.nix b/pkgs/tools/misc/pg_top/default.nix index 4de33433115..4f4bd7e754c 100644 --- a/pkgs/tools/misc/pg_top/default.nix +++ b/pkgs/tools/misc/pg_top/default.nix @@ -14,13 +14,11 @@ stdenv.mkDerivation rec { description = "A 'top' like tool for PostgreSQL"; longDescription = '' pg_top allows you to: - <itemizedlist> - <listitem>View currently running SQL statement of a process.</listitem> - <listitem>View query plan of a currently running SQL statement.</listitem> - <listitem>View locks held by a process.</listitem> - <listitem>View user table statistics.</listitem> - <listitem>View user index statistics.</listitem> - </itemizedlist> + * View currently running SQL statement of a process. + * View query plan of a currently running SQL statement. + * View locks held by a process. + * View user table statistics. + * View user index statistics. ''; homepage = http://ptop.projects.postgresql.org/; diff --git a/pkgs/tools/misc/qt5ct/default.nix b/pkgs/tools/misc/qt5ct/default.nix index a43335626ac..72ba4863c40 100644 --- a/pkgs/tools/misc/qt5ct/default.nix +++ b/pkgs/tools/misc/qt5ct/default.nix @@ -4,11 +4,11 @@ let inherit (stdenv.lib) getDev; in stdenv.mkDerivation rec { name = "qt5ct-${version}"; - version = "0.35"; + version = "0.36"; src = fetchurl { url = "mirror://sourceforge/qt5ct/${name}.tar.bz2"; - sha256 = "0xzgd12cvm4vyzl8qax6izdmaf46bf18h055z6k178s8pybm1sqw"; + sha256 = "12gfhchp05xn311zsxh41k3anyrscg53r5d06dasyxyk6hpr9hwg"; }; nativeBuildInputs = [ qmake qttools ]; diff --git a/pkgs/tools/misc/riemann-c-client/default.nix b/pkgs/tools/misc/riemann-c-client/default.nix index 68d9df987d8..bbbb19fc200 100644 --- a/pkgs/tools/misc/riemann-c-client/default.nix +++ b/pkgs/tools/misc/riemann-c-client/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, file , protobufc }: stdenv.mkDerivation rec { - name = "riemann-c-client-1.10.2"; + name = "riemann-c-client-1.10.3"; src = fetchFromGitHub { owner = "algernon"; repo = "riemann-c-client"; rev = "${name}"; - sha256 = "185wn6fqgrs16f9c0lkzw14477wmkgandz86h4miw7cgi7ki4l5i"; + sha256 = "0944l0wlx1m4x8b4dpjsq994614bxd7pi1c1va3qyk93hld9d3qc"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/tools/misc/yubico-piv-tool/default.nix b/pkgs/tools/misc/yubico-piv-tool/default.nix index c4a8f3a623b..d0b7ebf3fc8 100644 --- a/pkgs/tools/misc/yubico-piv-tool/default.nix +++ b/pkgs/tools/misc/yubico-piv-tool/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, openssl, pcsclite, check }: stdenv.mkDerivation rec { - name = "yubico-piv-tool-1.5.0"; + name = "yubico-piv-tool-1.6.1"; src = fetchurl { url = "https://developers.yubico.com/yubico-piv-tool/Releases/${name}.tar.gz"; - sha256 = "1axa0lnky5gsc8yack6mpfbjh49z0czr1cv52gbgjnx2kcbpb0y1"; + sha256 = "10xgdc51xvszkxmsvqnbjs8ixxz7rfnfahh3wn8glllynmszbhwi"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix index 12f68af7d0a..3920405fe4d 100644 --- a/pkgs/tools/networking/i2pd/default.nix +++ b/pkgs/tools/networking/i2pd/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { name = pname + "-" + version; pname = "i2pd"; - version = "2.19.0"; + version = "2.20.0"; src = fetchFromGitHub { owner = "PurpleI2P"; repo = pname; rev = version; - sha256 = "1676dqa4j7vd18fyxgl65yp3ip6aivchicy6qj8rwp3dilqkiv10"; + sha256 = "182iwfaz9ar18pqknrg60w89iinj91rn2651yaz2ap77h2a2psvf"; }; buildInputs = with stdenv.lib; [ boost zlib openssl ] diff --git a/pkgs/tools/networking/inadyn/default.nix b/pkgs/tools/networking/inadyn/default.nix index 6178181193c..8029415a98c 100644 --- a/pkgs/tools/networking/inadyn/default.nix +++ b/pkgs/tools/networking/inadyn/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "inadyn-${version}"; - version = "2.3.1"; + version = "2.4"; src = fetchFromGitHub { owner = "troglobit"; repo = "inadyn"; rev = "v${version}"; - sha256 = "0m2lkmvklhnggv1kim0rikq1gxxc984lsg4gpn8s6lzv6y0axbya"; + sha256 = "1h24yavp1246zn5isypvxrilp6xj2266qr52w2r24qxicr8b320y"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix index 0c546ff9109..07112d1497a 100644 --- a/pkgs/tools/networking/miniupnpd/default.nix +++ b/pkgs/tools/networking/miniupnpd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, iptables, libuuid, pkgconfig }: stdenv.mkDerivation rec { - name = "miniupnpd-2.1.20180706"; + name = "miniupnpd-2.1"; src = fetchurl { url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz"; - sha256 = "01mhv3lgpj2shs3666zwlhvfiv1mpf4h9mv35g8gihyq8k82ybgw"; + sha256 = "1hg0zzvvzfgpnmngmd3ffnsk9x18lwlxlpw5jgh7y6b1jrvr824m"; name = "${name}.tar.gz"; }; diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix index 6b6d99e745e..0f7f75b989e 100644 --- a/pkgs/tools/networking/nbd/default.nix +++ b/pkgs/tools/networking/nbd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib }: stdenv.mkDerivation rec { - name = "nbd-3.17"; + name = "nbd-3.18"; src = fetchurl { url = "mirror://sourceforge/nbd/${name}.tar.xz"; - sha256 = "12fil2hb3gkxslr3nl9kak93n4iyhfs3zdwrmx9vjcxblfqnnp6r"; + sha256 = "0cb0sjiv0j9sh9dk24nrjm7sa0axbrcp2av5hc91g1ryzk764dyq"; }; buildInputs = diff --git a/pkgs/tools/networking/network-manager/applet.nix b/pkgs/tools/networking/network-manager/applet.nix index 0b6a7e622a8..d516a2b5ee8 100644 --- a/pkgs/tools/networking/network-manager/applet.nix +++ b/pkgs/tools/networking/network-manager/applet.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, meson, ninja, intltool, gtk-doc, pkgconfig, networkmanager, gnome3 -, libnotify, libsecret, polkit, isocodes, modemmanager, libxml2, docbook_xsl +, libnotify, libsecret, polkit, isocodes, modemmanager, libxml2, docbook_xsl, docbook_xml_dtd_43 , mobile-broadband-provider-info, glib-networking, gsettings-desktop-schemas , libgudev, jansson, wrapGAppsHook, gobjectIntrospection , libappindicator-gtk3, withGnome ? false }: @@ -15,12 +15,8 @@ in stdenv.mkDerivation rec { sha256 = "0lmlkh4yyl9smvkgrzshn127zqfbp9f41f448ks8dlhhm38s38v2"; }; - patches = [ - # https://gitlab.gnome.org/GNOME/network-manager-applet/merge_requests/19 - ./libnm-gtk-mbpi.patch - ]; - mesonFlags = [ + "-Dlibnm_gtk=false" # It is deprecated "-Dselinux=false" "-Dappindicator=yes" "-Dgcr=${if withGnome then "true" else "false"}" @@ -35,7 +31,7 @@ in stdenv.mkDerivation rec { libappindicator-gtk3 ] ++ stdenv.lib.optionals withGnome [ gnome3.gcr ]; # advanced certificate chooser - nativeBuildInputs = [ meson ninja intltool pkgconfig wrapGAppsHook gobjectIntrospection gtk-doc docbook_xsl libxml2 ]; + nativeBuildInputs = [ meson ninja intltool pkgconfig wrapGAppsHook gobjectIntrospection gtk-doc docbook_xsl docbook_xml_dtd_43 libxml2 ]; postPatch = '' chmod +x meson_post_install.py # patchShebangs requires executable file diff --git a/pkgs/tools/networking/network-manager/fortisslvpn/default.nix b/pkgs/tools/networking/network-manager/fortisslvpn/default.nix index 11b29081f9b..16964e4db94 100644 --- a/pkgs/tools/networking/network-manager/fortisslvpn/default.nix +++ b/pkgs/tools/networking/network-manager/fortisslvpn/default.nix @@ -25,6 +25,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ intltool pkgconfig ]; configureFlags = [ + "--without-libnm-glib" "--with-gnome=${if withGnome then "yes" else "no"}" "--localstatedir=/tmp" ]; diff --git a/pkgs/tools/networking/network-manager/iodine/default.nix b/pkgs/tools/networking/network-manager/iodine/default.nix index a3dbeaf8265..a6fd3e7303d 100644 --- a/pkgs/tools/networking/network-manager/iodine/default.nix +++ b/pkgs/tools/networking/network-manager/iodine/default.nix @@ -28,6 +28,7 @@ in stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations"; configureFlags = [ + "--without-libnm-glib" "--with-gnome=${if withGnome then "yes" else "no"}" "--localstatedir=/" # needed for the management socket under /run/NetworkManager ]; diff --git a/pkgs/tools/networking/network-manager/l2tp/default.nix b/pkgs/tools/networking/network-manager/l2tp/default.nix index d48d2e910f5..3cac1b5e63c 100644 --- a/pkgs/tools/networking/network-manager/l2tp/default.nix +++ b/pkgs/tools/networking/network-manager/l2tp/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { ''; configureFlags = [ + "--without-libnm-glib" "--with-gnome=${if withGnome then "yes" else "no"}" "--localstatedir=/var" "--sysconfdir=$(out)/etc" diff --git a/pkgs/tools/networking/network-manager/libnm-gtk-mbpi.patch b/pkgs/tools/networking/network-manager/libnm-gtk-mbpi.patch deleted file mode 100644 index d7eef5749db..00000000000 --- a/pkgs/tools/networking/network-manager/libnm-gtk-mbpi.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- a/meson.build -+++ b/meson.build -@@ -137,7 +137,7 @@ - mobile_broadband_provider_info_dep = dependency('mobile-broadband-provider-info') - config_h.set_quoted('MOBILE_BROADBAND_PROVIDER_INFO_DATABASE', mobile_broadband_provider_info_dep.get_pkgconfig_variable('database')) - else -- config_h.set_quoted('MOBILE_BROADBAND_PROVIDER_INFO_DATABASE', join_paths(nma_prefix, 'share', 'mobile-broadband-provider-info', 'serviceproviders.xml')) -+ config_h.set_quoted('MOBILE_BROADBAND_PROVIDER_INFO_DATABASE', join_paths(nma_datadir, 'mobile-broadband-provider-info', 'serviceproviders.xml')) - endif - - gio_dep = dependency('gio-2.0', version: '>= 2.38') ---- a/src/libnm-gtk/nm-mobile-providers.c -+++ b/src/libnm-gtk/nm-mobile-providers.c -@@ -30,10 +30,6 @@ - - #include "nm-mobile-providers.h" - --#ifndef MOBILE_BROADBAND_PROVIDER_INFO --#define MOBILE_BROADBAND_PROVIDER_INFO DATADIR"/mobile-broadband-provider-info/serviceproviders.xml" --#endif -- - #define ISO_3166_COUNTRY_CODES ISO_CODES_PREFIX"/share/xml/iso-codes/iso_3166.xml" - #define ISO_CODES_LOCALESDIR ISO_CODES_PREFIX"/share/locale" - -@@ -990,7 +986,7 @@ - if (!country_codes) - country_codes = ISO_3166_COUNTRY_CODES; - if (!service_providers) -- service_providers = MOBILE_BROADBAND_PROVIDER_INFO; -+ service_providers = MOBILE_BROADBAND_PROVIDER_INFO_DATABASE; - - countries = read_country_codes (country_codes, - cancellable, diff --git a/pkgs/tools/networking/network-manager/openvpn/default.nix b/pkgs/tools/networking/network-manager/openvpn/default.nix index 8d3bd874718..0d3a4174744 100644 --- a/pkgs/tools/networking/network-manager/openvpn/default.nix +++ b/pkgs/tools/networking/network-manager/openvpn/default.nix @@ -25,6 +25,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ intltool pkgconfig libxml2 ]; configureFlags = [ + "--without-libnm-glib" "--with-gnome=${if withGnome then "yes" else "no"}" "--localstatedir=/" # needed for the management socket under /run/NetworkManager ]; diff --git a/pkgs/tools/networking/network-manager/strongswan.nix b/pkgs/tools/networking/network-manager/strongswan.nix index fc10fc6364c..d7f55857406 100644 --- a/pkgs/tools/networking/network-manager/strongswan.nix +++ b/pkgs/tools/networking/network-manager/strongswan.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations"; configureFlags = [ + "--without-libnm-glib" "--with-charon=${strongswanNM}/libexec/ipsec/charon-nm" "--with-nm-libexecdir=$(out)/libexec" "--with-nm-plugindir=$(out)/lib/NetworkManager" diff --git a/pkgs/tools/networking/network-manager/vpnc/default.nix b/pkgs/tools/networking/network-manager/vpnc/default.nix index d2b3a345d49..ef45defb7d5 100644 --- a/pkgs/tools/networking/network-manager/vpnc/default.nix +++ b/pkgs/tools/networking/network-manager/vpnc/default.nix @@ -24,6 +24,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ intltool pkgconfig file ]; configureFlags = [ + "--without-libnm-glib" "--with-gnome=${if withGnome then "yes" else "no"}" ]; diff --git a/pkgs/tools/networking/s4cmd/default.nix b/pkgs/tools/networking/s4cmd/default.nix index 20f129357df..8088cc0ec4d 100644 --- a/pkgs/tools/networking/s4cmd/default.nix +++ b/pkgs/tools/networking/s4cmd/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "s4cmd"; - version = "2.0.1"; + version = "2.1.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "14gfpnj4xa1sq3x3zd29drpzsygn998y32szwm069ma0w9jwjjz6"; + sha256 = "0d4mx98i3qhvlmr9x898mjvf827smzx6x5ji6daiwgjdlxc60mj2"; }; propagatedBuildInputs = with python3Packages; [ boto3 pytz ]; diff --git a/pkgs/tools/package-management/bunny/default.nix b/pkgs/tools/package-management/bunny/default.nix new file mode 100644 index 00000000000..c73f3fb524c --- /dev/null +++ b/pkgs/tools/package-management/bunny/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitLab }: + +stdenv.mkDerivation rec { + name = "bunny-${version}"; + version = "1.1"; + + src = fetchFromGitLab { + owner = "tim241"; + repo = "bunny"; + rev = version; + sha256 = "0mxhj23fscbyqb9hfpmimgjn6nbx1lx3dl2msgwdy281zs25w8ki"; + }; + + dontBuild = true; + + makeFlags = [ "prefix=$(out)" ]; + + meta = with stdenv.lib; { + description = "A simple shell script wrapper around multiple package managers"; + homepage = https://gitlab.com/tim241/bunny; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = with maintainers; [ countingsort ]; + }; +} diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index a46550d59cd..27793f44801 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "rpm-${version}"; - version = "4.14.1"; + version = "4.14.2"; src = fetchurl { url = "http://ftp.rpm.org/releases/rpm-4.14.x/rpm-${version}.tar.bz2"; - sha256 = "0fvrjq6jsvbllb5q6blchzh7p5flk61rz34g4g9mp9iwrhn0xx23"; + sha256 = "0armd7dqr8bl0isx8l4xlylm7dikasmxhhcbz336fkp2x30w5jw0"; }; outputs = [ "out" "dev" "man" ]; diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index 0a760807afb..71cf239d72c 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -5,14 +5,14 @@ }: stdenv.mkDerivation rec { - name = "sudo-1.8.23"; + name = "sudo-1.8.24"; src = fetchurl { urls = [ "ftp://ftp.sudo.ws/pub/sudo/${name}.tar.gz" "ftp://ftp.sudo.ws/pub/sudo/OLD/${name}.tar.gz" ]; - sha256 = "0yg62wq8rcrbr7qvh3wgfg2g4bwanbi50cr2lf2cfyy8dydx4qyq"; + sha256 = "1s2v49n905wf3phmdnaa6v1dwck2lrcin0flg85z7klf35x5b25l"; }; prePatch = '' diff --git a/pkgs/tools/system/minijail/default.nix b/pkgs/tools/system/minijail/default.nix index c47d40cef2b..74f0a84716a 100644 --- a/pkgs/tools/system/minijail/default.nix +++ b/pkgs/tools/system/minijail/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { shortname = "minijail"; name = "${shortname}-${version}"; - version = "android-8.0.0_r34"; + version = "android-9.0.0_r3"; src = fetchgit { url = "https://android.googlesource.com/platform/external/minijail"; rev = version; - sha256 = "1d0q08cgks6h6ffsw3zw8dz4rm9y2djj2pwwy3xi6flx7vwy0psf"; + sha256 = "1g1g52s3q61amcnx8cv1332sbixpck1bmjzgsrjiw5ix7chrzkp2"; }; buildInputs = [ libcap ]; diff --git a/pkgs/tools/system/syslog-ng-incubator/default.nix b/pkgs/tools/system/syslog-ng-incubator/default.nix index c90c67c7737..a57cafb54e2 100644 --- a/pkgs/tools/system/syslog-ng-incubator/default.nix +++ b/pkgs/tools/system/syslog-ng-incubator/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = [ maintainers.rickynils ]; platforms = platforms.linux; + broken = true; # 2018-05-12 }; } diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index 8e7551b4e41..b313fc0b53d 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -95,12 +95,13 @@ core = stdenv.mkDerivation rec { configureFlags = common.configureFlags ++ [ "--without-x" ] # disable xdvik and xpdfopen - ++ map (what: "--disable-${what}") [ + ++ map (what: "--disable-${what}") ([ "dvisvgm" "dvipng" # ghostscript dependency "luatex" "luajittex" "mp" "pmp" "upmp" "mf" # cairo would bring in X and more "xetex" "bibtexu" "bibtex8" "bibtex-x" "upmendex" # ICU isn't small - ] + ] ++ stdenv.lib.optional (stdenv.hostPlatform.isPower && stdenv.hostPlatform.is64bit) "mfluajit") ++ [ "--without-system-harfbuzz" "--without-system-icu" ] # bogus configure + ; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 82ca928fe4d..ebf6f4f36e8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -385,7 +385,7 @@ with pkgs; { deps = [ pkgs.lcov pkgs.enableGCOVInstrumentation ]; } ../build-support/setup-hooks/make-coverage-analysis-report.sh; - # intended to be used like nix-build -E 'with <nixpkgs> {}; enableDebugging fooPackage' + # intended to be used like nix-build -E 'with import <nixpkgs> {}; enableDebugging fooPackage' enableDebugging = pkg: pkg.override { stdenv = stdenvAdapters.keepDebugInfo pkg.stdenv; }; findXMLCatalogs = makeSetupHook { } ../build-support/setup-hooks/find-xml-catalogs.sh; @@ -635,6 +635,8 @@ with pkgs; bonfire = callPackage ../tools/misc/bonfire { }; + bunny = callPackage ../tools/package-management/bunny { }; + cloud-sql-proxy = callPackage ../tools/misc/cloud-sql-proxy { }; container-linux-config-transpiler = callPackage ../development/tools/container-linux-config-transpiler { }; @@ -706,7 +708,9 @@ with pkgs; asc-key-to-qr-code-gif = callPackage ../tools/security/asc-key-to-qr-code-gif { }; - gopass = callPackage ../tools/security/gopass { }; + gopass = callPackage ../tools/security/gopass { + buildGoPackage = buildGo110Package; + }; browserpass = callPackage ../tools/security/browserpass { }; @@ -849,23 +853,23 @@ with pkgs; bchunk = callPackage ../tools/cd-dvd/bchunk { }; - inherit (callPackages ../misc/logging/beats/5.x.nix { }) - filebeat - heartbeat - metricbeat - packetbeat; - - inherit (let beats6 = callPackages ../misc/logging/beats/6.x.nix { }; in { - filebeat6 = beats6.filebeat; - heartbeat6 = beats6.heartbeat; - metricbeat6 = beats6.metricbeat; - packetbeat6 = beats6.packetbeat; - }) + inherit (callPackages ../misc/logging/beats/6.x.nix { }) filebeat6 heartbeat6 metricbeat6 packetbeat6; + filebeat = filebeat6; + heartbeat = heartbeat6; + metricbeat = metricbeat6; + packetbeat = packetbeat6; + + inherit (callPackages ../misc/logging/beats/5.x.nix { }) + filebeat5 + heartbeat5 + metricbeat5 + packetbeat5; + bfr = callPackage ../tools/misc/bfr { }; bibtool = callPackage ../tools/misc/bibtool { }; @@ -1348,7 +1352,9 @@ with pkgs; gmic = callPackage ../tools/graphics/gmic { }; - goa = callPackage ../development/tools/goa { }; + goa = callPackage ../development/tools/goa { + buildGoPackage = buildGo110Package; + }; gohai = callPackage ../tools/system/gohai { }; @@ -1402,6 +1408,10 @@ with pkgs; lief = callPackage ../development/libraries/lief {}; + libndtypes = callPackage ../development/libraries/libndtypes { }; + + libxnd = callPackage ../development/libraries/libxnd { }; + loadwatch = callPackage ../tools/system/loadwatch { }; loccount = callPackage ../development/tools/misc/loccount { }; @@ -1456,6 +1466,8 @@ with pkgs; onboard = callPackage ../applications/misc/onboard { }; + xkbd = callPackage ../applications/misc/xkbd { }; + optar = callPackage ../tools/graphics/optar {}; patdiff = callPackage ../tools/misc/patdiff { }; @@ -1706,7 +1718,9 @@ with pkgs; nrg2iso = callPackage ../tools/cd-dvd/nrg2iso { }; libceph = ceph.lib; - ceph = callPackage ../tools/filesystems/ceph { boost = boost165; }; + ceph = callPackage ../tools/filesystems/ceph { + boost = boost166.override { enablePython = true; }; + }; ceph-dev = ceph; certmgr = callPackage ../tools/security/certmgr { }; @@ -2091,13 +2105,17 @@ with pkgs; dev86 = callPackage ../development/compilers/dev86 { }; - diskrsync = callPackage ../tools/backup/diskrsync { }; + diskrsync = callPackage ../tools/backup/diskrsync { + buildGoPackage = buildGo110Package; + }; djbdns = callPackage ../tools/networking/djbdns { }; dnscrypt-proxy = callPackage ../tools/networking/dnscrypt-proxy/1.x { }; - dnscrypt-proxy2 = callPackage ../tools/networking/dnscrypt-proxy/2.x { }; + dnscrypt-proxy2 = callPackage ../tools/networking/dnscrypt-proxy/2.x { + buildGoPackage = buildGo110Package; + }; dnscrypt-wrapper = callPackage ../tools/networking/dnscrypt-wrapper { }; @@ -2303,13 +2321,13 @@ with pkgs; elk5Version = "5.6.9"; elk6Version = "6.3.2"; - elasticsearch = callPackage ../servers/search/elasticsearch { }; - elasticsearch2 = callPackage ../servers/search/elasticsearch/2.x.nix { }; elasticsearch5 = callPackage ../servers/search/elasticsearch/5.x.nix { }; - elasticsearch6 = callPackage ../servers/search/elasticsearch/6.x.nix { }; - elasticsearch6-oss = callPackage ../servers/search/elasticsearch/6.x.nix { + elasticsearch6 = callPackage ../servers/search/elasticsearch { }; + elasticsearch6-oss = callPackage ../servers/search/elasticsearch { enableUnfree = false; }; + elasticsearch = elasticsearch6; + elasticsearch-oss = elasticsearch6-oss; elasticsearchPlugins = recurseIntoAttrs ( callPackage ../servers/search/elasticsearch/plugins.nix { } @@ -2933,8 +2951,12 @@ with pkgs; stdenv = stdenv_32bit; }; - gx = callPackage ../tools/package-management/gx { }; - gx-go = callPackage ../tools/package-management/gx/go { }; + gx = callPackage ../tools/package-management/gx { + buildGoPackage = buildGo110Package; + }; + gx-go = callPackage ../tools/package-management/gx/go { + buildGoPackage = buildGo110Package; + }; sbsigntool = callPackage ../tools/security/sbsigntool { }; @@ -2963,7 +2985,7 @@ with pkgs; gtkperf = callPackage ../development/tools/misc/gtkperf { }; - gtkvnc = callPackage ../tools/admin/gtk-vnc {}; + gtk-vnc = callPackage ../tools/admin/gtk-vnc {}; gtmess = callPackage ../applications/networking/instant-messengers/gtmess { }; @@ -3278,7 +3300,9 @@ with pkgs; ipfs = callPackage ../applications/networking/ipfs { }; ipfs-migrator = callPackage ../applications/networking/ipfs-migrator { }; - ipget = callPackage ../applications/networking/ipget { }; + ipget = callPackage ../applications/networking/ipget { + buildGoPackage = buildGo110Package; + }; ipmitool = callPackage ../tools/system/ipmitool { static = false; @@ -3383,6 +3407,10 @@ with pkgs; jupp = callPackage ../applications/editors/jupp { }; + jupyter = callPackage ../applications/editors/jupyter { }; + + jupyter-kernel = callPackage ../applications/editors/jupyter/kernel.nix { }; + jwhois = callPackage ../tools/networking/jwhois { }; k2pdfopt = callPackage ../applications/misc/k2pdfopt { }; @@ -3424,12 +3452,13 @@ with pkgs; keyfuzz = callPackage ../tools/inputmethods/keyfuzz { }; - kibana = callPackage ../development/tools/misc/kibana { }; kibana5 = callPackage ../development/tools/misc/kibana/5.x.nix { }; - kibana6 = callPackage ../development/tools/misc/kibana/6.x.nix { }; - kibana6-oss = callPackage ../development/tools/misc/kibana/6.x.nix { + kibana6 = callPackage ../development/tools/misc/kibana/default.nix { }; + kibana6-oss = callPackage ../development/tools/misc/kibana/default.nix { enableUnfree = false; }; + kibana = kibana6; + kibana-oss = kibana6-oss; kismet = callPackage ../applications/networking/sniffers/kismet { }; @@ -3506,12 +3535,12 @@ with pkgs; lockfileProgs = callPackage ../tools/misc/lockfile-progs { }; - logstash = callPackage ../tools/misc/logstash { }; logstash5 = callPackage ../tools/misc/logstash/5.x.nix { }; - logstash6 = callPackage ../tools/misc/logstash/6.x.nix { }; - logstash6-oss = callPackage ../tools/misc/logstash/6.x.nix { + logstash6 = callPackage ../tools/misc/logstash { }; + logstash6-oss = callPackage ../tools/misc/logstash { enableUnfree = false; }; + logstash = logstash6; logstash-contrib = callPackage ../tools/misc/logstash/contrib.nix { }; @@ -3959,7 +3988,9 @@ with pkgs; mimetic = callPackage ../development/libraries/mimetic { }; - minio-client = callPackage ../tools/networking/minio-client { }; + minio-client = callPackage ../tools/networking/minio-client { + buildGoPackage = buildGo110Package; + }; minissdpd = callPackage ../tools/networking/minissdpd { }; @@ -4193,7 +4224,9 @@ with pkgs; noip = callPackage ../tools/networking/noip { }; - nomad = callPackage ../applications/networking/cluster/nomad { }; + nomad = callPackage ../applications/networking/cluster/nomad { + buildGoPackage = buildGo110Package; + }; miller = callPackage ../tools/text/miller { }; @@ -4245,7 +4278,9 @@ with pkgs; nnn = callPackage ../applications/misc/nnn { }; - notary = callPackage ../tools/security/notary { }; + notary = callPackage ../tools/security/notary { + buildGoPackage = buildGo110Package; + }; notify-osd = callPackage ../applications/misc/notify-osd { }; @@ -4469,7 +4504,7 @@ with pkgs; patchutils = callPackage ../tools/text/patchutils { }; - parted = callPackage ../tools/misc/parted { hurd = null; }; + parted = callPackage ../tools/misc/parted { }; pell = callPackage ../applications/misc/pell { }; @@ -4496,24 +4531,6 @@ with pkgs; pngout = callPackage ../tools/graphics/pngout { }; - hurdPartedCross = - if targetPlatform != buildPlatform && targetPlatform.config == "i586-pc-gnu" - then (makeOverridable - ({ hurd }: - (parted.override { - # Needs the Hurd's libstore. - inherit hurd; - - # The Hurd wants a libparted.a. - enableStatic = true; - - gettext = null; - readline = null; - devicemapper = null; - }).crossDrv) - { hurd = gnu.hurdCrossIntermediate; }) - else null; - ipsecTools = callPackage ../os-specific/linux/ipsec-tools { flex = flex_2_5_35; }; patch = gnupatch; @@ -5150,8 +5167,6 @@ with pkgs; signal-desktop = callPackage ../applications/networking/instant-messengers/signal-desktop { }; - signal-desktop-beta = callPackage ../applications/networking/instant-messengers/signal-desktop/beta.nix { }; - # aka., pgp-tools signing-party = callPackage ../tools/security/signing-party { }; @@ -5521,7 +5536,9 @@ with pkgs; tmuxPlugins = recurseIntoAttrs (callPackage ../misc/tmux-plugins { }); - tmsu = callPackage ../tools/filesystems/tmsu { }; + tmsu = callPackage ../tools/filesystems/tmsu { + go = go_1_10; + }; toilet = callPackage ../tools/misc/toilet { }; @@ -5621,8 +5638,8 @@ with pkgs; libX11 = xorg.libX11; }; - twitterBootstrap = callPackage ../development/web/twitter-bootstrap {}; - twitterBootstrap3 = callPackage ../development/web/twitter-bootstrap/v3.nix {}; + twitterBootstrap3 = callPackage ../development/web/twitter-bootstrap {}; + twitterBootstrap = twitterBootstrap3; txt2man = callPackage ../tools/misc/txt2man { }; @@ -6747,7 +6764,11 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security Foundation; }; - go = go_1_10; + go_1_11 = callPackage ../development/compilers/go/1.11.nix { + inherit (darwin.apple_sdk.frameworks) Security Foundation; + }; + + go = go_1_11; go-repo-root = callPackage ../development/tools/go-repo-root { }; @@ -6793,6 +6814,9 @@ with pkgs; }; openjdk10 = + if stdenv.isDarwin then + callPackage ../development/compilers/openjdk/darwin/10.nix { } + else callPackage ../development/compilers/openjdk/10.nix { inherit (gnome2) GConf gnome_vfs; }; @@ -7234,9 +7258,6 @@ with pkgs; urweb = callPackage ../development/compilers/urweb { }; inherit (callPackage ../development/compilers/vala { }) - vala_0_26 - vala_0_28 - vala_0_32 vala_0_34 vala_0_36 vala_0_38 @@ -8720,8 +8741,6 @@ with pkgs; gdb = callPackage ../development/tools/misc/gdb { guile = null; - hurd = gnu.hurdCross; - inherit (gnu) mig; }; jhiccup = callPackage ../development/tools/java/jhiccup { }; @@ -9030,6 +9049,8 @@ with pkgs; cmocka = callPackage ../development/libraries/cmocka { }; + cmrt = callPackage ../development/libraries/cmrt { }; + cogl = callPackage ../development/libraries/cogl { }; coin3d = callPackage ../development/libraries/coin3d { }; @@ -9723,6 +9744,11 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AppKit Cocoa; }; + # On darwin gtk uses cocoa by default instead of x11. + gtk3-x11 = gtk3.override { + x11Support = true; + }; + gtkmm2 = callPackage ../development/libraries/gtkmm/2.x.nix { }; gtkmm3 = callPackage ../development/libraries/gtkmm/3.x.nix { }; @@ -10321,6 +10347,8 @@ with pkgs; libgroove = callPackage ../development/libraries/libgroove { }; + libgrss = callPackage ../development/libraries/libgrss { }; + libseccomp = callPackage ../development/libraries/libseccomp { }; libsecret = callPackage ../development/libraries/libsecret { }; @@ -10617,6 +10645,8 @@ with pkgs; libmad = callPackage ../development/libraries/libmad { }; + libmanette = callPackage ../development/libraries/libmanette { }; + libmatchbox = callPackage ../development/libraries/libmatchbox { }; libmatheval = callPackage ../development/libraries/libmatheval { @@ -11645,7 +11675,7 @@ with pkgs; kservice ktexteditor ktextwidgets kunitconversion kwallet kwayland kwidgetsaddons kwindowsystem kxmlgui kxmlrpcclient modemmanager-qt networkmanager-qt plasma-framework prison solid sonnet syntax-highlighting - threadweaver kirigami2 kholidays; + threadweaver kirigami2 kholidays kpurpose; ### KDE PLASMA 5 @@ -12270,6 +12300,8 @@ with pkgs; vaapiIntel = callPackage ../development/libraries/vaapi-intel { }; + vaapi-intel-hybrid = callPackage ../development/libraries/vaapi-intel-hybrid { }; + vaapiVdpau = callPackage ../development/libraries/vaapi-vdpau { }; vale = callPackage ../tools/text/vale { }; @@ -12631,8 +12663,11 @@ with pkgs; buildGo110Package = callPackage ../development/go-modules/generic { go = go_1_10; }; + buildGo111Package = callPackage ../development/go-modules/generic { + go = go_1_11; + }; - buildGoPackage = buildGo110Package; + buildGoPackage = buildGo111Package; go2nix = callPackage ../development/tools/go2nix { }; @@ -12990,13 +13025,17 @@ with pkgs; mediatomb = callPackage ../servers/mediatomb { }; - meguca = callPackage ../servers/meguca { }; + meguca = callPackage ../servers/meguca { + buildGoPackage = buildGo110Package; + }; memcached = callPackage ../servers/memcached {}; meteor = callPackage ../servers/meteor { }; - minio = callPackage ../servers/minio { }; + minio = callPackage ../servers/minio { + buildGoPackage = buildGo110Package; + }; # Backwards compatibility. mod_dnssd = pkgs.apacheHttpdPackages.mod_dnssd; @@ -13259,7 +13298,9 @@ with pkgs; postgresql_jdbc = callPackage ../servers/sql/postgresql/jdbc { }; - inherit (callPackage ../servers/monitoring/prometheus {}) + inherit (callPackage ../servers/monitoring/prometheus { + buildGoPackage = buildGo110Package; + }) prometheus_1 prometheus_2 ; @@ -13285,7 +13326,9 @@ with pkgs; prometheus-postfix-exporter = callPackage ../servers/monitoring/prometheus/postfix-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-snmp-exporter = callPackage ../servers/monitoring/prometheus/snmp-exporter.nix { + buildGoPackage = buildGo110Package; + }; prometheus-statsd-exporter = callPackage ../servers/monitoring/prometheus/statsd-bridge.nix { }; prometheus-surfboard-exporter = callPackage ../servers/monitoring/prometheus/surfboard-exporter.nix { }; prometheus-unifi-exporter = callPackage ../servers/monitoring/prometheus/unifi-exporter { }; @@ -13663,7 +13706,9 @@ with pkgs; dstat = callPackage ../os-specific/linux/dstat { }; # unstable until the first 1.x release - fscrypt-experimental = callPackage ../os-specific/linux/fscrypt { }; + fscrypt-experimental = callPackage ../os-specific/linux/fscrypt { + buildGoPackage = buildGo110Package; + }; fscryptctl-experimental = callPackage ../os-specific/linux/fscryptctl { }; fwupd = callPackage ../os-specific/linux/firmware/fwupd { }; @@ -13674,22 +13719,7 @@ with pkgs; libossp_uuid = callPackage ../development/libraries/libossp-uuid { }; - libuuid = - if targetPlatform != buildPlatform && targetPlatform.config == "i586-pc-gnu" - then (utillinuxMinimal // { - crossDrv = lib.overrideDerivation utillinuxMinimal.crossDrv (args: { - # `libblkid' fails to build on GNU/Hurd. - configureFlags = args.configureFlags - + " --disable-libblkid --disable-mount --disable-libmount" - + " --disable-fsck --enable-static --disable-partx"; - doCheck = false; - CPPFLAGS = # ugly hack for ugly software! - lib.concatStringsSep " " - (map (v: "-D${v}=4096") - [ "PATH_MAX" "MAXPATHLEN" "MAXHOSTNAMELEN" ]); - }); - }) - else if stdenv.isLinux + libuuid = if stdenv.isLinux then utillinuxMinimal else null; @@ -13761,9 +13791,6 @@ with pkgs; nmon = callPackage ../os-specific/linux/nmon { }; - # GNU/Hurd core packages. - gnu = recurseIntoAttrs (callPackage ../os-specific/gnu { }); - hwdata = callPackage ../os-specific/linux/hwdata { }; i7z = callPackage ../os-specific/linux/i7z { }; @@ -14382,7 +14409,9 @@ with pkgs; gomodifytags = callPackage ../development/tools/gomodifytags { }; - go-langserver = callPackage ../development/tools/go-langserver { }; + go-langserver = callPackage ../development/tools/go-langserver { + buildGoPackage = buildGo110Package; + }; gotests = callPackage ../development/tools/gotests { }; @@ -15424,10 +15453,6 @@ with pkgs; ffmpeg = ffmpeg_2; }; - awesome-3-5 = callPackage ../applications/window-managers/awesome/3.5.nix { - cairo = cairo.override { xcbSupport = true; }; - luaPackages = luaPackages.override { inherit lua; }; - }; awesome-4-0 = callPackage ../applications/window-managers/awesome { cairo = cairo.override { xcbSupport = true; }; luaPackages = luaPackages.override { inherit lua; }; @@ -15769,6 +15794,7 @@ with pkgs; }; deadbeefPlugins = { + headerbar-gtk3 = callPackage ../applications/audio/deadbeef/plugins/headerbar-gtk3.nix { }; mpris2 = callPackage ../applications/audio/deadbeef/plugins/mpris2.nix { }; opus = callPackage ../applications/audio/deadbeef/plugins/opus.nix { }; }; @@ -15876,6 +15902,11 @@ with pkgs; patches = config.dwm.patches or []; }; + dwm-git = callPackage ../applications/window-managers/dwm/git.nix { + patches = config.dwm.patches or []; + conf = config.dwm.conf or null; + }; + dwm-status = callPackage ../applications/window-managers/dwm/dwm-status.nix { }; dynamips = callPackage ../applications/virtualization/dynamips { }; @@ -16963,6 +16994,8 @@ with pkgs; img2pdf = callPackage ../applications/misc/img2pdf { }; + imgcat = callPackage ../applications/graphics/imgcat { }; + # Impressive, formerly known as "KeyJNote". impressive = callPackage ../applications/office/impressive { }; @@ -17065,7 +17098,7 @@ with pkgs; inherit (kdeApplications) akonadi akregator ark dolphin dragon ffmpegthumbs filelight gwenview k3b kaddressbook kate kcachegrind kcalc kcolorchooser kcontacts kdenlive kdf kdialog keditbookmarks - kget kgpg khelpcenter kig kleopatra kmail kmix kolourpaint kompare konsole + kget kgpg khelpcenter kig kleopatra kmail kmix kolourpaint kompare konsole kpkpass kitinerary kontact korganizer krdc krfb ksystemlog kwalletmanager marble minuet okular spectacle; okteta = libsForQt5.callPackage ../applications/editors/okteta { }; @@ -17082,8 +17115,6 @@ with pkgs; llvmPackages = llvmPackages_38; }; - kdevplatform = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevplatform.nix { }; - keepnote = callPackage ../applications/office/keepnote { }; kega-fusion = pkgsi686Linux.callPackage ../misc/emulators/kega-fusion { }; @@ -17316,6 +17347,8 @@ with pkgs; lyx = libsForQt5.callPackage ../applications/misc/lyx { }; + mac = callPackage ../development/libraries/mac { }; + magic-wormhole = with python3Packages; toPythonApplication magic-wormhole; mail-notification = callPackage ../desktops/gnome-2/desktop/mail-notification {}; @@ -18419,6 +18452,8 @@ with pkgs; spideroak = callPackage ../applications/networking/spideroak { }; + split2flac = callPackage ../applications/audio/split2flac { }; + squishyball = callPackage ../applications/audio/squishyball { ncurses = ncurses5; }; @@ -18785,6 +18820,8 @@ with pkgs; todo-txt-cli = callPackage ../applications/office/todo.txt-cli { }; + todoman = callPackage ../applications/office/todoman { }; + toggldesktop = libsForQt5.callPackage ../applications/misc/toggldesktop { }; tomahawk = callPackage ../applications/audio/tomahawk { @@ -18886,8 +18923,6 @@ with pkgs; valentina = libsForQt5.callPackage ../applications/misc/valentina { }; - vanubi = callPackage ../applications/editors/vanubi { }; - vbindiff = callPackage ../applications/editors/vbindiff { }; vcprompt = callPackage ../applications/version-management/vcprompt { }; @@ -18917,9 +18952,8 @@ with pkgs; vim_configurable = vimUtils.makeCustomizable (callPackage ../applications/editors/vim/configurable.nix { inherit (darwin.apple_sdk.frameworks) CoreServices Cocoa Foundation CoreData; inherit (darwin) libobjc cf-private; - inherit lua; gtk2 = if stdenv.isDarwin then gtk2-x11 else gtk2; - guiSupport = if stdenv.isDarwin then "gtk2" else "gtk3"; + gtk3 = if stdenv.isDarwin then gtk3-x11 else gtk3; }); qpdfview = libsForQt5.callPackage ../applications/misc/qpdfview {}; @@ -19324,9 +19358,7 @@ with pkgs; inherit (xorg) xcompmgr; - compton = callPackage ../applications/window-managers/compton { }; - - compton-git = callPackage ../applications/window-managers/compton/git.nix { }; + inherit (callPackage ../applications/window-managers/compton {}) compton compton-git; xdaliclock = callPackage ../tools/misc/xdaliclock {}; @@ -19463,8 +19495,6 @@ with pkgs; openssl = null; }; - finalterm = callPackage ../applications/misc/finalterm { }; - roxterm = callPackage ../applications/misc/roxterm { inherit (gnome3) gsettings-desktop-schemas vte; }; @@ -19556,6 +19586,8 @@ with pkgs; _2048-in-terminal = callPackage ../games/2048-in-terminal { }; + _20kly = callPackage ../games/20kly { }; + _90secondportraits = callPackage ../games/90secondportraits { love = love_0_10; }; adom = callPackage ../games/adom { }; @@ -19722,6 +19754,8 @@ with pkgs; EmptyEpsilon = callPackage ../games/empty-epsilon { }; + endgame-singularity = callPackage ../games/endgame-singularity { }; + endless-sky = callPackage ../games/endless-sky { }; enyo-doom = libsForQt5.callPackage ../games/enyo-doom { }; @@ -20235,6 +20269,8 @@ with pkgs; vessel = pkgsi686Linux.callPackage ../games/vessel { }; + vitetris = callPackage ../games/vitetris { }; + vms-empire = callPackage ../games/vms-empire { }; voxelands = callPackage ../games/voxelands { @@ -21395,6 +21431,8 @@ with pkgs; faust2lv2 = callPackage ../applications/audio/faust/faust2lv2.nix { }; + faustlive = callPackage ../applications/audio/faust/faustlive.nix { }; + fceux = callPackage ../misc/emulators/fceux { }; flockit = callPackage ../tools/backup/flockit { }; @@ -21925,7 +21963,9 @@ with pkgs; valauncher = callPackage ../applications/misc/valauncher { }; - vault = callPackage ../tools/security/vault { }; + vault = callPackage ../tools/security/vault { + go = go_1_10; + }; vaultenv = haskellPackages.vaultenv; @@ -22248,4 +22288,8 @@ with pkgs; doing = callPackage ../applications/misc/doing { }; undervolt = callPackage ../os-specific/linux/undervolt { }; + + alibuild = callPackage ../development/tools/build-managers/alibuild { + python = python27; + }; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2e40e1e56e3..489f1730517 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2009,6 +2009,8 @@ in { requests-unixsocket = callPackage ../development/python-modules/requests-unixsocket {}; + requests-aws4auth = callPackage ../development/python-modules/requests-aws4auth { }; + howdoi = callPackage ../development/python-modules/howdoi {}; neurotools = callPackage ../development/python-modules/neurotools {}; @@ -4581,6 +4583,10 @@ in { gdal = self.gdal; }; + django_2_1 = callPackage ../development/python-modules/django/2_1.nix { + gdal = self.gdal; + }; + django_1_8 = buildPythonPackage rec { name = "Django-${version}"; version = "1.8.18"; @@ -6927,6 +6933,8 @@ in { inherit (pkgs.linuxPackages) nvidia_x11; }; + libkeepass = callPackage ../development/python-modules/libkeepass { }; + librepo = toPythonModule (pkgs.librepo.override { inherit python; }); @@ -15638,35 +15646,7 @@ EOF # added 2018-05-23, can be removed once 18.09 is branched off udiskie = throw "pythonPackages.udiskie has been replaced by udiskie"; - # Should be bumped along with EFL! - pythonefl = buildPythonPackage rec { - name = "python-efl-${version}"; - version = "1.20.0"; - src = pkgs.fetchurl { - url = "http://download.enlightenment.org/rel/bindings/python/${name}.tar.xz"; - sha256 = "18qfqdkkjydqjk0nxs7wnnzdnqlbj3fhkjm0bbd927myzbihxpkh"; - }; - - hardeningDisable = [ "format" ]; - - preConfigure = '' - export NIX_CFLAGS_COMPILE="$(pkg-config --cflags efl) -I${self.dbus-python}/include/dbus-1.0 $NIX_CFLAGS_COMPILE" - ''; - preBuild = "${python}/bin/${python.executable} setup.py build_ext"; - installPhase= "${python}/bin/${python.executable} setup.py install --prefix=$out"; - - nativeBuildInputs = [ pkgs.pkgconfig ]; - buildInputs = with self; [ pkgs.enlightenment.efl ]; - doCheck = false; - - meta = { - description = "Python bindings for EFL and Elementary"; - homepage = http://enlightenment.org/; - platforms = platforms.linux; - license = licenses.gpl3; - maintainers = with maintainers; [ matejc tstrobel ftrvxmtrx ]; - }; - }; + pythonefl = callPackage ../development/python-modules/python-efl { }; tlsh = buildPythonPackage rec { name = "tlsh-3.4.5"; |