diff options
Diffstat (limited to 'pkgs')
101 files changed, 1944 insertions, 1502 deletions
diff --git a/pkgs/applications/audio/snapcast/default.nix b/pkgs/applications/audio/snapcast/default.nix index 84695730db675..681601c7d884b 100644 --- a/pkgs/applications/audio/snapcast/default.nix +++ b/pkgs/applications/audio/snapcast/default.nix @@ -20,8 +20,8 @@ let aixlog = dependency { name = "aixlog"; - version = "1.2.1"; - sha256 = "1rh4jib5g41b85bqrxkl5g74hk5ryf187y9fw0am76g59xlymfpr"; + version = "1.4.0"; + sha256 = "0f2bs5j1jjajcpa251dslnwkgglaam3b0cm6wdx5l7mbwvnmib2g"; }; popl = dependency { @@ -34,13 +34,13 @@ in stdenv.mkDerivation rec { pname = "snapcast"; - version = "0.20.0"; + version = "0.23.0"; src = fetchFromGitHub { owner = "badaix"; repo = "snapcast"; rev = "v${version}"; - sha256 = "152ic8hlyawcmj9pykb33xc6yx7il6yb9ilmsy6m9nlh40m8yxls"; + sha256 = "0183hhghzn0fhw2qzc1s009q7miabpcf0pxaqjdscsl8iivxqknd"; }; nativeBuildInputs = [ cmake pkg-config boost170.dev ]; diff --git a/pkgs/applications/audio/vorbis-tools/default.nix b/pkgs/applications/audio/vorbis-tools/default.nix index 894bed1715f58..865d82a73562c 100644 --- a/pkgs/applications/audio/vorbis-tools/default.nix +++ b/pkgs/applications/audio/vorbis-tools/default.nix @@ -1,26 +1,17 @@ -{ lib, stdenv, fetchurl, fetchzip, libogg, libvorbis, libao, pkg-config, curl -, speex, flac }: +{ lib, stdenv, fetchurl, libogg, libvorbis, libao, pkg-config, curl +, speex, flac +, autoreconfHook }: + +stdenv.mkDerivation rec { + pname = "vorbis-tools"; + version = "1.4.2"; -let - debPatch = fetchzip { - url = "mirror://debian/pool/main/v/vorbis-tools/vorbis-tools_1.4.0-11.debian.tar.xz"; - sha256 = "0kvmd5nslyqplkdb7pnmqj47ir3y5lmaxd12wmrnqh679a8jhcyi"; - }; -in -stdenv.mkDerivation { - name = "vorbis-tools-1.4.0"; src = fetchurl { - url = "http://downloads.xiph.org/releases/vorbis/vorbis-tools-1.4.0.tar.gz"; - sha256 = "1g12bnh5ah08v529y72kfdz5lhvy75iaz7f9jskyby23m9dkk2d3"; + url = "http://downloads.xiph.org/releases/vorbis/vorbis-tools-${version}.tar.gz"; + sha256 = "1c7h4ivgfdyygz2hyh6nfibxlkz8kdk868a576qkkjgj5gn78xyv"; }; - postPatch = '' - for patch in $(ls "${debPatch}"/patches/*.{diff,patch} | grep -v debian_subdir) - do patch -p1 < "$patch" - done - ''; - - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libogg libvorbis libao curl speex flac ]; meta = with lib; { diff --git a/pkgs/applications/editors/ht/default.nix b/pkgs/applications/editors/ht/default.nix index 096b69a5e82a7..2f1ea40359d50 100644 --- a/pkgs/applications/editors/ht/default.nix +++ b/pkgs/applications/editors/ht/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { patches = [ ./gcc7.patch ]; + NIX_CFLAGS_COMPILE = [ "-Wno-narrowing" ]; + meta = with lib; { description = "File editor/viewer/analyzer for executables"; homepage = "http://hte.sourceforge.net"; diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 7324a19620dc7..3cddd82737367 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -13,10 +13,10 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1kbjbqb03yapz7067q589gaa7d6cqaipj7hmp1l3nh0bmggzsc4c"; - x86_64-darwin = "1qgadm52c5lzkvgvqrz0n8brm4qbjg8hf1dk6a2ynqhqjxcwbj4r"; - aarch64-linux = "0i3yl9rx9h7qkl3k9qk6gg35nhz737qzzbvzvdwkqjaacsbpfgf8"; - armv7l-linux = "19iz2bxcq6y8sklr6zcnbp47kki9l00x3nvr213lkk3kj08l0afv"; + x86_64-linux = "07wbh4sfvnmvif1a03z8bbqrjmcwmb4q5nn3l2r738i9wrxdxjja"; + x86_64-darwin = "0djcx4n17giynckhsqqx8q7j25cxd3xqgjz3jhh8xh54h4fbvmbz"; + aarch64-linux = "172x6c2pl994ps4xbrgrkzdb02gmpqag61sbxc7796cx0xk8bjpi"; + armv7l-linux = "008bf7iwfizbn67wl1cxahl6h7pg04ms4q2nmr0dndcpxgc1q5gd"; }.${system}; in callPackage ./generic.nix rec { @@ -25,7 +25,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.52.1"; + version = "1.53.0"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; diff --git a/pkgs/applications/misc/qsyncthingtray/default.nix b/pkgs/applications/misc/qsyncthingtray/default.nix index cdb4f60382117..100be6c2dc87b 100644 --- a/pkgs/applications/misc/qsyncthingtray/default.nix +++ b/pkgs/applications/misc/qsyncthingtray/default.nix @@ -67,6 +67,6 @@ mkDerivation rec { # 0.5.7 segfaults when opening the main panel with qt 5.7 and fails to compile with qt 5.8 # but qt > 5.6 works when only using the native browser # https://github.com/sieren/QSyncthingTray/issues/223 - broken = (builtins.compareVersions qtbase.version "5.7.0" >= 0 && !preferNative); + broken = (builtins.compareVersions qtbase.version "5.7.0" >= 0 && !preferNative) || stdenv.isDarwin; }; } diff --git a/pkgs/applications/misc/tootle/default.nix b/pkgs/applications/misc/tootle/default.nix index 3b9b09aaba9b4..0f6747d69f836 100644 --- a/pkgs/applications/misc/tootle/default.nix +++ b/pkgs/applications/misc/tootle/default.nix @@ -16,17 +16,18 @@ , json-glib , glib , glib-networking +, libhandy }: stdenv.mkDerivation rec { pname = "tootle"; - version = "0.2.0"; + version = "1.0"; src = fetchFromGitHub { owner = "bleakgrey"; repo = pname; rev = version; - sha256 = "1z3wyx316nns6gi7vlvcfmalhvxncmvcmmlgclbv6b6hwl5x2ysi"; + sha256 = "NRM7GiJA8c5z9AvXpGXtMl4ZaYN2GauEIbjBmoY4pdo="; }; nativeBuildInputs = [ @@ -47,15 +48,7 @@ stdenv.mkDerivation rec { json-glib libgee pantheon.granite - ]; - - patches = [ - # Fix build with Vala 0.46 - # https://github.com/bleakgrey/tootle/pull/164 - (fetchpatch { - url = "https://github.com/worldofpeace/tootle/commit/0a88bdad6d969ead1e4058b1a19675c9d6857b16.patch"; - sha256 = "0xyx00pgswnhxxbsxngsm6khvlbfcl6ic5wv5n64x7klk8rzh6cm"; - }) + libhandy ]; postPatch = '' diff --git a/pkgs/applications/networking/appgate-sdp/default.nix b/pkgs/applications/networking/appgate-sdp/default.nix index 56f2162bf08bc..a1ea1d64c63f0 100644 --- a/pkgs/applications/networking/appgate-sdp/default.nix +++ b/pkgs/applications/networking/appgate-sdp/default.nix @@ -96,11 +96,11 @@ let in stdenv.mkDerivation rec { pname = "appgate-sdp"; - version = "5.3.2"; + version = "5.3.3"; src = fetchurl { url = "https://bin.appgate-sdp.com/${lib.versions.majorMinor version}/client/appgate-sdp_${version}_amd64.deb"; - sha256 = "123d4mx2nsh8q3ckm4g2chdcdwgg0cz9cvhiwjggxzvy7j6bqgy4"; + sha256 = "1854m93mr2crg68zhh1pgwwis0dqdv0778wqrb8dz9sdz940rza8"; }; dontConfigure = true; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index d25dd2a783017..d93fc5ceb4051 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -19,13 +19,12 @@ , jre8 , pipewire_0_2 , libva +, libdrm, wayland, mesa, libxkbcommon # Ozone # optional dependencies , libgcrypt ? null # gnomeSupport || cupsSupport -, libdrm ? null, wayland ? null, mesa ? null, libxkbcommon ? null # useOzone # package customization -, useOzone ? true , gnomeSupport ? false, gnome ? null , gnomeKeyringSupport ? false, libgnome-keyring3 ? null , proprietaryCodecs ? true @@ -143,11 +142,11 @@ let jre pipewire_0_2 libva + libdrm wayland mesa.drivers libxkbcommon ] ++ optional gnomeKeyringSupport libgnome-keyring3 ++ optionals gnomeSupport [ gnome.GConf libgcrypt ] ++ optionals cupsSupport [ libgcrypt cups ] - ++ optional pulseSupport libpulseaudio - ++ optionals useOzone [ libdrm wayland mesa.drivers libxkbcommon ]; + ++ optional pulseSupport libpulseaudio; patches = [ ./patches/no-build-timestamps.patch # Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed) @@ -226,11 +225,11 @@ let ''; gnFlags = mkGnFlags ({ + is_official_build = true; custom_toolchain = "//build/toolchain/linux/unbundle:default"; host_toolchain = "//build/toolchain/linux/unbundle:default"; - is_official_build = true; + system_wayland_scanner_path = "${wayland}/bin/wayland-scanner"; - use_vaapi = !stdenv.isAarch64; # TODO: Remove once M88 is released use_sysroot = false; use_gnome_keyring = gnomeKeyringSupport; use_gio = gnomeSupport; @@ -266,15 +265,6 @@ let } // optionalAttrs pulseSupport { use_pulseaudio = true; link_pulseaudio = true; - } // optionalAttrs useOzone { - use_ozone = true; - use_xkbcommon = true; - use_glib = true; - use_gtk = true; - use_system_libwayland = true; - use_system_minigbm = true; - use_system_libdrm = true; - system_wayland_scanner_path = "${wayland}/bin/wayland-scanner"; } // optionalAttrs (chromiumVersionAtLeast "89") { # Disable PGO (defaults to 2 since M89) because it fails without additional changes: # error: Could not read profile ../../chrome/build/pgo_profiles/chrome-linux-master-1610647094-405a32bcf15e5a84949640f99f84a5b9f61e2f2e.profdata: Unsupported instrumentation profile format version diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 15fdceb644afc..1c9ed86d14575 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,8 +1,8 @@ { "stable": { - "version": "88.0.4324.146", - "sha256": "0zc2gx5wjv00n2xmlagjd2xv4plg128d1kkhy7j8kpxvx3xiic9q", - "sha256bin64": "109wz6w1c8v32b7fvcbks1wj8ycdyb9y88alksmr3h42z3s0b4id", + "version": "88.0.4324.150", + "sha256": "1hrqrggg4g1hjmaajbpydwsij2mfkfj5ccs1lj76nv4qj91yj4mf", + "sha256bin64": "0xyhvhppxk95clk6vycg2yca1yyzpi13rs3lhs4j9a482api6ks0", "deps": { "gn": { "version": "2020-11-05", @@ -31,15 +31,15 @@ } }, "dev": { - "version": "90.0.4400.8", - "sha256": "0z7695r8k1xm5kx7cc42kmcr11dbagcwjak32sglj0sw3hsr2yqz", - "sha256bin64": "11gp2sxaly66qfb2gfxnikq1xad520r32pgshkm2jsb7a7vj7mmf", + "version": "90.0.4408.0", + "sha256": "0bg16nz65j13a8sdzrzkmbidlglh7bz7y8s4bi68il9ppbffw3k4", + "sha256bin64": "0ad2xif8ng71ian07vb8h3jsd5wh95xndja43vwswc3072zk5h05", "deps": { "gn": { - "version": "2021-01-14", + "version": "2021-01-25", "url": "https://gn.googlesource.com/gn", - "rev": "d62642c920e6a0d1756316d225a90fd6faa9e21e", - "sha256": "0f1i079asiznn092vm6lyad96wcs8pxh95fjmjbnaqjaalivsic0" + "rev": "55ad154c961d8326315b1c8147f4e504cd95e9e6", + "sha256": "0x5i1axkg44z412357sdb6kgs1h9ykzy8p5c7s40bybs4hg33lkc" } } }, diff --git a/pkgs/applications/networking/cluster/cni/plugins.nix b/pkgs/applications/networking/cluster/cni/plugins.nix index e018422050459..8fc667e3391cc 100644 --- a/pkgs/applications/networking/cluster/cni/plugins.nix +++ b/pkgs/applications/networking/cluster/cni/plugins.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cni-plugins"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "containernetworking"; repo = "plugins"; rev = "v${version}"; - sha256 = "1nkaspz96yglq1fr8a3xr39qmbs98pk7qpqav3cfd82qwbq7vs06"; + sha256 = "sha256-n+OtFXgFmW0xsGEtC6ua0qjdsJSbEjn08mAl5Z51Kp8="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index 5a7d953a06957..739992e6bc0b7 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -120,7 +120,7 @@ let # with generated bindata yet. k3sBuildStage1 = buildGoPackage rec { name = "k3s-build-1"; - version = "${k3sVersion}"; + version = k3sVersion; goPackagePath = "github.com/rancher/k3s"; @@ -160,7 +160,7 @@ let }; k3sBin = buildGoPackage rec { name = "k3s-bin"; - version = "${k3sVersion}"; + version = k3sVersion; goPackagePath = "github.com/rancher/k3s"; diff --git a/pkgs/applications/networking/cluster/kube3d/default.nix b/pkgs/applications/networking/cluster/kube3d/default.nix index cc90cf2d63c54..e55df3c4c30d9 100644 --- a/pkgs/applications/networking/cluster/kube3d/default.nix +++ b/pkgs/applications/networking/cluster/kube3d/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "kube3d"; - version = "4.0.0"; + version = "4.1.0"; excludedPackages = "tools"; @@ -10,7 +10,7 @@ buildGoModule rec { owner = "rancher"; repo = "k3d"; rev = "v${version}"; - sha256 = "sha256-sHtPW9EaTycHh9d/vp28BvzhmbLUQYsu6yMfJlJYH+k="; + sha256 = "sha256-hhgZpX6nM5viGW37gxejO1SRRlN9+m8F6j9EV9/6ApM="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix index 62fdfd71f235a..5ba6b57d5bd78 100644 --- a/pkgs/applications/networking/gns3/server.nix +++ b/pkgs/applications/networking/gns3/server.nix @@ -34,10 +34,8 @@ in python.pkgs.buildPythonPackage { }; postPatch = '' - # yarl 1.4+ only requires Python 3.6+ substituteInPlace requirements.txt \ - --replace "aiohttp==3.6.2" "aiohttp>=3.6.2" \ - --replace "yarl==1.3.0" "" + --replace "aiohttp==3.6.2" "aiohttp>=3.6.2" ''; propagatedBuildInputs = with python.pkgs; [ diff --git a/pkgs/applications/networking/gopher/sacc/default.nix b/pkgs/applications/networking/gopher/sacc/default.nix index a3ead49c69f30..046ae42ebcb77 100644 --- a/pkgs/applications/networking/gopher/sacc/default.nix +++ b/pkgs/applications/networking/gopher/sacc/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "sacc"; - version = "1.02"; + version = "1.03"; src = fetchurl { url = "ftp://bitreich.org/releases/sacc/sacc-${version}.tgz"; - sha512 = "18ja95cscgjaj1xqn70dj0482f76d0561bdcc47flqfsjh4mqckjqr65qv7awnw6rzm03i5cp45j1qx12y0y83skgsar4pplmy8q014"; + sha512 = "sha512-vOjAGBM2+080JZv4C4b5dNRTTX45evWFEJfK1DRaWCYrHRCAe07QdEIrHhbaIxhSYfrBd3D1y75rmDnuPC4THA=="; }; inherit patches; diff --git a/pkgs/applications/networking/protonvpn-gui/default.nix b/pkgs/applications/networking/protonvpn-gui/default.nix index c2d7fbd10b15e..8029264fdaa77 100644 --- a/pkgs/applications/networking/protonvpn-gui/default.nix +++ b/pkgs/applications/networking/protonvpn-gui/default.nix @@ -76,6 +76,9 @@ in python3Packages.buildPythonApplication rec { done ''; + # no tests + doCheck = false; + meta = with lib; { description = "Linux GUI for ProtonVPN, written in Python"; homepage = "https://github.com/ProtonVPN/linux-gui"; diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix index a28c68a658310..c742d076f9da6 100644 --- a/pkgs/applications/networking/remote/anydesk/default.nix +++ b/pkgs/applications/networking/remote/anydesk/default.nix @@ -4,16 +4,6 @@ , pulseaudio }: let - sha256 = { - x86_64-linux = "19751ygq1ng79aniqx91qawc0cw07cwdjdjd88azc9ww6z6nv0mp"; - i386-linux = "0dwc7v4p1dz51444zwn0kds23yi87r4h2d3isfj9xwkn90pxb7in"; - }.${stdenv.hostPlatform.system} or (throw "system ${stdenv.hostPlatform.system} not supported"); - - arch = { - x86_64-linux = "amd64"; - i386-linux = "i386"; - }.${stdenv.hostPlatform.system} or (throw "system ${stdenv.hostPlatform.system} not supported"); - description = "Desktop sharing application, providing remote support and online meetings"; desktopItem = makeDesktopItem { @@ -28,14 +18,14 @@ let in stdenv.mkDerivation rec { pname = "anydesk"; - version = "6.0.1"; + version = "6.1.0"; src = fetchurl { urls = [ - "https://download.anydesk.com/linux/${pname}-${version}-${arch}.tar.gz" - "https://download.anydesk.com/linux/generic-linux/${pname}-${version}-${arch}.tar.gz" + "https://download.anydesk.com/linux/${pname}-${version}-amd64.tar.gz" + "https://download.anydesk.com/linux/generic-linux/${pname}-${version}-amd64.tar.gz" ]; - inherit sha256; + sha256 = "1qbq6r0yanjappsi8yglw8r54bwf32bjb2i63awmr6pk5kmhhy3r"; }; buildInputs = [ @@ -83,7 +73,7 @@ in stdenv.mkDerivation rec { inherit description; homepage = "https://www.anydesk.com"; license = licenses.unfree; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ shyim ]; }; } diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 7b3e630233f69..c917c43969131 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, lib, pam, python3, libxslt, perl, ArchiveZip, gettext +{ stdenv, fetchurl, fetchpatch, lib, pam, python3, libxslt, perl, ArchiveZip, box2d, gettext , IOCompress, zlib, libjpeg, expat, freetype, libwpd , libxml2, db, curl, fontconfig, libsndfile, neon , bison, flex, zip, unzip, gtk3, libmspack, getopt, file, cairo, which @@ -58,18 +58,13 @@ in (mkDrv rec { outputs = [ "out" "dev" ]; - # For some reason librdf_redland sometimes refers to rasqal.h instead - # of rasqal/rasqal.h NIX_CFLAGS_COMPILE = [ - "-I${librdf_rasqal}/include/rasqal" - ] ++ lib.optionals stdenv.isx86_64 [ "-mno-fma" "-mno-avx" ] - # https://bugs.documentfoundation.org/show_bug.cgi?id=78174#c10 - ++ [ "-fno-visibility-inlines-hidden" ]; - - patches = [ - ./xdg-open-brief.patch + "-I${librdf_rasqal}/include/rasqal" # librdf_redland refers to rasqal.h instead of rasqal/rasqal.h + "-fno-visibility-inlines-hidden" # https://bugs.documentfoundation.org/show_bug.cgi?id=78174#c10 ]; + patches = [ ./xdg-open-brief.patch ]; + tarballPath = "external/tarballs"; postUnpack = '' @@ -378,7 +373,7 @@ in (mkDrv rec { "--enable-kf5" "--enable-qt5" "--enable-gtk3-kde5" - ] ++ lib.optional (lib.versionOlder version "6.4") "--disable-gtk"; # disables GTK2, GTK3 is still there + ]; checkPhase = '' make unitcheck @@ -391,7 +386,7 @@ in (mkDrv rec { ++ lib.optional kdeIntegration wrapQtAppsHook; buildInputs = with xorg; - [ ant ArchiveZip boost cairo clucene_core + [ ant ArchiveZip boost box2d cairo clucene_core IOCompress cppunit cups curl db dbus-glib expat file flex fontconfig freetype getopt gperf gtk3 hunspell icu jdk lcms libcdr libexttextcat unixODBC libjpeg diff --git a/pkgs/applications/office/libreoffice/src-fresh/download.nix b/pkgs/applications/office/libreoffice/src-fresh/download.nix index d956a3b08a615..ea6fc1d777e99 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/download.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/download.nix @@ -35,6 +35,13 @@ md5name = "35e06a3bd7cd8f66be822c7d64e80c2b6051a181e9e897006917cb8e7988a543-boost_1_71_0.tar.xz"; } { + name = "box2d-2.3.1.tar.gz"; + url = "https://dev-www.libreoffice.org/src/box2d-2.3.1.tar.gz"; + sha256 = "58ffc8475a8650aadc351345aef696937747b40501ab78d72c197c5ff5b3035c"; + md5 = ""; + md5name = "58ffc8475a8650aadc351345aef696937747b40501ab78d72c197c5ff5b3035c-box2d-2.3.1.tar.gz"; + } + { name = "breakpad.zip"; url = "https://dev-www.libreoffice.org/src/breakpad.zip"; sha256 = "7060149be16a8789b0ccf596bdeaf63115f03f520acb508f72a14686fb311cb9"; @@ -329,11 +336,11 @@ md5name = "c5e167c042afd2d7ad642ace6b643863baeb33880781983563e1ab68a30d3e95-glm-0.9.9.7.zip"; } { - name = "gpgme-1.9.0.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/gpgme-1.9.0.tar.bz2"; - sha256 = "1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb"; + name = "gpgme-1.13.1.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/gpgme-1.13.1.tar.bz2"; + sha256 = "c4e30b227682374c23cddc7fdb9324a99694d907e79242a25a4deeedb393be46"; md5 = ""; - md5name = "1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb-gpgme-1.9.0.tar.bz2"; + md5name = "c4e30b227682374c23cddc7fdb9324a99694d907e79242a25a4deeedb393be46-gpgme-1.13.1.tar.bz2"; } { name = "graphite2-minimal-1.3.14.tgz"; @@ -371,18 +378,18 @@ md5name = "5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz"; } { - name = "icu4c-67_1-src.tgz"; - url = "https://dev-www.libreoffice.org/src/icu4c-67_1-src.tgz"; - sha256 = "94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc"; + name = "icu4c-68_1-src.tgz"; + url = "https://dev-www.libreoffice.org/src/icu4c-68_1-src.tgz"; + sha256 = "a9f2e3d8b4434b8e53878b4308bd1e6ee51c9c7042e2b1a376abefb6fbb29f2d"; md5 = ""; - md5name = "94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc-icu4c-67_1-src.tgz"; + md5name = "a9f2e3d8b4434b8e53878b4308bd1e6ee51c9c7042e2b1a376abefb6fbb29f2d-icu4c-68_1-src.tgz"; } { - name = "icu4c-67_1-data.zip"; - url = "https://dev-www.libreoffice.org/src/icu4c-67_1-data.zip"; - sha256 = "7c16a59cc8c06128b7ecc1dc4fc056b36b17349312829b17408b9e67b05c4a7e"; + name = "icu4c-68_1-data.zip"; + url = "https://dev-www.libreoffice.org/src/icu4c-68_1-data.zip"; + sha256 = "03ea8b4694155620548c8c0ba20444f1e7db246cc79e3b9c4fc7a960b160d510"; md5 = ""; - md5name = "7c16a59cc8c06128b7ecc1dc4fc056b36b17349312829b17408b9e67b05c4a7e-icu4c-67_1-data.zip"; + md5name = "03ea8b4694155620548c8c0ba20444f1e7db246cc79e3b9c4fc7a960b160d510-icu4c-68_1-data.zip"; } { name = "flow-engine-0.9.4.zip"; @@ -483,18 +490,18 @@ md5name = "b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2"; } { - name = "lcms2-2.9.tar.gz"; - url = "https://dev-www.libreoffice.org/src/lcms2-2.9.tar.gz"; - sha256 = "48c6fdf98396fa245ed86e622028caf49b96fa22f3e5734f853f806fbc8e7d20"; + name = "lcms2-2.11.tar.gz"; + url = "https://dev-www.libreoffice.org/src/lcms2-2.11.tar.gz"; + sha256 = "dc49b9c8e4d7cdff376040571a722902b682a795bf92985a85b48854c270772e"; md5 = ""; - md5name = "48c6fdf98396fa245ed86e622028caf49b96fa22f3e5734f853f806fbc8e7d20-lcms2-2.9.tar.gz"; + md5name = "dc49b9c8e4d7cdff376040571a722902b682a795bf92985a85b48854c270772e-lcms2-2.11.tar.gz"; } { - name = "libassuan-2.5.1.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/libassuan-2.5.1.tar.bz2"; - sha256 = "47f96c37b4f2aac289f0bc1bacfa8bd8b4b209a488d3d15e2229cb6cc9b26449"; + name = "libassuan-2.5.3.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/libassuan-2.5.3.tar.bz2"; + sha256 = "91bcb0403866b4e7c4bc1cc52ed4c364a9b5414b3994f718c70303f7f765e702"; md5 = ""; - md5name = "47f96c37b4f2aac289f0bc1bacfa8bd8b4b209a488d3d15e2229cb6cc9b26449-libassuan-2.5.1.tar.bz2"; + md5name = "91bcb0403866b4e7c4bc1cc52ed4c364a9b5414b3994f718c70303f7f765e702-libassuan-2.5.3.tar.bz2"; } { name = "libatomic_ops-7.6.8.tar.gz"; @@ -525,11 +532,11 @@ md5name = "72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056-libffi-3.3.tar.gz"; } { - name = "libgpg-error-1.27.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/libgpg-error-1.27.tar.bz2"; - sha256 = "4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2"; + name = "libgpg-error-1.37.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/libgpg-error-1.37.tar.bz2"; + sha256 = "b32d6ff72a73cf79797f7f2d039e95e9c6f92f0c1450215410840ab62aea9763"; md5 = ""; - md5name = "4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2-libgpg-error-1.27.tar.bz2"; + md5name = "b32d6ff72a73cf79797f7f2d039e95e9c6f92f0c1450215410840ab62aea9763-libgpg-error-1.37.tar.bz2"; } { name = "liblangtag-0.6.2.tar.bz2"; @@ -595,11 +602,11 @@ md5name = "431434d3926f4bcce2e5c97240609983f60d7ff50df5a72083934759bb863f7b-mariadb-connector-c-3.1.8-src.tar.gz"; } { - name = "mdds-1.6.0.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/mdds-1.6.0.tar.bz2"; - sha256 = "f1585c9cbd12f83a6d43d395ac1ab6a9d9d5d77f062c7b5f704e24ed72dae07d"; + name = "mdds-1.7.0.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/mdds-1.7.0.tar.bz2"; + sha256 = "a66a2a8293a3abc6cd9baff7c236156e2666935cbfb69a15d64d38141638fecf"; md5 = ""; - md5name = "f1585c9cbd12f83a6d43d395ac1ab6a9d9d5d77f062c7b5f704e24ed72dae07d-mdds-1.6.0.tar.bz2"; + md5name = "a66a2a8293a3abc6cd9baff7c236156e2666935cbfb69a15d64d38141638fecf-mdds-1.7.0.tar.bz2"; } { name = "mDNSResponder-878.200.35.tar.gz"; @@ -616,11 +623,11 @@ md5name = "ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba-libmspub-0.1.4.tar.xz"; } { - name = "libmwaw-0.3.16.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libmwaw-0.3.16.tar.xz"; - sha256 = "0c639edba5297bde5575193bf5b5f2f469956beaff5c0206d91ce9df6bde1868"; + name = "libmwaw-0.3.17.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libmwaw-0.3.17.tar.xz"; + sha256 = "8e1537eb1de1b4714f4bf0a20478f342c5d71a65bf99307a694b1e9e30bb911c"; md5 = ""; - md5name = "0c639edba5297bde5575193bf5b5f2f469956beaff5c0206d91ce9df6bde1868-libmwaw-0.3.16.tar.xz"; + md5name = "8e1537eb1de1b4714f4bf0a20478f342c5d71a65bf99307a694b1e9e30bb911c-libmwaw-0.3.17.tar.xz"; } { name = "mythes-1.2.4.tar.gz"; @@ -630,11 +637,11 @@ md5name = "a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz"; } { - name = "neon-0.30.2.tar.gz"; - url = "https://dev-www.libreoffice.org/src/neon-0.30.2.tar.gz"; - sha256 = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca"; + name = "neon-0.31.1.tar.gz"; + url = "https://dev-www.libreoffice.org/src/neon-0.31.1.tar.gz"; + sha256 = "c9dfcee723050df37ce18ba449d7707b78e7ab8230f3a4c59d9112e17dc2718d"; md5 = ""; - md5name = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca-neon-0.30.2.tar.gz"; + md5name = "c9dfcee723050df37ce18ba449d7707b78e7ab8230f3a4c59d9112e17dc2718d-neon-0.31.1.tar.gz"; } { name = "nss-3.55-with-nspr-4.27.tar.gz"; @@ -672,18 +679,18 @@ md5name = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824-openldap-2.4.45.tgz"; } { - name = "openssl-1.0.2t.tar.gz"; - url = "https://dev-www.libreoffice.org/src/openssl-1.0.2t.tar.gz"; - sha256 = "14cb464efe7ac6b54799b34456bd69558a749a4931ecfd9cf9f71d7881cac7bc"; + name = "openssl-1.1.1i.tar.gz"; + url = "https://dev-www.libreoffice.org/src/openssl-1.1.1i.tar.gz"; + sha256 = "e8be6a35fe41d10603c3cc635e93289ed00bf34b79671a3a4de64fcee00d5242"; md5 = ""; - md5name = "14cb464efe7ac6b54799b34456bd69558a749a4931ecfd9cf9f71d7881cac7bc-openssl-1.0.2t.tar.gz"; + md5name = "e8be6a35fe41d10603c3cc635e93289ed00bf34b79671a3a4de64fcee00d5242-openssl-1.1.1i.tar.gz"; } { - name = "liborcus-0.15.4.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/liborcus-0.15.4.tar.bz2"; - sha256 = "cfb2aa60825f2a78589ed030c07f46a1ee16ef8a2d1bf2279192fbc1ae5a5f61"; + name = "liborcus-0.16.1.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/liborcus-0.16.1.tar.bz2"; + sha256 = "c700d1325f744104d9fca0d5a019434901e9d51a16eedfb05792f90a298587a4"; md5 = ""; - md5name = "cfb2aa60825f2a78589ed030c07f46a1ee16ef8a2d1bf2279192fbc1ae5a5f61-liborcus-0.15.4.tar.bz2"; + md5name = "c700d1325f744104d9fca0d5a019434901e9d51a16eedfb05792f90a298587a4-liborcus-0.16.1.tar.bz2"; } { name = "owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; @@ -721,11 +728,11 @@ md5name = "505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca-libpng-1.6.37.tar.xz"; } { - name = "poppler-0.82.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/poppler-0.82.0.tar.xz"; - sha256 = "234f8e573ea57fb6a008e7c1e56bfae1af5d1adf0e65f47555e1ae103874e4df"; + name = "poppler-21.01.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/poppler-21.01.0.tar.xz"; + sha256 = "016dde34e5f868ea98a32ca99b643325a9682281500942b7113f4ec88d20e2f3"; md5 = ""; - md5name = "234f8e573ea57fb6a008e7c1e56bfae1af5d1adf0e65f47555e1ae103874e4df-poppler-0.82.0.tar.xz"; + md5name = "016dde34e5f868ea98a32ca99b643325a9682281500942b7113f4ec88d20e2f3-poppler-21.01.0.tar.xz"; } { name = "postgresql-9.2.24.tar.bz2"; @@ -735,11 +742,11 @@ md5name = "a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126-postgresql-9.2.24.tar.bz2"; } { - name = "Python-3.7.7.tar.xz"; - url = "https://dev-www.libreoffice.org/src/Python-3.7.7.tar.xz"; - sha256 = "06a0a9f1bf0d8cd1e4121194d666c4e28ddae4dd54346de6c343206599f02136"; + name = "Python-3.8.4.tar.xz"; + url = "https://dev-www.libreoffice.org/src/Python-3.8.4.tar.xz"; + sha256 = "5f41968a95afe9bc12192d7e6861aab31e80a46c46fa59d3d837def6a4cd4d37"; md5 = ""; - md5name = "06a0a9f1bf0d8cd1e4121194d666c4e28ddae4dd54346de6c343206599f02136-Python-3.7.7.tar.xz"; + md5name = "5f41968a95afe9bc12192d7e6861aab31e80a46c46fa59d3d837def6a4cd4d37-Python-3.8.4.tar.xz"; } { name = "QR-Code-generator-1.4.0.tar.gz"; @@ -798,11 +805,11 @@ md5name = "6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700-serf-1.2.1.tar.bz2"; } { - name = "skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz"; - url = "https://dev-www.libreoffice.org/src/skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz"; - sha256 = "3294877fa2b61b220d98a0f7bfc11325429b13edd2cf455444c703ee3a14d760"; + name = "skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz"; + url = "https://dev-www.libreoffice.org/src/skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz"; + sha256 = "f293656a15342a53bb407b932fc907c6894178a162f09728bd383e24d84b1301"; md5 = ""; - md5name = "3294877fa2b61b220d98a0f7bfc11325429b13edd2cf455444c703ee3a14d760-skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz"; + md5name = "f293656a15342a53bb407b932fc907c6894178a162f09728bd383e24d84b1301-skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz"; } { name = "libstaroffice-0.0.7.tar.xz"; @@ -854,11 +861,11 @@ md5name = "99b3f7f8832385748582ab8130fbb9e5607bd5179bebf9751ac1d51a53099d1c-libwpg-0.3.3.tar.xz"; } { - name = "libwps-0.4.11.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libwps-0.4.11.tar.xz"; - sha256 = "a8fdaabc28654a975fa78c81873ac503ba18f0d1cdbb942f470a21d29284b4d1"; + name = "libwps-0.4.12.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libwps-0.4.12.tar.xz"; + sha256 = "e21afb52a06d03b774c5a8c72679687ab64891b91ce0c3bdf2d3e97231534edb"; md5 = ""; - md5name = "a8fdaabc28654a975fa78c81873ac503ba18f0d1cdbb942f470a21d29284b4d1-libwps-0.4.11.tar.xz"; + md5name = "e21afb52a06d03b774c5a8c72679687ab64891b91ce0c3bdf2d3e97231534edb-libwps-0.4.12.tar.xz"; } { name = "xsltml_2.1.2.zip"; diff --git a/pkgs/applications/office/libreoffice/src-fresh/primary.nix b/pkgs/applications/office/libreoffice/src-fresh/primary.nix index c9b1826471145..6fbc8c5cfc605 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/primary.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/primary.nix @@ -7,9 +7,9 @@ rec { }; major = "7"; - minor = "0"; - patch = "4"; - tweak = "2"; + minor = "1"; + patch = "0"; + tweak = "3"; subdir = "${major}.${minor}.${patch}"; @@ -17,13 +17,13 @@ rec { src = fetchurl { url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "1g9akxvm7fh6lnprnc3g184qdy8gbinhb4rb60gjpw82ip6d5acz"; + sha256 = "1rpk90g1g8m70nrj4lwkg50aiild73d29yjlgyrgg8wx6hzq7l4y"; }; # FIXME rename translations = fetchSrc { name = "translations"; - sha256 = "1v3kpk56fm783d5wihx41jqidpclizkfxrg4n0pq95d79hdiljsl"; + sha256 = "0m6cxyrxig8akv9183xdn6ialmjddicn676149nm506yc5y0szmi"; }; # the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from @@ -31,6 +31,6 @@ rec { help = fetchSrc { name = "help"; - sha256 = "1np9f799ww12kggl5az6piv5fi9rf737il5a5r47r4wl2li56qqb"; + sha256 = "1kvsi28n8x3gxpiszxh84x05aw23i3z4id63pgw2s7mfclby52k9"; }; } diff --git a/pkgs/applications/office/libreoffice/src-still/download.nix b/pkgs/applications/office/libreoffice/src-still/download.nix index 78482326be236..d956a3b08a615 100644 --- a/pkgs/applications/office/libreoffice/src-still/download.nix +++ b/pkgs/applications/office/libreoffice/src-still/download.nix @@ -1,854 +1,882 @@ [ { name = "libabw-0.1.3.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libabw-0.1.3.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libabw-0.1.3.tar.xz"; sha256 = "e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed"; md5 = ""; md5name = "e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed-libabw-0.1.3.tar.xz"; } { name = "commons-logging-1.2-src.tar.gz"; - url = "http://dev-www.libreoffice.org/src/commons-logging-1.2-src.tar.gz"; + url = "https://dev-www.libreoffice.org/src/commons-logging-1.2-src.tar.gz"; sha256 = "49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81"; md5 = ""; md5name = "49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81-commons-logging-1.2-src.tar.gz"; } { name = "apr-1.5.2.tar.gz"; - url = "http://dev-www.libreoffice.org/src/apr-1.5.2.tar.gz"; + url = "https://dev-www.libreoffice.org/src/apr-1.5.2.tar.gz"; sha256 = "1af06e1720a58851d90694a984af18355b65bb0d047be03ec7d659c746d6dbdb"; md5 = ""; md5name = "1af06e1720a58851d90694a984af18355b65bb0d047be03ec7d659c746d6dbdb-apr-1.5.2.tar.gz"; } { name = "apr-util-1.5.4.tar.gz"; - url = "http://dev-www.libreoffice.org/src/apr-util-1.5.4.tar.gz"; + url = "https://dev-www.libreoffice.org/src/apr-util-1.5.4.tar.gz"; sha256 = "976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19"; md5 = ""; md5name = "976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19-apr-util-1.5.4.tar.gz"; } { - name = "boost_1_69_0.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/boost_1_69_0.tar.bz2"; - sha256 = "8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406"; + name = "boost_1_71_0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/boost_1_71_0.tar.xz"; + sha256 = "35e06a3bd7cd8f66be822c7d64e80c2b6051a181e9e897006917cb8e7988a543"; md5 = ""; - md5name = "8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406-boost_1_69_0.tar.bz2"; + md5name = "35e06a3bd7cd8f66be822c7d64e80c2b6051a181e9e897006917cb8e7988a543-boost_1_71_0.tar.xz"; } { name = "breakpad.zip"; - url = "http://dev-www.libreoffice.org/src/breakpad.zip"; + url = "https://dev-www.libreoffice.org/src/breakpad.zip"; sha256 = "7060149be16a8789b0ccf596bdeaf63115f03f520acb508f72a14686fb311cb9"; md5 = ""; md5name = "7060149be16a8789b0ccf596bdeaf63115f03f520acb508f72a14686fb311cb9-breakpad.zip"; } { name = "bsh-2.0b6-src.zip"; - url = "http://dev-www.libreoffice.org/src/beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip"; + url = "https://dev-www.libreoffice.org/src/beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip"; sha256 = "9e93c73e23aff644b17dfff656444474c14150e7f3b38b19635e622235e01c96"; md5 = "beeca87be45ec87d241ddd0e1bad80c1"; md5name = "beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip"; } { name = "bzip2-1.0.6.tar.gz"; - url = "http://dev-www.libreoffice.org/src/00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz"; + url = "https://dev-www.libreoffice.org/src/00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz"; sha256 = "a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd"; md5 = "00b516f4704d4a7cb50a1d97e6e8e15b"; md5name = "00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz"; } { name = "cairo-1.16.0.tar.xz"; - url = "http://dev-www.libreoffice.org/src/cairo-1.16.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/cairo-1.16.0.tar.xz"; sha256 = "5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331"; md5 = ""; md5name = "5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331-cairo-1.16.0.tar.xz"; } { - name = "libcdr-0.1.5.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libcdr-0.1.5.tar.xz"; - sha256 = "6ace5c499a8be34ad871e825442ce388614ae2d8675c4381756a7319429e3a48"; + name = "libcdr-0.1.6.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libcdr-0.1.6.tar.xz"; + sha256 = "01cd00b04a030977e544433c2d127c997205332cd9b8e35ec0ee17110da7f861"; md5 = ""; - md5name = "6ace5c499a8be34ad871e825442ce388614ae2d8675c4381756a7319429e3a48-libcdr-0.1.5.tar.xz"; + md5name = "01cd00b04a030977e544433c2d127c997205332cd9b8e35ec0ee17110da7f861-libcdr-0.1.6.tar.xz"; } { name = "clucene-core-2.3.3.4.tar.gz"; - url = "http://dev-www.libreoffice.org/src/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz"; + url = "https://dev-www.libreoffice.org/src/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz"; sha256 = "ddfdc433dd8ad31b5c5819cc4404a8d2127472a3b720d3e744e8c51d79732eab"; md5 = "48d647fbd8ef8889e5a7f422c1bfda94"; md5name = "48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz"; } { + name = "dtoa-20180411.tgz"; + url = "https://dev-www.libreoffice.org/src/dtoa-20180411.tgz"; + sha256 = "0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4"; + md5 = ""; + md5name = "0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4-dtoa-20180411.tgz"; + } + { name = "libcmis-0.5.2.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libcmis-0.5.2.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libcmis-0.5.2.tar.xz"; sha256 = "d7b18d9602190e10d437f8a964a32e983afd57e2db316a07d87477a79f5000a2"; md5 = ""; md5name = "d7b18d9602190e10d437f8a964a32e983afd57e2db316a07d87477a79f5000a2-libcmis-0.5.2.tar.xz"; } { name = "CoinMP-1.7.6.tgz"; - url = "http://dev-www.libreoffice.org/src/CoinMP-1.7.6.tgz"; + url = "https://dev-www.libreoffice.org/src/CoinMP-1.7.6.tgz"; sha256 = "86c798780b9e1f5921fe4efe651a93cb420623b45aa1fdff57af8c37f116113f"; md5 = ""; md5name = "86c798780b9e1f5921fe4efe651a93cb420623b45aa1fdff57af8c37f116113f-CoinMP-1.7.6.tgz"; } { - name = "cppunit-1.14.0.tar.gz"; - url = "http://dev-www.libreoffice.org/src/cppunit-1.14.0.tar.gz"; - sha256 = "3d569869d27b48860210c758c4f313082103a5e58219a7669b52bfd29d674780"; + name = "cppunit-1.15.1.tar.gz"; + url = "https://dev-www.libreoffice.org/src/cppunit-1.15.1.tar.gz"; + sha256 = "89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7"; md5 = ""; - md5name = "3d569869d27b48860210c758c4f313082103a5e58219a7669b52bfd29d674780-cppunit-1.14.0.tar.gz"; + md5name = "89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7-cppunit-1.15.1.tar.gz"; } { name = "converttexttonumber-1-5-0.oxt"; - url = "http://dev-www.libreoffice.org/src/1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt"; + url = "https://dev-www.libreoffice.org/src/1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt"; sha256 = "71b238efd2734be9800af07566daea8d6685aeed28db5eb5fa0e6453f4d85de3"; md5 = "1f467e5bb703f12cbbb09d5cf67ecf4a"; md5name = "1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt"; } { - name = "curl-7.65.0.tar.xz"; - url = "http://dev-www.libreoffice.org/src/curl-7.65.0.tar.xz"; - sha256 = "7766d263929404f693905b5e5222aa0f2bdf8c66ab4b8758f0c0820a42b966cd"; + name = "curl-7.71.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/curl-7.71.0.tar.xz"; + sha256 = "cdf18794393d8bead915312708a9e5d819c6e9919de14b20d5c8e7987abd9772"; md5 = ""; - md5name = "7766d263929404f693905b5e5222aa0f2bdf8c66ab4b8758f0c0820a42b966cd-curl-7.65.0.tar.xz"; + md5name = "cdf18794393d8bead915312708a9e5d819c6e9919de14b20d5c8e7987abd9772-curl-7.71.0.tar.xz"; } { name = "libe-book-0.1.3.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libe-book-0.1.3.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libe-book-0.1.3.tar.xz"; sha256 = "7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9"; md5 = ""; md5name = "7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9-libe-book-0.1.3.tar.xz"; } { name = "libepoxy-1.5.3.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libepoxy-1.5.3.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libepoxy-1.5.3.tar.xz"; sha256 = "002958c5528321edd53440235d3c44e71b5b1e09b9177e8daf677450b6c4433d"; md5 = ""; md5name = "002958c5528321edd53440235d3c44e71b5b1e09b9177e8daf677450b6c4433d-libepoxy-1.5.3.tar.xz"; } { name = "epm-3.7.tar.gz"; - url = "http://dev-www.libreoffice.org/src/3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz"; + url = "https://dev-www.libreoffice.org/src/3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz"; sha256 = "b3fc4c5445de6c9a801504a3ea3efb2d4ea9d5a622c9427e716736e7713ddb91"; md5 = "3ade8cfe7e59ca8e65052644fed9fca4"; md5name = "3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz"; } { name = "libepubgen-0.1.1.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libepubgen-0.1.1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libepubgen-0.1.1.tar.xz"; sha256 = "03e084b994cbeffc8c3dd13303b2cb805f44d8f2c3b79f7690d7e3fc7f6215ad"; md5 = ""; md5name = "03e084b994cbeffc8c3dd13303b2cb805f44d8f2c3b79f7690d7e3fc7f6215ad-libepubgen-0.1.1.tar.xz"; } { name = "libetonyek-0.1.9.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libetonyek-0.1.9.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libetonyek-0.1.9.tar.xz"; sha256 = "e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a"; md5 = ""; md5name = "e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a-libetonyek-0.1.9.tar.xz"; } { name = "expat-2.2.8.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/expat-2.2.8.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/expat-2.2.8.tar.bz2"; sha256 = "9a130948b05a82da34e4171d5f5ae5d321d9630277af02c8fa51e431f6475102"; md5 = ""; md5name = "9a130948b05a82da34e4171d5f5ae5d321d9630277af02c8fa51e431f6475102-expat-2.2.8.tar.bz2"; } { name = "Firebird-3.0.0.32483-0.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/Firebird-3.0.0.32483-0.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/Firebird-3.0.0.32483-0.tar.bz2"; sha256 = "6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860"; md5 = ""; md5name = "6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860-Firebird-3.0.0.32483-0.tar.bz2"; } { - name = "fontconfig-2.12.6.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/fontconfig-2.12.6.tar.bz2"; - sha256 = "cf0c30807d08f6a28ab46c61b8dbd55c97d2f292cf88f3a07d3384687f31f017"; + name = "fontconfig-2.13.91.tar.gz"; + url = "https://dev-www.libreoffice.org/src/fontconfig-2.13.91.tar.gz"; + sha256 = "19e5b1bc9d013a52063a44e1307629711f0bfef35b9aca16f9c793971e2eb1e5"; md5 = ""; - md5name = "cf0c30807d08f6a28ab46c61b8dbd55c97d2f292cf88f3a07d3384687f31f017-fontconfig-2.12.6.tar.bz2"; + md5name = "19e5b1bc9d013a52063a44e1307629711f0bfef35b9aca16f9c793971e2eb1e5-fontconfig-2.13.91.tar.gz"; } { name = "crosextrafonts-20130214.tar.gz"; - url = "http://dev-www.libreoffice.org/src/368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz"; + url = "https://dev-www.libreoffice.org/src/368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz"; sha256 = "c48d1c2fd613c9c06c959c34da7b8388059e2408d2bb19845dc3ed35f76e4d09"; md5 = "368f114c078f94214a308a74c7e991bc"; md5name = "368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz"; } { name = "crosextrafonts-carlito-20130920.tar.gz"; - url = "http://dev-www.libreoffice.org/src/c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz"; + url = "https://dev-www.libreoffice.org/src/c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz"; sha256 = "4bd12b6cbc321c1cf16da76e2c585c925ce956a08067ae6f6c64eff6ccfdaf5a"; md5 = "c74b7223abe75949b4af367942d96c7a"; md5name = "c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz"; } { name = "dejavu-fonts-ttf-2.37.zip"; - url = "http://dev-www.libreoffice.org/src/33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip"; + url = "https://dev-www.libreoffice.org/src/33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip"; sha256 = "7576310b219e04159d35ff61dd4a4ec4cdba4f35c00e002a136f00e96a908b0a"; md5 = "33e1e61fab06a547851ed308b4ffef42"; md5name = "33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip"; } { name = "GentiumBasic_1102.zip"; - url = "http://dev-www.libreoffice.org/src/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip"; + url = "https://dev-www.libreoffice.org/src/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip"; sha256 = "2f1a2c5491d7305dffd3520c6375d2f3e14931ee35c6d8ae1e8f098bf1a7b3cc"; md5 = "1725634df4bb3dcb1b2c91a6175f8789"; md5name = "1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip"; } { name = "liberation-narrow-fonts-ttf-1.07.6.tar.gz"; - url = "http://dev-www.libreoffice.org/src/liberation-narrow-fonts-ttf-1.07.6.tar.gz"; + url = "https://dev-www.libreoffice.org/src/liberation-narrow-fonts-ttf-1.07.6.tar.gz"; sha256 = "8879d89b5ff7b506c9fc28efc31a5c0b954bbe9333e66e5283d27d20a8519ea3"; md5 = ""; md5name = "8879d89b5ff7b506c9fc28efc31a5c0b954bbe9333e66e5283d27d20a8519ea3-liberation-narrow-fonts-ttf-1.07.6.tar.gz"; } { name = "liberation-fonts-ttf-2.00.4.tar.gz"; - url = "http://dev-www.libreoffice.org/src/liberation-fonts-ttf-2.00.4.tar.gz"; + url = "https://dev-www.libreoffice.org/src/liberation-fonts-ttf-2.00.4.tar.gz"; sha256 = "c40e95fc5e0ecb73d4be565ae2afc1114e2bc7dc5253e00ee92d8fd6cc4adf45"; md5 = ""; md5name = "c40e95fc5e0ecb73d4be565ae2afc1114e2bc7dc5253e00ee92d8fd6cc4adf45-liberation-fonts-ttf-2.00.4.tar.gz"; } { name = "LinLibertineG-20120116.zip"; - url = "http://dev-www.libreoffice.org/src/e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip"; + url = "https://dev-www.libreoffice.org/src/e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip"; sha256 = "54adcb2bc8cac0927a647fbd9362f45eff48130ce6e2379dc3867643019e08c5"; md5 = "e7a384790b13c29113e22e596ade9687"; md5name = "e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip"; } { name = "source-code-pro-2.030R-ro-1.050R-it.tar.gz"; - url = "http://dev-www.libreoffice.org/src/907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz"; + url = "https://dev-www.libreoffice.org/src/907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz"; sha256 = "09466dce87653333f189acd8358c60c6736dcd95f042dee0b644bdcf65b6ae2f"; md5 = "907d6e99f241876695c19ff3db0b8923"; md5name = "907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz"; } { name = "source-sans-pro-2.010R-ro-1.065R-it.tar.gz"; - url = "http://dev-www.libreoffice.org/src/edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz"; + url = "https://dev-www.libreoffice.org/src/edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz"; sha256 = "e7bc9a1fec787a529e49f5a26b93dcdcf41506449dfc70f92cdef6d17eb6fb61"; md5 = "edc4d741888bc0d38e32dbaa17149596"; md5name = "edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz"; } { name = "source-serif-pro-3.000R.tar.gz"; - url = "http://dev-www.libreoffice.org/src/source-serif-pro-3.000R.tar.gz"; + url = "https://dev-www.libreoffice.org/src/source-serif-pro-3.000R.tar.gz"; sha256 = "826a2b784d5cdb4c2bbc7830eb62871528360a61a52689c102a101623f1928e3"; md5 = ""; md5name = "826a2b784d5cdb4c2bbc7830eb62871528360a61a52689c102a101623f1928e3-source-serif-pro-3.000R.tar.gz"; } { name = "EmojiOneColor-SVGinOT-1.3.tar.gz"; - url = "http://dev-www.libreoffice.org/src/EmojiOneColor-SVGinOT-1.3.tar.gz"; + url = "https://dev-www.libreoffice.org/src/EmojiOneColor-SVGinOT-1.3.tar.gz"; sha256 = "d1a08f7c10589f22740231017694af0a7a270760c8dec33d8d1c038e2be0a0c7"; md5 = ""; md5name = "d1a08f7c10589f22740231017694af0a7a270760c8dec33d8d1c038e2be0a0c7-EmojiOneColor-SVGinOT-1.3.tar.gz"; } { name = "noto-fonts-20171024.tar.gz"; - url = "http://dev-www.libreoffice.org/src/noto-fonts-20171024.tar.gz"; + url = "https://dev-www.libreoffice.org/src/noto-fonts-20171024.tar.gz"; sha256 = "29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994"; md5 = ""; md5name = "29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994-noto-fonts-20171024.tar.gz"; } { name = "culmus-0.131.tar.gz"; - url = "http://dev-www.libreoffice.org/src/culmus-0.131.tar.gz"; + url = "https://dev-www.libreoffice.org/src/culmus-0.131.tar.gz"; sha256 = "dcf112cfcccb76328dcfc095f4d7c7f4d2f7e48d0eed5e78b100d1d77ce2ed1b"; md5 = ""; md5name = "dcf112cfcccb76328dcfc095f4d7c7f4d2f7e48d0eed5e78b100d1d77ce2ed1b-culmus-0.131.tar.gz"; } { name = "libre-hebrew-1.0.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libre-hebrew-1.0.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libre-hebrew-1.0.tar.gz"; sha256 = "f596257c1db706ce35795b18d7f66a4db99d427725f20e9384914b534142579a"; md5 = ""; md5name = "f596257c1db706ce35795b18d7f66a4db99d427725f20e9384914b534142579a-libre-hebrew-1.0.tar.gz"; } { name = "alef-1.001.tar.gz"; - url = "http://dev-www.libreoffice.org/src/alef-1.001.tar.gz"; + url = "https://dev-www.libreoffice.org/src/alef-1.001.tar.gz"; sha256 = "b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f0b89fbdb75bf52"; md5 = ""; md5name = "b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f0b89fbdb75bf52-alef-1.001.tar.gz"; } { name = "Amiri-0.111.zip"; - url = "http://dev-www.libreoffice.org/src/Amiri-0.111.zip"; + url = "https://dev-www.libreoffice.org/src/Amiri-0.111.zip"; sha256 = "1fbfccced6348b5db2c1c21d5b319cd488e14d055702fa817a0f6cb83d882166"; md5 = ""; md5name = "1fbfccced6348b5db2c1c21d5b319cd488e14d055702fa817a0f6cb83d882166-Amiri-0.111.zip"; } { name = "ttf-kacst_2.01+mry.tar.gz"; - url = "http://dev-www.libreoffice.org/src/ttf-kacst_2.01+mry.tar.gz"; + url = "https://dev-www.libreoffice.org/src/ttf-kacst_2.01+mry.tar.gz"; sha256 = "dca00f5e655f2f217a766faa73a81f542c5c204aa3a47017c3c2be0b31d00a56"; md5 = ""; md5name = "dca00f5e655f2f217a766faa73a81f542c5c204aa3a47017c3c2be0b31d00a56-ttf-kacst_2.01+mry.tar.gz"; } { name = "ReemKufi-0.7.zip"; - url = "http://dev-www.libreoffice.org/src/ReemKufi-0.7.zip"; + url = "https://dev-www.libreoffice.org/src/ReemKufi-0.7.zip"; sha256 = "f60c6508d209ce4236d2d7324256c2ffddd480be7e3d6023770b93dc391a605f"; md5 = ""; md5name = "f60c6508d209ce4236d2d7324256c2ffddd480be7e3d6023770b93dc391a605f-ReemKufi-0.7.zip"; } { name = "Scheherazade-2.100.zip"; - url = "http://dev-www.libreoffice.org/src/Scheherazade-2.100.zip"; + url = "https://dev-www.libreoffice.org/src/Scheherazade-2.100.zip"; sha256 = "251c8817ceb87d9b661ce1d5b49e732a0116add10abc046be4b8ba5196e149b5"; md5 = ""; md5name = "251c8817ceb87d9b661ce1d5b49e732a0116add10abc046be4b8ba5196e149b5-Scheherazade-2.100.zip"; } { name = "libfreehand-0.1.2.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libfreehand-0.1.2.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libfreehand-0.1.2.tar.xz"; sha256 = "0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac"; md5 = ""; md5name = "0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac-libfreehand-0.1.2.tar.xz"; } { name = "freetype-2.9.1.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/freetype-2.9.1.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/freetype-2.9.1.tar.bz2"; sha256 = "db8d87ea720ea9d5edc5388fc7a0497bb11ba9fe972245e0f7f4c7e8b1e1e84d"; md5 = ""; md5name = "db8d87ea720ea9d5edc5388fc7a0497bb11ba9fe972245e0f7f4c7e8b1e1e84d-freetype-2.9.1.tar.bz2"; } { - name = "glm-0.9.4.6-libreoffice.zip"; - url = "http://dev-www.libreoffice.org/src/bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip"; - sha256 = "d0312c360efe04dd048b3311fe375ff36f1993b4c2e3cb58c81062990532904a"; - md5 = "bae83fa5dc7f081768daace6e199adc3"; - md5name = "bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip"; + name = "glm-0.9.9.7.zip"; + url = "https://dev-www.libreoffice.org/src/glm-0.9.9.7.zip"; + sha256 = "c5e167c042afd2d7ad642ace6b643863baeb33880781983563e1ab68a30d3e95"; + md5 = ""; + md5name = "c5e167c042afd2d7ad642ace6b643863baeb33880781983563e1ab68a30d3e95-glm-0.9.9.7.zip"; } { name = "gpgme-1.9.0.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/gpgme-1.9.0.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/gpgme-1.9.0.tar.bz2"; sha256 = "1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb"; md5 = ""; md5name = "1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb-gpgme-1.9.0.tar.bz2"; } { - name = "graphite2-minimal-1.3.13.tgz"; - url = "http://dev-www.libreoffice.org/src/graphite2-minimal-1.3.13.tgz"; - sha256 = "d47d387161db7f7ebade1920aa7cbdc797e79772597d8b55e80b58d1071bcc36"; + name = "graphite2-minimal-1.3.14.tgz"; + url = "https://dev-www.libreoffice.org/src/graphite2-minimal-1.3.14.tgz"; + sha256 = "b8e892d8627c41888ff121e921455b9e2d26836978f2359173d19825da62b8fc"; md5 = ""; - md5name = "d47d387161db7f7ebade1920aa7cbdc797e79772597d8b55e80b58d1071bcc36-graphite2-minimal-1.3.13.tgz"; + md5name = "b8e892d8627c41888ff121e921455b9e2d26836978f2359173d19825da62b8fc-graphite2-minimal-1.3.14.tgz"; } { - name = "harfbuzz-2.3.1.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/harfbuzz-2.3.1.tar.bz2"; - sha256 = "f205699d5b91374008d6f8e36c59e419ae2d9a7bb8c5d9f34041b9a5abcae468"; + name = "harfbuzz-2.6.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/harfbuzz-2.6.0.tar.xz"; + sha256 = "9cf7d117548265f95ca884e2f4c9fafaf4e17d45a67b11107147b79eed76c966"; md5 = ""; - md5name = "f205699d5b91374008d6f8e36c59e419ae2d9a7bb8c5d9f34041b9a5abcae468-harfbuzz-2.3.1.tar.bz2"; + md5name = "9cf7d117548265f95ca884e2f4c9fafaf4e17d45a67b11107147b79eed76c966-harfbuzz-2.6.0.tar.xz"; } { name = "hsqldb_1_8_0.zip"; - url = "http://dev-www.libreoffice.org/src/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip"; + url = "https://dev-www.libreoffice.org/src/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip"; sha256 = "d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370"; md5 = "17410483b5b5f267aa18b7e00b65e6e0"; md5name = "17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip"; } { name = "hunspell-1.7.0.tar.gz"; - url = "http://dev-www.libreoffice.org/src/hunspell-1.7.0.tar.gz"; + url = "https://dev-www.libreoffice.org/src/hunspell-1.7.0.tar.gz"; sha256 = "57be4e03ae9dd62c3471f667a0d81a14513e314d4d92081292b90435944ff951"; md5 = ""; md5name = "57be4e03ae9dd62c3471f667a0d81a14513e314d4d92081292b90435944ff951-hunspell-1.7.0.tar.gz"; } { name = "hyphen-2.8.8.tar.gz"; - url = "http://dev-www.libreoffice.org/src/5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz"; + url = "https://dev-www.libreoffice.org/src/5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz"; sha256 = "304636d4eccd81a14b6914d07b84c79ebb815288c76fe027b9ebff6ff24d5705"; md5 = "5ade6ae2a99bc1e9e57031ca88d36dad"; md5name = "5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz"; } { - name = "icu4c-63_1-src.tgz"; - url = "http://dev-www.libreoffice.org/src/icu4c-63_1-src.tgz"; - sha256 = "05c490b69454fce5860b7e8e2821231674af0a11d7ef2febea9a32512998cb9d"; + name = "icu4c-67_1-src.tgz"; + url = "https://dev-www.libreoffice.org/src/icu4c-67_1-src.tgz"; + sha256 = "94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc"; md5 = ""; - md5name = "05c490b69454fce5860b7e8e2821231674af0a11d7ef2febea9a32512998cb9d-icu4c-63_1-src.tgz"; + md5name = "94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc-icu4c-67_1-src.tgz"; } { - name = "icu4c-63_1-data.zip"; - url = "http://dev-www.libreoffice.org/src/icu4c-63_1-data.zip"; - sha256 = "9bef2bf28ec4fdc86a3bd88d7ac4d509fef6dfbe9c6798299e55b9d4343e960c"; + name = "icu4c-67_1-data.zip"; + url = "https://dev-www.libreoffice.org/src/icu4c-67_1-data.zip"; + sha256 = "7c16a59cc8c06128b7ecc1dc4fc056b36b17349312829b17408b9e67b05c4a7e"; md5 = ""; - md5name = "9bef2bf28ec4fdc86a3bd88d7ac4d509fef6dfbe9c6798299e55b9d4343e960c-icu4c-63_1-data.zip"; + md5name = "7c16a59cc8c06128b7ecc1dc4fc056b36b17349312829b17408b9e67b05c4a7e-icu4c-67_1-data.zip"; } { name = "flow-engine-0.9.4.zip"; - url = "http://dev-www.libreoffice.org/src/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip"; + url = "https://dev-www.libreoffice.org/src/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip"; sha256 = "233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd"; md5 = "ba2930200c9f019c2d93a8c88c651a0f"; md5name = "ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip"; } { name = "flute-1.1.6.zip"; - url = "http://dev-www.libreoffice.org/src/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip"; + url = "https://dev-www.libreoffice.org/src/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip"; sha256 = "1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133"; md5 = "d8bd5eed178db6e2b18eeed243f85aa8"; md5name = "d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip"; } { name = "libbase-1.1.6.zip"; - url = "http://dev-www.libreoffice.org/src/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip"; + url = "https://dev-www.libreoffice.org/src/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip"; sha256 = "75c80359c9ce343c20aab8a36a45cb3b9ee7c61cf92c13ae45399d854423a9ba"; md5 = "eeb2c7ddf0d302fba4bfc6e97eac9624"; md5name = "eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip"; } { name = "libfonts-1.1.6.zip"; - url = "http://dev-www.libreoffice.org/src/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip"; + url = "https://dev-www.libreoffice.org/src/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip"; sha256 = "e0531091787c0f16c83965fdcbc49162c059d7f0c64669e7f119699321549743"; md5 = "3bdf40c0d199af31923e900d082ca2dd"; md5name = "3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip"; } { name = "libformula-1.1.7.zip"; - url = "http://dev-www.libreoffice.org/src/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip"; + url = "https://dev-www.libreoffice.org/src/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip"; sha256 = "5826d1551bf599b85742545f6e01a0079b93c1b2c8434bf409eddb3a29e4726b"; md5 = "3404ab6b1792ae5f16bbd603bd1e1d03"; md5name = "3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip"; } { name = "liblayout-0.2.10.zip"; - url = "http://dev-www.libreoffice.org/src/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip"; + url = "https://dev-www.libreoffice.org/src/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip"; sha256 = "e1fb87f3f7b980d33414473279615c4644027e013012d156efa538bc2b031772"; md5 = "db60e4fde8dd6d6807523deb71ee34dc"; md5name = "db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip"; } { name = "libloader-1.1.6.zip"; - url = "http://dev-www.libreoffice.org/src/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip"; + url = "https://dev-www.libreoffice.org/src/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip"; sha256 = "3d853b19b1d94a6efa69e7af90f7f2b09ecf302913bee3da796c15ecfebcfac8"; md5 = "97b2d4dba862397f446b217e2b623e71"; md5name = "97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip"; } { name = "librepository-1.1.6.zip"; - url = "http://dev-www.libreoffice.org/src/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip"; + url = "https://dev-www.libreoffice.org/src/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip"; sha256 = "abe2c57ac12ba45d83563b02e240fa95d973376de2f720aab8fe11f2e621c095"; md5 = "8ce2fcd72becf06c41f7201d15373ed9"; md5name = "8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip"; } { name = "libserializer-1.1.6.zip"; - url = "http://dev-www.libreoffice.org/src/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip"; + url = "https://dev-www.libreoffice.org/src/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip"; sha256 = "05640a1f6805b2b2d7e2cb9c50db9a5cb084e3c52ab1a71ce015239b4a1d4343"; md5 = "f94d9870737518e3b597f9265f4e9803"; md5name = "f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip"; } { name = "libxml-1.1.7.zip"; - url = "http://dev-www.libreoffice.org/src/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip"; + url = "https://dev-www.libreoffice.org/src/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip"; sha256 = "7d2797fe9f79a77009721e3f14fa4a1dec17a6d706bdc93f85f1f01d124fab66"; md5 = "ace6ab49184e329db254e454a010f56d"; md5name = "ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip"; } { name = "sacjava-1.3.zip"; - url = "http://dev-www.libreoffice.org/src/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip"; + url = "https://dev-www.libreoffice.org/src/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip"; sha256 = "085f2112c51fa8c1783fac12fbd452650596415121348393bb51f0f7e85a9045"; md5 = "39bb3fcea1514f1369fcfc87542390fd"; md5name = "39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip"; } { name = "libjpeg-turbo-1.5.3.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libjpeg-turbo-1.5.3.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libjpeg-turbo-1.5.3.tar.gz"; sha256 = "b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523"; md5 = ""; md5name = "b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523-libjpeg-turbo-1.5.3.tar.gz"; } { - name = "language-subtag-registry-2019-09-16.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2019-09-16.tar.bz2"; - sha256 = "07b66bc0f2786fde55f6bbcbcb4a455a846eb8e2351c8ce3d0a219a73693736a"; + name = "language-subtag-registry-2020-09-29.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2020-09-29.tar.bz2"; + sha256 = "cbe9fca811a37056560aab73e9fc9d3522b46b6785cb02db165f521bf42c230f"; md5 = ""; - md5name = "07b66bc0f2786fde55f6bbcbcb4a455a846eb8e2351c8ce3d0a219a73693736a-language-subtag-registry-2019-09-16.tar.bz2"; + md5name = "cbe9fca811a37056560aab73e9fc9d3522b46b6785cb02db165f521bf42c230f-language-subtag-registry-2020-09-29.tar.bz2"; } { name = "JLanguageTool-1.7.0.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2"; sha256 = "48c87e41636783bba438b65fd895821e369ed139e1465fac654323ad93c5a82d"; md5 = "b63e6340a02ff1cacfeadb2c42286161"; md5name = "b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2"; } { name = "lcms2-2.9.tar.gz"; - url = "http://dev-www.libreoffice.org/src/lcms2-2.9.tar.gz"; + url = "https://dev-www.libreoffice.org/src/lcms2-2.9.tar.gz"; sha256 = "48c6fdf98396fa245ed86e622028caf49b96fa22f3e5734f853f806fbc8e7d20"; md5 = ""; md5name = "48c6fdf98396fa245ed86e622028caf49b96fa22f3e5734f853f806fbc8e7d20-lcms2-2.9.tar.gz"; } { name = "libassuan-2.5.1.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libassuan-2.5.1.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/libassuan-2.5.1.tar.bz2"; sha256 = "47f96c37b4f2aac289f0bc1bacfa8bd8b4b209a488d3d15e2229cb6cc9b26449"; md5 = ""; md5name = "47f96c37b4f2aac289f0bc1bacfa8bd8b4b209a488d3d15e2229cb6cc9b26449-libassuan-2.5.1.tar.bz2"; } { name = "libatomic_ops-7.6.8.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libatomic_ops-7.6.8.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libatomic_ops-7.6.8.tar.gz"; sha256 = "1d6a279edf81767e74d2ad2c9fce09459bc65f12c6525a40b0cb3e53c089f665"; md5 = ""; md5name = "1d6a279edf81767e74d2ad2c9fce09459bc65f12c6525a40b0cb3e53c089f665-libatomic_ops-7.6.8.tar.gz"; } { name = "libeot-0.01.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libeot-0.01.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/libeot-0.01.tar.bz2"; sha256 = "cf5091fa8e7dcdbe667335eb90a2cfdd0a3fe8f8c7c8d1ece44d9d055736a06a"; md5 = ""; md5name = "cf5091fa8e7dcdbe667335eb90a2cfdd0a3fe8f8c7c8d1ece44d9d055736a06a-libeot-0.01.tar.bz2"; } { name = "libexttextcat-3.4.5.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libexttextcat-3.4.5.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libexttextcat-3.4.5.tar.xz"; sha256 = "13fdbc9d4c489a4d0519e51933a1aa21fe3fb9eb7da191b87f7a63e82797dac8"; md5 = ""; md5name = "13fdbc9d4c489a4d0519e51933a1aa21fe3fb9eb7da191b87f7a63e82797dac8-libexttextcat-3.4.5.tar.xz"; } { + name = "libffi-3.3.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libffi-3.3.tar.gz"; + sha256 = "72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056"; + md5 = ""; + md5name = "72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056-libffi-3.3.tar.gz"; + } + { name = "libgpg-error-1.27.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libgpg-error-1.27.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/libgpg-error-1.27.tar.bz2"; sha256 = "4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2"; md5 = ""; md5name = "4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2-libgpg-error-1.27.tar.bz2"; } { name = "liblangtag-0.6.2.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/liblangtag-0.6.2.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/liblangtag-0.6.2.tar.bz2"; sha256 = "d6242790324f1432fb0a6fae71b6851f520b2c5a87675497cf8ea14c2924d52e"; md5 = ""; md5name = "d6242790324f1432fb0a6fae71b6851f520b2c5a87675497cf8ea14c2924d52e-liblangtag-0.6.2.tar.bz2"; } { - name = "libnumbertext-1.0.5.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libnumbertext-1.0.5.tar.xz"; - sha256 = "e1c9086b4cecb6b25f180316f30740dfabe6a4dbaf70dddc34276fc839e4f4f7"; + name = "libnumbertext-1.0.6.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libnumbertext-1.0.6.tar.xz"; + sha256 = "739f220b34bf7cb731c09de2921771d644d37dfd276c45564401e5759f10ae57"; md5 = ""; - md5name = "e1c9086b4cecb6b25f180316f30740dfabe6a4dbaf70dddc34276fc839e4f4f7-libnumbertext-1.0.5.tar.xz"; + md5name = "739f220b34bf7cb731c09de2921771d644d37dfd276c45564401e5759f10ae57-libnumbertext-1.0.6.tar.xz"; } { name = "ltm-1.0.zip"; - url = "http://dev-www.libreoffice.org/src/ltm-1.0.zip"; + url = "https://dev-www.libreoffice.org/src/ltm-1.0.zip"; sha256 = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483"; md5 = ""; md5name = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483-ltm-1.0.zip"; } { - name = "xmlsec1-1.2.28.tar.gz"; - url = "http://dev-www.libreoffice.org/src/xmlsec1-1.2.28.tar.gz"; - sha256 = "13eec4811ea30e3f0e16a734d1dbf7f9d246a71d540b48d143a07b489f6222d4"; + name = "xmlsec1-1.2.30.tar.gz"; + url = "https://dev-www.libreoffice.org/src/xmlsec1-1.2.30.tar.gz"; + sha256 = "2d84360b03042178def1d9ff538acacaed2b3a27411db7b2874f1612ed71abc8"; md5 = ""; - md5name = "13eec4811ea30e3f0e16a734d1dbf7f9d246a71d540b48d143a07b489f6222d4-xmlsec1-1.2.28.tar.gz"; + md5name = "2d84360b03042178def1d9ff538acacaed2b3a27411db7b2874f1612ed71abc8-xmlsec1-1.2.30.tar.gz"; } { name = "libxml2-2.9.10.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libxml2-2.9.10.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libxml2-2.9.10.tar.gz"; sha256 = "aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f"; md5 = ""; md5name = "aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f-libxml2-2.9.10.tar.gz"; } { name = "libxslt-1.1.34.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libxslt-1.1.34.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libxslt-1.1.34.tar.gz"; sha256 = "98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f"; md5 = ""; md5name = "98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f-libxslt-1.1.34.tar.gz"; } { name = "lp_solve_5.5.tar.gz"; - url = "http://dev-www.libreoffice.org/src/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz"; + url = "https://dev-www.libreoffice.org/src/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz"; sha256 = "171816288f14215c69e730f7a4f1c325739873e21f946ff83884b350574e6695"; md5 = "26b3e95ddf3d9c077c480ea45874b3b8"; md5name = "26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz"; } { name = "lxml-4.1.1.tgz"; - url = "http://dev-www.libreoffice.org/src/lxml-4.1.1.tgz"; + url = "https://dev-www.libreoffice.org/src/lxml-4.1.1.tgz"; sha256 = "940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e"; md5 = ""; md5name = "940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e-lxml-4.1.1.tgz"; } { - name = "mariadb_client-2.0.0-src.tar.gz"; - url = "http://dev-www.libreoffice.org/src/a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz"; - sha256 = "fd2f751dea049c1907735eb236aeace1d811d6a8218118b00bbaa9b84dc5cd60"; - md5 = "a233181e03d3c307668b4c722d881661"; - md5name = "a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz"; + name = "mariadb-connector-c-3.1.8-src.tar.gz"; + url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.1.8-src.tar.gz"; + sha256 = "431434d3926f4bcce2e5c97240609983f60d7ff50df5a72083934759bb863f7b"; + md5 = ""; + md5name = "431434d3926f4bcce2e5c97240609983f60d7ff50df5a72083934759bb863f7b-mariadb-connector-c-3.1.8-src.tar.gz"; } { - name = "mdds-1.4.3.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/mdds-1.4.3.tar.bz2"; - sha256 = "25ce3d5af9f6609e1de05bb22b2316e57b74a72a5b686fbb2da199da72349c81"; + name = "mdds-1.6.0.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/mdds-1.6.0.tar.bz2"; + sha256 = "f1585c9cbd12f83a6d43d395ac1ab6a9d9d5d77f062c7b5f704e24ed72dae07d"; md5 = ""; - md5name = "25ce3d5af9f6609e1de05bb22b2316e57b74a72a5b686fbb2da199da72349c81-mdds-1.4.3.tar.bz2"; + md5name = "f1585c9cbd12f83a6d43d395ac1ab6a9d9d5d77f062c7b5f704e24ed72dae07d-mdds-1.6.0.tar.bz2"; } { name = "mDNSResponder-878.200.35.tar.gz"; - url = "http://dev-www.libreoffice.org/src/mDNSResponder-878.200.35.tar.gz"; + url = "https://dev-www.libreoffice.org/src/mDNSResponder-878.200.35.tar.gz"; sha256 = "e777b4d7dbf5eb1552cb80090ad1ede319067ab6e45e3990d68aabf6e8b3f5a0"; md5 = ""; md5name = "e777b4d7dbf5eb1552cb80090ad1ede319067ab6e45e3990d68aabf6e8b3f5a0-mDNSResponder-878.200.35.tar.gz"; } { name = "libmspub-0.1.4.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libmspub-0.1.4.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libmspub-0.1.4.tar.xz"; sha256 = "ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba"; md5 = ""; md5name = "ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba-libmspub-0.1.4.tar.xz"; } { - name = "libmwaw-0.3.15.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libmwaw-0.3.15.tar.xz"; - sha256 = "0440bb09f05e3419423d8dfa36ee847056ebfd837f9cbc091fdb5b057daab0b1"; + name = "libmwaw-0.3.16.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libmwaw-0.3.16.tar.xz"; + sha256 = "0c639edba5297bde5575193bf5b5f2f469956beaff5c0206d91ce9df6bde1868"; md5 = ""; - md5name = "0440bb09f05e3419423d8dfa36ee847056ebfd837f9cbc091fdb5b057daab0b1-libmwaw-0.3.15.tar.xz"; + md5name = "0c639edba5297bde5575193bf5b5f2f469956beaff5c0206d91ce9df6bde1868-libmwaw-0.3.16.tar.xz"; } { name = "mythes-1.2.4.tar.gz"; - url = "http://dev-www.libreoffice.org/src/a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz"; + url = "https://dev-www.libreoffice.org/src/a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz"; sha256 = "1e81f395d8c851c3e4e75b568e20fa2fa549354e75ab397f9de4b0e0790a305f"; md5 = "a8c2c5b8f09e7ede322d5c602ff6a4b6"; md5name = "a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz"; } { name = "neon-0.30.2.tar.gz"; - url = "http://dev-www.libreoffice.org/src/neon-0.30.2.tar.gz"; + url = "https://dev-www.libreoffice.org/src/neon-0.30.2.tar.gz"; sha256 = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca"; md5 = ""; md5name = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca-neon-0.30.2.tar.gz"; } { - name = "nss-3.47.1-with-nspr-4.23.tar.gz"; - url = "http://dev-www.libreoffice.org/src/nss-3.47.1-with-nspr-4.23.tar.gz"; - sha256 = "07d4276168f59bb3038c7826dabb5fbfbab8336ddf65e4e6e43bce89ada78c64"; + name = "nss-3.55-with-nspr-4.27.tar.gz"; + url = "https://dev-www.libreoffice.org/src/nss-3.55-with-nspr-4.27.tar.gz"; + sha256 = "ec6032d78663c6ef90b4b83eb552dedf721d2bce208cec3bf527b8f637db7e45"; md5 = ""; - md5name = "07d4276168f59bb3038c7826dabb5fbfbab8336ddf65e4e6e43bce89ada78c64-nss-3.47.1-with-nspr-4.23.tar.gz"; + md5name = "ec6032d78663c6ef90b4b83eb552dedf721d2bce208cec3bf527b8f637db7e45-nss-3.55-with-nspr-4.27.tar.gz"; } { name = "libodfgen-0.1.6.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libodfgen-0.1.6.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/libodfgen-0.1.6.tar.bz2"; sha256 = "2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2"; md5 = ""; md5name = "2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2-libodfgen-0.1.6.tar.bz2"; } { - name = "odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar"; - url = "http://dev-www.libreoffice.org/src/../extern/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar"; - sha256 = "984f2a479df79e27e7b01a5815ac53ae64e07746b882262d8a64566494515504"; + name = "odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar"; + url = "https://dev-www.libreoffice.org/src/../extern/odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar"; + sha256 = "d55495ab3a86544650587de2a72180ddf8bfc6376d14ddfa923992dbc86a06e0"; md5 = ""; - md5name = "984f2a479df79e27e7b01a5815ac53ae64e07746b882262d8a64566494515504-odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar"; + md5name = "d55495ab3a86544650587de2a72180ddf8bfc6376d14ddfa923992dbc86a06e0-odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar"; } { name = "officeotron-0.7.4-master.jar"; - url = "http://dev-www.libreoffice.org/src/../extern/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar"; + url = "https://dev-www.libreoffice.org/src/../extern/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar"; sha256 = "f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770"; md5 = "8249374c274932a21846fa7629c2aa9b"; md5name = "8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar"; } { name = "openldap-2.4.45.tgz"; - url = "http://dev-www.libreoffice.org/src/openldap-2.4.45.tgz"; + url = "https://dev-www.libreoffice.org/src/openldap-2.4.45.tgz"; sha256 = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824"; md5 = ""; md5name = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824-openldap-2.4.45.tgz"; } { name = "openssl-1.0.2t.tar.gz"; - url = "http://dev-www.libreoffice.org/src/openssl-1.0.2t.tar.gz"; + url = "https://dev-www.libreoffice.org/src/openssl-1.0.2t.tar.gz"; sha256 = "14cb464efe7ac6b54799b34456bd69558a749a4931ecfd9cf9f71d7881cac7bc"; md5 = ""; md5name = "14cb464efe7ac6b54799b34456bd69558a749a4931ecfd9cf9f71d7881cac7bc-openssl-1.0.2t.tar.gz"; } { - name = "liborcus-0.14.1.tar.gz"; - url = "http://dev-www.libreoffice.org/src/liborcus-0.14.1.tar.gz"; - sha256 = "3f48cfbc21ad74787218284939c04d42cb836c73bc393f27f538b668e4d78a5f"; + name = "liborcus-0.15.4.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/liborcus-0.15.4.tar.bz2"; + sha256 = "cfb2aa60825f2a78589ed030c07f46a1ee16ef8a2d1bf2279192fbc1ae5a5f61"; md5 = ""; - md5name = "3f48cfbc21ad74787218284939c04d42cb836c73bc393f27f538b668e4d78a5f-liborcus-0.14.1.tar.gz"; + md5name = "cfb2aa60825f2a78589ed030c07f46a1ee16ef8a2d1bf2279192fbc1ae5a5f61-liborcus-0.15.4.tar.bz2"; } { name = "owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; - url = "http://dev-www.libreoffice.org/src/owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; + url = "https://dev-www.libreoffice.org/src/owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; sha256 = "b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb"; md5 = ""; md5name = "b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb-owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; } { name = "libpagemaker-0.0.4.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libpagemaker-0.0.4.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libpagemaker-0.0.4.tar.xz"; sha256 = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d"; md5 = ""; md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz"; } { - name = "pdfium-3794.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/pdfium-3794.tar.bz2"; - sha256 = "e3faddcf741336c64ca2e6f72b23e9e60979969b2cf67c878c9a5bc38328cfc4"; + name = "pdfium-4306.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/pdfium-4306.tar.bz2"; + sha256 = "eca406d47ac7e2a84dcc86f93c08f96e591d409589e881477fa75e488e4851d8"; md5 = ""; - md5name = "e3faddcf741336c64ca2e6f72b23e9e60979969b2cf67c878c9a5bc38328cfc4-pdfium-3794.tar.bz2"; + md5name = "eca406d47ac7e2a84dcc86f93c08f96e591d409589e881477fa75e488e4851d8-pdfium-4306.tar.bz2"; } { name = "pixman-0.34.0.tar.gz"; - url = "http://dev-www.libreoffice.org/src/e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz"; + url = "https://dev-www.libreoffice.org/src/e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz"; sha256 = "21b6b249b51c6800dc9553b65106e1e37d0e25df942c90531d4c3997aa20a88e"; md5 = "e80ebae4da01e77f68744319f01d52a3"; md5name = "e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz"; } { name = "libpng-1.6.37.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libpng-1.6.37.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libpng-1.6.37.tar.xz"; sha256 = "505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca"; md5 = ""; md5name = "505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca-libpng-1.6.37.tar.xz"; } { name = "poppler-0.82.0.tar.xz"; - url = "http://dev-www.libreoffice.org/src/poppler-0.82.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/poppler-0.82.0.tar.xz"; sha256 = "234f8e573ea57fb6a008e7c1e56bfae1af5d1adf0e65f47555e1ae103874e4df"; md5 = ""; md5name = "234f8e573ea57fb6a008e7c1e56bfae1af5d1adf0e65f47555e1ae103874e4df-poppler-0.82.0.tar.xz"; } { name = "postgresql-9.2.24.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/postgresql-9.2.24.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/postgresql-9.2.24.tar.bz2"; sha256 = "a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126"; md5 = ""; md5name = "a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126-postgresql-9.2.24.tar.bz2"; } { - name = "Python-3.5.9.tar.xz"; - url = "http://dev-www.libreoffice.org/src/Python-3.5.9.tar.xz"; - sha256 = "c24a37c63a67f53bdd09c5f287b5cff8e8b98f857bf348c577d454d3f74db049"; + name = "Python-3.7.7.tar.xz"; + url = "https://dev-www.libreoffice.org/src/Python-3.7.7.tar.xz"; + sha256 = "06a0a9f1bf0d8cd1e4121194d666c4e28ddae4dd54346de6c343206599f02136"; + md5 = ""; + md5name = "06a0a9f1bf0d8cd1e4121194d666c4e28ddae4dd54346de6c343206599f02136-Python-3.7.7.tar.xz"; + } + { + name = "QR-Code-generator-1.4.0.tar.gz"; + url = "https://dev-www.libreoffice.org/src/QR-Code-generator-1.4.0.tar.gz"; + sha256 = "fcdf9fd69fde07ae4dca2351d84271a9de8093002f733b77c70f52f1630f6e4a"; md5 = ""; - md5name = "c24a37c63a67f53bdd09c5f287b5cff8e8b98f857bf348c577d454d3f74db049-Python-3.5.9.tar.xz"; + md5name = "fcdf9fd69fde07ae4dca2351d84271a9de8093002f733b77c70f52f1630f6e4a-QR-Code-generator-1.4.0.tar.gz"; } { name = "libqxp-0.0.2.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libqxp-0.0.2.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libqxp-0.0.2.tar.xz"; sha256 = "e137b6b110120a52c98edd02ebdc4095ee08d0d5295a94316a981750095a945c"; md5 = ""; md5name = "e137b6b110120a52c98edd02ebdc4095ee08d0d5295a94316a981750095a945c-libqxp-0.0.2.tar.xz"; } { name = "raptor2-2.0.15.tar.gz"; - url = "http://dev-www.libreoffice.org/src/a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz"; + url = "https://dev-www.libreoffice.org/src/a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz"; sha256 = "ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed"; md5 = "a39f6c07ddb20d7dd2ff1f95fa21e2cd"; md5name = "a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz"; } { name = "rasqal-0.9.33.tar.gz"; - url = "http://dev-www.libreoffice.org/src/1f5def51ca0026cd192958ef07228b52-rasqal-0.9.33.tar.gz"; + url = "https://dev-www.libreoffice.org/src/1f5def51ca0026cd192958ef07228b52-rasqal-0.9.33.tar.gz"; sha256 = "6924c9ac6570bd241a9669f83b467c728a322470bf34f4b2da4f69492ccfd97c"; md5 = "1f5def51ca0026cd192958ef07228b52"; md5name = "1f5def51ca0026cd192958ef07228b52-rasqal-0.9.33.tar.gz"; } { name = "redland-1.0.17.tar.gz"; - url = "http://dev-www.libreoffice.org/src/e5be03eda13ef68aabab6e42aa67715e-redland-1.0.17.tar.gz"; + url = "https://dev-www.libreoffice.org/src/e5be03eda13ef68aabab6e42aa67715e-redland-1.0.17.tar.gz"; sha256 = "de1847f7b59021c16bdc72abb4d8e2d9187cd6124d69156f3326dd34ee043681"; md5 = "e5be03eda13ef68aabab6e42aa67715e"; md5name = "e5be03eda13ef68aabab6e42aa67715e-redland-1.0.17.tar.gz"; } { name = "librevenge-0.0.4.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/librevenge-0.0.4.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/librevenge-0.0.4.tar.bz2"; sha256 = "c51601cd08320b75702812c64aae0653409164da7825fd0f451ac2c5dbe77cbf"; md5 = ""; md5name = "c51601cd08320b75702812c64aae0653409164da7825fd0f451ac2c5dbe77cbf-librevenge-0.0.4.tar.bz2"; } { name = "rhino1_5R5.zip"; - url = "http://dev-www.libreoffice.org/src/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"; + url = "https://dev-www.libreoffice.org/src/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"; sha256 = "1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753"; md5 = "798b2ffdc8bcfe7bca2cf92b62caf685"; md5name = "798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"; } { name = "serf-1.2.1.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/serf-1.2.1.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/serf-1.2.1.tar.bz2"; sha256 = "6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700"; md5 = ""; md5name = "6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700-serf-1.2.1.tar.bz2"; } { - name = "libstaroffice-0.0.6.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libstaroffice-0.0.6.tar.xz"; - sha256 = "6b00e1ed8194e6072be4441025d1b888e39365727ed5b23e0e8c92c4009d1ec4"; + name = "skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz"; + url = "https://dev-www.libreoffice.org/src/skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz"; + sha256 = "3294877fa2b61b220d98a0f7bfc11325429b13edd2cf455444c703ee3a14d760"; + md5 = ""; + md5name = "3294877fa2b61b220d98a0f7bfc11325429b13edd2cf455444c703ee3a14d760-skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz"; + } + { + name = "libstaroffice-0.0.7.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libstaroffice-0.0.7.tar.xz"; + sha256 = "f94fb0ad8216f97127bedef163a45886b43c62deac5e5b0f5e628e234220c8db"; md5 = ""; - md5name = "6b00e1ed8194e6072be4441025d1b888e39365727ed5b23e0e8c92c4009d1ec4-libstaroffice-0.0.6.tar.xz"; + md5name = "f94fb0ad8216f97127bedef163a45886b43c62deac5e5b0f5e628e234220c8db-libstaroffice-0.0.7.tar.xz"; } { name = "swingExSrc.zip"; - url = "http://dev-www.libreoffice.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"; + url = "https://dev-www.libreoffice.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"; sha256 = "64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1"; md5 = "35c94d2df8893241173de1d16b6034c0"; md5name = "35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"; } { name = "twaindsm_2.4.1.orig.tar.gz"; - url = "http://dev-www.libreoffice.org/src/twaindsm_2.4.1.orig.tar.gz"; + url = "https://dev-www.libreoffice.org/src/twaindsm_2.4.1.orig.tar.gz"; sha256 = "82c818be771f242388457aa8c807e4b52aa84dc22b21c6c56184a6b4cbb085e6"; md5 = ""; md5name = "82c818be771f242388457aa8c807e4b52aa84dc22b21c6c56184a6b4cbb085e6-twaindsm_2.4.1.orig.tar.gz"; } { name = "ucpp-1.3.2.tar.gz"; - url = "http://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz"; + url = "https://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz"; sha256 = "983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776"; md5 = "0168229624cfac409e766913506961a8"; md5name = "0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz"; } { name = "libvisio-0.1.7.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libvisio-0.1.7.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libvisio-0.1.7.tar.xz"; sha256 = "8faf8df870cb27b09a787a1959d6c646faa44d0d8ab151883df408b7166bea4c"; md5 = ""; md5name = "8faf8df870cb27b09a787a1959d6c646faa44d0d8ab151883df408b7166bea4c-libvisio-0.1.7.tar.xz"; } { name = "libwpd-0.10.3.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libwpd-0.10.3.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libwpd-0.10.3.tar.xz"; sha256 = "2465b0b662fdc5d4e3bebcdc9a79027713fb629ca2bff04a3c9251fdec42dd09"; md5 = ""; md5name = "2465b0b662fdc5d4e3bebcdc9a79027713fb629ca2bff04a3c9251fdec42dd09-libwpd-0.10.3.tar.xz"; } { name = "libwpg-0.3.3.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libwpg-0.3.3.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libwpg-0.3.3.tar.xz"; sha256 = "99b3f7f8832385748582ab8130fbb9e5607bd5179bebf9751ac1d51a53099d1c"; md5 = ""; md5name = "99b3f7f8832385748582ab8130fbb9e5607bd5179bebf9751ac1d51a53099d1c-libwpg-0.3.3.tar.xz"; } { - name = "libwps-0.4.10.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libwps-0.4.10.tar.xz"; - sha256 = "1421e034286a9f96d3168a1c54ea570ee7aa008ca07b89de005ad5ce49fb29ca"; + name = "libwps-0.4.11.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libwps-0.4.11.tar.xz"; + sha256 = "a8fdaabc28654a975fa78c81873ac503ba18f0d1cdbb942f470a21d29284b4d1"; md5 = ""; - md5name = "1421e034286a9f96d3168a1c54ea570ee7aa008ca07b89de005ad5ce49fb29ca-libwps-0.4.10.tar.xz"; + md5name = "a8fdaabc28654a975fa78c81873ac503ba18f0d1cdbb942f470a21d29284b4d1-libwps-0.4.11.tar.xz"; } { name = "xsltml_2.1.2.zip"; - url = "http://dev-www.libreoffice.org/src/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip"; + url = "https://dev-www.libreoffice.org/src/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip"; sha256 = "75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870"; md5 = "a7983f859eafb2677d7ff386a023bc40"; md5name = "a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip"; } { name = "zlib-1.2.11.tar.xz"; - url = "http://dev-www.libreoffice.org/src/zlib-1.2.11.tar.xz"; + url = "https://dev-www.libreoffice.org/src/zlib-1.2.11.tar.xz"; sha256 = "4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066"; md5 = ""; md5name = "4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066-zlib-1.2.11.tar.xz"; } { name = "libzmf-0.0.2.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libzmf-0.0.2.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libzmf-0.0.2.tar.xz"; sha256 = "27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22"; md5 = ""; md5name = "27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22-libzmf-0.0.2.tar.xz"; diff --git a/pkgs/applications/office/libreoffice/src-still/override.nix b/pkgs/applications/office/libreoffice/src-still/override.nix index 50812d0efb948..0141b74c38903 100644 --- a/pkgs/applications/office/libreoffice/src-still/override.nix +++ b/pkgs/applications/office/libreoffice/src-still/override.nix @@ -1,19 +1,10 @@ -{ lib, kdeIntegration, fetchpatch, ... }: +{ lib, kdeIntegration, ... }: attrs: { - patches = attrs.patches or [ ] ++ [ - (fetchpatch { - url = "https://git.pld-linux.org/gitweb.cgi?p=packages/libreoffice.git;a=blob_plain;f=poppler-0.86.patch;h=76b8356d5f22ef537a83b0f9b0debab591f152fe;hb=a2737a61353e305a9ee69640fb20d4582c218008"; - name = "poppler-0.86.patch"; - sha256 = "0q6k4l8imgp8ailcv0qx5l83afyw44hah24fi7gjrm9xgv5sbb8j"; - }) - ]; postConfigure = attrs.postConfigure + '' - sed -e '/CPPUNIT_TEST(Import_Export_Import);/d' -i './sw/qa/extras/inc/swmodeltestbase.hxx' + sed -e '/CPPUNIT_TEST(Import_Export_Import);/d' -i './sw/qa/inc/swmodeltestbase.hxx' ''; - configureFlags = lib.remove "--without-system-qrcodegen" - (attrs.configureFlags ++ [ - (lib.enableFeature kdeIntegration "kde5") - ]); - meta = attrs.meta // { description = "Comprehensive, professional-quality productivity suite (Still/Stable release)"; }; + configureFlags = attrs.configureFlags ++ [ + (lib.enableFeature kdeIntegration "kf5") + ]; } diff --git a/pkgs/applications/office/libreoffice/src-still/primary.nix b/pkgs/applications/office/libreoffice/src-still/primary.nix index 36deae53670a7..c9b1826471145 100644 --- a/pkgs/applications/office/libreoffice/src-still/primary.nix +++ b/pkgs/applications/office/libreoffice/src-still/primary.nix @@ -6,9 +6,9 @@ rec { inherit sha256; }; - major = "6"; - minor = "3"; - patch = "5"; + major = "7"; + minor = "0"; + patch = "4"; tweak = "2"; subdir = "${major}.${minor}.${patch}"; @@ -17,13 +17,13 @@ rec { src = fetchurl { url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "0jnayv1i0iq1gpf3q3z9nfq6jid77d0c76675lkqb3gi07f63nzz"; + sha256 = "1g9akxvm7fh6lnprnc3g184qdy8gbinhb4rb60gjpw82ip6d5acz"; }; # FIXME rename translations = fetchSrc { name = "translations"; - sha256 = "01g09bbn1ixrsfj4l0x6x8p06dz9hnlrhnr3f3xb42drmi9ipvjv"; + sha256 = "1v3kpk56fm783d5wihx41jqidpclizkfxrg4n0pq95d79hdiljsl"; }; # the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from @@ -31,6 +31,6 @@ rec { help = fetchSrc { name = "help"; - sha256 = "1p38wlclv6cbjpkkq7n2mjpxy84pxi4vxc9s5kjp4dm63zzxafd6"; + sha256 = "1np9f799ww12kggl5az6piv5fi9rf737il5a5r47r4wl2li56qqb"; }; } diff --git a/pkgs/applications/version-management/git-and-tools/delta/default.nix b/pkgs/applications/version-management/git-and-tools/delta/default.nix index 465de2d1d2be8..4b77853746942 100644 --- a/pkgs/applications/version-management/git-and-tools/delta/default.nix +++ b/pkgs/applications/version-management/git-and-tools/delta/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "delta"; - version = "0.5.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "dandavison"; repo = pname; rev = version; - sha256 = "17cmwkha25hwsvnjcp388zd9kwacfq7adjp0sjw59y0vyr1maf22"; + sha256 = "sha256-cEVYU7vMgVxVIKztL6LHcvQjrNRRMrB5XMP/7gPCr5A="; }; - cargoSha256 = "1bji818cmkl0286a4qcnfiwibnqd5q5fvzmzgk5cabrdwaag2ia5"; + cargoSha256 = "sha256-iD3Cr1vo0FNyWvAN5m6ND+8sGyekgbkYmIxGTJkPEYE="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix b/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix index 376568324b786..f28d49702bce4 100644 --- a/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix @@ -23,6 +23,6 @@ rustPlatform.buildRustPackage rec { description = "Native cross platform full feature terminal based sequence editor for git interactive rebase"; changelog = "https://github.com/MitMaro/git-interactive-rebase-tool/releases/tag/${version}"; license = licenses.mit; - maintainers = with maintainers; [ masaeedu zowoq ]; + maintainers = with maintainers; [ masaeedu SuperSandro2000 zowoq ]; }; } diff --git a/pkgs/applications/window-managers/labwc/default.nix b/pkgs/applications/window-managers/labwc/default.nix new file mode 100644 index 0000000000000..3ebab2f62bf4d --- /dev/null +++ b/pkgs/applications/window-managers/labwc/default.nix @@ -0,0 +1,57 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, meson +, ninja +, cairo +, glib +, libinput +, libxml2 +, pandoc +, pango +, wayland +, wayland-protocols +, wlroots +, libxcb +, libxkbcommon +, xwayland +}: + +stdenv.mkDerivation rec { + pname = "labwc"; + version = "unstable-2021-01-12"; + + src = fetchFromGitHub { + owner = "johanmalm"; + repo = pname; + rev = "2a7086d9f7367d4a81bce58a6f7fc6614bbfbdb3"; + sha256 = "ECwEbWkCjktNNtbLSCflOVlEyxkg4XTfRevq7+qQ2IA="; + }; + + nativeBuildInputs = [ pkg-config meson ninja pandoc ]; + buildInputs = [ + cairo + glib + libinput + libxml2 + pango + wayland + wayland-protocols + wlroots + libxcb + libxkbcommon + xwayland + ]; + + mesonFlags = [ "-Dxwayland=enabled" ]; + + meta = with lib; { + homepage = "https://github.com/johanmalm/labwc"; + description = "Openbox alternative for Wayland"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.unix; + }; +} +# TODO: report a SIGSEGV when labwc starts inside a started Wayland window diff --git a/pkgs/build-support/fetchzip/default.nix b/pkgs/build-support/fetchzip/default.nix index a1744b48deb9f..b00983772e4ba 100644 --- a/pkgs/build-support/fetchzip/default.nix +++ b/pkgs/build-support/fetchzip/default.nix @@ -45,18 +45,13 @@ '' else '' mv "$unpackDir" "$out" '') - + extraPostFetch - # Remove write permissions for files unpacked with write bits set + + '' + ${extraPostFetch} + '' + # Remove non-owner write permissions # Fixes https://github.com/NixOS/nixpkgs/issues/38649 - # - # However, we should (for the moment) retain write permission on the directory - # itself, to avoid tickling https://github.com/NixOS/nix/issues/4295 in - # single-user Nix installations. This is because in sandbox mode we'll try to - # move the path, and if we don't have write permissions on the directory, - # then we can't update the ".." entry. + '' - chmod -R a-w "$out" - chmod u+w "$out" + chmod 755 "$out" ''; } // removeAttrs args [ "stripRoot" "extraPostFetch" ])).overrideAttrs (x: { # Hackety-hack: we actually need unzip hooks, too diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix index 70224aaa83632..a75b2c1b65dad 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 = "20201218"; + version = "20210202"; src = fetchurl { url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz"; - sha256 = "sha256-APKuXWtnpF1r/q2MXddaDeBnBigx4hwMevPwx5uNq3k="; + sha256 = "sha256-C7Vq7d+Uos9IhTwOgsrK64c9mMGVkNgfvOrbBqORsRs="; }; nativeBuildInputs = [ osinfo-db-tools gettext libxml2 ]; diff --git a/pkgs/development/compilers/ghc/8.10.1.nix b/pkgs/development/compilers/ghc/8.10.1.nix index 661dd5cb0026e..83604630545e3 100644 --- a/pkgs/development/compilers/ghc/8.10.1.nix +++ b/pkgs/development/compilers/ghc/8.10.1.nix @@ -116,6 +116,16 @@ stdenv.mkDerivation (rec { outputs = [ "out" "doc" ]; + patches = [ + # See upstream patch at + # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/4885. Since we build + # from source distributions, the auto-generated configure script needs to be + # patched as well, therefore we use an in-tree patch instead of pulling the + # upstream patch. Don't forget to check backport status of the upstream patch + # when adding new GHC releases in nixpkgs. + ./respect-ar-path.patch + ]; + postPatch = "patchShebangs ."; # GHC is a bit confused on its cross terminology. diff --git a/pkgs/development/compilers/ghc/8.10.2.nix b/pkgs/development/compilers/ghc/8.10.2.nix index 6e194b68faa26..a42dfce6468af 100644 --- a/pkgs/development/compilers/ghc/8.10.2.nix +++ b/pkgs/development/compilers/ghc/8.10.2.nix @@ -107,8 +107,16 @@ stdenv.mkDerivation (rec { outputs = [ "out" "doc" ]; - # https://gitlab.haskell.org/ghc/ghc/-/issues/18549 patches = [ + # See upstream patch at + # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/4885. Since we build + # from source distributions, the auto-generated configure script needs to be + # patched as well, therefore we use an in-tree patch instead of pulling the + # upstream patch. Don't forget to check backport status of the upstream patch + # when adding new GHC releases in nixpkgs. + ./respect-ar-path.patch + + # https://gitlab.haskell.org/ghc/ghc/-/issues/18549 ./issue-18549.patch ] ++ lib.optionals stdenv.isDarwin [ # Make Block.h compile with c++ compilers. Remove with the next release diff --git a/pkgs/development/compilers/ghc/8.10.3.nix b/pkgs/development/compilers/ghc/8.10.3.nix index 582817cca070b..fe160259f2b31 100644 --- a/pkgs/development/compilers/ghc/8.10.3.nix +++ b/pkgs/development/compilers/ghc/8.10.3.nix @@ -107,7 +107,15 @@ stdenv.mkDerivation (rec { outputs = [ "out" "doc" ]; - patches = lib.optionals stdenv.isDarwin [ + patches = [ + # See upstream patch at + # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/4885. Since we build + # from source distributions, the auto-generated configure script needs to be + # patched as well, therefore we use an in-tree patch instead of pulling the + # upstream patch. Don't forget to check backport status of the upstream patch + # when adding new GHC releases in nixpkgs. + ./respect-ar-path.patch + ] ++ lib.optionals stdenv.isDarwin [ # Make Block.h compile with c++ compilers. Remove with the next release (fetchpatch { url = "https://gitlab.haskell.org/ghc/ghc/-/commit/97d0b0a367e4c6a52a17c3299439ac7de129da24.patch"; diff --git a/pkgs/development/compilers/ghc/8.6.5.nix b/pkgs/development/compilers/ghc/8.6.5.nix index 219ace5a91640..8237f27241e70 100644 --- a/pkgs/development/compilers/ghc/8.6.5.nix +++ b/pkgs/development/compilers/ghc/8.6.5.nix @@ -110,6 +110,14 @@ stdenv.mkDerivation (rec { outputs = [ "out" "doc" ]; patches = [ + # See upstream patch at + # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/4885. Since we build + # from source distributions, the auto-generated configure script needs to be + # patched as well, therefore we use an in-tree patch instead of pulling the + # upstream patch. Don't forget to check backport status of the upstream patch + # when adding new GHC releases in nixpkgs. + ./respect-ar-path.patch + (fetchpatch { # https://phabricator.haskell.org/D5123 url = "https://gitlab.haskell.org/ghc/ghc/-/commit/13ff0b7ced097286e0d7b054f050871effe07f86.diff"; name = "D5123.diff"; diff --git a/pkgs/development/compilers/ghc/8.8.2.nix b/pkgs/development/compilers/ghc/8.8.2.nix index 94553e56a8113..144e46459759e 100644 --- a/pkgs/development/compilers/ghc/8.8.2.nix +++ b/pkgs/development/compilers/ghc/8.8.2.nix @@ -111,6 +111,16 @@ stdenv.mkDerivation (rec { outputs = [ "out" "doc" ]; + patches = [ + # See upstream patch at + # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/4885. Since we build + # from source distributions, the auto-generated configure script needs to be + # patched as well, therefore we use an in-tree patch instead of pulling the + # upstream patch. Don't forget to check backport status of the upstream patch + # when adding new GHC releases in nixpkgs. + ./respect-ar-path.patch + ]; + postPatch = "patchShebangs ."; # GHC is a bit confused on its cross terminology. diff --git a/pkgs/development/compilers/ghc/8.8.3.nix b/pkgs/development/compilers/ghc/8.8.3.nix index ca4dc35ccdc47..9e99207d9aaa7 100644 --- a/pkgs/development/compilers/ghc/8.8.3.nix +++ b/pkgs/development/compilers/ghc/8.8.3.nix @@ -116,6 +116,16 @@ stdenv.mkDerivation (rec { outputs = [ "out" "doc" ]; + patches = [ + # See upstream patch at + # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/4885. Since we build + # from source distributions, the auto-generated configure script needs to be + # patched as well, therefore we use an in-tree patch instead of pulling the + # upstream patch. Don't forget to check backport status of the upstream patch + # when adding new GHC releases in nixpkgs. + ./respect-ar-path.patch + ]; + postPatch = "patchShebangs ."; # GHC is a bit confused on its cross terminology. diff --git a/pkgs/development/compilers/ghc/8.8.4.nix b/pkgs/development/compilers/ghc/8.8.4.nix index ab5f2c12e230a..9bef190ad1c38 100644 --- a/pkgs/development/compilers/ghc/8.8.4.nix +++ b/pkgs/development/compilers/ghc/8.8.4.nix @@ -116,6 +116,16 @@ stdenv.mkDerivation (rec { outputs = [ "out" "doc" ]; + patches = [ + # See upstream patch at + # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/4885. Since we build + # from source distributions, the auto-generated configure script needs to be + # patched as well, therefore we use an in-tree patch instead of pulling the + # upstream patch. Don't forget to check backport status of the upstream patch + # when adding new GHC releases in nixpkgs. + ./respect-ar-path.patch + ]; + postPatch = "patchShebangs ."; # GHC is a bit confused on its cross terminology. diff --git a/pkgs/development/compilers/ghc/9.0.1.nix b/pkgs/development/compilers/ghc/9.0.1.nix index 39abe9c760e38..83f3534d3e4a6 100644 --- a/pkgs/development/compilers/ghc/9.0.1.nix +++ b/pkgs/development/compilers/ghc/9.0.1.nix @@ -96,12 +96,12 @@ let in stdenv.mkDerivation (rec { - version = "9.0.0.20201227"; + version = "9.0.1"; name = "${targetPrefix}ghc-${version}"; src = fetchurl { - url = "https://downloads.haskell.org/ghc/9.0.1-rc1/ghc-${version}-src.tar.xz"; - sha256 = "1kg227fzg9qq2p7r8xqr99vvnx7ind4clxkydikyzf3vqvaacjfy"; + url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz"; + sha256 = "1y9mi9bq76z04hmggavrn8jwi1gx92bm3zhx6z69ypq6wha068x5"; }; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/ghc/respect-ar-path.patch b/pkgs/development/compilers/ghc/respect-ar-path.patch new file mode 100644 index 0000000000000..a08a802c18a0a --- /dev/null +++ b/pkgs/development/compilers/ghc/respect-ar-path.patch @@ -0,0 +1,25 @@ +diff -urd a/aclocal.m4 b/aclocal.m4 +--- a/aclocal.m4 ++++ b/aclocal.m4 +@@ -1199,7 +1199,8 @@ + # thinks that target == host so it never checks the unqualified + # tools for Windows. See #14274. + AC_DEFUN([FP_PROG_AR], +-[if test -z "$fp_prog_ar"; then ++[AC_SUBST(fp_prog_ar,$AR) ++if test -z "$fp_prog_ar"; then + if test "$HostOS" = "mingw32" + then + AC_PATH_PROG([fp_prog_ar], [ar]) +diff -urd a/configure b/configure +--- a/configure ++++ b/configure +@@ -10744,6 +10744,8 @@ + test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + + ++fp_prog_ar=$AR ++ + if test -z "$fp_prog_ar"; then + if test "$HostOS" = "mingw32" + then diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 1144ee0f82349..7c57153b2a478 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1405,28 +1405,20 @@ self: super: { # quickcheck-instances is only used in the tests of binary-instances. binary-instances = dontCheck super.binary-instances; - # tons of overrides for bleeding edge versions for ghcide and hls - # overriding aeson on all of them to prevent double compilations - # this shouldn‘t break anything because nearly all their reverse deps are - # in this list or marked as broken anyways # 2020-11-19: Checks nearly fixed, but still disabled because of flaky tests: # https://github.com/haskell/haskell-language-server/issues/610 # https://github.com/haskell/haskell-language-server/issues/611 - haskell-language-server = dontCheck (super.haskell-language-server.override { - lsp-test = dontCheck self.lsp-test; - fourmolu = self.fourmolu_0_3_0_0; - }); + haskell-language-server = dontCheck super.haskell-language-server; + # 2021-01-20 # apply-refact 0.9.0.0 get's a build error with hls-hlint-plugin 0.8.0 # https://github.com/haskell/haskell-language-server/issues/1240 apply-refact = super.apply-refact_0_8_2_1; - fourmolu = dontCheck super.fourmolu; - # 1. test requires internet # 2. dependency shake-bench hasn't been published yet so we also need unmarkBroken and doDistribute - ghcide = doDistribute (unmarkBroken (dontCheck (super.ghcide_0_7_0_0.override { lsp-test = dontCheck self.lsp-test; }))); - refinery = doDistribute super.refinery_0_3_0_0; + ghcide = doDistribute (unmarkBroken (dontCheck super.ghcide)); + data-tree-print = doJailbreak super.data-tree-print; # 2020-11-15: aeson 1.5.4.1 needs to new quickcheck-instances for testing @@ -1527,7 +1519,7 @@ self: super: { # 2020-12-05: http-client is fixed on too old version essence-of-live-coding-warp = super.essence-of-live-coding-warp.override { - http-client = self.http-client_0_7_4; + http-client = self.http-client_0_7_5; }; # 2020-12-06: Restrictive upper bounds w.r.t. pandoc-types (https://github.com/owickstrom/pandoc-include-code/issues/27) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index 27bf04b914e79..6831c7c327d76 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -88,5 +88,6 @@ self: super: { # ghc versions prior to 8.8.x needs additional dependency to compile successfully. ghc-lib-parser-ex = addBuildDepend super.ghc-lib-parser-ex self.ghc-lib-parser; + hls-hlint-plugin = addBuildDepend super.hls-hlint-plugin self.ghc-lib; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index 2a0a7810f72a2..ad6c17cbd103d 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -94,4 +94,9 @@ self: super: { # This became a core library in ghc 8.10., so we don‘t have an "exception" attribute anymore. exceptions = super.exceptions_0_10_4; + + # Older compilers need the latest ghc-lib to build this package. + hls-hlint-plugin = addBuildDepend super.hls-hlint-plugin self.ghc-lib; + + mmorph = super.mmorph_1_1_3; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index d1099c56b2c84..c23d875dea385 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -123,4 +123,8 @@ self: super: { # ghc versions which don‘t match the ghc-lib-parser-ex version need the # additional dependency to compile successfully. ghc-lib-parser-ex = addBuildDepend super.ghc-lib-parser-ex self.ghc-lib-parser; + + # Older compilers need the latest ghc-lib to build this package. + hls-hlint-plugin = addBuildDepend super.hls-hlint-plugin self.ghc-lib; + } diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix index d9efb1ab9c32a..7e8546c7c7e63 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -100,10 +100,6 @@ self: super: { url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/regex-base-0.94.0.0.patch"; sha256 = "0k5fglbl7nnhn8400c4cpnflxcbj9p3xi5prl9jfmszr31jwdy5d"; }); - syb = appendPatch (dontCheck super.syb) (pkgs.fetchpatch { - url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/syb-0.7.1.patch"; - sha256 = "1407r8xv6bfnmpbw7glfh4smi76a2fc9pkq300c3d9f575708zqr"; - }); # The test suite depends on ChasingBottoms, which is broken with ghc-9.0.x. unordered-containers = dontCheck super.unordered-containers; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index fa18d7507db1a..3dcadefccc3c8 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -73,10 +73,12 @@ default-package-overrides: # gi-gdkx11-4.x requires gtk-4.x, which is still under development and # not yet available in Nixpkgs - gi-gdkx11 < 4 - # haskell-language-server 0.5.0.0 doesn't accept newer versions - - fourmolu ==0.2.* - - refinery ==0.2.* - # Stackage Nightly 2021-01-29 + - hls-plugin-api == 0.6.0.0 # Needed for hls 0.8.0 + - hls-eval-plugin == 0.1.0.0 # Needed for hls 0.8.0 + - hls-hlint-plugin == 0.1.0.0 # Needed for hls 0.8.0 + - ghcide == 0.7.0.0 # Needed for hls 0.8.0 + + # Stackage Nightly 2021-02-02 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Angle ==1.0 @@ -215,19 +217,19 @@ default-package-overrides: - ansi-terminal ==0.10.3 - ansi-wl-pprint ==0.6.9 - ANum ==0.2.0.2 - - ap-normalize ==0.1.0.0 - apecs ==0.9.2 - apecs-gloss ==0.2.4 - apecs-physics ==0.4.5 - api-field-json-th ==0.1.0.2 - api-maker ==0.1.0.0 - - app-settings ==0.2.0.12 + - ap-normalize ==0.1.0.0 - appar ==0.1.8 - appendmap ==0.1.5 - apply-refact ==0.9.0.0 - apportionment ==0.0.0.3 - approximate ==0.3.2 - approximate-equality ==1.1.0.2 + - app-settings ==0.2.0.12 - arbor-lru-cache ==0.1.1.1 - arbor-postgres ==0.0.5 - arithmoi ==0.11.0.1 @@ -236,12 +238,12 @@ default-package-overrides: - ascii ==1.0.1.0 - ascii-case ==1.0.0.2 - ascii-char ==1.0.0.6 + - asciidiagram ==1.3.3.3 - ascii-group ==1.0.0.2 - ascii-predicates ==1.0.0.2 - ascii-progress ==0.3.3.0 - ascii-superset ==1.0.1.0 - ascii-th ==1.0.0.2 - - asciidiagram ==1.3.3.3 - asif ==6.0.4 - asn1-encoding ==0.9.6 - asn1-parse ==0.9.5 @@ -269,8 +271,8 @@ default-package-overrides: - authenticate ==1.3.5 - authenticate-oauth ==1.6.0.1 - auto ==0.4.3.1 - - auto-update ==0.1.6 - autoexporter ==1.1.19 + - auto-update ==0.1.6 - avers ==0.0.17.1 - avro ==0.5.2.0 - aws-cloudfront-signed-cookies ==0.2.0.6 @@ -278,11 +280,6 @@ default-package-overrides: - backtracking ==0.1.0 - bank-holidays-england ==0.2.0.6 - barbies ==2.0.2.0 - - base-compat ==0.11.2 - - base-compat-batteries ==0.11.2 - - base-orphans ==0.8.4 - - base-prelude ==1.4 - - base-unicode-symbols ==0.2.4.2 - base16 ==0.3.0.1 - base16-bytestring ==0.1.1.7 - base16-lens ==0.1.3.0 @@ -296,7 +293,12 @@ default-package-overrides: - base64-bytestring-type ==1.0.1 - base64-lens ==0.3.0 - base64-string ==0.2 + - base-compat ==0.11.2 + - base-compat-batteries ==0.11.2 - basement ==0.0.11 + - base-orphans ==0.8.4 + - base-prelude ==1.4 + - base-unicode-symbols ==0.2.4.2 - basic-prelude ==0.7.0 - bazel-runfiles ==0.12 - bbdb ==0.8 @@ -309,8 +311,8 @@ default-package-overrides: - bibtex ==0.1.0.6 - bifunctors ==5.5.10 - bimap ==0.4.0 - - bimap-server ==0.1.0.1 - bimaps ==0.1.0.2 + - bimap-server ==0.1.0.1 - bin ==0.1 - binary-conduit ==1.3.1 - binary-ext ==2.0.4 @@ -330,8 +332,8 @@ default-package-overrides: - bins ==0.1.2.0 - bitarray ==0.0.1.1 - bits ==0.5.2 - - bits-extra ==0.0.2.0 - bitset-word8 ==0.1.1.2 + - bits-extra ==0.0.2.0 - bitvec ==1.0.3.0 - bitwise-enum ==1.0.0.3 - blake2 ==0.3.0 @@ -357,8 +359,8 @@ default-package-overrides: - boring ==0.1.3 - both ==0.1.1.1 - bound ==2.0.2 - - bounded-queue ==1.0.0 - BoundedChan ==1.0.3.0 + - bounded-queue ==1.0.0 - boundingboxes ==0.2.3 - bower-json ==1.0.0.1 - boxes ==0.1.5 @@ -376,10 +378,10 @@ default-package-overrides: - butcher ==1.3.3.2 - bv ==0.5 - bv-little ==1.1.1 - - byte-count-reader ==0.10.1.2 - - byte-order ==0.1.2.0 - byteable ==0.1.1 + - byte-count-reader ==0.10.1.2 - bytedump ==1.0 + - byte-order ==0.1.2.0 - byteorder ==1.0.4 - bytes ==0.17 - byteset ==0.1.1.0 @@ -395,7 +397,6 @@ default-package-overrides: - bzlib-conduit ==0.3.0.2 - c14n ==0.1.0.1 - c2hs ==0.28.7 - - ca-province-codes ==1.0.0.0 - cabal-debian ==5.1 - cabal-doctest ==1.0.8 - cabal-file ==0.1.1 @@ -407,12 +408,13 @@ default-package-overrides: - calendar-recycling ==0.0.0.1 - call-stack ==0.2.0 - can-i-haz ==0.3.1.0 + - ca-province-codes ==1.0.0.0 - cardano-coin-selection ==1.0.1 - carray ==0.1.6.8 - casa-client ==0.0.1 - casa-types ==0.0.1 - - case-insensitive ==1.2.1.0 - cased ==0.1.0.0 + - case-insensitive ==1.2.1.0 - cases ==0.1.4 - casing ==0.1.4.1 - cassava ==0.5.2.0 @@ -473,12 +475,12 @@ default-package-overrides: - cmark-gfm ==0.2.2 - cmark-lucid ==0.1.0.0 - cmdargs ==0.10.20 + - codec-beam ==0.2.0 + - codec-rpm ==0.2.2 + - code-page ==0.2 - co-log ==0.4.0.1 - co-log-concurrent ==0.5.0.0 - co-log-core ==0.2.1.1 - - code-page ==0.2 - - codec-beam ==0.2.0 - - codec-rpm ==0.2.2 - Color ==0.3.0 - colorful-monoids ==0.2.1.3 - colorize-haskell ==1.0.1 @@ -524,8 +526,8 @@ default-package-overrides: - conferer-aeson ==1.0.0.0 - conferer-hspec ==1.0.0.0 - conferer-warp ==1.0.0.0 - - config-ini ==0.2.4.0 - ConfigFile ==1.1.4 + - config-ini ==0.2.4.0 - configurator ==0.3.0.0 - configurator-export ==0.1.0.1 - configurator-pg ==0.2.5 @@ -533,8 +535,8 @@ default-package-overrides: - connection-pool ==0.2.2 - console-style ==0.0.2.1 - constraint ==0.1.4.0 - - constraint-tuples ==0.1.2 - constraints ==0.12 + - constraint-tuples ==0.1.2 - construct ==0.3 - contravariant ==1.5.3 - contravariant-extras ==0.3.5.2 @@ -562,13 +564,8 @@ default-package-overrides: - cron ==0.7.0 - crypto-api ==0.13.3 - crypto-cipher-types ==0.0.9 - - crypto-enigma ==0.1.1.6 - - crypto-numbers ==0.2.7 - - crypto-pubkey ==0.2.8 - - crypto-pubkey-types ==0.4.3 - - crypto-random ==0.0.9 - - crypto-random-api ==0.2.0 - cryptocompare ==0.1.2 + - crypto-enigma ==0.1.1.6 - cryptohash ==0.11.9 - cryptohash-cryptoapi ==0.1.4 - cryptohash-md5 ==0.11.100.1 @@ -577,6 +574,11 @@ default-package-overrides: - cryptonite ==0.27 - cryptonite-conduit ==0.2.2 - cryptonite-openssl ==0.7 + - crypto-numbers ==0.2.7 + - crypto-pubkey ==0.2.8 + - crypto-pubkey-types ==0.4.3 + - crypto-random ==0.0.9 + - crypto-random-api ==0.2.0 - csp ==1.4.0 - css-syntax ==0.1.0.0 - css-text ==0.1.3.0 @@ -613,6 +615,7 @@ default-package-overrides: - data-default-instances-dlist ==0.0.1 - data-default-instances-old-locale ==0.0.1 - data-diverse ==4.7.0.0 + - datadog ==0.2.5.0 - data-dword ==0.3.2 - data-endian ==0.1.1 - data-fix ==0.3.0 @@ -631,7 +634,6 @@ default-package-overrides: - data-reify ==0.6.3 - data-serializer ==0.3.4.1 - data-textual ==0.3.0.3 - - datadog ==0.2.5.0 - dataurl ==0.1.0.0 - DAV ==1.3.4 - DBFunctor ==0.1.1.1 @@ -650,8 +652,8 @@ default-package-overrides: - dense-linear-algebra ==0.1.0.0 - depq ==0.4.1.0 - deque ==0.4.3 - - derive-topdown ==0.0.2.2 - deriveJsonNoPrefix ==0.1.0.1 + - derive-topdown ==0.0.2.2 - deriving-aeson ==0.2.6 - deriving-compat ==0.5.10 - derulo ==1.0.9 @@ -660,17 +662,17 @@ default-package-overrides: - dhall-json ==1.7.5 - dhall-lsp-server ==1.0.13 - dhall-yaml ==1.2.5 - - di-core ==1.0.4 - - di-monad ==1.3.1 - diagrams-solve ==0.1.2 - dialogflow-fulfillment ==0.1.1.3 + - di-core ==1.0.4 - dictionary-sharing ==0.1.0.0 - Diff ==0.4.0 - digest ==0.0.1.2 - digits ==0.3.1 - dimensional ==1.3 - - direct-sqlite ==2.3.26 + - di-monad ==1.3.1 - directory-tree ==0.12.1 + - direct-sqlite ==2.3.26 - dirichlet ==0.1.0.2 - discount ==0.1.1 - disk-free-space ==0.1.0.1 @@ -682,8 +684,6 @@ default-package-overrides: - dlist-instances ==0.1.1.1 - dlist-nonempty ==0.1.1 - dns ==4.0.1 - - do-list ==1.0.1 - - do-notation ==0.1.0.2 - dockerfile ==0.2.0 - doclayout ==0.3 - doctemplates ==0.9 @@ -692,6 +692,8 @@ default-package-overrides: - doctest-exitcode-stdio ==0.0 - doctest-lib ==0.1 - doldol ==0.4.1.2 + - do-list ==1.0.1 + - do-notation ==0.1.0.2 - dot ==0.3 - dotenv ==0.8.0.7 - dotgen ==0.4.3 @@ -731,10 +733,10 @@ default-package-overrides: - elerea ==2.9.0 - elf ==0.30 - eliminators ==0.7 + - elm2nix ==0.2.1 - elm-bridge ==0.6.1 - elm-core-sources ==1.0.0 - elm-export ==0.6.0.1 - - elm2nix ==0.2.1 - elynx ==0.5.0.1 - elynx-markov ==0.5.0.1 - elynx-nexus ==0.5.0.1 @@ -746,9 +748,9 @@ default-package-overrides: - enclosed-exceptions ==1.0.3 - ENIG ==0.0.1.0 - entropy ==0.4.1.6 - - enum-subset-generate ==0.1.0.0 - enummapset ==0.6.0.3 - enumset ==0.0.5 + - enum-subset-generate ==0.1.0.0 - envelope ==0.2.2.0 - envparse ==0.4.1 - envy ==2.1.0.0 @@ -770,25 +772,25 @@ default-package-overrides: - essence-of-live-coding-quickcheck ==0.2.4 - etc ==0.4.1.0 - eve ==0.1.9.0 - - event-list ==0.1.2 - eventful-core ==0.2.0 - eventful-test-helpers ==0.2.0 + - event-list ==0.1.2 - eventstore ==1.4.1 - every ==0.0.1 - exact-combinatorics ==0.2.0.9 - exact-pi ==0.5.0.1 - exception-hierarchy ==0.1.0.4 - exception-mtl ==0.4.0.1 + - exceptions ==0.10.4 - exception-transformers ==0.4.0.9 - exception-via ==0.1.0.0 - - exceptions ==0.10.4 - executable-path ==0.0.3.1 - exit-codes ==1.0.0 - exomizer ==1.0.0 - - exp-pairs ==0.2.1.0 - experimenter ==0.1.0.4 - expiring-cache-map ==0.0.6.1 - explicit-exception ==0.1.10 + - exp-pairs ==0.2.1.0 - express ==0.1.3 - extended-reals ==0.2.4.0 - extensible-effects ==5.0.0.1 @@ -815,10 +817,10 @@ default-package-overrides: - fgl ==5.7.0.3 - file-embed ==0.0.13.0 - file-embed-lzma ==0 - - file-modules ==0.1.2.4 - - file-path-th ==0.1.0.0 - filelock ==0.1.1.5 - filemanip ==0.3.6.3 + - file-modules ==0.1.2.4 + - file-path-th ==0.1.0.0 - filepattern ==0.1.2 - fileplow ==0.1.0.0 - filtrable ==0.1.4.0 @@ -848,9 +850,9 @@ default-package-overrides: - fn ==0.3.0.2 - focus ==1.0.2 - focuslist ==0.1.0.2 + - foldable1 ==0.1.0.0 - fold-debounce ==0.2.0.9 - fold-debounce-conduit ==0.2.0.5 - - foldable1 ==0.1.0.0 - foldl ==1.4.10 - folds ==0.7.5 - follow-file ==0.0.3 @@ -864,10 +866,10 @@ default-package-overrides: - foundation ==0.0.25 - free ==5.1.5 - free-categories ==0.2.0.2 - - free-vl ==0.1.4 - freenect ==1.2.1 - freer-simple ==1.2.1.1 - freetype2 ==0.2.0 + - free-vl ==0.1.4 - friendly-time ==0.4.1 - from-sum ==0.2.3.0 - frontmatter ==0.1.0.2 @@ -883,8 +885,8 @@ default-package-overrides: - fuzzcheck ==0.1.1 - fuzzy ==0.1.0.0 - fuzzy-dates ==0.1.1.2 - - fuzzy-time ==0.1.0.0 - fuzzyset ==0.2.0 + - fuzzy-time ==0.1.0.0 - gauge ==0.2.5 - gd ==3000.7.3 - gdp ==0.0.3.0 @@ -899,8 +901,8 @@ default-package-overrides: - generic-lens-core ==2.0.0.0 - generic-monoid ==0.1.0.1 - generic-optics ==2.0.0.0 - - generic-random ==1.3.0.1 - GenericPretty ==1.2.2 + - generic-random ==1.3.0.1 - generics-sop ==0.5.1.0 - generics-sop-lens ==0.2.0.1 - geniplate-mirror ==0.7.7 @@ -933,7 +935,10 @@ default-package-overrides: - ghc-check ==0.5.0.3 - ghc-core ==0.5.6 - ghc-events ==0.15.1 - - ghc-exactprint ==0.6.3.3 + - ghc-exactprint ==0.6.3.4 + - ghcid ==0.8.7 + - ghci-hexcalc ==0.1.1.0 + - ghcjs-codemirror ==0.0.0.2 - ghc-lib ==8.10.3.20201220 - ghc-lib-parser ==8.10.3.20201220 - ghc-lib-parser-ex ==8.10.0.17 @@ -948,9 +953,6 @@ default-package-overrides: - ghc-typelits-knownnat ==0.7.4 - ghc-typelits-natnormalise ==0.7.3 - ghc-typelits-presburger ==0.5.2.0 - - ghci-hexcalc ==0.1.1.0 - - ghcid ==0.8.7 - - ghcjs-codemirror ==0.0.0.2 - ghost-buster ==0.1.1.0 - gi-atk ==2.0.22 - gi-cairo ==1.0.24 @@ -968,10 +970,9 @@ default-package-overrides: - gi-gtk ==3.0.36 - gi-gtk-hs ==0.3.9 - gi-harfbuzz ==0.0.3 - - gi-pango ==1.0.23 - - gi-xlib ==2.0.9 - ginger ==0.10.1.0 - gingersnap ==0.3.1.0 + - gi-pango ==1.0.23 - githash ==0.1.5.0 - github ==0.26 - github-release ==1.3.5 @@ -980,6 +981,7 @@ default-package-overrides: - github-webhooks ==0.15.0 - gitlab-haskell ==0.2.5 - gitrev ==1.3.1 + - gi-xlib ==2.0.9 - gl ==0.9 - glabrous ==2.0.2 - GLFW-b ==3.3.0.0 @@ -994,11 +996,11 @@ default-package-overrides: - gothic ==0.1.5 - gpolyline ==0.1.0.1 - graph-core ==0.3.0.0 - - graph-wrapper ==0.2.6.0 - graphite ==0.10.0.1 - graphql-client ==1.1.0 - graphs ==0.7.1 - graphviz ==2999.20.1.0 + - graph-wrapper ==0.2.6.0 - gravatar ==0.8.0 - greskell ==1.2.0.0 - greskell-core ==0.1.3.5 @@ -1013,7 +1015,7 @@ default-package-overrides: - hackage-db ==2.1.0 - hackage-security ==0.6.0.1 - haddock-library ==1.9.0 - - hadolint ==1.20.0 + - hadolint ==1.21.0 - hadoop-streaming ==0.2.0.3 - hakyll-convert ==0.3.0.3 - half ==0.3.1 @@ -1068,7 +1070,7 @@ default-package-overrides: - hedgehog-fakedata ==0.0.1.3 - hedgehog-fn ==1.0 - hedgehog-quickcheck ==0.1.1 - - hedis ==0.14.1 + - hedis ==0.14.2 - hedn ==0.3.0.2 - here ==1.2.13 - heredoc ==0.2.0.0 @@ -1082,9 +1084,9 @@ default-package-overrides: - hgeometry ==0.11.0.0 - hgeometry-combinatorial ==0.11.0.0 - hgrev ==0.2.6 - - hi-file-parser ==0.1.0.0 - hidapi ==0.1.5 - hie-bios ==0.7.2 + - hi-file-parser ==0.1.0.0 - higher-leveldb ==0.6.0.0 - highlighting-kate ==0.6.4 - hinfo ==0.0.3.0 @@ -1123,16 +1125,15 @@ default-package-overrides: - hpc-lcov ==1.0.1 - hprotoc ==2.4.17 - hruby ==0.3.8 - - hs-bibutils ==6.10.0.0 - - hs-functors ==0.1.7.1 - - hs-GeoIP ==0.3 - - hs-php-session ==0.0.9.3 - hsass ==0.8.0 + - hs-bibutils ==6.10.0.0 - hsc2hs ==0.68.7 - hscolour ==1.24.4 - hsdns ==1.8 - hsebaysdk ==0.4.1.0 - hsemail ==2.2.1 + - hs-functors ==0.1.7.1 + - hs-GeoIP ==0.3 - hsini ==0.5.1.2 - hsinstall ==2.6 - HSlippyMap ==3.0.1 @@ -1166,6 +1167,7 @@ default-package-overrides: - hspec-tables ==0.0.1 - hspec-wai ==0.10.1 - hspec-wai-json ==0.10.1 + - hs-php-session ==0.0.9.3 - hsshellscript ==3.4.5 - HStringTemplate ==0.8.7 - HSvm ==0.1.1.3.22 @@ -1179,6 +1181,7 @@ default-package-overrides: - html-entities ==1.1.4.3 - html-entity-map ==0.1.0.0 - htoml ==1.0.0.3 + - http2 ==2.0.5 - HTTP ==4000.3.15 - http-api-data ==0.4.1.1 - http-client ==0.6.4.1 @@ -1190,14 +1193,13 @@ default-package-overrides: - http-date ==0.0.10 - http-directory ==0.1.8 - http-download ==0.2.0.0 + - httpd-shed ==0.4.1.1 - http-link-header ==1.0.3.1 - http-media ==0.8.0.0 - http-query ==0.1.0 - http-reverse-proxy ==0.6.0 - http-streams ==0.8.7.2 - http-types ==0.12.3 - - http2 ==2.0.5 - - httpd-shed ==0.4.1.1 - human-readable-duration ==0.2.1.4 - HUnit ==1.6.1.0 - HUnit-approx ==1.1.1.1 @@ -1210,6 +1212,7 @@ default-package-overrides: - hw-conduit-merges ==0.2.1.0 - hw-diagnostics ==0.0.1.0 - hw-dsv ==0.4.1.0 + - hweblib ==0.6.3 - hw-eliasfano ==0.1.2.0 - hw-excess ==0.2.3.0 - hw-fingertree ==0.1.2.0 @@ -1222,7 +1225,7 @@ default-package-overrides: - hw-json-simd ==0.1.1.0 - hw-json-simple-cursor ==0.1.1.0 - hw-json-standard-cursor ==0.2.3.1 - - hw-kafka-client ==4.0.2 + - hw-kafka-client ==4.0.3 - hw-mquery ==0.2.1.0 - hw-packed-vector ==0.2.1.0 - hw-parser ==0.1.1.0 @@ -1234,7 +1237,6 @@ default-package-overrides: - hw-string-parse ==0.0.0.4 - hw-succinct ==0.1.0.1 - hw-xml ==0.5.1.0 - - hweblib ==0.6.3 - hxt ==9.3.1.18 - hxt-charproperties ==9.4.0.0 - hxt-css ==0.1.0.3 @@ -1318,13 +1320,13 @@ default-package-overrides: - iso3166-country-codes ==0.20140203.8 - iso639 ==0.1.0.3 - iso8601-time ==0.1.5 - - it-has ==0.2.0.0 - iterable ==3.0 - - ix-shapable ==0.1.0 + - it-has ==0.2.0.0 - ixset-typed ==0.5 - ixset-typed-binary-instance ==0.1.0.2 - ixset-typed-conversions ==0.1.2.0 - ixset-typed-hashable-instance ==0.1.0.2 + - ix-shapable ==0.1.0 - jack ==0.7.1.4 - jalaali ==1.0.0.0 - jira-wiki-markup ==1.3.2 @@ -1335,9 +1337,9 @@ default-package-overrides: - js-flot ==0.8.3 - js-jquery ==3.3.1 - json-feed ==1.0.11 + - jsonpath ==0.2.0.0 - json-rpc ==1.0.3 - json-rpc-generic ==0.2.1.5 - - jsonpath ==0.2.0.0 - JuicyPixels ==3.3.5 - JuicyPixels-blurhash ==0.1.0.3 - JuicyPixels-extra ==0.4.1 @@ -1416,22 +1418,22 @@ default-package-overrides: - libyaml ==0.1.2 - LibZip ==1.0.1 - life-sync ==1.1.1.0 - - lift-generics ==0.2 - lifted-async ==0.10.1.2 - lifted-base ==0.2.3.12 + - lift-generics ==0.2 - line ==4.0.1 - - linear ==1.21.3 + - linear ==1.21.4 - linear-circuit ==0.1.0.2 - linenoise ==0.3.2 - linux-file-extents ==0.2.0.0 - linux-namespaces ==0.1.3.0 - liquid-fixpoint ==0.8.10.2 - List ==0.6.2 + - ListLike ==4.7.4 - list-predicate ==0.1.0.1 + - listsafe ==0.1.0.1 - list-singleton ==1.0.0.4 - list-t ==1.0.4 - - ListLike ==4.7.4 - - listsafe ==0.1.0.1 - ListTree ==0.2.3 - little-logger ==0.3.1 - little-rio ==0.2.2 @@ -1464,8 +1466,8 @@ default-package-overrides: - machines ==0.7.1 - magic ==1.1 - magico ==0.0.2.1 - - main-tester ==0.2.0.1 - mainland-pretty ==0.7.0.1 + - main-tester ==0.2.0.1 - makefile ==1.1.0.0 - managed ==1.0.8 - MapWith ==0.2.0.0 @@ -1477,9 +1479,9 @@ default-package-overrides: - massiv-persist ==0.1.0.0 - massiv-serialise ==0.1.0.0 - massiv-test ==0.1.6.1 + - mathexpr ==0.3.0.0 - math-extras ==0.1.1.0 - math-functions ==0.3.4.1 - - mathexpr ==0.3.0.0 - matplotlib ==0.7.5 - matrices ==0.5.0 - matrix ==0.3.6.1 @@ -1491,9 +1493,9 @@ default-package-overrides: - mbox-utility ==0.0.3.1 - mcmc ==0.4.0.0 - mcmc-types ==1.0.3 - - med-module ==0.1.2.1 - medea ==1.2.0 - median-stream ==0.7.0.0 + - med-module ==0.1.2.1 - megaparsec ==9.0.1 - megaparsec-tests ==9.0.1 - membrain ==0.0.0.2 @@ -1522,12 +1524,12 @@ default-package-overrides: - mime-mail ==0.5.0 - mime-mail-ses ==0.4.3 - mime-types ==0.1.0.9 - - min-max-pqueue ==0.1.0.2 - mini-egison ==1.0.0 - minimal-configuration ==0.1.4 - minimorph ==0.3.0.0 - minio-hs ==1.5.3 - miniutter ==0.5.1.1 + - min-max-pqueue ==0.1.0.2 - mintty ==0.1.2 - missing-foreign ==0.1.1 - MissingH ==1.4.3.0 @@ -1537,10 +1539,10 @@ default-package-overrides: - mmark ==0.0.7.2 - mmark-cli ==0.0.5.0 - mmark-ext ==0.2.1.2 - - mmorph ==1.1.3 + - mmorph ==1.1.4 - mnist-idx ==0.1.2.8 - - mock-time ==0.1.0 - mockery ==0.3.5 + - mock-time ==0.1.0 - mod ==0.1.2.1 - model ==0.5 - modern-uri ==0.3.3.0 @@ -1550,7 +1552,9 @@ default-package-overrides: - monad-control-aligned ==0.0.1.1 - monad-coroutine ==0.9.0.4 - monad-extras ==0.6.0 + - monadic-arrays ==0.2.2 - monad-journal ==0.8.1 + - monadlist ==0.0.2 - monad-logger ==0.3.36 - monad-logger-json ==0.1.0.0 - monad-logger-logstash ==0.1.0.0 @@ -1559,28 +1563,26 @@ default-package-overrides: - monad-memo ==0.5.3 - monad-metrics ==0.2.2.0 - monad-par ==0.3.5 - - monad-par-extras ==0.3.3 - monad-parallel ==0.7.2.3 + - monad-par-extras ==0.3.3 - monad-peel ==0.2.1.2 - monad-primitive ==0.1 - monad-products ==4.0.1 + - MonadPrompt ==1.0.0.5 + - MonadRandom ==0.5.2 - monad-resumption ==0.1.4.0 - monad-skeleton ==0.1.5 - monad-st ==0.2.4.1 + - monads-tf ==0.1.0.3 - monad-time ==0.3.1.0 - monad-unlift ==0.2.0 - monad-unlift-ref ==0.2.1 - - monadic-arrays ==0.2.2 - - monadlist ==0.0.2 - - MonadPrompt ==1.0.0.5 - - MonadRandom ==0.5.2 - - monads-tf ==0.1.0.3 - mongoDB ==2.7.0.0 + - monoid-subclasses ==1.0.1 + - monoid-transformer ==0.0.4 - mono-traversable ==1.0.15.1 - mono-traversable-instances ==0.1.1.0 - mono-traversable-keys ==0.1.0 - - monoid-subclasses ==1.0.1 - - monoid-transformer ==0.0.4 - more-containers ==0.2.2.0 - morpheus-graphql ==0.16.0 - morpheus-graphql-client ==0.16.0 @@ -1593,14 +1595,14 @@ default-package-overrides: - mpi-hs-cereal ==0.1.0.0 - mtl-compat ==0.2.2 - mtl-prelude ==2.0.3.1 - - multi-containers ==0.1.1 - multiarg ==0.30.0.10 + - multi-containers ==0.1.1 - multimap ==1.2.1 - multipart ==0.2.1 - multiset ==0.3.4.3 - multistate ==0.8.0.3 - - murmur-hash ==0.1.0.9 - murmur3 ==1.0.4 + - murmur-hash ==0.1.0.9 - MusicBrainz ==0.4.1 - mustache ==2.3.1 - mutable-containers ==0.3.4 @@ -1648,16 +1650,16 @@ default-package-overrides: - nicify-lib ==1.0.1 - NineP ==0.0.2.1 - nix-paths ==1.0.1 - - no-value ==1.0.0.0 - - non-empty ==0.3.2 - - non-empty-sequence ==0.2.0.4 - - non-negative ==0.1.2 - nonce ==1.0.7 - nondeterminism ==1.4 + - non-empty ==0.3.2 - nonempty-containers ==0.3.4.1 - - nonempty-vector ==0.2.1.0 - nonemptymap ==0.0.6.0 + - non-empty-sequence ==0.2.0.4 + - nonempty-vector ==0.2.1.0 + - non-negative ==0.1.2 - not-gloss ==0.7.7.0 + - no-value ==1.0.0.0 - nowdoc ==0.1.1.0 - nqe ==0.6.3 - nri-env-parser ==0.1.0.3 @@ -1673,9 +1675,9 @@ default-package-overrides: - nvim-hs ==2.1.0.4 - nvim-hs-contrib ==2.0.0.0 - nvim-hs-ghcid ==2.0.0.0 - - o-clock ==1.2.0.1 - oauthenticated ==0.2.1.0 - ObjectName ==1.1.0.1 + - o-clock ==1.2.0.1 - odbc ==0.2.2 - oeis2 ==1.0.4 - ofx ==0.4.4.0 @@ -1688,9 +1690,9 @@ default-package-overrides: - Only ==0.1 - oo-prototypes ==0.1.0.0 - opaleye ==0.7.1.0 - - open-browser ==0.2.1.0 - OpenAL ==1.7.0.5 - openapi3 ==3.0.1.0 + - open-browser ==0.2.1.0 - openexr-write ==0.1.0.2 - OpenGL ==3.0.3.0 - OpenGLRaw ==3.3.4.0 @@ -1754,10 +1756,10 @@ default-package-overrides: - pattern-arrows ==0.0.2 - pava ==0.1.1.0 - pcg-random ==0.1.3.7 + - pcre2 ==1.1.4 - pcre-heavy ==1.0.0.2 - pcre-light ==0.4.1.0 - pcre-utils ==0.1.8.1.1 - - pcre2 ==1.1.4 - pdfinfo ==1.5.4 - peano ==0.1.0.1 - pem ==0.2.4 @@ -1779,8 +1781,8 @@ default-package-overrides: - persistent-test ==2.0.3.5 - persistent-typed-db ==0.1.0.2 - pg-harness-client ==0.6.0 - - pg-transact ==0.3.1.1 - pgp-wordlist ==0.1.0.3 + - pg-transact ==0.3.1.1 - phantom-state ==0.2.1.2 - pid1 ==0.1.2.0 - pinboard ==0.10.2.0 @@ -1819,7 +1821,6 @@ default-package-overrides: - port-utils ==0.2.1.0 - posix-paths ==0.2.1.6 - possibly ==1.0.0.0 - - post-mess-age ==0.2.1.0 - postgres-options ==0.2.0.0 - postgresql-binary ==0.12.3.3 - postgresql-libpq ==0.9.4.3 @@ -1828,27 +1829,28 @@ default-package-overrides: - postgresql-simple ==0.6.4 - postgresql-typed ==0.6.1.2 - postgrest ==7.0.1 + - post-mess-age ==0.2.1.0 - pptable ==0.3.0.0 - pqueue ==1.4.1.3 - prairie ==0.0.1.0 - prefix-units ==0.2.0 - prelude-compat ==0.0.0.2 - prelude-safeenum ==0.1.1.2 + - prettyclass ==1.0.0.0 - pretty-class ==1.0.1.1 - pretty-diff ==0.2.0.3 - pretty-hex ==1.1 - - pretty-relative-time ==0.2.0.0 - - pretty-show ==1.10 - - pretty-simple ==4.0.0.0 - - pretty-sop ==0.2.0.3 - - pretty-terminal ==0.1.0.0 - - prettyclass ==1.0.0.0 - prettyprinter ==1.7.0 - prettyprinter-ansi-terminal ==1.1.2 - prettyprinter-compat-annotated-wl-pprint ==1.1 - prettyprinter-compat-ansi-wl-pprint ==1.0.1 - prettyprinter-compat-wl-pprint ==1.0.0.1 - prettyprinter-convert-ansi-wl-pprint ==1.1.1 + - pretty-relative-time ==0.2.0.0 + - pretty-show ==1.10 + - pretty-simple ==4.0.0.0 + - pretty-sop ==0.2.0.3 + - pretty-terminal ==0.1.0.0 - primes ==0.2.1.0 - primitive ==0.7.1.0 - primitive-addr ==0.1.0.2 @@ -1862,20 +1864,14 @@ default-package-overrides: - product-profunctors ==0.11.0.1 - profiterole ==0.1 - profunctors ==5.5.2 - - project-template ==0.2.1.0 - projectroot ==0.2.0.1 + - project-template ==0.2.1.0 - prometheus ==2.2.2 - prometheus-client ==1.0.1 - prometheus-wai-middleware ==1.0.1.0 - promises ==0.3 - prompt ==0.1.1.2 - prospect ==0.1.0.0 - - proto-lens ==0.7.0.0 - - proto-lens-optparse ==0.1.1.7 - - proto-lens-protobuf-types ==0.7.0.0 - - proto-lens-protoc ==0.7.0.0 - - proto-lens-runtime ==0.7.0.0 - - proto-lens-setup ==0.4.0.4 - proto3-wire ==1.1.0 - protobuf ==0.2.1.3 - protobuf-simple ==0.1.1.0 @@ -1883,6 +1879,12 @@ default-package-overrides: - protocol-buffers-descriptor ==2.4.17 - protocol-radius ==0.0.1.1 - protocol-radius-test ==0.1.0.1 + - proto-lens ==0.7.0.0 + - proto-lens-optparse ==0.1.1.7 + - proto-lens-protobuf-types ==0.7.0.0 + - proto-lens-protoc ==0.7.0.0 + - proto-lens-runtime ==0.7.0.0 + - proto-lens-setup ==0.4.0.4 - protolude ==0.3.0 - proxied ==0.3.1 - psqueues ==0.2.7.2 @@ -1929,45 +1931,45 @@ default-package-overrides: - random-source ==0.3.0.8 - random-tree ==0.6.0.5 - range ==0.3.0.2 - - range-set-list ==0.1.3.1 - Ranged-sets ==0.4.0 + - range-set-list ==0.1.3.1 - rank1dynamic ==0.4.1 - rank2classes ==1.4.1 - Rasterific ==0.7.5.3 - rasterific-svg ==0.3.3.2 - - rate-limit ==1.4.2 - ratel ==1.0.12 + - rate-limit ==1.4.2 - ratel-wai ==1.1.3 - rattle ==0.2 - - raw-strings-qq ==1.1 - rawfilepath ==0.2.4 - rawstring-qm ==0.2.3.0 + - raw-strings-qq ==1.1 - rcu ==0.2.4 - rdf ==0.1.0.4 - rdtsc ==1.3.0.1 - re2 ==0.3 + - readable ==0.3.1 - read-editor ==0.1.0.2 - read-env-var ==1.0.0.0 - - readable ==0.3.1 - reanimate ==1.1.3.2 - reanimate-svg ==0.13.0.0 - rebase ==1.6.1 - record-dot-preprocessor ==0.2.7 - record-hasfield ==1.0 - - record-wrangler ==0.1.1.0 - records-sop ==0.1.0.3 + - record-wrangler ==0.1.1.0 - recursion-schemes ==5.2.1 - reducers ==3.12.3 - - ref-fd ==0.4.0.2 - - ref-tf ==0.4.0.2 - refact ==0.3.0.2 - - refined ==0.6.1 + - ref-fd ==0.4.0.2 + - refined ==0.6.2 - reflection ==2.1.6 - reform ==0.2.7.4 - reform-blaze ==0.2.4.3 - reform-hamlet ==0.0.5.3 - reform-happstack ==0.2.5.4 - RefSerialize ==0.4.0 + - ref-tf ==0.4.0.2 - regex ==1.1.0.0 - regex-applicative ==0.3.4 - regex-applicative-text ==0.1.0.1 @@ -2025,15 +2027,15 @@ default-package-overrides: - runmemo ==1.0.0.1 - rvar ==0.2.0.6 - safe ==0.3.19 + - safecopy ==0.10.3.1 - safe-decimal ==0.2.0.0 - safe-exceptions ==0.1.7.1 - safe-foldable ==0.1.0.0 + - safeio ==0.0.5.0 - safe-json ==1.1.1.1 - safe-money ==0.9 - - safe-tensor ==0.2.1.0 - - safecopy ==0.10.3.1 - - safeio ==0.0.5.0 - SafeSemaphore ==0.10.1 + - safe-tensor ==0.2.1.0 - salak ==0.3.6 - salak-yaml ==0.3.5.3 - saltine ==0.1.1.1 @@ -2071,8 +2073,8 @@ default-package-overrides: - semigroupoid-extras ==5 - semigroupoids ==5.3.5 - semigroups ==0.19.1 - - semiring-simple ==1.0.0.1 - semirings ==0.6 + - semiring-simple ==1.0.0.1 - semver ==0.4.0.1 - sendfile ==0.7.11.1 - seqalign ==0.2.0.4 @@ -2118,9 +2120,9 @@ default-package-overrides: - shared-memory ==0.2.0.0 - shell-conduit ==5.0.0 - shell-escape ==0.2.0 - - shell-utility ==0.1 - shellmet ==0.0.3.1 - shelltestrunner ==1.9 + - shell-utility ==0.1 - shelly ==1.9.0 - shikensu ==0.3.11 - shortcut-links ==0.5.1.1 @@ -2191,16 +2193,16 @@ default-package-overrides: - splitmix ==0.1.0.3 - spoon ==0.3.1 - spreadsheet ==0.1.3.8 - - sql-words ==0.1.6.4 - sqlcli ==0.2.2.0 - sqlcli-odbc ==0.2.0.1 - sqlite-simple ==0.4.18.0 + - sql-words ==0.1.6.4 - squeal-postgresql ==0.7.0.1 - squeather ==0.6.0.0 - srcloc ==0.5.1.2 - stache ==2.2.0 - - stack-templatizer ==0.1.0.2 - stackcollapse-ghc ==0.0.1.3 + - stack-templatizer ==0.1.0.2 - stateref ==0.3 - StateVar ==1.2.1 - static-text ==0.2.0.6 @@ -2215,8 +2217,8 @@ default-package-overrides: - stm-extras ==0.1.0.3 - stm-hamt ==1.2.0.4 - stm-lifted ==2.5.0.0 - - stm-split ==0.0.2.1 - STMonadTrans ==0.4.5 + - stm-split ==0.0.2.1 - stopwatch ==0.1.0.6 - storable-complex ==0.2.3.0 - storable-endian ==0.2.6 @@ -2237,6 +2239,7 @@ default-package-overrides: - strict-list ==0.1.5 - strict-tuple ==0.1.4 - strict-tuple-lens ==0.1.0.1 + - stringbuilder ==0.5.1 - string-class ==0.1.7.0 - string-combinators ==0.6.0.5 - string-conv ==0.1.2 @@ -2244,9 +2247,8 @@ default-package-overrides: - string-interpolate ==0.3.0.2 - string-qq ==0.0.4 - string-random ==0.1.4.0 - - string-transform ==1.1.1 - - stringbuilder ==0.5.1 - stringsearch ==0.3.6.6 + - string-transform ==1.1.1 - stripe-concepts ==1.0.2.4 - stripe-core ==2.6.2 - stripe-haskell ==2.6.2 @@ -2271,10 +2273,10 @@ default-package-overrides: - symmetry-operations-symbols ==0.0.2.1 - sysinfo ==0.1.1 - system-argv0 ==0.1.1 + - systemd ==2.3.0 - system-fileio ==0.3.16.4 - system-filepath ==0.4.14 - system-info ==0.5.1 - - systemd ==2.3.0 - tabular ==0.2.2.8 - taffybar ==3.2.3 - tagchup ==0.4.1.1 @@ -2291,6 +2293,7 @@ default-package-overrides: - tardis ==0.4.1.0 - tasty ==1.2.3 - tasty-ant-xml ==1.1.7 + - tasty-bench ==0.1 - tasty-dejafu ==2.0.0.7 - tasty-discover ==4.2.2 - tasty-expected-failure ==0.12.2 @@ -2340,6 +2343,7 @@ default-package-overrides: - text-icu ==0.7.0.1 - text-latin1 ==0.3.1 - text-ldap ==0.1.1.13 + - textlocal ==0.1.0.5 - text-manipulate ==0.2.0.1 - text-metrics ==0.3.0 - text-postgresql ==0.0.3.1 @@ -2350,9 +2354,8 @@ default-package-overrides: - text-show ==3.9 - text-show-instances ==3.8.4 - text-zipper ==0.11 - - textlocal ==0.1.0.5 - - tf-random ==0.5 - tfp ==1.0.1.1 + - tf-random ==0.5 - th-abstraction ==0.4.2.0 - th-bang-compat ==0.0.1.0 - th-compat ==0.1 @@ -2360,6 +2363,10 @@ default-package-overrides: - th-data-compat ==0.1.0.0 - th-desugar ==1.11 - th-env ==0.1.0.2 + - these ==1.1.1.1 + - these-lens ==1.0.1.1 + - these-optics ==1.0.1.1 + - these-skinny ==0.7.4 - th-expand-syns ==0.4.6.0 - th-extras ==0.0.0.4 - th-lift ==0.8.2 @@ -2367,37 +2374,33 @@ default-package-overrides: - th-nowq ==0.1.0.5 - th-orphans ==0.13.11 - th-printf ==0.7 - - th-reify-compat ==0.0.1.5 - - th-reify-many ==0.1.9 - - th-strict-compat ==0.1.0.1 - - th-test-utils ==1.1.0 - - th-utilities ==0.2.4.1 - - these ==1.1.1.1 - - these-lens ==1.0.1.1 - - these-optics ==1.0.1.1 - - these-skinny ==0.7.4 - thread-hierarchy ==0.3.0.2 - thread-local-storage ==0.2 - - thread-supervisor ==0.2.0.0 - threads ==0.5.1.6 + - thread-supervisor ==0.2.0.0 - threepenny-gui ==0.9.0.0 + - th-reify-compat ==0.0.1.5 + - th-reify-many ==0.1.9 - throttle-io-stream ==0.2.0.1 - through-text ==0.1.0.0 - throwable-exceptions ==0.1.0.9 + - th-strict-compat ==0.1.0.1 + - th-test-utils ==1.1.0 + - th-utilities ==0.2.4.1 - thyme ==0.3.5.5 - tidal ==1.6.1 - tile ==0.3.0.0 - time-compat ==1.9.5 + - timeit ==2.0 + - timelens ==0.2.0.2 - time-lens ==0.4.0.2 - time-locale-compat ==0.1.1.5 - time-locale-vietnamese ==1.0.0.0 - time-manager ==0.0.0 - time-parsers ==0.1.2.1 - - time-units ==1.0.0 - - timeit ==2.0 - - timelens ==0.2.0.2 - - timer-wheel ==0.3.0 - timerep ==2.0.1.0 + - timer-wheel ==0.3.0 + - time-units ==1.0.0 - timezone-olson ==0.2.0 - timezone-series ==0.1.9 - tinylog ==0.15.0 @@ -2432,10 +2435,14 @@ default-package-overrides: - ttl-hashtables ==1.4.1.0 - ttrie ==0.1.2.1 - tuple ==0.3.0.2 + - tuples-homogenous-h98 ==0.1.1.0 - tuple-sop ==0.3.1.0 - tuple-th ==0.2.5 - - tuples-homogenous-h98 ==0.1.1.0 - turtle ==1.5.20 + - typecheck-plugin-nat-simple ==0.1.0.2 + - TypeCompose ==0.9.14 + - typed-process ==0.2.6.0 + - typed-uuid ==0.0.0.2 - type-equality ==1 - type-errors ==0.2.0.0 - type-errors-pretty ==0.0.1.1 @@ -2449,12 +2456,8 @@ default-package-overrides: - type-of-html ==1.6.1.2 - type-of-html-static ==0.1.0.2 - type-operators ==0.2.0.0 - - type-spec ==0.4.0.0 - - typecheck-plugin-nat-simple ==0.1.0.2 - - TypeCompose ==0.9.14 - - typed-process ==0.2.6.0 - - typed-uuid ==0.0.0.2 - typerep-map ==0.3.3.0 + - type-spec ==0.4.0.0 - tzdata ==0.2.20201021.0 - ua-parser ==0.7.5.1 - uglymemo ==0.1.0.1 @@ -2593,18 +2596,18 @@ default-package-overrides: - Win32-notify ==0.3.0.3 - windns ==0.1.0.1 - witch ==0.0.0.4 - - with-location ==0.1.0 - - with-utf8 ==1.0.2.1 - witherable-class ==0 - within ==0.2.0.1 + - with-location ==0.1.0 + - with-utf8 ==1.0.2.1 - wizards ==1.0.3 - wl-pprint-annotated ==0.1.0.1 - wl-pprint-console ==0.1.0.2 - wl-pprint-text ==1.2.0.1 - - word-trie ==0.3.0 - - word-wrap ==0.4.1 - word24 ==2.0.1 - word8 ==0.1.3 + - word-trie ==0.3.0 + - word-wrap ==0.4.1 - world-peace ==1.0.2.0 - wrap ==0.0.0 - wreq ==0.5.3.2 @@ -2631,6 +2634,7 @@ default-package-overrides: - xml-basic ==0.1.3.1 - xml-conduit ==1.9.0.0 - xml-conduit-writer ==0.1.1.2 + - xmlgen ==0.6.2.2 - xml-hamlet ==0.5.0.1 - xml-helpers ==1.0.0 - xml-html-qq ==0.1.0.1 @@ -2640,7 +2644,6 @@ default-package-overrides: - xml-to-json ==2.0.1 - xml-to-json-fast ==2.0.0 - xml-types ==0.3.8 - - xmlgen ==0.6.2.2 - xmonad ==0.15 - xmonad-contrib ==0.16 - xmonad-extras ==0.15.3 @@ -2648,7 +2651,6 @@ default-package-overrides: - xxhash-ffi ==0.2.0.0 - yaml ==0.11.5.0 - yamlparse-applicative ==0.1.0.2 - - yes-precure5-command ==5.5.3 - yesod ==1.6.1.0 - yesod-auth ==1.6.10.1 - yesod-auth-hashdb ==1.7.1.5 @@ -2666,6 +2668,7 @@ default-package-overrides: - yesod-static ==1.6.1.0 - yesod-test ==1.6.12 - yesod-websockets ==0.3.0.2 + - yes-precure5-command ==5.5.3 - yi-rope ==0.11 - yjsvg ==0.2.0.1 - yjtools ==0.9.18 @@ -2680,9 +2683,9 @@ default-package-overrides: - zio ==0.1.0.2 - zip ==1.7.0 - zip-archive ==0.4.1 - - zip-stream ==0.2.0.1 - zipper-extra ==0.1.3.2 - zippers ==0.3 + - zip-stream ==0.2.0.1 - zlib ==0.6.2.2 - zlib-bindings ==0.1.1.5 - zlib-lens ==0.1.2.1 @@ -2694,7 +2697,8 @@ default-package-overrides: extra-packages: - Cabal == 2.2.* # required for jailbreak-cabal etc. - Cabal == 2.4.* # required for cabal-install etc. - - dhall == 1.29.0 # required for spago 0.14.0. + - dhall == 1.29.0 # required for ats-pkg + - dhall == 1.37.1 # required for spago 0.19.0. - Diff < 0.4 # required by liquidhaskell-0.8.10.2: https://github.com/ucsd-progsys/liquidhaskell/issues/1729 - ghc-tcplugins-extra ==0.3.2 # required for polysemy-plugin 0.2.5.0 - haddock == 2.23.* # required on GHC < 8.10.x @@ -2707,8 +2711,8 @@ extra-packages: - dependent-map == 0.2.4.0 # required by Hasura 1.3.1, 2020-08-20 - dependent-sum == 0.4 # required by Hasura 1.3.1, 2020-08-20 - network == 2.6.3.1 # required by pkgs/games/hedgewars/default.nix, 2020-11-15 - - ghcide == 0.7.0.0 # Needed for hls 0.8.0 - apply-refact == 0.8.2.1 # Needed for hls 0.8.0 + - mmorph == 1.1.3 # Newest working version of mmorph on ghc 8.6.5. needed for hls package-maintainers: peti: @@ -6036,7 +6040,6 @@ broken-packages: - haskell-igraph - haskell-in-space - haskell-kubernetes - - haskell-language-server - haskell-lsp-client - haskell-ml - haskell-mpfr @@ -6466,9 +6469,6 @@ broken-packages: - hlrdb - hlrdb-core - hls - - hls-explicit-imports-plugin - - hls-hlint-plugin - - hls-retrie-plugin - hlwm - hly - hmark @@ -6854,7 +6854,6 @@ broken-packages: - hugs2yc - hulk - HulkImport - - hum - human-parse - human-text - humble-prelude @@ -7563,6 +7562,7 @@ broken-packages: - libxml-enumerator - libxslt - lie + - lifetimes - lifted-base-tf - lifted-protolude - lifter @@ -8963,7 +8963,6 @@ broken-packages: - postgresql-tx-squeal - postgresql-tx-squeal-compat-simple - postgresql-typed-lifted - - postgrest - postgrest-ws - postie - postmark diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 06578f5653507..4e23ab80c1b69 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -659,7 +659,9 @@ self: super: builtins.intersectAttrs super { let # spago requires an older version of megaparsec, but it appears to work # fine with newer versions. - spagoWithOverrides = doJailbreak super.spago; + spagoWithOverrides = doJailbreak (super.spago.override { + dhall = self.dhall_1_37_1; + }); # This defines the version of the purescript-docs-search release we are using. # This is defined in the src/Spago/Prelude.hs file in the spago source. @@ -785,7 +787,7 @@ self: super: builtins.intersectAttrs super { testTarget = "unit-tests"; }; - haskell-language-server = overrideCabal super.haskell-language-server (drv: { + haskell-language-server = enableCabalFlag (enableCabalFlag (overrideCabal super.haskell-language-server (drv: { postInstall = let inherit (pkgs.lib) concatStringsSep take splitString; ghc_version = self.ghc.version; @@ -800,7 +802,7 @@ self: super: builtins.intersectAttrs super { export PATH=$PATH:$PWD/dist/build/haskell-language-server:$PWD/dist/build/haskell-language-server-wrapper export HOME=$TMPDIR ''; - }); + })) "all-plugins") "all-formatters"; # tests depend on a specific version of solc hevm = dontCheck (doJailbreak super.hevm); diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index cfd4a5eac642c..b1a2837ec6d06 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -8012,8 +8012,8 @@ self: { }: mkDerivation { pname = "HDBC-postgresql"; - version = "2.4.0.0"; - sha256 = "1zmilqvlp170nb7zakbhdpihykkq95s7nb7la2sdas1fv69mhnx3"; + version = "2.5.0.0"; + sha256 = "1awwrq7hivk1hp709iz624hm2wjbk18hspld91pixv5x34fcn7s9"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal ]; @@ -21931,8 +21931,8 @@ self: { }: mkDerivation { pname = "Z-Data"; - version = "0.5.0.0"; - sha256 = "07yx0mh1h0p5qsw0sn20mcz542h5dh3p6l3nbzqrjvdpp22s27h0"; + version = "0.6.0.0"; + sha256 = "16wb7hrk6rlxl0sks5nkhl60wxwlxdyjwj9j72g40l5x6qnlvk7d"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring case-insensitive containers deepseq ghc-prim @@ -21959,8 +21959,8 @@ self: { }: mkDerivation { pname = "Z-IO"; - version = "0.4.0.0"; - sha256 = "0jyx2mghm40llcvilg6m9120wfngvpmsggy7xy6zdf29lz3v9bd5"; + version = "0.6.0.0"; + sha256 = "1s7vdmp2i89c2rvcifn6znwl167ji8x3yrvk19rrkqpamdy9m3m3"; libraryHaskellDepends = [ base containers exceptions primitive stm time unix-time unordered-containers Z-Data @@ -30182,24 +30182,23 @@ self: { "ansi-terminal-game" = callPackage ({ mkDerivation, ansi-terminal, array, base, bytestring, cereal , clock, exceptions, hspec, linebreak, mintty, mtl, QuickCheck - , random, split, terminal-size, timers-tick + , random, split, terminal-size, timers-tick, unidecode }: mkDerivation { pname = "ansi-terminal-game"; - version = "1.0.0.0"; - sha256 = "0h33ih7sxzyp1a6r6ivk73lrfx6haxxzmgh56n75sa7p8vhr8f1i"; - revision = "1"; - editedCabalFile = "1x601p97ragf9k56qy1ndmn7g3brs8fvvmf1wcrxz1ynhndqqpjw"; + version = "1.1.0.0"; + sha256 = "08sy50yicjgcxmnpq2828xggmvxc5yjp3xp03nd0bq4ykyr4za80"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ansi-terminal array base bytestring cereal clock exceptions linebreak mintty mtl QuickCheck random split terminal-size - timers-tick + timers-tick unidecode ]; testHaskellDepends = [ ansi-terminal array base bytestring cereal clock exceptions hspec linebreak mtl QuickCheck random split terminal-size timers-tick + unidecode ]; description = "sdl-like functions for terminal applications, based on ansi-terminal"; license = lib.licenses.gpl3; @@ -36491,6 +36490,8 @@ self: { pname = "aws-larpi"; version = "0.1.0.0"; sha256 = "04z5wcvkcvq961zc9pg79k6340vgm6rdws6lfjysl5jrwr5sfxg9"; + revision = "1"; + editedCabalFile = "00singwkjvv2g92i16bsaqdq2rwg2l4v39vmy1vdi6dbpalkka4n"; libraryHaskellDepends = [ aeson base bytestring modern-uri req text ]; @@ -42955,6 +42956,8 @@ self: { pname = "bitwise-enum"; version = "1.0.0.3"; sha256 = "0ykrr8x1hc1lsj8cn19jcypvww4598g1v0vrn3z3b7n6hp6wfyis"; + revision = "3"; + editedCabalFile = "19d5xwigd482z47s8gpbd2jmm4pmx5bxg2fxkzjl8dias4yb431x"; libraryHaskellDepends = [ aeson array base deepseq mono-traversable vector ]; @@ -44978,6 +44981,8 @@ self: { pname = "bound"; version = "2.0.2"; sha256 = "14kl0aak48m1sbvi0g772hfmn6w984yc4j9p4ljxq6bfb2q4gqax"; + revision = "1"; + editedCabalFile = "1349bq2vrmhr63r1iqwfcb1sxm7yyf0641wsqmzd332g3aad159w"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bifunctors binary bytes cereal comonad deepseq hashable mmorph @@ -44992,6 +44997,30 @@ self: { license = lib.licenses.bsd3; }) {}; + "bound_2_0_3" = callPackage + ({ mkDerivation, base, bifunctors, binary, bytes, cereal, comonad + , deepseq, deriving-compat, functor-classes-compat, hashable + , mmorph, profunctors, template-haskell, th-abstraction + , transformers, transformers-compat, vector, void + }: + mkDerivation { + pname = "bound"; + version = "2.0.3"; + sha256 = "0rhpcz99sax81zh2k1ww7g2xgfcna56ppj9xc1l4gfnsrrlb27yg"; + libraryHaskellDepends = [ + base bifunctors binary bytes cereal comonad deepseq hashable mmorph + profunctors template-haskell th-abstraction transformers + transformers-compat + ]; + testHaskellDepends = [ + base deriving-compat functor-classes-compat transformers + transformers-compat vector void + ]; + description = "Making de Bruijn Succ Less"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "bound-extras" = callPackage ({ mkDerivation, base, bound, containers, deepseq, filepath , hashable, pretty, tasty, tasty-golden, text-short, transformers @@ -45421,6 +45450,33 @@ self: { license = lib.licenses.bsd3; }) {}; + "brick_0_60_1" = callPackage + ({ mkDerivation, base, bytestring, config-ini, containers + , contravariant, data-clist, deepseq, directory, dlist, exceptions + , filepath, microlens, microlens-mtl, microlens-th, QuickCheck, stm + , template-haskell, text, text-zipper, transformers, unix, vector + , vty, word-wrap + }: + mkDerivation { + pname = "brick"; + version = "0.60.1"; + sha256 = "017zhf5frk1dx5brjnz101pr9hyz4m03sw54gvlx7qv58r4prvjx"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring config-ini containers contravariant data-clist + deepseq directory dlist exceptions filepath microlens microlens-mtl + microlens-th stm template-haskell text text-zipper transformers + unix vector vty word-wrap + ]; + testHaskellDepends = [ + base containers microlens QuickCheck vector + ]; + description = "A declarative terminal user interface library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "brick-dropdownmenu" = callPackage ({ mkDerivation, base, brick, containers, microlens, microlens-ghc , microlens-th, pointedlist, vector, vty @@ -48092,8 +48148,8 @@ self: { ({ mkDerivation, base, Cabal, filepath }: mkDerivation { pname = "cabal-appimage"; - version = "0.3.0.0"; - sha256 = "0m3xq3k4s6rn90vd2sp115jyb722vi9wgih3lz05fnc2bypyg6zi"; + version = "0.3.0.1"; + sha256 = "0cl588kqsmq8vpnd96knqp6bllbc1kznfgs786vccvq7s4zxna6v"; libraryHaskellDepends = [ base Cabal filepath ]; description = "Cabal support for creating AppImage applications"; license = lib.licenses.agpl3; @@ -49880,8 +49936,8 @@ self: { }: mkDerivation { pname = "calamity"; - version = "0.1.24.1"; - sha256 = "14q0s17an5vk2gq9vcy0ghd30zg1dj3q5vdln86mnd4v34wkpfr2"; + version = "0.1.24.2"; + sha256 = "03z9wkvb75vib5m15ml2mrkdq2jgdnjnjp77wdb494xj50g3wgqn"; libraryHaskellDepends = [ aeson async base bytestring colour concurrent-extra connection containers data-default-class data-flags deepseq deque df1 di-core @@ -54705,8 +54761,8 @@ self: { }: mkDerivation { pname = "citeproc"; - version = "0.3.0.5"; - sha256 = "18ybi21fmw9rkd4m74dgy1cf3i9l79bpalm79427kass8mv4wpia"; + version = "0.3.0.7"; + sha256 = "03cc3d7a1rf3k23150b19y4mx1c6vk53l9c59vv9npf39id33g7s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -59192,8 +59248,8 @@ self: { }: mkDerivation { pname = "compdata"; - version = "0.12"; - sha256 = "0b08mmj04bbi735hvvdbg1nmg66qg1c11r0kvq7m569r91bmy54v"; + version = "0.12.1"; + sha256 = "0ksa3bgqjvshkrpd74420z9kkb3asq4flszzwrqswd4qw1yn9f05"; libraryHaskellDepends = [ base containers deepseq mtl QuickCheck template-haskell th-expand-syns transformers tree-view @@ -62851,6 +62907,8 @@ self: { pname = "contra-tracer"; version = "0.1.0.0"; sha256 = "146g43sqa23n1qg100jvz5m1jcjfxx4rxzmc8559b6apys9ys4br"; + revision = "1"; + editedCabalFile = "1r3rnxlbvfirj4n2vwysh7zkfdwlx3x4p9yjd32hpr3vdikgpvds"; libraryHaskellDepends = [ base ]; description = "Arrow and contravariant tracers"; license = lib.licenses.bsd3; @@ -64860,8 +64918,8 @@ self: { }: mkDerivation { pname = "crdt"; - version = "10.6"; - sha256 = "0c86gf70iv59dwmm0yv8isyyd6zy497vqgf6ml9s6rz4hhg1rwl0"; + version = "10.7"; + sha256 = "0745aa7zs5niwi55kdkfnyii9vdg9jfqr2872w068r8p33njcbdk"; libraryHaskellDepends = [ base binary bytestring containers Diff hashable mtl network-info safe stm time vector @@ -69041,6 +69099,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "data-fix_0_3_1" = callPackage + ({ mkDerivation, base, deepseq, hashable }: + mkDerivation { + pname = "data-fix"; + version = "0.3.1"; + sha256 = "0yfciggx8l82nfpv40w2673glnl9nnbh269kpfbw28i98x0c0icv"; + libraryHaskellDepends = [ base deepseq hashable ]; + description = "Fixpoint data types"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "data-fix-cse" = callPackage ({ mkDerivation, base, containers, data-fix, transformers }: mkDerivation { @@ -71688,16 +71758,14 @@ self: { broken = true; }) {}; - "deepseq_1_4_4_0" = callPackage + "deepseq_1_4_5_0" = callPackage ({ mkDerivation, array, base, ghc-prim, HUnit, test-framework , test-framework-hunit }: mkDerivation { pname = "deepseq"; - version = "1.4.4.0"; - sha256 = "09kfpmgl679l74b6dadia11pvhya9ik4wrd8x76cgkxk7gwcbkrc"; - revision = "1"; - editedCabalFile = "0mbby1hig605jyiyy4m2y2nnjjf5i2adzc6x269hbz4pxscjp43n"; + version = "1.4.5.0"; + sha256 = "0d3yw95xkyx7wwx3anfj1fqb10080xykqic483xpl7rvi1mik6js"; libraryHaskellDepends = [ array base ]; testHaskellDepends = [ array base ghc-prim HUnit test-framework test-framework-hunit @@ -72261,35 +72329,39 @@ self: { }) {}; "dep-t" = callPackage - ({ mkDerivation, base, mtl, rank2classes, tasty, tasty-hunit - , template-haskell, transformers, unliftio-core + ({ mkDerivation, base, doctest, mtl, rank2classes, sop-core, tasty + , tasty-hunit, template-haskell, transformers, unliftio-core }: mkDerivation { pname = "dep-t"; - version = "0.1.3.0"; - sha256 = "1bzf2czbml949an6gffc7jh898ba2axfh87phnrla0595x7nrx21"; + version = "0.4.0.2"; + sha256 = "0jnby6k89ink5dh12y5cc4ws8nn2cwhchnqqxyxwd29pwrx0vmx6"; libraryHaskellDepends = [ base mtl transformers unliftio-core ]; testHaskellDepends = [ - base mtl rank2classes tasty tasty-hunit template-haskell - transformers unliftio-core + base doctest mtl rank2classes sop-core tasty tasty-hunit + template-haskell transformers unliftio-core ]; description = "Reader-like monad transformer for dependency injection"; license = lib.licenses.bsd3; }) {}; "dep-t-advice" = callPackage - ({ mkDerivation, base, dep-t, doctest, mtl, rank2classes, sop-core - , tasty, tasty-hunit, template-haskell, transformers + ({ mkDerivation, base, criterion, dep-t, doctest, mtl, rank2classes + , sop-core, tasty, tasty-hunit, template-haskell, transformers }: mkDerivation { pname = "dep-t-advice"; - version = "0.3.0.0"; - sha256 = "00nqf37x877s5arkwv55cki068gpgq64yns4qhp039az2mfr4g9q"; - libraryHaskellDepends = [ base dep-t sop-core ]; + version = "0.4.0.1"; + sha256 = "11qjlidmjn2z1gnngrssdzm8hqiq9a54jksp9al8wzflf31jgh0i"; + libraryHaskellDepends = [ base dep-t sop-core transformers ]; testHaskellDepends = [ base dep-t doctest mtl rank2classes sop-core tasty tasty-hunit template-haskell transformers ]; + benchmarkHaskellDepends = [ + base criterion dep-t mtl rank2classes sop-core template-haskell + transformers + ]; description = "Giving good advice to functions in a DepT environment"; license = lib.licenses.bsd3; }) {}; @@ -73336,6 +73408,63 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "dhall_1_37_1" = callPackage + ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, atomic-write + , base, bytestring, case-insensitive, cborg, cborg-json, containers + , contravariant, cryptonite, data-fix, deepseq, Diff, directory + , doctest, dotgen, either, exceptions, filepath, foldl, gauge + , generic-random, half, hashable, haskeline, http-client + , http-client-tls, http-types, lens-family-core, megaparsec, memory + , mmorph, mockery, mtl, network-uri, optparse-applicative + , parser-combinators, parsers, pretty-simple, prettyprinter + , prettyprinter-ansi-terminal, profunctors, QuickCheck + , quickcheck-instances, repline, scientific, serialise + , special-values, spoon, tasty, tasty-expected-failure, tasty-hunit + , tasty-quickcheck, tasty-silver, template-haskell, text + , text-manipulate, th-lift-instances, transformers + , transformers-compat, turtle, unordered-containers, uri-encode + , vector + }: + mkDerivation { + pname = "dhall"; + version = "1.37.1"; + sha256 = "16qpasw41wcgbi9ljrs43dn2ajw25yipm8kxri6v5fwj3gyzj24d"; + revision = "1"; + editedCabalFile = "11sjra0k7sdy0xcbhlxvjjpd4h7ki9dcrndcpaq71qlgdql32w24"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson aeson-pretty ansi-terminal atomic-write base bytestring + case-insensitive cborg cborg-json containers contravariant + cryptonite data-fix deepseq Diff directory dotgen either exceptions + filepath half hashable haskeline http-client http-client-tls + http-types lens-family-core megaparsec memory mmorph mtl + network-uri optparse-applicative parser-combinators parsers + pretty-simple prettyprinter prettyprinter-ansi-terminal profunctors + repline scientific serialise template-haskell text text-manipulate + th-lift-instances transformers transformers-compat + unordered-containers uri-encode vector + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base bytestring cborg containers data-fix deepseq directory doctest + either filepath foldl generic-random http-client http-client-tls + lens-family-core megaparsec mockery prettyprinter QuickCheck + quickcheck-instances scientific serialise special-values spoon + tasty tasty-expected-failure tasty-hunit tasty-quickcheck + tasty-silver template-haskell text transformers turtle + unordered-containers vector + ]; + benchmarkHaskellDepends = [ + base bytestring containers directory gauge text + ]; + doCheck = false; + description = "A configuration language guaranteed to terminate"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "dhall" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, atomic-write , base, bytestring, case-insensitive, cborg, cborg-json, containers @@ -75828,8 +75957,8 @@ self: { }: mkDerivation { pname = "discord-haskell"; - version = "1.8.1"; - sha256 = "07rhg7r4v05q1y6rin4b5v49231r2w35jfwnrbg7b7s1skdld9g3"; + version = "1.8.2"; + sha256 = "0gw2c5fb4i6j5prmbj20fsnmci34kbzx3gk8pv93i33jndbs6g6h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -81642,8 +81771,8 @@ self: { ({ mkDerivation, base, containers, doctest }: mkDerivation { pname = "either-list-functions"; - version = "0.0.4.2"; - sha256 = "1cagf93vaz41hl5vm1xqvzdds82h2cck294apr5b082nscv6r9bc"; + version = "0.0.4.4"; + sha256 = "1kh10iykk6gqzl78smrwv1zl8dcy0ns2raisx5qchcvrdgshzdiy"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base doctest ]; description = "Functions involving lists of Either"; @@ -88048,8 +88177,8 @@ self: { }: mkDerivation { pname = "faktory"; - version = "1.0.1.4"; - sha256 = "151jlcrp80f8riyf8rxzvggyxq3k2mg2fi81r7wnc4in6gzsc0qj"; + version = "1.0.1.5"; + sha256 = "0v7hd609315lvkkvk00f0q6jkp87hi0zy9zf18b5rkbwalx12avp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -88879,8 +89008,8 @@ self: { ({ mkDerivation, base, doctest, first-class-families, Glob }: mkDerivation { pname = "fcf-containers"; - version = "0.5.0"; - sha256 = "0j4ij4iw5axjp56zhxb3kn6ls1l8m2ckqx6620y1yjhz3ja608f2"; + version = "0.6.0"; + sha256 = "09sr1xqdjzfk5gysd7hi66xadwcfrjq4q3vakmdilc14lw833wgp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base first-class-families ]; @@ -93787,8 +93916,8 @@ self: { }: mkDerivation { pname = "forsyde-shallow"; - version = "3.4.0.0"; - sha256 = "0czrgfx22j94xp56mf4cwrz2rdw2id77va89xpjxxrhdzwzfsvcn"; + version = "3.4.0.1"; + sha256 = "0im5xf8dcalsjk85fyvih042apv3wl54k3jlmdjg7fnm3mgxj1yj"; libraryHaskellDepends = [ base directory old-time process random ]; testHaskellDepends = [ base directory doctest hspec old-time process QuickCheck random @@ -93982,34 +94111,6 @@ self: { }: mkDerivation { pname = "fourmolu"; - version = "0.2.0.0"; - sha256 = "1jak0xgd6gcbw7icyrblvqnvzjyyakpw2zfnqj1z958qyg763v52"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson base bytestring containers directory dlist exceptions - filepath ghc-lib-parser HsYAML HsYAML-aeson mtl syb text - ]; - executableHaskellDepends = [ - base directory ghc-lib-parser gitrev optparse-applicative text - ]; - testHaskellDepends = [ - base containers filepath hspec path path-io text - ]; - testToolDepends = [ hspec-discover ]; - description = "A formatter for Haskell source code"; - license = lib.licenses.bsd3; - }) {}; - - "fourmolu_0_3_0_0" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, directory - , dlist, exceptions, filepath, ghc-lib-parser, gitrev, hspec - , hspec-discover, HsYAML, HsYAML-aeson, mtl, optparse-applicative - , path, path-io, syb, text - }: - mkDerivation { - pname = "fourmolu"; version = "0.3.0.0"; sha256 = "0v89dvcr8l0swj23kkakc39q6lyxjz90rqgwy7m6a5p6iv3h2wms"; isLibrary = true; @@ -94028,7 +94129,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "A formatter for Haskell source code"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "fp-ieee" = callPackage @@ -95614,8 +95714,8 @@ self: { }: mkDerivation { pname = "fswatcher"; - version = "0.2.2"; - sha256 = "0rdvh9310qbnp6vh3janr60nla33kyfy23yfzbzsca8ridr7ab7w"; + version = "0.3.0"; + sha256 = "0bn3pnk7jra4p20hm4ydvnqibfh3h9kc5lswvs8s02wlzf5z5a9f"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -99635,8 +99735,8 @@ self: { }: mkDerivation { pname = "geoip2"; - version = "0.4.0.1"; - sha256 = "0q0clfmq7spfplxr6dxhq0d39f5l95yfr87ixnv2cn0ahcx7fpi7"; + version = "0.4.1.0"; + sha256 = "06sbiyqy63ymqafdw14yz6aww412v3g6vsqq0v99vph3yzhn8xxp"; libraryHaskellDepends = [ base bytestring cereal containers iproute lens mmap reinterpret-cast text @@ -100243,8 +100343,8 @@ self: { }: mkDerivation { pname = "ghc-exactprint"; - version = "0.6.3.3"; - sha256 = "1psrr6iaa7k5f3zz7j82crg052n3x1h2dljyb16qzbv98bqny6nb"; + version = "0.6.3.4"; + sha256 = "0x3z9zlghcd22v6hidby72w6g11xl6cbwyskzcjlv0235csr5v98"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -100410,6 +100510,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "ghc-lib_9_0_1_20210205" = callPackage + ({ mkDerivation, alex, array, base, binary, bytestring, containers + , deepseq, directory, exceptions, filepath, ghc-lib-parser + , ghc-prim, happy, hpc, pretty, process, time, transformers, unix + }: + mkDerivation { + pname = "ghc-lib"; + version = "9.0.1.20210205"; + sha256 = "1kj69qbz7yv943ybbnmk2xvrba9220ky4cmx3d1vxzjg951x1ici"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array base binary bytestring containers deepseq directory + exceptions filepath ghc-lib-parser ghc-prim hpc pretty process time + transformers unix + ]; + libraryToolDepends = [ alex happy ]; + description = "The GHC API, decoupled from GHC versions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ghc-lib-parser" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, filepath, ghc-prim, happy, hpc, pretty @@ -100429,6 +100550,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "ghc-lib-parser_9_0_1_20210205" = callPackage + ({ mkDerivation, alex, array, base, binary, bytestring, containers + , deepseq, directory, exceptions, filepath, ghc-prim, happy, hpc + , pretty, process, time, transformers, unix + }: + mkDerivation { + pname = "ghc-lib-parser"; + version = "9.0.1.20210205"; + sha256 = "1lzqbm1nrnw1bydjd9py82rlzznxnnbplzjx80sn966kyyxmlr8v"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array base binary bytestring containers deepseq directory + exceptions filepath ghc-prim hpc pretty process time transformers + unix + ]; + libraryToolDepends = [ alex happy ]; + description = "The GHC API, decoupled from GHC versions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ghc-lib-parser-ex" = callPackage ({ mkDerivation, base, bytestring, containers, directory, extra , filepath, ghc, ghc-boot, ghc-boot-th, tasty, tasty-hunit @@ -100449,6 +100591,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "ghc-lib-parser-ex_9_0_0_1" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, extra + , filepath, ghc, ghc-boot, ghc-boot-th, ghc-lib-parser, tasty + , tasty-hunit, uniplate + }: + mkDerivation { + pname = "ghc-lib-parser-ex"; + version = "9.0.0.1"; + sha256 = "03a98bn50bhqvfrchd5fx0w2x4ddb3ap78wikbb3hfhcgq4843nl"; + libraryHaskellDepends = [ + base bytestring containers ghc-lib-parser uniplate + ]; + testHaskellDepends = [ + base directory extra filepath ghc ghc-boot ghc-boot-th tasty + tasty-hunit uniplate + ]; + description = "Algorithms on GHC parse trees"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ghc-make" = callPackage ({ mkDerivation, base, process, shake, unordered-containers }: mkDerivation { @@ -101110,8 +101273,8 @@ self: { }: mkDerivation { pname = "ghc-vis"; - version = "0.9"; - sha256 = "134m5hzpbggifvigw2f4q6ci1lm5r2457va8lb0j7daiadq7xhcw"; + version = "0.9.1"; + sha256 = "1sqs6hkc2yf7nlbawadzychni8hbl6h9qclf7k11dfrfaqj10f4z"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base cairo containers deepseq fgl ghc-heap-view graphviz gtk3 mtl @@ -101154,24 +101317,25 @@ self: { "ghci-dap" = callPackage ({ mkDerivation, array, base, bytestring, containers, deepseq - , directory, filepath, ghc, ghc-boot, ghc-paths, ghc-prim, ghci - , haskeline, haskell-dap, process, text, time, transformers, unix + , directory, exceptions, filepath, ghc, ghc-boot, ghc-paths + , ghc-prim, ghci, haskeline, haskell-dap, process, text, time + , transformers, unix }: mkDerivation { pname = "ghci-dap"; - version = "0.0.14.0"; - sha256 = "0gnawjk1bzrcinazygwal4kfnqq780v7q4lm0xrvjb50cvixkjpf"; + version = "0.0.15.0"; + sha256 = "1m4ypd2d9bjdkdqrnqijc1na5g14mmjrcr5msgr7spsnskhzi4yg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - array base bytestring containers deepseq directory filepath ghc - ghc-boot ghc-paths ghc-prim ghci haskeline haskell-dap process text - time transformers + array base bytestring containers deepseq directory exceptions + filepath ghc ghc-boot ghc-paths ghc-prim ghci haskeline haskell-dap + process text time transformers ]; executableHaskellDepends = [ - array base bytestring containers deepseq directory filepath ghc - ghc-boot ghc-paths ghc-prim ghci haskeline haskell-dap process text - time transformers unix + array base bytestring containers deepseq directory exceptions + filepath ghc ghc-boot ghc-paths ghc-prim ghci haskeline haskell-dap + process text time transformers unix ]; description = "ghci-dap is a GHCi having DAP interface"; license = lib.licenses.bsd3; @@ -101329,7 +101493,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "ghcide_0_7_0_0" = callPackage + "ghcide" = callPackage ({ mkDerivation, aeson, array, async, base, base16-bytestring , binary, bytestring, case-insensitive, containers, cryptohash-sha1 , data-default, deepseq, directory, extra, filepath, fingertree @@ -101388,15 +101552,15 @@ self: { broken = true; }) {shake-bench = null;}; - "ghcide" = callPackage + "ghcide_0_7_3_0" = callPackage ({ mkDerivation, aeson, array, async, base, base16-bytestring , binary, bytestring, case-insensitive, containers, cryptohash-sha1 , data-default, deepseq, directory, dlist, extra, filepath , fingertree, fuzzy, ghc, ghc-boot, ghc-boot-th, ghc-check , ghc-exactprint, ghc-paths, ghc-typelits-knownnat, gitrev, Glob , haddock-library, hashable, haskell-lsp, haskell-lsp-types - , heapsize, hie-bios, hie-compat, hls-plugin-api, hslogger - , implicit-hie-cradle, lens, lsp-test, mtl, network-uri + , heapsize, hie-bios, hie-compat, hls-plugin-api, hp2pretty + , hslogger, implicit-hie-cradle, lens, lsp-test, mtl, network-uri , opentelemetry, optparse-applicative, parallel, prettyprinter , prettyprinter-ansi-terminal, process, QuickCheck , quickcheck-instances, record-dot-preprocessor, record-hasfield @@ -101408,8 +101572,8 @@ self: { }: mkDerivation { pname = "ghcide"; - version = "0.7.2.0"; - sha256 = "1d35vfwg906djfr2klrql7crgcyabfad12akalx25jc6c7pacv1d"; + version = "0.7.3.0"; + sha256 = "0iak2bwkp0x66cl9axcxq00vmf4yn6y0h8ih4wq6mnavmplbyi3b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -101443,6 +101607,7 @@ self: { benchmarkHaskellDepends = [ aeson base directory filepath shake shake-bench text yaml ]; + benchmarkToolDepends = [ hp2pretty ]; description = "The core of an IDE"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; @@ -101984,7 +102149,7 @@ self: { description = "Gdk bindings"; license = lib.licenses.lgpl21; hydraPlatforms = lib.platforms.none; - }) {gtk4 = null;}; + }) {inherit (pkgs) gtk4;}; "gi-gdkpixbuf" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gdk-pixbuf @@ -102194,7 +102359,7 @@ self: { license = lib.licenses.lgpl21; hydraPlatforms = lib.platforms.none; broken = true; - }) {gtk4 = null;}; + }) {inherit (pkgs) gtk4;}; "gi-gst" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib @@ -102376,7 +102541,7 @@ self: { description = "Gtk bindings"; license = lib.licenses.lgpl21; hydraPlatforms = lib.platforms.none; - }) {gtk4 = null;}; + }) {inherit (pkgs) gtk4;}; "gi-gtk-declarative" = callPackage ({ mkDerivation, async, base, containers, data-default-class @@ -113329,19 +113494,20 @@ self: { "hadolint" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers - , directory, filepath, gitrev, hspec, HsYAML, HUnit + , cryptonite, directory, filepath, gitrev, hspec, HsYAML, HUnit , language-docker, megaparsec, mtl, optparse-applicative, parallel , ShellCheck, split, text, void }: mkDerivation { pname = "hadolint"; - version = "1.20.0"; - sha256 = "1wb2q26najfmmgvj35wvinvip4l1d3k5mazrang4cr3ch8v1nv6w"; + version = "1.21.0"; + sha256 = "1hxp8wl0jh30njd2z5g339qi3zlszy3br21d1pzarziwdabi9vcg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson async base bytestring containers directory filepath HsYAML - language-docker megaparsec mtl parallel ShellCheck split text void + aeson async base bytestring containers cryptonite directory + filepath HsYAML language-docker megaparsec mtl parallel ShellCheck + split text void ]; executableHaskellDepends = [ base containers gitrev language-docker megaparsec @@ -114791,8 +114957,8 @@ self: { ({ mkDerivation, base, containers, random }: mkDerivation { pname = "hanabi-dealer"; - version = "0.11.0.1"; - sha256 = "1w4zxjs6253rxkfhhsvcvpfzzslaxyb3m2c6nbh22l6a1li9bcm9"; + version = "0.11.0.2"; + sha256 = "1ndg8zmcc5a9z9qcc5z5nwssywxighnqxa4pzc5iy7kw4x9bm3kn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers random ]; @@ -117437,15 +117603,12 @@ self: { }) {}; "haskell-dap" = callPackage - ({ mkDerivation, base, containers, unix }: + ({ mkDerivation, base, containers }: mkDerivation { pname = "haskell-dap"; - version = "0.0.14.0"; - sha256 = "1n4w7kvsy7dri07840i6rm6b7fl425f8r3fglbcss42g674k35di"; - isLibrary = true; - isExecutable = true; + version = "0.0.15.0"; + sha256 = "1wk6813pwwnph7w1waci9q6r0glsjpayk27kr43zddwd2v0abcld"; libraryHaskellDepends = [ base containers ]; - executableHaskellDepends = [ base unix ]; description = "Haskell implementation of the DAP interface data"; license = lib.licenses.bsd3; }) {}; @@ -117459,8 +117622,8 @@ self: { }: mkDerivation { pname = "haskell-debug-adapter"; - version = "0.0.33.0"; - sha256 = "1v4dzjv1w0jdp5dyq3qrbdw34433b5xg6wk5hg87agzc3mllbkqa"; + version = "0.0.34.0"; + sha256 = "00z9yhs2c34rdki404gcwf938a2lshr0a7mrvzpknk70n1a0gall"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -117880,8 +118043,6 @@ self: { testToolDepends = [ ghcide ]; description = "LSP server for GHC"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskell-lexer" = callPackage @@ -119992,8 +120153,8 @@ self: { }: mkDerivation { pname = "haskoin-core"; - version = "0.18.0"; - sha256 = "13j8hsyj7x30s6rl8pigvkcwn9ahrwd85y4i8z6728rsjj2ygih3"; + version = "0.19.0"; + sha256 = "0yyrka8hr6jsl7w59j3xmnvzq4gnwz4gybjar2zq1g096shdpk7c"; libraryHaskellDepends = [ aeson array base base16-bytestring bytestring cereal conduit containers cryptonite deepseq entropy hashable hspec memory mtl @@ -120126,41 +120287,41 @@ self: { ({ mkDerivation, aeson, aeson-pretty, base, base64, bytestring , cereal, conduit, containers, data-default, deepseq, filepath , hashable, haskoin-core, haskoin-node, haskoin-store-data, hedis - , hspec, hspec-discover, http-types, monad-logger, mtl, network - , nqe, optparse-applicative, QuickCheck, random + , hspec, hspec-discover, http-types, lens, monad-logger, mtl + , network, nqe, optparse-applicative, QuickCheck, random , rocksdb-haskell-jprupp, rocksdb-query, scotty, string-conversions , text, time, transformers, unliftio, unordered-containers, wai - , warp + , warp, wreq }: mkDerivation { pname = "haskoin-store"; - version = "0.39.0"; - sha256 = "1a1bhsjxb1nj49b5xjv78h89xsc5ffrf9qq1n12ak54ckvw0rgmv"; + version = "0.40.18"; + sha256 = "13zpl2kkirq0nl0sjblllm6gzfj82ghm3i18rh7ak9dxzavjnphy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-pretty base bytestring cereal conduit containers data-default deepseq hashable haskoin-core haskoin-node - haskoin-store-data hedis http-types monad-logger mtl network nqe - random rocksdb-haskell-jprupp rocksdb-query scotty + haskoin-store-data hedis http-types lens monad-logger mtl network + nqe random rocksdb-haskell-jprupp rocksdb-query scotty string-conversions text time transformers unliftio - unordered-containers wai warp + unordered-containers wai warp wreq ]; executableHaskellDepends = [ aeson aeson-pretty base bytestring cereal conduit containers data-default deepseq filepath hashable haskoin-core haskoin-node - haskoin-store-data hedis http-types monad-logger mtl network nqe - optparse-applicative random rocksdb-haskell-jprupp rocksdb-query - scotty string-conversions text time transformers unliftio - unordered-containers wai warp + haskoin-store-data hedis http-types lens monad-logger mtl network + nqe optparse-applicative random rocksdb-haskell-jprupp + rocksdb-query scotty string-conversions text time transformers + unliftio unordered-containers wai warp wreq ]; testHaskellDepends = [ aeson aeson-pretty base base64 bytestring cereal conduit containers data-default deepseq hashable haskoin-core haskoin-node - haskoin-store-data hedis hspec http-types monad-logger mtl network - nqe QuickCheck random rocksdb-haskell-jprupp rocksdb-query scotty - string-conversions text time transformers unliftio - unordered-containers wai warp + haskoin-store-data hedis hspec http-types lens monad-logger mtl + network nqe QuickCheck random rocksdb-haskell-jprupp rocksdb-query + scotty string-conversions text time transformers unliftio + unordered-containers wai warp wreq ]; testToolDepends = [ hspec-discover ]; description = "Storage and index for Bitcoin and Bitcoin Cash"; @@ -120173,21 +120334,22 @@ self: { ({ mkDerivation, aeson, base, bytestring, cereal, containers , data-default, deepseq, hashable, haskoin-core, hspec , hspec-discover, http-client, http-types, lens, mtl, network - , QuickCheck, scotty, string-conversions, text, wreq + , QuickCheck, scotty, string-conversions, text + , unordered-containers, wreq }: mkDerivation { pname = "haskoin-store-data"; - version = "0.38.1"; - sha256 = "0x3p0fylfc8llv94nmjaz9537qp2jwm5zlbs8mw7b4lh9z69f3ba"; + version = "0.40.2"; + sha256 = "08c2ga6j5himcprsyyd2jw3mygsj7if6i9h4mrg4m4v8x31vhg3f"; libraryHaskellDepends = [ aeson base bytestring cereal containers data-default deepseq hashable haskoin-core http-client http-types lens mtl network - scotty string-conversions text wreq + scotty string-conversions text unordered-containers wreq ]; testHaskellDepends = [ aeson base bytestring cereal containers data-default deepseq hashable haskoin-core hspec http-client http-types lens mtl network - QuickCheck scotty string-conversions text wreq + QuickCheck scotty string-conversions text unordered-containers wreq ]; testToolDepends = [ hspec-discover ]; description = "Data for Haskoin Store"; @@ -120860,10 +121022,8 @@ self: { ({ mkDerivation, base, doctest }: mkDerivation { pname = "haskus-utils-types"; - version = "1.5"; - sha256 = "1mbgnx4i82g9bq1qpvjjs9yb683gfja5bws8y26mzjl4igk6izsy"; - revision = "1"; - editedCabalFile = "1mjwmk5prbrb91dbhxg9pp47zf5cfnnm07h3f2m902af3l0yjiih"; + version = "1.5.1"; + sha256 = "1nm5nn45r2c9f20j7v0v3abkbglyi45wmyrigy1v65c5lk4g57r5"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest ]; description = "Haskus types utility modules"; @@ -123404,8 +123564,8 @@ self: { ({ mkDerivation, async, base, io-streams, time }: mkDerivation { pname = "heartbeat-streams"; - version = "0.1.0.2"; - sha256 = "059dx7paaniwmxgyzapv0542jf8yb4vzbg8501d2j779ixvzm80d"; + version = "0.1.0.3"; + sha256 = "004dkld0friilhb9j1fhibzndchkljxzqm6k99zli4h83q787wlf"; libraryHaskellDepends = [ async base io-streams time ]; description = "Heartbeats for io-streams"; license = lib.licenses.bsd3; @@ -123726,6 +123886,20 @@ self: { broken = true; }) {}; + "hedgehog-fakedata_0_0_1_4" = callPackage + ({ mkDerivation, base, containers, fakedata, hedgehog, random }: + mkDerivation { + pname = "hedgehog-fakedata"; + version = "0.0.1.4"; + sha256 = "1pa8kf6pxsvmfy8r29xk486cdi38881blqj1lcnjya98ilb6ldx3"; + libraryHaskellDepends = [ base fakedata hedgehog random ]; + testHaskellDepends = [ base containers fakedata hedgehog ]; + description = "Use 'fakedata' with 'hedgehog'"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "hedgehog-fn" = callPackage ({ mkDerivation, base, contravariant, hedgehog, transformers }: mkDerivation { @@ -123859,8 +124033,8 @@ self: { }: mkDerivation { pname = "hedis"; - version = "0.14.1"; - sha256 = "0n7hwg8mp4v512g7s8cblmai0j00l1149bbdacm6s7d0plnk0qqd"; + version = "0.14.2"; + sha256 = "1zm8llpbbvr5f5s0i4qsn025734s1mamfvm1dgxw4p87m9zhprlm"; libraryHaskellDepends = [ async base bytestring bytestring-lexing containers deepseq errors exceptions HTTP mtl network network-uri resource-pool scanner stm @@ -125106,31 +125280,31 @@ self: { "hevm" = callPackage ({ mkDerivation, abstract-par, aeson, ansi-wl-pprint, async, base , base16-bytestring, binary, brick, bytestring, cereal, containers - , cryptonite, data-dword, deepseq, directory, fgl, filepath, free - , haskeline, here, HUnit, lens, lens-aeson, libff, megaparsec - , memory, monad-par, mtl, multiset, operational, optparse-generic - , process, QuickCheck, quickcheck-text, regex-tdfa, restless-git - , rosezipper, s-cargot, sbv, scientific, secp256k1, semver-range - , tasty, tasty-hunit, tasty-quickcheck, temporary, text - , text-format, time, transformers, tree-view, unordered-containers - , vector, vty, witherable, wreq + , cryptonite, data-dword, Decimal, deepseq, directory, fgl + , filepath, free, haskeline, here, HUnit, lens, lens-aeson, libff + , megaparsec, memory, monad-par, mtl, multiset, operational + , optparse-generic, process, QuickCheck, quickcheck-text + , regex-tdfa, restless-git, rosezipper, s-cargot, sbv, scientific + , secp256k1, semver-range, tasty, tasty-hunit, tasty-quickcheck + , temporary, text, text-format, time, transformers, tree-view + , unordered-containers, vector, vty, witherable, wreq }: mkDerivation { pname = "hevm"; - version = "0.42.0"; - sha256 = "0p736bxsg91l7n82xad52j5gqvyx6ik7hbmlnnz5bsrnsm05maxz"; + version = "0.44.1"; + sha256 = "1ygrksnqav1cw9pq1x2xi0na5fxy0phyc0v48nkzpis868gy0b97"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ abstract-par aeson ansi-wl-pprint base base16-bytestring binary - brick bytestring cereal containers cryptonite data-dword deepseq - directory fgl filepath free haskeline lens lens-aeson megaparsec - memory monad-par mtl multiset operational optparse-generic process - QuickCheck quickcheck-text regex-tdfa restless-git rosezipper - s-cargot sbv scientific semver-range temporary text text-format - time transformers tree-view unordered-containers vector vty - witherable wreq + brick bytestring cereal containers cryptonite data-dword Decimal + deepseq directory fgl filepath free haskeline lens lens-aeson + megaparsec memory monad-par mtl multiset operational + optparse-generic process QuickCheck quickcheck-text regex-tdfa + restless-git rosezipper s-cargot sbv scientific semver-range + temporary text text-format time transformers tree-view + unordered-containers vector vty witherable wreq ]; librarySystemDepends = [ libff secp256k1 ]; executableHaskellDepends = [ @@ -125398,8 +125572,8 @@ self: { }: mkDerivation { pname = "hexpat-streamparser"; - version = "0.0.1"; - sha256 = "09klv9if55rlhjrh7cw68kk9z3mrwm1p2agb7a23j8a68iga5gvi"; + version = "0.0.2"; + sha256 = "11g78dkr9dp4kgz8zmckgq66587qahdhxyhcn03ajr0b07ab27z3"; libraryHaskellDepends = [ base bytestring hexpat List mtl parser-combinators text transformers @@ -127071,8 +127245,8 @@ self: { }: mkDerivation { pname = "hindent"; - version = "5.3.1"; - sha256 = "008s8zm9qs972b7v5kkmr8l3i9kc6zm7yj33mkw6dv69b7h3c01l"; + version = "5.3.2"; + sha256 = "129gkn8qg68wsd60mq8yk7hrqsc8sd8v56xn41m5ii3hriq1mmv7"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -127763,6 +127937,17 @@ self: { license = lib.licenses.bsd3; }) {}; + "histogram-simple" = callPackage + ({ mkDerivation, base, containers }: + mkDerivation { + pname = "histogram-simple"; + version = "1.0"; + sha256 = "11x8v0svvsc0impf59vixbsaxh5nwvyc9wmw9xkshd4k4a30bdb8"; + libraryHaskellDepends = [ base containers ]; + description = "Simple Data.Map-based histogram"; + license = lib.licenses.bsd3; + }) {}; + "historian" = callPackage ({ mkDerivation, base, containers, directory, filepath, process , regex-compat, regex-posix @@ -128266,8 +128451,8 @@ self: { }: mkDerivation { pname = "hledger"; - version = "1.20.3"; - sha256 = "1wy45ppcakml2wk021yr8kqv0q0x85vms8kx0npjawzbs498qqx9"; + version = "1.20.4"; + sha256 = "1fsdh4k0lrlx3n81hns8h2dh917i0cmh1iax55d9q7jlxvy5bq95"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -128467,8 +128652,8 @@ self: { }: mkDerivation { pname = "hledger-lib"; - version = "1.20.3"; - sha256 = "0pm6ckim1krkg4x7azspsnc1alwynqnjdhxrda764xyrz9s0r8cp"; + version = "1.20.4"; + sha256 = "17fs3jh3wx1hgzijqpw0s57hq6hq43fadplmqkcjw1ikgm8h0zyw"; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal array base base-compat-batteries blaze-markup bytestring call-stack cassava cassava-megaparsec @@ -128544,8 +128729,8 @@ self: { }: mkDerivation { pname = "hledger-ui"; - version = "1.20.3"; - sha256 = "02g6xdxif67fjj6rjskw69cxhx2irwv7sk0b1slr20nch122pzl1"; + version = "1.20.4"; + sha256 = "0y9jyv4mphzyla70z365l5dwg50chsng011bazzpfwr6w889803i"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -128591,8 +128776,8 @@ self: { }: mkDerivation { pname = "hledger-web"; - version = "1.20.3"; - sha256 = "1dz3lwp86dlmdrnj5hda12219x03xw8csxk0bjysn43rjzxag4q4"; + version = "1.20.4"; + sha256 = "06psp5r6blj3s1z8zg515jgw58pyxy43qinh5cl161fxcl8ldfn4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -128886,8 +129071,8 @@ self: { }: mkDerivation { pname = "hls-eval-plugin"; - version = "0.1.0.5"; - sha256 = "1vfsvhn7b5w537hsri6bz36c547pxv13jyjvj1a5934jzyzvv9qn"; + version = "0.1.0.0"; + sha256 = "1rghn0p8qqh9vh0x1ib2w00vv74y8j9qj2ydhwc68viii03wpjan"; libraryHaskellDepends = [ aeson base containers deepseq Diff directory extra filepath ghc ghc-boot-th ghc-paths ghcide hashable haskell-lsp haskell-lsp-types @@ -128899,6 +129084,30 @@ self: { license = lib.licenses.asl20; }) {}; + "hls-eval-plugin_0_2_0_0" = callPackage + ({ mkDerivation, aeson, base, containers, deepseq, Diff, directory + , dlist, extra, filepath, ghc, ghc-boot-th, ghc-paths, ghcide + , hashable, haskell-lsp, haskell-lsp-types, hls-plugin-api, lens + , megaparsec, mtl, parser-combinators, pretty-simple, QuickCheck + , safe-exceptions, shake, temporary, text, time, transformers + , unordered-containers + }: + mkDerivation { + pname = "hls-eval-plugin"; + version = "0.2.0.0"; + sha256 = "0l85qia3gsdafxmkidr26sxgajvp46hcphkb1l8vm6q7h6jgj0d5"; + libraryHaskellDepends = [ + aeson base containers deepseq Diff directory dlist extra filepath + ghc ghc-boot-th ghc-paths ghcide hashable haskell-lsp + haskell-lsp-types hls-plugin-api lens megaparsec mtl + parser-combinators pretty-simple QuickCheck safe-exceptions shake + temporary text time transformers unordered-containers + ]; + description = "Eval plugin for Haskell Language Server"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "hls-exactprint-utils" = callPackage ({ mkDerivation, base, dlist, ghc, ghc-exactprint, ghcide , haskell-lsp-types, hls-plugin-api, retrie, syb, text @@ -128931,8 +129140,6 @@ self: { ]; description = "Explicit imports plugin for Haskell Language Server"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hls-haddock-comments-plugin" = callPackage @@ -128941,10 +129148,8 @@ self: { }: mkDerivation { pname = "hls-haddock-comments-plugin"; - version = "0.1.0.0"; - sha256 = "12zs6yq39jpg3x6w9y5a5jri5rfh8qpxawdhmhiqm067zjnj9xi4"; - revision = "1"; - editedCabalFile = "0kddmrlmcsa1d22mqzw1wsh82x4nn0ff4xbwci7585i9z61mzhg2"; + version = "0.1.1.0"; + sha256 = "1kqkdbwx34k109dk3bl57hk2mcqw1cjj7l5382qfwy5bky4zjihn"; libraryHaskellDepends = [ base containers ghc ghc-exactprint ghcide haskell-lsp-types hls-plugin-api text unordered-containers @@ -128974,8 +129179,28 @@ self: { ]; description = "Hlint integration plugin with Haskell Language Server"; license = lib.licenses.asl20; + }) {}; + + "hls-hlint-plugin_0_2_0_0" = callPackage + ({ mkDerivation, aeson, apply-refact, base, binary, bytestring + , containers, data-default, deepseq, Diff, directory, extra + , filepath, ghc, ghc-exactprint, ghcide, hashable, haskell-lsp + , hlint, hls-plugin-api, hslogger, lens, regex-tdfa, shake + , temporary, text, transformers, unordered-containers + }: + mkDerivation { + pname = "hls-hlint-plugin"; + version = "0.2.0.0"; + sha256 = "0v822s8m6iy7s0sld06gwh3ly20na0624s5g4642kkb2facbhm7d"; + libraryHaskellDepends = [ + aeson apply-refact base binary bytestring containers data-default + deepseq Diff directory extra filepath ghc ghc-exactprint ghcide + hashable haskell-lsp hlint hls-plugin-api hslogger lens regex-tdfa + shake temporary text transformers unordered-containers + ]; + description = "Hlint integration plugin with Haskell Language Server"; + license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hls-plugin-api" = callPackage @@ -128998,6 +129223,25 @@ self: { license = lib.licenses.asl20; }) {}; + "hls-plugin-api_0_7_0_0" = callPackage + ({ mkDerivation, aeson, base, containers, data-default, Diff + , hashable, haskell-lsp, hslogger, lens, process, regex-tdfa, shake + , text, unix, unordered-containers + }: + mkDerivation { + pname = "hls-plugin-api"; + version = "0.7.0.0"; + sha256 = "1cpl65ay55k3lvwsvqzwbg0c6lkzmiki2qvk6lj2dn6rcry9gk55"; + libraryHaskellDepends = [ + aeson base containers data-default Diff hashable haskell-lsp + hslogger lens process regex-tdfa shake text unix + unordered-containers + ]; + description = "Haskell Language Server API for plugin communication"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "hls-retrie-plugin" = callPackage ({ mkDerivation, aeson, base, containers, deepseq, directory, extra , ghc, ghcide, hashable, haskell-lsp, haskell-lsp-types @@ -129015,24 +129259,21 @@ self: { ]; description = "Retrie integration plugin for Haskell Language Server"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hls-splice-plugin" = callPackage ({ mkDerivation, aeson, base, containers, dlist, foldl, ghc - , ghc-exactprint, ghcide, haskell-lsp, hls-exactprint-utils - , hls-plugin-api, lens, retrie, shake, syb, text, transformers - , unordered-containers + , ghc-exactprint, ghcide, haskell-lsp, hls-plugin-api, lens, retrie + , shake, syb, text, transformers, unordered-containers }: mkDerivation { pname = "hls-splice-plugin"; - version = "0.1.0.0"; - sha256 = "10zqgczp1mx81ac8fh59dp1hipfh09w4hnxylqjhj6c6wzgwa4cj"; + version = "0.3.0.0"; + sha256 = "1mi9951hgq7mcwry5mdi4ywxk3jkzs47x7q4nvm2svkpvgnbfhdv"; libraryHaskellDepends = [ aeson base containers dlist foldl ghc ghc-exactprint ghcide - haskell-lsp hls-exactprint-utils hls-plugin-api lens retrie shake - syb text transformers unordered-containers + haskell-lsp hls-plugin-api lens retrie shake syb text transformers + unordered-containers ]; description = "HLS Plugin to expand TemplateHaskell Splices and QuasiQuotes"; license = lib.licenses.asl20; @@ -132371,25 +132612,25 @@ self: { "hpqtypes-extras" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, containers - , cryptohash, exceptions, fields-json, hpqtypes, lifted-base - , log-base, monad-control, mtl, safe, semigroups, tasty - , tasty-hunit, text, text-show, transformers, uuid-types + , cryptohash, deepseq, exceptions, extra, fields-json, hpqtypes + , lifted-base, log-base, monad-control, mtl, QuickCheck, safe + , semigroups, tasty, tasty-bench, tasty-hunit, text, text-show + , time, transformers, uuid-types }: mkDerivation { pname = "hpqtypes-extras"; - version = "1.10.3.0"; - sha256 = "1ifr6z89ki541b9x3kpyf10vbn3anhfcq8ppqwyp5zvmkx0q3wqs"; - revision = "1"; - editedCabalFile = "0pa13k78w0xm59pvlsd9rmg9ddi3jkc918j5i0hb4vlxcaivq34y"; + version = "1.10.4.0"; + sha256 = "0qlxhq4vkr0qq1ckazb0lng9mbnljh32xsmcpbp5qm01bngadz56"; libraryHaskellDepends = [ base base16-bytestring bytestring containers cryptohash exceptions - fields-json hpqtypes lifted-base log-base monad-control mtl safe - semigroups text text-show + extra fields-json hpqtypes lifted-base log-base monad-control mtl + safe semigroups text text-show ]; testHaskellDepends = [ - base exceptions hpqtypes lifted-base log-base monad-control tasty - tasty-hunit text transformers uuid-types + base exceptions hpqtypes lifted-base log-base monad-control + QuickCheck tasty tasty-hunit text time transformers uuid-types ]; + benchmarkHaskellDepends = [ base deepseq tasty-bench ]; description = "Extra utilities for hpqtypes library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -135568,6 +135809,22 @@ self: { license = lib.licenses.mit; }) {}; + "hslua-module-path" = callPackage + ({ mkDerivation, base, filepath, hslua, tasty, tasty-hunit + , tasty-lua, text + }: + mkDerivation { + pname = "hslua-module-path"; + version = "0.1.0"; + sha256 = "18z6k9nlba0a1f0fdfw0cr0y5daa381dfmrinfp70c8r3dh7w7ny"; + libraryHaskellDepends = [ base filepath hslua text ]; + testHaskellDepends = [ + base filepath hslua tasty tasty-hunit tasty-lua text + ]; + description = "Lua module to work with file paths"; + license = lib.licenses.mit; + }) {}; + "hslua-module-system" = callPackage ({ mkDerivation, base, containers, directory, exceptions, hslua , tasty, tasty-hunit, tasty-lua, temporary, text @@ -138430,7 +138687,7 @@ self: { license = lib.licenses.mit; }) {}; - "http-client_0_7_4" = callPackage + "http-client_0_7_5" = callPackage ({ mkDerivation, array, async, base, base64-bytestring , blaze-builder, bytestring, case-insensitive, containers, cookie , deepseq, directory, exceptions, filepath, ghc-prim, hspec @@ -138439,8 +138696,8 @@ self: { }: mkDerivation { pname = "http-client"; - version = "0.7.4"; - sha256 = "1a4vhhn8y5qcqd4i2q7pl9jqfrsh65nkv32qcsc80cjy2bcqivjs"; + version = "0.7.5"; + sha256 = "11p4szyrdl0ck2iixdrq2dcjz9dlv4pd36ymkipmq7c28l1cvy7k"; libraryHaskellDepends = [ array base base64-bytestring blaze-builder bytestring case-insensitive containers cookie deepseq exceptions filepath @@ -139924,8 +140181,8 @@ self: { pname = "hum"; version = "0.2.0.0"; sha256 = "144b1161rvlmayklvgm7cajs0jz5bhlbcgrq288pvymlyl4f962b"; - revision = "1"; - editedCabalFile = "07d19lqi5djdsda976qr1w8ps535dxxjsp0lr43b62cinw2ssnki"; + revision = "2"; + editedCabalFile = "03hh7nyqchskkp4iqcq335mnpdsvgdw8d1pf3dp7p4wmsk20kwmk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -139945,8 +140202,6 @@ self: { ]; description = "A TUI MPD client, inspired by ncmpcpp"; license = lib.licenses.gpl2Plus; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "human-parse" = callPackage @@ -140323,8 +140578,8 @@ self: { }: mkDerivation { pname = "husk-scheme"; - version = "3.19.3"; - sha256 = "0bb4iph3pp26rm9sdsjsshbig3misd1yr4waqblj8vr9fmrpx084"; + version = "3.20"; + sha256 = "11pghca4msm5nw1zdw3qlxzhmcwl9xg5hyvjd9z7869a3qahid5q"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -141135,8 +141390,8 @@ self: { }: mkDerivation { pname = "hw-kafka-client"; - version = "4.0.2"; - sha256 = "166gi8mj2ljv4xcjrhi2pgjmnj112998fzbzjfpf5ckj54d20ch9"; + version = "4.0.3"; + sha256 = "1s3wj5ih9mc7vp0w9rymw22w1yxp8z3qi7qmza9qw00aail8c5dg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -144600,8 +144855,8 @@ self: { }: mkDerivation { pname = "imperative-edsl"; - version = "0.8"; - sha256 = "0mz6yy472wvcg4ywjhaaqi0cxyy9l437pw4rkwd2j392n6hlfbar"; + version = "0.8.1"; + sha256 = "1z1a7b7m69m9xagvfa6xx3l1j0s7lrlvp4n09lra1x3q7lpfgnra"; libraryHaskellDepends = [ array base BoundedChan containers data-default-class deepseq directory exception-transformers ghc-prim language-c-quote @@ -144915,8 +145170,8 @@ self: { }: mkDerivation { pname = "in-other-words"; - version = "0.1.1.0"; - sha256 = "0f11si2bnxw2bm5mfnnqh9cfwhlzdcqkw5dfjql1y618db808am9"; + version = "0.2.0.0"; + sha256 = "0adl539jilc3rnwx9ir39y97f6h60xavzhhc8pa9vc6gqp1v4g20"; libraryHaskellDepends = [ async base exceptions monad-control mtl stm transformers transformers-base @@ -144930,6 +145185,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "in-other-words-plugin" = callPackage + ({ mkDerivation, base, containers, ghc, ghc-tcplugins-extra, hspec + , hspec-discover, in-other-words, syb, transformers + }: + mkDerivation { + pname = "in-other-words-plugin"; + version = "0.1.0.0"; + sha256 = "02c6qprny0x1qs5zpcma07vr3ikrksr18gqxpvf9hx55w3pnni0w"; + libraryHaskellDepends = [ + base containers ghc ghc-tcplugins-extra in-other-words syb + transformers + ]; + testHaskellDepends = [ + base containers ghc ghc-tcplugins-extra hspec in-other-words syb + transformers + ]; + testToolDepends = [ hspec-discover ]; + description = "Disambiguate obvious uses of effects when using in-other-words"; + license = lib.licenses.bsd3; + }) {}; + "inbox" = callPackage ({ mkDerivation, async, base, error-or, text, time }: mkDerivation { @@ -147408,6 +147684,8 @@ self: { pname = "io-streams"; version = "1.5.2.0"; sha256 = "1hbabrk5145d77qi23688piaf1wc93n8vaj846n0s3zk953z1lk3"; + revision = "1"; + editedCabalFile = "1dcadj5gv1m2yy97zsbq5x67vsblp8gy58a0kl5di9vkbgrcw46n"; configureFlags = [ "-fnointeractivetests" ]; libraryHaskellDepends = [ attoparsec base bytestring bytestring-builder network primitive @@ -149364,12 +149642,13 @@ self: { "j" = callPackage ({ mkDerivation, base, bytestring, repa, tasty, tasty-hunit, unix + , vector }: mkDerivation { pname = "j"; - version = "0.2.1.1"; - sha256 = "14mmqdkh73idqsxsvgvz5nfv7n0ashj35amawzy63zs80hfmqcf2"; - libraryHaskellDepends = [ base bytestring repa unix ]; + version = "0.2.2.0"; + sha256 = "1lmk6zw5w51d6aglykiyp9qpa656qs9imf99nalzn7qldsz81aqd"; + libraryHaskellDepends = [ base bytestring repa unix vector ]; testHaskellDepends = [ base bytestring repa tasty tasty-hunit ]; description = "J in Haskell"; license = lib.licenses.bsd3; @@ -151648,8 +151927,8 @@ self: { }: mkDerivation { pname = "jsonifier"; - version = "0.1.0.6"; - sha256 = "0yhczdq3m79xbg04hcahl2c75kipm5szahr7bmj8xjml4zxzd3bk"; + version = "0.1.1"; + sha256 = "09w92adnjskx7cxyki415nqxdzqfz78rcqisk1g862r92907ibwf"; libraryHaskellDepends = [ base bytestring ptr-poker scientific text ]; @@ -154564,6 +154843,22 @@ self: { broken = true; }) {}; + "kparams" = callPackage + ({ mkDerivation, base, HUnit }: + mkDerivation { + pname = "kparams"; + version = "0.1.0.0"; + sha256 = "0q1ma3qm2anpr6w4xa78wh97b7pzy85ggjiiwbd0gb7b0vwbglx0"; + isLibrary = false; + isExecutable = true; + libraryHaskellDepends = [ base ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base HUnit ]; + doHaddock = false; + description = "Extracts values from /proc/cmdline"; + license = lib.licenses.mit; + }) {}; + "kqueue" = callPackage ({ mkDerivation, base, c2hs, directory, filepath, mtl, time, unix }: @@ -157810,8 +158105,8 @@ self: { }: mkDerivation { pname = "launchdarkly-server-sdk"; - version = "2.0.2"; - sha256 = "01c42wyjvnd1wp665p2khjsm1apc9kw3gw6mnlwbdgsimhj8v4z0"; + version = "2.1.0"; + sha256 = "1nj6jcmara4x8y292q5qacli6hmfhahw856a0nyngca2c8m5mwr1"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring bytestring bytestring-conversion clock containers cryptohash exceptions extra @@ -158107,8 +158402,8 @@ self: { pname = "lazy-io-streams"; version = "0.1.0.0"; sha256 = "022x0sikvdsvpp0gh7q82sdpd5kxd2zmprdpmf7z4c3hf4xk9vxy"; - revision = "1"; - editedCabalFile = "0pn446g45naqh92g9mib98fw5xznbp6r4x27acmnqrmlcqjz9jsm"; + revision = "2"; + editedCabalFile = "01r6i81rxm6rng50yhfj84z3dvhcbap10sfqigg01mfmy4zn9pnl"; libraryHaskellDepends = [ base bytestring io-streams ]; description = "Get lazy with your io-streams"; license = lib.licenses.bsd3; @@ -158887,8 +159182,8 @@ self: { pname = "lens"; version = "4.19.2"; sha256 = "0fy2vr5r11cc6ana8m2swqgs3zals4kims55vd6119bi76p5iy2j"; - revision = "3"; - editedCabalFile = "1anqghjbi0wyvqpg7qcbph5rfq78sjpdavrajh4z6f20kzy4mn45"; + revision = "4"; + editedCabalFile = "013cfgb5q2zq02pb8dlyzmb6sfp8k82af609srmqda26kccbyci2"; setupHaskellDepends = [ base Cabal cabal-doctest filepath ]; libraryHaskellDepends = [ array base base-orphans bifunctors bytestring call-stack comonad @@ -159170,6 +159465,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "lens-process_0_4_0_0" = callPackage + ({ mkDerivation, base, filepath, lens, process, tasty, tasty-hunit + }: + mkDerivation { + pname = "lens-process"; + version = "0.4.0.0"; + sha256 = "1gms2bxa1sygpid09cg3nk1kyhkg4s38dqs0gd77ia2aln6zd7qg"; + libraryHaskellDepends = [ base filepath lens process ]; + testHaskellDepends = [ + base filepath lens process tasty tasty-hunit + ]; + description = "Optics for system processes"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "lens-properties" = callPackage ({ mkDerivation, base, lens, QuickCheck, transformers }: mkDerivation { @@ -159812,14 +160123,14 @@ self: { }) {}; "libBF" = callPackage - ({ mkDerivation, base, deepseq }: + ({ mkDerivation, base, deepseq, hashable }: mkDerivation { pname = "libBF"; - version = "0.5.1"; - sha256 = "0iwbkfbp26z1zmnk28mnkvyh8k0i0bx56wl2jwygdnqvl5lmfv6i"; + version = "0.6"; + sha256 = "01dh44fj1fhg912hw6p0r1ng7spm59xpzwc1rps8p2lcsicj4gvw"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base deepseq ]; + libraryHaskellDepends = [ base deepseq hashable ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "A binding to the libBF library"; @@ -160858,8 +161169,8 @@ self: { }: mkDerivation { pname = "licensor"; - version = "0.4.1"; - sha256 = "0p1wnyff2v23405v42ks5m3lyxhcahmcs3vh2qc5kz4q7ybnks7b"; + version = "0.4.2"; + sha256 = "1knmd13plijk4f1pzk8h3br69agjqzajgr9n3d180w6ask1iaz4z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -160928,6 +161239,27 @@ self: { license = lib.licenses.mpl20; }) {}; + "lifetimes" = callPackage + ({ mkDerivation, base, containers, hspec, monad-stm + , safe-exceptions, stm, transformers, zenhack-prelude + }: + mkDerivation { + pname = "lifetimes"; + version = "0.1.0.0"; + sha256 = "192bzz4nqqi2kdk9x4nxlwmx0mf0sshqdcnx1dgyjh5z9k29rww5"; + libraryHaskellDepends = [ + base containers monad-stm stm transformers zenhack-prelude + ]; + testHaskellDepends = [ + base containers hspec monad-stm safe-exceptions stm transformers + zenhack-prelude + ]; + description = "Flexible manual resource management"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "lift-generics" = callPackage ({ mkDerivation, base, base-compat, generic-deriving, ghc-prim , hspec, hspec-discover, mtl, template-haskell, th-compat @@ -161462,36 +161794,6 @@ self: { "linear" = callPackage ({ mkDerivation, adjunctions, base, base-orphans, binary, bytes - , bytestring, Cabal, cabal-doctest, cereal, containers, deepseq - , distributive, doctest, ghc-prim, hashable, HUnit, lens, random - , reflection, semigroupoids, semigroups, simple-reflect, tagged - , template-haskell, test-framework, test-framework-hunit - , transformers, transformers-compat, unordered-containers, vector - , void - }: - mkDerivation { - pname = "linear"; - version = "1.21.3"; - sha256 = "12gn571cfchrj9zir30c86vib3ppjia5908di21pnsfy6dmw6994"; - revision = "1"; - editedCabalFile = "17cbb44yyfcxz9fybv05yxli8gdfka415dwrp7vh804q7qxs5vna"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - adjunctions base base-orphans binary bytes cereal containers - deepseq distributive ghc-prim hashable lens random reflection - semigroupoids semigroups tagged template-haskell transformers - transformers-compat unordered-containers vector void - ]; - testHaskellDepends = [ - base binary bytestring deepseq doctest HUnit lens reflection - simple-reflect test-framework test-framework-hunit vector - ]; - description = "Linear Algebra"; - license = lib.licenses.bsd3; - }) {}; - - "linear_1_21_4" = callPackage - ({ mkDerivation, adjunctions, base, base-orphans, binary, bytes , bytestring, cereal, containers, deepseq, distributive, ghc-prim , hashable, HUnit, lens, random, reflection, semigroupoids , semigroups, simple-reflect, tagged, template-haskell @@ -161514,7 +161816,6 @@ self: { ]; description = "Linear Algebra"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "linear-accelerate" = callPackage @@ -169488,36 +169789,37 @@ self: { "matterhorn" = callPackage ({ mkDerivation, aeson, aspell-pipe, async, base, base-compat - , brick, brick-skylighting, bytestring, cheapskate, checkers - , config-ini, connection, containers, data-clist, directory - , filepath, gitrev, hashable, Hclip, mattermost-api - , mattermost-api-qc, microlens-platform, mtl, network-uri, process - , random, semigroups, skylighting-core, split, stm, stm-delay - , strict, tasty, tasty-hunit, tasty-quickcheck, temporary, text - , text-zipper, time, timezone-olson, timezone-series, transformers - , Unique, unix, unordered-containers, utf8-string, uuid, vector - , vty, word-wrap, xdg-basedir + , brick, brick-skylighting, bytestring, checkers, commonmark + , commonmark-extensions, config-ini, connection, containers + , data-clist, directory, filepath, gitrev, hashable, Hclip + , mattermost-api, mattermost-api-qc, microlens-platform, mtl + , network-uri, parsec, process, random, semigroups + , skylighting-core, split, stm, stm-delay, strict, tasty + , tasty-hunit, tasty-quickcheck, temporary, text, text-zipper, time + , timezone-olson, timezone-series, transformers, Unique, unix + , unordered-containers, utf8-string, uuid, vector, vty, word-wrap + , xdg-basedir }: mkDerivation { pname = "matterhorn"; - version = "50200.11.0"; - sha256 = "0wvw3wbv2sii1bjc8nmwyb1k0hzixfkfvpkmlkwa2my564vvmgz8"; + version = "50200.12.0"; + sha256 = "0rsxgc4igcjhddfil01la1sbnglvr08mf7gfi9fr6pf7sb9w6qbq"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson aspell-pipe async base base-compat brick brick-skylighting - bytestring cheapskate config-ini connection containers data-clist - directory filepath gitrev hashable Hclip mattermost-api - microlens-platform mtl network-uri process random semigroups - skylighting-core split stm stm-delay strict temporary text - text-zipper time timezone-olson timezone-series transformers unix - unordered-containers utf8-string uuid vector vty word-wrap - xdg-basedir + bytestring commonmark commonmark-extensions config-ini connection + containers data-clist directory filepath gitrev hashable Hclip + mattermost-api microlens-platform mtl network-uri parsec process + random semigroups skylighting-core split stm stm-delay strict + temporary text text-zipper time timezone-olson timezone-series + transformers unix unordered-containers utf8-string uuid vector vty + word-wrap xdg-basedir ]; executableHaskellDepends = [ base text ]; testHaskellDepends = [ - base bytestring cheapskate checkers containers mattermost-api + base bytestring checkers commonmark containers mattermost-api mattermost-api-qc tasty tasty-hunit tasty-quickcheck text time Unique uuid ]; @@ -169536,8 +169838,8 @@ self: { }: mkDerivation { pname = "mattermost-api"; - version = "50200.9.0"; - sha256 = "08whhlkr3ayimn66lwinvv0ci8zbhk5i7sz1fk5r1dp7mg2jzgig"; + version = "50200.10.0"; + sha256 = "0pbp4f0gwhap8d9chn6c2zf22ic3r32302zir4a5r6cmgg4vscgd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -169561,8 +169863,8 @@ self: { }: mkDerivation { pname = "mattermost-api-qc"; - version = "50200.9.0"; - sha256 = "0rcbsf5hrp2fd9jqmcr07gg2y0xg4ksasrqfxrc7n4mgw0a409i6"; + version = "50200.10.0"; + sha256 = "0cv7l5g63ar7ii704j8q3y5hsvbmljm8cmgdw6p2shqigv8slzci"; libraryHaskellDepends = [ base containers mattermost-api QuickCheck text time ]; @@ -173756,7 +174058,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "mmorph" = callPackage + "mmorph_1_1_3" = callPackage ({ mkDerivation, base, mtl, transformers, transformers-compat }: mkDerivation { pname = "mmorph"; @@ -173767,6 +174069,22 @@ self: { ]; description = "Monad morphisms"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + + "mmorph" = callPackage + ({ mkDerivation, base, mtl, transformers, transformers-compat }: + mkDerivation { + pname = "mmorph"; + version = "1.1.4"; + sha256 = "1hxyyh0x58kjdsyf1kj2kibjxzk2d9rcabv2y9vrpb59w85lqanz"; + revision = "1"; + editedCabalFile = "0xvwjcfpy6243wiwgyckmwc1nbw31y32n3hrrswdjw21znz894yl"; + libraryHaskellDepends = [ + base mtl transformers transformers-compat + ]; + description = "Monad morphisms"; + license = lib.licenses.bsd3; }) {}; "mmsyn2" = callPackage @@ -174219,6 +174537,33 @@ self: { license = lib.licenses.bsd3; }) {}; + "modern-uri_0_3_3_1" = callPackage + ({ mkDerivation, base, bytestring, containers, contravariant + , criterion, deepseq, exceptions, hspec, hspec-discover + , hspec-megaparsec, megaparsec, mtl, profunctors, QuickCheck + , reflection, tagged, template-haskell, text, weigh + }: + mkDerivation { + pname = "modern-uri"; + version = "0.3.3.1"; + sha256 = "0h4ssb4wy4ac6vd5jcbvp0r2fr1jmyc60hg56s7ym50bbymj5wp3"; + libraryHaskellDepends = [ + base bytestring containers contravariant deepseq exceptions + megaparsec mtl profunctors QuickCheck reflection tagged + template-haskell text + ]; + testHaskellDepends = [ + base bytestring hspec hspec-megaparsec megaparsec QuickCheck text + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq megaparsec text weigh + ]; + description = "Modern library for working with URIs"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "modify-fasta" = callPackage ({ mkDerivation, base, containers, fasta, mtl, optparse-applicative , pipes, pipes-text, regex-tdfa, regex-tdfa-text, semigroups, split @@ -175268,19 +175613,19 @@ self: { "monad-metrics-extensible" = callPackage ({ mkDerivation, base, dependent-map, dependent-sum, ekg, ekg-core - , exceptions, hspec, mtl, stm, text + , exceptions, hspec, mtl, stm, text, time }: mkDerivation { pname = "monad-metrics-extensible"; - version = "0.1.0.1"; - sha256 = "044hvhnf7wsgd18cac2j3bfw2vbxfnra736l6qndfx07mkv1nz5n"; + version = "0.1.1.0"; + sha256 = "14ahi50c6pd30zywjbsffn3p090ib57h6as2ad8jqxywjalxd8dm"; libraryHaskellDepends = [ base dependent-map dependent-sum ekg ekg-core exceptions mtl stm - text + text time ]; testHaskellDepends = [ base dependent-map dependent-sum ekg ekg-core exceptions hspec mtl - stm text + stm text time ]; description = "An extensible and type-safe wrapper around EKG metrics"; license = lib.licenses.bsd3; @@ -178443,6 +178788,8 @@ self: { pname = "mu-protobuf"; version = "0.4.2.0"; sha256 = "07mgld1cmpynhdih7ppki8xw85zpknv0ipn7fvn79bj53s0nx6vg"; + revision = "1"; + editedCabalFile = "12zp8g0v8f924dsc3c0ynzqcv2j4c4xl6dh72mz11nmxi9la51s7"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -178485,8 +178832,8 @@ self: { }: mkDerivation { pname = "mu-schema"; - version = "0.3.1.1"; - sha256 = "0n30xn2z1dl4n28mbfnif8csvz0namll0hab1r7mhnamp0yc3gs8"; + version = "0.3.1.2"; + sha256 = "0q4a1anqrx6d5n0br26lb4x8gw10gasv8ggiw4fgcaly2sd09rs1"; libraryHaskellDepends = [ aeson base bytestring containers first-class-families sop-core template-haskell text th-abstraction unordered-containers uuid @@ -180476,6 +180823,22 @@ self: { license = lib.licenses.bsd3; }) {inherit (pkgs) mysql;}; + "mysql_0_1_7_3" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, hspec, mysql + }: + mkDerivation { + pname = "mysql"; + version = "0.1.7.3"; + sha256 = "1yf9ni64q19ci6ripcjh0pvpklxyi0fzigb33ss05wswlal385rc"; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ base bytestring containers ]; + librarySystemDepends = [ mysql ]; + testHaskellDepends = [ base bytestring hspec ]; + description = "A low-level MySQL client library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) mysql;}; + "mysql-effect" = callPackage ({ mkDerivation, base, bytestring, extensible-effects, mysql , mysql-simple @@ -180979,10 +181342,8 @@ self: { ({ mkDerivation, base, named, servant }: mkDerivation { pname = "named-servant"; - version = "0.3.0"; - sha256 = "14a55ww538c39wmacazdchrinc098yw9kbv44z4dw1739zhsghb6"; - revision = "1"; - editedCabalFile = "1xrbz9vhb61wkjb1amswvpb9sfslg1258vqlm880angc18i3dyi7"; + version = "0.3.1"; + sha256 = "01wy971gf178i866wly5fs86ll2rwkjp3n99ni0rdxw6p1hnq447"; libraryHaskellDepends = [ base named servant ]; description = "support records and named (from the named package) parameters in servant"; license = lib.licenses.bsd3; @@ -180996,10 +181357,8 @@ self: { }: mkDerivation { pname = "named-servant-client"; - version = "0.3.0"; - sha256 = "1ilzhvdvspd8wddv6yypvl6whbzsa3pzqz2a8ikmk0l3vkskv60d"; - revision = "1"; - editedCabalFile = "19frg1vj2zzibdrbmxdmjfas31z5hwhy7kjkk28vm20y51h4lir3"; + version = "0.3.1"; + sha256 = "1q6xzg5sgjy52jp378jm9dq2wl283mnnpslc8fq0pdly2v6d7z6i"; libraryHaskellDepends = [ base named named-servant servant servant-client-core ]; @@ -181015,10 +181374,8 @@ self: { }: mkDerivation { pname = "named-servant-server"; - version = "0.3.0"; - sha256 = "14v1sgfz6agsbiy2938chy0vi4j4jd1swdhwb9g2yg068m3262k3"; - revision = "1"; - editedCabalFile = "0880w18l18hjnrpf0j4z0rd98waai3431gzakqm53zh8zs75lcll"; + version = "0.3.1"; + sha256 = "168xvsdkln5pgf6iqs1qzy07b9ichzpqhx95j79hrba941jzd19y"; libraryHaskellDepends = [ base named named-servant servant servant-server text ]; @@ -184283,6 +184640,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "newtype-generics_0_6" = callPackage + ({ mkDerivation, base, gauge, hspec, hspec-discover, semigroups + , transformers + }: + mkDerivation { + pname = "newtype-generics"; + version = "0.6"; + sha256 = "04bymwhkvlsgcsd0v630mndrzf0xnh3v81ba6nfzwcvbg3ksr2wa"; + libraryHaskellDepends = [ base transformers ]; + testHaskellDepends = [ base hspec ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ base gauge semigroups ]; + description = "A typeclass and set of functions for working with newtypes"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "newtype-th" = callPackage ({ mkDerivation, base, haskell-src-meta, newtype, syb , template-haskell @@ -184448,8 +184822,8 @@ self: { }: mkDerivation { pname = "ngx-export-tools"; - version = "0.4.9.1"; - sha256 = "0ib0xzs815q29a2v1m550g7cm5cr7l6lkslmi0lpcxpfgpi08ccv"; + version = "0.4.9.2"; + sha256 = "064zbwamkkd5cx0wjisa019pprb4pg2mmm5n6a948f3dn0zpmlwx"; libraryHaskellDepends = [ aeson base binary bytestring ngx-export safe template-haskell ]; @@ -188504,8 +188878,8 @@ self: { }: mkDerivation { pname = "opaleye-sqlite"; - version = "0.0.1.0"; - sha256 = "0r3ij02wkxq50hl70wn53fdr1qi5gigg4x3y0vabm53gabgxdbxq"; + version = "0.0.1.1"; + sha256 = "02wpy2q3j6z91kjrwl9qyka74rqhbs7dlgfrc6nvpnl1ssp9vps0"; libraryHaskellDepends = [ base base16-bytestring bytestring case-insensitive contravariant direct-sqlite pretty product-profunctors profunctors semigroups @@ -188527,8 +188901,8 @@ self: { }: mkDerivation { pname = "opaleye-trans"; - version = "0.5.1"; - sha256 = "11vfp8rb46fvrhryyw9k66cbfnd920n5r4mcasdcnxhn1n8hc7i4"; + version = "0.5.2"; + sha256 = "0vszkxbgk4cqiaz4q8vgsc56yzh37dg7np2315h6bpvp1hy8fcs0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -190236,6 +190610,8 @@ self: { pname = "optparse-generic"; version = "1.4.4"; sha256 = "0xy0kc8qximsiqpnc1fmh5zlsh6n26s7scrixin5bwnylg056j74"; + revision = "1"; + editedCabalFile = "14vbfbl2va3s2pa4qjyyny1i15s2iw9993ld5b0qsqdv1z6nfjz1"; libraryHaskellDepends = [ base bytestring Only optparse-applicative system-filepath text time transformers void @@ -191885,8 +192261,8 @@ self: { }: mkDerivation { pname = "pandoc-crossref"; - version = "0.3.9.0"; - sha256 = "18hxvzrl4b9y3343nissbcxrl4g8x82yrinyir9ifgmpz5ikg248"; + version = "0.3.9.1"; + sha256 = "0kyml1bmzjp6by86inlmyx8qkl4f92yibmhc477sglv9m8haw0wx"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -192179,21 +192555,21 @@ self: { "pandoc-plantuml-diagrams" = callPackage ({ mkDerivation, base, bytestring, directory, hspec, hspec-discover - , mtl, pandoc-types, process, SHA, utf8-string + , mtl, pandoc-types, process, SHA, text, utf8-string }: mkDerivation { pname = "pandoc-plantuml-diagrams"; - version = "0.1.0.4"; - sha256 = "1fshgv5wl56z3w0yimwv5dbi7dal600anb5wkxd5n3jlpmp8fwky"; + version = "0.1.1.0"; + sha256 = "19wd13vwf7v2v57wiv4s2y68zrvk6rcy1w2wxxad4cv5bb65wnfn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring directory pandoc-types process SHA utf8-string + base bytestring directory pandoc-types process SHA text utf8-string ]; executableHaskellDepends = [ base pandoc-types ]; testHaskellDepends = [ base bytestring directory hspec hspec-discover mtl pandoc-types - process SHA utf8-string + process SHA text utf8-string ]; testToolDepends = [ hspec-discover ]; description = "Render and insert PlantUML diagrams with Pandoc"; @@ -196017,8 +196393,8 @@ self: { }: mkDerivation { pname = "peregrin"; - version = "0.3.0"; - sha256 = "0jhvd69avl5wy2fcsx93ng2yll97gagylwd264dv7qjaa4m6hqs2"; + version = "0.3.1"; + sha256 = "1hiv9rzpjmjywwc4j6bqkqvqwv2gr6d512hv0l6m5c6idsyk2v12"; libraryHaskellDepends = [ base bytestring postgresql-simple text ]; testHaskellDepends = [ base hspec pg-harness-client postgresql-simple resource-pool text @@ -197837,8 +198213,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-examples"; - version = "0.6.2.1"; - sha256 = "0k9cwvfdxf13izbww7g08p0x702xgmm7dck3mjk4maajjfia34zm"; + version = "0.7.0.0"; + sha256 = "1dwqkl9223rmz503gclzs0l00mi9gkk542fwpvw71hd121hl4qvg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -197934,8 +198310,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-properties"; - version = "0.3.0.1"; - sha256 = "0b3wnzlka9dapk1478jr35pnd3ykj3mn5nkhvmwjdsxigzzaa1wf"; + version = "0.4.0.0"; + sha256 = "194sg4crm5z4lqqzr8apjgnbcl5h6ddkqk8crja41c5q3d5mpih5"; libraryHaskellDepends = [ base phonetic-languages-common phonetic-languages-rhythmicity phonetic-languages-vector ukrainian-phonetics-basic vector @@ -197948,10 +198324,10 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "phonetic-languages-rhythmicity"; - version = "0.1.2.0"; - sha256 = "1ljblyk0m1fs3n2gj72w6gs62dxjk5gsn8x6p7fwlwhvaa316wm3"; + version = "0.2.0.0"; + sha256 = "0cvn2l0ds5nyz4inx354l8r9m4bkqjic7plpjgvhih8f4b53j6ln"; libraryHaskellDepends = [ base ]; - description = "Allows to estimate the rhythmicity metrices for the text (usually, the Ukrainian poetic one)"; + description = "Allows to estimate the rhythmicity properties for the text (usually, the Ukrainian poetic one)"; license = lib.licenses.mit; }) {}; @@ -197998,8 +198374,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-examples-array"; - version = "0.3.0.0"; - sha256 = "17akng54rj8mn4ic9h1a806b03nqsigkyjggfskf4k1z9x84hdf4"; + version = "0.4.0.0"; + sha256 = "03vin7gng1sqifyy0s83igmd41bxxwrp7ck9j7bxhnqq0qmg5d7n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -198059,8 +198435,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-lists-examples"; - version = "0.6.0.0"; - sha256 = "0y843gymz9wf7hmp8asxmd90rdlgxz2b1pgi27mpglr7xmhpfr34"; + version = "0.7.0.0"; + sha256 = "1y3ad4lxapd9nblijn09i36f3xl6g9hxqmn8adcza74f4cq8pgyb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -198088,8 +198464,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-properties-array"; - version = "0.1.2.0"; - sha256 = "1vxjq0ki7slmgp1sq481srnqzcy8sazl0c2vqdkyz0hsx5hi8lyv"; + version = "0.2.0.0"; + sha256 = "1y7cki8c07q9423b54cjvy9k6a9byarpww3px50bc91ivirda6zr"; libraryHaskellDepends = [ base phonetic-languages-rhythmicity phonetic-languages-simplified-base ukrainian-phonetics-basic-array @@ -198105,8 +198481,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-properties-lists"; - version = "0.3.0.0"; - sha256 = "094fyljkvfi2snj41j00xqflhabnsp5hn50xp6dvmpcr12k6nvs0"; + version = "0.4.0.0"; + sha256 = "01awd747w67m4rnm9zgsb8j28756fpvyml1j613kz33fp5s91ml2"; libraryHaskellDepends = [ base phonetic-languages-rhythmicity phonetic-languages-simplified-common ukrainian-phonetics-basic @@ -198123,8 +198499,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-properties-lists-double"; - version = "0.1.0.0"; - sha256 = "1mx282gq9b2m718zrjjqxk1a17qdw5mdipmb818jr5ccrb81yhsl"; + version = "0.2.0.0"; + sha256 = "1ci63bhlk8xzf111njg97xs1ibamiv04k19wsfnhvxs3zzyzgrj0"; libraryHaskellDepends = [ base phonetic-languages-rhythmicity phonetic-languages-simplified-common ukrainian-phonetics-basic @@ -200202,6 +200578,31 @@ self: { broken = true; }) {}; + "pixiv" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , cryptohash-md5, directory, exceptions, filepath, http-client + , http-client-tls, lens, monad-control, mtl, process, servant + , servant-client, servant-client-core, template-haskell, temporary + , text, time, transformers, transformers-base, zip-archive + }: + mkDerivation { + pname = "pixiv"; + version = "0.1.0"; + sha256 = "001pfzijh7ibcyinmw0l8yvw0kxsvmniw993qx9b6zlzf689cpp6"; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring cryptohash-md5 directory + exceptions filepath http-client http-client-tls lens monad-control + mtl process servant servant-client servant-client-core + template-haskell temporary text time transformers transformers-base + zip-archive + ]; + testHaskellDepends = [ + aeson base bytestring http-client http-client-tls + ]; + description = "Pixiv API binding based on servant-client"; + license = lib.licenses.bsd3; + }) {}; + "piyo" = callPackage ({ mkDerivation, base, extra, sdl2, sdl2-gfx, sdl2-image , sdl2-mixer, sdl2-ttf, text @@ -203997,8 +204398,6 @@ self: { ]; description = "REST API for any Postgres database"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "postgrest-ws" = callPackage @@ -205809,8 +206208,8 @@ self: { pname = "primitive"; version = "0.7.1.0"; sha256 = "1w53i4mk248g58xrffmksznr4nmn2bbbycajzpcqfxx5ybyyrsvb"; - revision = "1"; - editedCabalFile = "0nllkqvfrplhslfgbqgpn0r5k4mj5wlfixjxrpjz6vb73xwi5977"; + revision = "2"; + editedCabalFile = "1m08slj8m596z4pqsw3ag25ijhzlv9ki809ydh4nbin141bpsdgn"; libraryHaskellDepends = [ base deepseq transformers ]; testHaskellDepends = [ base base-orphans ghc-prim QuickCheck quickcheck-classes-base @@ -206410,6 +206809,8 @@ self: { pname = "process"; version = "1.6.11.0"; sha256 = "0nv8c2hnx1l6xls6b61l8sm7j250qfbj1fjj5n6m15ppk9f0d9jd"; + revision = "1"; + editedCabalFile = "136mp45m1jh27yayb0gx4giybp6imh7hbr774fsb2m9vj2l52b27"; libraryHaskellDepends = [ base deepseq directory filepath unix ]; testHaskellDepends = [ base bytestring directory ]; description = "Process libraries"; @@ -213606,8 +214007,8 @@ self: { }: mkDerivation { pname = "raw-feldspar"; - version = "0.3"; - sha256 = "0kxnl7vvqkmrq2cjwgrb4342bvr8a57v652f2pd5yvndamcz5m3w"; + version = "0.3.1"; + sha256 = "1kn86izm2wpqj59nnpxw34n37bh1w5y7h9rd59c1pcymhp29n6qd"; libraryHaskellDepends = [ array base constraints containers data-default-class data-hash imperative-edsl language-c-quote mtl operational-alacarte @@ -215622,8 +216023,8 @@ self: { }: mkDerivation { pname = "refined"; - version = "0.6.1"; - sha256 = "124sqpcii62jh2n2vfskg9jc8ic4hhlwmwim40f6a0dmhdnsh8lx"; + version = "0.6.2"; + sha256 = "1xfy6sl6kl9k7vvlvwg8fb3kdpqd0fl1c9wcfwgdqb874a4xn6dz"; libraryHaskellDepends = [ aeson base bytestring deepseq exceptions mtl QuickCheck template-haskell text these-skinny @@ -215652,22 +216053,6 @@ self: { }: mkDerivation { pname = "refinery"; - version = "0.2.0.0"; - sha256 = "0nsfmb5y8y0hanh3h03v0n8wa5frgj85gz8ycl8h5z045j2kk3wq"; - libraryHaskellDepends = [ base exceptions logict mmorph mtl ]; - testHaskellDepends = [ - base checkers exceptions hspec logict mmorph mtl QuickCheck - ]; - description = "Toolkit for building proof automation systems"; - license = lib.licenses.bsd3; - }) {}; - - "refinery_0_3_0_0" = callPackage - ({ mkDerivation, base, checkers, exceptions, hspec, logict, mmorph - , mtl, QuickCheck - }: - mkDerivation { - pname = "refinery"; version = "0.3.0.0"; sha256 = "1bsbnxf75prw153c3k02jk84h3sravdi1c1sl75c7sx4xq81qhlp"; libraryHaskellDepends = [ base exceptions logict mmorph mtl ]; @@ -215676,7 +216061,6 @@ self: { ]; description = "Toolkit for building proof automation systems"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "reflection" = callPackage @@ -218269,8 +218653,8 @@ self: { pname = "repa"; version = "3.4.1.4"; sha256 = "17m3wl4hvf04fxwm4fflhnv41yl9bm263hnbpxc8x6xqwifplq23"; - revision = "7"; - editedCabalFile = "0j0nqp6xvwis83h1hwm9910xjfxh13nddy61dlli0wdzzddpb8ah"; + revision = "8"; + editedCabalFile = "0bhkiav26m61lzjkxjldals136viixyg88xf1bbihsp9kzkbv6as"; libraryHaskellDepends = [ base bytestring ghc-prim QuickCheck template-haskell vector ]; @@ -222468,6 +222852,31 @@ self: { broken = true; }) {}; + "rpmbuild-order_0_4_3_2" = callPackage + ({ mkDerivation, base, case-insensitive, containers, directory + , extra, fgl, filepath, hspec, optparse-applicative, process + , simple-cmd, simple-cmd-args, unix + }: + mkDerivation { + pname = "rpmbuild-order"; + version = "0.4.3.2"; + sha256 = "1510v4gbylzpdh7l23r4z6xhqmjalay3crxg2216lz8j0mb4sbq9"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base case-insensitive containers directory extra fgl filepath + process + ]; + executableHaskellDepends = [ + base directory extra fgl optparse-applicative simple-cmd-args + ]; + testHaskellDepends = [ base extra hspec simple-cmd unix ]; + description = "Order RPM packages by dependencies"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "rrule" = callPackage ({ mkDerivation, base, hspec, megaparsec, parser-combinators, text , time @@ -222983,8 +223392,8 @@ self: { }: mkDerivation { pname = "runhs"; - version = "1.0.0.8"; - sha256 = "177xak0p91xn827cnpa374l94lmmym2yrrcsxzjd9752hdzyw7k3"; + version = "1.0.0.9"; + sha256 = "1i2g706997wkqj081pqxj8nq6nhj94x4kf5q0fnj39fp35fmak6q"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -228629,10 +229038,8 @@ self: { }: mkDerivation { pname = "servant-cassava"; - version = "0.10"; - sha256 = "03jnyghwa5kjbl5j55njmp7as92flw91zs9cgdvb4jrsdy85sb4v"; - revision = "7"; - editedCabalFile = "0n4nbm0axa9qd805jb3gja2p2fiwvhjpvdi5rhlwh4shm9crppcy"; + version = "0.10.1"; + sha256 = "0hf7v35yyfqxc20hgq755laba7lziz2vsy7y8cj8nhczcc67smq0"; libraryHaskellDepends = [ base base-compat bytestring cassava http-media servant vector ]; @@ -229381,8 +229788,8 @@ self: { pname = "servant-iCalendar"; version = "0.1.0.1"; sha256 = "15gqlb60r8msn3k1j8wjxq89qg6d790lnb751wabg2lsxybmdzas"; - revision = "7"; - editedCabalFile = "0yf5gccdilswzabzysc2mrxxq84xdx7k18a647bksimwd44x2i68"; + revision = "8"; + editedCabalFile = "10ka19ga7slcv4cb2f0ncfbkz52bbrm8jkxma8qksz6hm48wxjya"; libraryHaskellDepends = [ base data-default http-media iCalendar servant ]; @@ -235840,23 +236247,26 @@ self: { }) {}; "slack-web" = callPackage - ({ mkDerivation, aeson, base, containers, errors, hspec - , http-api-data, http-client, http-client-tls, megaparsec, mtl + ({ mkDerivation, aeson, base, containers, deepseq, errors, fakepull + , hashable, hspec, http-api-data, http-client, http-client-tls + , megaparsec, mtl, QuickCheck, quickcheck-instances, scientific , servant, servant-client, servant-client-core, text, time - , transformers + , transformers, unordered-containers }: mkDerivation { pname = "slack-web"; - version = "0.2.0.11"; - sha256 = "14ngln71sn5i26041m4v614vq4qhr44pzlgyxliyqw08dxn25la7"; + version = "0.2.1.0"; + sha256 = "01bwiq3b97bznn3sc51vi7q8xkjdslvqqh250fk7arcaq6hkkiw1"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ - aeson base containers errors http-api-data http-client - http-client-tls megaparsec mtl servant servant-client - servant-client-core text time transformers + aeson base containers deepseq errors hashable http-api-data + http-client http-client-tls megaparsec mtl scientific servant + servant-client servant-client-core text time transformers + unordered-containers ]; testHaskellDepends = [ - aeson base containers errors hspec http-api-data megaparsec text - time + aeson base fakepull hspec QuickCheck quickcheck-instances text time ]; description = "Bindings for the Slack web API"; license = lib.licenses.mit; @@ -241733,8 +242143,8 @@ self: { }: mkDerivation { pname = "stack-all"; - version = "0.1.1"; - sha256 = "0b81f6v18dyd5zia6drqn3jqncj3sp8cscrhlrcwvbljs1j8fd0j"; + version = "0.1.2"; + sha256 = "1iqm96f9c6csv4dzr6l7cyiv99nmbc9739xhycg2gvpm9sncmxrb"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -248624,8 +249034,8 @@ self: { }: mkDerivation { pname = "symantic-parser"; - version = "0.0.0.20210102"; - sha256 = "00gmcbn1amdr9nx54wia898gc7437563g9gpvlkhsg9r7197acid"; + version = "0.1.0.20210201"; + sha256 = "0c7vqxd0dagn7l3k4khbqvwg51y6a40m0f5qf587vj4rpjalc473"; libraryHaskellDepends = [ array base bytestring containers ghc-prim hashable template-haskell text transformers unordered-containers @@ -248945,8 +249355,8 @@ self: { }: mkDerivation { pname = "syntactic"; - version = "3.8.1"; - sha256 = "0560h3k360316q05wwylpbcvadp9dxzywbp206xm2wslpl1d9m8v"; + version = "3.8.2"; + sha256 = "04lv8v42bs4qjjcia39grfxmabiv41dipgg5b58xgiv4ay884nfm"; libraryHaskellDepends = [ base constraints containers data-hash deepseq mtl syb template-haskell tree-view @@ -251212,6 +251622,17 @@ self: { broken = true; }) {}; + "tasty-bench" = callPackage + ({ mkDerivation, base, deepseq, tasty }: + mkDerivation { + pname = "tasty-bench"; + version = "0.1"; + sha256 = "0dc1fbsxxbdj90dihx8nv587pfds3s9si81i2qx438gkh3pyinmi"; + libraryHaskellDepends = [ base deepseq tasty ]; + description = "Featherlight benchmark framework"; + license = lib.licenses.mit; + }) {}; + "tasty-dejafu" = callPackage ({ mkDerivation, base, dejafu, random, tagged, tasty }: mkDerivation { @@ -251806,8 +252227,8 @@ self: { }: mkDerivation { pname = "tasty-sugar"; - version = "1.0.1.1"; - sha256 = "1mkph7g4ybvy4h4rblr60bnalj5jf1acfgdqcw0ggwmbhfbzbg68"; + version = "1.1.0.0"; + sha256 = "1v1ikl4jy02c0jlvm4di8ndm7fbyr8235ydppp953d7qb8yilsyp"; libraryHaskellDepends = [ base directory filemanip filepath logict optparse-applicative prettyprinter tagged tasty @@ -259229,10 +259650,10 @@ self: { }: mkDerivation { pname = "tokyocabinet-haskell"; - version = "0.0.6"; - sha256 = "1cav27hnl49ghl6f7mhyaqmvfdqib6s76z251vai4vih9psis8rk"; + version = "0.0.7"; + sha256 = "1fmj46wvl6ayx30r5r538vnygz32s1877m2f9zf7nb2zyiz5vmcb"; revision = "1"; - editedCabalFile = "1mk2nwi51zm0b2081db26xipwa0yd53ikhxa5vd8fp8x2w52wliw"; + editedCabalFile = "07kx002x3yh1klhxn9fq0bi2pfy4mdqacg3caqklmdl22dkh74lq"; libraryHaskellDepends = [ base bytestring mtl ]; librarySystemDepends = [ tokyocabinet ]; testHaskellDepends = [ base bytestring directory HUnit mtl ]; @@ -260197,18 +260618,18 @@ self: { }) {}; "trackit" = callPackage - ({ mkDerivation, base, brick, fsnotify, mtl, optparse-generic - , process, process-extras, stm, text, time, vty + ({ mkDerivation, base, brick, fsnotify, microlens-platform, mtl + , optparse-generic, process, process-extras, stm, text, time, vty }: mkDerivation { pname = "trackit"; - version = "0.6.3"; - sha256 = "0bjsvz1kc6i2zpzdcjrrncqs3rpl7rfp961njhihymazffhsx3l2"; + version = "0.7"; + sha256 = "0v0f1a4p1602jgz5iik7mxxnld61ai7saan0brqry2sd6a8cjw43"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base brick fsnotify mtl optparse-generic process process-extras stm - text time vty + base brick fsnotify microlens-platform mtl optparse-generic process + process-extras stm text time vty ]; description = "A command-line tool for live monitoring"; license = lib.licenses.bsd3; @@ -266358,8 +266779,8 @@ self: { }: mkDerivation { pname = "uniqueness-periods-vector-examples"; - version = "0.14.5.0"; - sha256 = "0c30dd5x1bgk40gzfa5wdrnlam0j41z0cpd1dhmcj6fzwd1l2nra"; + version = "0.15.0.0"; + sha256 = "0cgl2xnmp0m73iizmhbl33vgc6mf1wzj49nf9xm1c1d70ak21g1l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -266412,8 +266833,8 @@ self: { }: mkDerivation { pname = "uniqueness-periods-vector-properties"; - version = "0.5.5.0"; - sha256 = "08pzazvgg0nldybbj1558xvipn3wafqm9491fk2xcrf4na5pc42l"; + version = "0.6.0.0"; + sha256 = "08c97g221xcbsrwzyv36gikilim2yz2v2kkrhqvaj102v7ygh6ih"; libraryHaskellDepends = [ base mmsyn6ukr mmsyn7s phonetic-languages-rhythmicity phonetic-languages-ukrainian uniqueness-periods-vector @@ -267096,8 +267517,8 @@ self: { }: mkDerivation { pname = "unliftio-streams"; - version = "0.1.1.0"; - sha256 = "0qp78c610anqpgpd13pz24x68kcpc69z2wjrz6a3qixvqjvp72bw"; + version = "0.1.1.1"; + sha256 = "1r9yn710nwx4h2ky2pmlhmap5ydx4fhcaq119dq7cysnygzi5q2n"; libraryHaskellDepends = [ base bytestring io-streams text unliftio-core ]; @@ -267868,6 +268289,8 @@ self: { pname = "uri-encode"; version = "1.5.0.7"; sha256 = "0lj2h701af12539p957rw24bxr07mfqd5r4h52i42f43ax165767"; + revision = "1"; + editedCabalFile = "172mgdd8dgy8wphgl9vbvp26lrzp01prr5jshbng4rlhpyd340p1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -274216,6 +274639,40 @@ self: { license = lib.licenses.mit; }) {}; + "warp_3_3_14" = callPackage + ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked + , bytestring, case-insensitive, containers, directory, gauge + , ghc-prim, hashable, hspec, http-client, http-date, http-types + , http2, HUnit, iproute, lifted-base, network, process, QuickCheck + , simple-sendfile, stm, streaming-commons, text, time, time-manager + , unix, unix-compat, vault, wai, word8, x509 + }: + mkDerivation { + pname = "warp"; + version = "3.3.14"; + sha256 = "0whmh6dbl7321a2kg6ypngw5kgvvxqdk161li0l4hr3wqqddlc93"; + libraryHaskellDepends = [ + array async auto-update base bsb-http-chunked bytestring + case-insensitive containers ghc-prim hashable http-date http-types + http2 iproute network simple-sendfile stm streaming-commons text + time-manager unix unix-compat vault wai word8 x509 + ]; + testHaskellDepends = [ + array async auto-update base bsb-http-chunked bytestring + case-insensitive containers directory ghc-prim hashable hspec + http-client http-date http-types http2 HUnit iproute lifted-base + network process QuickCheck simple-sendfile stm streaming-commons + text time time-manager unix unix-compat vault wai word8 x509 + ]; + benchmarkHaskellDepends = [ + auto-update base bytestring containers gauge hashable http-date + http-types network time-manager unix unix-compat x509 + ]; + description = "A fast, light-weight web server for WAI applications"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "warp-dynamic" = callPackage ({ mkDerivation, base, data-default, dyre, http-types, wai, warp }: mkDerivation { @@ -278885,8 +279342,8 @@ self: { }: mkDerivation { pname = "xdot"; - version = "0.3.0.2"; - sha256 = "0k3lklghlj51nslv8pi8anj78hls2srmdr6hz5yibfhvycpib0c2"; + version = "0.3.0.3"; + sha256 = "06pgs74b3llyhhp2rr9a3rvgycnvg395q5ib9vwdiv9pqgq31kia"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -282680,7 +283137,7 @@ self: { broken = true; }) {}; - "yesod-auth-oauth2_0_6_2_1" = callPackage + "yesod-auth-oauth2_0_6_2_2" = callPackage ({ mkDerivation, aeson, base, bytestring, cryptonite, errors , hoauth2, hspec, http-client, http-conduit, http-types, memory , microlens, safe-exceptions, text, uri-bytestring, yesod-auth @@ -282688,8 +283145,8 @@ self: { }: mkDerivation { pname = "yesod-auth-oauth2"; - version = "0.6.2.1"; - sha256 = "1kzz271y69l47wikfmfix5v9csh6xy7cv8b36gxzlwr6vil59bmy"; + version = "0.6.2.2"; + sha256 = "176iz5mg9jhrp8kp61f12j1jw3icnqp10dxln7046p1nqam0nv3d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ diff --git a/pkgs/development/haskell-modules/non-hackage-packages.nix b/pkgs/development/haskell-modules/non-hackage-packages.nix index af317c92a5ab5..4d66478f338d7 100644 --- a/pkgs/development/haskell-modules/non-hackage-packages.nix +++ b/pkgs/development/haskell-modules/non-hackage-packages.nix @@ -18,16 +18,6 @@ self: super: { # https://github.com/spacchetti/spago/issues/512 spago = self.callPackage ../tools/purescript/spago/spago.nix { }; - # HLS and its fork of ghcide that it uses - # both are auto-generated by pkgs/development/tools/haskell/haskell-language-server/update.sh - haskell-language-server = self.callPackage ../tools/haskell/haskell-language-server { }; - hls-hlint-plugin = self.callPackage ../tools/haskell/haskell-language-server/hls-hlint-plugin.nix { }; - hls-tactics-plugin = self.callPackage ../tools/haskell/haskell-language-server/hls-tactics-plugin.nix { }; - hls-explicit-imports-plugin = self.callPackage ../tools/haskell/haskell-language-server/hls-explicit-imports-plugin.nix { }; - hls-retrie-plugin = self.callPackage ../tools/haskell/haskell-language-server/hls-retrie-plugin.nix { }; - hls-class-plugin = self.callPackage ../tools/haskell/haskell-language-server/hls-class-plugin.nix { }; - hls-eval-plugin = self.callPackage ../tools/haskell/haskell-language-server/hls-eval-plugin.nix { }; - nix-output-monitor = self.callPackage ../../tools/nix/nix-output-monitor { }; # cabal2nix --revision <rev> https://github.com/hasura/ci-info-hs.git diff --git a/pkgs/development/libraries/neon/default.nix b/pkgs/development/libraries/neon/default.nix index c0c62deb0ace1..739c5e07d2065 100644 --- a/pkgs/development/libraries/neon/default.nix +++ b/pkgs/development/libraries/neon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libxml2, pkg-config, perl +{ lib, stdenv, fetchurl, libxml2, pkg-config , compressionSupport ? true, zlib ? null , sslSupport ? true, openssl ? null , static ? stdenv.hostPlatform.isStatic @@ -14,12 +14,12 @@ let in stdenv.mkDerivation rec { - version = "0.31.0"; + version = "0.31.2"; pname = "neon"; src = fetchurl { - url = "http://www.webdav.org/neon/${pname}-${version}.tar.gz"; - sha256 = "19dx4rsqrck9jl59y4ad9jf115hzh6pz1hcl2dnlfc84hc86ymc0"; + url = "https://notroj.github.io/${pname}/${pname}-${version}.tar.gz"; + sha256 = "0y46dbhiblcvg8k41bdydr3fivghwk73z040ki5825d24ynf67ng"; }; patches = optionals stdenv.isDarwin [ ./0.29.6-darwin-fix-configure.patch ]; @@ -37,12 +37,10 @@ stdenv.mkDerivation rec { passthru = {inherit compressionSupport sslSupport;}; - checkInputs = [ perl ]; - doCheck = false; # fails, needs the net - meta = with lib; { description = "An HTTP and WebDAV client library"; - homepage = "http://www.webdav.org/neon/"; + homepage = "https://notroj.github.io/neon/"; + changelog = "https://github.com/notroj/${pname}/blob/${version}/NEWS"; platforms = platforms.unix; license = licenses.lgpl2; }; diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix index c0c0218a318fe..48178e7740935 100644 --- a/pkgs/development/libraries/wolfssl/default.nix +++ b/pkgs/development/libraries/wolfssl/default.nix @@ -2,21 +2,33 @@ stdenv.mkDerivation rec { pname = "wolfssl"; - version = "4.5.0"; + version = "4.6.0"; src = fetchFromGitHub { owner = "wolfSSL"; repo = "wolfssl"; rev = "v${version}-stable"; - sha256 = "138ppnwkqkfi7nnqpd0b93dqaph72ma65m9286bz2qzlis1x8r0v"; + sha256 = "0hk3bnzznxj047gwxdxw2v3w6jqq47996m7g72iwj6c2ai9g6h4m"; }; - configureFlags = [ "--enable-all" ]; + # almost same as Debian but for now using --enable-all instead of --enable-distro to ensure options.h gets installed + configureFlags = [ "--enable-all --enable-pkcs11 --enable-tls13 --enable-base64encode" ]; outputs = [ "out" "dev" "doc" "lib" ]; nativeBuildInputs = [ autoreconfHook ]; + postPatch = '' + # fix recursive cycle: + # build flags (including location of header files) are exposed in the + # public API of wolfssl, causing lib to depend on dev + substituteInPlace configure.ac \ + --replace '#define LIBWOLFSSL_CONFIGURE_ARGS \"$ac_configure_args\"' ' ' + substituteInPlace configure.ac \ + --replace '#define LIBWOLFSSL_GLOBAL_CFLAGS \"$CPPFLAGS $AM_CPPFLAGS $CFLAGS $AM_CFLAGS\"' ' ' + ''; + + postInstall = '' # fix recursive cycle: # wolfssl-config points to dev, dev propagates bin diff --git a/pkgs/development/ocaml-modules/lwt_ssl/default.nix b/pkgs/development/ocaml-modules/lwt_ssl/default.nix index e74a743e6b186..173094aacb84c 100644 --- a/pkgs/development/ocaml-modules/lwt_ssl/default.nix +++ b/pkgs/development/ocaml-modules/lwt_ssl/default.nix @@ -5,6 +5,7 @@ buildDunePackage rec { version = "1.1.3"; minimumOCamlVersion = "4.02"; + useDune2 = true; src = fetchzip { url = "https://github.com/aantron/${pname}/archive/${version}.tar.gz"; diff --git a/pkgs/development/ocaml-modules/ssl/default.nix b/pkgs/development/ocaml-modules/ssl/default.nix index 9a574a0457a54..1f4fd7b858056 100644 --- a/pkgs/development/ocaml-modules/ssl/default.nix +++ b/pkgs/development/ocaml-modules/ssl/default.nix @@ -1,17 +1,20 @@ -{ lib, buildDunePackage, fetchFromGitHub, pkg-config, openssl }: +{ lib, buildDunePackage, fetchFromGitHub, pkg-config, openssl +, dune-configurator }: buildDunePackage rec { pname = "ssl"; - version = "0.5.9"; + version = "0.5.10"; src = fetchFromGitHub { owner = "savonet"; repo = "ocaml-ssl"; - rev = version; - sha256 = "04h02rvzrwp886n5hsx84rnc9b150iggy38g5v1x1rwz3pkdnmf0"; + rev = "v${version}"; + sha256 = "1rszqiqayh67xlwd5411k8vib47x9kapdr037z1majd2c14z3kcb"; }; + useDune2 = true; nativeBuildInputs = [ pkg-config ]; + buildInputs = [ dune-configurator ]; propagatedBuildInputs = [openssl]; meta = { @@ -20,6 +23,7 @@ buildDunePackage rec { license = "LGPL+link exception"; maintainers = [ lib.maintainers.maggesi + lib.maintainers.anmonteiro ]; }; } diff --git a/pkgs/development/php-packages/phpstan/default.nix b/pkgs/development/php-packages/phpstan/default.nix index 74b44c21d0475..1d6de28856205 100644 --- a/pkgs/development/php-packages/phpstan/default.nix +++ b/pkgs/development/php-packages/phpstan/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, pkgs, lib, php }: let pname = "phpstan"; - version = "0.12.70"; + version = "0.12.71"; in mkDerivation { inherit pname version; src = pkgs.fetchurl { url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar"; - sha256 = "sha256-bQvLGrDUh66lipmML1VwrdNKkI6NezBckdlOqnDe7Qk="; + sha256 = "sha256-VSA/37LTawwIL1qdyp35auml7we3xDdrZN21/V3BWlM="; }; phases = [ "installPhase" ]; diff --git a/pkgs/development/php-packages/redis/default.nix b/pkgs/development/php-packages/redis/default.nix index a61ae1194ffb1..fedc7a7ffde2f 100644 --- a/pkgs/development/php-packages/redis/default.nix +++ b/pkgs/development/php-packages/redis/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "redis"; - version = "5.3.2"; - sha256 = "1cfsbxf3q3im0cmalgk76jpz581zr92z03c1viy93jxb53k2vsgl"; + version = "5.3.3"; + sha256 = "sha256-N3iRYeFkzVIjmjDJojjaYf7FyDlc2sOFtu2PDFD9kvA="; internalDeps = with php.extensions; [ session diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index e62e24d4ab4ed..8269f09a24621 100644 --- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "Adafruit-PlatformDetect"; - version = "2.28.0"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "aa272605fd8a2ddcc6e5dd8151d628f76a9468c97ba7e4e315d6bc78b9bfb8f8"; + sha256 = "b22d500f674c084cefd73acd233fe12b816c8446f1da3cff58d7876477b862a3"; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/aioharmony/default.nix b/pkgs/development/python-modules/aioharmony/default.nix index 0b6c68de8b4ca..3f2ee2fee3ea0 100644 --- a/pkgs/development/python-modules/aioharmony/default.nix +++ b/pkgs/development/python-modules/aioharmony/default.nix @@ -1,27 +1,36 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k, slixmpp, async-timeout, aiohttp }: +{ lib +, aiohttp +, async-timeout +, buildPythonPackage +, fetchPypi +, isPy3k +, slixmpp +}: buildPythonPackage rec { pname = "aioharmony"; - version = "0.2.6"; + version = "0.2.7"; + disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "90f4d1220d44b48b21a57e0273aa3c4a51599d0097af88e8be26df151e599344"; + sha256 = "sha256-aej8xC0Bsy6ip7IwO6onp55p6afkz8yZnz14cCExSPA="; }; - disabled = !isPy3k; + propagatedBuildInputs = [ + aiohttp + async-timeout + slixmpp + ]; - #aioharmony does not seem to include tests + # aioharmony does not seem to include tests doCheck = false; pythonImportsCheck = [ "aioharmony.harmonyapi" "aioharmony.harmonyclient" ]; - propagatedBuildInputs = [ slixmpp async-timeout aiohttp ]; - meta = with lib; { homepage = "https://github.com/ehendrix23/aioharmony"; - description = - "Asyncio Python library for connecting to and controlling the Logitech Harmony"; + description = "Python library for interacting the Logitech Harmony devices"; license = licenses.asl20; maintainers = with maintainers; [ oro ]; }; diff --git a/pkgs/development/python-modules/awesomeversion/default.nix b/pkgs/development/python-modules/awesomeversion/default.nix index 8f832f827edc9..2a532beca4731 100644 --- a/pkgs/development/python-modules/awesomeversion/default.nix +++ b/pkgs/development/python-modules/awesomeversion/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "awesomeversion"; - version = "21.2.0"; + version = "21.2.2"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "ludeeus"; repo = pname; rev = version; - sha256 = "1rzd0mcxdjnnzg35hvdvacwrr9brwmkw9bwlb5x6bcp24ry9yl0q"; + sha256 = "1yl09csypa64nhsw7dc6kj8iybm1wkhfzylyfyq8b7jpwdx7ql31"; }; postPatch = '' diff --git a/pkgs/development/python-modules/casbin/default.nix b/pkgs/development/python-modules/casbin/default.nix index 2587772127b10..7e26181cf5525 100644 --- a/pkgs/development/python-modules/casbin/default.nix +++ b/pkgs/development/python-modules/casbin/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "casbin"; - version = "0.16.1"; + version = "0.16.2"; disabled = isPy27; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = pname; repo = "pycasbin"; rev = "v${version}"; - sha256 = "1bjrg0ig40rjk5x65x7ac9xsl332r0ypqgrqjdivb5dvplifnw36"; + sha256 = "0jan4xikyi1p92rsir8camc6ify81wnd9l57v1pgmjf5fgb5r2w8"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/crytic-compile/default.nix b/pkgs/development/python-modules/crytic-compile/default.nix index 936db1081b6ad..95f2effc045ad 100644 --- a/pkgs/development/python-modules/crytic-compile/default.nix +++ b/pkgs/development/python-modules/crytic-compile/default.nix @@ -6,6 +6,10 @@ buildPythonPackage rec { disabled = pythonOlder "3.6"; + patchPhase = '' + substituteInPlace setup.py --replace 'version="0.1.11",' 'version="${version}",' + ''; + src = fetchFromGitHub { owner = "crytic"; repo = "crytic-compile"; @@ -21,7 +25,7 @@ buildPythonPackage rec { meta = with lib; { description = "Abstraction layer for smart contract build systems"; homepage = "https://github.com/crytic/crytic-compile"; - license = licenses.agpl3; - maintainers = with maintainers; [ SuperSandro2000 ]; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ SuperSandro2000 arturcygan ]; }; } diff --git a/pkgs/development/python-modules/dash-core-components/default.nix b/pkgs/development/python-modules/dash-core-components/default.nix index 9d5e650207bca..2782342c1b518 100644 --- a/pkgs/development/python-modules/dash-core-components/default.nix +++ b/pkgs/development/python-modules/dash-core-components/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "dash_core_components"; - version = "1.13.0"; + version = "1.15.0"; src = fetchPypi { inherit pname version; - sha256 = "f92025b12931539cdda2173f2b4cd077119cbabbf3ddf62333f6302fd0d8a3ac"; + sha256 = "b61cb37322de91b4feb0d4d823694cbba8686f6459db774b53d553135350c71e"; }; # No tests in archive diff --git a/pkgs/development/python-modules/dash-html-components/default.nix b/pkgs/development/python-modules/dash-html-components/default.nix index 69eb4de2a2376..3d29054467710 100644 --- a/pkgs/development/python-modules/dash-html-components/default.nix +++ b/pkgs/development/python-modules/dash-html-components/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "dash_html_components"; - version = "1.1.1"; + version = "1.1.2"; src = fetchPypi { inherit pname version; - sha256 = "2c662e640528c890aaa0fa23d48e51c4d13ce69a97841d856ddcaaf2c6a47be3"; + sha256 = "83eaa39667b7c3e6cbefa360743e6e536d913269ea15db14308ad022c78bc301"; }; # No tests in archive diff --git a/pkgs/development/python-modules/dash-renderer/default.nix b/pkgs/development/python-modules/dash-renderer/default.nix index 8977d49489cbd..5c8f524e423af 100644 --- a/pkgs/development/python-modules/dash-renderer/default.nix +++ b/pkgs/development/python-modules/dash-renderer/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "dash_renderer"; - version = "1.8.3"; + version = "1.9.0"; src = fetchPypi { inherit pname version; - sha256 = "f7ab2b922f4f0850bae0e9793cec99f8a1a241e5f7f5786e367ddd9e41d2b170"; + sha256 = "3c5519a781beb2261ee73b2d193bef6f212697636f204acd7d58cd986ba88e30"; }; # No tests in archive diff --git a/pkgs/development/python-modules/dash-table/default.nix b/pkgs/development/python-modules/dash-table/default.nix index c313aea6c0627..8374d8694ac90 100644 --- a/pkgs/development/python-modules/dash-table/default.nix +++ b/pkgs/development/python-modules/dash-table/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "dash_table"; - version = "4.11.0"; + version = "4.11.2"; src = fetchPypi { inherit pname version; - sha256 = "3170504a8626a9676b016c5ab456ab8c1fb1ea0206dcc2eddb8c4c6589216304"; + sha256 = "90fbdd12eaaf657aa80d429263de4bbeef982649eb5981ebeb2410d67c1d20eb"; }; # No tests in archive diff --git a/pkgs/development/python-modules/dash/default.nix b/pkgs/development/python-modules/dash/default.nix index f6f00553d930f..89ff61f6c5e9b 100644 --- a/pkgs/development/python-modules/dash/default.nix +++ b/pkgs/development/python-modules/dash/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "dash"; - version = "1.17.0"; + version = "1.19.0"; src = fetchFromGitHub { owner = "plotly"; repo = pname; rev = "v${version}"; - sha256 = "1fbnhpmkxavv6yirmhx7659q1y9bqynwjd1g6cscv1mfv9m59l60"; + sha256 = "067ipkp186h26j7whfid8hjf6cwjmw2b5jp6fvvg280j7q9bjsa9"; }; propagatedBuildInputs = [ @@ -43,7 +43,7 @@ buildPythonPackage rec { ]; checkPhase = '' - pytest tests/unit/test_{configs,fingerprint,import,resources}.py \ + pytest tests/unit/test_{configs,fingerprint,resources}.py \ tests/unit/dash/ ''; diff --git a/pkgs/development/python-modules/datashader/default.nix b/pkgs/development/python-modules/datashader/default.nix index c49e2e30b809b..534cc816def79 100644 --- a/pkgs/development/python-modules/datashader/default.nix +++ b/pkgs/development/python-modules/datashader/default.nix @@ -76,11 +76,6 @@ buildPythonPackage rec { nbconvert ]; - postConfigure = '' - substituteInPlace setup.py \ - --replace "'numba >=0.37.0,<0.49'" "'numba'" - ''; - # dask doesn't do well with large core counts checkPhase = '' pytest -n $NIX_BUILD_CORES datashader -k 'not dask.array' diff --git a/pkgs/development/python-modules/django/3.nix b/pkgs/development/python-modules/django/3.nix index 2444146e83741..7b447eb8d7879 100644 --- a/pkgs/development/python-modules/django/3.nix +++ b/pkgs/development/python-modules/django/3.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "Django"; - version = "3.1.5"; + version = "3.1.6"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "2d78425ba74c7a1a74b196058b261b9733a8570782f4e2828974777ccca7edf7"; + sha256 = "c6c0462b8b361f8691171af1fb87eceb4442da28477e12200c40420176206ba7"; }; patches = lib.optional withGdal diff --git a/pkgs/development/python-modules/drf-nested-routers/default.nix b/pkgs/development/python-modules/drf-nested-routers/default.nix new file mode 100644 index 0000000000000..d265838526da9 --- /dev/null +++ b/pkgs/development/python-modules/drf-nested-routers/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, django +, djangorestframework +, pytest +, pytest-cov +, pytest-django +, ipdb +, python +}: + +buildPythonPackage rec { + pname = "drf-nested-routers"; + version = "0.92.5"; + + src = fetchFromGitHub { + owner = "alanjds"; + repo = "drf-nested-routers"; + rev = "v${version}"; + sha256 = "1l1jza8xz6xcm3gwxh1k6pc8fs95cq3v751gxj497y1a83d26j8i"; + }; + + propagatedBuildInputs = [ django djangorestframework setuptools ]; + checkInputs = [ pytest pytest-cov pytest-django ipdb ]; + + checkPhase = '' + ${python.interpreter} runtests.py --nolint + ''; + + meta = with lib; { + homepage = "https://github.com/alanjds/drf-nested-routers"; + description = "Provides routers and fields to create nested resources in the Django Rest Framework"; + license = licenses.asl20; + maintainers = with maintainers; [ felschr ]; + }; +} diff --git a/pkgs/development/python-modules/flask-paginate/default.nix b/pkgs/development/python-modules/flask-paginate/default.nix index 212e3a6fcc2b0..214c89e1d4b22 100644 --- a/pkgs/development/python-modules/flask-paginate/default.nix +++ b/pkgs/development/python-modules/flask-paginate/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "flask-paginate"; - version = "0.8.0"; + version = "0.8.1"; src = fetchPypi { inherit pname version; - sha256 = "60b2a696bf63d2bc1c90a5b1a861c280461732b88f079c267dc98021911a007b"; + sha256 = "31133c29c718aed95276425f7795d0a32b8d45a992ddd359c69600f22f869254"; }; propagatedBuildInputs = [ flask ]; diff --git a/pkgs/development/python-modules/j2cli/default.nix b/pkgs/development/python-modules/j2cli/default.nix index d6efe84edfd6b..c83b1c77e2ccc 100644 --- a/pkgs/development/python-modules/j2cli/default.nix +++ b/pkgs/development/python-modules/j2cli/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { J2Cli is a command-line tool for templating in shell-scripts, leveraging the Jinja2 library. ''; - maintainers = with maintainers; [ rushmorem ]; + maintainers = with maintainers; [ rushmorem SuperSandro2000 ]; }; } diff --git a/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix b/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix index 71fba8a12225b..bd3e073a7724b 100644 --- a/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix +++ b/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix @@ -28,6 +28,9 @@ buildPythonPackage rec { --replace "/bin/bash" "${bash}/bin/bash" ''; + # no tests + doCheck = false; + meta = with lib; { description = "JupyterHub Spawner using systemd for resource isolation"; homepage = "https://github.com/jupyterhub/systemdspawner"; diff --git a/pkgs/development/python-modules/manticore/default.nix b/pkgs/development/python-modules/manticore/default.nix index f9ca3afc4b15d..9e0938fb14865 100644 --- a/pkgs/development/python-modules/manticore/default.nix +++ b/pkgs/development/python-modules/manticore/default.nix @@ -57,6 +57,7 @@ buildPythonPackage rec { ] ++ lib.optionals (!stdenv.isLinux) [ "--ignore=tests/native" "--ignore=tests/other/test_locking.py" + "--ignore=tests/other/test_state_introspection.py" ]; disabledTests = [ # failing tests diff --git a/pkgs/development/python-modules/nunavut/default.nix b/pkgs/development/python-modules/nunavut/default.nix index 8b2943ba363a8..63b5214b27bad 100644 --- a/pkgs/development/python-modules/nunavut/default.nix +++ b/pkgs/development/python-modules/nunavut/default.nix @@ -1,13 +1,18 @@ -{ lib, buildPythonPackage, pythonOlder, fetchPypi, pydsdl }: +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, pydsdl +}: buildPythonPackage rec { pname = "nunavut"; - version = "0.6.2"; + version = "1.0.1"; disabled = pythonOlder "3.5"; # only python>=3.5 is supported src = fetchPypi { inherit pname version; - sha256 = "48b6802722d78542ca5d7bbc0d6aa9b0a31e1be0070c47b41527f227eb6a1443"; + sha256 = "1gvs3fx2l15y5ffqsxxjfa4p1ydaqbq7qp5nsgb8jbz871358jxm"; }; propagatedBuildInputs = [ @@ -19,7 +24,10 @@ export HOME=$TMPDIR ''; - # repo doesn't contain tests, ensure imports aren't broken + # No tests in pypy package and no git tags yet for release versions, see + # https://github.com/UAVCAN/nunavut/issues/182 + doCheck = false; + pythonImportsCheck = [ "nunavut" ]; diff --git a/pkgs/development/python-modules/praw/default.nix b/pkgs/development/python-modules/praw/default.nix index 8d4018d6d09f1..d6329d0c3814f 100644 --- a/pkgs/development/python-modules/praw/default.nix +++ b/pkgs/development/python-modules/praw/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "praw"; - version = "7.1.2"; + version = "7.1.3"; src = fetchFromGitHub { owner = "praw-dev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-aEx0swjfyBrSu1fgIiAwdwWmk9v5o7sbT5HTVp7L3R4="; + sha256 = "sha256-Ndj7JNRQVLlWyOkS7zSi3B07mZyulyIL0Ju3owNoAsw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pydsdl/default.nix b/pkgs/development/python-modules/pydsdl/default.nix index 655adecd5c898..08029d35df5bf 100644 --- a/pkgs/development/python-modules/pydsdl/default.nix +++ b/pkgs/development/python-modules/pydsdl/default.nix @@ -2,25 +2,24 @@ buildPythonPackage rec { pname = "pydsdl"; - version = "1.4.2"; + version = "1.9.4"; disabled = pythonOlder "3.5"; # only python>=3.5 is supported src = fetchFromGitHub { owner = "UAVCAN"; repo = pname; rev = version; - sha256 = "03kbpzdrjzj5vpgz5rhc110pm1axdn3ynv88b42zq6iyab4k8k1x"; + sha256 = "1hmmc4sg6dckbx2ghcjpi74yprapa6lkxxzy0h446mvyngp0kwfv"; }; - propagatedBuildInputs = [ - ]; - # allow for writable directory for darwin preBuild = '' export HOME=$TMPDIR ''; - # repo doesn't contain tests, ensure imports aren't broken + # repo doesn't contain tests + doCheck = false; + pythonImportsCheck = [ "pydsdl" ]; diff --git a/pkgs/development/python-modules/pyicloud/default.nix b/pkgs/development/python-modules/pyicloud/default.nix index 6e808a0105853..039d6259f36d9 100644 --- a/pkgs/development/python-modules/pyicloud/default.nix +++ b/pkgs/development/python-modules/pyicloud/default.nix @@ -1,40 +1,46 @@ { lib , buildPythonPackage -, fetchPypi -, requests +, fetchFromGitHub +, certifi +, click , keyring , keyrings-alt -, click +, pytz +, requests , six , tzlocal -, certifi -, bitstring -, unittest2 +, pytest-mock +, pytestCheckHook , future }: buildPythonPackage rec { pname = "pyicloud"; - version = "0.9.7"; + version = "0.10.2"; - src = fetchPypi { - inherit pname version; - sha256 = "dcebb32e474bc28aa77b944a0a64949ef3b5b852cbef6256fbc95347a04e777c"; + src = fetchFromGitHub { + owner = "picklepete"; + repo = pname; + rev = version; + sha256 = "0bxbhvimwbj2jm8dg7sil8yvln17xgjhvpwr4m783vwfcf76kdmy"; }; propagatedBuildInputs = [ - requests + certifi + click + future keyring keyrings-alt - click + pytz + requests six tzlocal - certifi - bitstring - future ]; - checkInputs = [ unittest2 ]; + checkInputs = [ + pytest-mock + pytestCheckHook + ]; postPatch = '' sed -i \ diff --git a/pkgs/development/python-modules/pysma/default.nix b/pkgs/development/python-modules/pysma/default.nix new file mode 100644 index 0000000000000..f1005fe0b7a9b --- /dev/null +++ b/pkgs/development/python-modules/pysma/default.nix @@ -0,0 +1,36 @@ +{ lib +, aiohttp +, attrs +, buildPythonPackage +, fetchPypi +, jmespath +, async-timeout +}: + +buildPythonPackage rec { + pname = "pysma"; + version = "0.3.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "1awcsbk14i2aw01f7b7hrmpn9q6vr9v6la0i9n7ldv1h8rzq6j16"; + }; + + propagatedBuildInputs = [ + aiohttp + async-timeout + attrs + jmespath + ]; + + # pypi does not contain tests and GitHub archive not available + doCheck = false; + pythonImportsCheck = [ "pysma" ]; + + meta = with lib; { + description = "Python library for interacting with SMA Solar's WebConnect"; + homepage = "https://github.com/kellerza/pysma"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/slackclient/default.nix b/pkgs/development/python-modules/slackclient/default.nix index a690788095e62..d990295bff61e 100644 --- a/pkgs/development/python-modules/slackclient/default.nix +++ b/pkgs/development/python-modules/slackclient/default.nix @@ -49,6 +49,8 @@ buildPythonPackage rec { responses ]; + pythonImportsCheck = [ "slack" ]; + meta = with lib; { description = "A client for Slack, which supports the Slack Web API and Real Time Messaging (RTM) API"; homepage = "https://github.com/slackapi/python-slackclient"; diff --git a/pkgs/development/python-modules/slither-analyzer/default.nix b/pkgs/development/python-modules/slither-analyzer/default.nix index deb12817a7bd8..0b320e7902216 100644 --- a/pkgs/development/python-modules/slither-analyzer/default.nix +++ b/pkgs/development/python-modules/slither-analyzer/default.nix @@ -1,5 +1,7 @@ -{ lib, buildPythonPackage, fetchPypi, makeWrapper, pythonOlder -, crytic-compile, prettytable, setuptools, solc +{ lib, stdenv, buildPythonPackage, fetchPypi, makeWrapper, pythonOlder +, crytic-compile, prettytable, setuptools +# solc is currently broken on Darwin, default to false +, solc, withSolc ? !stdenv.isDarwin }: buildPythonPackage rec { @@ -19,7 +21,7 @@ buildPythonPackage rec { nativeBuildInputs = [ makeWrapper ]; propagatedBuildInputs = [ crytic-compile prettytable setuptools ]; - postFixup = '' + postFixup = lib.optionalString withSolc '' wrapProgram $out/bin/slither \ --prefix PATH : "${lib.makeBinPath [ solc ]}" ''; @@ -32,7 +34,7 @@ buildPythonPackage rec { contract details, and provides an API to easily write custom analyses. ''; homepage = "https://github.com/trailofbits/slither"; - license = licenses.agpl3; - maintainers = [ maintainers.asymmetric ]; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ asymmetric arturcygan ]; }; } diff --git a/pkgs/development/tools/haskell/haskell-language-server/default.nix b/pkgs/development/tools/haskell/haskell-language-server/default.nix deleted file mode 100644 index 71b6355db58db..0000000000000 --- a/pkgs/development/tools/haskell/haskell-language-server/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ mkDerivation, aeson, base, binary, blaze-markup, brittany -, bytestring, containers, data-default, deepseq, directory, extra -, fetchgit, filepath, floskell, fourmolu, ghc, ghc-boot-th -, ghc-paths, ghcide, gitrev, hashable, haskell-lsp, hie-bios -, hls-class-plugin, hls-eval-plugin, hls-explicit-imports-plugin -, hls-hlint-plugin, hls-plugin-api, hls-retrie-plugin -, hls-tactics-plugin, hslogger, hspec, hspec-core -, hspec-expectations, lens, lsp-test, mtl, optparse-applicative -, optparse-simple, ormolu, process, regex-tdfa, safe-exceptions -, shake, lib, stm, stylish-haskell, tasty, tasty-ant-xml -, tasty-expected-failure, tasty-golden, tasty-hunit, tasty-rerun -, temporary, text, transformers, unordered-containers, with-utf8 -, yaml -}: -mkDerivation { - pname = "haskell-language-server"; - version = "0.8.0.0"; - src = fetchgit { - url = "https://github.com/haskell/haskell-language-server.git"; - sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588"; - rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5"; - fetchSubmodules = true; - }; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers data-default directory extra filepath ghc ghcide - gitrev haskell-lsp hls-plugin-api hslogger optparse-applicative - optparse-simple process shake text unordered-containers - ]; - executableHaskellDepends = [ - aeson base binary brittany bytestring containers deepseq directory - extra filepath floskell fourmolu ghc ghc-boot-th ghc-paths ghcide - gitrev hashable haskell-lsp hie-bios hls-class-plugin - hls-eval-plugin hls-explicit-imports-plugin hls-hlint-plugin - hls-plugin-api hls-retrie-plugin hls-tactics-plugin hslogger lens - mtl optparse-applicative optparse-simple ormolu process regex-tdfa - safe-exceptions shake stylish-haskell temporary text transformers - unordered-containers with-utf8 - ]; - testHaskellDepends = [ - aeson base blaze-markup bytestring containers data-default - directory extra filepath haskell-lsp hie-bios hls-plugin-api - hslogger hspec hspec-core hspec-expectations lens lsp-test process - stm tasty tasty-ant-xml tasty-expected-failure tasty-golden - tasty-hunit tasty-rerun temporary text transformers - unordered-containers yaml - ]; - testToolDepends = [ ghcide ]; - homepage = "https://github.com/haskell/haskell-language-server#readme"; - description = "LSP server for GHC"; - license = lib.licenses.asl20; -} diff --git a/pkgs/development/tools/haskell/haskell-language-server/hls-class-plugin.nix b/pkgs/development/tools/haskell/haskell-language-server/hls-class-plugin.nix deleted file mode 100644 index b757dc8c9e867..0000000000000 --- a/pkgs/development/tools/haskell/haskell-language-server/hls-class-plugin.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ mkDerivation, aeson, base, containers, fetchgit, ghc -, ghc-exactprint, ghcide, haskell-lsp, hls-plugin-api, lens, shake -, lib, text, transformers, unordered-containers -}: -mkDerivation { - pname = "hls-class-plugin"; - version = "0.1.0.0"; - src = fetchgit { - url = "https://github.com/haskell/haskell-language-server.git"; - sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588"; - rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5"; - fetchSubmodules = true; - }; - postUnpack = "sourceRoot+=/plugins/hls-class-plugin; echo source root reset to $sourceRoot"; - libraryHaskellDepends = [ - aeson base containers ghc ghc-exactprint ghcide haskell-lsp - hls-plugin-api lens shake text transformers unordered-containers - ]; - description = "Explicit imports plugin for Haskell Language Server"; - license = lib.licenses.asl20; -} diff --git a/pkgs/development/tools/haskell/haskell-language-server/hls-eval-plugin.nix b/pkgs/development/tools/haskell/haskell-language-server/hls-eval-plugin.nix deleted file mode 100644 index 2677b45a591d3..0000000000000 --- a/pkgs/development/tools/haskell/haskell-language-server/hls-eval-plugin.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ mkDerivation, aeson, base, containers, deepseq, Diff, directory -, extra, fetchgit, filepath, ghc, ghc-boot-th, ghc-paths, ghcide -, hashable, haskell-lsp, haskell-lsp-types, hls-plugin-api -, parser-combinators, pretty-simple, QuickCheck, safe-exceptions -, shake, lib, temporary, text, time, transformers -, unordered-containers -}: -mkDerivation { - pname = "hls-eval-plugin"; - version = "0.1.0.0"; - src = fetchgit { - url = "https://github.com/haskell/haskell-language-server.git"; - sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588"; - rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5"; - fetchSubmodules = true; - }; - postUnpack = "sourceRoot+=/plugins/hls-eval-plugin; echo source root reset to $sourceRoot"; - libraryHaskellDepends = [ - aeson base containers deepseq Diff directory extra filepath ghc - ghc-boot-th ghc-paths ghcide hashable haskell-lsp haskell-lsp-types - hls-plugin-api parser-combinators pretty-simple QuickCheck - safe-exceptions shake temporary text time transformers - unordered-containers - ]; - description = "Eval plugin for Haskell Language Server"; - license = lib.licenses.asl20; -} diff --git a/pkgs/development/tools/haskell/haskell-language-server/hls-explicit-imports-plugin.nix b/pkgs/development/tools/haskell/haskell-language-server/hls-explicit-imports-plugin.nix deleted file mode 100644 index 8207b5181ba17..0000000000000 --- a/pkgs/development/tools/haskell/haskell-language-server/hls-explicit-imports-plugin.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ mkDerivation, aeson, base, containers, deepseq, fetchgit, ghc -, ghcide, haskell-lsp-types, hls-plugin-api, shake, lib, text -, unordered-containers -}: -mkDerivation { - pname = "hls-explicit-imports-plugin"; - version = "0.1.0.0"; - src = fetchgit { - url = "https://github.com/haskell/haskell-language-server.git"; - sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588"; - rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5"; - fetchSubmodules = true; - }; - postUnpack = "sourceRoot+=/plugins/hls-explicit-imports-plugin; echo source root reset to $sourceRoot"; - libraryHaskellDepends = [ - aeson base containers deepseq ghc ghcide haskell-lsp-types - hls-plugin-api shake text unordered-containers - ]; - description = "Explicit imports plugin for Haskell Language Server"; - license = lib.licenses.asl20; -} diff --git a/pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix b/pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix deleted file mode 100644 index 02e314cba3a17..0000000000000 --- a/pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ mkDerivation, aeson, apply-refact, base, binary, bytestring -, containers, data-default, deepseq, Diff, directory, extra -, fetchgit, filepath, ghc, ghc-lib, ghc-lib-parser-ex, ghcide -, hashable, haskell-lsp, hlint, hls-plugin-api, hslogger, lens -, regex-tdfa, shake, lib, temporary, text, transformers -, unordered-containers -}: -mkDerivation { - pname = "hls-hlint-plugin"; - version = "0.1.0.0"; - src = fetchgit { - url = "https://github.com/haskell/haskell-language-server.git"; - sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588"; - rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5"; - fetchSubmodules = true; - }; - postUnpack = "sourceRoot+=/plugins/hls-hlint-plugin; echo source root reset to $sourceRoot"; - libraryHaskellDepends = [ - aeson apply-refact base binary bytestring containers data-default - deepseq Diff directory extra filepath ghc ghc-lib ghc-lib-parser-ex - ghcide hashable haskell-lsp hlint hls-plugin-api hslogger lens - regex-tdfa shake temporary text transformers unordered-containers - ]; - description = "Hlint integration plugin with Haskell Language Server"; - license = lib.licenses.asl20; -} diff --git a/pkgs/development/tools/haskell/haskell-language-server/hls-retrie-plugin.nix b/pkgs/development/tools/haskell/haskell-language-server/hls-retrie-plugin.nix deleted file mode 100644 index cca8acb8819e6..0000000000000 --- a/pkgs/development/tools/haskell/haskell-language-server/hls-retrie-plugin.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ mkDerivation, aeson, base, containers, deepseq, directory, extra -, fetchgit, ghc, ghcide, hashable, haskell-lsp, haskell-lsp-types -, hls-plugin-api, retrie, safe-exceptions, shake, lib, text -, transformers, unordered-containers -}: -mkDerivation { - pname = "hls-retrie-plugin"; - version = "0.1.0.0"; - src = fetchgit { - url = "https://github.com/haskell/haskell-language-server.git"; - sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588"; - rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5"; - fetchSubmodules = true; - }; - postUnpack = "sourceRoot+=/plugins/hls-retrie-plugin; echo source root reset to $sourceRoot"; - libraryHaskellDepends = [ - aeson base containers deepseq directory extra ghc ghcide hashable - haskell-lsp haskell-lsp-types hls-plugin-api retrie safe-exceptions - shake text transformers unordered-containers - ]; - description = "Retrie integration plugin for Haskell Language Server"; - license = lib.licenses.asl20; -} diff --git a/pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix b/pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix deleted file mode 100644 index 369ce0e27b86d..0000000000000 --- a/pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ mkDerivation, aeson, base, checkers, containers, deepseq -, directory, extra, fetchgit, filepath, fingertree, generic-lens -, ghc, ghc-boot-th, ghc-exactprint, ghc-source-gen, ghcide -, haskell-lsp, hie-bios, hls-plugin-api, hspec, hspec-discover -, lens, mtl, QuickCheck, refinery, retrie, shake, lib, syb, text -, transformers -}: -mkDerivation { - pname = "hls-tactics-plugin"; - version = "0.5.1.0"; - src = fetchgit { - url = "https://github.com/haskell/haskell-language-server.git"; - sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588"; - rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5"; - fetchSubmodules = true; - }; - postUnpack = "sourceRoot+=/plugins/tactics; echo source root reset to $sourceRoot"; - libraryHaskellDepends = [ - aeson base containers deepseq directory extra filepath fingertree - generic-lens ghc ghc-boot-th ghc-exactprint ghc-source-gen ghcide - haskell-lsp hls-plugin-api lens mtl refinery retrie shake syb text - transformers - ]; - testHaskellDepends = [ - base checkers containers ghc hie-bios hls-plugin-api hspec mtl - QuickCheck - ]; - testToolDepends = [ hspec-discover ]; - description = "Tactics plugin for Haskell Language Server"; - license = "unknown"; - hydraPlatforms = lib.platforms.none; -} diff --git a/pkgs/development/tools/haskell/haskell-language-server/update.sh b/pkgs/development/tools/haskell/haskell-language-server/update.sh deleted file mode 100755 index aaccf8b9b9fe2..0000000000000 --- a/pkgs/development/tools/haskell/haskell-language-server/update.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p cabal2nix jq curl -# -# This script will update the haskell-language-server derivation to the latest version using -# cabal2nix. -# -# Note that you should always try building haskell-language-server after updating it here, since -# some of the overrides in pkgs/development/haskell/configuration-nix.nix may -# need to be updated/changed. -# -# Remember to split out different updates into multiple commits - -set -eo pipefail - -# This is the directory of this update.sh script. -script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" - -# =========================== -# HLS -# =========================== - -# hls derivation created with cabal2nix. -hls_derivation_file="${script_dir}/default.nix" - -# This is the current revision of hls in Nixpkgs. -hls_old_version="$(sed -En 's/.*\bversion = "(.*?)".*/\1/p' "$hls_derivation_file")" - -# This is the latest release version of hls on GitHub. -# Get all tag names, filter to the hls ones (no prefix like 'hls-plugin-api-'), -# sort for the latest one and select just that -hls_latest_release=$(curl -H "Accept: application/vnd.github.v3+json" https://api.github.com/repos/haskell/haskell-language-server/tags | - jq --raw-output 'map(.name) | .[]' | - grep '^[0-9]' | - sort --version-sort | - tail -n1) - -# Use this value instead for the very latest revision -# hls_head=(curl --silent "https://api.github.com/repos/haskell/haskell-language-server/commits/master" | jq '.sha' --raw-output) - -hls_new_version=$hls_latest_release - -echo "Updating haskell-language-server from old version $hls_old_version to new version $hls_new_version." -echo "Running cabal2nix and outputting to ${hls_derivation_file}..." -cabal2nix --revision "$hls_new_version" "https://github.com/haskell/haskell-language-server.git" > "$hls_derivation_file" -cabal2nix --revision "$hls_new_version" --subpath plugins/tactics "https://github.com/haskell/haskell-language-server.git" > "${script_dir}/hls-tactics-plugin.nix" -for plugin in "hls-hlint-plugin" "hls-explicit-imports-plugin" "hls-retrie-plugin" "hls-class-plugin" "hls-eval-plugin"; do - cabal2nix --revision "$hls_new_version" --subpath plugins/$plugin "https://github.com/haskell/haskell-language-server.git" > "${script_dir}/$plugin.nix" -done - -echo "Finished." diff --git a/pkgs/development/tools/rust/cargo-generate/default.nix b/pkgs/development/tools/rust/cargo-generate/default.nix index 635f36ee834c9..5576016d5323e 100644 --- a/pkgs/development/tools/rust/cargo-generate/default.nix +++ b/pkgs/development/tools/rust/cargo-generate/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-generate"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "ashleygwilliams"; repo = "cargo-generate"; rev = "v${version}"; - sha256 = "0rq0anz0cawrgsinqyjh8wb3dgha09wx3ydrd3m9nfxs5dd3ij3k"; + sha256 = "sha256-/tZUYJaNvJ7H3xAc9ygcJD6meK1Em87VYqqYqY1l4zE="; }; - cargoSha256 = "1vngn9gbiv59wrq230qk2mv00bsbdfk2mi1iqpr736c5wj1caqld"; + cargoSha256 = "sha256-/6nr+UNQPa8+cEnAMgyjuCV1JjfqXcNLfuqi4/kgmk0="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/misc/emulators/wine/cert-path-stable.patch b/pkgs/misc/emulators/wine/cert-path-stable.patch deleted file mode 100644 index da01a4778102b..0000000000000 --- a/pkgs/misc/emulators/wine/cert-path-stable.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/dlls/crypt32/rootstore.c b/dlls/crypt32/rootstore.c -index f795181..fb4926a 100644 ---- a/dlls/crypt32/rootstore.c -+++ b/dlls/crypt32/rootstore.c -@@ -18,6 +18,7 @@ - #include "config.h" - #include <stdarg.h> - #include <stdio.h> -+#include <stdlib.h> /* getenv */ - #include <sys/types.h> - #ifdef HAVE_SYS_STAT_H - #include <sys/stat.h> -@@ -916,6 +917,11 @@ static void read_trusted_roots_from_known_locations(HCERTSTORE store) - - for (i = 0; !ret && i < ARRAY_SIZE(CRYPT_knownLocations); i++) - ret = import_certs_from_path(CRYPT_knownLocations[i], from, TRUE); -+ -+ char *nix_cert_file = getenv("NIX_SSL_CERT_FILE"); -+ if (nix_cert_file != NULL) -+ ret = import_certs_from_path(nix_cert_file, from, TRUE); -+ - check_and_store_certs(from, store); - } - CertCloseStore(from, 0); diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 3a5abe18d7548..15e2f80aa4ea7 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -13,9 +13,9 @@ let fetchurl = args@{url, sha256, ...}: in rec { stable = fetchurl rec { - version = "5.0.3"; - url = "https://dl.winehq.org/wine/source/5.0/wine-${version}.tar.xz"; - sha256 = "sha256-nBo1Ni/VE9/1yEW/dtpj6hBaeUrHFEqlA/cTYa820i8="; + version = "6.0"; + url = "https://dl.winehq.org/wine/source/6.0/wine-${version}.tar.xz"; + sha256 = "sha256-tJMGXy+D7kKcYuLsWGmKPPY+94ci4bIHZYIxUuhYLFY="; ## see http://wiki.winehq.org/Gecko gecko32 = fetchurl rec { @@ -38,15 +38,15 @@ in rec { patches = [ # Also look for root certificates at $NIX_SSL_CERT_FILE - ./cert-path-stable.patch + ./cert-path.patch ]; }; unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "6.0-rc4"; - url = "https://dl.winehq.org/wine/source/6.0/wine-${version}.tar.xz"; - sha256 = "sha256-ndeBORgnfYmtPbvZEesaetocknePF8cnyjqfulkcfsU="; + version = "6.1"; + url = "https://dl.winehq.org/wine/source/6.x/wine-${version}.tar.xz"; + sha256 = "sha256-qSwkMIxIuFG13CKh01aWpXMRxEezHsn6VD7FsKpzoUk="; inherit (stable) mono gecko32 gecko64; patches = [ @@ -58,7 +58,7 @@ in rec { staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "sha256-GdFiCGnGSDOxGERlfsPMJdSrQTvnx8gf4z4joqIKT7c="; + sha256 = "sha256-uu6wvWT54Zvp86KfUcKepGxjQ6JHRQ7Yuu4yeROdHeo="; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; diff --git a/pkgs/os-specific/linux/fuse/default.nix b/pkgs/os-specific/linux/fuse/default.nix index 0ed6f54a1dcc0..02c46b9ba7728 100644 --- a/pkgs/os-specific/linux/fuse/default.nix +++ b/pkgs/os-specific/linux/fuse/default.nix @@ -11,7 +11,7 @@ in { }; fuse_3 = mkFuse { - version = "3.10.1"; - sha256Hash = "0bb22mac8m0z6qp0s6g4r0x4aj6gc19pfyqr6sdy4hkpwxicgmaf"; + version = "3.10.2"; + sha256Hash = "0m44hhk6jxkgkvk2jsjcwa3pqgzzqnpm606n3n8wn1ldypkvpsps"; }; } diff --git a/pkgs/servers/etebase/default.nix b/pkgs/servers/etebase/default.nix new file mode 100644 index 0000000000000..d16c6f0113369 --- /dev/null +++ b/pkgs/servers/etebase/default.nix @@ -0,0 +1,57 @@ +{ lib, stdenv, python3, fetchFromGitHub }: + +let + py = python3.override { + packageOverrides = self: super: { + django = super.django_3; + }; + }; +in + with py.pkgs; + +buildPythonPackage rec { + pname = "etebase-server"; + version = "0.7.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "etesync"; + repo = "server"; + rev = "v${version}"; + sha256 = "1r2a7ki9w2h3l6rwqa3fzxjlqfj2lbgfrm8lynjhvcdv02s5abbi"; + }; + + patches = [ ./secret.patch ]; + + propagatedBuildInputs = with pythonPackages; [ + asgiref + cffi + django + django-cors-headers + djangorestframework + drf-nested-routers + msgpack + psycopg2 + pycparser + pynacl + pytz + six + sqlparse + ]; + + installPhase = '' + mkdir -p $out/bin $out/lib + cp -r . $out/lib/etebase-server + ln -s $out/lib/etebase-server/manage.py $out/bin/etebase-server + wrapProgram $out/bin/etebase-server --prefix PYTHONPATH : "$PYTHONPATH" + chmod +x $out/bin/etebase-server + ''; + + meta = with lib; { + homepage = "https://github.com/etesync/server"; + description = "An Etebase (EteSync 2.0) server so you can run your own."; + license = licenses.agpl3Only; + maintainers = with maintainers; [ felschr ]; + broken = stdenv.isDarwin; + }; +} diff --git a/pkgs/servers/etebase/secret.patch b/pkgs/servers/etebase/secret.patch new file mode 100644 index 0000000000000..182d3259248ee --- /dev/null +++ b/pkgs/servers/etebase/secret.patch @@ -0,0 +1,26 @@ +diff --git a/etebase_server/settings.py b/etebase_server/settings.py +index 9baf8d3..501d9f6 100644 +--- a/etebase_server/settings.py ++++ b/etebase_server/settings.py +@@ -23,11 +22,6 @@ + # Quick-start development settings - unsuitable for production + # See https://docs.djangoproject.com/en/3.0/howto/deployment/checklist/ + +-# SECURITY WARNING: keep the secret key used in production secret! +-# See secret.py for how this is generated; uses a file 'secret.txt' in the root +-# directory +-SECRET_FILE = os.path.join(BASE_DIR, "secret.txt") +- + # SECURITY WARNING: don't run with debug turned on in production! + DEBUG = True + +@@ -143,7 +137,7 @@ + + section = config["global"] + +- SECRET_FILE = section.get("secret_file", SECRET_FILE) ++ SECRET_FILE = section.get("secret_file", None) + STATIC_ROOT = section.get("static_root", STATIC_ROOT) + STATIC_URL = section.get("static_url", STATIC_URL) + MEDIA_ROOT = section.get("media_root", MEDIA_ROOT) + diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index b6c3a281f2e28..d6aebd0cd452f 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2021.2.0"; + version = "2021.2.1"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; @@ -744,7 +744,7 @@ "slack" = ps: with ps; [ ]; # missing inputs: slackclient "sleepiq" = ps: with ps; [ ]; # missing inputs: sleepyq "slide" = ps: with ps; [ ]; # missing inputs: goslide-api - "sma" = ps: with ps; [ ]; # missing inputs: pysma + "sma" = ps: with ps; [ pysma ]; "smappee" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pysmappee "smart_meter_texas" = ps: with ps; [ ]; # missing inputs: smart-meter-texas "smarthab" = ps: with ps; [ ]; # missing inputs: smarthab diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 1c24f6dd4f86c..977c58906ac73 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -57,7 +57,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2021.2.0"; + hassVersion = "2021.2.1"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -76,7 +76,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "116aq683wy7sxdbxr43li90irpfbsz0dv8w0r1fghcjpwlj7ihwa"; + sha256 = "0a8l23n6j0x1hjcifajgbrip7b4l8xcgxn2wa1lcg27p1cghrv5m"; }; # leave this in, so users don't have to constantly update their downstream patch handling @@ -101,6 +101,7 @@ in with py.pkgs; buildPythonApplication rec { astral async-timeout attrs + awesomeversion bcrypt certifi ciso8601 @@ -181,30 +182,23 @@ in with py.pkgs; buildPythonApplication rec { pytestFlagsArray = [ "-n auto" + # assign tests grouped by file to workers + "--dist loadfile" # don't bulk test all components "--ignore tests/components" - # prone to race conditions due to parallel file access - "--ignore tests/test_config.py" # pyotp since v2.4.0 complains about the short mock keys, hass pins v2.3.0 "--ignore tests/auth/mfa_modules/test_notify.py" "tests" ] ++ map (component: "tests/components/" + component) componentTests; disabledTests = [ - # AssertionError: assert 'unknown' == 'not_home' - "test_device_tracker_not_home" + # AssertionError: assert 1 == 0 + "test_merge" + # ModuleNotFoundError: No module named 'pyqwikswitch' + "test_merge_id_schema" # keyring.errors.NoKeyringError: No recommended backend was available. "test_secrets_from_unrelated_fails" "test_secrets_credstash" - # AssertionError: Expected 'start' to have been called once. Called 0 times. - "test_setup_and_stop" - # AssertionError: assert {} == {'test': <ANY...ckage': <ANY>} - "test_get_custom_components_internal" - # assert 0 == 1 where 0 = len([]) - "test_error_posted_as_event" - # RuntimeError: Event loop is closed - "test_config_path" - "test_info_endpoint_register_callback_timeout" ]; preCheck = '' diff --git a/pkgs/tools/admin/procs/default.nix b/pkgs/tools/admin/procs/default.nix index c413934590874..afdbbbe9450b3 100644 --- a/pkgs/tools/admin/procs/default.nix +++ b/pkgs/tools/admin/procs/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "procs"; - version = "0.11.1"; + version = "0.11.3"; src = fetchFromGitHub { owner = "dalance"; repo = pname; rev = "v${version}"; - sha256 = "sha256-e9fdqsv/P3zZdjsdAkwO21txPS1aWd0DuqRQUdr1vX4="; + sha256 = "sha256-OaHsNxrOrPlAwtFDY3Tnx+nOabax98xcGQeNds32iOA="; }; - cargoSha256 = "sha256-ilSDLbPQnmhQcNbtKCpUNmyZY0JUY/Ksg0sj/t7veT0="; + cargoSha256 = "sha256-miOfm1Sw6tIICkT9T2V82cdGG2STo9vuLPWsAN/8wuM="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/graphics/pngcheck/default.nix b/pkgs/tools/graphics/pngcheck/default.nix index 7fba539977f9e..579dcad4ccb4c 100644 --- a/pkgs/tools/graphics/pngcheck/default.nix +++ b/pkgs/tools/graphics/pngcheck/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, zlib }: stdenv.mkDerivation rec { - name = "pngcheck-2.3.0"; + name = "pngcheck-3.0.2"; src = fetchurl { url = "mirror://sourceforge/png-mng/${name}.tar.gz"; - sha256 = "0pzkj1bb4kdybk6vbfq9s0wzdm5szmrgixkas3xmbpv4mhws1w3p"; + sha256 = "sha256-DX4mLyQRb93yhHqM61yS2fXybvtC6f/2PsK7dnYTHKc="; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/tools/misc/duf/default.nix b/pkgs/tools/misc/duf/default.nix index ed8a11e182c9b..82cc7fa29e4a7 100644 --- a/pkgs/tools/misc/duf/default.nix +++ b/pkgs/tools/misc/duf/default.nix @@ -2,26 +2,24 @@ buildGoModule rec { pname = "duf"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "muesli"; repo = "duf"; rev = "v${version}"; - sha256 = "0n0nvrqrlr75dmf2j6ja615ighzs35cfixn7z9cwdz3vhj1xhc5f"; + sha256 = "sha256-Wm3gfir6blQFLLi+2bT5Y/5tf7qUxEddJQ7tCYfBGgM="; }; - dontStrip = true; + vendorSha256 = "0icxy6wbqjqawr6i5skwp1z37fq303p8f95crd8lwn6pjjiqzk4i"; - vendorSha256 = "1jqilfsirj7bkhzywimzf98w2b4s777phb06nsw6lr3bi6nnwzr1"; - - buildFlagsArray = [ "-ldflags=" "-X=main.Version=${version}" ]; + buildFlagsArray = [ "-ldflags=" "-s -w -X=main.Version=${version}" ]; meta = with lib; { homepage = "https://github.com/muesli/duf/"; description = "Disk Usage/Free Utility"; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ petabyteboy penguwin ]; + maintainers = with maintainers; [ petabyteboy penguwin SuperSandro2000 ]; }; } diff --git a/pkgs/tools/misc/pcb2gcode/default.nix b/pkgs/tools/misc/pcb2gcode/default.nix index b5675f8287db8..0b300b079db24 100644 --- a/pkgs/tools/misc/pcb2gcode/default.nix +++ b/pkgs/tools/misc/pcb2gcode/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "pcb2gcode"; - version = "2.1.0"; + version = "2.2.2"; src = fetchFromGitHub { owner = "pcb2gcode"; repo = "pcb2gcode"; rev = "v${version}"; - sha256 = "0nzglcyh6ban27cc73j4l7w7r9k38qivq0jz8iwnci02pfalw4ry"; + sha256 = "sha256-GSLWpLp/InAxVolKmBIjljpe3ZzmS/87TWKwzax5SkY="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/tools/misc/phoronix-test-suite/default.nix b/pkgs/tools/misc/phoronix-test-suite/default.nix index da69d5a8b9310..348670c3bb1b1 100644 --- a/pkgs/tools/misc/phoronix-test-suite/default.nix +++ b/pkgs/tools/misc/phoronix-test-suite/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "phoronix-test-suite"; - version = "10.2.0"; + version = "10.2.1"; src = fetchurl { url = "https://phoronix-test-suite.com/releases/${pname}-${version}.tar.gz"; - sha256 = "sha256-eoKHgbSyOEkwzki5wWuZlOAmZljxOMXcztA/g8TtutQ="; + sha256 = "sha256-2HB4TPbyG+cTY6O1k0tRPrnKyg41SYnVM919Hii3gpg="; }; buildInputs = [ php ]; diff --git a/pkgs/tools/misc/venus/default.nix b/pkgs/tools/misc/venus/default.nix deleted file mode 100644 index 28c4508525ec1..0000000000000 --- a/pkgs/tools/misc/venus/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, python, pythonPackages, libxslt, libxml2, makeWrapper }: - -stdenv.mkDerivation rec { - pname = "venus"; - version = "unstable-2011-02-18"; - - src = fetchFromGitHub { - owner = "rubys"; - repo = "venus"; - rev = "9de21094a8cf565bdfcf75688e121a5ad1f5397b"; - sha256 = "10yyx4jaxxbwhica12aiw119aywghcr7b24gs9lrmafpa6xd3an2"; - }; - - preConfigure = '' - substituteInPlace tests/test_spider.py \ - --replace "urllib.urlopen('http://127.0.0.1:%d/' % _PORT).read()" "" \ - --replace "[200,200,200,200,404]" "[200,200,200,404]" - substituteInPlace planet.py \ - --replace "#!/usr/bin/env python" "#!${python}/bin/python" - substituteInPlace tests/test_apply.py \ - --replace "'xsltproc" "'${libxslt.bin}/bin/xsltproc" - substituteInPlace planet/shell/xslt.py \ - --replace "'xsltproc" "'${libxslt.bin}/bin/xsltproc" - ''; - - doCheck = true; - checkPhase = "python runtests.py"; - - buildInputs = [ python libxslt - libxml2 pythonPackages.genshi pythonPackages.lxml makeWrapper ]; - - installPhase = '' - mkdir -p $out/bin - cp -R ./* $out/ - ln -s $out/planet.py $out/bin/venus-planet - wrapProgram $out/planet.py \ - --prefix PYTHONPATH : $PYTHONPATH:${pythonPackages.lxml}/lib/${python.libPrefix}/site-packages:${pythonPackages.genshi}/lib/${python.libPrefix}/site-packages - python runtests.py - ''; - - meta = { - description = "News feed reader"; - longDescription = '' - Planet Venus is an awesome ‘river of news’ feed reader. It downloads news - feeds published by web sites and aggregates their content together into a - single combined feed, latest news first. - ''; - homepage = "http://intertwingly.net/code/venus/docs/index.html"; - license = lib.licenses.psfl; - platforms = lib.platforms.all; - maintainers = []; - }; -} diff --git a/pkgs/tools/networking/nebula/default.nix b/pkgs/tools/networking/nebula/default.nix index 61f0a00a9b819..06684016abcf8 100644 --- a/pkgs/tools/networking/nebula/default.nix +++ b/pkgs/tools/networking/nebula/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { subPackages = [ "cmd/nebula" "cmd/nebula-cert" ]; - buildFlagsArray = [ "-ldflags='-X main.Build=${version}'" ]; + buildFlagsArray = [ "-ldflags=" "-X main.Build=${version}" ]; meta = with lib; { description = "A scalable overlay networking tool with a focus on performance, simplicity and security"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index bb2fb36bb5b30..fbd30aea40a0b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -717,6 +717,7 @@ mapAliases ({ v8_3_16_14 = throw "v8_3_16_14 was removed in 2019-11-01: no longer referenced by other packages"; valadoc = throw "valadoc was deprecated on 2019-10-10: valadoc was merged into vala 0.38"; vamp = { vampSDK = vamp-plugin-sdk; }; # added 2020-03-26 + venus = throw "venus has been removed from nixpkgs, as it's unmaintained"; # added 2021-02-05 vdirsyncerStable = vdirsyncer; # added 2020-11-08, see https://github.com/NixOS/nixpkgs/issues/103026#issuecomment-723428168 vimbWrapper = vimb; # added 2015-01 vimprobable2 = throw "vimprobable2 has been removed from nixpkgs. It relied on webkitgtk24x that has been removed."; # added 2019-12-05 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6db7d5a57f9ec..f7e4c0038a6ab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8972,10 +8972,6 @@ in hitch = callPackage ../servers/hitch { }; - venus = callPackage ../tools/misc/venus { - python = python27; - }; - veracrypt = callPackage ../applications/misc/veracrypt { wxGTK = wxGTK30; }; @@ -21822,6 +21818,8 @@ in eteroj.lv2 = libsForQt5.callPackage ../applications/audio/eteroj.lv2 { }; + etebase-server = with python3Packages; toPythonApplication etebase-server; + etesync-dav = callPackage ../applications/misc/etesync-dav {}; etherape = callPackage ../applications/networking/sniffers/etherape { }; @@ -23178,6 +23176,8 @@ in lame = callPackage ../development/libraries/lame { }; + labwc = callPackage ../applications/window-managers/labwc { }; + larswm = callPackage ../applications/window-managers/larswm { }; lash = callPackage ../applications/audio/lash { }; @@ -23238,11 +23238,10 @@ in }; libreoffice-qt = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { - libreoffice = libsForQt514.callPackage ../applications/office/libreoffice + libreoffice = libsForQt5.callPackage ../applications/office/libreoffice (libreoffice-args // { kdeIntegration = true; variant = "fresh"; - jdk = jdk11; }); }); @@ -23250,7 +23249,6 @@ in libreoffice = callPackage ../applications/office/libreoffice (libreoffice-args // { variant = "fresh"; - jdk = jdk11; }); }); libreoffice-fresh-unwrapped = libreoffice-fresh.libreoffice; @@ -23258,10 +23256,7 @@ in libreoffice-still = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { libreoffice = callPackage ../applications/office/libreoffice (libreoffice-args // { - stdenv = gcc9Stdenv; # Fails in multiple ways with gcc10 - icu = icu64; variant = "still"; - jdk = jdk8; }); }); libreoffice-still-unwrapped = libreoffice-still.libreoffice; @@ -25533,7 +25528,9 @@ in volnoti = callPackage ../applications/misc/volnoti { }; - vorbis-tools = callPackage ../applications/audio/vorbis-tools { }; + vorbis-tools = callPackage ../applications/audio/vorbis-tools { + autoreconfHook = buildPackages.autoreconfHook269; + }; vscode = callPackage ../applications/editors/vscode/vscode.nix { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 87b6736a62bcd..3d66eaaa5b0a3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1960,6 +1960,8 @@ in { dpkt = callPackage ../development/python-modules/dpkt { }; + drf-nested-routers = callPackage ../development/python-modules/drf-nested-routers { }; + drf-yasg = callPackage ../development/python-modules/drf-yasg { }; drms = callPackage ../development/python-modules/drms { }; @@ -2087,6 +2089,8 @@ in { inherit (pkgs.darwin.apple_sdk.frameworks) Security; }; + etebase-server = callPackage ../servers/etebase { }; + etesync = callPackage ../development/python-modules/etesync { }; eth-hash = callPackage ../development/python-modules/eth-hash { }; @@ -5925,6 +5929,8 @@ in { pyslurm = callPackage ../development/python-modules/pyslurm { slurm = pkgs.slurm; }; + pysma = callPackage ../development/python-modules/pysma { }; + pysmb = callPackage ../development/python-modules/pysmb { }; pysmbc = callPackage ../development/python-modules/pysmbc { inherit (pkgs) pkg-config; }; |