diff options
Diffstat (limited to 'pkgs')
197 files changed, 5826 insertions, 2623 deletions
diff --git a/pkgs/applications/altcoins/ledger-live-desktop/default.nix b/pkgs/applications/altcoins/ledger-live-desktop/default.nix new file mode 100644 index 00000000000..0417d2913de --- /dev/null +++ b/pkgs/applications/altcoins/ledger-live-desktop/default.nix @@ -0,0 +1,50 @@ +{ stdenv, fetchurl, makeDesktopItem, makeWrapper, appimage-run }: + +stdenv.mkDerivation rec { + pname = "ledger-live-desktop"; + version = "1.12.0"; + + src = fetchurl { + url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage"; + sha256 = "0sn0ri8kqvy36d6vjwsb0mh54nwic58416m6q5drl1schsn6wyvj"; + }; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ appimage-run ]; + + desktopIcon = fetchurl { + url = "https://raw.githubusercontent.com/LedgerHQ/${pname}/v${version}/build/icon.png"; + sha256 = "1mmfaf0yk7xf1kgbs3ka8wsbz1qgh60xj6z91ica1i7lw2qbdd5h"; + }; + + desktopItem = makeDesktopItem { + name = pname; + exec = "${placeholder "out"}/bin/${pname}"; + icon = pname; + desktopName = "Ledger Live"; + categories = "Utility;"; + }; + + unpackPhase = ":"; + + installPhase = '' + runHook preInstall + + ${desktopItem.buildCommand} + install -D $src $out/share/${src.name} + install -Dm -x ${desktopIcon} \ + $out/share/icons/hicolor/1024x1024/apps/${pname}.png + makeWrapper ${appimage-run}/bin/appimage-run $out/bin/${pname} \ + --add-flags $out/share/${src.name} + + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "Wallet app for Ledger Nano S and Ledger Blue"; + homepage = "https://www.ledger.com/live"; + license = licenses.mit; + maintainers = with maintainers; [ thedavidmeister ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/altcoins/lnd.nix b/pkgs/applications/altcoins/lnd.nix index 7fcaca487b1..27f10c963c0 100644 --- a/pkgs/applications/altcoins/lnd.nix +++ b/pkgs/applications/altcoins/lnd.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "lnd"; - version = "0.7.0-beta"; + version = "0.7.1-beta"; src = fetchFromGitHub { owner = "lightningnetwork"; repo = "lnd"; rev = "v${version}"; - sha256 = "0d6m1vfy33rg6d7qmkpydiypav1girxsnxan9njyjz0vhinmq0sx"; + sha256 = "1c0sm0lavdai4w6d283q54knggw9d42vvqmglnv2h9swbw1l23ry"; }; - modSha256 = "0akxi7xhyz7xx0vc003abidva02sp940cc2gfjg4fmzkc95cajc9"; + modSha256 = "13hjaf4bswk8g57lyxzdlqqp4a6ddl3qm6n4jja4b1h58mlbil73"; meta = with lib; { description = "Lightning Network Daemon"; diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix index 9fbcf8b7ac2..d0c8f4d9ebe 100644 --- a/pkgs/applications/audio/mixxx/default.nix +++ b/pkgs/applications/audio/mixxx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, chromaprint +{ stdenv, mkDerivation, fetchFromGitHub, makeWrapper, chromaprint , fftw, flac, faad2, glibcLocales, mp4v2 , libid3tag, libmad, libopus, libshout, libsndfile, libusb1, libvorbis , libGLU, libxcb, lilv, lv2, opusfile @@ -6,7 +6,7 @@ , qtx11extras, rubberband, scons, sqlite, taglib, upower, vampSDK }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "mixxx-${version}"; version = "2.2.1"; diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix index fbb2f498c0b..15901915201 100644 --- a/pkgs/applications/audio/qjackctl/default.nix +++ b/pkgs/applications/audio/qjackctl/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, alsaLib, libjack2, dbus, qtbase, qttools, qtx11extras }: stdenv.mkDerivation rec { - version = "0.5.8"; + version = "0.5.9"; name = "qjackctl-${version}"; # some dependencies such as killall have to be installed additionally src = fetchurl { url = "mirror://sourceforge/qjackctl/${name}.tar.gz"; - sha256 = "1r5hf3hcr20n93jrrm7xk2zf6yx264pcr4d10cpybhrancxh602n"; + sha256 = "1saywsda9m124rmjp7i3n0llryaliabjxhqhvqr6dm983qy7pypk"; }; buildInputs = [ diff --git a/pkgs/applications/audio/qmidinet/default.nix b/pkgs/applications/audio/qmidinet/default.nix index b596e74a264..16e76bb631c 100644 --- a/pkgs/applications/audio/qmidinet/default.nix +++ b/pkgs/applications/audio/qmidinet/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, qt5, alsaLib, libjack2 }: stdenv.mkDerivation rec { - version = "0.5.4"; + version = "0.5.5"; name = "qmidinet-${version}"; src = fetchurl { url = "mirror://sourceforge/qmidinet/${name}.tar.gz"; - sha256 = "1il4b8v3azb33yg4fy78npi56xlkz4n60f17sgvckyxb2yj57jwq"; + sha256 = "0az20hh14g7k6h779dk1b6fshxnfj2664sj6ypgllzriwv430x9y"; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/audio/qsampler/default.nix b/pkgs/applications/audio/qsampler/default.nix index b09aa835c9f..4e6df82a32a 100644 --- a/pkgs/applications/audio/qsampler/default.nix +++ b/pkgs/applications/audio/qsampler/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "qsampler-${version}"; - version = "0.5.5"; + version = "0.5.6"; src = fetchurl { url = "mirror://sourceforge/qsampler/${name}.tar.gz"; - sha256 = "1li2p8zknrdr62wlaassfvgski0rlbr3lvrzywbh32dq8j50w8zf"; + sha256 = "0lx2mzyajmjckwfvgf8p8bahzpj0n0lflyip41jk32nwd2hzjhbs"; }; nativeBuildInputs = [ autoconf automake libtool pkgconfig qttools ]; diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index f7b24aa2824..77aa7994994 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, squashfsTools, xorg, alsaLib, makeWrapper, openssl, freetype , glib, pango, cairo, atk, gdk-pixbuf, gtk2, cups, nspr, nss, libpng, libnotify , libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_3, curl, zlib, gnome3 -, at-spi2-atk, at-spi2-core, apulse +, at-spi2-atk }: let @@ -10,22 +10,20 @@ let # If an update breaks things, one of those might have valuable info: # https://aur.archlinux.org/packages/spotify/ # https://community.spotify.com/t5/Desktop-Linux - version = "1.1.10.546.ge08ef575-19"; + version = "1.0.96.181.gf6bc1b6b-12"; # To get the latest stable revision: # curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated' # To get general information: # curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.' # More examples of api usage: # https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py - rev = "36"; + rev = "30"; deps = [ alsaLib - apulse atk at-spi2-atk - at-spi2-core cairo cups curl @@ -74,7 +72,7 @@ stdenv.mkDerivation { # https://community.spotify.com/t5/Desktop-Linux/Redistribute-Spotify-on-Linux-Distributions/td-p/1695334 src = fetchurl { url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap"; - sha512 = "c49f1a86a9b737e64a475bbe62754a36f607669e908eb725a2395f0a0a6b95968e0c8ce27ab2c8b6c92fe8cbacb1ef58de11c79b92dc0f58c2c6d3a140706a1f"; + sha512 = "859730fbc80067f0828f7e13eee9a21b13b749f897a50e17c2da4ee672785cfd79e1af6336e609529d105e040dc40f61b6189524783ac93d49f991c4ea8b3c56"; }; buildInputs = [ squashfsTools makeWrapper ]; @@ -136,8 +134,6 @@ stdenv.mkDerivation { librarypath="${stdenv.lib.makeLibraryPath deps}:$libdir" wrapProgram $out/share/spotify/spotify \ --prefix LD_LIBRARY_PATH : "$librarypath" \ - --prefix LD_LIBRARY_PATH : "${apulse}/lib/apulse" \ - --set APULSE_PLAYBACK_DEVICE plug:dmix \ --prefix PATH : "${gnome3.zenity}/bin" # fix Icon line in the desktop file (#48062) @@ -162,7 +158,7 @@ stdenv.mkDerivation { homepage = https://www.spotify.com/; description = "Play music from the Spotify music service"; license = licenses.unfree; - maintainers = with maintainers; [ eelco ftrvxmtrx sheenobu mudri timokau angristan ]; + maintainers = with maintainers; [ eelco ftrvxmtrx sheenobu mudri timokau ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 63c6d26df8e..794a881090c 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -13,9 +13,9 @@ let sha256Hash = "090rc307mfm0yw4h592l9307lq4aas8zq0ci49csn6kxhds8rsrm"; }; betaVersion = { - version = "3.5.0.18"; # "Android Studio 3.5 RC 1" - build = "191.5717577"; - sha256Hash = "1p0w7xrfk33m1wvwnc3s3s7w9rm8wn9b3bjn566w2qpjv5ngdkn3"; + version = "3.5.0.19"; # "Android Studio 3.5 RC 2" + build = "191.5763348"; + sha256Hash = "0z7mjpk0cqwk4ysd3cdsahlg70ax90353qvvag9wgyzl2x2sr6d2"; }; latestVersion = { # canary & dev version = "3.6.0.3"; # "Android Studio 3.6 Canary 3" diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index eb6bbabdea4..844999b0366 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -263,12 +263,12 @@ in datagrip = buildDataGrip rec { name = "datagrip-${version}"; - version = "2019.1.4"; /* updated by script */ + version = "2019.2.1"; /* updated by script */ description = "Your Swiss Army Knife for Databases and SQL"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; - sha256 = "0zjcn71fgngkvsixgimzm5afwjbd8zf14zzm6barap4pwp5xx0hb"; /* updated by script */ + sha256 = "0va5dcvjxq7mlkz0di5zl1ra5gv6cls3wy40fvkpm2vlirg0m31s"; /* updated by script */ }; wmClass = "jetbrains-datagrip"; update-channel = "DataGrip RELEASE"; @@ -367,12 +367,12 @@ in ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "2019.1.2"; /* updated by script */ + version = "2019.2"; /* updated by script */ description = "The Most Intelligent Ruby and Rails IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; - sha256 = "1zhci8nkywv66bwc6hbyh4h3x61qhv2fbmfb5gkw9znkk1qa0q6v"; /* updated by script */ + sha256 = "1f4mdarmh7m9jq432d0s9jds9288g0zgpxnlpmx12i26vvq8kykd"; /* updated by script */ }; wmClass = "jetbrains-rubymine"; update-channel = "RubyMine RELEASE"; diff --git a/pkgs/applications/editors/neovim/qt.nix b/pkgs/applications/editors/neovim/qt.nix index 3004bf544c4..83b14b4ea37 100644 --- a/pkgs/applications/editors/neovim/qt.nix +++ b/pkgs/applications/editors/neovim/qt.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchFromGitHub, cmake, doxygen, makeWrapper +{ stdenv, mkDerivation, fetchFromGitHub, cmake, doxygen, makeWrapper , msgpack, neovim, pythonPackages, qtbase }: let - unwrapped = stdenv.mkDerivation rec { + unwrapped = mkDerivation rec { pname = "neovim-qt-unwrapped"; - version = "0.2.11"; + version = "0.2.12"; src = fetchFromGitHub { owner = "equalsraf"; repo = "neovim-qt"; rev = "v${version}"; - sha256 = "0pc1adxc89p2rdvb6nxyqr9sjzqz9zw2dg7a4ardxsl3a8jga1wh"; + sha256 = "09s3044j0y8nmyi8ykslfii6fx7k9mckmdvb0jn2xmdabpb60i20"; }; cmakeFlags = [ @@ -24,7 +24,7 @@ let jinja2 python msgpack ]); - nativeBuildInputs = [ cmake doxygen makeWrapper ]; + nativeBuildInputs = [ cmake doxygen ]; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/rednotebook/default.nix b/pkgs/applications/editors/rednotebook/default.nix index 11154250e58..11a5b4c7ba3 100644 --- a/pkgs/applications/editors/rednotebook/default.nix +++ b/pkgs/applications/editors/rednotebook/default.nix @@ -5,13 +5,13 @@ buildPythonApplication rec { pname = "rednotebook"; - version = "2.8"; + version = "2.11.1"; src = fetchFromGitHub { owner = "jendrikseipp"; repo = "rednotebook"; rev = "v${version}"; - sha256 = "0k75lw3p6jx30ngvn8iipk1763gazkbrsad3fpl3sqppaqaggryj"; + sha256 = "04c7a0wgmdl88v9386y1052c38ajbkryiwhqps5lx34d4g7r6hm1"; }; # We have not packaged tests. @@ -30,6 +30,10 @@ buildPythonApplication rec { "--suffix XDG_DATA_DIRS : $XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" ]; + # Until gobject-introspection in nativeBuildInputs is supported. + # https://github.com/NixOS/nixpkgs/issues/56943#issuecomment-472568643 + strictDeps = false; + meta = with lib; { homepage = http://rednotebook.sourceforge.net/; description = "A modern journal that includes a calendar navigation, customizable templates, export functionality and word clouds"; diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix index 157204ce1ca..7273b7252ca 100644 --- a/pkgs/applications/editors/typora/default.nix +++ b/pkgs/applications/editors/typora/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, makeWrapper, electron_3, dpkg, gtk3, glib, gsettings-desktop-schemas, wrapGAppsHook }: +{ stdenv, fetchurl, makeWrapper, electron_5, dpkg, gtk3, glib, gsettings-desktop-schemas, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "typora"; - version = "0.9.72"; + version = "0.9.73"; src = fetchurl { url = "https://www.typora.io/linux/typora_${version}_amd64.deb"; - sha256 = "0q7fj77pr3ykpwgip87h12qxvpvlzs15mi9w3phqm3p9mmm9rlrs"; + sha256 = "1fgcb4bx5pw8ah5j30d38gw7qi1cmqarfhvgdns9f2n0d57bvvw3"; }; nativeBuildInputs = [ @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ''; postFixup = '' - makeWrapper ${electron_3}/bin/electron $out/bin/typora \ + makeWrapper ${electron_5}/bin/electron $out/bin/typora \ --add-flags $out/share/typora \ "''${gappsWrapperArgs[@]}" \ --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}" @@ -50,6 +50,6 @@ stdenv.mkDerivation rec { homepage = https://typora.io; license = licenses.unfree; maintainers = with maintainers; [ jensbin worldofpeace ]; - inherit (electron_3.meta) platforms; + platforms = [ "x86_64-linux"]; }; } diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index cf2376b3733..1fc15af7244 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -52,13 +52,13 @@ mkDerivation rec { pname = "digikam"; - version = "6.1.0"; + version = "6.2.0"; src = fetchFromGitHub { owner = "KDE"; repo = "digikam"; rev = "v${version}"; - sha256 = "0h0jqfgpanhxfi3r7cgip58ppypqx79z6c5jj7i7f19hp2zziip8"; + sha256 = "1l1nb1nwicmip2jxhn5gzr7h60igvns0zs3kzp36r6qf4wvg3v2z"; }; nativeBuildInputs = [ cmake doxygen extra-cmake-modules kdoctools wrapGAppsHook ]; @@ -105,6 +105,8 @@ mkDerivation rec { threadweaver ]; + enableParallelBuilding = true; + cmakeFlags = [ "-DENABLE_MYSQLSUPPORT=1" "-DENABLE_INTERNALMYSQL=1" diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index a6c067bc6eb..02af754a72c 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "10.9.5"; + version = "11.1.1"; src = fetchurl { url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/draw.io-x86_64-${version}.rpm"; - sha256 = "13687d5bfxj7wlbh5j13pvxvs69whlg820wllk3pb1xb3syynlpn"; + sha256 = "1jibkxx00rma641c3xr7720qj9slqsvhbpi7nawi6f2f91gzyc10"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index 8fc39ded638..8f0fe00a85e 100644 --- a/pkgs/applications/graphics/freecad/default.nix +++ b/pkgs/applications/graphics/freecad/default.nix @@ -9,11 +9,11 @@ let pythonPackages = python3Packages; in stdenv.mkDerivation rec { name = "freecad-${version}"; - version = "0.18.2"; + version = "0.18.3"; src = fetchurl { url = "https://github.com/FreeCAD/FreeCAD/archive/${version}.tar.gz"; - sha256 = "1r5rhaiq22yhrfpmcmzx6bflqj6q9asbyjyfja4x4rzfy9yh0a4v"; + sha256 = "07j7azgnicmd8cqnyskp15y44ykgj5qqz5y3w1jdynrv3yrvk1kz"; }; nativeBuildInputs = [ cmake ninja pkgconfig pythonPackages.pyside2-tools ]; diff --git a/pkgs/applications/graphics/fstl/default.nix b/pkgs/applications/graphics/fstl/default.nix index b1437508a50..bdb1e87d70e 100644 --- a/pkgs/applications/graphics/fstl/default.nix +++ b/pkgs/applications/graphics/fstl/default.nix @@ -1,5 +1,6 @@ -{stdenv, fetchFromGitHub, qtbase, mesa_glu}: -stdenv.mkDerivation rec { +{ stdenv, fetchFromGitHub, mkDerivation, qtbase, mesa_glu }: + +mkDerivation rec { name = "fstl-${version}"; version = "0.9.3"; diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index cc46ac2d3bb..83489e1a24c 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -10,11 +10,11 @@ mkDerivation rec { pname = "krita"; - version = "4.2.2"; + version = "4.2.5"; src = fetchurl { url = "https://download.kde.org/stable/${pname}/${version}/${pname}-${version}.tar.gz"; - sha256 = "1pzk5bqp3kh22djhvsvmsc7ybirs4hsnkpg1y9677m2gxwbqnnps"; + sha256 = "1f14r2mrqasl6nr3sss0xy2h8xlxd5wdcjcd64m9nz2gwlm39r7w"; }; nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip makeWrapper ]; diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 5445c7efb59..3b98114c710 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -1,7 +1,7 @@ { config, stdenv, lib, fetchurl, boost, cmake, ffmpeg, gettext, glew , ilmbase, libXi, libX11, libXext, libXrender , libjpeg, libpng, libsamplerate, libsndfile -, libtiff, libGLU_combined, openal, opencolorio, openexr, openimageio, openjpeg_1, pythonPackages +, libtiff, libGLU_combined, openal, opencolorio, openexr, openimageio, openjpeg_1, python3Packages , zlib, fftw, opensubdiv, freetype, jemalloc, ocl-icd, addOpenGLRunpath , jackaudioSupport ? false, libjack2 , cudaSupport ? config.cudaSupport or false, cudatoolkit @@ -11,14 +11,15 @@ with lib; -let python = pythonPackages.python; in +let python = python3Packages.python; in stdenv.mkDerivation rec { - name = "blender-2.79b"; + pname = "blender"; + version = "2.80"; src = fetchurl { - url = "https://download.blender.org/source/${name}.tar.gz"; - sha256 = "1g4kcdqmf67srzhi3hkdnr4z1ph4h9sza1pahz38mrj998q4r52c"; + url = "https://download.blender.org/source/${pname}-${version}.tar.gz"; + sha256 = "1h550jisdbis50hxwk5kxrvrk1a6sh2fsri3yyj66vhzbi87x7fd"; }; nativeBuildInputs = [ cmake ] ++ optional cudaSupport addOpenGLRunpath; @@ -36,7 +37,6 @@ stdenv.mkDerivation rec { postPatch = '' - substituteInPlace doc/manpage/blender.1.py --replace /usr/bin/python ${python}/bin/python3 substituteInPlace extern/clew/src/clew.c --replace '"libOpenCL.so"' '"${ocl-icd}/lib/libOpenCL.so"' ''; @@ -47,10 +47,7 @@ stdenv.mkDerivation rec { "-DWITH_INSTALL_PORTABLE=OFF" "-DWITH_FFTW3=ON" #"-DWITH_SDL=ON" - "-DWITH_GAMEENGINE=ON" "-DWITH_OPENCOLORIO=ON" - "-DWITH_SYSTEM_OPENJPEG=ON" - "-DWITH_PLAYER=ON" "-DWITH_OPENSUBDIV=ON" "-DPYTHON_LIBRARY=${python.libPrefix}m" "-DPYTHON_LIBPATH=${python}/lib" @@ -58,13 +55,10 @@ stdenv.mkDerivation rec { "-DPYTHON_VERSION=${python.pythonVersion}" "-DWITH_PYTHON_INSTALL=OFF" "-DWITH_PYTHON_INSTALL_NUMPY=OFF" + "-DPYTHON_NUMPY_PATH=${python3Packages.numpy}/${python.sitePackages}" ] ++ optional jackaudioSupport "-DWITH_JACK=ON" - ++ optionals cudaSupport - [ "-DWITH_CYCLES_CUDA_BINARIES=ON" - # Disable architectures before sm_30 to support new CUDA toolkits. - "-DCYCLES_CUDA_BINARIES_ARCH=sm_30;sm_35;sm_37;sm_50;sm_52;sm_60;sm_61" - ] + ++ optional cudaSupport "-DWITH_CYCLES_CUDA_BINARIES=ON" ++ optional colladaSupport "-DWITH_OPENCOLLADA=ON"; NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR -I${python}/include/${python.libPrefix}"; @@ -78,7 +72,7 @@ stdenv.mkDerivation rec { postInstall = optionalString enableNumpy '' wrapProgram $out/bin/blender \ - --prefix PYTHONPATH : ${pythonPackages.numpy}/${python.sitePackages} + --prefix PYTHONPATH : ${python3Packages.numpy}/${python.sitePackages} ''; # Set RUNPATH so that libcuda and libnvrtc in /run/opengl-driver(-32)/lib can be diff --git a/pkgs/applications/misc/gImageReader/default.nix b/pkgs/applications/misc/gImageReader/default.nix index 062bca5b215..9a34694e2f2 100644 --- a/pkgs/applications/misc/gImageReader/default.nix +++ b/pkgs/applications/misc/gImageReader/default.nix @@ -16,13 +16,13 @@ let in stdenv.mkDerivation rec { name = "gImageReader-${version}"; - version = "3.3.0"; + version = "3.3.1"; src = fetchFromGitHub { owner= "manisandro"; repo = "gImageReader"; rev = "v${version}"; - sha256 = "0pjk4kr7bc5q4hi1xf7na2zln9fyqdazgzq62r3bg41nzy7fakcz"; + sha256 = "17hz2dgxx2j7hsk0lx3riidqvlsg0ylnicjd2gphsi3yp7w20zdj"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index cb04be4b6ea..1ce9bfb1f67 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "gallery_dl"; - version = "1.8.6"; + version = "1.10.1"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0in47v6c82a6mqg4wzxrji7wd8a9qh5386rsr77s3a8613am1n2x"; + sha256 = "174d2q7w0kwa6xx9k3bl5gdwmk0gklvch963g7vl979wqsf7nskw"; }; doCheck = false; diff --git a/pkgs/applications/misc/gkrellm/default.nix b/pkgs/applications/misc/gkrellm/default.nix index b4fac899f66..f44cdd0bad7 100644 --- a/pkgs/applications/misc/gkrellm/default.nix +++ b/pkgs/applications/misc/gkrellm/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "gkrellm-2.3.10"; + name = "gkrellm-2.3.11"; src = fetchurl { url = "http://gkrellm.srcbox.net/releases/${name}.tar.bz2"; - sha256 = "0rnpzjr0ys0ypm078y63q4aplcgdr5nshjzhmz330n6dmnxci7lb"; + sha256 = "01lccz4fga40isv09j8rjgr0qy10rff9vj042n6gi6gdv4z69q0y"; }; nativeBuildInputs = [ pkgconfig which ]; diff --git a/pkgs/applications/misc/goldendict/default.nix b/pkgs/applications/misc/goldendict/default.nix index 42d5d83f7bd..6a5f4c9ce03 100644 --- a/pkgs/applications/misc/goldendict/default.nix +++ b/pkgs/applications/misc/goldendict/default.nix @@ -1,25 +1,29 @@ -{ stdenv, fetchFromGitHub, pkgconfig, libXtst, libvorbis, hunspell -, libao, ffmpeg, libeb, lzo, xz, libtiff +{ mkDerivation, lib, fetchFromGitHub, pkgconfig, libXtst, libvorbis, hunspell +, libao, ffmpeg, libeb, lzo, xz, libtiff, opencc , qtbase, qtsvg, qtwebkit, qtx11extras, qttools, qmake }: -stdenv.mkDerivation rec { +mkDerivation rec { - name = "goldendict-2018-06-13"; + name = "goldendict-2019-08-01"; src = fetchFromGitHub { owner = "goldendict"; repo = "goldendict"; - rev = "48e850c7ec11d83cba7499f7fdce377ef3849bbb"; - sha256 = "0i4q4waqjv45hgwillvjik97pg26kwlmz4925djjkx8s6hxgjlq9"; + rev = "0f951b06a55f3a201891cf645a556e773bda5f52"; + sha256 = "1d1hn95vhvsmbq9q96l5adn90g0hg25dl01knb4y4v6v9x4yrl2x"; }; nativeBuildInputs = [ pkgconfig qmake ]; buildInputs = [ qtbase qtsvg qtwebkit qtx11extras qttools - libXtst libvorbis hunspell libao ffmpeg libeb lzo xz libtiff + libXtst libvorbis hunspell libao ffmpeg libeb lzo xz libtiff opencc ]; - qmakeFlags = [ "CONFIG+=zim_support" ]; + qmakeFlags = [ + "goldendict.pro" + "CONFIG+=zim_support" + "CONFIG+=chinese_conversion_support" + ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = http://goldendict.org/; description = "A feature-rich dictionary lookup program"; platforms = platforms.linux; diff --git a/pkgs/applications/misc/jgmenu/default.nix b/pkgs/applications/misc/jgmenu/default.nix index 64c693092b0..879f344a5af 100644 --- a/pkgs/applications/misc/jgmenu/default.nix +++ b/pkgs/applications/misc/jgmenu/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "jgmenu"; - version = "3.1"; + version = "3.3"; src = fetchFromGitHub { owner = "johanmalm"; repo = pname; rev = "v${version}"; - sha256 = "03lk89d6wvqv234qciksd4zm0z4lkvrxfh6r9ff0d8yzg67m7rd0"; + sha256 = "02qpvlmcis7217hkqilhszza4g1smb4byx4gihgp5207aj8qhz0l"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix index 0d9fffd1bb7..8e6965bfc4f 100644 --- a/pkgs/applications/misc/mediainfo-gui/default.nix +++ b/pkgs/applications/misc/mediainfo-gui/default.nix @@ -2,11 +2,11 @@ , desktop-file-utils, libSM, imagemagick }: stdenv.mkDerivation rec { - version = "19.04"; + version = "19.07"; name = "mediainfo-gui-${version}"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "11wag23gx7nprrm1qlgvbc83rs9zxdsshqrp98zwia80xh8c9bk5"; + sha256 = "0b2ypdlpj5v64ggqk628mgqraba27z725sa0zf0fa4agxhf9ka44"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/applications/misc/netsurf/browser/default.nix b/pkgs/applications/misc/netsurf/browser/default.nix index 1b800f65434..0bb86fdca95 100644 --- a/pkgs/applications/misc/netsurf/browser/default.nix +++ b/pkgs/applications/misc/netsurf/browser/default.nix @@ -1,71 +1,85 @@ -{ stdenv, fetchurl, pkgconfig, libpng, openssl, curl, gtk2, check, SDL -, libxml2, libidn, perl, nettools, perlPackages -, libXcursor, libXrandr, makeWrapper +{ stdenv, fetchurl, fetchpatch, makeWrapper, wrapGAppsHook + +# Buildtime dependencies. + +, check, pkgconfig, xxd + +# Runtime dependencies. + +, curl, expat, libXcursor, libXrandr, libidn, libjpeg, libpng, libwebp, libxml2 +, openssl, perl, perlPackages + +# uilib-specific dependencies + +, gtk2 # GTK 2 +, SDL # Framebuffer + +# Configuration + , uilib ? "framebuffer" -, buildsystem -, nsgenbind -, libnsfb -, libwapcaplet -, libparserutils -, libcss -, libhubbub -, libdom -, libnsbmp -, libnsgif -, libnsutils -, libutf8proc + +# Netsurf-specific dependencies + +, libcss, libdom, libhubbub, libnsbmp, libnsfb, libnsgif +, libnslog, libnspsl, libnsutils, libparserutils, libsvgtiny, libutf8proc +, libwapcaplet, nsgenbind }: +let + inherit (stdenv.lib) optional optionals; +in stdenv.mkDerivation rec { name = "netsurf-${version}"; - version = "3.5"; - - # UI libs incldue Framebuffer, and gtk + version = "3.9"; src = fetchurl { url = "http://download.netsurf-browser.org/netsurf/releases/source/netsurf-${version}-src.tar.gz"; - sha256 = "1k0x8mzgavfy7q9kywl6kzsc084g1xlymcnsxi5v6jp279nsdwwq"; + sha256 = "1hzcm2s2wh5sapgr000lg63hcdbj6hyajxl43xa1x80kc5piqbyp"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libpng openssl curl gtk2 check libxml2 libidn perl - nettools perlPackages.HTMLParser libXcursor libXrandr makeWrapper SDL - buildsystem - nsgenbind - libnsfb - libwapcaplet - libparserutils - libcss - libhubbub - libdom - libnsbmp - libnsgif - libnsutils + patches = [ + # GTK: prefer using curl's intrinsic defaults for CURLOPT_CA* + (fetchpatch { + name = "0001-GTK-prefer-using-curl-s-intrinsic-defaults-for-CURLO.patch"; + url = "http://source.netsurf-browser.org/netsurf.git/patch/?id=87177d8aa109206d131e0d80a2080ce55dab01c7"; + sha256 = "08bc60pc5k5qpckqv21zgmgszj3rpwskfc84shs8vg92vkimv2ai"; + }) + ]; + + nativeBuildInputs = [ + makeWrapper + perl + perlPackages.HTMLParser + pkgconfig + xxd + ] + ++ optional (uilib == "gtk") wrapGAppsHook + ; + + buildInputs = [ + check curl libXcursor libXrandr libidn libjpeg libpng libwebp libxml2 openssl + # Netsurf-specific libraries + nsgenbind libnsfb libwapcaplet libparserutils libnslog libcss + libhubbub libdom libnsbmp libnsgif libsvgtiny libnsutils libnspsl libutf8proc - ]; + ] + ++ optionals (uilib == "framebuffer") [ expat SDL ] + ++ optional (uilib == "gtk") gtk2 + ; preConfigure = '' cat <<EOF > Makefile.conf - override NETSURF_GTK_RESOURCES := $out/share/Netsurf/${uilib}/res + override NETSURF_GTK_RES_PATH := $out/share/ override NETSURF_USE_GRESOURCE := YES EOF ''; makeFlags = [ - "PREFIX=$(out)" - "NSSHARED=${buildsystem}/share/netsurf-buildsystem" + "PREFIX=${placeholder "out"}" "TARGET=${uilib}" ]; - installPhase = '' - mkdir -p $out/bin $out/share/Netsurf/${uilib} - cmd=$(case "${uilib}" in framebuffer) echo nsfb;; gtk) echo nsgtk;; esac) - cp $cmd $out/bin/netsurf - wrapProgram $out/bin/netsurf --set NETSURFRES $out/share/Netsurf/${uilib}/res - tar -hcf - ${uilib}/res | (cd $out/share/Netsurf/ && tar -xvpf -) - ''; - meta = with stdenv.lib; { homepage = http://www.netsurf-browser.org/; description = "Free opensource web browser"; diff --git a/pkgs/applications/misc/netsurf/libcss/default.nix b/pkgs/applications/misc/netsurf/libcss/default.nix index e97452249bc..55538925abd 100644 --- a/pkgs/applications/misc/netsurf/libcss/default.nix +++ b/pkgs/applications/misc/netsurf/libcss/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { name = "netsurf-${libname}-${version}"; libname = "libcss"; - version = "0.6.0"; + version = "0.9.0"; src = fetchurl { url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; - sha256 = "0qp4p1q1dwgdra4pkrzd081zjzisxkgwx650ijx323j8bj725daf"; + sha256 = "1vw9j3d2mr4wbvs8fyqmgslkbxknvac10456775hflxxcivbm3xr"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/misc/netsurf/libdom/default.nix b/pkgs/applications/misc/netsurf/libdom/default.nix index 50a6dadadb5..de92219e7f9 100644 --- a/pkgs/applications/misc/netsurf/libdom/default.nix +++ b/pkgs/applications/misc/netsurf/libdom/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { name = "netsurf-${libname}-${version}"; libname = "libdom"; - version = "0.3.0"; + version = "0.4.0"; src = fetchurl { url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; - sha256 = "1kk6qbqagx5ypiy9kf0059iqdzyz8fqaw336vzhb5gnrzjw3wv4a"; + sha256 = "1ixkqsl3f7dl1kajksm0c231w1v5xy8z6hm3v67hgm9nh4qcvfcy"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/misc/netsurf/libhubbub/default.nix b/pkgs/applications/misc/netsurf/libhubbub/default.nix index 71519687151..03ee66fc598 100644 --- a/pkgs/applications/misc/netsurf/libhubbub/default.nix +++ b/pkgs/applications/misc/netsurf/libhubbub/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "netsurf-${libname}-${version}"; libname = "libhubbub"; - version = "0.3.3"; + version = "0.3.6"; src = fetchurl { url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; - sha256 = "101781iw32p47386fxqr01nrkywi12w17ajh02k2vlga4z8zyv86"; + sha256 = "1x3v7xvagx85v9h3pypzc86rcxs4mij87mmcqkp8pq50q6awfmnp"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/misc/netsurf/libnsbmp/default.nix b/pkgs/applications/misc/netsurf/libnsbmp/default.nix index 7e99f8f5b86..b0fb18c89b1 100644 --- a/pkgs/applications/misc/netsurf/libnsbmp/default.nix +++ b/pkgs/applications/misc/netsurf/libnsbmp/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "netsurf-${libname}-${version}"; libname = "libnsbmp"; - version = "0.1.3"; + version = "0.1.5"; src = fetchurl { url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; - sha256 = "0gmvzw1whh7553d6s98vr4ri2whjwrgggcq1z5b160gwjw20mzyy"; + sha256 = "0lib2m07d1i0k80m4blkwnj0g7rha4jbm5vrgd0wwbkyfa0hvk35"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/misc/netsurf/libnsfb/default.nix b/pkgs/applications/misc/netsurf/libnsfb/default.nix index 24235f43a11..29b0a7867db 100644 --- a/pkgs/applications/misc/netsurf/libnsfb/default.nix +++ b/pkgs/applications/misc/netsurf/libnsfb/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "netsurf-${libname}-${version}"; libname = "libnsfb"; - version = "0.1.4"; + version = "0.2.1"; src = fetchurl { url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; - sha256 = "176f8why9gzbaca9nnxjqasl02qzc6g507z5w3dzkcjifnkz4mzl"; + sha256 = "09qag9lgn5ahanbcyf2rvfmsz15vazfwnl8xpn8f1iczd44b0bv0"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/misc/netsurf/libnsgif/default.nix b/pkgs/applications/misc/netsurf/libnsgif/default.nix index 836bfd5f3e0..4de882243fe 100644 --- a/pkgs/applications/misc/netsurf/libnsgif/default.nix +++ b/pkgs/applications/misc/netsurf/libnsgif/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "netsurf-${libname}-${version}"; libname = "libnsgif"; - version = "0.1.3"; + version = "0.2.1"; src = fetchurl { url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; - sha256 = "1a4z45gh0fw4iybf34fig725av25h31ffk0azi0snzh4130cklnk"; + sha256 = "0jwshypgmx16xlsbx3d8njk8a5khazlplca5mxd3rdbhrlsabbly"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/misc/netsurf/libnslog/default.nix b/pkgs/applications/misc/netsurf/libnslog/default.nix new file mode 100644 index 00000000000..497630c9aa6 --- /dev/null +++ b/pkgs/applications/misc/netsurf/libnslog/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, pkgconfig, bison, flex +, buildsystem +}: + +stdenv.mkDerivation rec { + + name = "netsurf-${libname}-${version}"; + libname = "libnslog"; + version = "0.1.2"; + + src = fetchurl { + url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; + sha256 = "1ggs6xvxp8fbg5w8pifalipm458ygr9ab6j2yvj8fnnmxwvdh4jd"; + }; + + nativeBuildInputs = [ pkgconfig bison flex ]; + buildInputs = [ + buildsystem + ]; + + makeFlags = [ + "PREFIX=$(out)" + "NSSHARED=${buildsystem}/share/netsurf-buildsystem" + ]; + + meta = with stdenv.lib; { + homepage = http://www.netsurf-browser.org/; + description = "NetSurf Parametric Logging Library"; + license = licenses.mit; + maintainers = [ maintainers.samueldr ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/netsurf/libnspsl/default.nix b/pkgs/applications/misc/netsurf/libnspsl/default.nix new file mode 100644 index 00000000000..f0abbdc049a --- /dev/null +++ b/pkgs/applications/misc/netsurf/libnspsl/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, pkgconfig +, buildsystem +}: + +stdenv.mkDerivation rec { + + name = "netsurf-${libname}-${version}"; + libname = "libnspsl"; + version = "0.1.5"; + + src = fetchurl { + url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; + sha256 = "0siq8zjfxv75i9fw6q5hkaijpdm1w3zskd5qk6vsvz8cqan4vifd"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ + buildsystem + ]; + + makeFlags = [ + "PREFIX=$(out)" + "NSSHARED=${buildsystem}/share/netsurf-buildsystem" + ]; + + meta = with stdenv.lib; { + homepage = http://www.netsurf-browser.org/; + description = "NetSurf Public Suffix List - Handling library"; + license = licenses.mit; + maintainers = [ maintainers.samueldr ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/netsurf/libnsutils/default.nix b/pkgs/applications/misc/netsurf/libnsutils/default.nix index 1e8dbe27137..3eaa882cb73 100644 --- a/pkgs/applications/misc/netsurf/libnsutils/default.nix +++ b/pkgs/applications/misc/netsurf/libnsutils/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "netsurf-${libname}-${version}"; libname = "libnsutils"; - version = "0.0.2"; + version = "0.0.5"; src = fetchurl { url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; - sha256 = "03p4xmd08yhj70nyj7acjccmmshs59lv4n4zsqpsn5lgkwa23lzy"; + sha256 = "09w1rixps1iiq6wirjwxmd6h87llvjzvw565rahjb3rlyhcplfqf"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/misc/netsurf/libparserutils/default.nix b/pkgs/applications/misc/netsurf/libparserutils/default.nix index ed9433b9f57..ea9d7c9ea85 100644 --- a/pkgs/applications/misc/netsurf/libparserutils/default.nix +++ b/pkgs/applications/misc/netsurf/libparserutils/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "netsurf-${libname}-${version}"; libname = "libparserutils"; - version = "0.2.3"; + version = "0.2.4"; src = fetchurl { url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; - sha256 = "01gzlsabgl6x0icd8758d9jqs8rrf9574bdkjainn04w3fs3znf5"; + sha256 = "1n2794y2l0c8nv8z2pxwfnbn882987ifmxjv60zdxkhcndhswarj"; }; buildInputs = [ buildsystem perl ]; diff --git a/pkgs/applications/misc/netsurf/libsvgtiny/default.nix b/pkgs/applications/misc/netsurf/libsvgtiny/default.nix new file mode 100644 index 00000000000..9a4f922c2b6 --- /dev/null +++ b/pkgs/applications/misc/netsurf/libsvgtiny/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, pkgconfig, gperf +, buildsystem +, libdom +, libhubbub +, libparserutils +, libwapcaplet +}: + +stdenv.mkDerivation rec { + + name = "netsurf-${libname}-${version}"; + libname = "libsvgtiny"; + version = "0.1.7"; + + src = fetchurl { + url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; + sha256 = "10bpkmvfpydj74im3r6kqm9vnvgib6afy0alx71q5n0w5yawy39c"; + }; + + nativeBuildInputs = [ pkgconfig gperf ]; + buildInputs = [ + buildsystem + libdom + libhubbub + libparserutils + libwapcaplet + ]; + + makeFlags = [ + "PREFIX=$(out)" + "NSSHARED=${buildsystem}/share/netsurf-buildsystem" + ]; + + meta = with stdenv.lib; { + homepage = http://www.netsurf-browser.org/; + description = "NetSurf SVG decoder"; + license = licenses.mit; + maintainers = [ maintainers.samueldr ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/netsurf/libutf8proc/default.nix b/pkgs/applications/misc/netsurf/libutf8proc/default.nix index a905f3a12a8..2144ccd3303 100644 --- a/pkgs/applications/misc/netsurf/libutf8proc/default.nix +++ b/pkgs/applications/misc/netsurf/libutf8proc/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "netsurf-${libname}-${version}"; libname = "libutf8proc"; - version = "1.3.1"; + version = "2.4.0-1"; src = fetchurl { url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; - sha256 = "0xf659y3c6ikjnip47r30wv796a34d71p6qhc4xjs64iqszm1sbq"; + sha256 = "0wn409laqaqlqnz2d77419b5rya99vvc696vj187biy1i5livaq1"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/misc/netsurf/libwapcaplet/default.nix b/pkgs/applications/misc/netsurf/libwapcaplet/default.nix index 509cbeb4503..a234af740f3 100644 --- a/pkgs/applications/misc/netsurf/libwapcaplet/default.nix +++ b/pkgs/applications/misc/netsurf/libwapcaplet/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "netsurf-${libname}-${version}"; libname = "libwapcaplet"; - version = "0.3.0"; + version = "0.4.2"; src = fetchurl { url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; - sha256 = "0cs1dd2afjgc3wf5gqg434hv6jdabrp9qvlpl4dp53nhkyfywna3"; + sha256 = "1fjwzbn7j8bi1b9bvwxsy3i2cr6byq2s2d29866801pjnf528g86"; }; buildInputs = [ buildsystem ]; diff --git a/pkgs/applications/misc/netsurf/nsgenbind/default.nix b/pkgs/applications/misc/netsurf/nsgenbind/default.nix index 971e16848ae..f343a886283 100644 --- a/pkgs/applications/misc/netsurf/nsgenbind/default.nix +++ b/pkgs/applications/misc/netsurf/nsgenbind/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "netsurf-nsgenbind-${version}"; - version = "0.3"; + version = "0.7"; src = fetchurl { url = "http://download.netsurf-browser.org/libs/releases/nsgenbind-${version}-src.tar.gz"; - sha256 = "16xsazly7gxwywmlkf2xix9b924sj3skhgdak7218l0nc62a08gg"; + sha256 = "0rplmky4afsjwiwh7grkmcdmzg86zksa55j93dvq92f91yljwqqq"; }; buildInputs = [ buildsystem flex bison ]; diff --git a/pkgs/applications/misc/xteddy/default.nix b/pkgs/applications/misc/xteddy/default.nix index 6f67ed96c57..6bc492833cc 100644 --- a/pkgs/applications/misc/xteddy/default.nix +++ b/pkgs/applications/misc/xteddy/default.nix @@ -1,19 +1,22 @@ -{ stdenv, fetchzip, pkg-config, xorg, imlib2, makeWrapper }: +{ stdenv, fetchFromGitLab, pkg-config, xorg, imlib2, makeWrapper }: stdenv.mkDerivation rec { name = "xteddy-${version}"; - version = "2.2"; - src = fetchzip { - url = "https://deb.debian.org/debian/pool/main/x/xteddy/xteddy_${version}.orig.tar.gz"; - sha256 = "0sap4fqvs0888ymf5ga10p3n7n5kr35j38kfsfd7nj0xm4hmcma3"; + version = "2.2-5"; + src = fetchFromGitLab { + domain = "salsa.debian.org"; + owner = "games-team"; + repo = "xteddy"; + rev = "debian%2F${version}"; # %2F = urlquote("/"); + sha256 = "0rm7w78d6qajq4fvi4agyqm0c70f3c1i0cy2jdb6kqql2k8w78qy"; }; + nativeBuildInputs = [ pkg-config makeWrapper ]; buildInputs = [ imlib2 xorg.libX11 xorg.libXext ]; - makeFlags = [ "LIBS=-lXext" ]; + patches = [ "${src}/debian/patches/10_libXext.patch" "${src}/debian/patches/wrong-man-page-section.patch" ]; postPatch = '' - sed -i 's/man 1 xteddy/man 6 xteddy/' xteddy.c sed -i "s:/usr/games/xteddy:$out/bin/xteddy:" xtoys sed -i "s:/usr/share/xteddy:$out/share/xteddy:" xtoys ''; @@ -32,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Cuddly teddy bear for your X desktop"; - homepage = https://weber.itn.liu.se/~stegu/xteddy/; + homepage = "https://weber.itn.liu.se/~stegu/xteddy/"; license = licenses.gpl2; maintainers = [ maintainers.xaverdh ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/yubioath-desktop/default.nix b/pkgs/applications/misc/yubioath-desktop/default.nix index 3d4718990cb..843bc0c1c23 100644 --- a/pkgs/applications/misc/yubioath-desktop/default.nix +++ b/pkgs/applications/misc/yubioath-desktop/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl +{ stdenv, fetchurl, mkDerivation , qmake, qtbase, qtquickcontrols , python3, pyotherside , pcsclite, yubikey-personalization , yubikey-manager, makeWrapper }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "yubioath-desktop"; version = "4.3.6"; diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 78a6a52e20f..133c37d0606 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,935 +1,935 @@ { - version = "68.0b12"; + version = "69.0b10"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/ach/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/ach/firefox-69.0b10.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "63b9f627e652b3cd48c33eed8fa04e4c154b0e2dc2f6dd58d43b37a5a4043d2b120b45f24c1e794672bbd4e981d0865fb950c336b6a4201973e4c8b3b4bf1d1c"; + sha512 = "1a7b57f59dc6503e2c457955d48609fd06e6b86b23a508ae15304e19fdf1b347f209a58075c24041ddfb4c80a5aaf9e66d5e721cf57815d16f43741b5184dca1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/af/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/af/firefox-69.0b10.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "58e69cf58c679b8d7ccd2a06aa61b71f6cd4cdc052e506bed2155519a13127049457a1e47789077ff1bd87dbb81583a60678e230e5c6f1ea7b4386a20e6f26f0"; + sha512 = "5f037bb80ebeb5da5eecc94bdeab4e1809e09d6aa93bded34dd87d929e72237e69cee896ef02b51d5dc2a272a4fe40739fcf683ccc9806dd8039f5ee403534cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/an/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/an/firefox-69.0b10.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "51785eb45aed769e65a786661dc89e2044475070da31910e66a567b4f747df8ce694d4a5fc28c9cada0e4a1ab43e553d9ffd9ebf2249bd4ebc523e35312bf944"; + sha512 = "f48b2f24cbac76fee0a6b6eb1f77f13234acc283f3213c7c5d776410c4c23a17207ff7b857d609d25eb80a3f1c3c6dd4742d5c7a3216ae0a6193831ff428dd3c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/ar/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/ar/firefox-69.0b10.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "79d5044947911e22d2e4a4c563b34a38a8e6972637026cdab4fba359566d1a78163298dbfca544c388918b2d3581fdffa89a9a61449d5d20f1c7e7989aa987c0"; + sha512 = "be8961705ad1f8c90c5a5550b7fe6d3427d53cdad5e3c4f629f5f6267cdf6085a35d03ed49851e54413a7b00230ab66d7348b751fdab2d1ca52e9e9a156c4b1f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/ast/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/ast/firefox-69.0b10.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "ae7cdc0d5dcd7297c9e78f55e36207621b148b8040d074672a64252e681bfcdcff1c17af021a31f3c9d89ae38326cc508f350c6840d77b1480b25e05f1c6b2d2"; + sha512 = "d323bda4f61c784179484cc85171ec802c4fb3a559cc177937f0862ace8359d91d0b205ab289b724a0545f82dd36a8e7e1312053747b8ff64ac920effdf2eedb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/az/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/az/firefox-69.0b10.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "c8252fc3fb04008f0cffa43db9983fd741b8bfa04e0fd03d8a293f9cf2eb7a8a7b7b3a6ed14b0fc433aabdb6f106df8c309d83b1a1e60a6539d7fdbc236be092"; + sha512 = "afe1a5359ef53315d8c27db657ac578613d392d3d946e02456e03fcbbea756f014ec500639d6560b4bd8d096e23699650118657d0b08d8858b89cab9a102ace8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/be/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/be/firefox-69.0b10.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "75784cc6833bb7c988d8b288a8fb64fda53e642fe2c2bce5a525b6aa3a823d409f996d221b90f4445a1ce4d5fbaf0fcdbf6121a2f0e7a0d8106686c9780b192f"; + sha512 = "4ad1e8dc3f5f28ec0ab9f652a1d49dc0d0103b1e3c2462a9cb8754c444fa31bda76ea24b3608efcdddcab8ad2a1248214462c60c5348cf918c133152e7c33177"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/bg/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/bg/firefox-69.0b10.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "38aa22c8739e72594757db7130f34e577b260bc2a61987761348dc356b9d951fba997f5f78084bdef9d8742faf4491e94993fa4e0777913a3c58b28fd3be791b"; + sha512 = "d510f03564876531f7406b210b60a4076c9c48d403f6a80901bae6495beff9d2bdcce953ad02245b20389c38d9b0843e76356cb52cf081ddd46738e703335b2e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/bn/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/bn/firefox-69.0b10.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha512 = "d6074ab4cd4346774f143406facd7dbee1b3e4d45092a9d61085c6639c9ebc47599b2e8df7dfc79a2a15335a7746f5dce08fac9ebdf082df12f407aff5dc705c"; + sha512 = "23c1674ba24c7d6abd7159ec422fbe718bc706424ff243623dc9852ad3867281e54aa1b6129cf9a5d5de56d267558cd6abaf6821ffd51265bbb7202914ab950f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/br/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/br/firefox-69.0b10.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "47377442b5c53424feb7c329f634a1e7da72ef92f152beed1306a602812184f48f9d0d47d22d7f0508a23e27b997685528b80297866668bf04323361f926b255"; + sha512 = "bc3589a09d40bf7e2e538a408a1fbe0c3fcb373b0b0002e5ca039b60d655492283830530b251d5acbf1152dd64f95097aa99f37965819fb19386014fcdef9cf1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/bs/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/bs/firefox-69.0b10.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "ab2237624d724a130da9daecdbcbc6f34feb76320000809d227929d35456450e15d45088b809b043c0387843e988b1a3ac155b44a2134c8ff57d8f79c81746d2"; + sha512 = "a9c60dd3ec3d00a171eb66506d514560b3c09b5a2650b17207bc841dd5b365d0f545dba75b37c0e84e18321cc92932ac25ff9859a76a4be2f8174fcc594b8211"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/ca/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/ca/firefox-69.0b10.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "559f469319186e63da2da98864f4070414bccefa619a8ff5b8d149e3bb44013fc8a9e29abcf66931ae1cef3b76d0cc1f626f5fe84aa00e7905330609746f1ef6"; + sha512 = "98cc03135c40f3c827b7bf583925cdc11d4595fc4fe8868f52616efb2ae72b26145964a97c01e199a65cb643642c558802dea6f4c1c45a1daf2f201a82467eda"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/cak/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/cak/firefox-69.0b10.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "10ee270b0f201ff6127e1dfaf2e80a4f665ffea5206944d658379582be0169242a2062705cd5588764ed479775efb2f7a476a9618ad8517c90cf36350c587a35"; + sha512 = "74ea91936aa49ac7edc9d91917de7ca9ff15226d95375d02c6d687ee3effab8dc3c47c38378953cd55486e2c0d4fb2a00431178ea45309d1a20301310c42c89d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/cs/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/cs/firefox-69.0b10.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "bb44e9cee3a211a858b87e307494376edf3edfd7c691c5e643b1cf575aca2f6e95987fbecc11355ebeee724c5607f6f938360b3e1ff2157433de22ff3cc18c68"; + sha512 = "be3c5fb9f0fa30a8fa9fff4df91f622dc222546aa8aaaa8e64f13dabc86a9475c1e2ccca1426457d287cac2c3159f048b5246cf7a9372bbb46c67d529e126bbe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/cy/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/cy/firefox-69.0b10.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "15be2de82abd5e631c609e034fc267743835a7b35c1afa0ee56c082d3abd3aa293254021141d435004afe7b0dfb48af03247683736de091364476f63635e01da"; + sha512 = "b60163ce4fdc726507b2899bee66dbe03a3b700c4a59c42d7cc3c131648588ec1b29664cf716b176fac73b9749f630505ecf65248110779b2cb55a2ef05bd9dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/da/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/da/firefox-69.0b10.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "78ec7abc743c26f48ea5a5232feed7026f9b57992214c007d2486cf19e996a5c074bf972951beca030e534fa1c967af94ba5767d8002bce1089a007926ede8b2"; + sha512 = "8cd36e2c99f8e15e27cc5263d9f7c329b3421184ac017d34e286492190e0d74cd521849376d72bfe5d718c81ad4ebc0bfdf7d892a810639e212530184c9f457a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/de/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/de/firefox-69.0b10.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "be1e4a3466b3d2d442547895623bd055055da4911345567c569f54f098a31b12cdb25a36994796435e1effd7cac2c0f064614c89649faff9b4b7d6223fdd4439"; + sha512 = "b7b8fdf8caf159bd2a10c2a827b2d89cafd97cd29554f7b837dec9f3b10b393010b3fde927c2a54be02b232b2d105d71753c94b15be7de29cc226ab03c860a05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/dsb/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/dsb/firefox-69.0b10.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "184815dddf4d41ec5d00db47e43004bb8af8cddc694412a81af405da38808e75f7ba1d73f74ebe68409d3e939858ef390eca6829e58bf0739ac9f2552f07171c"; + sha512 = "9932ee55b2d0ca583b9120260592569fffbecdf10745b3d320ff1c68f3866dd1f89643cf6c8df3ec585fd34530bf2a0d49f4a5f835d7a65b10ecb7da7af7067d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/el/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/el/firefox-69.0b10.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "5ea63e62510babdebf33296a4ed91fea53758c67f5942db663964f04af6f9f96e091d9a423c9558eedf553b4dd69db55e453c1ac99631eae8813581874f9f584"; + sha512 = "6a0afb7e5ab4323957acaa6b53062d0a85cdebca058270a2486310e50157b8028b2c77a4d366a503f44034a5879aa135bfbe1f95a4a3c6ddc9498ca1fbc558ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/en-CA/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/en-CA/firefox-69.0b10.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "af35af203abe32360fb99ff7a913554ef0520c2524f93b5c194cfe080cf2f65247aacf0231cc1b90867737c29b8b385983d0ae0de902bc9f9cf4f0bd67de2b14"; + sha512 = "431c6f3d28a2331628ef0a762736bbc4d1bc4e68a73de39e4e3798618201c579f0bcf9fd61ac26fada5c7ca0b112e9f9d3cae96ad981ab677e88805f8b5d2bcf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/en-GB/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/en-GB/firefox-69.0b10.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "145c2b405c4eeaa932720e706246561dd83038a8a21918f2ce1b0012efcac7d0d7d9c3257c2a8b3020197e4a6bb8fa93609a0a04bbc698dac38cff6de13b1b6e"; + sha512 = "f3c852da6abad331eb3f0e168736aeaef9172a258f949d150f729bb295e76674bd74715671950e338542fb9ab08331d5d53883db449438814a1378e2c0c7cb5d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/en-US/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/en-US/firefox-69.0b10.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "0a2c58bd51c6ef8ab4826130067ed07ba87f81c621d0b5dc3166a366d054e2e71b982fd65e74d83bfb63152d4087e46e07177265c6b44f538953cd961deed5f0"; + sha512 = "64d49769e3e908510b4539f39765ff3eb7b108b24e7f431be837116a6b83ef13a02bc3f5f40232a87c9ba25305d75f30f2ad830a9a37cdb30e5cb58bac567fc5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/eo/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/eo/firefox-69.0b10.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "e26839f4b78cb079016a39f3873380123be4d7ca804c8b15ed59190157a806395513317adafc978dd45bb7571350685774e7eefdce720a14b81b38df5d9ff06f"; + sha512 = "2e078e519874deca4790e1f97c56d8d7f51988e321a676ee347fc30fa51b6ea25d14dc7f5f79d8a0dfd4c76fb4540599fbc0fd7ba16460907e8a1ec661b6eecd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/es-AR/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/es-AR/firefox-69.0b10.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "fc6b5902ee337bb05a3f1c3e4ba9f37e90a8efe650003164d662a3225ece90512a86abe5fddf9c80e2eb30bb1cdef022b03fda53175f9f6fd3ff626d502c5b82"; + sha512 = "7d3b797c0dd0c13867786dfe2779a264a9fa5b4626f9db97beba08c69f0d63de425b6dc6447554ca9a5fa36bbd942510c2565405469d1e4aa64737de7f024231"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/es-CL/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/es-CL/firefox-69.0b10.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "12c0ce281867ad4f6c5a190ae11174bcdbe81137a31deb0eeb6997a46826d6f53129394b314d3a0d6bae1d4119498257d34f6ffc5b30568d457b6a6ced186639"; + sha512 = "e8382333581d1a30db66941950b2ecb02d0b93a48d2da79a63c36b66f093da20e03943a51aae9ff6cbd65252a7cd0b4b6760b8b27ed536f1f5f058411b8ac4fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/es-ES/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/es-ES/firefox-69.0b10.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "1e30b6695d13c1d11dda43f4f87be9bb5d0115891ddaaab793ec842d4b38ae669cd71db065eaede2fef84235bb4ef6186d2cdd236d310a4b7f27e03a725e410c"; + sha512 = "312295d067a1aede3ee947c1423b8dac575610e24bb8f0b5c5bc981d009e669d8185978ae3f3b17fa9fe655f4b3a01bcd3aec2afb3adf8b916ac2abefde302cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/es-MX/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/es-MX/firefox-69.0b10.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "e60152629eefad15af7af7cbf788119732933911c9c3765a9722aa11617349a4341741b5116e7a4e76d5f5bf3c1f7bf786c3d4b10c2c33ae6cf19950f308a331"; + sha512 = "147deb688909ffc381ad43b2311d30815601d48030ba6e381ddfecd9a2ea9b299ccf1337adb12907664a30157a0dacd19311f311f3765d23ce5dfe85cd469d2a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/et/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/et/firefox-69.0b10.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "ab4fc13e9c851065fd04f25e4c1e2ee740e6505e903e8c15150eb60b3d7a80af678f7af1a2a508b651d4fbfbc7bd9f5626056df7142806561a00736237cc36ca"; + sha512 = "82847b67b0c1b758682aee0a404f27f04e935eeb77e62ad7636e8ae6671e4bbdbb369b38115c0d66567029929f00841eaa254cb180653f730f34446fd45df57d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/eu/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/eu/firefox-69.0b10.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "46eec787849aaf9cb125e881881a7e0c98f39ac6a5666bf56b54f78e07e1e13bae5308083717cc9ee4e85cbcb6dab60eabf5b3e722507432e0c122bede73c11d"; + sha512 = "79e6551219630ad521e67a7f5669ccdbe7346a5dd0ac6b1aab2654d13430d971b4e455b52900e82e0a9fcc7ab6f27f4433d90ddedb57f199cbf6bbc6217770b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/fa/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/fa/firefox-69.0b10.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "fd595bdb3dfe3bebf04d80499b25386094ab9c594815c93b678c41c551fc5198db60012a66a878d9bfb0f300c731607b7bcce94108a8b44d515b0238d7d30a59"; + sha512 = "67e80ad128ba1251fbafc483be98365e80b8ef888448e6e56fc06e901f93e2f10de9683bdb1e24b77717bfec0428be30769ff8676c7f52b8004159a77181b05c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/ff/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/ff/firefox-69.0b10.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "f3a4dc9dc9677064f65e7eca298eada76feee7399537860db48c853946d163b405a1db2c84e58c7be6b1e868ef9e3b09c5058ca7dc0e7c107db072bac2907d5a"; + sha512 = "3b888ba947259b334ae018d3cfd03168686abecf00b75fa1630491f3f190fd59a62af7e06bfec135410b1ee78cf82acc387bf9b13d5c7971b25d82a92733053d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/fi/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/fi/firefox-69.0b10.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "ce8ed3b5a3856903db73ef5ea0286126c119a76d44f5dfbe7f8b2261e99046fcaf4f06d07118dc1726d915a5e1ec909a4ca45ad75bdbc3f16b93258a6b987e52"; + sha512 = "70c13e5d110c1508b66cd48baf81652860196d9d350e36e51631fb6f4e979f8fb4df9f712f15b13c54b2c2651661eb2465599cfbc294a94e137dbe93ec15dbda"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/fr/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/fr/firefox-69.0b10.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "75ca1639d5d2be13c186ace6cd9064705827bc63fad48dfbdbe275d1c427ed00b6ce401cfd1c019b46d49453bfce1de51222747f8d7c9ecf373a7898be7993b5"; + sha512 = "3c0da7e5784b34cfee62e4b66e347132f02c22ba7fcef9b384643ddbe1121a2865169079e064e157193ba006c720ddec3d59e85df6c806226a5185142eca9c73"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/fy-NL/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/fy-NL/firefox-69.0b10.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "04fb6e2c7c0bf006f45b1d43c543fc43a81063de3dd923a2e72db5d8baf6375251313d00bf960e7e3767f60999884b018bec51a47b92415d6c90218327790da4"; + sha512 = "387aa2fa548820dd9e4a1b4ec374b500946dac4f93aa743b2166f08b78cdf8d34c86bdda25e7c4b17df0d94773b94c88a76472a27ca6d522adcdcfb4ef579874"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/ga-IE/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/ga-IE/firefox-69.0b10.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "746f3ac13e2d030db89cfee4629c6dcf467a735c124f026e24fd409794bb567730fc50fa4befdf9fa093456d86bd588c9657cd26875683f86d919ed0b3993d18"; + sha512 = "968455b9e61db7b669ff4a34fd085508930576d4e1009431c5207b1c76a66de776eed3cb6f0370d26d9b44d9c3e4e710537e57c86ce5b28d90c5f80a828a3594"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/gd/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/gd/firefox-69.0b10.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "f28e688e388e3a5c587bbc41e58f6af85ef41fe67fa847d6ee257005a783a6e2e19f422d8678b3c44e1e386d088a276ffde8da48feca5acd964a706c7eb94222"; + sha512 = "557937a63061312bf3371e2f257c9463667182a28e4f4488caa39ed57185344cffac6a937817cf058538e39ce4087f6734c2e00a2a1cedff253736480818dd5e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/gl/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/gl/firefox-69.0b10.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "444c4227c6ade4ff0452e751646a450a0db96f145ff6fdd68f7b58e6aac291ed1313e57003a6084df33d4718e407fa58d0043e6eba5f585da2ed98ea4f40ffab"; + sha512 = "ad568ee3c89d7e869bdbdf2a50e611ccbeb6c6446b2e314e474c43c6f0d470290bca3534e2cba917b1ed77b7c8480a756cc0c2a3d4907ef91809f21f6dbbfbfe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/gn/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/gn/firefox-69.0b10.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "dbd6a63dde30c979727048957f80d677d9cb3926f64d8783244e28efb167872dce4d6089e818e2b5a044969558395e6f74bb29657aff1424a07711c18f0a1aac"; + sha512 = "52440609480bb73b62d4ce0d35e68f459153ecd815233c70cb5a2f2f5555d56cee0bc548eb68f6e2d4f3979fc14c8a101ca9a9506a3ed592341a1f818962d325"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/gu-IN/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/gu-IN/firefox-69.0b10.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "f93f362a8711aeae41c833e32146969d3a931bc26066ab84d4f3f09384022d9ee23b791e6893ce530766443f365bdcb8c732d7ab9ce9c7200a66d6a90da96bf5"; + sha512 = "d6d445097510f45d9c320b19cd0db97e69f8e5de8f31a532e1b929d0bcb04c86dfe38b20bcc5ff320581d7febba06f1ef5e3ddc61641dca382b66f0f2d7fa942"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/he/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/he/firefox-69.0b10.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "96dc618290fc3a6b8d073e57474c2dc5c32e6708be676ed42eb73e0073186c82b110cf63984de43ba6bafebf808da15e4650c34df47d9647b62d8b9290de8dcf"; + sha512 = "ee81c7847efcb09ad9603194641798e200558b4dca7f19b93ccd918e4f63fe0400e9a91583444f1c017112dcf56d73506c29a94eb0694bdb58f226ef2973088a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/hi-IN/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/hi-IN/firefox-69.0b10.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "2154a8dd7de9584b03515a750a23fbcf415009907cd6c1e4d08003e0aa6b5683d47554a9ce1222631f12b63abba151480a2a491e686b8c89e5ba22f819ee7c48"; + sha512 = "8c7044bfc7dde901dbd2ba7e719da6d5385d260a6473a1e0f3f9af99f1ea3add4382bb2683264a1cfe60379e9fae4b68a41f30fa183d54c83502a173b55a1db5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/hr/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/hr/firefox-69.0b10.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "19315270b79ea8b96457977cbc4f71d2f16359de6e515664aaec9c002f4d537ca5d0d0187eadb6ee2d5112293ffd0e5a0bf156665401bbe569c2bc8d4d712ba3"; + sha512 = "b680b30f2fc0f4f82f8cdc3eb7849d4a29b667a8cda453395b28499581edb785cb1bfb3ec39efe032f150e5b502955579803459a2dbd2f32264d677ef190de34"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/hsb/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/hsb/firefox-69.0b10.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "74d86de9290a8f8260301c6a1f5d39b8e18742cc8f2b3f8d282e4093765e4938fce7181bbef81da127cc0fa4b75dfca8cc44de5cbd29e6f56807b049a24a1ef5"; + sha512 = "8c4ac8f04d933bb104b533b2a8a512e2f30bbb6219f4d5622ca873a42a4d365131083cf9ff7a0be879c098b2b434cacfaa76106f432e3b609e1bc92b3ad674a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/hu/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/hu/firefox-69.0b10.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "d5bf23cfa847068d09bd90d8b6fa1494154b65b1ea6323d7c3d275b46f973f8b4a98bab02d4e61706a3fb144009b4b5aed7259124fc36a037926d9372f409adc"; + sha512 = "7ad2b72826cf5d98afd1dd65fc30cf9e5525656271f3d1be3b40b2c0a1321694cc6ca36eafc0c51f77e1ca8a6408fdd6d3be528923789564d2ca8bdbab5a5cd5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/hy-AM/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/hy-AM/firefox-69.0b10.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "70fa78782d08bad09b937718055d2dc89e10ef0dcb8e6d0cf8af07705890818c11550cfd307c54792bd1749499bf1addfe4e89ce0ef35276d4ced93ef75b34e4"; + sha512 = "fb850f1bad3f626f3272e9ae6e3a60d51b63ba221f341752334b490169874a44f2be3c9b3783fd523b3f4c0484bfc26999a84cc59c893100f21ece93f01b4b8b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/ia/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/ia/firefox-69.0b10.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "abc7de0b055056395c57e8b7cfe086ba31a447165230b9012f6e14162237a6c49b7ff2fdbd0db373e3a5cc5e596dcc48b16bcce4932638eb6fe2c99b82ea0023"; + sha512 = "796915bb31c4c18f22348dd7fb1e7c33f44938b5658fb32cb5a86e1470c8f2492642a81b0d2f59721f604cd785e5b56dd45c001d070b2e144b191ee0d0d6b21b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/id/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/id/firefox-69.0b10.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "55bd13dd322a97af87b506551880017f112fc29a11a175ba6040ed4c1fe672f7ebcbfce0e4cc9b409373bcadfd1dd9327ce53c858a18f4420e5cf366c441874c"; + sha512 = "5613ac6fe486517bede9fbeedbe64300e7be8bc1dd2a65bac94defd7c800e97c1a4ee5a2375fd0358de3a466a8ca75288b1b6b6c676e3ae02634aa35731bd8e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/is/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/is/firefox-69.0b10.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "4f1029f4696fb66d1a407e6b74a9692e916e35dde605bba0aa61864bcf129d12c8f3b58a399e5118cdaa70b62f34b09325273308ff188c98dca7b8eda4851ac0"; + sha512 = "339bb54fde82ce43032d00b2245b114392a47a8eebc0be18a7a0d4cd1ec625412817303c48aad908d1bde88fd80e4a1a2245dbdf5ce9556c0a8b998025b1f58a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/it/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/it/firefox-69.0b10.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "3c1f74c2ab991a103783eb78c23c82d6ff0a3d30913ef5bfc3d6ede8772654e8b5f3cab6d5b4cfbd9dace2f8f2ddf1fb542ae57be03179737fddad72812d7d26"; + sha512 = "4fda975595c299241a10ca325a828af6d5be420bc76c021dab815bda759010982213a55591cafc69139dc6a796df96c0eb35d7d7503c68e78ba71926576c40d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/ja/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/ja/firefox-69.0b10.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "157f40be2e4a41cf91ed4f6b27fb03da9f5f333e79103773879e3f559cb0f10d9947129cc9d09bba93926260cd0b6021ceb780c269b9f4efe73c9da0af03bafb"; + sha512 = "d620ac66a39e20439f1a83ba7aab904d78ef85355418d65e8a61b441f7f5e02f349201141fbc4a36e5810a4e2ccbedb624aba0e8071456acb0745ccbca05989d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/ka/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/ka/firefox-69.0b10.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "ae819155531645b4bfd34fa3f2fcab86ae61cd4efce98dc05325c77cb4c9a9acdfb4c256ac36357575f9826090c92f02d30670dc02efb0e84fd2cd66a71a1cd6"; + sha512 = "9c2025a3e57112adc9417bf27f16d596e1639531dc1ec2ac685c91ca79f27f3361f1d9c5b5f6e864391c62068561985e257c1bd8e63a80443521c9344fced2a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/kab/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/kab/firefox-69.0b10.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "6447fe7826efcdb5e639d88c0ec13fc180f61d4cfc1877bb6f814a305b4480a6481b0403e0656a0c7c10f3595824a85d7755eff197e7b5798288fadd0eb205bd"; + sha512 = "5ee9889fa241c9a4f9cce25d8ad557ff8d4112dbc620767ea8b874683b1026fbf65d6fa335a01e11c317d59523f43e7a7dd8ef7af60173104a0eeaede4c5f8cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/kk/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/kk/firefox-69.0b10.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "f0d272fc030461e6de01c21c3b06d7a8105a81991d7c6347090c85e450a0fe1a44b209b9ffd90c4ade956ba37678398dc4e46640179306bfd2f6b8fcff64dbe8"; + sha512 = "410790bd0e13444a0780a1dc3042daafef1d8594164d4062483d1c03cc6ba4f682602a5fa28310b1d64c26ff511766943bdb0f2787b9eac0a64668ea38914971"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/km/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/km/firefox-69.0b10.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "b8b26fc961738ca0fce723ca41f6bec5d75d18722f7416b93eef2596cc2c01f7831da09b5de305b55c5faae3826382329a2fb0163e1bd79a3b73e00fcaa6c947"; + sha512 = "98936520579408e241575b802fb77247072cf832b0e6bb2bd0be75af246d211ddef7266cad5136e51e30395317985d4a4aa66647a20e3980cd2aee3e6a4a4de7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/kn/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/kn/firefox-69.0b10.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "7ba655e207aeba5cf8f734be11f6fd20fa7fc57d0dbfcdf588c70bec224fd23ac2a447c9238ed9559ab612f5f829359254bb88a80851dd4a6ff691ba4d5b39d1"; + sha512 = "1060fdb60461684c0bd8625ed4f5e53f967619682ef920cffca663c70c395a211bdc940931f08de07814b5796f4fb6ef0b340543e4a1bdc526f6f4cb5a250e9e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/ko/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/ko/firefox-69.0b10.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "1a9480d6f8c9781d401b5b3d98f43b60bf6f0d80121920fdee1ccc6b2339e9c7a96b6fc53214ace7a459e84991cf8d712fc558250158fe10ce7b6b57c40a6172"; + sha512 = "4a88b46b972a90a8ae6c00ec23d4d4c00b18a6f5560f0514d939a135bf2c3f9207fc2bf84a19fb496182acfb95da70037ecfef0ceeb2f7a2220b5803957763e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/lij/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/lij/firefox-69.0b10.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "b76d259acf9ce2ec775066f50e68d5821c50b475d870c3c69ef70b66fe2cd14de5f52f47eae6b9e419538c7292149ba301a6c7061cb14eb7b707e5bc8721a557"; + sha512 = "a219c8f97158fdfd1bf0dfcbf40540c5adbdb861c3e8df131e826fa5feb73f33900024a8812a3ee648c63a8c8d69641f927ebb437745730a962db85bfde229d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/lt/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/lt/firefox-69.0b10.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "509413d7a37363ba9a57ad6f6389f8c06120480d0d0cb14635b914c0a0026095d522c95f8c6c244b12c048137cbeae240f12c1b35843b00e2c725e37e3a59540"; + sha512 = "4faa38c7fe80b3176ba1cff0153577adfd13480917659f8b45c70a1ff5650e29935ed10cec88059be602fbff64583153642acc9dbb419a8d269115659db55a37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/lv/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/lv/firefox-69.0b10.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "ecb21ab93dca533a2de4b31d48523a6dc83a5901f3824b1cd480152457bfb908a5650f1f9a948713e0e5cfde566157e349f171b1fde5a201dec30877f42f9204"; + sha512 = "6334ac39f823a5a289dc60288eda76f2fe770d8eeb1c3e6b1265eb5c7b2f1affca0143b0311c8ff077f39e093b3ccfe743e4aded6384bd1e0d212067207df40c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/mk/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/mk/firefox-69.0b10.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "7853fef96ba965febc97c43b9030b50c9a0d3b2f3af31eea2f59ebde3792f6c18eaa207617706dea9c9c24d9d19e1898c357b02b41060ef6b0f79b0c5ef9e8f0"; + sha512 = "9b63449642f2e047b49e3a29528b4aa29565f72488c82f0086ee1d427d980fb64f913b3ddff1f1f799071b1fc542ee17e6822728bd0187b38fff28127229d63f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/mr/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/mr/firefox-69.0b10.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "9b769e0ed3884bb60e7a5d8347bb0cd6af654ffadd7b3f5fcb7f848c859886cb29e276d7e6ce28b56bffed2dc87a9d6722f03e2f0af9b51a657620e57b48dec9"; + sha512 = "be966949b09bf18819d34c774178b8eadade9b259082f9b6d6782fedadea6ef604382e8667ef49c479422f7c46df424d5e8d47beaae6b5139d2a4d372c2b59b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/ms/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/ms/firefox-69.0b10.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "f076289f7bc5fa8ba644111b306e076103659b8d779faf3dc3c281d9bc7c19498e47babc80795fd20ec8e1c772db984b165418f9e48490c692348de87f1383e8"; + sha512 = "71664b9bbbdc21da73698ed616bd6cd34fdccbad0212288d3eb6a332ebbe1578bced0ff4f4d587e4cadc076762235eacf568e0b5139a0b851b5d6bddb6a41807"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/my/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/my/firefox-69.0b10.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "d268b850e130543ee45230d3594411d617b5d81bdc85e92464f51772794caa751a95a319a506f3d5e7de2bbaea08fdc86959d167e5f7a29ce050d196b038a447"; + sha512 = "9fb7a365fbdba50f664a1cada9fc26995f7b5809ec65334ba87127108c1e5027ce46f8c793d5da7cb32daf1788e2a98fe7aff0fac1b2d2f3f47ecac041538b2d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/nb-NO/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/nb-NO/firefox-69.0b10.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "f2822fbef945733f249690c30fe06762788455f574696711fa1eaae1decee763ec4d793d0f51702b38c9d87e6697f90a3f81292bc824f2b0d12fdd3643530b60"; + sha512 = "17f96fa38949bd3be40b3a6bf6e5ebe323819940946350ec535182f0197edb89af45500f54c76e51ac2fae1a95412b9f2a41b92e38803cc4af1097123e6233ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/ne-NP/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/ne-NP/firefox-69.0b10.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "f58c8e74f86927afd5cd74b8e502c6fb9366bb2aa85349dade0a0b2ad538c0f2c11c68c305dc6d590bb2d9caa8ccc1b465493a8b1e1df914d437a0f124399330"; + sha512 = "e9cfc087a4c5ffcc223d873d26ec3203992e4ac8f418f5eea156f66bb92f14606da3cbc00cf7ec0524f549261153df9e40e402e73aded124b57c95feb6812740"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/nl/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/nl/firefox-69.0b10.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "1ddc6e85c68bdc42af08aca251160b720afe535505865adf2990386fd6cf6cc59e1f65ceb36cd3239b12da43897ceac325e69750ea1fb93adbc90e056714990e"; + sha512 = "19735c48e5da611d5f982bc7d295cf995d878b26ff35f55a7798ebd28689996c75fb8e5971c6db627e5cdd15423150dc146f8c03f4886fa50913cd8818a1bbd5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/nn-NO/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/nn-NO/firefox-69.0b10.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "125ad213464891daad95c54c2354d36c987c9de62b695acdf999cd3b4a3cebd692b780d28307b4381da05f9fba6556d76a5c16e9e0c4ff5c7847511995a17944"; + sha512 = "74a7eee4b310f9d893208f28ca0a03863f28daf95e1cb3197ff6805dc17ced77cd4e2b3d27bdbcf20982e71a6e60f36d9f0147c650623b7f79467f9a060f08e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/oc/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/oc/firefox-69.0b10.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "9b6d7a9c9e557d9a836aee780ae5c0ef7e81540c6064c183243e55928b32a4f937270ae4b2c21f33e625aba6662a5d0f614167aed728941025115b5a5947834a"; + sha512 = "ec7f830c37cf2e67d978038898df581bbb7fbedc3b98117bf4497104713c382261cac7921eb45898e23343deec775587a6f1f69aaddd788ac15cea293593a84c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/pa-IN/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/pa-IN/firefox-69.0b10.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "5adbe11d8313d055e58cdc9fc51750b31f8e284403f823e11b72ad9069986647305001a9fd7db737f3943819878b5b9bb70e8c4cde61834ff8bb33e4771399a7"; + sha512 = "e5d72332e01f54c9576bd1aad7f54733c43061bd8e1813b8094cfab87d18f2144817270c572780f66b0fb0ae6a4bb7071221735317ede3b6eefe1f6204865766"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/pl/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/pl/firefox-69.0b10.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "c67e75c02e92dcee4e5c2dc71b087ffc3424d18951516a347a4b00c68542a7bb05a81b03dde60f3b4edf6c0add653c72edcbef8db6165811182e9be3ac7cc8d8"; + sha512 = "93cbf86c41086b81851e58a7b6a66f181a6baae871954664c088e3fcac956e4854b5590d1c5226b2cc286f12db85c21428ebc7a1c20c769dadb992936746f1aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/pt-BR/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/pt-BR/firefox-69.0b10.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "683165b6c93ec9e0f109b1ba4d24c907cfbc3787136d99307d15abe0e1eed8b6e444ad0b70a352a4aa7c9bcc0d4a09efab48133a9a07797d6e5b2f98e0ee1650"; + sha512 = "ea2f727cdbe67174939f736c6b23a9d88c902655f13445c74866a71f7a8f22e9037436e1589a52d258bc6d5f1338853de846542a6bab3dcf81d5e092e206e2d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/pt-PT/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/pt-PT/firefox-69.0b10.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "ce7367061456c3009e7dd6b4d0a3cf6a1324c3daeb7406020734f63adc169214b9deb26dc37936725d4ca3ed1208d4d81fc5dfdd73d7753b9d64bc8740f76acb"; + sha512 = "6d6b8fdf32ea8ade420fd64f4c882d554433dd9743bcecd11986a70ca5d12f9150ae4feae6897a412bcad192098ccb44412fbca1329ded3b77e15ba06076434b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/rm/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/rm/firefox-69.0b10.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "801801eae3a2c51e753dbe1c436d0fd5832c1fc9f0687c04c2a5452f1dbe06435c9619c13f87d6fff2cffd5997469b4fabd8e2d9c917853ac34e3695c1ec223e"; + sha512 = "dfe161375554d9886b50220b4d33625c3779d542fa20e713d7dad8c1221c1bb9c4300a4d139ab57335fc021f237e3316404637d2a837095e247aaaf6650d20f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/ro/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/ro/firefox-69.0b10.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "be62b477b0b72b6febb26194604e7be748dd1ed879e3e44e02d430f4feb40b5e50dfa8a5affaa1836fc1ba20cb1aad5fe5482cc870eab83570809ac90994c087"; + sha512 = "c3f6766f3f22acdae48cd340112b0248a21a580c68a473a311f6923340417487e16fb82c99648909e627be4cda63a779905f5a17b43379eeafb795b6c1dbf5f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/ru/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/ru/firefox-69.0b10.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "5943d3f90b1830607619a15cd61493969fe79b7e370934f20de1e63da3cce04fb733fdb9efc8568cdd8ab5fbfe23d67f86be2cb5fe4a9d738688e096ded10f53"; + sha512 = "49590d809c2883ce0eb7c5db156defb950c5bb6cc1106e4240c18cd4f17ea550952ac36d2ff8875cad4fb24cdded1e6d51881d5b9d6e360e44f780d884125e92"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/si/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/si/firefox-69.0b10.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "d230ff8a7e74efb71424c8c8df2ce1895e44643da96e67f042f1f59a06aa4b3abb8e8c6fa29033196ff6e5cf5ab8792de5d9ec51ae59906c019a6df028ffd436"; + sha512 = "66541feefd335e4b9f79e9165ace04f36decc46ec97b211a8f9af86517a197b09209e8f43bf9db449bfa3f1bfed37a8d3fc438514efbcce17dddb6577928b41b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/sk/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/sk/firefox-69.0b10.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "57fdf155d558627c6c80d722574d2361b99fbe692ebef94d53ff52d3cfa33e406339e8c6ac9219c3e4a7de430426aff8be30d5946f7284fdcc50ef514b0c0c70"; + sha512 = "9967449c710e8a08e7936dc3a297fff5e254d1fcc960f04a6b349aa97526cf6924522975e750770ace0aa455265c6422ed97fda48afe25d254cbd9b30517171d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/sl/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/sl/firefox-69.0b10.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "95f792d6bf63d490d2622156abb2ffb4383252f734738df1b76fc07af60a382d4bff37159ce1887ac411e9637676c24aa6487fc97c1fe8b296aa2971d148f983"; + sha512 = "7b3881eca1b35475c26806f29f9a7155e63e159cc139558366f8e1dcd92483be475de2b9075184a31fe1c7d3c8c0a7053b90e7f763f33c38adf8cc57722d7b9c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/son/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/son/firefox-69.0b10.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "2583e96c5d24231cb3d8b1bb4d9e73c5e6cf73724b10612cc4bff6b2a6d3b7d30321a06221339711293671f8648ec80d48a650e2f18fedc821ce9876136252cb"; + sha512 = "5fc0d6cf18760f577dcd2e606247a16c20b39a234d60e28880107e1324045db4a384d65c4e83da26d0296f2c89864d24c8bc24127dc5aff8fe080e7c727536ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/sq/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/sq/firefox-69.0b10.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "0ae04967e13f3d3e279372001afda687aedf087cb1773047aa3304f36575409a85e91e7076b494d98a78d9524284e80773ed5d87d4856df7407dd0cc384d67fa"; + sha512 = "7ca9d972c906796828deae1e79dfb1ea9455835ba1b870d3acbd484103db6d87e76011b55668da3a6e361239a8ad87d5acb7d25ba3ab474e28018bd8c768cc57"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/sr/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/sr/firefox-69.0b10.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "8f0dbc4ff9381e66889abf817a484e1b21f72646211d7acdb4b3c6e0fb2af349d436396a8efe8a20ec8357e42bedda4d5811537563849be5ca7c1daf4ab0d23e"; + sha512 = "ae58799b2b20a91df60eaf452a0c81b1d608eeacddbf0a98d941abb8a9c7feba8857d9fed9e4c59fea2b24a7b6ba7e1193be826008450794fb710edb36ee2d9d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/sv-SE/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/sv-SE/firefox-69.0b10.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "7725e0444d58ba8a2c095511649c45b4fe63ae348cefbb7ac4ef80e3aa776e43de8f9555e5d91074b2a74664c7dc1ad463571efd846735b91ff880ec2ed76d52"; + sha512 = "273973c93b118f70d0a83af1daa3ef64de77444172e668ae34df2b547e053047ce4fbb565b4ab5b0f2094ef7cd11d0f8f37b4ef205312e80e99b16f67eeb30e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/ta/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/ta/firefox-69.0b10.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "952ee81f4d42181c5babc12d0d6abbe9e31d650e3a3957d7d1afcfc54335d1e1b45691fbbb6359a531c73fcf46435fe468bdc87825d42c66b74b64264194fe88"; + sha512 = "813cae155b3e8ab0f78542124648e8218705f5122f4a340dfb5ca15cdf3ed3f7505845a6ea23263e139b7f3713a0db304c360289d4989f91be8bfec45436af09"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/te/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/te/firefox-69.0b10.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "de9c9bfa66dc87f2311bf18a15e544391662d36e0f71a72278dee8e24d4cca860f8cfda8f93bd2bd26fc0c3d3992f1603f2e3fd36fbe7a9478390b9535d51e0d"; + sha512 = "4069f40d9ff366c3f126d77855344424c498b9e9c6e9fc78c78097b8d3b3087478f8c3964d46671474e98023c32fd44202d43967ac8c3d81b3debe5467a14788"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/th/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/th/firefox-69.0b10.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "d421e5d653b00e290c6acf069c40cf43695b37796bab9a59e7d6c4f9fc4ff22e2d3a9a370a9f6a558c718014cb16a5e0dd05bbec7e1ebab78e50a539bb1a1581"; + sha512 = "9e0a5a920856b492425a493aa85cacb465f4f59eb45a6c0ba2cfa631558650e40a9d23c12032b543487e78092730206862af1bc7345388803f992bc4fd5bc0a7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/tr/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/tr/firefox-69.0b10.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "ca4a1f139e8dd4dfee268c0b90778cbf0f9462ae9bc037958cb5b3e0668b902e392ebb5e5dcaf9d72974bf1a5eccb74b079df3e3a81cfad08501cbb39129d2d8"; + sha512 = "1f97700f9c6b9996523c100b7393f3ac465c45adb1cefdb163b77b12d7679df2163296880e9004e4b6f8dcd8840cdee24eb752bc6a985f15e2d8f57db01d9e0b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/uk/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/uk/firefox-69.0b10.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "e85e9926f59b948f6d9f181a87f8a6096e0ab85c81ca63bd0ccb885eebb05091a11d1c0c583998807b0f153b3de4b76447a2a82a99da9202964971cbfde73ae8"; + sha512 = "c8ad5621ce8c61e83aac7cd7b272ea7bd668d159872442aa80d88ed1b46ccf77de913e8cd7e339388b117d9d6797c36b9535dcb0efccd805410f804ebdd1f105"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/ur/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/ur/firefox-69.0b10.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "b1c42f0960b0bcac39b0d3ff2470881bb1d4f69fcdc2d2af3899d8379fc9d949f2b1cba879303e47d5d67122290a82158a12e36a05fe2d41eca3ea68b603973d"; + sha512 = "e1c056d287dc38be98db702869d16958379b8b56ddeb46770b175668f447d87b043773c3c9907e0d106abed7cdfe1f99dd871ac4510836664964b3a71d7a5289"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/uz/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/uz/firefox-69.0b10.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "a862cd7e358d5aed459c93671a0541137c93fdc9687b4caf483ce3cdfddd6964a8e941b92cfa85bc638c7f20a6f2fa219d4e275000eb3452c6a744a95c44ea06"; + sha512 = "da694f4cc7f3250e88a8c54e94629749c30288776a1838c8f2183dad59107cceb3984aff23ef4e7d05bb7acd001e1b69adccce297695b206409214e9995b41da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/vi/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/vi/firefox-69.0b10.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "0b4cc1154a43446dbf10a796896023ae1d7570dfd9d346cfd05f402954a3f31d803382a7c50e25c0695fd09144f465060cce838e8de144df3fefbed3288358fe"; + sha512 = "b120a6a272abc7c633de952415b35c13ca88f4263eb939f9040e9168154d7309c3e096827348407c36cb09d1ceb67fcefb4b3f3dd4e35da404a1ec44e103e126"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/xh/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/xh/firefox-69.0b10.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "f5c4b78437b9e389cb2a7429d02679280cf9bd8fc7ddba32640221addad8350805c83543588f7567cc19cdcfa2cbf9795a88ed44b3158a7fec9087e2e7815171"; + sha512 = "68405955b821eca91f75943630104710a0ced12933b3c9fe84d836d10fce32cba1a0799be8de9f3cb58758ae627b5692c9e7e624b8fc62b0d70a16734b7a5e4e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/zh-CN/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/zh-CN/firefox-69.0b10.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "f1c7466c71a9890937bdbda1f17f8813f7cebd7200040338c56c54b40644f47f91bb74ee74734bdf7c2b2343e9445a20098182cdae23876c0c9c4a98e711184f"; + sha512 = "ce80275c117902d0a2edc1e7a1b6f23f5b54e684f813e38696224151621f2ebfb2184bc018905051a07b0428e245380c630cac60d5bc927b4329e701cb0c174a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-x86_64/zh-TW/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/zh-TW/firefox-69.0b10.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "c98e96c1d0d792a378b76deb6222c7cd202c77def3790cdfa30df155b629986c97b11ce025327c0cee8b03cdc8c4c16a938a5060774f1e029bb17c88ff7e9e5f"; + sha512 = "89ef19db13cd8da8e19612381c218a601429cf666f95c762510b300eb9140812c0adae9e5b7b4957eccdb8be7fc306deb9a089c19434b2410162265782e5226a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/ach/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/ach/firefox-69.0b10.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "be126d8ae1c0998da42006332da3110dcd15a233d1ffef4cbc4f09a4cd2426fb2729e698d7d632fc1ba23b6c1e0ae6d38081aa48a63f9cf738ea6e644273033d"; + sha512 = "bdee0f41ef6b4d2efbe13e256616820df048610af411befb91256bab040225530cec74b35c591ef740161d12a8fad6cf96e35e25bce7453be30ad8111c2ef3f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/af/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/af/firefox-69.0b10.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "e6bd3df1a3eb81fcf78a570cc62395689a7e2d456051ccdb85a99b5c48966835e58fd52098fe7e75ad1f6fa2d333ca1d4853be2775071077b42679c31ab00590"; + sha512 = "9268d6071ff9142579be3495edca6325dd283128f2a1ca60d6e249d0a963aba7dc3a897aea523804f5485843950db5901d4db9ce10c3ffb1273dfab5adbbfc72"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/an/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/an/firefox-69.0b10.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "e8590dc16c0047b0d409c60091bddfd4019fee4053ae42c874733e5da0a03a4e170eca053e7dcd3fda70057d7ace4c3014032008c9ebb9ed5c05c8ad57f0daf4"; + sha512 = "8b42c162402df67971c01ffd9087768b4e49dd60f069b88b154b3e1a237c0c4f9c7a7e4f752a83e8fff3eccaa87e7599a9c3ebdcc3fb70604032fbe7db524d62"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/ar/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/ar/firefox-69.0b10.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "7aa355aae3c22329f5769bda023bff2a2bc509e842306421c6728448f55cc675163076ffb76163d56dcac77102e200c78a5221114c6576495d24fca021d54886"; + sha512 = "d4a0c3987c1bc8e304ff065bf1ca1dae66691e28a51beee4726bfa7a685b5efe17c19ec8f7520b982a1b88c631b126c8511abaddeaae2818515ac59b2781e830"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/ast/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/ast/firefox-69.0b10.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "df275d655fde2a2a9c87f77d608bc0ea30807817ce360560e6315b5fb9ad1a06d19399784f13df1be958bcc8cadc84f9ab4e9c2a7672099b23e5c28051b07c01"; + sha512 = "089557a50dd106d25e35eb72ff741c80e8aac36974c2d4a5c49842ce56078ffd8b9f67d829be48411b46d4f823bc1d9ebb2dae22e8293cc197e57eaf23099b72"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/az/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/az/firefox-69.0b10.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "0dda2c6c3c403890c2019ed19e506ce30b86c8d547996d22a3e778c9d519f0368496454b37ddc14c6b7dc4cb3284c17ce2550a57d3ae31b8d4b978c05eaa4b8b"; + sha512 = "237af11c85728ea6d05dcbfe456a5dabc369b0fa690d23a05457b7541d787b149bff45e5b71be4c39ebd808f65badec902e657cb6cd3dbf7081fb4c962a27b00"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/be/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/be/firefox-69.0b10.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "cfbea537c171b49b866de652ffe26b8ca7e57fe79bb834bbc859781a78505ecd21bfe58194585e60654555a1135295f6bd9efa26e23fa86f9306df9a172a0c0c"; + sha512 = "c9952ededa6dcf507969ed16ce47ea4f6e2694c1e9df207df5457ff92929ef195885a91ff1d160c1dbb8e72e6a7796ccf4ac36a9bc28efc3dfd4e34f5cc17907"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/bg/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/bg/firefox-69.0b10.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "2b4f145666a4e77be1a8af82c1122b6d2a71ad5fa1f2bf8a938f04f7b67619f639ab9170858efd49d7333d2073e40363213f946e161404d3ef250e2f5cd13868"; + sha512 = "bebf78848ee8b81af5440ebdbe49dbf14de20d853f1e6bc6a8b7ace7d6c329ac28e3df2a754b7e5e2c1210f6cde54b539a11d676708ab36907ded0ac4025d6d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/bn/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/bn/firefox-69.0b10.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha512 = "c8a1061200871ea00f380f464ded104c757dab2430dd3c416d027a6dfe1c2a1bf97ec6963e6ce2a68f99dd6abef1ba8a0cc978f1387ba0e8dd3793e259abb078"; + sha512 = "8f4cc489cdcc348fa19c8129c8a9e83507e7f30dba3f2788b21e6573ca0228909612b8e158c8d9cd87dc8b69554bead47d9522fd754bf045964a1880a5deee06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/br/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/br/firefox-69.0b10.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "cc40c33af7dcf8258c6d675f392c15da86eeaea27c5c4b27fc2d618b5a7f5cdeb2a2b827134c4fc5f88321d5df5f2d04be088dbf409c51b12538aa6855a7897b"; + sha512 = "564878573b16470ab89f3ec82d2efcefa69708a2abcb9fcd7527fe6d3a0b1302a400eb121dd1041599942d436583cf931b6c13a9eeafd13d00ea15f3cfd1c524"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/bs/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/bs/firefox-69.0b10.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "fd5e9ce9a3f25d01b0a14cf8729b1f44256a279f57211f37af888697f51cdcacead83209c39f126da266d06b6d9fcae30005776da9bcfdcac823f0bd5b91b374"; + sha512 = "4ad5cca7ce623219abfd09f94a33753f909e344ddc8f2687d6a50386275728e13853106206e1261c6625328f5448578890e496752cc11796a30757e29fdeeb2a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/ca/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/ca/firefox-69.0b10.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "2fba5d90b6b1c2ed66b6fa8dc52371e77cb1d783acda27c88341c89ead42a8acc6a271daec2b0c0a992b27e2737fc33c26638abdf18ebad64c2d54b2d3e1e84e"; + sha512 = "83617e53c6b10b7668e7675ca0bd17d4a121eee25bf2381b2e97aae3f8bc2552422a18517f0112c938fc032f4dfc62c85844ac05f823b02346423339dc8f679d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/cak/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/cak/firefox-69.0b10.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "d9d1ac1370867478bb211b9b51f71f9aafd75745b4553b66cfcc739c2c5f5ac42e2db13d31eaec98877113c0fba9482d4547824917d5f1b8c3e8d43e0045bd8e"; + sha512 = "11b6a20036725b6e794a2d76e73cb6d2850d498d8bcae442fa31f663901931665a9e4bd21c6694317eb3a493bf6d33e00bc8e8ad98f151a2bd38daec404a9e5e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/cs/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/cs/firefox-69.0b10.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "703dc733105080287191c1e77a6c969a6b8ae9ba575fbfa572f43c64982c0a957b4319c76712dfcaca2ff6b4e6ae00dbc1f325df2b06261e0cacc75cc279b9a3"; + sha512 = "387f5bf3c18887cd89c977504a2fb956944d3bdefbbe17410edc541ab8ceb16a4118b0e98e7193a85c66826c684e636dab7e7ab5033d4fcc6304ac49d0d96997"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/cy/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/cy/firefox-69.0b10.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "d2e139f9891abad647f8e4cde9283e5a4376dec5ede58ecd27d16cb92a623ca5c5442aebe7ab5ad5726b899b7a90d109350716ccbcf3f645aff46d9167bb8cb7"; + sha512 = "a0c139b58e15851ca69fc9e138df813912be6ecace6003a3dd474ace17f4f18125b74f247bd795b619e6964d238c162e16ee83c953fb3511369842ec6374b4e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/da/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/da/firefox-69.0b10.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "3c6fa6a9112dae40dbf70328af0955a63f1a7c0c2216daf6a3b42a2e6a14f841c6d04e4e294c9e8bf0564afaaf20d9959730fc8b50a491a059955c5e1b2beb99"; + sha512 = "4a9459cef3d4c737652014d2b5a29801c3517e28d614cc1f8fd4707c7571e952a53c9bc0827308fa05272416f84e6db95b45bd27cfd7411f0bd15a75b17d5eab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/de/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/de/firefox-69.0b10.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "dc1c0b8b87a83a6bb2f30beb4da6b3d04a7d0fa0feb734cc207b2b282d3fa55cc5a0bc19d0b9fe430424686b0c785a2f6797210ea7c740c2199cacbfd680500f"; + sha512 = "1aae6f492c3f7dc2194fdc923568bd8b77ee9f591e7ca9d8f8e6e6dd14f6873bb999340ff0c347a60982ae7a35a1e98ed5cdb07cd079493e06f5f248859b99aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/dsb/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/dsb/firefox-69.0b10.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "f7589f38caf59a8acc7d02c026119304443c3016482c47b39613834d93d348f7489364d1fb2efdfb2397ba9a8fe088915531e21b95927d3fac97ec2f07bc6af3"; + sha512 = "283b212624768d1ffd58573f67e253a4f8d8b0ecc824fd666290b5424f1b1642d3d88fd0e1cc29f6259860718ab147bb371583fc5a8eebd408d5e73c7f8e1ed9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/el/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/el/firefox-69.0b10.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "50d0be1514be61facdc660ffe8079defa37cde6f823b47ae498cd1e4536c9f6ced551f82ca8ad08e0be4f0d64b2e8e055a20f3a28b282566c61545aa39994a53"; + sha512 = "1ec29d5a50105d7f4d4b6d6cb2fec25a9fabb150a9de547fe13fd1c37a964ffb2bdc5a66599ba315fabca4bc833b8b12e48b218ff70711e06dca8b5d36332032"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/en-CA/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/en-CA/firefox-69.0b10.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "eca93e266ef850971878ee858830f056afe430d5fb6dd45ebf0cc305bbf4ae9d8820154c0c8df596a344c4993ef184e000c9059e068e75064ea53d8c0a2fbd07"; + sha512 = "86658e29977df1dc66487d4f4550db41474ed8625c920763336e2a1ecf98da2f0ae0d765c7a0b7ecb5864b505d841789ab93868bc1bb0542c687e359662027d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/en-GB/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/en-GB/firefox-69.0b10.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "504c55d0039df0db7cce4cf0346919462fe0ebbe1e36a05ba452b815506d58ad03ed6bfe5e4d347a29a1ee97cbac52158f7939a0c817513e3cc864ad0d80f3fd"; + sha512 = "c8b4401a307d72b27843fccf12d71f72aadaa12eaf373af78f80ba00fb27fd3f7b06a430ab17bf74955d4de673373dec25faac738cb2bb292a48134043d95a6d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/en-US/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/en-US/firefox-69.0b10.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "882a4d9edfd71941cf685b0944ec9a4d1dbc7fd847a9bad9ad2f91d84ba0edd025b40529f26d9e9c40707cc82c741e360d1935df3765d1210768967614a416c1"; + sha512 = "291e666a59b9e26ba612a8cf75b04e82610d6818fe3aa034b09cd62052d52c3990eee25a808838348cdbb7606e2a9218c6a9478ef868207f0c920cab76bb393f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/eo/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/eo/firefox-69.0b10.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "3fac5b2ec348b453b5710ab58184a8716b98a08da4f7c344690c221c3467c01f92ee21125ce396695358529190a168c2f5ad7d7a6a0b82391e17e94bfacc86d0"; + sha512 = "e056e31a8c364ebf56915967d54d0d24903adf32a751123171470bcd968779b3e58cec4731f9b126865b06bafc3aada52e6c0c4abadb981161c390b1ff75d916"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/es-AR/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/es-AR/firefox-69.0b10.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "589d3bc9f2da99d81ed11b2ee353f7dec1fd2f747cd32212ff270f7a1adbc1691e4af76026d1e11e21632a2c976b4b126ec07ae5977209127a99e50e859994bd"; + sha512 = "b165b4626e4326b9a7b72d32497b935b14e470a8ec9731491762a4f2f5b020766a453a5d277a4b693ddba243c39a5145f6b1962cf65282f983ece1a58d9231f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/es-CL/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/es-CL/firefox-69.0b10.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "d0cccd7eb4d8e7593288e5268661075355e528ac6f50bb06bca66995687af703cc15b843641aa41e2d9c34a71444581b151555de083282d857900462fca4a4d4"; + sha512 = "e50aa715b2197242e03890bd7d981b34bbe438e7b594d38637495d6c5c7bbbe14dfc345893e08eddd095a758528ffb9f8fd73dc197bcd68c6b3a9aaa8dd403cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/es-ES/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/es-ES/firefox-69.0b10.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "c4c39caa2d8e3787bc81a125c3639720c315540f3efd4030f6b16f7be73d7162e9c3f404ecbf9a89918fe522b492e79db9e1983960a0f20e60fd9e5fcf4a6fd6"; + sha512 = "cf0900c6571046403fc0dc2369208ba65f580d6894b2e2888d50631480e2945129311e1a3f5971837c6afb3b558dfec83c0886802c7881c8840ea883a7049a38"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/es-MX/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/es-MX/firefox-69.0b10.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "3d385a01ea51929790a6a1e81700aa6fbdd5988b6721b791aa65ead15d20654a7e71cc5595d9a8c9652fa760e07a4b0757115b46e9d9de2b2282d83999ca93d1"; + sha512 = "321f06c0105c8d969f1ea04ca8065bbca76d4c42c8eb18b95fb3d859b0d0d0a5e7c1bf5d7c9894821987b2a4d46c08198faca5c03cb0a51b001039977d523ecf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/et/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/et/firefox-69.0b10.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "e3a278a33d7957326cd0631766d3a4784190c9d3225814ff1fc7f987edbe91fba39dabf2eac7fc95f44ff8eafd46c79254affbaf4d0ade7fc25c9c14366ed4f8"; + sha512 = "db603e5489fd329fa7f9c7b8e5589d2b7d62ca8e295dcab1e7a3e838c125f1acdca7dc541f67366acc4550682a121e132e5aff8243fd5e0871ad94249f037941"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/eu/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/eu/firefox-69.0b10.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "89790aaae509fa4338abdb92bf2380355f88a71c9246807ebb7099b443bd961fc9dc4190204a72b6d2477e69081724b503a1abc913fab0dd0e1e5e00033dfab5"; + sha512 = "c74c42da5f7b1b08d3f031b6f67bc4b8fb3d77c7364bfc5d8ad442e0883efc7488e1699c560ae0c7efb88e4c4f5a661d972489b431bd710211398334047d8c98"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/fa/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/fa/firefox-69.0b10.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "37738b97826f9cf0d1e5364385f4e960487fceea5c27bbb82b43fbb4596ca6e8418edc8f78e6fd323ebdb5472abcd015fd50b345362bdef27ddb172549a9318b"; + sha512 = "fb791c52894ee901a54df353a7f4b3a16259689e05c4a18931c878665645d123cf493d25bfdaaa4641a6f925f2a23a77e585ec73f9f2bfb33b87ad3ffecc94cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/ff/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/ff/firefox-69.0b10.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "cb8e50396c862b276678a2fabb80f980fef30d994f53a09359d58604aa0a27eb0b278e5d9a1b1dc7c1fe596a0d3e0313bfcafc44c0d065c4cb3abc5c6034e6e9"; + sha512 = "f5c657a4d1ff42e772943ade151288fc8fad73e532ee11f00ad6098288483a3326eb00a80f13b38abf4165a1ec057f5fcff705ebf9c6d1a29a3fab491b08b63a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/fi/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/fi/firefox-69.0b10.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "99fadaee05f23da102c430d3d1481962b540b71663a219699ec57b2b7342b3531fb3dcfcd506d505364f4c72f3f659140a1169993283683043fbac76cc282eed"; + sha512 = "1d758e4d9c472286d694c70075a0e9a6c955f42e21ef38057e9647a91722ffa15909a39e4c29ecf8d221c5ee3d464a0bdab80b9ce2e9b048a471295f0b6b4dfe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/fr/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/fr/firefox-69.0b10.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "70c559e2a9efef7314ee1f029b21e684ca39adf2aef298c613b1fbb93b7b727885b51bebd741eed536d4df4f61e3f63e985257cce79433ab3e6412740486e73e"; + sha512 = "12bc2af05bd45e5296340560fb9b1b5c3b970bf4f57a3425fc4e7a810a8a092637ecac20ac1fdc643a4d891754b93109bdb8214ba5fe93bc62137c296d667ae6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/fy-NL/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/fy-NL/firefox-69.0b10.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "9935b93db2eca7b29d190cb61e29e249d307efa2475617e4a4885018767bdb7d745380a6ddce2611af94bda34054654de9ef5f61a5cde627900471511bd51f10"; + sha512 = "274c67f1acca9b79423da8366ed52036229917547dff79f740918818c379d21402eb0516ca8919cff136b6407950e6b4fb6fee3ce6c1bbc1d68092678f4f255c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/ga-IE/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/ga-IE/firefox-69.0b10.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "d77f318779d04a6891e4b05f0e17fc76ef8571df1bc87d251b1c00997c9f7736df18fdc98c2a3f91473309dcb2c74df121e300816fc1617efd806a738d4e99d3"; + sha512 = "537e1760621cdd5e0690db7ca1aa0fc935b0e1fcf1a037d988c38c7a5294e34cc904d44642234286b24e070b27ca67e41b7bef0e0983ef6909a977ce3b0ec52b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/gd/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/gd/firefox-69.0b10.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "c960a3557bce3e6aded9454f506ef14eed46695d468199d4dfb5a9bc84314aa171c0b61c3c3972925a881ed5da6d3cdbdf6dd0fce70d2c509cc9d49e6cc74af8"; + sha512 = "1198fffefa0cfc1e4d9dc7058c840ee3aa6957022a988c3f39fb9da29b74650923153c563f1c5504f70bf8effeb35ed4d9b697e637613b145ae88d556002c064"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/gl/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/gl/firefox-69.0b10.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "58a0dbf623f87c0fe76384b5407b0681e2ec6418af046a65bc843ab0731d84fa1254244405bdaad92ea03b867c1022cd8359a3f469bbdfabc2d177a2dfd38a3a"; + sha512 = "5484eb61aa9d6103b9b44ca9dd0fd2ef1440b20a5c07392aa1a71127a0bba0867e55797429edf328a5c7fd207325df0deb04429e2224ed9faa1336c8d189f5db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/gn/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/gn/firefox-69.0b10.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "1dae8f4d086ca7ae9ce7ebde47d5f11b49768a3c074915735171f851a10aa2ef70bea0701fafc345d777e5cfd5517604744d70e143217426fc3f8a29350904a7"; + sha512 = "65d1b767146511e6c337cb18dffe1e1e8bbcc702aefb6dccdc31b6722a3f0146826e154b0255ede79f282a3fa3bb4b63d7350acbf49d752d2e8b58de484c2b34"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/gu-IN/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/gu-IN/firefox-69.0b10.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "ee01da06262f1f87093a19f775db4546b2c0a7d2e0a52bf2640e2eb77afab91f36c5134f5e6ba61f0839e366417920727f82066d277bded53d30cfe1bf708841"; + sha512 = "e8c3cd52bc402b56d04ae1be33a99197df8570d160fc415893f9d91ba7a4b64e20f345282eba8e1b71f9c486db4b37e84e6b56f63b8f6f15532a1ce9bdcee7e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/he/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/he/firefox-69.0b10.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "20db236c57f8ef23cada1a4d081c6070141db952986431b6654aaf78f70fdeacf0d50eed7d2b054ef51ff56807ac019efb16a67b47bc9466720a50f07cd59614"; + sha512 = "b2b8b13ee803ffdb039bd656a8f7eebaf10cca29a49ddb2555bb2e561b39a7f76f3e65243e3b37ec31b182897a260ae801ce11223f888949677539b103561398"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/hi-IN/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/hi-IN/firefox-69.0b10.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "3713350c1cd114dee03fcc74fc4620e56e8f56eafac03fc93e39f3d5bbdd6ad251e9e3b68bf380c1225f4092d607b6624debd37b239853c564a32f5af7ad0edf"; + sha512 = "e564b962cdef896bb6b7708c315b3ab07bb51c4d3813a9855d5ecfd774577808165c15db6f875894b6ca4d9ce01ade8b2eda64d12d2b03a507291ed235978691"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/hr/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/hr/firefox-69.0b10.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "d7b407331779e0ba9a717b339ce3c0c7ed7977f2d78ffef8889285de4855d50db9a2d23455c81b87620f7235bd1b46259be7694ee05a34c6a80bf3eac172518b"; + sha512 = "56ed53ccf263879995b79e9455a73fd7fa9cc082fa984f603d5b9347231232598f85f7c3abcd4e1ae243098ad338eb59efb544a1aef16f6c55e036ff4ea02324"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/hsb/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/hsb/firefox-69.0b10.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "f0be34fac431045229d9719f7dd8de16d7c47688f8fb403d701e07163376878d82fdd5990cfcd3668d7224569630942c1e0819152d1db397ce25f965decd84c9"; + sha512 = "9bd729f6d27874d73d4d174f8520dd5639d6e8e4c2284b67438b73b44eb715478a66d2be348b431007fc19ba7c347f914da59265369e80ff7ddb545e6fde25a7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/hu/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/hu/firefox-69.0b10.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "acb207fe9c841da3e1d6e0ab80b0a48fe6e8361869be1871bf156f33c99bcafba28a91b4e533a28218416e5a5c5864ff44f7d75ede0deb04c283db252418a164"; + sha512 = "872993e7f725c8ad3c360cfdaeed4ad0839857f52d88d5db040ec4dbfd829241a7aa0f4c786f2e5f174b4a3161000dd2bc962e9f290e8f67a0757db52ab3ec7c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/hy-AM/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/hy-AM/firefox-69.0b10.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "c8243580e1d4304d9e249ff49e9f14021f886ac29cfaee1b35630f9ac1e7cfec125cd547bee8e645f1c3e709aa834da46a97fddc8fe1eba565ee33818a10a443"; + sha512 = "a503a134cbde97990b0f733eb79a93454f668c490040b83a109200a3c54560730a1a1b9fce137af6ca5e1a37268b994f500030be8215222d442b651f319e3f75"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/ia/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/ia/firefox-69.0b10.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "593f1f384da7f3adc0d945ce87b7196e6b34db416e860c6561a0b4b6e37c2cdb945f26ec465f49caa3da94f2d95230830f8a09a32de6896fd5348aa9ce6dffc1"; + sha512 = "9ff8052382c08e4181c55706cf6612abf24ac8db22a64f7adacda83efbe3e17b8866a7536a9bfeec555ca0a8f3628e88effcc39998a13f382223551d111ac3ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/id/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/id/firefox-69.0b10.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "2c8f939c34c4655173599ac5b5b485695bb3e5aa83e734fea482659d0883e784463d606497de540877bc9121741f9a2fa45fd9842979f348502dca9f148d45e5"; + sha512 = "e03931527fb8a834973092e7cdc75fb1a03923a7ee26abb4e415a6eabef47a32a52accb1365030b4ee84687289a2b71c94faf633f39fa868ee0ffe235e1518f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/is/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/is/firefox-69.0b10.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "cfebb762b4318c4db863b1a1307cfa59965333d99f6cf78b99927df92741ce8cbf2540b657ce9ab948bca587a80cbc11633033499109addea0f675a2fa9747a0"; + sha512 = "403339f6fffb70f1541b11840e38ef8ea52d2fbae4ccfe802dc1dbcfc1b2ab8ce50ef7eb3e20c485d86f3ec1c97cba9077a131b7db8d3ba42cec71778b09888f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/it/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/it/firefox-69.0b10.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "f2ae7405bc9fda25240a53a731a81724880d0a61f975ecd4e916c46f69648bd09e94f9703cf7f159de3d7578b2a5f114c5abdc7b425540533622a44659fe8580"; + sha512 = "518a661eb87dae3af75834198c6fb1d3f6836511dd532b3166f4b395ac0fb1ab602b56a0a8be06f3474e2c89da8ba04b09fc116b2391b11b229d2aef8ff31275"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/ja/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/ja/firefox-69.0b10.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "f7084f3dabd2e5cc4029c3840b3ae6cb5de56919076325a5c2789c39794574cdde5ea656d75fc0e0ee2b5600800ea51c3db66431a793362dbe949c49e629bfb3"; + sha512 = "e1ad475114f41e22ef4eb38cff1870822920fe164a79791b21a9b7e9dfb4c7ede59f16578db71214d72270e18ed7eac759a2a978b9fa1c52b04b8b07468c9531"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/ka/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/ka/firefox-69.0b10.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "9cdbdad908b6c0f292c5bc78a1afdb867b7bccdb43afc524ef3a72a7079587664cb0df58aeb6b3aab3cfb509c0300bf48b3c56e8b6a6ba94e6413f4a4c17a0c6"; + sha512 = "4aa683433623ac70de7ba0377f8fecd9685a40f1ade072c70cfc2bba375158e04d54fcb25a170077e321d300de849a9e19eba464c619b9f911c25340aa636133"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/kab/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/kab/firefox-69.0b10.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "c2e65f580b84e26addf7f13642b17596d91c24afaac8decd03235dbf6392df083368ad1e7b3a5f44666ff87a8dc6a08bc3030410be8a578164d3140a8743d2b9"; + sha512 = "45f1b8a04b5a80c4e8207eb9c52b44228b176037aa47319325c0783dd6b5b09c07f76f12535d1f1eda265e0e6f160c24cfd087c699c24d628fbc4d007c156dec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/kk/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/kk/firefox-69.0b10.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "ae42960c95b5331f5bb93dca24a2a2e9e10ff210fa4d9cc8adc728a67e15dd1e70c57a8e2ba4ba9feb0466268ec7df14cf061aedd30a597a89a46d3f9fb3a313"; + sha512 = "6b327637688b45f61cabfa626fb8b23919142e8eba03db5727bd18b714d4671f6beca487c43fe95f48d9d6771e1775cda098197e41addd06979b480558bea85b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/km/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/km/firefox-69.0b10.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "7b4e27a7be3e0d5641fa152e76b878d1fb485579e298e7305934ed4d94ac719e658c32345891be818e03150a417542fae07ebd03db74eeb5e9912a75ec5a0dbc"; + sha512 = "de72e1d2164a102c063f6906678a739d70cd7e0b44dfac622ef94e79d7bf076e32fd166b12f9fc077b65592d97d5d6b2f13ba2e403c24c9f9a988f58c9ac3554"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/kn/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/kn/firefox-69.0b10.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "9082afa873079ac286dbe1bbd977f6499fb3dd31c9665c6632750de20ca851dda5559aa6b697034367257517dfcd449ee98f253539521c49b3b1d5e4cf2baef3"; + sha512 = "b505d91f5586a2aaa53824faeb65c31fdb85cd975e8ec659e63c1c95a71f96fa13350f93658455cb9000bc533551a4ca1cde49a0ea74a0d0a8927215b251c34d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/ko/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/ko/firefox-69.0b10.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "21d84b384cc16f8b0b62517c355fa438fce255b3d5a7fa77902da2190530c868e46b5a99da059ca5f1306fa58e52471cf7aa85c2d860b8983077d9531a408bbd"; + sha512 = "84fc13c778f38dec4399293bf8b4129d5d21596cb9442e2f6a6d9cf671917b762fee13509a817d272bb4883ae012692919eb62f8c83ae9620684a9f458ac85e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/lij/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/lij/firefox-69.0b10.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "88104bd633dea730e1291fb3e1be8f63c68be288c86505d5fadf4c51189460b4315408b15d1c30d4a78dafada45687cf4d231c324a2fbb5b1f1c6f0df053fd4f"; + sha512 = "afcc6d36a9186a24c7672bf0c3cc181e021ec2c08651a84b58e9f06e400394d8ccc7b4484d17909c3388714104ce3485005eef3911596dc23abf8ea9515a4908"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/lt/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/lt/firefox-69.0b10.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "2b6159e38a3c32f993a9a03e12dcae5198355804b60c262354ccd1976d5c448d133a4e4bfa5fa77040a7811353aceae105afe9e4029e97f88868bb311fdcd64c"; + sha512 = "ad072bd72f7160d7bd9caa7e69d8b1cfd8744e6ead5e1ba0bce5c89a5e4c5193cc55b56018f9feda5d03041082eb5e054dac18ae78d280d7bba72fa5b12ef84a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/lv/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/lv/firefox-69.0b10.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "6aa7a4e61ab8a08de96b233e98efbd6a558562dd20400b5c905fae5d25e7eedca8732028b5c810611580f250e9fdaec5bed9b6be4ca82a854b218fb50bf29f76"; + sha512 = "3b8bb275384540b32b29d32a72ebb54997aec84b2dabe26ce6f9a92ca60a461dac4368fc8ab816001664c1e8702c130aabf5ae3c39c107da034670aa52b9b616"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/mk/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/mk/firefox-69.0b10.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "aea23827fc798c1870bbcf3a1d6305835fbdacbf7b65d3a58cda68d289dcd2abc1552af01c7f81ec2c95953e8a390072fd38bb187083205069c10e049beb5509"; + sha512 = "519c24ac7757d8af7959dab1e88315f4e4c163003d9467c5d1c5606fe74e9972d35d54731eb46cb7de98be456094d047782c62bbd6e3880f6743c2b3441ce865"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/mr/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/mr/firefox-69.0b10.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "a4016ed6ea3c66f3e136e324c370373b79240d021478333f1e75fd5a6041884be5f3984cf769e41e05bb7ba4ab27b3e110b4b60acad2734f57aec1955509756c"; + sha512 = "7dfa0d85c946dec0190730c49b79a447311e632a58e467c5451c467fa870e6262077f89b2bbb57e29d9d35ae78fb182c4553d4f192aed45633776b6301a53a26"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/ms/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/ms/firefox-69.0b10.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "360f51dea75071407513f798b21cd5e45af7f00a6d106550270d8f1cc381e9d93946c0c5d7a5bcf0869c7b552e2a6f217a00a7e33b628e55849298ec71d7ab4f"; + sha512 = "2e7201c05ebdf99e7dd87c1fd974a33fd8c5d56e34aab55da6af22237ea8a4caeb6367ffdbfdfb15e5726096b918ccb7512c77ab20e02f879f4cfd5be27caa3d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/my/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/my/firefox-69.0b10.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "500597a8d6728ddecbd535d8d7dafd5a7f462319b2aa8dab159b7c2f6662d4bdb67988e6861ea8e1e8bfaabd1b8ae3e0e281f6c695e21b86f3557299c4f253f7"; + sha512 = "f5cb255dddc705083cd5c91daced163d4337b4162d9686d6c76ab935aabb6d3a651e3932189948115c1612ad5e864cc83ee17f107422d21eb9f8dd54e28d271b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/nb-NO/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/nb-NO/firefox-69.0b10.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "a42cc16daf51f5820e0fc549131827e9e00fe9da455607c54a069a2ea25cbef0f7d0b831612dbca90763ff94d143ddbf2f3dd795b22f137b167af70f30a27dad"; + sha512 = "d0eeecb4147ef017c4301621ef7c04a14e1aa7af7e7de2882733ff77e8fde916f55d68573cad5d104eb631c60172b7fd886b4c896c1fe9805841ce5e40de6a38"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/ne-NP/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/ne-NP/firefox-69.0b10.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "e279dbf320b862b84cc47ff48422f979080d109f6d5e222c44ff0b7a282a5e2f9c7b8cf90e31a00c62dececb6ed580d15f78126adc1ba5328edaa83bcd2df389"; + sha512 = "db7f205b6c42575bbf1e69c256c2113d49a86388f58eb806e761024e73f70ced1a974e18b226c83936a601f428c54ac8deb663ca950960154c60e41fec37efcf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/nl/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/nl/firefox-69.0b10.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "927e986bb7ac3cb3c0bca70b1731427c47b0c08be95d71017c6e748b837ee5eae4b9240f2c106326f9fe4dc19503e1bdd211ccba4574f10476980083aeb9f6c9"; + sha512 = "b5c4569a404b9b7cbf6b3c4e1b125c1b45fe228018b8513766726f00bf7e52fe2ed1d07f724f5cd2a37afce2c84201d30425d156eead9e02a47011c95fb045d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/nn-NO/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/nn-NO/firefox-69.0b10.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "f3f63b23cdfff7d7b7d1a83906afbdaca279eca3bc7bcb0e81844617ae0c682e47de7677e50e9aa255d4153ddc2c71380631ffe9c75467183f9c04ad14fb9a81"; + sha512 = "0d8661643f719055c88b057838fec06b19cc5c91d7975149dce7c61ada82dc7f40516622828c05cfc1a5bd44442f2677907b460770378b92bffdebba9dee3015"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/oc/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/oc/firefox-69.0b10.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "ced599f04e78c03c0aff767aa874ae9a16f931a4ccf6fa720eb75fd68dbbf7cfd0a5ff34f5d0ab11570d02d6b9f63f797c41f191e7d00218113eca83cffcd65d"; + sha512 = "5064c9198ec7f2c2e83683405d0ec619f7f8243e326051e33fcd869499fe281836ad2d5e1b633a3f264f7968398ff5c8933c5f7fe95729db462395042673058c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/pa-IN/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/pa-IN/firefox-69.0b10.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "beca221d503a6b082df8bfe67e9be796c670088e0b3baf30b6e2fb24a9397f10efbe7958461082fb0696ded9b4e4b5b15c77ed57006a76e0c54623cf6f04235e"; + sha512 = "3c52168910d6612a5cd6540b74d922624ed399bc6cdede95ca1ba83cd534acbf6673170687393d3f0ea9a04fbc5940e97062bdf25484a779bb93f914cf793865"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/pl/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/pl/firefox-69.0b10.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "0eca48ee1275ed2bec85bec2c9d0e09ab962c4ee7543441126ff520cd61ac5bc686d1ce006243d652ad4c79fd08be6473b87c0052cda20348a66b5eacec18ca7"; + sha512 = "b8e627cae2a2a2acb6b0dfab43ea501171165898196634ec435944d625ef8d1048ed02ac94aab9bdaf63ec5b2f3159d534db78801b1038fb493797ba27c2d7dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/pt-BR/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/pt-BR/firefox-69.0b10.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "0f1b2909355e22bee9812ebe04b2ab9280b892724addca0915b0773592a6598b0aa48543d92a16be39eb1f748f8109594cc129d59d5a74afcfee8ce71ddc7d8a"; + sha512 = "263678f014c16c22edcf4139bcc443a02fd67dd41a8820f670c2a1a44f83bc3bc4532bbad92707525264baf687a17b6d5d3e46bd9d7228a3798c7387d218e17f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/pt-PT/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/pt-PT/firefox-69.0b10.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "2e8a2d2208825576580a86734f5a77a0d17fdc8ad76bc317a1171bc610eb71f20bb66502cd9158a8afb281ac5e92f8edc9a81592f2df4fbfe2e368acedc241fd"; + sha512 = "2113203fef6c17485784d4ecb03ac8ed249102a8bd231ef3c0a9c95c06e0d46ab3bd5af475ffbd9ce11036df0937e34a42ea560a3c056ea153607e93540fb91b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/rm/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/rm/firefox-69.0b10.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "6132cc4dd0ce68b50ed5417842c3f8bdc8deb3243f82cc6160ff657a8d51a73403e6a6f987a7a8fc519806c380754a1fe9eafe804c08a972d05c1fb75c76dbf0"; + sha512 = "57e47591931d942c59259d10b41a3eacb4e5d8d61540fc294546a0a15dd347b2419b64b66e4a33e651e2f616e158b7bda60bccfaea1a42182197dca694e43e3e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/ro/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/ro/firefox-69.0b10.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "b7b64b358f847a47831fa7b30a4b1fb2ce5e3dd68252e8516ec255e193d5f2e4f4831bd4649b29ecf8e94e133b9178ae62f13a2bc1d56b93195543d4fffc2a21"; + sha512 = "0c206c38a7833d1c7596f26a0d6b995cbbaedb2b014464dc15c82fb3a8315bb524dec0d2df2ddfe9a28b8737c32c87a85c8b815f284535dc572669089266fee9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/ru/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/ru/firefox-69.0b10.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "0c06df6db5060e4c5d7bc1802ffa5b31dc7fcbf041d8ad94ae5d2f02f340ab0a1b8078c0b35822c25fa48b9a48f3e89f15ddb3819f27613d8ac51d3033129bd0"; + sha512 = "fa544b95295299c3a9eb8c97be37cab4faf77df818f624562dbfcb553f6b9650b458185e52c2a77ce07e3884ce76bcf925e15aabaa4af4490abb9a6b9ff1ac81"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/si/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/si/firefox-69.0b10.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "ebe76dc51e5ae556152b468084e848d2beebd5b6a2b87efd136db6936492a03085b8207c2928ebb2f5dc003be4fd47e7b330034bbcbf7085663e08348e5580e9"; + sha512 = "2f2a407162f4c1fbda3ae3c2f18a97683ff12fcbf863734659d45aae50ea6cc3a8bb447449c1e1922b3b64f84bcc295596287cd24855e10ff8fe25401293f888"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/sk/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/sk/firefox-69.0b10.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "e722e0d139da87df2ae9526621379f1e8a23da052bdacc21204cc41b2ee22a316c915cedc8d13c53b63acbd5a5e0693e52a6897fe4c94f33bff8cbc27c4d0f0e"; + sha512 = "871daa6bdeb59b9ac1c3d73316846d2955bd278a46f17820c7b1f9724a91968f7e1dc19934701afe4d880a22befd3999784e1cda962620400b01bc56662245d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/sl/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/sl/firefox-69.0b10.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "8ffecbb942625559f6d97ee57d716b97a8cca1110aaecb5759b85aa2f56d65058b08e48b939cd9ec493d709d44cc3083843eebe1e742d6bebaaed15eb9bc4149"; + sha512 = "02e477a1c5ffb5cb8df98c8da67dc1556e0bc832b99ab03b4e231ee801baa8bc2964ed81e94ef431ea70b958c3c18fe01dcfec583823d4aebd3c6efb24333772"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/son/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/son/firefox-69.0b10.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "bf56d3a90aa862f478c0a858bd307663f1e0bcaf3298e3f3513d0a55a3be3934677778ed16897d477cb27874bfcd9cc7f8965cf5916b48de3425459a04d2d1e7"; + sha512 = "b423b037a5395bd230030ce18056703867d74fd595b54c070fb9165f8c8b25108acc9b35fe0422bedc6e5ff57a0657b4bf1ebf5b9840c3b5f0fd3db2b577d416"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/sq/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/sq/firefox-69.0b10.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "5745e225017602257b546b1b08d112292664f46e87a62cbbd46a9fea65db34f24dff61f1473f13927afa33c7c6dd2d9e8e3c3d0bb18c7a6014e45b878c2aecd1"; + sha512 = "7805e5a4b7b84e3ca89bb40d086726b42afb07e6aa78ac2c5231a1e8a3deadf02493b83077841e979b08eee913062c03a6da6b7a835acb54dc2ce34692808a67"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/sr/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/sr/firefox-69.0b10.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "90f3ae30892151dca30556aabb3d5ef9f7e2fd85d361d32af4d87516337b8389d8bcf01708477fded9a5cddf58a9f69980fbed68109a36a4892ba3e1e0229df4"; + sha512 = "e3506dcd3a14fefffd3a450e2573498db3fc82ecf9e20b203c5bcb3ba8d9f62e7dc69dfa3ceece91090adafad675451bf70d5badda3e0adcabf340410c9fbce0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/sv-SE/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/sv-SE/firefox-69.0b10.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "b9c4453da8a47729a63ed1c67d18d7544cc9a6241a2b9feb246f0ada423086dd72bee3b91a0ef1e335ef15fd1c57ac1937a25b311587ab2470438d8f93076532"; + sha512 = "cacecb4743defedf9f67348adfb201f0092d835049b8a93afe1f1bba6c919441b540c101024f8e55b4d3ad2f4fdc71f8cd91bfc7d35ba5ee2af4ec13efacf10a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/ta/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/ta/firefox-69.0b10.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "99954f03406a823b9662f371d1c6fdbab18d15099b081a4b7ca99517433aa67c22c719efc1fb84baec3e3e25f1286bcf4d876e9494b8b5f92ef921f88c99c57e"; + sha512 = "9184c8ec21fecb20291cefaca07b78fa1d18baa5ae0af2a13639f0b3de176b80615a133a26b575a8c10d722308f50aa0dfb34d9b495a92a137cd1ff738467be7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/te/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/te/firefox-69.0b10.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "420c1b6eabaf6062eaf635625c52a14534dd4646c3c28946ff13a9ac573ffa200d71d29098bb99909747d90e2fa5ff8a316e1785ff45eccc1fd070cf354236d6"; + sha512 = "e903b44ee00bf108bfdb57a31bd954a7a924c039e606bbbe8d804979ea2c9d9268e23df1da36f1188b3e2684bf77a8ccc12590bfd02f73b759cd8f660f038a31"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/th/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/th/firefox-69.0b10.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "9e399d3d6c76a27e357f3d5b6a728f6dde409b1575588b55f84b1ee53668928ec1d83a425feeda3dac0198b5ffe15d432d00b9404e13c0cc861f9147fa0b93a9"; + sha512 = "1c5c1a75ebe2cc3a80eb88d3cf80787360e88401ee749ab5b8944caba5caf55d267939376a0c76c72bd733b31d438e141d3f937bf604e8f48e333cc3024851a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/tr/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/tr/firefox-69.0b10.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "3382250950fe1ea125a3058c633440712f5db3505c92e695708753e8b5f2b89d2a283dc09157c47309d926a0f25662afb1c540d16c15bc2b97cb661cfddc10c7"; + sha512 = "a7fc78e4abbaf40ec8982ee14054e2cce5f21e4c5f6fd2dc04d38bb6b3b062c12a97cc7dc113b8893a1f5a842aa892ea1440bad081530918e1108b7034e349e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/uk/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/uk/firefox-69.0b10.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "207e86fd3d98316afd63f4c5f10651e9a5c754a3aa2c4c2b50d40eb51048b32806fa631a7559a919b540111f8ca5ed84d038afbb7865de90411d627360b9b979"; + sha512 = "fbfc588e3a366190509948fa846ee0c075e91e4489ca31c496ad73cf3150d93cd1ae657886f370ff36acb211852b0644dd3bc446da973a2dc18f019752a0810e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/ur/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/ur/firefox-69.0b10.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "faab2519f98d53694dc7aa55191a6296f29baff7efc9484790a2a78aa7c6fef09e5a0384fd9235ef32df4d75a0a0a1150a40f6d83f37d487ae9535385ea48210"; + sha512 = "ec1cd0bea6a8a78ec6c8bf459d84af87958bf11835ded4c33a46cb721d37a0c56854bc754b5f4c13890b3a436d8c7b9746a6a421683f7845b72052eec9f59bae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/uz/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/uz/firefox-69.0b10.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "b71bbdf0ea3d19038cba328516eba8c49a5a36d29cb0e04151140c7e5b19ea982c7389cd5248d846c760d55f723b11530d050a327a49f3d8cdb371fd283c1a9a"; + sha512 = "0d8f70aa963afb07cd2a3eed5eead80afa7a8e4664411a781e2ed808fee47381d341b4a0a118b73cf19a3639d61dd36f47a10a5a4e88243ccf0a4930585aa02b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/vi/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/vi/firefox-69.0b10.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "d2a27da5ee81c6a46f3e8f4a0d21d37bdfdd1080a8dcc8f43b121c5b4fa6a5a544e8f04a6bea3204c1c8b18604516909a0d8717581d6b2f88a432aa5d04c4aea"; + sha512 = "530c31e84972d53a6983291bdf1a01a4528503f122f94bee9e3fd4fbe284bf7b92f3f53e9b119c9da678a9b453b6f64a054385b96af2bf7855a90babf7cfcf14"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/xh/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/xh/firefox-69.0b10.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "c52908654b48f79eafc96a5b4f31e13595383dc397564a958fe4ecea444beadaeeac88c1b1c3929005715796a89dca4e3befdfb6d02f4c1503b7e86f1deefde7"; + sha512 = "e2c3ac847fce76ee7754e02fe1bd34882e2364ec8773906f9884ce2806b47f5cd966fd5fa39229bf6ce67df43e803542cd6a4925255138d007b571288c8212a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/zh-CN/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/zh-CN/firefox-69.0b10.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "3fcb1f091af4b37fcdf29ce99299ec02cfa07927f9945bb27be8b97e9374cad28bb2dec9f03aeffd7334e9802f001c520573cc1d34e5670c2476ff16f758347e"; + sha512 = "04c3306367ed2284b08fcb5c8a8f0c5d3b447117a1195b50457d0e9907d262163129811e95222f307668f4c1178a4575c6d80f3d7ad68587630fb83ca6c1f9f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0b12/linux-i686/zh-TW/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/zh-TW/firefox-69.0b10.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "440464d74bb0601ac6d0868a2fce0592a1d49fc029a2bb1782e6758d35e7f7a3961ec0cc60e8b389aaea2dc42703551f7d31e3d1c569e485ccf58bb0e34ba126"; + sha512 = "cea2e28cec094e9672d849a94b65f925ffb44de9e8182961ba5fe5e1571d665a069c525ff11b9f61632b64017674266b109d5cbd032f552d0d99ec9fc347bba2"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index d9b96fb7e63..5d4ee39a4b2 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,935 +1,935 @@ { - version = "68.0b12"; + version = "69.0b10"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/ach/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ach/firefox-69.0b10.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "4239de26746d164633b7095da96a837bbd58294a4636d6bd3e4b23cb711f6cb6b1f56f1fd7d30938225f1532117da1d9eace309e2249ca7c6671685d1d9a97d4"; + sha512 = "9d036f8217a95ea3d601e10050ee15f75f6d3eea5f38f5a1ce0a773d92cca7418a863385555ec9112751016e4008672f8de79c17b7156775d7ba3eee2a4c19d9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/af/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/af/firefox-69.0b10.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "ed5e3724fa2c88c84b4bf5d4c38613dc99546f952b74ac2e9803f9fc8fb2d5dfc58f8ab34244671eba42adee1ac1e917e578e9625f7206bf3b4b58aa75a5c8aa"; + sha512 = "def33babd8a97fb1b9f9059a019d5c823e965f404baadc1daf3325a3f7437f0152585dd6ba13f67542eb7b1e7cb2f265986c7813c35e65cb79febba5636a6c5d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/an/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/an/firefox-69.0b10.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "ee87f64673037099dd29fac1d3c545298f4db4d12d0c8809e1f8ea6eddd29210edfb9e20346c0f5f747ba86335e123fd08d5b40b0a6d7ba2f34d4906dfda7f19"; + sha512 = "b51086111c0a2a989c6123729028b41a834f25bff19836b486bfd935d52055a8c23bdb0e79eb8718d86a4b4781ed6fdd02b946d2dc5e0b86de9fc2166393f1e4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/ar/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ar/firefox-69.0b10.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "ee2d65b077b464ac1a27e5ff24f33a303ec2a614246cdbf83cf84a7356f1cf3f721f6d804283c9fe2a47ffff1e61688de6129515c5fc833d60f8de2efe370f0c"; + sha512 = "d3cc62cfa029a7112aa8b27257e2b1b7c3adb99d56d3d749b19009be92ada130353f6d5bd8383b78ddd179417779d2425ecfa2d778a4752f7a876f3fbef84c34"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/ast/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ast/firefox-69.0b10.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "e9995774e3349c221f22d09413d6fc30bcb57db262ff311988f596d63702d210b904db5720577c06be4d53e2b95ade7aaa7980b5002ea93c9b9186f108fbb83e"; + sha512 = "75ec692ad8b8d56e13b6b34a980c9f37034b188a675dd0c975e598277fa919587a90a3be11867bd63db1c83a12876d10e2eeb83e5666f10c256adad5b9f369f7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/az/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/az/firefox-69.0b10.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "0fe2676b475fce70b5cf325d1044829022599962d1dc144840189f9057623bf575db1cd7cfb8b6d7ccce6588134c91bdf15cc6907fc94f696947a83671cee9b5"; + sha512 = "9f44dd00187942430c69898298e677dbfe8385a9e43d312681c7d487ae3353b0dd668a87945d41183bbdffd8bfe7331d1d752a594fa515372139385935134417"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/be/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/be/firefox-69.0b10.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "ece3b80725f7a2cd2a97778a64f3be788277fcea436151cf5221554a4746e7f9215fbd708f1d7634b974e7716c387c3c8914a5ce3386323c048353cf8aafe039"; + sha512 = "faf91758f3cf17f8dbc570195adacbd93a57f46f0750eabceb6e66df16dbf459670254712b63146b89be67442ba828d5506a703cd51bf3d7c42708ba30bba3e4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/bg/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/bg/firefox-69.0b10.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "5bb8489017dbf8a66aeae34299257afd9849337ab94de9d840db7d408bfefce3959ef08fff6eb2f5f8b3b5878c451b32d9b1ac9b46769149b8dbabeef1b38352"; + sha512 = "b712fdfa9643d00cf44129ec7d0f718ebb46e48fb568d70989b5c094f1a7c231247672620955f397b94e7de0aaa74893780155901cc1c4e26ba4ab9646b566e7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/bn/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/bn/firefox-69.0b10.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha512 = "fc3633d0b2668687410a0163e51eccc67ded362e5e588d53ab2d3ecc804d2e8467a6e935d1eaa696eda720079a82a3c63913803787e33d2b93016d1125f52ae5"; + sha512 = "9a41d3c3647f3c7c0f5d329edf70693f63835a5dfaf67df08d7937a2efdc89b4cae263e4447ea09e05453be4a3ca658a965f3aafe432cad86ce9ce754c4e5813"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/br/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/br/firefox-69.0b10.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "5e310958d3cabb6911cdcb5403d377baa011be673f3e69a55f4269ad427fd33e13a2b2c674e0bd221589feaeb26b91ac98d7cb9c1d5f718bd7a83c5779ad9e9e"; + sha512 = "8c3ee20552f7c85723cb8489cea7f64821619a09deaffba94f42c1b29c55894e40720cb3997791c10baf27c99ea11976741c30286e417b207ec620a3dee4c771"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/bs/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/bs/firefox-69.0b10.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "0803e0f91a6696b643e73ea0fddc2e58867a3ad1ef909a8f19aa03aedfb2dc6197dcfab8bd14d0472783d10880e1e23f19720192fc22ad42fac00dc02e4edf0f"; + sha512 = "348c1e68f57f2a09c134452aa110b39cd638d97bb0b8adaef7f57210c9d95e3a8a6732e72a437219e517799835c4d1d6332af54706239bc604f57e166d859898"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/ca/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ca/firefox-69.0b10.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "ee6cb26b32ac4a103736432007bb48f41167d52ef89ab27fd2c9764aea4370eb65d88b54a06c37730c3c4c823b02b2519109d9a71d096c9a68a82e86305a01f9"; + sha512 = "4630f3edb4f435dd169335c67477ceb6e42f2d8161dd9559ff58525fc117f7cbf45da534de6e160bf824b3b4b41ded3d3dcac2782f2a208ab7d0e014b4ba40ed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/cak/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/cak/firefox-69.0b10.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "a5547de0ea1ac5c39aa97550159e82c6595241f6079a86bf832c798e3b4f215a6869c1e43e9ab0e1f0d9ddd54133ebc6b0fcd20bad39f5fae9d30ff641c5397d"; + sha512 = "2cae224ee70259a60c0868b83ba933eb43867ca0345bc0fea9693dc3ddcd9130d7325ba953d729778e7ed0eae334b200abd11dc1e903183514c11475e0a61269"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/cs/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/cs/firefox-69.0b10.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "b4ae0ce992a4aeb6d16ce6f56ce81887557c95bbaa70636e1074c9d3e2766400413cdcc36c0a5994209dad20dba9a6cebe55011eca9295203aeef0a13b74493c"; + sha512 = "434ef8593e4771c00b772ef3be672fa82d1084431882a6b95011cdaaa04035d08bb1927ec0eafe51d44e7028e2038f798073c5287335300989866ee7f7347ed6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/cy/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/cy/firefox-69.0b10.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "d1bb65cbeac9c4bb7071a5963cf622d36792b9ca436b89e0d3f6bce3e718c2e6365364d876379ed5cff908a38565f593af236341b9712d54818f1c359a55cf57"; + sha512 = "e26e3a3e571efa96d03169f17bb7e0920b2ba160830440ed924b6b60c244d31297bfc72d810292e07b9abeee9cb4843f0c2369192b827362fd65bb3f9da4c577"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/da/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/da/firefox-69.0b10.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "a9b46e51ee7e941414cf6ccc3d9b531ec5e621966515d66f7b0673a7b2be548e8cdc7f783ce0a756e4b50ce2d4b17dcc0dcbdb8c07c97d8ad70a44264155cd69"; + sha512 = "4cac02fcb2efbe5736e52232b2cc6225572f9fa2518129d501b7d86d782177b4581d9d0ccd5d90131a1e2d676dc43ce9d0841f036701cbc543d379a24ac11fbd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/de/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/de/firefox-69.0b10.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "f591e1ffc684f428fbae4b94ce1086a27c9ecea4e9528c18e6dfa8af2a967ff8bfe374984390a6808c2bad656e13adc7cafbb76c862a16f77804d1b4fdfcd29c"; + sha512 = "b8279a32bd29f70e9470707c9d8843a39c9c7e95c1b732944bdcdcb1fc383d33881ab40f2d00ea36bf01ab7501a77e754dbd2230187fbb2eb0b324cc155a4412"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/dsb/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/dsb/firefox-69.0b10.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "9947092a150bbef82391521ef36dccdcdef9eafe5b5282af5f34d28fc0dd6d173e146ad9ac7f7ee10ca02e4a5ce5099f29939852565c3cac95507f33a8f23e1c"; + sha512 = "761e8e0c9414a8a72fac258d52729ad4dab8376e249218ec49ceb47311bd798346b57902671ec394f1ef2c15b641c47f9741e67c76f54684fe4639b609e1700f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/el/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/el/firefox-69.0b10.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "a806b3ec254afe96748abf2f9c970e5e5b2ffcb7f7c70e1c4c0c92ed60d493da5cc6b22a5bf78aa1de8c36f5108e4283ed67285d53ebd737d86950c18cce66d7"; + sha512 = "ed8d934d5c7c3bbc1126f04de045cd5f0ed9a529a8d4f207ff115c2e8dd4e152c801e5a4aa0b37fc10dd8fd1f1e363b78f21b4930d49e25649264b751c1260ea"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/en-CA/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/en-CA/firefox-69.0b10.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "b3967481f6e7f4e03ab431d8e76ab8bbab286da468897e75a6dceb6ab735f36122ea4ce85867113143019d3750262f705d1f64d59669ee590bf08db409788c09"; + sha512 = "60689489f53a863d55cfbef67499220efb00aee32ee6ea7054f41f14df43c1b787a04ea374e0ab950dba2110b2728b980fdc46f97136614ef8b97eee210eb58c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/en-GB/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/en-GB/firefox-69.0b10.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "7c68680326ecd1d0e7bbd2ccc90d36623434e8019c5bc0968227e15af92b1f07f65767fb2c78a5051538fe79a17bb485b3b697774d938fe3ca876ae3a2e728e8"; + sha512 = "c3e10c0f0922e4bab3558cbb6be106278fa782b50a0fa5e38db6adf7ff60e88717af15437e48ea23b15762424d89a94361663dda8e02d6fdf9d6c19a5afc90a9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/en-US/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/en-US/firefox-69.0b10.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "5cab4ea7a8d3a72e6fe1535b21f1b48c2adb183764b71fb230d051b2112ad2466672046faf6b0feffd4b93dd727ac6c824ff420e37901b6e00b6a32b91c830c3"; + sha512 = "135e4b561e311d6132164808272bd689b486b840d652ae0ea4ce9a7096472836fe798309d0feafc1ab8cfb32b2c72b396a63734b4795e591863a5c89bd49802c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/eo/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/eo/firefox-69.0b10.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "ac913d42212452ce632c86debe61a27d46f682d3fe1c41c61724cb0aaa5ba3b2f63867d0addac46fa3f71d42282dbe3a3e5600990a1dfe611979fafb1c98f4a7"; + sha512 = "8991bccfb8cf10e0df6a2288968b334edd0b71a4030c0e008daf124b6e5256d73dbf5b5b376570852a0fa338570a9d286f24ef63dcf039842cd0fb1eb5901695"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/es-AR/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/es-AR/firefox-69.0b10.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "fd003ca892cb26d56f6a3e5553a108c29180310203d095e8cd428a2bf499908c24f8e55077ba443bf9dea6188025e82bb18ebd86fb06e59d3abe83bd1fb23171"; + sha512 = "57a8275cf23e29a9a425ce23ef3bc787596df0dda95d5dbb2673bd658ad0bdcae3fa554cf51899d5a2719ebc218b70bda176c3467a01a7a4da7a60678f668101"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/es-CL/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/es-CL/firefox-69.0b10.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "d5144d975a73ab85cef8e271d78f408c7f4f72db7df29c4a7b756fb6134a2a0dec9eb77472f2c980c2e290cea6d59ac9f599e4e946844c0fa0054f79fb201fb2"; + sha512 = "2528855037d5a843895c639cb0d2b353784e59dc2103c4175e085f216d490ea037bf440bf4bbf926301143079a2885040c294c77b10f032135fe070b20e99371"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/es-ES/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/es-ES/firefox-69.0b10.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "586ef6cff55662f1287cd5ab7926e9f269f8e337432d3708f66e660aad348b88cfa5ca28579c703892695091501cdcda0df18553bfd16ee13c06b26de5581d97"; + sha512 = "4c5c6cbd1fa3680489bf6324e975bcea43429f7b55be853d2523daa45adf1f22772d0427f9df005c7e3c22543830473df82d4da818aff2ff72c96902d0b72e5d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/es-MX/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/es-MX/firefox-69.0b10.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "1a5e2bb5f11d289846214261703fb1b953fbfcf5dde959ef769cb03286bac9a9ef93866000b00828b49c79e4db9aa620327b4f77c3a44f7ccad158a66600cdc3"; + sha512 = "e2400bb17d7df8b0541de8c391b28d2b5e7ee9523dc73d90e9d10ec578b3acb58051c6bb510b18c076b7dad8a4b4a7ddb605db3af318022c369ea78cccf3c441"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/et/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/et/firefox-69.0b10.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "6542fbd6db3f5b41a878ad1172da004407a733c7b6cc19688c1377c24ce5c13ad8e6972d54e02acede345ce948c34b6c164589d452295c0be723145615d2743b"; + sha512 = "ebb2bcc463312c187d2c5119c4e0e5580a78477be61b76a028a28791398311e0fde3ddcda039397c9d63f8658ceb7490b62fb6e69eeed34c204e60b6867b216d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/eu/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/eu/firefox-69.0b10.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "bfce7ce5f0cd03a065ec995f9bbde6a797741b1e9fdb9d7ccc334a8e84deed04dac62e344a05f1ba29f8a9487866520821eb8da02915e2921d0dcaad0922924d"; + sha512 = "8c3796a5189f40324b2227750ea72b09397df750a154e1056a8bf9b7933a8ad6935a64be569641bd391fdaeb9d10cdd330c0ad031ea012e9a64848d8a034c650"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/fa/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/fa/firefox-69.0b10.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "e0e0ef6054925fa5e8987ea9f802311ac80d0290107bc7cbbf8141ae6bd191928cd12a17331edff49ac59673a8ddbe5b35fef6308957e57d6204350ed13b5e97"; + sha512 = "239371297c2524142842dd18b9de92c8b93b7fff82c045599d19effad81344703c65cf77e1db4c665de2b565cfe5ae7ec8a7589b68ab25b5ff0e6ea90b7c4cad"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/ff/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ff/firefox-69.0b10.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "e224b2d00f272c997ea127f4664e958ae7a7e795965a07beb4ae082549e2f7a866eb5489a7e82240c00fd9f21223d82fbca0f3b708b9c632a98187896c6f1424"; + sha512 = "064babe379e9753394acfda8e1a9ccebbf1b980ceca6d0898e897b5ce91d06c74fe525c5c2ac34d9527c55acffac5f70a88ee5742ab363e3f0855d5d851bf56e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/fi/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/fi/firefox-69.0b10.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "294d654921278d359cf174e28c9cc6cfab1800caf42beee733621ecf3f6b27add20e036b6fc7f7f6fbc6a14acc2ee47865d28f14999e88fa91b5da5248282f8b"; + sha512 = "411501345e1f1f9bff9d03f2e97e756d750cce3fc753be5572016de12bf18c1b6be716f39b0db87ebaeed6bc300264eef9d1624d82fd289767ac32c2765cc44c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/fr/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/fr/firefox-69.0b10.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "c855b9c5880229379823d5a3486f588cafd654f75cd60ee741e3b1cc3cf84acb200f0a62f7c17d2eea68ff65df83a6b4789b11f027f56d166b05cc45d700ea71"; + sha512 = "9bd4161f31256e12ece7d5cc28eb78dc0bf2249a6643d6d962524582b10a520ce3dbb578fbee803f9f2fc301bd57adebb7fd6f9d3f83fa7c7fbb30b7e16960f5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/fy-NL/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/fy-NL/firefox-69.0b10.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "f0086a1455b5f6b0ba116fec9dc3aad31f0165edec2d8ae84258d624142ca1651dd30a8d4d4ccd7441a81b9def479836643ad9ee753eab125d70932c097c1cd9"; + sha512 = "d14d82ba14694de463c45aa32ab5782643233c12591a1c48732067a4366f22467e4c31d231164750722f2b6f6b61b2a8a2378e866b55de706ba83052cefeb24d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/ga-IE/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ga-IE/firefox-69.0b10.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "3488aa241d4eb1af1ae759ee1576fc22e44ba23730b24c78018d5e975b236206d19a1724bcb1b9c28bc3635f3a024f55fc5ddc8211d8803f3a6957e0c3c05011"; + sha512 = "1fc14f670747b47d6b784e7a4f1875c90cf566009f084e5923af853f4c46686cdd0d66eebf410a4d9f024b260af57151d281014303ce93226b95c20bf41d1944"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/gd/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/gd/firefox-69.0b10.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "703b0c668354a90ec5960bd529dd017d5fdb5c014ea9b59b4f8491cdb6612421c22c5e14083074e6d17ad5f4293c7cf5db789ba86cd3ad27997619e6cc95aec2"; + sha512 = "60bbe1d315958353d50dac327a358a3c1b52f5f93ea93262d640d91cf85207f47fc34fbf689c9efb60ff63b8cb8d7e991cd7edc8effe2277c8b70bf026d36608"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/gl/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/gl/firefox-69.0b10.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "0412e4011dcda241839eddb2ecff5b3e67399891d8ad3caf5538ed7cacee3fd0e5e5dcdec97b6afa92e50e492c4c3b3fb5169aa4f167f4cca58e2adc8d081b3e"; + sha512 = "dc13fa5d442188edc445c0a32e0dfe96d6320cddf6369c6a70af52f77ea375d98b596655cea8df02c81c7db4a8fec9ea9e48cef7579665e7c4ef89eef9022dd5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/gn/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/gn/firefox-69.0b10.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "693aa9153aa73a92b00a56aa331c05f0a09a2c4ef8315cae07a158ae709d9182a07f36722fe2dbf52959fba75cc8494ee81e71a58b69d6a6da8c638381fc746a"; + sha512 = "23c145e14f86300430479ab5253c854921672341b3ab0c5748bbfb1d7f4553a22f7e7c76ab3d48eb8110c9a69caa337cfb0c4cb66b53b3a267cb077375449897"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/gu-IN/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/gu-IN/firefox-69.0b10.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "df97e1a087a21d7e8f478a50f8993b34d82f3305b3eab3caccfc72927ca9b6f03e431f9b63aef6d044eb1905f1df1fc81c9cd4bfbca4c67a1d2f92d302ca3e20"; + sha512 = "8738fe7c58893724e6a2a5b46dd888823fa0e1621639341b36b120913f28626f9ecc71e7ae54d16704a411f9c58908ff4ac7f77c8c4622f4278969ac7fe665af"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/he/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/he/firefox-69.0b10.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "aa41c1dff2c5e2f8db9557f1632c1cc0739bc02c606775b602ceef7ea2f9f560bdaeaf3785654aca205c5dc6357c29c7292b1fe756ac8fa0ac2d1d01c15663ce"; + sha512 = "09fc26d62b294e76662e005980cf54bdef3f5d0b38ac83da3fad4b85bcc0bd614651249caa4a37bf681a7f1ff03470e79980216f24d396833fcefc808ceac4bc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/hi-IN/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/hi-IN/firefox-69.0b10.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "53e4d3fc6741dfe72486ed2ca69ec673419d1d6c518de7cf494a7c8c1165a08f6a6113c5c1c7c86b7cc7b2c6e3413eaa790f26397e28dfa86d69bf91120ba02c"; + sha512 = "a51273d8cd8f4ecc4d7e5140daec8d834dbfc76567a62d92ac5a469da733a6231fc6c91e5182bafade141366936080499c51f6fdf6d61f023292c0fdda186507"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/hr/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/hr/firefox-69.0b10.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "3c3ea9b770da15c1424a05aff6c87f5699269831c51bbe846caafceeb0a2401201f01cdf4d9cd37b84582b6864a9e53655bbd0f42ad19cb669ca8c28c73a18c8"; + sha512 = "19947b47816f7172ce94fc1a91516520fad41fc09fb8d5c25828ceabadd8506a2d5dcc6f1e1f32c43c7afff48066bf5729ff9c831dd5f3dfe1e509a3874c4965"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/hsb/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/hsb/firefox-69.0b10.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "b1c2285b03472cdf88ac85ea1b623a60d976fef85863e5614c561fcf7e9fa05ddfdbeecb929e01d5508106d51ed2c0c24400b6447bbc357be147e950f0d64339"; + sha512 = "1eea8f2b9904f4dfebb08c718df271adf3bbc9b7eda5d0109e3cc5e34aae7688e1e81769b9bae51c8252b3d69aa52a9b740e242137675015973fe2310dd4b92a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/hu/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/hu/firefox-69.0b10.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "5a5bb5c7b68af0faa608a9ea8af8cdb0bf8740e77766bfac26cfe25963e6fc8492a88e171e6299cc7c022e2f3d04eaa22df10acfcfd82b42c72bec28466fe449"; + sha512 = "098bdd04332e0cf675e3cfacaace38a40920fa58660098e27483555ed5f55b06f9dc8e64b38a6bc6729d7e2ba39faff02a7f90cb0286470bbae26ea523ec5fe9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/hy-AM/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/hy-AM/firefox-69.0b10.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "8a3f3d775bb16ca99a58ac819efbf256fc17acc542f7cfc227806b96bdf24ea6ad737a4b749134e00989b7777cb35000dd6b2d78085ed0be3dbe8065f174171b"; + sha512 = "3228e47d2e168b9b93bb96631345a41a0130eba87ff03f8b57c0a71377f011b208037df5f03936e9d8543d994872bca26a78ed19f12a52c723063775f76d306b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/ia/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ia/firefox-69.0b10.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "7abc1b715852d94a9b5e8e02b7f235d30d0222a297808dc6cc24f9567fccc3478b8c689e133e0595c5c236b0437a6a546776898a683c34cdcab4707968757c68"; + sha512 = "7fc1f0b3d8a4957d04080de201430af03db69a56082b8dfc07ff6992b10e0c357693aef3e6f1231eb3d3bf135218f6e77e79e000f329da7c8cf9b144108c1248"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/id/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/id/firefox-69.0b10.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "23ad16f9e5d7ffbaf4ee487c75facf91b0a4fce7ce001e67890f87ac805c8f9f54aa6dfb662bcf3a7536d6fbf1eedc5f393ca6382b89039a1b1945f6544216b8"; + sha512 = "740baef5685aec6ce47740e925f0f764dfaac1a736a634c119bf012bec24e7872238cd128d19f2f1d59e8452f54e95a9c10816748b4ddd8b7e469f8bf1568082"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/is/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/is/firefox-69.0b10.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "567af9d4865c9796dd8c7c2c1b564c897c35b387a7da28ff68d45b6a1a0258121a8ea432e6972e7f47d32c64c3bcc99d16f43547afc8faba21512a64e0191d3a"; + sha512 = "10566dd3e42d4499dd82900e160933f0d66773576341ff7d39ab6d1bcef2188a291856d9f3854f87f2086df77b914f9c30893446f4ae0f580d07613ce6ec31cb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/it/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/it/firefox-69.0b10.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "bf6272b515b54020cc3301136eb134b9ba3943d5b6c97aa7ad92d7b429d69fbaf2abd2af52bf5d111185f0f62cd174a52d89197ba6e22dc7d3a4338acdd737cc"; + sha512 = "67e67041f213108d6fc2fa6fc5144fa20c8de19237669949a0be8786885c054710a5971bb826127c75facf65fb5a5175a349d60e4fa7d0f3e016eb48f434068f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/ja/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ja/firefox-69.0b10.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "e60909c2e80c5351f6ca6f00452eef4069b08ddac80aa4d0c2e2dedb2f6a8965fb04e94f0334aae9c8fabf7d611579357251e5931e4cedb5edbff32a6e735539"; + sha512 = "24da0b3cb0f81b593563dc3eda3bf3559357d2f3f1b9019772850bc49f410ef4a12800e0a54edfc888c810083f43d74757359c82438498fe20853435bb7cc066"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/ka/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ka/firefox-69.0b10.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "a3f6f68b741f8260adbfdde61fdf6e216c482303f7f10c46355d020db98cc9cc818dec959997384339c1051a5a7eb79371412dbbfbc416ada3c4d291fac70d8e"; + sha512 = "9212744cec092fcf7440258f2d6c07f680b6b89bb73e804cca0323d4d86b4d1c7ad6bf2c24ae6cade056d9fd742fea5220847bd17203d319ef87d1d015af9179"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/kab/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/kab/firefox-69.0b10.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "ea01ec4928bbc83cc3801fb166062b5875a039046f80337efb62369ae93fa38e0dc9f8170dcaa9699f98557f9cda1b01d007b720f47157f2217c936481645fb9"; + sha512 = "dc48121c91f66d5c33c7afeec4218861cd8dc0aef232a4940048724541269a22ecf21645f032a51289cb5f362dda8b8073084de152337cefe21c3e4c97d0744f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/kk/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/kk/firefox-69.0b10.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "551281239137022acba3426f790369bcce3d8372afd6bf62f4077fcf640222906461527fc7c339d7a2355a36278007180742af74ec0d27b64b25554057562015"; + sha512 = "c64ae21572eddf9b97b0fd3c97d0927229c54f42af3fb65bb3a8e579064937b76f4e3ac32ce3debe24537dfc5d6aaf3615f1aec7289e62a043b1aac7b2df653b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/km/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/km/firefox-69.0b10.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "9e3ef62fb17222b701e3f348fa5d48395a1294f762670b214052d0434865c7b10af3550ceb384437009a940241c4851e7dc57ddbd8a745a7b3e4fa3dceb6c346"; + sha512 = "8348b595287e8b22ffaa78d50bda5550ae027659f91c83317f2307e180d8aca29b8e58ac0b39787e7abdbd66ca88cf44fd937a6eea2064fa8df9173ac9978898"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/kn/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/kn/firefox-69.0b10.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "654e866b0f4ed8f2c1582ca229e13f4ae3c5db02849e28bcf25993c4154ee436429e16d265be68c08fc1b328ce5f349b13795f9fa1794346679ffad057f4517e"; + sha512 = "f7a2d48278c9c2da883f889c89ab83778b2d9a43a32ce6186d7b7c5428a62138689cdc3182fd851da4b992b51902352f0e28c3cf7c9bd9c014712206f4c21c11"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/ko/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ko/firefox-69.0b10.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "2cd646fc7261ac381a7132b881ae5bc02e351797a5218f4ce4c227dbf55240fec4cb4351d6302c79365376cb8c0b2b1d5b2c331efe0a80bd36b6d786178598b7"; + sha512 = "ef00c8295bb7598e0fd9a9023c4c404759e41436685c23ef0ae9c756bdd12e1cf34ae6cec4d5327807797128a3f54f105804445b11b03317ffa0e2495e262442"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/lij/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/lij/firefox-69.0b10.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "22a5705ee4868520fd2e3148a9327777fdf5d87f459c565a88f266cd0bc0347452dfd7c06c784c6f3428dbfb0f682ec50fc080aa17b4c798455c5f9fb417e59f"; + sha512 = "a7927a14c82f8f095e36e5c1440e8e95bbd8906bb2945c0f8b6363b93290d9e3195c15a48d0a3e6ee9da44ff050c016e2ee7118f1e1f2c14bc234efa450fba4b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/lt/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/lt/firefox-69.0b10.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "b420dba741661ee320a0556edf98617f42a9c8bf3759dd13041b8fdf05e82145f1c4d2b59521719124290918fab53dc2182a123e3f1aaf1ab83cb7d187866f1e"; + sha512 = "0b382fe2188a0251cd0f45a4ca6b9e1e057249e01fbb2fbe76a34035fae4fd704f1eaeb75319acc75df1a94ece00d956b5886f07a0f5a21a5e00a6acdbd8f830"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/lv/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/lv/firefox-69.0b10.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "3ab942e922592771b1c02e93b110e8a757c8bca9061654110d08a2181221d3697a2d385fce484e108bdd44eae4d69043aa02c3781deb297674c2671a87caf874"; + sha512 = "68cc69b2e070219bbd23322480cf232bce9daac37afa9b7a8cd4d8f512d82ac170cc3926a0245218b6bce0994aacc54d8f3dcb9ea0a7941e9bc3b707787ad04b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/mk/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/mk/firefox-69.0b10.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "f595c839941e6b02a6e312842a0a6effe80acb81d69445b5d3a3ccf559c953de20266343362b87480eaee809c5baf9455f30ecfbd7a148b5a7e753e421b97c97"; + sha512 = "91fe3a635b0cbc401d5293c04da69dc3a59aafa062be8376e559858dbe9aaca49ba3826fb7486e8f12ebc582bc96a83268ed480b95324e008c77270dcf813f18"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/mr/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/mr/firefox-69.0b10.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "5e7d0ddbc640ba9e9f31c5754842bcaef5d90501f208a387daf5935a9be9d97ff340bb551c7fc5dd9fef9da7877fd3e6558fec5dec9e0eebf0d7ac5a367aed8f"; + sha512 = "8315f540933ef132f30ef28c744fba49b30fc4152d2929a7ed673939da5dc1c4de490bccca83a33dda2ebcf27624ad1892e93756555ee2da8395039ce76a5d38"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/ms/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ms/firefox-69.0b10.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "7c9c34344989bc919b842dbd02c674fcfd18f1357794a91500f237dd7eb58014e135d4124533726a92db69fc6e69b40d6b1e3bea425a9de649b71134e70d16e3"; + sha512 = "fa8272b4bc3d1a6a032c987331bafeee26b7f0881a75ba1b788171441a35e1ca95bf9dff46c529eb926dc867b524590ecb3262f2de04c0fcd8ecfad806955a6f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/my/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/my/firefox-69.0b10.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "30e13316e102d857b0a2c257910443cd38cac26b0d6b40e9b352a7c6800dd2890231084b04a9ee32f6eb1bb92a811d5cf54a4c4c19f8edf263d5a890d614953d"; + sha512 = "b46e40abb59f4157800ebfa9e79a5aaf968fba405a77dc1c7360965d5d690139d8ce1f5735e6349a198c2cedb0a1fc90d3cdaa2d414e0800a7130de8c45753c8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/nb-NO/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/nb-NO/firefox-69.0b10.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "c9550a3c280670f8753dbd308737155f34af95e9622dc0201d96d1a1ca6e326797e6f0c9889893c34dd43daed6f6e6bafcd0b8ce2fabef31dea30bc6804dc95e"; + sha512 = "469a56fd2380f457bc84cb2fc96fa580ad0e7150042b6b9e0ebb27b29f315f34f8c2e2caf42284cc184531e392632eb52773be0d080f32281c540d81f3b63752"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/ne-NP/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ne-NP/firefox-69.0b10.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "82bcd5dbb7e227860e0ac8caacd47a1cc32f1e99664e82e642612c5fbcb7906faa5c853dfa1fc347c4da200064ffdce455935f48d524d0a4c27121d58c1f4bdd"; + sha512 = "88540a7aaa06488b3252e898cf654fe1031921e27e98525dfb5f44f770d60b43b5fd5450e5321b27b31e73e663b14fe98716f25b7db5b4acceaa7bee55f4cf79"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/nl/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/nl/firefox-69.0b10.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "9760b1e715752ca64e539570c032ed31c45d336540001dc1b7505c082f2f048b52038c5bdb03138e5e7ce291ff5314909e438974dfc848b66fe864fa9d5e5ac2"; + sha512 = "5fccf7ad91b99aefce329b515bbe5096141618a96469912fd32f621c98be17acfe579cf03137d96cdf8d8319c4ed3d4b28e8bbe1ec2f3251b8c004e19b14b1c9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/nn-NO/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/nn-NO/firefox-69.0b10.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "b1712c4d0e87c77a21f1da15ac86407c4e27a8c1a7ad7882e08fd93f6ff24c029181dc14263fde6f27329ea80e3eaab8023d31fa63c90cc4aa7d5f4a43692f17"; + sha512 = "7d9faba6bb18f19d9acab0c63bc4ffcbdf8eecdbe345943674ff2ac9545d24efae2cfeaeb34ddc8e6f24bdace18d6a6ad77d2ccda7518063ee1cea2e66382a8c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/oc/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/oc/firefox-69.0b10.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "49b2a7299c9c884d3180513b4e8f325a610c839cca52e8a1b9862a0e759112f1490ce109a7c7fc08aac289adcb73176183d1ff693720737fcfc80296e662ccd6"; + sha512 = "fc14d0fa30457836c0b41950df190f931c6c011a569f9160083665deddb33b6947d92485ed1e2c3adbad6a9bf51480d64c108de79a39889a87059020d0748f51"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/pa-IN/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/pa-IN/firefox-69.0b10.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "a1cb0f0a3502481a5f88cad6bafb82fa177936db8cbd534be954a15bb185d181d0959abb5b2090de6225bb14741971662aa58a3b362a26b27e2b6f805764c2fe"; + sha512 = "641580dc6260a863ee948e2fe7a814e7aee991efe556ca60cc6ff0074ffab369ca9dda05d9c3028ee22d000bb7cf5264dc56cec844f917039a7e2193b2709142"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/pl/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/pl/firefox-69.0b10.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "f7207b2839d9c948ea15d9063fac22f16824072a4a102bfc41a7e31962f79bb60fea5de01f0c780942f33ad7066ae7ca1b7a03a7be13a195753b1db3ddba659a"; + sha512 = "467b4c1f71cf5732834ec482f0ee1afb3d047b4a25c6a38928fd9199fed3598e94eb34ee3da7d552e3135a054d13423d94dabb430b19d00f73d0c99d6ea1df8a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/pt-BR/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/pt-BR/firefox-69.0b10.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "eefb516a3322efd51b046838a86ddbec5e65a87326f3474876f6e42cfd8bb138d2c5bef32e9a2fccff61c01307c39e7611a83acd40a9e9ddbecc473d4b506ede"; + sha512 = "af6e8ea04434f992a88c8a2fde33274776841bba274b0249b21f3ada6d991fdeff53a5499e0c92ec54e4f1acbd52b5d8226af89cab7641062d73cddfa56602f5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/pt-PT/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/pt-PT/firefox-69.0b10.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "92f417c004802c422474feb25b69cb6530df5c34f36e1a1a2feb62e87d8202618ad033ccac40465e903d9c85bfa7cf30ca87335e082af6518d6cb114bedc4cff"; + sha512 = "238852418c739d91ee6213da7c3fb9be47ca2c2f1ef13e459ebd7219814c6052147a9b8c37aa2f09155a15c84f281c20a6f23b53acbcb20ccc92392347970816"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/rm/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/rm/firefox-69.0b10.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "04703dda30160f844f8c1475caebd9f604cbbf05f522fbe1aaf841d4a335e295372a4f26c2d07ef24fe07358699450ea13260de1c97e49797f745a484ba11226"; + sha512 = "13f001cc46a461176557a14de16303976f6f6cb91f778d6c9f1bb6f4973f2ef939635c28c64eac24ab2318abc558dd8b7b1b71e3ce71d5422c13fa0508900c49"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/ro/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ro/firefox-69.0b10.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "c4f5a4a4fd04f2536f3bfa303a05bf78c78c0b7b22f4f1d975baf3fb46cd9f7562db151e7c321e4260dcb2efd9bf81e751a6e2ceaff0e3289c5e54932973cff2"; + sha512 = "2f454799772e92899a138a32702200c8a261e653fb0a9b588e312091e5acef92362eeeb18bc26ac62e6ca093f1ed07e7839010d07396754114a0b989d5aaec07"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/ru/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ru/firefox-69.0b10.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "f2bfeb0c11cac02047c2bc4d29135cf56a4d67eeae45bbce6394a0b496c62fff54b270f23024031c5770cbaedaf8ea95e806effaa0d026434358e5a593c1b4f1"; + sha512 = "efe333e4abddf173a87bce8e3b82a5112a2d36f5ae690c5ad09ae668804ab3dc67a6ca3fc4d1fd49ad9591a482a5e617e4f897aa6ef59638920cd97e863d8a92"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/si/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/si/firefox-69.0b10.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "f5c50ad106a1c9e4c0182c62c23ca088209fee9b5856aa77d399ace75c3800746c9c79e028dfdadb6094aabc680c129c7510d26d7f258a9c9409630081acbec4"; + sha512 = "245531ae683a796db5628becba71ba68e389d8d9646dd678a08327e41c66d2f1baf9ba223ac70d19eb110d56cb932238d1642ab129989067f4e9fe87b8d73f19"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/sk/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/sk/firefox-69.0b10.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "d251454b2078ae1b6ccb5252a9b88a057ae94f747e207832e3e955c15d9a2b17c5cc203cd5fe7c2ec56e1a326d1758c8012948a42f4c9d7cc5ef2c84fdc2f4df"; + sha512 = "633c280502541f20572aaff136e0e7a2f4ca2bd2bf8c286703688ebd1fcb4516933ad46761b9bf90da033b4085985ca96e3224e8fd30d6b22bc2d531ec9195e9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/sl/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/sl/firefox-69.0b10.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "a99e992d5b71a22e5e9ca260b0c45942156474ff48da53b5cc02785dd84dbcc381b94e8b2d44d4568656c588c65a49e75c2d8c6257107e345f867df33a3c8c3f"; + sha512 = "0fcfb99cfc7be32f2ee53ec3d5d3cc436c6d423c3570e5d2564bd9e662d2e1b13339e1e63a702943b54de4374c756fcae5c6ffeefb5d63a962b5e16ce69d222b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/son/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/son/firefox-69.0b10.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "3669abce71819235bd489ab54e96107508b8c75ed3c29d010e36033c9ec4e6d2a440e1ab41f212d52436129c7d29209223c5cb8bf7a855bc5c0ebbe4e71edb5b"; + sha512 = "da0321adc6aab116cdfbe1a9e67bca1e4eead2612827c783225badeec0c25af867cad573b16d4c9e052c325e922c1cfdac506fe77e707a7e554bb2268380ad15"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/sq/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/sq/firefox-69.0b10.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "2f0ac03412be6e5010ad0647c4be28c9edc547ad73baa509bbfc7fdeb478c9c0ad87ef6698fb0d6a60718109a57f5ab58b0ea16a997258c01dfd463ff5cf09b6"; + sha512 = "d3f30a04a94669b0a4cc2f0067b6f15431de64a8e27d66f700274f498f4a19121fb3008a23e14c8e6949f9c261bcd4669a0afc613d4c7dc08b3075cbbb61dc79"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/sr/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/sr/firefox-69.0b10.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "43c708b130e0319e9fe2ae2fa2162aa1caabb3b41856fba34bf0ca1c2e77da6cac5f7c5fa3e8d07c0480634aa04a38b2a5db07433513710e7b04398e9a3360e1"; + sha512 = "3c85221edfabe9cfc95a8d73a7435e8a4273293a4ed79d925059f12f7cff87bcdbf6b48779377bbf828fe3cd2ec841c3e0720d69c6c97b5727c27b2d3a08d42c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/sv-SE/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/sv-SE/firefox-69.0b10.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "1914a95197db1796ca17e8d8a511ef687329ffbdfcb0dddffc4e1963c1251519b0c120340f730a04171be57f353f5c29e7f3a9c1a7b8c92488a3aeff9bd58d55"; + sha512 = "b88eb668b293a98f17956fcd48af915ac077c3f5c2fa0dad895fa4c05c577f0c56fae5ed2b4eba22518c979ba6af768ed92d8ddbd17e49a96388f36155388e98"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/ta/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ta/firefox-69.0b10.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "af327044ee1c8738f5e65a231af3e0ef74e82491b62445e5a9fd2bea7ed4a05451e46d2cb572b95d025c18616ffa662c3668ab6b1770abba124b976050db9e2b"; + sha512 = "b70452ca9eaaca80a4cba956037e67e236d1663a6a009193a4e78f80bc77f5d2fe77ee385ce6ec27d1356cddd59017741aaa9f78f6c25e2b706064b0e22aeeb0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/te/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/te/firefox-69.0b10.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "51f7975194f153c708e2275992daae1b4435a2e8f159ec344585a9ad759719716fd6d8a1ac10a03dd452faf5a960df2a1b580b74e83df6673a87b562ba6308a8"; + sha512 = "57e762c6ca3f3c9ea6c6b0088971ff8800203d38ca90bf65801a3d4f84f44e836d7454051e609f3b7bb4a851ba5c57a57d9781b81b872209bca2df3ee23283c4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/th/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/th/firefox-69.0b10.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "02b651d278898a400474ac59f5def40eedd8c2502d13882e3309256780be13dce4374c75f68d98db3a7555451a5b7d2baf5a7add1733e359ad30fcd4122e0a44"; + sha512 = "4cd5b8a3b6d77f6e3653a4f9a1eaf36a93416f5c0e89c39c97863304227ff33363853d27174a90bc9d5e54c4b7d3c72b3adf2a09b2485655d1d24f7bab96f7a0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/tr/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/tr/firefox-69.0b10.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "bf1e0b7170a86a058f117dc10f8b3f23139a7f7f1b93ccc91619590b9b1fac56f525f5924d6ab331cfec1e0e2b48bbb88b78ba184f7a88cdb2d9fb8d78753979"; + sha512 = "1f697f15c169a0ed5595699a20d37a3d6034d4ea2df2aa02dda2dc73b3fc91c07d8c344bfdffac5a4a6c4a44f016c9246dae1169c4ff7fdacfdf9d5093a4e353"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/uk/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/uk/firefox-69.0b10.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "aa043dd41d2a3b7e670ac81cc0da3aadb1a461fc6957ce40b53e2f2b37de98a5e04146010f49b6d3a63136efe490bfbbfe4676ea353a161e18f009ac5b760e6d"; + sha512 = "cc6c67520fa96593cdad128612a291e8b6c78914ddeb7088036743173b99dd3dd94a4670ce9e38e265591e1da95845f448e22eb8f0074877863dbf748f9967dd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/ur/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/ur/firefox-69.0b10.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "e97b0758d937d9fe31888d4f1c12ce090017a2b9457005d5bebb4eb5b384adc570bf79f7574bf5eb292081763179c16e98d7bb54acdb5f8e494930cb58388035"; + sha512 = "e22efcb9c9b36059209d40f1bf34bd65307b1319cb6c51a12c99684847228bc8cc139ee0ba7888e87042ac2b5866717e661b4f4e2bbd30f46dad6f18ab5c7df8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/uz/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/uz/firefox-69.0b10.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "0207ed27cd8507fcc35d18602ea45c0a69384800563d5fbb5e11dc02565912fabfd3343910e7ccd5e4b8270f39498886aa9b42a7ff0b46452c5057c4c4388889"; + sha512 = "e27b755d4af110b3751de25925e95eda62037cdf8236db7587aa47aef099a055b5ddf1bf08f031ffa9c79142ecef49f2045751bb41c18d9fef9e0a2734440612"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/vi/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/vi/firefox-69.0b10.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "aa6dc56a32f74543d8b2a382cfd5284a977f1242cb54292f09a46d5a2a7ae7d38b74457a7412355e09f5950d82f095ae3ae0fc4a978511a396524e3e0798e281"; + sha512 = "33617c205dfc61511df43de79c29ae8bae059e6d0d3bdc868a6965e98822efefa832d6f1ff514676f3531d4b5c89d8fac4da780b85151b05e2e05dd41ada3f1d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/xh/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/xh/firefox-69.0b10.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "ac3495cc44f55a5b67cd7f63859349e1433dc6977599a4e2e5195e6920f320732d4f0fe1bb59d4f6124887ae30dce695a120c2427f8b6e6dc5ae33f0ac3f8c39"; + sha512 = "76ce282b86372019e4467d66ad1025ca6641cd8c5f4bce509def9aedcfc028b491f86cd5149a0496d08d55711578356c21ccdef786f910afe9b8ffa26c2c4c8c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/zh-CN/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/zh-CN/firefox-69.0b10.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "de166a41754eddc1a6b230b72a649c14c7b0a814c4d72d96c916404cc0330e97a1bff136a618e7dde7069d6d7da9419bd0fa74c005319b3150f0a79cddb73568"; + sha512 = "1ccf7de81d4dbd19a9499cdfb3f286f86dee4451c5bbc5ce0bfb85d184b351e45b0d9289b609d3eca60ea32a45cbaf2160664511443a6c0d13d144945606ef26"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-x86_64/zh-TW/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-x86_64/zh-TW/firefox-69.0b10.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "a37b6e0089130c2f9b8b7d45aa09ed3670fe5f35775aa0c4e99b662dcc7f72f7fc20cf97487f1cd154614ef5bb55ce7d911851a0f0c2813f03a82e3f71390701"; + sha512 = "f645642c10edc2d36bd97bbf1b950710d1b52770717be35fe58b081604a4dba55b5dc417f1553cc6574826ebe7bc3435f0904754f5551f98f93d61023ca2de01"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/ach/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ach/firefox-69.0b10.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "788c3814b6d661faf392d9d16ec8c6d709c9d97f21dd5004f3dccab3d776a3394ff5a5b397069b679dd6f41493dbc284502ebb4eaceafcb7ec7064f28ae816e3"; + sha512 = "58b0df5500016a4c87a60233c8ef2d479937ec002b10ae53ee973b997c8911dcaa77470c8f0e6e3667cad5f2e4f11006a767040b0ffbc33d04b8a937087e9994"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/af/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/af/firefox-69.0b10.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "9937eeed4840806481a4705235d1316dc7e1330a2046570ff781097ebea5ba4f1f3462c458c90fad163bdaca0226eee541e7475916323ae25b4f554f4bef828a"; + sha512 = "a9d47c62679e0c24a759812b6b194ae890e4cea6bbca683eb55f016a81eb05c207fef6f61f2ebc6c8f85cfb25d5f71f62b70502355435913094dfcadde81aba6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/an/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/an/firefox-69.0b10.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "ed447fd2e4391f82ad2d37453429873170a7277ec9fc3ba935dd55d0529b5208a905bf2852758ed23043ca0f63eedf709596f9aef97d1047960951a9cbfca2c8"; + sha512 = "7b8fb37c1b458c9d04d45b69e3dcd054b14cf6f9bb3faa4c9bb978033e8e7fb67724ed8dfe1bce39b4821d669f9289e7ec3367a826f67ff9be81cbe37267cdf7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/ar/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ar/firefox-69.0b10.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "a0ac8fb8b489361eb48cf26d0e9b3b9513cc3f76e38dbe23e44399a3c65c68d8094631656373bac46430572dff54c324a322c3ac6eec3419af2ecd273b7f3e38"; + sha512 = "5ab368033e7281d7bdfc7d27b95cc7d28e8c5528e75ecb49e0b68fbbc02d2e3ff15e5c6c3218e3dd339ab2ea1531e47ecb888f7e379881d953667ebe1de3a1e7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/ast/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ast/firefox-69.0b10.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "2efcdac7d506cd1872264e0316bbe02c093f9384301326c8256d2ac6abbd737490a8b93f51a4457c5d4c24485cab5bff149d04bd633164d59b867075c964cdbb"; + sha512 = "2df1a20c28fe5d114cc1e0b0d95723ddbe4f7da2d38e9ae7a1cb43fb7808968472e32157981c612341d8e9ecf590b8d068f6b84dc3bd2642228b9d659a29e367"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/az/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/az/firefox-69.0b10.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "b48664a259c88ba408797aa597d5580b52cea58f5d4ac8c3b1cf8939bb8bf90024edaefb38626e83dcb566b766a73e8a6739f518f62776f7a27027b0616b7537"; + sha512 = "fcee266e1263300751f9d3829a41381cffcc82316d419cc5ad739bc67e96826cbdf7324f4cd5cc16aeb0cc3496c5188383810e311f6454b0c4794cb20b4a0703"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/be/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/be/firefox-69.0b10.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "2e22d3b81946f8ccb95f7431c4505e8120bdf35581708150ec8658fdaecfcac457c2e27d3eff1966ba472ba238b5a145954dc84433c77f626de36897e321c0b9"; + sha512 = "06f63c9f406e1c0ce2bd6400c30304a664b8728900a52ce1e015682596bf7488501da8dd6a766d54150b81ac287f04a058f110863ac6483c89348ca49fdbde4c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/bg/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/bg/firefox-69.0b10.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "c41cfa73a86c653948646b15522abf041c82399bfd22ad9c8bb2e2266cc806617238f3852f7f89bc5fbc748d90f28548cf79e86f44703b06bfab36ffa384acb2"; + sha512 = "ff644c16c203058c37d7baee9d787d4373b3e0a2bca1d25330b11dd6da9fcebee5a93d038c283637783d27a216d062a0db84c462f9d858b35bc2dd26c638d960"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/bn/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/bn/firefox-69.0b10.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha512 = "778d4e60b02ee0f52695c513af3a91e15672397ab60516fe5faa9c0168325ea709314e9b650bc767bc15b721af946925d69e42457f4e821ebf55a5c2dc27b7a2"; + sha512 = "54a33277a4b10d53cfc8f794ce1ecdf328f83ae99f0dfee6d47f9243c17d83351301e3138121f45928b9db54b2b9e63d0474533ae6644ca874b20405f4acac89"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/br/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/br/firefox-69.0b10.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "6477cc04626631888fae079b480475520dda775f5e4d9741b82b6bbe8cd0a74845507047fb91ec1d490db77e7f2098bc7798e367aa6ef0687ffe17aca62b9dcc"; + sha512 = "9dc72a4327bd02cfcb328bba9731ee90fda96e22ba4c46615ebc3ca0abe19472261386ffaeb06070b1456103090276c1da544fbb4c3ba8cca29a5f296fe6414a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/bs/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/bs/firefox-69.0b10.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "c51750a16b9da843f9586db8b4c8922a40f946851a52d35b2a52527b6ffcf3ff2535a762168e2af361a374c590d153cdc53cae64521c96ecc51beae88dd00e3f"; + sha512 = "34d0f109426869a9b6ead4d7509770f4b861590a028aa2228d4e4b508c72cb2be184a3734fc7e71b7fa0318e9b454a95bfb63314f0ee3c8af11339f1a3d15c62"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/ca/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ca/firefox-69.0b10.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "3208657a8b81a849bff701a95b04898d32016138ea35f10d1c1a707e53bd66c0f0d94a7e546592c6586d94a7350331bcf20bd78c127bef7f5826c93469727e61"; + sha512 = "d4d442549316d417b1c013759b64d31b6fe1a55990b02357043528c5985c40dba1edd060cd58bca5d8233eb1a4a6b850bcd6cd297a81c9d6bed8f032538b9a94"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/cak/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/cak/firefox-69.0b10.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "e0b62c344e89a66f25e7989774983c02d0b31f258054cc71e5b1566f0d6a0e2c834a2a6c596a07ec2a74f47bc149e4c302e7d17cfd26dc4b8de4918474d0a5c8"; + sha512 = "c79a799abe3281b64e654f317de6956a1dedc4049b8c5f98aa41cd12d0d290018e7ab5faf411a777493b8e6e8d761637bad09db75edd0812cf8e57e49ebae4bb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/cs/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/cs/firefox-69.0b10.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "971ff02141f709092e19e88c21f166dd7f8abee8d7a213a0543902dbe602e5d517ecd028731a49ab5e92cec5abfb084ea5b38824cd2856739dfcb7f8ae2063d7"; + sha512 = "bcc5a60b5795207cae1ffa2359e7668fa6f09583ea8904a73ccffdb13cbffe312a6f0bee62356fe1533f25d10b592d8ca620942f8d265ab0450a7eb42ba95c17"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/cy/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/cy/firefox-69.0b10.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "0956b4b06f09dfb714a0a457387f9e39b47f25ba37300c3f7d506ab6cc7e4c87e48992a38f04018efed84fd76d955e0037abb29c9c93210fd06e05cf1f0ce960"; + sha512 = "221b4186252a507fce2398825039814173e55d767b1221835c0ced80fb19e4108006169009874c76176d7c39f25158cd9f554c7c08a18e1f2aca585c09054293"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/da/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/da/firefox-69.0b10.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "943b0344ab68dfb317fe1fe11deb4af70224de6c5ed34dad4aa5615497bb169a8f815ed2af4c806cf45caa0c1a4ef6df1a9fa7584ae5d3de65574c15727b138c"; + sha512 = "947eae9a8a2e3761d5ee5d7d23d5edb2c5977417e0c812528116fe76216b7de6738978fbd561a0e78fa8e47877f880b63db5f92e4987814c69fd683f83b3dc82"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/de/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/de/firefox-69.0b10.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "097ae1d3f44e296402c706782011f87edc2feff98960aee0e4bf180de99be4b066f849907b90d98f4223a5f7475484e1d03294d09a4b97ba094a1548276c004f"; + sha512 = "78e94aa258713c9d1d1c893d37b79062f6af8b7de49bd70857b77ed8a6eeccb8c6e452b9fcd35f726d504fafee49a7c45cd876ae7e4493bd1c11f13a737fd02b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/dsb/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/dsb/firefox-69.0b10.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "c935a2c8c67a81a064f9441d01bbaf515cd981b7edffaca85b901c8837a51bd76615e17f6ba651c4f00199aded533270a3e3572ae932f113a44e4047e974655d"; + sha512 = "041797c6567cc399d88bd34846092aa1af2e40d380d9c286e423ea797160e63616bcc3bf611c28e3eb3cfa2136db9db749f32e72141361064a71130db69adc3f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/el/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/el/firefox-69.0b10.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "ae08f0ebf177e0d5a3d1d68037adba15616a300343707b04fbe1e53e369e85d7362a28eae8864391e8463f8812f6d9990a7a56f66b33983fc3561624da79d5b4"; + sha512 = "432d58b92a720d14b3df6cdaf685e471eef8b1f7b7ff7c9685304d99bb2382f4eb1eb0535105572d472e7887e880ab6cfe18baeb7f1660dcb59c432120dcf41e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/en-CA/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/en-CA/firefox-69.0b10.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "5b8169dfec0401822ac49f0b6a83d1730b28658f6767c347047d688fe84e09622bdc0320f70506004be66414206b8aea7de7a5fef942d5697fcde71ae2ed7f74"; + sha512 = "d7241e3dc44a5f66d7fa39eaf19fb0ba04f67ec1816cefe0dc2721e12df7d73b69d2fe1c7ebb24c2f5957ea3b575452ac6998bb9d9933d5ed39463d846b59d03"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/en-GB/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/en-GB/firefox-69.0b10.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "4a6841b68577dc00131bca9c635243f12ef6df5fd295cf89e9b7aee50abcd765dd08863a49e39e5dee795e1cffde3b48d1719687449d5482f0afbced9dcc8b5b"; + sha512 = "5b12a9bf265009d1baaadc0707042a4290ba398544249d39ded6f213dbf8274207cc924fe5bd47f416b0923d35559a43724a31e8ab9b5fbb52f0c8749d6441e4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/en-US/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/en-US/firefox-69.0b10.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "4ec83e426ef77701c024a31695ca10a12a88600d01aaa5c4a979c83ef5ad4ff2b378012989311da15e986da0e1022e8dbb9bdf0e2dcdf194c4b990db61e9416d"; + sha512 = "c12dc9983539a597b00115cf1350007f9441c90e281ebc3d0d91c00bf4b260678925f52e4a1409f02f8b56d43f30191bd0eaa1ef29c3000bc3ebf1f527a5f635"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/eo/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/eo/firefox-69.0b10.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "731260894548db91a501d12417449a6fc9aea0485258df16470e8517e82e44270eb273113b1c06ec973031d2dd3f920e510b1ab0b7addc2fd19959eaa41431ed"; + sha512 = "9429af640db7a461a66e67d7b35239eed02ed9ec5b96718c4337fe3812f93a2039c5c5eb365fc7ca3e502368657f6a33f7318b6594cd3767d0fe72314c4eef8e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/es-AR/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/es-AR/firefox-69.0b10.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "833e51d3ec511302d86599b1e65ae2c551793f7c09397d93665ebb067d9be1b0e6caf2fab67b96d0af70218a913b359271bc8143a080ec671aa1c19762421a7b"; + sha512 = "92200fa63eb1f034b80a28e45d4223e6a27a7d4f2daf07d9e1966f76927e0e6dc0da996c7528bf2dd87189a2b061adb6e44a540b7af6598923e1fb47eefef7d8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/es-CL/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/es-CL/firefox-69.0b10.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "f60869d77f08d4ec67d1e240cce766429324de937d7ab0e36590684c46dd7ee9d81add5529fc721d028ad21fe1666fb94f6256a8485fd954c946c172a74c7fa1"; + sha512 = "094dd4ff8ba4c4f5205f43b73afade5a210ac01824c3c9f475cdbfec83bebfc6390b899ffd44c395f379c40baf9254943ed5d15b30676bb5216ae8f40c02aec5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/es-ES/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/es-ES/firefox-69.0b10.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "67818179412979b5067fb08cd889ec3036d4270cc322a92b67be0fea402b3fdc22a6ad1eb1c768aa7d9a7f89b0b7f2bada19968903e7f2d85aa4a537cb41a6f4"; + sha512 = "500400ffc47aebf23b7bc816be356550242b8655b703ddb992c18ae032ac524dc94513a81a05e4a593fd70e753a25c567e4c8089c341e6dbf374897d89c210f5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/es-MX/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/es-MX/firefox-69.0b10.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "4b281caff272f08ece0e27ebaf7d7ff5ef26b250a6d33e95f59854386bafea8b5e5fed904dd239f2c4c1473c558c81e15de38fbe4555274c468c30aa2da80476"; + sha512 = "4d674f72fd150d30eb87bfd0bbd716ac93645dd69b0a8eeb5c57648077059436c6b071b4746a8b9104732e48ebbc8797c5981adfdc785500bceb99bb8b2a3190"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/et/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/et/firefox-69.0b10.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "f1d15b73184643b3d47fdb9abbfdc0708f808c804bb287bf892bed370262da4170276675d29e2069737459549f9ff593077b3649ef39920607f61f6a3507cd07"; + sha512 = "ad4e26c6f7800bea6eec1be23e5964ae880b87e1bcad875c4925916c4b901bf0b4be3643d69a1785bc0bfcb35affccf2394cc2805ab0f2f8022c5bae666b70c8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/eu/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/eu/firefox-69.0b10.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "0d21e233e25b8200411328987feaa2868a431f3d3702adb2953d72eee46d521cbbf65d2a33e94d1a10b22a2038261137e6124bc843a2447a2895ff9dc17c7ca1"; + sha512 = "e8091097cfbf737c775e8448e42866bcb167305e4d186b17190f41f45b12554fdf959d55be029c29915f8b3277d8d41192b740a65c218de84707f931f4e55bd6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/fa/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/fa/firefox-69.0b10.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "27cf9068c191012ffbf32768bcd35b48fdc0d15816f00551e917cc454ad7804094805194d23d7ea216830a91e179b67186627d500f50c0bfdc6449af5a4046e6"; + sha512 = "b6ea01641fdaa57026f7ad6193cb026c68392952dd3cb7e33f14bfea5762e04eebe23eb042e8b05bdef7a1f6e8bdcd7daf181f621442273f0f6a10f4d74b69a0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/ff/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ff/firefox-69.0b10.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "521878b91b8740ad2a7e7607931dba74f5c26e84e1385563d6d2fe6da2228c18cd0bad5379fb5fd41c0b76be4302775b4f02070882dc6c29683fdba6768adeca"; + sha512 = "293f1d5c58dd55c4a9af1deed28c3e89531df45b00e4ccf7add6e2e28b6eb34752e8eebe045392b1bfdc7a7287422ac8fb8f607822f13c28cbd7114b1a207941"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/fi/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/fi/firefox-69.0b10.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "3a470d7385523a01bcfb443cd462a3c26adf3ed50eb54f0b970f2b084f8bd7a020eb0ffb47c95fa85beb4e25226ed3361f4631d74904fcf2d32c7f15d718b788"; + sha512 = "5615e699341e9c49388e4db80d9628dc0bdb964a13885f5e5b070fef3c1a397145ad13b5c583305c52d6c1a5f466dfdd10fb97b05924c3220043da08b41121e5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/fr/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/fr/firefox-69.0b10.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "eaaf5b834cc5c71ab901673c0201640d5802773f215062c0472ffadff161fdcb2cfffb70712a8f14b7de2bed06a58f96e795ebe89a8c640e90b13b2bdfa89428"; + sha512 = "3fb4b9aec3ee90cccd3f2fb34ff0665e68e7b55cb237e1760fbbec481748596f4c61c0e633cd1b5ef6993500f057fff74e983daa14343c820b9e3bed0cc90e2c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/fy-NL/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/fy-NL/firefox-69.0b10.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "37bbb5b9c608fd08ce33d76e39aab5c02d2f3befa1e73e12cc241be0dbc107e13a3f5418b87e2291afa08f6801fb804b9c7b45126abcba40c45a6839e0d3bdfb"; + sha512 = "47ab5c06277c1aff27a54e42e01501b6b33dd0452c9ed069d6cae1a19b551459b4988274ace92001a15409964a09beae84b49c356f9005416b2660a3c5b7275c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/ga-IE/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ga-IE/firefox-69.0b10.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "09a0b825c831e8dc9bff31c6f9d0c6f08ab56ccd2c680724433dee4af574a0e43604cd1eae54a8728278a7c42d01658e0c511319b1a02ce9e831c96f28fba1e8"; + sha512 = "0df94004a3443899ee641ba604174c996c03ff091b0e0738f5a61e5e30a2627e2d3ab468e7cd71065c6585f3eb450a9f0d6b9c82f997c8ae81aa9e891adb2dbf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/gd/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/gd/firefox-69.0b10.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "22f6fcd27ab973d942ebb4fdc6df4855179fd6fe454401f1338ce36fb62ccdd6722c63fcd3e306d5364ef2aec57738112aad005179a01ef4b200f7cb1cd62ca3"; + sha512 = "2fa916963a8ee51ebe2e4e230efa2bdd36922008276ac6f67de09eea1c44b53070254e232b9713b4c1884e280727609c7e61d169219b8f56652964c7012e85bf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/gl/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/gl/firefox-69.0b10.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "245b8ec2cceb6a4b9b17bd9c50e834994db593614616a3c2b89dad1198107ec36f73544589852c5c11281dc90f3d4dbb5d2364a30afa3e16999d0a054c3dcebd"; + sha512 = "c4eef282b8e1658ef582c3d3219e283d1c741a00dcc3b3fb6b29494c7d0098ff7574cc92716f798c98a6ce0cb7e8362ab0b48ec1160b62520a5bc5cdf582e99d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/gn/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/gn/firefox-69.0b10.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "6b158020ae5035565b1aaafd211e881d094e3b9077e78fc28e2f380303b8c23b1caa4cd3ea0832201026fceb528a5556dc89f7a7de9298b11184287f1c1dfc45"; + sha512 = "c6e913c6df1765846191e7979655b038d3a4b12e44812be36876380da49b646b1208119f299818fe4b4ee67f2999f3c5e442be40ec8343a2b6d6b3fcaa6edc05"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/gu-IN/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/gu-IN/firefox-69.0b10.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "0bcaf3254813905c546fc229fc8dc384003a0814a09b537d3465cd8cd83b1e9cddae0bf9cad48c4900abc3f76d2842b82119699202f37991b52a016cf8feaf2f"; + sha512 = "348e13f235c3c80b28717571916d2aebb7d0a6865d6d4577f651ed3061dd66bf02a43bdecbda879b69f78ccd9a8e2de8ac96f3abe49b87562fa6c6c398c21b2f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/he/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/he/firefox-69.0b10.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "69b9baffff76a335915324214ce98dfb418b0a66e3f1895d6c4f808be6029d239e665e33ebf563694e7f5b8c733b85acdc8e131a2948c92a4ab33d015eea85d2"; + sha512 = "d0100433eb4194c415249b1adf984b4f3dbd8a11e4785008086603fdf1a2e6dd8d319e76296d0e5d9f9fcc0033b67f12d062b7ee0f2170c9e74b1cc73d55bdf6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/hi-IN/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/hi-IN/firefox-69.0b10.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "f6a74baf232baa6602e93ccb83d020958630e169f888594237705f9aa2807d502ec3ce705d5fe55e4f89b1bea44133b11b642b011c15329c380eaf6ae19a5b8b"; + sha512 = "91807a5b65da4bd3d2c801431cdd5922617433068b85ac4f3c87de9e3b881239c9ffbcd6d426ee4f88a98c4fe706f2a03b105df4b124d9fffc029b158fc15105"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/hr/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/hr/firefox-69.0b10.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "1e8ec2487dc44daa07aebcf0660d18b7aebb04f469b236d2a8f7a49817d5361bccacc15d9549bc44a5673a35e9f93871da6c4b5f8360ed5e19eb5c4775a07161"; + sha512 = "3e0d747dd6e79117799fbbdc585c73312c13a21b8ea7c0ae4872b66d4da670267dce1942b350ad00026e3258af9da362e81c59e791820d3341c49ebd0e3816b1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/hsb/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/hsb/firefox-69.0b10.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "bee5a0d34206cbac80e9c54026f5a19630173b7725c9223aa00dbced1ed95010d3995ebc4048d6c32db7ea3a28b25d6f86537e13d3e541103c118f847f199ec6"; + sha512 = "777ad7021020da8d302192f56e93de358af7deae7a60fe5e9f13a3b3d98779e99c4f23b8c3a801b0154f5ba35528f5800d93167de0fa3d397108df7f7ef23a58"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/hu/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/hu/firefox-69.0b10.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "dc8fbfaa7143b05fec1a16c83cd3c366925b38ddb0c5c8621d5c4cfd7163d0715cf3a75d675f665f35a6fe47397403f810ce71eabaef93d1e27bd4ded74da70d"; + sha512 = "651b0a70264ef15320391311ce357e944fc1cc59a7b68875578dee031247ebf8566dd70c566c43f94773751b73e783f1cbdb3cfadd0f9d11c302bcfdcb014d0c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/hy-AM/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/hy-AM/firefox-69.0b10.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "9e7fb55ec4e3f3ad69a89bca9c50048e7abfe35929b1ce5d0454191ae655c7047a41bb6846b3c12d5098f12ababb2bd6e062cb7cc1eb8605e5d4056880288097"; + sha512 = "a3372d320797626169609e5e2d97a72f8a54cf7bdd106fd41eaf2d8e6ac8cf0615962b3cbea463aa412badb5ac02f7c1c04cf7aad546cac73caa2742e7d985af"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/ia/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ia/firefox-69.0b10.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "19ba064d6ec4442291498378ff7db168fe626b912a4f5fe0f7dbd868e0250c958c1189b575315f287c5216842d05963bff10d412f1c5d2850e5f7382b3e94046"; + sha512 = "3f3925da5a9d5525f4427155061cec77307139ea61eeb532bf475aad3bc47f30af07213d26500ac8a2287bb81d37ad2bd4490626afcfe8839f94287779212612"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/id/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/id/firefox-69.0b10.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "bdf2a45765ca4b34b35d093b4d8dfa86fae7ec7f54ffee7e52f47e2f25801c5364a1e1174f2f12ff67959d209de8bf423d25bffef7185742af1cc4cb62c499cf"; + sha512 = "3a698899d82d3a10a7c6c4e2eb61706896c73182f16b1752404a422d2731ad272052618e87bea89455eb2ffa410e138614c2c6285c1089bbc830a0217a0c9cd8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/is/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/is/firefox-69.0b10.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "196940b279e680ee674b5ac0c8d2744cd60310d11345ef067aa7c0ccc8c7cc9713bca2b2deadf728acc90f26d23ab4938b4d79f6744a4e357b943a6d2872a35c"; + sha512 = "d5cfdea22357a74ab7daead5a2e8b5aa16e454f0d63c569221bcdc71d8960f45780661cafff8c60499fe50dcc49d967600096e1d2f44bc1f7f649cd3f16df8d2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/it/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/it/firefox-69.0b10.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "e42447492b421235810d4746a55777d774c488db6e233507c1c3947ece9902a55eb4390d450eabe4369f65033e9620316cdbfa4bc1dcafcc139e61205083f2b8"; + sha512 = "92da285bcd16df6a1f61f9ad7a57cc7eb867013421d61cee6a5eedf26e2a518a1988b53f6a217048eebbaa78551324a391f9c52e03d475d32eae513a4c9e2296"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/ja/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ja/firefox-69.0b10.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "ff4d87e5c3d0a4de6725c48c455f59cb8ffc3646da8bf16113845a6eaa6cb5f7ad25cdb1ae9a8cd4d099db6c65352bbebdb534643550af0ebc6ffd6efb82ce5d"; + sha512 = "995903a57a7fc0f41c3737e570d61a1fcf226054d7c11be982d66ecad685aa9fa6ae6ffef93797aee387b3b442fc049f6329b5d88de86e7e809529ccf817947f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/ka/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ka/firefox-69.0b10.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "5dc95cbb37f035c32442137f713a9e2cce8057b147bc4f410675948cc21e23cab78dbab97b0374fe0ff35caf9d8562832e244086137c40d88b53c8b85ef0c740"; + sha512 = "834ba5046a53091f3b24038069fc98f6d40350a401ac811a75ee6053e9bcffa97d8b3210eaaadb748b328b7679c80783bde5cdc1d6340e80b7240174a3b7c140"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/kab/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/kab/firefox-69.0b10.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "3d3ef83ab8390f132edc7c574c8daf18946a9a73c9a8348bc4c5a169dd829f634f4ba5c024b91b7598f7f02cafdbf292887bd1d65f657ede7cee9280673246db"; + sha512 = "75986a7f8dba13177b00a99f219fa1e5262015fb5688dceff96222ec1a2f6ae758aeeee620edc090acfa59a4870dd43ea181dde61a5a7e68e693e59af97d54b9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/kk/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/kk/firefox-69.0b10.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "11b1581c79c38bd6b85afb60547dd755725aec25459c57c3a62f668ee5d59999e2f0e1629f9d50fbb68a04765a8134b991508d9a0ee3fccd320f8ade0fc7c030"; + sha512 = "8cb2cfe5ba91af61096084aee42dd7f666605bdab54cd7304c6e839765e41e2cee627d34ed65b7162934b60eed448090e5c963813f87bc0805e79e4f92e99523"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/km/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/km/firefox-69.0b10.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "e28f65d21d1b97fccc46339333465c6f3297ae790883ac78bb32bd3ca18344aae70578addbac7b9660f04fea267354e219d952fac7fb0426350d99f648e13637"; + sha512 = "77d511c378a386c5567a47d4115fbc5c5b88dc03838a3de838c403f7b2d986b367e5cf43efd93749ac9635436f4ff1827ed3a59345a8897f332963f0cb12496f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/kn/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/kn/firefox-69.0b10.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "0297aa868255f4d391254c8210142b4c31ab9a966eb800d09dbe5fe593af42d68c52d45c73c32edf6988da3c7902ee324e4e026648c075ab67b389f2f595b761"; + sha512 = "51646a4e9ef0a644266a925705e4e5d2f4488697c076f9156862d258bdb4ed2eb6b105d5b9047dfaf574154d4fca750365f86f0693f312f68d8984812997badf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/ko/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ko/firefox-69.0b10.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "e5f311b43b253954b5e9e22617dde33d34ee08e03e66be4d95e29d5afc48a755e5f686d769ad4ec12498b5a9c46c47c8284cc7b5b0b923bbdce878263fa28233"; + sha512 = "d122b9dc0c0d5f4b7d62b3f188558e0db25549cfddef321f54b53c66e704ac895e9c67d3c8970de1f4ba3e7ffdd47bac5a4430000c289fb332c1e3f9d5893b66"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/lij/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/lij/firefox-69.0b10.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "26cc5ba51d71a0d277ad908cbc145c3e04ba4d090b4a41103e2c3dc610914194c46de3ca5e635f1b944308fd697ccfdd68c703944a1eaf0d072e34926ec85ffb"; + sha512 = "f1d45f8a8938599b0eab9aca11b1a917b8be86a224ed5e2c2b9bdc3ca0e4532958c6cd3468c17512b718135adb4284074fa2f4f32e851ddaaf72535cff60d58a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/lt/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/lt/firefox-69.0b10.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "cfa6be0944df97db783b827df5349a799d67d5369c37508e4d8fcaee5a2e02b7940f54384afadba3ea36a4f3b56ae621d01b35f6d7c7dc8830da34464671c366"; + sha512 = "c6d7dba3ea655c9c419b5960f7d6bd6c4816a55e835470c1c77ad820fa48fa58a25db12dd26393d0eecc6aa77ee022d27ad4ba42779922a451297a35a65a87fd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/lv/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/lv/firefox-69.0b10.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "d896152ca7a803bbb80f4108e919addd9a2bb77c78f5a39b521031e703a59fa8874226f87bf2bffc3555620d454b21294839d626c139de6a4ab4639490513268"; + sha512 = "c5f8b3946e256c9d22b735e65987073776a1b7bfbc80b198e9a026f42b2d6161ea244d748de9948849d9fe3b760b30bb92bab2c459c8d925565f41ef39e916e7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/mk/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/mk/firefox-69.0b10.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "6a7e88217fae55da91c29f8c895cfcf2732dfae0ca009bfd1af0b0b020b7a3d15f58c6e400e8645a1c675958f67257425fd16a7b45d2ca159bcdacca51a0bbe6"; + sha512 = "e847e1aceea05139b2f1884298d59bea6a57dc3f33edca3d0175e9137de40d8e9347116951a9e5e9f8acfe43b458bcb8744a404093d1857d0b42f72ffaad90e3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/mr/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/mr/firefox-69.0b10.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "1a8d3b92619df25154cb7564375e41b3321c67e309cbd89bf05015a856e45a36024e406a36d27214c149f5c38d2bf4cf07b8be72af8d5b9d6ae02c91f68a1a9c"; + sha512 = "92014b5413076602f711f3c71730ddd462b69bf67fffc104f2b18fd92189ae43a94c368fc4047c43366c3a15fca3cda9d8368631da51bd04f1c24727dec9ca63"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/ms/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ms/firefox-69.0b10.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "da5defe18a07f890c53f64ee87926c62c70c23ae568fb18cb15ad9729eb432f141e6f5d3f88336ad3a6c30d6c7ab902ca12a86224470151ea8bdb97956239630"; + sha512 = "5c5decf31166b853e39b9a830ada9996778ad9331fb7ae21005968c1577daa156f852aab12e21da3cb5cddc55284b8cf0b439c205c0ddbe93b919de19567b7f4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/my/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/my/firefox-69.0b10.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "0eec34d82f3dbe7cc6b4b9292fa90e1bbb547fd225aa15ef3d5cfbca79b1702565f709e4b0d5bdb21b895946856547a676cde13a3aa6076e5d293569fc4d04b4"; + sha512 = "60f910bc5a9cc7102bc6c9dfe8748e29d9590220acb5ef5c5b25e5c8b7186c6d17093df015df61296ba461c0a1f7dea139a94c4f920cd8cd8d770d0ee03d61ab"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/nb-NO/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/nb-NO/firefox-69.0b10.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "53f2979beec2d9aa4d69e87d3ec708092421f91056c563dd555f6258cd50ac3d0ff70a9857372933ff185a5d22f33c42a400c56e0e834e33e1db6ec8a0e2cbca"; + sha512 = "3b7702091cffa06e91d5c82c0d18468d09c6df66ce2e0aa84180db7cefc627c1f2dcb9fe889351d265a5b4a0ff49cbffe957a22b7400c8300642e68462e317c5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/ne-NP/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ne-NP/firefox-69.0b10.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "2e0bf9610afdb65d9e7bb6605ad2cc55a7e00207cd622650e47e089db1e5bcafcffb4e63d48612b5186d46a933956a23502b0f71a1f4fb02973539b1c0cb5bbb"; + sha512 = "6c66a05a2cb9d3224beeedc821874634049258e107820f3b1881a1cefc8d084091a418bf6c46400d56fafd7022979f324dde5309e365e06c9ec806a5020ebc0a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/nl/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/nl/firefox-69.0b10.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "5ba83f18d2d642e55b97d260ab85a0df446c82a17fc10fa8d2fb89df00d0ed8943ac99bc07f28fd8db1e6af41200058c1e90822bbffc39205bab81fff00a8c87"; + sha512 = "6fb7a1357f73852706906386572c1a04237a041890f4bbc6ef5c1a865ba541d6af86eb6b055ada442251e3dd7d4ce30a79ebc50ebffa3850c2bbee44ba866a19"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/nn-NO/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/nn-NO/firefox-69.0b10.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "2d60bef6c729e82a1864c1c420dfd7bbde8922d93f575fa80d5bade425b10b96ea7ed1f00184ec7960f8553ebd56cc54a2c9645d1517da8db97e03b65b2cc700"; + sha512 = "cdf167ea3728623fa7d3d9cbc39df02ba32750bfb61ecc9dfc574e9126c7e4b00c9c8fc938a6368d4f501d2b381eaefff9fb3024d4bdaad6f853c924fdc1b2eb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/oc/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/oc/firefox-69.0b10.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "67c9724d01749aa132f38a8c5acb7c603b6186b0ff70c693be66dc1c4d5404bed74c8de23bad5e45eebc27e5decfb26733b0c00acd6f2e283780c56d7fa012e2"; + sha512 = "9e5180bcb7195b7064ea10046f1cd044e6d287ce732be1d6f4c0a3c5adb2a26b951d76e92866a667652616bb7853f5249618220bad09ea2d32b8aa71131d9371"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/pa-IN/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/pa-IN/firefox-69.0b10.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "9b8495348104147f212246414172030bddfddaffaca9615cf701f210ff410d39a0ee3dc78c6a92fe83a35b32e2b18e528db6b6183a5481f8be20c5b93196ff2b"; + sha512 = "e0ad213505bad75ce2947b0bd501df174ef4516916bef43e083506721438e83f5a35139d5aa661569ec8d955eab87973995e29ac077c330af53e9647cffbd825"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/pl/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/pl/firefox-69.0b10.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "426fb10742be943737a8c1288500ff5b678fc2d29bb3e2bbf2d55221fcce4616be4e86cd8e60356b20f0f5bec51bc5242fea076607ecedcbf3b27bddfacc88ce"; + sha512 = "9e84080936bbf5e7585edae2b3ccdd1d9a825ffcefea7d4399f892e9c2a18fab580928e74671e14dbde3ae0cfb0ad081f6ae3b9cd9ff1df3c778a8d0f399e11d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/pt-BR/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/pt-BR/firefox-69.0b10.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "3a288a97dfe69e3fcfa6c48ea4c96a5c5d3cacfb5d6179fa420083961c30ce195d4adad693a981d6409978c938dd6a43f4756d3b62f78fff6f954f917515dc45"; + sha512 = "b98aa88bf2c9207ab21708c7fb72be8256a0c89df32ed51202c9f24fe232d38285dcf7cb74017ce50e7eee22f091de494793eab15c36ae5724d393f49d70d78c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/pt-PT/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/pt-PT/firefox-69.0b10.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "627014dbfe2892da96f76ad180b23126def791bea2a43c431dd418ee6cf4a34edcc352ae710af93f793666aa4e84d88b5b345c341f2b18ad9bdf036797127947"; + sha512 = "0afdbce1e0c0571a31fd5f90e40bd088a3df479ecb40c851750480e917fa60150d00a35a32083a846640c2c9ed5ee455e1a71ccf2ba226f0fd6899c2e22490b0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/rm/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/rm/firefox-69.0b10.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "a54cbeb70b2a0d013bc47f9a09cb549a0b9f5352f3a9bf82483a65dbc6f7b57f48d141ceeaaedface0601c0fd9159c2e8b55e21300962b235a36c29682ab8ffb"; + sha512 = "224c878a035a8c3a5fa6baa45964e676ee33bd5a52273f7da755a36f4d3191fb11eeed10acdfe8e5417eb2ce55fd524206cd8973a1874073d1b1c936a0490f5b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/ro/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ro/firefox-69.0b10.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "e3b894d8e72ea9fdeb99f40e822e731dbd346a468444de95a6782f8b7b97d6d2b36353ca4c02216662804e5e9843dbe410041a6afa8d51cf1dfc777fbd851216"; + sha512 = "3c07f89c0b52a0ab59d1820704fcd65c4d90cca95a4cac212b97697c6a25b918cc7cb2d86eabb4e58aa961e868c21ce5350aeee2ff2289b052fbaf9b1f1d461d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/ru/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ru/firefox-69.0b10.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "2c30a6eceef40e9d0f86172f58f7ac38c3d0bae36c9ca3d0bd262ee1995296b06a38daadfe7a57870623b31aca240e4d1685d6c1513cb297f19e533aa4ff9428"; + sha512 = "747f637a451e584e70414b11a5bbb65cf45a55c4491de0f0877efae6d348cffa3c4442235829474d1609d05749d3f785e17f6dea041a318dc504f795d312a88e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/si/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/si/firefox-69.0b10.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "c05c7bdaf6e986bfeb99872bc8056c11096e1b961ef418ce88b7a8d386c782fc4b2f8d0d0dafac6fb2c0f68db9e1cd27f323c4d36b16175e1901d8908c7b9f3a"; + sha512 = "43a5d175b3759863ac557a69c6650bd3d7a1b2fe4747466a5e5d3b8eb5570c5b4d9ac18120ad5a79b768731409f1179fffbc5be9e6c171523ed5e0b71945eae2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/sk/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/sk/firefox-69.0b10.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "cdb5a13a02f45f599e3cee55c8d17437fb2190aae81fe9248e02af7eabb967945fdb5eae8e5ecf59c8586f5e5ad32acabb78abf50a31823add459e815beebf3b"; + sha512 = "4c11c5e850d9dfbe8285973acdb85de064b9009df28b974dc482c8138472c8555c6e44718d770f561805a8dc4d600ec77cead4d217d76f412b1128db4dc3d31b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/sl/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/sl/firefox-69.0b10.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "ef3d0ffaf4eb051a98044057734742c5b615c9e64043af99a1fee36cbd1456494c01f20df8b53c5094b12bb66711e8db4dd7db2223e6a827f9a2c6cdc3fbf55d"; + sha512 = "b02dc1cbcd8307fd803d477a73c7196fcdf4cc7ce7b250892ed0cba61c2003c63454623a953a0186359e117b0ece427d977561f04d29757d2889236289fa7fe6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/son/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/son/firefox-69.0b10.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "d430041041f703b7367963dfe58cba49b8ca23a50ac70f2dd315d4f2e4e5afe66a3656af08be4046a88e0a06901da722451f6f20740fec9e65fc53a6ebd4f104"; + sha512 = "aae03bccc5904c2b50d4bdc4bdbd0995ca8eeba67973bbd5ee5488606c2f0759b88334c500aa2b48edadb2c6ea27b16452db29a6647377de87a6f6d054acf202"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/sq/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/sq/firefox-69.0b10.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "34042131464d3e29af4d6f9306f8bf20a77a0a1926ecc297a3b587551efcffec5ccf7df82ebbd9cc25cfa9e4598fd15493a8661d61d1ffa9708bf8d706c5e45b"; + sha512 = "2c9708666b8226ad9f2c107c3c9c8607942781544a6eb9a050915d5a55712fa5c9bb38a07581e9781c054a4799f4d677788cadaaa30dede88b508771da20cbeb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/sr/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/sr/firefox-69.0b10.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "795dd65257fdf6eb34e822e4ec0b56ad8e1d1536818c7bdae2c4fcd1711fded36ccd168ac22500a071bed37a15e481a4539071b30e9b91159d2ec0f60a428754"; + sha512 = "b575acaaa5701c18fbb90cc71d6627eeae41a0ac1cf42327843e7c120cb51e7761b54669eda69577ed2c3c8c98ee9be66dba65e914283e50afb058f7b94c3487"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/sv-SE/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/sv-SE/firefox-69.0b10.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "a905295f59f638d137f729905872aa9da66b035a5bd63d8717043f4a32ba53ada9835fb7aa613ea0b2252a92ed38a404e533d62d7514a13873a68c40c96a02fb"; + sha512 = "728c09e2feaaee2faebe8bd6a42ac78685c98c5d0065d14ea9d29df1afadb429f9d03519e9256e678f63c29d59f392805ea8843f7df8d25c3d42c557e91feca4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/ta/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ta/firefox-69.0b10.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "c996ac6a419097d2d14400cd050dba33e87ffee5059629f15fd4d666d6abdb02351cb241b03a663fadd85f29a328b311e173d4850d59abf4339a367aa22a94c8"; + sha512 = "5415b52d2270d55c12254ae4cc61cadf0b743cda3ec80f36e8e5ced2bb0599abfa37725994f680165c3803889cc04f218dbd2b89f3011bc41a8f1fe204b1a821"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/te/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/te/firefox-69.0b10.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "082d663b14641747a927a23ad9c9e135f2179b958f733e2943267a40600a1b3acfe5b132048b3a4e71879ed292793a5592635de9aed547ece695884a129a598c"; + sha512 = "6361e327a8d71977488d0b6e5d4dfcf9271dc4739b52e31a979bcc686b2a6f326065e88ebafba05e38e6628955690a934c02b510eb5ae0ea15371bc309ae43b3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/th/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/th/firefox-69.0b10.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "f3c45ea9333b25094e153faa4e1faefc9497b04bcccff90b514221671d51e0348fe119a091e6a2c1a867c7e3a5727672a1b153f2101ccf56e5bd223ca8af7fe3"; + sha512 = "883fc0aabee67ca6098a4e860f58018bbdb511aeff8f1ffddf8c012357208dd2156ef0fbea7e92f2f0fc0da8d8a60d913ca638742c2b6511fbb4d943b59cb944"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/tr/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/tr/firefox-69.0b10.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "91e70c57b698a6b4782f64c81a4482cd6046885da0a41a7f1d05b96fd4b10b69681fbb43e302f97d2b4939215f815a68b368b8ee70b1443c29d90410374253db"; + sha512 = "e5f302af1bb937aa0dc0283a97a61588a7ad72dd46f74c0514645edbe23a5c25032a585230709fffe34d3b7e739797e4a2a33c2b2115f4623ab2da9b7c5fda4e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/uk/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/uk/firefox-69.0b10.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "217d3d17cca00530179905c5f0c221380af53f03cc01c152e894eee6bcc58d387db244574d23ac62dfdda160f6fd6065c732c863c5684e85ab32d246af381714"; + sha512 = "4590f2774f1b119bb76c23b65103a635c4c51541fd9ade6ae44d997892f21015c71d8d718697acff6525420d6b2d5352d2f3c4afd3f35841fd7b207260c1ac2b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/ur/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/ur/firefox-69.0b10.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "527871804b234603c95d06fe4c9d9624610aade70ba3985d37f87125a443fb1efd3afa9370b9ab4dadfbade6cc91ed180e830249b0613d366179733fe5f2c2ac"; + sha512 = "d559ce617dd2da4bf45eed7a61c79703064f29ca473993fd2df64f8e7006a6026c70e732db66fa33f78e550eaae88da2dd67cfefa85456d7e9e8a1d28e67b5be"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/uz/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/uz/firefox-69.0b10.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "35407d10af3148eeb1c62a1e690f5bd83d623afb24151eab254cdd59c19ccdd6f7fe84b9c68136b3f5736fefef31eaaecbf4ee88a4bb38ba93714e6e1a469e96"; + sha512 = "1770b55e2f8a7119d5395587f9f7d7fdc10f8c3c55f954f62d08a1ec3fa66600cecbe94cc7cd04580c1ba568ce5e839bac52e8c8b3dc654937e91a8a573db358"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/vi/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/vi/firefox-69.0b10.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "edd451320a4bb5d670896abc788ba7d845a9ad2eaf235a8aadb13bace36773ce51f31d41b94c363278a9868eabae84186adf7df5902770f12a476145641924d3"; + sha512 = "754513e26d09ceff0957a5d520097b600db660657feb1d8484ce046e90e60d37268474df79ebf5a450436b9f6574f0443fb7d647ff0f5b045055591488e4ab67"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/xh/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/xh/firefox-69.0b10.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "dbc83d9d017ab327dd63a6f42e5fbdfb1d5575c848acc6d8610fa937839e18cf84b43df9ecfbf4cdc6e4390ab24f802a3962e1c58bc09c7ae332aea42b7467c8"; + sha512 = "2e2e353006a2ad5430a201e0b7ed793d439afc1f7f4114258065f58afaa351eaf2be32f3dce1401af350cdc5753fffc13fee856181e51b961d688049c348c3f1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/zh-CN/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/zh-CN/firefox-69.0b10.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "ca19b51389a339e82332640396cd398ab68651ad3c77fcbc60a6e748400bedd88557a49459e573e02038d69bf95a38eba08760e9cb40d25a0a97354b92cc7052"; + sha512 = "7b86f1c8b7d81b90f7b72b3eec110257758da38f7f3bca50006a339de5ca1075e06762f07ba29b23a0718c6014ee30564329276098c9f8569487b4831f7b5809"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/68.0b12/linux-i686/zh-TW/firefox-68.0b12.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/69.0b10/linux-i686/zh-TW/firefox-69.0b10.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "8c07654fc7a45d3918d2ce9a7732f7b5feb05cda23280385bf363b907b176c6f3414f05324fed9e384c6e5d63d48030234aa3fcc8c12e240266ba1bf89464c16"; + sha512 = "1f2a59adb5f3e243629f54ceb769e032eb2274990a7f5feb43a0c7f2df8344aea31fff8cb0ab9ea2e220f68548a7266ea052f8c02ef3fc8bbeb0b5917a1c853e"; } ]; } diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 03a5aa7bfe2..05eafb48e72 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, fetchzip, python3Packages -, makeWrapper, wrapGAppsHook, qtbase, glib-networking +, mkDerivationWith, wrapQtAppsHook, wrapGAppsHook, qtbase, glib-networking , asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2 , libxslt, gst_all_1 ? null , withPdfReader ? true @@ -10,23 +10,23 @@ assert withMediaPlayback -> gst_all_1 != null; let pdfjs = let - version = "1.10.100"; + version = "2.1.266"; in fetchzip rec { name = "pdfjs-${version}"; url = "https://github.com/mozilla/pdf.js/releases/download/v${version}/${name}-dist.zip"; - sha256 = "04df4cf6i6chnggfjn6m1z9vb89f01a0l9fj5rk21yr9iirq9rkq"; + sha256 = "1ybbnpz2jcdikzwr7r13lq528vxj3bpms1fqmg3n1zgs30cqpkby"; stripRoot = false; }; -in python3Packages.buildPythonApplication rec { +in mkDerivationWith python3Packages.buildPythonApplication rec { pname = "qutebrowser"; - version = "1.6.3"; + version = "1.7.0"; # the release tarballs are different from the git checkout! src = fetchurl { url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "0z9an14vlv0r48x7fk0mk7465gnhh19dx1w63lyhsgnfqy5pzlhy"; + sha256 = "0wyjmb2qvnw3gn0ypgckwblmn7kasi12dfwp343hi6wscqripw7i"; }; # Needs tox @@ -41,12 +41,12 @@ in python3Packages.buildPythonApplication rec { ]); nativeBuildInputs = [ - makeWrapper wrapGAppsHook asciidoc + wrapQtAppsHook wrapGAppsHook asciidoc docbook_xml_dtd_45 docbook_xsl libxml2 libxslt ]; propagatedBuildInputs = with python3Packages; [ - pyyaml pyqt5 jinja2 pygments + pyyaml pyqt5 pyqtwebengine jinja2 pygments pypeg2 cssutils pyopengl attrs # scripts and userscripts libs tldextract beautifulsoup4 @@ -57,6 +57,9 @@ in python3Packages.buildPythonApplication rec { ./fix-restart.patch ]; + dontWrapGApps = true; + dontWrapQtApps = true; + postPatch = '' substituteInPlace qutebrowser/app.py --subst-var-by qutebrowser "$out/bin/qutebrowser" @@ -71,8 +74,8 @@ in python3Packages.buildPythonApplication rec { postInstall = '' install -Dm644 doc/qutebrowser.1 "$out/share/man/man1/qutebrowser.1" - install -Dm644 misc/qutebrowser.desktop \ - "$out/share/applications/qutebrowser.desktop" + install -Dm644 misc/org.qutebrowser.qutebrowser.desktop \ + "$out/share/applications/org.qutebrowser.qutebrowser.desktop" # Install icons for i in 16 24 32 48 64 128 256 512; do @@ -95,6 +98,12 @@ in python3Packages.buildPythonApplication rec { done ''; + postFixup = '' + wrapProgram $out/bin/qutebrowser \ + "''${gappsWrapperArgs[@]}" \ + "''${qtWrapperArgs[@]}" + ''; + meta = with stdenv.lib; { homepage = https://github.com/The-Compiler/qutebrowser; description = "Keyboard-focused browser with a minimal GUI"; diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index 5b5d6a98e88..8c85370728f 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, go-bindata, libvirt, qemu +{ stdenv, buildGoModule, fetchFromGitHub, go-bindata, libvirt, qemu , gpgme, makeWrapper, vmnet , docker-machine-kvm, docker-machine-kvm2 , extraDrivers ? [] @@ -11,12 +11,11 @@ let binPath = drivers ++ stdenv.lib.optionals stdenv.isLinux ([ libvirt qemu ]); -in buildGoPackage rec { +in buildGoModule rec { pname = "minikube"; - name = "${pname}-${version}"; - version = "1.0.1"; + version = "1.2.0"; - kubernetesVersion = "1.14.1"; + kubernetesVersion = "1.15.0"; goPackagePath = "k8s.io/minikube"; @@ -24,15 +23,15 @@ in buildGoPackage rec { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "1fgyaq8789wc3h6xmn4iw6if2jxdv5my35yn6ipx3q6i4hagxl4b"; + sha256 = "0l9znrp49877cp1bkwx84c8lv282ga5a946rjbxi8gznkf3kwaw7"; }; + modSha256 = "1cp63n0x2lgbqvvymx9byx48r42qw6w224x5x4iiarc2nryfdhn0"; + buildInputs = [ go-bindata makeWrapper gpgme ] ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin vmnet; subPackages = [ "cmd/minikube" ] ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin "cmd/drivers/hyperkit"; preBuild = '' - pushd go/src/${goPackagePath} >/dev/null - go-bindata -nomemcopy -o pkg/minikube/assets/assets.go -pkg assets deploy/addons/... VERSION_MAJOR=$(grep "^VERSION_MAJOR" Makefile | sed "s/^.*\s//") @@ -47,21 +46,15 @@ in buildGoPackage rec { -X k8s.io/minikube/pkg/version.isoPath=$ISO_BUCKET \ -X k8s.io/minikube/vendor/k8s.io/client-go/pkg/version.gitVersion=$KUBERNETES_VERSION \ -X k8s.io/minikube/vendor/k8s.io/kubernetes/pkg/version.gitVersion=$KUBERNETES_VERSION" - - popd >/dev/null ''; postInstall = '' - mkdir -p $bin/share/bash-completion/completions/ - MINIKUBE_WANTUPDATENOTIFICATION=false MINIKUBE_WANTKUBECTLDOWNLOADMSG=false HOME=$PWD $bin/bin/minikube completion bash > $bin/share/bash-completion/completions/minikube - mkdir -p $bin/share/zsh/site-functions/ - MINIKUBE_WANTUPDATENOTIFICATION=false MINIKUBE_WANTKUBECTLDOWNLOADMSG=false HOME=$PWD $bin/bin/minikube completion zsh > $bin/share/zsh/site-functions/_minikube - ''; - - postFixup = '' - wrapProgram $bin/bin/${pname} --prefix PATH : $bin/bin:${stdenv.lib.makeBinPath binPath} - '' + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' - mv $bin/bin/hyperkit $bin/bin/docker-machine-driver-hyperkit + mkdir -p $out/share/bash-completion/completions/ + MINIKUBE_WANTUPDATENOTIFICATION=false MINIKUBE_WANTKUBECTLDOWNLOADMSG=false HOME=$PWD $out/bin/minikube completion bash > $out/share/bash-completion/completions/minikube + mkdir -p $out/share/zsh/site-functions/ + MINIKUBE_WANTUPDATENOTIFICATION=false MINIKUBE_WANTKUBECTLDOWNLOADMSG=false HOME=$PWD $out/bin/minikube completion zsh > $out/share/zsh/site-functions/_minikube + ''+ stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' + mv $out/bin/hyperkit $out/bin/docker-machine-driver-hyperkit ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 1833e641a07..f990f8de529 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -24,11 +24,11 @@ with python'.pkgs; buildPythonApplication rec { pname = "FlexGet"; - version = "2.21.8"; + version = "2.21.15"; src = fetchPypi { inherit pname version; - sha256 = "0a3dz013xxlwxz94i243bahw15k5y45mgk0z1zgkp1xrbiwglwvc"; + sha256 = "0p1pa5l9apd40mdlgzp9vfpd8x9laqiah2i8l3q9m6nnibk1ipx8"; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index 67d4e480110..10b7eb7d439 100644 --- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -13,17 +13,19 @@ let inherit (stdenv.hostPlatform) system; + throwSystem = throw "Unsupported system: ${system}"; + pname = "wire-desktop"; version = { "x86_64-linux" = "3.9.2895"; "x86_64-darwin" = "3.9.2943"; - }.${system}; + }.${system} or throwSystem; sha256 = { "x86_64-linux" = "0wrn95m64j4b7ym44h9zawq13kg4m12aixlyyzp56bfyczmjq4a5"; "x86_64-darwin" = "1y1bzsjmjrj518q29xfx6gg1nhdbaz7y5hzaqrp241az6plp090k"; - }.${system}; + }.${system} or throwSystem; meta = with stdenv.lib; { description = "A modern, secure messenger for everyone"; diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix index 42f29574eef..bb4c6c54f16 100644 --- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -31,11 +31,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "claws-mail-${version}"; - version = "3.17.3"; + version = "3.17.4"; src = fetchurl { url = "http://www.claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz"; - sha256 = "1wnj6c9cbmhphs2l6wfvndkk2g08rmxw0sl2c8k1k008dxd1ykjh"; + sha256 = "00mfhaac16sv67rwiq98hr4nl5zmd1h2afswwwksdcsi3q9x23jr"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index 9f45a70e8b8..727a68c440a 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -2,10 +2,10 @@ , hicolor-icon-theme, libsoup, gnome3 }: stdenv.mkDerivation rec { - name = "homebank-5.2.6"; + name = "homebank-5.2.7"; src = fetchurl { url = "http://homebank.free.fr/public/${name}.tar.gz"; - sha256 = "10cqii1bsc7dmg8nzj6xhmk44r390vca49vbsw4g504h0bvwn54s"; + sha256 = "0pzbn0wlppwbap19isbv8vv3cq7xswladhc272ykaya78r1bxvcf"; }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; diff --git a/pkgs/applications/radio/urh/default.nix b/pkgs/applications/radio/urh/default.nix index 48c20ecca47..a1b92e7e4e1 100644 --- a/pkgs/applications/radio/urh/default.nix +++ b/pkgs/applications/radio/urh/default.nix @@ -1,5 +1,6 @@ -{ stdenv, fetchFromGitHub, python3Packages -, hackrf, rtl-sdr, airspy, limesuite }: +{ stdenv, lib, fetchFromGitHub, python3Packages +, hackrf, rtl-sdr, airspy, limesuite, libiio +, USRPSupport ? false, uhd }: python3Packages.buildPythonApplication rec { pname = "urh"; @@ -12,14 +13,16 @@ python3Packages.buildPythonApplication rec { sha256 = "1jrrj9c4ddm37m8j0g693xjimpnlvx7lan5kxish5p14xpwdak35"; }; - buildInputs = [ hackrf rtl-sdr airspy limesuite ]; + buildInputs = [ hackrf rtl-sdr airspy limesuite libiio ] + ++ lib.optional USRPSupport uhd; + propagatedBuildInputs = with python3Packages; [ - pyqt5 numpy psutil cython pyzmq + pyqt5 numpy psutil cython pyzmq pyaudio ]; doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/jopohl/urh"; description = "Universal Radio Hacker: investigate wireless protocols like a boss"; license = licenses.gpl3; diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index 84c01cbfd67..00231113d2c 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -17,14 +17,14 @@ let }; in stdenv.mkDerivation rec { - version = "14.29.46"; + version = "14.29.49"; pname = "jmol"; src = let baseVersion = "${lib.versions.major version}.${lib.versions.minor version}"; in fetchurl { url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz"; - sha256 = "00ig1f1fz5qbkam0h06vs1gsb95hdqa0iyhsp4qbyjjfxir7m59l"; + sha256 = "19fyr4ldvbd5rbw19hslg9fpwc42wxmyx7r3z78k6dw653vb1ml5"; }; patchPhase = '' diff --git a/pkgs/applications/science/electronics/eagle/eagle.nix b/pkgs/applications/science/electronics/eagle/eagle.nix index 90b7db4b545..ba1b9e174be 100644 --- a/pkgs/applications/science/electronics/eagle/eagle.nix +++ b/pkgs/applications/science/electronics/eagle/eagle.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { name = "eagle-${version}"; - version = "9.4.1"; + version = "9.4.2"; src = fetchurl { url = "https://eagle-updates.circuits.io/downloads/${builtins.replaceStrings ["."] ["_"] version}/Autodesk_EAGLE_${version}_English_Linux_64bit.tar.gz"; - sha256 = "0p3kxryvk853rx24phcadvmqn6f37rnnql8sf6cqn9cqhrrkbvlq"; + sha256 = "0lrwrvqcb91mcggmicvwjrngccsdy0f06l7a8nfgp9ckn4d9vmg2"; }; desktopItem = makeDesktopItem { diff --git a/pkgs/applications/science/logic/why3/configure.patch b/pkgs/applications/science/logic/why3/configure.patch new file mode 100644 index 00000000000..3eebf3cf165 --- /dev/null +++ b/pkgs/applications/science/logic/why3/configure.patch @@ -0,0 +1,11 @@ +diff --git a/configure b/configure +--- a/configure ++++ b/configure +@@ -4029,7 +4029,6 @@ fi + + if test "$USEOCAMLFIND" = yes; then + OCAMLFINDLIB=$(ocamlfind printconf stdlib) +- OCAMLFIND=$(which ocamlfind) + if test "$OCAMLFINDLIB" != "$OCAMLLIB"; then + USEOCAMLFIND=no; + echo "but your ocamlfind is not compatible with your ocamlc:" diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix index a3b369ad54a..bd538dc6c75 100644 --- a/pkgs/applications/science/logic/why3/default.nix +++ b/pkgs/applications/science/logic/why3/default.nix @@ -1,4 +1,5 @@ -{ fetchurl, stdenv, ocamlPackages, coq }: +{ callPackage, fetchurl, stdenv +, ocamlPackages, coqPackages, rubber, hevea, emacs }: stdenv.mkDerivation rec { name = "why3-${version}"; @@ -9,14 +10,34 @@ stdenv.mkDerivation rec { sha256 = "0xz001jhi71ja8vqrjz27v63bidrzj4qvg1yqarq6p4dmpxhk348"; }; - buildInputs = (with ocamlPackages; [ - ocaml findlib num lablgtk ocamlgraph zarith menhir ]) ++ - stdenv.lib.optionals (ocamlPackages.ocaml == coq.ocamlPackages.ocaml ) [ - coq ocamlPackages.camlp5 - ]; + buildInputs = with ocamlPackages; [ + ocaml findlib ocamlgraph zarith menhir + # Compressed Sessions + # Emacs compilation of why3.el + emacs + # Documentation + rubber hevea + # GUI + lablgtk + # WebIDE + js_of_ocaml js_of_ocaml-ppx + # Coq Support + coqPackages.coq coqPackages.flocq ocamlPackages.camlp5 + ]; + + propagatedBuildInputs = with ocamlPackages; [ camlzip num ]; + + enableParallelBuilding = true; + + # Remove unnecessary call to which + patches = [ ./configure.patch ]; + + configureFlags = [ "--enable-verbose-make" ]; installTargets = [ "install" "install-lib" ]; + passthru.withProvers = callPackage ./with-provers.nix {}; + meta = with stdenv.lib; { description = "A platform for deductive program verification"; homepage = "http://why3.lri.fr/"; diff --git a/pkgs/applications/science/logic/why3/with-provers.nix b/pkgs/applications/science/logic/why3/with-provers.nix new file mode 100644 index 00000000000..3528dbd3a64 --- /dev/null +++ b/pkgs/applications/science/logic/why3/with-provers.nix @@ -0,0 +1,30 @@ +{ stdenv, makeWrapper, runCommand, symlinkJoin, why3 }: +provers: +let configAwkScript = runCommand "why3-conf.awk" { inherit provers; } + '' + for p in $provers; do + for b in $p/bin/*; do + BASENAME=$(basename $b) + echo "/^command =/{ gsub(\"$BASENAME\", \"$b\") }" >> $out + done + done + echo '{ print }' >> $out + ''; +in stdenv.mkDerivation { + name = "${why3.name}-with-provers"; + + phases = [ "buildPhase" "installPhase" ]; + + buildInputs = [ why3 makeWrapper ] ++ provers; + + buildPhase = '' + mkdir -p $out/share/why3/ + why3 config --detect-provers -C $out/share/why3/why3.conf + awk -i inplace -f ${configAwkScript} $out/share/why3/why3.conf + ''; + + installPhase = '' + mkdir -p $out/bin + makeWrapper ${why3}/bin/why3 $out/bin/why3 --add-flags "--extra-config $out/share/why3/why3.conf" + ''; +} diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix index 1a3ba8096e2..fbdbac003dc 100644 --- a/pkgs/applications/science/math/gmsh/default.nix +++ b/pkgs/applications/science/math/gmsh/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, cmake, openblasCompat, gfortran, gmm, fltk, libjpeg , zlib, libGLU_combined, libGLU, xorg }: -let version = "4.4.0"; in +let version = "4.4.1"; in stdenv.mkDerivation { name = "gmsh-${version}"; src = fetchurl { url = "http://gmsh.info/src/gmsh-${version}-source.tgz"; - sha256 = "0b0h15cmi6zy31cii7r9jmfm9xksljff255dn6l9frhdjymkmx7l"; + sha256 = "1p7hibmsgv961lfkzdxlgcvmcb0q155m2sp60r97cjsfzhw68g45"; }; buildInputs = [ openblasCompat gmm fltk libjpeg zlib libGLU_combined diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 67125458c72..4c78963d7fa 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -14,6 +14,7 @@ , darwin , withLibsecret ? false , pkgconfig, glib, libsecret +, gzip # needed at runtime by gitweb.cgi }: assert sendEmailSupport -> perlSupport; @@ -22,6 +23,8 @@ assert svnSupport -> perlSupport; let version = "2.22.0"; svn = subversionClient.override { perlBindings = perlSupport; }; + + gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; in stdenv.mkDerivation { @@ -32,7 +35,7 @@ stdenv.mkDerivation { sha256 = "17zj6jwx3s6bybd290f1mj5iym1r64560rmnf0p63x4akxclp7hm"; }; - outputs = [ "out" ] ++ stdenv.lib.optional perlSupport "gitweb"; + outputs = [ "out" ]; hardeningDisable = [ "format" ]; @@ -171,9 +174,6 @@ stdenv.mkDerivation { # HTTP(s) transports for pushing ln -s $out/libexec/git-core/git-http-backend $out/bin/git-http-backend '' + stdenv.lib.optionalString perlSupport '' - # put in separate package for simpler maintenance - mv $out/share/gitweb $gitweb/ - # wrap perl commands makeWrapper "$out/share/git/contrib/credential/netrc/git-credential-netrc" $out/bin/git-credential-netrc \ --set PERL5LIB "$out/${perlPackages.perl.libPrefix}:${perlPackages.makePerlPath perlLibs}" @@ -187,6 +187,16 @@ stdenv.mkDerivation { --set GITPERLLIB "$out/${perlPackages.perl.libPrefix}:${perlPackages.makePerlPath perlLibs}" wrapProgram $out/libexec/git-core/git-cvsexportcommit \ --set GITPERLLIB "$out/${perlPackages.perl.libPrefix}:${perlPackages.makePerlPath perlLibs}" + + # gzip (and optionally bzip2, xz, zip) are runtime dependencies for + # gitweb.cgi, need to patch so that it's found + sed -i -e "s|'compressor' => \['gzip'|'compressor' => ['${gzip}/bin/gzip'|" \ + $out/share/gitweb/gitweb.cgi + # Give access to CGI.pm and friends (was removed from perl core in 5.22) + for p in ${stdenv.lib.concatStringsSep " " gitwebPerlLibs}; do + sed -i -e "/use CGI /i use lib \"$p/${perlPackages.perl.libPrefix}\";" \ + "$out/share/gitweb/gitweb.cgi" + done '' + (if svnSupport then '' diff --git a/pkgs/applications/version-management/git-and-tools/gitweb/default.nix b/pkgs/applications/version-management/git-and-tools/gitweb/default.nix index a98dd5bc586..afd90ba4969 100644 --- a/pkgs/applications/version-management/git-and-tools/gitweb/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitweb/default.nix @@ -1,35 +1,25 @@ -{ stdenv, git, gzip, perlPackages, fetchFromGitHub +{ stdenv, buildEnv, git, fetchFromGitHub , gitwebTheme ? false }: let - gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; gitwebThemeSrc = fetchFromGitHub { owner = "kogakure"; repo = "gitweb-theme"; rev = "049b88e664a359f8ec25dc6f531b7e2aa60dd1a2"; - sha256 = "0wksqma41z36dbv6w6iplkjfdm0ha3njp222fakyh4lismajr71p"; + extraPostFetch = '' + mkdir -p "$TMPDIR/gitwebTheme" + mv "$out"/* "$TMPDIR/gitwebTheme/" + mkdir "$out/static" + mv "$TMPDIR/gitwebTheme"/* "$out/static/" + ''; + sha256 = "17hypq6jvhy6zhh26lp3nyi52npfd5wy5752k6sq0shk4na2acqi"; }; -in stdenv.mkDerivation { +in buildEnv { name = "gitweb-${stdenv.lib.getVersion git}"; - src = git.gitweb; - - installPhase = '' - mkdir $out - mv * $out - - # gzip (and optionally bzip2, xz, zip) are runtime dependencies for - # gitweb.cgi, need to patch so that it's found - sed -i -e "s|'compressor' => \['gzip'|'compressor' => ['${gzip}/bin/gzip'|" \ - $out/gitweb.cgi - # Give access to CGI.pm and friends (was removed from perl core in 5.22) - for p in ${stdenv.lib.concatStringsSep " " gitwebPerlLibs}; do - sed -i -e "/use CGI /i use lib \"$p/${perlPackages.perl.libPrefix}\";" \ - "$out/gitweb.cgi" - done - - ${stdenv.lib.optionalString gitwebTheme "cp ${gitwebThemeSrc}/* $out/static"} - ''; + ignoreCollisions = true; + paths = stdenv.lib.optional gitwebTheme "${gitwebThemeSrc}" + ++ [ "${git}/share/gitweb" ]; meta = git.meta // { maintainers = with stdenv.lib.maintainers; [ gnidorah ]; diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/pkgs/applications/version-management/smartgithg/default.nix index 38c3da220c9..5c9b5a83c18 100644 --- a/pkgs/applications/version-management/smartgithg/default.nix +++ b/pkgs/applications/version-management/smartgithg/default.nix @@ -1,64 +1,90 @@ -{ stdenv, fetchurl, lib, makeWrapper -, substituteAll +{ stdenv +, fetchurl +, makeDesktopItem , jre -, gtk2, glib +, gtk3 +, glib +, gnome3 +, wrapGAppsHook +, hicolor-icon-theme , libXtst , which }: stdenv.mkDerivation rec { - name = "smartgithg-${version}"; - version = "18.2.4"; + pname = "smartgithg"; + version = "18.2.9"; src = fetchurl { url = "https://www.syntevo.com/downloads/smartgit/smartgit-linux-${builtins.replaceStrings [ "." ] [ "_" ] version}.tar.gz"; - sha256 = "0ch6vcvndn1fpx05ym9yp2ssfw2af6ac0pw8ssvjkc676zc0jr73"; + sha256 = "0d08awb2s3w1w8n8048abw2x4wnqhfx96sls9kdsnxj0xrszgz67"; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ wrapGAppsHook ]; - buildInputs = [ jre ]; + buildInputs = [ jre gnome3.adwaita-icon-theme hicolor-icon-theme gtk3 ]; - buildCommand = let - pkg_path = "$out/${name}"; - bin_path = "$out/bin"; - install_freedesktop_items = substituteAll { - inherit (stdenv) shell; - isExecutable = true; - src = ./install_freedesktop_items.sh; - }; - runtime_paths = lib.makeBinPath [ - jre - #git mercurial subversion # the paths are requested in configuration - which - ]; - runtime_lib_paths = lib.makeLibraryPath [ - gtk2 glib - libXtst - ]; - in '' - tar xvzf $src - mkdir -pv $out - mkdir -pv ${pkg_path} - # unpacking should have produced a dir named 'smartgit' - cp -a smartgit/* ${pkg_path} - # prevent using packaged jre - rm -r ${pkg_path}/jre - mkdir -pv ${bin_path} - jre=${jre.home} - makeWrapper ${pkg_path}/bin/smartgit.sh ${bin_path}/smartgit \ - --prefix PATH : ${runtime_paths} \ - --prefix LD_LIBRARY_PATH : ${runtime_lib_paths} \ + preFixup = with stdenv.lib; '' + gappsWrapperArgs+=( \ + --prefix PATH : ${makeBinPath [ jre which ]} \ + --prefix LD_LIBRARY_PATH : ${makeLibraryPath [ + gtk3 + glib + libXtst + ]} \ --prefix JRE_HOME : ${jre} \ --prefix JAVA_HOME : ${jre} \ - --prefix SMARTGITHG_JAVA_HOME : ${jre} - sed -i '/ --login/d' ${pkg_path}/bin/smartgit.sh - patchShebangs $out - cp ${bin_path}/smartgit ${bin_path}/smartgithg + --prefix SMARTGITHG_JAVA_HOME : ${jre} \ + ) \ + ''; + + installPhase = '' + runHook preInstall + + sed -i '/ --login/d' bin/smartgit.sh + mkdir -pv $out/{bin,share/applications,share/icons/hicolor/scalable/apps/} + cp -av ./{dictionaries,lib} $out/ + cp -av bin/smartgit.sh $out/bin/smartgit + ln -sfv $out/bin/smartgit $out/bin/smartgithg + + cp -av $desktopItem/share/applications/* $out/share/applications/ + for icon_size in 32 48 64 128 256; do + path=$icon_size'x'$icon_size + icon=bin/smartgit-$icon_size.png + mkdir -p $out/share/icons/hicolor/$path/apps + cp $icon $out/share/icons/hicolor/$path/apps/smartgit.png + done - ${install_freedesktop_items} "${pkg_path}/bin" "$out" + cp -av bin/smartgit.svg $out/share/icons/hicolor/scalable/apps/ + + runHook postInstall ''; + desktopItem = with stdenv.lib; makeDesktopItem rec { + name = "smartgit"; + exec = "smartgit"; + comment = meta.description; + icon = "smartgit"; + desktopName = "SmartGit"; + categories = concatStringsSep ";" [ + "Application" + "Development" + "RevisionControl" + ]; + mimeType = concatStringsSep ";" [ + "x-scheme-handler/git" + "x-scheme-handler/smartgit" + "x-scheme-handler/sourcetree" + ]; + startupNotify = "true"; + extraEntries = '' + Keywords=git + StartupWMClass=${name} + Version=1.0 + Encoding=UTF-8 + ''; + }; + meta = with stdenv.lib; { description = "GUI for Git, Mercurial, Subversion"; homepage = http://www.syntevo.com/smartgit/; diff --git a/pkgs/applications/version-management/smartgithg/install_freedesktop_items.sh b/pkgs/applications/version-management/smartgithg/install_freedesktop_items.sh deleted file mode 100755 index 2ff14dcf099..00000000000 --- a/pkgs/applications/version-management/smartgithg/install_freedesktop_items.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!@shell@ - -inBinDir=$1 -out=$2 - -cat $inBinDir/add-menuitem.sh | \ -sed -re 's#xdg-icon-resource[ ]+install[ ]+--size[ ]+([0-9]+)[ ]+("[^"]+")[ ]+([$0-9a-zA-Z_]+)#mkdir -p '${out}'/share/icons/hicolor/\1x\1/apps \&\& cp \2 '${out}'/share/icons/hicolor/\1x\1/apps/\3\.png #' | \ -sed -re 's#xdg-desktop-menu[ ]+install[ ]+([$0-9a-zA-Z_]+)#mkdir -p '${out}'/share/applications \&\& cp \1 '${out}'/share/applications/#' | \ -sed -re 's#Exec="[^"]+"#Exec=smartgit#' | -sed -re 's#SMARTGIT_BIN=.*#'SMARTGIT_BIN=${inBinDir}'#' \ -| bash diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix index 04130f25f30..c4ce2750172 100644 --- a/pkgs/data/documentation/man-pages/default.nix +++ b/pkgs/data/documentation/man-pages/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "man-pages-${version}"; - version = "5.01"; + version = "5.02"; src = fetchurl { url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz"; - sha256 = "09xn8d8xxwgms6h1bvjlgn3mxz51vxf3ra0ry9f5dqi29qry3z3x"; + sha256 = "1s4pdz2pwf0kvhdwx2s6lqn3xxzi38yz5jfyq5ymdmswc9gaiyn2"; }; makeFlags = [ "MANDIR=$(out)/share/man" ]; diff --git a/pkgs/data/fonts/terminus-font/default.nix b/pkgs/data/fonts/terminus-font/default.nix index 4198fe2cbe6..57356398004 100644 --- a/pkgs/data/fonts/terminus-font/default.nix +++ b/pkgs/data/fonts/terminus-font/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "terminus-font"; - version = "4.47"; + version = "4.48"; name = "${pname}-${version}"; # set here for use in URL below src = fetchurl { url = "mirror://sourceforge/project/${pname}/${name}/${name}.tar.gz"; - sha256 = "15qjcpalcxjiwsjgjg5k88vkwp56cs2nnx4ghya6mqp4i1c206qg"; + sha256 = "1bwlkj39rqbyq57v5yssayav6hzv1n11b9ml2s0dpiyfsn6rqy9l"; }; nativeBuildInputs = [ python3 bdftopcf mkfontdir mkfontscale ]; diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index 0eb3dbefe41..eeee8d56664 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,6 @@ { fetchurl }: fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/bee48f46f4c9e9c1195bf81efb61fa5fb0aec0dc.tar.gz"; - sha256 = "0wxj0iakqy1cyncga8s1qlb8c06vj3ilh5z8lpann7xr8yh6sm4b"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/4db96602103463d72e59ce214d0da8af35405f07.tar.gz"; + sha256 = "14r7m3555ngfafk2wgdj4lnv7zzajcc4j4fiws4k3kr3xwbrwrxr"; } diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix index 19872bef7fe..39cdd29c94b 100644 --- a/pkgs/data/misc/osinfo-db/default.nix +++ b/pkgs/data/misc/osinfo-db/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "osinfo-db"; - version = "20190611"; + version = "20190726"; src = fetchurl { url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz"; - sha256 = "00gkdkycicl4rlr8by61sfsgpjsiswr8b148fl2arinr4vz3n46h"; + sha256 = "0kcdq8g324a368bqvki718ms5kdcc3dzfmpgzyxwl0mkxbmhmirr"; }; nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ]; diff --git a/pkgs/desktops/deepin/dde-calendar/default.nix b/pkgs/desktops/deepin/dde-calendar/default.nix index 16c8002b8e4..0d25d9083eb 100644 --- a/pkgs/desktops/deepin/dde-calendar/default.nix +++ b/pkgs/desktops/deepin/dde-calendar/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake, qttools, +{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, cmake, qttools, deepin-gettext-tools, dtkcore, dtkwidget, deepin }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "${pname}-${version}"; pname = "dde-calendar"; version = "1.2.10"; diff --git a/pkgs/desktops/deepin/dde-control-center/default.nix b/pkgs/desktops/deepin/dde-control-center/default.nix index 906812cf98b..88c3639ff2e 100644 --- a/pkgs/desktops/deepin/dde-control-center/default.nix +++ b/pkgs/desktops/deepin/dde-control-center/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake, deepin, qttools, qtdeclarative, +{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, cmake, deepin, qttools, qtdeclarative, networkmanager, qtsvg, qtx11extras, dtkcore, dtkwidget, geoip, gsettings-qt, dde-network-utils, networkmanager-qt, xorg, mtdev, fontconfig, freetype, dde-api, dde-daemon, qt5integration, deepin-desktop-base, deepin-desktop-schemas, dbus, systemd, dde-qt-dbus-factory, qtmultimedia, qtbase, glib, gnome3, which, - substituteAll, wrapGAppsHook, tzdata + substituteAll, tzdata, wrapGAppsHook }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "${pname}-${version}"; pname = "dde-control-center"; version = "4.10.11"; diff --git a/pkgs/desktops/deepin/dde-dock/default.nix b/pkgs/desktops/deepin/dde-dock/default.nix index e143f783a5a..21c8221bd13 100644 --- a/pkgs/desktops/deepin/dde-dock/default.nix +++ b/pkgs/desktops/deepin/dde-dock/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, qttools, qtx11extras, - qtsvg, libsForQt5, polkit, gsettings-qt, dtkcore, dtkwidget, +{ stdenv, mkDerivation, fetchFromGitHub, cmake, pkgconfig, qttools, qtx11extras, + qtsvg, polkit, gsettings-qt, dtkcore, dtkwidget, dde-qt-dbus-factory, dde-network-utils, dde-daemon, deepin-desktop-schemas, xorg, glib, wrapGAppsHook, deepin, - plugins ? [], symlinkJoin, makeWrapper }: + plugins ? [], symlinkJoin, makeWrapper, libdbusmenu }: let -unwrapped = stdenv.mkDerivation rec { +unwrapped = mkDerivation rec { name = "${pname}-${version}"; pname = "dde-dock"; version = "4.10.3"; @@ -34,7 +34,7 @@ unwrapped = stdenv.mkDerivation rec { dtkwidget glib.bin gsettings-qt - libsForQt5.libdbusmenu + libdbusmenu polkit qtsvg qtx11extras diff --git a/pkgs/desktops/deepin/dde-file-manager/default.nix b/pkgs/desktops/deepin/dde-file-manager/default.nix index c203ccae6fb..3580eeb4304 100644 --- a/pkgs/desktops/deepin/dde-file-manager/default.nix +++ b/pkgs/desktops/deepin/dde-file-manager/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, avfs, dde-daemon, dde-dock, +{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, avfs, dde-daemon, dde-dock, dde-polkit-agent, dde-qt-dbus-factory, deepin, deepin-anything, deepin-desktop-schemas, deepin-gettext-tools, deepin-movie-reborn, deepin-shortcut-viewer, deepin-terminal, dtkcore, dtkwidget, @@ -8,7 +8,7 @@ qtx11extras, runtimeShell, samba, shadow, taglib, udisks2-qt5, xdg-user-dirs, xorg, zlib, wrapGAppsHook }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "${pname}-${version}"; pname = "dde-file-manager"; version = "4.8.6.4"; diff --git a/pkgs/desktops/deepin/dde-launcher/default.nix b/pkgs/desktops/deepin/dde-launcher/default.nix index 2710393a257..f8a05b86980 100644 --- a/pkgs/desktops/deepin/dde-launcher/default.nix +++ b/pkgs/desktops/deepin/dde-launcher/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake, dde-qt-dbus-factory, +{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, cmake, dde-qt-dbus-factory, dde-session-ui, deepin, deepin-desktop-schemas, deepin-wallpapers, dtkcore, dtkwidget, gsettings-qt, qtsvg, qttools, qtx11extras, which, xdg_utils, wrapGAppsHook }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "${pname}-${version}"; pname = "dde-launcher"; version = "4.6.13"; diff --git a/pkgs/desktops/deepin/dde-network-utils/default.nix b/pkgs/desktops/deepin/dde-network-utils/default.nix index 84c7c9207ec..4fd08749ee4 100644 --- a/pkgs/desktops/deepin/dde-network-utils/default.nix +++ b/pkgs/desktops/deepin/dde-network-utils/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub, substituteAll, qmake, pkgconfig, qttools, +{ stdenv, mkDerivation, fetchFromGitHub, substituteAll, qmake, pkgconfig, qttools, dde-qt-dbus-factory, proxychains, which, deepin }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "${pname}-${version}"; pname = "dde-network-utils"; version = "0.1.4"; diff --git a/pkgs/desktops/deepin/dde-polkit-agent/default.nix b/pkgs/desktops/deepin/dde-polkit-agent/default.nix index 8e58ae2f684..d1f1bed2775 100644 --- a/pkgs/desktops/deepin/dde-polkit-agent/default.nix +++ b/pkgs/desktops/deepin/dde-polkit-agent/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub, pkgconfig, qmake, qttools, polkit-qt, +{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, qttools, polkit-qt, dtkcore, dtkwidget, dde-qt-dbus-factory, deepin }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "${pname}-${version}"; pname = "dde-polkit-agent"; version = "0.2.10"; diff --git a/pkgs/desktops/deepin/dde-session-ui/default.nix b/pkgs/desktops/deepin/dde-session-ui/default.nix index 0c00627cd4f..8302e8e97bc 100644 --- a/pkgs/desktops/deepin/dde-session-ui/default.nix +++ b/pkgs/desktops/deepin/dde-session-ui/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchFromGitHub, pkgconfig, qmake, dbus, dde-daemon, +{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, dbus, dde-daemon, dde-qt-dbus-factory, deepin, deepin-desktop-schemas, deepin-gettext-tools, deepin-icon-theme, deepin-wallpapers, dtkcore, dtkwidget, gnugrep, gsettings-qt, hicolor-icon-theme, lightdm_qt, onboard, qtsvg, qttools, qtx11extras, setxkbmap, utillinux, which, xkeyboard_config, xorg, xrandr, wrapGAppsHook }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "${pname}-${version}"; pname = "dde-session-ui"; version = "4.9.12"; @@ -109,7 +109,7 @@ stdenv.mkDerivation rec { postFixup = '' # wrapGAppsHook does not work with binaries outside of $out/bin or $out/libexec for binary in $out/lib/deepin-daemon/*; do - wrapProgram $binary "''${gappsWrapperArgs[@]}" + wrapProgram $binary "''${qtWrapperArgs[@]}" done searchHardCodedPaths $out # debugging diff --git a/pkgs/desktops/deepin/deepin-anything/default.nix b/pkgs/desktops/deepin/deepin-anything/default.nix index a8cce9ba392..c768fa60ce7 100644 --- a/pkgs/desktops/deepin/deepin-anything/default.nix +++ b/pkgs/desktops/deepin/deepin-anything/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub, pkgconfig, qtbase, udisks2-qt5, utillinux, +{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qtbase, udisks2-qt5, utillinux, dtkcore, deepin }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "${pname}-${version}"; pname = "deepin-anything"; version = "0.1.0"; diff --git a/pkgs/desktops/deepin/deepin-calculator/default.nix b/pkgs/desktops/deepin/deepin-calculator/default.nix index 5b7ca756607..51f0b666cb1 100644 --- a/pkgs/desktops/deepin/deepin-calculator/default.nix +++ b/pkgs/desktops/deepin/deepin-calculator/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub, pkgconfig, qmake, qttools, qtsvg, dtkcore, +{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, qttools, qtsvg, dtkcore, dtkwidget, deepin }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "${pname}-${version}"; pname = "deepin-calculator"; version = "1.0.11"; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { postFixup = '' searchHardCodedPaths $out # debugging ''; - + passthru.updateScript = deepin.updateScript { inherit name; }; meta = with stdenv.lib; { diff --git a/pkgs/desktops/deepin/deepin-image-viewer/default.nix b/pkgs/desktops/deepin/deepin-image-viewer/default.nix index 5957478aa48..89ef6247504 100644 --- a/pkgs/desktops/deepin/deepin-image-viewer/default.nix +++ b/pkgs/desktops/deepin/deepin-image-viewer/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchFromGitHub, pkgconfig, qmake, qttools, qtsvg, +{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, qttools, qtsvg, qtx11extras, dtkcore, dtkwidget, qt5integration, freeimage, libraw, libexif, deepin }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "${pname}-${version}"; pname = "deepin-image-viewer"; version = "1.3.17"; diff --git a/pkgs/desktops/deepin/deepin-menu/default.nix b/pkgs/desktops/deepin/deepin-menu/default.nix index 43a124c0719..4292fb2d212 100644 --- a/pkgs/desktops/deepin/deepin-menu/default.nix +++ b/pkgs/desktops/deepin/deepin-menu/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub, pkgconfig, qmake, dtkcore, dtkwidget, +{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, dtkcore, dtkwidget, qt5integration, deepin }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "${pname}-${version}"; pname = "deepin-menu"; version = "3.4.8"; diff --git a/pkgs/desktops/deepin/deepin-metacity/default.nix b/pkgs/desktops/deepin/deepin-metacity/default.nix index fdf2c240e2c..a4aede5857c 100644 --- a/pkgs/desktops/deepin/deepin-metacity/default.nix +++ b/pkgs/desktops/deepin/deepin-metacity/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, gnome3, glib, gtk3, libgtop, bamf, json-glib, libcanberra-gtk3, libxkbcommon, libstartup_notification, deepin-wallpapers, deepin-desktop-schemas, - deepin }: + deepin, wrapGAppsHook }: stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { libtool glib.dev gnome3.gnome-common + wrapGAppsHook ]; buildInputs = [ diff --git a/pkgs/desktops/deepin/deepin-movie-reborn/default.nix b/pkgs/desktops/deepin/deepin-movie-reborn/default.nix index cdf3019e5fe..6e14f0fd804 100644 --- a/pkgs/desktops/deepin/deepin-movie-reborn/default.nix +++ b/pkgs/desktops/deepin/deepin-movie-reborn/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, qttools, qtx11extras, +{ stdenv, mkDerivation, fetchFromGitHub, cmake, pkgconfig, qttools, qtx11extras, dtkcore, dtkwidget, ffmpeg, ffmpegthumbnailer, mpv, pulseaudio, libdvdnav, libdvdread, xorg, deepin }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "${pname}-${version}"; pname = "deepin-movie-reborn"; version = "3.2.24"; diff --git a/pkgs/desktops/deepin/deepin-screenshot/default.nix b/pkgs/desktops/deepin/deepin-screenshot/default.nix index 4096df66190..256744828db 100644 --- a/pkgs/desktops/deepin/deepin-screenshot/default.nix +++ b/pkgs/desktops/deepin/deepin-screenshot/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig, xdg_utils, qttools, qtx11extras, +{ stdenv, mkDerivation, fetchFromGitHub, fetchpatch, cmake, pkgconfig, xdg_utils, qttools, qtx11extras, dtkcore, dtkwidget, dtkwm, deepin-turbo, deepin-shortcut-viewer, deepin }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "${pname}-${version}"; pname = "deepin-screenshot"; version = "4.2.1"; diff --git a/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix b/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix index 737c99261f9..8c482d53405 100644 --- a/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix +++ b/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub, pkgconfig, qmake, dtkcore, dtkwidget, +{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, dtkcore, dtkwidget, qt5integration, deepin }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "${pname}-${version}"; pname = "deepin-shortcut-viewer"; version = "1.3.5"; diff --git a/pkgs/desktops/deepin/deepin-terminal/default.nix b/pkgs/desktops/deepin/deepin-terminal/default.nix index 937c1f0d218..51156554f99 100644 --- a/pkgs/desktops/deepin/deepin-terminal/default.nix +++ b/pkgs/desktops/deepin/deepin-terminal/default.nix @@ -2,7 +2,7 @@ gettext, at-spi2-core, dbus, epoxy, expect, gtk3, json-glib, libXdmcp, libgee, libpthreadstubs, librsvg, libsecret, libtasn1, libxcb, libxkbcommon, p11-kit, pcre, vte, wnck, libselinux, - libsepol, utillinux, deepin-menu, deepin-shortcut-viewer, deepin }: + libsepol, utillinux, deepin-menu, deepin-shortcut-viewer, deepin, wrapGAppsHook }: stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { gettext libselinux libsepol utillinux # required by gio deepin.setupHook + wrapGAppsHook ]; buildInputs = [ diff --git a/pkgs/desktops/deepin/deepin-turbo/default.nix b/pkgs/desktops/deepin/deepin-turbo/default.nix index d5702a55d90..1fe930ea490 100644 --- a/pkgs/desktops/deepin/deepin-turbo/default.nix +++ b/pkgs/desktops/deepin/deepin-turbo/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, qtbase, deepin }: +{ stdenv, mkDerivation, fetchFromGitHub, cmake, pkgconfig, qtbase, deepin }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "${pname}-${version}"; pname = "deepin-turbo"; version = "0.0.3"; diff --git a/pkgs/desktops/deepin/dtkcore/default.nix b/pkgs/desktops/deepin/dtkcore/default.nix index a0ed5c04e18..2a527e3cc19 100644 --- a/pkgs/desktops/deepin/dtkcore/default.nix +++ b/pkgs/desktops/deepin/dtkcore/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, pkgconfig, qmake, gsettings-qt, pythonPackages, deepin }: +{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, gsettings-qt, pythonPackages, deepin }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "${pname}-${version}"; pname = "dtkcore"; version = "2.0.14"; diff --git a/pkgs/desktops/deepin/dtkwidget/default.nix b/pkgs/desktops/deepin/dtkwidget/default.nix index 4992519f832..8487509e73b 100644 --- a/pkgs/desktops/deepin/dtkwidget/default.nix +++ b/pkgs/desktops/deepin/dtkwidget/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitHub, pkgconfig, qmake, qttools, qtmultimedia, +{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, qttools, qtmultimedia, qtsvg, qtx11extras, librsvg, libstartup_notification, gsettings-qt, dde-qt-dbus-factory, dtkcore, deepin }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "${pname}-${version}"; pname = "dtkwidget"; version = "2.0.14"; @@ -31,12 +31,13 @@ stdenv.mkDerivation rec { dtkcore ]; - preConfigure = '' - qmakeFlags="$qmakeFlags \ - INCLUDE_INSTALL_DIR=$out/include \ - LIB_INSTALL_DIR=$out/lib \ - QT_HOST_DATA=$out" - ''; + outRef = placeholder "out"; + + qmakeFlags = [ + "INCLUDE_INSTALL_DIR=${outRef}/include" + "LIB_INSTALL_DIR=${outRef}/lib" + "QT_HOST_DATA=${outRef}" + ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/deepin/dtkwm/default.nix b/pkgs/desktops/deepin/dtkwm/default.nix index c0834ace8f8..c05eedd8857 100644 --- a/pkgs/desktops/deepin/dtkwm/default.nix +++ b/pkgs/desktops/deepin/dtkwm/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub, pkgconfig, qmake, qtx11extras, dtkcore, +{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, qtx11extras, dtkcore, deepin }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "${pname}-${version}"; pname = "dtkwm"; version = "2.0.11"; @@ -23,12 +23,13 @@ stdenv.mkDerivation rec { qtx11extras ]; - preConfigure = '' - qmakeFlags="$qmakeFlags \ - QT_HOST_DATA=$out \ - INCLUDE_INSTALL_DIR=$out/include \ - LIB_INSTALL_DIR=$out/lib" - ''; + outRef = placeholder "out"; + + qmakeFlags = [ + "QT_HOST_DATA=${outRef}" + "INCLUDE_INSTALL_DIR=${outRef}/include" + "LIB_INSTALL_DIR=${outRef}/lib" + ]; passthru.updateScript = deepin.updateScript { inherit name; }; diff --git a/pkgs/desktops/deepin/qcef/default.nix b/pkgs/desktops/deepin/qcef/default.nix index eb220dcdae6..b275174fa9f 100644 --- a/pkgs/desktops/deepin/qcef/default.nix +++ b/pkgs/desktops/deepin/qcef/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools, +{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools, qtwebchannel, qtx11extras, gnome2, nss, nspr, alsaLib, atk, cairo, cups, dbus, expat, fontconfig, gdk-pixbuf, glib, gtk2, @@ -38,7 +38,7 @@ let libPath = stdenv.lib.makeLibraryPath rpahtLibraries; in -stdenv.mkDerivation rec { +mkDerivation rec { name = "${pname}-${version}"; pname = "qcef"; version = "1.1.6"; diff --git a/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix b/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix index 2e6ddfcdb2d..f2e6eb0d123 100644 --- a/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix +++ b/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub, pkgconfig, qmake, qtx11extras, libSM, - mtdev, cairo, deepin }: +{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, qtx11extras, libSM, + mtdev, cairo, deepin, qtbase }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "${pname}-${version}"; pname = "qt5dxcb-plugin"; version = "1.2.2"; @@ -25,9 +25,9 @@ stdenv.mkDerivation rec { cairo ]; - preConfigure = '' - qmakeFlags="$qmakeFlags INSTALL_PATH=$out/$qtPluginPrefix/platforms" - ''; + qmakeFlags = [ + "INSTALL_PATH=${placeholder ''out''}/${qtbase.qtPluginPrefix}/platforms" + ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/deepin/qt5integration/default.nix b/pkgs/desktops/deepin/qt5integration/default.nix index 7df1fdf3165..8302e701b38 100644 --- a/pkgs/desktops/deepin/qt5integration/default.nix +++ b/pkgs/desktops/deepin/qt5integration/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitHub, pkgconfig, qmake, mtdev , - lxqt, qtx11extras, qtmultimedia, qtsvg , +{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, mtdev, + lxqt, qtx11extras, qtmultimedia, qtsvg, qt5dxcb-plugin, qtstyleplugins, dtkcore, dtkwidget, deepin }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "${pname}-${version}"; pname = "qt5integration"; version = "0.3.12"; diff --git a/pkgs/desktops/deepin/udisks2-qt5/default.nix b/pkgs/desktops/deepin/udisks2-qt5/default.nix index b0f5aaee97c..e7f735a4256 100644 --- a/pkgs/desktops/deepin/udisks2-qt5/default.nix +++ b/pkgs/desktops/deepin/udisks2-qt5/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, qmake, qtbase, deepin }: +{ stdenv, mkDerivation, fetchFromGitHub, qmake, qtbase, deepin }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "${pname}-${version}"; pname = "udisks2-qt5"; version = "0.0.1"; diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix index 776da94242f..7b7b7f64aa4 100644 --- a/pkgs/desktops/gnome-3/core/epiphany/default.nix +++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "epiphany-${version}"; - version = "3.32.3"; + version = "3.32.4"; src = fetchurl { url = "mirror://gnome/sources/epiphany/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0gx386k1p78ppjhvdanv99hfiwana0ccn9d499qrp0rvlicnijrw"; + sha256 = "15d9s295yr6m9pbwh344c4akm7rgn19y4g1xkyn7gbq1hdbjia69"; }; # Tests need an X display diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix index 99c7afffe7a..ad4cfa86c27 100644 --- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { pname = "files"; - version = "4.1.8"; + version = "4.1.9"; name = "elementary-${pname}-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = pname; rev = version; - sha256 = "1frslwbqnv3mwv5dpb1sbhxnwl87cps2ambkkhnn9wwckjpm7p8f"; + sha256 = "12p1li9a7kqdlgkq20svaly5kr661ww93qngaiic6zv1bdw2bpmv"; }; passthru = { diff --git a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix index 1ce18a1ec40..e30252bb71c 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "stylesheet"; - version = "5.2.4"; + version = "5.2.5"; name = "elementary-gtk-theme-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = pname; rev = version; - sha256 = "1zhh9s4bmmk69k6j0klvfjmyv32wnwf0g575brm6gswn47nr2fni"; + sha256 = "0934rfdwkn4315mhayzba8a3b6i1xczp66gl6n45hh5c81gb2p65"; }; passthru = { diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix index 9b942da25a6..ba4933363c1 100644 --- a/pkgs/development/compilers/ghc/8.2.2.nix +++ b/pkgs/development/compilers/ghc/8.2.2.nix @@ -166,7 +166,7 @@ stdenv.mkDerivation (rec { export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 - export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isAarch32 ".gold"}" + export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld.gold" export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" diff --git a/pkgs/development/compilers/ghc/8.4.4.nix b/pkgs/development/compilers/ghc/8.4.4.nix index a355f57a5c7..a90af60de43 100644 --- a/pkgs/development/compilers/ghc/8.4.4.nix +++ b/pkgs/development/compilers/ghc/8.4.4.nix @@ -126,7 +126,7 @@ stdenv.mkDerivation (rec { export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 - export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isAarch32 ".gold"}" + export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld.gold" export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" diff --git a/pkgs/development/compilers/ghc/8.6.4.nix b/pkgs/development/compilers/ghc/8.6.4.nix index ff9ef0a5c38..97ca95812d6 100644 --- a/pkgs/development/compilers/ghc/8.6.4.nix +++ b/pkgs/development/compilers/ghc/8.6.4.nix @@ -125,7 +125,7 @@ stdenv.mkDerivation (rec { export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 - export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isAarch32 ".gold"}" + export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld.gold" export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" diff --git a/pkgs/development/compilers/ghc/8.6.5.nix b/pkgs/development/compilers/ghc/8.6.5.nix index 44ad6da2ff5..d264cfda2a3 100644 --- a/pkgs/development/compilers/ghc/8.6.5.nix +++ b/pkgs/development/compilers/ghc/8.6.5.nix @@ -125,7 +125,7 @@ stdenv.mkDerivation (rec { export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 - export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isAarch32 ".gold"}" + export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld.gold" export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" diff --git a/pkgs/development/compilers/ghc/8.8.1.nix b/pkgs/development/compilers/ghc/8.8.1.nix index 07b9cd1e1aa..6899ad4fd48 100644 --- a/pkgs/development/compilers/ghc/8.8.1.nix +++ b/pkgs/development/compilers/ghc/8.8.1.nix @@ -110,7 +110,7 @@ stdenv.mkDerivation (rec { export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 - export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isAarch32 ".gold"}" + export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld.gold" export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 2edb49bd463..539d0408681 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -119,7 +119,8 @@ stdenv.mkDerivation (rec { export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 - export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isAarch32 ".gold"}" + # and more generally have a faster linker. + export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld.gold" export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" diff --git a/pkgs/development/compilers/graalvm/default.nix b/pkgs/development/compilers/graalvm/default.nix index b47f94fdf9a..be03e1aeeed 100644 --- a/pkgs/development/compilers/graalvm/default.nix +++ b/pkgs/development/compilers/graalvm/default.nix @@ -273,9 +273,9 @@ in rec { if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi EOF ''; + postFixup = openjdk.postFixup or null; dontStrip = true; # stripped javac crashes with "segmentaion fault" inherit (openjdk) meta; - inherit (openjdk) postFixup; }; graalvm8 = stdenv.mkDerivation rec { diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index f49d63168d4..32659d5be56 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.3.40"; + version = "1.3.41"; 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 = "14n3x0771d0a1yqncig97lk4bigkx2nvx20khpcnvf873c2b3h28"; + sha256 = "0ch1fynqjfsb7jklw3pa6fygrgnl8nz4x4v0id06wq4md23bcjn4"; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/compilers/reason/default.nix b/pkgs/development/compilers/reason/default.nix index 715b000f323..5ade7fd6fba 100644 --- a/pkgs/development/compilers/reason/default.nix +++ b/pkgs/development/compilers/reason/default.nix @@ -1,23 +1,24 @@ { stdenv, makeWrapper, fetchFromGitHub, ocaml, findlib, dune -, menhir, merlin-extend, ppx_tools_versioned, utop +, menhir, merlin-extend, ppx_tools_versioned, utop, cppo +, ocaml_lwt }: stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-reason-${version}"; - version = "3.3.7"; + version = "3.5.0"; src = fetchFromGitHub { owner = "facebook"; repo = "reason"; - rev = "4d20e5b535c29c5ef1283e65958b32996e449e5a"; - sha256 = "0f3pb61wg58g8f3wcnp1h4gpmnwmp7bq0cnqdfwldmh9cs0dqyfk"; + rev = "ea207004e021efef5a92ecd011d9d5b9b16bbded"; + sha256 = "0cdjy7sw15rlk63prrwy8lavqrz8fqwsgwr19ihvj99x332r98kk"; }; nativeBuildInputs = [ makeWrapper ]; propagatedBuildInputs = [ menhir merlin-extend ppx_tools_versioned ]; - buildInputs = [ ocaml findlib dune utop menhir ]; + buildInputs = [ ocaml findlib dune cppo utop menhir ]; buildFlags = [ "build" ]; # do not "make tests" before reason lib is installed @@ -26,6 +27,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/rtop \ --prefix PATH : "${utop}/bin" \ + --set CAML_LD_LIBRARY_PATH ${ocaml_lwt}/lib/ocaml/${ocaml.version}/site-lib:$CAML_LD_LIBRARY_PATH \ --set OCAMLPATH $out/lib/ocaml/${ocaml.version}/site-lib:$OCAMLPATH ''; diff --git a/pkgs/development/compilers/smlnj/bootstrap.nix b/pkgs/development/compilers/smlnj/bootstrap.nix index 2fe1f1f3f5a..21cfd408298 100644 --- a/pkgs/development/compilers/smlnj/bootstrap.nix +++ b/pkgs/development/compilers/smlnj/bootstrap.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchurl, cpio, rsync, makeWrapper }: +{ stdenv, fetchurl, cpio, rsync, xar, makeWrapper }: stdenv.mkDerivation rec { name = "smlnj-bootstrap-${version}"; - version = "110.84"; + version = "110.91"; src = fetchurl { url = "http://smlnj.cs.uchicago.edu/dist/working/${version}/smlnj-x86-${version}.pkg"; - sha256 = "17fpnlxcfwx2ysg6y9c5wwx6s3jca981nb0pawfcg6xg9wcapyfz"; + sha256 = "12jn50h5jz0ac1vzld2mb94p1dyc8h0mk0hip2wj5xqk1dbzwxl4"; }; buildInputs = [ cpio rsync makeWrapper ]; unpackPhase = '' - /usr/bin/xar -xf $src + ${xar}/bin/xar -xf $src cd smlnj.pkg ''; diff --git a/pkgs/development/coq-modules/coquelicot/default.nix b/pkgs/development/coq-modules/coquelicot/default.nix index e316a8b792d..3b916b5e40b 100644 --- a/pkgs/development/coq-modules/coquelicot/default.nix +++ b/pkgs/development/coq-modules/coquelicot/default.nix @@ -1,10 +1,23 @@ { stdenv, fetchurl, which, coq, ssreflect }: +let param = + if stdenv.lib.versionAtLeast coq.coq-version "8.8" + then { + version = "3.0.3"; + uid = "38105"; + sha256 = "0y52lqx1jphv6fwf0d702vzprxmfmxggnh1hy3fznxyl4isfpg4j"; + } else { + version = "3.0.2"; + uid = "37523"; + sha256 = "1biia7nfqf7vaqq5gmykl4rwjyvrcwss6r2jdf0in5pvp2rnrj2w"; + } +; in + stdenv.mkDerivation { - name = "coq${coq.coq-version}-coquelicot-3.0.2"; + name = "coq${coq.coq-version}-coquelicot-${param.version}"; src = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/file/37523/coquelicot-3.0.2.tar.gz"; - sha256 = "1biia7nfqf7vaqq5gmykl4rwjyvrcwss6r2jdf0in5pvp2rnrj2w"; + url = "https://gforge.inria.fr/frs/download.php/file/${param.uid}/coquelicot-${param.version}.tar.gz"; + inherit (param) sha256; }; nativeBuildInputs = [ which ]; @@ -24,7 +37,7 @@ stdenv.mkDerivation { }; passthru = { - compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" "8.9" ]; + compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" "8.9" "8.10" ]; }; } diff --git a/pkgs/development/coq-modules/flocq/default.nix b/pkgs/development/coq-modules/flocq/default.nix index 09fbd580845..d9ad7d6e3be 100644 --- a/pkgs/development/coq-modules/flocq/default.nix +++ b/pkgs/development/coq-modules/flocq/default.nix @@ -1,14 +1,12 @@ -{ stdenv, bash, which, autoconf, automake, fetchurl, coq }: +{ stdenv, bash, which, autoconf, automake, fetchzip, coq }: let params = if stdenv.lib.versionAtLeast coq.coq-version "8.7" then { - version = "3.1.0"; - uid = "37901"; - sha256 = "02szrgz9m0ac51la1lqpiv6i2g0zbgx9gz5rp0q1g00ajldyna5c"; + version = "3.2.0"; + sha256 = "15bi36x7zj0glsb3s2gwqd4wswhfzh36rbp7imbyff53a7nna95l"; } else { version = "2.6.1"; - uid = "37454"; - sha256 = "06msp1fwpqv6p98a3i1nnkj7ch9rcq3rm916yxq8dxf51lkghrin"; + sha256 = "1y4czkfrd8p37vwv198nns4hz1brfv71na17pxsidwpxy7qnyfw1"; } ; in @@ -17,8 +15,8 @@ stdenv.mkDerivation rec { name = "coq${coq.coq-version}-flocq-${version}"; inherit (params) version; - src = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/file/${params.uid}/flocq-${version}.tar.gz"; + src = fetchzip { + url = "https://gitlab.inria.fr/flocq/flocq/-/archive/flocq-${version}.tar.gz"; inherit (params) sha256; }; @@ -46,6 +44,6 @@ stdenv.mkDerivation rec { }; passthru = { - compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" "8.9" ]; + compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" "8.9" "8.10" ]; }; } diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 5cddf2f3672..524dba0e4c4 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -72,7 +72,7 @@ self: super: { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "11d4qyhmc774h2xyrpyn9rxx99x3vjs0fcxsg49gj5ayzmykafap"; + sha256 = "1pz12l0awshdq5xyac5awjd902sy9l65z6ihya4pzapik4gqfdcd"; }; }).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; @@ -1111,7 +1111,7 @@ self: super: { ''; }); - hsdev_0_3_3_1 = super.hsdev_0_3_3_1.overrideScope (self: super: { + hsdev_0_3_3_2 = super.hsdev_0_3_3_2.overrideScope (self: super: { haskell-names = self.haskell-names_0_9_6; network = self.network_3_0_1_1; }); @@ -1129,9 +1129,10 @@ self: super: { concurrent-output = self.concurrent-output_1_10_10; # needed for new ansi-terminal version hi-file-parser = dontCheck (unmarkBroken super.hi-file-parser); # Avoid depending on newer hspec versions. http-download = dontCheck (unmarkBroken super.http-download); - pantry-tmp = dontCheck (unmarkBroken super.pantry-tmp); - rio = self.rio_0_1_10_0; + pantry = dontCheck (unmarkBroken super.pantry); + rio = self.rio_0_1_11_0; rio-prettyprint = unmarkBroken super.rio-prettyprint; + unliftio = self.unliftio_0_2_12; })); # musl fixes @@ -1253,8 +1254,8 @@ self: super: { cmark-gfm = self.cmark-gfm_0_2_0; pandoc = dontCheck (doDistribute super.pandoc_2_7_3); # test suite failure: https://github.com/jgm/pandoc/issues/5582 pandoc-citeproc = doDistribute super.pandoc-citeproc_0_16_2; - skylighting = self.skylighting_0_8_1_1; - skylighting-core = self.skylighting-core_0_8_1_1; + skylighting = self.skylighting_0_8_2; + skylighting-core = self.skylighting-core_0_8_2; # Current versions of tasty-hedgehog need hedgehog 1.x, which # we don't have in LTS-13.x. @@ -1299,8 +1300,8 @@ self: super: { temporary-resourcet = doJailbreak super.temporary-resourcet; # Requires dhall >= 1.23.0 - ats-pkg = super.ats-pkg.override { dhall = self.dhall_1_24_0; }; - dhall-to-cabal = super.dhall-to-cabal.override { dhall = self.dhall_1_24_0; }; + ats-pkg = super.ats-pkg.override { dhall = self.dhall_1_25_0; }; + dhall-to-cabal = super.dhall-to-cabal.override { dhall = self.dhall_1_25_0; }; # Test suite doesn't work with current QuickCheck # https://github.com/pruvisto/heap/issues/11 @@ -1313,7 +1314,7 @@ self: super: { constraints-deriving = dontCheck super.constraints-deriving; # The old LTS-13.x version does not compile. - ip = self.ip_1_5_0; + ip = self.ip_1_5_1; # Needs deque >= 0.3, but latest version on stackage is 2.7 butcher = super.butcher.override { deque = self.deque_0_4_2_3; }; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index ee519f903ca..6eeade90a07 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -43,7 +43,7 @@ core-packages: - ghcjs-base-0 default-package-overrides: - # LTS Haskell 13.27 + # LTS Haskell 13.30 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -345,6 +345,7 @@ default-package-overrides: - bzlib ==0.5.0.5 - bzlib-conduit ==0.3.0.1 - c2hs ==0.28.6 + - Cabal ==2.4.1.0 - cabal2spec ==2.2.2.1 - cabal-doctest ==1.0.6 - cabal-rpm ==0.12.6 @@ -901,6 +902,7 @@ default-package-overrides: - hashids ==1.0.2.4 - hashmap ==1.3.3 - hashtables ==1.2.3.3 + - haskeline ==0.7.5.0 - haskell-gi ==0.21.5 - haskell-gi-base ==0.21.5 - haskell-gi-overloading ==1.0 @@ -1375,6 +1377,7 @@ default-package-overrides: - mono-traversable ==1.0.11.0 - mono-traversable-instances ==0.1.0.0 - mountpoints ==1.0.2 + - mtl ==2.2.2 - mtl-compat ==0.2.2 - mtl-prelude ==2.0.3.1 - multiarg ==0.30.0.10 @@ -1500,6 +1503,7 @@ default-package-overrides: - parallel-io ==0.3.3 - paripari ==0.6.0.0 - parseargs ==0.2.0.9 + - parsec ==3.1.13.0 - parsec-class ==1.0.0.0 - parsec-numbers ==0.1.0 - parsec-numeric ==0.1.0.0 @@ -1913,6 +1917,7 @@ default-package-overrides: - statistics ==0.15.0.0 - stb-image-redux ==0.2.1.2 - step-function ==0.2 + - stm ==2.5.0.0 - stm-chans ==3.0.0.4 - stm-conduit ==4.0.1 - stm-delay ==0.1.1.1 @@ -2021,6 +2026,7 @@ default-package-overrides: - testing-feat ==1.1.0.0 - testing-type-modifiers ==0.1.0.1 - texmath ==0.11.2.2 + - text ==1.2.3.1 - text-binary ==0.2.1.1 - text-builder ==0.6.5.1 - text-conversions ==0.3.0 @@ -2277,6 +2283,7 @@ default-package-overrides: - xdg-basedir ==0.2.2 - xeno ==0.3.5.1 - xenstore ==0.1.1 + - xhtml ==3000.2.2.1 - xls ==0.1.2 - xlsx ==0.7.2 - xlsx-tabular ==0.2.2.1 @@ -2427,6 +2434,7 @@ package-maintainers: - funcmp - git-annex - hackage-db + - haskell-ci - hledger - hledger-interest - hledger-ui @@ -2791,6 +2799,7 @@ broken-packages: - apelsin - api-builder - api-tools + - api-yoti - apiary - apiary-authenticate - apiary-clientsession @@ -2887,6 +2896,7 @@ broken-packages: - atomic-primops-vector - atomo - ats-format + - ats-pkg - ats-setup - ats-storable - attic-schedule @@ -2956,7 +2966,9 @@ broken-packages: - azurify - b9 - babylon + - backblaze-b2-hs - backdropper + - backstop - backtracking-exceptions - backward-state - bag @@ -3003,6 +3015,7 @@ broken-packages: - bdcs-api - beam - beam-newtype-field + - beam-postgres - beam-th - beamable - beautifHOL @@ -3171,6 +3184,7 @@ broken-packages: - blunt - BNFC-meta - bno055-haskell + - board-games - bogre-banana - bolt - boltzmann-brain @@ -3183,11 +3197,13 @@ broken-packages: - boolexpr - boombox - boomslang + - boots - borel - boring-window-switcher - bot - bounded-array - bowntz + - box - braid - brain-bleep - Bravo @@ -3319,6 +3335,7 @@ broken-packages: - call-haskell-from-anything - camfort - campfire + - canon - canonical-filepath - canonical-json - canteven-http @@ -3413,6 +3430,9 @@ broken-packages: - checked - Checked - checkmate + - chell + - chell-hunit + - chell-quickcheck - chessIO - chevalier-common - chiasma @@ -3743,6 +3763,7 @@ broken-packages: - crf-chain2-generic - crf-chain2-tiers - critbit + - criterion-compare - criterion-plus - criterion-to-html - criu-rpc @@ -3863,6 +3884,7 @@ broken-packages: - data-type - data-util - data-variant + - database-id-groundhog - database-study - datadog - datadog-tracing @@ -3974,8 +3996,11 @@ broken-packages: - dgim - dgs - dhall-check + - dhall-lsp-server - dhall-nix + - dhall-to-cabal - dhcp-lease-parser + - dhrun - dia-base - dia-functions - diagrams-boolean @@ -4029,7 +4054,6 @@ broken-packages: - dirtree - discogs-haskell - discord-gateway - - discord-haskell - discord-hs - discord-rest - discord-types @@ -4192,6 +4216,7 @@ broken-packages: - effect-handlers - effect-stack - effin + - egison - egison-quote - egison-tutorial - ehaskell @@ -4232,6 +4257,7 @@ broken-packages: - entangle - EntrezHTTP - entwine + - enum-text-rio - EnumContainers - enumerate - enumerate-function @@ -4500,6 +4526,7 @@ broken-packages: - FM-SBLEX - fmark - FModExRaw + - fmt-for-rio - fn-extra - foldl-incremental - foldl-statistics @@ -4629,6 +4656,7 @@ broken-packages: - gact - game-probability - gameclock + - gamgee - Gamgine - gamma - Ganymede @@ -4743,6 +4771,7 @@ broken-packages: - ghcjs-promise - ghcjs-xhr - ghclive + - ghcprofview - ght - gi-cairo-again - gi-dbusmenu @@ -4756,7 +4785,12 @@ broken-packages: - gi-gstpbutils - gi-gsttag - gi-gstvideo + - gi-gtk + - gi-gtk-declarative + - gi-gtk-declarative-app-simple + - gi-gtk-hs - gi-gtkosxapplication + - gi-gtksource - gi-handy - gi-notify - gi-ostree @@ -4764,6 +4798,7 @@ broken-packages: - gi-poppler - gi-secret - gi-soup + - gi-vte - gi-wnck - gi-xlib - giak @@ -4945,6 +4980,7 @@ broken-packages: - gtfs - gtk-serialized-event - gtk-sni-tray + - gtk-strut - gtk-toy - gtk2hs-hello - gtk2hs-rpn @@ -5109,6 +5145,7 @@ broken-packages: - hArduino - hardware-edsl - HaRe + - harg - hark - harmony - HarmTrace @@ -5512,6 +5549,7 @@ broken-packages: - hjson-query - hjsonpointer - hjsonschema + - hjugement-cli - HJVM - hkgr - hlatex @@ -5999,8 +6037,10 @@ broken-packages: - identifiers - idiii - idna2008 + - idris - IDynamic - ieee-utils + - iexcloud - ifcxt - IFS - ig @@ -6323,6 +6363,8 @@ broken-packages: - ks-test - KSP - ktx + - kubernetes-client + - kubernetes-client-core - kure - kure-your-boilerplate - KyotoCabinet @@ -6339,6 +6381,7 @@ broken-packages: - lambda-calculator - lambda-canvas - lambda-devs + - lambda-options - lambda-toolbox - lambda2js - lambdaBase @@ -6740,6 +6783,7 @@ broken-packages: - marxup - masakazu-bot - MASMGen + - massiv-test - master-plan - matchers - math-grads @@ -6791,6 +6835,7 @@ broken-packages: - mellon-gpio - mellon-web - melody + - membrain - memcache-conduit - memcache-haskell - memcached-binary @@ -7140,6 +7185,7 @@ broken-packages: - network-netpacket - network-protocol-xmpp - network-rpca + - network-run - network-server - network-service - network-simple @@ -7316,6 +7362,7 @@ broken-packages: - optional - options-time - optparse-applicative-simple + - optparse-enum - orc - orchestrate - OrchestrateDB @@ -7371,6 +7418,7 @@ broken-packages: - pang-a-lambda - pangraph - panpipe + - pantry - pantry-tmp - papa-export - papa-implement @@ -7419,6 +7467,7 @@ broken-packages: - pasta - pastis - pasty + - patat - patches-vector - Pathfinder - pathfindingcore @@ -7653,6 +7702,7 @@ broken-packages: - postgresql-named - postgresql-query - postgresql-simple-bind + - postgresql-simple-named - postgresql-simple-queue - postgresql-simple-sop - postgresql-simple-typed @@ -7979,8 +8029,10 @@ broken-packages: - Referees - refh - reflection-extras + - reflex - reflex-animation - reflex-backend-wai + - reflex-basic-host - reflex-dom-svg - reflex-gloss - reflex-gloss-scene @@ -8104,6 +8156,8 @@ broken-packages: - rfc1413-server - rhythm-game-tutorial - RichConditional + - ridley + - ridley-extras - riemann - riff - ring-buffer @@ -8263,6 +8317,7 @@ broken-packages: - scotty-binding-play - scotty-blaze - scotty-fay + - scotty-form - scotty-format - scotty-hastache - scotty-resource @@ -8773,6 +8828,7 @@ broken-packages: - statsd-client - statsdi - stb-image-redux + - stc-lang - stdata - stdf - stdio @@ -8802,6 +8858,7 @@ broken-packages: - StrappedTemplates - stratum-tool - stratux + - stratux-demo - stratux-http - stratux-types - stratux-websockets @@ -8896,6 +8953,7 @@ broken-packages: - symantic-cli - symantic-http-test - symantic-lib + - symantic-xml - symengine - symengine-hs - sync @@ -9017,6 +9075,7 @@ broken-packages: - terminal-punch - terminal-text - termination-combinators + - termonad - termplot - terntup - terrahs @@ -9187,6 +9246,7 @@ broken-packages: - trace-function-call - traced - tracetree + - tracing - tracker - traction - tracy @@ -9208,6 +9268,8 @@ broken-packages: - translatable-intset - translate - translate-cli + - trasa-extra + - trasa-th - travis - travis-meta-yaml - trawl @@ -9386,6 +9448,7 @@ broken-packages: - unsequential - unused - uom-plugin + - up - update-nix-fetchgit - Updater - uploadcare @@ -9405,6 +9468,7 @@ broken-packages: - urldecode - UrlDisp - urldisp-happstack + - urlpath - URLT - urn - urn-random @@ -9489,6 +9553,7 @@ broken-packages: - verilog - versioning - versioning-servant + - vflow-types - vfr-waypoints - vgrep - vhd @@ -9682,6 +9747,7 @@ broken-packages: - writer-cps-lens - writer-cps-monads-tf - writer-cps-morph + - ws - wsdl - wsedit - wss-client @@ -9702,6 +9768,7 @@ broken-packages: - wxSimpleCanvas - wxturtle - wyvern + - X - x-dsp - X11-extras - X11-rm @@ -9808,6 +9875,7 @@ broken-packages: - yate - yavie - yaya + - yaya-hedgehog - yaya-unsafe - ycextra - yeller diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 9d40b8d98a2..23cbf15e51b 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -584,6 +584,6 @@ self: super: builtins.intersectAttrs super { snap-server = dontCheck super.snap-server; # Tests require internet - dhall_1_24_0 = dontCheck super.dhall_1_24_0; + dhall_1_25_0 = dontCheck super.dhall_1_25_0; } diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 1bfeac57840..d5e5aa7ef56 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -636,8 +636,8 @@ self: { }: mkDerivation { pname = "AbortT-transformers"; - version = "1.0.1.2"; - sha256 = "1skqp7zmh7vzrfhfnc6mn125xmqz2p0c8pmaccxynga9623dmsb2"; + version = "1.0.1.3"; + sha256 = "14bv2bmd6fi1kf0id3ah7gfabbqzbpahws6zy11ji6h3j29pwk8y"; libraryHaskellDepends = [ base transformers ]; testHaskellDepends = [ base HUnit QuickCheck test-framework test-framework-hunit @@ -2664,8 +2664,8 @@ self: { pname = "Cabal"; version = "2.4.1.0"; sha256 = "151mrrd9sskghvlwmj32da5gafwqj6sv9xz9fmp84b7vm4nr0skk"; - revision = "1"; - editedCabalFile = "1dvs2i0kfk8rji9wbrv7y0iydbif9jzg4c7rmaa6lxg8hp7mij2n"; + revision = "2"; + editedCabalFile = "04kg5xh8yabmp1ymk32gw2r66l76338rsglq8i4j2913bhq23vwa"; setupHaskellDepends = [ mtl parsec ]; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath @@ -2954,8 +2954,8 @@ self: { }: mkDerivation { pname = "ChasingBottoms"; - version = "1.3.1.5"; - sha256 = "0hfk2cb9da5fvr96x8lzij93yl3rvax2id9a8gihd5j5aq4kxx30"; + version = "1.3.1.6"; + sha256 = "17lw2mdzrn2f4w0byfdkyd7h7pcnjzv3n3giapcjg6bza5xjqfbd"; libraryHaskellDepends = [ base containers mtl QuickCheck random syb ]; @@ -11761,8 +11761,8 @@ self: { ({ mkDerivation, base, containers }: mkDerivation { pname = "LParse"; - version = "0.3.0.0"; - sha256 = "0nl76ycq608p2wm61pqn64wmq5aqmnwc9p8k4mvx8zwqw06jqlmm"; + version = "0.3.1.0"; + sha256 = "1fw5s0688d5x2i2qarac2r96pj13b2fhla0212fzwlsgpbmg7g8z"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base ]; description = "A continuation-based parser library"; @@ -13319,17 +13319,17 @@ self: { }) {}; "Monadoro" = callPackage - ({ mkDerivation, ansi-terminal, base, process, time }: + ({ mkDerivation, ansi-terminal, base, doctest, time }: mkDerivation { pname = "Monadoro"; - version = "0.1.2.0"; - sha256 = "1bqaiarr5gv42xl8fww67iryyh1mscwdkgcahdc988y19ag8a4j9"; + version = "0.2.1.1"; + sha256 = "0f7swjf5lr7w7gld46l74plc2x79v6dbq5zmsglpk1x8k7vpfj79"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ ansi-terminal base process time ]; - executableHaskellDepends = [ ansi-terminal base process time ]; - testHaskellDepends = [ ansi-terminal base process time ]; - description = "A minimalistic CLI Pomodoro timer, based on a library of the same purpose"; + libraryHaskellDepends = [ ansi-terminal base time ]; + executableHaskellDepends = [ ansi-terminal base time ]; + testHaskellDepends = [ ansi-terminal base doctest time ]; + description = "A minimalistic CLI Pomodoro timer"; license = stdenv.lib.licenses.mit; }) {}; @@ -15301,12 +15301,17 @@ self: { }: mkDerivation { pname = "Persistence"; - version = "1.1.4.2"; - sha256 = "0lvzzcmsmpmsj63ysf3ad6a2v14cf61daz767fxkcf7b7cl50cjp"; + version = "2.0"; + sha256 = "0iwkvplldy6sznp33n5w5ink312cg6shh3qg98canz6j6hrspa8y"; + revision = "1"; + editedCabalFile = "063rizxqn44pzblj2nxyk3ia2zymryrqq55n081g21aih38n8xlr"; libraryHaskellDepends = [ base containers maximal-cliques parallel vector ]; - description = "Quickly detect clusters and holes in data"; + testHaskellDepends = [ + base containers maximal-cliques parallel vector + ]; + description = "A versatile library for topological data analysis"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -17518,27 +17523,28 @@ self: { }) {}; "ShellCheck" = callPackage - ({ mkDerivation, aeson, base, bytestring, Cabal, containers - , directory, mtl, parsec, process, QuickCheck, regex-tdfa + ({ mkDerivation, aeson, array, base, bytestring, Cabal, containers + , deepseq, Diff, directory, filepath, mtl, parsec, process + , QuickCheck, regex-tdfa }: mkDerivation { pname = "ShellCheck"; - version = "0.6.0"; - sha256 = "1xkxrn1j5qvh2pxm0cnjpqqqsvwr7xy8pk31cwbh8r879nrrzrzn"; + version = "0.7.0"; + sha256 = "1vx895cp5k5h0680xfwj74lk97m9y627n965x6srds0gfnbkzy9s"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal process ]; libraryHaskellDepends = [ - aeson base bytestring containers directory mtl parsec process - QuickCheck regex-tdfa + aeson array base bytestring containers deepseq Diff directory + filepath mtl parsec process QuickCheck regex-tdfa ]; executableHaskellDepends = [ - aeson base bytestring containers directory mtl parsec QuickCheck - regex-tdfa + aeson array base bytestring containers deepseq Diff directory + filepath mtl parsec QuickCheck regex-tdfa ]; testHaskellDepends = [ - aeson base bytestring containers directory mtl parsec QuickCheck - regex-tdfa + aeson array base bytestring containers deepseq Diff directory + filepath mtl parsec QuickCheck regex-tdfa ]; description = "Shell script analysis tool"; license = stdenv.lib.licenses.gpl3; @@ -18868,12 +18874,17 @@ self: { }: mkDerivation { pname = "TeX-my-math"; - version = "0.201.1.1"; - sha256 = "064ram3i1a59ypd8i3wnp7x9vbkc8zawby52676y4pfkqvddnhnm"; + version = "0.201.2.0"; + sha256 = "1dg06lqh2x9smq6hbcn2gyh2qll9z7v4gbd1ipvf2isdwxc201vk"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base decimal-literals dumb-cas hashable haskell-src-meta HaTeX template-haskell text unordered-containers vector-space void ]; + executableHaskellDepends = [ + base directory filepath HaTeX process text + ]; testHaskellDepends = [ base directory dumb-cas filepath haskell-src-meta HaTeX process template-haskell text @@ -20407,6 +20418,21 @@ self: { broken = true; }) {}; + "X" = callPackage + ({ mkDerivation, base, bytestring, deepseq, text, text-short }: + mkDerivation { + pname = "X"; + version = "0.2.0.0"; + sha256 = "1p03ah2qi694kcbwb7gk2cypj6p42c6ajn51wpak96p9vmpp5a4r"; + libraryHaskellDepends = [ + base bytestring deepseq text text-short + ]; + description = "A light-weight XML library"; + license = "BSD-3-Clause AND GPL-3.0-or-later"; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "X11" = callPackage ({ mkDerivation, base, data-default, libX11, libXext, libXinerama , libXrandr, libXrender, libXScrnSaver @@ -24872,8 +24898,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "alist"; - version = "0.1.1.7"; - sha256 = "1kklhgksg0lvl4v80y82c5zsfwrr7nbdb8sl64529589sfrsrpsw"; + version = "0.1.2.7"; + sha256 = "0ydq2sxyfgij0rf54i3ajj4hdqjawhcdsgi822yrkq86xjvsxc4w"; libraryHaskellDepends = [ base ]; description = "lists with O(1) append"; license = stdenv.lib.licenses.bsd3; @@ -28715,14 +28741,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "antiope-athena_7_1_2" = callPackage + "antiope-athena_7_2_2" = callPackage ({ mkDerivation, amazonka, amazonka-athena, amazonka-core, base , lens, resourcet, text, unliftio-core }: mkDerivation { pname = "antiope-athena"; - version = "7.1.2"; - sha256 = "19xh9cm859r3p5n0plpwddp4zkgr3sg74xx8m4zv160xi3dggjia"; + version = "7.2.2"; + sha256 = "1a5mp3s22qv41p9cgiyz6gc96kwz9f9wwx8v4dr1jjgslmlik4m1"; libraryHaskellDepends = [ amazonka amazonka-athena amazonka-core base lens resourcet text unliftio-core @@ -28740,8 +28766,8 @@ self: { ({ mkDerivation, aeson, antiope-s3, avro, base, bytestring, text }: mkDerivation { pname = "antiope-contract"; - version = "7.1.2"; - sha256 = "0k6zn6nhl5b92qjbaxlm1fk21k4anhlm1p86ggydnw8alh9r2lwc"; + version = "7.2.2"; + sha256 = "188p6b4mzj513ylkjlf9z3cra6qdv6x0ar4fc1hjs1waggng0b9d"; libraryHaskellDepends = [ aeson antiope-s3 avro base bytestring text ]; @@ -28771,7 +28797,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "antiope-core_7_1_2" = callPackage + "antiope-core_7_2_2" = callPackage ({ mkDerivation, aeson, aeson-lens, amazonka, amazonka-core, base , bytestring, exceptions, generic-lens, hedgehog, hspec , http-client, http-types, hw-hspec-hedgehog, lens, mtl, resourcet @@ -28779,8 +28805,8 @@ self: { }: mkDerivation { pname = "antiope-core"; - version = "7.1.2"; - sha256 = "0i3gwc07hkl50abkk80jnjkp6iixn6hr6q2h1kj206d6cigjx0cn"; + version = "7.2.2"; + sha256 = "0j27bd5f9zkx0qhsl9zam7rzvprcb5075rm174gr77gmf4lqraaa"; libraryHaskellDepends = [ aeson amazonka amazonka-core base bytestring exceptions generic-lens http-client http-types lens mtl resourcet text @@ -28817,17 +28843,17 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "antiope-dynamodb_7_1_2" = callPackage - ({ mkDerivation, amazonka, amazonka-core, amazonka-dynamodb + "antiope-dynamodb_7_2_2" = callPackage + ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-dynamodb , antiope-core, base, generic-lens, lens, text, unliftio-core , unordered-containers }: mkDerivation { pname = "antiope-dynamodb"; - version = "7.1.2"; - sha256 = "0g74fg6fclmrfjkhgqyhq95l967bhjah6rk0davrbd3dfandr612"; + version = "7.2.2"; + sha256 = "19a41njxa09sf1qlc9zmy65nmwp02lcn0q0dk5gwqkpmjjf5ah3s"; libraryHaskellDepends = [ - amazonka amazonka-core amazonka-dynamodb antiope-core base + aeson amazonka amazonka-core amazonka-dynamodb antiope-core base generic-lens lens text unliftio-core unordered-containers ]; testHaskellDepends = [ @@ -28861,7 +28887,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "antiope-messages_7_1_2" = callPackage + "antiope-messages_7_2_2" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, base, bytestring , generic-lens, hedgehog, hspec, hw-hspec-hedgehog, lens , lens-aeson, monad-loops, network-uri, scientific, text @@ -28869,8 +28895,8 @@ self: { }: mkDerivation { pname = "antiope-messages"; - version = "7.1.2"; - sha256 = "0y2dwf0sbay4dm9ns11k2qpjqmgnvxswmd508bwf52305avi97vc"; + version = "7.2.2"; + sha256 = "0vdp8kkqv4g3lkjvwhg4yyb8rjwphjp4gjmx0b6910jwizhslqwf"; libraryHaskellDepends = [ aeson amazonka amazonka-core base bytestring generic-lens lens lens-aeson monad-loops network-uri text unliftio-core @@ -28891,8 +28917,8 @@ self: { }: mkDerivation { pname = "antiope-optparse-applicative"; - version = "7.1.2"; - sha256 = "0cp9yizvibhi7bwm22z62gx8hv3cm1vbpbv70a0ws4k2i2cq8yrr"; + version = "7.2.2"; + sha256 = "006jr3kdyvfzyabxr4zc4kf9sm8pkaca572whdxwpnfpz0m54k0j"; libraryHaskellDepends = [ amazonka amazonka-core amazonka-s3 base optparse-applicative text ]; @@ -28929,7 +28955,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "antiope-s3_7_1_2" = callPackage + "antiope-s3_7_2_2" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3 , antiope-core, antiope-messages, attoparsec, base, bytestring , conduit, conduit-extra, exceptions, generic-lens, hedgehog, hspec @@ -28938,8 +28964,8 @@ self: { }: mkDerivation { pname = "antiope-s3"; - version = "7.1.2"; - sha256 = "1z85kn6675r54f1hnfn6g0yhg7cjfka32h913qnljd7qmb6ikhhs"; + version = "7.2.2"; + sha256 = "14lmkkr86n8h7iqkjvc5sxmccxi3fv97kgljb8m8fl35fxcwd1j8"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-s3 antiope-core antiope-messages attoparsec base bytestring conduit conduit-extra @@ -28976,15 +29002,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "antiope-sns_7_1_2" = callPackage + "antiope-sns_7_2_2" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-sns, base , bytestring, generic-lens, hedgehog, hspec, hw-hspec-hedgehog , lens, text, time, unliftio-core }: mkDerivation { pname = "antiope-sns"; - version = "7.1.2"; - sha256 = "14mq13q6gvg8r3dm329xzbbxlxxx0p5r5gyyqglpqfmdi5dy9948"; + version = "7.2.2"; + sha256 = "10wbf6pmws8gway4i7z55z7xi2az5xzb65yj0q1qc86vxbchnxkk"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-sns base bytestring generic-lens lens text time unliftio-core @@ -29021,7 +29047,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "antiope-sqs_7_1_2" = callPackage + "antiope-sqs_7_2_2" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-sqs, base , bytestring, conduit, generic-lens, hedgehog, hspec , hw-hspec-hedgehog, lens, lens-aeson, monad-loops, mtl @@ -29030,8 +29056,8 @@ self: { }: mkDerivation { pname = "antiope-sqs"; - version = "7.1.2"; - sha256 = "0gpg340nwnni7ybzcq82i7p3j61gw1120209s9ziyqfrlbs7r976"; + version = "7.2.2"; + sha256 = "0qjnwrc23zav84s4ffqi2g97yrfpkxmzm981ik6h5fsi7f6wzj0n"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-sqs base bytestring conduit generic-lens lens lens-aeson monad-loops mtl network-uri split text @@ -29047,6 +29073,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "antiope-swf" = callPackage + ({ mkDerivation, amazonka-swf, base, hedgehog, hspec + , hw-hspec-hedgehog, lens, text + }: + mkDerivation { + pname = "antiope-swf"; + version = "7.2.2"; + sha256 = "1shw4sw0nfrkdcjjin3nq63igfalywz03w171v5knn2kx6xwf4yy"; + libraryHaskellDepends = [ amazonka-swf base lens text ]; + testHaskellDepends = [ base hedgehog hspec hw-hspec-hedgehog ]; + description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>"; + license = stdenv.lib.licenses.mit; + }) {}; + "antiprimes" = callPackage ({ mkDerivation, base, hspec, primes }: mkDerivation { @@ -29274,6 +29314,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "apecs_0_8_1" = callPackage + ({ mkDerivation, array, base, containers, criterion, linear, mtl + , QuickCheck, template-haskell, vector + }: + mkDerivation { + pname = "apecs"; + version = "0.8.1"; + sha256 = "10m3lbfg97psnk3z2ml1q9g2ymwa2fnsknrh6ggp9k5c7mskslv0"; + libraryHaskellDepends = [ + array base containers mtl template-haskell vector + ]; + testHaskellDepends = [ base containers linear QuickCheck vector ]; + benchmarkHaskellDepends = [ base criterion linear ]; + description = "Fast Entity-Component-System library for game programming"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "apecs-gloss" = callPackage ({ mkDerivation, apecs, apecs-physics, base, containers, gloss , linear @@ -29289,6 +29347,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "apecs-gloss_0_2_1" = callPackage + ({ mkDerivation, apecs, apecs-physics, base, containers, gloss + , linear + }: + mkDerivation { + pname = "apecs-gloss"; + version = "0.2.1"; + sha256 = "0v1nagzwhb1l9wfjl4yp3ymbhbpjcrwrih2y8cxkzws5wxgbbnvg"; + libraryHaskellDepends = [ + apecs apecs-physics base containers gloss linear + ]; + description = "Simple gloss renderer for apecs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "apecs-physics" = callPackage ({ mkDerivation, apecs, base, Cabal, containers, inline-c, linear , template-haskell, vector @@ -29305,6 +29379,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "apecs-physics_0_4_0" = callPackage + ({ mkDerivation, apecs, base, Cabal, containers, inline-c, linear + , template-haskell, vector + }: + mkDerivation { + pname = "apecs-physics"; + version = "0.4.0"; + sha256 = "0yqylgsl2n0fsb73qdvl1iinazfzzx64683jp37sr2dm8jpys3lc"; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ + apecs base containers inline-c linear template-haskell vector + ]; + description = "2D physics for apecs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "apecs-physics-gloss" = callPackage ({ mkDerivation, apecs, apecs-physics, base, gloss }: mkDerivation { @@ -29322,8 +29413,8 @@ self: { }: mkDerivation { pname = "apecs-stm"; - version = "0.1.1"; - sha256 = "0d0l48fynsk84y2ifb004dpr39s2hdcwrgfp1ds3qff6784sh66b"; + version = "0.1.2"; + sha256 = "0wq20ibki20xccp7gvajzfmp90m9vr0sdx55m3ni91j76bsswqg8"; libraryHaskellDepends = [ apecs base containers list-t stm stm-containers template-haskell vector @@ -29403,8 +29494,8 @@ self: { }: mkDerivation { pname = "api-monobank"; - version = "0.1.2.0"; - sha256 = "0n9nj6cfszp2wz003sn0xk9533pawlv3afk5p96l6id964dpcdhb"; + version = "0.1.3.0"; + sha256 = "0ajp0wv3nkv2db9bx68mq67ag46s2b26p80fx9ypw8nqhnkddg0g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -29471,6 +29562,28 @@ self: { broken = true; }) {}; + "api-yoti" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, bytestring + , containers, crypto-pubkey-openssh, crypto-pubkey-types + , crypto-simple, cryptonite, directory, hashable, memory, mtl, pem + , text, time, transformers, wreq + }: + mkDerivation { + pname = "api-yoti"; + version = "0.1.0.0"; + sha256 = "1c2jb9qzfzkcbcxabc7xvqc6npdm23dglpd9zqic7wafm7jdmf0s"; + libraryHaskellDepends = [ + aeson base base64-bytestring bytestring containers + crypto-pubkey-openssh crypto-pubkey-types crypto-simple cryptonite + directory hashable memory mtl pem text time transformers wreq + ]; + testHaskellDepends = [ base bytestring text ]; + description = "Api bindings for Yoti services"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "apiary" = callPackage ({ mkDerivation, aeson, base, blaze-builder, blaze-html , blaze-markup, bytestring, bytestring-lexing, case-insensitive @@ -30815,8 +30928,8 @@ self: { }: mkDerivation { pname = "arithmetic"; - version = "1.2"; - sha256 = "0yipdx61ky9db46fy2cbal4qc9y94arkcj4z1dj28bx7j7fnmvzk"; + version = "1.4"; + sha256 = "1qydk2sxrm0xfv23b354lfilyl2cnc0gc0842rz3672j3xwzrrfa"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -32608,8 +32721,8 @@ self: { }: mkDerivation { pname = "ats-pkg"; - version = "3.2.5.17"; - sha256 = "0ss71fn4d1grasgm1rvg7y4sngfnhsknmf6gxby0yvwfm95fi8aj"; + version = "3.2.5.18"; + sha256 = "16v3308zap5jhpd9xsvjdgp28330iscaikdl76jqf5jhb175pxzr"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -32628,6 +32741,8 @@ self: { doHaddock = false; description = "A build tool for ATS"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ats-setup" = callPackage @@ -33777,6 +33892,41 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "avro_0_4_5_1" = callPackage + ({ mkDerivation, aeson, array, base, base16-bytestring, bifunctors + , binary, bytestring, containers, data-binary-ieee754, deepseq + , directory, extra, fail, gauge, hashable, hspec, hspec-discover + , lens, lens-aeson, mtl, pure-zlib, QuickCheck, random + , raw-strings-qq, scientific, semigroups, tagged, template-haskell + , text, tf-random, transformers, unordered-containers, vector, zlib + }: + mkDerivation { + pname = "avro"; + version = "0.4.5.1"; + sha256 = "1a7ykj2c8bk7y8iaac1076sp4c4qzxh37d97w0xv63srmy7l1r8s"; + libraryHaskellDepends = [ + aeson array base base16-bytestring bifunctors binary bytestring + containers data-binary-ieee754 deepseq fail hashable mtl scientific + semigroups tagged template-haskell text tf-random + unordered-containers vector zlib + ]; + testHaskellDepends = [ + aeson array base base16-bytestring bifunctors binary bytestring + containers directory extra fail hashable hspec lens lens-aeson mtl + pure-zlib QuickCheck raw-strings-qq scientific semigroups tagged + template-haskell text tf-random transformers unordered-containers + vector + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + aeson base bytestring containers gauge hashable mtl random + raw-strings-qq text transformers unordered-containers vector + ]; + description = "Avro serialization support for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "avwx" = callPackage ({ mkDerivation, attoparsec, base, HTTP, lens, optparse-applicative , parsers, pretty-show, text @@ -34758,6 +34908,8 @@ self: { pname = "b-tree"; version = "0.1.4"; sha256 = "17hcv85020dm5h3449bfa763bcbl723h17chah4418dby2ql5lxg"; + revision = "1"; + editedCabalFile = "106vsqgv7545p0rky073sd7viidbg4zy3fzlb39r9irbl3p3giih"; libraryHaskellDepends = [ base binary bytestring containers directory errors exceptions filepath lens mmap mtl pipes pipes-interleave transformers vector @@ -34840,6 +34992,40 @@ self: { broken = true; }) {}; + "backblaze-b2-hs" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, bytestring + , case-insensitive, conduit, containers, cryptonite, formatting + , http-client, http-types, protolude, req, req-conduit, scientific + , tasty, tasty-hunit, text, time, unliftio, unliftio-core + }: + mkDerivation { + pname = "backblaze-b2-hs"; + version = "0.1.0.0"; + sha256 = "18xpjz3w9yw79732xiz8278gbd1v9vg534l0h9azg0wwhd8vbh7j"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base64-bytestring bytestring case-insensitive conduit + containers cryptonite formatting http-client http-types protolude + req req-conduit scientific text time unliftio unliftio-core + ]; + executableHaskellDepends = [ + aeson base base64-bytestring bytestring case-insensitive conduit + containers cryptonite formatting http-client http-types protolude + req req-conduit scientific text time unliftio unliftio-core + ]; + testHaskellDepends = [ + aeson base base64-bytestring bytestring case-insensitive conduit + containers cryptonite formatting http-client http-types protolude + req req-conduit scientific tasty tasty-hunit text time unliftio + unliftio-core + ]; + description = "A client library to access Backblaze B2 cloud storage in Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "backdropper" = callPackage ({ mkDerivation, base, directory, haskell98, hslogger, old-time , process, random @@ -34880,6 +35066,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "backstop" = callPackage + ({ mkDerivation, base, directory, filepath, HUnit, mtl, process + , QuickCheck, unix + }: + mkDerivation { + pname = "backstop"; + version = "1.3.0.352"; + sha256 = "1790n52amkvwlm92rh6i6rxfxbw2n2cfam2sf0cx4yf160jxvyj3"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base directory filepath mtl process unix + ]; + executableHaskellDepends = [ + base directory filepath mtl process unix + ]; + testHaskellDepends = [ + base filepath HUnit process QuickCheck unix + ]; + description = "Backstop a target directory by source directories"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "backtracking-exceptions" = callPackage ({ mkDerivation, base, either, free, kan-extensions, mtl , semigroupoids, semigroups, transformers @@ -35531,6 +35742,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "base-unicode-symbols_0_2_4_2" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "base-unicode-symbols"; + version = "0.2.4.2"; + sha256 = "0qkhp4ybmx4nbqqkrmw3hkm47bv61i2wpi20qb09wvk10g2dcr23"; + libraryHaskellDepends = [ base ]; + description = "Unicode alternatives for common functions and operators"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "base16-bytestring" = callPackage ({ mkDerivation, base, bytestring, ghc-prim }: mkDerivation { @@ -35756,6 +35979,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "basement_0_0_11" = callPackage + ({ mkDerivation, base, ghc-prim }: + mkDerivation { + pname = "basement"; + version = "0.0.11"; + sha256 = "0srlws74yiraqaapgcjd9p5d1fwb3zr9swcz74jpjm55fls2nn37"; + libraryHaskellDepends = [ base ghc-prim ]; + description = "Foundation scrap box of array & string"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "basen-bytestring" = callPackage ({ mkDerivation, base, bytestring, QuickCheck }: mkDerivation { @@ -36437,6 +36672,8 @@ self: { ]; description = "Connection layer between beam and postgres"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "beam-sqlite" = callPackage @@ -36666,17 +36903,25 @@ self: { "bench-show" = callPackage ({ mkDerivation, ansi-wl-pprint, base, Chart, Chart-diagrams, csv - , directory, filepath, mwc-random, split, statistics, text + , directory, filepath, mwc-random, optparse-applicative + , optparse-simple, semigroups, split, statistics, text , transformers, vector }: mkDerivation { pname = "bench-show"; - version = "0.2.2"; - sha256 = "12fi59j9a98n4q6gjvjsf0hjc2rsy33b7kzjiqxy5wzh8isciaa4"; + version = "0.3.0"; + sha256 = "0c690w96iyj6idikcwl75ci5sqvfh4fdd8mvb4z24x3xb24kirh5"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ ansi-wl-pprint base Chart Chart-diagrams csv directory filepath mwc-random split statistics transformers vector ]; + executableHaskellDepends = [ + ansi-wl-pprint base Chart Chart-diagrams csv directory filepath + mwc-random optparse-applicative optparse-simple semigroups split + statistics transformers vector + ]; testHaskellDepends = [ base split text ]; description = "Show, plot and compare benchmark results"; license = stdenv.lib.licenses.bsd3; @@ -37326,6 +37571,8 @@ self: { pname = "bimap"; version = "0.4.0"; sha256 = "1794iykd7rhj29y0w4vyjyn6wnw28hi8sxzvm1j5ivdzmf39d8yi"; + revision = "1"; + editedCabalFile = "111wyqh17a6pkjhyaz8n1891m69hwr2gybqcpacw4xdmarxmi7f5"; libraryHaskellDepends = [ base containers deepseq exceptions ]; testHaskellDepends = [ base containers deepseq exceptions QuickCheck template-haskell @@ -38822,7 +39069,7 @@ self: { license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {inherit (pkgs) wlc;}; + }) {wlc = null;}; "bindings-yices" = callPackage ({ mkDerivation, base, gmp, yices }: @@ -39178,8 +39425,8 @@ self: { }: mkDerivation { pname = "birch-beer"; - version = "0.1.4.0"; - sha256 = "0vmyp13lxppkar2lgkc231kx7am0h8p2gq6m0swzaz3ra64yh39c"; + version = "0.1.4.2"; + sha256 = "02q89rp7f12vf257f2m7g34qwv15027k7gsm4yq95blhi4c5rbg0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -39913,21 +40160,21 @@ self: { }) {}; "bitvec" = callPackage - ({ mkDerivation, base, HUnit, primitive, QuickCheck - , quickcheck-classes, test-framework, test-framework-hunit - , test-framework-quickcheck2, vector + ({ mkDerivation, base, gauge, ghc-prim, primitive + , quickcheck-classes, tasty, tasty-hunit, tasty-quickcheck, vector }: mkDerivation { pname = "bitvec"; - version = "0.2.0.1"; - sha256 = "0mgmf60gy3nzp66mf4bydls46bddk76rz40zkdfp0hhsspasia9b"; - libraryHaskellDepends = [ base primitive vector ]; + version = "1.0.0.0"; + sha256 = "0m33q70h513iiiwv7w45p4zz7jkf00p5kjy9x3ds6y2rk4di4vl2"; + libraryHaskellDepends = [ base ghc-prim primitive vector ]; testHaskellDepends = [ - base HUnit primitive QuickCheck quickcheck-classes test-framework - test-framework-hunit test-framework-quickcheck2 vector + base primitive quickcheck-classes tasty tasty-hunit + tasty-quickcheck vector ]; + benchmarkHaskellDepends = [ base gauge vector ]; description = "Unboxed bit vectors"; - license = stdenv.lib.licenses.publicDomain; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; @@ -41113,33 +41360,36 @@ self: { }) {}; "board-games" = callPackage - ({ mkDerivation, array, base, cgi, containers, criterion, html - , httpd-shed, network-uri, non-empty, QuickCheck, random - , transformers, utility-ht + ({ mkDerivation, array, base, cgi, containers, criterion + , enummapset, html, httpd-shed, network-uri, non-empty, parallel + , QuickCheck, random, transformers, utility-ht }: mkDerivation { pname = "board-games"; - version = "0.2.1"; - sha256 = "1gsbk1m58f82b1ic0fv1ygslz4lyxxdl0a849q5hl4qbl9s7rbqb"; + version = "0.3"; + sha256 = "1ylwibyl0j1v0bdrpfnjhdm431npagavxzgi2l5sp0scgpkcyyx7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - array base cgi containers html non-empty random transformers - utility-ht + array base cgi containers enummapset html non-empty QuickCheck + random transformers utility-ht ]; executableHaskellDepends = [ array base cgi containers html httpd-shed network-uri non-empty random transformers utility-ht ]; testHaskellDepends = [ - array base containers non-empty QuickCheck random transformers - utility-ht + array base containers enummapset non-empty QuickCheck random + transformers utility-ht ]; benchmarkHaskellDepends = [ - base containers criterion non-empty utility-ht + base containers criterion enummapset non-empty parallel QuickCheck + random transformers utility-ht ]; description = "Three games for inclusion in a web server"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bogocopy" = callPackage @@ -41612,6 +41862,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "boots" = callPackage + ({ mkDerivation, base, data-default, exceptions, fast-logger, hspec + , microlens, monad-logger, mtl, salak, salak-yaml, text + , unliftio-core + }: + mkDerivation { + pname = "boots"; + version = "0.0.3"; + sha256 = "1glf3hq3vqa3rd115ym7jy5jmwx8mzqbidj875274safg8n552rm"; + libraryHaskellDepends = [ + base data-default exceptions fast-logger microlens monad-logger mtl + salak salak-yaml text unliftio-core + ]; + testHaskellDepends = [ + base data-default exceptions fast-logger hspec microlens + monad-logger mtl salak salak-yaml text unliftio-core + ]; + description = "Boot application by plugins"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "bootstrap-types" = callPackage ({ mkDerivation, base, text }: mkDerivation { @@ -41899,6 +42172,43 @@ self: { broken = true; }) {}; + "box" = callPackage + ({ mkDerivation, async, attoparsec, base, concurrency + , contravariant, data-default, dejafu, doctest, exceptions, flow + , foldl, generic-lens, lens, mmorph, pipes, profunctors, protolude + , random, stm, streaming, text, time, transformers + , transformers-base + }: + mkDerivation { + pname = "box"; + version = "0.0.1.2"; + sha256 = "11g3ig1n1myfgcfvp6gkn5lyr2gdzj4zpginwmjac1c599xiyf8i"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async attoparsec base concurrency contravariant data-default dejafu + exceptions flow foldl generic-lens lens mmorph pipes profunctors + protolude random stm streaming text time transformers + transformers-base + ]; + executableHaskellDepends = [ + async attoparsec base concurrency contravariant data-default dejafu + exceptions flow foldl generic-lens lens mmorph pipes profunctors + protolude random stm streaming text time transformers + transformers-base + ]; + testHaskellDepends = [ + async attoparsec base concurrency contravariant data-default dejafu + doctest exceptions flow foldl generic-lens lens mmorph pipes + profunctors protolude random stm streaming text time transformers + transformers-base + ]; + description = "boxes"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "box-tuples" = callPackage ({ mkDerivation, base, ghc-prim }: mkDerivation { @@ -43203,6 +43513,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "bulmex" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, jsaddle + , jsaddle-dom, lens, network-uri, reflex, reflex-dom-core + , reflex-dom-helpers, text, time, witherable + }: + mkDerivation { + pname = "bulmex"; + version = "2.0.0"; + sha256 = "0nzgzg17av87i1777rjakiyamcgkszfcw3ch150536vkp1jaqlm5"; + libraryHaskellDepends = [ + aeson base bytestring containers jsaddle jsaddle-dom lens + network-uri reflex reflex-dom-core reflex-dom-helpers text time + witherable + ]; + description = "Reflex infused with bulma (css)"; + license = stdenv.lib.licenses.mit; + }) {}; + "bumper" = callPackage ({ mkDerivation, base, Cabal, containers, fclabels, process , regex-compat, split, strict @@ -43488,7 +43816,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "bv-little_1_0_1" = callPackage + "bv-little_1_1_0" = callPackage ({ mkDerivation, base, criterion, deepseq, hashable, integer-gmp , keys, mono-traversable, mono-traversable-keys, primitive , QuickCheck, smallcheck, tasty, tasty-hunit, tasty-quickcheck @@ -43496,8 +43824,8 @@ self: { }: mkDerivation { pname = "bv-little"; - version = "1.0.1"; - sha256 = "1as21xhzrzcqmrqybczwxhh81avgkmdgn7hhk534dxv6csd7jyp6"; + version = "1.1.0"; + sha256 = "1cpmwmd6gig0gggbr197cjpp0ykaj30jniqq3r5lsv644wizkg6r"; libraryHaskellDepends = [ base deepseq hashable integer-gmp keys mono-traversable mono-traversable-keys primitive QuickCheck text-show @@ -43569,12 +43897,12 @@ self: { }) {}; "byte-order" = callPackage - ({ mkDerivation, base, primitive }: + ({ mkDerivation, base, primitive, primitive-unaligned }: mkDerivation { pname = "byte-order"; - version = "0.1.0.0"; - sha256 = "1g0bqx4xzv9y5shjn4wbnrrskahrmybzm1sw1kryyn5z8w7srw34"; - libraryHaskellDepends = [ base primitive ]; + version = "0.1.1.0"; + sha256 = "09j6gkvg1nv05dga46cyxsgnf5ksqbnnsz9nf36xg0vw6c352w7s"; + libraryHaskellDepends = [ base primitive primitive-unaligned ]; testHaskellDepends = [ base primitive ]; description = "Portable big-endian and little-endian conversions"; license = stdenv.lib.licenses.bsd3; @@ -43677,15 +44005,15 @@ self: { broken = true; }) {}; - "bytestring_0_10_8_2" = callPackage + "bytestring_0_10_10_0" = callPackage ({ mkDerivation, base, byteorder, deepseq, directory, dlist , ghc-prim, HUnit, integer-gmp, mtl, QuickCheck, random , test-framework, test-framework-hunit, test-framework-quickcheck2 }: mkDerivation { pname = "bytestring"; - version = "0.10.8.2"; - sha256 = "0fjc5ybxx67l0kh27l6vq4saf88hp1wnssj5ka90ii588y76cvys"; + version = "0.10.10.0"; + sha256 = "1h94lyyn4fpklm25dsazj9za08m0vz9irafpza90h9j5wx4qpndq"; libraryHaskellDepends = [ base deepseq ghc-prim integer-gmp ]; testHaskellDepends = [ base byteorder deepseq directory dlist ghc-prim HUnit mtl @@ -44552,8 +44880,8 @@ self: { }: mkDerivation { pname = "cabal-cache"; - version = "1.0.1.0"; - sha256 = "0x013n44ppwm6vh9n9wch8hki2g3pr2bahngymdm7vd6628jpshz"; + version = "1.0.1.1"; + sha256 = "1yb3wvjqqmkm4aysfyx4zf1z88453ywfc4czb4zvghfdgd95d0rx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -45129,6 +45457,8 @@ self: { pname = "cabal-rpm"; version = "0.12.6"; sha256 = "1k602v7v87w6xcd9a5m8n5grnjbkyn79rdi9azl7djna0rs129ns"; + revision = "1"; + editedCabalFile = "0wfj9gcygm1c9fy86973ybs8ww8g6fn3l7f5v2kvs28204g8i18g"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -45148,6 +45478,8 @@ self: { pname = "cabal-rpm"; version = "0.13.3"; sha256 = "04d5m74i0r6livhkhmccrwhshpa2aizyb77i2qcqhxradw0lkvl4"; + revision = "1"; + editedCabalFile = "1ngw9afzplbz4q707nak9zcjmk9fdynw0jvis4lgjq02y4i14hj6"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -46273,6 +46605,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "call-stack_0_2_0" = callPackage + ({ mkDerivation, base, nanospec }: + mkDerivation { + pname = "call-stack"; + version = "0.2.0"; + sha256 = "1iz0wkbcqchyji72c4j4zb72vfsfdp2ys8pf9mqqsxaq774r7ilm"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base nanospec ]; + description = "Use GHC call-stacks in a backward compatible way"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "camfort" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , directory, fgl, filepath, flint, fortran-src, GenericPretty @@ -46348,15 +46693,29 @@ self: { broken = true; }) {}; + "can-i-haz" = callPackage + ({ mkDerivation, base, deepseq, hspec, should-not-typecheck }: + mkDerivation { + pname = "can-i-haz"; + version = "0.1.0.1"; + sha256 = "1nay2hrvf8cxazsy5ha3affwxayirznjf0zlir0n7vbyl5w92im0"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base deepseq hspec should-not-typecheck ]; + description = "Generic implementation of the Has pattern"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "canon" = callPackage ({ mkDerivation, arithmoi, array, base, containers, random }: mkDerivation { pname = "canon"; - version = "0.1.1.1"; - sha256 = "0z2s4bk6xs9p2lgg7r70nhr6igvw3z5iarc29slsg0cv9w4232c1"; + version = "0.1.1.2"; + sha256 = "181c09kh76104b23hf52b049cc6clww1y9kffw1f0hnkxhds9n84"; libraryHaskellDepends = [ arithmoi array base containers random ]; description = "Arithmetic for Psychedelically Large Numbers"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "canonical-filepath" = callPackage @@ -46373,21 +46732,22 @@ self: { }) {}; "canonical-json" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, parsec - , pretty, QuickCheck, tasty, tasty-quickcheck, unordered-containers - , vector + ({ mkDerivation, aeson, base, bytestring, containers, criterion + , deepseq, parsec, pretty, QuickCheck, tasty, tasty-quickcheck + , unordered-containers, vector }: mkDerivation { pname = "canonical-json"; - version = "0.5.0.1"; - sha256 = "1r52f69afsnl6kmn0h2rl6wp21jjain4kz6123a1haacfm2f2hwj"; + version = "0.6.0.0"; + sha256 = "0lb847hvgkn49g6rvmavk14brvvpiy6q5fswk3cm9rc53hbq02zz"; libraryHaskellDepends = [ - base bytestring containers parsec pretty + base bytestring containers deepseq parsec pretty ]; testHaskellDepends = [ - aeson base bytestring QuickCheck tasty tasty-quickcheck + aeson base bytestring containers QuickCheck tasty tasty-quickcheck unordered-containers vector ]; + benchmarkHaskellDepends = [ base bytestring containers criterion ]; description = "Canonical JSON for signing and hashing JSON values"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -47661,6 +48021,19 @@ self: { broken = true; }) {}; + "category_0_2_4_1" = callPackage + ({ mkDerivation, alg, base, transformers }: + mkDerivation { + pname = "category"; + version = "0.2.4.1"; + sha256 = "0gliy1frgpgyzq3vkin315ylpklfc6dvg0vd93hz8f9m3js6dm48"; + libraryHaskellDepends = [ alg base transformers ]; + description = "Categorical types and classes"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "category-extras" = callPackage ({ mkDerivation, adjunctions, bifunctors, categories, comonad , comonad-extras, comonad-transformers, comonads-fd, contravariant @@ -47894,6 +48267,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cborg_0_2_2_0" = callPackage + ({ mkDerivation, aeson, array, base, base-orphans + , base16-bytestring, base64-bytestring, bytestring, containers + , deepseq, fail, ghc-prim, half, integer-gmp, primitive, QuickCheck + , random, scientific, tasty, tasty-hunit, tasty-quickcheck, text + , vector + }: + mkDerivation { + pname = "cborg"; + version = "0.2.2.0"; + sha256 = "1rdnvy0w17s70ikmbyrnwax5rvqh19l95sh8i7ipgxi23z1r0bp1"; + libraryHaskellDepends = [ + array base bytestring containers deepseq ghc-prim half integer-gmp + primitive text + ]; + testHaskellDepends = [ + aeson array base base-orphans base16-bytestring base64-bytestring + bytestring deepseq fail half QuickCheck random scientific tasty + tasty-hunit tasty-quickcheck text vector + ]; + description = "Concise Binary Object Representation (CBOR)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cborg-json" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, cborg, scientific, text , unordered-containers, vector @@ -49232,6 +49630,8 @@ self: { ]; description = "A simple and intuitive library for automated testing"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "chell-hunit" = callPackage @@ -49243,6 +49643,8 @@ self: { libraryHaskellDepends = [ base chell HUnit ]; description = "HUnit support for the Chell testing library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "chell-quickcheck" = callPackage @@ -49254,6 +49656,8 @@ self: { libraryHaskellDepends = [ base chell QuickCheck random ]; description = "QuickCheck support for the Chell testing library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "chessIO" = callPackage @@ -49724,23 +50128,24 @@ self: { "chronos" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, clock - , criterion, deepseq, hashable, HUnit, old-locale, primitive - , QuickCheck, semigroups, test-framework, test-framework-hunit - , test-framework-quickcheck2, text, thyme, time, torsor, vector + , criterion, deepseq, doctest, hashable, HUnit, old-locale + , primitive, QuickCheck, semigroups, test-framework + , test-framework-hunit, test-framework-quickcheck2, text, thyme + , time, torsor, vector }: mkDerivation { pname = "chronos"; - version = "1.0.5"; - sha256 = "0274b5qv1wf52vsdjm1siksh07qgdgid0a9316b7nab2gc7jgpdz"; - revision = "3"; - editedCabalFile = "13gjxvybjkgw0qs1vi45b7vs4d2lbh7l76kl8m99dd13dvvb49qf"; + version = "1.0.6"; + sha256 = "07z79acmr8768m31knr9r90x0f8xabdkvvyd7y0bv7061562fvdz"; + revision = "1"; + editedCabalFile = "156f61rp421x1hisdiq1m7nbaaq4hczfv66v9g94blv3a48rjwzz"; libraryHaskellDepends = [ aeson attoparsec base bytestring clock hashable primitive semigroups text torsor vector ]; testHaskellDepends = [ - attoparsec base bytestring HUnit QuickCheck test-framework - test-framework-hunit test-framework-quickcheck2 text + attoparsec base bytestring doctest HUnit QuickCheck test-framework + test-framework-hunit test-framework-quickcheck2 text torsor ]; benchmarkHaskellDepends = [ attoparsec base bytestring criterion deepseq old-locale QuickCheck @@ -50540,8 +50945,8 @@ self: { }: mkDerivation { pname = "clang-pure"; - version = "0.2.0.4"; - sha256 = "13c03zj15xx8hq6gqvq62dfqz936mrrz34irk7bqyi0sbhqgrjn1"; + version = "0.2.0.5"; + sha256 = "0s84q6qdym02xvva3iq559kmhwzb08slip69h4cvvc6a7lqmaj37"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal inline-c process ]; @@ -52115,6 +52520,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "cmake-syntax" = callPackage + ({ mkDerivation, base, bytestring, hspec, raw-strings-qq, trifecta + }: + mkDerivation { + pname = "cmake-syntax"; + version = "0.1.0.0"; + sha256 = "1d4pdnf4yb630iiw2iviidhzddfx15z2w6gamf92bdl17886i4jr"; + libraryHaskellDepends = [ + base bytestring raw-strings-qq trifecta + ]; + testHaskellDepends = [ + base bytestring hspec raw-strings-qq trifecta + ]; + description = "Parser for the CMake syntax (CMakeLists.txt and .cmake files)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cmark" = callPackage ({ mkDerivation, base, blaze-html, bytestring, cheapskate , criterion, discount, HUnit, markdown, sundown, text @@ -53477,8 +53899,8 @@ self: { pname = "colour-space"; version = "0.1.4.0"; sha256 = "0sr341chqhngm7ihyy3ym3w345sk101gznw80iksjwxjg3iiqxmq"; - revision = "1"; - editedCabalFile = "1n9n76g9zjp1i02f964dlfy65m978m8whbcivd063pf1acp9njax"; + revision = "2"; + editedCabalFile = "0qldxm84rk344h4wgk3bqsxfhkmvj8psm0sqgfnjh34a4fy5hjzg"; libraryHaskellDepends = [ base colour constrained-categories JuicyPixels linear linearmap-category manifolds semigroups vector-space @@ -53529,6 +53951,23 @@ self: { broken = true; }) {}; + "columnar" = callPackage + ({ mkDerivation, base, bytestring, cassava, containers, enum-text + , fmt, lens, possibly, rio, template-haskell, text, time + , unordered-containers, vector + }: + mkDerivation { + pname = "columnar"; + version = "1.0.0.0"; + sha256 = "0qf5fbd9cwc22npww4qsjaj7rxdy2r3rjm19w23a9shqvgc2l6av"; + libraryHaskellDepends = [ + base bytestring cassava containers enum-text fmt lens possibly rio + template-haskell text time unordered-containers vector + ]; + description = "A CSV toolkit based on cassava and enum-text"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "com" = callPackage ({ mkDerivation }: mkDerivation { @@ -56746,6 +57185,8 @@ self: { pname = "constrained-categories"; version = "0.4.0.0"; sha256 = "1wq4ivkgxbwxxrfk5lwn2psbbiaq87dr8zf1z9b9yhw2hi75lsgw"; + revision = "1"; + editedCabalFile = "0f96xmq5j03f9ks9cjlgbc5wq0azdbrbj2lh3kr3ybz658dli3j7"; libraryHaskellDepends = [ base contravariant semigroups tagged trivial-constraint void ]; @@ -56923,8 +57364,8 @@ self: { }: mkDerivation { pname = "constraints-deriving"; - version = "1.0.4.0"; - sha256 = "1a78bb8gld07g5m9lwg6phdx3i87pmlk47hic2vbpi9n68kl055v"; + version = "1.1.0.0"; + sha256 = "15rspwn8i2rwmqsxb505087ars0i10licwj4adsgm89ajhgrqvp9"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal ]; @@ -57241,17 +57682,22 @@ self: { "contiguous" = callPackage ({ mkDerivation, base, deepseq, primitive, primitive-unlifted - , QuickCheck, quickcheck-instances, vector + , QuickCheck, quickcheck-classes, quickcheck-instances, random + , random-shuffle, vector, weigh }: mkDerivation { pname = "contiguous"; - version = "0.4.0.1"; - sha256 = "1hs9jvl9zzy7jdbxna0aw8nbq3af327xfgb0cgzwmp55iwpjn9rn"; + version = "0.5"; + sha256 = "0nz3ssh0zc8rs67mk8fmc8plvbjac6mlxdmzk9fw8sj2vx2ssisq"; libraryHaskellDepends = [ base deepseq primitive primitive-unlifted ]; testHaskellDepends = [ - base primitive QuickCheck quickcheck-instances vector + base primitive QuickCheck quickcheck-classes quickcheck-instances + vector + ]; + benchmarkHaskellDepends = [ + base primitive random random-shuffle weigh ]; description = "Unified interface for primitive arrays"; license = stdenv.lib.licenses.bsd3; @@ -58087,6 +58533,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "core-data" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, core-text + , hashable, prettyprinter, prettyprinter-ansi-terminal, scientific + , text, unordered-containers, vector + }: + mkDerivation { + pname = "core-data"; + version = "0.2.0.0"; + sha256 = "1lzvs99qqw8nvgqqz080zdsxl5vdxdmnffxl8s26c7p41izycp5n"; + libraryHaskellDepends = [ + aeson base bytestring containers core-text hashable prettyprinter + prettyprinter-ansi-terminal scientific text unordered-containers + vector + ]; + description = "Convenience wrappers around common data structures and encodings"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "core-haskell" = callPackage ({ mkDerivation, base, haskeline, haskell-src-exts, hint }: mkDerivation { @@ -58104,6 +58568,44 @@ self: { broken = true; }) {}; + "core-program" = callPackage + ({ mkDerivation, async, base, bytestring, chronologique, core-data + , core-text, directory, exceptions, hashable, hourglass, mtl + , prettyprinter, prettyprinter-ansi-terminal, safe-exceptions, stm + , template-haskell, terminal-size, text, text-short, transformers + , unix + }: + mkDerivation { + pname = "core-program"; + version = "0.2.0.0"; + sha256 = "13907wk5p8yc31wf7s3w6an8g2b5j8pp0k196l5fh90c5dadizys"; + libraryHaskellDepends = [ + async base bytestring chronologique core-data core-text directory + exceptions hashable hourglass mtl prettyprinter + prettyprinter-ansi-terminal safe-exceptions stm template-haskell + terminal-size text text-short transformers unix + ]; + description = "Opinionated Haskell Interoperability"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "core-text" = callPackage + ({ mkDerivation, base, bytestring, deepseq, fingertree, hashable + , prettyprinter, prettyprinter-ansi-terminal, template-haskell + , text, text-short + }: + mkDerivation { + pname = "core-text"; + version = "0.2.0.0"; + sha256 = "1rkbz43vnjv8vv68xh98qcp59lmahw4sdpfnhvgrh92wj0namifk"; + libraryHaskellDepends = [ + base bytestring deepseq fingertree hashable prettyprinter + prettyprinter-ansi-terminal template-haskell text text-short + ]; + description = "A text type based on a finger tree over UTF-8 fragments"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "corebot-bliki" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, containers , directory, filepath, filestore, http-types, monads-tf, pandoc @@ -58545,24 +59047,27 @@ self: { }) {}; "cpkg" = callPackage - ({ mkDerivation, base, binary, bytestring, bzlib, containers, cpphs - , dhall, dir-traverse, directory, filemanip, filepath, hashable - , hspec, hspec-megaparsec, http-client, http-client-tls, libarchive - , lzma, megaparsec, microlens, mtl, network-uri - , optparse-applicative, prettyprinter, process, recursion, tar - , temporary, text, zip-archive, zlib + ({ mkDerivation, base, binary, bytestring, bzlib + , composition-prelude, containers, cpphs, dhall, dir-traverse + , directory, filemanip, filepath, hashable, hspec, hspec-megaparsec + , http-client, http-client-tls, libarchive, lzma, megaparsec + , microlens, mtl, network-uri, optparse-applicative, prettyprinter + , process, recursion, tar, temporary, text, zip-archive, zlib }: mkDerivation { pname = "cpkg"; - version = "0.2.1.0"; - sha256 = "0wwfdw4qvgf25zych8pvknx99pr4zrxknyi80laqx7b7w5l0rnvc"; + version = "0.2.3.1"; + sha256 = "0nw1h6zgx3dizx92nwzdf9ny8bzyfa2n28lpv34xvw38fz9yq16w"; + revision = "2"; + editedCabalFile = "15bn9c0zvr8xdhq4hgnq3hhqwvv8pc5a7bdvw58psn7dwhcac6nh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base binary bytestring bzlib containers dhall dir-traverse - directory filemanip filepath hashable http-client http-client-tls - libarchive lzma megaparsec microlens mtl network-uri prettyprinter - process recursion tar temporary text zip-archive zlib + base binary bytestring bzlib composition-prelude containers dhall + dir-traverse directory filemanip filepath hashable http-client + http-client-tls libarchive lzma megaparsec microlens mtl + network-uri prettyprinter process recursion tar temporary text + zip-archive zlib ]; libraryToolDepends = [ cpphs ]; executableHaskellDepends = [ @@ -58815,7 +59320,7 @@ self: { broken = true; }) {}; - "cql-io_1_1_0" = callPackage + "cql-io_1_1_1" = callPackage ({ mkDerivation, async, auto-update, base, bytestring, containers , cql, cryptonite, data-default-class, Decimal, exceptions , hashable, HsOpenSSL, iproute, lens, mtl, mwc-random, network @@ -58825,10 +59330,8 @@ self: { }: mkDerivation { pname = "cql-io"; - version = "1.1.0"; - sha256 = "1pqqq31f9xcpn5rykkgrakgl17dm1nnskh1m88fxaynzjj485pkw"; - revision = "1"; - editedCabalFile = "0zxc28i4c26qi6xpgsyhn0f539ni6wv6c1pixh056bzm9pwp60d7"; + version = "1.1.1"; + sha256 = "1zg199ifkqh1ba335vqp0jlm4sn5ybjxap4qymb54bylhwj0vzcp"; libraryHaskellDepends = [ async auto-update base bytestring containers cql cryptonite data-default-class exceptions hashable HsOpenSSL iproute lens mtl @@ -59526,6 +60029,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "criterion-compare" = callPackage + ({ mkDerivation, base, bytestring, cassava, Chart, Chart-diagrams + , clay, colour, containers, data-default, filepath, lens, lucid + , optparse-applicative, text, vector + }: + mkDerivation { + pname = "criterion-compare"; + version = "0.1.0.0"; + sha256 = "034cm3hap9x6cwp44hrd03b09mifcm076a9pn3lgql5ardx91yl7"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring cassava Chart Chart-diagrams clay colour containers + data-default filepath lens lucid optparse-applicative text vector + ]; + description = "A simple tool for visualising differences in Criterion benchmark results"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "criterion-measurement" = callPackage ({ mkDerivation, aeson, base, base-compat, binary, containers , deepseq, vector @@ -62546,8 +63070,8 @@ self: { ({ mkDerivation, base, deepseq, QuickCheck }: mkDerivation { pname = "data-clist"; - version = "0.1.2.2"; - sha256 = "1aibiml1vs983lbxq18zcn9h11k3zjrxpsx4rxssqdjwni1kg9yi"; + version = "0.1.2.3"; + sha256 = "1mwfhnmvi3vicyjzl33m6pcipi2v887zazyqxygq258ndd010s9m"; libraryHaskellDepends = [ base deepseq QuickCheck ]; description = "Simple functional ring type"; license = stdenv.lib.licenses.bsd3; @@ -64042,6 +64566,34 @@ self: { broken = true; }) {}; + "database-id-class" = callPackage + ({ mkDerivation, aeson, base }: + mkDerivation { + pname = "database-id-class"; + version = "0.1.0.1"; + sha256 = "0zm053ll1vwd5gdwq4p3zpl9f010q894nk3djaad3ry4y2mirsc4"; + libraryHaskellDepends = [ aeson base ]; + description = "Class for types with a database id"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "database-id-groundhog" = callPackage + ({ mkDerivation, aeson, base, database-id-class, groundhog + , template-haskell + }: + mkDerivation { + pname = "database-id-groundhog"; + version = "0.1.0.1"; + sha256 = "16q90lzxjbisfdvcl4lbjlfmn02xnscsxkv9hm35xw9z8q19zlsx"; + libraryHaskellDepends = [ + aeson base database-id-class groundhog template-haskell + ]; + description = "HasId/Groundhog interop"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "database-migrate" = callPackage ({ mkDerivation, base, bytestring, cmdargs, containers, directory , either, filepath, lens, postgresql-simple, text, time @@ -64113,6 +64665,8 @@ self: { pname = "datadog-tracing"; version = "1.5.1"; sha256 = "1jjgavp9winbl2gyix61y30myvzhvzb500l2zwcb087cqzy7z6nb"; + revision = "2"; + editedCabalFile = "1mb0g3lddphaki1q946dpayhjdma9g0xcx55wdmksbhkjrbm0rgb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -65519,6 +66073,8 @@ self: { pname = "decimal-literals"; version = "0.1.0.1"; sha256 = "0lbpnc4c266fbqjzzrnig648zzsqfaphlxqwyly9xd15qggzasb0"; + revision = "1"; + editedCabalFile = "0giz73yb179xvww1s92dbl4mhvcxlv25f0zrjwc9lsvx9h2aivg0"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "Preprocessing decimal literals more or less as they are (instead of via fractions)"; @@ -66263,6 +66819,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "dependent-map_0_3" = callPackage + ({ mkDerivation, base, constraints-extras, containers + , dependent-sum + }: + mkDerivation { + pname = "dependent-map"; + version = "0.3"; + sha256 = "1azy6yrnd0adga4z2mlp9knbp55xhlj4v9c3rb2lr1sd2l8cgf80"; + libraryHaskellDepends = [ + base constraints-extras containers dependent-sum + ]; + description = "Dependent finite maps (partial dependent products)"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dependent-monoidal-map" = callPackage ({ mkDerivation, aeson, base, constraints, constraints-extras , dependent-map, dependent-sum, dependent-sum-aeson-orphans @@ -66305,15 +66877,13 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; - "dependent-sum_0_5" = callPackage - ({ mkDerivation, base }: + "dependent-sum_0_6_1" = callPackage + ({ mkDerivation, base, constraints-extras }: mkDerivation { pname = "dependent-sum"; - version = "0.5"; - sha256 = "1n5ln2fain1x9zkrzy1sknwm528lrdsnsg52z1d0hfpy5sngndsr"; - revision = "2"; - editedCabalFile = "1vxg9v2b5479qm7q9qzjyh9rmcdpr634s3kpjx0skqq0r68bc36s"; - libraryHaskellDepends = [ base ]; + version = "0.6.1"; + sha256 = "077pq10kldxk47zlrz022a1m7a5qpr2xa2wapa01xa2hrlgv5xh4"; + libraryHaskellDepends = [ base constraints-extras ]; description = "Dependent sum type"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; @@ -66351,6 +66921,23 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "dependent-sum-template_0_1_0_0" = callPackage + ({ mkDerivation, base, constraints-extras, dependent-sum + , template-haskell, th-extras + }: + mkDerivation { + pname = "dependent-sum-template"; + version = "0.1.0.0"; + sha256 = "07z95f27jpdb8y01f904z0fi6kjllsbcm2zg0k1v9y8c6rwavw0f"; + libraryHaskellDepends = [ + base dependent-sum template-haskell th-extras + ]; + testHaskellDepends = [ base constraints-extras dependent-sum ]; + description = "Template Haskell code to generate instances of classes in dependent-sum package"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "depends" = callPackage ({ mkDerivation, base, containers, directory, filepath, hspec , process, QuickCheck, transformers, yaml-config @@ -67144,46 +67731,45 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dhall_1_24_0" = callPackage + "dhall_1_25_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, base , bytestring, case-insensitive, cborg, cborg-json, containers - , contravariant, criterion, cryptonite, deepseq, Diff, directory - , doctest, dotgen, exceptions, filepath, foldl, haskeline + , contravariant, cryptonite, deepseq, Diff, directory, doctest + , dotgen, either, exceptions, filepath, foldl, gauge, haskeline , http-client, http-client-tls, http-types, lens-family-core , megaparsec, memory, mockery, mtl, optparse-applicative, parsers , prettyprinter, prettyprinter-ansi-terminal, profunctors - , QuickCheck, quickcheck-instances, repline, scientific, serialise - , tasty, tasty-hunit, tasty-quickcheck, template-haskell, text - , transformers, transformers-compat, turtle, unordered-containers - , uri-encode, vector + , QuickCheck, quickcheck-instances, repline, scientific, semigroups + , serialise, spoon, tasty, tasty-hunit, tasty-quickcheck + , template-haskell, text, th-lift-instances, transformers + , transformers-compat, turtle, unordered-containers, uri-encode + , vector }: mkDerivation { pname = "dhall"; - version = "1.24.0"; - sha256 = "1n04jk45qjl00wx7gxzp36j7d1m1ca7h7y4qlp8gxhykpkr6zzv7"; - revision = "1"; - editedCabalFile = "1b0gqva12rh0fynddal7q8jy6i3yax79br8xbfp9kh7936w9cs1j"; + version = "1.25.0"; + sha256 = "0d8qx4fawvxykig628jfgqpa660mzzicysa7g3mda6zni9j4yq0h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal base bytestring case-insensitive - cborg cborg-json containers contravariant cryptonite Diff directory - dotgen exceptions filepath haskeline http-client http-client-tls - http-types lens-family-core megaparsec memory mtl + cborg cborg-json containers contravariant cryptonite deepseq Diff + directory dotgen either exceptions filepath haskeline http-client + http-client-tls http-types lens-family-core megaparsec memory mtl optparse-applicative parsers prettyprinter prettyprinter-ansi-terminal profunctors repline scientific - serialise template-haskell text transformers transformers-compat - unordered-containers uri-encode vector + serialise template-haskell text th-lift-instances transformers + transformers-compat unordered-containers uri-encode vector ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base bytestring cborg containers deepseq directory doctest filepath - foldl megaparsec mockery prettyprinter QuickCheck - quickcheck-instances serialise tasty tasty-hunit tasty-quickcheck - text transformers turtle vector + foldl lens-family-core megaparsec mockery prettyprinter QuickCheck + quickcheck-instances semigroups serialise spoon tasty tasty-hunit + tasty-quickcheck text transformers turtle vector ]; benchmarkHaskellDepends = [ - base bytestring containers criterion directory serialise text + base bytestring containers directory gauge serialise text ]; description = "A configuration language guaranteed to terminate"; license = stdenv.lib.licenses.bsd3; @@ -67211,14 +67797,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dhall-bash_1_0_21" = callPackage + "dhall-bash_1_0_22" = callPackage ({ mkDerivation, base, bytestring, containers, dhall , neat-interpolation, optparse-generic, shell-escape, text }: mkDerivation { pname = "dhall-bash"; - version = "1.0.21"; - sha256 = "06rv0wrs1ym6szy78wg3nyfwaqm279vy6m7zny9s90lnpa6dc098"; + version = "1.0.22"; + sha256 = "1qxcf3f8a390znwkbhcirlgqpgg0ssc3bnwdml7wkv8k0qwqq57j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -67279,28 +67865,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dhall-json_1_3_0" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers - , dhall, exceptions, lens, libyaml, optparse-applicative + "dhall-json_1_4_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, base + , bytestring, containers, dhall, exceptions, libyaml + , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal , scientific, tasty, tasty-hunit, text, unordered-containers , vector, yaml }: mkDerivation { pname = "dhall-json"; - version = "1.3.0"; - sha256 = "176i30shaklranbhmb4m4zqn13cn9hd6lqiqdjv9qmckkapbkjpi"; - revision = "1"; - editedCabalFile = "101xfp3zg9i7qyibknjpcdhha8sc024xmylphiwb509h3fjy3yks"; + version = "1.4.0"; + sha256 = "0kxb71m1rf6y7z3wx4yx5ks0p5vhnlpgchsih3mfn9ygppc2z0ri"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson aeson-pretty base bytestring containers dhall exceptions lens + aeson aeson-pretty base bytestring containers dhall exceptions libyaml optparse-applicative scientific text unordered-containers vector yaml ]; executableHaskellDepends = [ - aeson aeson-pretty base bytestring dhall exceptions - optparse-applicative text + aeson aeson-pretty ansi-terminal base bytestring dhall exceptions + optparse-applicative prettyprinter prettyprinter-ansi-terminal text ]; testHaskellDepends = [ aeson base bytestring dhall tasty tasty-hunit text @@ -67329,20 +67914,51 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dhall-lsp-server" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers + , cryptonite, data-default, dhall, dhall-json, directory, doctest + , dotgen, filepath, haskell-lsp, hslogger, lens, lens-family-core + , megaparsec, mtl, network-uri, optparse-applicative, prettyprinter + , sorted-list, stm, text, transformers, unordered-containers + , uri-encode, yi-rope + }: + mkDerivation { + pname = "dhall-lsp-server"; + version = "1.0.0"; + sha256 = "1i4bx8qiy1hbs6bm50fixj1ipkd9rm6y6z3bci8ngh1rhy5v51x1"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty base bytestring containers cryptonite + data-default dhall dhall-json dotgen filepath haskell-lsp hslogger + lens lens-family-core megaparsec mtl network-uri + optparse-applicative prettyprinter sorted-list stm text + transformers unordered-containers uri-encode yi-rope + ]; + executableHaskellDepends = [ + aeson base containers data-default dhall filepath haskell-lsp + hslogger lens lens-family-core megaparsec mtl optparse-applicative + prettyprinter sorted-list stm text transformers + unordered-containers yi-rope + ]; + testHaskellDepends = [ base directory doctest filepath ]; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "dhall-nix" = callPackage ({ mkDerivation, base, containers, data-fix, dhall, hnix - , insert-ordered-containers, neat-interpolation, optparse-generic - , text + , neat-interpolation, optparse-generic, text }: mkDerivation { pname = "dhall-nix"; - version = "1.1.6"; - sha256 = "0pchanzgcag6z7fywqm09xj29n0pfxd2ya2ky64aapykq038jxbs"; + version = "1.1.7"; + sha256 = "0axg7qq8rfy5qsffiw57lll40mw7bxgk67g7lgdb5vbri69xj3is"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers data-fix dhall hnix insert-ordered-containers - neat-interpolation text + base containers data-fix dhall hnix neat-interpolation text ]; executableHaskellDepends = [ base dhall hnix optparse-generic text @@ -67396,6 +68012,8 @@ self: { ]; description = "Compile Dhall expressions to Cabal files"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dhcp-lease-parser" = callPackage @@ -67418,6 +68036,41 @@ self: { broken = true; }) {}; + "dhrun" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, bytestring, conduit + , conduit-extra, containers, dhall, directory, editor-open + , filepath, generic-random, Glob, hspec, mtl, optparse-applicative + , process, protolude, quickcheck-text, tasty, tasty-golden + , tasty-hspec, tasty-hunit, tasty-quickcheck, text, time, unix + , unliftio, unliftio-core, yaml + }: + mkDerivation { + pname = "dhrun"; + version = "1.0.1"; + sha256 = "1gyg5221g1qsq2h62lcdwi4g7amis26692hh3fdi824bjylz8pal"; + isLibrary = false; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal base bytestring conduit conduit-extra containers + dhall directory mtl process protolude text time unix unliftio-core + yaml + ]; + executableHaskellDepends = [ + base bytestring dhall directory editor-open filepath + optparse-applicative protolude + ]; + testHaskellDepends = [ + aeson base bytestring dhall filepath generic-random Glob hspec mtl + protolude quickcheck-text tasty tasty-golden tasty-hspec + tasty-hunit tasty-quickcheck text unliftio yaml + ]; + doHaddock = false; + description = "Dhall/YAML configurable concurrent integration test executor"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "di" = callPackage ({ mkDerivation, base, containers, df1, di-core, di-df1, di-handle , di-monad, exceptions @@ -69319,24 +69972,25 @@ self: { "discord-haskell" = callPackage ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring - , containers, data-default, http-client, iso8601-time, JuicyPixels - , MonadRandom, req, safe-exceptions, text, time + , containers, data-default, emoji, http-client, iso8601-time + , JuicyPixels, MonadRandom, req, safe-exceptions, text, time , unordered-containers, vector, websockets, wuss }: mkDerivation { pname = "discord-haskell"; - version = "0.8.4"; - sha256 = "1x2rqnvmxcyf320l0vyrj2dw5p1nql588zp8nknnwpk0sp0dxmjm"; + version = "1.0.0"; + sha256 = "1z0d46gd7rgwbh05ws6hcp4rikach0yg1fim6ni0ww4g0mksj8j3"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ aeson async base base64-bytestring bytestring containers - data-default http-client iso8601-time JuicyPixels MonadRandom req - safe-exceptions text time unordered-containers vector websockets - wuss + data-default emoji http-client iso8601-time JuicyPixels MonadRandom + req safe-exceptions text time unordered-containers vector + websockets wuss ]; + executableHaskellDepends = [ base text ]; description = "Write bots for Discord in Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "discord-hs" = callPackage @@ -70364,6 +71018,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ditto" = callPackage + ({ mkDerivation, base, containers, mtl, semigroups, text }: + mkDerivation { + pname = "ditto"; + version = "0.3.1"; + sha256 = "1y3s0q0c0lsj6hsszazbd0yjb10nagvg96nw3x154kz55mn2bdym"; + libraryHaskellDepends = [ base containers mtl semigroups text ]; + description = "ditto is a type-safe HTML form generation and validation library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "ditto-lucid" = callPackage + ({ mkDerivation, base, ditto, lucid, path-pieces, text }: + mkDerivation { + pname = "ditto-lucid"; + version = "0.3.2"; + sha256 = "1asp25vi3m6rbk1wllqb1gzjrgifndhcpr2blx1j132ql6h5qqpj"; + libraryHaskellDepends = [ base ditto lucid path-pieces text ]; + description = "Add support for using lucid with Ditto"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "diversity" = callPackage ({ mkDerivation, base, containers, data-ordlist, fasta , math-functions, MonadRandom, optparse-applicative, parsec, pipes @@ -70714,6 +71390,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dns_4_0_0" = callPackage + ({ mkDerivation, array, async, attoparsec, auto-update, base + , base16-bytestring, base64-bytestring, bytestring, Cabal + , cabal-doctest, containers, cryptonite, doctest, hourglass, hspec + , iproute, mtl, network, psqueues, QuickCheck, word8 + }: + mkDerivation { + pname = "dns"; + version = "4.0.0"; + sha256 = "0gq0y8pw4x8fja0f3hhwpbxh4rg2i8nzfnp2rxh2py49qfhg38mj"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + array async attoparsec auto-update base base16-bytestring + base64-bytestring bytestring containers cryptonite hourglass + iproute mtl network psqueues + ]; + testHaskellDepends = [ + base bytestring doctest hspec iproute network QuickCheck word8 + ]; + testTarget = "spec"; + description = "DNS library in Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dnscache" = callPackage ({ mkDerivation, base, bytestring, containers, contstuff, dns , iproute, time @@ -71026,6 +71727,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "doctemplates_0_3_0_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, filepath + , Glob, mtl, parsec, scientific, tasty, tasty-golden, tasty-hunit + , temporary, text, unordered-containers, vector + }: + mkDerivation { + pname = "doctemplates"; + version = "0.3.0.1"; + sha256 = "11xvrmk9qb2izq8y61pna0lxlsfr5yb94nlk5ih8z1fcdn7ghl3j"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base containers filepath mtl parsec scientific text + unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring filepath Glob mtl tasty tasty-golden + tasty-hunit temporary text + ]; + description = "Pandoc-style document templates"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "doctest" = callPackage ({ mkDerivation, base, base-compat, code-page, deepseq, directory , filepath, ghc, ghc-paths, hspec, HUnit, mockery, process @@ -71294,6 +72018,26 @@ self: { broken = true; }) {}; + "doldol" = callPackage + ({ mkDerivation, base, HUnit, QuickCheck, test-framework + , test-framework-hunit, test-framework-quickcheck2 + , test-framework-th + }: + mkDerivation { + pname = "doldol"; + version = "0.4.1.2"; + sha256 = "0r9ylifyyv2mg4b94ikv8q56j0z5f6qa8r2jcpqg0xzdznwxqlv5"; + revision = "1"; + editedCabalFile = "0xwbdrfzd6z3nwkgnav2drisw2sn464ggkz8fid58cym9hbfpl47"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base HUnit QuickCheck test-framework test-framework-hunit + test-framework-quickcheck2 test-framework-th + ]; + description = "Flag packer & handler for flaggable data"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "dollaridoos" = callPackage ({ mkDerivation, base, profunctors, semigroups }: mkDerivation { @@ -71500,15 +72244,15 @@ self: { broken = true; }) {}; - "dotenv_0_8_0_1" = callPackage + "dotenv_0_8_0_2" = callPackage ({ mkDerivation, base, base-compat, containers, directory , exceptions, hspec, hspec-megaparsec, megaparsec , optparse-applicative, process, text, transformers, yaml }: mkDerivation { pname = "dotenv"; - version = "0.8.0.1"; - sha256 = "1mp6j3wcxiz75yjf9bnb4kc5gw09v0ax1fz0hhh9i2glxi53m27l"; + version = "0.8.0.2"; + sha256 = "0an7spi0cgvzr64nyy7p8pdslyf0jlh9l2ww52jbh1habsxjn6fp"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -72624,6 +73368,8 @@ self: { pname = "dumb-cas"; version = "0.2.0.0"; sha256 = "1zcq9r2p5gjpfivprjp9hspqpayrj9in2jck5vf5ibxpc671isb4"; + revision = "1"; + editedCabalFile = "1269wjyywvi86gmpqdpq2niv5ifns0bqr1i5229w69jdlzrc6dqg"; libraryHaskellDepends = [ base containers decimal-literals hashable template-haskell unordered-containers @@ -73045,8 +73791,8 @@ self: { }: mkDerivation { pname = "dynamic-graph"; - version = "0.1.0.12"; - sha256 = "1jygkj2jryjxlkyf0104abhkhjmfdvjaaa4zcyz7kgpny342fhiy"; + version = "0.1.0.13"; + sha256 = "1gx3hqbps8mvhxm03j5wri7v4qy3z42kcy8rhhcxq7dd0mryd4rz"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base cairo colour GLFW-b GLUtil OpenGL pango pipes transformers @@ -73154,6 +73900,8 @@ self: { pname = "dynamic-plot"; version = "0.4.0.0"; sha256 = "1klq7lwvfwwp6z842g50a2xx6cqihp8a6551f935nr2sx9hwdr94"; + revision = "1"; + editedCabalFile = "0x5jxjvwfkax6lxwk28hd2p903q6zmr1nxhyahrwcnqgh6ygywiw"; libraryHaskellDepends = [ base colour colour-space constrained-categories containers data-default deepseq diagrams-cairo diagrams-core diagrams-gtk @@ -74093,8 +74841,8 @@ self: { ({ mkDerivation, base, constraints, mtl, transformers }: mkDerivation { pname = "effect-stack"; - version = "0.2.1"; - sha256 = "0sram572nbzpgwb3vi5fmg2f4ynsh693q05w0n5yjj8zl4a7p4ds"; + version = "0.3"; + sha256 = "08zalj8svp78ykqbf5nhd6khgygz8dplcvjd19w3hvgm08y4kxqi"; libraryHaskellDepends = [ base constraints mtl transformers ]; description = "Reducing the pain of transformer stacks with duplicated effects"; license = stdenv.lib.licenses.bsd3; @@ -74180,28 +74928,30 @@ self: { }) {}; "egison" = callPackage - ({ mkDerivation, array, base, containers, criterion, deepseq - , directory, filepath, ghc, ghc-paths, Glob, hashable, haskeline - , HUnit, lens, mtl, parallel, parsec, process, random, regex-tdfa - , split, test-framework, test-framework-hunit, text, transformers - , unordered-containers, vector + ({ mkDerivation, alex, array, base, containers, criterion, deepseq + , directory, filepath, ghc, ghc-paths, Glob, happy, hashable + , haskeline, HUnit, mtl, optparse-applicative, parallel, parsec + , process, random, regex-tdfa, split, test-framework + , test-framework-hunit, text, transformers, unordered-containers + , vector }: mkDerivation { pname = "egison"; - version = "3.8.2"; - sha256 = "090zhf89faakidbf8kkbsa8ck0rl7fqbpg3fwymjqlafgnfx1jc2"; + version = "3.9.0"; + sha256 = "1law6pwgqvp6nniwwbbsdm6fjq2fp30ywjfla2qqgwdabcqbd2vq"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base containers directory ghc ghc-paths hashable haskeline - lens mtl parallel parsec process random regex-tdfa split text + mtl parallel parsec process random regex-tdfa split text transformers unordered-containers vector ]; + libraryToolDepends = [ alex happy ]; executableHaskellDepends = [ array base containers directory filepath ghc ghc-paths haskeline - mtl parsec process regex-tdfa text transformers - unordered-containers vector + mtl optparse-applicative parsec process regex-tdfa text + transformers unordered-containers vector ]; testHaskellDepends = [ base filepath Glob HUnit mtl test-framework test-framework-hunit @@ -74212,6 +74962,8 @@ self: { ]; description = "Programming language with non-linear pattern-matching against non-free data"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "egison-quote" = callPackage @@ -74823,8 +75575,8 @@ self: { }: mkDerivation { pname = "elm-bridge"; - version = "0.5.1"; - sha256 = "0d9544s892rhy0dkhzz6w3nryhbl26yahs4k1nkpgdqsxsnv4rvn"; + version = "0.5.2"; + sha256 = "1ls4c4lrjbmms1kcaz88nnxn3ih3wbx51adjggbvyvfj52bc5cvp"; libraryHaskellDepends = [ aeson base template-haskell ]; testHaskellDepends = [ aeson base containers hspec QuickCheck text @@ -75805,8 +76557,8 @@ self: { }: mkDerivation { pname = "engine-io-wai"; - version = "1.0.9"; - sha256 = "1zdin34gfi2059n1wjfxs4i2kfc0r53f3wpwhjd0fbp0as56h94s"; + version = "1.0.10"; + sha256 = "07vjjb7d5ndv8cailnrv5qif0d3kmi09bq1s38hwjyp5ml8dlfis"; libraryHaskellDepends = [ attoparsec base bytestring either engine-io http-types mtl text transformers transformers-compat unordered-containers wai @@ -75944,6 +76696,41 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "enum-text_0_5_1_0" = callPackage + ({ mkDerivation, array, base, bytestring, fmt, hashable, possibly + , text, time, unordered-containers + }: + mkDerivation { + pname = "enum-text"; + version = "0.5.1.0"; + sha256 = "0v48hmxbpzjpclg1q0avrc1dp4giglbxy2rkqnbj4f0sprp03kff"; + libraryHaskellDepends = [ + array base bytestring fmt hashable possibly text time + unordered-containers + ]; + description = "A text rendering and parsing toolkit for enumerated types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "enum-text-rio" = callPackage + ({ mkDerivation, base, bytestring, enum-text, fmt, rio, text }: + mkDerivation { + pname = "enum-text-rio"; + version = "1.2.0.0"; + sha256 = "0cz91i1m9ibphlm153i23i03nhx41bca398hkfzf9hq904ziarna"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base bytestring enum-text fmt rio text ]; + executableHaskellDepends = [ + base bytestring enum-text fmt rio text + ]; + description = "Making fmt available with rio"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "enum-types" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -76148,6 +76935,26 @@ self: { broken = true; }) {}; + "enummapset_0_6_0_2" = callPackage + ({ mkDerivation, array, base, containers, deepseq, ghc-prim, HUnit + , QuickCheck, semigroups, test-framework, test-framework-hunit + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "enummapset"; + version = "0.6.0.2"; + sha256 = "0476rzarcfpp4qm4qsz6wdnhr11nlfhqgrnbni591kbmngqlld1v"; + libraryHaskellDepends = [ base containers deepseq semigroups ]; + testHaskellDepends = [ + array base containers deepseq ghc-prim HUnit QuickCheck semigroups + test-framework test-framework-hunit test-framework-quickcheck2 + ]; + description = "IntMap and IntSet with Enum keys/elements"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "enummapset-th" = callPackage ({ mkDerivation, base, containers, deepseq, template-haskell }: mkDerivation { @@ -76278,6 +77085,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "envy_2_0_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, hspec, mtl + , QuickCheck, quickcheck-instances, text, time, transformers + }: + mkDerivation { + pname = "envy"; + version = "2.0.0.0"; + sha256 = "0l3rg9kvx5pp8ly1wl86g0nfp4161vdbf1cavpm2s84hahq9wg0z"; + libraryHaskellDepends = [ + base bytestring containers mtl text time transformers + ]; + testHaskellDepends = [ + base bytestring hspec mtl QuickCheck quickcheck-instances text time + transformers + ]; + description = "An environmentally friendly way to deal with environment variables"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "epanet-haskell" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -78949,6 +79776,8 @@ self: { pname = "explicit-constraint-lens"; version = "0.1.0.0"; sha256 = "181frvmgv65rcjpiya4gswvpq9ahz97c8lalhgmwknx9jx5nqd98"; + revision = "1"; + editedCabalFile = "06mj6zxj1l439g6l5ibrxbsr6ff2c199i3dlf0k1yxjck1dfblv4"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "Fully-flexible polymorphic lenses, without any bizarre profunctors"; @@ -79074,6 +79903,19 @@ self: { broken = true; }) {}; + "express" = callPackage + ({ mkDerivation, base, leancheck, template-haskell }: + mkDerivation { + pname = "express"; + version = "0.1.0"; + sha256 = "1bm2bzkkjnwrzf67g7291pw7cvlxg86mz69fnlrigmlxcx3kxbn4"; + libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ base leancheck ]; + benchmarkHaskellDepends = [ base leancheck ]; + description = "Express"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "expression-parser" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -79240,7 +80082,7 @@ self: { }) {}; "extensible" = callPackage - ({ mkDerivation, aeson, base, bytestring, cassava, comonad + ({ mkDerivation, aeson, barbies, base, bytestring, cassava, comonad , constraints, deepseq, exceptions, ghc-prim, hashable, lens , membership, monad-skeleton, mtl, prettyprinter, primitive , profunctors, QuickCheck, resourcet, StateVar, tagged @@ -79249,10 +80091,10 @@ self: { }: mkDerivation { pname = "extensible"; - version = "0.5.1"; - sha256 = "0rqq2pwp5zzpl9xzjmk0m8a54mbs10d7dywswfd84wqrngknkp10"; + version = "0.6.1"; + sha256 = "1h96kn622qyx27xap79ywq4kx4q82x4b3kxviakhqwxlvf2sklg2"; libraryHaskellDepends = [ - aeson base bytestring cassava comonad constraints deepseq + aeson barbies base bytestring cassava comonad constraints deepseq exceptions ghc-prim hashable membership monad-skeleton mtl prettyprinter primitive profunctors QuickCheck resourcet StateVar tagged template-haskell text th-lift transformers @@ -79306,32 +80148,31 @@ self: { }) {}; "extensible-effects-concurrent" = callPackage - ({ mkDerivation, async, base, bytestring, containers, data-default - , deepseq, directory, exceptions, extensible-effects, filepath - , hostname, HUnit, lens, monad-control, mtl, network, parallel - , pretty-types, process, QuickCheck, safe-exceptions, stm, tagged - , tasty, tasty-discover, tasty-hunit, text, time, transformers-base + ({ mkDerivation, async, base, containers, data-default, deepseq + , directory, exceptions, extensible-effects, filepath, hashable + , hostname, HUnit, lens, monad-control, mtl, network, pretty-types + , QuickCheck, safe-exceptions, stm, tasty, tasty-discover + , tasty-hunit, text, time, transformers-base }: mkDerivation { pname = "extensible-effects-concurrent"; - version = "0.29.2"; - sha256 = "0a2nbnr8giil05jy5nr7d3gy3cgvq9058dzqb49as65n232n1iv1"; + version = "0.32.0"; + sha256 = "1zipam9jac1bj4fkzihgh0hasiwgpycidhvxb0b2b0q7ic18487a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - async base bytestring containers data-default deepseq directory - exceptions extensible-effects filepath hostname lens monad-control - mtl network parallel pretty-types process QuickCheck - safe-exceptions stm tagged text time transformers-base + async base containers data-default deepseq directory exceptions + extensible-effects filepath hashable hostname lens monad-control + mtl network pretty-types safe-exceptions stm text time + transformers-base ]; executableHaskellDepends = [ - base data-default deepseq directory extensible-effects filepath - lens pretty-types text + base data-default deepseq extensible-effects lens pretty-types text ]; testHaskellDepends = [ async base containers data-default deepseq extensible-effects - filepath hostname HUnit lens pretty-types QuickCheck stm tasty - tasty-discover tasty-hunit text time + filepath hostname HUnit lens monad-control pretty-types QuickCheck + stm tasty tasty-discover tasty-hunit text time ]; testToolDepends = [ tasty-discover ]; description = "Message passing concurrency as extensible-effect"; @@ -79471,6 +80312,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "extrapolate_0_4_0" = callPackage + ({ mkDerivation, base, express, leancheck, speculate + , template-haskell + }: + mkDerivation { + pname = "extrapolate"; + version = "0.4.0"; + sha256 = "0qlpgpwzdvc2my332krjs8pqwzrhpkw9l3irfx6gx8fpmgasfd8n"; + libraryHaskellDepends = [ + base express leancheck speculate template-haskell + ]; + testHaskellDepends = [ base express 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 @@ -79511,6 +80369,17 @@ self: { broken = true; }) {}; + "f-algebra-gen" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "f-algebra-gen"; + version = "0.1.0.2"; + sha256 = "1vxhfr4wqm2bclnq15lp4q496w3916ll9chj6mcqbn0r64bmmkn8"; + libraryHaskellDepends = [ base template-haskell ]; + description = "Generate a special f-algebra combinator from any data type"; + license = stdenv.lib.licenses.mit; + }) {}; + "f-ree-hack-cheats-free-v-bucks-generator" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -79819,8 +80688,8 @@ self: { ({ mkDerivation, base, containers, hspec, mtl, QuickCheck }: mkDerivation { pname = "fakefs"; - version = "0.2.0.0"; - sha256 = "0r20w8grmcfr5vwh8j2kfg9lm9pkcq9cvgnrw1sj2vi38s96icwx"; + version = "0.2.0.1"; + sha256 = "0szdjrc4m87h9dsb7qg5rpp5avnyzv47mymyihgvmxc22wiyf1c1"; libraryHaskellDepends = [ base containers mtl ]; testHaskellDepends = [ base containers hspec QuickCheck ]; description = "Extensible fake file system for testing"; @@ -80906,6 +81775,8 @@ self: { pname = "fedora-haskell-tools"; version = "0.8"; sha256 = "03wk335dpkbcdgxqsjiavnqc43jkw8gh7y41dyfwivwd9mr32y2w"; + revision = "1"; + editedCabalFile = "06xak96g91krd45kvz1nscnfn4rw9gdj5xxwn8simb2vmqiy6f94"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -81004,7 +81875,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "feed_1_1_0_0" = callPackage + "feed_1_2_0_0" = callPackage ({ mkDerivation, base, base-compat, bytestring, HUnit , markdown-unlit, old-locale, old-time, safe, test-framework , test-framework-hunit, text, time, time-locale-compat, utf8-string @@ -81012,10 +81883,8 @@ self: { }: mkDerivation { pname = "feed"; - version = "1.1.0.0"; - sha256 = "05hiasa6k13v1pzp9cs991zh04njda0ax9868rc7k906b19qqkjg"; - revision = "1"; - editedCabalFile = "0bn0vnn6v373ycrbxwqzp1ncmq649h13f2na8q8yf0i68mxampks"; + version = "1.2.0.0"; + sha256 = "0cakrlq1ra2gwyqmdhss4clkj0xxrwy3pc4xjzgqz4w3yd1czjg7"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base base-compat bytestring old-locale old-time safe text time @@ -83206,13 +84075,17 @@ self: { }) {}; "flags-applicative" = callPackage - ({ mkDerivation, base, containers, hspec, mtl, network, text }: + ({ mkDerivation, base, casing, containers, hspec, mtl, network + , text + }: mkDerivation { pname = "flags-applicative"; - version = "0.0.5.2"; - sha256 = "1yjwnh6mqq3ypc3rs7a13j998zizfn6fn35d2wijdkm4ahyjpjhv"; - libraryHaskellDepends = [ base containers mtl network text ]; - testHaskellDepends = [ base hspec text ]; + version = "0.1.0.1"; + sha256 = "1pamcfv5g6d42ksq10af0l2a6k8y997zx3y4pvf5gcy5hlxr2gwv"; + libraryHaskellDepends = [ + base casing containers mtl network text + ]; + testHaskellDepends = [ base containers hspec text ]; description = "Applicative flag parsing"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -84161,6 +85034,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fmt-for-rio" = callPackage + ({ mkDerivation, base, enum-text-rio }: + mkDerivation { + pname = "fmt-for-rio"; + version = "1.0.0.0"; + sha256 = "0hxf1cgch4l5vwnsg4449ing3qi40kpfcwjg4l807sw0b18ccwar"; + libraryHaskellDepends = [ base enum-text-rio ]; + description = "Adaptor for getting fmt to work with rio"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "fmt-terminal-colors" = callPackage ({ mkDerivation, ansi-terminal, base, fmt }: mkDerivation { @@ -85233,6 +86119,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "foundation_0_0_24" = callPackage + ({ mkDerivation, base, basement, gauge, ghc-prim }: + mkDerivation { + pname = "foundation"; + version = "0.0.24"; + sha256 = "1yygliyg5dh06n7iyyrvy4iz2328hgb5igjp832wxrfa529pwqdk"; + libraryHaskellDepends = [ base basement ghc-prim ]; + testHaskellDepends = [ base basement ]; + benchmarkHaskellDepends = [ base basement gauge ]; + description = "Alternative prelude with batteries and no dependencies"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "foundation-edge" = callPackage ({ mkDerivation, bytestring, foundation, text }: mkDerivation { @@ -85836,8 +86736,8 @@ self: { pname = "free-vector-spaces"; version = "0.1.5.0"; sha256 = "0rf6yhjcd2x4yj2jvyl6yc8x55a2hqhj5mxzg4f24734agh720z1"; - revision = "1"; - editedCabalFile = "0b95827ppw0nvhaxg9axkngsij2sj8d6s06amz2vi79jgs7vbfr6"; + revision = "3"; + editedCabalFile = "09jy8kj31p6b4pmzry6glq7climw6pmpph23byhijs82a7yl609w"; libraryHaskellDepends = [ base lens linear MemoTrie pragmatic-show vector vector-space ]; @@ -86705,6 +87605,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ft-generator" = callPackage + ({ mkDerivation, base, mtl, parsec }: + mkDerivation { + pname = "ft-generator"; + version = "1.0"; + sha256 = "1kgh8w1ny0zsrbf53vqabkap6zp6fmq2hx35nxw2hcfw7b0pvavk"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base mtl parsec ]; + description = "implementation accompanying a WFLP'19 submission"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "ftdi" = callPackage ({ mkDerivation, base, base-unicode-symbols, bytestring, safe , transformers, usb @@ -87187,24 +88100,22 @@ self: { ({ mkDerivation, base, bifunctors, comonad, constraints, containers , dependent-sum, deriving-compat, free, hedgehog, kan-extensions , mmorph, mtl, natural-transformation, nonempty-containers, pointed - , profunctors, recursion-schemes, semigroupoids, tagged, tasty - , tasty-hedgehog, these, transformers, trivial-constraint, vinyl + , profunctors, semigroupoids, tagged, tasty, tasty-hedgehog, these + , transformers, trivial-constraint, vinyl }: mkDerivation { pname = "functor-combinators"; - version = "0.1.1.0"; - sha256 = "1x3a2rwqhvcyr298adfc9qband5s5qwh8wfd67cgrq5qx2z4j8xf"; - revision = "2"; - editedCabalFile = "09r6bgjlcsjjbwqhfxqbw5dk5sj9lsbfwwsjpdzmi8z8dywgyn2z"; + version = "0.1.1.1"; + sha256 = "1bs1xqlndbzi91z9048clmgmgkjyyrkgcmz6s864villy0s9h90c"; libraryHaskellDepends = [ base bifunctors comonad constraints containers deriving-compat free kan-extensions mmorph mtl natural-transformation - nonempty-containers pointed profunctors recursion-schemes - semigroupoids tagged these transformers trivial-constraint vinyl + nonempty-containers pointed profunctors semigroupoids tagged these + transformers trivial-constraint vinyl ]; testHaskellDepends = [ base bifunctors dependent-sum free hedgehog nonempty-containers - semigroupoids tagged tasty tasty-hedgehog transformers + semigroupoids tasty tasty-hedgehog transformers ]; description = "Tools for functor combinator-based program design"; license = stdenv.lib.licenses.bsd3; @@ -87451,8 +88362,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "funspection"; - version = "0.1.0.0"; - sha256 = "1bq7gj8kcgz8ccy6skkqbrfkxavkg3s511shm8fd9s8syqwdglr8"; + version = "1.0.0.0"; + sha256 = "0jbzvn06d5kfyiav3fjd6k8sk8dy00pwk2g711nrbmlrljbw7f39"; libraryHaskellDepends = [ base ]; description = "Type-level function utilities"; license = stdenv.lib.licenses.bsd3; @@ -87472,15 +88383,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "fused-effects_0_4_0_0" = callPackage + "fused-effects_0_5_0_0" = callPackage ({ mkDerivation, base, criterion, deepseq, doctest, hspec , inspection-testing, MonadRandom, QuickCheck, random, transformers , unliftio-core }: mkDerivation { pname = "fused-effects"; - version = "0.4.0.0"; - sha256 = "1r6yzw0212p5wn9rad2r7pjijnw6jajhypirm4j8h1gz1a393ds8"; + version = "0.5.0.0"; + sha256 = "1s1jvxdmwnjyxcx7zhspv1qkfy1dvcj0c92az2njqjibldbvqsa4"; libraryHaskellDepends = [ base deepseq MonadRandom random transformers unliftio-core ]; @@ -87499,10 +88410,8 @@ self: { }: mkDerivation { pname = "fused-effects-exceptions"; - version = "0.1.1.0"; - sha256 = "0b9rj752ry72n6ln4fj9n6m2d1qfdxp229hzkgxznag0rr3bm5rd"; - revision = "1"; - editedCabalFile = "1sg9gvv5lf4z7h70szjcqilhxxjmkiyriz95qyvahplln9p6281l"; + version = "0.2.0.0"; + sha256 = "1hgvl48vdrgcb45izmwad40x5jgxiaf3rdhhm5x0gjd9848drmbb"; libraryHaskellDepends = [ base fused-effects safe-exceptions unliftio-core ]; @@ -87713,6 +88622,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fuzzyset_0_1_1" = callPackage + ({ mkDerivation, base, base-unicode-symbols, data-default, hspec + , ieee754, lens, text, text-metrics, unordered-containers, vector + }: + mkDerivation { + pname = "fuzzyset"; + version = "0.1.1"; + sha256 = "1r23xp3c4f1y0kx0kcg4z83rfxl6swciysb3cy7z6yv35fs8bs4q"; + libraryHaskellDepends = [ + base base-unicode-symbols data-default lens text text-metrics + unordered-containers vector + ]; + testHaskellDepends = [ + base base-unicode-symbols hspec ieee754 lens text + unordered-containers + ]; + description = "Fuzzy set for approximate string matching"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fuzzytime" = callPackage ({ mkDerivation, base, cmdargs, directory, old-time, process }: mkDerivation { @@ -87906,22 +88836,20 @@ self: { "galois-field" = callPackage ({ mkDerivation, base, criterion, integer-gmp, MonadRandom - , protolude, tasty, tasty-discover, tasty-quickcheck - , wl-pprint-text + , protolude, tasty, tasty-quickcheck, wl-pprint-text }: mkDerivation { pname = "galois-field"; - version = "0.2.0"; - sha256 = "19q08k5aqnp1vcvlnlw6h4qmlh80dj1rglzckzf7ak78ifcwm1m8"; + version = "0.3.0"; + sha256 = "0c4n37rf6kfpyxdmqk4hdgmjc8fvxwynq0izgrhrqinv4z4l97v7"; libraryHaskellDepends = [ base integer-gmp MonadRandom protolude tasty-quickcheck wl-pprint-text ]; testHaskellDepends = [ - base integer-gmp MonadRandom protolude tasty tasty-discover - tasty-quickcheck wl-pprint-text + base integer-gmp MonadRandom protolude tasty tasty-quickcheck + wl-pprint-text ]; - testToolDepends = [ tasty-discover ]; benchmarkHaskellDepends = [ base criterion integer-gmp MonadRandom protolude tasty-quickcheck wl-pprint-text @@ -87983,6 +88911,40 @@ self: { broken = true; }) {}; + "gamgee" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, bytestring + , cryptonite, directory, filepath, Hclip, memory + , optparse-applicative, polysemy, QuickCheck, quickcheck-instances + , relude, safe-exceptions, tasty, tasty-golden, tasty-quickcheck + , text, time, unix + }: + mkDerivation { + pname = "gamgee"; + version = "1.1.0"; + sha256 = "0ip6y8l2dmw15494d77s771aqmn7awrqnlmbcc7dd2lqwq5s5wgr"; + revision = "1"; + editedCabalFile = "1lg04ps7m85x4py844vcc53a3r6ijaqzjrggrwp53iv2ga1m88sr"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base64-bytestring bytestring cryptonite memory polysemy + relude safe-exceptions text time + ]; + executableHaskellDepends = [ + aeson base directory filepath Hclip optparse-applicative polysemy + relude safe-exceptions text time unix + ]; + testHaskellDepends = [ + aeson base bytestring cryptonite filepath memory polysemy + QuickCheck quickcheck-instances relude tasty tasty-golden + tasty-quickcheck text time + ]; + description = "Tool for generating TOTP MFA tokens"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "gamma" = callPackage ({ mkDerivation, base, continued-fractions, converge, erf, numbers , QuickCheck, template-haskell, test-framework @@ -89220,12 +90182,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "generics-mrsop_2_0_0" = callPackage + "generics-mrsop_2_1_0" = callPackage ({ mkDerivation, base, containers, mtl, template-haskell }: mkDerivation { pname = "generics-mrsop"; - version = "2.0.0"; - sha256 = "1cdjh5bjvx8xfglwnm48lfybdz4n8v7v8va2c3zyihzqbxh6akml"; + version = "2.1.0"; + sha256 = "1ynzwpwry6fqzjmz3n0iwdp5ra3c402jg1g8sdf7vbpaw9ilyrng"; libraryHaskellDepends = [ base containers mtl template-haskell ]; description = "Generic Programming with Mutually Recursive Sums of Products"; license = stdenv.lib.licenses.mit; @@ -90856,16 +91818,17 @@ self: { "ghc-heap-view" = callPackage ({ mkDerivation, base, binary, bytestring, Cabal, containers - , deepseq, filepath, ghc, template-haskell, transformers + , deepseq, filepath, ghc-heap, template-haskell, transformers }: mkDerivation { pname = "ghc-heap-view"; - version = "0.5.10"; - sha256 = "0wb4311k8pyvgmhlxsdr8ss497nlgr8hawkm0fi930s3y4xxak1f"; + version = "0.6.0"; + sha256 = "1j2ygig1m7xq1y5gsaaxbgywv382yzlp1nbf3cp98yias0s61vcr"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal filepath ]; libraryHaskellDepends = [ - base binary bytestring containers ghc template-haskell transformers + base binary bytestring containers ghc-heap template-haskell + transformers ]; testHaskellDepends = [ base deepseq ]; description = "Extract the heap representation of Haskell values and thunks"; @@ -90966,8 +91929,8 @@ self: { }: mkDerivation { pname = "ghc-lib"; - version = "8.8.0.20190424"; - sha256 = "03f1racabmixc4jk3mn6k6cnhapaplswa8fbb9yajrzj56ag16wm"; + version = "8.8.0.20190723"; + sha256 = "161qmm41vayks22vxbji436by1rfbx0x5m2zm4cc11pjcjrd4p63"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -90991,8 +91954,8 @@ self: { }: mkDerivation { pname = "ghc-lib-parser"; - version = "8.8.0.20190424"; - sha256 = "12gsh994pr13bsybwlravmi21la66dyw74pk74yfw2pnz682wv10"; + version = "8.8.0.20190723"; + sha256 = "0szrv98h2c1db3400cbb7vbhqnwagqncgpllzd9jiw74rq6y8mjq"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath @@ -91347,6 +92310,18 @@ self: { broken = true; }) {}; + "ghc-source-gen" = callPackage + ({ mkDerivation, base, ghc, ghc-paths, tasty, tasty-hunit }: + mkDerivation { + pname = "ghc-source-gen"; + version = "0.1.0.0"; + sha256 = "0sw62jjbd7h9i96hn0srl9m8p0qip6hnm1am6if7snqdm5b4ki3k"; + libraryHaskellDepends = [ base ghc ]; + testHaskellDepends = [ base ghc ghc-paths tasty tasty-hunit ]; + description = "Constructs Haskell syntax trees for the GHC API"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ghc-srcspan-plugin" = callPackage ({ mkDerivation, array, base, containers, ghc, hpc }: mkDerivation { @@ -91656,6 +92631,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghci-hexcalc_0_1_1_0" = callPackage + ({ mkDerivation, base, binary, doctest, QuickCheck }: + mkDerivation { + pname = "ghci-hexcalc"; + version = "0.1.1.0"; + sha256 = "1kjkx8w1rq1fkzl0ffvp71xjb2q5pmlgnm19g0avim7isrjy87kh"; + libraryHaskellDepends = [ base binary ]; + testHaskellDepends = [ base binary doctest QuickCheck ]; + description = "GHCi as a Hex Calculator interactive"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghci-history-parser" = callPackage ({ mkDerivation, base, doctest, hspec, parsec }: mkDerivation { @@ -91717,6 +92705,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ghci-websockets" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, foreign-store + , text, wai, wai-app-static, warp, websockets + }: + mkDerivation { + pname = "ghci-websockets"; + version = "0.0.2"; + sha256 = "0x3hwgsihsr780hxsmjbxhxlw98rv1aws30myh117l7gjmj5lvzg"; + libraryHaskellDepends = [ + aeson base bytestring containers foreign-store text wai + wai-app-static warp websockets + ]; + description = "A websocket server that survives GHCi reloads"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ghcid" = callPackage ({ mkDerivation, ansi-terminal, base, cmdargs, containers , directory, extra, filepath, fsnotify, process, tasty, tasty-hunit @@ -92057,6 +93061,26 @@ self: { broken = true; }) {}; + "ghcprofview" = callPackage + ({ mkDerivation, aeson, base, containers, ghc-prof, gi-gtk + , haskell-gi-base, regex-tdfa, regex-tdfa-text, scientific, text + }: + mkDerivation { + pname = "ghcprofview"; + version = "0.1.0.0"; + sha256 = "103186dik439sdzz1w6dr98s1sfghjxdkp51mh18wrcwdbdb9r3a"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson base containers ghc-prof gi-gtk haskell-gi-base regex-tdfa + regex-tdfa-text scientific text + ]; + description = "GHC .prof files viewer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "ghczdecode" = callPackage ({ mkDerivation, base, zenc }: mkDerivation { @@ -92126,15 +93150,15 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) atk;}; - "gi-atk_2_0_20" = callPackage + "gi-atk_2_0_21" = callPackage ({ mkDerivation, atk, base, bytestring, Cabal, containers, gi-glib , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading , text, transformers }: mkDerivation { pname = "gi-atk"; - version = "2.0.20"; - sha256 = "0pgmsd486l7ym8yi8png1zw90zk505jbdxj6jmh2hn096dl9wdrw"; + version = "2.0.21"; + sha256 = "0npcz82l5ssbrgzr99a94nlirmfdy9z5p2k0nrk7357bawpiv7sk"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject haskell-gi @@ -92170,15 +93194,15 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) cairo;}; - "gi-cairo_1_0_22" = callPackage + "gi-cairo_1_0_23" = callPackage ({ mkDerivation, base, bytestring, Cabal, cairo, containers , haskell-gi, haskell-gi-base, haskell-gi-overloading, text , transformers }: mkDerivation { pname = "gi-cairo"; - version = "1.0.22"; - sha256 = "1kk91v31pw14jdk8q2jkhiknw7qx4pll2cljxs8ahraclinakj1r"; + version = "1.0.23"; + sha256 = "1y479ll6pzf5qjf18ziqgvfi6zq4jyajkq9zlggmh9pjhxpwj8nh"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers haskell-gi haskell-gi-base @@ -92252,8 +93276,8 @@ self: { }: mkDerivation { pname = "gi-dbusmenu"; - version = "0.4.6"; - sha256 = "0yyd6hyfzkpq2qn1bsj2gqgxk35z8ggi6rs8nnz908fcr0k1zr2m"; + version = "0.4.7"; + sha256 = "0av2628vylmkk566f2zbzbwygni4rawrk14yamc6m9s9rsw2scf9"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject haskell-gi @@ -92274,8 +93298,8 @@ self: { }: mkDerivation { pname = "gi-dbusmenugtk3"; - version = "0.4.7"; - sha256 = "143xhf8d968bj5w443211vfl0vs27ygj65cdzdsidfz3vh56ms9r"; + version = "0.4.8"; + sha256 = "0ncn2i0bvsqsi785bjhdxr77hyxsp2dm26ihn7nxbvdkvn0mafhz"; setupHaskellDepends = [ base Cabal gi-atk gi-dbusmenu gi-gdk gi-gdkpixbuf gi-glib gi-gobject gi-gtk haskell-gi @@ -92313,16 +93337,16 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) gtk3;}; - "gi-gdk_3_0_21" = callPackage + "gi-gdk_4_0_1" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo - , gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-pango, gtk3 + , gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-pango, gtk4 , haskell-gi, haskell-gi-base, haskell-gi-overloading, text , transformers }: mkDerivation { pname = "gi-gdk"; - version = "3.0.21"; - sha256 = "0lfsmq3kfcz7g16zhvz84x0vqc59ifagcbkm1vv2g0lk10j7zg5x"; + version = "4.0.1"; + sha256 = "1b2azv7c3c9ni9f258ag2cxy97sh8ax78v0hym0gpvrky741vqwq"; setupHaskellDepends = [ base Cabal gi-cairo gi-gdkpixbuf gi-gio gi-glib gi-gobject gi-pango haskell-gi @@ -92332,11 +93356,11 @@ self: { gi-gobject gi-pango haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; - libraryPkgconfigDepends = [ gtk3 ]; + libraryPkgconfigDepends = [ gtk4 ]; description = "Gdk bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) gtk3;}; + }) {gtk4 = null;}; "gi-gdkpixbuf" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gdk-pixbuf @@ -92357,15 +93381,15 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) gdk-pixbuf;}; - "gi-gdkpixbuf_2_0_22" = callPackage + "gi-gdkpixbuf_2_0_23" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gdk-pixbuf , gi-gio, gi-glib, gi-gobject, haskell-gi, haskell-gi-base , haskell-gi-overloading, text, transformers }: mkDerivation { pname = "gi-gdkpixbuf"; - version = "2.0.22"; - sha256 = "1mj7h1053ib8bzgka4zfn7mxyd1m05az7l0dijw531v32378s5kq"; + version = "2.0.23"; + sha256 = "0jphrxqdbls3l73is1k93fizghbxgkf14q57l4w3m559vgk34anp"; setupHaskellDepends = [ base Cabal gi-gio gi-glib gi-gobject haskell-gi ]; @@ -92386,8 +93410,8 @@ self: { }: mkDerivation { pname = "gi-gdkx11"; - version = "3.0.8"; - sha256 = "0vz26ls00m16a4mfbiw4vwmnr3plyds4wr914q5jx9xrhr3mp202"; + version = "3.0.9"; + sha256 = "0z3vwwpv8a85nvg2bc4cdaa8w4jmdl5mm5bxfpwmssyxcnm1xdnc"; setupHaskellDepends = [ base Cabal gi-cairo gi-gdk gi-gio gi-gobject gi-xlib haskell-gi ]; @@ -92410,8 +93434,8 @@ self: { }: mkDerivation { pname = "gi-ggit"; - version = "1.0.7"; - sha256 = "1x84yi4c97jg6f4spp3s1bxcm5ny310yyji5s9izkd3dzagb2kxf"; + version = "1.0.8"; + sha256 = "151qgcwp2spa957nr3jdb9ac35f1r1gyi2d5vzgxy8xzc3993wmq"; setupHaskellDepends = [ base Cabal gi-gio gi-glib gi-gobject haskell-gi ]; @@ -92445,15 +93469,15 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib;}; - "gi-gio_2_0_24" = callPackage + "gi-gio_2_0_25" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, glib, haskell-gi, haskell-gi-base , haskell-gi-overloading, text, transformers }: mkDerivation { pname = "gi-gio"; - version = "2.0.24"; - sha256 = "0f49a3bqv0izwz9pbc9yxb5ysg8hwjmw85qjyfzsqndanmjsrlrz"; + version = "2.0.25"; + sha256 = "0w42ls035a69c2wyf050zvqxwyql3ln3ifwn9k4m187icj345qnz"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject haskell-gi @@ -92472,8 +93496,8 @@ self: { }: mkDerivation { pname = "gi-girepository"; - version = "1.0.21"; - sha256 = "15i5p1s8qj5f2m6kf69xzjndisgbi5184vya88py1b12284klvrv"; + version = "1.0.22"; + sha256 = "1m7gnam8a46zbbnxgcszv1wn8zgzdrpki6k3fgy5xjnb4gp5pvpj"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject haskell-gi @@ -92505,15 +93529,15 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib;}; - "gi-glib_2_0_22" = callPackage + "gi-glib_2_0_23" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, glib , haskell-gi, haskell-gi-base, haskell-gi-overloading, text , transformers }: mkDerivation { pname = "gi-glib"; - version = "2.0.22"; - sha256 = "0wb494n9zci7kchw3043108rmdymycj0rkv83gib7l01gilpgjjl"; + version = "2.0.23"; + sha256 = "1wsix558lj58i8mdwikb2q78941dxl3pchhd75xkk5hq8rknp37x"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers haskell-gi haskell-gi-base @@ -92544,15 +93568,15 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib;}; - "gi-gobject_2_0_21" = callPackage + "gi-gobject_2_0_22" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib , haskell-gi, haskell-gi-base, haskell-gi-overloading, text , transformers }: mkDerivation { pname = "gi-gobject"; - version = "2.0.21"; - sha256 = "0il4z77wm6njilqx2jjjkldlgp0fk9m5lwwhfnalqasb7h2i90mn"; + version = "2.0.22"; + sha256 = "0c1ia60793dly5y5xd2s1qs5a37f0r3jypzc21r0yswgqdlsi7g6"; setupHaskellDepends = [ base Cabal gi-glib haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib haskell-gi haskell-gi-base @@ -92564,6 +93588,49 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) glib;}; + "gi-graphene" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib + , gi-gobject, graphene-gobject, haskell-gi, haskell-gi-base + , haskell-gi-overloading, text, transformers + }: + mkDerivation { + pname = "gi-graphene"; + version = "1.0.1"; + sha256 = "04aiq9zqjxaky48j57nakx0alhc9j1g6ydki7fww7r4jajmf6pjv"; + setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-glib gi-gobject haskell-gi + haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ graphene-gobject ]; + description = "Graphene bindings"; + license = stdenv.lib.licenses.lgpl21; + }) {graphene-gobject = null;}; + + "gi-gsk" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo + , gi-gdk, gi-glib, gi-gobject, gi-graphene, gi-pango, gtk4 + , haskell-gi, haskell-gi-base, haskell-gi-overloading, text + , transformers + }: + mkDerivation { + pname = "gi-gsk"; + version = "4.0.1"; + sha256 = "0645dyifg6d3x03zrzf2andfah32s878rcyqzw891prn2dvga3nx"; + setupHaskellDepends = [ + base Cabal gi-cairo gi-gdk gi-glib gi-gobject gi-graphene gi-pango + haskell-gi + ]; + libraryHaskellDepends = [ + base bytestring containers gi-cairo gi-gdk gi-glib gi-gobject + gi-graphene gi-pango haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ gtk4 ]; + description = "Gsk bindings"; + license = stdenv.lib.licenses.lgpl21; + }) {gtk4 = null;}; + "gi-gst" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, gstreamer, haskell-gi, haskell-gi-base @@ -92571,8 +93638,8 @@ self: { }: mkDerivation { pname = "gi-gst"; - version = "1.0.21"; - sha256 = "1nj1iyhfvi3a5mwkr4x0gn26bykdjdam3gwsl1hkbg21zvjkd087"; + version = "1.0.22"; + sha256 = "0qicgvy9wm1xs5y6fda8sxdilwfg2y6albdqy3jg2n5qn7c9p0f6"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject haskell-gi @@ -92592,8 +93659,8 @@ self: { }: mkDerivation { pname = "gi-gstaudio"; - version = "1.0.20"; - sha256 = "09v36n019ka4nj65x082gkg2j4r3q0ibvrcq5p6ka7kq8rhfxhx0"; + version = "1.0.21"; + sha256 = "0zrcplkd0hfdfvwq7gbg8wyvsk2an8k5yj342adq1ar0zgfh064n"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject gi-gst gi-gstbase haskell-gi ]; @@ -92615,8 +93682,8 @@ self: { }: mkDerivation { pname = "gi-gstbase"; - version = "1.0.21"; - sha256 = "03awzmc62hw1nmw0b3xczmxmk5drrlhq0clh7lhxlj1r1nzq2ack"; + version = "1.0.22"; + sha256 = "1y7hf5kcm4kj185glb298zr6x39m61hvqrdwskk9043nrd8ifcxx"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject gi-gst haskell-gi ]; @@ -92639,8 +93706,8 @@ self: { }: mkDerivation { pname = "gi-gstpbutils"; - version = "1.0.20"; - sha256 = "10kbk7mk829xc0rkzzhpz53v39xfl5f6my1smjdqdwdnxxgcsl5w"; + version = "1.0.21"; + sha256 = "15kg01g8cgaw98khf6nrr9sjbfss3a3d43g9zgbbv5h5qnzvjazb"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject gi-gst gi-gstaudio gi-gsttag gi-gstvideo haskell-gi @@ -92664,8 +93731,8 @@ self: { }: mkDerivation { pname = "gi-gsttag"; - version = "1.0.20"; - sha256 = "1jhly2jhfy2a79maj4x2p7idqr1f82znizfimkyvdnf8rbrr1h3h"; + version = "1.0.21"; + sha256 = "061xy3vx41pgyyg6mcbc7saj50n5zwfc72l8dw54kgv09vykp7ji"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject gi-gst gi-gstbase haskell-gi ]; @@ -92687,8 +93754,8 @@ self: { }: mkDerivation { pname = "gi-gstvideo"; - version = "1.0.21"; - sha256 = "05sv1an6za2ywxh6dzy4d79g1dm0jyypqkhz40g0pk5kxvgi4gkm"; + version = "1.0.22"; + sha256 = "0fr9pfcfsjajl5cd6p05a4kp83acmllzzdm0kc2nxnr0kmjifi5v"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject gi-gst gi-gstbase haskell-gi ]; @@ -92722,51 +93789,59 @@ self: { libraryPkgconfigDepends = [ gtk3 ]; description = "Gtk bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) gtk3;}; - "gi-gtk_3_0_31" = callPackage + "gi-gtk_4_0_1" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject - , gi-pango, gtk3, haskell-gi, haskell-gi-base + , gi-graphene, gi-gsk, gi-pango, gtk4, haskell-gi, haskell-gi-base , haskell-gi-overloading, text, transformers }: mkDerivation { pname = "gi-gtk"; - version = "3.0.31"; - sha256 = "00bfy8hn56cm5zm005vdnwwzsw5bzangipxv47n01jp4ksn3wdpx"; + version = "4.0.1"; + sha256 = "1brn4pyjvnc00bwqwf3d77dhbiknak5yjqs9xyk9mknw2pb98ppv"; setupHaskellDepends = [ base Cabal gi-atk gi-cairo gi-gdk gi-gdkpixbuf gi-gio gi-glib - gi-gobject gi-pango haskell-gi + gi-gobject gi-graphene gi-gsk gi-pango haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf - gi-gio gi-glib gi-gobject gi-pango haskell-gi haskell-gi-base - haskell-gi-overloading text transformers + gi-gio gi-glib gi-gobject gi-graphene gi-gsk gi-pango haskell-gi + haskell-gi-base haskell-gi-overloading text transformers ]; - libraryPkgconfigDepends = [ gtk3 ]; + libraryPkgconfigDepends = [ gtk4 ]; description = "Gtk bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) gtk3;}; + broken = true; + }) {gtk4 = null;}; "gi-gtk-declarative" = callPackage - ({ mkDerivation, base, criterion, gi-gdk, gi-glib, gi-gobject - , gi-gtk, haskell-gi, haskell-gi-base, haskell-gi-overloading, mtl - , random, text, unordered-containers, vector + ({ mkDerivation, async, base, data-default-class, gi-gdk, gi-glib + , gi-gobject, gi-gtk, haskell-gi, haskell-gi-base + , haskell-gi-overloading, hedgehog, mtl, safe-exceptions, stm, text + , unordered-containers, vector }: mkDerivation { pname = "gi-gtk-declarative"; - version = "0.4.3"; - sha256 = "148daz8a6nj6djvsfiy5yk7lfyxhdjl5l34a7d6nn66mikc8538b"; + version = "0.5.0"; + sha256 = "0nhacfja1wrz0sa5pbz069sbpyzp8jnlrp078gg9gydwhlmh2k2h"; libraryHaskellDepends = [ - base gi-glib gi-gobject gi-gtk haskell-gi haskell-gi-base - haskell-gi-overloading mtl text unordered-containers vector + base data-default-class gi-glib gi-gobject gi-gtk haskell-gi + haskell-gi-base haskell-gi-overloading mtl text + unordered-containers vector ]; - benchmarkHaskellDepends = [ - base criterion gi-gdk gi-glib gi-gtk random text vector + testHaskellDepends = [ + async base gi-gdk gi-glib gi-gobject gi-gtk hedgehog + safe-exceptions stm text unordered-containers vector ]; description = "Declarative GTK+ programming in Haskell"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gi-gtk-declarative-app-simple" = callPackage @@ -92776,8 +93851,8 @@ self: { }: mkDerivation { pname = "gi-gtk-declarative-app-simple"; - version = "0.4.2"; - sha256 = "1ydaxs2isqpy8ld8nlg4plr7ry5xni3g93m9kxdm2klz8xzs3js7"; + version = "0.5.0"; + sha256 = "0vl9gqgdbqr4hipr7ka01hyvyz9n8by0ry890w4n2c5w9rghgvva"; libraryHaskellDepends = [ async base gi-gdk gi-glib gi-gobject gi-gtk gi-gtk-declarative haskell-gi haskell-gi-base haskell-gi-overloading pipes @@ -92785,6 +93860,8 @@ self: { ]; description = "Declarative GTK+ programming in Haskell in the style of Pux"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gi-gtk-hs" = callPackage @@ -92802,17 +93879,19 @@ self: { ]; description = "A wrapper for gi-gtk, adding a few more idiomatic API parts on top"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; - "gi-gtk-hs_0_3_7_0" = callPackage + "gi-gtk-hs_0_3_8_0" = callPackage ({ mkDerivation, base, base-compat, containers, gi-gdk , gi-gdkpixbuf, gi-glib, gi-gobject, gi-gtk, haskell-gi-base, mtl , text, transformers }: mkDerivation { pname = "gi-gtk-hs"; - version = "0.3.7.0"; - sha256 = "0z64avmb13k7cvps51xj6j3jrxsdnqnpkh9038lm68vkkadv2dag"; + version = "0.3.8.0"; + sha256 = "0cpykq24fjpidxb1hh6qi74xv5lh6nrz8q1l4iqy8jx26qlzri5l"; libraryHaskellDepends = [ base base-compat containers gi-gdk gi-gdkpixbuf gi-glib gi-gobject gi-gtk haskell-gi-base mtl text transformers @@ -92820,6 +93899,7 @@ self: { description = "A wrapper for gi-gtk, adding a few more idiomatic API parts on top"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gi-gtkosxapplication" = callPackage @@ -92829,15 +93909,16 @@ self: { }: mkDerivation { pname = "gi-gtkosxapplication"; - version = "2.0.16"; - sha256 = "11wfmvjgl6lmmdanz5jmmvf4289c9jiylxfn006shc4pby7ay6i8"; - setupHaskellDepends = [ base Cabal haskell-gi ]; + version = "2.0.17"; + sha256 = "1h6j61wg9krvd3kqbkafd90vk534hhz9mrlvj2h182f5kp5rybl8"; + setupHaskellDepends = [ + base Cabal gi-gdkpixbuf gi-gobject gi-gtk haskell-gi + ]; libraryHaskellDepends = [ base bytestring containers gi-gdkpixbuf gi-gobject gi-gtk haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ gtk-mac-integration-gtk3 ]; - doHaddock = false; description = "GtkosxApplication bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; @@ -92864,9 +93945,11 @@ self: { doHaddock = false; description = "GtkSource bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) gtksourceview3;}; - "gi-gtksource_3_0_21" = callPackage + "gi-gtksource_3_0_22" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject , gi-gtk, gi-pango, gtksourceview3, haskell-gi, haskell-gi-base @@ -92874,8 +93957,8 @@ self: { }: mkDerivation { pname = "gi-gtksource"; - version = "3.0.21"; - sha256 = "1y64hlcpy536x053p7xkhm6jgb7ahhj0zkgzgf962d8mqadaqzr0"; + version = "3.0.22"; + sha256 = "08b3ffjdgyr5xapx37kkwx3z8fsd42ydvdwk3nvh2ysfq9q86cjh"; setupHaskellDepends = [ base Cabal gi-atk gi-cairo gi-gdk gi-gdkpixbuf gi-gio gi-glib gi-gobject gi-gtk gi-pango haskell-gi @@ -92889,6 +93972,7 @@ self: { description = "GtkSource bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) gtksourceview3;}; "gi-handy" = callPackage @@ -92899,8 +93983,8 @@ self: { }: mkDerivation { pname = "gi-handy"; - version = "0.0.5"; - sha256 = "1a4ihmmqx82gmyn0lhwqcpijswciqjxq7dl17vbgycpvzabhpvyl"; + version = "0.0.6"; + sha256 = "134dspf2vhwl76g25mjjj3gmdis748qg3rschmypd9w4zr2l651w"; setupHaskellDepends = [ base Cabal gi-atk gi-gdk gi-gio gi-glib gi-gobject gi-gtk haskell-gi @@ -92938,15 +94022,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) webkitgtk;}; - "gi-javascriptcore_4_0_20" = callPackage + "gi-javascriptcore_4_0_21" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading , text, transformers, webkitgtk }: mkDerivation { pname = "gi-javascriptcore"; - version = "4.0.20"; - sha256 = "0n8aiazjsh74f8k2nbjia619401pwackdxmnb2chzpsqad9kqxrh"; + version = "4.0.21"; + sha256 = "0zl2lanysqir9qhndai7v4yp6sq671115mi5k9q58rwkmvkm6w04"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject haskell-gi @@ -92965,8 +94049,8 @@ self: { }: mkDerivation { pname = "gi-notify"; - version = "0.7.20"; - sha256 = "0dr9zs6j3cbdxfd6ja2d5ch87scrqlnzp4xlj1dx6inwnhl150yq"; + version = "0.7.21"; + sha256 = "13ifi60jlfm9jypf6gam224s5rgq2kd1cj98wfl1dg9crahghbls"; setupHaskellDepends = [ base Cabal gi-gdkpixbuf gi-glib gi-gobject haskell-gi ]; @@ -92988,8 +94072,8 @@ self: { }: mkDerivation { pname = "gi-ostree"; - version = "1.0.11"; - sha256 = "0gwxdc4rddndvnw1izwapvi926dl6v0ljpp5504k67a8kszaycx0"; + version = "1.0.12"; + sha256 = "0j7nd4ylz4whnsdfbn6ra7kvvnx6l6bqv2y57rgk1nnac3cc6201"; setupHaskellDepends = [ base Cabal gi-gio gi-glib gi-gobject haskell-gi ]; @@ -93028,15 +94112,15 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) cairo; inherit (pkgs) pango;}; - "gi-pango_1_0_21" = callPackage + "gi-pango_1_0_22" = callPackage ({ mkDerivation, base, bytestring, Cabal, cairo, containers , gi-glib, gi-gobject, haskell-gi, haskell-gi-base , haskell-gi-overloading, pango, text, transformers }: mkDerivation { pname = "gi-pango"; - version = "1.0.21"; - sha256 = "1adlwkwqlqnck3fq601my22iqh9lbvjy4vvy5zbmcs942j3lj691"; + version = "1.0.22"; + sha256 = "09dz13wai7cyp24vhc6wxyyg2g89dsqq40r80j56xgpyvfki8yf2"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject haskell-gi @@ -93060,8 +94144,8 @@ self: { }: mkDerivation { pname = "gi-pangocairo"; - version = "1.0.22"; - sha256 = "09axv2wn686xwsdmrh2v71j8p0qkchvws30aamkzcdclbfwxa3aw"; + version = "1.0.23"; + sha256 = "0la2ga1hprwm4fnia48y0q1cg8il0aq42nwvaj5gndx6id42a1i6"; setupHaskellDepends = [ base Cabal gi-cairo gi-glib gi-gobject gi-pango haskell-gi ]; @@ -93087,8 +94171,8 @@ self: { }: mkDerivation { pname = "gi-poppler"; - version = "0.18.20"; - sha256 = "1jkzrrzdkn60akiijyzbq5sf0digawrzxm556dirxcjksh829zby"; + version = "0.18.21"; + sha256 = "1mfi3yn7yrwg2cdpqp0av4cabmmqpmm2hywsrm5d78cxix4z1s7f"; setupHaskellDepends = [ base Cabal gi-cairo gi-gio gi-glib gi-gobject haskell-gi ]; @@ -93110,8 +94194,8 @@ self: { }: mkDerivation { pname = "gi-secret"; - version = "0.0.10"; - sha256 = "1ylgn8yvrksf8swk1gw6n8kw0dqvr92l9fj4jzxzpskfrmgk82ln"; + version = "0.0.11"; + sha256 = "1s3vwy0aff4m1rvkbcvfa4zwbbalaiz46ij3ymmsx319v2mwwiib"; setupHaskellDepends = [ base Cabal gi-gio gi-glib gi-gobject haskell-gi ]; @@ -93133,8 +94217,8 @@ self: { }: mkDerivation { pname = "gi-soup"; - version = "2.4.21"; - sha256 = "01zqzp4mpwkg3cfgx91harjds3bbxs0giqr4lly9z37ksbr2siv0"; + version = "2.4.22"; + sha256 = "0vgvcq9nysw9xfyjddi1qzngw7pfrfx4g1f3zngf56jcvxf8q6rw"; setupHaskellDepends = [ base Cabal gi-gio gi-glib gi-gobject haskell-gi ]; @@ -93168,9 +94252,11 @@ self: { libraryPkgconfigDepends = [ vte_291 ]; description = "Vte bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {vte_291 = pkgs.vte;}; - "gi-vte_2_91_24" = callPackage + "gi-vte_2_91_25" = 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 @@ -93178,8 +94264,8 @@ self: { }: mkDerivation { pname = "gi-vte"; - version = "2.91.24"; - sha256 = "1grqallhd1sklcmfhrrmjisj5yp9znx1yqzdn3v5awldjcj54025"; + version = "2.91.25"; + sha256 = "0h6kqbbdr7zgpq6sfqs2pfx99c7wj1aabpzna9fryn6zhaha8j3c"; setupHaskellDepends = [ base Cabal gi-atk gi-gdk gi-gio gi-glib gi-gobject gi-gtk gi-pango haskell-gi @@ -93193,6 +94279,7 @@ self: { description = "Vte bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {vte_291 = pkgs.vte;}; "gi-webkit" = callPackage @@ -93226,8 +94313,8 @@ self: { }: mkDerivation { pname = "gi-webkit2"; - version = "4.0.24"; - sha256 = "1sxn9v361bp0arl3mq3dg9k1igaf9gcwxx0p7xlwqvqabgs4nr2q"; + version = "4.0.25"; + sha256 = "1xg4xy24nnz0ngv46m58jkmaka72nv4954g03f6ixpvwappim0vm"; setupHaskellDepends = [ base Cabal gi-atk gi-cairo gi-gdk gi-gio gi-glib gi-gobject gi-gtk gi-javascriptcore gi-soup haskell-gi @@ -93251,8 +94338,8 @@ self: { }: mkDerivation { pname = "gi-webkit2webextension"; - version = "4.0.23"; - sha256 = "073rkgfp120ccabxk7nh72p3h7qs7b9qaqr3d1wlcb18grhnvyl4"; + version = "4.0.24"; + sha256 = "0lnf173c6myrswk0kdnwkhs925imvcpyvpmy50krqljnv6f2ksxn"; setupHaskellDepends = [ base Cabal gi-gio gi-gobject gi-gtk gi-javascriptcore gi-soup haskell-gi @@ -93276,8 +94363,8 @@ self: { }: mkDerivation { pname = "gi-wnck"; - version = "3.0.6"; - sha256 = "10x5ijcbxvgbrzi4l7mjx336q83kz1kmayan7kpa46zimvj8vn6g"; + version = "3.0.7"; + sha256 = "02kgbp3h5ny7y0qmddsfng0a1gqpdmadl6yy45hmk98ws02rk9bx"; setupHaskellDepends = [ base Cabal gi-atk gi-gdk gi-gdkpixbuf gi-gobject gi-gtk haskell-gi ]; @@ -93300,8 +94387,8 @@ self: { }: mkDerivation { pname = "gi-xlib"; - version = "2.0.7"; - sha256 = "0rcl4wxnghlbyc2ddf131pm7wkj2psjzbqfhgv92av3kvz9y513z"; + version = "2.0.8"; + sha256 = "0gixgql24zx04sph7kn4n5gmgmz5xbw2f15mqfw0i5igad2pvsj3"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers haskell-gi haskell-gi-base @@ -93576,8 +94663,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "7.20190708"; - sha256 = "18s563swrp8mx479995pdhhmn40y3xwlbm1z3w63qsnjqmj7zlij"; + version = "7.20190730"; + sha256 = "16mya2dm7q9ggdmwyszri85qnnxf0l71xnn8khnxl5fqrh2zvsjg"; configureFlags = [ "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime" "-f-networkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" @@ -94274,19 +95361,24 @@ self: { }) {}; "githud" = callPackage - ({ mkDerivation, base, mtl, parsec, process, tasty, tasty-hunit - , tasty-quickcheck, tasty-smallcheck, text, unix + ({ mkDerivation, base, bytestring, daemons, data-default, directory + , mtl, network, parsec, process, tasty, tasty-hunit + , tasty-quickcheck, tasty-smallcheck, text, unix, utf8-string }: mkDerivation { pname = "githud"; - version = "2.1.0"; - sha256 = "19j0vy427n3rzi1nfmh7kjn8jj1ji3xrbrs957hyns9sy4wwrfly"; + version = "3.0.0"; + sha256 = "1zr7d5h0x1fsnwb2pg9vn34ir0m144h1vnlh0avickazz2ljx2xr"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base mtl parsec process text unix ]; + libraryHaskellDepends = [ + base bytestring daemons data-default directory mtl network parsec + process text unix utf8-string + ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - base mtl parsec tasty tasty-hunit tasty-quickcheck tasty-smallcheck + base daemons mtl parsec tasty tasty-hunit tasty-quickcheck + tasty-smallcheck ]; description = "More efficient replacement to the great git-radar"; license = stdenv.lib.licenses.bsd3; @@ -94373,8 +95465,8 @@ self: { }: mkDerivation { pname = "gitlab-haskell"; - version = "0.1.0.1"; - sha256 = "1gvhfdlh6x500qms0kfqsyf0c934rm0xw1z1gv8zzb7nssndiann"; + version = "0.1.0.2"; + sha256 = "16dj3m038fgxf8w69g8qldnsk2xrk83lkkgdapwv7qz9c9jd0nh1"; libraryHaskellDepends = [ aeson base bytestring connection http-conduit http-types text transformers unliftio unliftio-core @@ -99542,14 +100634,21 @@ self: { }) {}; "graphql" = callPackage - ({ mkDerivation, attoparsec, base, tasty, tasty-hunit, text }: + ({ mkDerivation, aeson, base, hspec, hspec-expectations, megaparsec + , raw-strings-qq, text, transformers, unordered-containers + }: mkDerivation { pname = "graphql"; - version = "0.3"; - sha256 = "18hb8bwcwx98vrr9nzr8965i4c1y6dh10ilijksbldf10yaiq53z"; + version = "0.4.0.0"; + sha256 = "03y8wn0a1zbrsl3i5g5zy5awmlgsncnksskd4gcx8wzfl14120g0"; enableSeparateDataOutput = true; - libraryHaskellDepends = [ attoparsec base text ]; - testHaskellDepends = [ attoparsec base tasty tasty-hunit text ]; + libraryHaskellDepends = [ + aeson base megaparsec text transformers unordered-containers + ]; + testHaskellDepends = [ + aeson base hspec hspec-expectations megaparsec raw-strings-qq text + transformers + ]; description = "Haskell GraphQL implementation"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -100918,6 +102017,8 @@ self: { libraryHaskellDepends = [ base gi-gdk gi-gtk text transformers ]; description = "Libary for creating strut windows with gi-gtk"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gtk-toggle-button-list" = callPackage @@ -104802,6 +105903,37 @@ self: { broken = true; }) {}; + "hapistrano_0_3_9_3" = callPackage + ({ mkDerivation, aeson, async, base, directory, filepath + , formatting, gitrev, hspec, mtl, optparse-applicative, path + , path-io, process, QuickCheck, silently, stm, temporary, time + , transformers, typed-process, yaml + }: + mkDerivation { + pname = "hapistrano"; + version = "0.3.9.3"; + sha256 = "1kp2gdr0xjzr0qi584lqiqh7hjk8vymz04af2zcgdhbw68brj2cx"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base filepath formatting gitrev mtl path process stm time + transformers typed-process + ]; + executableHaskellDepends = [ + aeson async base formatting gitrev optparse-applicative path + path-io stm yaml + ]; + testHaskellDepends = [ + base directory filepath hspec mtl path path-io process QuickCheck + silently temporary + ]; + description = "A deployment library for Haskell applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "happindicator" = callPackage ({ mkDerivation, array, base, bytestring, containers, glib, gtk , gtk2hs-buildtools, libappindicator-gtk2, mtl @@ -105763,6 +106895,28 @@ self: { broken = true; }) {}; + "harg" = callPackage + ({ mkDerivation, aeson, barbies, base, bytestring, directory + , higgledy, markdown-unlit, optparse-applicative, text, yaml + }: + mkDerivation { + pname = "harg"; + version = "0.1.0.1"; + sha256 = "11qkyx9axd8vybkb1kq7vs5v5xf594wgkbpbfpvj0hah7iw9wb95"; + libraryHaskellDepends = [ + aeson barbies base bytestring directory higgledy + optparse-applicative text yaml + ]; + testHaskellDepends = [ + aeson barbies base higgledy optparse-applicative + ]; + testToolDepends = [ markdown-unlit ]; + description = "Haskell program configuration from multiple sources"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "hark" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, haskell98 , mtl, old-locale, old-time, regex-pcre @@ -105934,6 +107088,8 @@ self: { pname = "hasbolt"; version = "0.1.3.3"; sha256 = "1l1p9iz9k8i1car5cd6cfd2bpidkrfbr2354hxvg8gpnw1i5jsbb"; + revision = "1"; + editedCabalFile = "0v4ksld4qs1ll5a5c6x5kvrcb584yskhbda7zv9r9lrqvcsjwg5i"; libraryHaskellDepends = [ base binary bytestring connection containers data-binary-ieee754 data-default network text transformers @@ -105953,8 +107109,8 @@ self: { }: mkDerivation { pname = "hasbolt-extras"; - version = "0.0.0.18"; - sha256 = "11ij6xrxf28sv8b464dqax9834k0r6q99hdyfsg030aw2i1rqygy"; + version = "0.0.0.19"; + sha256 = "11g6rlgyxi57bvmr862ly7yfwiiph1kckr056b5khz8v8k6fhhpv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -106947,6 +108103,7 @@ self: { doHaddock = false; description = "Cabal package script generator for Travis-CI"; license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; "haskell-cnc" = callPackage @@ -107011,13 +108168,13 @@ self: { }: mkDerivation { pname = "haskell-conll"; - version = "0.1.0.1"; - sha256 = "09lgj70lk2xh75rq4gdmfacmb465r0xn03v8cnk82bx52c7jwiga"; + version = "0.1.0.2"; + sha256 = "05w90jlidxr55r5j1hihfhdcwjkzw85xipwxdd3i6kmskin2pv1v"; libraryHaskellDepends = [ base containers lens pretty-show protolude split text ]; description = "Core Types for NLP"; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; @@ -107289,7 +108446,7 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;}; - "haskell-gi_0_22_6" = callPackage + "haskell-gi_0_23_0" = callPackage ({ mkDerivation, attoparsec, base, bytestring, Cabal, containers , directory, doctest, filepath, glib, gobject-introspection , haskell-gi-base, mtl, pretty-show, process, regex-tdfa, safe @@ -107297,8 +108454,8 @@ self: { }: mkDerivation { pname = "haskell-gi"; - version = "0.22.6"; - sha256 = "0m1ixnxv1vq2ywnvf9fihipn81ka1ixbgga4fsmgmk9hl1ai48mm"; + version = "0.23.0"; + sha256 = "04d2lxmbbq7g0yrc5rz9n7zscza9g63vvbz0qv3427y7hbq1xn4a"; libraryHaskellDepends = [ attoparsec base bytestring Cabal containers directory filepath haskell-gi-base mtl pretty-show process regex-tdfa safe text @@ -107323,12 +108480,12 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib;}; - "haskell-gi-base_0_22_2" = callPackage + "haskell-gi-base_0_23_0" = callPackage ({ mkDerivation, base, bytestring, containers, glib, text }: mkDerivation { pname = "haskell-gi-base"; - version = "0.22.2"; - sha256 = "0rv46x4xgsdk25s1vd3zm95cjgc5vy4rwsbaxk1hyc5ga5qjyzx0"; + version = "0.23.0"; + sha256 = "1f22d4pvmyy52w9hqa36b6psw34j562rayqgk052ng1ax9yvwzn0"; libraryHaskellDepends = [ base bytestring containers text ]; libraryPkgconfigDepends = [ glib ]; description = "Foundation for libraries generated by haskell-gi"; @@ -109311,8 +110468,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "haskeme"; - version = "0.1.0.3"; - sha256 = "14hrimm52v5hlgkdkqwijxrfnzj8x46bg3kh9nw1vlflf97053wf"; + version = "0.1.0.4"; + sha256 = "0lis0ni0l52x691adm2da7mzjam4g414gc0d0i9f6i050ra02g3j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -109690,12 +110847,12 @@ self: { , haskoin-node, hspec, hspec-discover, http-types, monad-logger , mtl, network, nqe, optparse-applicative, random, resourcet , rocksdb-haskell, rocksdb-query, scotty, string-conversions, text - , time, transformers, unliftio, unordered-containers, uuid + , time, transformers, unliftio, unordered-containers, wai }: mkDerivation { pname = "haskoin-store"; - version = "0.16.5"; - sha256 = "111gip8l2c9m85viaz02rlxhdb6svwx0jyhrkzcqjgz4j3y0n4lj"; + version = "0.16.6"; + sha256 = "03214p8xqf062grgpkbfchrm4awm0zrq41j77z8s31iin9d0qzp9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -109703,21 +110860,21 @@ self: { hashable haskoin-core haskoin-node http-types monad-logger mtl network nqe random resourcet rocksdb-haskell rocksdb-query scotty string-conversions text time transformers unliftio - unordered-containers uuid + unordered-containers wai ]; executableHaskellDepends = [ aeson base bytestring cereal conduit containers data-default filepath hashable haskoin-core haskoin-node http-types monad-logger mtl network nqe optparse-applicative random resourcet rocksdb-haskell rocksdb-query scotty string-conversions text time - transformers unliftio unordered-containers uuid + transformers unliftio unordered-containers wai ]; testHaskellDepends = [ aeson base bytestring cereal conduit containers data-default hashable haskoin-core haskoin-node hspec http-types monad-logger mtl network nqe random resourcet rocksdb-haskell rocksdb-query scotty string-conversions text time transformers unliftio - unordered-containers uuid + unordered-containers wai ]; testToolDepends = [ hspec-discover ]; description = "Storage and index for Bitcoin and Bitcoin Cash"; @@ -111294,8 +112451,8 @@ self: { }: mkDerivation { pname = "haven"; - version = "0.2.0.1"; - sha256 = "15q9cgfifz87ns730agv2vzc8rp5lqggiclc91khpckm2qppk6yd"; + version = "0.2.0.2"; + sha256 = "0n92h5gjy6ax0c5f2k80j21ymf741vzhsm1kdav86hphhxdlw8ng"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -112954,8 +114111,8 @@ self: { }: mkDerivation { pname = "hedgehog-classes"; - version = "0.2.1"; - sha256 = "1hkkbmsn397a73aqaasi2c076nx9g8s8vsdp6wdqq33a96q1b0mq"; + version = "0.2.2"; + sha256 = "072w697nc7dv9yi700g5ap4h49ichpw1srzkq07sz637022l19wl"; libraryHaskellDepends = [ aeson base binary containers hedgehog pretty-show semirings silently transformers wl-pprint-annotated @@ -113071,7 +114228,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hedis_0_12_5" = callPackage + "hedis_0_12_6" = callPackage ({ mkDerivation, async, base, bytestring, bytestring-lexing , deepseq, doctest, errors, HTTP, HUnit, mtl, network, network-uri , resource-pool, scanner, stm, test-framework, test-framework-hunit @@ -113079,8 +114236,8 @@ self: { }: mkDerivation { pname = "hedis"; - version = "0.12.5"; - sha256 = "1alabz8j9lmd2ydm34hndqcyvihnfyvl7cgda6ycsch5sbffmjlp"; + version = "0.12.6"; + sha256 = "1lx7lwh282ijp63yfy6ybb6zc5zil09abnrsbm052ghdlnz3sfk1"; libraryHaskellDepends = [ async base bytestring bytestring-lexing deepseq errors HTTP mtl network network-uri resource-pool scanner stm text time tls @@ -115250,8 +116407,8 @@ self: { pname = "hi-file-parser"; version = "0.1.0.0"; sha256 = "09gs26z0jvkkhb1r43gj27pq0k5fc4i6fpr59g397vz4sm86gb2l"; - revision = "1"; - editedCabalFile = "1hylfzkd42mqap2ydh4wq96vwbblyp26zb8wwyn63yl72swbww23"; + revision = "2"; + editedCabalFile = "1bm98h0v4wf9vmdng15c2r48yz06118jxlprsnk0z3jw0d95ij9z"; libraryHaskellDepends = [ base binary bytestring rio vector ]; testHaskellDepends = [ base binary bytestring hspec rio vector ]; description = "Parser for GHC's hi files"; @@ -115469,8 +116626,8 @@ self: { }: mkDerivation { pname = "hierarchical-spectral-clustering"; - version = "0.4.0.0"; - sha256 = "1mw546dvyzrhcw7a61zb0anfgxk3s5r3bjrj7iry36shh1ancs1s"; + version = "0.4.1.1"; + sha256 = "0wi1yw0mhszalixay7sd1n7i8xjmb3m6v7h3kn09ih5vn3bxj26f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -115794,8 +116951,8 @@ self: { pname = "hills"; version = "0.1.2.6"; sha256 = "0ggdppg7mbq3ljrb4hvracdv81m9jqnsrl6iqy56sba118k7m0jh"; - revision = "2"; - editedCabalFile = "11f4mmhxivxkdcn4wdcz1hszfyi3hdggls22x2q0m3jxq3lw0izg"; + revision = "3"; + editedCabalFile = "10l4hx0j8il66h3m9flhwsqm9v52qmpj4cyjih4c6cnng6vjsfnj"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -116605,22 +117762,22 @@ self: { }) {}; "hit-on" = callPackage - ({ mkDerivation, ansi-terminal, base, base-noprelude, github - , gitrev, optparse-applicative, relude, shellmet, text, vector + ({ mkDerivation, ansi-terminal, base, base-noprelude, directory + , github, gitrev, hspec, optparse-applicative, process, relude + , shellmet, text, vector }: mkDerivation { pname = "hit-on"; - version = "0.0.0"; - sha256 = "14npvwxh33cn8z2klp7liij41r9pyr00rs4g28yva2zry75bf98r"; - revision = "1"; - editedCabalFile = "1fwvm0fz2agqziaspxlxxmdv44xrv65pf601i0938wkx4452v8fz"; + version = "0.1.0.0"; + sha256 = "13pxn9xqyfd5n53bl57bk0wc8qlnl5dsh1xq5y49arsnk2g86ir5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-terminal base-noprelude github gitrev optparse-applicative - relude shellmet text vector + ansi-terminal base-noprelude directory github gitrev + optparse-applicative process relude shellmet text vector ]; executableHaskellDepends = [ base ]; + testHaskellDepends = [ base github hspec text ]; description = "Haskell Git Helper Tool"; license = stdenv.lib.licenses.mpl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -116755,8 +117912,8 @@ self: { pname = "hjsonschema"; version = "1.9.0"; sha256 = "051i5y557g82hd5zcn63f65jyxk07d9wnvfmwdps391zxza8ifki"; - revision = "1"; - editedCabalFile = "1kxn0smmcmzysvi1bw9v0j6j68fk4s36nqyqmvbkl61pgm6bs803"; + revision = "2"; + editedCabalFile = "0110dyc8lbd8x0cbmxgwwbvzckxkfj84krd5p51p0jaixvrrl53r"; libraryHaskellDepends = [ aeson base bytestring containers file-embed filepath hashable hjsonpointer http-client http-client-tls http-types pcre-heavy @@ -116794,6 +117951,35 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "hjugement-cli" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring + , containers, cryptonite, deepseq, directory, filepath, ghc-prim + , hjugement, hjugement-protocol, lens-family-core, memory, pipes + , pipes-aeson, pipes-bytestring, pipes-group, pipes-parse + , pipes-safe, pipes-text, random, reflection, symantic-cli + , symantic-document, terminal-size, text, time, transformers, unix + , unordered-containers + }: + mkDerivation { + pname = "hjugement-cli"; + version = "0.0.0.20190721"; + sha256 = "1fgl9yjjmwd8y2hcmva0fh3d6qwvj8papdm0v50s85b9s8cwn6ll"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson base base64-bytestring binary bytestring containers + cryptonite deepseq directory filepath ghc-prim hjugement + hjugement-protocol lens-family-core memory pipes pipes-aeson + pipes-bytestring pipes-group pipes-parse pipes-safe pipes-text + random reflection symantic-cli symantic-document terminal-size text + time transformers unix unordered-containers + ]; + description = "Majority Judgment and Helios-C command line tool"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "hjugement-protocol" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring , containers, criterion, cryptonite, deepseq, memory, QuickCheck @@ -116802,8 +117988,8 @@ self: { }: mkDerivation { pname = "hjugement-protocol"; - version = "0.0.1.20190623"; - sha256 = "0rqsggij0vx9hh7wl8nzmycb55ilcm0j6dp33x94jycpyvqnc4ym"; + version = "0.0.4.20190711"; + sha256 = "0r4g8n1a8c0azdk307mq1q2dv1h4xf251fjrmldcws7b0vrla5ri"; libraryHaskellDepends = [ aeson base base64-bytestring binary bytestring containers cryptonite deepseq memory random reflection text transformers @@ -117120,6 +118306,8 @@ self: { pname = "hledger-iadd"; version = "1.3.9"; sha256 = "07g48w4099m4vm7z5hrg9zzd2v2yhy7kcv40902njz6v8cklgdgq"; + revision = "1"; + editedCabalFile = "18qjkl79gwmdgk6vl8cg3m94wm0qw30kxn4lvlnj9n6gnv2p0b3k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -117391,8 +118579,8 @@ self: { }: mkDerivation { pname = "hlint"; - version = "2.2"; - sha256 = "0921s4cnpjnxmsp8x5dhjs8qiv6mlw98nngwsq6ad5qrj1wn72lx"; + version = "2.2.2"; + sha256 = "1v10xcz4vdzk1a3gjlvqbdckldax2643sg7s3xkm3dnlj5hg05yp"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -119362,8 +120550,8 @@ self: { }: mkDerivation { pname = "hoogle"; - version = "5.0.17.9"; - sha256 = "0s4p82issy3jlc0yz153r7i38ny1ygchf294hgms6jr1q467w86z"; + version = "5.0.17.10"; + sha256 = "12s3n3l6lf2vwmh4jbxnra694fpnzjgd8c236pnan0jdcb6x82vl"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -119791,10 +120979,8 @@ self: { }: mkDerivation { pname = "horname"; - version = "0.1.3.0"; - sha256 = "067jnyqk4lwrr23hvc30rqjmd400n9vd8wvj9bq67w47paqcz9p9"; - revision = "1"; - editedCabalFile = "10cgcxvpl0s4hs2r5g34kcdiy676azz751j3w5703m54mpz9irwl"; + version = "0.2.0.0"; + sha256 = "1qcvgjwasrgi760sv5rxl5klincgw34xczd3mqz32id183s57164"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -121615,6 +122801,22 @@ self: { broken = true; }) {}; + "hs-rqlite" = callPackage + ({ mkDerivation, aeson, base, bifunctors, bytestring, containers + , HTTP, scientific, text, unordered-containers + }: + mkDerivation { + pname = "hs-rqlite"; + version = "0.1.0.0"; + sha256 = "04q9vnwil3f30972pljs613wq1kb71w61jivdyxxy9i14grfcxsq"; + libraryHaskellDepends = [ + aeson base bifunctors bytestring containers HTTP scientific text + unordered-containers + ]; + description = "A Haskell client for RQlite"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hs-rs-notify" = callPackage ({ mkDerivation, base, filepath, notifier, process, protolude, text , unix @@ -122873,7 +124075,7 @@ self: { broken = true; }) {}; - "hsdev_0_3_3_1" = callPackage + "hsdev_0_3_3_2" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, async, attoparsec , base, bytestring, Cabal, containers, cpphs, data-default, deepseq , direct-sqlite, directory, exceptions, filepath, fsnotify, ghc @@ -122887,8 +124089,8 @@ self: { }: mkDerivation { pname = "hsdev"; - version = "0.3.3.1"; - sha256 = "09i1m3xkvjzq69mpzf73g3jxf3g5md8lfrxjwza6ns8ii9m4xcqh"; + version = "0.3.3.2"; + sha256 = "1qx5ppj1l871pm9qhqwd4297p3cp0v0fv64fkw4cdbpjza798x1i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -124383,6 +125585,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hspec-megaparsec_2_0_1" = callPackage + ({ mkDerivation, base, containers, hspec, hspec-expectations + , megaparsec + }: + mkDerivation { + pname = "hspec-megaparsec"; + version = "2.0.1"; + sha256 = "0w8nn2rh01lkiwsiyqh3gviklhfmy0245rakj94dmliyljw8skfg"; + libraryHaskellDepends = [ + base containers hspec-expectations megaparsec + ]; + testHaskellDepends = [ base hspec hspec-expectations megaparsec ]; + description = "Utility functions for testing Megaparsec parsers with Hspec"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hspec-meta" = callPackage ({ mkDerivation, ansi-terminal, array, base, call-stack, clock , deepseq, directory, filepath, hspec-expectations, HUnit @@ -125693,6 +126912,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "htdp-image" = callPackage + ({ mkDerivation, AC-Angle, base, gloss, HUnit, test-framework + , test-framework-hunit + }: + mkDerivation { + pname = "htdp-image"; + version = "1.1.0.0"; + sha256 = "17123nqkg8yk0pssmshdza0ipc42rx818q9gidig1d1camiyrfl4"; + libraryHaskellDepends = [ AC-Angle base gloss ]; + testHaskellDepends = [ + base gloss HUnit test-framework test-framework-hunit + ]; + description = "Beginner friendly graphics library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "htestu" = callPackage ({ mkDerivation, base, gcc, random }: mkDerivation { @@ -126775,8 +128010,8 @@ self: { pname = "http-download"; version = "0.1.0.0"; sha256 = "0wip7l6cls734ag306s5l0683qqh273b3lk5ibig66racmysjqyb"; - revision = "3"; - editedCabalFile = "147fjxz1y3rqwnrhvrhgg2d93fl6pbwkhc2fbzriwn7kyan8z06l"; + revision = "4"; + editedCabalFile = "1s20zjh52whs6hfhr90zyyy7g78zv1pw9hry1nwlzdv4hg97cbdh"; libraryHaskellDepends = [ base base64-bytestring bytestring conduit conduit-extra cryptonite cryptonite-conduit directory exceptions filepath http-client @@ -128936,8 +130171,8 @@ self: { }: mkDerivation { pname = "hw-kafka-avro"; - version = "4.0.0"; - sha256 = "0khqvd1l44bx4mnrv7hbvr0qbak6n17l4qqk3lwga21qnchnlgak"; + version = "4.0.1"; + sha256 = "1x0mq3sn05iwrn444kzyl66056xm8203hq0ajx9f8r85faq3v1ir"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -129148,17 +130383,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hw-prim_0_6_2_29" = callPackage + "hw-prim_0_6_2_31" = callPackage ({ mkDerivation, base, bytestring, criterion, directory, exceptions , ghc-prim, hedgehog, hspec, hspec-discover, hw-hspec-hedgehog - , mmap, QuickCheck, semigroups, transformers, vector + , mmap, QuickCheck, semigroups, transformers, unliftio-core, vector }: mkDerivation { pname = "hw-prim"; - version = "0.6.2.29"; - sha256 = "1pbcmi3ysaidhb5jlllmdwdkh7gbky234qxf5j2r5lk3n0n6zzp1"; + version = "0.6.2.31"; + sha256 = "00xfakvwnj3zys2ilpc9w9z5qzw1ng3cc65jfa1860z6yr7xdp59"; libraryHaskellDepends = [ - base bytestring ghc-prim mmap semigroups transformers vector + base bytestring ghc-prim mmap semigroups transformers unliftio-core + vector ]; testHaskellDepends = [ base bytestring directory exceptions hedgehog hspec @@ -129398,8 +130634,8 @@ self: { }: mkDerivation { pname = "hw-uri"; - version = "0.0.2.0"; - sha256 = "0z2y9ykg6q3p7qgm7s66sg5cw3pf2cbjlqk8xf6l7qgpa7br1z2b"; + version = "0.1.1.0"; + sha256 = "1f96632k6pcaxhy2nrm13s9kdb0dz3vsav6hzf94wlv7zdlncn8x"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-s3 antiope-core antiope-s3 base bytestring directory exceptions filepath http-client @@ -131332,15 +132568,16 @@ self: { , blaze-html, blaze-markup, bytestring, Cabal, cheapskate , code-page, containers, deepseq, directory, filepath, fingertree , fsnotify, gmp, haskeline, ieee754, libffi, megaparsec, mtl - , network, optparse-applicative, pretty, process, regex-tdfa, safe - , split, tagged, tasty, tasty-golden, tasty-rerun, terminal-size - , text, time, transformers, uniplate, unix, unordered-containers - , utf8-string, vector, vector-binary-instances, zip-archive + , network, optparse-applicative, parser-combinators, pretty + , process, regex-tdfa, safe, split, tagged, tasty, tasty-golden + , tasty-rerun, terminal-size, text, time, transformers, uniplate + , unix, unordered-containers, utf8-string, vector + , vector-binary-instances, zip-archive }: mkDerivation { pname = "idris"; - version = "1.3.1"; - sha256 = "0fn9h58l592j72njwma1ia48h8h87wi2rjqfxs7j2lfmvgfv18fi"; + version = "1.3.2"; + sha256 = "0wychzkg0yghd2pp8fqz78vp1ayzks191knfpl7mhh8igsmb6bc7"; configureFlags = [ "-fcurses" "-fexeconly" "-fffi" "-fgmp" ]; isLibrary = true; isExecutable = true; @@ -131351,8 +132588,8 @@ self: { base base64-bytestring binary blaze-html blaze-markup bytestring cheapskate code-page containers deepseq directory filepath fingertree fsnotify haskeline ieee754 libffi megaparsec mtl network - optparse-applicative pretty process regex-tdfa safe split - terminal-size text time transformers uniplate unix + optparse-applicative parser-combinators pretty process regex-tdfa + safe split terminal-size text time transformers uniplate unix unordered-containers utf8-string vector vector-binary-instances zip-archive ]; @@ -131367,6 +132604,8 @@ self: { ]; description = "Functional Programming Language with Dependent Types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) gmp;}; "ieee" = callPackage @@ -131425,6 +132664,25 @@ self: { license = "GPL"; }) {}; + "iexcloud" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, http-conduit + , HUnit, semigroups, stocks, unordered-containers + }: + mkDerivation { + pname = "iexcloud"; + version = "0.0.0.1"; + sha256 = "15qn3h1bz75bykcnyra6gg4d33gmr6ywc485hk2gmi4k6hbl6amf"; + libraryHaskellDepends = [ + aeson base bytestring containers http-conduit semigroups + unordered-containers + ]; + testHaskellDepends = [ base bytestring HUnit stocks ]; + description = "Library for the IEX Trading API"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "if" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -133229,16 +134487,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "influxdb_1_7_0" = callPackage + "influxdb_1_7_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal , cabal-doctest, clock, containers, doctest, foldl, http-client - , http-types, lens, network, optional-args, scientific, tagged - , template-haskell, text, time, unordered-containers, vector + , http-types, lens, network, optional-args, raw-strings-qq + , scientific, tagged, tasty, tasty-hunit, template-haskell, text + , time, unordered-containers, vector }: mkDerivation { pname = "influxdb"; - version = "1.7.0"; - sha256 = "1a9la9gm5brsh9rs9ai1a50kcdk75kw8jmrh1rd6xs4xiwdca819"; + version = "1.7.1"; + sha256 = "1nny63rd9bw7ijg9l09cd467whfaa1n3ph8dqdy7bp6kcbvdwnzn"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -133247,7 +134506,10 @@ self: { http-types lens network optional-args scientific tagged text time unordered-containers vector ]; - testHaskellDepends = [ base doctest template-haskell ]; + testHaskellDepends = [ + base containers doctest raw-strings-qq tasty tasty-hunit + template-haskell time + ]; description = "Haskell client library for InfluxDB"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -133983,6 +135245,8 @@ self: { pname = "integer-logarithms"; version = "1.0.3"; sha256 = "05pc5hws66csvcvfswlwcr2fplwn1lbssvwifjxkbbwqhq0n5qjs"; + revision = "1"; + editedCabalFile = "1z6z63jr42jn073fd9ns7jcrw7n5lwx076q4b5rgzak7q1ixw2i8"; libraryHaskellDepends = [ array base ghc-prim integer-gmp ]; testHaskellDepends = [ base QuickCheck smallcheck tasty tasty-hunit tasty-quickcheck @@ -134720,8 +135984,8 @@ self: { pname = "invertible-grammar"; version = "0.1.2"; sha256 = "1nf7dchcxs8wwd2hgfpf04qd63ws22pafjwb5911lq7da8k1y57j"; - revision = "1"; - editedCabalFile = "1qk0pi8n45mbzwr6i6sly59b74njk0akzm6k0vnr262lqahy0hdl"; + revision = "2"; + editedCabalFile = "0j6zmj0dlhiq4qjrbjbvdsmky1l4z1qwqikixk1b9dpa05n01ykf"; libraryHaskellDepends = [ base bifunctors containers mtl prettyprinter profunctors semigroups tagged template-haskell text transformers @@ -135080,7 +136344,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ip_1_5_0" = callPackage + "ip_1_5_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion , deepseq, doctest, hashable, hspec, hspec-discover, HUnit , primitive, QuickCheck, quickcheck-classes, test-framework @@ -135089,10 +136353,8 @@ self: { }: mkDerivation { pname = "ip"; - version = "1.5.0"; - sha256 = "128kqqjbn020lpmga17dp34v91jbnnn8q2b1gy9rw21wvy507f5j"; - revision = "1"; - editedCabalFile = "09r4flbanb4zq3ixx57zd47gjvl6ghyrv62k11smbxzs6wy3szr4"; + version = "1.5.1"; + sha256 = "1crnn76vxhqq13556nc0537bh8xi5jzklyp24dqqfamxmfbwkzll"; libraryHaskellDepends = [ aeson attoparsec base bytestring deepseq hashable primitive text vector wide-word @@ -135129,11 +136391,11 @@ self: { ({ mkDerivation, base, binary, bytestring, iproute }: mkDerivation { pname = "ip2location"; - version = "8.0.4"; - sha256 = "0fry56zk9nbpqp58qvm1xxbq53pjiahkb58gh2h8dax80q3iczh4"; + version = "8.1.0"; + sha256 = "07n5xnspl318hrmff4gr274zpgszgviilwhjd7vdrhm1sq9sdir8"; libraryHaskellDepends = [ base binary bytestring iproute ]; description = "IP2Location Haskell package for IP geolocation"; - license = stdenv.lib.licenses.lgpl3; + license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; @@ -135142,8 +136404,8 @@ self: { ({ mkDerivation, base, binary, bytestring, iproute }: mkDerivation { pname = "ip2proxy"; - version = "2.0.0"; - sha256 = "0lhc0ni65wj32j97yw9iy2lawnl4bc7ml6lsjk12wks4mcy01nrv"; + version = "2.1.0"; + sha256 = "0qcmqy8p13hg9aih8m9w7qpbr6zcbvgc9y6bzh2cqm2sbx7ksvqm"; libraryHaskellDepends = [ base binary bytestring iproute ]; description = "IP2Proxy Haskell package for proxy detection"; license = stdenv.lib.licenses.mit; @@ -135469,6 +136731,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "irc-client_1_1_1_0" = callPackage + ({ mkDerivation, base, bytestring, conduit, connection, containers + , contravariant, exceptions, irc-conduit, irc-ctcp, mtl + , network-conduit-tls, old-locale, profunctors, stm, stm-chans + , text, time, tls, transformers, x509, x509-store, x509-validation + }: + mkDerivation { + pname = "irc-client"; + version = "1.1.1.0"; + sha256 = "1f2lqg37ig3f23066c4179vcym6p3ylmxsywqhmb0n078kix6kfb"; + libraryHaskellDepends = [ + base bytestring conduit connection containers contravariant + exceptions irc-conduit irc-ctcp mtl network-conduit-tls old-locale + profunctors stm stm-chans text time tls transformers x509 + x509-store x509-validation + ]; + description = "An IRC client library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "irc-colors" = callPackage ({ mkDerivation, base, text }: mkDerivation { @@ -136815,10 +138098,10 @@ self: { }: mkDerivation { pname = "jaeger-flamegraph"; - version = "1.3.0"; - sha256 = "03j5hjrhyhmc6qjp7v4j0mr2y0fpk0zds6v55as24par508w72ka"; - revision = "2"; - editedCabalFile = "0p2pcfyrcbqh0rnmhhp5hbwixvlml62iz0d48z7dd6cwfdzlkfrr"; + version = "1.3.2"; + sha256 = "1m7vs4zi1cm5xj3wn8zr44rdx1l99ra59xwr64y9bdrs1raga7k3"; + revision = "1"; + editedCabalFile = "003h3aqdkpvpqqyv7ypv3shvfiqcwq7cfihqv38bp2iq5vin938q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base containers QuickCheck text ]; @@ -137646,6 +138929,37 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "jose_0_8_1_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base64-bytestring + , bytestring, concise, containers, cryptonite, hspec, lens, memory + , monad-time, mtl, network-uri, QuickCheck, quickcheck-instances + , safe, semigroups, tasty, tasty-hspec, tasty-quickcheck + , template-haskell, text, time, unordered-containers, vector, x509 + }: + mkDerivation { + pname = "jose"; + version = "0.8.1.0"; + sha256 = "02xg8axy6whbkn0mzg1gjy6b1mhxlmsh1x7vjk1fiawvg9nwzrkl"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base base64-bytestring bytestring concise + containers cryptonite lens memory monad-time mtl network-uri + QuickCheck quickcheck-instances safe semigroups template-haskell + text time unordered-containers vector x509 + ]; + testHaskellDepends = [ + aeson attoparsec base base64-bytestring bytestring concise + containers cryptonite hspec lens memory monad-time mtl network-uri + QuickCheck quickcheck-instances safe semigroups tasty tasty-hspec + tasty-quickcheck template-haskell text time unordered-containers + vector x509 + ]; + description = "Javascript Object Signing and Encryption and JSON Web Token library"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "jose-jwt" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, cereal , containers, criterion, cryptonite, doctest, either, hspec, HUnit @@ -137802,13 +139116,14 @@ self: { }) {}; "jsaddle-dom" = callPackage - ({ mkDerivation, base, base-compat, exceptions, jsaddle, lens, text - , transformers + ({ mkDerivation, base, base-compat, Cabal, exceptions, jsaddle + , lens, text, transformers }: mkDerivation { pname = "jsaddle-dom"; - version = "0.9.3.1"; - sha256 = "0ifbddp4vjpbl89bwczfp7ivnhfayg8317l8qk6h84p9vd1km44z"; + version = "0.9.3.2"; + sha256 = "1qc135w1y4f2mbky36dmb0ggcbwkv1vnmszw5lkhkxhkcag2sf07"; + setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base base-compat exceptions jsaddle lens text transformers ]; @@ -137979,8 +139294,8 @@ self: { }: mkDerivation { pname = "json-api"; - version = "0.1.1.2"; - sha256 = "092x0zldcz6dsvvsxs2zr4cp4mbwjsrdpcassrl5i715x9rb5fmm"; + version = "0.1.4.0"; + sha256 = "1xswmpkwr1f49kf4hmp9014lwv4lcnyjj161ylfh5ihjfr30w0yb"; libraryHaskellDepends = [ aeson base containers data-default lens lens-aeson text unordered-containers url @@ -138712,6 +140027,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "json5hs" = callPackage + ({ mkDerivation, array, base, bytestring, containers, mtl, pretty + , syb, text + }: + mkDerivation { + pname = "json5hs"; + version = "0.1.2.2"; + sha256 = "19r1ripvalrhvlqdk0pvm18b4a8sibdwlc60i2yj7da10rdx5cv1"; + libraryHaskellDepends = [ + array base bytestring containers mtl pretty syb text + ]; + description = "Serialising to and from JSON5"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "jsonextfilter" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, containers , monads-tf, optparse-applicative, process, scientific, string-qq @@ -138736,13 +140066,15 @@ self: { "jsonpath" = callPackage ({ mkDerivation, aeson, aeson-casing, attoparsec, base, bytestring - , file-embed, hspec, hspec-attoparsec, text, unordered-containers - , vector + , file-embed, hspec, hspec-attoparsec, hspec-discover, text + , unordered-containers, vector }: mkDerivation { pname = "jsonpath"; - version = "0.1.0.0"; - sha256 = "0lr0sw30siaycw92b1xbnlrjn1pb7y8l9dflrjzr5d9k43lnrz42"; + version = "0.1.0.1"; + sha256 = "0wp5516g33spb9ilphjkzamr88xl64fb6y9zjfci1kac5vkl4qqk"; + revision = "2"; + editedCabalFile = "04jw3ayvcabsfcqazksnn0rg0i1326d0gjdx1zl8rk955g2qlwam"; libraryHaskellDepends = [ aeson attoparsec base text unordered-containers vector ]; @@ -138750,6 +140082,7 @@ self: { aeson aeson-casing attoparsec base bytestring file-embed hspec hspec-attoparsec text unordered-containers vector ]; + testToolDepends = [ hspec-discover ]; description = "Library to parse and execute JSONPath"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -139747,7 +141080,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "katip_0_8_2_0" = callPackage + "katip_0_8_3_0" = callPackage ({ mkDerivation, aeson, async, auto-update, base, blaze-builder , bytestring, containers, criterion, deepseq, directory, either , filepath, hostname, microlens, microlens-th, monad-control, mtl @@ -139759,8 +141092,8 @@ self: { }: mkDerivation { pname = "katip"; - version = "0.8.2.0"; - sha256 = "064i2dbl52i2z7lyvk01ayvf6dzzn20bac3fwh0dlvr5bn49wran"; + version = "0.8.3.0"; + sha256 = "0wpqchpgrp7awrf7hirg0768g8nnqrydnwcw8xgxw6w47zcb71d0"; libraryHaskellDepends = [ aeson async auto-update base bytestring containers either hostname microlens microlens-th monad-control mtl old-locale resourcet @@ -140402,8 +141735,8 @@ self: { }: mkDerivation { pname = "keera-hails-reactive-gtk"; - version = "0.3"; - sha256 = "0b3j9h0d4sw1hhgihnlqpiyc9bwfk5qd6jl64jij3q3rjy97wr3v"; + version = "0.5"; + sha256 = "014d9hr2321gs6ska8ykrgh59k92c6kxf0a3gqvrfj3rck28izb9"; libraryHaskellDepends = [ base bytestring cairo glib gtk gtk-helpers keera-hails-reactivevalues mtl transformers @@ -140415,13 +141748,15 @@ self: { }) {}; "keera-hails-reactive-network" = callPackage - ({ mkDerivation, base, keera-hails-reactivevalues, network }: + ({ mkDerivation, base, bytestring, keera-hails-reactivevalues + , network, network-bsd + }: mkDerivation { pname = "keera-hails-reactive-network"; - version = "0.0.3.3"; - sha256 = "1379djvy5nn6k67ds7mk9jjh03zd6sj0v8sf5agmk3pf5cyp0xa3"; + version = "0.1"; + sha256 = "1d1r9p5ray60yfrxs89byc7rmdsm340k2b8klv25k0wh2fvrx2yw"; libraryHaskellDepends = [ - base keera-hails-reactivevalues network + base bytestring keera-hails-reactivevalues network network-bsd ]; description = "Haskell on Rails - Sockets as Reactive Values"; license = stdenv.lib.licenses.bsd3; @@ -141325,18 +142660,18 @@ self: { "korea-holidays" = callPackage ({ mkDerivation, aeson, base, hspec, monad-extras, split - , template-haskell, yaml + , template-haskell, time, yaml }: mkDerivation { pname = "korea-holidays"; - version = "0.1.0.3"; - sha256 = "0v240dkvqy1jhkq1mzhyaiyg62m8lbbm79bc2g31jy9b7r1h93i2"; + version = "0.1.0.4"; + sha256 = "11yiip6nv84k8q4n37w9kn1w57vizlcggszh0pnrkkx36xwwk9ll"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson base monad-extras split template-haskell yaml + aeson base monad-extras split template-haskell time yaml ]; testHaskellDepends = [ - aeson base hspec monad-extras split template-haskell yaml + aeson base hspec monad-extras split template-haskell time yaml ]; description = "Korea Holidays"; license = stdenv.lib.licenses.mit; @@ -141485,6 +142820,66 @@ self: { broken = true; }) {egl = null; inherit (pkgs) glew;}; + "kubernetes-client" = callPackage + ({ mkDerivation, aeson, base, bytestring, connection, containers + , data-default-class, hspec, http-client, http-client-tls + , kubernetes-client-core, microlens, mtl, pem, safe-exceptions + , streaming-bytestring, text, tls, x509, x509-store, x509-system + , x509-validation, yaml + }: + mkDerivation { + pname = "kubernetes-client"; + version = "0.1.0.1"; + sha256 = "0fzilm4k7cq3k6vlx01c5gzg4lnrgpfdldbiml4rbiv42f13pr7j"; + libraryHaskellDepends = [ + aeson base bytestring connection containers data-default-class + http-client http-client-tls kubernetes-client-core microlens mtl + pem safe-exceptions streaming-bytestring text tls x509 x509-store + x509-system x509-validation + ]; + testHaskellDepends = [ + aeson base bytestring connection containers data-default-class + hspec http-client http-client-tls kubernetes-client-core microlens + mtl pem safe-exceptions streaming-bytestring text tls x509 + x509-store x509-system x509-validation yaml + ]; + description = "Client library for Kubernetes"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "kubernetes-client-core" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, bytestring + , case-insensitive, containers, deepseq, exceptions, hspec + , http-api-data, http-client, http-client-tls, http-media + , http-types, iso8601-time, katip, microlens, mtl, network + , QuickCheck, random, safe-exceptions, semigroups, text, time + , transformers, unordered-containers, vector + }: + mkDerivation { + pname = "kubernetes-client-core"; + version = "0.1.0.1"; + sha256 = "08sxsc9a9vdsqp71zxnc309cng75k3c57mcmmryhpwwyscvgfnsk"; + revision = "1"; + editedCabalFile = "0qzh7zq36q57yfccna1izi1gz9fpki9ngnl8dgf3m6halrxwqlc7"; + libraryHaskellDepends = [ + aeson base base64-bytestring bytestring case-insensitive containers + deepseq exceptions http-api-data http-client http-client-tls + http-media http-types iso8601-time katip microlens mtl network + random safe-exceptions text time transformers unordered-containers + vector + ]; + testHaskellDepends = [ + aeson base bytestring containers hspec iso8601-time mtl QuickCheck + semigroups text time transformers unordered-containers vector + ]; + description = "Auto-generated kubernetes-client-core API Client"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "kure" = callPackage ({ mkDerivation, base, dlist, transformers }: mkDerivation { @@ -141907,6 +143302,8 @@ self: { ]; description = "Declarative command-line parser using type-driven pattern matching"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lambda-placeholders" = callPackage @@ -144238,7 +145635,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "lattices_2" = callPackage + "lattices_2_0_1" = callPackage ({ mkDerivation, base, base-compat, containers, deepseq, hashable , integer-logarithms, QuickCheck, quickcheck-instances , semigroupoids, tagged, tasty, tasty-quickcheck, transformers @@ -144246,10 +145643,8 @@ self: { }: mkDerivation { pname = "lattices"; - version = "2"; - sha256 = "050c66rrzh5p204jyqmysyhm419f8pasi0mlbwv3n167y0fnr8xq"; - revision = "1"; - editedCabalFile = "08m46liplbh1xxnpsq0wnjabmyj625vbnnsyypd52jlhzclfhqz1"; + version = "2.0.1"; + sha256 = "0c7n7fh89llg8ijylwc14ikqrg077vcqcgph5h9nar6i5dyaprfy"; libraryHaskellDepends = [ base base-compat containers deepseq hashable integer-logarithms QuickCheck semigroupoids tagged transformers universe-base @@ -144476,8 +145871,8 @@ self: { pname = "lazy-hash"; version = "0.1.0.0"; sha256 = "1xa2c8gxk5l4njbs58zpq2ybdvjd4y214p71nfmfrzw0arwz49pa"; - revision = "1"; - editedCabalFile = "07sn3q7q29zkxpillprx2d05pybjpvpglz8s7jq07akdhwmwx9mk"; + revision = "2"; + editedCabalFile = "0j46blbddl9y4chccyns7cixbxb0a4pkmdkbd5z09510ddz3jqm3"; libraryHaskellDepends = [ base constrained-categories hashable haskell-src-meta tagged template-haskell vector-space @@ -144497,6 +145892,8 @@ self: { pname = "lazy-hash-cache"; version = "0.1.0.0"; sha256 = "1bdq2fbxpmlva1qbxbiznnjmz7yv7qzcr8wdgds0rdzwhjn97mp4"; + revision = "1"; + editedCabalFile = "1m42wsj93vpb6v1dcj2lc5z04qc2np8i7n3w82jwwk4wbgl5q35j"; libraryHaskellDepends = [ base base16-bytestring binary bytestring data-default-class directory filepath hashable lazy-hash microlens microlens-th @@ -144698,16 +146095,16 @@ self: { "ldap-client" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, async, base, bytestring - , connection, containers, hspec, network, process, semigroups, stm - , text + , connection, containers, fail, hspec, network, process, semigroups + , stm, text }: mkDerivation { pname = "ldap-client"; - version = "0.2.0"; - sha256 = "0vs6n3q9svwhcp6853ipxmw1anmy8qfy3xajjsf7h4pjnqzy7g88"; + version = "0.3.0"; + sha256 = "0fii1yi3mn1dqvzbsx63fqrb53v81a7d2gqn3xma8v9vsp9nxv7v"; libraryHaskellDepends = [ asn1-encoding asn1-types async base bytestring connection - containers network semigroups stm text + containers fail network semigroups stm text ]; testHaskellDepends = [ base bytestring hspec process semigroups ]; description = "Pure Haskell LDAP Client Library"; @@ -145242,8 +146639,8 @@ self: { pname = "lens"; version = "4.17.1"; sha256 = "1gpkc53l2cggnfrgg5k4ih82rycjbdvpj9pnbi5cq8ms0dbvs4a7"; - revision = "1"; - editedCabalFile = "1zknh9h72qzszwrz9h25c5ssdr2pv5z67w6kv526sk1y8rnrbxk1"; + revision = "2"; + editedCabalFile = "1bh868l69nisdhw8qw5y51nj2w0pbbq7mxqiwf42iq0vcb6h0ybv"; setupHaskellDepends = [ base Cabal cabal-doctest filepath ]; libraryHaskellDepends = [ array base base-orphans bifunctors bytestring call-stack comonad @@ -145361,6 +146758,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lens-family_2_0_0" = callPackage + ({ mkDerivation, base, containers, lens-family-core, mtl + , transformers + }: + mkDerivation { + pname = "lens-family"; + version = "2.0.0"; + sha256 = "1nq3dwkrjyqafbv4gvwwgz6ih8y4x9bks11jhljh43q3qnjz54v7"; + libraryHaskellDepends = [ + base containers lens-family-core mtl transformers + ]; + description = "Lens Families"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lens-family-core" = callPackage ({ mkDerivation, base, containers, transformers }: mkDerivation { @@ -145372,6 +146785,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lens-family-core_2_0_0" = callPackage + ({ mkDerivation, base, containers, transformers }: + mkDerivation { + pname = "lens-family-core"; + version = "2.0.0"; + sha256 = "0ni6s873hy2h3b316835ssmlyr05yinb3a8jq5b01p9ppp9zrd0r"; + libraryHaskellDepends = [ base containers transformers ]; + description = "Haskell 2022 Lens Families"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lens-family-th" = callPackage ({ mkDerivation, base, hspec, template-haskell, transformers }: mkDerivation { @@ -145520,19 +146945,20 @@ self: { }) {}; "lens-regex-pcre" = callPackage - ({ mkDerivation, base, hspec, lens, pcre-heavy, pcre-light - , template-haskell, text + ({ mkDerivation, base, bytestring, hspec, lens, pcre-heavy + , pcre-light, template-haskell, text }: mkDerivation { pname = "lens-regex-pcre"; - version = "0.3.0.0"; - sha256 = "1010nhik7vfk6gll9h8cwnq7mx3v4gnl3nlyn7ma5y93ghq0ckvs"; + version = "0.3.1.0"; + sha256 = "1fbhwzs7mwz9c0l3p34zcgfvqxwxlhr3abz9gawlraiiypmz0iby"; libraryHaskellDepends = [ - base lens pcre-heavy pcre-light template-haskell text + base bytestring lens pcre-heavy pcre-light template-haskell text ]; testHaskellDepends = [ base hspec lens pcre-heavy pcre-light template-haskell text ]; + description = "A lensy interface to regular expressions"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -146053,6 +147479,8 @@ self: { pname = "libarchive"; version = "1.0.5.1"; sha256 = "1fchnvs03hg513v7a45a3qbfr3kbh3nmqjqljzr2y1mg2ghkr7cz"; + revision = "4"; + editedCabalFile = "0wzw962gl9lm5faaa86z4q7s9cbzqn346cmlbhr518dbnw7nv31d"; libraryHaskellDepends = [ base bytestring composition-prelude dlist filepath ]; @@ -147756,8 +149184,8 @@ self: { pname = "linearmap-category"; version = "0.3.5.0"; sha256 = "0qmd0nz343j3j3kprbhwfkglcswfcawfy0y6g4ai6nzdga42nfrf"; - revision = "2"; - editedCabalFile = "129fgr6m9691cd3nzy1magiwd7f9x2jip96pqj10d0lgb931frzg"; + revision = "3"; + editedCabalFile = "0b4m77csdsi5wgvbclza2arps5s0xgg0iibiy8kwax55ml04kkvp"; libraryHaskellDepends = [ base call-stack constrained-categories containers free-vector-spaces ieee754 lens linear manifolds-core semigroups @@ -148653,13 +150081,15 @@ self: { }) {}; "list-witnesses" = callPackage - ({ mkDerivation, base, decidable, profunctors, singletons, vinyl }: + ({ mkDerivation, base, decidable, microlens, profunctors + , singletons, vinyl + }: mkDerivation { pname = "list-witnesses"; - version = "0.1.1.0"; - sha256 = "16dlyk9hxz5fbsj726w1sgindryhyhsgvhs37zqygwmfzvqdbasd"; + version = "0.1.1.1"; + sha256 = "13h5gckpysf4p5wjfnq7l5v66rmxi3i9cmykf18ld3hnilgd7wa7"; libraryHaskellDepends = [ - base decidable profunctors singletons vinyl + base decidable microlens profunctors singletons vinyl ]; description = "Witnesses for working with type-level lists"; license = stdenv.lib.licenses.bsd3; @@ -150017,6 +151447,27 @@ self: { broken = true; }) {}; + "log4hs" = callPackage + ({ mkDerivation, aeson, base, containers, data-default, directory + , filepath, hspec, hspec-core, process, QuickCheck + , template-haskell, text, time + }: + mkDerivation { + pname = "log4hs"; + version = "0.0.3.0"; + sha256 = "0bbl1cfa85dr1kxiikykh32x0141bkgfabvkjp37m52sv3vs9mvi"; + libraryHaskellDepends = [ + aeson base containers data-default directory filepath + template-haskell text time + ]; + testHaskellDepends = [ + aeson base containers data-default directory filepath hspec + hspec-core process QuickCheck template-haskell text time + ]; + description = "A python logging style log library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "logentries" = callPackage ({ mkDerivation, base, bytestring, data-default, fast-logger, hspec , network, stm, uuid-types, wai, wai-extra @@ -150296,12 +151747,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "logict_0_7_0_1" = callPackage + "logict_0_7_0_2" = callPackage ({ mkDerivation, base, mtl, tasty, tasty-hunit }: mkDerivation { pname = "logict"; - version = "0.7.0.1"; - sha256 = "1zzcfxdl156rrr120vjcn2wawa2qdrninm6d4mxj215ig1a3aak5"; + version = "0.7.0.2"; + sha256 = "1xfgdsxg0lp8m0a2cb83rcxrnnc37asfikay2kydi933anh9ihfc"; libraryHaskellDepends = [ base mtl ]; testHaskellDepends = [ base mtl tasty tasty-hunit ]; description = "A backtracking logic-programming monad"; @@ -153174,8 +154625,8 @@ self: { }: mkDerivation { pname = "mandrill"; - version = "0.5.3.5"; - sha256 = "0yh7r3wrzpzm3iv0zvs6nzf36hwv0y7xlsz6cy3dlnyrr5jbsb1i"; + version = "0.5.3.6"; + sha256 = "1jvgxhc3x7867cryvsbpj7hks9syhpqbwyh4y0v6b0yp0xil8qrl"; libraryHaskellDepends = [ aeson base base64-bytestring blaze-html bytestring containers email-validate http-client http-client-tls http-types microlens-th @@ -153931,26 +155382,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "massiv_0_3_6_0" = callPackage - ({ mkDerivation, async, base, bytestring, Cabal, cabal-doctest - , containers, data-default, data-default-class, deepseq, doctest - , exceptions, hspec, mersenne-random-pure64, primitive, QuickCheck - , random, scheduler, splitmix, template-haskell, unliftio - , unliftio-core, vector + "massiv_0_4_0_0" = callPackage + ({ mkDerivation, base, bytestring, Cabal, cabal-doctest + , data-default-class, deepseq, doctest, exceptions + , mersenne-random-pure64, primitive, QuickCheck, random, scheduler + , splitmix, template-haskell, unliftio-core, vector }: mkDerivation { pname = "massiv"; - version = "0.3.6.0"; - sha256 = "00bjgrb7pa59i8wmbjgscq0jw4x3r1gjvpns7sd58ffa8zfd6sgc"; + version = "0.4.0.0"; + sha256 = "077w18fxgq50h1ylbalf6lbam2rcqp4a3b6qr21ac63514dyvyfz"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bytestring data-default-class deepseq exceptions primitive scheduler unliftio-core vector ]; testHaskellDepends = [ - async base bytestring containers data-default deepseq doctest hspec - mersenne-random-pure64 QuickCheck random scheduler splitmix - template-haskell unliftio vector + base doctest mersenne-random-pure64 QuickCheck random splitmix + template-haskell ]; description = "Massiv (Массив) is an Array Library"; license = stdenv.lib.licenses.bsd3; @@ -153993,6 +155442,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "massiv-test" = callPackage + ({ mkDerivation, base, bytestring, containers, data-default + , data-default-class, deepseq, exceptions, genvalidity-hspec, hspec + , massiv, primitive, QuickCheck, scheduler, unliftio, vector + }: + mkDerivation { + pname = "massiv-test"; + version = "0.1.0"; + sha256 = "08rs0j773c3jxnj6akh8gaywfz2g10w1ddmcqpkci5bqqjmqqf85"; + libraryHaskellDepends = [ + base bytestring data-default-class deepseq exceptions hspec massiv + primitive QuickCheck scheduler unliftio vector + ]; + testHaskellDepends = [ + base bytestring containers data-default deepseq genvalidity-hspec + hspec massiv QuickCheck scheduler vector + ]; + description = "Library that contains generators, properties and tests for Massiv Array Library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "master-plan" = callPackage ({ mkDerivation, base, diagrams, diagrams-lib, diagrams-rasterific , hspec, megaparsec, mtl, optparse-applicative, QuickCheck @@ -154759,14 +156231,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "mbox-utility_0_0_3" = callPackage + "mbox-utility_0_0_3_1" = callPackage ({ mkDerivation, base, bytestring, hsemail, non-empty, parsec , spreadsheet, time, utility-ht }: mkDerivation { pname = "mbox-utility"; - version = "0.0.3"; - sha256 = "1y24y0n81f0v9c9829y4va22h42n0wmjndaj1d15n07xvhn4xdps"; + version = "0.0.3.1"; + sha256 = "0vh9ibh4g3fssq9jfzrmaa56sk4k35r27lmz2xq4fhc62fmkia92"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -155337,19 +156809,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "mega-sdist_0_4_0_0" = callPackage - ({ mkDerivation, base, bytestring, optparse-simple, pantry-tmp - , path, path-io, rio, rio-orphans, yaml + "mega-sdist_0_4_0_1" = callPackage + ({ mkDerivation, base, bytestring, optparse-simple, pantry, path + , path-io, rio, rio-orphans, yaml }: mkDerivation { pname = "mega-sdist"; - version = "0.4.0.0"; - sha256 = "0d8z0jj4xm091zdlydkp5fgs22xrjrsydfm9czfr79pmcx83bdi4"; + version = "0.4.0.1"; + sha256 = "191saxmdh3705rhci7lz7qzcdzv2zvw9bwa7f5d62500azi13j8v"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base bytestring optparse-simple pantry-tmp path path-io rio - rio-orphans yaml + base bytestring optparse-simple pantry path path-io rio rio-orphans + yaml ]; description = "Handles uploading to Hackage from mega repos"; license = stdenv.lib.licenses.mit; @@ -155559,6 +157031,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "membrain" = callPackage + ({ mkDerivation, base, doctest, Glob, hedgehog, hspec, type-spec }: + mkDerivation { + pname = "membrain"; + version = "0.0.0.0"; + sha256 = "01wv5i3kgbpmwjnjk5xgkpm3j5wazlz1f05kmm523wf34xivp498"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base doctest Glob hedgehog hspec type-spec + ]; + description = "Type-safe memory units"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "memcache" = callPackage ({ mkDerivation, base, binary, blaze-builder, bytestring, criterion , data-default-class, hashable, network, resource-pool, time @@ -155667,8 +157155,8 @@ self: { }: mkDerivation { pname = "memdb"; - version = "1.0.0.0"; - sha256 = "1rm1ijhhiyznbqidcpa1796lzj35dhi4jb0a2qbrvgim329ymsr2"; + version = "1.0.0.3"; + sha256 = "082i381qyba51zkv4fqkn3mdhmya39pz8pw69m02c3hnp5vr4n4c"; libraryHaskellDepends = [ base bytestring cereal vector ]; testHaskellDepends = [ base bytestring cereal hspec QuickCheck vector @@ -156734,8 +158222,8 @@ self: { pname = "microlens-process"; version = "0.2.0.0"; sha256 = "05bkm3nhiv2mprds9xlmmnzll91hn76navb9h9kc9nl5rnq4nwrn"; - revision = "2"; - editedCabalFile = "02h97gnxwsn20npxsc0mjhyv5s8fj41xkm18xwvcqcq7a4cj8jnw"; + revision = "4"; + editedCabalFile = "00dhcr2czcx986a4lijmlbrxk2wm059mmbh63qs48wb6z4rrsg7y"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base filepath microlens process ]; testHaskellDepends = [ base doctest microlens process ]; @@ -157341,6 +158829,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "minecraft" = callPackage + ({ mkDerivation }: + mkDerivation { + pname = "minecraft"; + version = "0.0.0.0"; + sha256 = "07h6hgq4k1wm4ldwb29fgmmbl9ygrlbq3qv3ymfvc25l5rvgss4h"; + doHaddock = false; + description = "TBA"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "minecraft-data" = callPackage ({ mkDerivation, array, base, bytestring, cereal, containers, lens , mtl, nbt, pipes, pipes-bytestring, pipes-cereal, pipes-parse @@ -157348,8 +158847,8 @@ self: { }: mkDerivation { pname = "minecraft-data"; - version = "0.1.0.0"; - sha256 = "1p0lci3b3lwcd6j13bvsscz7ar5vskvhkpj8gy4fp8d1pak2adwr"; + version = "0.1.0.1"; + sha256 = "02ispnzvxjazjy76bqpils6jmy37l4v61l1wcklvvsvkb72yc39n"; libraryHaskellDepends = [ array base bytestring cereal containers lens mtl nbt pipes pipes-bytestring pipes-cereal pipes-parse pipes-zlib text text-show @@ -157559,36 +159058,36 @@ self: { broken = true; }) {}; - "minio-hs_1_3_1" = callPackage + "minio-hs_1_5_0" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring - , case-insensitive, conduit, conduit-extra, connection, containers - , cryptonite, cryptonite-conduit, digest, directory, exceptions - , filepath, http-client, http-client-tls, http-conduit, http-types - , ini, memory, protolude, QuickCheck, raw-strings-qq, resourcet - , retry, tasty, tasty-hunit, tasty-quickcheck, tasty-smallcheck - , temporary, text, time, transformers, unliftio, unliftio-core + , case-insensitive, conduit, conduit-extra, connection, cryptonite + , cryptonite-conduit, digest, directory, exceptions, filepath + , http-client, http-client-tls, http-conduit, http-types, ini + , memory, protolude, QuickCheck, raw-strings-qq, resourcet, retry + , tasty, tasty-hunit, tasty-quickcheck, tasty-smallcheck, temporary + , text, time, transformers, unliftio, unliftio-core , unordered-containers, xml-conduit }: mkDerivation { pname = "minio-hs"; - version = "1.3.1"; - sha256 = "1z553cpflxmr5hy723bgmwyq061fpivi1jw0vq64x1i0bz0q1llp"; + version = "1.5.0"; + sha256 = "0qp8zl7f055lpchg8abcc27jq4s0nn14qp474qrj4wdmynfi8bc8"; libraryHaskellDepends = [ aeson base base64-bytestring binary bytestring case-insensitive - conduit conduit-extra connection containers cryptonite - cryptonite-conduit digest directory exceptions filepath http-client - http-client-tls http-conduit http-types ini memory protolude - raw-strings-qq resourcet retry text time transformers unliftio - unliftio-core unordered-containers xml-conduit + conduit conduit-extra connection cryptonite cryptonite-conduit + digest directory exceptions filepath http-client http-client-tls + http-conduit http-types ini memory protolude raw-strings-qq + resourcet retry text time transformers unliftio unliftio-core + unordered-containers xml-conduit ]; testHaskellDepends = [ aeson base base64-bytestring binary bytestring case-insensitive - conduit conduit-extra connection containers cryptonite - cryptonite-conduit digest directory exceptions filepath http-client - http-client-tls http-conduit http-types ini memory protolude - QuickCheck raw-strings-qq resourcet retry tasty tasty-hunit - tasty-quickcheck tasty-smallcheck temporary text time transformers - unliftio unliftio-core unordered-containers xml-conduit + conduit conduit-extra connection cryptonite cryptonite-conduit + digest directory exceptions filepath http-client http-client-tls + http-conduit http-types ini memory protolude QuickCheck + raw-strings-qq resourcet retry tasty tasty-hunit tasty-quickcheck + tasty-smallcheck temporary text time transformers unliftio + unliftio-core unordered-containers xml-conduit ]; description = "A MinIO Haskell Library for Amazon S3 compatible cloud storage"; license = stdenv.lib.licenses.asl20; @@ -157974,6 +159473,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "miso_1_2_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, http-api-data + , http-types, lucid, network-uri, servant, servant-lucid, text + , transformers, vector + }: + mkDerivation { + pname = "miso"; + version = "1.2.0.0"; + sha256 = "08yhr5hxrvgqdc32yz2j3mix7s8q5bzycld3kd4rfcy2h4h72962"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers http-api-data http-types lucid + network-uri servant servant-lucid text transformers vector + ]; + description = "A tasty Haskell front-end framework"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "miso-action-logger" = callPackage ({ mkDerivation, aeson, base, ghcjs-base, miso }: mkDerivation { @@ -159547,6 +161066,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "monad-metrics-extensible" = callPackage + ({ mkDerivation, base, dependent-map, dependent-sum, ekg, ekg-core + , exceptions, hspec, mtl, stm, text + }: + mkDerivation { + pname = "monad-metrics-extensible"; + version = "0.1.0.1"; + sha256 = "044hvhnf7wsgd18cac2j3bfw2vbxfnra736l6qndfx07mkv1nz5n"; + libraryHaskellDepends = [ + base dependent-map dependent-sum ekg ekg-core exceptions mtl stm + text + ]; + testHaskellDepends = [ + base dependent-map dependent-sum ekg ekg-core exceptions hspec mtl + stm text + ]; + description = "An extensible and type-safe wrapper around EKG metrics"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "monad-mock" = callPackage ({ mkDerivation, base, constraints, exceptions, haskell-src-exts , haskell-src-meta, hspec, monad-control, mtl, template-haskell @@ -160004,6 +161543,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "monad-validate" = callPackage + ({ mkDerivation, aeson, aeson-qq, base, exceptions, hspec + , monad-control, mtl, scientific, text, transformers + , transformers-base, unordered-containers, vector + }: + mkDerivation { + pname = "monad-validate"; + version = "1.0.0.0"; + sha256 = "0d2r54jhy5zkjph57f85syw6g0fmvj3csas8ki2hg7lfiqj6yq4q"; + revision = "1"; + editedCabalFile = "0zdxr266655w77zgzfqiw2aij64rhlys310c38myq1g6vgcxlbc2"; + libraryHaskellDepends = [ + base exceptions monad-control mtl transformers transformers-base + ]; + testHaskellDepends = [ + aeson aeson-qq base exceptions hspec monad-control mtl scientific + text transformers transformers-base unordered-containers vector + ]; + description = "A monad transformer for data validation"; + license = stdenv.lib.licenses.isc; + }) {}; + "monad-var" = callPackage ({ mkDerivation, base, base-compat, stm }: mkDerivation { @@ -160734,6 +162295,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "monoidal-containers_0_5_0_0" = callPackage + ({ mkDerivation, aeson, base, containers, deepseq, hashable, lens + , newtype, semigroups, these, unordered-containers + }: + mkDerivation { + pname = "monoidal-containers"; + version = "0.5.0.0"; + sha256 = "0dayylvsn6mcgyis04nl4384sg8vr4mrnvf1wvfhb5pip3v7hl7a"; + libraryHaskellDepends = [ + aeson base containers deepseq hashable lens newtype semigroups + these unordered-containers + ]; + description = "Containers with monoidal accumulation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "monoidplus" = callPackage ({ mkDerivation, base, contravariant, semigroups, transformers }: mkDerivation { @@ -161747,8 +163325,8 @@ self: { }: mkDerivation { pname = "ms-tds"; - version = "0.2.0.0"; - sha256 = "0675h4w8nayvh2gm644anz8sqk37b1n5ia4w5fgyaf9y6drafyda"; + version = "0.3.0.0"; + sha256 = "0pdv9x6743qaqk6fcm02hfrr09ckwbd9fpgzgmgmgnqhqxm0y9y6"; libraryHaskellDepends = [ array base binary bytestring crypto-random data-default-class mtl network template-haskell text time tls uuid-types x509-store @@ -161885,8 +163463,8 @@ self: { }: mkDerivation { pname = "mssql-simple"; - version = "0.2.0.0"; - sha256 = "1pqw2kr8fyy62kmamvm600zsqri9d2201kixvr6gdy6z0ivyl0sz"; + version = "0.3.0.0"; + sha256 = "0wssw1d3ki95b83ww6brx8apk7s86vnzgwlh91xvfdp8hkqygx1q"; libraryHaskellDepends = [ base binary bytestring hostname ms-tds network text time tls ]; @@ -163586,6 +165164,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "mwc-probability_2_1_0" = callPackage + ({ mkDerivation, base, mwc-random, primitive, transformers }: + mkDerivation { + pname = "mwc-probability"; + version = "2.1.0"; + sha256 = "0ac4pr2l0p48a0n6jym445c8h7n2nf1pqkhrz6cd1rjbmrk5mbm3"; + libraryHaskellDepends = [ base mwc-random primitive transformers ]; + description = "Sampling function-based probability distributions"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mwc-probability-transition" = callPackage ({ mkDerivation, base, exceptions, ghc-prim, hspec, logging-effect , mtl, mwc-probability, primitive, QuickCheck, transformers @@ -164419,6 +166009,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "named-sop" = callPackage + ({ mkDerivation, base, singletons, tasty, tasty-hunit, text }: + mkDerivation { + pname = "named-sop"; + version = "0.2.0.0"; + sha256 = "1yz4cp19nf44cscfzhwsw7xigq07sxbvzfw5v5l3jgsjxi5xw9ad"; + libraryHaskellDepends = [ base singletons text ]; + testHaskellDepends = [ base tasty tasty-hunit ]; + description = "Dependently-typed sums and products, tagged by field name"; + license = stdenv.lib.licenses.mit; + }) {}; + "namelist" = callPackage ({ mkDerivation, base, case-insensitive, data-default-class, parsec , QuickCheck, tasty, tasty-hunit, tasty-quickcheck @@ -164715,10 +166317,8 @@ self: { }: mkDerivation { pname = "naqsha"; - version = "0.3.0.0"; - sha256 = "1564aff7ynqilqa9aiv1ih3dl9rimvvzyzqczx1bb94iznrfzghi"; - isLibrary = false; - isExecutable = false; + version = "0.3.0.1"; + sha256 = "0wg2vvik0yhaqyla64m3mcrv0fkrs92dgkrq5pzq78xjycnm7q1r"; libraryHaskellDepends = [ base bytestring groups vector ]; testHaskellDepends = [ base bytestring groups hspec hspec-discover HUnit QuickCheck vector @@ -165477,33 +167077,53 @@ self: { "net-spider" = callPackage ({ mkDerivation, aeson, base, containers, data-interval, doctest , doctest-discover, extended-reals, greskell, greskell-websocket - , hashable, hspec, monad-logger, safe-exceptions, text, time - , unordered-containers, vector + , hashable, hspec, monad-logger, safe-exceptions, scientific, text + , time, unordered-containers, vector }: mkDerivation { pname = "net-spider"; - version = "0.3.0.0"; - sha256 = "1wz37rrjpk4v8h1mh6pbld84f9kp5h3qcjxxh6fgbkij5l4g7m77"; + version = "0.3.2.0"; + sha256 = "0b9k2gxb9nmjd59pcz7x8jrk2vycf8jk448ifpfc9spk6ylkh4gh"; libraryHaskellDepends = [ aeson base containers data-interval extended-reals greskell - greskell-websocket hashable monad-logger safe-exceptions text time - unordered-containers vector + greskell-websocket hashable monad-logger safe-exceptions scientific + text time unordered-containers vector ]; testHaskellDepends = [ - base doctest doctest-discover hspec vector + aeson base doctest doctest-discover hspec text vector ]; description = "A graph database middleware to maintain a time-varying graph"; license = stdenv.lib.licenses.bsd3; }) {}; + "net-spider-cli" = callPackage + ({ mkDerivation, aeson, base, doctest, doctest-discover + , greskell-core, hashable, hspec, net-spider, optparse-applicative + , text + }: + mkDerivation { + pname = "net-spider-cli"; + version = "0.1.0.1"; + sha256 = "1qfzdfkiri3v344mk5zkc8mhxig3xmplcbw8382hkhsdmy4ny4ga"; + libraryHaskellDepends = [ + aeson base greskell-core hashable net-spider optparse-applicative + text + ]; + testHaskellDepends = [ + base doctest doctest-discover hspec net-spider optparse-applicative + ]; + description = "CLI option parsers for NetSpider objects"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "net-spider-pangraph" = callPackage ({ mkDerivation, base, bytestring, doctest, doctest-discover , greskell, hspec, net-spider, pangraph, text, time }: mkDerivation { pname = "net-spider-pangraph"; - version = "0.1.0.0"; - sha256 = "1aiacaccml8477vmcnv9mqcrn87nyx7pbgwp7rppz7h5w0dsj8lx"; + version = "0.1.1.0"; + sha256 = "1j3s379ri05jg3bzhiz6d8fjvxlkz00l7mrphqmr46j4y8d9vrkv"; libraryHaskellDepends = [ base bytestring greskell net-spider pangraph text time ]; @@ -165518,15 +167138,14 @@ self: { "net-spider-rpl" = callPackage ({ mkDerivation, aeson, base, greskell, hashable, hspec, ip - , net-spider, net-spider-pangraph, text, time + , net-spider, text, time }: mkDerivation { pname = "net-spider-rpl"; - version = "0.1.0.0"; - sha256 = "0basbgcdkjksg9p2s5s0whnbas3w3wnrkkdsr907m8gppkdk6i69"; + version = "0.2.1.0"; + sha256 = "07f51ym5v1mpa1v6249sgkxqd8y52fdgs8l2r59mxil1ph6al7x1"; libraryHaskellDepends = [ - aeson base greskell hashable ip net-spider net-spider-pangraph text - time + aeson base greskell hashable ip net-spider text time ]; testHaskellDepends = [ base hspec net-spider text ]; description = "NetSpider data model and utility for RPL networks"; @@ -166701,6 +168320,19 @@ self: { broken = true; }) {}; + "network-run" = callPackage + ({ mkDerivation, base, network }: + mkDerivation { + pname = "network-run"; + version = "0.0.1"; + sha256 = "1yc5hpcadab1dzvi9wz6v25v7wp5j07a36wdabrxi1pwy4gania5"; + libraryHaskellDepends = [ base network ]; + description = "Simple network runner library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "network-server" = callPackage ({ mkDerivation, base, network, unix }: mkDerivation { @@ -167568,8 +169200,8 @@ self: { }: mkDerivation { pname = "ngx-export-tools"; - version = "0.4.5.0"; - sha256 = "1775syhp5pgm6sdn3x8y3zqzvqrwypl07xm6rkv34sbw5x84mmmv"; + version = "0.4.6.0"; + sha256 = "0bvyh1b8q2mh2labaykc7lndr2rfhzmkw8c7b56pxsa2fypfl232"; libraryHaskellDepends = [ aeson base binary bytestring ngx-export safe template-haskell ]; @@ -168169,6 +169801,17 @@ self: { broken = true; }) {}; + "no-value" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "no-value"; + version = "1.0.0.0"; + sha256 = "1jczx8d4ah74wiishdcv335hlr0330wwq0vfb5rv4gmrvbpkgllf"; + libraryHaskellDepends = [ base ]; + description = "A type class for choosing sentinel-like values"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "noether" = callPackage ({ mkDerivation, array, async, base, bytestring, containers , criterion, deepseq, ghc-prim, hashable, hedgehog, mtl, mtl-compat @@ -169171,8 +170814,8 @@ self: { pname = "number-show"; version = "0.1.0.0"; sha256 = "01lywbcqg46wrd3qy0jikkh1p45yflypf1vcmrw75qpwji2afjry"; - revision = "1"; - editedCabalFile = "0wzim9xpm78rd71jcgfrz427rjvyvrb7qilkcvw78si7mj9wsxcc"; + revision = "2"; + editedCabalFile = "1lsxi6704g6svw0834haggp6j97kb6r51583lr2a3kn1ni2zh60c"; libraryHaskellDepends = [ base microlens microlens-th ]; description = "Flexible and accurate (for a given precision) numerical->string conversion"; license = stdenv.lib.licenses.gpl3; @@ -172316,6 +173959,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "optparse-enum" = callPackage + ({ mkDerivation, base, enum-text, fmt, optparse-applicative, text + }: + mkDerivation { + pname = "optparse-enum"; + version = "1.0.0.0"; + sha256 = "0d3wpfss1nm42hjn8l7x34ksa7yx5ccc4iglbfvln0rkbqdsjh13"; + libraryHaskellDepends = [ + base enum-text fmt optparse-applicative text + ]; + description = "An enum-text based toolkit for optparse-applicative"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "optparse-generic" = callPackage ({ mkDerivation, base, bytestring, Only, optparse-applicative , semigroups, system-filepath, text, time, transformers, void @@ -172984,6 +174643,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "outsort" = callPackage + ({ mkDerivation, async, base, bytestring, conduit + , conduit-algorithms, conduit-combinators, conduit-extra + , containers, deepseq, directory, exceptions, filemanip, filepath + , MissingH, primitive, resourcet, safe, safeio, temporary, text + , transformers, transformers-base, vector, vector-algorithms + }: + mkDerivation { + pname = "outsort"; + version = "0.1.0"; + sha256 = "13iw9hgsmz1j4lm4ahpi9kjgf3pcayll9fpi3fga48474hpz7gff"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + async base bytestring conduit conduit-algorithms + conduit-combinators conduit-extra containers deepseq directory + exceptions filemanip filepath MissingH primitive resourcet safe + safeio temporary text transformers transformers-base vector + vector-algorithms + ]; + description = "External sorting package based on Conduit"; + license = stdenv.lib.licenses.mit; + }) {}; + "overhang" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -173208,6 +174891,8 @@ self: { pname = "packed-multikey-map"; version = "0.1.0.0"; sha256 = "19bh697xazsi22krwjgy83hv1pscnaqx544d5pk0q71wnync5m89"; + revision = "1"; + editedCabalFile = "1z6bx1qga02f33l194k2m45gs9cddq9q7q52b2vhv408n09jixrn"; libraryHaskellDepends = [ base constraints containers QuickCheck transformers vector ]; @@ -174197,8 +175882,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "pandora"; - version = "0.1.7"; - sha256 = "1wmp5c7b9scdrhrh50cpjfpcw1riw4kxs1vy935mzwja1y4zalsj"; + version = "0.2.0"; + sha256 = "0p46z3imh618v7i2734b5nlg9nx3hw4imjchqsx2l7nvkrpkgn64"; description = "A box of patterns and paradigms"; license = stdenv.lib.licenses.mit; }) {}; @@ -174347,6 +176032,60 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "pantry" = callPackage + ({ mkDerivation, aeson, ansi-terminal, array, base, base-orphans + , base64-bytestring, bytestring, Cabal, conduit, conduit-extra + , containers, contravariant, cryptonite, cryptonite-conduit + , deepseq, digest, directory, exceptions, filelock, filepath + , generic-deriving, ghc-prim, hackage-security, hashable, hedgehog + , hpack, hspec, http-client, http-client-tls, http-conduit + , http-download, http-types, integer-gmp, memory, mono-traversable + , mtl, network, network-uri, path, path-io, persistent + , persistent-sqlite, persistent-template, primitive, QuickCheck + , raw-strings-qq, resourcet, rio, rio-orphans, rio-prettyprint + , safe, syb, tar-conduit, template-haskell, text, text-metrics + , th-lift, th-lift-instances, th-orphans, th-reify-many + , th-utilities, time, transformers, unix-compat, unliftio + , unordered-containers, vector, yaml, zip-archive + }: + mkDerivation { + pname = "pantry"; + version = "0.1.1.1"; + sha256 = "082p2shapgnv10qjm77bpn0y6p6582n38xcgirh2l8mhs1yqflyg"; + libraryHaskellDepends = [ + aeson ansi-terminal array base base-orphans base64-bytestring + bytestring Cabal conduit conduit-extra containers contravariant + cryptonite cryptonite-conduit deepseq digest directory filelock + filepath generic-deriving ghc-prim hackage-security hashable hpack + http-client http-client-tls http-conduit http-download http-types + integer-gmp memory mono-traversable mtl network network-uri path + path-io persistent persistent-sqlite persistent-template primitive + resourcet rio rio-orphans rio-prettyprint safe syb tar-conduit + template-haskell text text-metrics th-lift th-lift-instances + th-orphans th-reify-many th-utilities time transformers unix-compat + unliftio unordered-containers vector yaml zip-archive + ]; + testHaskellDepends = [ + aeson ansi-terminal array base base-orphans base64-bytestring + bytestring Cabal conduit conduit-extra containers contravariant + cryptonite cryptonite-conduit deepseq digest directory exceptions + filelock filepath generic-deriving ghc-prim hackage-security + hashable hedgehog hpack hspec http-client http-client-tls + http-conduit http-download http-types integer-gmp memory + mono-traversable mtl network network-uri path path-io persistent + persistent-sqlite persistent-template primitive QuickCheck + raw-strings-qq resourcet rio rio-orphans rio-prettyprint safe syb + tar-conduit template-haskell text text-metrics th-lift + th-lift-instances th-orphans th-reify-many th-utilities time + transformers unix-compat unliftio unordered-containers vector yaml + zip-archive + ]; + description = "Content addressable Haskell package management"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "pantry-tmp" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, base, base-orphans , base64-bytestring, bytestring, Cabal, conduit, conduit-extra @@ -174367,8 +176106,8 @@ self: { pname = "pantry-tmp"; version = "0.1.0.0"; sha256 = "18b2ac5kb6xzkxa2c5hhl6n37npxcxzxghi0p5wnv5rps3ahsmnn"; - revision = "3"; - editedCabalFile = "12k0lqpc530ai9gb1ldx7l62qi86z4qc2s1bzif8fwaflk4c7ax6"; + revision = "4"; + editedCabalFile = "0hiashi78cak635jk74bk6m1dwdgyp8m0j5bzg18i776mb1zn09y"; libraryHaskellDepends = [ aeson ansi-terminal array base base-orphans base64-bytestring bytestring Cabal conduit conduit-extra containers contravariant @@ -174834,6 +176573,17 @@ self: { broken = true; }) {}; + "par-traverse" = callPackage + ({ mkDerivation, base, directory, filepath, parallel-io }: + mkDerivation { + pname = "par-traverse"; + version = "0.2.0.0"; + sha256 = "1cbanrhaad3fq2kkpdkb3rh7c8qrc1v7by8v6mg4lrgghdx3msk8"; + libraryHaskellDepends = [ base directory filepath parallel-io ]; + description = "Traverse a directory in parallel"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "para" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -175481,12 +177231,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "parser-combinators_1_1_0" = callPackage + "parser-combinators_1_2_0" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "parser-combinators"; - version = "1.1.0"; - sha256 = "149yhbnrrl108h1jinrsxni3rwrldhphpk9bbmbpr90q5fbl4xmc"; + version = "1.2.0"; + sha256 = "18kfg4sxighqzd64ad98xhc62sh7pd63pv7xhcj601pw922iappa"; libraryHaskellDepends = [ base ]; description = "Lightweight package providing commonly useful parser combinators"; license = stdenv.lib.licenses.bsd3; @@ -175500,10 +177250,8 @@ self: { }: mkDerivation { pname = "parser-combinators-tests"; - version = "1.1.0"; - sha256 = "0m3xgdi1q3q638zfvgpdqyrhfq9abqwjripvbdx5z9rai4whzqmz"; - revision = "1"; - editedCabalFile = "0adgbzpylvk9p7ylxynsdrmqhhbh5pm8ww1s3nz3czl79y8lhh47"; + version = "1.2.0"; + sha256 = "0ainpyrxm03brn6z27jkqp65rc1z3lza00k6mg10506qk83fa52l"; isLibrary = false; isExecutable = false; testHaskellDepends = [ @@ -176031,6 +177779,8 @@ self: { ]; description = "Terminal-based presentations using Pandoc"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "patch-combinators" = callPackage @@ -176279,8 +178029,8 @@ self: { ({ mkDerivation, base, containers }: mkDerivation { pname = "patience"; - version = "0.2.1.1"; - sha256 = "14d6hkrkbanlv09z7dbg8q7hk5ax5mfpgzr0knmcviq02kmzbs0s"; + version = "0.3"; + sha256 = "1i1b37lgi31c17yrjyf8pdm4nf5lq8vw90z3rri78hf0k66d0p3i"; libraryHaskellDepends = [ base containers ]; description = "Patience diff and longest increasing subsequence"; license = stdenv.lib.licenses.bsd3; @@ -177342,6 +179092,32 @@ self: { broken = true; }) {}; + "perceptual-hash" = callPackage + ({ mkDerivation, base, containers, cpphs, criterion, filepath, hip + , optparse-applicative, par-traverse, pHash, primitive, repa, stm + , vector, vector-algorithms + }: + mkDerivation { + pname = "perceptual-hash"; + version = "0.1.1.0"; + sha256 = "107f5xb4wg4zmwqldw8a04byazqyzd0vkn6zl5iv4f5ii2sdb5yh"; + revision = "1"; + editedCabalFile = "001nr9brgk05bbhz9lw8viqrc6rgfy0rjp08fcdhn302j55j33i3"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base hip primitive repa vector vector-algorithms + ]; + executableHaskellDepends = [ + base containers filepath optparse-applicative par-traverse stm + ]; + benchmarkHaskellDepends = [ base criterion ]; + benchmarkPkgconfigDepends = [ pHash ]; + benchmarkToolDepends = [ cpphs ]; + description = "Find duplicate images"; + license = stdenv.lib.licenses.bsd3; + }) {pHash = null;}; + "perdure" = callPackage ({ mkDerivation, array, base, binary, bytestring, cognimeta-utils , collections-api, comonad-transformers, containers, cryptohash @@ -177468,8 +179244,8 @@ self: { }: mkDerivation { pname = "perfect-vector-shuffle"; - version = "0.1.0"; - sha256 = "1nvwbmfqv9bq6423hxafjrvza6ynj3pry4m5ms1g2yf5vsx47w38"; + version = "0.1.1"; + sha256 = "1r9w8792r25fgyf7q7jdpnw4rmdvrjfg7g4dn2dk1d3gy4lbabig"; libraryHaskellDepends = [ base MonadRandom primitive random vector ]; @@ -177998,6 +179774,8 @@ self: { pname = "persistent-mongoDB"; version = "2.8.0"; sha256 = "12hp7cqdz672r5rhad6xvjpxhrs8v1swiz0d9n7xbn41g11a247l"; + revision = "1"; + editedCabalFile = "06iqf7frc5h7qvxhnxi2zirgspsmafp2ls0jw3ppzb01q0y6mgi4"; libraryHaskellDepends = [ aeson attoparsec base bson bytestring cereal conduit containers http-api-data mongoDB network path-pieces persistent resource-pool @@ -178103,6 +179881,27 @@ self: { broken = true; }) {}; + "persistent-pagination" = callPackage + ({ mkDerivation, base, conduit, containers, esqueleto, foldl, hspec + , hspec-discover, microlens, mtl, persistent, persistent-sqlite + , persistent-template, QuickCheck, time + }: + mkDerivation { + pname = "persistent-pagination"; + version = "0.1.1.0"; + sha256 = "1g2mn2gv9dygx4rrpxi81421dyyy9pdnzrdpqcb5sygcjsqi17ha"; + libraryHaskellDepends = [ + base conduit esqueleto foldl microlens mtl persistent + ]; + testHaskellDepends = [ + base conduit containers esqueleto hspec hspec-discover mtl + persistent persistent-sqlite persistent-template QuickCheck time + ]; + testToolDepends = [ hspec-discover ]; + description = "Efficient and correct pagination for persistent or esqueleto queries"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "persistent-parser" = callPackage ({ mkDerivation, attoparsec, base, hspec, text }: mkDerivation { @@ -178356,7 +180155,7 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {inherit (pkgs) sqlite;}; - "persistent-sqlite_2_10_1" = callPackage + "persistent-sqlite_2_10_4" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , exceptions, fast-logger, hspec, HUnit, microlens-th, monad-logger , persistent, persistent-template, persistent-test, QuickCheck @@ -178366,8 +180165,8 @@ self: { }: mkDerivation { pname = "persistent-sqlite"; - version = "2.10.1"; - sha256 = "1yan8ciljv2kkcxlc9yj97gvlgkzf1ha6369dqnr7fgk1xhr74nz"; + version = "2.10.4"; + sha256 = "0x4b327h2gqhccy7yw5sa8mn8xfc4zb5kqwx98nr9yk7f1s0fr79"; configureFlags = [ "-fsystemlib" ]; isLibrary = true; isExecutable = true; @@ -178414,7 +180213,7 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; - "persistent-template_2_7_1" = callPackage + "persistent-template_2_7_2" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , deepseq, deepseq-generics, file-embed, hspec, http-api-data , monad-control, monad-logger, path-pieces, persistent, QuickCheck @@ -178422,8 +180221,8 @@ self: { }: mkDerivation { pname = "persistent-template"; - version = "2.7.1"; - sha256 = "1yki4dvfk2p5cs2gfdnplsfyb1cxakhrdfjxgdgbnc0xxicbzx42"; + version = "2.7.2"; + sha256 = "04fpxsbj78gy51bl3jcfg70aaha92v0r48bjwq4pg7ln3cic95i8"; libraryHaskellDepends = [ aeson base bytestring containers http-api-data monad-control monad-logger path-pieces persistent template-haskell text @@ -179591,8 +181390,8 @@ self: { }: mkDerivation { pname = "pinboard-notes-backup"; - version = "1.0.4"; - sha256 = "0frlxz9mqd0dypi3f6w926sngwp4jhrz47zr35zdxwrvv64z29g7"; + version = "1.0.4.1"; + sha256 = "1a0lw43pjfz18aplm2frljwaww37pm2ashxi59j6l5n32lg5573j"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -179649,15 +181448,17 @@ self: { "ping" = callPackage ({ mkDerivation, base, cpu, ip, posix-api, primitive - , primitive-containers, stm, transformers + , primitive-addr, primitive-containers, stm, transformers }: mkDerivation { pname = "ping"; - version = "0.1.0.2"; - sha256 = "1cjgs571q5p5r5j94w8cax20r951v08x3cq5a2wd5r852bbgg9ww"; + version = "0.1.0.3"; + sha256 = "1h57p53vakjxm3g6inp9wvj5pp71qb0mpcrxbaa707w8v9lyvwwi"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ - base cpu ip posix-api primitive primitive-containers stm - transformers + base cpu ip posix-api primitive primitive-addr primitive-containers + stm transformers ]; description = "icmp echo requests"; license = stdenv.lib.licenses.bsd3; @@ -179774,6 +181575,27 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "piped" = callPackage + ({ mkDerivation, base, conduit, gauge, microlens-platform, mtl + , quickcheck-instances, tasty, tasty-discover, tasty-golden + , tasty-hunit, tasty-quickcheck + }: + mkDerivation { + pname = "piped"; + version = "0.1.0.0"; + sha256 = "0f7j4mzdcmw7lnmq73hr6wfi64jjg350bmf0w1pf1rgma2wb9cl0"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base mtl ]; + testHaskellDepends = [ + base conduit gauge microlens-platform mtl quickcheck-instances + tasty tasty-discover tasty-golden tasty-hunit tasty-quickcheck + ]; + testToolDepends = [ tasty-discover ]; + description = "Conduit with a smaller core"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "pipeline" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -180344,6 +182166,8 @@ self: { pname = "pipes-group"; version = "1.0.12"; sha256 = "1issfj3syi6lfbcdn3bhlbnlh86s92ldsb04c4ac69xipsgyhwqk"; + revision = "1"; + editedCabalFile = "0ws99n692c9km68n9y3x0b5bqdg3b47sva04nx9a4xdqr8p5akps"; libraryHaskellDepends = [ base free pipes pipes-parse transformers ]; @@ -182299,8 +184123,8 @@ self: { }: mkDerivation { pname = "poly"; - version = "0.3.0.0"; - sha256 = "0kwh1n9b6zh21kg2036v02jpr9xvvay6x72b044j4la65pal5h8i"; + version = "0.3.1.0"; + sha256 = "1c8xnkqxwzbpx01clz9spz9zwa18qhsbvscrc381r0f46cjax2ph"; libraryHaskellDepends = [ base primitive semirings vector vector-algorithms ]; @@ -182477,26 +184301,27 @@ self: { ({ mkDerivation, async, base, containers, criterion, doctest , first-class-families, free, freer-simple, hspec, hspec-discover , inspection-testing, mtl, syb, template-haskell, th-abstraction - , transformers, type-errors, unagi-chan + , transformers, type-errors, type-errors-pretty, unagi-chan }: mkDerivation { pname = "polysemy"; - version = "0.7.0.0"; - sha256 = "0p9f5m2invppncmd1d9sim1kvnzcgramnq3y1vr0bisg02y0c8dc"; + version = "1.0.0.0"; + sha256 = "1y63vwrmmany62ci2sdd8kfmkrigk0vds2kjpxmyh9nsvw5fv576"; libraryHaskellDepends = [ async base containers first-class-families mtl syb template-haskell - th-abstraction transformers type-errors unagi-chan + th-abstraction transformers type-errors type-errors-pretty + unagi-chan ]; testHaskellDepends = [ async base containers doctest first-class-families hspec inspection-testing mtl syb template-haskell th-abstraction - transformers type-errors unagi-chan + transformers type-errors type-errors-pretty unagi-chan ]; testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ async base containers criterion first-class-families free freer-simple mtl syb template-haskell th-abstraction transformers - type-errors unagi-chan + type-errors type-errors-pretty unagi-chan ]; description = "Higher-order, low-boilerplate, zero-cost free monads"; license = stdenv.lib.licenses.bsd3; @@ -182551,21 +184376,21 @@ self: { }) {}; "polysemy-zoo" = callPackage - ({ mkDerivation, base, constraints, containers, hspec - , hspec-discover, mtl, polysemy, polysemy-plugin, random - , reflection, text + ({ mkDerivation, async, base, binary, bytestring, constraints + , containers, ghc-prim, hedis, hspec, hspec-discover, mtl, polysemy + , polysemy-plugin, random, reflection }: mkDerivation { pname = "polysemy-zoo"; - version = "0.3.0.0"; - sha256 = "1ww5qsxpz1h5jb1444fm2hnzkikcpnpf7gw4v1vkn8bh6cnmpxfy"; + version = "0.5.0.1"; + sha256 = "06ggm3qinabwp5bha858anwdvw726wzl738wpgf1kd9mgivbv53w"; libraryHaskellDepends = [ - base constraints containers mtl polysemy polysemy-plugin random - reflection + async base binary bytestring constraints containers ghc-prim hedis + mtl polysemy polysemy-plugin random reflection ]; testHaskellDepends = [ - base constraints containers hspec mtl polysemy polysemy-plugin - random reflection text + async base binary bytestring constraints containers ghc-prim hedis + hspec mtl polysemy polysemy-plugin random reflection ]; testToolDepends = [ hspec-discover ]; description = "Experimental, user-contributed effects and interpreters for polysemy"; @@ -183129,12 +184954,14 @@ self: { }: mkDerivation { pname = "posix-api"; - version = "0.3.0.0"; - sha256 = "172271qakd2w8hg68m57p8avwwb2cm8hds0qzq53559p2n1z69xq"; + version = "0.3.2.0"; + sha256 = "1ki45p31cc1zplzsi9kln85rm556rwk5yvwgsb75bcgqwg6xpcl8"; libraryHaskellDepends = [ base primitive primitive-addr primitive-offset primitive-unlifted ]; - testHaskellDepends = [ base primitive tasty tasty-hunit ]; + testHaskellDepends = [ + base primitive primitive-unlifted tasty tasty-hunit + ]; description = "posix bindings"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -183530,8 +185357,8 @@ self: { }: mkDerivation { pname = "postgresql-lo-stream"; - version = "0.1.1.0"; - sha256 = "196f6lz8i8y0cfnd4lqjky69wpi0mc2jfs7jz5v0j3r15jbs5212"; + version = "0.1.1.1"; + sha256 = "0m2s717qb42ywiqvdi18nybjadkivygfi2pbflip5rvphqfc8k8x"; libraryHaskellDepends = [ base bytestring io-streams lifted-base monad-loops mtl postgresql-simple @@ -183717,6 +185544,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "postgresql-simple-named" = callPackage + ({ mkDerivation, base, bytestring, doctest, Glob, hspec, mtl + , postgresql-simple, resource-pool, text, transformers + }: + mkDerivation { + pname = "postgresql-simple-named"; + version = "0.0.1.0"; + sha256 = "1lp7bq7w3l127cb4js3gmmp8c9nvxabs64c200c73lqg5mw9fkfp"; + libraryHaskellDepends = [ + base bytestring mtl postgresql-simple text + ]; + testHaskellDepends = [ + base bytestring doctest Glob hspec postgresql-simple resource-pool + transformers + ]; + description = "Implementation of named parameters for `postgresql-simple` library"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "postgresql-simple-opts" = callPackage ({ mkDerivation, base, bytestring, data-default, either , generic-deriving, hspec, optparse-applicative, optparse-generic @@ -184457,6 +186305,8 @@ self: { pname = "pragmatic-show"; version = "0.1.2.0"; sha256 = "1nkwimmnk10p0pnv2hr3mxgfs1r2rjfhiaccmhd68a6279whp6p7"; + revision = "1"; + editedCabalFile = "17rs7ms62aisnk5wsdp67v3cgv5ph734iswv7137ibv339dlkl82"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck vector-space @@ -185590,8 +187440,8 @@ self: { ({ mkDerivation, base, primitive }: mkDerivation { pname = "primitive-addr"; - version = "0.1.0.1"; - sha256 = "01gr75k2j60dgs711w1s9r201ndapqlwapznrvd3cm6r4rm3i54i"; + version = "0.1.0.2"; + sha256 = "06r1p56wm8rbjxnlaqbmc3rbsj1rsv5scwnh80lsn0xw56jc70a2"; libraryHaskellDepends = [ base primitive ]; description = "Addresses to unmanaged memory"; license = stdenv.lib.licenses.bsd3; @@ -186441,8 +188291,8 @@ self: { pname = "product-profunctors"; version = "0.10.0.0"; sha256 = "0s0ssl2900r16992mgl0idkryg3l7psp8nljyg9brr7fqa3pd3dd"; - revision = "1"; - editedCabalFile = "17zi38fzg7yf9i5da2hlch6jw2qhmjcvs9wwkhyvra520605mlya"; + revision = "2"; + editedCabalFile = "0sarkc9sch60f5j1xjy30yrgycvmp5bqx1iynmlsfzdx7rvk5s29"; libraryHaskellDepends = [ base bifunctors contravariant profunctors tagged template-haskell ]; @@ -187120,8 +188970,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "5.9.0"; - sha256 = "1hgqq782qyqdnr86cx7xc063ksqyq37pwf58jz2g0rn3sk8qmv1i"; + version = "5.9.1"; + sha256 = "1v4cpj4kbmhl4xkxm7gxm2z9pqf6zmr4psawaxixvsav6xpxgphr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -188670,8 +190520,8 @@ self: { }: mkDerivation { pname = "purebred-email"; - version = "0.1.0.1"; - sha256 = "0igjid6rfg13bhgkm51np0ml2sfnkg5a6z3231mmiynkdja7l5zl"; + version = "0.2.0.0"; + sha256 = "1jjdia8qlwdibmfrqasyvm6qq01pxc9r66qmbyjmhz9bhdkqdd61"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -190248,8 +192098,8 @@ self: { }: mkDerivation { pname = "quickcheck-arbitrary-template"; - version = "0.2.0.0"; - sha256 = "1bn0g3gg7cpjwap1vgvahw91yjn0v8sy1hiy60w54gdg5rrll5j9"; + version = "0.2.1.0"; + sha256 = "1g9b39bhjcx44l8mwj5hwbjkd575prd46v16jz895q4f3ibqnfvp"; libraryHaskellDepends = [ base QuickCheck safe template-haskell ]; testHaskellDepends = [ base QuickCheck safe tasty tasty-golden tasty-hunit @@ -191835,10 +193685,8 @@ self: { ({ mkDerivation, base, hmatrix, mtl, random-fu }: mkDerivation { pname = "random-fu-multivariate"; - version = "0.1.2.0"; - sha256 = "11hss3d1aa917g7w7k76zcakk82ras3046vb768yh5kayrb6a347"; - revision = "2"; - editedCabalFile = "13frafm1fdlgir64qsqy97158mv5chx98y23pdzdqiannf10w4by"; + version = "0.1.2.1"; + sha256 = "01r3jgjmhcj7wrc9ighwm0sbndsrz92l20gxh9p4rm2l90n0vxqc"; libraryHaskellDepends = [ base hmatrix mtl random-fu ]; testHaskellDepends = [ base ]; description = "Multivariate distributions for random-fu"; @@ -192064,6 +193912,24 @@ self: { broken = true; }) {}; + "range-set-list_0_1_3_1" = callPackage + ({ mkDerivation, base, containers, deepseq, hashable, tasty + , tasty-quickcheck + }: + mkDerivation { + pname = "range-set-list"; + version = "0.1.3.1"; + sha256 = "0m8c8qhpk9vaykqfy6gsv1csmvdclm27zv9l56ipv152k75xks0j"; + libraryHaskellDepends = [ base containers deepseq hashable ]; + testHaskellDepends = [ + base containers deepseq hashable tasty tasty-quickcheck + ]; + description = "Memory efficient sets with ranges of elements"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "range-space" = callPackage ({ mkDerivation, base, QuickCheck, semigroups, test-framework , test-framework-quickcheck2, time, vector-space @@ -192535,6 +194401,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ratel-wai_1_1_0" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, containers + , http-client, ratel, wai + }: + mkDerivation { + pname = "ratel-wai"; + version = "1.1.0"; + sha256 = "1wgmlcazfbz4y4q9k6367i76l8cal1qgqhqbh2p69ca365w9pf56"; + libraryHaskellDepends = [ + base bytestring case-insensitive containers http-client ratel wai + ]; + description = "Notify Honeybadger about exceptions via a WAI middleware"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rating-chgk-info" = callPackage ({ mkDerivation, aeson, base-noprelude, bytestring, cassava , containers, directory, gauge, http-client, http-client-tls, iconv @@ -193571,23 +195453,23 @@ self: { }) {}; "readme-lhs" = callPackage - ({ mkDerivation, attoparsec, base, containers, filepath, foldl - , HUnit, optparse-applicative, protolude, tasty, tasty-hunit, text + ({ mkDerivation, base, containers, doctest, optparse-generic + , pandoc, pandoc-types, protolude, tasty, text }: mkDerivation { pname = "readme-lhs"; - version = "0.1.0.0"; - sha256 = "1pn0an37w4kgcn93a6qm0jxqsj882mhjwrnvl7hc5vp1960nqs6j"; + version = "0.2.0"; + sha256 = "0xwc2gqf23g87mi16miyi0nxy4wh33rki324biv3wh7xbpj03kpx"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ attoparsec base foldl protolude text ]; - executableHaskellDepends = [ - base containers filepath foldl optparse-applicative protolude text + libraryHaskellDepends = [ + base containers pandoc pandoc-types protolude text ]; - testHaskellDepends = [ - base HUnit protolude tasty tasty-hunit text + executableHaskellDepends = [ + base optparse-generic pandoc protolude ]; - description = "See readme.lhs"; + testHaskellDepends = [ base doctest protolude tasty ]; + description = "See readme.md"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -194108,8 +195990,8 @@ self: { }: mkDerivation { pname = "red-black-record"; - version = "2.0.2.2"; - sha256 = "1afmqdgd0xhawjckjz318561zsr478a7jkpr20l7alic6zxnl4z9"; + version = "2.0.4.0"; + sha256 = "1wcg8a3aql1jmnfl7q5gzjgxl4z6780zgp8w10v3g52ilcdq4myn"; libraryHaskellDepends = [ base sop-core ]; testHaskellDepends = [ aeson base bytestring doctest profunctors sop-core tasty @@ -194548,8 +196430,8 @@ self: { }: mkDerivation { pname = "refined"; - version = "0.4.2.1"; - sha256 = "0p74hqmlx0ns8zjn689ngfjn4y5rvap5fza0p9mpx7107bskdf9d"; + version = "0.4.2.2"; + sha256 = "1gdfhmj8f1abxflxmqyfibz0hdaayr932f04vchygdvdb812av60"; libraryHaskellDepends = [ aeson base deepseq exceptions mtl prettyprinter QuickCheck template-haskell transformers @@ -194601,26 +196483,27 @@ self: { }) {}; "reflex" = callPackage - ({ mkDerivation, base, bifunctors, comonad, containers, criterion - , data-default, deepseq, dependent-map, dependent-sum, directory - , exception-transformers, filemanip, filepath, haskell-src-exts - , haskell-src-meta, hlint, lens, loch-th, MemoTrie, monad-control - , monoidal-containers, mtl, prim-uniq, primitive, process, random - , ref-tf, reflection, semigroupoids, semigroups, split, stm, syb + ({ mkDerivation, base, bifunctors, comonad, constraints-extras + , containers, criterion, data-default, deepseq, dependent-map + , dependent-sum, directory, exception-transformers, filemanip + , filepath, haskell-src-exts, haskell-src-meta, hlint, lens + , loch-th, MemoTrie, monad-control, monoidal-containers, mtl + , prim-uniq, primitive, process, profunctors, random, ref-tf + , reflection, semigroupoids, semigroups, split, stm, syb , template-haskell, these, time, transformers, transformers-compat , unbounded-delays, witherable }: mkDerivation { pname = "reflex"; - version = "0.6.1"; - sha256 = "1ggp2bpil2ig6rs45fn754kpqnp45lp069nc6ib4isj0dgzb9gpn"; + version = "0.6.2.1"; + sha256 = "0s8saim58bqqhg1nbrrdw2blnph7jrhqw97wxf73g4r1d8jacg3z"; libraryHaskellDepends = [ - base bifunctors comonad containers data-default dependent-map - dependent-sum exception-transformers haskell-src-exts + base bifunctors comonad constraints-extras containers data-default + dependent-map dependent-sum exception-transformers haskell-src-exts haskell-src-meta lens MemoTrie monad-control monoidal-containers - mtl prim-uniq primitive random ref-tf reflection semigroupoids - semigroups stm syb template-haskell these time transformers - transformers-compat unbounded-delays witherable + mtl prim-uniq primitive profunctors random ref-tf reflection + semigroupoids semigroups stm syb template-haskell these time + transformers transformers-compat unbounded-delays witherable ]; testHaskellDepends = [ base bifunctors containers deepseq dependent-map dependent-sum @@ -194633,6 +196516,8 @@ self: { ]; description = "Higher-order Functional Reactive Programming"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "reflex-animation" = callPackage @@ -194693,6 +196578,8 @@ self: { executableHaskellDepends = [ base mtl reflex ]; description = "A basic `reflex` host for backend work"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "reflex-dom" = callPackage @@ -194808,16 +196695,18 @@ self: { }) {}; "reflex-dom-helpers" = callPackage - ({ mkDerivation, base, reflex, reflex-dom, template-haskell }: + ({ mkDerivation, base, reflex, reflex-dom-core, template-haskell + , text + }: mkDerivation { pname = "reflex-dom-helpers"; - version = "0.1.0.0"; - sha256 = "0fzvw9wd8465a0i0qnvnqngfs2fql13skxsrr9m1qivr3n3h7jhi"; + version = "0.2.0.1"; + sha256 = "1c0sa8i4rln7whmivmwlmivrj8zc45v25zsi1qwqx5d00mjbmkyk"; libraryHaskellDepends = [ - base reflex reflex-dom template-haskell + base reflex reflex-dom-core template-haskell text ]; testHaskellDepends = [ base ]; - description = "Element tag helpers for working with reflex-dom"; + description = "Html tag helpers for reflex-dom"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -194958,6 +196847,29 @@ self: { broken = true; }) {}; + "reflex-vty" = callPackage + ({ mkDerivation, base, bimap, containers, data-default + , dependent-map, dependent-sum, exception-transformers, mtl + , primitive, ref-tf, reflex, stm, text, time, transformers, vty + }: + mkDerivation { + pname = "reflex-vty"; + version = "0.1.1.0"; + sha256 = "1nhi33d0yqx2pjccrcbsgwp2l56sdmqpl11vpvkvx4wkxckyz2qf"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bimap containers data-default dependent-map dependent-sum + exception-transformers mtl primitive ref-tf reflex stm text time + transformers vty + ]; + executableHaskellDepends = [ + base containers reflex text time transformers vty + ]; + description = "Reflex FRP host and widgets for vty applications"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "reform" = callPackage ({ mkDerivation, base, containers, mtl, semigroups, text }: mkDerivation { @@ -195021,6 +196933,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "reform-lucid" = callPackage + ({ mkDerivation, base, lucid, path-pieces, reform, text }: + mkDerivation { + pname = "reform-lucid"; + version = "0.1.0.0"; + sha256 = "1a3jfk0i87vqwxxlspzy44lf2i3bxxxy20pnbysczzf8i113y9zi"; + libraryHaskellDepends = [ base lucid path-pieces reform text ]; + description = "Add support for using lucid with Reform"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "reformat" = callPackage ({ mkDerivation, base, parsec }: mkDerivation { @@ -195820,8 +197743,8 @@ self: { }: mkDerivation { pname = "registry-hedgehog"; - version = "0.2.0.3"; - sha256 = "138x33b9sficpy20dvcayf9isilv9crng2d46m2gh7ckidw94ghp"; + version = "0.2.1.0"; + sha256 = "1gx7grxy7p08bbvmxrhr3ciw9jg7isz3xsa2ha3s3pg4ifas4g59"; libraryHaskellDepends = [ base containers hedgehog mmorph multimap protolude registry tasty tasty-discover tasty-hedgehog tasty-th template-haskell text @@ -196096,6 +198019,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "relational-query_0_12_2_2" = callPackage + ({ mkDerivation, array, base, bytestring, containers, dlist + , names-th, persistable-record, product-isomorphic + , quickcheck-simple, sql-words, template-haskell, text + , th-reify-compat, time, time-locale-compat, transformers + }: + mkDerivation { + pname = "relational-query"; + version = "0.12.2.2"; + sha256 = "0768cw6c5chzdcwshjjniysik5d1yj7zvhwncqnn0wgy4gp6kzjv"; + libraryHaskellDepends = [ + array base bytestring containers dlist names-th persistable-record + product-isomorphic sql-words template-haskell text th-reify-compat + time time-locale-compat transformers + ]; + testHaskellDepends = [ + base containers product-isomorphic quickcheck-simple transformers + ]; + description = "Typeful, Modular, Relational, algebraic query engine"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "relational-query-HDBC" = callPackage ({ mkDerivation, base, containers, convertible, dlist, HDBC , HDBC-session, names-th, persistable-record, product-isomorphic @@ -198764,6 +200710,8 @@ self: { ]; description = "Quick metrics to grow your app strong"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ridley-extras" = callPackage @@ -198781,6 +200729,8 @@ self: { testHaskellDepends = [ base ]; description = "Handy metrics that don't belong to ridley"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "riemann" = callPackage @@ -198903,7 +200853,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "rio_0_1_10_0" = callPackage + "rio_0_1_11_0" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, directory , exceptions, filepath, hashable, hspec, microlens, mtl, primitive , process, QuickCheck, text, time, typed-process, unix, unliftio @@ -198911,8 +200861,8 @@ self: { }: mkDerivation { pname = "rio"; - version = "0.1.10.0"; - sha256 = "1jhiy139jl8rc8j4fwl76k1w8mrmmjszhsja7xcs8n2nxr13cb2g"; + version = "0.1.11.0"; + sha256 = "17p3zr1fncwqc1rz181mfbxi9dlyd2cd8xcxhnxm3fgnq6i9cj4l"; libraryHaskellDepends = [ base bytestring containers deepseq directory exceptions filepath hashable microlens mtl primitive process text time typed-process @@ -198957,8 +200907,8 @@ self: { pname = "rio-prettyprint"; version = "0.1.0.0"; sha256 = "0n8ldc73i0954c6s8jh0hibxrisp84yh5pcxv3x3q0wg4v2xvr0m"; - revision = "1"; - editedCabalFile = "0ya7i766srm62p19idm7lwwfk01b81f8795q7jqqwl7rwk5rcdag"; + revision = "2"; + editedCabalFile = "1hvhjqy7kfk7fglx1rw8axscy0dfzqwd1564awnwdhvmf8silkkn"; libraryHaskellDepends = [ aeson annotated-wl-pprint ansi-terminal array base Cabal colour mtl path rio text @@ -199736,15 +201686,16 @@ self: { "ron" = callPackage ({ mkDerivation, aeson, attoparsec, base, binary, bytestring , containers, criterion, deepseq, hashable, integer-gmp, mtl - , template-haskell, text, time, unordered-containers + , scientific, template-haskell, text, time, unordered-containers }: mkDerivation { pname = "ron"; - version = "0.6"; - sha256 = "022ilxpk9axw41d1cmlgdsgc3c7ss6a0j6a1w10l81g56xlpi67z"; + version = "0.7"; + sha256 = "1bh4vdq9nwi5kwfa2qly1n0jfnphy17b8svd1k3jdzjfclwrjpgj"; libraryHaskellDepends = [ aeson attoparsec base binary bytestring containers hashable - integer-gmp mtl template-haskell text time unordered-containers + integer-gmp mtl scientific template-haskell text time + unordered-containers ]; benchmarkHaskellDepends = [ base criterion deepseq integer-gmp ]; description = "RON"; @@ -199757,8 +201708,8 @@ self: { }: mkDerivation { pname = "ron-rdt"; - version = "0.6"; - sha256 = "0npd4fh3flywfrpnwfsfpss4zbzd9jj9xsbpxlcc4hhjh45x1b6b"; + version = "0.7"; + sha256 = "1fcvsirzhwmkzcsdr0bhipqq7k7wsg1cjb6z3q4sjihcq9qp22gq"; libraryHaskellDepends = [ base containers Diff hashable integer-gmp mtl ron text time transformers unordered-containers @@ -199774,8 +201725,8 @@ self: { }: mkDerivation { pname = "ron-schema"; - version = "0.6"; - sha256 = "07nn74vwx26flam7klwfvj4yz5mqh8d5flf5ps7wxxfn70z3g4yg"; + version = "0.7"; + sha256 = "12vnzmsj6vxvr26x7a9vvp025dxn9jlyi40hgpydpyg9dmjbs246"; libraryHaskellDepends = [ base bytestring containers hedn integer-gmp megaparsec mtl ron ron-rdt template-haskell text transformers @@ -199791,8 +201742,8 @@ self: { }: mkDerivation { pname = "ron-storage"; - version = "0.7"; - sha256 = "0wqvbnylz2wx85c7qfqzima3axif6r65vc0iwl8lrmxpif2zs41c"; + version = "0.8"; + sha256 = "1326r8x3m4x1ylf32x66h9s6y7z4hwrwah33kkshj656f3f4bnds"; libraryHaskellDepends = [ base bytestring containers directory filepath integer-gmp mtl network-info ron ron-rdt stm text transformers @@ -200700,8 +202651,8 @@ self: { }: mkDerivation { pname = "ruby-marshal"; - version = "0.1.2"; - sha256 = "13s017sqim92yz9r3x8zc4by1hksncikavsn12kf42vv58k95g1p"; + version = "0.1.3"; + sha256 = "0syjd9fmp55cfkq1kb78pvx0vg9dk43s5w4q2a8ndd1fkg194jwx"; libraryHaskellDepends = [ base bytestring cereal containers mtl string-conv vector ]; @@ -201663,64 +203614,66 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "salak_0_2_9_3" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, containers - , data-default, directory, filepath, hspec, menshen, mtl, pqueue - , QuickCheck, scientific, text, time, unliftio-core + "salak_0_3_3" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, data-default + , directory, exceptions, filepath, hashable, heaps, hspec, menshen + , mtl, QuickCheck, random, scientific, text, time, unliftio-core + , unordered-containers }: mkDerivation { pname = "salak"; - version = "0.2.9.3"; - sha256 = "0y1p2cf8bpglqf20a16d2h5xfknzz6wcdgwv6mamh24mdqv0c3rn"; + version = "0.3.3"; + sha256 = "1jq9vngi03wqcvfb1r9ndg4w1vipgbhbzdyybkpj4hmc074l1079"; libraryHaskellDepends = [ - attoparsec base bytestring containers data-default directory - filepath menshen mtl pqueue scientific text time unliftio-core + attoparsec base bytestring data-default directory exceptions + filepath hashable heaps menshen mtl scientific text time + unliftio-core unordered-containers ]; testHaskellDepends = [ - attoparsec base bytestring containers data-default directory - filepath hspec menshen mtl pqueue QuickCheck scientific text time - unliftio-core + attoparsec base bytestring data-default directory exceptions + filepath hashable heaps hspec menshen mtl QuickCheck random + scientific text time unliftio-core unordered-containers ]; - description = "Configuration Loader"; - license = stdenv.lib.licenses.bsd3; + description = "Configuration (re)Loader and Parser"; + license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; "salak-toml" = callPackage - ({ mkDerivation, base, hspec, mtl, QuickCheck, salak, text, time - , tomland, unordered-containers + ({ mkDerivation, base, exceptions, hspec, mtl, QuickCheck, salak + , text, time, tomland, unordered-containers }: mkDerivation { pname = "salak-toml"; - version = "0.2.9.3"; - sha256 = "1hb5ddm7a9acwri730w50p14vyk6z8q1wnx2b87386d80am5mbpy"; + version = "0.3.3"; + sha256 = "0961xwj928map27az5qlp86wxg5jj6kq9cxqhbmcyl7m1cic91dy"; libraryHaskellDepends = [ - base mtl salak text time tomland unordered-containers + base salak text time tomland unordered-containers ]; testHaskellDepends = [ - base hspec mtl QuickCheck salak text time tomland + base exceptions hspec mtl QuickCheck salak text time tomland unordered-containers ]; description = "Configuration Loader for toml"; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; "salak-yaml" = callPackage - ({ mkDerivation, base, conduit, hspec, libyaml, mtl, QuickCheck - , salak, text + ({ mkDerivation, base, conduit, exceptions, hspec, libyaml, mtl + , QuickCheck, salak, text }: mkDerivation { pname = "salak-yaml"; - version = "0.2.9.3"; - sha256 = "0jjmw923zvm349q318iw7y5lfqhbr85xgp6ai3xx5w5d4mcb2f32"; + version = "0.3.3"; + sha256 = "038pfna1jijw6vf8b89ql4f4987s60lpj90nlny66wxkj4b2nbrq"; libraryHaskellDepends = [ base conduit libyaml salak text ]; testHaskellDepends = [ - base conduit hspec libyaml mtl QuickCheck salak text + base conduit exceptions hspec libyaml mtl QuickCheck salak text ]; description = "Configuration Loader for yaml"; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; @@ -203176,8 +205129,8 @@ self: { }: mkDerivation { pname = "scidb-hquery"; - version = "2.8.0.432"; - sha256 = "0swjsgf84kwkzv7nwrnrzlpxbhdvi3i5pnnjrlgql9x4c30bqw6i"; + version = "2.8.0.434"; + sha256 = "0q994ac1krcw312nklxxjr9d4r231s50lb2crbpph1swv6h8jwrq"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; @@ -203498,6 +205451,21 @@ self: { broken = true; }) {}; + "scotty-form" = callPackage + ({ mkDerivation, base, ditto, ditto-lucid, lucid, scotty, text }: + mkDerivation { + pname = "scotty-form"; + version = "0.1.0.0"; + sha256 = "0ks11rav9x52lq27mr12qlygg6yl9wl87fqa28jbz084fwn97w44"; + libraryHaskellDepends = [ + base ditto ditto-lucid lucid scotty text + ]; + description = "Html form validation using `ditto`"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "scotty-format" = callPackage ({ mkDerivation, aeson, base, http-media, http-types, scotty, text }: @@ -204205,8 +206173,8 @@ self: { }: mkDerivation { pname = "sdr"; - version = "0.1.0.11"; - sha256 = "0gkf7ql1a40vpb4qaivcyygvlykp4whljmhp2jy37bk56zr45yvv"; + version = "0.1.0.12"; + sha256 = "0nikrpcyb5mihc70cfvxy24bl80jjnabc8dc8y056yx54759jkk8"; libraryHaskellDepends = [ array base bytestring cairo cereal Chart Chart-cairo colour containers Decimal dynamic-graph fftwRaw GLFW-b mwc-random OpenGL @@ -205680,6 +207648,8 @@ self: { pname = "serialise"; version = "0.2.1.0"; sha256 = "19ary6ivzk8z7wcxhm860qmh7pwqj0qjqzav1h42y85l608zqgh4"; + revision = "1"; + editedCabalFile = "1rknhad1i8bpknsnphmcmb6dnb48c2p2c13ia2qqch3hkhsvfpr6"; libraryHaskellDepends = [ array base bytestring cborg containers ghc-prim half hashable primitive text time unordered-containers vector @@ -205850,7 +207820,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant_0_16_1" = callPackage + "servant_0_16_2" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat, bifunctors , bytestring, Cabal, cabal-doctest, case-insensitive, deepseq , doctest, hspec, hspec-discover, http-api-data, http-media @@ -205860,8 +207830,8 @@ self: { }: mkDerivation { pname = "servant"; - version = "0.16.1"; - sha256 = "1v63b3ng1zck4jw79ijjv4vvsm8w1c8vz4c0dd8sklpkcrfbpxam"; + version = "0.16.2"; + sha256 = "0yzl1yklbbymlh8jdc4ncrdxkalx2z349v4msbd6wxxrxfkxbz6n"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson attoparsec base base-compat bifunctors bytestring @@ -207862,7 +209832,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant-server_0_16_1" = callPackage + "servant-server_0_16_2" = callPackage ({ mkDerivation, aeson, base, base-compat, base64-bytestring , bytestring, Cabal, cabal-doctest, containers, directory, doctest , exceptions, filepath, hspec, hspec-discover, hspec-wai @@ -207874,8 +209844,8 @@ self: { }: mkDerivation { pname = "servant-server"; - version = "0.16.1"; - sha256 = "1zkx6ipz4ay64jdvqxhhrq2sfxj6d6ma8z4cxwpascnawhjqjpq7"; + version = "0.16.2"; + sha256 = "1l4kgjg5z775bi76hy7cb70qwvmkai4rxqkgp0ildsjgsvf8qb80"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -209078,8 +211048,8 @@ self: { }: mkDerivation { pname = "sexp-grammar"; - version = "2.0.2"; - sha256 = "1cmn5y72wp9dlzqzrv4rmfb1zm3zw517la0kf0vgyv3nhsn58397"; + version = "2.1.0"; + sha256 = "139sqr50bba74h2r6gdivzsgkqjwq1gcah54zw2jkwzhlfk03fm1"; libraryHaskellDepends = [ array base bytestring containers deepseq invertible-grammar prettyprinter recursion-schemes scientific semigroups text @@ -211023,6 +212993,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "silently_1_2_5_1" = callPackage + ({ mkDerivation, base, deepseq, directory, nanospec, temporary }: + mkDerivation { + pname = "silently"; + version = "1.2.5.1"; + sha256 = "1lgs1gsr5dp0x21diqn4l03fxgai2kgdmj85gqp0iz3zykvbmjbz"; + libraryHaskellDepends = [ base deepseq directory ]; + testHaskellDepends = [ base deepseq directory nanospec temporary ]; + description = "Prevent or capture writing to stdout and other handles"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "silvi" = callPackage ({ mkDerivation, attoparsec, base, bytestring, chronos, http-types , ip, quantification, savage, text @@ -211083,8 +213066,8 @@ self: { }: mkDerivation { pname = "simple"; - version = "0.11.2"; - sha256 = "05069qjgzm4j22p0q6i75qpsvzpw52b7bh2x2b6jcxnlvqp6flzg"; + version = "0.11.3"; + sha256 = "0qifp6wacsmykb09ddx03yv4pbk7c1rhs16jjlfafm2wc2025rac"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -211206,6 +213189,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "simple-cabal_0_0_0_1" = callPackage + ({ mkDerivation, base, Cabal, directory, filepath }: + mkDerivation { + pname = "simple-cabal"; + version = "0.0.0.1"; + sha256 = "17v22v9sb8z2jbr76vv577hxcvypfkpmji2k8yzwd2kxjssxpjrn"; + libraryHaskellDepends = [ base Cabal directory filepath ]; + description = "Cabal file wrapper library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "simple-cmd" = callPackage ({ mkDerivation, base, directory, filepath, process, unix }: mkDerivation { @@ -211860,8 +213855,8 @@ self: { }: mkDerivation { pname = "simple-templates"; - version = "0.8.0.1"; - sha256 = "13na1f29fvc0j452kh0a3fjig3fq4qbklcpdv6bm1fr0cf8hzq98"; + version = "0.9.0.0"; + sha256 = "09s81syr45dvrqski4gz96ynmv8gb3zwyy4n6a7frv49z843phda"; libraryHaskellDepends = [ aeson attoparsec base scientific text unordered-containers vector ]; @@ -212862,7 +214857,7 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "skylighting_0_8_1_1" = callPackage + "skylighting_0_8_2" = callPackage ({ mkDerivation, aeson, ansi-terminal, attoparsec, base , base64-bytestring, binary, blaze-html, bytestring , case-insensitive, colour, containers, directory, filepath, hxt @@ -212871,8 +214866,8 @@ self: { }: mkDerivation { pname = "skylighting"; - version = "0.8.1.1"; - sha256 = "0q1zkb053szbgx3lqpmllxas0krb9m425qi0aplffhdqwmd05w8w"; + version = "0.8.2"; + sha256 = "0a81hd4f0xlc8as5lh454gkbyxndaxyj7lblkfk92j173nyx69cz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -212918,7 +214913,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "skylighting-core_0_8_1_1" = callPackage + "skylighting-core_0_8_2" = callPackage ({ mkDerivation, aeson, ansi-terminal, attoparsec, base , base64-bytestring, binary, blaze-html, bytestring , case-insensitive, colour, containers, criterion, Diff, directory @@ -212928,8 +214923,8 @@ self: { }: mkDerivation { pname = "skylighting-core"; - version = "0.8.1.1"; - sha256 = "1klk9jlnyz5ciz2gm1dx5mh85nkvz6y1xsflvyf45c2gw9grc2km"; + version = "0.8.2"; + sha256 = "1nd11170r7xwv0hy21bx9nz7173ijbqkh7r8504ixjkwckgr2zs0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -213375,19 +215370,22 @@ self: { }) {}; "small-bytearray-builder" = callPackage - ({ mkDerivation, base, byteslice, primitive, primitive-offset - , QuickCheck, run-st, tasty, tasty-quickcheck, vector + ({ mkDerivation, base, byteslice, bytestring, gauge, primitive + , primitive-offset, QuickCheck, run-st, tasty, tasty-quickcheck + , vector }: mkDerivation { pname = "small-bytearray-builder"; - version = "0.1.0.0"; - sha256 = "1dsjvgl15wbja1fzm1sawqavvijkmaqidfaqk9qgp42kifhh0hzh"; + version = "0.1.1.0"; + sha256 = "1i3b77mczfy9f0gp5ckqln1vdhnqflz8lajfiygx5spxf9kraf9d"; libraryHaskellDepends = [ base byteslice primitive primitive-offset run-st vector ]; testHaskellDepends = [ - base byteslice primitive QuickCheck tasty tasty-quickcheck vector + base byteslice bytestring primitive QuickCheck tasty + tasty-quickcheck vector ]; + benchmarkHaskellDepends = [ base gauge primitive ]; description = "Serialize to a small byte arrays"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -214686,6 +216684,8 @@ self: { pname = "snaplet-customauth"; version = "0.1.2"; sha256 = "0y1a8c9j1q1pzby5v4ajnafm6dr9fvxvvkiynvscyjsf73gp2myb"; + revision = "1"; + editedCabalFile = "1dh8vmrnndg06l5yr3fbmxlzf164nvcy923mafc624bxcr6iip9f"; libraryHaskellDepends = [ aeson base base64-bytestring binary binary-orphans bytestring configurator containers errors heist hoauth2 http-client @@ -215946,8 +217946,10 @@ self: { }: mkDerivation { pname = "sockets"; - version = "0.4.0.0"; - sha256 = "0xv8341kvy6br88lj4g17hqci9sn8qbm063iv69gmfbyp5x7fs9d"; + version = "0.5.0.0"; + sha256 = "0pxrdxmiqyp5xs24sp22b4rldhzm1rahkdq5lc24m30g4p609xa3"; + revision = "1"; + editedCabalFile = "1ji60m0wj3jwdfwdjaxzic41rwdnq72m9xspn64f66c872lx137d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -215956,7 +217958,7 @@ self: { ]; testHaskellDepends = [ async base byteslice bytestring ip primitive primitive-addr - primitive-unlifted tasty tasty-hunit + primitive-unlifted stm tasty tasty-hunit ]; benchmarkHaskellDepends = [ base byteslice bytestring entropy ip primitive @@ -216277,6 +218279,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "sortee" = callPackage + ({ mkDerivation, base, hspec, HUnit, QuickCheck }: + mkDerivation { + pname = "sortee"; + version = "0.1.0.1"; + sha256 = "0lnjxryiqnkmsdqjam37ld1xqk50l3qh6lmmpsw5fnw48c8hlyzs"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec HUnit QuickCheck ]; + description = "Generate string for sort key"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "sorting" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -216845,8 +218859,8 @@ self: { pname = "spatial-rotations"; version = "0.1.0.1"; sha256 = "02nysw4dbg5l37j83kdybxkrdzgjxn20h3lknnphwz0hr0n489ii"; - revision = "2"; - editedCabalFile = "174y0jgf9bxqsc895f984q0gwn981sxdxmnwd3c25jp03iidc6c4"; + revision = "3"; + editedCabalFile = "03kjhr51w600cnm1jgdc9nbm9ay66fxq93z7r6xgph1a4dmcjvg4"; libraryHaskellDepends = [ base linear manifolds-core vector-space ]; @@ -216998,8 +219012,8 @@ self: { }: mkDerivation { pname = "spectral-clustering"; - version = "0.3.0.2"; - sha256 = "1jxjqdyjj8ajv7qb3qldaqh2mr00fg51yp4fiqi5d3bd4b4isga8"; + version = "0.3.1.0"; + sha256 = "140njrq73nalkm7dp9vyk3hz027jj0ppgjqdr3qcz93a9lkzdsyh"; libraryHaskellDepends = [ base clustering containers eigen hmatrix hmatrix-svdlibc mwc-random safe sparse-linear-algebra statistics vector @@ -217023,6 +219037,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "speculate_0_4_0" = callPackage + ({ mkDerivation, base, cmdargs, containers, express, leancheck }: + mkDerivation { + pname = "speculate"; + version = "0.4.0"; + sha256 = "12h4lci5547fb1g21xh3fbq1d7fmn3w54ppqdnh8h35aa0jqw9hl"; + libraryHaskellDepends = [ + base cmdargs containers express leancheck + ]; + testHaskellDepends = [ base express leancheck ]; + benchmarkHaskellDepends = [ base express leancheck ]; + description = "discovery of properties about Haskell functions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "speculation" = callPackage ({ mkDerivation, base, ghc-prim, stm, transformers }: mkDerivation { @@ -217482,6 +219512,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "splitmix_0_0_3" = callPackage + ({ mkDerivation, async, base, base-compat-batteries, bytestring + , clock, containers, criterion, deepseq, HUnit, process, random + , tf-random, time, vector + }: + mkDerivation { + pname = "splitmix"; + version = "0.0.3"; + sha256 = "1k0amgkz7rvyz3lnw7m786ilnr1cibwhx9sc4qynq329gxan5r7w"; + libraryHaskellDepends = [ base deepseq random time ]; + testHaskellDepends = [ + async base base-compat-batteries bytestring deepseq HUnit process + random tf-random vector + ]; + benchmarkHaskellDepends = [ + base clock containers criterion random tf-random + ]; + description = "Fast Splittable PRNG"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "splitter" = callPackage ({ mkDerivation, base, directory, filepath, parsec, range }: mkDerivation { @@ -218499,7 +220551,7 @@ self: { , http-client, http-client-tls, http-conduit, http-download , http-types, memory, microlens, mintty, mono-traversable, mtl , mustache, neat-interpolation, network-uri, open-browser - , optparse-applicative, pantry-tmp, path, path-io, persistent + , optparse-applicative, pantry, path, path-io, persistent , persistent-sqlite, persistent-template, pretty, primitive , process, project-template, QuickCheck, raw-strings-qq , regex-applicative-text, resource-pool, resourcet, retry, rio @@ -218512,10 +220564,8 @@ self: { }: mkDerivation { pname = "stack"; - version = "2.1.1.1"; - sha256 = "1qqy0hkcvr4nblpknwljc71hck8ccpdiqxbxhj5mjwp9ybvag1j2"; - revision = "2"; - editedCabalFile = "0c2vqmw6rvq4jspmc1h1d33bdzmm63svrax1q5r9g70lvjfi7ax8"; + version = "2.1.3.1"; + sha256 = "1q2nagnc24fvyj3hwnpgyp3rqhxswhscyw4pw2dazqx34ad3d0zr"; configureFlags = [ "-fdisable-git-info" "-fhide-dependency-versions" "-fsupported-build" @@ -218532,7 +220582,7 @@ self: { http-client http-client-tls http-conduit http-download http-types memory microlens mintty mono-traversable mtl mustache neat-interpolation network-uri open-browser optparse-applicative - pantry-tmp path path-io persistent persistent-sqlite + pantry path path-io persistent persistent-sqlite persistent-template pretty primitive process project-template regex-applicative-text resource-pool resourcet retry rio rio-prettyprint semigroups split stm streaming-commons tar @@ -218550,7 +220600,7 @@ self: { http-client http-client-tls http-conduit http-download http-types memory microlens mintty mono-traversable mtl mustache neat-interpolation network-uri open-browser optparse-applicative - pantry-tmp path path-io persistent persistent-sqlite + pantry path path-io persistent persistent-sqlite persistent-template pretty primitive process project-template regex-applicative-text resource-pool resourcet retry rio rio-prettyprint semigroups split stm streaming-commons tar @@ -218568,7 +220618,7 @@ self: { hspec http-client http-client-tls http-conduit http-download http-types memory microlens mintty mono-traversable mtl mustache neat-interpolation network-uri open-browser optparse-applicative - pantry-tmp path path-io persistent persistent-sqlite + pantry path path-io persistent persistent-sqlite persistent-template pretty primitive process project-template QuickCheck raw-strings-qq regex-applicative-text resource-pool resourcet retry rio rio-prettyprint semigroups smallcheck split stm @@ -218828,8 +220878,8 @@ self: { }: mkDerivation { pname = "stack2cabal"; - version = "1.0.2"; - sha256 = "0zdyjf55zda465ai6bjp13a4f4khgz59smmaa2nlbbrjknlb1kbl"; + version = "1.0.3"; + sha256 = "1bmghzb866p3225ai3w4xxy3s2qic3vr4srcx7xb113qjvmadran"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -219136,8 +221186,8 @@ self: { }: mkDerivation { pname = "stackage-to-hackage"; - version = "1.1.0"; - sha256 = "165g5vyxck8hh2523v4h0cwjl3yvp4wwzlsdrs9wvg9ca3ij0v85"; + version = "1.1.1"; + sha256 = "10zd3wqla54mfnwv65gklvmglhcpzhanqfka0l0ilnbkqlgx4acm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -220004,6 +222054,41 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "stc-lang" = callPackage + ({ mkDerivation, abstract-par, aeson, base, BoundedChan, bytestring + , clock, deepseq, ghc-prim, hashable, hashtables, hedis, HUnit + , hw-kafka-client, microlens, microlens-aeson, monad-par + , monad-par-extras, mtl, random, test-framework + , test-framework-hunit, text, time, transformers, uuid-types + , vector, yaml + }: + mkDerivation { + pname = "stc-lang"; + version = "1.0.0"; + sha256 = "1x11q696f3598g3ph3shiia0xwxqjaydp27inmfqz01p891xhj5w"; + revision = "1"; + editedCabalFile = "1fjkr2k0j2463vifmaqm6d8pk3r66wrmf74g8lypgf9p4vbsv53m"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + abstract-par base BoundedChan bytestring deepseq microlens + monad-par monad-par-extras mtl transformers + ]; + executableHaskellDepends = [ + aeson base BoundedChan bytestring clock deepseq hashable hashtables + hedis hw-kafka-client microlens microlens-aeson mtl random text + transformers uuid-types vector yaml + ]; + testHaskellDepends = [ + base deepseq ghc-prim HUnit microlens mtl test-framework + test-framework-hunit time transformers + ]; + description = "A library for implicit, monadic dataflow parallelism"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "std" = callPackage ({ mkDerivation }: mkDerivation { @@ -221075,41 +223160,56 @@ self: { }) {}; "stratux" = callPackage - ({ mkDerivation, base, directory, doctest, filepath, QuickCheck - , stratux-http, stratux-types, stratux-websockets, template-haskell + ({ mkDerivation, base, stratux-http, stratux-types + , stratux-websockets }: mkDerivation { pname = "stratux"; - version = "0.0.9"; - sha256 = "17jy7svf74k3r87p8xlp0hi9z95f5npmnn28jlwx4rb68dn63aly"; + version = "0.0.10"; + sha256 = "0km05c7i6yxlxy4fa39rrll1xmf5yzb6vk1b8s8rmh19520dzb07"; libraryHaskellDepends = [ base stratux-http stratux-types stratux-websockets ]; - testHaskellDepends = [ - base directory doctest filepath QuickCheck template-haskell - ]; description = "A library for stratux"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; + "stratux-demo" = callPackage + ({ mkDerivation, base, lens, network-uri, optparse-applicative + , stratux, text, time, transformers + }: + mkDerivation { + pname = "stratux-demo"; + version = "0.0.12"; + sha256 = "0rarr1z6rk6idjyxzb0053p90rpixqwc767bslcm6dvj9rxbgsvp"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base lens network-uri optparse-applicative stratux text time + transformers + ]; + executableHaskellDepends = [ + base lens network-uri optparse-applicative stratux text time + transformers + ]; + description = "A demonstration of the stratux library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "stratux-http" = callPackage - ({ mkDerivation, aeson, base, directory, doctest, either, filepath - , HTTP, network-uri, QuickCheck, stratux-types, template-haskell - , utf8-string + ({ mkDerivation, aeson, base, HTTP, network-uri, stratux-types + , transformers, utf8-string }: mkDerivation { pname = "stratux-http"; - version = "0.0.9"; - sha256 = "121pansnd8pdhv9ki2qdav93cwldmnxnykjldhbkb2bkyr0skdyb"; - revision = "1"; - editedCabalFile = "0paq3zs9c39dcjxxyz975q4nccmgdxxay839wa60gka75hix34gs"; + version = "0.0.11"; + sha256 = "056fz3fs1giwlh9yfj462p0bg98gzikbqvkkwcyrmyqpxjsala15"; libraryHaskellDepends = [ - aeson base either HTTP network-uri stratux-types utf8-string - ]; - testHaskellDepends = [ - base directory doctest filepath QuickCheck template-haskell + aeson base HTTP network-uri stratux-types transformers utf8-string ]; description = "A library for using HTTP with stratux"; license = stdenv.lib.licenses.bsd3; @@ -221118,20 +223218,16 @@ self: { }) {}; "stratux-types" = callPackage - ({ mkDerivation, aeson, base, bytestring, directory, doctest - , filepath, lens, QuickCheck, scientific, template-haskell, text + ({ mkDerivation, aeson, base, bytestring, lens, scientific, text , time }: mkDerivation { pname = "stratux-types"; - version = "0.0.9"; - sha256 = "06d4qagcmzch25zkxpnvw04h5aav5wbdrfyi6xvzvndj12hvayza"; + version = "0.0.11"; + sha256 = "0ps9y9rfjk5xzikkl4rsv203rfqc1yqa8alp5hx37lqgcnymw4hy"; libraryHaskellDepends = [ aeson base bytestring lens scientific text time ]; - testHaskellDepends = [ - base directory doctest filepath QuickCheck template-haskell - ]; description = "A library for reading JSON output from stratux"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -221139,23 +223235,17 @@ self: { }) {}; "stratux-websockets" = callPackage - ({ mkDerivation, aeson, base, directory, doctest, either, filepath - , network, QuickCheck, stratux-types, template-haskell, text + ({ mkDerivation, aeson, base, either, network, stratux-types, text , transformers, websockets }: mkDerivation { pname = "stratux-websockets"; - version = "0.0.9"; - sha256 = "0076n4i250frv71w9sysw935g5aq0py8shwaqrhjrv4jp6mb2k3q"; - revision = "1"; - editedCabalFile = "0863p5spgs68q6ddp3v9azm7x01wky1480yp3rrjxpkgay1ha4db"; + version = "0.0.11"; + sha256 = "0602y8h37zplp1g0fmdim1f8pmdz713jydc4qsh6ii3x58i8klj5"; libraryHaskellDepends = [ aeson base either network stratux-types text transformers websockets ]; - testHaskellDepends = [ - base directory doctest filepath QuickCheck template-haskell - ]; description = "A library for using websockets with stratux"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -223375,8 +225465,8 @@ self: { pname = "summoner"; version = "1.3.0.1"; sha256 = "1m08n2ip9rjx06mcwcv636ncicmpxcmhx82i3p4yc5vylibxr57s"; - revision = "3"; - editedCabalFile = "0galzkk5y41akmy12vfk8zh5pm9pyv4a5034qpfcxm7ix0s2ivms"; + revision = "4"; + editedCabalFile = "1vjk95n2wqybigy8p55gs7qkiv5v1lwf8qmri1f9bk29599sh74k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -224553,8 +226643,8 @@ self: { }: mkDerivation { pname = "symantic"; - version = "6.3.3.20190614"; - sha256 = "1l0a82r1fx6ai5csjaqiha8gngb1pay1cmj947619xy36iwng3pc"; + version = "6.3.4.20190712"; + sha256 = "0khx7ddr9cdwyqz22xai8vmjn37c3w9gf4mlzil8lqvdf2cwk6wk"; libraryHaskellDepends = [ base containers mono-traversable symantic-document symantic-grammar text transformers @@ -224566,15 +226656,16 @@ self: { }) {}; "symantic-cli" = callPackage - ({ mkDerivation, base, containers, megaparsec, symantic-document - , text, transformers + ({ mkDerivation, base, bytestring, containers, megaparsec + , symantic-document, text, transformers }: mkDerivation { pname = "symantic-cli"; - version = "2.2.4.20190701"; - sha256 = "0qkfjhva0mrmirc4md82r5f738i6af4whlyqnxmksqz0jwa9r5nv"; + version = "2.4.0.20190719"; + sha256 = "0ca3c309wxby99sy3xa96i04q2r7wxcgk4amy8z86xaz1r78a60d"; libraryHaskellDepends = [ - base containers megaparsec symantic-document text transformers + base bytestring containers megaparsec symantic-document text + transformers ]; description = "Symantics for parsing and documenting a CLI"; license = stdenv.lib.licenses.gpl3; @@ -224588,8 +226679,8 @@ self: { }: mkDerivation { pname = "symantic-document"; - version = "1.2.3.20190628"; - sha256 = "0ahbhksiyinfsbgb2xhikckly8m5g2lfads5cjk7mbi27zn9y2v8"; + version = "1.5.0.20190711"; + sha256 = "01vza9k4ic6xwgj4jqihcfm5a5q8n6svi1988v851pi40dg8m03s"; libraryHaskellDepends = [ ansi-terminal base text transformers ]; testHaskellDepends = [ base containers tasty tasty-hunit text transformers @@ -224766,6 +226857,31 @@ self: { broken = true; }) {}; + "symantic-xml" = callPackage + ({ mkDerivation, base, bytestring, containers, data-default-class + , deepseq, filepath, hashable, hxt-charproperties, megaparsec, safe + , tasty, tasty-golden, text, transformers, treeseq + , unordered-containers + }: + mkDerivation { + pname = "symantic-xml"; + version = "1.0.0.20190223"; + sha256 = "0mqx0ysp9c4zzljjgl0w68k5r8qgv2h35cfq0mqvijcjq5dgiflp"; + libraryHaskellDepends = [ + base bytestring containers data-default-class filepath hashable + hxt-charproperties megaparsec safe text transformers treeseq + unordered-containers + ]; + testHaskellDepends = [ + base bytestring containers data-default-class deepseq filepath + hashable megaparsec tasty tasty-golden text transformers treeseq + ]; + description = "Library for reading, validating and writing a subset of the XML format"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "symbol" = callPackage ({ mkDerivation, base, containers, deepseq }: mkDerivation { @@ -224779,6 +226895,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "symbolic-link" = callPackage + ({ mkDerivation, base, directory, unix, yaml }: + mkDerivation { + pname = "symbolic-link"; + version = "0.1.0.2"; + sha256 = "02v0ry474xkpacbav6s3781xiczkhbx5rzks9ad5pj2y16z59pr7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base directory unix ]; + executableHaskellDepends = [ base directory unix yaml ]; + description = "Symlink tools"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "symbols" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -226516,6 +228646,8 @@ self: { pname = "tai"; version = "0"; sha256 = "1kp7m9mhawi2fbdsir4kg9z6hbmlw4kmp3kjvlk4qkhvckgl3pxw"; + revision = "1"; + editedCabalFile = "0m95bx120pjigxncbdb28y3cv4d6x05vgpjgny86vk0lkslk130y"; libraryHaskellDepends = [ base clock lens mtl parsers time trifecta wreq ]; @@ -226926,6 +229058,8 @@ self: { pname = "tart"; version = "0.1.2"; sha256 = "1ik86xbai9513gr9k60m55xf5pj5bdw3wbjc0gd260j9k9j4p73k"; + revision = "1"; + editedCabalFile = "04xkrc0xfbx2kk6f8b41zf611s4k848ahczbbs85pd9lqqpkbhzj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -227575,6 +229709,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "tasty-silver_3_1_13" = callPackage + ({ mkDerivation, ansi-terminal, async, base, bytestring, containers + , deepseq, directory, filepath, mtl, optparse-applicative, process + , process-extras, regex-tdfa, semigroups, stm, tagged, tasty + , tasty-hunit, temporary, text, transformers + }: + mkDerivation { + pname = "tasty-silver"; + version = "3.1.13"; + sha256 = "1sd9xgjcvlnw338dn5rcy5la7gw15yvg4xl85ym7aav5fr97apfs"; + libraryHaskellDepends = [ + ansi-terminal async base bytestring containers deepseq directory + filepath mtl optparse-applicative process process-extras regex-tdfa + semigroups stm tagged tasty temporary text + ]; + testHaskellDepends = [ + base directory filepath process tasty tasty-hunit temporary + transformers + ]; + description = "A fancy test runner, including support for golden tests"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-smallcheck" = callPackage ({ mkDerivation, async, base, smallcheck, tagged, tasty }: mkDerivation { @@ -227648,6 +229806,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tasty-tmux" = callPackage + ({ mkDerivation, base, bytestring, mtl, regex-posix, tasty + , tasty-hunit, text, typed-process + }: + mkDerivation { + pname = "tasty-tmux"; + version = "0.1.0.0"; + sha256 = "1k7xc2fvfjrv48hml1jlhjrdrnb9sjaar7xrbwbj1275s09b51h8"; + libraryHaskellDepends = [ + base bytestring mtl regex-posix tasty tasty-hunit text + typed-process + ]; + description = "Terminal user acceptance testing (UAT) via tmux"; + license = stdenv.lib.licenses.agpl3; + }) {}; + "tasty-travis" = callPackage ({ mkDerivation, base, tasty, tasty-hunit }: mkDerivation { @@ -229128,6 +231302,8 @@ self: { ]; description = "Terminal emulator configurable in Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) gtk3; vte_291 = pkgs.vte;}; "termplot" = callPackage @@ -230055,8 +232231,8 @@ self: { }: mkDerivation { pname = "text-cp437"; - version = "0.2.1"; - sha256 = "1fzsb341yr1jiv9wflr35ra1z1cd41wmyp0y5dv2p0fq10kxcfgs"; + version = "0.2.2"; + sha256 = "1lv1nhkrwdrs3ji7x2qv1r33dipgchr1fl2znmmkhxksbhlwi0x9"; libraryHaskellDepends = [ base bytestring text ]; testHaskellDepends = [ base bytestring QuickCheck quickcheck-text text @@ -230558,6 +232734,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "text-short_0_1_3" = callPackage + ({ mkDerivation, base, binary, bytestring, deepseq, ghc-prim + , hashable, quickcheck-instances, tasty, tasty-hunit + , tasty-quickcheck, text + }: + mkDerivation { + pname = "text-short"; + version = "0.1.3"; + sha256 = "0xyrxlb602z8bc9sr2y1fag0x56a20yj5qrkvy7iwc6hnznrynxz"; + libraryHaskellDepends = [ + base binary bytestring deepseq ghc-prim hashable text + ]; + testHaskellDepends = [ + base binary quickcheck-instances tasty tasty-hunit tasty-quickcheck + text + ]; + description = "Memory-efficient representation of Unicode text strings"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "text-show" = callPackage ({ mkDerivation, array, base, base-compat-batteries, base-orphans , bifunctors, bytestring, bytestring-builder, containers @@ -231514,6 +233711,22 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "th-test-utils" = callPackage + ({ mkDerivation, base, tasty, tasty-hunit, template-haskell + , transformers + }: + mkDerivation { + pname = "th-test-utils"; + version = "1.0.0"; + sha256 = "1kpkf6h0vr06z7iphkcjva9x28mfjg967hrih4im527g9vw5mdq6"; + libraryHaskellDepends = [ base template-haskell transformers ]; + testHaskellDepends = [ + base tasty tasty-hunit template-haskell transformers + ]; + description = "Utility functions for testing Template Haskell code"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "th-to-exp" = callPackage ({ mkDerivation, base, hspec, template-haskell }: mkDerivation { @@ -231758,14 +233971,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "these_1" = callPackage + "these_1_0_1" = callPackage ({ mkDerivation, aeson, assoc, base, base-compat, binary, deepseq , hashable, QuickCheck, semigroupoids, unordered-containers }: mkDerivation { pname = "these"; - version = "1"; - sha256 = "01pnibkkzbsdiry4w018img92ja2sqwjigpw53q12mfnabvsgvxn"; + version = "1.0.1"; + sha256 = "1k0pi65g7cm9hzdw6my6bzz2zvddkmj1qs45ymqmi316bpiixk3r"; libraryHaskellDepends = [ aeson assoc base base-compat binary deepseq hashable QuickCheck semigroupoids unordered-containers @@ -232437,6 +234650,27 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "tidal_1_3_0" = callPackage + ({ mkDerivation, base, bifunctors, bytestring, clock, colour + , containers, criterion, deepseq, hosc, microspec, mwc-random + , network, parsec, text, transformers, vector, weigh + }: + mkDerivation { + pname = "tidal"; + version = "1.3.0"; + sha256 = "0zd9z0nc600b1zw0c1bpl5b3ik1dcspv5kd72p3if70g81x56d8l"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bifunctors bytestring clock colour containers deepseq hosc + mwc-random network parsec text transformers vector + ]; + testHaskellDepends = [ base containers microspec parsec ]; + benchmarkHaskellDepends = [ base criterion weigh ]; + description = "Pattern language for improvised music"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tidal-midi" = callPackage ({ mkDerivation, base, containers, PortMidi, tidal, time , transformers @@ -232472,13 +234706,22 @@ self: { }) {}; "tidal-vis" = callPackage - ({ mkDerivation, base, cairo, colour, tidal }: + ({ mkDerivation, async, base, cairo, colour, containers, gloss + , hashable, hosc, mtl, network, SDL, SDL-gfx, SDL-image, SDL-ttf + , tidal, time, unagi-chan + }: mkDerivation { pname = "tidal-vis"; - version = "0.9.3"; - sha256 = "1sj17czyzpfrq0a8kalr170dw1zcphix0dnhdf6ggryskb1wswdp"; - libraryHaskellDepends = [ base cairo colour tidal ]; - description = "Visual rendering for Tidal patterns"; + version = "1.0.14"; + sha256 = "1l924nqv8ljd9ljpy05r18j0rc5if3k5lvpifv2g8fn967gi0nfs"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base cairo colour containers gloss hashable hosc mtl network + SDL SDL-gfx SDL-image SDL-ttf tidal time unagi-chan + ]; + executableHaskellDepends = [ base ]; + description = "Visual rendering for Tidal patterns and osc messages"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -233852,7 +236095,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "tls_1_5_0" = callPackage + "tls_1_5_1" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, async, base, bytestring , cereal, cryptonite, data-default-class, gauge, hourglass, memory , mtl, network, QuickCheck, tasty, tasty-quickcheck, transformers @@ -233860,8 +236103,8 @@ self: { }: mkDerivation { pname = "tls"; - version = "1.5.0"; - sha256 = "04hdk8mdn8l928prj1h37xkn4ny44bnkrbbknxyqjba51y5y30bc"; + version = "1.5.1"; + sha256 = "1fs5q494ip8hi2jdp34wy93hmdd42lwkh1hi0jg3ngdnilpg33yi"; libraryHaskellDepends = [ asn1-encoding asn1-types async base bytestring cereal cryptonite data-default-class hourglass memory mtl network transformers x509 @@ -233899,15 +236142,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "tls-debug_0_4_6" = callPackage + "tls-debug_0_4_7" = callPackage ({ mkDerivation, base, bytestring, cryptonite, data-default-class , network, pem, tls, tls-session-manager, x509, x509-store , x509-system, x509-validation }: mkDerivation { pname = "tls-debug"; - version = "0.4.6"; - sha256 = "0xfjwyiazjdyba6x9bps93ibah9p22ww24wlmr6iksfsdhs79l7n"; + version = "0.4.7"; + sha256 = "1p3ihky5vznjv66f1mbpj33ahkg8g0xgfknldzmgllwsmh533dji"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -233955,6 +236198,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tls-session-manager_0_0_3" = callPackage + ({ mkDerivation, auto-update, base, basement, bytestring, clock + , memory, psqueues, tls + }: + mkDerivation { + pname = "tls-session-manager"; + version = "0.0.3"; + sha256 = "0k57flqp2b4bipafiyfipnqmdqv04ky39yr4s4s9sx577zz2j2yi"; + libraryHaskellDepends = [ + auto-update base basement bytestring clock memory psqueues tls + ]; + description = "In-memory TLS session manager"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tmapchan" = callPackage ({ mkDerivation, base, containers, hashable, stm , unordered-containers @@ -234455,9 +236714,9 @@ self: { broken = true; }) {}; - "tomland_1_1_0_0" = callPackage + "tomland_1_1_0_1" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, deepseq - , gauge, hashable, hedgehog, hspec-megaparsec, htoml + , directory, gauge, hashable, hedgehog, hspec-megaparsec, htoml , htoml-megaparsec, markdown-unlit, megaparsec, mtl, parsec , parser-combinators, tasty, tasty-discover, tasty-hedgehog , tasty-hspec, tasty-silver, text, time, toml-parser, transformers @@ -234465,8 +236724,10 @@ self: { }: mkDerivation { pname = "tomland"; - version = "1.1.0.0"; - sha256 = "0ip3pp76jf6di18r10ksxw35a2594k7h1iygm0b4k77m4fx4bqzn"; + version = "1.1.0.1"; + sha256 = "0ihz8pvcnr33mydz4n7gsayikh50pn1bg3km2h3nlv054lff7kai"; + revision = "1"; + editedCabalFile = "16382q0q77bv9zlahmgbmc90hvl1b23g9fxk4dl2f1lhlfqjkxnw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -234476,9 +236737,9 @@ self: { executableHaskellDepends = [ base text time unordered-containers ]; executableToolDepends = [ markdown-unlit ]; testHaskellDepends = [ - base bytestring containers hashable hedgehog hspec-megaparsec - megaparsec tasty tasty-hedgehog tasty-hspec tasty-silver text time - unordered-containers + base bytestring containers directory hashable hedgehog + hspec-megaparsec megaparsec tasty tasty-hedgehog tasty-hspec + tasty-silver text time unordered-containers ]; testToolDepends = [ tasty-discover ]; benchmarkHaskellDepends = [ @@ -234649,17 +236910,17 @@ self: { , diversity, fgl, filepath, find-clumpiness, foldl, graphviz , hierarchical-clustering, hierarchical-spectral-clustering , hmatrix, inline-r, lens, managed, matrix-market-attoparsec - , mltool, modularity, mtl, optparse-generic, palette, parallel - , plots, safe, scientific, sparse-linear-algebra - , spectral-clustering, split, statistics, streaming - , streaming-bytestring, streaming-cassava, streaming-utils - , streaming-with, SVGFonts, temporary, terminal-progress-bar, text - , text-show, transformers, vector, vector-algorithms, zlib + , modularity, mtl, optparse-generic, palette, parallel, plots, safe + , scientific, sparse-linear-algebra, spectral-clustering, split + , statistics, streaming, streaming-bytestring, streaming-cassava + , streaming-utils, streaming-with, SVGFonts, temporary + , terminal-progress-bar, text, text-show, transformers, vector + , vector-algorithms, zlib }: mkDerivation { pname = "too-many-cells"; - version = "0.1.8.0"; - sha256 = "0xf9q5x4ch4v1yr41fs155rvymdhslphj6d4dsjhf12ahq8rs5rl"; + version = "0.1.12.2"; + sha256 = "01jbz5a51myy4293637c9v2ac87cp60l4rax2gkdiqw8vj8231j4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -234667,9 +236928,9 @@ self: { diagrams diagrams-cairo diagrams-graphviz diagrams-lib differential directory diversity fgl filepath find-clumpiness foldl graphviz hierarchical-clustering hierarchical-spectral-clustering hmatrix - inline-r lens managed matrix-market-attoparsec mltool modularity - mtl palette parallel plots safe scientific sparse-linear-algebra - split statistics streaming streaming-bytestring streaming-cassava + inline-r lens managed matrix-market-attoparsec modularity mtl + palette parallel plots safe scientific sparse-linear-algebra split + statistics streaming streaming-bytestring streaming-cassava streaming-with SVGFonts temporary text text-show vector vector-algorithms zlib ]; @@ -234677,9 +236938,10 @@ self: { aeson base birch-beer bytestring cassava colour containers diagrams-cairo diagrams-lib directory fgl filepath find-clumpiness graphviz hierarchical-spectral-clustering inline-r lens - matrix-market-attoparsec mtl optparse-generic palette plots - spectral-clustering streaming streaming-bytestring streaming-utils - terminal-progress-bar text text-show transformers vector + matrix-market-attoparsec modularity mtl optparse-generic palette + plots spectral-clustering streaming streaming-bytestring + streaming-utils terminal-progress-bar text text-show transformers + vector ]; description = "Cluster single cells and analyze cell clade relationships"; license = stdenv.lib.licenses.gpl3; @@ -234689,15 +236951,15 @@ self: { "toodles" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, blaze-html - , bytestring, cmdargs, directory, extra, hspec, hspec-expectations - , megaparsec, MissingH, process, regex-posix, RSA, servant - , servant-blaze, servant-server, strict, text, time, wai, warp - , yaml + , bytestring, cmdargs, directory, extra, filepath, hspec + , hspec-expectations, megaparsec, MissingH, process, regex-posix + , RSA, servant, servant-blaze, servant-server, strict, text, time + , wai, warp, yaml }: mkDerivation { pname = "toodles"; - version = "1.2.1"; - sha256 = "19z8xx8pw66m9q9xq0qldpzhmjwfsln4hn8smmz2pjk2x713883c"; + version = "1.2.3"; + sha256 = "0b6sznzkcjhs5fw920ivmvh6n6walamy16602bxid7sjrlgdjzcf"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -234708,8 +236970,9 @@ self: { ]; executableHaskellDepends = [ aeson base base64-bytestring blaze-html bytestring cmdargs - directory extra megaparsec MissingH process regex-posix RSA servant - servant-blaze servant-server strict text time wai warp yaml + directory extra filepath megaparsec MissingH process regex-posix + RSA servant servant-blaze servant-server strict text time wai warp + yaml ]; testHaskellDepends = [ aeson base base64-bytestring blaze-html bytestring cmdargs @@ -235110,8 +237373,8 @@ self: { }: mkDerivation { pname = "tpdb"; - version = "2.1.1"; - sha256 = "0hk592dki8hp15a84pnqnjdwql2zczfask71gxf833i0vrph38yb"; + version = "2.2.0"; + sha256 = "1hrnfvp49rny9rznnhlhvgw4ffmn9nbbdiknsbwxgjfh1ixir1vf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -235252,6 +237515,8 @@ self: { ]; description = "Distributed tracing"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tracker" = callPackage @@ -235292,8 +237557,8 @@ self: { }: mkDerivation { pname = "traction"; - version = "0.1.0"; - sha256 = "1vf6hrzxr28yp6rijdxcq83c60hzkyvjkc2caiifmfi5ay2hzlzq"; + version = "0.2.0"; + sha256 = "1rbbp2sw5i1x499bhi1d0f37m34rf6j9p2ndlqsijallmdiawcgq"; libraryHaskellDepends = [ base bytestring containers exceptions mmorph postgresql-simple resource-pool syb template-haskell text time transformers @@ -235663,6 +237928,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "transformers-except" = callPackage + ({ mkDerivation, base, exceptions, text, transformers }: + mkDerivation { + pname = "transformers-except"; + version = "0.1.1"; + sha256 = "1i89k4bml223f7m3pin73vrz51xb2j7q7rr39x9v587hmm40mvkm"; + libraryHaskellDepends = [ base exceptions text transformers ]; + description = "An Except monad transformer with"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "transformers-fix" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -235857,8 +238133,8 @@ self: { }: mkDerivation { pname = "trasa"; - version = "0.4"; - sha256 = "059zbm4bfzcv0qlvr55l49xs5izycb2hdjbyqvri5f3vrnwnic1q"; + version = "0.4.1"; + sha256 = "0nnr72h6ylx52ni6l7r0nnv02d540agzfhyjfjrxywbx7xz70q5c"; libraryHaskellDepends = [ base binary bytestring hashable http-media http-types quantification text unordered-containers @@ -235884,6 +238160,43 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "trasa-extra" = callPackage + ({ mkDerivation, aeson, base, bytestring, case-insensitive + , containers, cookie, http-types, mtl, path-pieces, quantification + , text, trasa, trasa-server + }: + mkDerivation { + pname = "trasa-extra"; + version = "0.1.0.0"; + sha256 = "0ka5w55zzx7cy17pwdwcjf20yl0lmpg6bqv874k0ia7hihl6sx6c"; + libraryHaskellDepends = [ + aeson base bytestring case-insensitive containers cookie http-types + mtl path-pieces quantification text trasa trasa-server + ]; + description = "Extra functions for trasa"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "trasa-form" = callPackage + ({ mkDerivation, base, bytestring, cookie, ditto, ditto-lucid + , http-api-data, http-types, lucid, mtl, quantification, text + , trasa, trasa-server, unordered-containers + }: + mkDerivation { + pname = "trasa-form"; + version = "0.3.2.0"; + sha256 = "0q59wkg7k66iq8n6b73226z23sgy8pfvylac9qvlaiib6dllq1g8"; + libraryHaskellDepends = [ + base bytestring cookie ditto ditto-lucid http-api-data http-types + lucid mtl quantification text trasa trasa-server + unordered-containers + ]; + description = "generate forms using lucid, ditto and trasa"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "trasa-reflex" = callPackage ({ mkDerivation, base, bytestring, containers, ghcjs-dom , http-media, http-types, jsaddle, reflex, reflex-dom, text, trasa @@ -235907,8 +238220,8 @@ self: { }: mkDerivation { pname = "trasa-server"; - version = "0.4"; - sha256 = "1xh85kh9ilsq8zy19if4s93zmjqxbpgqpvhkh9jpk8klia7zc0pv"; + version = "0.5.4"; + sha256 = "1z3cq2zfygxf1v7ifga23mf7zn750925cvghmb3i54a9r0wafmb2"; libraryHaskellDepends = [ base bytestring case-insensitive containers http-media http-types mtl text trasa wai @@ -235931,6 +238244,8 @@ self: { testHaskellDepends = [ base trasa ]; description = "Template Haskell to generate trasa routes"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "traverse-with-class" = callPackage @@ -236651,8 +238966,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "trivial-constraint"; - version = "0.5.1.0"; - sha256 = "0wk925w1qswr5ma6427p0p1gl96hr1pfdqkn08r3ccpbibz6q1sy"; + version = "0.6.0.0"; + sha256 = "0y0iyll7ml5qz271cqa0dc3w2j3w1d8jjaxwaf2flcidigws69z5"; libraryHaskellDepends = [ base ]; description = "Constraints that any type, resp. no type fulfills"; license = stdenv.lib.licenses.gpl3; @@ -238340,6 +240655,18 @@ self: { broken = true; }) {}; + "type-errors-pretty" = callPackage + ({ mkDerivation, base, doctest, Glob }: + mkDerivation { + pname = "type-errors-pretty"; + version = "0.0.0.0"; + sha256 = "0yj8c91maanihyl9506ihpxv3zyfvprr359dvd2b9ym3py50kncs"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest Glob ]; + description = "Combinators for writing pretty type errors easily"; + license = stdenv.lib.licenses.mpl20; + }) {}; + "type-fun" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -239281,8 +241608,8 @@ self: { }: mkDerivation { pname = "typesafe-precure"; - version = "0.7.4.1"; - sha256 = "1nm74fj819kws9rrksk80gyrl3m5dxsm17bm2a18mp8dca76iix2"; + version = "0.7.5.1"; + sha256 = "0n2cnd15gwixk17jqcz4hxishikscwbcn2gnrkcz3a295ng68ins"; libraryHaskellDepends = [ aeson aeson-pretty autoexporter base bytestring dlist monad-skeleton template-haskell text th-data-compat @@ -239563,8 +241890,8 @@ self: { pname = "ucam-webauth"; version = "0.1.0.0"; sha256 = "14l989aasyqdw1x7aq9ikhcq9p3s1ax4qk53rd5s53wdgbc20n9k"; - revision = "5"; - editedCabalFile = "1hii6sjyc3dps800ffwkjq6fq82idlpkdv68k1y9ivv477plw24a"; + revision = "6"; + editedCabalFile = "1dammzdhin226byx8p287kdnn9pc7s49hfxcdmflly6hsy1psnvy"; libraryHaskellDepends = [ aeson attoparsec base bytestring containers cryptonite errors http-api-data http-types microlens microlens-mtl mtl @@ -239960,40 +242287,23 @@ self: { }) {}; "unbeliever" = callPackage - ({ mkDerivation, aeson, async, base, bytestring, chronologique - , containers, deepseq, directory, exceptions, fingertree, gauge - , hashable, hourglass, hspec, mtl, prettyprinter - , prettyprinter-ansi-terminal, safe-exceptions, scientific, stm - , template-haskell, terminal-size, text, text-short, transformers - , unix, unordered-containers, vector + ({ mkDerivation, base, bytestring, core-data, core-program + , core-text, fingertree, gauge, hspec, safe-exceptions, text + , text-short }: mkDerivation { pname = "unbeliever"; - version = "0.9.3.2"; - sha256 = "1gsjmr9h7w08576smi978k5djhvjk4ry0ljgr6zxx7nj7cy1m84b"; - revision = "1"; - editedCabalFile = "0mlbjb79ylk2jb7mp6da1xfl2r28zfijwv5dd2l73l9mgi5h0s72"; - libraryHaskellDepends = [ - aeson async base bytestring chronologique containers deepseq - directory exceptions fingertree hashable hourglass mtl - prettyprinter prettyprinter-ansi-terminal safe-exceptions - scientific stm template-haskell terminal-size text text-short - transformers unix unordered-containers vector - ]; + version = "0.10.0.1"; + sha256 = "0fmv76xmi4ansrksa07vidqvxiqgdmvvampkqngi1ma7g3k2n29x"; + libraryHaskellDepends = [ base core-data core-program core-text ]; testHaskellDepends = [ - aeson async base bytestring chronologique containers deepseq - directory exceptions fingertree hashable hourglass hspec mtl - prettyprinter prettyprinter-ansi-terminal safe-exceptions - scientific stm template-haskell terminal-size text text-short - transformers unix unordered-containers vector + base bytestring core-data core-program core-text fingertree hspec + safe-exceptions text text-short ]; benchmarkHaskellDepends = [ - aeson async base bytestring chronologique containers deepseq - directory exceptions fingertree gauge hashable hourglass mtl - prettyprinter prettyprinter-ansi-terminal safe-exceptions - scientific stm template-haskell terminal-size text text-short - transformers unix unordered-containers vector + base bytestring core-data core-program core-text gauge text ]; + doHaddock = false; description = "Opinionated Haskell Interoperability"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -240579,8 +242889,8 @@ self: { pname = "union"; version = "0.1.2"; sha256 = "1i4fvlwkw1wx64a6l8342aqfqsdq7fqa4p24g3i5gn5704lxrsb3"; - revision = "2"; - editedCabalFile = "170dhg4z4jzi50nh4xx75r9k8zz5br7j2iqjjw2r1dx29ajqbcw9"; + revision = "3"; + editedCabalFile = "160jc4ykqvkzw79sb9j95mw7hsnknpfhkbbd75xmkpx08vnv4d76"; libraryHaskellDepends = [ base deepseq hashable profunctors tagged vinyl ]; @@ -241389,6 +243699,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "unliftio_0_2_12" = callPackage + ({ mkDerivation, async, base, bytestring, containers, deepseq + , directory, filepath, gauge, hspec, process, QuickCheck, stm, time + , transformers, unix, unliftio-core + }: + mkDerivation { + pname = "unliftio"; + version = "0.2.12"; + sha256 = "02gy1zrxgzg4xmzm8lafsf1nyr3as1q20r8ld73xg3q7rkag9acg"; + libraryHaskellDepends = [ + async base bytestring deepseq directory filepath process stm time + transformers unix unliftio-core + ]; + testHaskellDepends = [ + async base bytestring containers deepseq directory filepath hspec + process QuickCheck stm time transformers unix unliftio-core + ]; + benchmarkHaskellDepends = [ + async base bytestring deepseq directory filepath gauge process stm + time transformers unix unliftio-core + ]; + description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "unliftio-core" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -241879,6 +244215,8 @@ self: { ]; description = "Command-line tool to generate paths for moving upward in a file system"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "up-grade" = callPackage @@ -242352,6 +244690,8 @@ self: { ]; description = "Painfully simple URL deployment"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "urn" = callPackage @@ -242405,6 +244745,17 @@ self: { broken = true; }) {}; + "usa-holidays" = callPackage + ({ mkDerivation, base, doctest, doctest-discover, hspec, time }: + mkDerivation { + pname = "usa-holidays"; + version = "0.1.0.1"; + sha256 = "04biw4l5rpfcflrmcn45hlirq26bpzs27745jhyr32gl6mpnqb12"; + libraryHaskellDepends = [ base time ]; + testHaskellDepends = [ base doctest doctest-discover hspec time ]; + license = stdenv.lib.licenses.bsd3; + }) {}; + "usb" = callPackage ({ mkDerivation, base, bindings-libusb, bytestring, containers , ghc-prim, text, vector @@ -243855,6 +246206,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vault_0_3_1_3" = callPackage + ({ mkDerivation, base, containers, hashable, semigroups + , unordered-containers + }: + mkDerivation { + pname = "vault"; + version = "0.3.1.3"; + sha256 = "0vdm472vn734xa27jjm2mjacl37mxiqaaahvm4hzqjgyh4cqq377"; + libraryHaskellDepends = [ + base containers hashable semigroups unordered-containers + ]; + description = "a persistent store for values of arbitrary types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "vault-tool" = callPackage ({ mkDerivation, aeson, base, bytestring, http-client , http-client-tls, http-types, text, unordered-containers @@ -244925,6 +247292,8 @@ self: { ]; description = "types for ingesting vflow data with aeson"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "vfr-waypoints" = callPackage @@ -246313,6 +248682,36 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "wai-extra_3_0_27" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring + , bytestring, case-insensitive, containers, cookie + , data-default-class, deepseq, directory, fast-logger, hspec + , http-types, http2, HUnit, iproute, network, old-locale, resourcet + , streaming-commons, text, time, transformers, unix, unix-compat + , vault, void, wai, wai-logger, word8, zlib + }: + mkDerivation { + pname = "wai-extra"; + version = "3.0.27"; + sha256 = "1p8x61xjbwjif10iibc3b2gxh3dd3rymrfvinrdn0h9wn7qsyh2x"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal base base64-bytestring bytestring + case-insensitive containers cookie data-default-class deepseq + directory fast-logger http-types http2 iproute network old-locale + resourcet streaming-commons text time transformers unix unix-compat + vault void wai wai-logger word8 zlib + ]; + testHaskellDepends = [ + base bytestring case-insensitive cookie fast-logger hspec + http-types http2 HUnit resourcet text time transformers wai zlib + ]; + description = "Provides some basic WAI handlers and middleware"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wai-frontend-monadcgi" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, cgi , containers, http-types, transformers, wai @@ -246510,8 +248909,8 @@ self: { }: mkDerivation { pname = "wai-http2-extra"; - version = "0.1.1"; - sha256 = "00fr1rg92vfkn6cb7cgdwmj7lavmyj8m9y0xxj05ws4b93r5f2z5"; + version = "0.1.2"; + sha256 = "1f4ddgrprdnbpdbb6jj8n2ib206dlj5mgf8ar6r1ls2p90vpn6yr"; libraryHaskellDepends = [ auto-update base bytestring containers http-types wai warp word8 ]; @@ -247865,8 +250264,8 @@ self: { pname = "warc"; version = "1.0.4"; sha256 = "1mxfm8kdvm0l1lnzma4n9mriz94ypckxqcz1f34fa3n1j3ckc45b"; - revision = "1"; - editedCabalFile = "1mdd3r1lg92rchy1zv4jwvrsn6x3wnplhbnwavpx0nivf3xp7m8q"; + revision = "2"; + editedCabalFile = "0vlh1wivzs2ikmp3jbx4m0zxyvkjy1rn6xhbgaz1n5vi37hid74n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -248538,6 +250937,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "web-routes-generics" = callPackage + ({ mkDerivation, base, parsec, text, web-routes }: + mkDerivation { + pname = "web-routes-generics"; + version = "0.1.0.1"; + sha256 = "16nykkzjznl9zq2qgn87lpqxkz8yx83s7949lv4vzapp4hjv04yy"; + libraryHaskellDepends = [ base parsec text web-routes ]; + description = "portable, type-safe URL routing"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "web-routes-happstack" = callPackage ({ mkDerivation, base, bytestring, happstack-server, text , web-routes @@ -250064,18 +252474,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "winery_1_1_1" = callPackage + "winery_1_1_2" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, cereal , containers, cpu, deepseq, directory, fast-builder, gauge , hashable, HUnit, megaparsec, mtl, prettyprinter , prettyprinter-ansi-terminal, QuickCheck, quickcheck-instances - , scientific, semigroups, serialise, text, time, transformers - , unordered-containers, vector + , scientific, semigroups, serialise, store, text, time + , transformers, unordered-containers, vector }: mkDerivation { pname = "winery"; - version = "1.1.1"; - sha256 = "0jyr5vwz55rjwqvvh2ys3aq426i6jhfrykz0mx4kidr9l9yd0yls"; + version = "1.1.2"; + sha256 = "1hxs3pyv0icqmnmnjadr86d55jdi689hgcjgx3lq7skxs3hp0qf1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -250095,7 +252505,7 @@ self: { ]; benchmarkHaskellDepends = [ aeson base binary bytestring cereal deepseq directory gauge - serialise text + serialise store text ]; description = "A compact, well-typed seralisation format for Haskell values"; license = stdenv.lib.licenses.bsd3; @@ -250475,7 +252885,7 @@ self: { license = stdenv.lib.licenses.isc; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {inherit (pkgs) wlc;}; + }) {wlc = null;}; "wobsurv" = callPackage ({ mkDerivation, aeson, attoparsec, base-prelude, bytestring @@ -251031,14 +253441,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "world-peace_1_0_0_0" = callPackage + "world-peace_1_0_1_0" = callPackage ({ mkDerivation, aeson, base, deepseq, doctest, Glob, profunctors , should-not-typecheck, tagged, tasty, tasty-hunit, text }: mkDerivation { pname = "world-peace"; - version = "1.0.0.0"; - sha256 = "1fx8f7dfrslqwmkbcyff5q7iafa5znc73f77il7y87hz23q9yzmx"; + version = "1.0.1.0"; + sha256 = "1fx7y9h1yyjc5xn1mpbkwas6p6h06rivzndb545z1qnnp583vzwp"; libraryHaskellDepends = [ aeson base deepseq profunctors tagged ]; testHaskellDepends = [ base doctest Glob should-not-typecheck tasty tasty-hunit text @@ -251507,6 +253917,8 @@ self: { ]; description = "A simple CLI utility for interacting with a websocket"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ws-chans" = callPackage @@ -254461,7 +256873,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "yam_0_6_3" = callPackage + "yam_0_7" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, binary, bytestring , data-default, exceptions, fast-logger, hspec, http-client , http-types, lens, menshen, monad-logger, mtl, mwc-random @@ -254472,8 +256884,8 @@ self: { }: mkDerivation { pname = "yam"; - version = "0.6.3"; - sha256 = "1mw4yylh8cmrm22cqpdkd64idklkwig8c4rbvrmpw5j5s0hdmdly"; + version = "0.7"; + sha256 = "1b1igh82zhdbql4kfjxxh1rg1776x2yv2755hnvps5p06c2wap7z"; libraryHaskellDepends = [ aeson base base16-bytestring binary bytestring data-default exceptions fast-logger http-client http-types lens menshen @@ -254549,15 +256961,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "yam-datasource_0_6_3" = callPackage + "yam-datasource_0_7" = callPackage ({ mkDerivation, base, conduit, data-default, monad-logger , persistent, resource-pool, resourcet, salak, servant-server, text , unliftio-core, yam }: mkDerivation { pname = "yam-datasource"; - version = "0.6.3"; - sha256 = "0zcwd32iz01b3m3xg1n3axvrljbkcld196pblc7cn0kb2n0w6ilp"; + version = "0.7"; + sha256 = "0dkricvyypyggbmqp3mqryz7sw1z1z92ixnvz48lc8xqahvj0fsv"; libraryHaskellDepends = [ base conduit data-default monad-logger persistent resource-pool resourcet salak servant-server text unliftio-core yam @@ -254600,8 +257012,8 @@ self: { }: mkDerivation { pname = "yam-redis"; - version = "0.6.3"; - sha256 = "0xvv9azq8ihyxgz11089xkvxmisp6ajggldayj8bdg045m74lv9r"; + version = "0.7"; + sha256 = "0cw4prkmi2csmi1kw3k0lvvzhnl71f4fplsv3f2jxgcgviim89pw"; libraryHaskellDepends = [ base bytestring data-default hedis menshen monad-logger mtl salak servant-server text yam @@ -255288,6 +257700,8 @@ self: { libraryHaskellDepends = [ base deriving-compat hedgehog yaya ]; description = "Hedgehog testing support for the Yaya recursion scheme library"; license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yaya-unsafe" = callPackage @@ -256488,6 +258902,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-form_1_6_6" = callPackage + ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html + , blaze-markup, byteable, bytestring, containers, data-default + , email-validate, hspec, network-uri, persistent, resourcet + , semigroups, shakespeare, text, time, transformers, wai + , xss-sanitize, yesod-core, yesod-persistent + }: + mkDerivation { + pname = "yesod-form"; + version = "1.6.6"; + sha256 = "16m7m7yixsnka926znjy0xn0kp30mbvjq2f46rh987kdr28dks9p"; + libraryHaskellDepends = [ + aeson attoparsec base blaze-builder blaze-html blaze-markup + byteable bytestring containers data-default email-validate + network-uri persistent resourcet semigroups shakespeare text time + transformers wai xss-sanitize yesod-core yesod-persistent + ]; + testHaskellDepends = [ base hspec text time ]; + description = "Form handling support for Yesod Web Framework"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-form-bootstrap4" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, shakespeare, text , yesod-core, yesod-form diff --git a/pkgs/development/idris-modules/build-idris-package.nix b/pkgs/development/idris-modules/build-idris-package.nix index c67d53f8d9c..28bac4e981b 100644 --- a/pkgs/development/idris-modules/build-idris-package.nix +++ b/pkgs/development/idris-modules/build-idris-package.nix @@ -1,5 +1,5 @@ # Build an idris package -{ stdenv, lib, idrisPackages, gmp }: +{ stdenv, lib, gmp, prelude, base, with-packages, idris }: { idrisDeps ? [] , noPrelude ? false , noBase ? false @@ -11,15 +11,15 @@ }@attrs: let allIdrisDeps = idrisDeps - ++ lib.optional (!noPrelude) idrisPackages.prelude - ++ lib.optional (!noBase) idrisPackages.base; - idris-with-packages = idrisPackages.with-packages allIdrisDeps; + ++ lib.optional (!noPrelude) prelude + ++ lib.optional (!noBase) base; + idris-with-packages = with-packages allIdrisDeps; newAttrs = builtins.removeAttrs attrs [ "idrisDeps" "noPrelude" "noBase" "name" "version" "ipkgName" "extraBuildInputs" ] // { meta = attrs.meta // { - platforms = attrs.meta.platforms or idrisPackages.idris.meta.platforms; + platforms = attrs.meta.platforms or idris.meta.platforms; }; }; in diff --git a/pkgs/development/interpreters/duktape/default.nix b/pkgs/development/interpreters/duktape/default.nix index f3b253bfd22..f79c30740a1 100644 --- a/pkgs/development/interpreters/duktape/default.nix +++ b/pkgs/development/interpreters/duktape/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "duktape-${version}"; - version = "2.3.0"; + version = "2.4.0"; src = fetchurl { url = "http://duktape.org/duktape-${version}.tar.xz"; - sha256 = "1s5g8lg0dga6x3rcq328a6hsd2sk2vzwq9zfmskjh5h6n8x2yvpd"; + sha256 = "1z3i0ymnkk6q48bmbgh59g1ryrwjdv46vrf6nbnmqfv3s43r7a46"; }; buildPhase = '' diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 42fcae5e179..b3b506783cd 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -104,9 +104,9 @@ in { major = "3"; minor = "8"; patch = "0"; - suffix = "b2"; + suffix = "b3"; }; - sha256 = "1rh9dz5vmc56y45d6j2wfjw4m7x25i6v8vyld4mrqh06s2gn1hbl"; + sha256 = "03wq85pkpr9j56k3zg6whahc5park1pzshbakl7y50lzrkpq2ynd"; inherit (darwin) CF configd; inherit passthruFun; }; diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index 6619235ab82..f2b038aa379 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 = "9.600.4"; + version = "9.600.5"; name = "armadillo-${version}"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "1gph9acmk8wqs6n00csvbs94rh153y7ml0w2zlbk9ia8xbgbdbbx"; + sha256 = "1gy2rb3klvzx833851qgsbh5k1ds5zffwk0rmy1k8b1g51jdd76x"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/cimg/default.nix b/pkgs/development/libraries/cimg/default.nix index 89dd2b44338..bab0a84ca79 100644 --- a/pkgs/development/libraries/cimg/default.nix +++ b/pkgs/development/libraries/cimg/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "cimg-${version}"; - version = "2.6.6"; + version = "2.6.7"; src = fetchurl { url = "http://cimg.eu/files/CImg_${version}.zip"; - sha256 = "06a6qgs7q79asfbfp615h5iin23y7g8y1achnmsp3rpkikssskzv"; + sha256 = "1jjsyq6ljpprak8l76aym1p28j9y7djxl73pdh1kpkw85ac23h6m"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/libraries/cpp-netlib/default.nix b/pkgs/development/libraries/cpp-netlib/default.nix index badfc630a47..a4729cdeaed 100644 --- a/pkgs/development/libraries/cpp-netlib/default.nix +++ b/pkgs/development/libraries/cpp-netlib/default.nix @@ -1,12 +1,15 @@ -{ stdenv, fetchurl, cmake, boost, openssl, asio }: +{ stdenv, fetchFromGitHub, cmake, boost, openssl, asio }: stdenv.mkDerivation rec { - name = "cpp-netlib-${version}"; - version = "0.12.0"; + pname = "cpp-netlib"; + version = "0.13.0-final"; - src = fetchurl { - url = "http://downloads.cpp-netlib.org/${version}/${name}-final.tar.bz2"; - sha256 = "0h7gyrbr3madycnj8rl8k1jzk2hd8np2k5ad9mijlh0fizzzk3h8"; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "${pname}-${version}"; + sha256 = "18782sz7aggsl66b4mmi1i0ijwa76iww337fi9sygnplz2hs03a3"; + fetchSubmodules = true; }; buildInputs = [ cmake boost openssl ]; diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index 77773e91e17..81e90154aa5 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, cmake, zlib, c-ares, pkgconfig, openssl, protobuf, gflags }: stdenv.mkDerivation rec { - version = "1.19.1"; + version = "1.22.0"; name = "grpc-${version}"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - sha256 = "0c0jra4qnd86gyr4rlblic3igb5dpgrldac35myk5i5ia547fdhj"; + sha256 = "10wf9sakkxpcvc09n1h91x6slwwhxblghs4zn95klyc4m6py1gfg"; }; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags ]; @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { "-DgRPC_PROTOBUF_PROVIDER=package" "-DgRPC_GFLAGS_PROVIDER=package" "-DBUILD_SHARED_LIBS=ON" + "-DCMAKE_SKIP_BUILD_RPATH=OFF" ]; # CMake creates a build directory by default, this conflicts with the diff --git a/pkgs/development/libraries/libgpiod/default.nix b/pkgs/development/libraries/libgpiod/default.nix index c498ef3460a..5eac024f831 100644 --- a/pkgs/development/libraries/libgpiod/default.nix +++ b/pkgs/development/libraries/libgpiod/default.nix @@ -1,13 +1,12 @@ -{ stdenv, fetchgit, autoreconfHook, autoconf-archive, pkgconfig, kmod, enable-tools ? true }: +{ stdenv, fetchurl, autoreconfHook, autoconf-archive, pkgconfig, kmod, enable-tools ? true }: stdenv.mkDerivation rec { - name = "libgpiod-unstable-${version}"; - version = "2018-10-07"; + pname = "libgpiod"; + version = "1.4"; - src = fetchgit { - url = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git"; - rev = "4bf402d3a49336eacd33654441d575bd267780b8"; - sha256 = "01f3jzb133z189sxdiz9qiy65p0bjqhynfllidbpxdr0cxkyyc1d"; + src = fetchurl { + url = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/snapshot/libgpiod-${version}.tar.gz"; + sha256 = "17qc2qbrnmaimxx9i3l30831hy890hp9s5a48iapni1dlr1z27p2"; }; buildInputs = [ kmod ]; @@ -20,7 +19,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-tools=${if enable-tools then "yes" else "no"}" "--enable-bindings-cxx" - "--prefix=$(out)" + "--prefix=${placeholder ''out''}" ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libiio/default.nix b/pkgs/development/libraries/libiio/default.nix index ee8029966dc..df5035461af 100644 --- a/pkgs/development/libraries/libiio/default.nix +++ b/pkgs/development/libraries/libiio/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchFromGitHub , cmake, flex, bison , libxml2, python +, libusb1, runtimeShell }: stdenv.mkDerivation rec { @@ -17,7 +18,17 @@ stdenv.mkDerivation rec { outputs = [ "out" "lib" "dev" "python" ]; nativeBuildInputs = [ cmake flex bison ]; - buildInputs = [ libxml2 ]; + buildInputs = [ libxml2 libusb1 ]; + + postPatch = '' + substituteInPlace libiio.rules.cmakein \ + --replace /bin/sh ${runtimeShell} + ''; + + # since we can't expand $out in cmakeFlags + preConfigure = '' + cmakeFlags="$cmakeFlags -DUDEV_RULES_INSTALL_DIR=$out/etc/udev/rules.d" + ''; postInstall = '' mkdir -p $python/lib/${python.libPrefix}/site-packages/ diff --git a/pkgs/development/libraries/opencollada/default.nix b/pkgs/development/libraries/opencollada/default.nix index d3e1482feb4..cd3da4a7960 100644 --- a/pkgs/development/libraries/opencollada/default.nix +++ b/pkgs/development/libraries/opencollada/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "opencollada-${version}"; - version = "1.6.67"; + version = "1.6.68"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenCOLLADA"; rev = "v${version}"; - sha256 = "0x1h2ns0y05bdvn3i5s600jz6nb8qw8qqgg54njz7833bcy913mj"; + sha256 = "1ym16fxx9qhf952vva71sdzgbm7ifis0h1n5fj1bfdj8zvvkbw5w"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/openjpeg/generic.nix b/pkgs/development/libraries/openjpeg/generic.nix index 9cd645ed1d4..e26f4160921 100644 --- a/pkgs/development/libraries/openjpeg/generic.nix +++ b/pkgs/development/libraries/openjpeg/generic.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libpng libtiff lcms2 ]; - doCheck = testsSupport; + doCheck = (testsSupport && !stdenv.isAarch64); # tests fail on aarch64-linux checkPhase = '' substituteInPlace ../tools/ctest_scripts/travis-ci.cmake \ --replace "JPYLYZER_EXECUTABLE=" "JPYLYZER_EXECUTABLE=\"${jpylyzer}/bin/jpylyzer\" # " diff --git a/pkgs/development/libraries/wt/default.nix b/pkgs/development/libraries/wt/default.nix index e1c339d1e0f..ba77189b2a5 100644 --- a/pkgs/development/libraries/wt/default.nix +++ b/pkgs/development/libraries/wt/default.nix @@ -34,7 +34,7 @@ let ]; meta = with stdenv.lib; { - homepage = https://www.webtoolkit.eu/wt; + homepage = "https://www.webtoolkit.eu/wt"; description = "C++ library for developing web applications"; platforms = platforms.linux; license = licenses.gpl2; @@ -43,12 +43,12 @@ let }; in { wt3 = generic { - version = "3.3.11"; - sha256 = "1s1bwg3s7brnspr9ya1vg5mr29dbvhf05s606fiv409b7ladqvxq"; + version = "3.4.0"; + sha256 = "0y0b2h9jf5cg1gdh48dj32pj5nsvipab1cgygncxf98c46ikhysg"; }; wt4 = generic { - version = "4.0.5"; - sha256 = "1gn8f30mjmn9aaxdazk49wijz37nglfww15ydrjiyhl6v5xhsjdv"; + version = "4.1.0"; + sha256 = "1a9nl5gs8m8pssf2l3z6kbl2rc9fw5ad7lfslw5yr3gzi0zqn05x"; }; } diff --git a/pkgs/development/python-modules/boltons/default.nix b/pkgs/development/python-modules/boltons/default.nix index 655af7c66f2..b5aa9e6cf03 100644 --- a/pkgs/development/python-modules/boltons/default.nix +++ b/pkgs/development/python-modules/boltons/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "boltons"; - version = "2019-01-07"; + version = "19.1.0"; # No tests in PyPi Tarball src = fetchFromGitHub { owner = "mahmoud"; repo = "boltons"; - rev = "3584ac9399f227a2a11b74153140ee171fd49783"; - sha256 = "13xngjw249sk4vmr5kqqnia0npw0kpa0gm020a4dqid0cjyvj0rv"; + rev = version; + sha256 = "0b55wly0ksviyl3a4dmih9vzd7bj3p10gr6la4722cs9cx4128q5"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/django/2_2.nix b/pkgs/development/python-modules/django/2_2.nix index 34b31bb35ab..efc13e455e5 100644 --- a/pkgs/development/python-modules/django/2_2.nix +++ b/pkgs/development/python-modules/django/2_2.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "Django"; - version = "2.2.3"; + version = "2.2.4"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1sn0a7yjipwxrplh1x4kr77a93xzik1inh07bxwaqaw94qdzc8sd"; + sha256 = "1s5ad5zlmwdn4h5lwn4s4m8mqy0gz4w9nfzyknn815sr252db98n"; }; patches = stdenv.lib.optional withGdal diff --git a/pkgs/development/python-modules/docker/default.nix b/pkgs/development/python-modules/docker/default.nix index fc6169f1b13..d82cc0d3f6b 100644 --- a/pkgs/development/python-modules/docker/default.nix +++ b/pkgs/development/python-modules/docker/default.nix @@ -1,33 +1,43 @@ -{ stdenv, buildPythonPackage, fetchPypi -, six, requests, websocket_client -, ipaddress, backports_ssl_match_hostname, docker_pycreds +{ stdenv, buildPythonPackage, fetchPypi, isPy27 +, backports_ssl_match_hostname +, mock +, paramiko +, pytest +, requests +, six +, websocket_client }: + buildPythonPackage rec { - version = "3.7.2"; + version = "4.0.2"; pname = "docker"; src = fetchPypi { inherit pname version; - sha256 = "c456ded5420af5860441219ff8e51cdec531d65f4a9e948ccd4133e063b72f50"; + sha256 = "0r1i46h8x1vfvadayyvmh5hc6mpzgv3vvp6pv4g1wavamya2wnyc"; }; propagatedBuildInputs = [ six requests websocket_client - ipaddress - backports_ssl_match_hostname - docker_pycreds + paramiko + ] ++ stdenv.lib.optional isPy27 backports_ssl_match_hostname; + + checkInputs = [ + mock + pytest ]; - # Flake8 version conflict - doCheck = false; + # Other tests touch network + checkPhase = '' + ${pytest}/bin/pytest tests/unit/ + ''; meta = with stdenv.lib; { description = "An API client for docker written in Python"; homepage = https://github.com/docker/docker-py; license = licenses.asl20; - maintainers = with maintainers; [ - ]; + maintainers = with maintainers; [ jonringer ]; }; } diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix index f16a5800bb4..9355db763dc 100644 --- a/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/pkgs/development/python-modules/grpcio-tools/default.nix @@ -1,24 +1,24 @@ -{ stdenv, buildPythonPackage, fetchPypi, lib, grpcio}: +{ stdenv, buildPythonPackage, fetchPypi, protobuf, grpcio }: buildPythonPackage rec { pname = "grpcio-tools"; - version = "1.18.0"; + version = "1.22.0"; src = fetchPypi { inherit pname version; - sha256 = "77ec4d3c92ccbbe3de37c457e3c72962e519c36cafb96abe5842bced8eb926fa"; + sha256 = "b5c0fe51a155625c9d1132ab8deb56b3015e111a6961e48aeb9dd89bd7c670ab"; }; enableParallelBuilding = true; - propagatedBuildInputs = [ grpcio ]; + propagatedBuildInputs = [ protobuf grpcio ]; # no tests in the package doCheck = false; meta = with stdenv.lib; { description = "Protobuf code generator for gRPC"; - license = lib.licenses.asl20; + license = licenses.asl20; homepage = "https://grpc.io/grpc/python/"; maintainers = with maintainers; [ vanschelven ]; }; diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix index 9d8814e6531..5c85dd34357 100644 --- a/pkgs/development/python-modules/grpcio/default.nix +++ b/pkgs/development/python-modules/grpcio/default.nix @@ -1,32 +1,30 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, lib, darwin -, six, protobuf, enum34, futures, isPy27, isPy34, pkgconfig +{ stdenv, buildPythonPackage, fetchFromGitHub, darwin +, six, protobuf, enum34, futures, isPy27, pkgconfig , cython}: -with stdenv.lib; buildPythonPackage rec { pname = "grpcio"; - version = "1.18.0"; + version = "1.22.0"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "0cilbhk35gv46mk40jl5f3iqa94x14qyxbavpfq0kh0rld82nx4m"; + sha256 = "093w8mgvl8ylqlqnfz06ijkmlnkxcjszf9zg6k5ybjw7dwal0jhz"; }; nativeBuildInputs = [ cython pkgconfig ] - ++ optional stdenv.isDarwin darwin.cctools; + ++ stdenv.lib.optional stdenv.isDarwin darwin.cctools; propagatedBuildInputs = [ six protobuf ] - ++ lib.optionals (isPy27 || isPy34) [ enum34 ] - ++ lib.optionals (isPy27) [ futures ]; + ++ stdenv.lib.optionals (isPy27) [ enum34 futures ]; - preBuild = optionalString stdenv.isDarwin "unset AR"; + preBuild = stdenv.lib.optionalString stdenv.isDarwin "unset AR"; meta = with stdenv.lib; { description = "HTTP/2-based RPC framework"; - license = lib.licenses.asl20; + license = licenses.asl20; homepage = "https://grpc.io/grpc/python/"; maintainers = with maintainers; [ vanschelven ]; }; diff --git a/pkgs/development/python-modules/jsonpickle/default.nix b/pkgs/development/python-modules/jsonpickle/default.nix index a6ef8e3e1fb..d21864d2682 100644 --- a/pkgs/development/python-modules/jsonpickle/default.nix +++ b/pkgs/development/python-modules/jsonpickle/default.nix @@ -1,18 +1,21 @@ { lib , buildPythonPackage , fetchPypi +, pytest }: buildPythonPackage rec { pname = "jsonpickle"; - version = "1.1"; + version = "1.2"; src = fetchPypi { inherit pname version; - sha256 = "625098cc8e5854b8c23b587aec33bc8e33e0e597636bfaca76152249c78fe5c1"; + sha256 = "16xj4r31pnd90slax5mmd5wps5s73wp9mn6sy9nhkl5ih7bj5sfk"; }; - doCheck = false; + checkInputs = [ pytest ]; + + checkPhase = "pytest tests/jsonpickle_test.py"; meta = { description = "Python library for serializing any arbitrary object graph into JSON"; @@ -20,4 +23,4 @@ buildPythonPackage rec { license = lib.licenses.bsd3; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/paramiko/default.nix b/pkgs/development/python-modules/paramiko/default.nix index a1ecced51eb..7ea4a5ee533 100644 --- a/pkgs/development/python-modules/paramiko/default.nix +++ b/pkgs/development/python-modules/paramiko/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "paramiko"; - version = "2.4.2"; + version = "2.6.0"; src = fetchPypi { inherit pname version; - sha256 = "a8975a7df3560c9f1e2b43dc54ebd40fd00a7017392ca5445ce7df409f900fcb"; + sha256 = "0h9hb2kp07zdfbanad527ll90n9ji7isf7m39jyp0sr21pxfvcpl"; }; checkInputs = [ pytest mock pytest-relaxed ]; diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index 288f35f2352..5791299bdc1 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -1,5 +1,10 @@ { lib, fetchurl, pythonPackages, pkgconfig -, qmake, lndir, qtbase, qtsvg, qtwebengine, dbus +, dbus +, qmake, lndir +, qtbase +, qtsvg +, qtdeclarative +, qtwebchannel , withConnectivity ? false, qtconnectivity , withWebKit ? false, qtwebkit , withWebSockets ? false, qtwebsockets @@ -9,29 +14,61 @@ let inherit (pythonPackages) buildPythonPackage python isPy3k dbus-python enum34; - sip = pythonPackages.sip.override { sip-module = "PyQt5.sip"; }; + sip = (pythonPackages.sip.override { sip-module = "PyQt5.sip"; }).overridePythonAttrs(oldAttrs: { + # If we install sip in another folder, then we need to create a __init__.py as well + # if we want to be able to import it with Python 2. + # Python 3 could rely on it being an implicit namespace package, however, + # PyQt5 we made an explicit namespace package so sip should be as well. + postInstall = '' + cat << EOF > $out/${python.sitePackages}/PyQt5/__init__.py + from pkgutil import extend_path + __path__ = extend_path(__path__, __name__) + EOF + ''; + }); in buildPythonPackage rec { - pname = "PyQt"; - version = "5.11.3"; + pname = "pyqt"; + version = "5.13.0"; format = "other"; src = fetchurl { - url = "mirror://sourceforge/pyqt/PyQt5/PyQt-${version}/PyQt5_gpl-${version}.tar.gz"; - sha256 = "0wqh4srqkcc03rvkwrcshaa028psrq58xkys6npnyhqxc0apvdf9"; + url = "https://www.riverbankcomputing.com/static/Downloads/PyQt5/${version}/PyQt5_gpl-${version}.tar.gz"; + sha256 = "1ydgdz28f1v17qqz3skyv26k5l0w63fr4dncc5xm49jr2gjzznqc"; }; outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig qmake lndir sip ]; - - buildInputs = [ dbus sip ]; - - propagatedBuildInputs = [ qtbase qtsvg qtwebengine dbus-python ] - ++ lib.optional (!isPy3k) enum34 + nativeBuildInputs = [ + pkgconfig + qmake + lndir + sip + qtbase + qtsvg + qtdeclarative + qtwebchannel + ] + ++ lib.optional withConnectivity qtconnectivity + ++ lib.optional withWebKit qtwebkit + ++ lib.optional withWebSockets qtwebsockets + ; + + buildInputs = [ + dbus + qtbase + qtsvg + qtdeclarative + ] ++ lib.optional withConnectivity qtconnectivity ++ lib.optional withWebKit qtwebkit - ++ lib.optional withWebSockets qtwebsockets; + ++ lib.optional withWebSockets qtwebsockets + ; + + propagatedBuildInputs = [ + dbus-python + sip + ] ++ lib.optional (!isPy3k) enum34; patches = [ # Fix some wrong assumptions by ./configure.py @@ -39,6 +76,10 @@ in buildPythonPackage rec { ./pyqt5-fix-dbus-mainloop-support.patch ]; + passthru = { + inherit sip; + }; + configurePhase = '' runHook preConfigure @@ -62,8 +103,34 @@ in buildPythonPackage rec { for i in $out/bin/*; do wrapProgram $i --prefix PYTHONPATH : "$PYTHONPATH" done + + # Let's make it a namespace package + cat << EOF > $out/${python.sitePackages}/PyQt5/__init__.py + from pkgutil import extend_path + __path__ = extend_path(__path__, __name__) + EOF ''; + installCheckPhase = let + modules = [ + "PyQt5" + "PyQt5.QtCore" + "PyQt5.QtQml" + "PyQt5.QtWidgets" + "PyQt5.QtGui" + ] + ++ lib.optional withWebSockets "PyQt5.QtWebSockets" + ++ lib.optional withWebKit "PyQt5.QtWebKit" + ++ lib.optional withConnectivity "PyQt5.QtConnectivity" + ; + imports = lib.concatMapStrings (module: "import ${module};") modules; + in '' + echo "Checking whether modules can be imported..." + ${python.interpreter} -c "${imports}" + ''; + + doCheck = true; + enableParallelBuilding = true; meta = with lib; { diff --git a/pkgs/development/python-modules/pyqtwebengine/default.nix b/pkgs/development/python-modules/pyqtwebengine/default.nix new file mode 100644 index 00000000000..7d745aa9e10 --- /dev/null +++ b/pkgs/development/python-modules/pyqtwebengine/default.nix @@ -0,0 +1,89 @@ +{ lib, fetchurl, pythonPackages, pkgconfig +, qmake, qtbase, qtsvg, qtwebengine +}: + +let + + inherit (pythonPackages) buildPythonPackage python isPy3k pyqt5 enum34; + inherit (pyqt5) sip; + +in buildPythonPackage rec { + pname = "pyqtwebengine"; + version = "5.12.1"; + format = "other"; + + src = fetchurl { + url = "https://www.riverbankcomputing.com/static/Downloads/PyQtWebEngine/${version}/PyQtWebEngine_gpl-${version}.tar.gz"; + sha256 = "0wylkd7fh2g27y3710rpxmj9wx0wpi3z7qbv6khiddm15rkh81w6"; + }; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ + pkgconfig + qmake + sip + qtbase + qtsvg + qtwebengine + ]; + + buildInputs = [ + sip + qtbase + qtsvg + qtwebengine + ]; + + propagatedBuildInputs = [ pyqt5 ] + ++ lib.optional (!isPy3k) enum34; + + configurePhase = '' + runHook preConfigure + + mkdir -p "$out/share/sip/PyQt5" + + # FIXME: Without --no-dist-info, I get + # unable to create /nix/store/yv4pzx3lxk3lscq0pw3hqzs7k4x76xsm-python3-3.7.2/lib/python3.7/site-packages/PyQtWebEngine-5.12.dist-info + ${python.executable} configure.py -w \ + --destdir="$out/${python.sitePackages}/PyQt5" \ + --no-dist-info \ + --apidir="$out/api/${python.libPrefix}" \ + --sipdir="$out/share/sip/PyQt5" \ + --pyqt-sipdir="${pyqt5}/share/sip/PyQt5" \ + --stubsdir="$out/${python.sitePackages}/PyQt5" + + runHook postConfigure + ''; + + postInstall = '' + # Let's make it a namespace package + cat << EOF > $out/${python.sitePackages}/PyQt5/__init__.py + from pkgutil import extend_path + __path__ = extend_path(__path__, __name__) + EOF + ''; + + installCheckPhase = let + modules = [ + "PyQt5.QtWebEngine" + "PyQt5.QtWebEngineWidgets" + ]; + imports = lib.concatMapStrings (module: "import ${module};") modules; + in '' + echo "Checking whether modules can be imported..." + PYTHONPATH=$PYTHONPATH:$out/${python.sitePackages} ${python.interpreter} -c "${imports}" + ''; + + doCheck = true; + + + enableParallelBuilding = true; + + meta = with lib; { + description = "Python bindings for Qt5"; + homepage = http://www.riverbankcomputing.co.uk; + license = licenses.gpl3; + platforms = platforms.mesaPlatforms; + }; +} diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix index 2b034897a78..cb1575f9349 100644 --- a/pkgs/development/python-modules/sip/default.nix +++ b/pkgs/development/python-modules/sip/default.nix @@ -2,25 +2,38 @@ buildPythonPackage rec { pname = sip-module; - version = "4.19.13"; + version = "4.19.18"; format = "other"; disabled = isPyPy; src = fetchurl { - url = "mirror://sourceforge/pyqt/sip/sip-${version}/sip-${version}.tar.gz"; - sha256 = "0pniq03jk1n5bs90yjihw3s3rsmjd8m89y9zbnymzgwrcl2sflz3"; + url = "https://www.riverbankcomputing.com/static/Downloads/sip/${version}/sip-${version}.tar.gz"; + sha256 = "07kyd56xgbb40ljb022rq82shgxprlbl0z27mpf1b6zd00w8dgf0"; }; configurePhase = '' ${python.executable} ./configure.py \ --sip-module ${sip-module} \ - -d $out/lib/${python.libPrefix}/site-packages \ + -d $out/${python.sitePackages} \ -b $out/bin -e $out/include ''; enableParallelBuilding = true; + installCheckPhase = let + modules = [ + sip-module + "sipconfig" + ]; + imports = lib.concatMapStrings (module: "import ${module};") modules; + in '' + echo "Checking whether modules can be imported..." + PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH ${python.interpreter} -c "${imports}" + ''; + + doCheck = true; + meta = with lib; { description = "Creates C++ bindings for Python modules"; homepage = "http://www.riverbankcomputing.co.uk/"; diff --git a/pkgs/development/python-modules/spyder-kernels/default.nix b/pkgs/development/python-modules/spyder-kernels/default.nix index a3aaa942a9b..206b0799b4a 100644 --- a/pkgs/development/python-modules/spyder-kernels/default.nix +++ b/pkgs/development/python-modules/spyder-kernels/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "spyder-kernels"; - version = "0.4.4"; + version = "0.5.1"; src = fetchPypi { inherit pname version; - sha256 = "0g3754s71cnh7kygps6gbzrhs5gb47p3pblr7hcvxk1mzl3xw94r"; + sha256 = "7e124fad5203b748005e952cf33b44695dbb9d92f5e0dc5443e7ca0db817f400"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix index 406cd6e8627..7222f18d5f9 100644 --- a/pkgs/development/python-modules/spyder/default.nix +++ b/pkgs/development/python-modules/spyder/default.nix @@ -1,21 +1,23 @@ { stdenv, buildPythonPackage, fetchPypi, makeDesktopItem, jedi, pycodestyle, psutil, pyflakes, rope, numpy, scipy, matplotlib, pylint, keyring, numpydoc, qtconsole, qtawesome, nbconvert, mccabe, pyopengl, cloudpickle, pygments, - spyder-kernels, qtpy, pyzmq, chardet }: + spyder-kernels, qtpy, pyzmq, chardet +, pyqtwebengine +}: buildPythonPackage rec { pname = "spyder"; - version = "3.3.4"; + version = "3.3.6"; src = fetchPypi { inherit pname version; - sha256 = "1fa5yhw0sjk5qydydp76scyxd8lvyciknq0vajnq0mxhhvfig3ra"; + sha256 = "1z7qw1h3rhca12ycv8xrzw6z2gf81v0j6lfq9kpwh472w4vk75v1"; }; propagatedBuildInputs = [ jedi pycodestyle psutil pyflakes rope numpy scipy matplotlib pylint keyring numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle spyder-kernels - pygments qtpy pyzmq chardet + pygments qtpy pyzmq chardet pyqtwebengine ]; # There is no test for spyder @@ -35,6 +37,7 @@ buildPythonPackage rec { # remove dependency on pyqtwebengine # this is still part of the pyqt 5.11 version we have in nixpkgs sed -i /pyqtwebengine/d setup.py + substituteInPlace setup.py --replace "pyqt5<5.13" "pyqt5" ''; # Create desktop item diff --git a/pkgs/development/python-modules/stringcase/default.nix b/pkgs/development/python-modules/stringcase/default.nix new file mode 100644 index 00000000000..79f05f9b72d --- /dev/null +++ b/pkgs/development/python-modules/stringcase/default.nix @@ -0,0 +1,22 @@ +{ buildPythonPackage, fetchPypi, stdenv +}: + +buildPythonPackage rec { + pname = "stringcase"; + version = "1.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "023hv3gknblhf9lx5kmkcchzmbhkdhmsnknkv7lfy20rcs06k828"; + }; + + # PyPi package does not include tests. + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/okunishinishi/python-stringcase; + description = "Convert string cases between camel case, pascal case, snake case etc…"; + license = licenses.mit; + maintainers = with maintainers; [ alunduil ]; + }; +} diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index a1dfd91c29f..95f5a418a61 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - version = "8.22"; + version = "8.23"; name = "checkstyle-${version}"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "0lnpzh4c5m8xkdx8dxywp33i3zrnwj1nhgpqnqgx31aw3x0drw40"; + sha256 = "0k161c687q33rlm4r8h3f0ks5p2w8pj6kh258zdzk8kjfigfxkmx"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/analysis/frama-c/default.nix b/pkgs/development/tools/analysis/frama-c/default.nix index 29a19022094..5f6b894f984 100644 --- a/pkgs/development/tools/analysis/frama-c/default.nix +++ b/pkgs/development/tools/analysis/frama-c/default.nix @@ -1,87 +1,77 @@ -{ stdenv, fetchurl, makeWrapper, ncurses, ocamlPackages, graphviz -, ltl2ba, coq, why3, autoconf +{ lib, stdenv, fetchurl, makeWrapper, writeText +, autoconf, ncurses, graphviz, doxygen +, ocamlPackages, ltl2ba, coq, why3, }: let mkocamlpath = p: "${p}/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib"; - ocamlpath = "${mkocamlpath ocamlPackages.apron}:${mkocamlpath ocamlPackages.mlgmpidl}"; + runtimeDeps = with ocamlPackages; [ + apron + biniou + camlzip + easy-format + menhir + mlgmpidl + num + ocamlgraph + why3 + yojson + zarith + ]; + ocamlpath = lib.concatMapStringsSep ":" mkocamlpath runtimeDeps; in stdenv.mkDerivation rec { name = "frama-c-${version}"; - version = "18.0"; - slang = "Argon"; + version = "19.0"; + slang = "Potassium"; src = fetchurl { url = "http://frama-c.com/download/frama-c-${version}-${slang}.tar.gz"; - sha256 = "0a88k2mhafj7pz3dzgsqkrc9digkxpnvr9jqq9nbzwq8qr02bca2"; - }; + sha256 = "190n1n4k0xbycz25bn0d2gnfxd8w6scz3nlixl7w2k2jvpqlcs3n"; - why2 = fetchurl { - url = "http://why.lri.fr/download/why-2.40.tar.gz"; - sha256 = "0h1mbpxsgwvf3pbl0qbg22j6f4v1ffka24ap1ajbjk9b1yb3ali8"; }; + preConfigure = lib.optionalString stdenv.cc.isClang "configureFlagsArray=(\"--with-cpp=clang -E -C\")"; + nativeBuildInputs = [ autoconf makeWrapper ]; buildInputs = with ocamlPackages; [ - ncurses ocaml findlib ltl2ba ocamlgraph - lablgtk coq graphviz zarith why3 apron + ncurses ocaml findlib ltl2ba ocamlgraph yojson menhir camlzip + lablgtk coq graphviz zarith apron why3 mlgmpidl doxygen ]; + enableParallelBuilding = true; - # Experimentally, the build segfaults with high core counts - enableParallelBuilding = false; - - unpackPhase = '' - tar xf $src - tar xf $why2 - ''; - - buildPhase = '' - cd frama* - ./configure --prefix=$out - # It is not parallel safe - make - make install - cd ../why* - FRAMAC=$out/bin/frama-c ./configure --prefix=$out - make - make install + fixupPhase = '' for p in $out/bin/frama-c{,-gui}; do wrapProgram $p --prefix OCAMLPATH ':' ${ocamlpath} done ''; - # Enter frama-c directory before patching - prePatch = ''cd frama*''; - patches = [ ./dynamic.diff ]; - postPatch = '' - # strip absolute paths to /usr/bin - for file in ./configure ./share/Makefile.common ./src/*/configure; do #*/ - substituteInPlace $file --replace '/usr/bin/' "" - done + # Allow loading of external Frama-C plugins + setupHook = writeText "setupHook.sh" '' + addFramaCPath () { + if test -d "''$1/lib/frama-c/plugins"; then + export FRAMAC_PLUGIN="''${FRAMAC_PLUGIN}''${FRAMAC_PLUGIN:+:}''$1/lib/frama-c/plugins" + export OCAMLPATH="''${OCAMLPATH}''${OCAMLPATH:+:}''$1/lib/frama-c/plugins" + fi + + if test -d "''$1/lib/frama-c"; then + export OCAMLPATH="''${OCAMLPATH}''${OCAMLPATH:+:}''$1/lib/frama-c" + fi + + if test -d "''$1/share/frama-c/"; then + export FRAMAC_EXTRA_SHARE="''${FRAMAC_EXTRA_SHARE}''${FRAMAC_EXTRA_SHARE:+:}''$1/share/frama-c" + fi - substituteInPlace ./src/plugins/aorai/aorai_register.ml --replace '"ltl2ba' '"${ltl2ba}/bin/ltl2ba' - - cd ../why* - - substituteInPlace ./Makefile.in --replace '-warn-error A' '-warn-error A-3' - substituteInPlace ./frama-c-plugin/Makefile --replace 'shell frama-c' "shell $out/bin/frama-c" - substituteInPlace ./jc/jc_make.ml --replace ' why-dp ' " $out/bin/why-dp " - substituteInPlace ./jc/jc_make.ml --replace "?= why@\n" "?= $out/bin/why@\n" - substituteInPlace ./jc/jc_make.ml --replace ' gwhy-bin@' " $out/bin/gwhy-bin@" - substituteInPlace ./jc/jc_make.ml --replace ' why3 ' " ${why3}/bin/why3 " - substituteInPlace ./jc/jc_make.ml --replace ' why3ide ' " ${why3}/bin/why3ide " - substituteInPlace ./jc/jc_make.ml --replace ' why3replayer ' " ${why3}/bin/why3replayer " - substituteInPlace ./jc/jc_make.ml --replace ' why3ml ' " ${why3}/bin/why3ml " - substituteInPlace ./jc/jc_make.ml --replace ' coqdep@' " ${coq}/bin/coqdep@" - substituteInPlace ./jc/jc_make.ml --replace 'coqc' " ${coq}/bin/coqc" - substituteInPlace ./frama-c-plugin/register.ml --replace ' jessie ' " $out/bin/jessie " - cd .. + } + + addEnvHooks "$targetOffset" addFramaCPath ''; + meta = { description = "An extensible and collaborative platform dedicated to source-code analysis of C software"; homepage = http://frama-c.com/; diff --git a/pkgs/development/tools/analysis/frama-c/dynamic.diff b/pkgs/development/tools/analysis/frama-c/dynamic.diff deleted file mode 100644 index 737cad0cda4..00000000000 --- a/pkgs/development/tools/analysis/frama-c/dynamic.diff +++ /dev/null @@ -1,12 +0,0 @@ ---- a/src/kernel_services/plugin_entry_points/dynamic.ml 2016-05-30 16:15:22.000000000 +0200 -+++ b/src/kernel_services/plugin_entry_points/dynamic.ml 2016-10-13 18:25:31.000000000 +0200 -@@ -270,7 +270,8 @@ - load_path := - List.fold_right (add_dir ~user:true) path - (List.fold_right (add_dir ~user:false) Config.plugin_dir []); -- let findlib_path = String.concat ":" !load_path in -+ let findlib_path = String.concat ":" (!load_path @ -+ try [Sys.getenv "OCAMLPATH"] with Not_found -> []) in - Klog.debug ~dkey "setting findlib path to %s" findlib_path; - Findlib.init ~env_ocamlpath:findlib_path () - diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix index b372481cec7..caa4d718f89 100644 --- a/pkgs/development/tools/analysis/tflint/default.nix +++ b/pkgs/development/tools/analysis/tflint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tflint"; - version = "0.9.2"; + version = "0.9.3"; src = fetchFromGitHub { owner = "wata727"; repo = pname; rev = "v${version}"; - sha256 = "0yk5hygrjkbq5ry2kark3hd59hwjxpgryz0ychr8mhzvlr97aj1k"; + sha256 = "10saljrman41pjmjhbzan8jw8jbz069yhcf6vvzxmw763x5s3n85"; }; - modSha256 = "096hq0xc3cq45r13pm0s0q9rxd4z0ia6x0wy4xmwgzfb97jvn20p"; + modSha256 = "0zfgyv1m7iay3brkqmh35gw1giyr3i3ja56dh4kgm6ai4z1jmvgc"; subPackages = [ "." ]; diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix index 5999525def0..ea8ee1f8496 100644 --- a/pkgs/development/tools/build-managers/bear/default.nix +++ b/pkgs/development/tools/build-managers/bear/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "bear-${version}"; - version = "2.4.0"; + version = "2.4.1"; src = fetchFromGitHub { owner = "rizsotto"; repo = "Bear"; rev = version; - sha256 = "0r5mhacn8v4b2kjni91nxh3b6g86cbkrnlk4f6sj4mdrvx25dp39"; + sha256 = "0fqhhavyz9ddjc3wgb2ng47bfgk1q4w5bwah74nsa02k8r22pbch"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/tools/build-managers/bloop/default.nix b/pkgs/development/tools/build-managers/bloop/default.nix index c20985f31dc..ba842289dba 100644 --- a/pkgs/development/tools/build-managers/bloop/default.nix +++ b/pkgs/development/tools/build-managers/bloop/default.nix @@ -1,56 +1,71 @@ -{ stdenv, lib, fetchurl, coursier, jdk, jre, python, makeWrapper }: +{ stdenv, lib, fetchurl, coursier, python, makeWrapper }: let baseName = "bloop"; - version = "1.2.5"; - deps = stdenv.mkDerivation { - name = "${baseName}-deps-${version}"; + version = "1.3.2"; + nailgunCommit = "9327a60a"; # Fetched from https://github.com/scalacenter/bloop/releases/download/v${version}/install.py + + client = stdenv.mkDerivation { + name = "${baseName}-client-${version}"; + + src = fetchurl { + url = "https://raw.githubusercontent.com/scalacenter/nailgun/${nailgunCommit}/pynailgun/ng.py"; + sha256 = "0z4as5ibmzkd145wsch9caiy4037bgg780gcf7pyns0cv9n955b4"; + }; + + phases = [ "installPhase" ]; + + installPhase = ''cp $src $out''; + }; + + server = stdenv.mkDerivation { + name = "${baseName}-server-${version}"; buildCommand = '' + mkdir -p $out/bin + export COURSIER_CACHE=$(pwd) - ${coursier}/bin/coursier fetch ch.epfl.scala:bloop-frontend_2.12:${version} \ + ${coursier}/bin/coursier bootstrap ch.epfl.scala:bloop-frontend_2.12:${version} \ -r "bintray:scalameta/maven" \ -r "bintray:scalacenter/releases" \ - -r "https://oss.sonatype.org/content/repositories/staging" > deps - mkdir -p $out/share/java - cp $(< deps) $out/share/java/ + -r "https://oss.sonatype.org/content/repositories/staging" \ + --deterministic \ + -f --main bloop.Server -o $out/bin/blp-server ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "19373fyb0g7irrdzb1vsjmyv5xj84qwbcfb6lm076px7wfyn0w1c"; + outputHash = "0k9zc9q793fkfwcssbkmzb0nxmgb99rwi0pjkqhvf719vmgvhc2a"; }; -in -stdenv.mkDerivation rec { - name = "${baseName}-${version}"; - # Fetched from https://github.com/scalacenter/bloop/releases/download/v${version}/install.py - nailgunCommit = "0c325237"; + zsh = stdenv.mkDerivation { + name = "${baseName}-zshcompletion-${version}"; - buildInputs = [ jdk makeWrapper deps ]; + src = fetchurl { + url = "https://raw.githubusercontent.com/scalacenter/bloop/v${version}/etc/zsh/_bloop"; + sha256 = "09qq5888vaqlqan2jbs2qajz2c3ff13zj8r0x2pcxsqmvlqr02hp"; + }; - phases = [ "installPhase" ]; + phases = [ "installPhase" ]; - client = fetchurl { - url = "https://raw.githubusercontent.com/scalacenter/nailgun/${nailgunCommit}/pynailgun/ng.py"; - sha256 = "0qjw4nsyb4cxg96jj1yv5c0ivcxvmscxxqfzll5w9p1pjb30bq0n"; + installPhase = ''cp $src $out''; }; +in +stdenv.mkDerivation rec { + name = "${baseName}-${version}"; - zshCompletion = fetchurl { - url = "https://raw.githubusercontent.com/scalacenter/bloop/v${version}/etc/zsh/_bloop"; - sha256 = "1id6f1fgy2rk0q5aad6ffivhbxa94fallzsc04l9n0y1s2xdhqpm"; - }; + buildInputs = [ makeWrapper ]; + + phases = [ "installPhase" ]; installPhase = '' mkdir -p $out/bin mkdir -p $out/share/zsh/site-functions - cp ${client} $out/bin/blp-client - cp ${zshCompletion} $out/share/zsh/site-functions/_bloop - chmod +x $out/bin/blp-client + ln -s ${server}/bin/blp-server $out/blp-server + ln -s ${zsh} $out/share/zsh/site-functions/_bloop - makeWrapper ${jre}/bin/java $out/bin/blp-server \ - --prefix PATH : ${lib.makeBinPath [ jdk ]} \ - --add-flags "-cp $CLASSPATH bloop.Server" - makeWrapper $out/bin/blp-client $out/bin/bloop \ + cp ${client} $out/bloop + chmod +x $out/bloop + makeWrapper $out/bloop $out/bin/bloop \ --prefix PATH : ${lib.makeBinPath [ python ]} ''; diff --git a/pkgs/development/tools/database/litecli/default.nix b/pkgs/development/tools/database/litecli/default.nix index cbf1af44057..8881bce1a38 100644 --- a/pkgs/development/tools/database/litecli/default.nix +++ b/pkgs/development/tools/database/litecli/default.nix @@ -2,7 +2,7 @@ python3Packages.buildPythonApplication rec { pname = "litecli"; - version = "1.0.0"; + version = "1.1.0"; # Python 2 won't have prompt_toolkit 2.x.x # See: https://github.com/NixOS/nixpkgs/blob/f49e2ad3657dede09dc998a4a98fd5033fb52243/pkgs/top-level/python-packages.nix#L3408 @@ -10,15 +10,9 @@ python3Packages.buildPythonApplication rec { src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0s5a6r5q09144cc5169snwis5i2jrh3z2g4mw9wi2fsjxyhgpwq5"; + sha256 = "0cqil2cmnbw0jvb14v6kbr7l9yarfgy253cbb8v9znp0l4qfs7ra"; }; - # fixes tests https://github.com/dbcli/litecli/pull/53 - postPatch = '' - substituteInPlace litecli/main.py \ - --replace 'except FileNotFoundError:' 'except (FileNotFoundError, OSError):' - ''; - propagatedBuildInputs = with python3Packages; [ cli-helpers click diff --git a/pkgs/development/tools/go-protobuf/default.nix b/pkgs/development/tools/go-protobuf/default.nix index e64d61478e6..f818569dd00 100644 --- a/pkgs/development/tools/go-protobuf/default.nix +++ b/pkgs/development/tools/go-protobuf/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { name = "go-protobuf-${version}"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "golang"; repo = "protobuf"; rev = "v${version}"; - sha256 = "15am4s4646qy6iv0g3kkqq52rzykqjhm4bf08dk0fy2r58knpsyl"; + sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym"; }; modSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5"; diff --git a/pkgs/development/tools/hcloud/default.nix b/pkgs/development/tools/hcloud/default.nix index fd05e12b4d5..9b64dc8a3b1 100644 --- a/pkgs/development/tools/hcloud/default.nix +++ b/pkgs/development/tools/hcloud/default.nix @@ -1,16 +1,16 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "hcloud-${version}"; - version = "1.11.0"; - + pname = "hcloud"; + version = "1.13.0"; + goPackagePath = "github.com/hetznercloud/cli"; src = fetchFromGitHub { owner = "hetznercloud"; repo = "cli"; rev = "v${version}"; - sha256 = "0iknw14728l2mynrvb3fiqm7y893ppp22gbb3mppi6iy3as94f1f"; + sha256 = "1bin9gcmmj3i6a11rv7czvnryl8bv7cjz3pi2cqx8baycg3hia5j"; }; goDeps = ./deps.nix; @@ -32,7 +32,7 @@ buildGoPackage rec { meta = { description = "A command-line interface for Hetzner Cloud, a provider for cloud virtual private servers"; - homepage = https://github.com/hetznercloud/cli; + homepage = "https://github.com/hetznercloud/cli"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.zauberpony ]; diff --git a/pkgs/development/tools/hcloud/deps.nix b/pkgs/development/tools/hcloud/deps.nix index b0b54470128..01bde6f302a 100644 --- a/pkgs/development/tools/hcloud/deps.nix +++ b/pkgs/development/tools/hcloud/deps.nix @@ -1,4 +1,4 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 [ { goPackagePath = "github.com/dustin/go-humanize"; @@ -23,8 +23,8 @@ fetch = { type = "git"; url = "https://github.com/gosuri/uilive"; - rev = "ac356e6e42cd31fcef8e6aec13ae9ed6fe87713e"; - sha256 = "1k28zbc14p1yqzhamp9rcagjdw6wsdb55m08nx758jwlr31az6jy"; + rev = "4512d98b127f3f3a1b7c3cf1104969fdd17b31d9"; + sha256 = "12n3kjgdzrb50jhkcb2ac3437mdhxh33zrcz7mi4gpji20jz4ai7"; }; } { @@ -32,8 +32,17 @@ fetch = { type = "git"; url = "https://github.com/gosuri/uiprogress"; - rev = "d0567a9d84a1c40dd7568115ea66f4887bf57b33"; - sha256 = "1m7rxf71mn8w2yysc8wmf2703avhci6f4nkiijjl1f2cx4kzykck"; + rev = "4442fea128d2bc91caf276b08518bdf4582561c8"; + sha256 = "1g6xjknm0981h3b1drbvm6vd66hiah1cylpdck9cqd18kyxd6bpd"; + }; + } + { + goPackagePath = "github.com/hetznercloud/cli"; + fetch = { + type = "git"; + url = "https://github.com/hetznercloud/cli"; + rev = "d6ec656f964aac4382d9c724edd27a8608e7b354"; + sha256 = "0ng7hihzplwyz4sdipms4m9qq2bcj92qczzd5adhm6da851jxpbc"; }; } { @@ -41,8 +50,8 @@ fetch = { type = "git"; url = "https://github.com/hetznercloud/hcloud-go"; - rev = "ecee721a51a772254d0104bf4d796358e40d6bbd"; - sha256 = "0bwym7f8am14yfh584p28d8lnj4f9mhqi05l1mlrl315xn0c78v3"; + rev = "70b166c92266125ee6a621dcc6089023a5f8d055"; + sha256 = "02hh214qk8qrhl9rpaywv2z5jpkzx3y2j8gv5xmdprdamrjwwlbc"; }; } { @@ -50,8 +59,8 @@ fetch = { type = "git"; url = "https://github.com/pelletier/go-toml"; - rev = "27c6b39a135b7dc87a14afb068809132fb7a9a8f"; - sha256 = "13ldxh43xf4prmcrjzriz3gxpnijpqlzrgyhh7bnkj7lkhryfpk9"; + rev = "84da2c4a25c585816f2c4211b699228d111d18ab"; + sha256 = "1zh5kswqckz7aaz4kpd1kxbxnlhlmprba1ghkl742x6mbv3w08bm"; }; } { @@ -59,8 +68,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/cobra"; - rev = "d2d81d9a96e23f0255397222bb0b4e3165e492dc"; - sha256 = "14nhpiyhz2lm468y5sm1vyxks5aky12kmbhmqq319s92lkm494cy"; + rev = "1c9c46d5c1cc2aaebdd1898c0680e85e8a44b36d"; + sha256 = "0mxliq4gfvdazga8mapc2sazi915rz1h6prnark9hwbbsz0xn0r3"; }; } { @@ -86,8 +95,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "ff983b9c42bc9fbf91556e191cc8efb585c16908"; - sha256 = "1hpr06kzn8jnn3gvzp0p9zn4fz4l9h69f7x66idx142w4xdlaanz"; + rev = "4def268fd1a49955bfb3dda92fe3db4f924f2285"; + sha256 = "1bfsnari529gw34cz0zqk3d9mrkcj1ay35kangri8kbgll0ss5a6"; }; } { @@ -95,8 +104,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "7fbe1cd0fcc20051e1fcb87fbabec4a1bacaaeba"; - sha256 = "0y49s4kazign9nsw2x3h39cgs14lqi57m4hrka26w49z8a1xdyc6"; + rev = "fc99dfbffb4e5ed5758a37e31dd861afe285406b"; + sha256 = "186x8bg926qb9sprs5zpd97xzvvhc2si7q1nhvyg12r5cd6v7zjd"; }; } ] diff --git a/pkgs/development/tools/java/cfr/default.nix b/pkgs/development/tools/java/cfr/default.nix index aa47ed1186c..1f0d8f28609 100644 --- a/pkgs/development/tools/java/cfr/default.nix +++ b/pkgs/development/tools/java/cfr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "cfr-${version}"; - version = "0.145"; + version = "0.146"; src = fetchurl { url = "http://www.benf.org/other/cfr/cfr_${version}.jar"; - sha256 = "0xv2v9z9xwym5m7h6bkvcmdgsa9lmkvsl77vk3aykgbzxywh7xqv"; + sha256 = "16pmn3shhb00x3ba2zazbkprwvc34a6dds8ghc53winbf371xi3c"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/misc/hound/default.nix b/pkgs/development/tools/misc/hound/default.nix index f1875ee0903..0f9219f10a0 100644 --- a/pkgs/development/tools/misc/hound/default.nix +++ b/pkgs/development/tools/misc/hound/default.nix @@ -1,10 +1,18 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv +, buildGoPackage +, fetchFromGitHub +, makeWrapper +, mercurial +, git +}: buildGoPackage rec { name = "hound-unstable-${version}"; version = "2018-11-02"; rev = "74ec7448a234d8d09e800b92e52c92e378c07742"; + nativeBuildInputs = [ makeWrapper ]; + goPackagePath = "github.com/etsy/hound"; src = fetchFromGitHub { @@ -16,6 +24,12 @@ buildGoPackage rec { goDeps = ./deps.nix; + postInstall = with stdenv; let + binPath = lib.makeBinPath [ mercurial git ]; + in '' + wrapProgram $bin/bin/houndd --prefix PATH : ${binPath} + ''; + meta = { inherit (src.meta) homepage; diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index 6dfda2bbfe6..d8899de205f 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -5,13 +5,13 @@ with stdenv.lib; let - version = "0.1.36"; + version = "0.1.37"; src = fetchFromGitHub { rev = "v${version}"; owner = "containers"; repo = "skopeo"; - sha256 = "0q0d6dzx9q57fim0drxs7l45500f3228wq50vzj232x5qx5h00sj"; + sha256 = "1ly5yq3aj4ciqn6hbhvxqp1im81pbas9smdhbbks7iwjvh944d62"; }; defaultPolicyFile = runCommand "skopeo-default-policy.json" {} "cp ${src}/default-policy.json $out"; diff --git a/pkgs/development/tools/vulkan-validation-layers/default.nix b/pkgs/development/tools/vulkan-validation-layers/default.nix index 5acf5ed0d23..3c189d09f1c 100644 --- a/pkgs/development/tools/vulkan-validation-layers/default.nix +++ b/pkgs/development/tools/vulkan-validation-layers/default.nix @@ -3,17 +3,17 @@ , pkgconfig, xlibsWrapper, libxcb, libXrandr, wayland }: stdenv.mkDerivation rec { name = "vulkan-validation-layers-${version}"; - version = "1.1.101.0"; # WARNING: glslang overrides in all-packages.nix must be updated to match known-good.json! + version = "1.1.106.0"; # WARNING: glslang overrides in all-packages.nix must be updated to match known-good.json! src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-ValidationLayers"; rev = "sdk-${version}"; - sha256 = "00gz72m393i3m3rh5hv9d0znzlz39cpw35ifchzb4cr11bi4mzyz"; + sha256 = "1sq42j8ikll2dyi9ygaz80lx89mvq9d21pkaf49gzhg4xjcd97dp"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake python3 vulkan-headers vulkan-loader xlibsWrapper libxcb libXrandr wayland ]; + nativeBuildInputs = [ pkgconfig cmake python3 ]; + buildInputs = [ vulkan-headers vulkan-loader libxcb libXrandr wayland ]; enableParallelBuilding = true; cmakeFlags = [ "-DGLSLANG_INSTALL_DIR=${glslang}" ]; diff --git a/pkgs/development/web/twitter-bootstrap/3.nix b/pkgs/development/web/twitter-bootstrap/3.nix deleted file mode 100644 index 71cda3d3d9f..00000000000 --- a/pkgs/development/web/twitter-bootstrap/3.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl, unzip }: - -stdenv.mkDerivation rec { - name = "bootstrap-${version}"; - version = "3.4.1"; - - src = fetchurl { - url = "https://github.com/twbs/bootstrap/releases/download/v${version}/bootstrap-${version}-dist.zip"; - sha256 = "0bnrxyryl4kyq250k4n2lxgkddfs9lxhqd6gq8x3kg9wfz7r75yl"; - }; - - buildInputs = [ unzip ]; - - dontBuild = true; - installPhase = '' - mkdir $out - cp -r * $out/ - ''; - - meta = { - description = "Front-end framework for faster and easier web development"; - homepage = https://getbootstrap.com/; - license = stdenv.lib.licenses.mit; - }; - -} diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index 7cd9212c5a8..2530202a565 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -7,7 +7,7 @@ , lame , mplayer , libpulseaudio -, pyqt5 +, pyqtwebengine , decorator , beautifulsoup4 , sqlalchemy @@ -83,7 +83,7 @@ buildPythonApplication rec { outputs = [ "out" "doc" "man" ]; propagatedBuildInputs = [ - pyqt5 sqlalchemy beautifulsoup4 send2trash pyaudio requests decorator + pyqtwebengine sqlalchemy beautifulsoup4 send2trash pyaudio requests decorator markdown ] ++ lib.optional plotsSupport matplotlib diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix index 203afa93b45..2179c2bff76 100644 --- a/pkgs/games/crawl/default.nix +++ b/pkgs/games/crawl/default.nix @@ -49,8 +49,9 @@ stdenv.mkDerivation rec { fontsPath = lib.optionalString tileMode dejavu_fonts; - makeFlags = [ "prefix=$(out)" "FORCE_CC=cc" "FORCE_CXX=c++" "HOSTCXX=c++" + makeFlags = [ "prefix=${placeholder "out"}" "FORCE_CC=cc" "FORCE_CXX=c++" "HOSTCXX=c++" "SAVEDIR=~/.crawl" "sqlite=${sqlite.dev}" + "DATADIR=${placeholder "out"}" ] ++ lib.optional tileMode "TILES=y" ++ lib.optional enableSound "SOUND=y"; diff --git a/pkgs/games/flare/default.nix b/pkgs/games/flare/default.nix index 5ae656d1fc1..551276b1b25 100644 --- a/pkgs/games/flare/default.nix +++ b/pkgs/games/flare/default.nix @@ -1,10 +1,10 @@ -{ lib, buildEnv, callPackage, makeWrapper }: +{ lib, buildEnv, callPackage, makeWrapper, Cocoa }: buildEnv { - name = "flare-1.10"; + name = "flare-1.11"; paths = [ - (callPackage ./engine.nix {}) + (callPackage ./engine.nix { inherit Cocoa; }) (callPackage ./game.nix {}) ]; diff --git a/pkgs/games/flare/engine.nix b/pkgs/games/flare/engine.nix index 8b620835f85..74f983c6441 100644 --- a/pkgs/games/flare/engine.nix +++ b/pkgs/games/flare/engine.nix @@ -1,18 +1,19 @@ -{ stdenv, fetchFromGitHub, cmake, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf }: +{ stdenv, fetchFromGitHub, cmake, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, Cocoa }: stdenv.mkDerivation rec { pname = "flare-engine"; - version = "1.10"; + version = "1.11"; src = fetchFromGitHub { owner = "flareteam"; repo = pname; rev = "v${version}"; - sha256 = "0fm7jmxl86h8199nazdi9ivsrhcv9gcymhz1l5c6l2f4d0aqdqiq"; + sha256 = "1j6raymz128miq517h9drks4gj79dajw3lsr0msqxz0z3zm6cc4n"; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ SDL2 SDL2_image SDL2_mixer SDL2_ttf ]; + buildInputs = [ SDL2 SDL2_image SDL2_mixer SDL2_ttf ] + ++ stdenv.lib.optional stdenv.isDarwin Cocoa; meta = with stdenv.lib; { description = "Free/Libre Action Roleplaying Engine"; diff --git a/pkgs/games/flare/game.nix b/pkgs/games/flare/game.nix index b10d7dfedb0..6a231a5ff7d 100644 --- a/pkgs/games/flare/game.nix +++ b/pkgs/games/flare/game.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flare-game"; - version = "1.10"; + version = "1.11"; src = fetchFromGitHub { owner = "flareteam"; repo = pname; rev = "v${version}"; - sha256 = "1lfra4ww8za08vcgza2jvh3jrwi6zryk4ljyj32lpp9v4ws9hdh4"; + sha256 = "18m2qfbbaqklm20gnr7wzrwbmylp1jh781a4p1dq0hymqcg92x5l"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index 6f32e91044c..4f48f1248f4 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -20,13 +20,13 @@ let }; in stdenv.mkDerivation rec { name = "dolphin-emu-${version}"; - version = "5.0-9976"; + version = "5.0-10751"; src = fetchFromGitHub { owner = "dolphin-emu"; repo = "dolphin"; - rev = "63f30cc44da248b0226e1c8724b3e53ecf4c768f"; - sha256 = "0lkf571kzmw26fybl1lqpvhc81jkbh4hcvi3766bb7mvvzapkybd"; + rev = "64c0ff576c6d3ea2ee35e6b6d7ea8c814442d53f"; + sha256 = "19351j3gys9kgxpdjv1dckaiv74dylcdh1kx0z9qz8llv9s1r0s3"; }; enableParallelBuilding = true; diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 41c73577df7..7ad6283c930 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -61,12 +61,12 @@ let ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2019-07-30"; + version = "2019-08-02"; src = fetchFromGitHub { owner = "w0rp"; repo = "ale"; - rev = "8f5ecf01200f82d12d452992a92c23fcf9e0f0e8"; - sha256 = "0yb9d1wh5b1g53bg5rjwf84m140rpsdb6i5rnp28a1w24330vxhg"; + rev = "dd1e1025b8a9b13cb7966bf2baa3e6b42a862857"; + sha256 = "0rgfsnx4dbigbc17r3ksvikmdkyfz3fl4g78nd31lxhsn3x5akcj"; }; }; @@ -182,12 +182,12 @@ let calendar-vim = buildVimPluginFrom2Nix { pname = "calendar-vim"; - version = "2019-07-20"; + version = "2019-07-30"; src = fetchFromGitHub { owner = "itchyny"; repo = "calendar.vim"; - rev = "cf9ddfe0eb36a4d57a1240735360385e3ed5534c"; - sha256 = "0504wl874fr0lzv48l8khfrx4l59c6bklndvrgmf5xj9ppz72hza"; + rev = "f8ba659ba6a094d000f355807efb71f7975d10f0"; + sha256 = "16np6mkmn7h4rx9471yqy4k89m6w9v1gz1cyphlwn90gzm8f97xz"; }; }; @@ -314,12 +314,12 @@ let coc-go = buildVimPluginFrom2Nix { pname = "coc-go"; - version = "2019-05-24"; + version = "2019-08-02"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-go"; - rev = "2393c9860927e91874f6d13174cc1edeec758d9c"; - sha256 = "1szq2nr3gppza2rq8b6kh4a8f3h831gzbnbnv45ycrcyplb4w2sy"; + rev = "6a4b1485dbbd1e4bbc18a03beaeebe3cc6018e8f"; + sha256 = "1nd9fph6yvg1n7cabd5li9qxs3b2g0v3q7qq1n1xmp3n49c5m0nr"; }; }; @@ -391,12 +391,12 @@ let coc-lists = buildVimPluginFrom2Nix { pname = "coc-lists"; - version = "2019-07-22"; + version = "2019-08-01"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-lists"; - rev = "24e00e54ca8f4e38303f02927694d09d0ddc0287"; - sha256 = "0wjhdp4nym3f56h5bi923q46vp7c5d611fywamzva5sv5raainxq"; + rev = "999865c6bd3745689d1eb4009b9b706cb5a68617"; + sha256 = "0sq9im0bbbpsjcf22frn24rb5apxf3sravqhlvwkh34wh9qjvzgy"; }; }; @@ -545,12 +545,12 @@ let coc-tsserver = buildVimPluginFrom2Nix { pname = "coc-tsserver"; - version = "2019-07-21"; + version = "2019-08-01"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-tsserver"; - rev = "f8ed02524da46c71e5c3b79e0707cbc6d66666f5"; - sha256 = "1w7lz287b322zan6rqimcmypaf9vq3x0ix1ka9s63qzgnpwg7g1i"; + rev = "8daf0e45d513ab3b9eb91e126e50c48b901d8cf9"; + sha256 = "1zf75zahvcq5kcrpn5m69i0sj3dv4g2m8x3jffjqnx3cnirm42r4"; }; }; @@ -622,12 +622,12 @@ let command-t = buildVimPluginFrom2Nix { pname = "command-t"; - version = "2019-06-28"; + version = "2019-08-02"; src = fetchFromGitHub { owner = "wincent"; repo = "command-t"; - rev = "4f86fcb812b07a3d691d4b617e093b001a6ad839"; - sha256 = "06i02632q6rkq7xljfn70shlfb301l31sv8pd738anshf8qwkfff"; + rev = "02a22d27e1c4671db32b0ded1fa2bb861c16d14c"; + sha256 = "0aj9lnrd0v4296c8rwy4bp73dah0lx298yi6ybz3rma2gx9xss6c"; fetchSubmodules = true; }; }; @@ -788,12 +788,12 @@ let denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2019-07-28"; + version = "2019-08-03"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "00ce66260291d059386f1aac6ef707e6dbd0c13f"; - sha256 = "174d78f5xxx2i040xqm8qmm8px3w06wnwcgmcvb0jjpy3blj2v3a"; + rev = "85fa3ed3b430df61d1b8aeb8772162acfebc1f46"; + sha256 = "1m7y3ph51wxcm3yasdg3ajxwm4bqdjq7ajg5c4f3d3xf8f2nkl87"; }; }; @@ -901,12 +901,12 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2019-07-29"; + version = "2019-08-03"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "3267781440f62dc5070d9a8a2d25d926b0266403"; - sha256 = "1w22b251l6wg9s90npvj04b45fyjh1rl60g7s9l5c44iqxc8aamw"; + rev = "e8cab49ac99a5bb45e16a4bf24bb697163e7beaf"; + sha256 = "1g03ybsjv7j5iad34bax949s29lxi89cs5i3g9h0ypg4if1c0g53"; }; }; @@ -1013,12 +1013,12 @@ let falcon = buildVimPluginFrom2Nix { pname = "falcon"; - version = "2019-07-29"; + version = "2019-08-01"; src = fetchFromGitHub { owner = "fenetikm"; repo = "falcon"; - rev = "9db4ff975d5745aaa33ed52b6025dd24112b1007"; - sha256 = "04lkw240kcsrc15qydxkbg57wqr41k530zc8pzxicr6axby6xjgc"; + rev = "370f7efa1ce15d4d8fa62b2b00ea60bebd11ef73"; + sha256 = "0i5vjxwrmj0amf8dbr6slq91gg2rkvdw8gwam7qaf7n6d874qxbn"; }; }; @@ -1477,12 +1477,12 @@ let lightline-vim = buildVimPluginFrom2Nix { pname = "lightline-vim"; - version = "2019-07-25"; + version = "2019-08-02"; src = fetchFromGitHub { owner = "itchyny"; repo = "lightline.vim"; - rev = "f2a1f47c85a1341895c20e6dbc3a9440804eec1b"; - sha256 = "0048c83fpf5snpwj913rsx7h8giymbb9k5ssjfaxcl8jfz3j6qdc"; + rev = "d589eb55305043955e65df8f326580f06e4533c9"; + sha256 = "0fvj8p5dh0gg9kxnn6shfyb84jmvv5f6wvh6fa0cgycy7xl1jrrk"; }; }; @@ -1675,12 +1675,12 @@ let neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2019-07-28"; + version = "2019-08-01"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "673f9d571134299951250535402ac32ad713f8d5"; - sha256 = "1jvyb6rdfd60c36vyxpkfh4cbwk8v6bhqpk5i384a6gxc7577f0v"; + rev = "528b5e47ec9c29fbbd470f2af71b8ad994a96bdb"; + sha256 = "09cq8a4ryhxvnpjvpbm0dq22ccqfmym59avxr4c0ablx1sqy9lhy"; }; }; @@ -1719,12 +1719,12 @@ let neosnippet-snippets = buildVimPluginFrom2Nix { pname = "neosnippet-snippets"; - version = "2019-07-21"; + version = "2019-08-03"; src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet-snippets"; - rev = "25dbe4ac607580fa05940dae24e544147d0bafeb"; - sha256 = "19vbk47mxa7j4bznk4vbxqzlscbk9kfqrsp6ja6x6bv7xvnhs8wm"; + rev = "c5b182d5831f298bde1d6ce9bf28ada62fb61157"; + sha256 = "0diq8yhrs0359sajzd07ri0f985lgkl5959284pbjhv3r8vm22rc"; }; }; @@ -2137,12 +2137,12 @@ let rust-vim = buildVimPluginFrom2Nix { pname = "rust-vim"; - version = "2019-07-26"; + version = "2019-08-01"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust.vim"; - rev = "18fef3b61ce18ad262ca014d11496457d8574df7"; - sha256 = "0iwc4fjvrif2sdgmzp392lyr7q2n8c2kdwvdpam7q16cql0va1ry"; + rev = "772eaa6a991d2a0f53844f241a6af3bc1ab1fc50"; + sha256 = "1794yvladda6wz574qn0cv3giainqssl864vhh16aigjjaqy76nf"; }; }; @@ -3094,12 +3094,12 @@ let vim-dispatch = buildVimPluginFrom2Nix { pname = "vim-dispatch"; - version = "2019-07-26"; + version = "2019-08-01"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dispatch"; - rev = "8e046e365fb74309f2504e9a3bcb2234e17a371b"; - sha256 = "074k4rf568489g2rw0vaf7al20qgwpsvm3pd5jh102ibqc5m3xp8"; + rev = "c58708e820252d594541a86e31fbc95ec8d37e3e"; + sha256 = "0py41f0dkvx95w8hb3a2cys981x8nz4a0nn3hs7rjv3z0brrsxfx"; }; }; @@ -3215,12 +3215,12 @@ let vim-fireplace = buildVimPluginFrom2Nix { pname = "vim-fireplace"; - version = "2019-07-30"; + version = "2019-08-02"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fireplace"; - rev = "76b4a30d6dfdb7f7e81a934a91c6810c6acf7787"; - sha256 = "1pdf3r8an21fbh7pixmijw9m7fgkqfbwwgzbplaz3j6d123wqq4n"; + rev = "5886fd272a7957fa2791c567866c7fc2b4dec73c"; + sha256 = "11ygf520p7s7fj7gv1pnzv62ywa2afbm5kbkipbdwwnd4m90amzk"; }; }; @@ -3281,12 +3281,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2019-07-29"; + version = "2019-08-03"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "a3ab24f68148c838597567e9cb88b81427f5ea60"; - sha256 = "0kxagcy8sk98f89jgisnii03w4phpsggp9ypydcc66djpkygd8bv"; + rev = "e5a6a8c5256c8afe2c607f8566e4ef35c43b5de2"; + sha256 = "165vgx5h1qmkbir30a1hd5mym2d09wz0q556cwhipmypkyfnfzcp"; }; }; @@ -3358,12 +3358,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2019-07-30"; + version = "2019-08-02"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "8e9293f729cf13f21b6e5b48b5982492d5e5f655"; - sha256 = "016zyh8j6i2d0qwcb7mw1cmcbp0i23sjf63crgmm00g645bn2cx8"; + rev = "974fd4367cd327a075b79f6d9d7b71f3e84d7a4c"; + sha256 = "1q8k9rgy191d502jl654nvlmh2nd5m2lq03l5ldyi2y6cgrd5k8d"; }; }; @@ -3810,12 +3810,12 @@ let vim-lsc = buildVimPluginFrom2Nix { pname = "vim-lsc"; - version = "2019-07-30"; + version = "2019-08-02"; src = fetchFromGitHub { owner = "natebosch"; repo = "vim-lsc"; - rev = "2cdd275bcc85962d3e8bbc2864210c7ed78019a9"; - sha256 = "0y01kk0wbf419srp3g27078lc69czfdb2mnxmjff7kam1f9krzfv"; + rev = "ad9d2bd0582419e902bc402545da397634202ed0"; + sha256 = "12b46vcc8kw6nhp177vs8b4lwh0nd34a74j5vfa2wd5d3mhqz5j8"; }; }; @@ -4118,12 +4118,12 @@ let vim-projectionist = buildVimPluginFrom2Nix { pname = "vim-projectionist"; - version = "2019-07-19"; + version = "2019-07-29"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-projectionist"; - rev = "e07013ac9ed5ff998c62f5fe12800eb31b083f12"; - sha256 = "1bmcw4pawniwn01gvcxd98wp7pksd9ncqmiajvxb2pgnanpl5dk8"; + rev = "94001f00825c36fab63b9f3ca47a204111e561a2"; + sha256 = "0pppaavma07c3lxqlbk8cghdsirncxng52mjmv5qk8yar8kxqvbr"; }; }; @@ -4173,12 +4173,12 @@ let vim-racer = buildVimPluginFrom2Nix { pname = "vim-racer"; - version = "2019-04-21"; + version = "2019-07-30"; src = fetchFromGitHub { owner = "racer-rust"; repo = "vim-racer"; - rev = "4649e13a1f5a9c31781db570ac7de97e57dc0b3c"; - sha256 = "07ywhrlhh5vvxrnwac05q75a0vjrmhdjvcql88qrxwg88na6db7i"; + rev = "539e38c6ec0f747a9116452fe9ebd062222b89a3"; + sha256 = "19kfhm32mspwvnvfl96hzl67h9jcmzwwl92c37rw38pqpnm1sy1l"; }; }; @@ -4690,12 +4690,12 @@ let vim-vue = buildVimPluginFrom2Nix { pname = "vim-vue"; - version = "2019-07-29"; + version = "2019-08-01"; src = fetchFromGitHub { owner = "posva"; repo = "vim-vue"; - rev = "da6395c56b20514add2d9c8b0283aaabb96e54b1"; - sha256 = "01r96pwamdnma9vbqvrrqy91sa18d3g8w85izaacfcfibh7q87bk"; + rev = "fcdc2d25d19edf5f0dcf87bc2c5c7327190bf59b"; + sha256 = "1lryy3kqihgm3sql686z3irwsr96ka0vj10bqfsdmjzk05h87yhb"; }; }; @@ -4822,12 +4822,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2019-07-30"; + version = "2019-08-03"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "35292b2f4b29300102db97db2c5d4c82add1711f"; - sha256 = "0y4z9zpl2fg9dwzzz697nq1iw2jxxdc1gzbak77fdkbywx7lpymy"; + rev = "b2385ed9016442a27c8ce028ab566de864ee1910"; + sha256 = "0q2w8jhnpfzr49bqpmgya31w55pi7zvr41ar6maqchqi9fns25gf"; }; }; @@ -4932,12 +4932,12 @@ let xptemplate = buildVimPluginFrom2Nix { pname = "xptemplate"; - version = "2017-12-06"; + version = "2019-07-31"; src = fetchFromGitHub { owner = "drmingdrmer"; repo = "xptemplate"; - rev = "74aac3aebaf9c67c12c21d6b25295b9bec9c93b3"; - sha256 = "01yvas50hg7iwwrdh61407mc477byviccksgi0fkaz89p78bbd1p"; + rev = "e8c0d74b1308415dfebadaf58ba94b2d34aecec2"; + sha256 = "0x3c9f3vpkwnmshbmwg4lddivssx6s4f3b3px6nf4cxd0lbm4j9l"; }; }; diff --git a/pkgs/os-specific/linux/batman-adv/batctl.nix b/pkgs/os-specific/linux/batman-adv/batctl.nix index 58c6a7167e3..537010dea53 100644 --- a/pkgs/os-specific/linux/batman-adv/batctl.nix +++ b/pkgs/os-specific/linux/batman-adv/batctl.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, libnl }: let - ver = "2019.2"; + ver = "2019.3"; in stdenv.mkDerivation rec { name = "batctl-${ver}"; src = fetchurl { url = "https://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz"; - sha256 = "18qfz209pyksklcnrgvw6hm30iw7dng0rxi2njqxhk3xzw464rgv"; + sha256 = "0307a01n72kg7vcm60mi8jna6bydiin2cr3ylrixra1596hkzn9b"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/ipset/default.nix b/pkgs/os-specific/linux/ipset/default.nix index c831c14031a..57255b4a382 100644 --- a/pkgs/os-specific/linux/ipset/default.nix +++ b/pkgs/os-specific/linux/ipset/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libmnl }: stdenv.mkDerivation rec { - name = "ipset-7.2"; + name = "ipset-7.3"; src = fetchurl { url = "http://ipset.netfilter.org/${name}.tar.bz2"; - sha256 = "06268dchlk4x8x27rhn569hjkm99jk2iid3ara2xr7k66i2kh4rf"; + sha256 = "0nm3vagr1pb5hr1028qrwx6v6s8bxf1m4qjx72vak42y032wfi26"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 57d9ad8fc16..57b0585ea4e 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.135"; + version = "4.14.136"; # 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 = "0x2v0pj4hjb71qkxbqn4ymg6zmyabp91kylyzd270nbig7i234a2"; + sha256 = "0w6z5fhwqgpqnz2js8vj9j5dl6isx8n7rnzrm0vr9r8njaazz396"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index a1192b68b3f..dc404f0ef6a 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.63"; + version = "4.19.64"; # 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 = "0pfjwpa6szvdr941y13806hlsgsbslfsvkrd5534p1iip5h8g63m"; + sha256 = "1gasmcdsrsk81dscslmrsxqsvkfp5xxdx3ay95izggpk7piqnvvs"; }; } // (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 366bf1ad265..000ba6073a3 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, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.186"; + version = "4.4.187"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "113rjf8842glzi23y1g1yrwncihv2saah6wz0r726r06bk9p64hb"; + sha256 = "1dlzb5yzcsicd41myj3q4dq2ql8xcc49brs5f7xjmc5ynvvjjgnc"; }; } // (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 8fe5d3dfcb2..de15a2700a9 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, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.186"; + version = "4.9.187"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0sjbp7m6d625rw06wv34a0805d1lgldii4pxiqfpja871m1q8914"; + sha256 = "1iyimwl4ysnk6m66m73sg0cnp4vac56d6yy174shfpnj5h2csjq1"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.2.nix b/pkgs/os-specific/linux/kernel/linux-5.2.nix index 9a0551c4d06..d74f8548b3b 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.2.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.2.5"; + version = "5.2.6"; # 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/v5.x/linux-${version}.tar.xz"; - sha256 = "15ndscsp3yqgas901g6inpmyvinz4cwr5y3md516j2pr8cl40if6"; + sha256 = "1whzgdz1wnjzkb78yqz4xs3mad02rv17ksmwaf4ykp4lfgxml45y"; }; } // (args.argsOverride or {})) diff --git a/pkgs/servers/confluent-platform/default.nix b/pkgs/servers/confluent-platform/default.nix index 34950228920..84985b8f0eb 100644 --- a/pkgs/servers/confluent-platform/default.nix +++ b/pkgs/servers/confluent-platform/default.nix @@ -1,20 +1,35 @@ -{ stdenv, lib, fetchurl, jre, makeWrapper, bash, gnused }: +{ stdenv, lib, fetchurl, fetchFromGitHub +, jre, makeWrapper, bash, gnused }: -let - scalaVersion = "2.12"; -in stdenv.mkDerivation rec { name = "confluent-platform-${version}"; - version = "5.2.1"; + version = "5.3.0"; + scalaVersion = "2.12"; src = fetchurl { url = "http://packages.confluent.io/archive/${lib.versions.majorMinor version}/confluent-${version}-${scalaVersion}.tar.gz"; - sha256 = "11fdcc557aca782e87352ed6e655c37c71fb7b3a003796ee956970b01dedbbb1"; + sha256 = "14cilq63fib5yvj40504aj6wssi7xw4f7c2jadlzdmdxzh4ixqmp"; + }; + + confluentCli = fetchFromGitHub { + owner = "confluentinc"; + repo = "confluent-cli"; + rev = "v${version}"; + sha256 = "18yvp56b8l074qfkgr4afirgd43g8b023n9ija6dnk6p6dib1f4j"; }; buildInputs = [ jre makeWrapper bash ]; installPhase = '' + cp -R $confluentCli confluent-cli + chmod -R +w confluent-cli + + ( + export CONFLUENT_HOME=$PWD + cd confluent-cli + make install + ) + mkdir -p $out cp -R bin etc share src $out rm -rf $out/bin/windows @@ -32,7 +47,7 @@ stdenv.mkDerivation rec { wrapProgram $p \ --set JAVA_HOME "${jre}" \ --set KAFKA_LOG_DIR "/tmp/apache-kafka-logs" \ - --prefix PATH : "${bash}/bin:${gnused}/bin" + --prefix PATH : "${jre}/bin:${bash}/bin:${gnused}/bin" done ''; diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 4c4a45cca79..74d0d1341d6 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -8,14 +8,14 @@ assert enableSeccomp -> libseccomp != null; assert enablePython -> python3 != null; -let version = "9.14.3"; in +let version = "9.14.4"; in stdenv.mkDerivation rec { name = "bind-${version}"; src = fetchurl { url = "https://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz"; - sha256 = "1ymxr38c62w6961j8g2vllnv0s72z7zk4b2j2k8ixdh1rymqm1yf"; + sha256 = "0gxqws7ml15lwkjw9mdcd759gv5kk3s9m17j3vrp9448ls1gnbii"; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; diff --git a/pkgs/servers/icingaweb2/default.nix b/pkgs/servers/icingaweb2/default.nix index 11bfb99782d..9216464f1e4 100644 --- a/pkgs/servers/icingaweb2/default.nix +++ b/pkgs/servers/icingaweb2/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, php }: with lib; stdenv.mkDerivation rec { name = "icingaweb2-${version}"; - version = "2.6.3"; + version = "2.7.0"; src = fetchFromGitHub { owner = "Icinga"; repo = "icingaweb2"; rev = "v${version}"; - sha256 = "0xcsf45m85d4ww5y2d5i73rjbp3hmc8lljc67lz9fl6f90y9gb22"; + sha256 = "0akz2v9zfdchagnzdqcvzrxyw9bkmg8pp23wwdpwdrw67z2931zj"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 1091e31cf9f..d2ead585e7d 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jackett-${version}"; - version = "0.11.457"; + version = "0.11.559"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "139ga5qra6jrn3mkp08a5p495alxq78a8imfj4k8ywv1s05kw7dw"; + sha256 = "1ds263q92igvgn0dirl506cmrzy374msaxl1x13gax0i0ggf09mq"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index d5aea241484..84d4d04cac7 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -8,14 +8,14 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.16.2.1321-ad17d5f9e"; + version = "1.16.3.1402-22929c8a2"; pname = "plexmediaserver"; name = "${pname}-${version}"; # Fetch the source src = fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/redhat/plexmediaserver-${version}.x86_64.rpm"; - sha256 = "0h3qw563fa296crbcnarykk3lq7qp1v4znzzylbmy87li1rd77a9"; + sha256 = "0mb5y777mcyn8lv1afyi0xx0afyzjm67ccbbkyhk2j817k9diyg5"; }; outputs = [ "out" "basedb" ]; diff --git a/pkgs/servers/search/solr/8.x.nix b/pkgs/servers/search/solr/8.x.nix index 3c21a2a77ef..48f5847b111 100644 --- a/pkgs/servers/search/solr/8.x.nix +++ b/pkgs/servers/search/solr/8.x.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "solr"; - version = "8.1.1"; + version = "8.2.0"; src = fetchurl { url = "mirror://apache/lucene/${pname}/${version}/${pname}-${version}.tgz"; - sha256 = "18a6pgbvg6z38r3kqkhr152z7sa2hqip2g9fd26y4gzm2665j5dm"; + sha256 = "0j9lydxlng785h2n1b8avinrkqdpbj5qn4rk897p2pbf4fdv795z"; }; nativeBuildInputs = [ makeWrapper ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://lucene.apache.org/solr/; + homepage = "https://lucene.apache.org/solr/"; description = "Open source enterprise search platform from the Apache Lucene project"; license = licenses.asl20; platforms = platforms.all; diff --git a/pkgs/servers/search/solr/default.nix b/pkgs/servers/search/solr/default.nix index 6a32ce39d5c..ddd46299a9c 100644 --- a/pkgs/servers/search/solr/default.nix +++ b/pkgs/servers/search/solr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "solr"; - version = "7.7.1"; + version = "7.7.2"; src = fetchurl { url = "mirror://apache/lucene/solr/${version}/solr-${version}.tgz"; - sha256 = "1i189xhlxrpdqx2gx3r8s4dcd7nm74vjynwkrgv2hnq4mw95zf2g"; + sha256 = "1pr02d4sw5arig1brjb6j7ir644n8s737qsx6ll46di5iw1y93pb"; }; nativeBuildInputs = [ makeWrapper ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://lucene.apache.org/solr/; + homepage = "https://lucene.apache.org/solr/"; description = "Open source enterprise search platform from the Apache Lucene project"; license = licenses.asl20; platforms = platforms.all; diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix index c37eaad2f7f..a55d1cf14cd 100644 --- a/pkgs/servers/sip/freeswitch/default.nix +++ b/pkgs/servers/sip/freeswitch/default.nix @@ -1,6 +1,6 @@ let -# the default list from v1.8.5, except with applications/mod_signalwire also disabled +# the default list from v1.8.7, except with applications/mod_signalwire also disabled defaultModules = mods: with mods; [ applications.commands applications.conference @@ -86,11 +86,11 @@ modulesConf = let in stdenv.mkDerivation rec { - name = "freeswitch-1.8.5"; + name = "freeswitch-1.8.7"; src = fetchurl { url = "https://files.freeswitch.org/freeswitch-releases/${name}.tar.bz2"; - sha256 = "00xdrx84pw2v5pw1r5gfbb77nmvlfj275pmd48yfrc9g8c91j1sr"; + sha256 = "0k52mxdfc5w9fdnz8kvfjiwnnjjhnpkirnyrfkhq7bad84m731z4"; }; postPatch = '' patchShebangs libs/libvpx/build/make/rtcd.pl diff --git a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix index 87a54471eca..f37e347e89a 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix @@ -1,20 +1,20 @@ -{ stdenv, fetchFromGitHub, postgresql, openssl }: +{ stdenv, fetchFromGitHub, postgresql, openssl, zlib, readline }: if stdenv.lib.versionOlder postgresql.version "10" then throw "pg_auto_failover not supported for PostgreSQL ${postgresql.version}" else stdenv.mkDerivation rec { pname = "pg_auto_failover"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "citusdata"; repo = pname; rev = "v${version}"; - sha256 = "1296zk143y9fvmcg2hjbrjdjfhi5rrd0clh16vblkghcvxrzfyvy"; + sha256 = "0mggf5h6gh2mck75dmz5w63gi7d10pqs58fdp2jdpv3am75picll"; }; - buildInputs = [ postgresql openssl ]; + buildInputs = [ postgresql openssl zlib readline ]; installPhase = '' install -D -t $out/bin src/bin/pg_autoctl/pg_autoctl diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix index de9d7eb1305..63b8a39b0e2 100644 --- a/pkgs/servers/sql/postgresql/ext/postgis.nix +++ b/pkgs/servers/sql/postgresql/ext/postgis.nix @@ -10,6 +10,7 @@ , pkgconfig , file , protobufc +, libiconv }: stdenv.mkDerivation rec { name = "postgis-${version}"; @@ -22,7 +23,8 @@ stdenv.mkDerivation rec { sha256 = "0pnva72f2w4jcgnl1y7nw5rdly4ipx3hji4c9yc9s0hna1n2ijxn"; }; - buildInputs = [ libxml2 postgresql geos proj gdal json_c protobufc ]; + buildInputs = [ libxml2 postgresql geos proj gdal json_c protobufc ] + ++ stdenv.lib.optional stdenv.isDarwin libiconv; nativeBuildInputs = [ perl pkgconfig ]; dontDisableStatic = true; @@ -43,14 +45,18 @@ stdenv.mkDerivation rec { sed -i "s|\$(DESTDIR)\$(PGSQL_BINDIR)|$prefix/bin|g " \ "raster/scripts/python/Makefile"; - ''; - - preInstall = '' mkdir -p $out/bin + + # postgis' build system assumes it is being installed to the same place as postgresql, and looks + # for the postgres binary relative to $PREFIX. We gently support this system using an illusion. + ln -s ${postgresql}/bin/postgres $out/bin/postgres ''; # create aliases for all commands adding version information postInstall = '' + # Teardown the illusory postgres used for building; see postConfigure. + rm $out/bin/postgres + for prog in $out/bin/*; do # */ ln -s $prog $prog-${version} done @@ -64,6 +70,6 @@ stdenv.mkDerivation rec { homepage = https://postgis.net/; license = licenses.gpl2; maintainers = [ maintainers.marcweber ]; - platforms = platforms.linux; + inherit (postgresql.meta) platforms; }; } diff --git a/pkgs/servers/web-apps/matomo/default.nix b/pkgs/servers/web-apps/matomo/default.nix index 17cb8be739f..9c1e01745a8 100644 --- a/pkgs/servers/web-apps/matomo/default.nix +++ b/pkgs/servers/web-apps/matomo/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, php }: stdenv.mkDerivation rec { - name = "matomo-${version}"; - version = "3.9.1"; + pname = "matomo"; + version = "3.10.0"; src = fetchurl { url = "https://builds.matomo.org/matomo-${version}.tar.gz"; - sha256 = "1y406dnwn4jyrjr2d5qfsg3b4v7nfbh09v74dm1vlcy3mkbhv2bp"; + sha256 = "1mzqn2wh63ffzv6436cr8shl40nlj8sazsj2j37lx9pkz89n2wjz"; }; nativeBuildInputs = [ makeWrapper ]; @@ -39,8 +39,8 @@ stdenv.mkDerivation rec { cp -ra * $out/share/ # tmp/ is created by matomo in PIWIK_USER_PATH rmdir $out/share/tmp - # config/ needs to be copied to PIWIK_USER_PATH anyway - mv $out/share/config $out/ + # config/ needs to be accessed by PIWIK_USER_PATH anyway + ln -s $out/share/config $out/ makeWrapper ${php}/bin/php $out/bin/matomo-console \ --add-flags "$out/share/console" diff --git a/pkgs/servers/x11/xorg/.gitignore b/pkgs/servers/x11/xorg/.gitignore new file mode 100644 index 00000000000..1bf88f244e8 --- /dev/null +++ b/pkgs/servers/x11/xorg/.gitignore @@ -0,0 +1 @@ +download-cache/ diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index a5869b21c58..3be672c29f1 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -728,6 +728,19 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; + libXTrap = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext, libXt }: stdenv.mkDerivation { + name = "libXTrap-1.0.1"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/lib/libXTrap-1.0.1.tar.bz2; + sha256 = "0bi5wxj6avim61yidh9fd3j4n8czxias5m8vss9vhxjnk1aksdwg"; + }; + hardeningDisable = [ "bindnow" "relro" ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ xorgproto libX11 libXext libXt ]; + meta.platforms = stdenv.lib.platforms.unix; + }) {}; + libXau = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto }: stdenv.mkDerivation { name = "libXau-1.0.9"; builder = ./builder.sh; @@ -2834,7 +2847,7 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; - xtrap = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXt }: stdenv.mkDerivation { + xtrap = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXt, libXTrap }: stdenv.mkDerivation { name = "xtrap-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -2843,7 +2856,7 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libX11 libXt ]; + buildInputs = [ libX11 libXt libXTrap ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 26c2721e240..426b848a138 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -202,6 +202,7 @@ mirror://xorg/individual/lib/libXrender-0.9.10.tar.bz2 mirror://xorg/individual/lib/libXres-1.2.0.tar.bz2 mirror://xorg/individual/lib/libXScrnSaver-1.2.3.tar.bz2 mirror://xorg/individual/lib/libxshmfence-1.3.tar.bz2 +mirror://xorg/individual/lib/libXTrap-1.0.1.tar.bz2 mirror://xorg/individual/lib/libXt-1.1.5.tar.bz2 mirror://xorg/individual/lib/libXtst-1.2.3.tar.bz2 mirror://xorg/individual/lib/libXv-1.0.11.tar.bz2 diff --git a/pkgs/tools/backup/pyznap/default.nix b/pkgs/tools/backup/pyznap/default.nix index e37327c429d..eb714b64a97 100644 --- a/pkgs/tools/backup/pyznap/default.nix +++ b/pkgs/tools/backup/pyznap/default.nix @@ -1,21 +1,17 @@ { lib , buildPythonApplication , fetchPypi -, paramiko -, configparser }: buildPythonApplication rec { pname = "pyznap"; - version = "1.1.2"; + version = "1.2.1"; src = fetchPypi { inherit pname version; - sha256 = "9ac0da5d7f6461d1d6f128362786e297144b415f9e3a2f1835642ab3dda82d55"; + sha256 = "0pnngr4zdxkf6b570ikzvkrm3a8fr47w6crjaw7ln094qkniywvj"; }; - propagatedBuildInputs = [ configparser paramiko ]; - # tests aren't included in the PyPI packages doCheck = false; diff --git a/pkgs/tools/backup/zfs-replicate/default.nix b/pkgs/tools/backup/zfs-replicate/default.nix new file mode 100644 index 00000000000..83fa76b0800 --- /dev/null +++ b/pkgs/tools/backup/zfs-replicate/default.nix @@ -0,0 +1,42 @@ +{ buildPythonApplication, click, fetchPypi, hypothesis, mypy, pytest +, pytestcov, pytestrunner, stdenv, stringcase +}: + +buildPythonApplication rec { + pname = "zfs-replicate"; + version = "1.1.11"; + + src = fetchPypi { + inherit pname version; + sha256 = "0386xc6rw6bhzw2a08g90afb3snqhm1ikx65bjfh22ha69fwmga8"; + }; + + checkInputs = [ + hypothesis + mypy + pytest + pytestcov + ]; + + buildInputs = [ + pytestrunner + ]; + + propagatedBuildInputs = [ + click + stringcase + ]; + + doCheck = true; + + checkPhase = '' + pytest --doctest-modules + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/alunduil/zfs-replicate; + description = "ZFS Snapshot Replication"; + license = licenses.bsd2; + maintainers = with maintainers; [ alunduil ]; + }; +} diff --git a/pkgs/tools/misc/birdfont/default.nix b/pkgs/tools/misc/birdfont/default.nix index 56e7650673e..092c83114e7 100644 --- a/pkgs/tools/misc/birdfont/default.nix +++ b/pkgs/tools/misc/birdfont/default.nix @@ -4,11 +4,11 @@ gobject-introspection, gsettings-desktop-schemas, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "birdfont"; - version = "2.26.0"; + version = "2.27.0"; src = fetchurl { url = "https://birdfont.org/releases/${pname}-${version}.tar.xz"; - sha256 = "0lcbwmwfb18dpr5kpnrl2zx59jhvj7k7vzjld51zv0zhcvl9fg3j"; + sha256 = "0dr2cnvq30wak0j2k8089is7fvhw0ppwkfrrw1m649s2b95wav3q"; }; nativeBuildInputs = [ python3 pkgconfig vala gobject-introspection wrapGAppsHook ]; diff --git a/pkgs/tools/misc/debianutils/default.nix b/pkgs/tools/misc/debianutils/default.nix index 3613905db48..b42c302a38f 100644 --- a/pkgs/tools/misc/debianutils/default.nix +++ b/pkgs/tools/misc/debianutils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "debianutils"; - version = "4.8.6.2"; + version = "4.8.6.3"; src = fetchurl { url = "mirror://debian/pool/main/d/${pname}/${pname}_${version}.tar.xz"; - sha256 = "1fhbn62v85ydcap4pjx6jb37bly42lf3l64ig4ppr7yiaax8i8xc"; + sha256 = "08g2gdm6n66w5m8qwm4f48wzgs3ymkpki6dg01nwzwbdzhxdxirc"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/disper/default.nix b/pkgs/tools/misc/disper/default.nix index 22951eecf53..167b4a547f8 100644 --- a/pkgs/tools/misc/disper/default.nix +++ b/pkgs/tools/misc/disper/default.nix @@ -1,9 +1,19 @@ -{stdenv, fetchurl, python, xorg, makeWrapper}: +{ stdenv, fetchFromGitHub, python, xorg, makeWrapper }: stdenv.mkDerivation rec { - name = "disper-0.3.1"; + pname = "disper"; + version = "0.3.1.1"; - buildInputs = [python makeWrapper]; + src = fetchFromGitHub { + owner = "apeyser"; + repo = pname; + rev = "${pname}-${version}"; + sha256 = "1kl4py26n95q0690npy5mc95cv1cyfvh6kxn8rvk62gb8scwg9zn"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + buildInputs = [ python ]; preConfigure = '' export makeFlags="PREFIX=$out" @@ -14,11 +24,6 @@ stdenv.mkDerivation rec { --prefix "LD_LIBRARY_PATH" : "${stdenv.lib.makeLibraryPath [ xorg.libXrandr xorg.libX11 ]}" ''; - src = fetchurl { - url = http://ppa.launchpad.net/disper-dev/ppa/ubuntu/pool/main/d/disper/disper_0.3.1.tar.gz; - sha256 = "1l8brcpfn4iascb454ym0wrv5kqyz4f0h8k6db54nc3zhfwy7vvw"; - }; - meta = { description = "On-the-fly display switch utility"; homepage = http://willem.engen.nl/projects/disper/; diff --git a/pkgs/tools/misc/esptool/default.nix b/pkgs/tools/misc/esptool/default.nix index 50ee066d96a..8793685069a 100644 --- a/pkgs/tools/misc/esptool/default.nix +++ b/pkgs/tools/misc/esptool/default.nix @@ -2,13 +2,13 @@ python3.pkgs.buildPythonApplication rec { pname = "esptool"; - version = "2.6"; + version = "2.7"; src = fetchFromGitHub { owner = "espressif"; repo = "esptool"; rev = "v${version}"; - sha256 = "1hxgzqh5z81dq1k2xd6329h8idk9y8q29izrwm1vhn0m9v1pxa22"; + sha256 = "1p5hx0rhs986ffqz78rdxg7jayndsq632399xby39k17kvd3mb31"; }; checkInputs = with python3.pkgs; [ flake8 flake8-future-import flake8-import-order openssl ]; diff --git a/pkgs/tools/misc/kronometer/default.nix b/pkgs/tools/misc/kronometer/default.nix index 0307cd86df8..4e83c2479f1 100644 --- a/pkgs/tools/misc/kronometer/default.nix +++ b/pkgs/tools/misc/kronometer/default.nix @@ -6,14 +6,14 @@ let pname = "kronometer"; - version = "2.2.2"; + version = "2.2.3"; in mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; - sha256 = "142f1kqygil6d4pvh6pallin355h2rq5s1hs6gd11plcin6rkg2j"; + sha256 = "05hs8729a3aqjpwmn2xdf2sriacrll4sj4ax3lm4s1ravj09n9bm"; }; meta = with lib; { diff --git a/pkgs/tools/misc/lesspipe/default.nix b/pkgs/tools/misc/lesspipe/default.nix index 9bb46f113fd..bb99521cc27 100644 --- a/pkgs/tools/misc/lesspipe/default.nix +++ b/pkgs/tools/misc/lesspipe/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "lesspipe"; - version = "1.83"; + version = "1.84"; buildInputs = [ perl ]; preConfigure = "patchShebangs ."; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "wofr06"; repo = "lesspipe"; rev = version; - sha256 = "1vqch6k4fz5pyf8szlnqm3qhlvgs9l4njd13yczjh4kpaxpn0rxb"; + sha256 = "124ffhzrikr88ab14rk6753n8adxijpmg7q3zx7nmqc52wpkfd8q"; }; patches = [ diff --git a/pkgs/tools/misc/man-db/default.nix b/pkgs/tools/misc/man-db/default.nix index 8d0728b7556..ced4a156137 100644 --- a/pkgs/tools/misc/man-db/default.nix +++ b/pkgs/tools/misc/man-db/default.nix @@ -63,6 +63,6 @@ stdenv.mkDerivation rec { homepage = http://man-db.nongnu.org; description = "An implementation of the standard Unix documentation system accessed using the man command"; license = licenses.gpl2; - platforms = platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/misc/mongodb-compass/default.nix b/pkgs/tools/misc/mongodb-compass/default.nix index f03b536c615..16762d243db 100644 --- a/pkgs/tools/misc/mongodb-compass/default.nix +++ b/pkgs/tools/misc/mongodb-compass/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, dpkg , alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib -, gnome2, libnotify, libxcb, nspr, nss, systemd, xorg }: +, gnome2, gnome3, libnotify, libxcb, nspr, nss, systemd, xorg }: let - version = "1.13.1"; + version = "1.17.0"; rpath = stdenv.lib.makeLibraryPath [ alsaLib @@ -19,7 +19,7 @@ let glib gnome2.GConf gnome2.gdk_pixbuf - gnome2.gtk + gnome3.gtk gnome2.pango libnotify libxcb @@ -46,7 +46,7 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://downloads.mongodb.com/compass/mongodb-compass_${version}_amd64.deb"; - sha256 = "0x23jshnr0rafm5sn2vhq2y2gryg8mksahzyv5fszblgaxay234p"; + sha256 = "085xq1ik8kyza1kq9kn0pf98zk6g2qa21clxhn48rgnqk20aninv"; } else throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}"; diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix index 42d03c06b87..1cf64362e6d 100644 --- a/pkgs/tools/misc/plantuml/default.nix +++ b/pkgs/tools/misc/plantuml/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre, graphviz }: stdenv.mkDerivation rec { - version = "1.2019.7"; + version = "1.2019.8"; name = "plantuml-${version}"; src = fetchurl { url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar"; - sha256 = "1md8dyjlvwfg4hbvigcvzipj1gf8hb39rqqh825aa2swchs8nvhm"; + sha256 = "0kbyjsy8zp3325syg9g91rfgy2dzkffdj2ji82b5h9zy3rkrz08p"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/yubikey-personalization-gui/default.nix b/pkgs/tools/misc/yubikey-personalization-gui/default.nix index 405ff745baa..5b0ad830b19 100644 --- a/pkgs/tools/misc/yubikey-personalization-gui/default.nix +++ b/pkgs/tools/misc/yubikey-personalization-gui/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, yubikey-personalization, qtbase, qmake, libyubikey }: +{ stdenv, fetchurl, mkDerivation, pkgconfig, yubikey-personalization, qtbase, qmake, libyubikey }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "yubikey-personalization-gui-3.1.25"; src = fetchurl { diff --git a/pkgs/tools/networking/babeld/default.nix b/pkgs/tools/networking/babeld/default.nix index 7dfc8e9d7ad..ce372f6b752 100644 --- a/pkgs/tools/networking/babeld/default.nix +++ b/pkgs/tools/networking/babeld/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "babeld-1.8.4"; + name = "babeld-1.8.5"; src = fetchurl { url = "http://www.pps.univ-paris-diderot.fr/~jch/software/files/${name}.tar.gz"; - sha256 = "11wbs1x17lr7jk2578zwy3cdwc6zhxwv97nnp13z14613320s1wq"; + sha256 = "1i2v7npl9aykq8d6zhkinqnbdpqx5x910dqkrv30fib0fp19jb90"; }; preBuild = '' diff --git a/pkgs/tools/networking/mtr/default.nix b/pkgs/tools/networking/mtr/default.nix index 3c2ced1712f..59242551f92 100644 --- a/pkgs/tools/networking/mtr/default.nix +++ b/pkgs/tools/networking/mtr/default.nix @@ -1,38 +1,42 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, ncurses +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +, libcap, ncurses , withGtk ? false, gtk2 ? null }: assert withGtk -> gtk2 != null; stdenv.mkDerivation rec { - name="mtr-${version}"; - version="0.92"; + pname = "mtr"; + version = "0.93"; src = fetchFromGitHub { owner = "traviscross"; repo = "mtr"; rev = "v${version}"; - sha256 = "0ca2ml846cv0zzkpd8y7ah6i9b3czrr8wlxja3cray94ybwb294d"; + sha256 = "0n0zr9k61w7a9psnzgp7xnc7ll1ic2xzcvqsbbbyndg3v9rff6bw"; }; - preConfigure = '' + # we need this before autoreconfHook does its thing + postPatch = '' echo ${version} > .tarball-version + ''; - ./bootstrap.sh - - substituteInPlace Makefile.in --replace ' install-exec-hook' "" + # and this after autoreconfHook has generated Makefile.in + preConfigure = '' + substituteInPlace Makefile.in \ + --replace ' install-exec-hook' "" ''; configureFlags = stdenv.lib.optional (!withGtk) "--without-gtk"; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ ncurses ] ++ stdenv.lib.optional withGtk gtk2; + buildInputs = [ libcap ncurses ] ++ stdenv.lib.optional withGtk gtk2; enableParallelBuilding = true; meta = with stdenv.lib; { description = "A network diagnostics tool"; - homepage = http://www.bitwizard.nl/mtr/; + homepage = "https://www.bitwizard.nl/mtr/"; license = licenses.gpl2; maintainers = with maintainers; [ koral orivej raskin ]; platforms = platforms.unix; diff --git a/pkgs/tools/package-management/nfpm/default.nix b/pkgs/tools/package-management/nfpm/default.nix new file mode 100644 index 00000000000..5cbb207ec4f --- /dev/null +++ b/pkgs/tools/package-management/nfpm/default.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "nfpm"; + version = "0.12.0"; + + src = fetchFromGitHub { + owner = "goreleaser"; + repo = pname; + rev = "v${version}"; + sha256 = "090mxkmbfzi3mby18zhrr34fr6vzc7j0r2ss3rjr5lyfgilw1qwr"; + }; + + modSha256 = "02nkqmljb528ppsr2dw2r3rc83j3qmys3a8v0a1z2b4sq2sv1v7w"; + + meta = with lib; { + description = "A simple deb and rpm packager written in Go"; + homepage = "https://github.com/goreleaser/nfpm"; + maintainers = [ maintainers.marsam ]; + license = licenses.mit; + }; +} diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix new file mode 100644 index 00000000000..b58e41d850d --- /dev/null +++ b/pkgs/tools/security/vault/vault-bin.nix @@ -0,0 +1,53 @@ +{ stdenv, fetchurl, unzip }: + +let + version = "1.1.3"; + + sources = let + base = "https://releases.hashicorp.com/vault/${version}"; + in { + "x86_64-linux" = fetchurl { + url = "${base}/vault_${version}_linux_amd64.zip"; + sha256 = "293b88f4d31f6bcdcc8b508eccb7b856a0423270adebfa0f52f04144c5a22ae0"; + }; + "i686-linux" = fetchurl { + url = "${base}/vault_${version}_linux_386.zip"; + sha256 = "9f2fb99e08fa3d25af1497516d08b5d2d8a73bcacd5354ddec024e9628795867"; + }; + "x86_64-darwin" = fetchurl { + url = "${base}/vault_${version}_darwin_amd64.zip"; + sha256 = "a0a7a242f8299ac4a00af8aa10ccedaf63013c8a068f56eadfb9d730b87155ea"; + }; + "i686-darwin" = fetchurl { + url = "${base}/vault_${version}_darwin_386.zip"; + sha256 = "50542cfb37abb06e8bb6b8ba41f5ca7d72a4d6a4396d4e3f4a8391bed14f63be"; + }; + "aarch64-linux" = fetchurl { + url = "${base}/vault_${version}_linux_arm64.zip"; + sha256 = "c243dce14b2e48e3667c2aa5b7fb37009dd7043b56032d6ebe50dd456715fd3f"; + }; + }; + +in stdenv.mkDerivation { + name = "vault-bin-${version}"; + + src = sources."${stdenv.hostPlatform.system}" or (throw "unsupported system: ${stdenv.hostPlatform.system}"); + + nativeBuildInputs = [ unzip ]; + + sourceRoot = "."; + + installPhase = '' + mkdir -p $out/bin $out/share/bash-completion/completions + mv vault $out/bin + echo "complete -C $out/bin/vault vault" > $out/share/bash-completion/completions/vault + ''; + + meta = with stdenv.lib; { + homepage = https://www.vaultproject.io; + description = "A tool for managing secrets, this binary includes the UI"; + platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" "i686-darwin" ]; + license = licenses.mpl20; + maintainers = with maintainers; [ offline psyanticy ]; + }; +} diff --git a/pkgs/tools/system/hwinfo/default.nix b/pkgs/tools/system/hwinfo/default.nix index ff937638056..eba8c8f41b4 100644 --- a/pkgs/tools/system/hwinfo/default.nix +++ b/pkgs/tools/system/hwinfo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "hwinfo-${version}"; - version = "21.66"; + version = "21.67"; src = fetchFromGitHub { owner = "opensuse"; repo = "hwinfo"; rev = "${version}"; - sha256 = "1f841hzh9ik02690h9b1k3ysqv91avsb0zir2ykqz8qj39c5qsxz"; + sha256 = "1fvlrqx1wgl79a9j3xhhhdihj4lkpbrchfsc27il0p52fynn4dji"; }; patchPhase = '' diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix index 34dacc80d92..46fe9ab1cd7 100644 --- a/pkgs/tools/text/highlight/default.nix +++ b/pkgs/tools/text/highlight/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "highlight-${version}"; - version = "3.52"; + version = "3.53"; src = fetchFromGitLab { owner = "saalen"; repo = "highlight"; rev = "v${version}"; - sha256 = "0zhn1k70ck82ks7ckzsy1yiz686ym2ps7c28wjmkgxfpyjanilrq"; + sha256 = "11szws4q6qyffq2fsvh1vksh1d0kcwg6smyyba9yr61hzx6zmzgr"; }; enableParallelBuilding = true; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Source code highlighting tool"; - homepage = http://www.andre-simon.de/doku/highlight/en/highlight.php; + homepage = "http://www.andre-simon.de/doku/highlight/en/highlight.php"; platforms = platforms.unix; maintainers = with maintainers; [ ndowens willibutz ]; }; diff --git a/pkgs/tools/video/gopro/default.nix b/pkgs/tools/video/gopro/default.nix new file mode 100644 index 00000000000..f783b086345 --- /dev/null +++ b/pkgs/tools/video/gopro/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub +, ffmpeg +, imagemagick +, makeWrapper +, mplayer +}: + +stdenv.mkDerivation rec { + pname = "gopro"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "KonradIT"; + repo = "gopro-linux"; + rev = version; + sha256 = "0sb9vpiadrq8g4ag828h8mvq01fg0306j0wjwkxdmwfqync1128l"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + + install -Dm755 gopro -t $out/bin + wrapProgram $out/bin/gopro \ + --prefix PATH ":" "${stdenv.lib.makeBinPath [ ffmpeg imagemagick mplayer ]}" + + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "Command line interface for processing media filmed on GoPro HERO 3, 4, 5, 6, and 7 cameras"; + homepage = "https://github.com/KonradIT/gopro-linux"; + platforms = platforms.linux; + license = licenses.gpl3; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1eb600bd42..77563721c58 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2997,7 +2997,9 @@ in flannel = callPackage ../tools/networking/flannel { }; - flare = callPackage ../games/flare { }; + flare = callPackage ../games/flare { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; flashbench = callPackage ../os-specific/linux/flashbench { }; @@ -3431,6 +3433,8 @@ in google-music-scripts = callPackage ../tools/audio/google-music-scripts { }; + gopro = callPackage ../tools/video/gopro { }; + gource = callPackage ../applications/version-management/gource { }; govc = callPackage ../tools/virtualization/govc { }; @@ -4281,6 +4285,8 @@ in libparserutils = callPackage ../applications/misc/netsurf/libparserutils { }; + libnslog = callPackage ../applications/misc/netsurf/libnslog { }; + libcss = callPackage ../applications/misc/netsurf/libcss { }; libhubbub = callPackage ../applications/misc/netsurf/libhubbub { }; @@ -4295,6 +4301,10 @@ in libnsutils = callPackage ../applications/misc/netsurf/libnsutils { }; + libsvgtiny = callPackage ../applications/misc/netsurf/libsvgtiny { }; + + libnspsl = callPackage ../applications/misc/netsurf/libnspsl { }; + libutf8proc = callPackage ../applications/misc/netsurf/libutf8proc { }; browser = callPackage ../applications/misc/netsurf/browser { }; @@ -4305,6 +4315,8 @@ in netsniff-ng = callPackage ../tools/networking/netsniff-ng { }; + nfpm = callPackage ../tools/package-management/nfpm { }; + nginx-config-formatter = callPackage ../tools/misc/nginx-config-formatter { }; ninka = callPackage ../development/tools/misc/ninka { }; @@ -4381,6 +4393,8 @@ in leatherman = callPackage ../development/libraries/leatherman { }; + ledger-live-desktop = callPackage ../applications/altcoins/ledger-live-desktop { }; + ledmon = callPackage ../tools/system/ledmon { }; leela = callPackage ../tools/graphics/leela { }; @@ -6477,9 +6491,7 @@ in libX11 = xorg.libX11; }; - twitterBootstrap3 = callPackage ../development/web/twitter-bootstrap/3.nix {}; - twitterBootstrap4 = callPackage ../development/web/twitter-bootstrap {}; - twitterBootstrap = twitterBootstrap3; + twitterBootstrap = callPackage ../development/web/twitter-bootstrap {}; txr = callPackage ../tools/misc/txr { stdenv = clangStdenv; }; @@ -13764,24 +13776,24 @@ in src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; - rev = "5994ae2a045015004cce24802dc47c33736486ea"; - sha256 = "1w1zkql03aggma31nz4xb1b5waxxf2jcg99slzvmihg9ngmmlbm6"; + rev = "26c1b8878315a7a5c188df45e0bc236bb222b698"; + sha256 = "1q76vaqwxf4q2l4rd7j2p2jqgcqpys0m235drzx0drkn2qd50n1b"; }; }); spirv-headers = spirv-tools.overrideAttrs (_: { src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; - rev = "79b6681aadcb53c27d1052e5f8a0e82a981dbf2f"; - sha256 = "0flng2rdmc4ndq3j71h6wk1ibcjvhjrg2rzd6rv445vcsf0jh2pj"; + rev = "2434b89345a50c018c84f42a310b0fad4f3fd94f"; + sha256 = "1m902q1alm0rbh69zlskkx4n453xijijp9mf3wzwphi2j36gygwm"; }; }); }).overrideAttrs (_: { src = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; - rev = "5432f0dd8f331f15182681664d7486681e8514e6"; - sha256 = "0spdm93qkx83z8bks61am2g3ary7fkibvhqq706nj4z9wx4k0cbm"; + rev = "e06c7e9a515b716c731bda13f507546f107775d1"; + sha256 = "04y4dd1cqdkd4qffmhgmg3agf9j07ii2w38vpp4jw53ir818bqdq"; }; }); }; @@ -17239,10 +17251,7 @@ in bleachbit = callPackage ../applications/misc/bleachbit { }; - blender = callPackage ../applications/misc/blender { - pythonPackages = python35Packages; - stdenv = gcc6Stdenv; - }; + blender = callPackage ../applications/misc/blender { }; bluefish = callPackage ../applications/editors/bluefish { gtk = gtk3; @@ -23075,7 +23084,7 @@ in veriT = callPackage ../applications/science/logic/verit {}; - why3 = callPackage ../applications/science/logic/why3 {}; + why3 = callPackage ../applications/science/logic/why3 { }; workcraft = callPackage ../applications/science/logic/workcraft {}; @@ -24166,6 +24175,8 @@ in vault = callPackage ../tools/security/vault { }; + vault-bin = callPackage ../tools/security/vault/vault-bin.nix { }; + vaultenv = haskellPackages.vaultenv; vazir-fonts = callPackage ../data/fonts/vazir-fonts { }; @@ -24566,4 +24577,6 @@ in dapper = callPackage ../development/tools/dapper { }; kube3d = callPackage ../applications/networking/cluster/kube3d {}; + + zfs-replicate = python3Packages.callPackage ../tools/backup/zfs-replicate { }; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d581522a548..0896322e510 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -949,6 +949,10 @@ in { */ pyqt5_with_qtwebkit = self.pyqt5.override { withWebKit = true; }; + pyqtwebengine = pkgs.libsForQt5.callPackage ../development/python-modules/pyqtwebengine { + pythonPackages = self; + }; + pysc2 = callPackage ../development/python-modules/pysc2 { }; pyscard = callPackage ../development/python-modules/pyscard { inherit (pkgs.darwin.apple_sdk.frameworks) PCSC; }; @@ -6088,6 +6092,8 @@ in { pydantic = callPackage ../development/python-modules/pydantic { }; fastapi = callPackage ../development/python-modules/fastapi { }; + + stringcase = callPackage ../development/python-modules/stringcase { }; }); in fix' (extends overrides packages) |