git.iko.soy/typeable/nixpkgs
on master help sign in
Merge branch 'master' into ohmyzsh-cleanups
commit63a726d8479a4831fcc2b891638f56e9f185857e authorTim Steinbach <NeQuissimus@users.noreply.github.com> dateMon 31 Aug 2020, 08:57 (6 years ago) parentb07a1dc1b01869
377 files changed+9941−7921
.editorconfig+7−1 .github/workflows/editorconfig.yml+27 lib/systems/examples.nix+2−2 maintainers/maintainer-list.nix+24 maintainers/scripts/luarocks-packages.csv+4 nixos/doc/manual/release-notes/rl-2009.xml+15 nixos/lib/test-driver/Logger.pm−75 nixos/lib/test-driver/Machine.pm−734 nixos/lib/test-driver/test-driver.pl−191 nixos/lib/test-driver/test-driver.py+223−156 nixos/lib/testing-python.nix+1−1 nixos/lib/testing.nix−258 nixos/modules/installer/tools/nixos-rebuild.sh+4−1 nixos/modules/module-list.nix+1 nixos/modules/services/continuous-integration/hercules-ci-agent/common.nix+213 nixos/modules/services/continuous-integration/hercules-ci-agent/default.nix+86 nixos/modules/services/databases/postgresql.nix+42−14 nixos/modules/services/misc/nix-daemon.nix−7 nixos/modules/services/misc/redmine.nix+45−57 nixos/modules/services/networking/networkmanager.nix+1−1 nixos/modules/services/security/tor.nix+15−5 nixos/modules/system/boot/stage-1.nix+3−2 nixos/modules/system/boot/systemd.nix−2 nixos/release-combined.nix+18 nixos/tests/all-tests.nix+1 nixos/tests/charliecloud.nix+43 nixos/tests/common/acme/server/mkcerts.nix+2−1 nixos/tests/common/acme/server/snakeoil-certs.nix+153−152 nixos/tests/make-test.nix−9 nixos/tests/postgresql-wal-receiver.nix+12−12 nixos/tests/systemd-networkd.nix+6−5 nixos/tests/systemd.nix+4−3 pkgs/applications/audio/audacity/default.nix+1−1 pkgs/applications/audio/axoloti/libusb1.nix+2−2 pkgs/applications/audio/faust/faust2.nix+2−3 pkgs/applications/audio/mopidy/iris.nix+1−1 pkgs/applications/audio/mopidy/mopidy.nix+1−1 pkgs/applications/audio/pulseaudio-dlna/default.nix+3−3 pkgs/applications/audio/sonata/default.nix+24−12 pkgs/applications/audio/sonic-visualiser/default.nix+8−10 pkgs/applications/audio/soundkonverter/default.nix+10−1 pkgs/applications/editors/android-studio/default.nix+3−3 pkgs/applications/editors/brackets/default.nix+2−2 pkgs/applications/editors/emacs-modes/melpa-packages.nix+6 pkgs/applications/editors/gophernotes/default.nix+26 pkgs/applications/editors/lighttable/default.nix+3−3 pkgs/applications/editors/neovim/qt.nix+1 pkgs/applications/editors/typora/default.nix+4−4 pkgs/applications/editors/vscode/generic.nix+1−1 pkgs/applications/gis/qgis/unwrapped.nix+2−2 pkgs/applications/graphics/drawio/default.nix+1−1 pkgs/applications/graphics/drawpile/default.nix+44−25 pkgs/applications/graphics/feh/default.nix+2−2 pkgs/applications/graphics/gcolor3/default.nix+26−17 pkgs/applications/graphics/odafileconverter/default.nix+53 pkgs/applications/graphics/pencil/default.nix+1−1 pkgs/applications/kde/calendarsupport.nix+2−2 pkgs/applications/kde/default.nix−1 pkgs/applications/kde/fetch.sh+1−1 pkgs/applications/kde/grantleetheme/default.nix−1 pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch−155 pkgs/applications/kde/grantleetheme/series−1 pkgs/applications/kde/incidenceeditor.nix+2−2 pkgs/applications/kde/kdepim-apps-libs/default.nix−1 pkgs/applications/kde/kdepim-apps-libs/kdepim-apps-libs-grantlee-merge-theme-dirs.patch−62 pkgs/applications/kde/kdepim-apps-libs/series−1 pkgs/applications/kde/kdepim-runtime/default.nix+4−4 pkgs/applications/kde/kmail.nix−1 pkgs/applications/kde/kmail.patch−24 pkgs/applications/kde/kontact.nix+2−2 pkgs/applications/kde/mailimporter.nix+2−2 pkgs/applications/kde/pimcommon.nix+5−5 pkgs/applications/kde/srcs.nix+868−876 pkgs/applications/misc/electrum/default.nix+17−4 pkgs/applications/misc/krename/default.nix+2 pkgs/applications/misc/navi/default.nix+3−3 pkgs/applications/misc/obinskit/default.nix+2−1 pkgs/applications/misc/orca/default.nix+2−2 pkgs/applications/misc/simplenote/default.nix+2−1 pkgs/applications/networking/browsers/chromium/common.nix+2−2 pkgs/applications/networking/browsers/firefox-bin/release_sources.nix+385−385 pkgs/applications/networking/browsers/firefox/common.nix+8 pkgs/applications/networking/browsers/firefox/packages.nix+6−6 pkgs/applications/networking/browsers/opera/default.nix+1−1 pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix+3−3 pkgs/applications/networking/browsers/ungoogled-chromium/common.nix+2−2 pkgs/applications/networking/cluster/luigi/default.nix+11−4 pkgs/applications/networking/instant-messengers/bluejeans/default.nix+2−1 pkgs/applications/networking/instant-messengers/franz/generic.nix+2−1 pkgs/applications/networking/instant-messengers/rambox/default.nix+2−2 pkgs/applications/networking/instant-messengers/signal-desktop/default.nix+1−1 pkgs/applications/networking/instant-messengers/teams/default.nix+1−1 pkgs/applications/networking/instant-messengers/vk-messenger/default.nix+2−2 pkgs/applications/networking/instant-messengers/wavebox/default.nix+1−1 pkgs/applications/networking/instant-messengers/wire-desktop/default.nix+2−1 pkgs/applications/networking/mailreaders/mailspring/default.nix+2−1 pkgs/applications/networking/mailreaders/thunderbird-bin/68_sources.nix+245−245 pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix+265−265 pkgs/applications/networking/mailreaders/thunderbird/68.nix+3−3 pkgs/applications/networking/mailreaders/thunderbird/default.nix+3−3 pkgs/applications/networking/modem-manager-gui/default.nix+11−18 pkgs/applications/networking/msmtp/default.nix+2−2 pkgs/applications/networking/mullvad-vpn/default.nix+2−2 pkgs/applications/networking/p2p/tremc/default.nix+49 pkgs/applications/networking/remote/citrix-workspace/generic.nix+1−1 pkgs/applications/networking/termius/default.nix+2−1 pkgs/applications/office/calligra/default.nix+9−18 pkgs/applications/radio/noaa-apt/default.nix+64 pkgs/applications/science/logic/alt-ergo/default.nix+5−7 pkgs/applications/science/logic/lean/default.nix+2−2 pkgs/applications/science/math/rofi-calc/default.nix+2−2 pkgs/applications/version-management/gitlab/data.json+5−5 pkgs/applications/version-management/gitlab/gitaly/default.nix+2−2 pkgs/applications/virtualization/charliecloud/default.nix+22−8 pkgs/applications/virtualization/docker/default.nix+7−7 pkgs/applications/virtualization/singularity/default.nix−4 pkgs/applications/window-managers/windowchef/default.nix+27 pkgs/build-support/kernel/modules-closure.sh+11−1 pkgs/build-support/rust/fetchcrate.nix+5−2 pkgs/data/fonts/noto-fonts/default.nix+24−12 pkgs/data/fonts/noto-fonts/tools.nix+46−16 pkgs/data/fonts/recursive/default.nix+3−3 pkgs/data/fonts/twitter-color-emoji/default.nix+10−15 pkgs/data/themes/marwaita/default.nix+2−2 pkgs/data/themes/venta/default.nix+47 pkgs/desktops/deepin/dde-api/default.nix−1 pkgs/desktops/deepin/dde-daemon/default.nix−1 pkgs/desktops/deepin/startdde/default.nix−1 pkgs/desktops/plasma-5/addons/caffeine-plus.nix+32 pkgs/desktops/plasma-5/khotkeys.nix+3−2 pkgs/development/androidndk-pkgs/default.nix+30 pkgs/development/compilers/binaryen/0001-Get-rid-of-git-dependency.patch−38 pkgs/development/compilers/binaryen/default.nix+15−26 pkgs/development/compilers/closure/default.nix+2−2 pkgs/development/compilers/emscripten/default.nix+89−48 pkgs/development/compilers/emscripten/fastcomp/default.nix−28 pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix−53 pkgs/development/compilers/emscripten/package.json+15 pkgs/development/compilers/emscripten/yarn.lock+346 pkgs/development/compilers/emscripten/yarn.nix+437 pkgs/development/compilers/flutter/default.nix+1 pkgs/development/compilers/gcc/10/default.nix+9−6 pkgs/development/compilers/gcc/4.8/default.nix+9−6 pkgs/development/compilers/gcc/4.9/default.nix+9−6 pkgs/development/compilers/gcc/6/default.nix+9−6 pkgs/development/compilers/gcc/7/default.nix+9−6 pkgs/development/compilers/gcc/8/default.nix+9−6 pkgs/development/compilers/gcc/9/default.nix+9−6 pkgs/development/compilers/gcc/builder.sh+11−1 pkgs/development/compilers/ghc/8.10.1.nix+9−2 pkgs/development/compilers/ghc/8.6.5.nix+9−2 pkgs/development/compilers/ghc/8.8.2.nix+9−2 pkgs/development/compilers/ghc/8.8.3.nix+9−2 pkgs/development/compilers/ghc/8.8.4.nix+9−2 pkgs/development/compilers/ghc/head.nix+4−4 pkgs/development/compilers/ghcjs-ng/8.6/dep-overrides.nix+5−2 pkgs/development/compilers/ghcjs-ng/default.nix+1−2 pkgs/development/compilers/kcc/default.nix+25 pkgs/development/compilers/sagittarius-scheme/default.nix+2−2 pkgs/development/coq-modules/gappalib/default.nix+4−4 pkgs/development/go-modules/generic/default.nix+1−1 pkgs/development/go-packages/generic/default.nix+1−2 pkgs/development/haskell-modules/configuration-common.nix+29−15 pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix+9−1 pkgs/development/haskell-modules/configuration-hackage2nix.yaml+75−37 pkgs/development/haskell-modules/hackage-packages.nix+1349−687 pkgs/development/interpreters/python/tests.nix+75−70 pkgs/development/interpreters/python/tests/test_python.py → pkgs/development/interpreters/python/tests/test_environments/test_python.py pkgs/development/interpreters/rakudo/default.nix+2−2 pkgs/development/interpreters/rakudo/nqp.nix+3−3 pkgs/development/libraries/enchant/2.x.nix+2−2 pkgs/development/libraries/gtk-layer-shell/default.nix+19−7 pkgs/development/libraries/kde-frameworks/default.nix+1 pkgs/development/libraries/kde-frameworks/fetch.sh+1−1 pkgs/applications/kde/kdav.nix → pkgs/development/libraries/kde-frameworks/kdav.nix+1−2 pkgs/development/libraries/kde-frameworks/kdesu/kdesu-search-for-wrapped-daemon-first.patch+2−2 pkgs/development/libraries/kde-frameworks/krunner.nix−7 pkgs/development/libraries/kde-frameworks/kwayland.nix+2−2 pkgs/development/libraries/kde-frameworks/srcs.nix+336−328 pkgs/development/libraries/kpmcore/default.nix+6−7 pkgs/development/libraries/libpipeline/default.nix+2−2 pkgs/development/libraries/libseccomp/default.nix+10−9 pkgs/development/libraries/libthreadar/default.nix+35 pkgs/development/libraries/mimalloc/default.nix+2−2 pkgs/development/libraries/nspr/default.nix+2−2 pkgs/development/libraries/nss/default.nix+2−2 pkgs/development/libraries/plasma-wayland-protocols/default.nix+24 pkgs/development/libraries/qca-qt5/default.nix+2−2 pkgs/development/libraries/qt-5/modules/qtbase.nix+2−2 pkgs/development/libraries/qt-5/modules/qtimageformats.nix+2−1 pkgs/development/libraries/qt-5/modules/qtwebengine.nix+1−1 pkgs/development/libraries/x265/default.nix+2 pkgs/development/lua-modules/generated-packages.nix+68 pkgs/development/mobile/androidenv/compose-android-packages.nix+1−1 pkgs/development/mobile/androidenv/generated/addons.nix−128 pkgs/development/mobile/androidenv/ndk-bundle/default.nix+4−2 pkgs/development/ocaml-modules/cohttp/async.nix+22 pkgs/development/ocaml-modules/conduit/async.nix+19 pkgs/development/ocaml-modules/conduit/default.nix+1−1 pkgs/development/ocaml-modules/eliom/default.nix+2−2 pkgs/development/ocaml-modules/janestreet/0.13.nix+10 pkgs/development/ocaml-modules/mirage-crypto/default.nix+2−2 pkgs/development/ocaml-modules/mirage-stack/default.nix+2−2 pkgs/development/ocaml-modules/posix/base.nix+26 pkgs/development/ocaml-modules/posix/socket.nix+16 pkgs/development/ocaml-modules/posix/types.nix+15 pkgs/development/ocaml-modules/webbrowser/default.nix+26 pkgs/development/python-modules/afdko/default.nix+55 pkgs/development/python-modules/blis/default.nix+4−2 pkgs/development/python-modules/booleanoperations/default.nix+34 pkgs/development/python-modules/deepdiff/default.nix+2−6 pkgs/development/python-modules/defcon/default.nix+35 pkgs/development/python-modules/django/1_11.nix−34 pkgs/development/python-modules/dogpile.cache/default.nix+2−2 pkgs/development/python-modules/flit/default.nix+2−2 pkgs/development/python-modules/fontmath/default.nix+25 pkgs/development/python-modules/fontparts/default.nix+39 pkgs/development/python-modules/fontpens/default.nix+38 pkgs/development/python-modules/fonttools/default.nix+47−15 pkgs/development/python-modules/google-api-python-client/default.nix+2−2 pkgs/development/python-modules/jinja2/default.nix+4−2 pkgs/development/python-modules/jupyterhub-tmpauthenticator/default.nix+31 pkgs/development/python-modules/kombu/default.nix+2−2 pkgs/development/python-modules/lml/default.nix+30 pkgs/development/python-modules/ludios_wpull/default.nix+5−3 pkgs/development/python-modules/mathlibtools/default.nix+26 pkgs/development/python-modules/mautrix/default.nix+2−2 pkgs/development/python-modules/mmh3/default.nix+23 pkgs/development/python-modules/mutatormath/default.nix+25 pkgs/development/python-modules/nix-prefetch-github/default.nix+5−6 pkgs/development/python-modules/phonenumbers/default.nix+2−2 pkgs/development/python-modules/pint/default.nix+6−5 pkgs/development/python-modules/psautohint/default.nix+40 pkgs/development/python-modules/pure-eval/default.nix+27 pkgs/development/python-modules/pyexcel-io/default.nix+31 pkgs/development/python-modules/pyexcel-ods/default.nix+41 pkgs/development/python-modules/pyexcel-xls/default.nix+41 pkgs/development/python-modules/pyexcel/default.nix+45 pkgs/development/python-modules/pyipp/default.nix+2−2 pkgs/development/python-modules/pyside2/default.nix+2−2 pkgs/development/python-modules/pytest-randomly/default.nix+31 pkgs/development/python-modules/pytorch/bin.nix+68 pkgs/development/python-modules/pytorch/binary-hashes.nix+10 pkgs/development/python-modules/pytorch/default.nix+8−6 pkgs/development/python-modules/pyudev/default.nix+1−1 pkgs/development/python-modules/qtconsole/default.nix+2−2 pkgs/development/python-modules/reportlab/default.nix+2−2 pkgs/development/python-modules/rq/default.nix+7−5 pkgs/development/python-modules/samsungctl/default.nix+29 pkgs/development/python-modules/samsungtvws/default.nix+36 pkgs/development/python-modules/sentry-sdk/default.nix+5−1 pkgs/development/python-modules/splinter/default.nix+2−2 pkgs/development/python-modules/tldextract/default.nix+2−1 pkgs/development/python-modules/trimesh/default.nix+2−2 pkgs/development/python-modules/ufonormalizer/default.nix+19 pkgs/development/python-modules/ufoprocessor/default.nix+35 pkgs/development/python-modules/ujson/2.nix+28 pkgs/development/python-modules/unicodedata2/default.nix+23 pkgs/development/python-modules/zopfli/default.nix+21 pkgs/development/tools/build-managers/cmake/default.nix+12−9 pkgs/development/tools/coursier/default.nix+2−2 pkgs/development/tools/dot-http/default.nix+28 pkgs/development/tools/haskell/haskell-language-server/hls-ghcide.nix+2−2 pkgs/development/tools/misc/kimg/default.nix+26 pkgs/development/tools/misc/objconv/default.nix+2−2 pkgs/development/tools/node-webkit/nw12.nix+2−2 pkgs/development/tools/nwjs/default.nix+2−2 pkgs/development/tools/packer/default.nix+2−2 pkgs/development/tools/parsing/tree-sitter/default.nix+4−1 pkgs/development/tools/profiling/sysprof/default.nix+2−1 pkgs/development/tools/rust/cargo-embed/default.nix+27 pkgs/development/tools/rust/cargo-flash/default.nix+27 pkgs/development/tools/rust/cargo-make/Cargo.lock−1283 pkgs/development/tools/rust/cargo-make/default.nix+7−17 pkgs/development/tools/so/default.nix+27 pkgs/development/tools/wxformbuilder/default.nix+35 pkgs/development/web/cypress/default.nix+2−2 pkgs/development/web/deno/default.nix+3−3 pkgs/development/web/deno/deps.nix+4−4 pkgs/games/exult/arch.patch−123 pkgs/games/exult/default.nix+4−11 pkgs/games/gemrb/default.nix+11−8 pkgs/games/katago/default.nix+27−24 pkgs/games/klavaro/default.nix+2−2 pkgs/misc/logging/beats/6.x.nix+2−2 pkgs/misc/logging/beats/7.x.nix+2−2 pkgs/misc/vscode-extensions/updateSettings.nix+3−3 pkgs/misc/vscode-extensions/vscodeEnv.nix+7−7 pkgs/misc/vscode-extensions/vscodeEnvTest.nix+1−2 pkgs/misc/vscode-extensions/vscodeExts2nix.nix+6−6 pkgs/misc/vscode-extensions/vscodeWithConfiguration.nix+13−13 pkgs/os-specific/linux/bcc/default.nix+2−2 pkgs/os-specific/linux/firmware/fwupd/default.nix+5 pkgs/os-specific/linux/fscrypt/default.nix−4 pkgs/os-specific/linux/kernel/hardened/patches.json+12−12 pkgs/os-specific/linux/kernel/linux-5.7.nix+2−2 pkgs/os-specific/linux/kernel/linux-5.8.nix+2−2 pkgs/os-specific/linux/klibc/default.nix+2−2 pkgs/os-specific/linux/microcode/amd.nix+1−1 pkgs/os-specific/linux/nvidia-x11/generic.nix+4−1 pkgs/os-specific/linux/rdma-core/default.nix+2−2 pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch+3−3 pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch+3−3 pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch+5−5 pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch+2−2 pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch+62−45 pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch+4−4 pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch+19−19 pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch+2−2 pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch+14−14 pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch+4−4 pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch+5−5 pkgs/os-specific/linux/systemd/0012-Install-default-configuration-into-out-share-factory.patch+36−35 pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patch+4−4 pkgs/os-specific/linux/systemd/0014-add-rootprefix-to-lookup-dir-paths.patch+2−2 pkgs/os-specific/linux/systemd/0015-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch+4−4 pkgs/os-specific/linux/systemd/0016-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch+4−4 pkgs/os-specific/linux/systemd/0017-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch+2−2 pkgs/os-specific/linux/systemd/0018-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch+2−2 pkgs/os-specific/linux/systemd/default.nix+12−51 pkgs/os-specific/linux/zfs/default.nix+17−7 pkgs/servers/dns/knot-dns/default.nix+2−3 pkgs/servers/gonic/default.nix+59 pkgs/servers/gonic/deps.nix+795 pkgs/servers/home-assistant/component-packages.nix+273−273 pkgs/servers/home-assistant/default.nix+2−2 pkgs/servers/home-assistant/parse-requirements.py+8−3 pkgs/servers/matrix-synapse/default.nix+2−2 pkgs/servers/monitoring/loki/default.nix+2−2 pkgs/servers/monitoring/prometheus/postfix-exporter.nix+2−2 pkgs/servers/sql/postgresql/ext/timescaledb.nix+2−2 pkgs/servers/tegola/default.nix+4−2 pkgs/shells/xonsh/default.nix+12−2 pkgs/shells/zsh/oh-my-zsh/default.nix+3−10 pkgs/tools/admin/lego/default.nix+3−1 pkgs/tools/admin/lxd/default.nix+2−2 pkgs/tools/admin/salt/default.nix+1−1 pkgs/tools/admin/salt/pepper/default.nix+7−6 pkgs/tools/backup/dar/default.nix+18−6 pkgs/tools/backup/grab-site/default.nix+11−3 pkgs/tools/compression/bzip2/1_1.nix+45 pkgs/tools/filesystems/nixpart/0.4/blivet.nix+1−1 pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix+2−2 pkgs/tools/misc/bashcards/default.nix+2−2 pkgs/tools/misc/broot/default.nix+4−6 pkgs/tools/misc/eva/default.nix+6 pkgs/tools/misc/grub/2.0x.nix+2−2 pkgs/tools/misc/hakuneko/default.nix+2−1 pkgs/tools/misc/lsd/default.nix+3−3 pkgs/tools/misc/ostree/default.nix+2−2 pkgs/tools/misc/parallel/default.nix+2−2 pkgs/tools/misc/plantuml/default.nix+2−2 pkgs/tools/misc/sd-mux-ctrl/default.nix+28 pkgs/tools/misc/somafm-cli/default.nix+33 pkgs/tools/misc/staruml/default.nix+2−2 pkgs/tools/networking/circus/default.nix+10−3 pkgs/tools/networking/dd-agent/datadog-agent.nix+1−1 pkgs/tools/networking/toss/default.nix+20 pkgs/tools/networking/wireguard-tools/default.nix+2−2 pkgs/tools/package-management/librepo/default.nix+2−2 pkgs/tools/package-management/nix-template/default.nix+23 pkgs/tools/package-management/nix/default.nix+4−4 pkgs/tools/package-management/nixpkgs-review/default.nix+2−2 pkgs/tools/security/bitwarden/default.nix+2−1 pkgs/tools/security/encryptr/default.nix+2−2 pkgs/tools/security/gopass/default.nix+17−12 pkgs/tools/security/kbs2/default.nix+5−3 pkgs/tools/security/keybase/gui.nix+2−2 pkgs/tools/security/rustscan/default.nix+37 pkgs/tools/system/htop/default.nix+22−13 pkgs/tools/text/podiff/default.nix+3−3 pkgs/tools/typesetting/lowdown/default.nix+2−2 pkgs/tools/virtualization/cri-tools/default.nix+2−2 pkgs/top-level/all-packages.nix+78−16 pkgs/top-level/ocaml-packages.nix+13−1 pkgs/top-level/perl-packages.nix+3−3 pkgs/top-level/python-packages.nix+61−9
.editorconfig+7−1
@@ -57,10 +57,13 @@ indent_size = unset
5757[deps.nix]
5858insert_final_newline = unset
5959
60+[eggs.nix]
61+trim_trailing_whitespace = unset
62+
6063[gemset.nix]
6164insert_final_newline = unset
6265
63−[node-packages.nix]
66+[node-{composition,packages}.nix]
6467insert_final_newline = unset
6568
6669[nixos/modules/services/networking/ircd-hybrid/*.{conf,in}]
@@ -102,5 +105,8 @@ insert_final_newline = unset
102105indent_size = unset
103106trim_trailing_whitespace = unset
104107
108+[pkgs/top-level/emscripten-packages.nix]
109+trim_trailing_whitespace = unset
110+
105111[pkgs/top-level/perl-packages.nix]
106112indent_size = unset
.github/workflows/editorconfig.ymlnew file+27
@@ -0,0 +1,27 @@
1+name: "Checking EditorConfig"
2+
3+on:
4+ pull_request:
5+
6+jobs:
7+ tests:
8+ runs-on: ubuntu-latest
9+ steps:
10+ - uses: actions/checkout@v2
11+ with:
12+ fetch-depth: 0
13+ - uses: technote-space/get-diff-action@v3.1.0
14+ - name: Fetch editorconfig-checker
15+ if: env.GIT_DIFF
16+ env:
17+ ECC_VERSION: "2.1.0"
18+ ECC_URL: "https://github.com/editorconfig-checker/editorconfig-checker/releases/download"
19+ run: |
20+ curl -sSf -O -L -C - "$ECC_URL/$ECC_VERSION/ec-linux-amd64.tar.gz" && \
21+ tar xzf ec-linux-amd64.tar.gz && \
22+ mv ./bin/ec-linux-amd64 ./bin/editorconfig-checker
23+ - name: Checking EditorConfig
24+ if: env.GIT_DIFF
25+ run: |
26+ ./bin/editorconfig-checker -disable-indentation \
27+ ${{ env.GIT_DIFF }}
lib/systems/examples.nix+2−2
@@ -46,7 +46,7 @@ rec {
4646
4747 armv7a-android-prebuilt = {
4848 config = "armv7a-unknown-linux-androideabi";
49− sdkVer = "24";
49+ sdkVer = "29";
5050 ndkVer = "18b";
5151 platform = platforms.armv7a-android;
5252 useAndroidPrebuilt = true;
@@ -54,7 +54,7 @@ rec {
5454
5555 aarch64-android-prebuilt = {
5656 config = "aarch64-unknown-linux-android";
57− sdkVer = "24";
57+ sdkVer = "29";
5858 ndkVer = "18b";
5959 platform = platforms.aarch64-multiplatform;
6060 useAndroidPrebuilt = true;
maintainers/maintainer-list.nix+24
@@ -2879,6 +2879,12 @@
28792879 githubId = 5918766;
28802880 name = "Franz Thoma";
28812881 };
2882+ fooker = {
2883+ email = "fooker@lab.sh";
2884+ github = "fooker";
2885+ githubId = 405105;
2886+ name = "Dustin Frisch";
2887+ };
28822888 forkk = {
28832889 email = "forkk@forkk.net";
28842890 github = "forkk";
@@ -7355,6 +7361,12 @@
73557361 githubId = 1153271;
73567362 name = "Sander van der Burg";
73577363 };
7364+ sarcasticadmin = {
7365+ email = "rob@sarcasticadmin.com";
7366+ github = "sarcasticadmin";
7367+ githubId = 30531572;
7368+ name = "Robert James Hernandez";
7369+ };
73587370 sargon = {
73597371 email = "danielehlers@mindeye.net";
73607372 github = "sargon";
@@ -7989,6 +8001,12 @@
79898001 githubId = 65870;
79908002 name = "Сухарик";
79918003 };
8004+ SuperSandro2000 = {
8005+ email = "sandro.jaeckel@gmail.com";
8006+ github = "SuperSandro2000";
8007+ githubId = 7258858;
8008+ name = "Sandro Jäckel";
8009+ };
79928010 SuprDewd = {
79938011 email = "suprdewd@gmail.com";
79948012 github = "SuprDewd";
@@ -9488,6 +9506,12 @@
94889506 github = "fzakaria";
94899507 githubId = 605070;
94909508 };
9509+ nagisa = {
9510+ name = "Simonas Kazlauskas";
9511+ email = "nixpkgs@kazlauskas.me";
9512+ github = "nagisa";
9513+ githubId = 679122;
9514+ };
94919515 yevhenshymotiuk = {
94929516 name = "Yevhen Shymotiuk";
94939517 email = "yevhenshymotiuk@gmail.com";
maintainers/scripts/luarocks-packages.csv+4
@@ -35,6 +35,10 @@ lua-cmsgpack,,,,,
3535lua-iconv,,,,,
3636lua-lsp,,http://luarocks.org/dev,,,
3737lua-messagepack,,,,,
38+lua-resty-http,,,,,
39+lua-resty-jwt,,,,,
40+lua-resty-openidc,,,,,
41+lua-resty-session,,,,,
3842lua-term,,,,,
3943lua-toml,,,,,
4044lua-zlib,,,,,koral
nixos/doc/manual/release-notes/rl-2009.xml+15
@@ -204,6 +204,16 @@ GRANT ALL PRIVILEGES ON *.* TO 'mysql'@'localhost' WITH GRANT OPTION;
204204 Note: Password support is only avaiable in GRUB version 2.
205205 </para>
206206 </listitem>
207+ <listitem>
208+ <para>
209+ Following its deprecation in 20.03, the Perl NixOS test driver has been removed.
210+ All remaining tests have been ported to the Python test framework.
211+ Code outside nixpkgs using <filename>make-test.nix</filename> or
212+ <filename>testing.nix</filename> needs to be ported to
213+ <filename>make-test-python.nix</filename> and
214+ <filename>testing-python.nix</filename> respectively.
215+ </para>
216+ </listitem>
207217 </itemizedlist>
208218 </section>
209219
@@ -223,6 +233,11 @@ GRANT ALL PRIVILEGES ON *.* TO 'mysql'@'localhost' WITH GRANT OPTION;
223233 <para>
224234 There is a new <xref linkend="opt-security.doas.enable"/> module that provides <command>doas</command>, a lighter alternative to <command>sudo</command> with many of the same features.
225235 </para>
236+ </listitem>
237+ <listitem>
238+ <para>
239+ <link xlink:href="https://hercules-ci.com">Hercules CI</link> Agent is a specialized build agent for projects built with Nix. See the <link xlink:href="https://nixos.org/nixos/options.html#services.hercules-ci-agent">options</link> and <link xlink:href="https://docs.hercules-ci.com/hercules-ci/getting-started/#deploy-agent">setup</link>.
240+ </para>
226241 </listitem>
227242 </itemizedlist>
228243
nixos/lib/test-driver/Logger.pmdeleted−75
@@ -1,75 +0,0 @@
1−package Logger;
2−
3−use strict;
4−use Thread::Queue;
5−use XML::Writer;
6−use Encode qw(decode encode);
7−use Time::HiRes qw(clock_gettime CLOCK_MONOTONIC);
8−
9−sub new {
10− my ($class) = @_;
11−
12− my $logFile = defined $ENV{LOGFILE} ? "$ENV{LOGFILE}" : "/dev/null";
13− my $log = new XML::Writer(OUTPUT => new IO::File(">$logFile"));
14−
15− my $self = {
16− log => $log,
17− logQueue => Thread::Queue->new()
18− };
19−
20− $self->{log}->startTag("logfile");
21−
22− bless $self, $class;
23− return $self;
24−}
25−
26−sub close {
27− my ($self) = @_;
28− $self->{log}->endTag("logfile");
29− $self->{log}->end;
30−}
31−
32−sub drainLogQueue {
33− my ($self) = @_;
34− while (defined (my $item = $self->{logQueue}->dequeue_nb())) {
35− $self->{log}->dataElement("line", sanitise($item->{msg}), 'machine' => $item->{machine}, 'type' => 'serial');
36− }
37−}
38−
39−sub maybePrefix {
40− my ($msg, $attrs) = @_;
41− $msg = $attrs->{machine} . ": " . $msg if defined $attrs->{machine};
42− return $msg;
43−}
44−
45−sub nest {
46− my ($self, $msg, $coderef, $attrs) = @_;
47− print STDERR maybePrefix("$msg\n", $attrs);
48− $self->{log}->startTag("nest");
49− $self->{log}->dataElement("head", $msg, %{$attrs});
50− my $now = clock_gettime(CLOCK_MONOTONIC);
51− $self->drainLogQueue();
52− eval { &$coderef };
53− my $res = $@;
54− $self->drainLogQueue();
55− $self->log(sprintf("(%.2f seconds)", clock_gettime(CLOCK_MONOTONIC) - $now));
56− $self->{log}->endTag("nest");
57− die $@ if $@;
58−}
59−
60−sub sanitise {
61− my ($s) = @_;
62− $s =~ s/[[:cntrl:]\xff]//g;
63− $s = decode('UTF-8', $s, Encode::FB_DEFAULT);
64− return encode('UTF-8', $s, Encode::FB_CROAK);
65−}
66−
67−sub log {
68− my ($self, $msg, $attrs) = @_;
69− chomp $msg;
70− print STDERR maybePrefix("$msg\n", $attrs);
71− $self->drainLogQueue();
72− $self->{log}->dataElement("line", $msg, %{$attrs});
73−}
74−
75−1;
nixos/lib/test-driver/Machine.pmdeleted−734
@@ -1,734 +0,0 @@
1−package Machine;
2−
3−use strict;
4−use threads;
5−use Socket;
6−use IO::Handle;
7−use POSIX qw(dup2);
8−use FileHandle;
9−use Cwd;
10−use File::Basename;
11−use File::Path qw(make_path);
12−use File::Slurp;
13−use Time::HiRes qw(clock_gettime CLOCK_MONOTONIC);
14−
15−
16−my $showGraphics = defined $ENV{'DISPLAY'};
17−
18−my $sharedDir;
19−
20−
21−sub new {
22− my ($class, $args) = @_;
23−
24− my $startCommand = $args->{startCommand};
25−
26− my $name = $args->{name};
27− if (!$name) {
28− $startCommand =~ /run-(.*)-vm$/ if defined $startCommand;
29− $name = $1 || "machine";
30− }
31−
32− if (!$startCommand) {
33− # !!! merge with qemu-vm.nix.
34− my $netBackend = "-netdev user,id=net0";
35− my $netFrontend = "-device virtio-net-pci,netdev=net0";
36−
37− $netBackend .= "," . $args->{netBackendArgs}
38− if defined $args->{netBackendArgs};
39−
40− $netFrontend .= "," . $args->{netFrontendArgs}
41− if defined $args->{netFrontendArgs};
42−
43− $startCommand =
44− "qemu-kvm -m 384 $netBackend $netFrontend \$QEMU_OPTS ";
45−
46− if (defined $args->{hda}) {
47− if ($args->{hdaInterface} eq "scsi") {
48− $startCommand .= "-drive id=hda,file="
49− . Cwd::abs_path($args->{hda})
50− . ",werror=report,if=none "
51− . "-device scsi-hd,drive=hda ";
52− } else {
53− $startCommand .= "-drive file=" . Cwd::abs_path($args->{hda})
54− . ",if=" . $args->{hdaInterface}
55− . ",werror=report ";
56− }
57− }
58−
59− $startCommand .= "-cdrom $args->{cdrom} "
60− if defined $args->{cdrom};
61− $startCommand .= "-device piix3-usb-uhci -drive id=usbdisk,file=$args->{usb},if=none,readonly -device usb-storage,drive=usbdisk "
62− if defined $args->{usb};
63− $startCommand .= "-bios $args->{bios} "
64− if defined $args->{bios};
65− $startCommand .= $args->{qemuFlags} || "";
66− }
67−
68− my $tmpDir = $ENV{'TMPDIR'} || "/tmp";
69− unless (defined $sharedDir) {
70− $sharedDir = $tmpDir . "/xchg-shared";
71− make_path($sharedDir, { mode => 0700, owner => $< });
72− }
73−
74− my $allowReboot = 0;
75− $allowReboot = $args->{allowReboot} if defined $args->{allowReboot};
76−
77− my $self = {
78− startCommand => $startCommand,
79− name => $name,
80− allowReboot => $allowReboot,
81− booted => 0,
82− pid => 0,
83− connected => 0,
84− socket => undef,
85− stateDir => "$tmpDir/vm-state-$name",
86− monitor => undef,
87− log => $args->{log},
88− redirectSerial => $args->{redirectSerial} // 1,
89− };
90−
91− mkdir $self->{stateDir}, 0700;
92−
93− bless $self, $class;
94− return $self;
95−}
96−
97−
98−sub log {
99− my ($self, $msg) = @_;
100− $self->{log}->log($msg, { machine => $self->{name} });
101−}
102−
103−
104−sub nest {
105− my ($self, $msg, $coderef, $attrs) = @_;
106− $self->{log}->nest($msg, $coderef, { %{$attrs || {}}, machine => $self->{name} });
107−}
108−
109−
110−sub name {
111− my ($self) = @_;
112− return $self->{name};
113−}
114−
115−
116−sub stateDir {
117− my ($self) = @_;
118− return $self->{stateDir};
119−}
120−
121−
122−sub start {
123− my ($self) = @_;
124− return if $self->{booted};
125−
126− $self->log("starting vm");
127−
128− # Create a socket pair for the serial line input/output of the VM.
129− my ($serialP, $serialC);
130− socketpair($serialP, $serialC, PF_UNIX, SOCK_STREAM, 0) or die;
131−
132− # Create a Unix domain socket to which QEMU's monitor will connect.
133− my $monitorPath = $self->{stateDir} . "/monitor";
134− unlink $monitorPath;
135− my $monitorS;
136− socket($monitorS, PF_UNIX, SOCK_STREAM, 0) or die;
137− bind($monitorS, sockaddr_un($monitorPath)) or die "cannot bind monitor socket: $!";
138− listen($monitorS, 1) or die;
139−
140− # Create a Unix domain socket to which the root shell in the guest will connect.
141− my $shellPath = $self->{stateDir} . "/shell";
142− unlink $shellPath;
143− my $shellS;
144− socket($shellS, PF_UNIX, SOCK_STREAM, 0) or die;
145− bind($shellS, sockaddr_un($shellPath)) or die "cannot bind shell socket: $!";
146− listen($shellS, 1) or die;
147−
148− # Start the VM.
149− my $pid = fork();
150− die if $pid == -1;
151−
152− if ($pid == 0) {
153− close $serialP;
154− close $monitorS;
155− close $shellS;
156− if ($self->{redirectSerial}) {
157− open NUL, "</dev/null" or die;
158− dup2(fileno(NUL), fileno(STDIN));
159− dup2(fileno($serialC), fileno(STDOUT));
160− dup2(fileno($serialC), fileno(STDERR));
161− }
162− $ENV{TMPDIR} = $self->{stateDir};
163− $ENV{SHARED_DIR} = $sharedDir;
164− $ENV{USE_TMPDIR} = 1;
165− $ENV{QEMU_OPTS} =
166− ($self->{allowReboot} ? "" : "-no-reboot ") .
167− "-monitor unix:./monitor -chardev socket,id=shell,path=./shell " .
168− "-device virtio-serial -device virtconsole,chardev=shell " .
169− "-device virtio-rng-pci " .
170− ($showGraphics ? "-serial stdio" : "-nographic") . " " . ($ENV{QEMU_OPTS} || "");
171− chdir $self->{stateDir} or die;
172− exec $self->{startCommand};
173− die "running VM script: $!";
174− }
175−
176− # Process serial line output.
177− close $serialC;
178−
179− threads->create(\&processSerialOutput, $self, $serialP)->detach;
180−
181− sub processSerialOutput {
182− my ($self, $serialP) = @_;
183− while (<$serialP>) {
184− chomp;
185− s/\r$//;
186− print STDERR $self->{name}, "# $_\n";
187− $self->{log}->{logQueue}->enqueue({msg => $_, machine => $self->{name}}); # !!!
188− }
189− }
190−
191− eval {
192− local $SIG{CHLD} = sub { die "QEMU died prematurely\n"; };
193−
194− # Wait until QEMU connects to the monitor.
195− accept($self->{monitor}, $monitorS) or die;
196−
197− # Wait until QEMU connects to the root shell socket. QEMU
198− # does so immediately; this doesn't mean that the root shell
199− # has connected yet inside the guest.
200− accept($self->{socket}, $shellS) or die;
201− $self->{socket}->autoflush(1);
202− };
203− die "$@" if $@;
204−
205− $self->waitForMonitorPrompt;
206−
207− $self->log("QEMU running (pid $pid)");
208−
209− $self->{pid} = $pid;
210− $self->{booted} = 1;
211−}
212−
213−
214−# Send a command to the monitor and wait for it to finish. TODO: QEMU
215−# also has a JSON-based monitor interface now, but it doesn't support
216−# all commands yet. We should use it once it does.
217−sub sendMonitorCommand {
218− my ($self, $command) = @_;
219− $self->log("sending monitor command: $command");
220− syswrite $self->{monitor}, "$command\n";
221− return $self->waitForMonitorPrompt;
222−}
223−
224−
225−# Wait until the monitor sends "(qemu) ".
226−sub waitForMonitorPrompt {
227− my ($self) = @_;
228− my $res = "";
229− my $s;
230− while (sysread($self->{monitor}, $s, 1024)) {
231− $res .= $s;
232− last if $res =~ s/\(qemu\) $//;
233− }
234− return $res;
235−}
236−
237−
238−# Call the given code reference repeatedly, with 1 second intervals,
239−# until it returns 1 or a timeout is reached.
240−sub retry {
241− my ($coderef) = @_;
242− my $n;
243− for ($n = 899; $n >=0; $n--) {
244− return if &$coderef($n);
245− sleep 1;
246− }
247− die "action timed out after $n seconds";
248−}
249−
250−
251−sub connect {
252− my ($self) = @_;
253− return if $self->{connected};
254−
255− $self->nest("waiting for the VM to finish booting", sub {
256−
257− $self->start;
258−
259− my $now = clock_gettime(CLOCK_MONOTONIC);
260− local $SIG{ALRM} = sub { die "timed out waiting for the VM to connect\n"; };
261− alarm 600;
262− readline $self->{socket} or die "the VM quit before connecting\n";
263− alarm 0;
264−
265− $self->log("connected to guest root shell");
266− # We're interested in tracking how close we are to `alarm`.
267− $self->log(sprintf("(connecting took %.2f seconds)", clock_gettime(CLOCK_MONOTONIC) - $now));
268− $self->{connected} = 1;
269−
270− });
271−}
272−
273−
274−sub waitForShutdown {
275− my ($self) = @_;
276− return unless $self->{booted};
277−
278− $self->nest("waiting for the VM to power off", sub {
279− waitpid $self->{pid}, 0;
280− $self->{pid} = 0;
281− $self->{booted} = 0;
282− $self->{connected} = 0;
283− });
284−}
285−
286−
287−sub isUp {
288− my ($self) = @_;
289− return $self->{booted} && $self->{connected};
290−}
291−
292−
293−sub execute_ {
294− my ($self, $command) = @_;
295−
296− $self->connect;
297−
298− print { $self->{socket} } ("( $command ); echo '|!=EOF' \$?\n");
299−
300− my $out = "";
301−
302− while (1) {
303− my $line = readline($self->{socket});
304− die "connection to VM lost unexpectedly" unless defined $line;
305− #$self->log("got line: $line");
306− if ($line =~ /^(.*)\|\!\=EOF\s+(\d+)$/) {
307− $out .= $1;
308− $self->log("exit status $2");
309− return ($2, $out);
310− }
311− $out .= $line;
312− }
313−}
314−
315−
316−sub execute {
317− my ($self, $command) = @_;
318− my @res;
319− $self->nest("running command: $command", sub {
320− @res = $self->execute_($command);
321− });
322− return @res;
323−}
324−
325−
326−sub succeed {
327− my ($self, @commands) = @_;
328−
329− my $res;
330− foreach my $command (@commands) {
331− $self->nest("must succeed: $command", sub {
332− my ($status, $out) = $self->execute_($command);
333− if ($status != 0) {
334− $self->log("output: $out");
335− die "command `$command' did not succeed (exit code $status)\n";
336− }
337− $res .= $out;
338− });
339− }
340−
341− return $res;
342−}
343−
344−
345−sub mustSucceed {
346− succeed @_;
347−}
348−
349−
350−sub waitUntilSucceeds {
351− my ($self, $command) = @_;
352− $self->nest("waiting for success: $command", sub {
353− retry sub {
354− my ($status, $out) = $self->execute($command);
355− return 1 if $status == 0;
356− };
357− });
358−}
359−
360−
361−sub waitUntilFails {
362− my ($self, $command) = @_;
363− $self->nest("waiting for failure: $command", sub {
364− retry sub {
365− my ($status, $out) = $self->execute($command);
366− return 1 if $status != 0;
367− };
368− });
369−}
370−
371−
372−sub fail {
373− my ($self, $command) = @_;
374− $self->nest("must fail: $command", sub {
375− my ($status, $out) = $self->execute_($command);
376− die "command `$command' unexpectedly succeeded"
377− if $status == 0;
378− });
379−}
380−
381−
382−sub mustFail {
383− fail @_;
384−}
385−
386−
387−sub getUnitInfo {
388− my ($self, $unit, $user) = @_;
389− my ($status, $lines) = $self->systemctl("--no-pager show \"$unit\"", $user);
390− return undef if $status != 0;
391− my $info = {};
392− foreach my $line (split '\n', $lines) {
393− $line =~ /^([^=]+)=(.*)$/ or next;
394− $info->{$1} = $2;
395− }
396− return $info;
397−}
398−
399−sub systemctl {
400− my ($self, $q, $user) = @_;
401− if ($user) {
402− $q =~ s/'/\\'/g;
403− return $self->execute("su -l $user -c \$'XDG_RUNTIME_DIR=/run/user/`id -u` systemctl --user $q'");
404− }
405−
406− return $self->execute("systemctl $q");
407−}
408−
409−# Fail if the given systemd unit is not in the "active" state.
410−sub requireActiveUnit {
411− my ($self, $unit) = @_;
412− $self->nest("checking if unit ‘$unit’ has reached state 'active'", sub {
413− my $info = $self->getUnitInfo($unit);
414− my $state = $info->{ActiveState};
415− if ($state ne "active") {
416− die "Expected unit ‘$unit’ to to be in state 'active' but it is in state ‘$state’\n";
417− };
418− });
419−}
420−
421−# Wait for a systemd unit to reach the "active" state.
422−sub waitForUnit {
423− my ($self, $unit, $user) = @_;
424− $self->nest("waiting for unit ‘$unit’", sub {
425− retry sub {
426− my $info = $self->getUnitInfo($unit, $user);
427− my $state = $info->{ActiveState};
428− die "unit ‘$unit’ reached state ‘$state’\n" if $state eq "failed";
429− if ($state eq "inactive") {
430− # If there are no pending jobs, then assume this unit
431− # will never reach active state.
432− my ($status, $jobs) = $self->systemctl("list-jobs --full 2>&1", $user);
433− if ($jobs =~ /No jobs/) { # FIXME: fragile
434− # Handle the case where the unit may have started
435− # between the previous getUnitInfo() and
436− # list-jobs.
437− my $info2 = $self->getUnitInfo($unit);
438− die "unit ‘$unit’ is inactive and there are no pending jobs\n"
439− if $info2->{ActiveState} eq $state;
440− }
441− }
442− return 1 if $state eq "active";
443− };
444− });
445−}
446−
447−
448−sub waitForJob {
449− my ($self, $jobName) = @_;
450− return $self->waitForUnit($jobName);
451−}
452−
453−
454−# Wait until the specified file exists.
455−sub waitForFile {
456− my ($self, $fileName) = @_;
457− $self->nest("waiting for file ‘$fileName’", sub {
458− retry sub {
459− my ($status, $out) = $self->execute("test -e $fileName");
460− return 1 if $status == 0;
461− }
462− });
463−}
464−
465−sub startJob {
466− my ($self, $jobName, $user) = @_;
467− $self->systemctl("start $jobName", $user);
468− # FIXME: check result
469−}
470−
471−sub stopJob {
472− my ($self, $jobName, $user) = @_;
473− $self->systemctl("stop $jobName", $user);
474−}
475−
476−
477−# Wait until the machine is listening on the given TCP port.
478−sub waitForOpenPort {
479− my ($self, $port) = @_;
480− $self->nest("waiting for TCP port $port", sub {
481− retry sub {
482− my ($status, $out) = $self->execute("nc -z localhost $port");
483− return 1 if $status == 0;
484− }
485− });
486−}
487−
488−
489−# Wait until the machine is not listening on the given TCP port.
490−sub waitForClosedPort {
491− my ($self, $port) = @_;
492− retry sub {
493− my ($status, $out) = $self->execute("nc -z localhost $port");
494− return 1 if $status != 0;
495− }
496−}
497−
498−
499−sub shutdown {
500− my ($self) = @_;
501− return unless $self->{booted};
502−
503− print { $self->{socket} } ("poweroff\n");
504−
505− $self->waitForShutdown;
506−}
507−
508−
509−sub crash {
510− my ($self) = @_;
511− return unless $self->{booted};
512−
513− $self->log("forced crash");
514−
515− $self->sendMonitorCommand("quit");
516−
517− $self->waitForShutdown;
518−}
519−
520−
521−# Make the machine unreachable by shutting down eth1 (the multicast
522−# interface used to talk to the other VMs). We keep eth0 up so that
523−# the test driver can continue to talk to the machine.
524−sub block {
525− my ($self) = @_;
526− $self->sendMonitorCommand("set_link virtio-net-pci.1 off");
527−}
528−
529−
530−# Make the machine reachable.
531−sub unblock {
532− my ($self) = @_;
533− $self->sendMonitorCommand("set_link virtio-net-pci.1 on");
534−}
535−
536−
537−# Take a screenshot of the X server on :0.0.
538−sub screenshot {
539− my ($self, $filename) = @_;
540− my $dir = $ENV{'out'} || Cwd::abs_path(".");
541− $filename = "$dir/${filename}.png" if $filename =~ /^\w+$/;
542− my $tmp = "${filename}.ppm";
543− my $name = basename($filename);
544− $self->nest("making screenshot ‘$name’", sub {
545− $self->sendMonitorCommand("screendump $tmp");
546− system("pnmtopng $tmp > ${filename}") == 0
547− or die "cannot convert screenshot";
548− unlink $tmp;
549− }, { image => $name } );
550−}
551−
552−# Get the text of TTY<n>
553−sub getTTYText {
554− my ($self, $tty) = @_;
555−
556− my ($status, $out) = $self->execute("fold -w\$(stty -F /dev/tty${tty} size | awk '{print \$2}') /dev/vcs${tty}");
557− return $out;
558−}
559−
560−# Wait until TTY<n>'s text matches a particular regular expression
561−sub waitUntilTTYMatches {
562− my ($self, $tty, $regexp) = @_;
563−
564− $self->nest("waiting for $regexp to appear on tty $tty", sub {
565− retry sub {
566− my ($retries_remaining) = @_;
567− if ($retries_remaining == 0) {
568− $self->log("Last chance to match /$regexp/ on TTY$tty, which currently contains:");
569− $self->log($self->getTTYText($tty));
570− }
571−
572− return 1 if $self->getTTYText($tty) =~ /$regexp/;
573− }
574− });
575−}
576−
577−# Debugging: Dump the contents of the TTY<n>
578−sub dumpTTYContents {
579− my ($self, $tty) = @_;
580−
581− $self->execute("fold -w 80 /dev/vcs${tty} | systemd-cat");
582−}
583−
584−# Take a screenshot and return the result as text using optical character
585−# recognition.
586−sub getScreenText {
587− my ($self) = @_;
588−
589− system("command -v tesseract &> /dev/null") == 0
590− or die "getScreenText used but enableOCR is false";
591−
592− my $text;
593− $self->nest("performing optical character recognition", sub {
594− my $tmpbase = Cwd::abs_path(".")."/ocr";
595− my $tmpin = $tmpbase."in.ppm";
596−
597− $self->sendMonitorCommand("screendump $tmpin");
598−
599− my $magickArgs = "-filter Catrom -density 72 -resample 300 "
600− . "-contrast -normalize -despeckle -type grayscale "
601− . "-sharpen 1 -posterize 3 -negate -gamma 100 "
602− . "-blur 1x65535";
603− my $tessArgs = "-c debug_file=/dev/null --psm 11 --oem 2";
604−
605− $text = `convert $magickArgs $tmpin tiff:- | tesseract - - $tessArgs`;
606− my $status = $? >> 8;
607− unlink $tmpin;
608−
609− die "OCR failed with exit code $status" if $status != 0;
610− });
611− return $text;
612−}
613−
614−
615−# Wait until a specific regexp matches the textual contents of the screen.
616−sub waitForText {
617− my ($self, $regexp) = @_;
618− $self->nest("waiting for $regexp to appear on the screen", sub {
619− retry sub {
620− my ($retries_remaining) = @_;
621− if ($retries_remaining == 0) {
622− $self->log("Last chance to match /$regexp/ on the screen, which currently contains:");
623− $self->log($self->getScreenText);
624− }
625−
626− return 1 if $self->getScreenText =~ /$regexp/;
627− }
628− });
629−}
630−
631−
632−# Wait until it is possible to connect to the X server. Note that
633−# testing the existence of /tmp/.X11-unix/X0 is insufficient.
634−sub waitForX {
635− my ($self, $regexp) = @_;
636− $self->nest("waiting for the X11 server", sub {
637− retry sub {
638− my ($status, $out) = $self->execute("journalctl -b SYSLOG_IDENTIFIER=systemd | grep 'Reached target Current graphical'");
639− return 0 if $status != 0;
640− ($status, $out) = $self->execute("[ -e /tmp/.X11-unix/X0 ]");
641− return 1 if $status == 0;
642− }
643− });
644−}
645−
646−
647−sub getWindowNames {
648− my ($self) = @_;
649− my $res = $self->mustSucceed(
650− q{xwininfo -root -tree | sed 's/.*0x[0-9a-f]* \"\([^\"]*\)\".*/\1/; t; d'});
651− return split /\n/, $res;
652−}
653−
654−
655−sub waitForWindow {
656− my ($self, $regexp) = @_;
657− $self->nest("waiting for a window to appear", sub {
658− retry sub {
659− my @names = $self->getWindowNames;
660−
661− my ($retries_remaining) = @_;
662− if ($retries_remaining == 0) {
663− $self->log("Last chance to match /$regexp/ on the the window list, which currently contains:");
664− $self->log(join(", ", @names));
665− }
666−
667− foreach my $n (@names) {
668− return 1 if $n =~ /$regexp/;
669− }
670− }
671− });
672−}
673−
674−
675−sub copyFileFromHost {
676− my ($self, $from, $to) = @_;
677− my $s = `cat $from` or die;
678− $s =~ s/'/'\\''/g;
679− $self->mustSucceed("echo '$s' > $to");
680−}
681−
682−
683−my %charToKey = (
684− 'A' => "shift-a", 'N' => "shift-n", '-' => "0x0C", '_' => "shift-0x0C", '!' => "shift-0x02",
685− 'B' => "shift-b", 'O' => "shift-o", '=' => "0x0D", '+' => "shift-0x0D", '@' => "shift-0x03",
686− 'C' => "shift-c", 'P' => "shift-p", '[' => "0x1A", '{' => "shift-0x1A", '#' => "shift-0x04",
687− 'D' => "shift-d", 'Q' => "shift-q", ']' => "0x1B", '}' => "shift-0x1B", '$' => "shift-0x05",
688− 'E' => "shift-e", 'R' => "shift-r", ';' => "0x27", ':' => "shift-0x27", '%' => "shift-0x06",
689− 'F' => "shift-f", 'S' => "shift-s", '\'' => "0x28", '"' => "shift-0x28", '^' => "shift-0x07",
690− 'G' => "shift-g", 'T' => "shift-t", '`' => "0x29", '~' => "shift-0x29", '&' => "shift-0x08",
691− 'H' => "shift-h", 'U' => "shift-u", '\\' => "0x2B", '|' => "shift-0x2B", '*' => "shift-0x09",
692− 'I' => "shift-i", 'V' => "shift-v", ',' => "0x33", '<' => "shift-0x33", '(' => "shift-0x0A",
693− 'J' => "shift-j", 'W' => "shift-w", '.' => "0x34", '>' => "shift-0x34", ')' => "shift-0x0B",
694− 'K' => "shift-k", 'X' => "shift-x", '/' => "0x35", '?' => "shift-0x35",
695− 'L' => "shift-l", 'Y' => "shift-y", ' ' => "spc",
696− 'M' => "shift-m", 'Z' => "shift-z", "\n" => "ret",
697−);
698−
699−
700−sub sendKeys {
701− my ($self, @keys) = @_;
702− foreach my $key (@keys) {
703− $key = $charToKey{$key} if exists $charToKey{$key};
704− $self->sendMonitorCommand("sendkey $key");
705− }
706−}
707−
708−
709−sub sendChars {
710− my ($self, $chars) = @_;
711− $self->nest("sending keys ‘$chars’", sub {
712− $self->sendKeys(split //, $chars);
713− });
714−}
715−
716−
717−# Sleep N seconds (in virtual guest time, not real time).
718−sub sleep {
719− my ($self, $time) = @_;
720− $self->succeed("sleep $time");
721−}
722−
723−
724−# Forward a TCP port on the host to a TCP port on the guest. Useful
725−# during interactive testing.
726−sub forwardPort {
727− my ($self, $hostPort, $guestPort) = @_;
728− $hostPort = 8080 unless defined $hostPort;
729− $guestPort = 80 unless defined $guestPort;
730− $self->sendMonitorCommand("hostfwd_add tcp::$hostPort-:$guestPort");
731−}
732−
733−
734−1;
nixos/lib/test-driver/test-driver.pldeleted−191
@@ -1,191 +0,0 @@
1−#! /somewhere/perl -w
2−
3−use strict;
4−use Machine;
5−use Term::ReadLine;
6−use IO::File;
7−use IO::Pty;
8−use Logger;
9−use Cwd;
10−use POSIX qw(_exit dup2);
11−use Time::HiRes qw(clock_gettime CLOCK_MONOTONIC);
12−
13−$SIG{PIPE} = 'IGNORE'; # because Unix domain sockets may die unexpectedly
14−
15−STDERR->autoflush(1);
16−
17−my $log = new Logger;
18−
19−
20−# Start vde_switch for each network required by the test.
21−my %vlans;
22−foreach my $vlan (split / /, $ENV{VLANS} || "") {
23− next if defined $vlans{$vlan};
24− # Start vde_switch as a child process. We don't run it in daemon
25− # mode because we want the child process to be cleaned up when we
26− # die. Since we have to make sure that the control socket is
27− # ready, we send a dummy command to vde_switch (via stdin) and
28− # wait for a reply. Note that vde_switch requires stdin to be a
29− # TTY, so we create one.
30− $log->log("starting VDE switch for network $vlan");
31− my $socket = Cwd::abs_path "./vde$vlan.ctl";
32− my $pty = new IO::Pty;
33− my ($stdoutR, $stdoutW); pipe $stdoutR, $stdoutW;
34− my $pid = fork(); die "cannot fork" unless defined $pid;
35− if ($pid == 0) {
36− dup2(fileno($pty->slave), 0);
37− dup2(fileno($stdoutW), 1);
38− exec "vde_switch -s $socket --dirmode 0700" or _exit(1);
39− }
40− close $stdoutW;
41− print $pty "version\n";
42− readline $stdoutR or die "cannot start vde_switch";
43− $ENV{"QEMU_VDE_SOCKET_$vlan"} = $socket;
44− $vlans{$vlan} = $pty;
45− die unless -e "$socket/ctl";
46−}
47−
48−
49−my %vms;
50−my $context = "";
51−
52−sub createMachine {
53− my ($args) = @_;
54− my $vm = Machine->new({%{$args}, log => $log, redirectSerial => ($ENV{USE_SERIAL} // "0") ne "1"});
55− $vms{$vm->name} = $vm;
56− $context .= "my \$" . $vm->name . " = \$vms{'" . $vm->name . "'}; ";
57− return $vm;
58−}
59−
60−foreach my $vmScript (@ARGV) {
61− my $vm = createMachine({startCommand => $vmScript});
62−}
63−
64−
65−sub startAll {
66− $log->nest("starting all VMs", sub {
67− $_->start foreach values %vms;
68− });
69−}
70−
71−
72−# Wait until all VMs have terminated.
73−sub joinAll {
74− $log->nest("waiting for all VMs to finish", sub {
75− $_->waitForShutdown foreach values %vms;
76− });
77−}
78−
79−
80−# In interactive tests, this allows the non-interactive test script to
81−# be executed conveniently.
82−sub testScript {
83− eval "$context $ENV{testScript};\n";
84− warn $@ if $@;
85−}
86−
87−
88−my $nrTests = 0;
89−my $nrSucceeded = 0;
90−
91−
92−sub subtest {
93− my ($name, $coderef) = @_;
94− $log->nest("subtest: $name", sub {
95− $nrTests++;
96− eval { &$coderef };
97− if ($@) {
98− $log->log("error: $@", { error => 1 });
99− } else {
100− $nrSucceeded++;
101− }
102− });
103−}
104−
105−
106−sub runTests {
107− if (defined $ENV{tests}) {
108− $log->nest("running the VM test script", sub {
109− eval "$context $ENV{tests}";
110− if ($@) {
111− $log->log("error: $@", { error => 1 });
112− die $@;
113− }
114− }, { expanded => 1 });
115− } else {
116− my $term = Term::ReadLine->new('nixos-vm-test');
117− $term->ReadHistory;
118− while (defined ($_ = $term->readline("> "))) {
119− eval "$context $_\n";
120− warn $@ if $@;
121− }
122− $term->WriteHistory;
123− }
124−
125− # Copy the kernel coverage data for each machine, if the kernel
126− # has been compiled with coverage instrumentation.
127− $log->nest("collecting coverage data", sub {
128− foreach my $vm (values %vms) {
129− my $gcovDir = "/sys/kernel/debug/gcov";
130−
131− next unless $vm->isUp();
132−
133− my ($status, $out) = $vm->execute("test -e $gcovDir");
134− next if $status != 0;
135−
136− # Figure out where to put the *.gcda files so that the
137− # report generator can find the corresponding kernel
138− # sources.
139− my $kernelDir = $vm->mustSucceed("echo \$(dirname \$(readlink -f /run/current-system/kernel))/.build/linux-*");
140− chomp $kernelDir;
141− my $coverageDir = "/tmp/xchg/coverage-data/$kernelDir";
142−
143− # Copy all the *.gcda files.
144− $vm->execute("for d in $gcovDir/nix/store/*/.build/linux-*; do for i in \$(cd \$d && find -name '*.gcda'); do echo \$i; mkdir -p $coverageDir/\$(dirname \$i); cp -v \$d/\$i $coverageDir/\$i; done; done");
145− }
146− });
147−
148− $log->nest("syncing", sub {
149− foreach my $vm (values %vms) {
150− next unless $vm->isUp();
151− $vm->execute("sync");
152− }
153− });
154−
155− if ($nrTests != 0) {
156− $log->log("$nrSucceeded out of $nrTests tests succeeded",
157− ($nrSucceeded < $nrTests ? { error => 1 } : { }));
158− }
159−}
160−
161−
162−# Create an empty raw virtual disk with the given name and size (in
163−# MiB).
164−sub createDisk {
165− my ($name, $size) = @_;
166− system("qemu-img create -f raw $name ${size}M") == 0
167− or die "cannot create image of size $size";
168−}
169−
170−
171−END {
172− $log->nest("cleaning up", sub {
173− foreach my $vm (values %vms) {
174− if ($vm->{pid}) {
175− $log->log("killing " . $vm->{name} . " (pid " . $vm->{pid} . ")");
176− kill 9, $vm->{pid};
177− }
178− }
179− });
180− $log->close();
181−}
182−
183−my $now1 = clock_gettime(CLOCK_MONOTONIC);
184−
185−runTests;
186−
187−my $now2 = clock_gettime(CLOCK_MONOTONIC);
188−
189−printf STDERR "test script finished in %.2fs\n", $now2 - $now1;
190−
191−exit ($nrSucceeded < $nrTests ? 1 : 0);
nixos/lib/test-driver/test-driver.py+223−156
@@ -1,14 +1,19 @@
11#! /somewhere/python3
2+from contextlib import contextmanager, _GeneratorContextManager
3+from queue import Queue, Empty
4+from typing import Tuple, Any, Callable, Dict, Iterator, Optional, List
5+from xml.sax.saxutils import XMLGenerator
6+import queue
7+import io
8+import _thread
29import argparse
310import atexit
411import base64
5−import io
6−import itertools
7−import logging
12+import codecs
813import os
914import pathlib
15+import ptpython.repl
1016import pty
11−import queue
1217import re
1318import shlex
1419import shutil
@@ -16,12 +21,9 @@ import socket
1621import subprocess
1722import sys
1823import tempfile
19−import _thread
2024import time
21−from contextlib import contextmanager
22−from typing import Any, Callable, Dict, Iterator, List, Optional, Tuple
23−
24−import ptpython.repl
25+import traceback
26+import unicodedata
2527
2628CHAR_TO_KEY = {
2729 "A": "shift-a",
@@ -86,24 +88,13 @@ CHAR_TO_KEY = {
8688 ")": "shift-0x0B",
8789}
8890
89−# Forward reference
91+# Forward references
92+log: "Logger"
9093machines: "List[Machine]"
9194
92−logging.basicConfig(format="%(message)s")
93−logger = logging.getLogger("test-driver")
94−logger.setLevel(logging.INFO)
9595
96−machine_colours_iter = (
97− "\x1b[{}m".format(x) for x in itertools.cycle(reversed(range(31, 37)))
98−)
99−
100−
101−class MachineLogAdapter(logging.LoggerAdapter):
102− def process(self, msg: str, kwargs: Any) -> Tuple[str, Any]:
103− return (
104− f"{self.extra['colour_code']}{self.extra['machine']}\x1b[39m: {msg}",
105− kwargs,
106− )
96+def eprint(*args: object, **kwargs: Any) -> None:
97+ print(*args, file=sys.stderr, **kwargs)
10798
10899
109100def make_command(args: list) -> str:
@@ -111,7 +102,8 @@ def make_command(args: list) -> str:
111102
112103
113104def create_vlan(vlan_nr: str) -> Tuple[str, str, "subprocess.Popen[bytes]", Any]:
114− logger.info(f"starting VDE switch for network {vlan_nr}")
105+ global log
106+ log.log("starting VDE switch for network {}".format(vlan_nr))
115107 vde_socket = tempfile.mkdtemp(
116108 prefix="nixos-test-vde-", suffix="-vde{}.ctl".format(vlan_nr)
117109 )
@@ -150,6 +142,70 @@ def retry(fn: Callable) -> None:
150142 raise Exception("action timed out")
151143
152144
145+class Logger:
146+ def __init__(self) -> None:
147+ self.logfile = os.environ.get("LOGFILE", "/dev/null")
148+ self.logfile_handle = codecs.open(self.logfile, "wb")
149+ self.xml = XMLGenerator(self.logfile_handle, encoding="utf-8")
150+ self.queue: "Queue[Dict[str, str]]" = Queue()
151+
152+ self.xml.startDocument()
153+ self.xml.startElement("logfile", attrs={})
154+
155+ def close(self) -> None:
156+ self.xml.endElement("logfile")
157+ self.xml.endDocument()
158+ self.logfile_handle.close()
159+
160+ def sanitise(self, message: str) -> str:
161+ return "".join(ch for ch in message if unicodedata.category(ch)[0] != "C")
162+
163+ def maybe_prefix(self, message: str, attributes: Dict[str, str]) -> str:
164+ if "machine" in attributes:
165+ return "{}: {}".format(attributes["machine"], message)
166+ return message
167+
168+ def log_line(self, message: str, attributes: Dict[str, str]) -> None:
169+ self.xml.startElement("line", attributes)
170+ self.xml.characters(message)
171+ self.xml.endElement("line")
172+
173+ def log(self, message: str, attributes: Dict[str, str] = {}) -> None:
174+ eprint(self.maybe_prefix(message, attributes))
175+ self.drain_log_queue()
176+ self.log_line(message, attributes)
177+
178+ def enqueue(self, message: Dict[str, str]) -> None:
179+ self.queue.put(message)
180+
181+ def drain_log_queue(self) -> None:
182+ try:
183+ while True:
184+ item = self.queue.get_nowait()
185+ attributes = {"machine": item["machine"], "type": "serial"}
186+ self.log_line(self.sanitise(item["msg"]), attributes)
187+ except Empty:
188+ pass
189+
190+ @contextmanager
191+ def nested(self, message: str, attributes: Dict[str, str] = {}) -> Iterator[None]:
192+ eprint(self.maybe_prefix(message, attributes))
193+
194+ self.xml.startElement("nest", attrs={})
195+ self.xml.startElement("head", attributes)
196+ self.xml.characters(message)
197+ self.xml.endElement("head")
198+
199+ tic = time.time()
200+ self.drain_log_queue()
201+ yield
202+ self.drain_log_queue()
203+ toc = time.time()
204+ self.log("({:.2f} seconds)".format(toc - tic))
205+
206+ self.xml.endElement("nest")
207+
208+
153209class Machine:
154210 def __init__(self, args: Dict[str, Any]) -> None:
155211 if "name" in args:
@@ -179,11 +235,8 @@ class Machine:
179235 self.pid: Optional[int] = None
180236 self.socket = None
181237 self.monitor: Optional[socket.socket] = None
238+ self.logger: Logger = args["log"]
182239 self.allow_reboot = args.get("allowReboot", False)
183− self.logger = MachineLogAdapter(
184− logger,
185− extra=dict(machine=self.name, colour_code=next(machine_colours_iter)),
186− )
187240
188241 @staticmethod
189242 def create_startcommand(args: Dict[str, str]) -> str:
@@ -239,6 +292,14 @@ class Machine:
239292 def is_up(self) -> bool:
240293 return self.booted and self.connected
241294
295+ def log(self, msg: str) -> None:
296+ self.logger.log(msg, {"machine": self.name})
297+
298+ def nested(self, msg: str, attrs: Dict[str, str] = {}) -> _GeneratorContextManager:
299+ my_attrs = {"machine": self.name}
300+ my_attrs.update(attrs)
301+ return self.logger.nested(msg, my_attrs)
302+
242303 def wait_for_monitor_prompt(self) -> str:
243304 assert self.monitor is not None
244305 answer = ""
@@ -253,7 +314,7 @@ class Machine:
253314
254315 def send_monitor_command(self, command: str) -> str:
255316 message = ("{}\n".format(command)).encode()
256− self.logger.info(f"sending monitor command: {command}")
317+ self.log("sending monitor command: {}".format(command))
257318 assert self.monitor is not None
258319 self.monitor.send(message)
259320 return self.wait_for_monitor_prompt()
@@ -320,19 +381,16 @@ class Machine:
320381 return self.execute("systemctl {}".format(q))
321382
322383 def require_unit_state(self, unit: str, require_state: str = "active") -> None:
323− self.logger.info(
324− f"checking if unit ‘{unit}’ has reached state '{require_state}'"
325− )
326− info = self.get_unit_info(unit)
327− state = info["ActiveState"]
328− if state != require_state:
329− raise Exception(
330− "Expected unit ‘{}’ to to be in state ".format(unit)
331− + "'{}' but it is in state ‘{}’".format(require_state, state)
332− )
333−
334− def log(self, message: str) -> None:
335− self.logger.info(message)
384+ with self.nested(
385+ "checking if unit ‘{}’ has reached state '{}'".format(unit, require_state)
386+ ):
387+ info = self.get_unit_info(unit)
388+ state = info["ActiveState"]
389+ if state != require_state:
390+ raise Exception(
391+ "Expected unit ‘{}’ to to be in state ".format(unit)
392+ + "'{}' but it is in state ‘{}’".format(require_state, state)
393+ )
336394
337395 def execute(self, command: str) -> Tuple[int, str]:
338396 self.connect()
@@ -356,25 +414,27 @@ class Machine:
356414 """Execute each command and check that it succeeds."""
357415 output = ""
358416 for command in commands:
359− self.logger.info(f"must succeed: {command}")
360− (status, out) = self.execute(command)
361− if status != 0:
362− self.logger.info(f"output: {out}")
363− raise Exception(
364− "command `{}` failed (exit code {})".format(command, status)
365− )
366− output += out
417+ with self.nested("must succeed: {}".format(command)):
418+ (status, out) = self.execute(command)
419+ if status != 0:
420+ self.log("output: {}".format(out))
421+ raise Exception(
422+ "command `{}` failed (exit code {})".format(command, status)
423+ )
424+ output += out
367425 return output
368426
369427 def fail(self, *commands: str) -> str:
370428 """Execute each command and check that it fails."""
371429 output = ""
372430 for command in commands:
373− self.logger.info(f"must fail: {command}")
374− (status, out) = self.execute(command)
375− if status == 0:
376− raise Exception("command `{}` unexpectedly succeeded".format(command))
377− output += out
431+ with self.nested("must fail: {}".format(command)):
432+ (status, out) = self.execute(command)
433+ if status == 0:
434+ raise Exception(
435+ "command `{}` unexpectedly succeeded".format(command)
436+ )
437+ output += out
378438 return output
379439
380440 def wait_until_succeeds(self, command: str) -> str:
@@ -388,9 +448,9 @@ class Machine:
388448 status, output = self.execute(command)
389449 return status == 0
390450
391− self.logger.info(f"waiting for success: {command}")
392− retry(check_success)
393− return output
451+ with self.nested("waiting for success: {}".format(command)):
452+ retry(check_success)
453+ return output
394454
395455 def wait_until_fails(self, command: str) -> str:
396456 """Wait until a command returns failure.
@@ -403,21 +463,21 @@ class Machine:
403463 status, output = self.execute(command)
404464 return status != 0
405465
406− self.logger.info(f"waiting for failure: {command}")
407− retry(check_failure)
408− return output
466+ with self.nested("waiting for failure: {}".format(command)):
467+ retry(check_failure)
468+ return output
409469
410470 def wait_for_shutdown(self) -> None:
411471 if not self.booted:
412472 return
413473
414− self.logger.info("waiting for the VM to power off")
415− sys.stdout.flush()
416− self.process.wait()
474+ with self.nested("waiting for the VM to power off"):
475+ sys.stdout.flush()
476+ self.process.wait()
417477
418− self.pid = None
419− self.booted = False
420− self.connected = False
478+ self.pid = None
479+ self.booted = False
480+ self.connected = False
421481
422482 def get_tty_text(self, tty: str) -> str:
423483 status, output = self.execute(
@@ -435,19 +495,19 @@ class Machine:
435495 def tty_matches(last: bool) -> bool:
436496 text = self.get_tty_text(tty)
437497 if last:
438− self.logger.info(
498+ self.log(
439499 f"Last chance to match /{regexp}/ on TTY{tty}, "
440500 f"which currently contains: {text}"
441501 )
442502 return len(matcher.findall(text)) > 0
443503
444− self.logger.info(f"waiting for {regexp} to appear on tty {tty}")
445− retry(tty_matches)
504+ with self.nested("waiting for {} to appear on tty {}".format(regexp, tty)):
505+ retry(tty_matches)
446506
447507 def send_chars(self, chars: List[str]) -> None:
448− self.logger.info(f"sending keys ‘{chars}‘")
449− for char in chars:
450− self.send_key(char)
508+ with self.nested("sending keys ‘{}‘".format(chars)):
509+ for char in chars:
510+ self.send_key(char)
451511
452512 def wait_for_file(self, filename: str) -> None:
453513 """Waits until the file exists in machine's file system."""
@@ -456,16 +516,16 @@ class Machine:
456516 status, _ = self.execute("test -e {}".format(filename))
457517 return status == 0
458518
459− self.logger.info(f"waiting for file ‘{filename}‘")
460− retry(check_file)
519+ with self.nested("waiting for file ‘{}‘".format(filename)):
520+ retry(check_file)
461521
462522 def wait_for_open_port(self, port: int) -> None:
463523 def port_is_open(_: Any) -> bool:
464524 status, _ = self.execute("nc -z localhost {}".format(port))
465525 return status == 0
466526
467− self.logger.info(f"waiting for TCP port {port}")
468− retry(port_is_open)
527+ with self.nested("waiting for TCP port {}".format(port)):
528+ retry(port_is_open)
469529
470530 def wait_for_closed_port(self, port: int) -> None:
471531 def port_is_closed(_: Any) -> bool:
@@ -487,17 +547,17 @@ class Machine:
487547 if self.connected:
488548 return
489549
490− self.logger.info("waiting for the VM to finish booting")
491− self.start()
550+ with self.nested("waiting for the VM to finish booting"):
551+ self.start()
492552
493− tic = time.time()
494− self.shell.recv(1024)
495− # TODO: Timeout
496− toc = time.time()
553+ tic = time.time()
554+ self.shell.recv(1024)
555+ # TODO: Timeout
556+ toc = time.time()
497557
498− self.logger.info("connected to guest root shell")
499− self.logger.info(f"(connecting took {toc - tic:.2f} seconds)")
500− self.connected = True
558+ self.log("connected to guest root shell")
559+ self.log("(connecting took {:.2f} seconds)".format(toc - tic))
560+ self.connected = True
501561
502562 def screenshot(self, filename: str) -> None:
503563 out_dir = os.environ.get("out", os.getcwd())
@@ -506,12 +566,15 @@ class Machine:
506566 filename = os.path.join(out_dir, "{}.png".format(filename))
507567 tmp = "{}.ppm".format(filename)
508568
509− self.logger.info(f"making screenshot {filename}")
510− self.send_monitor_command("screendump {}".format(tmp))
511− ret = subprocess.run("pnmtopng {} > {}".format(tmp, filename), shell=True)
512− os.unlink(tmp)
513− if ret.returncode != 0:
514− raise Exception("Cannot convert screenshot")
569+ with self.nested(
570+ "making screenshot {}".format(filename),
571+ {"image": os.path.basename(filename)},
572+ ):
573+ self.send_monitor_command("screendump {}".format(tmp))
574+ ret = subprocess.run("pnmtopng {} > {}".format(tmp, filename), shell=True)
575+ os.unlink(tmp)
576+ if ret.returncode != 0:
577+ raise Exception("Cannot convert screenshot")
515578
516579 def copy_from_host_via_shell(self, source: str, target: str) -> None:
517580 """Copy a file from the host into the guest by piping it over the
@@ -587,18 +650,20 @@ class Machine:
587650
588651 tess_args = "-c debug_file=/dev/null --psm 11 --oem 2"
589652
590− self.logger.info("performing optical character recognition")
591− with tempfile.NamedTemporaryFile() as tmpin:
592− self.send_monitor_command("screendump {}".format(tmpin.name))
653+ with self.nested("performing optical character recognition"):
654+ with tempfile.NamedTemporaryFile() as tmpin:
655+ self.send_monitor_command("screendump {}".format(tmpin.name))
593656
594− cmd = "convert {} {} tiff:- | tesseract - - {}".format(
595− magick_args, tmpin.name, tess_args
596− )
597− ret = subprocess.run(cmd, shell=True, capture_output=True)
598− if ret.returncode != 0:
599− raise Exception("OCR failed with exit code {}".format(ret.returncode))
657+ cmd = "convert {} {} tiff:- | tesseract - - {}".format(
658+ magick_args, tmpin.name, tess_args
659+ )
660+ ret = subprocess.run(cmd, shell=True, capture_output=True)
661+ if ret.returncode != 0:
662+ raise Exception(
663+ "OCR failed with exit code {}".format(ret.returncode)
664+ )
600665
601− return ret.stdout.decode("utf-8")
666+ return ret.stdout.decode("utf-8")
602667
603668 def wait_for_text(self, regex: str) -> None:
604669 def screen_matches(last: bool) -> bool:
@@ -606,15 +671,15 @@ class Machine:
606671 matches = re.search(regex, text) is not None
607672
608673 if last and not matches:
609− self.logger.info(f"Last OCR attempt failed. Text was: {text}")
674+ self.log("Last OCR attempt failed. Text was: {}".format(text))
610675
611676 return matches
612677
613− self.logger.info(f"waiting for {regex} to appear on screen")
614− retry(screen_matches)
678+ with self.nested("waiting for {} to appear on screen".format(regex)):
679+ retry(screen_matches)
615680
616681 def wait_for_console_text(self, regex: str) -> None:
617− self.logger.info(f"waiting for {regex} to appear on console")
682+ self.log("waiting for {} to appear on console".format(regex))
618683 # Buffer the console output, this is needed
619684 # to match multiline regexes.
620685 console = io.StringIO()
@@ -637,7 +702,7 @@ class Machine:
637702 if self.booted:
638703 return
639704
640− self.logger.info("starting vm")
705+ self.log("starting vm")
641706
642707 def create_socket(path: str) -> socket.socket:
643708 if os.path.exists(path):
@@ -694,7 +759,7 @@ class Machine:
694759
695760 # Store last serial console lines for use
696761 # of wait_for_console_text
697− self.last_lines: queue.Queue = queue.Queue()
762+ self.last_lines: Queue = Queue()
698763
699764 def process_serial_output() -> None:
700765 assert self.process.stdout is not None
@@ -702,7 +767,8 @@ class Machine:
702767 # Ignore undecodable bytes that may occur in boot menus
703768 line = _line.decode(errors="ignore").replace("\r", "").rstrip()
704769 self.last_lines.put(line)
705− self.logger.info(line)
770+ eprint("{} # {}".format(self.name, line))
771+ self.logger.enqueue({"msg": line, "machine": self.name})
706772
707773 _thread.start_new_thread(process_serial_output, ())
708774
@@ -711,10 +777,10 @@ class Machine:
711777 self.pid = self.process.pid
712778 self.booted = True
713779
714− self.logger.info(f"QEMU running (pid {self.pid})")
780+ self.log("QEMU running (pid {})".format(self.pid))
715781
716782 def cleanup_statedir(self) -> None:
717− self.logger.info("delete the VM state directory")
783+ self.log("delete the VM state directory")
718784 if os.path.isfile(self.state_dir):
719785 shutil.rmtree(self.state_dir)
720786
@@ -729,7 +795,7 @@ class Machine:
729795 if not self.booted:
730796 return
731797
732− self.logger.info("forced crash")
798+ self.log("forced crash")
733799 self.send_monitor_command("quit")
734800 self.wait_for_shutdown()
735801
@@ -749,8 +815,8 @@ class Machine:
749815 status, _ = self.execute("[ -e /tmp/.X11-unix/X0 ]")
750816 return status == 0
751817
752− self.logger.info("waiting for the X11 server")
753− retry(check_x)
818+ with self.nested("waiting for the X11 server"):
819+ retry(check_x)
754820
755821 def get_window_names(self) -> List[str]:
756822 return self.succeed(
@@ -763,17 +829,19 @@ class Machine:
763829 def window_is_visible(last_try: bool) -> bool:
764830 names = self.get_window_names()
765831 if last_try:
766− self.logger.info(
767− f"Last chance to match {regexp} on the window list, "
768− + f"which currently contains: {', '.join(names)}"
832+ self.log(
833+ "Last chance to match {} on the window list,".format(regexp)
834+ + " which currently contains: "
835+ + ", ".join(names)
769836 )
770837 return any(pattern.search(name) for name in names)
771838
772− self.logger.info("Waiting for a window to appear")
773− retry(window_is_visible)
839+ with self.nested("Waiting for a window to appear"):
840+ retry(window_is_visible)
774841
775842 def sleep(self, secs: int) -> None:
776− time.sleep(secs)
843+ # We want to sleep in *guest* time, not *host* time.
844+ self.succeed(f"sleep {secs}")
777845
778846 def forward_port(self, host_port: int = 8080, guest_port: int = 80) -> None:
779847 """Forward a TCP port on the host to a TCP port on the guest.
@@ -798,22 +866,23 @@ class Machine:
798866
799867def create_machine(args: Dict[str, Any]) -> Machine:
800868 global log
869+ args["log"] = log
801870 args["redirectSerial"] = os.environ.get("USE_SERIAL", "0") == "1"
802871 return Machine(args)
803872
804873
805874def start_all() -> None:
806875 global machines
807− logger.info("starting all VMs")
808− for machine in machines:
809− machine.start()
876+ with log.nested("starting all VMs"):
877+ for machine in machines:
878+ machine.start()
810879
811880
812881def join_all() -> None:
813882 global machines
814− logger.info("waiting for all VMs to finish")
815− for machine in machines:
816− machine.wait_for_shutdown()
883+ with log.nested("waiting for all VMs to finish"):
884+ for machine in machines:
885+ machine.wait_for_shutdown()
817886
818887
819888def test_script() -> None:
@@ -824,12 +893,13 @@ def run_tests() -> None:
824893 global machines
825894 tests = os.environ.get("tests", None)
826895 if tests is not None:
827− logger.info("running the VM test script")
828− try:
829− exec(tests, globals())
830− except Exception:
831− logging.exception("error:")
832− sys.exit(1)
896+ with log.nested("running the VM test script"):
897+ try:
898+ exec(tests, globals())
899+ except Exception as e:
900+ eprint("error: ")
901+ traceback.print_exc()
902+ sys.exit(1)
833903 else:
834904 ptpython.repl.embed(locals(), globals())
835905
@@ -842,19 +912,18 @@ def run_tests() -> None:
842912
843913@contextmanager
844914def subtest(name: str) -> Iterator[None]:
845− logger.info(name)
846− try:
847− yield
848− return True
849− except Exception as e:
850− logger.info(f'Test "{name}" failed with error: "{e}"')
851− raise e
915+ with log.nested(name):
916+ try:
917+ yield
918+ return True
919+ except Exception as e:
920+ log.log(f'Test "{name}" failed with error: "{e}"')
921+ raise e
852922
853923 return False
854924
855925
856−def main() -> None:
857− global machines
926+if __name__ == "__main__":
858927 arg_parser = argparse.ArgumentParser()
859928 arg_parser.add_argument(
860929 "-K",
@@ -864,6 +933,8 @@ def main() -> None:
864933 )
865934 (cli_args, vm_scripts) = arg_parser.parse_known_args()
866935
936+ log = Logger()
937+
867938 vlan_nrs = list(dict.fromkeys(os.environ.get("VLANS", "").split()))
868939 vde_sockets = [create_vlan(v) for v in vlan_nrs]
869940 for nr, vde_socket, _, _ in vde_sockets:
@@ -874,27 +945,23 @@ def main() -> None:
874945 if not cli_args.keep_vm_state:
875946 machine.cleanup_statedir()
876947 machine_eval = [
877− "global {0}; {0} = machines[{1}]".format(m.name, idx)
878− for idx, m in enumerate(machines)
948+ "{0} = machines[{1}]".format(m.name, idx) for idx, m in enumerate(machines)
879949 ]
880950 exec("\n".join(machine_eval))
881951
882952 @atexit.register
883953 def clean_up() -> None:
884− logger.info("cleaning up")
885− for machine in machines:
886− if machine.pid is None:
887− continue
888− logger.info(f"killing {machine.name} (pid {machine.pid})")
889− machine.process.kill()
890− for _, _, process, _ in vde_sockets:
891− process.terminate()
954+ with log.nested("cleaning up"):
955+ for machine in machines:
956+ if machine.pid is None:
957+ continue
958+ log.log("killing {} (pid {})".format(machine.name, machine.pid))
959+ machine.process.kill()
960+ for _, _, process, _ in vde_sockets:
961+ process.terminate()
962+ log.close()
892963
893964 tic = time.time()
894965 run_tests()
895966 toc = time.time()
896967 print("test script finished in {:.2f}s".format(toc - tic))
897−
898−
899−if __name__ == "__main__":
900− main()
nixos/lib/testing-python.nix+1−1
@@ -62,7 +62,7 @@ rec {
6262 ''
6363 mkdir -p $out
6464
65− tests='exec(os.environ["testScript"])' ${driver}/bin/nixos-test-driver
65+ LOGFILE=/dev/null tests='exec(os.environ["testScript"])' ${driver}/bin/nixos-test-driver
6666
6767 for i in */xchg/coverage-data; do
6868 mkdir -p $out/coverage-data
nixos/lib/testing.nixdeleted−258
@@ -1,258 +0,0 @@
1−{ system
2−, pkgs ? import ../.. { inherit system config; }
3− # Use a minimal kernel?
4−, minimal ? false
5− # Ignored
6−, config ? {}
7− # Modules to add to each VM
8−, extraConfigurations ? [] }:
9−
10−with import ./build-vms.nix { inherit system pkgs minimal extraConfigurations; };
11−with pkgs;
12−
13−rec {
14−
15− inherit pkgs;
16−
17−
18− testDriver = lib.warn ''
19− Perl VM tests are deprecated and will be removed for 20.09.
20− Please update your tests to use the python test driver.
21− See https://github.com/NixOS/nixpkgs/pull/71684 for details.
22− '' stdenv.mkDerivation {
23− name = "nixos-test-driver";
24−
25− buildInputs = [ makeWrapper perl ];
26−
27− dontUnpack = true;
28−
29− preferLocalBuild = true;
30−
31− installPhase =
32− ''
33− mkdir -p $out/bin
34− cp ${./test-driver/test-driver.pl} $out/bin/nixos-test-driver
35− chmod u+x $out/bin/nixos-test-driver
36−
37− libDir=$out/${perl.libPrefix}
38− mkdir -p $libDir
39− cp ${./test-driver/Machine.pm} $libDir/Machine.pm
40− cp ${./test-driver/Logger.pm} $libDir/Logger.pm
41−
42− wrapProgram $out/bin/nixos-test-driver \
43− --prefix PATH : "${lib.makeBinPath [ qemu_test vde2 netpbm coreutils ]}" \
44− --prefix PERL5LIB : "${with perlPackages; makePerlPath [ TermReadLineGnu XMLWriter IOTty FileSlurp ]}:$out/${perl.libPrefix}"
45− '';
46− };
47−
48−
49− # Run an automated test suite in the given virtual network.
50− # `driver' is the script that runs the network.
51− runTests = driver:
52− stdenv.mkDerivation {
53− name = "vm-test-run-${driver.testName}";
54−
55− requiredSystemFeatures = [ "kvm" "nixos-test" ];
56−
57− buildCommand =
58− ''
59− mkdir -p $out
60−
61− LOGFILE=/dev/null tests='eval $ENV{testScript}; die $@ if $@;' ${driver}/bin/nixos-test-driver
62−
63− for i in */xchg/coverage-data; do
64− mkdir -p $out/coverage-data
65− mv $i $out/coverage-data/$(dirname $(dirname $i))
66− done
67− '';
68− };
69−
70−
71− makeTest =
72− { testScript
73− , makeCoverageReport ? false
74− , enableOCR ? false
75− , name ? "unnamed"
76− , ...
77− } @ t:
78−
79− let
80− # A standard store path to the vm monitor is built like this:
81− # /tmp/nix-build-vm-test-run-$name.drv-0/vm-state-machine/monitor
82− # The max filename length of a unix domain socket is 108 bytes.
83− # This means $name can at most be 50 bytes long.
84− maxTestNameLen = 50;
85− testNameLen = builtins.stringLength name;
86−
87− testDriverName = with builtins;
88− if testNameLen > maxTestNameLen then
89− abort ("The name of the test '${name}' must not be longer than ${toString maxTestNameLen} " +
90− "it's currently ${toString testNameLen} characters long.")
91− else
92− "nixos-test-driver-${name}";
93−
94− nodes = buildVirtualNetwork (
95− t.nodes or (if t ? machine then { machine = t.machine; } else { }));
96−
97− testScript' =
98− # Call the test script with the computed nodes.
99− if lib.isFunction testScript
100− then testScript { inherit nodes; }
101− else testScript;
102−
103− vlans = map (m: m.config.virtualisation.vlans) (lib.attrValues nodes);
104−
105− vms = map (m: m.config.system.build.vm) (lib.attrValues nodes);
106−
107− ocrProg = tesseract4.override { enableLanguages = [ "eng" ]; };
108−
109− imagemagick_tiff = imagemagick_light.override { inherit libtiff; };
110−
111− # Generate onvenience wrappers for running the test driver
112− # interactively with the specified network, and for starting the
113− # VMs from the command line.
114− driver = runCommand testDriverName
115− { buildInputs = [ makeWrapper];
116− testScript = testScript';
117− preferLocalBuild = true;
118− testName = name;
119− }
120− ''
121− mkdir -p $out/bin
122− echo "$testScript" > $out/test-script
123− ln -s ${testDriver}/bin/nixos-test-driver $out/bin/
124− vms=($(for i in ${toString vms}; do echo $i/bin/run-*-vm; done))
125− wrapProgram $out/bin/nixos-test-driver \
126− --add-flags "''${vms[*]}" \
127− ${lib.optionalString enableOCR
128− "--prefix PATH : '${ocrProg}/bin:${imagemagick_tiff}/bin'"} \
129− --run "export testScript=\"\$(cat $out/test-script)\"" \
130− --set VLANS '${toString vlans}'
131− ln -s ${testDriver}/bin/nixos-test-driver $out/bin/nixos-run-vms
132− wrapProgram $out/bin/nixos-run-vms \
133− --add-flags "''${vms[*]}" \
134− ${lib.optionalString enableOCR "--prefix PATH : '${ocrProg}/bin'"} \
135− --set tests 'startAll; joinAll;' \
136− --set VLANS '${toString vlans}' \
137− ${lib.optionalString (builtins.length vms == 1) "--set USE_SERIAL 1"}
138− ''; # "
139−
140− passMeta = drv: drv // lib.optionalAttrs (t ? meta) {
141− meta = (drv.meta or {}) // t.meta;
142− };
143−
144− test = passMeta (runTests driver);
145− report = passMeta (releaseTools.gcovReport { coverageRuns = [ test ]; });
146−
147− nodeNames = builtins.attrNames nodes;
148− invalidNodeNames = lib.filter
149− (node: builtins.match "^[A-z_][A-z0-9_]+$" node == null) nodeNames;
150−
151− in
152− if lib.length invalidNodeNames > 0 then
153− throw ''
154− Cannot create machines out of (${lib.concatStringsSep ", " invalidNodeNames})!
155− All machines are referenced as perl variables in the testing framework which will break the
156− script when special characters are used.
157−
158− Please stick to alphanumeric chars and underscores as separation.
159− ''
160− else
161− (if makeCoverageReport then report else test) // {
162− inherit nodes driver test;
163− };
164−
165− runInMachine =
166− { drv
167− , machine
168− , preBuild ? ""
169− , postBuild ? ""
170− , ... # ???
171− }:
172− let
173− vm = buildVM { }
174− [ machine
175− { key = "run-in-machine";
176− networking.hostName = "client";
177− nix.readOnlyStore = false;
178− virtualisation.writableStore = false;
179− }
180− ];
181−
182− buildrunner = writeText "vm-build" ''
183− source $1
184−
185− ${coreutils}/bin/mkdir -p $TMPDIR
186− cd $TMPDIR
187−
188− exec $origBuilder $origArgs
189− '';
190−
191− testScript = ''
192− startAll;
193− $client->waitForUnit("multi-user.target");
194− ${preBuild}
195− $client->succeed("env -i ${bash}/bin/bash ${buildrunner} /tmp/xchg/saved-env >&2");
196− ${postBuild}
197− $client->succeed("sync"); # flush all data before pulling the plug
198− '';
199−
200− vmRunCommand = writeText "vm-run" ''
201− xchg=vm-state-client/xchg
202− ${coreutils}/bin/mkdir $out
203− ${coreutils}/bin/mkdir -p $xchg
204−
205− for i in $passAsFile; do
206− i2=''${i}Path
207− _basename=$(${coreutils}/bin/basename ''${!i2})
208− ${coreutils}/bin/cp ''${!i2} $xchg/$_basename
209− eval $i2=/tmp/xchg/$_basename
210− ${coreutils}/bin/ls -la $xchg
211− done
212−
213− unset i i2 _basename
214− export | ${gnugrep}/bin/grep -v '^xchg=' > $xchg/saved-env
215− unset xchg
216−
217− export tests='${testScript}'
218− ${testDriver}/bin/nixos-test-driver ${vm.config.system.build.vm}/bin/run-*-vm
219− ''; # */
220−
221− in
222− lib.overrideDerivation drv (attrs: {
223− requiredSystemFeatures = [ "kvm" ];
224− builder = "${bash}/bin/sh";
225− args = ["-e" vmRunCommand];
226− origArgs = attrs.args;
227− origBuilder = attrs.builder;
228− });
229−
230−
231− runInMachineWithX = { require ? [], ... } @ args:
232− let
233− client =
234− { ... }:
235− {
236− inherit require;
237− imports = [
238− ../tests/common/auto.nix
239− ];
240− virtualisation.memorySize = 1024;
241− services.xserver.enable = true;
242− test-support.displayManager.auto.enable = true;
243− services.xserver.displayManager.defaultSession = "none+icewm";
244− services.xserver.windowManager.icewm.enable = true;
245− };
246− in
247− runInMachine ({
248− machine = client;
249− preBuild =
250− ''
251− $client->waitForX;
252− '';
253− } // args);
254−
255−
256− simpleTest = as: (makeTest as).test;
257−
258−}
nixos/modules/installer/tools/nixos-rebuild.sh+4−1
@@ -288,7 +288,10 @@ fi
288288if [ "$action" = edit ]; then
289289 if [[ -z $flake ]]; then
290290 NIXOS_CONFIG=${NIXOS_CONFIG:-$(nix-instantiate --find-file nixos-config)}
291− exec "${EDITOR:-nano}" "$NIXOS_CONFIG"
291+ if [[ -d $NIXOS_CONFIG ]]; then
292+ NIXOS_CONFIG=$NIXOS_CONFIG/default.nix
293+ fi
294+ exec ${EDITOR:-nano} "$NIXOS_CONFIG"
292295 else
293296 exec nix edit "${lockFlags[@]}" -- "$flake#$flakeAttr"
294297 fi
nixos/modules/module-list.nix+1
@@ -262,6 +262,7 @@
262262 ./services/continuous-integration/buildbot/worker.nix
263263 ./services/continuous-integration/buildkite-agents.nix
264264 ./services/continuous-integration/hail.nix
265+ ./services/continuous-integration/hercules-ci-agent/default.nix
265266 ./services/continuous-integration/hydra/default.nix
266267 ./services/continuous-integration/gitlab-runner.nix
267268 ./services/continuous-integration/gocd-agent/default.nix
nixos/modules/services/continuous-integration/hercules-ci-agent/common.nixnew file+213
@@ -0,0 +1,213 @@
1+/*
2+
3+This file is for options that NixOS and nix-darwin have in common.
4+
5+Platform-specific code is in the respective default.nix files.
6+
7+ */
8+
9+{ config, lib, options, pkgs, ... }:
10+
11+let
12+ inherit (lib) mkOption mkIf types filterAttrs literalExample mkRenamedOptionModule;
13+
14+ cfg =
15+ config.services.hercules-ci-agent;
16+
17+ format = pkgs.formats.toml {};
18+
19+ settingsModule = { config, ... }: {
20+ freeformType = format.type;
21+ options = {
22+ baseDirectory = mkOption {
23+ type = types.path;
24+ default = "/var/lib/hercules-ci-agent";
25+ description = ''
26+ State directory (secrets, work directory, etc) for agent
27+ '';
28+ };
29+ concurrentTasks = mkOption {
30+ description = ''
31+ Number of tasks to perform simultaneously, such as evaluations, derivations.
32+
33+ You must have a total capacity across agents of at least 2 concurrent tasks on <literal>x86_64-linux</literal>
34+ to allow for import from derivation.
35+ '';
36+ type = types.int;
37+ default = 4;
38+ };
39+ workDirectory = mkOption {
40+ description = ''
41+ The directory in which temporary subdirectories are created for task state. This includes sources for Nix evaluation.
42+ '';
43+ type = types.path;
44+ default = config.baseDirectory + "/work";
45+ defaultText = literalExample ''baseDirectory + "/work"'';
46+ };
47+ staticSecretsDirectory = mkOption {
48+ description = ''
49+ This is the default directory to look for statically configured secrets like <literal>cluster-join-token.key</literal>.
50+ '';
51+ type = types.path;
52+ default = config.baseDirectory + "/secrets";
53+ defaultText = literalExample ''baseDirectory + "/secrets"'';
54+ };
55+ clusterJoinTokenPath = mkOption {
56+ description = ''
57+ Location of the cluster-join-token.key file.
58+ '';
59+ type = types.path;
60+ default = config.staticSecretsDirectory + "/cluster-join-token.key";
61+ defaultText = literalExample ''staticSecretsDirectory + "/cluster-join-token.key"'';
62+ # internal: It's a bit too detailed to show by default in the docs,
63+ # but useful to define explicitly to allow reuse by other modules.
64+ internal = true;
65+ };
66+ binaryCachesPath = mkOption {
67+ description = ''
68+ Location of the binary-caches.json file.
69+ '';
70+ type = types.path;
71+ default = config.staticSecretsDirectory + "/binary-caches.json";
72+ defaultText = literalExample ''staticSecretsDirectory + "/binary-caches.json"'';
73+ # internal: It's a bit too detailed to show by default in the docs,
74+ # but useful to define explicitly to allow reuse by other modules.
75+ internal = true;
76+ };
77+ };
78+ };
79+
80+ checkNix =
81+ if !cfg.checkNix
82+ then ""
83+ else if lib.versionAtLeast config.nix.package.version "2.4.0"
84+ then ""
85+ else pkgs.stdenv.mkDerivation {
86+ name = "hercules-ci-check-system-nix-src";
87+ inherit (config.nix.package) src patches;
88+ configurePhase = ":";
89+ buildPhase = ''
90+ echo "Checking in-memory pathInfoCache expiry"
91+ if ! grep 'struct PathInfoCacheValue' src/libstore/store-api.hh >/dev/null; then
92+ cat 1>&2 <<EOF
93+
94+ You are deploying Hercules CI Agent on a system with an incompatible
95+ nix-daemon. Please
96+ - either upgrade Nix to version 2.4.0 (when released),
97+ - or set option services.hercules-ci-agent.patchNix = true;
98+ - or set option nix.package to a build of Nix 2.3 with this patch applied:
99+ https://github.com/NixOS/nix/pull/3405
100+
101+ The patch is required for Nix-daemon clients that expect a change in binary
102+ cache contents while running, like the agent's evaluator. Without it, import
103+ from derivation will fail if your cluster has more than one machine.
104+ We are conservative with changes to the overall system, which is why we
105+ keep changes to a minimum and why we ask for confirmation in the form of
106+ services.hercules-ci-agent.patchNix = true before applying.
107+
108+ EOF
109+ exit 1
110+ fi
111+ '';
112+ installPhase = "touch $out";
113+ };
114+
115+ patchedNix = lib.mkIf (!lib.versionAtLeast pkgs.nix.version "2.4.0") (
116+ if lib.versionAtLeast pkgs.nix.version "2.4pre"
117+ then lib.warn "Hercules CI Agent module will not patch 2.4 pre-release. Make sure it includes (equivalently) PR #3043, commit d048577909 or is no older than 2020-03-13." pkgs.nix
118+ else pkgs.nix.overrideAttrs (
119+ o: {
120+ patches = (o.patches or []) ++ [ backportNix3398 ];
121+ }
122+ )
123+ );
124+
125+ backportNix3398 = pkgs.fetchurl {
126+ url = "https://raw.githubusercontent.com/hercules-ci/hercules-ci-agent/hercules-ci-agent-0.7.3/for-upstream/issue-3398-path-info-cache-ttls-backport-2.3.patch";
127+ sha256 = "0jfckqjir9il2il7904yc1qyadw366y7xqzg81sp9sl3f1pw70ib";
128+ };
129+in
130+{
131+ imports = [
132+ (mkRenamedOptionModule ["services" "hercules-ci-agent" "extraOptions"] ["services" "hercules-ci-agent" "settings"])
133+ (mkRenamedOptionModule ["services" "hercules-ci-agent" "baseDirectory"] ["services" "hercules-ci-agent" "settings" "baseDirectory"])
134+ (mkRenamedOptionModule ["services" "hercules-ci-agent" "concurrentTasks"] ["services" "hercules-ci-agent" "settings" "concurrentTasks"])
135+ ];
136+
137+ options.services.hercules-ci-agent = {
138+ enable = mkOption {
139+ type = types.bool;
140+ default = false;
141+ description = ''
142+ Enable to run Hercules CI Agent as a system service.
143+
144+ <link xlink:href="https://hercules-ci.com">Hercules CI</link> is a
145+ continuous integation service that is centered around Nix.
146+
147+ Support is available at <link xlink:href="mailto:help@hercules-ci.com">help@hercules-ci.com</link>.
148+ '';
149+ };
150+ patchNix = mkOption {
151+ type = types.bool;
152+ default = false;
153+ description = ''
154+ Fix Nix 2.3 cache path metadata caching behavior. Has the effect of <literal>nix.package = patch pkgs.nix;</literal>
155+
156+ This option will be removed when Hercules CI Agent moves to Nix 2.4 (upcoming Nix release).
157+ '';
158+ };
159+ checkNix = mkOption {
160+ type = types.bool;
161+ default = true;
162+ description = ''
163+ Whether to make sure that the system's Nix (nix-daemon) is compatible.
164+
165+ If you set this to false, please keep up with the change log.
166+ '';
167+ };
168+ package = mkOption {
169+ description = ''
170+ Package containing the bin/hercules-ci-agent executable.
171+ '';
172+ type = types.package;
173+ default = pkgs.hercules-ci-agent;
174+ defaultText = literalExample "pkgs.hercules-ci-agent";
175+ };
176+ settings = mkOption {
177+ description = ''
178+ These settings are written to the <literal>agent.toml</literal> file.
179+
180+ Not all settings are listed as options, can be set nonetheless.
181+
182+ For the exhaustive list of settings, see <link xlink:href="https://docs.hercules-ci.com/hercules-ci/reference/agent-config/"/>.
183+ '';
184+ type = types.submoduleWith { modules = [ settingsModule ]; };
185+ };
186+
187+ /*
188+ Internal and/or computed values.
189+
190+ These are written as options instead of let binding to allow sharing with
191+ default.nix on both NixOS and nix-darwin.
192+ */
193+ tomlFile = mkOption {
194+ type = types.path;
195+ internal = true;
196+ defaultText = "generated hercules-ci-agent.toml";
197+ description = ''
198+ The fully assembled config file.
199+ '';
200+ };
201+ };
202+
203+ config = mkIf cfg.enable {
204+ nix.extraOptions = lib.addContextFrom checkNix ''
205+ # A store path that was missing at first may well have finished building,
206+ # even shortly after the previous lookup. This *also* applies to the daemon.
207+ narinfo-cache-negative-ttl = 0
208+ '';
209+ nix.package = mkIf cfg.patchNix patchedNix;
210+ services.hercules-ci-agent.tomlFile =
211+ format.generate "hercules-ci-agent.toml" cfg.settings;
212+ };
213+}
nixos/modules/services/continuous-integration/hercules-ci-agent/default.nixnew file+86
@@ -0,0 +1,86 @@
1+/*
2+
3+This file is for NixOS-specific options and configs.
4+
5+Code that is shared with nix-darwin goes in common.nix.
6+
7+ */
8+
9+{ pkgs, config, lib, ... }:
10+
11+let
12+
13+ inherit (lib) mkIf mkDefault;
14+
15+ cfg = config.services.hercules-ci-agent;
16+
17+ command = "${cfg.package}/bin/hercules-ci-agent --config ${cfg.tomlFile}";
18+ testCommand = "${command} --test-configuration";
19+
20+in
21+{
22+ imports = [
23+ ./common.nix
24+ (lib.mkRenamedOptionModule ["services" "hercules-ci-agent" "user"] ["systemd" "services" "hercules-ci-agent" "serviceConfig" "User"])
25+ ];
26+
27+ config = mkIf cfg.enable {
28+
29+ systemd.services.hercules-ci-agent = {
30+ wantedBy = [ "multi-user.target" ];
31+ after = [ "network-online.target" ];
32+ wants = [ "network-online.target" ];
33+ path = [ config.nix.package ];
34+ serviceConfig = {
35+ User = "hercules-ci-agent";
36+ ExecStart = command;
37+ ExecStartPre = testCommand;
38+ Restart = "on-failure";
39+ RestartSec = 120;
40+ StartLimitBurst = 30 * 1000000; # practically infinite
41+ };
42+ };
43+
44+ # Changes in the secrets do not affect the unit in any way that would cause
45+ # a restart, which is currently necessary to reload the secrets.
46+ systemd.paths.hercules-ci-agent-restart-files = {
47+ wantedBy = [ "hercules-ci-agent.service" ];
48+ pathConfig = {
49+ Unit = "hercules-ci-agent-restarter.service";
50+ PathChanged = [ cfg.settings.clusterJoinTokenPath cfg.settings.binaryCachesPath ];
51+ };
52+ };
53+ systemd.services.hercules-ci-agent-restarter = {
54+ serviceConfig.Type = "oneshot";
55+ script = ''
56+ # Wait a bit, with the effect of bundling up file changes into a single
57+ # run of this script and hopefully a single restart.
58+ sleep 10
59+ if systemctl is-active --quiet hercules-ci-agent.service; then
60+ if ${testCommand}; then
61+ systemctl restart hercules-ci-agent.service
62+ else
63+ echo 1>&2 "WARNING: Not restarting agent because config is not valid at this time."
64+ fi
65+ else
66+ echo 1>&2 "Not restarting hercules-ci-agent despite config file update, because it is not already active."
67+ fi
68+ '';
69+ };
70+
71+ # Trusted user allows simplified configuration and better performance
72+ # when operating in a cluster.
73+ nix.trustedUsers = [ config.systemd.services.hercules-ci-agent.serviceConfig.User ];
74+ services.hercules-ci-agent.settings.nixUserIsTrusted = true;
75+
76+ users.users.hercules-ci-agent = {
77+ home = cfg.settings.baseDirectory;
78+ createHome = true;
79+ group = "hercules-ci-agent";
80+ description = "Hercules CI Agent system user";
81+ isSystemUser = true;
82+ };
83+
84+ users.groups.hercules-ci-agent = {};
85+ };
86+}
nixos/modules/services/databases/postgresql.nix+42−14
@@ -11,23 +11,23 @@ let
1111 then cfg.package
1212 else cfg.package.withPackages (_: cfg.extraPlugins);
1313
14+ toStr = value:
15+ if true == value then "yes"
16+ else if false == value then "no"
17+ else if isString value then "'${lib.replaceStrings ["'"] ["''"] value}'"
18+ else toString value;
19+
1420 # The main PostgreSQL configuration file.
15− configFile = pkgs.writeText "postgresql.conf"
16− ''
17− hba_file = '${pkgs.writeText "pg_hba.conf" cfg.authentication}'
18− ident_file = '${pkgs.writeText "pg_ident.conf" cfg.identMap}'
19− log_destination = 'stderr'
20− log_line_prefix = '${cfg.logLinePrefix}'
21− listen_addresses = '${if cfg.enableTCPIP then "*" else "localhost"}'
22− port = ${toString cfg.port}
23− ${cfg.extraConfig}
24− '';
21+ configFile = pkgs.writeText "postgresql.conf" (concatStringsSep "\n" (mapAttrsToList (n: v: "${n} = ${toStr v}") cfg.settings));
2522
2623 groupAccessAvailable = versionAtLeast postgresql.version "11.0";
2724
2825in
2926
3027{
28+ imports = [
29+ (mkRemovedOptionModule [ "services" "postgresql" "extraConfig" ] "Use services.postgresql.settings instead.")
30+ ];
3131
3232 ###### interface
3333
@@ -212,10 +212,28 @@ in
212212 '';
213213 };
214214
215− extraConfig = mkOption {
216− type = types.lines;
217− default = "";
218− description = "Additional text to be appended to <filename>postgresql.conf</filename>.";
215+ settings = mkOption {
216+ type = with types; attrsOf (oneOf [ bool float int str ]);
217+ default = {};
218+ description = ''
219+ PostgreSQL configuration. Refer to
220+ <link xlink:href="https://www.postgresql.org/docs/11/config-setting.html#CONFIG-SETTING-CONFIGURATION-FILE"/>
221+ for an overview of <literal>postgresql.conf</literal>.
222+
223+ <note><para>
224+ String values will automatically be enclosed in single quotes. Single quotes will be
225+ escaped with two single quotes as described by the upstream documentation linked above.
226+ </para></note>
227+ '';
228+ example = literalExample ''
229+ {
230+ log_connections = true;
231+ log_statement = "all";
232+ logging_collector = true
233+ log_disconnections = true
234+ log_destination = lib.mkForce "syslog";
235+ }
236+ '';
219237 };
220238
221239 recoveryConfig = mkOption {
@@ -245,6 +263,16 @@ in
245263
246264 config = mkIf cfg.enable {
247265
266+ services.postgresql.settings =
267+ {
268+ hba_file = "${pkgs.writeText "pg_hba.conf" cfg.authentication}";
269+ ident_file = "${pkgs.writeText "pg_ident.conf" cfg.identMap}";
270+ log_destination = "stderr";
271+ log_line_prefix = cfg.logLinePrefix;
272+ listen_addresses = if cfg.enableTCPIP then "*" else "localhost";
273+ port = cfg.port;
274+ };
275+
248276 services.postgresql.package =
249277 # Note: when changing the default, make it conditional on
250278 # ‘system.stateVersion’ to maintain compatibility with existing
nixos/modules/services/misc/nix-daemon.nix−7
@@ -500,13 +500,6 @@ in
500500
501501 config = {
502502
503− assertions = [
504− {
505− assertion = config.nix.distributedBuilds || config.nix.buildMachines == [];
506− message = "You must set `nix.distributedBuilds = true` to use nix.buildMachines";
507− }
508− ];
509−
510503 nix.binaryCachePublicKeys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ];
511504 nix.binaryCaches = [ "https://cache.nixos.org/" ];
512505
nixos/modules/services/misc/redmine.nix+45−57
@@ -1,12 +1,12 @@
11{ config, lib, pkgs, ... }:
22
33let
4− inherit (lib) mkDefault mkEnableOption mkIf mkOption types;
4+ inherit (lib) mkBefore mkDefault mkEnableOption mkIf mkOption mkRemovedOptionModule types;
55 inherit (lib) concatStringsSep literalExample mapAttrsToList;
6− inherit (lib) optional optionalAttrs optionalString singleton versionAtLeast;
6+ inherit (lib) optional optionalAttrs optionalString;
77
88 cfg = config.services.redmine;
9−
9+ format = pkgs.formats.yaml {};
1010 bundle = "${cfg.package}/share/redmine/bin/bundle";
1111
1212 databaseYml = pkgs.writeText "database.yml" ''
@@ -20,24 +20,8 @@ let
2020 ${optionalString (cfg.database.type == "mysql2" && cfg.database.socket != null) "socket: ${cfg.database.socket}"}
2121 '';
2222
23− configurationYml = pkgs.writeText "configuration.yml" ''
24− default:
25− scm_subversion_command: ${pkgs.subversion}/bin/svn
26− scm_mercurial_command: ${pkgs.mercurial}/bin/hg
27− scm_git_command: ${pkgs.gitAndTools.git}/bin/git
28− scm_cvs_command: ${pkgs.cvs}/bin/cvs
29− scm_bazaar_command: ${pkgs.breezy}/bin/bzr
30− scm_darcs_command: ${pkgs.darcs}/bin/darcs
31−
32− ${cfg.extraConfig}
33− '';
34−
35− additionalEnvironment = pkgs.writeText "additional_environment.rb" ''
36− config.logger = Logger.new("${cfg.stateDir}/log/production.log", 14, 1048576)
37− config.logger.level = Logger::INFO
38−
39− ${cfg.extraEnv}
40− '';
23+ configurationYml = format.generate "configuration.yml" cfg.settings;
24+ additionalEnvironment = pkgs.writeText "additional_environment.rb" cfg.extraEnv;
4125
4226 unpackTheme = unpack "theme";
4327 unpackPlugin = unpack "plugin";
@@ -56,8 +40,13 @@ let
5640 pgsqlLocal = cfg.database.createLocally && cfg.database.type == "postgresql";
5741
5842in
59−
6043{
44+ imports = [
45+ (mkRemovedOptionModule [ "services" "redmine" "extraConfig" ] "Use services.redmine.settings instead.")
46+ (mkRemovedOptionModule [ "services" "redmine" "database" "password" ] "Use services.redmine.database.passwordFile instead.")
47+ ];
48+
49+ # interface
6150 options = {
6251 services.redmine = {
6352 enable = mkEnableOption "Redmine";
@@ -93,21 +82,24 @@ in
9382 description = "The state directory, logs and plugins are stored here.";
9483 };
9584
96− extraConfig = mkOption {
97− type = types.lines;
98− default = "";
85+ settings = mkOption {
86+ type = format.type;
87+ default = {};
9988 description = ''
100− Extra configuration in configuration.yml.
101−
102− See <link xlink:href="https://guides.rubyonrails.org/action_mailer_basics.html#action-mailer-configuration"/>
89+ Redmine configuration (<filename>configuration.yml</filename>). Refer to
90+ <link xlink:href="https://guides.rubyonrails.org/action_mailer_basics.html#action-mailer-configuration"/>
10391 for details.
10492 '';
10593 example = literalExample ''
106− email_delivery:
107− delivery_method: smtp
108− smtp_settings:
109− address: mail.example.com
110− port: 25
94+ {
95+ email_delivery = {
96+ delivery_method = "smtp";
97+ smtp_settings = {
98+ address = "mail.example.com";
99+ port = 25;
100+ };
101+ };
102+ }
111103 '';
112104 };
113105
@@ -186,16 +178,6 @@ in
186178 description = "Database user.";
187179 };
188180
189− password = mkOption {
190− type = types.str;
191− default = "";
192− description = ''
193− The password corresponding to <option>database.user</option>.
194− Warning: this is stored in cleartext in the Nix store!
195− Use <option>database.passwordFile</option> instead.
196− '';
197− };
198−
199181 passwordFile = mkOption {
200182 type = types.nullOr types.path;
201183 default = null;
@@ -226,11 +208,12 @@ in
226208 };
227209 };
228210
211+ # implementation
229212 config = mkIf cfg.enable {
230213
231214 assertions = [
232− { assertion = cfg.database.passwordFile != null || cfg.database.password != "" || cfg.database.socket != null;
233− message = "one of services.redmine.database.socket, services.redmine.database.passwordFile, or services.redmine.database.password must be set";
215+ { assertion = cfg.database.passwordFile != null || cfg.database.socket != null;
216+ message = "one of services.redmine.database.socket or services.redmine.database.passwordFile must be set";
234217 }
235218 { assertion = cfg.database.createLocally -> cfg.database.user == cfg.user;
236219 message = "services.redmine.database.user must be set to ${cfg.user} if services.redmine.database.createLocally is set true";
@@ -243,6 +226,22 @@ in
243226 }
244227 ];
245228
229+ services.redmine.settings = {
230+ production = {
231+ scm_subversion_command = "${pkgs.subversion}/bin/svn";
232+ scm_mercurial_command = "${pkgs.mercurial}/bin/hg";
233+ scm_git_command = "${pkgs.gitAndTools.git}/bin/git";
234+ scm_cvs_command = "${pkgs.cvs}/bin/cvs";
235+ scm_bazaar_command = "${pkgs.breezy}/bin/bzr";
236+ scm_darcs_command = "${pkgs.darcs}/bin/darcs";
237+ };
238+ };
239+
240+ services.redmine.extraEnv = mkBefore ''
241+ config.logger = Logger.new("${cfg.stateDir}/log/production.log", 14, 1048576)
242+ config.logger.level = Logger::INFO
243+ '';
244+
246245 services.mysql = mkIf mysqlLocal {
247246 enable = true;
248247 package = mkDefault pkgs.mariadb;
@@ -338,7 +337,7 @@ in
338337
339338
340339 # handle database.passwordFile & permissions
341− DBPASS=$(head -n1 ${cfg.database.passwordFile})
340+ DBPASS=${optionalString (cfg.database.passwordFile != null) "$(head -n1 ${cfg.database.passwordFile})"}
342341 cp -f ${databaseYml} "${cfg.stateDir}/config/database.yml"
343342 sed -e "s,#dbpass#,$DBPASS,g" -i "${cfg.stateDir}/config/database.yml"
344343 chmod 440 "${cfg.stateDir}/config/database.yml"
@@ -379,17 +378,6 @@ in
379378 redmine.gid = config.ids.gids.redmine;
380379 };
381380
382− warnings = optional (cfg.database.password != "")
383− ''config.services.redmine.database.password will be stored as plaintext
384− in the Nix store. Use database.passwordFile instead.'';
385−
386− # Create database passwordFile default when password is configured.
387− services.redmine.database.passwordFile =
388− (mkDefault (toString (pkgs.writeTextFile {
389− name = "redmine-database-password";
390− text = cfg.database.password;
391− })));
392−
393381 };
394382
395383}
nixos/modules/services/networking/networkmanager.nix+1−1
@@ -458,7 +458,7 @@ in {
458458
459459 systemd.services.NetworkManager-dispatcher = {
460460 wantedBy = [ "network.target" ];
461− restartTriggers = [ configFile ];
461+ restartTriggers = [ configFile overrideNameserversScript ];
462462
463463 # useful binaries for user-specified hooks
464464 path = [ pkgs.iproute pkgs.utillinux pkgs.coreutils ];
nixos/modules/services/security/tor.nix+15−5
@@ -34,8 +34,8 @@ let
3434 User tor
3535 DataDirectory ${torDirectory}
3636 ${optionalString cfg.enableGeoIP ''
37− GeoIPFile ${pkgs.tor.geoip}/share/tor/geoip
38− GeoIPv6File ${pkgs.tor.geoip}/share/tor/geoip6
37+ GeoIPFile ${cfg.package.geoip}/share/tor/geoip
38+ GeoIPv6File ${cfg.package.geoip}/share/tor/geoip6
3939 ''}
4040
4141 ${optint "ControlPort" cfg.controlPort}
@@ -123,6 +123,16 @@ in
123123 '';
124124 };
125125
126+ package = mkOption {
127+ type = types.package;
128+ default = pkgs.tor;
129+ defaultText = "pkgs.tor";
130+ example = literalExample "pkgs.tor";
131+ description = ''
132+ Tor package to use
133+ '';
134+ };
135+
126136 enableGeoIP = mkOption {
127137 type = types.bool;
128138 default = true;
@@ -749,8 +759,8 @@ in
749759 serviceConfig =
750760 { Type = "simple";
751761 # Translated from the upstream contrib/dist/tor.service.in
752− ExecStartPre = "${pkgs.tor}/bin/tor -f ${torRcFile} --verify-config";
753− ExecStart = "${pkgs.tor}/bin/tor -f ${torRcFile}";
762+ ExecStartPre = "${cfg.package}/bin/tor -f ${torRcFile} --verify-config";
763+ ExecStart = "${cfg.package}/bin/tor -f ${torRcFile}";
754764 ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
755765 KillSignal = "SIGINT";
756766 TimeoutSec = 30;
@@ -773,7 +783,7 @@ in
773783 };
774784 };
775785
776− environment.systemPackages = [ pkgs.tor ];
786+ environment.systemPackages = [ cfg.package ];
777787
778788 services.privoxy = mkIf (cfg.client.enable && cfg.client.privoxy.enable) {
779789 enable = true;
nixos/modules/system/boot/stage-1.nix+3−2
@@ -121,12 +121,13 @@ let
121121 copy_bin_and_libs ${pkgs.mdadm}/sbin/mdmon
122122
123123 # Copy udev.
124− copy_bin_and_libs ${udev}/lib/systemd/systemd-udevd
125− copy_bin_and_libs ${udev}/lib/systemd/systemd-sysctl
126124 copy_bin_and_libs ${udev}/bin/udevadm
125+ copy_bin_and_libs ${udev}/lib/systemd/systemd-sysctl
127126 for BIN in ${udev}/lib/udev/*_id; do
128127 copy_bin_and_libs $BIN
129128 done
129+ # systemd-udevd is only a symlink to udevadm these days
130+ ln -sf udevadm $out/bin/systemd-udevd
130131
131132 # Copy modprobe.
132133 copy_bin_and_libs ${pkgs.kmod}/bin/kmod
nixos/modules/system/boot/systemd.nix−2
@@ -903,11 +903,9 @@ in
903903 )
904904 ]);
905905 passwd = (mkMerge [
906− [ "mymachines" ]
907906 (mkAfter [ "systemd" ])
908907 ]);
909908 group = (mkMerge [
910− [ "mymachines" ]
911909 (mkAfter [ "systemd" ])
912910 ]);
913911 };
nixos/release-combined.nix+18
@@ -106,11 +106,29 @@ in rec {
106106 (onFullSupported "nixos.tests.networking.scripted.bridge")
107107 (onFullSupported "nixos.tests.networking.scripted.dhcpOneIf")
108108 (onFullSupported "nixos.tests.networking.scripted.dhcpSimple")
109+ (onFullSupported "nixos.tests.networking.scripted.link")
109110 (onFullSupported "nixos.tests.networking.scripted.loopback")
110111 (onFullSupported "nixos.tests.networking.scripted.macvlan")
112+ (onFullSupported "nixos.tests.networking.scripted.privacy")
113+ (onFullSupported "nixos.tests.networking.scripted.routes")
111114 (onFullSupported "nixos.tests.networking.scripted.sit")
112115 (onFullSupported "nixos.tests.networking.scripted.static")
116+ (onFullSupported "nixos.tests.networking.scripted.virtual")
113117 (onFullSupported "nixos.tests.networking.scripted.vlan")
118+ (onFullSupported "nixos.tests.networking.networkd.bond")
119+ (onFullSupported "nixos.tests.networking.networkd.bridge")
120+ (onFullSupported "nixos.tests.networking.networkd.dhcpOneIf")
121+ (onFullSupported "nixos.tests.networking.networkd.dhcpSimple")
122+ (onFullSupported "nixos.tests.networking.networkd.link")
123+ (onFullSupported "nixos.tests.networking.networkd.loopback")
124+ # Fails nondeterministically (https://github.com/NixOS/nixpkgs/issues/96709)
125+ #(onFullSupported "nixos.tests.networking.networkd.macvlan")
126+ (onFullSupported "nixos.tests.networking.networkd.privacy")
127+ (onFullSupported "nixos.tests.networking.networkd.routes")
128+ (onFullSupported "nixos.tests.networking.networkd.sit")
129+ (onFullSupported "nixos.tests.networking.networkd.static")
130+ (onFullSupported "nixos.tests.networking.networkd.virtual")
131+ (onFullSupported "nixos.tests.networking.networkd.vlan")
114132 (onFullSupported "nixos.tests.systemd-networkd-ipv6-prefix-delegation")
115133 (onFullSupported "nixos.tests.nfs3.simple")
116134 (onFullSupported "nixos.tests.nfs4.simple")
nixos/tests/all-tests.nix+1
@@ -49,6 +49,7 @@ in
4949 ceph-multi-node = handleTestOn ["x86_64-linux"] ./ceph-multi-node.nix {};
5050 certmgr = handleTest ./certmgr.nix {};
5151 cfssl = handleTestOn ["x86_64-linux"] ./cfssl.nix {};
52+ charliecloud = handleTest ./charliecloud.nix {};
5253 chromium = (handleTestOn ["x86_64-linux"] ./chromium.nix {}).stable or {};
5354 cjdns = handleTest ./cjdns.nix {};
5455 clickhouse = handleTest ./clickhouse.nix {};
nixos/tests/charliecloud.nixnew file+43
@@ -0,0 +1,43 @@
1+# This test checks charliecloud image construction and run
2+
3+import ./make-test-python.nix ({ pkgs, ...} : let
4+
5+ dockerfile = pkgs.writeText "Dockerfile" ''
6+ FROM nix
7+ RUN mkdir /home /tmp
8+ RUN touch /etc/passwd /etc/group
9+ CMD ["true"]
10+ '';
11+
12+in {
13+ name = "charliecloud";
14+ meta = with pkgs.stdenv.lib.maintainers; {
15+ maintainers = [ bzizou ];
16+ };
17+
18+ nodes = {
19+ host = { ... }: {
20+ environment.systemPackages = [ pkgs.charliecloud ];
21+ virtualisation.docker.enable = true;
22+ users.users.alice = {
23+ isNormalUser = true;
24+ extraGroups = [ "docker" ];
25+ };
26+ };
27+ };
28+
29+ testScript = ''
30+ host.start()
31+ host.wait_for_unit("docker.service")
32+ host.succeed(
33+ 'su - alice -c "docker load --input=${pkgs.dockerTools.examples.nix}"'
34+ )
35+ host.succeed(
36+ "cp ${dockerfile} /home/alice/Dockerfile"
37+ )
38+ host.succeed('su - alice -c "ch-build -t hello ."')
39+ host.succeed('su - alice -c "ch-builder2tar hello /var/tmp"')
40+ host.succeed('su - alice -c "ch-tar2dir /var/tmp/hello.tar.gz /var/tmp"')
41+ host.succeed('su - alice -c "ch-run /var/tmp/hello -- echo Running_From_Container_OK"')
42+ '';
43+})
nixos/tests/common/acme/server/mkcerts.nix+2−1
@@ -59,7 +59,8 @@ pkgs.runCommand "acme-snakeoil-ca" {
5959 openssl genrsa -out snakeoil.key 4096
6060 openssl req -new -key snakeoil.key -out snakeoil.csr
6161 openssl x509 -req -in snakeoil.csr -sha256 -set_serial 666 \
62− -CA ca.pem -CAkey ca.key -out snakeoil.pem -days 36500
62+ -CA ca.pem -CAkey ca.key -out snakeoil.pem -days 36500 \
63+ -extfile "$OPENSSL_CONF" -extensions req_ext
6364 addpem snakeoil.key ${lib.escapeShellArg fqdn} key
6465 addpem snakeoil.pem ${lib.escapeShellArg fqdn} cert
6566 '') domains}
nixos/tests/common/acme/server/snakeoil-certs.nix+153−152
@@ -2,170 +2,171 @@
22{
33 ca.key = builtins.toFile "ca.key" ''
44 -----BEGIN PRIVATE KEY-----
5− MIIJQwIBADANBgkqhkiG9w0BAQEFAASCCS0wggkpAgEAAoICAQDCnVZGEn68ezXl
6− DWE5gjsCPqutR4nxw/wvIbAxB2Vk2WeQ6HGvt2Jdrz5qer2IXd76YtpQeqd+ffet
7− aLtMeFTr+Xy9yqEpx2AfvmEEcLnuiWbsUGZzsHwW7/4kPgAFBy9TwJn/k892lR6u
8− QYa0QS39CX85kLMZ/LZXUyClIBa+IxT1OovmGqMOr4nGASRQP6d/nnyn41Knat/d
9− tpyaa5zgfYwA6YW6UxcywvBSpMOXM0/82BFZGyALt3nQ+ffmrtKcvMjsNLBFaslV
10− +zYO1PMbLbTCW8SmJTjhzuapXtBHruvoe24133XWlvcP1ylaTx0alwiQWJr1XEOU
11− WLEFTgOTeRyiVDxDunpz+7oGcwzcdOG8nCgd6w0aYaECz1zvS3FYTQz+MiqmEkx6
12− s4bj1U90I0kwUJbeWjjrGO7Y9Qq4i19GafDg7cAMn9eHCiNbNrPj6t/gfaVbCrbk
13− m3ZVjkvLTQ2mb2lv7+tVii45227iNPuNS6lx2FVlr/DXiRrOVfghPvoOxUfXzogJ
14− hZLV4Zki+ycbGQa5w8YMDYCv4c08dKA7AatVhNS60c1zgQNjuWF3BvocSySyGUon
15− VT6h1DYlJ9YAqgqNpedgNR9kpp034SMhB7dj9leB6LRMA+c1fG/T+1lDbkA+vope
16− pt4+30oDcCTYfEifl1HwqNw/bXDm1wIDAQABAoICABPbd/UYaAQVUk93yQbUKe81
17− s9CvbvzTMYUhm9e02Hyszitz/D2gqZHDksvMkFA8u8aylXIGwdZfRglUmV/ZG1kk
18− kLzQ0xbvN/ilNUL9uYsETBMqtPly9YZloHnUNa5NqF+UVGJGk7GWz5WaLANybx3V
19− fTzDbfLl3TkVy0vt9UQbUkUfXyzwZNjXwmgIr8rcY9vasP90a3eXqRX3Tw1Wk6A4
20− TzO8oB994O0WBO150Fc6Lhwvc72yzddENlLDXq8UAXtqq9mmGqJKnhZ+1mo3AkMw
21− q7P1JyCIxcAMm26GtRvLVljXV0x5640kxDrCin6jeeW/qWkJEW6dpmuZjR5scmLI
22− /9n8H+fGzdZH8bOPPotMy12doj3vJqvew3p0eIkmVctYMJKD0j/CWjvKJNE3Yx4O
23− Ls47X/dEypX6anR1HQUXcpd6JfRWdIJANo2Duaz+HYbyA88bHcJL9shFYcjLs3sX
24− R/TvnnKHvw/ud7XBgvLGwGAf/cDEuLI2tv+V7tkMGrMUv+gUJNZaJaCpdt+1iUwO
25− QFq8APyBNn6FFw54TwXWfSjfSNh3geIMLHuErYVu9MIXvB7Yhh+ZvLcfLbmckhAX
26− wb39RRHnCWvnw5Bm9hnsDhqfDsIoP+2wvUkViyHOmrKi8nSJhSk19C8AuQtSVcJg
27− 5op+epEmjt70GHt52nuBAoIBAQD2a4Ftp4QxWE2d6oAFI6WPrX7nAwI5/ezCbO/h
28− yoYAn6ucTVnn5/5ITJ8V4WTWZ4lkoZP3YSJiCyBhs8fN63J+RaJ/bFRblHDns1HA
29− 2nlMVdNLg6uOfjgUJ8Y6xVM0J2dcFtwIFyK5pfZ7loxMZfvuovg74vDOi2vnO3dO
30− 16DP3zUx6B/yIt57CYn8NWTq+MO2bzKUnczUQRx0yEzPOfOmVbcqGP8f7WEdDWXm
31− 7scjjN53OPyKzLOVEhOMsUhIMBMO25I9ZpcVkyj3/nj+fFLf/XjOTM00M/S/KnOj
32− RwaWffx6mSYS66qNc5JSsojhIiYyiGVEWIznBpNWDU35y/uXAoIBAQDKLj0dyig2
33− kj1r3HvdgK4sRULqBQFMqE9ylxDmpJxAj6/A8hJ0RCBR57vnIIZMzK4+6K0l3VBJ
34− ukzXJHJLPkZ0Uuo2zLuRLkyjBECH6KYznyTkUVRn50Oq6IoP6WTCfd3Eg+7AKYY1
35− VFo2iR8sxeSQQ+AylFy6QcQ1xPIW30Jj1/LFjrRdRggapPEekpJec0pEqhasT8rR
36− UFhRL2NdZnL5b7ZlsJc7gZKEJgNfxgzaCzloqLcjCgGpOhLKx0fFsNOqHcbIGMwG
37− 6wQCOyNghQJ6AZtRD5TYCJow92FchWjoTIaMJ8RjMKQmxpiwM6wQG4J78Hd3mbhf
38− q0hiQhPHaNbBAoIBAFeIeMFq8BpXM7sUwcURlI4lIx8Mgo33FVM7PzsFpfQyw9MR
39− 5w3p6vnjvd8X4aoHvVZxzw3hA0WwjiAmrKMJL/KK6d45rP2bDUBBAplvAgeLtTLt
40− 4tMLIwCF4HSgA55TIPQlaqO1FDC+M4BTSiMZVxS970/WnZPBEuNgzFDFZ+pvb4X6
41− 3t40ZLNwAAQHM4IEPAFiHqWMKGZ9eo5BWIeEHnjHmfjqSDYfLJAVYk1WJIcMUzom
42− lA76CBC8CxW/I94AtcRhWuFUv/Z5/+OYEYLUxtuqPm+J+JrCmf4OJmWppT1wI2+p
43− V00BSeRVWXTm1piieM8ahF5y1hp6y3uV3k0NmKECggEBAMC42Ms3s6NpPSE+99eJ
44− 3P0YPJOkl7uByNGbTKH+kW89SDRsy8iGVCSe9892gm5cwU/4LWyljO3qp2qBNG2i
45− /DfP/bCk8bqPXsAZwoWK8DrO3bTCDepJWYhlx40pVkHLBwVXGdOVAXh+YswPY2cj
46− cB9QhDrSj52AKU9z36yLvtY7uBA3Wph6tCjpx2n0H4/m6AmR9LDmEpf5tWYV/OrA
47− SKKaqUw/y7kOZyKOtbKqr/98qYmpIYFF/ZVZZSZkVXcNeoZzgdOlR37ksVqLEsrj
48− nxu7wli/uItBj/FTLjyqcvjUUYDyO1KtwBuyPUPgzYhBIN2Rt9+K6WRQelwnToFL
49− 30ECggEBALzozykZj2sr3z8tQQRZuXLGotUFGsQCB8ikeqoeB8FbNNkC+qgflQGv
50− zLRB2KWOvnboc94wVgBJH43xG0HBibZnBhUO8/HBI/WlmyEj9KQ/ZskUK4GVZkB6
51− r/81ASLwH+P/rqrLEjcp1SIPPevjzCWD9VYR5m/qPHLNxStwGSrPjtPzgaFxhq84
52− Jl+YVmNqVlrOKYYfIPh8exPLiTti3wfM61pVYFv56PI2gd5ysMWYnuN+vK0sbmZh
53− cIWwykcKlODIngI7IzYqt8NuIJI0jrYyHgtUw4jaJzdF4mEOplGONxdz15jAGHtg
54− JUsBXFNz132nP4iIr3UKrPedQZijSi4=
5+ MIIJQgIBADANBgkqhkiG9w0BAQEFAASCCSwwggkoAgEAAoICAQDd1G7OFpXIoHnr
6+ rxdw+hiJVDY6nQDDKFt9FBKwlv7x2hCvX7bnyvHaL7H61c+80McGPISrQn3+MjuR
7+ Zuqwax49DddNXbGt4WqGlx4LAeI37OgNUUz9foNr2rDDV744vwp14/PD1f3nqpWf
8+ Ogzzsh8rxac0mZ5Se9HxOIpI7NRNuHJjj7HWZ4YxeOvi289rmpu0JPcp25njw7h6
9+ FNfHu8GGp34Uj6wAxubdRyfViV8z9FMfbglLuA9i1OiSy3NQpq8VwBG+u/0iC7PQ
10+ sQjxSragQu25sfATYIrFJQ4ZCvh0nxqKMeyPPBi6dAcMpa2AZAqtqv+CwWdo36Bt
11+ S5XiC7rApgYn+yteKQHSbnCiG2W/boSbfg9lRk3w41dESENCADVajLb3Eovvp0tB
12+ O/BALudvWjzAPbpXleVNr6ngWtGlsZTC7LXDgBqdW2KlzpZGcz+PW3ATlwip/ZFR
13+ t7A15u5dVkWPVoPuQ0w1Tw+g9dxWFTNk3h+2d7K87IxQbcvqxeIDSEVFMrxo0e4C
14+ G2udMcelZwARl6iNTAETa2zJW0XtAdGVM+HY1S/kU6U9J3nubDttAkAMABjPwyjL
15+ G7hfyWqUHf9yPs49GsftAVvIy8XIeu0shD1BG11/VzvwpUCiRc+btuWi2erZ4ZfP
16+ oQ5YoS9gt4S+Ipz7TPGBl+AUk9HO2QIDAQABAoICAGW+aLAXxc2GZUVHQp4r55Md
17+ T94kYtQgL4435bafGwH8vchiQzcfazxiweRFqwl0TMS8fzE5xyYPDilLpfsStoTU
18+ U1sFzVfuWviuWTY9P+/ctjZdgs2F+GtAm/CMzw+h9/9IdWbuQI3APO4SJxyjJw7h
19+ kiZbCzXT2uAjybFXBq07GyQ1JSEszGzmhHLB1OoKuL2wcrj9IyFHhNZhtvLCWCoV
20+ qotttjuI/xyg5VFYt5TRzEpPIu5a1pvDAYVK0XI9cXKtbLYp7RlveqMOgAaD+S2a
21+ ZQTV60JH9n4j18p+sKR00SxvZ4vuyXzDePRBDUolGIy9MIJdiLueTiuzDmTmclnM
22+ 8Yy7oliawW2Bn+1gaWpqmgzEUw9bXRSqIp2zGZ7HaQ+5c/MhS002+/i8WQyssfeg
23+ 9EfI+Vl0D2avTxCECmsfjUxtkhzMYPVNbRPjt0QBEM+s8lDoNsP2zhMO441+TKpe
24+ /5KZHIW+Y0US6GMIUs1o1byKfNz8Nj5HjEKO9CMyK6SBMJnCMroPD4H6opqk3lw9
25+ 4mk04BdN556EzyJDT0a5/VpXG2DUYwFaNwE1ZPMu3Yx6IBoM1xx8mR80vHQCddmF
26+ NP+BzkpUiHf0Txyy0YQWECZ/anTt0Bo0XqY5tirIM2dkG0ngNl9tGlw6gVAY1ky8
27+ +cr7qKmhhwMWojaX/L+9AoIBAQD/BZAeF3l9I5RBh6ktWA+opzVyd6ejdLpc2Q1z
28+ fmSmtUKRsEe51sWaIf6Sez408UaCMT2IQuppPgMnV8xfMM1/og75Cs8aPyAohwKo
29+ IbOenXhLfFZiYB4y/Pac3F+FzNKsTT6n+fsE+82UHafY5ZI2FlPb2L0lfyx09zXv
30+ fBYhcXgwSx5ymJLJSl8zFaEGn9qi3UB5ss44SaNM0n8SFGUQUk3PR7SFWSWgNxtl
31+ CP7LWTsjXYoC/qBMe7b8JieK5aFk1EkkG1EkJvdiMnulMcMJzl+kj6LqVPmVDoZS
32+ mMGvgKGJPpFgrbJ5wlA7uOhucGmMpFWP9RCav66DY4GHrLJPAoIBAQDerkZQ03AN
33+ i2iJVjtL97TvDjrE8vtNFS/Auh8JyDIW4GGK3Y/ZoMedQpuu3e6NYM9aMjh+QJoA
34+ kqhaiZ/tMXjEXJByglpc3a43g2ceWtJg5yLgexGgRtegbA57PRCo35Vhc6WycD1l
35+ 6FZNxpTkd2BXX/69KWZ6PpSiLYPvdzxP5ZkYqoWRQIa4ee4orHfz/lUXJm1XwmyG
36+ mx3hN9Z9m8Q/PGMGfwrorcp4DK53lmmhTZyPh+X5T5/KkVmrw/v5HEEB3JsknStR
37+ 3DAqp2XZcRHsGQef9R7H+PINJm9nebjCraataaE4gr76znXKT23P80Ce5Lw6OQUW
38+ XHhoL16gS+pXAoIBADTuz6ofTz01PFmZsfjSdXWZN1PKGEaqPOB2wP7+9h9QMkAR
39+ KeId/Sfv9GotII1Woz70v4Pf983ebEMnSyla9NyQI7F3l+MnxSIEW/3P+PtsTgLF
40+ DR0gPERzEzEd4Mnh6LyQz/eHwJ2ZMmOTADrZ8848Ni3EwAXfbrfcdBqAVAufBMZp
41+ YSmCF72mLTpqO+EnHvd9GxvnjDxMtJOGgY+cIhoQK0xh4stm5JNrvMjs5A4LOGYv
42+ zSyv80/Mwf92X/DJlwVZttDCxsXNPL3qIpX4TTZk2p9KnRMsjh1tRV4xjMpD1cOp
43+ 8/zwMMJrHcI3sC70MERb+9KEmGy2ap+k8MbbhqsCggEAUAqqocDupR+4Kq2BUPQv
44+ 6EHgJA0HAZUc/hSotXZtcsWiqiyr2Vkuhzt7BGcnqU/kGJK2tcL42D3fH/QaNUM0
45+ Grj+/voWCw1v4uprtYCF4GkUo0X5dvgf570Pk4LGqzz6z/Wm2LX5i9jwtLItsNWs
46+ HpwVz97CxCwcdxMPOpNMbZek6TXaHvTnuAWz8pDT6TNBWLnqUcJECjpVii/s/Gdy
47+ KhzFp38g57QYdABy8e9x9pYUMY9yvaO+VyzZ46DlwIxEXavzZDzOZnVUJvDW7krz
48+ Wz8/+2I7dzvnnYx0POiG3gtXPzwZxFtS1IpD0r2sRjQ0xSiI9BCs4HXKngBw7gN7
49+ rwKCAQEAloJOFw4bafVXZVXuQVnLDm0/MNTfqxUzFE6V2WkMVkJqcpKt+ndApM8P
50+ MJvojHWw1fmxDzIAwqZ9rXgnwWKydjSZBDYNjhGFUACVywHe5AjC4PPMUdltGptU
51+ lY0BjC7qtwkVugr65goQkEzU61y9JgTqKpYsr3D+qXcoiDvWRuqk5Q0WfYJrUlE0
52+ APWaqbxmkqUVDRrXXrifiluupk+BCV7cFSnnknSYbd9FZd9DuKaoNBlkp2J9LZE+
53+ Ux74Cfro8SHINHmvqL+YLFUPVDWNeuXh5Kl6AaJ7yclCLXLxAIix3/rIf6mJeIGc
54+ s9o9Sr49cibZ3CbMjCSNE3AOeVE1/Q==
5555 -----END PRIVATE KEY-----
5656 '';
5757 ca.cert = builtins.toFile "ca.cert" ''
5858 -----BEGIN CERTIFICATE-----
59− MIIFDzCCAvegAwIBAgIUTRDYSWJvmlhwIR3pzVrIQfnboLEwDQYJKoZIhvcNAQEL
60− BQAwFjEUMBIGA1UEAwwLU25ha2VvaWwgQ0EwIBcNMjAwMzIyMjI1NjE3WhgPMjEy
61− MDAyMjcyMjU2MTdaMBYxFDASBgNVBAMMC1NuYWtlb2lsIENBMIICIjANBgkqhkiG
62− 9w0BAQEFAAOCAg8AMIICCgKCAgEAwp1WRhJ+vHs15Q1hOYI7Aj6rrUeJ8cP8LyGw
63− MQdlZNlnkOhxr7diXa8+anq9iF3e+mLaUHqnfn33rWi7THhU6/l8vcqhKcdgH75h
64− BHC57olm7FBmc7B8Fu/+JD4ABQcvU8CZ/5PPdpUerkGGtEEt/Ql/OZCzGfy2V1Mg
65− pSAWviMU9TqL5hqjDq+JxgEkUD+nf558p+NSp2rf3bacmmuc4H2MAOmFulMXMsLw
66− UqTDlzNP/NgRWRsgC7d50Pn35q7SnLzI7DSwRWrJVfs2DtTzGy20wlvEpiU44c7m
67− qV7QR67r6HtuNd911pb3D9cpWk8dGpcIkFia9VxDlFixBU4Dk3kcolQ8Q7p6c/u6
68− BnMM3HThvJwoHesNGmGhAs9c70txWE0M/jIqphJMerOG49VPdCNJMFCW3lo46xju
69− 2PUKuItfRmnw4O3ADJ/XhwojWzaz4+rf4H2lWwq25Jt2VY5Ly00Npm9pb+/rVYou
70− Odtu4jT7jUupcdhVZa/w14kazlX4IT76DsVH186ICYWS1eGZIvsnGxkGucPGDA2A
71− r+HNPHSgOwGrVYTUutHNc4EDY7lhdwb6HEskshlKJ1U+odQ2JSfWAKoKjaXnYDUf
72− ZKadN+EjIQe3Y/ZXgei0TAPnNXxv0/tZQ25APr6KXqbePt9KA3Ak2HxIn5dR8Kjc
73− P21w5tcCAwEAAaNTMFEwHQYDVR0OBBYEFCIoeYSYjtMiPrmxfHmcrsZkyTpvMB8G
74− A1UdIwQYMBaAFCIoeYSYjtMiPrmxfHmcrsZkyTpvMA8GA1UdEwEB/wQFMAMBAf8w
75− DQYJKoZIhvcNAQELBQADggIBAHPdwOgAxyhIhbqFObNftW8K3sptorB/Fj6jwYCm
76− mHleFueqQnjTHMWsflOjREvQp1M307FWooGj+KQkjwvAyDc/Hmy7WgJxBg9p3vc+
77− /Xf/e7ZfBl8rv7vH8VXW/BC1vVsILdFncrgTrP8/4psV50/cl1F4+nPBiekvvxwZ
78− k+R7SgeSvcWT7YlOG8tm1M3al4F4mWzSRkYjkrXmwRCKAiya9xcGSt0Bob+LoM/O
79− mpDGV/PMC1WAoDc1mMuXN2hSc0n68xMcuFs+dj/nQYn8uL5pzOxpX9560ynKyLDv
80− yOzQlM2VuZ7H2hSIeYOFgrtHJJwhDtzjmUNDQpQdp9Fx+LONQTS1VLCTXND2i/3F
81− 10X6PkdnLEn09RiPt5qy20pQkICxoEydmlwpFs32musYfJPdBPkZqZWrwINBv2Wb
82− HfOmEB4xUvXufZ5Ju5icgggBkyNA3PCLo0GZFRrMtvA7i9IXOcXNR+njhKa9246V
83− QQfeWiz05RmIvgShJYVsnZWtael8ni366d+UXypBYncohimyNlAD1n+Bh3z0PvBB
84− +FK4JgOSeouM4SuBHdwmlZ/H0mvfUG81Y8Jbrw0yuRHtuCtX5HpN5GKpZPHDE7aQ
85− fEShVB/GElC3n3DvgK9OJBeVVhYQgUEfJi4rsSxt3cdEI0NrdckUoZbApWVJ3CBc
86− F8Y7
59+ MIIFDzCCAvegAwIBAgIUX0P6NfX4gRUpFz+TNV/f26GHokgwDQYJKoZIhvcNAQEL
60+ BQAwFjEUMBIGA1UEAwwLU25ha2VvaWwgQ0EwIBcNMjAwODI0MDc0MjEyWhgPMjEy
61+ MDA3MzEwNzQyMTJaMBYxFDASBgNVBAMMC1NuYWtlb2lsIENBMIICIjANBgkqhkiG
62+ 9w0BAQEFAAOCAg8AMIICCgKCAgEA3dRuzhaVyKB5668XcPoYiVQ2Op0AwyhbfRQS
63+ sJb+8doQr1+258rx2i+x+tXPvNDHBjyEq0J9/jI7kWbqsGsePQ3XTV2xreFqhpce
64+ CwHiN+zoDVFM/X6Da9qww1e+OL8KdePzw9X956qVnzoM87IfK8WnNJmeUnvR8TiK
65+ SOzUTbhyY4+x1meGMXjr4tvPa5qbtCT3KduZ48O4ehTXx7vBhqd+FI+sAMbm3Ucn
66+ 1YlfM/RTH24JS7gPYtTokstzUKavFcARvrv9Iguz0LEI8Uq2oELtubHwE2CKxSUO
67+ GQr4dJ8aijHsjzwYunQHDKWtgGQKrar/gsFnaN+gbUuV4gu6wKYGJ/srXikB0m5w
68+ ohtlv26Em34PZUZN8ONXREhDQgA1Woy29xKL76dLQTvwQC7nb1o8wD26V5XlTa+p
69+ 4FrRpbGUwuy1w4AanVtipc6WRnM/j1twE5cIqf2RUbewNebuXVZFj1aD7kNMNU8P
70+ oPXcVhUzZN4ftneyvOyMUG3L6sXiA0hFRTK8aNHuAhtrnTHHpWcAEZeojUwBE2ts
71+ yVtF7QHRlTPh2NUv5FOlPSd57mw7bQJADAAYz8Moyxu4X8lqlB3/cj7OPRrH7QFb
72+ yMvFyHrtLIQ9QRtdf1c78KVAokXPm7blotnq2eGXz6EOWKEvYLeEviKc+0zxgZfg
73+ FJPRztkCAwEAAaNTMFEwHQYDVR0OBBYEFNhBZxryvykCjfPO85xB3wof2enAMB8G
74+ A1UdIwQYMBaAFNhBZxryvykCjfPO85xB3wof2enAMA8GA1UdEwEB/wQFMAMBAf8w
75+ DQYJKoZIhvcNAQELBQADggIBAEZwlsQ+3yd1MVxLRy9RjoA8hI7iWBNmvPUyNjlb
76+ l/L9N+dZgdx9G5h/KPRUyzvUc/uk/ZxTWVPIOp13WI65qwsBKrwvYKiXiwzjt+9V
77+ CKDRc1sOghTSXk4FD3L5UcKvTQ2lRcFsqxbkopEwQWhoCuhe4vFyt3Nx8ZGLCBUD
78+ 3I5zMHtO8FtpZWKJPw46Yc1kasv0nlfly/vUbnErYfgjWX1hgWUcRgYdKwO4sOZ7
79+ KbNma0WUsX5mWhXo4Kk7D15wATHO+j9s+j8m86duBL3A4HzpTo1DhHvBi0dkg0CO
80+ XuSdByIzVLIPh3yhCHN1loRCP2rbzKM8IQeU/X5Q4UJeC/x9ew8Kk+RKXoHc8Y2C
81+ JQO1DxuidyDJRhbb98wZo2YfIsdWQGjYZBe1XQRwBD28JnB+Rb9shml6lORWQn9y
82+ P/STo9uWm5zvOCfqwbnCoetljDweItINx622G9SafBwPZc3o79oL7QSl8DgCtN6g
83+ p0wGIlIBx+25w/96PqZcrYb8B7/uBHJviiKjBXDoIJWNiNRhW5HaFjeJdSKq7KIL
84+ I/PO9KuHafif36ksG69X02Rio2/cTjgjEW1hGHcDRyyJWWaj7bd2eWuouh6FF22b
85+ PA6FGY4vewDPnbLKLaix2ZIKxtedUDOH/qru3Mv58IFXmQ4iyM8oC8aOxYSQLZDn
86+ 1yJD
8787 -----END CERTIFICATE-----
8888 '';
8989 "acme.test".key = builtins.toFile "acme.test.key" ''
9090 -----BEGIN RSA PRIVATE KEY-----
91− MIIJKAIBAAKCAgEAlgQTZjKfs3aHw0J993k7jFAs+hVRPf//zHMAiUkPKUYPTSl1
92− TxS/bPbhWzSoom00j4SLhGGGhbd+lnvTg0uvKbxskgATfw5clbm1ZN+gx4DuxwjL
93− V3xIxpeSY+PKzs5z8w/k+AJh+zOPyXwH3ut3C+ogp1S/5IhmzV3a/yU/6k0zpGxj
94− N6ZPRTXFrz93I1pPeCkJz90l7tj+2uFc9xtM20NQX52f0Y2oShcG8fKdNZVzuHHk
95− ZXkrZIhou55/nRy2jKgFeD3GQQfa9rwPWrVybQ6tKMMkoazB/Unky9xcTI2LJarf
96− xgHDO9v9yFBvmR4UM8B3kM82NHoENtHaZ2mmiMGZzTEQlf8xwYyHFrqBFIVRWEUr
97− 7rr/O5Qr9gIN0T4u367HCexVYAKzbO2P9h75czzjMMoGkbXze9SMQ/ikrxEmwAHg
98− r1Xxh6iQYmgPNk8AR3d9+o2I7WJZMUYZARLnuhVr9BNXv510iqZTqX8lcyL5fEj3
99− ST4Ab+H7rfevZt6NU26iJLBYAjrA2mSvH+wvkboxrgSS8xYPkOW8NLNEbbodzofI
100− pB+SaK53OIk0bj9c1YAgrSNER/TDTgDXrWUNrlfVZ/M7+AEdeU06wi7sVhVif6OB
101− D3OpgKSNjeE6TuJH80Pi5MWugSFBr792Xb6uhVoPiVOFN+qiGB6UkwBgSKkCAwEA
102− AQKCAgAmN7OZfZwh5DiCDhZ5TXFWNba/n16rJOTN+R5R20L5iNetGLrCAs8hu2N+
103− ENRFTPzu8x14BEB5IF4niDRCZq2hPFeMemh9HfOIUV9c63vSV459NkhXaVpA/axV
104− tlqchQwVCB+U70Z28JPZCLgYmnQhnOvktTqNxhIqj5aTGbJGxpQ5d0Nvkfbv8tsB
105− 4nE/mGpWel39jqFzT+Tdbjx414Ok+GkpcsacZDJTbbpfOSfD1uc8PgepskzTt8y2
106− v5JTPFVlUAjUsSgouQ+XfCGNQlx8XBjRIaXbal+hX4niRald91FTr0yC7UAHp+vn
107− dFZ586fB526OfbuZctxP+vZhEhFSseQKxHQ0tB8me81xH44daVNr9PPUM69FDT3j
108− ygJaUJjNEG3vVzePCDzhmxTmz2/rAClp77WTWziBWDoA6YWDDzhgNPrXWzLIbZIx
109− ue9ZbGEOh/u5ZzrEXxKCz9FjDe9wQu3TeYUe0M+ejzwWgn7zdWDvjjmtLUUuun2Y
110− wW7WANpu32qvB/V+qssw4O63tbRiwneRCnb8AF2ixgyWr6xyZwch4kacv1KMiixf
111− gO/5GTj7ba5GcdGoktJb29cUEgz13yPd106RsHK4vcggFxfMbOVauNRIo6ddLwyS
112− 8UMxLf2i2cToOLkHZrIb8FgimmzRoBd3yYzwVJBydiVcsrHQAQKCAQEAxlzFYCiQ
113− hjEtblGnrkOC7Hx6HvqMelViOkGN8Y9VczG4GhwntmSE2nbpaAKhFBGdLfuSI3tJ
114− Lf24f0IGgAhzPmpo2TjbxPO3YSKFTH71fznVBhtQ1iSxwZ1InXktnuhot6VSDx6A
115− sbHSy1hMFy3nj+Zj5+fQ89tclzBzG9bCShaauO39KrPMwKi6CYoYdGhXBC3+OpHY
116− zBNvmDTxG2kW8L42rlf14EH4pAlgKs4eeZbpcbZ6fXURP2hToHJ8swyKw/1p12WA
117− cc19BKFJXL8nNP4uCf/fI0mVYpytz5KwUzG+z+umDqk+RRCH4mNB28xvEEuEyp/e
118− /C5Is+WrlDAA6QKCAQEAwZsK4AJ/w4Xf4Q/SsnZJO9bfP1ejJjzKElt8rG28JXeb
119− +FjykZZ6vw2gt2Boest2n9N4fBwaRkaHVtVS4iAmaDXozTlcvCLs2rVjPSguuQtW
120− 80CKg6+dux+6gFN8IGzDCiX3pWUnhhiXvCcRYEcvgpH6GA5vuCNrXrjH0JFC0kef
121− aaDMGMTbzhc2IIRztmWU4v8YJSSy5KOkIQLWO+7u9aGx9IqT5/z3gx3XrItyl0Bk
122− aQmZEh7JOSyhmGhhf5LdeTLu2YgRw3/tzS+lPMX3+UPw99k9MdTOFn2pww5AdRmg
123− aBIzV+/LBYG0pPRl0D8/6yzGVBPuUDQpmK9Z3gsxwQKCAQEAnNkMZN2Ocd1+6+V7
124− LmtJog9HTSmWXMEZG7FsOJ661Yxx44txx2IyPsCaDNlPXxwSaiKrSo0Yr1oZQd8G
125− XsTPw4HGiETSWijQTulJ99PH8SLck6iTwdBgEhV5LrN75FQnQVdizHu1DUzrvkiC
126− Wi29FWb6howiCEDjNNVln5SwKn83NpVQgyyK8ag4+oQMlDdQ3wgzJ0Ld53hS3Eq4
127− f5EYR6JQgIki7YGcxrB3L0GujTxMONMuhfdEfRvUTGFawwVe0FyYDW7AIrx2Z2vV
128− I5YuvVNjOhrt6OwtSD1VnnWCITaLh8LwmlUu3NOWbudHUzKSe5MLXGEPo95BNKad
129− hl5yyQKCAQBNo0gMJtRnawMpdLfwewDJL1SdSR6S0ePS0r8/Qk4l1D5GrByyB183
130− yFY/0zhyra7nTt1NH9PlhJj3WFqBdZURSzUNP0iR5YuH9R9Twg5ihEqdB6/EOSOO
131− i521okTvl83q/ui9ecAMxUXr3NrZ+hHyUWmyRe/FLub6uCzg1a+vNauWpzXRZPgk
132− QCijh5oDdd7r3JIpKvtWNs01s7aHmDxZYjtDrmK7sDTtboUzm0QbpWXevUuV+aSF
133− +gDfZlRa3WFVHfisYSWGeYG6O7YOlfDoE7fJHGOu3QC8Ai6Wmtt8Wgd6VHokdHO8
134− xJPVZnCBvyt5up3Zz5hMr25S3VazdVfBAoIBAHVteqTGqWpKFxekGwR0RqE30wmN
135− iIEwFhgOZ8sQ+6ViZJZUR4Nn2fchn2jVwF8V8J1GrJbTknqzAwdXtO3FbgfmmyF2
136− 9VbS/GgomXhA9vJkM4KK3Iwo/y/nE9hRhtzuVE0QPudz2fyfaDgnWjcNM59064tH
137− 88361LVJm3ixyWSBD41UZ7NgWWJX1y2f073vErsfcPpavF5lhn1oSkQnOlgMJsnl
138− 24qeuzAgTWu/2rFpIA2EK30Bgvsl3pjJxHwyNDAgklV7C783LIoAHi7VO7tzZ6iF
139− dmD5XLfcUZc3eaB7XehNQKBXDGLJeI5AFmjsHka5GUoitkU2PFrg/3+nJmg=
91+ MIIJKgIBAAKCAgEA3dJl4ByHHRcqbZzblszHIS5eEW3TcXTvllqC1nedGLGU9dnA
92+ YbdpDUYhvWz/y9AfRZ1d8jYz01jZtt5xWYG0QoQUdkCc9QPPh0Axrl38cGliB6IZ
93+ IY0qftW9zrLSgCOUnXL/45JqSpD57DHMSSiJl3hoOo4keBaMRN/UK6F3DxD/nZEs
94+ h+yBBh2js3qxleExqkX8InmjK9pG8j7qa4Be5Lh4iILBHbGAMaxM7ViNAg4KgWyg
95+ d5+4qB86JFtE/cJ+r3D62ARjVaxU6ePOL0AwS/vx5ls6DFQC7+1CpGCNemgLPzcc
96+ 70s0V0SAnF73xHYqRWjJFtumyvyTkiQWLg0zDQOugWd3B9ADuaIEx2nviPyphAtj
97+ M3ZKrL2zN1aIfqzbxJ/L8TQFa2WPsPU2+iza/m9kMfLXZ4XPF/SJxQ+5yVH+rxx5
98+ OWrXZ13nCMyeVoaXQofmG7oZvOQbtuT9r5DQZd9WN0P3G3sy0/dNnlNVn8uCBvXJ
99+ TQhRKsy1FESZdgcFNtpJEG7BRG9Gc6i0V39aSRzShZyKJSBQhlc0FMTlX445EYsh
100+ PKjEC/+Suq9wy/LuLjIkkqBbVg4617IlibLz0fDY/yrZqkfSqhCVsWnra21Ty3Mp
101+ vD+wnskTzuGrvCVTe3KcWp+wkeH0xvhr8FXX6nn492YCfvZSITO3FF+qWt8CAwEA
102+ AQKCAgEAk2xV0NCk66yNwjPRrTOD1IWgdyzqrijtYpvdAPSWL+c1/P8vYMIoy22k
103+ 1uQuTSKQ5g9kdKmZYAlZCLRl2Pre9qYZg04GAsD5mAYN/rjwITWotTICSc4sRAeC
104+ EnG+fPMovkvDzVdt1QjtURD3mFeculKH0wLNMhKqPswTkrvJCPZfLDVjxyJjzdC9
105+ D3enttjnzSaeH7t/upFjPXSbD79NUe1YDkH4XuetL1Y3+jYz4P279bBgJaC9dN7s
106+ IWWXQJ+W2rrXu+GOs03JUXjZe4XJk3ZqmpJezfq3yQWCmQSigovLjcPvMwpkSut4
107+ HnTvbl6qUV8G5m4tOBMNcL8TDqAvIGY8Q2NAT0iKJN187FbHpjSwQL/Ckgqz/taJ
108+ Q82LfIA1+IjwW372gY2Wge8tM/s3+2vOEn2k91sYfiKtrRFfrHBurehVQSpJb2gL
109+ YPoUhUGu4C1nx44sQw+DgugOBp1BTKA1ZOBIk6NyS/J9sU3jSgMr88n10TyepP6w
110+ OVk9kcNomnm/QIOyTDW4m76uoaxslg7kwOJ4j6wycddS8JtvEO4ZPk/fHZCbvlMv
111+ /dAKsC3gigO2zW6IYYb7mSXI07Ew/rFH1NfSILiGw8GofJHDq3plGHZo9ycB6JC+
112+ 9C8n9IWjn8ahwbulCoQQhdHwXvf61t+RzNFuFiyAT0PF2FtD/eECggEBAPYBNSEY
113+ DSQc/Wh+UlnwQsevxfzatohgQgQJRU1ZpbHQrl2uxk1ISEwrfqZwFmFotdjjzSYe
114+ e1WQ0uFYtdm1V/QeQK+8W0u7E7/fof4dR6XxrzJ2QmtWEmCnLOBUKCfPc7/4p4IU
115+ 7Q8PDwuwvXgaASZDaEsyTxL9bBrNMLFx9hIScQ9CaygpKvufilCHG79maoKArLwX
116+ s7G16qlT4YeEdiNuLGv0Ce0txJuFYp7cGClWQhruw+jIbr+Sn9pL9cn8GboCiUAq
117+ VgZKsofhEkKIEbP1uFypX2JnyRSE/h0qDDcH1sEXjR9zYYpQjVpk3Jiipgw4PXis
118+ 79uat5/QzUqVc1sCggEBAObVp686K9NpxYNoEliMijIdzFnK5J/TvoX9BBMz0dXc
119+ CgQW40tBcroU5nRl3oCjT1Agn8mxWLXH3czx6cPlSA8fnMTJmev8FaLnEcM15pGI
120+ 8/VCBbTegdezJ8vPRS/T9c4CViXo7d0qDMkjNyn22ojPPFYh8M1KVNhibDTEpXMQ
121+ vJxBJgvHePj+5pMOIKwAvQicqD07fNp6jVPmB/GnprBkjcCQZtshNJzWrW3jk7Fr
122+ xWpQJ8nam8wHdMvfKhpzvD6azahwmfKKaQmh/RwmH4xdtIKdh4j+u+Ax+Bxi0g7V
123+ GQfusIFB1MO48yS6E56WZMmsPy+jhTcIB4prIbfu4c0CggEBALgqqUKwRc4+Ybvj
124+ rfUk+GmT/s3QUwx/u4xYAGjq7y/SgWcjG9PphC559WPWz/p2sITB7ehWs5CYTjdj
125+ +SgWKdVY/KZThamJUTy4yAZ8lxH1gGpvvEOs+S8gmGkMt88t8ILMPWMWFW7LoEDp
126+ PL74ANpLZn29GROnY1IhQQ3mughHhBqfZ6d2QnaDtsGYlD5TBvPSLv7VY7Jr9VR0
127+ toeEtAjMRzc+SFwmgmTHk9BIB1KTAAQ3sbTIsJh8xW1gpo5jTEND+Mpvp10oeMVe
128+ yxPB2Db4gt/j8MOz3QaelbrxqplcJfsCjaT49RHeQiRlE/y070iApgx8s0idaFCd
129+ ucLXZbcCggEBANkcsdg9RYVWoeCj3UWOAll6736xN/IgDb4mqVOKVN3qVT1dbbGV
130+ wFvHVq66NdoWQH4kAUaKWN65OyQNkQqgt/MJj8EDwZNVCeCrp2hNZS0TfCn9TDK/
131+ aa7AojivHesLWNHIHtEPUdLIPzhbuAHvXcJ58M0upTfhpwXTJOVI5Dji0BPDrw47
132+ Msw3rBU6n35IP4Q/HHpjXl58EDuOS4B+aGjWWwF4kFWg2MR/oqWN/JdOv2LsO1A/
133+ HnR7ut4aa5ZvrunPXooERrf6eSsHQnLcZKX4aNTFZ/pxZbJMLYo9ZEdxJVbxqPAa
134+ RA1HAuJTZiquV+Pb755WFfEZy0Xk19URiS0CggEAPT1e+9sdNC15z79SxvJQ4pmT
135+ xiXat+1pq9pxp5HEOre2sSAd7CF5lu/1VQd6p0gtLZY+Aw4BXOyMtzYWgIap+u9j
136+ ThFl9qrTFppG5KlFKKpQ8dQQ8ofO1akS8cK8nQeSdvrqEC/kGT2rmVdeevhBlfGy
137+ BZi2ikhEQrz5jsLgIdT7sN2aLFYtmzLU9THTvlfm4ckQ7jOTxvVahb+WRe/iMCwP
138+ Exrb83JDo31jHvAoYqUFrZkmPA+DUWFlrqb21pCzmC/0iQSuDcayRRjZkY/s5iAh
139+ gtI6YyAsSL8hKvFVCC+VJf1QvFOpgUfsZjrIZuSc3puBWtN2dirHf7EfyxgEOg==
140140 -----END RSA PRIVATE KEY-----
141141 '';
142142 "acme.test".cert = builtins.toFile "acme.test.cert" ''
143143 -----BEGIN CERTIFICATE-----
144− MIIEoTCCAokCAgKaMA0GCSqGSIb3DQEBCwUAMBYxFDASBgNVBAMMC1NuYWtlb2ls
145− IENBMCAXDTIwMDMyMjIyNTYxOFoYDzIxMjAwMjI3MjI1NjE4WjAUMRIwEAYDVQQD
146− DAlhY21lLnRlc3QwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCWBBNm
147− Mp+zdofDQn33eTuMUCz6FVE9///McwCJSQ8pRg9NKXVPFL9s9uFbNKiibTSPhIuE
148− YYaFt36We9ODS68pvGySABN/DlyVubVk36DHgO7HCMtXfEjGl5Jj48rOznPzD+T4
149− AmH7M4/JfAfe63cL6iCnVL/kiGbNXdr/JT/qTTOkbGM3pk9FNcWvP3cjWk94KQnP
150− 3SXu2P7a4Vz3G0zbQ1BfnZ/RjahKFwbx8p01lXO4ceRleStkiGi7nn+dHLaMqAV4
151− PcZBB9r2vA9atXJtDq0owyShrMH9SeTL3FxMjYslqt/GAcM72/3IUG+ZHhQzwHeQ
152− zzY0egQ20dpnaaaIwZnNMRCV/zHBjIcWuoEUhVFYRSvuuv87lCv2Ag3RPi7frscJ
153− 7FVgArNs7Y/2HvlzPOMwygaRtfN71IxD+KSvESbAAeCvVfGHqJBiaA82TwBHd336
154− jYjtYlkxRhkBEue6FWv0E1e/nXSKplOpfyVzIvl8SPdJPgBv4fut969m3o1TbqIk
155− sFgCOsDaZK8f7C+RujGuBJLzFg+Q5bw0s0Rtuh3Oh8ikH5Jornc4iTRuP1zVgCCt
156− I0RH9MNOANetZQ2uV9Vn8zv4AR15TTrCLuxWFWJ/o4EPc6mApI2N4TpO4kfzQ+Lk
157− xa6BIUGvv3Zdvq6FWg+JU4U36qIYHpSTAGBIqQIDAQABMA0GCSqGSIb3DQEBCwUA
158− A4ICAQBCDs0V4z00Ze6Ask3qDOLAPo4k85QCfItlRZmwl2XbPZq7kbe13MqF2wxx
159− yiLalm6veK+ehU9MYN104hJZnuce5iEcZurk+8A+Pwn1Ifz+oWKVbUtUP3uV8Sm3
160− chktJ2H1bebXtNJE5TwvdHiUkXU9ywQt2FkxiTSl6+eac7JKEQ8lVN/o6uYxF5ds
161− +oIZplb7bv2XxsRCzq55F2tJX7fIzqXrSa+lQTnfLGmDVMAQX4TRB/lx0Gqd1a9y
162− qGfFnZ7xVyW97f6PiL8MoxPfd2I2JzrzGyP/igNbFOW0ho1OwfxVmvZeS7fQSc5e
163− +qu+nwnFfl0S4cHRif3G3zmz8Ryx9LM5TYkH41qePIHxoEO2sV0DgWJvbSjysV2S
164− EU2a31dJ0aZ+z6YtZVpHlujKMVzxVTrqj74trS4LvU5h/9hv7e1gjYdox1TO0HMK
165− mtDfgBevB21Tvxpz67Ijf31HvfTmCerKJEOjGnbYmyYpMeMNSONRDcToWk8sUwvi
166− OWa5jlUFRAxgXNM09vCTPi9aRUhcFqACqfAd6I1NqGVlfplLWrc7SWaSa+PsLfBf
167− 4EOZfk8iEKBVeYXNjg+CcD8j8yk/oEs816/jpihIk8haCDRWYWGKyyGnwn6OQb8d
168− MdRO2b7Oi/AAmEF3jMlICqv286GIYK5qTKk2/CKHlOLPnsWEuA==
144+ MIIEwDCCAqigAwIBAgICApowDQYJKoZIhvcNAQELBQAwFjEUMBIGA1UEAwwLU25h
145+ a2VvaWwgQ0EwIBcNMjAwODI0MDc0MjEzWhgPMjEyMDA3MzEwNzQyMTNaMBQxEjAQ
146+ BgNVBAMMCWFjbWUudGVzdDCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIB
147+ AN3SZeAchx0XKm2c25bMxyEuXhFt03F075ZagtZ3nRixlPXZwGG3aQ1GIb1s/8vQ
148+ H0WdXfI2M9NY2bbecVmBtEKEFHZAnPUDz4dAMa5d/HBpYgeiGSGNKn7Vvc6y0oAj
149+ lJ1y/+OSakqQ+ewxzEkoiZd4aDqOJHgWjETf1Cuhdw8Q/52RLIfsgQYdo7N6sZXh
150+ MapF/CJ5oyvaRvI+6muAXuS4eIiCwR2xgDGsTO1YjQIOCoFsoHefuKgfOiRbRP3C
151+ fq9w+tgEY1WsVOnjzi9AMEv78eZbOgxUAu/tQqRgjXpoCz83HO9LNFdEgJxe98R2
152+ KkVoyRbbpsr8k5IkFi4NMw0DroFndwfQA7miBMdp74j8qYQLYzN2Sqy9szdWiH6s
153+ 28Sfy/E0BWtlj7D1Nvos2v5vZDHy12eFzxf0icUPuclR/q8ceTlq12dd5wjMnlaG
154+ l0KH5hu6GbzkG7bk/a+Q0GXfVjdD9xt7MtP3TZ5TVZ/Lggb1yU0IUSrMtRREmXYH
155+ BTbaSRBuwURvRnOotFd/Wkkc0oWciiUgUIZXNBTE5V+OORGLITyoxAv/krqvcMvy
156+ 7i4yJJKgW1YOOteyJYmy89Hw2P8q2apH0qoQlbFp62ttU8tzKbw/sJ7JE87hq7wl
157+ U3tynFqfsJHh9Mb4a/BV1+p5+PdmAn72UiEztxRfqlrfAgMBAAGjGDAWMBQGA1Ud
158+ EQQNMAuCCWFjbWUudGVzdDANBgkqhkiG9w0BAQsFAAOCAgEAM5WrCpBOmLrZ1QX8
159+ l6vxVXwoI8pnqyy3cbAm3aLRPbw4gb0Ot90Pv/LoMhP0fkrNOKwH/FGRjSXyti0X
160+ TheKrP7aEf6XL2/Xnb8rK2jYMQo6YJU9T+wBJA6Q+GBrc8SE75KfOi5NWJr8T4Ju
161+ Etb+G05hXClrN19VFzIoz3L4kRV+xNMialcOT3xQfHtXCQUgwAWpPlwcJA/Jf60m
162+ XsfwQwk2Ir16wq+Lc3y+mQ7d/dbG+FVrngFk4qN2B9M/Zyv4N9ZBbqeDUn3mYtJE
163+ FeJrwHgmwH6slf1gBN3gxUKRW7Bvzxk548NdmLOyN+Y4StsqbOaYGtShUJA7f1Ng
164+ qQqdgvxZ9MNwwMv9QVDZEnaaew3/oWOSmQGAai4hrc7gLMLJmIxzgfd5P6Dr06e4
165+ 2zwsMuI8Qh/IDqu/CfmFYvaua0FEeyAtpoID9Y/KPM7fu9bJuxjZ6kqLVFkEi9nF
166+ /rCMchcSA8N2z/vLPabpNotO7OYH3VD7aQGTfCL82dMlp1vwZ39S3Z1TFLLh3MZ+
167+ BYcAv8kUvCV6kIdPAXvJRSQOJUlJRV7XiI2mwugdDzMx69wQ0Zc1e4WyGfiSiVYm
168+ ckSJ/EkxuwT/ZYLqCAKSFGMlFhad9g1Zyvd67XgfZq5p0pJTtGxtn5j8QHy6PM6m
169+ NbjvWnP8lDU8j2l3eSG58S14iGs=
169170 -----END CERTIFICATE-----
170171 '';
171172}
nixos/tests/make-test.nixdeleted−9
@@ -1,9 +0,0 @@
1−f: {
2− system ? builtins.currentSystem,
3− pkgs ? import ../.. { inherit system; config = {}; },
4− ...
5−} @ args:
6−
7−with import ../lib/testing.nix { inherit system pkgs; };
8−
9−makeTest (if pkgs.lib.isFunction f then f (args // { inherit pkgs; inherit (pkgs) lib; }) else f)
nixos/tests/postgresql-wal-receiver.nix+12−12
@@ -14,13 +14,10 @@ let
1414 baseBackupDir = "/tmp/pg_basebackup";
1515 walBackupDir = "/tmp/pg_wal";
1616 atLeast12 = lib.versionAtLeast pkg.version "12.0";
17− restoreCommand = ''
18− restore_command = 'cp ${walBackupDir}/%f %p'
19− '';
2017
2118 recoveryFile = if atLeast12
2219 then pkgs.writeTextDir "recovery.signal" ""
23− else pkgs.writeTextDir "recovery.conf" "${restoreCommand}";
20+ else pkgs.writeTextDir "recovery.conf" "restore_command = 'cp ${walBackupDir}/%f %p'";
2421
2522 in {
2623 name = "postgresql-wal-receiver-${postgresqlPackage}";
@@ -30,14 +27,17 @@ let
3027 services.postgresql = {
3128 package = pkg;
3229 enable = true;
33− extraConfig = ''
34− wal_level = archive # alias for replica on pg >= 9.6
35− max_wal_senders = 10
36− max_replication_slots = 10
37− '' + lib.optionalString atLeast12 ''
38− ${restoreCommand}
39− recovery_end_command = 'touch recovery.done'
40− '';
30+ settings = lib.mkMerge [
31+ {
32+ wal_level = "archive"; # alias for replica on pg >= 9.6
33+ max_wal_senders = 10;
34+ max_replication_slots = 10;
35+ }
36+ (lib.mkIf atLeast12 {
37+ restore_command = "cp ${walBackupDir}/%f %p";
38+ recovery_end_command = "touch recovery.done";
39+ })
40+ ];
4141 authentication = ''
4242 host replication ${replicationUser} all trust
4343 '';
nixos/tests/systemd-networkd.nix+6−5
@@ -7,18 +7,19 @@ let generateNodeConf = { lib, pkgs, config, privk, pubk, peerId, nodeId, ...}: {
77 virtualisation.vlans = [ 1 ];
88 environment.systemPackages = with pkgs; [ wireguard-tools ];
99 boot.extraModulePackages = [ config.boot.kernelPackages.wireguard ];
10− systemd.tmpfiles.rules = [
11− "f /run/wg_priv 0640 root systemd-network - ${privk}"
12− ];
1310 systemd.network = {
1411 enable = true;
1512 netdevs = {
1613 "90-wg0" = {
1714 netdevConfig = { Kind = "wireguard"; Name = "wg0"; };
1815 wireguardConfig = {
19− PrivateKeyFile = "/run/wg_priv";
16+ # NOTE: we're storing the wireguard private key in the
17+ # store for this test. Do not do this in the real
18+ # world. Keep in mind the nix store is
19+ # world-readable.
20+ PrivateKeyFile = pkgs.writeText "wg0-priv" privk;
2021 ListenPort = 51820;
21− FwMark = 42;
22+ FirewallMark = 42;
2223 };
2324 wireguardPeers = [ {wireguardPeerConfig={
2425 Endpoint = "192.168.1.${peerId}:51820";
nixos/tests/systemd.nix+4−3
@@ -144,9 +144,10 @@ import ./make-test-python.nix ({ pkgs, ... }: {
144144 )
145145
146146 output = machine.succeed("systemctl show | grep Watchdog")
147− assert "RuntimeWatchdogUSec=30s" in output
148− assert "RebootWatchdogUSec=10m" in output
149− assert "KExecWatchdogUSec=5m" in output
147+ # assert "RuntimeWatchdogUSec=30s" in output
148+ # for some reason RuntimeWatchdogUSec, doesn't seem to be updated in here.
149+ assert "RebootWatchdogUSec=10min" in output
150+ assert "KExecWatchdogUSec=5min" in output
150151
151152 # Test systemd cryptsetup support
152153 with subtest("systemd successfully reads /etc/crypttab and unlocks volumes"):
pkgs/applications/audio/audacity/default.nix+1−1
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
5757
5858 meta = with stdenv.lib; {
5959 description = "Sound editor with graphical UI";
60− homepage = "http://audacityteam.org/";
60+ homepage = "https://www.audacityteam.org/";
6161 license = licenses.gpl2Plus;
6262 maintainers = with maintainers; [ lheckemann ];
6363 platforms = intersectLists platforms.linux platforms.x86; # fails on ARM
pkgs/applications/audio/axoloti/libusb1.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, systemd ? null, libobjc, IOKit, fetchpatch }:
1+{ stdenv, lib, fetchurl, pkgconfig, systemd ? null, libobjc, IOKit, fetchpatch }:
22
33stdenv.mkDerivation rec {
44 name = "libusb-1.0.19";
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
2626 NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
2727
2828 preFixup = stdenv.lib.optionalString stdenv.isLinux ''
29− sed 's,-ludev,-L${systemd.lib}/lib -ludev,' -i $out/lib/libusb-1.0.la
29+ sed 's,-ludev,-L${lib.getLib systemd}/lib -ludev,' -i $out/lib/libusb-1.0.la
3030 '';
3131
3232 meta = with stdenv.lib; {
pkgs/applications/audio/faust/faust2.nix+2−3
@@ -5,8 +5,7 @@
55, pkgconfig
66, cmake
77, llvm
8−# TODO: put back when it builds again
9−# , emscripten
8+, emscripten
109, openssl
1110, libsndfile
1211, libmicrohttpd
@@ -47,7 +46,7 @@ let
4746 inherit src;
4847
4948 nativeBuildInputs = [ makeWrapper pkgconfig cmake vim which ];
50− buildInputs = [ llvm /*emscripten*/ openssl libsndfile libmicrohttpd gnutls libtasn1 p11-kit ];
49+ buildInputs = [ llvm emscripten openssl libsndfile libmicrohttpd gnutls libtasn1 p11-kit ];
5150
5251
5352 passthru = {
pkgs/applications/audio/mopidy/iris.nix+1−1
@@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec {
1414 ] ++ (with python3Packages; [
1515 configobj
1616 requests
17− tornado_4
17+ tornado
1818 ]);
1919
2020 # no tests implemented
pkgs/applications/audio/mopidy/mopidy.nix+1−1
@@ -21,7 +21,7 @@ pythonPackages.buildPythonApplication rec {
2121 ];
2222
2323 propagatedBuildInputs = with pythonPackages; [
24− gst-python pygobject3 pykka tornado_4 requests setuptools
24+ gst-python pygobject3 pykka tornado requests setuptools
2525 ] ++ stdenv.lib.optional (!stdenv.isDarwin) dbus-python;
2626
2727 # There are no tests
pkgs/applications/audio/pulseaudio-dlna/default.nix+3−3
@@ -4,7 +4,7 @@
44, faacSupport ? false, faac ? null
55, flacSupport ? true, flac ? null
66, soxSupport ? true, sox ? null
7−, vorbisSupport ? true, vorbisTools ? null
7+, vorbisSupport ? true, vorbis-tools ? null
88}:
99
1010assert mp3Support -> lame != null;
@@ -12,7 +12,7 @@ assert opusSupport -> opusTools != null;
1212assert faacSupport -> faac != null;
1313assert flacSupport -> flac != null;
1414assert soxSupport -> sox != null;
15−assert vorbisSupport -> vorbisTools != null;
15+assert vorbisSupport -> vorbis-tools != null;
1616
1717let
1818 zeroconf = pythonPackages.callPackage ./zeroconf.nix { };
@@ -37,7 +37,7 @@ pythonPackages.buildPythonApplication {
3737 ++ stdenv.lib.optional faacSupport faac
3838 ++ stdenv.lib.optional flacSupport flac
3939 ++ stdenv.lib.optional soxSupport sox
40− ++ stdenv.lib.optional vorbisSupport vorbisTools;
40+ ++ stdenv.lib.optional vorbisSupport vorbis-tools;
4141
4242 # upstream has no tests
4343 checkPhase = ''
pkgs/applications/audio/sonata/default.nix+24−12
@@ -1,5 +1,5 @@
1−{ stdenv, fetchFromGitHub, pkgconfig, gettext, intltool, wrapGAppsHook
2−, python3Packages, gnome3, gtk3, gsettings-desktop-schemas, gobject-introspection }:
1+{ stdenv, fetchFromGitHub, wrapGAppsHook, gettext
2+, python3Packages, gnome3, gtk3, glib, gdk-pixbuf, gsettings-desktop-schemas, gobject-introspection }:
33
44let
55 inherit (python3Packages) buildPythonApplication isPy3k dbus-python pygobject3 mpd2 setuptools;
@@ -16,26 +16,38 @@ in buildPythonApplication rec {
1616
1717 disabled = !isPy3k;
1818
19− nativeBuildInputs = [ pkgconfig gettext ];
19+ nativeBuildInputs = [
20+ gettext
21+ gobject-introspection
22+ wrapGAppsHook
23+ ];
24+
2025 buildInputs = [
21− intltool wrapGAppsHook
26+ glib
2227 gnome3.adwaita-icon-theme
2328 gsettings-desktop-schemas
29+ gtk3
30+ gdk-pixbuf
31+ ];
32+
33+ # The optional tagpy dependency (for editing metadata) is not yet
34+ # included because it's difficult to build.
35+ pythonPath = [
36+ dbus-python
37+ mpd2
38+ pygobject3
39+ setuptools
2440 ];
2541
42+ # Otherwise the setup hook for gobject-introspection is not run:
43+ # https://github.com/NixOS/nixpkgs/issues/56943
44+ strictDeps = false;
45+
2646 postPatch = ''
2747 # Remove "Local MPD" tab which is not suitable for NixOS.
2848 sed -i '/localmpd/d' sonata/consts.py
2949 '';
3050
31− propagatedBuildInputs = [
32− gobject-introspection gtk3 pygobject3 setuptools
33− ];
34−
35− # The optional tagpy dependency (for editing metadata) is not yet
36− # included because it's difficult to build.
37− pythonPath = [ dbus-python pygobject3 mpd2 ];
38−
3951 meta = {
4052 description = "An elegant client for the Music Player Daemon";
4153 longDescription = ''
pkgs/applications/audio/sonic-visualiser/default.nix+8−10
@@ -1,8 +1,8 @@
11# TODO add plugins having various licenses, see http://www.vamp-plugins.org/download.html
22
33{ stdenv, fetchurl, alsaLib, bzip2, fftw, libjack2, libX11, liblo
4−, libmad, libogg, lrdf, librdf_raptor, librdf_rasqal, libsamplerate
5−, libsndfile, pkgconfig, libpulseaudio, qtbase, qtsvg, redland
4+, libmad, lrdf, librdf_raptor, librdf_rasqal, libsamplerate
5+, libsndfile, pkg-config, libpulseaudio, qtbase, qtsvg, redland
66, rubberband, serd, sord, vamp-plugin-sdk, fftwFloat
77, capnproto, liboggz, libfishsound, libid3tag, opusfile
88, wrapQtAppsHook
@@ -10,13 +10,14 @@
1010
1111stdenv.mkDerivation rec {
1212 pname = "sonic-visualiser";
13− version = "4.0.1";
13+ version = "4.2";
1414
1515 src = fetchurl {
16− url = "https://code.soundsoftware.ac.uk/attachments/download/2607/${pname}-${version}.tar.gz";
17− sha256 = "14674adzp3chilymna236qyvci3b1zmi3wyz696wk7bcd3ndpsg6";
16+ url = "https://code.soundsoftware.ac.uk/attachments/download/2755/${pname}-${version}.tar.gz";
17+ sha256 = "1wsvranhvdl21ksbinbgb55qvs3g2d4i57ssj1vx2aln6m01ms9q";
1818 };
1919
20+ nativeBuildInputs = [ pkg-config wrapQtAppsHook ];
2021 buildInputs =
2122 [ libsndfile qtbase qtsvg fftw fftwFloat bzip2 lrdf rubberband
2223 libsamplerate vamp-plugin-sdk alsaLib librdf_raptor librdf_rasqal redland
@@ -27,7 +28,6 @@ stdenv.mkDerivation rec {
2728 # portaudio
2829 libpulseaudio
2930 libmad
30− libogg # ?
3131 libfishsound
3232 liblo
3333 libX11
@@ -37,15 +37,13 @@ stdenv.mkDerivation rec {
3737 opusfile
3838 ];
3939
40− nativeBuildInputs = [ pkgconfig wrapQtAppsHook ];
41−
42− enableParallelBuilding = true;
43−
4440 # comment out the tests
4541 preConfigure = ''
4642 sed -i 's/sub_test_svcore_/#sub_test_svcore_/' sonic-visualiser.pro
4743 '';
4844
45+ enableParallelBuilding = true;
46+
4947 meta = with stdenv.lib; {
5048 description = "View and analyse contents of music audio files";
5149 homepage = "https://www.sonicvisualiser.org/";
pkgs/applications/audio/soundkonverter/default.nix+10−1
@@ -1,6 +1,6 @@
11# currently needs to be installed into an environment and needs a `kbuildsycoca5` run afterwards for plugin discovery
22{
3− mkDerivation, fetchFromGitHub, lib, makeWrapper,
3+ mkDerivation, fetchFromGitHub, fetchpatch, lib, makeWrapper,
44 cmake, extra-cmake-modules, pkgconfig,
55 libkcddb, kconfig, kconfigwidgets, ki18n, kdelibs4support, kio, solid, kwidgetsaddons, kxmlgui,
66 qtbase, phonon,
@@ -53,6 +53,15 @@ mkDerivation rec {
5353 rev = "v" + version;
5454 sha256 = "1g2khdsjmsi4zzynkq8chd11cbdhjzmi37r9jhpal0b730nq9x7l";
5555 };
56+ patches = [
57+ # already merged into master, so it can go during the next release
58+ (fetchpatch {
59+ url = "https://patch-diff.githubusercontent.com/raw/dfaust/soundkonverter/pull/87.patch";
60+ sha256 = "sha256-XIpD4ZMTZVcu+F27OtpRy51H+uQgpd5l22IZ6XsD64w=";
61+ name = "soundkonverter_taglib.patch";
62+ stripLen = 1;
63+ })
64+ ];
5665 enableParallelBuilding = true;
5766 nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig kdelibs4support makeWrapper ];
5867 propagatedBuildInputs = [ libkcddb kconfig kconfigwidgets ki18n kdelibs4support kio solid kwidgetsaddons kxmlgui qtbase phonon];
pkgs/applications/editors/android-studio/default.nix+3−3
@@ -19,9 +19,9 @@ let
1919 sha256Hash = "11lkwcbzdl86cyz4lci65cx9z5jjhrc4z40maqx2r5hw1xka9290";
2020 };
2121 latestVersion = { # canary & dev
22− version = "4.2.0.7"; # "Android Studio 4.2 Canary 7"
23− build = "201.6720134";
24− sha256Hash = "1c9s6rd0z596qr7hbil5rl3fqby7c8h7ma52d1qj5rxra73k77nz";
22+ version = "4.2.0.8"; # "Android Studio 4.2 Canary 8"
23+ build = "202.6787931";
24+ sha256Hash = "0y5fzr22dknzxay1bhd1ymhdnmdrpccdw8dswy2z9bxjsvq65n62";
2525 };
2626in {
2727 # Attributes are named by their corresponding release channels
pkgs/applications/editors/brackets/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, gtk2, glib, gdk-pixbuf, alsaLib, nss, nspr, gconf
1+{ stdenv, lib, fetchurl, gtk2, glib, gdk-pixbuf, alsaLib, nss, nspr, gconf
22, cups, libgcrypt_1_5, systemd, dbus, libXdamage, expat }:
33with stdenv.lib;
44
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
2727 rmdir $out/usr
2828 ln -sf $out/opt/brackets/brackets $out/bin/brackets
2929
30− ln -s ${systemd.lib}/lib/libudev.so.1 $out/opt/brackets/lib/libudev.so.0
30+ ln -s ${lib.getLib systemd}/lib/libudev.so.1 $out/opt/brackets/lib/libudev.so.0
3131
3232 substituteInPlace $out/opt/brackets/brackets.desktop \
3333 --replace "Exec=/opt/brackets/brackets" "Exec=brackets"
pkgs/applications/editors/emacs-modes/melpa-packages.nix+6
@@ -531,6 +531,12 @@ let
531531 (attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
532532 }));
533533
534+ orgit-forge = super.orgit-forge.overrideAttrs (attrs: {
535+ # searches for Git at build time
536+ nativeBuildInputs =
537+ (attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
538+ });
539+
534540 # tries to write to $HOME
535541 php-auto-yasnippets = super.php-auto-yasnippets.overrideAttrs (attrs: {
536542 HOME = "/tmp";
pkgs/applications/editors/gophernotes/default.nixnew file+26
@@ -0,0 +1,26 @@
1+{ lib
2+, buildGoModule
3+, fetchFromGitHub
4+}:
5+
6+buildGoModule rec {
7+ pname = "gophernotes";
8+ version = "0.7.1";
9+
10+ src = fetchFromGitHub {
11+ owner = "gopherdata";
12+ repo = "gophernotes";
13+ rev = "v${version}";
14+ sha256 = "0hs92bdrsjqafdkhg2fk3z16h307i32mvbm9f6bb80bgsciysh27";
15+ };
16+
17+ vendorSha256 = "1ylqf1sx0h2kixnq9f3prn3sha43q3ybd5ay57yy5z79qr8zqvxs";
18+
19+ meta = with lib; {
20+ description = "Go kernel for Jupyter notebooks";
21+ homepage = "https://github.com/gopherdata/gophernotes";
22+ license = licenses.mit;
23+ maintainers = [ maintainers.costrouc ];
24+ platforms = platforms.all;
25+ };
26+}
pkgs/applications/editors/lighttable/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, zlib, glib, alsaLib, makeDesktopItem
1+{ stdenv, lib, fetchurl, zlib, glib, alsaLib, makeDesktopItem
22, dbus, gtk2, atk, pango, freetype, fontconfig, libgnome-keyring3, gdk-pixbuf
33, cairo, cups, expat, libgpgerror, nspr, gnome2, nss, xorg, systemd, libnotify
44}:
@@ -45,9 +45,9 @@ stdenv.mkDerivation rec {
4545
4646 mv $out/share/LightTable/light $out/bin/light
4747
48− ln -sf ${systemd.lib}/lib/libudev.so.1 $out/share/LightTable/libudev.so.0
48+ ln -sf ${lib.getLib systemd}/lib/libudev.so.1 $out/share/LightTable/libudev.so.0
4949 substituteInPlace $out/bin/light \
50− --replace "/usr/lib/x86_64-linux-gnu" "${systemd.lib}/lib" \
50+ --replace "/usr/lib/x86_64-linux-gnu" "${lib.getLib systemd}/lib" \
5151 --replace "/lib/x86_64-linux-gnu" "$out/share/LightTable" \
5252 --replace 'HERE=`dirname $(readlink -f $0)`' "HERE=$out/share/LightTable"
5353
pkgs/applications/editors/neovim/qt.nix+1
@@ -38,6 +38,7 @@ let
3838
3939 meta = with stdenv.lib; {
4040 description = "Neovim client library and GUI, in Qt5";
41+ homepage = "https://github.com/equalsraf/neovim-qt";
4142 license = licenses.isc;
4243 maintainers = with maintainers; [ peterhoeg ];
4344 inherit (neovim.meta) platforms;
pkgs/applications/editors/typora/default.nix+4−4
@@ -2,7 +2,7 @@
22, lib
33, fetchurl
44, makeWrapper
5−, electron_8
5+, electron_9
66, dpkg
77, gtk3
88, glib
@@ -13,15 +13,15 @@
1313}:
1414
1515let
16− electron = electron_8;
16+ electron = electron_9;
1717in
1818stdenv.mkDerivation rec {
1919 pname = "typora";
20− version = "0.9.89";
20+ version = "0.9.95";
2121
2222 src = fetchurl {
2323 url = "https://www.typora.io/linux/typora_${version}_amd64.deb";
24− sha256 = "0gk8j13z1ymad34zzcy4vqwyjgd5khgyw5xjj9rbzm5v537kqmx6";
24+ sha256 = "0kgzk7z707vlbjrvykrnw2h6wscmc3h5hxycyz1z1j2cz26fns4p";
2525 };
2626
2727 nativeBuildInputs = [
pkgs/applications/editors/vscode/generic.nix+1−1
@@ -62,7 +62,7 @@ in
6262 else [ gtk2 at-spi2-atk wrapGAppsHook ] ++ atomEnv.packages)
6363 ++ [ libsecret libXScrnSaver ];
6464
65− runtimeDependencies = lib.optional (stdenv.isLinux) [ systemd.lib fontconfig.lib ];
65+ runtimeDependencies = lib.optional (stdenv.isLinux) [ (lib.getLib systemd) fontconfig.lib ];
6666
6767 nativeBuildInputs = lib.optional (!stdenv.isDarwin) autoPatchelfHook;
6868
pkgs/applications/gis/qgis/unwrapped.nix+2−2
@@ -10,7 +10,7 @@ let
1010 [ qscintilla-qt5 gdal jinja2 numpy psycopg2
1111 chardet dateutil pyyaml pytz requests urllib3 pygments pyqt5 sip owslib six ];
1212in mkDerivation rec {
13− version = "3.10.7";
13+ version = "3.10.9";
1414 pname = "qgis";
1515 name = "${pname}-unwrapped-${version}";
1616
@@ -18,7 +18,7 @@ in mkDerivation rec {
1818 owner = "qgis";
1919 repo = "QGIS";
2020 rev = "final-${lib.replaceStrings ["."] ["_"] version}";
21− sha256 = "0z593n5g3zwhlzhs0z7nlpblz6z2rl3y7y3j1wf1rdx76i8p3qgf";
21+ sha256 = "0d646hvrhhgsw789qc2g3iblmsvr64qh15jck1jkaljzrj3qbml6";
2222 };
2323
2424 passthru = {
pkgs/applications/graphics/drawio/default.nix+1−1
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
5656 ];
5757
5858 runtimeDependencies = [
59− systemd.lib
59+ (lib.getLib systemd)
6060 ];
6161
6262 dontBuild = true;
pkgs/applications/graphics/drawpile/default.nix+44−25
@@ -1,7 +1,8 @@
1−{ lib
1+{ stdenv
2+, lib
23, mkDerivation
3−, fetchurl
4−, cmake
4+, fetchFromGitHub
5+, fetchpatch
56, extra-cmake-modules
67
78# common deps
@@ -9,6 +10,7 @@
910
1011# client deps
1112, qtbase
13+, qtkeychain
1214, qtmultimedia
1315, qtsvg
1416, qttools
@@ -23,6 +25,8 @@
2325# optional server deps
2426, libmicrohttpd
2527, libsodium
28+, withSystemd ? stdenv.isLinux
29+, systemd ? null
2630
2731# options
2832, buildClient ? true
@@ -35,11 +39,9 @@
3539with lib;
3640
3741let
38− commonDeps = [
39− karchive
40− ];
4142 clientDeps = [
4243 qtbase
44+ qtkeychain
4345 qtmultimedia
4446 qtsvg
4547 qttools
@@ -49,40 +51,57 @@ let
4951 libvpx # WebM video export
5052 miniupnpc # automatic port forwarding
5153 ];
54+
5255 serverDeps = [
5356 # optional:
5457 libmicrohttpd # HTTP admin api
5558 libsodium # ext-auth support
56− ];
59+ ] ++ optional withSystemd systemd;
60+
5761 kisDeps = [
5862 qtx11extras
5963 ];
6064
65+ boolToFlag = bool:
66+ if bool then "ON" else "OFF";
67+
6168in mkDerivation rec {
6269 pname = "drawpile";
6370 version = "2.1.17";
6471
65− src = fetchurl {
66− url = "https://drawpile.net/files/src/drawpile-${version}.tar.gz";
67− sha256 = "11lhn1mymhqk9g5sh384xhj3qw8h9lv88pr768y9q6kg3sl7nzzf";
72+ src = fetchFromGitHub {
73+ owner = "drawpile";
74+ repo = "drawpile";
75+ rev = "${version}";
76+ sha256 = "sha256-AFFY+FcY9ExAur13OoWR9285RZtBe6jnRIrwi5raiCM=";
6877 };
6978
70− nativeBuildInputs = [
71− cmake
72− extra-cmake-modules
79+ patches = [
80+ # fix for libmicrohttpd 0.9.71
81+ (fetchpatch {
82+ url = "https://github.com/drawpile/Drawpile/commit/ed1a75deb113da2d1df91a28f557509c4897130e.diff";
83+ sha256 = "sha256-54wabH5F3Hf+6vv9rpCwCRdhjSaUFtuF/mE1/U+CpOA=";
84+ name = "mhdfix.patch"; })
85+ ];
86+
87+ nativeBuildInputs = [ extra-cmake-modules ];
88+
89+ buildInputs = [
90+ karchive
91+ ]
92+ ++ optionals buildClient clientDeps
93+ ++ optionals buildServer serverDeps
94+ ++ optionals enableKisTablet kisDeps;
95+
96+ cmakeFlags = [
97+ "-Wno-dev"
98+ "-DINITSYS=systemd"
99+ "-DCLIENT=${boolToFlag buildClient}"
100+ "-DSERVER=${boolToFlag buildServer}"
101+ "-DSERVERGUI=${boolToFlag buildServerGui}"
102+ "-DTOOLS=${boolToFlag buildExtraTools}"
103+ "-DKIS_TABLET=${boolToFlag enableKisTablet}"
73104 ];
74− buildInputs =
75− commonDeps ++
76− optionals buildClient clientDeps ++
77− optionals buildServer serverDeps ++
78− optionals enableKisTablet kisDeps ;
79−
80− cmakeFlags =
81− optional (!buildClient ) "-DCLIENT=off" ++
82− optional (!buildServer ) "-DSERVER=off" ++
83− optional (!buildServerGui ) "-DSERVERGUI=off" ++
84− optional ( buildExtraTools) "-DTOOLS=on" ++
85− optional ( enableKisTablet) "-DKIS_TABLET=on";
86105
87106 meta = {
88107 description = "A collaborative drawing program that allows multiple users to sketch on the same canvas simultaneously";
pkgs/applications/graphics/feh/default.nix+2−2
@@ -7,11 +7,11 @@ with stdenv.lib;
77
88stdenv.mkDerivation rec {
99 pname = "feh";
10− version = "3.4.1";
10+ version = "3.5";
1111
1212 src = fetchurl {
1313 url = "https://feh.finalrewind.org/${pname}-${version}.tar.bz2";
14− sha256 = "0yvvj1s7ayn0lwils582smwkmckdk0gij5c58g45n4xh981n693q";
14+ sha256 = "07jklibpi4ig9pbdrwhllsfffxn2h8xf4ma36qii00w4hb69v3rq";
1515 };
1616
1717 outputs = [ "out" "man" "doc" ];
pkgs/applications/graphics/gcolor3/default.nix+26−17
@@ -1,31 +1,40 @@
1−{ stdenv, fetchFromGitLab, meson, ninja, gettext, pkgconfig, libxml2, gtk3, hicolor-icon-theme, wrapGAppsHook
2−, fetchpatch }:
1+{ stdenv
2+, fetchFromGitLab
3+, meson
4+, ninja
5+, gettext
6+, pkg-config
7+, libxml2
8+, gtk3
9+, libportal
10+, wrapGAppsHook
11+}:
312
4−let
5− version = "2.3.1";
6−in stdenv.mkDerivation {
13+stdenv.mkDerivation rec {
714 pname = "gcolor3";
8− inherit version;
15+ version = "2.4.0";
916
1017 src = fetchFromGitLab {
1118 domain = "gitlab.gnome.org";
1219 owner = "World";
1320 repo = "gcolor3";
1421 rev = "v${version}";
15− sha256 = "10cfzlkflwkb7f51rnrxmgxpfryh1qzvqaydj6lffjq9zvnhigg7";
22+ sha256 = "rHIAjk2m3Lkz11obgNZaapa1Zr2GDH7XzgzuAJmq+MU=";
1623 };
1724
18− patches = [
19− # Remove useage of deprecrated G_PARAM_PRIVATE
20− (fetchpatch {
21− url = "https://gitlab.gnome.org/World/gcolor3/commit/96612cdd6c2cc71e28eb97ee17956004a05e5140.patch";
22− sha256 = "134wv5x15bd7k0fjzifrddwssaq213sx2l38r3xw6x1j625qwzq9";
23− })
25+ nativeBuildInputs = [
26+ meson
27+ ninja
28+ gettext
29+ pkg-config
30+ libxml2 # xml-stripblanks preprocessing of GResource
31+ wrapGAppsHook
2432 ];
2533
26− nativeBuildInputs = [ meson ninja gettext pkgconfig libxml2 wrapGAppsHook ];
27−
28− buildInputs = [ gtk3 hicolor-icon-theme ];
34+ buildInputs = [
35+ gtk3
36+ libportal
37+ ];
2938
3039 postPatch = ''
3140 chmod +x meson_install.sh # patchShebangs requires executable file
@@ -34,7 +43,7 @@ in stdenv.mkDerivation {
3443
3544 meta = with stdenv.lib; {
3645 description = "A simple color chooser written in GTK3";
37− homepage = "https://www.hjdskes.nl/projects/gcolor3/";
46+ homepage = "https://gitlab.gnome.org/World/gcolor3";
3847 license = licenses.gpl2Plus;
3948 maintainers = with maintainers; [ jtojnar ];
4049 platforms = platforms.unix;
pkgs/applications/graphics/odafileconverter/default.nixnew file+53
@@ -0,0 +1,53 @@
1+{ lib, stdenv, mkDerivation, dpkg, fetchurl, qtbase }:
2+
3+let
4+ # To obtain the version you will need to run the following command:
5+ #
6+ # dpkg-deb -I ${odafileconverter.src} | grep Version
7+ version = "21.7.0.0";
8+ rpath = "$ORIGIN:${lib.makeLibraryPath [ stdenv.cc.cc qtbase ]}";
9+
10+in mkDerivation {
11+ pname = "oda-file-converter";
12+ inherit version;
13+ nativeBuildInputs = [ dpkg ];
14+
15+ src = fetchurl {
16+ # NB: this URL is not stable (i.e. the underlying file and the corresponding version will change over time)
17+ url = "https://download.opendesign.com/guestfiles/ODAFileConverter/ODAFileConverter_QT5_lnxX64_7.2dll.deb";
18+ sha256 = "0sa21nnwzqb6g7gl0z43smqgcd9h3xipj3cq2cl7ybfh3cvcxfi9";
19+ };
20+
21+ unpackPhase = ''
22+ dpkg -x $src oda_unpacked
23+ sourceRoot=$PWD/oda_unpacked
24+ '';
25+
26+ installPhase = ''
27+ mkdir -p $out/bin $out/lib
28+ cp -vr $sourceRoot/usr/bin/ODAFileConverter_${version} $out/libexec
29+ cp -vr $sourceRoot/usr/share $out/share
30+ '';
31+
32+ dontWrapQtApps = true;
33+ fixupPhase = ''
34+ echo "setting interpreter"
35+ patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/libexec/ODAFileConverter
36+ patchelf --set-rpath '${rpath}' $out/libexec/ODAFileConverter
37+ wrapQtApp $out/libexec/ODAFileConverter
38+ mv $out/libexec/ODAFileConverter $out/bin
39+
40+ find $out/libexec -type f -executable | while read file; do
41+ echo "patching $file"
42+ patchelf --set-rpath '${rpath}' $file
43+ done
44+ '';
45+
46+ meta = with stdenv.lib; {
47+ description = "For converting between different versions of .dwg and .dxf";
48+ homepage = "https://www.opendesign.com/guestfiles/oda_file_converter";
49+ license = licenses.unfree;
50+ maintainers = with maintainers; [ nagisa ];
51+ platforms = [ "x86_64-linux" ];
52+ };
53+}
pkgs/applications/graphics/pencil/default.nix+1−1
@@ -91,7 +91,7 @@ in stdenv.mkDerivation rec {
9191 $out/opt/pencil/pencil
9292
9393 # fix missing libudev
94− ln -s ${systemd.lib}/lib/libudev.so.1 $out/opt/pencil/libudev.so.1
94+ ln -s ${lib.getLib systemd}/lib/libudev.so.1 $out/opt/pencil/libudev.so.1
9595 wrapProgram $out/opt/pencil/pencil \
9696 --prefix LD_LIBRARY_PATH : $out/opt/pencil
9797 '';
pkgs/applications/kde/calendarsupport.nix+2−2
@@ -1,7 +1,7 @@
11{
22 mkDerivation, lib, kdepimTeam,
33 extra-cmake-modules, kdoctools,
4− akonadi, akonadi-calendar, akonadi-mime, kcalutils, kdepim-apps-libs,
4+ akonadi, akonadi-calendar, akonadi-mime, akonadi-notes, kcalutils, kdepim-apps-libs,
55 kholidays, kidentitymanagement, kmime, pimcommon, qttools,
66}:
77
@@ -13,7 +13,7 @@ mkDerivation {
1313 };
1414 nativeBuildInputs = [ extra-cmake-modules kdoctools ];
1515 buildInputs = [
16− akonadi akonadi-mime kcalutils kdepim-apps-libs kholidays pimcommon qttools
16+ akonadi akonadi-mime akonadi-notes kcalutils kdepim-apps-libs kholidays pimcommon qttools
1717 ];
1818 propagatedBuildInputs = [ akonadi-calendar kidentitymanagement kmime ];
1919 outputs = [ "out" "dev" ];
pkgs/applications/kde/default.nix−1
@@ -100,7 +100,6 @@ let
100100 kcalutils = callPackage ./kcalutils.nix {};
101101 kcharselect = callPackage ./kcharselect.nix {};
102102 kcolorchooser = callPackage ./kcolorchooser.nix {};
103− kdav = callPackage ./kdav.nix {};
104103 kdebugsettings = callPackage ./kdebugsettings.nix {};
105104 kdegraphics-mobipocket = callPackage ./kdegraphics-mobipocket.nix {};
106105 kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers.nix {};
pkgs/applications/kde/fetch.sh+1−1
@@ -1 +1 @@
1−WGET_ARGS=(http://download.kde.org/stable/release-service/20.04.3/src)
1+WGET_ARGS=(http://download.kde.org/stable/release-service/20.08.0/src)
pkgs/applications/kde/grantleetheme/default.nix−1
@@ -11,7 +11,6 @@ mkDerivation {
1111 maintainers = kdepimTeam;
1212 };
1313 output = [ "out" "dev" ];
14− patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
1514 nativeBuildInputs = [ extra-cmake-modules kdoctools ];
1615 buildInputs = [
1716 grantlee ki18n kiconthemes knewstuff kservice kxmlgui qtbase
pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patchdeleted−155
@@ -1,155 +0,0 @@
1−diff --git a/src/grantleetheme.cpp b/src/grantleetheme.cpp
2−index 27d5bc8..8d43140 100644
3−--- a/src/grantleetheme.cpp
4−+++ b/src/grantleetheme.cpp
5−@@ -46,7 +46,7 @@ ThemePrivate::ThemePrivate(const ThemePrivate &other)
6− , description(other.description)
7− , name(other.name)
8− , dirName(other.dirName)
9−- , absolutePath(other.absolutePath)
10−+ , absolutePaths(other.absolutePaths)
11− , author(other.author)
12− , email(other.email)
13− , loader(other.loader)
14−@@ -64,12 +64,15 @@ void ThemePrivate::setupEngine()
15−
16− void ThemePrivate::setupLoader()
17− {
18−- // Get the parent dir with themes, we set the theme directory separately
19−- QDir dir(absolutePath);
20−- dir.cdUp();
21−+ QStringList templateDirs;
22−+ for (const QString& path : absolutePaths) {
23−+ QDir dir(path);
24−+ dir.cdUp();
25−+ templateDirs << dir.absolutePath();
26−+ }
27−
28− loader = QSharedPointer<GrantleeTheme::QtResourceTemplateLoader>::create();
29−- loader->setTemplateDirs({ dir.absolutePath() });
30−+ loader->setTemplateDirs(templateDirs);
31− loader->setTheme(dirName);
32−
33− if (!sEngine) {
34−@@ -121,7 +124,7 @@ Theme::Theme(const QString &themePath, const QString &dirName, const QString &de
35− KConfigGroup group(&config, QStringLiteral("Desktop Entry"));
36− if (group.isValid()) {
37− d->dirName = dirName;
38−- d->absolutePath = themePath;
39−+ d->absolutePaths = QStringList(themePath);
40− d->name = group.readEntry("Name", QString());
41− d->description = group.readEntry("Description", QString());
42− d->themeFileName = group.readEntry("FileName", QString());
43−@@ -140,7 +143,7 @@ Theme::~Theme()
44−
45− bool Theme::operator==(const Theme &other) const
46− {
47−- return isValid() && other.isValid() && d->absolutePath == other.absolutePath();
48−+ return isValid() && other.isValid() && d->absolutePaths == other.absolutePaths();
49− }
50−
51− Theme &Theme::operator=(const Theme &other)
52−@@ -184,7 +187,12 @@ QString Theme::dirName() const
53−
54− QString Theme::absolutePath() const
55− {
56−- return d->absolutePath;
57−+ return d->absolutePaths.first();
58−+}
59−+
60−+QStringList Theme::absolutePaths() const
61−+{
62−+ return d->absolutePaths;
63− }
64−
65− QString Theme::author() const
66−@@ -223,6 +231,13 @@ QString Theme::render(const QString &templateName, const QVariantHash &data, con
67− return result;
68− }
69−
70−+void Theme::addThemeDir(const QString& path)
71−+{
72−+ QDir dir(path);
73−+ dir.cdUp();
74−+ d->absolutePaths << dir.absolutePath();
75−+}
76−+
77− void Theme::addPluginPath(const QString &path)
78− {
79− if (!ThemePrivate::sEngine) {
80−diff --git a/src/grantleetheme.h b/src/grantleetheme.h
81−index a25c27b..be38299 100644
82−--- a/src/grantleetheme.h
83−+++ b/src/grantleetheme.h
84−@@ -48,11 +48,14 @@ public:
85− Q_REQUIRED_RESULT QStringList displayExtraVariables() const;
86− Q_REQUIRED_RESULT QString dirName() const;
87− Q_REQUIRED_RESULT QString absolutePath() const;
88−+ Q_REQUIRED_RESULT QStringList absolutePaths() const;
89− Q_REQUIRED_RESULT QString author() const;
90− Q_REQUIRED_RESULT QString authorEmail() const;
91−
92− Q_REQUIRED_RESULT QString render(const QString &templateName, const QVariantHash &data, const QByteArray &applicationDomain = QByteArray());
93−
94−+ void addThemeDir(const QString&);
95−+
96− static void addPluginPath(const QString &path);
97−
98− private:
99−diff --git a/src/grantleetheme_p.h b/src/grantleetheme_p.h
100−index eb73dcb..00510e9 100644
101−--- a/src/grantleetheme_p.h
102−+++ b/src/grantleetheme_p.h
103−@@ -43,7 +43,7 @@ public:
104− QString description;
105− QString name;
106− QString dirName;
107−- QString absolutePath;
108−+ QStringList absolutePaths;
109− QString author;
110− QString email;
111−
112−diff --git a/src/grantleethememanager.cpp b/src/grantleethememanager.cpp
113−index 606d717..dc99041 100644
114−--- a/src/grantleethememanager.cpp
115−+++ b/src/grantleethememanager.cpp
116−@@ -125,25 +125,18 @@ public:
117−
118− for (const QString &directory : qAsConst(themesDirectories)) {
119− QDirIterator dirIt(directory, QStringList(), QDir::AllDirs | QDir::NoDotAndDotDot);
120−- QStringList alreadyLoadedThemeName;
121− while (dirIt.hasNext()) {
122− dirIt.next();
123− const QString dirName = dirIt.fileName();
124− GrantleeTheme::Theme theme = q->loadTheme(dirIt.filePath(), dirName, defaultDesktopFileName);
125− if (theme.isValid()) {
126− QString themeName = theme.name();
127−- if (alreadyLoadedThemeName.contains(themeName)) {
128−- int i = 2;
129−- const QString originalName(theme.name());
130−- while (alreadyLoadedThemeName.contains(themeName)) {
131−- themeName = originalName + QStringLiteral(" (%1)").arg(i);
132−- ++i;
133−- }
134−- theme.d->name = themeName;
135−+ QMap<QString, GrantleeTheme::Theme>::iterator i = themes.find(dirName);
136−+ if (i != themes.end()) {
137−+ i.value().addThemeDir(dirIt.filePath());
138−+ } else {
139−+ themes.insert(dirName, theme);
140− }
141−- alreadyLoadedThemeName << themeName;
142−- themes.insert(dirName, theme);
143−- //qDebug()<<" theme.name()"<<theme.name();
144− }
145− }
146− watch->addDir(directory);
147−@@ -366,7 +359,7 @@ QString ThemeManager::pathFromThemes(const QString &themesRelativePath, const QS
148− GrantleeTheme::Theme theme = loadTheme(dirIt.filePath(), dirName, defaultDesktopFileName);
149− if (theme.isValid()) {
150− if (dirName == themeName) {
151−- return theme.absolutePath();
152−+ return theme.absolutePaths().first();
153− }
154− }
155− }
pkgs/applications/kde/grantleetheme/seriesdeleted−1
@@ -1 +0,0 @@
1−grantlee-merge-theme-dirs.patch
pkgs/applications/kde/incidenceeditor.nix+2−2
@@ -2,7 +2,7 @@
22 mkDerivation, lib, kdepimTeam,
33 extra-cmake-modules, kdoctools,
44 akonadi, akonadi-mime, calendarsupport, eventviews, kdepim-apps-libs,
5− kdiagram, kldap, kmime, qtbase,
5+ kdiagram, kldap, kmime, pimcommon, qtbase
66}:
77
88mkDerivation {
@@ -14,7 +14,7 @@ mkDerivation {
1414 nativeBuildInputs = [ extra-cmake-modules kdoctools ];
1515 buildInputs = [
1616 akonadi akonadi-mime calendarsupport eventviews kdepim-apps-libs kdiagram
17− kldap kmime qtbase
17+ kldap kmime pimcommon qtbase
1818 ];
1919 outputs = [ "out" "dev" ];
2020}
pkgs/applications/kde/kdepim-apps-libs/default.nix−1
@@ -11,7 +11,6 @@ mkDerivation {
1111 license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
1212 maintainers = kdepimTeam;
1313 };
14− patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
1514 nativeBuildInputs = [ extra-cmake-modules kdoctools ];
1615 buildInputs = [
1716 akonadi akonadi-contacts grantlee grantleetheme kconfig kconfigwidgets
pkgs/applications/kde/kdepim-apps-libs/kdepim-apps-libs-grantlee-merge-theme-dirs.patchdeleted−62
@@ -1,62 +0,0 @@
1−Index: kdepim-apps-libs-17.04.0/kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.cpp
2−===================================================================
3−--- kdepim-apps-libs-17.04.0.orig/kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.cpp
4−+++ kdepim-apps-libs-17.04.0/kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.cpp
5−@@ -50,9 +50,9 @@ public:
6− mTemplateLoader.clear();
7− }
8−
9−- void changeGrantleePath(const QString &path)
10−+ void changeGrantleePath(const QStringList &paths)
11− {
12−- mTemplateLoader->setTemplateDirs(QStringList() << path);
13−+ mTemplateLoader->setTemplateDirs(paths);
14− mEngine->addTemplateLoader(mTemplateLoader);
15−
16− mSelfcontainedTemplate = mEngine->loadByName(QStringLiteral("contactgroup.html"));
17−@@ -86,12 +86,12 @@ GrantleeContactGroupFormatter::~Grantlee
18−
19− void GrantleeContactGroupFormatter::setAbsoluteThemePath(const QString &path)
20− {
21−- d->changeGrantleePath(path);
22−+ d->changeGrantleePath(QStringList(path));
23− }
24−
25− void GrantleeContactGroupFormatter::setGrantleeTheme(const GrantleeTheme::Theme &theme)
26− {
27−- d->changeGrantleePath(theme.absolutePath());
28−+ d->changeGrantleePath(theme.absolutePaths());
29− }
30−
31− inline static void setHashField(QVariantHash &hash, const QString &name, const QString &value)
32−Index: kdepim-apps-libs-17.04.0/kaddressbookgrantlee/src/formatter/grantleecontactformatter.cpp
33−===================================================================
34−--- kdepim-apps-libs-17.04.0.orig/kaddressbookgrantlee/src/formatter/grantleecontactformatter.cpp
35−+++ kdepim-apps-libs-17.04.0/kaddressbookgrantlee/src/formatter/grantleecontactformatter.cpp
36−@@ -74,9 +74,9 @@ public:
37− mTemplateLoader.clear();
38− }
39−
40−- void changeGrantleePath(const QString &path)
41−+ void changeGrantleePath(const QStringList &paths)
42− {
43−- mTemplateLoader->setTemplateDirs(QStringList() << path);
44−+ mTemplateLoader->setTemplateDirs(paths);
45− mEngine->addTemplateLoader(mTemplateLoader);
46−
47− mSelfcontainedTemplate = mEngine->loadByName(QStringLiteral("contact.html"));
48−@@ -112,12 +112,12 @@ GrantleeContactFormatter::~GrantleeConta
49−
50− void GrantleeContactFormatter::setAbsoluteThemePath(const QString &path)
51− {
52−- d->changeGrantleePath(path);
53−+ d->changeGrantleePath(QStringList(path));
54− }
55−
56− void GrantleeContactFormatter::setGrantleeTheme(const GrantleeTheme::Theme &theme)
57− {
58−- d->changeGrantleePath(theme.absolutePath());
59−+ d->changeGrantleePath(theme.absolutePaths());
60− }
61−
62− void GrantleeContactFormatter::setForceDisableQRCode(bool b)
pkgs/applications/kde/kdepim-apps-libs/seriesdeleted−1
@@ -1 +0,0 @@
1−kdepim-apps-libs-grantlee-merge-theme-dirs.patch
pkgs/applications/kde/kdepim-runtime/default.nix+4−4
@@ -4,8 +4,8 @@
44 shared-mime-info,
55 akonadi, akonadi-calendar, akonadi-contacts, akonadi-mime, akonadi-notes,
66 kalarmcal, kcalutils, kcontacts, kdav, kdelibs4support, kidentitymanagement,
7− kimap, kmailtransport, kmbox, kmime, knotifications, knotifyconfig,
8− pimcommon, qtwebengine, libkgapi, qtnetworkauth, qtspeech, qtxmlpatterns,
7+ kimap, kldap, kmailtransport, kmbox, kmime, knotifications, knotifyconfig,
8+ pimcommon, qtwebengine, libkgapi, qca-qt5, qtnetworkauth, qtspeech, qtxmlpatterns,
99}:
1010
1111mkDerivation {
@@ -18,7 +18,7 @@ mkDerivation {
1818 buildInputs = [
1919 akonadi akonadi-calendar akonadi-contacts akonadi-mime akonadi-notes
2020 kalarmcal kcalutils kcontacts kdav kdelibs4support kidentitymanagement kimap
21− kmailtransport kmbox kmime knotifications knotifyconfig qtwebengine
22− pimcommon libkgapi qtnetworkauth qtspeech qtxmlpatterns
21+ kldap kmailtransport kmbox kmime knotifications knotifyconfig qtwebengine
22+ pimcommon libkgapi qca-qt5 qtnetworkauth qtspeech qtxmlpatterns
2323 ];
2424}
pkgs/applications/kde/kmail.nix−1
@@ -27,5 +27,4 @@ mkDerivation {
2727 kdepim-addons
2828 ];
2929 propagatedUserEnvPkgs = [ kdepim-runtime kwallet akonadi ];
30− patches = [ ./kmail.patch ];
3130}
pkgs/applications/kde/kmail.patchdeleted−24
@@ -1,24 +0,0 @@
1−diff --git a/agents/archivemailagent/CMakeLists.txt b/agents/archivemailagent/CMakeLists.txt
2−index 48ed076..9c56896 100644
3−--- a/agents/archivemailagent/CMakeLists.txt
4−+++ b/agents/archivemailagent/CMakeLists.txt
5−@@ -22,6 +22,7 @@ ki18n_wrap_ui(libarchivemailagent_SRCS ui/archivemailwidget.ui )
6− add_library(archivemailagent STATIC ${libarchivemailagent_SRCS})
7− target_link_libraries(archivemailagent
8− KF5::MailCommon
9−+ KF5::Libkdepim
10− KF5::I18n
11− KF5::Notifications
12− KF5::IconThemes
13−diff --git a/agents/followupreminderagent/CMakeLists.txt b/agents/followupreminderagent/CMakeLists.txt
14−index a56b730..83604cf 100644
15−--- a/agents/followupreminderagent/CMakeLists.txt
16−+++ b/agents/followupreminderagent/CMakeLists.txt
17−@@ -23,6 +23,7 @@ target_link_libraries(followupreminderagent
18− KF5::AkonadiMime
19− KF5::AkonadiAgentBase
20− KF5::DBusAddons
21−+ KF5::FollowupReminder
22− KF5::XmlGui
23− KF5::KIOWidgets
24− KF5::Notifications
pkgs/applications/kde/kontact.nix+2−2
@@ -4,7 +4,7 @@
44 qtwebengine,
55 kcmutils, kcrash, kdbusaddons, kparts, kwindowsystem,
66 akonadi, grantleetheme, kdepim-apps-libs, kontactinterface, kpimtextedit,
7− mailcommon, libkdepim
7+ mailcommon, libkdepim, pimcommon
88}:
99
1010mkDerivation {
@@ -18,6 +18,6 @@ mkDerivation {
1818 qtwebengine
1919 kcmutils kcrash kdbusaddons kparts kwindowsystem
2020 akonadi grantleetheme kdepim-apps-libs kontactinterface kpimtextedit
21− mailcommon libkdepim
21+ mailcommon libkdepim pimcommon
2222 ];
2323}
pkgs/applications/kde/mailimporter.nix+2−2
@@ -2,7 +2,7 @@
22 mkDerivation, lib, kdepimTeam,
33 extra-cmake-modules, kdoctools,
44 akonadi, akonadi-mime, karchive, kcompletion, kconfig, kcoreaddons, ki18n,
5− kmime, kxmlgui, libkdepim
5+ kmime, kxmlgui, libkdepim, pimcommon
66}:
77
88mkDerivation {
@@ -14,6 +14,6 @@ mkDerivation {
1414 nativeBuildInputs = [ extra-cmake-modules kdoctools ];
1515 buildInputs = [
1616 akonadi akonadi-mime karchive kcompletion kconfig kcoreaddons ki18n kmime
17− kxmlgui libkdepim
17+ kxmlgui libkdepim pimcommon
1818 ];
1919}
pkgs/applications/kde/pimcommon.nix+5−5
@@ -1,9 +1,9 @@
11{
22 mkDerivation, lib, kdepimTeam,
33 extra-cmake-modules, kdoctools,
4− akonadi, akonadi-contacts, akonadi-mime, grantlee, karchive, kcodecs,
4+ akonadi, akonadi-contacts, akonadi-mime, akonadi-search, grantlee, karchive, kcmutils, kcodecs,
55 kcompletion, kconfig, kconfigwidgets, kcontacts, kdbusaddons,
6− kiconthemes, kimap, kio, kitemmodels, kjobwidgets, knewstuff, kpimtextedit,
6+ kiconthemes, kimap, kio, kitemmodels, kjobwidgets, kldap, knewstuff, kpimtextedit,
77 kpurpose, kwallet, kwindowsystem, libkdepim, qtwebengine
88}:
99
@@ -15,12 +15,12 @@ mkDerivation {
1515 };
1616 nativeBuildInputs = [ extra-cmake-modules kdoctools ];
1717 buildInputs = [
18− akonadi-mime grantlee karchive kcodecs kcompletion kconfigwidgets
19− kdbusaddons kiconthemes kio kitemmodels kjobwidgets knewstuff kpimtextedit
18+ akonadi-mime grantlee karchive kcmutils kcodecs kcompletion kconfigwidgets
19+ kdbusaddons kiconthemes kio kitemmodels kjobwidgets knewstuff kldap kpimtextedit
2020 kpurpose kwallet kwindowsystem libkdepim qtwebengine
2121 ];
2222 propagatedBuildInputs = [
23− akonadi akonadi-contacts kconfig kcontacts kimap
23+ akonadi akonadi-contacts akonadi-search kconfig kcontacts kimap
2424 ];
2525 outputs = [ "out" "dev" ];
2626}
pkgs/applications/kde/srcs.nix+868−876
@@ -4,1739 +4,1731 @@
44
55{
66 akonadi = {
7− version = "20.04.3";
7+ version = "20.08.0";
88 src = fetchurl {
9− url = "${mirror}/stable/release-service/20.04.3/src/akonadi-20.04.3.tar.xz";
10− sha256 = "c91cc53afd2f81fbeed55700cd86010ee865de2594948769410167e6992bdb32";
11− name = "akonadi-20.04.3.tar.xz";
9+ url = "${mirror}/stable/release-service/20.08.0/src/akonadi-20.08.0.tar.xz";
10+ sha256 = "a18ce2d8c9e9fc7f195a7546ee5b7c2541e37ceb7afa0aa25e9ade4f54de2813";
11+ name = "akonadi-20.08.0.tar.xz";
1212 };
1313 };
1414 akonadi-calendar = {
15− version = "20.04.3";
15+ version = "20.08.0";
1616 src = fetchurl {
17− url = "${mirror}/stable/release-service/20.04.3/src/akonadi-calendar-20.04.3.tar.xz";
18− sha256 = "ff8732b0d09b87ce0760b7df02ee390d3c0c064780076ed4c6ed05c52ca634bb";
19− name = "akonadi-calendar-20.04.3.tar.xz";
17+ url = "${mirror}/stable/release-service/20.08.0/src/akonadi-calendar-20.08.0.tar.xz";
18+ sha256 = "4664e2dc6bc0762d999662188c64410fa70be2cef1be221569ec3b9270f80fd8";
19+ name = "akonadi-calendar-20.08.0.tar.xz";
2020 };
2121 };
2222 akonadi-calendar-tools = {
23− version = "20.04.3";
23+ version = "20.08.0";
2424 src = fetchurl {
25− url = "${mirror}/stable/release-service/20.04.3/src/akonadi-calendar-tools-20.04.3.tar.xz";
26− sha256 = "654fec93158e6623a8a81a371fa85d0a18b9f486f6c29926d97a8105a2d65ed2";
27− name = "akonadi-calendar-tools-20.04.3.tar.xz";
25+ url = "${mirror}/stable/release-service/20.08.0/src/akonadi-calendar-tools-20.08.0.tar.xz";
26+ sha256 = "f994db29d374b0fbfd3328fc618df44680b0dfaec1cf9f842a7a9c6ecbb841fa";
27+ name = "akonadi-calendar-tools-20.08.0.tar.xz";
2828 };
2929 };
3030 akonadiconsole = {
31− version = "20.04.3";
31+ version = "20.08.0";
3232 src = fetchurl {
33− url = "${mirror}/stable/release-service/20.04.3/src/akonadiconsole-20.04.3.tar.xz";
34− sha256 = "acd6d63a30af49ec66ff30c3ecdd4e53c4f4a15c4d1e41ffd988366b5106447c";
35− name = "akonadiconsole-20.04.3.tar.xz";
33+ url = "${mirror}/stable/release-service/20.08.0/src/akonadiconsole-20.08.0.tar.xz";
34+ sha256 = "a43c6b756a69301f7756464deea58c72aaefaa1b47f1136959588e8f41b7b91b";
35+ name = "akonadiconsole-20.08.0.tar.xz";
3636 };
3737 };
3838 akonadi-contacts = {
39− version = "20.04.3";
39+ version = "20.08.0";
4040 src = fetchurl {
41− url = "${mirror}/stable/release-service/20.04.3/src/akonadi-contacts-20.04.3.tar.xz";
42− sha256 = "5bcd7acc70631e844ed77e127ff895efb573b62ef79062a6065e24b8826af39d";
43− name = "akonadi-contacts-20.04.3.tar.xz";
41+ url = "${mirror}/stable/release-service/20.08.0/src/akonadi-contacts-20.08.0.tar.xz";
42+ sha256 = "206f0704768a789201ead784e78d7138aba6b50b8f3880369df8799730fca8b4";
43+ name = "akonadi-contacts-20.08.0.tar.xz";
4444 };
4545 };
4646 akonadi-import-wizard = {
47− version = "20.04.3";
47+ version = "20.08.0";
4848 src = fetchurl {
49− url = "${mirror}/stable/release-service/20.04.3/src/akonadi-import-wizard-20.04.3.tar.xz";
50− sha256 = "225615f9d64166ce33718817dfda7aadada5876204c939edc1455ae01b7bf1b2";
51− name = "akonadi-import-wizard-20.04.3.tar.xz";
49+ url = "${mirror}/stable/release-service/20.08.0/src/akonadi-import-wizard-20.08.0.tar.xz";
50+ sha256 = "d742ced3b498f39edff33f7fc73db1e882bf4b1e17b35d5f734f8732cb1e7bde";
51+ name = "akonadi-import-wizard-20.08.0.tar.xz";
5252 };
5353 };
5454 akonadi-mime = {
55− version = "20.04.3";
55+ version = "20.08.0";
5656 src = fetchurl {
57− url = "${mirror}/stable/release-service/20.04.3/src/akonadi-mime-20.04.3.tar.xz";
58− sha256 = "92e9bab71f87c0de8e3437dd4779054332826fe2522c36a7c038c789b207f7ac";
59− name = "akonadi-mime-20.04.3.tar.xz";
57+ url = "${mirror}/stable/release-service/20.08.0/src/akonadi-mime-20.08.0.tar.xz";
58+ sha256 = "c0a709e25fef86f778ef21adbf78c6beab203f4f4a8d9f5e17a4d3175fe01d33";
59+ name = "akonadi-mime-20.08.0.tar.xz";
6060 };
6161 };
6262 akonadi-notes = {
63− version = "20.04.3";
63+ version = "20.08.0";
6464 src = fetchurl {
65− url = "${mirror}/stable/release-service/20.04.3/src/akonadi-notes-20.04.3.tar.xz";
66− sha256 = "e1b4b6d2347038774589a9a8a935e4697d248008dfd2b5b496e6555974c96a55";
67− name = "akonadi-notes-20.04.3.tar.xz";
65+ url = "${mirror}/stable/release-service/20.08.0/src/akonadi-notes-20.08.0.tar.xz";
66+ sha256 = "aeb348d6af30e8775d60cab0894634c6e5ac95a3baf97f69407602dea5944525";
67+ name = "akonadi-notes-20.08.0.tar.xz";
6868 };
6969 };
7070 akonadi-search = {
71− version = "20.04.3";
71+ version = "20.08.0";
7272 src = fetchurl {
73− url = "${mirror}/stable/release-service/20.04.3/src/akonadi-search-20.04.3.tar.xz";
74− sha256 = "21ca09d39d6e550ca01e80f1a112557f00387e014763b1f47824d53d41cb5bdf";
75− name = "akonadi-search-20.04.3.tar.xz";
73+ url = "${mirror}/stable/release-service/20.08.0/src/akonadi-search-20.08.0.tar.xz";
74+ sha256 = "06974398ddd6cbd42d0cb9dc3cac4b6ad6bdc8062d1f94523a973ed702b40e2f";
75+ name = "akonadi-search-20.08.0.tar.xz";
7676 };
7777 };
7878 akregator = {
79− version = "20.04.3";
79+ version = "20.08.0";
8080 src = fetchurl {
81− url = "${mirror}/stable/release-service/20.04.3/src/akregator-20.04.3.tar.xz";
82− sha256 = "e175a1b60270ad76afaf16e8e5630d237cdc068c06d0ae93591494b18ad4584c";
83− name = "akregator-20.04.3.tar.xz";
81+ url = "${mirror}/stable/release-service/20.08.0/src/akregator-20.08.0.tar.xz";
82+ sha256 = "e8dbef1b8e8c165e824f108a33f9d2a6a0ea8668299f808fcc2ce2b4d398dcf5";
83+ name = "akregator-20.08.0.tar.xz";
8484 };
8585 };
8686 analitza = {
87− version = "20.04.3";
87+ version = "20.08.0";
8888 src = fetchurl {
89− url = "${mirror}/stable/release-service/20.04.3/src/analitza-20.04.3.tar.xz";
90− sha256 = "f9d1873c6190dc1eaeb6fad97d4197256342e0b729f7e8199e15bfb495f854b7";
91− name = "analitza-20.04.3.tar.xz";
89+ url = "${mirror}/stable/release-service/20.08.0/src/analitza-20.08.0.tar.xz";
90+ sha256 = "51bc5ecd31e557fcf5660e57458aa866ee44e386550bb2c37c22fae252405aa1";
91+ name = "analitza-20.08.0.tar.xz";
9292 };
9393 };
9494 ark = {
95− version = "20.04.3";
95+ version = "20.08.0";
9696 src = fetchurl {
97− url = "${mirror}/stable/release-service/20.04.3/src/ark-20.04.3.tar.xz";
98− sha256 = "e7251b0b6f12291ffbaa328bf7f8e101ebeef6fd110dabbcf76d8ad7cfd305bc";
99− name = "ark-20.04.3.tar.xz";
97+ url = "${mirror}/stable/release-service/20.08.0/src/ark-20.08.0.tar.xz";
98+ sha256 = "7627ffa17466d31dfdedabaa07b491ce14b46041d04f8b20316a0fa731fab098";
99+ name = "ark-20.08.0.tar.xz";
100100 };
101101 };
102102 artikulate = {
103− version = "20.04.3";
103+ version = "20.08.0";
104104 src = fetchurl {
105− url = "${mirror}/stable/release-service/20.04.3/src/artikulate-20.04.3.tar.xz";
106− sha256 = "394e93df2b370ba1e6621b2bcf871be42efde6fa2189de29d4c8198e387767ea";
107− name = "artikulate-20.04.3.tar.xz";
105+ url = "${mirror}/stable/release-service/20.08.0/src/artikulate-20.08.0.tar.xz";
106+ sha256 = "30ef4eedabebccfb600eec1ba7bc691e8ad4e0de8d7fdcf56a630714d6b9848b";
107+ name = "artikulate-20.08.0.tar.xz";
108108 };
109109 };
110110 audiocd-kio = {
111− version = "20.04.3";
111+ version = "20.08.0";
112112 src = fetchurl {
113− url = "${mirror}/stable/release-service/20.04.3/src/audiocd-kio-20.04.3.tar.xz";
114− sha256 = "af8782771a5d48fb2e3ba9703f8b8e542f5fddd418ca293d23a6eb83ebe86929";
115− name = "audiocd-kio-20.04.3.tar.xz";
113+ url = "${mirror}/stable/release-service/20.08.0/src/audiocd-kio-20.08.0.tar.xz";
114+ sha256 = "7a01d5b89f5271ee1eba203e15c46b146879e4651643ec6348e1033c0ffdc8c7";
115+ name = "audiocd-kio-20.08.0.tar.xz";
116116 };
117117 };
118118 baloo-widgets = {
119− version = "20.04.3";
119+ version = "20.08.0";
120120 src = fetchurl {
121− url = "${mirror}/stable/release-service/20.04.3/src/baloo-widgets-20.04.3.tar.xz";
122− sha256 = "29394f9d47407074a5ec0f85ceade5dcc8c03f0d9a83c1e339310f19f7711ae3";
123− name = "baloo-widgets-20.04.3.tar.xz";
121+ url = "${mirror}/stable/release-service/20.08.0/src/baloo-widgets-20.08.0.tar.xz";
122+ sha256 = "37800c3cde7e2a9cfbab2e11f21dd1ae76b2a31b687802bc45027966a8734985";
123+ name = "baloo-widgets-20.08.0.tar.xz";
124124 };
125125 };
126126 blinken = {
127− version = "20.04.3";
127+ version = "20.08.0";
128128 src = fetchurl {
129− url = "${mirror}/stable/release-service/20.04.3/src/blinken-20.04.3.tar.xz";
130− sha256 = "d6901fe40768ba8319609bfd143b2d1c585b04a148aedcb4b358b041db7f1afb";
131− name = "blinken-20.04.3.tar.xz";
129+ url = "${mirror}/stable/release-service/20.08.0/src/blinken-20.08.0.tar.xz";
130+ sha256 = "0a08f5fc8e0c100956bb99910265d9630191e462f8f812842e79b64e76055c1c";
131+ name = "blinken-20.08.0.tar.xz";
132132 };
133133 };
134134 bomber = {
135− version = "20.04.3";
135+ version = "20.08.0";
136136 src = fetchurl {
137− url = "${mirror}/stable/release-service/20.04.3/src/bomber-20.04.3.tar.xz";
138− sha256 = "b292c11ebfb4311420ce6b9a4b132a437d061946e8eb08556fec89bb84c23428";
139− name = "bomber-20.04.3.tar.xz";
137+ url = "${mirror}/stable/release-service/20.08.0/src/bomber-20.08.0.tar.xz";
138+ sha256 = "91b4ff0e0615cd42e36c6755d30ee62b74d6c5ae309512b9f8f347c34786ec47";
139+ name = "bomber-20.08.0.tar.xz";
140140 };
141141 };
142142 bovo = {
143− version = "20.04.3";
143+ version = "20.08.0";
144144 src = fetchurl {
145− url = "${mirror}/stable/release-service/20.04.3/src/bovo-20.04.3.tar.xz";
146− sha256 = "5365c0fd5a57814f224585e4331be129414d1f5d51d2b90bac8421df4ae5f300";
147− name = "bovo-20.04.3.tar.xz";
145+ url = "${mirror}/stable/release-service/20.08.0/src/bovo-20.08.0.tar.xz";
146+ sha256 = "f66997324d596095b30442b2446a3c581834ad60d1a27fd7f7f394549f2418a8";
147+ name = "bovo-20.08.0.tar.xz";
148148 };
149149 };
150150 calendarsupport = {
151− version = "20.04.3";
151+ version = "20.08.0";
152152 src = fetchurl {
153− url = "${mirror}/stable/release-service/20.04.3/src/calendarsupport-20.04.3.tar.xz";
154− sha256 = "40b069e1561fac49f46dd0504af0ac459010ac98f30748b8f15a50ca1fd35b5b";
155− name = "calendarsupport-20.04.3.tar.xz";
153+ url = "${mirror}/stable/release-service/20.08.0/src/calendarsupport-20.08.0.tar.xz";
154+ sha256 = "1c1682d46f248b092062a461cdefec9da3733cb0ee1a590b7c48c4977028e977";
155+ name = "calendarsupport-20.08.0.tar.xz";
156156 };
157157 };
158158 cantor = {
159− version = "20.04.3";
159+ version = "20.08.0";
160160 src = fetchurl {
161− url = "${mirror}/stable/release-service/20.04.3/src/cantor-20.04.3.tar.xz";
162− sha256 = "ff589ccb48016fd784de9883fe19ee0c2c450e3993e9cc5f7dc499448db0c6a4";
163− name = "cantor-20.04.3.tar.xz";
161+ url = "${mirror}/stable/release-service/20.08.0/src/cantor-20.08.0.tar.xz";
162+ sha256 = "1d4babf783f53929f0ea42380dacdb7ab989b66383dd3c37ab22787a26715082";
163+ name = "cantor-20.08.0.tar.xz";
164164 };
165165 };
166166 cervisia = {
167− version = "20.04.3";
167+ version = "20.08.0";
168168 src = fetchurl {
169− url = "${mirror}/stable/release-service/20.04.3/src/cervisia-20.04.3.tar.xz";
170− sha256 = "3e2aac0a08c01d9ea5c5814e739f082ec5a510cd8f0f6bce37cfff9130b0f078";
171− name = "cervisia-20.04.3.tar.xz";
169+ url = "${mirror}/stable/release-service/20.08.0/src/cervisia-20.08.0.tar.xz";
170+ sha256 = "6e10acc196661b7d1873e370eb67486386e25e4d6b7946ade8479b70fba34d66";
171+ name = "cervisia-20.08.0.tar.xz";
172172 };
173173 };
174174 dolphin = {
175− version = "20.04.3";
175+ version = "20.08.0";
176176 src = fetchurl {
177− url = "${mirror}/stable/release-service/20.04.3/src/dolphin-20.04.3.tar.xz";
178− sha256 = "5e493e898e02005780b59474f506904742625b50e4669c113906d4f30daa863e";
179− name = "dolphin-20.04.3.tar.xz";
177+ url = "${mirror}/stable/release-service/20.08.0/src/dolphin-20.08.0.tar.xz";
178+ sha256 = "fe5a68d9afd0771ba9ffc2d5d79e7bc43da85fd3ee3c2493a9a2d5c359c3cd6f";
179+ name = "dolphin-20.08.0.tar.xz";
180180 };
181181 };
182182 dolphin-plugins = {
183− version = "20.04.3";
183+ version = "20.08.0";
184184 src = fetchurl {
185− url = "${mirror}/stable/release-service/20.04.3/src/dolphin-plugins-20.04.3.tar.xz";
186− sha256 = "f0dad66e7302711e136b0253fb73dbf16bc9facdbb4ad617207fb818fc84130a";
187− name = "dolphin-plugins-20.04.3.tar.xz";
185+ url = "${mirror}/stable/release-service/20.08.0/src/dolphin-plugins-20.08.0.tar.xz";
186+ sha256 = "a8a0c35f75eb8e63ee90f44ce930babceff86676b8bba213c82b7ffb29e526bb";
187+ name = "dolphin-plugins-20.08.0.tar.xz";
188188 };
189189 };
190190 dragon = {
191− version = "20.04.3";
191+ version = "20.08.0";
192192 src = fetchurl {
193− url = "${mirror}/stable/release-service/20.04.3/src/dragon-20.04.3.tar.xz";
194− sha256 = "2b0d6414f2cea9f2a0b2ebddeffa7e5342db96fac34b2a00439fca5784f6131f";
195− name = "dragon-20.04.3.tar.xz";
193+ url = "${mirror}/stable/release-service/20.08.0/src/dragon-20.08.0.tar.xz";
194+ sha256 = "0e3a540b3f93118a9a17f2c6f675d0f007b123266c6e71a27b5ddb6b9a7e14a8";
195+ name = "dragon-20.08.0.tar.xz";
196196 };
197197 };
198198 elisa = {
199− version = "20.04.3";
199+ version = "20.08.0";
200200 src = fetchurl {
201− url = "${mirror}/stable/release-service/20.04.3/src/elisa-20.04.3.tar.xz";
202− sha256 = "d99dc2eb80d4219d08c72e612ac07cbb6c91c2eff365b49da69cbc3c1e70885b";
203− name = "elisa-20.04.3.tar.xz";
201+ url = "${mirror}/stable/release-service/20.08.0/src/elisa-20.08.0.tar.xz";
202+ sha256 = "acbff9f3c3d26c2a2c249974ccd8ff0bdeb22148a8a5b72e1199f1ec2f9d712e";
203+ name = "elisa-20.08.0.tar.xz";
204204 };
205205 };
206206 eventviews = {
207− version = "20.04.3";
207+ version = "20.08.0";
208208 src = fetchurl {
209− url = "${mirror}/stable/release-service/20.04.3/src/eventviews-20.04.3.tar.xz";
210− sha256 = "f10d43f57e62d68b6d0b41e9e3442baee8b68664e085f6e4347ac6adc1af32ff";
211− name = "eventviews-20.04.3.tar.xz";
209+ url = "${mirror}/stable/release-service/20.08.0/src/eventviews-20.08.0.tar.xz";
210+ sha256 = "205607d89d739f1efa4472303206647d04fba4e9d80610800a4a229676ede732";
211+ name = "eventviews-20.08.0.tar.xz";
212212 };
213213 };
214214 ffmpegthumbs = {
215− version = "20.04.3";
215+ version = "20.08.0";
216216 src = fetchurl {
217− url = "${mirror}/stable/release-service/20.04.3/src/ffmpegthumbs-20.04.3.tar.xz";
218− sha256 = "089305a75d32cf8bf1b9279623b524912af78aa538379dcccf998ca1ab165164";
219− name = "ffmpegthumbs-20.04.3.tar.xz";
217+ url = "${mirror}/stable/release-service/20.08.0/src/ffmpegthumbs-20.08.0.tar.xz";
218+ sha256 = "84c3a8f064423d7e51a57b9ed32a9f4fdbca73f7fa7e47a6289d9b516f1ba9ff";
219+ name = "ffmpegthumbs-20.08.0.tar.xz";
220220 };
221221 };
222222 filelight = {
223− version = "20.04.3";
223+ version = "20.08.0";
224224 src = fetchurl {
225− url = "${mirror}/stable/release-service/20.04.3/src/filelight-20.04.3.tar.xz";
226− sha256 = "d0939d0a04424978c06b675ac784c6a1ecbccbb67a31f5af661c6716bf38f0a4";
227− name = "filelight-20.04.3.tar.xz";
225+ url = "${mirror}/stable/release-service/20.08.0/src/filelight-20.08.0.tar.xz";
226+ sha256 = "29ea650f7b0f1863ea6caeca39362eff652edee755963967eb4653665a2499b4";
227+ name = "filelight-20.08.0.tar.xz";
228228 };
229229 };
230230 granatier = {
231− version = "20.04.3";
231+ version = "20.08.0";
232232 src = fetchurl {
233− url = "${mirror}/stable/release-service/20.04.3/src/granatier-20.04.3.tar.xz";
234− sha256 = "9d06047f613a03b32d603e90bd14ca2873be9da9b4b17b98a65242e9855a7aaf";
235− name = "granatier-20.04.3.tar.xz";
233+ url = "${mirror}/stable/release-service/20.08.0/src/granatier-20.08.0.tar.xz";
234+ sha256 = "9fd034875c2ac80a089145c47f36b3b97ed69eaa1693aa83bc5bd76561096efd";
235+ name = "granatier-20.08.0.tar.xz";
236236 };
237237 };
238238 grantlee-editor = {
239− version = "20.04.3";
239+ version = "20.08.0";
240240 src = fetchurl {
241− url = "${mirror}/stable/release-service/20.04.3/src/grantlee-editor-20.04.3.tar.xz";
242− sha256 = "1a3e4ece1a37e11735291bbec99314bc0ede0714377db916ed1266ec19325ef5";
243− name = "grantlee-editor-20.04.3.tar.xz";
241+ url = "${mirror}/stable/release-service/20.08.0/src/grantlee-editor-20.08.0.tar.xz";
242+ sha256 = "08aeac1c6bacabdeb4e4273efc5c5f4995454c45bd51069b3ef6105237b84afa";
243+ name = "grantlee-editor-20.08.0.tar.xz";
244244 };
245245 };
246246 grantleetheme = {
247− version = "20.04.3";
247+ version = "20.08.0";
248248 src = fetchurl {
249− url = "${mirror}/stable/release-service/20.04.3/src/grantleetheme-20.04.3.tar.xz";
250− sha256 = "c5b2e4b1d5e14b39d2e66d160ba0b86c16f86e921abf578640bf1576a5f25eb3";
251− name = "grantleetheme-20.04.3.tar.xz";
249+ url = "${mirror}/stable/release-service/20.08.0/src/grantleetheme-20.08.0.tar.xz";
250+ sha256 = "7e86d2f9f5a725f988211f676da2c4191ed6df55418135f3a54da5d687d63e8e";
251+ name = "grantleetheme-20.08.0.tar.xz";
252252 };
253253 };
254254 gwenview = {
255− version = "20.04.3";
255+ version = "20.08.0";
256256 src = fetchurl {
257− url = "${mirror}/stable/release-service/20.04.3/src/gwenview-20.04.3.tar.xz";
258− sha256 = "d176021d6784e33cb0aaa6fa2517e81f9eac237079d2a06d6b55b8f4b04e8bd9";
259− name = "gwenview-20.04.3.tar.xz";
257+ url = "${mirror}/stable/release-service/20.08.0/src/gwenview-20.08.0.tar.xz";
258+ sha256 = "e7a6d96801bfc41156292faac915691b929d4da641cf04839c74a68debc95c44";
259+ name = "gwenview-20.08.0.tar.xz";
260260 };
261261 };
262262 incidenceeditor = {
263− version = "20.04.3";
263+ version = "20.08.0";
264264 src = fetchurl {
265− url = "${mirror}/stable/release-service/20.04.3/src/incidenceeditor-20.04.3.tar.xz";
266− sha256 = "b3c70c926acab7a0585bf2bf7575ebe4d04c439fc49af073d0cb599f3b9e57c2";
267− name = "incidenceeditor-20.04.3.tar.xz";
265+ url = "${mirror}/stable/release-service/20.08.0/src/incidenceeditor-20.08.0.tar.xz";
266+ sha256 = "5f23343959cd672570a4a3439be0e8b27c413b9747a17bd04138359c43dac678";
267+ name = "incidenceeditor-20.08.0.tar.xz";
268268 };
269269 };
270270 juk = {
271− version = "20.04.3";
271+ version = "20.08.0";
272272 src = fetchurl {
273− url = "${mirror}/stable/release-service/20.04.3/src/juk-20.04.3.tar.xz";
274− sha256 = "2566257f83db74d69b95e109146a82e1e03966b3592c891b48e81cf2a13d812b";
275− name = "juk-20.04.3.tar.xz";
273+ url = "${mirror}/stable/release-service/20.08.0/src/juk-20.08.0.tar.xz";
274+ sha256 = "ec00ef054768efc64b5b0da69fba90104689b314a064f52989d1c6dbd73dad1b";
275+ name = "juk-20.08.0.tar.xz";
276276 };
277277 };
278278 k3b = {
279− version = "20.04.3";
279+ version = "20.08.0";
280280 src = fetchurl {
281− url = "${mirror}/stable/release-service/20.04.3/src/k3b-20.04.3.tar.xz";
282− sha256 = "562dc91be0a992ef0f139310bfd941202e4ae273e11b754d02a8cf6f85f20420";
283− name = "k3b-20.04.3.tar.xz";
281+ url = "${mirror}/stable/release-service/20.08.0/src/k3b-20.08.0.tar.xz";
282+ sha256 = "d10ac6bfa89744ec857ce7c65d5d7eae5f26ce151341d6f393b9a141cc05540a";
283+ name = "k3b-20.08.0.tar.xz";
284284 };
285285 };
286286 kaccounts-integration = {
287− version = "20.04.3";
287+ version = "20.08.0";
288288 src = fetchurl {
289− url = "${mirror}/stable/release-service/20.04.3/src/kaccounts-integration-20.04.3.tar.xz";
290− sha256 = "57661418d6fe58f9c3d308ba8804e5bc83312bba0967e13bf144b1a7dba9b36d";
291− name = "kaccounts-integration-20.04.3.tar.xz";
289+ url = "${mirror}/stable/release-service/20.08.0/src/kaccounts-integration-20.08.0.tar.xz";
290+ sha256 = "b1d0912ec7771be6c04f4cf635d9196acee1c63f47fe1814a5da2002196125a0";
291+ name = "kaccounts-integration-20.08.0.tar.xz";
292292 };
293293 };
294294 kaccounts-providers = {
295− version = "20.04.3";
295+ version = "20.08.0";
296296 src = fetchurl {
297− url = "${mirror}/stable/release-service/20.04.3/src/kaccounts-providers-20.04.3.tar.xz";
298− sha256 = "ffeeac1283c453a4bbd4249cbe314eb7f9800a9cbedce192fdb1f12f30670e3e";
299− name = "kaccounts-providers-20.04.3.tar.xz";
297+ url = "${mirror}/stable/release-service/20.08.0/src/kaccounts-providers-20.08.0.tar.xz";
298+ sha256 = "5a2293e124839dec3ca5cbe72548ff01ce3c0f7edc5c6dd78ca4d8a27054f574";
299+ name = "kaccounts-providers-20.08.0.tar.xz";
300300 };
301301 };
302302 kaddressbook = {
303− version = "20.04.3";
303+ version = "20.08.0";
304304 src = fetchurl {
305− url = "${mirror}/stable/release-service/20.04.3/src/kaddressbook-20.04.3.tar.xz";
306− sha256 = "d1c8f6af88572548a90756963921a8555df239467858432079a37788f4980b58";
307− name = "kaddressbook-20.04.3.tar.xz";
305+ url = "${mirror}/stable/release-service/20.08.0/src/kaddressbook-20.08.0.tar.xz";
306+ sha256 = "e34b4515a5721b9dd1d9d391acb81905bc2b6a0d219347c7dac87ebbb5b7b921";
307+ name = "kaddressbook-20.08.0.tar.xz";
308308 };
309309 };
310310 kajongg = {
311− version = "20.04.3";
311+ version = "20.08.0";
312312 src = fetchurl {
313− url = "${mirror}/stable/release-service/20.04.3/src/kajongg-20.04.3.tar.xz";
314− sha256 = "0175fb44b4f092fa318113a576f41e0a29dc1f5d7dfbf0ca7877a5c46a095d00";
315− name = "kajongg-20.04.3.tar.xz";
313+ url = "${mirror}/stable/release-service/20.08.0/src/kajongg-20.08.0.tar.xz";
314+ sha256 = "1813ff2d960f96d63c5680b4a7e7dca6249146876c7a6d203eb0f9768eca244b";
315+ name = "kajongg-20.08.0.tar.xz";
316316 };
317317 };
318318 kalarm = {
319− version = "20.04.3";
319+ version = "20.08.0";
320320 src = fetchurl {
321− url = "${mirror}/stable/release-service/20.04.3/src/kalarm-20.04.3.tar.xz";
322− sha256 = "71f94af998495c759b9c2e7bf2092887748301c993f76dbf36f6ac9e4bb2a1f5";
323− name = "kalarm-20.04.3.tar.xz";
321+ url = "${mirror}/stable/release-service/20.08.0/src/kalarm-20.08.0.tar.xz";
322+ sha256 = "02c1a62f603cc6917d0f95eff4aaa23cf808395bed9b1dad21817f6c32256748";
323+ name = "kalarm-20.08.0.tar.xz";
324324 };
325325 };
326326 kalarmcal = {
327− version = "20.04.3";
327+ version = "20.08.0";
328328 src = fetchurl {
329− url = "${mirror}/stable/release-service/20.04.3/src/kalarmcal-20.04.3.tar.xz";
330− sha256 = "19c9aab451f95f7689d8b18059e84f189b11cf15bb7f60fe55402b944512692e";
331− name = "kalarmcal-20.04.3.tar.xz";
329+ url = "${mirror}/stable/release-service/20.08.0/src/kalarmcal-20.08.0.tar.xz";
330+ sha256 = "bd4f048a976829ee5768b9d26aebe4efbbfa0a2991486c8f57f250fe4198532c";
331+ name = "kalarmcal-20.08.0.tar.xz";
332332 };
333333 };
334334 kalgebra = {
335− version = "20.04.3";
335+ version = "20.08.0";
336336 src = fetchurl {
337− url = "${mirror}/stable/release-service/20.04.3/src/kalgebra-20.04.3.tar.xz";
338− sha256 = "988ae02433e961a84da35498aa6ff88fbcc36f8f12d55457116935740d3f1475";
339− name = "kalgebra-20.04.3.tar.xz";
337+ url = "${mirror}/stable/release-service/20.08.0/src/kalgebra-20.08.0.tar.xz";
338+ sha256 = "658fd3eae218b6b73dbf3ff2edb59c511bfb11d549b7e41a5224c62b4bfedc2c";
339+ name = "kalgebra-20.08.0.tar.xz";
340340 };
341341 };
342342 kalzium = {
343− version = "20.04.3";
343+ version = "20.08.0";
344344 src = fetchurl {
345− url = "${mirror}/stable/release-service/20.04.3/src/kalzium-20.04.3.tar.xz";
346− sha256 = "b884fc8c13c3618a73e3ecfd265660e7045245059a951aff32c12ee5981902ca";
347− name = "kalzium-20.04.3.tar.xz";
345+ url = "${mirror}/stable/release-service/20.08.0/src/kalzium-20.08.0.tar.xz";
346+ sha256 = "e9b402ea91ac87a19cef6e686bfb8507f6afac0d19c5dc7de777475d5db1b06f";
347+ name = "kalzium-20.08.0.tar.xz";
348348 };
349349 };
350350 kamera = {
351− version = "20.04.3";
351+ version = "20.08.0";
352352 src = fetchurl {
353− url = "${mirror}/stable/release-service/20.04.3/src/kamera-20.04.3.tar.xz";
354− sha256 = "dcac50db634fccb3e602abb575322342d50c56832a61731546cf1fec552d5b3e";
355− name = "kamera-20.04.3.tar.xz";
353+ url = "${mirror}/stable/release-service/20.08.0/src/kamera-20.08.0.tar.xz";
354+ sha256 = "ca4194b99703a1908d4991538419c49fc28f5df8cb32f7c07a20454f4918f12a";
355+ name = "kamera-20.08.0.tar.xz";
356356 };
357357 };
358358 kamoso = {
359− version = "20.04.3";
359+ version = "20.08.0";
360360 src = fetchurl {
361− url = "${mirror}/stable/release-service/20.04.3/src/kamoso-20.04.3.tar.xz";
362− sha256 = "9b6410f75bd47901cdd787ea5a7a7bc93da16837f955f27de9e609d9e7b4b896";
363− name = "kamoso-20.04.3.tar.xz";
361+ url = "${mirror}/stable/release-service/20.08.0/src/kamoso-20.08.0.tar.xz";
362+ sha256 = "c27ea592a70d7634740973e860acdf8cda49c0880a13f623c315fbc02cc3d592";
363+ name = "kamoso-20.08.0.tar.xz";
364364 };
365365 };
366366 kanagram = {
367− version = "20.04.3";
367+ version = "20.08.0";
368368 src = fetchurl {
369− url = "${mirror}/stable/release-service/20.04.3/src/kanagram-20.04.3.tar.xz";
370− sha256 = "7fe8fde45d54b09118238f4a7a63aa2f6fc24ae14c49739ffe71cffc44bc5a95";
371− name = "kanagram-20.04.3.tar.xz";
369+ url = "${mirror}/stable/release-service/20.08.0/src/kanagram-20.08.0.tar.xz";
370+ sha256 = "d7fc300883bb5420ce1f9bc2ec52324a74b775a8ecea12b904afedc0a6af6ca3";
371+ name = "kanagram-20.08.0.tar.xz";
372372 };
373373 };
374374 kapman = {
375− version = "20.04.3";
375+ version = "20.08.0";
376376 src = fetchurl {
377− url = "${mirror}/stable/release-service/20.04.3/src/kapman-20.04.3.tar.xz";
378− sha256 = "e3c34e94a204e6d9a4ebb35c415b8c5707313fba746867f2984fd0e95926d529";
379− name = "kapman-20.04.3.tar.xz";
377+ url = "${mirror}/stable/release-service/20.08.0/src/kapman-20.08.0.tar.xz";
378+ sha256 = "24ad6ae146c0770fe4498983604b25ced25eab98b4a94898311553f7e4a97475";
379+ name = "kapman-20.08.0.tar.xz";
380380 };
381381 };
382382 kapptemplate = {
383− version = "20.04.3";
383+ version = "20.08.0";
384384 src = fetchurl {
385− url = "${mirror}/stable/release-service/20.04.3/src/kapptemplate-20.04.3.tar.xz";
386− sha256 = "72ce76b66ae503591a60081f334c2d2a0e9338a125b64de413e1e4ab81c29013";
387− name = "kapptemplate-20.04.3.tar.xz";
385+ url = "${mirror}/stable/release-service/20.08.0/src/kapptemplate-20.08.0.tar.xz";
386+ sha256 = "ef92d56a155f1218d28a63167e67f4fc7bbdf9ba63344bef9512b2e1435f322d";
387+ name = "kapptemplate-20.08.0.tar.xz";
388388 };
389389 };
390390 kate = {
391− version = "20.04.3";
391+ version = "20.08.0";
392392 src = fetchurl {
393− url = "${mirror}/stable/release-service/20.04.3/src/kate-20.04.3.tar.xz";
394− sha256 = "38d92f2b95032cd20bd5b78ada2ee25fc9c06593047d063c28419df0839bc334";
395− name = "kate-20.04.3.tar.xz";
393+ url = "${mirror}/stable/release-service/20.08.0/src/kate-20.08.0.tar.xz";
394+ sha256 = "aa0695f40cf9d491a08338f1c9b4331dfbb63cb311cf815ed0499b38940fa0db";
395+ name = "kate-20.08.0.tar.xz";
396396 };
397397 };
398398 katomic = {
399− version = "20.04.3";
399+ version = "20.08.0";
400400 src = fetchurl {
401− url = "${mirror}/stable/release-service/20.04.3/src/katomic-20.04.3.tar.xz";
402− sha256 = "9ced288f46af528aa31931a0ab1a1b2d346d63ce6729e508163bf3370dbd261f";
403− name = "katomic-20.04.3.tar.xz";
401+ url = "${mirror}/stable/release-service/20.08.0/src/katomic-20.08.0.tar.xz";
402+ sha256 = "006c55f3f688f70b51cf89589843037f09d30e826cf1a30ec441e84724ad27ab";
403+ name = "katomic-20.08.0.tar.xz";
404404 };
405405 };
406406 kbackup = {
407− version = "20.04.3";
407+ version = "20.08.0";
408408 src = fetchurl {
409− url = "${mirror}/stable/release-service/20.04.3/src/kbackup-20.04.3.tar.xz";
410− sha256 = "0360f5b5d512a48975e09e5c1d2f035b7c2e1ead00b9b9f76059b76eb4499f92";
411− name = "kbackup-20.04.3.tar.xz";
409+ url = "${mirror}/stable/release-service/20.08.0/src/kbackup-20.08.0.tar.xz";
410+ sha256 = "5d5882df3dfa6a078940ea6e292fd1c1aba7c016426e36d87f0d7f8c149bcd59";
411+ name = "kbackup-20.08.0.tar.xz";
412412 };
413413 };
414414 kblackbox = {
415− version = "20.04.3";
415+ version = "20.08.0";
416416 src = fetchurl {
417− url = "${mirror}/stable/release-service/20.04.3/src/kblackbox-20.04.3.tar.xz";
418− sha256 = "8bf24ceaf33fabd3ec3030b42565dcbb2d8b282553a3222d741b0b43d70d3a38";
419− name = "kblackbox-20.04.3.tar.xz";
417+ url = "${mirror}/stable/release-service/20.08.0/src/kblackbox-20.08.0.tar.xz";
418+ sha256 = "0f6d0341e5bbc16d2d0ec9dc14027ebc91fdda2b9eb2ac6061055a60541db358";
419+ name = "kblackbox-20.08.0.tar.xz";
420420 };
421421 };
422422 kblocks = {
423− version = "20.04.3";
423+ version = "20.08.0";
424424 src = fetchurl {
425− url = "${mirror}/stable/release-service/20.04.3/src/kblocks-20.04.3.tar.xz";
426− sha256 = "128cbd7751883cc46d3bc0fcf3c2fc40d8d87631ad54c90459727da209237609";
427− name = "kblocks-20.04.3.tar.xz";
428− };
429− };
430− kblog = {
431− version = "20.04.3";
432− src = fetchurl {
433− url = "${mirror}/stable/release-service/20.04.3/src/kblog-20.04.3.tar.xz";
434− sha256 = "5932a8ba3ec33f13aec201252abb6d0712740f52af03747e9eb0f6c0764cb9b4";
435− name = "kblog-20.04.3.tar.xz";
425+ url = "${mirror}/stable/release-service/20.08.0/src/kblocks-20.08.0.tar.xz";
426+ sha256 = "041904451ce1aec7da113ed4fb442abd92083b8d7522b1c91e05933d574fba8e";
427+ name = "kblocks-20.08.0.tar.xz";
436428 };
437429 };
438430 kbounce = {
439− version = "20.04.3";
431+ version = "20.08.0";
440432 src = fetchurl {
441− url = "${mirror}/stable/release-service/20.04.3/src/kbounce-20.04.3.tar.xz";
442− sha256 = "21977895752b7a33484463cf3fe47ff6f4d5ad4bb8ee824b92b309c5c0ee3837";
443− name = "kbounce-20.04.3.tar.xz";
433+ url = "${mirror}/stable/release-service/20.08.0/src/kbounce-20.08.0.tar.xz";
434+ sha256 = "7949b9ea43ca93b13378c018d8a532c200233f5f3d2acaba3c74d90f3ed79ccb";
435+ name = "kbounce-20.08.0.tar.xz";
444436 };
445437 };
446438 kbreakout = {
447− version = "20.04.3";
439+ version = "20.08.0";
448440 src = fetchurl {
449− url = "${mirror}/stable/release-service/20.04.3/src/kbreakout-20.04.3.tar.xz";
450− sha256 = "4e9bd79060d826d99573e3db364005b32d70643b0fe0d7c5e427fb1c8a34896b";
451− name = "kbreakout-20.04.3.tar.xz";
441+ url = "${mirror}/stable/release-service/20.08.0/src/kbreakout-20.08.0.tar.xz";
442+ sha256 = "0aa63a16d45ca432065777352f69a7fc0993fd0077f14e05cb89b06a1b69ad69";
443+ name = "kbreakout-20.08.0.tar.xz";
452444 };
453445 };
454446 kbruch = {
455− version = "20.04.3";
447+ version = "20.08.0";
456448 src = fetchurl {
457− url = "${mirror}/stable/release-service/20.04.3/src/kbruch-20.04.3.tar.xz";
458− sha256 = "7381df5deb97580a0d60881d591b3d18715c8ad5692a580aebe82a836f1bb8df";
459− name = "kbruch-20.04.3.tar.xz";
449+ url = "${mirror}/stable/release-service/20.08.0/src/kbruch-20.08.0.tar.xz";
450+ sha256 = "9e0c51ec0e32a8b46b567c7d275acb3845e09aef446c27324d872fc3a096113e";
451+ name = "kbruch-20.08.0.tar.xz";
460452 };
461453 };
462454 kcachegrind = {
463− version = "20.04.3";
455+ version = "20.08.0";
464456 src = fetchurl {
465− url = "${mirror}/stable/release-service/20.04.3/src/kcachegrind-20.04.3.tar.xz";
466− sha256 = "ef6e782540c254eada9e75049eb02919afd7adc9940ace79aa20dcad26240770";
467− name = "kcachegrind-20.04.3.tar.xz";
457+ url = "${mirror}/stable/release-service/20.08.0/src/kcachegrind-20.08.0.tar.xz";
458+ sha256 = "94b3963e9eebc0bf67644de1666cf019649f5eaf924ac01c1af6e48619a11f87";
459+ name = "kcachegrind-20.08.0.tar.xz";
468460 };
469461 };
470462 kcalc = {
471− version = "20.04.3";
463+ version = "20.08.0";
472464 src = fetchurl {
473− url = "${mirror}/stable/release-service/20.04.3/src/kcalc-20.04.3.tar.xz";
474− sha256 = "1ec38e3bf0c17df25a3367d4f3d5f7ef32b9a6fb5f081c20ad0091a968a2cf4a";
475− name = "kcalc-20.04.3.tar.xz";
465+ url = "${mirror}/stable/release-service/20.08.0/src/kcalc-20.08.0.tar.xz";
466+ sha256 = "3b6dee02e43ddb85ae6748cd8aefb422112be411e778c56372e97de0046bfca2";
467+ name = "kcalc-20.08.0.tar.xz";
476468 };
477469 };
478470 kcalutils = {
479− version = "20.04.3";
471+ version = "20.08.0";
480472 src = fetchurl {
481− url = "${mirror}/stable/release-service/20.04.3/src/kcalutils-20.04.3.tar.xz";
482− sha256 = "6604e0377c8955be7963853691aeaf689c00e2f78caab6b3472ffb4c822e07a3";
483− name = "kcalutils-20.04.3.tar.xz";
473+ url = "${mirror}/stable/release-service/20.08.0/src/kcalutils-20.08.0.tar.xz";
474+ sha256 = "82504223fe3a0f6149204aa5f3b38dc7fb05a25048e4a0159ba6e1923c24c1f8";
475+ name = "kcalutils-20.08.0.tar.xz";
484476 };
485477 };
486478 kcharselect = {
487− version = "20.04.3";
479+ version = "20.08.0";
488480 src = fetchurl {
489− url = "${mirror}/stable/release-service/20.04.3/src/kcharselect-20.04.3.tar.xz";
490− sha256 = "0da77b66efeab1ba7c17335853f3c3feab9b53b4c37cfa6a9f983327d13080f4";
491− name = "kcharselect-20.04.3.tar.xz";
481+ url = "${mirror}/stable/release-service/20.08.0/src/kcharselect-20.08.0.tar.xz";
482+ sha256 = "91b17c42286c3a715dcde764057364bada6d07ae163f9b5cdc7daec338ee3a72";
483+ name = "kcharselect-20.08.0.tar.xz";
492484 };
493485 };
494486 kcolorchooser = {
495− version = "20.04.3";
487+ version = "20.08.0";
496488 src = fetchurl {
497− url = "${mirror}/stable/release-service/20.04.3/src/kcolorchooser-20.04.3.tar.xz";
498− sha256 = "276cee46f92eeb5b47ec09366498b117c657fb2e618fc9fe34c797d4384549fd";
499− name = "kcolorchooser-20.04.3.tar.xz";
489+ url = "${mirror}/stable/release-service/20.08.0/src/kcolorchooser-20.08.0.tar.xz";
490+ sha256 = "df1bfd346bfcdea7a585f489f62ab2f76993ce07f83c47cb8202be981b8a3829";
491+ name = "kcolorchooser-20.08.0.tar.xz";
500492 };
501493 };
502494 kcron = {
503− version = "20.04.3";
495+ version = "20.08.0";
504496 src = fetchurl {
505− url = "${mirror}/stable/release-service/20.04.3/src/kcron-20.04.3.tar.xz";
506− sha256 = "b1d7d36e5b9efe4fd5c5fedf0b9e267fd2aaf6423e6a18bb64112a0c8257e4fa";
507− name = "kcron-20.04.3.tar.xz";
508− };
509− };
510− kdav = {
511− version = "20.04.3";
512− src = fetchurl {
513− url = "${mirror}/stable/release-service/20.04.3/src/kdav-20.04.3.tar.xz";
514− sha256 = "b645d5d17c967fd09c3d7abdfc262740a95870dd66bd3e5f4c0382da097d8510";
515− name = "kdav-20.04.3.tar.xz";
497+ url = "${mirror}/stable/release-service/20.08.0/src/kcron-20.08.0.tar.xz";
498+ sha256 = "e45d06ed0665d8f1cad3d44cc43035d50fc533bf9ab6e10fe53ab23f2ed5e708";
499+ name = "kcron-20.08.0.tar.xz";
516500 };
517501 };
518502 kdebugsettings = {
519− version = "20.04.3";
503+ version = "20.08.0";
520504 src = fetchurl {
521− url = "${mirror}/stable/release-service/20.04.3/src/kdebugsettings-20.04.3.tar.xz";
522− sha256 = "5f42891c0990216780fbe005521e423d922007c7ddeac97a05c3c99b6fe30344";
523− name = "kdebugsettings-20.04.3.tar.xz";
505+ url = "${mirror}/stable/release-service/20.08.0/src/kdebugsettings-20.08.0.tar.xz";
506+ sha256 = "21914b67dfc654ed525118afeda74e6a0539af9a0f3be05c490e9edbf13b2328";
507+ name = "kdebugsettings-20.08.0.tar.xz";
524508 };
525509 };
526510 kdeconnect-kde = {
527− version = "20.04.3";
511+ version = "20.08.0";
528512 src = fetchurl {
529− url = "${mirror}/stable/release-service/20.04.3/src/kdeconnect-kde-20.04.3.tar.xz";
530− sha256 = "412940a35dcd9f1491a54e4f9fd5ffdadc890bb9a45cfe2a0f8cb1ee7dc1ccbb";
531− name = "kdeconnect-kde-20.04.3.tar.xz";
513+ url = "${mirror}/stable/release-service/20.08.0/src/kdeconnect-kde-20.08.0.tar.xz";
514+ sha256 = "3de16bf165b68635919e68fa2460a5d14139cd9a63cb27573a7b2b2a5b0044a1";
515+ name = "kdeconnect-kde-20.08.0.tar.xz";
532516 };
533517 };
534518 kde-dev-scripts = {
535− version = "20.04.3";
519+ version = "20.08.0";
536520 src = fetchurl {
537− url = "${mirror}/stable/release-service/20.04.3/src/kde-dev-scripts-20.04.3.tar.xz";
538− sha256 = "0b321954ea79e829d81c9be0170babae87e5eab22c8d42b296746d5a0160fbae";
539− name = "kde-dev-scripts-20.04.3.tar.xz";
521+ url = "${mirror}/stable/release-service/20.08.0/src/kde-dev-scripts-20.08.0.tar.xz";
522+ sha256 = "2c3120e63ebcd41e30acfd53063bad659e1982f79b81429e0541b0100bc25ad3";
523+ name = "kde-dev-scripts-20.08.0.tar.xz";
540524 };
541525 };
542526 kde-dev-utils = {
543− version = "20.04.3";
527+ version = "20.08.0";
544528 src = fetchurl {
545− url = "${mirror}/stable/release-service/20.04.3/src/kde-dev-utils-20.04.3.tar.xz";
546− sha256 = "8f004e47bbd5ee032d711673b3320e59663087c636c9c51d031dc563b5391c83";
547− name = "kde-dev-utils-20.04.3.tar.xz";
529+ url = "${mirror}/stable/release-service/20.08.0/src/kde-dev-utils-20.08.0.tar.xz";
530+ sha256 = "7998afa4ac1b293eb3ba8f48ea77cd0bc22d2c2eda84e291d8c9cf2a5e719547";
531+ name = "kde-dev-utils-20.08.0.tar.xz";
548532 };
549533 };
550534 kdeedu-data = {
551− version = "20.04.3";
535+ version = "20.08.0";
552536 src = fetchurl {
553− url = "${mirror}/stable/release-service/20.04.3/src/kdeedu-data-20.04.3.tar.xz";
554− sha256 = "e717f82a1b4729f0a6df65221e9c2b01df17acf3d4eb8c2340cea23b6b65d969";
555− name = "kdeedu-data-20.04.3.tar.xz";
537+ url = "${mirror}/stable/release-service/20.08.0/src/kdeedu-data-20.08.0.tar.xz";
538+ sha256 = "c863f72c8dacb47dc8c82f966f4b70d33f75c2b9f6d63c174e9f3a2c73241943";
539+ name = "kdeedu-data-20.08.0.tar.xz";
556540 };
557541 };
558542 kdegraphics-mobipocket = {
559− version = "20.04.3";
543+ version = "20.08.0";
560544 src = fetchurl {
561− url = "${mirror}/stable/release-service/20.04.3/src/kdegraphics-mobipocket-20.04.3.tar.xz";
562− sha256 = "24ce0c1565b8bc922ea08c3d6bb625ff4bba2e656545e09e410a0ff3bc84c80f";
563− name = "kdegraphics-mobipocket-20.04.3.tar.xz";
545+ url = "${mirror}/stable/release-service/20.08.0/src/kdegraphics-mobipocket-20.08.0.tar.xz";
546+ sha256 = "2c11b6efe2c5f7725341c861dd9ba8e919ba3734866e808225c13bb2f2d90a2d";
547+ name = "kdegraphics-mobipocket-20.08.0.tar.xz";
564548 };
565549 };
566550 kdegraphics-thumbnailers = {
567− version = "20.04.3";
551+ version = "20.08.0";
568552 src = fetchurl {
569− url = "${mirror}/stable/release-service/20.04.3/src/kdegraphics-thumbnailers-20.04.3.tar.xz";
570− sha256 = "b72bdd67738391a10672cd20667555168382285a764bd9e712e1485e7860441f";
571− name = "kdegraphics-thumbnailers-20.04.3.tar.xz";
553+ url = "${mirror}/stable/release-service/20.08.0/src/kdegraphics-thumbnailers-20.08.0.tar.xz";
554+ sha256 = "d466c08b4a5e4ccc36907dd38e82019f9060c2ea1931f336f9fbb2f79036566e";
555+ name = "kdegraphics-thumbnailers-20.08.0.tar.xz";
572556 };
573557 };
574558 kdenetwork-filesharing = {
575− version = "20.04.3";
559+ version = "20.08.0";
576560 src = fetchurl {
577− url = "${mirror}/stable/release-service/20.04.3/src/kdenetwork-filesharing-20.04.3.tar.xz";
578− sha256 = "8cdbe70cd4263e8be6fdc0de987cb9255efae9b747018bc5098c0882a3d69c4d";
579− name = "kdenetwork-filesharing-20.04.3.tar.xz";
561+ url = "${mirror}/stable/release-service/20.08.0/src/kdenetwork-filesharing-20.08.0.tar.xz";
562+ sha256 = "8fabf6b5eae8c32bf75db911ae76d35aa9fee66355964cf0ad8150f960b83256";
563+ name = "kdenetwork-filesharing-20.08.0.tar.xz";
580564 };
581565 };
582566 kdenlive = {
583− version = "20.04.3";
567+ version = "20.08.0";
584568 src = fetchurl {
585− url = "${mirror}/stable/release-service/20.04.3/src/kdenlive-20.04.3.tar.xz";
586− sha256 = "29e5fa37f4680683cc6e244cee4d0b3a0e3e3290f15c0e0b6015ae4784d7315e";
587− name = "kdenlive-20.04.3.tar.xz";
569+ url = "${mirror}/stable/release-service/20.08.0/src/kdenlive-20.08.0.tar.xz";
570+ sha256 = "89914ee37f5bbdd16051b0db4a6cfb6f8c3d748f47c9e28e5349920ca133c0bd";
571+ name = "kdenlive-20.08.0.tar.xz";
588572 };
589573 };
590574 kdepim-addons = {
591− version = "20.04.3";
575+ version = "20.08.0";
592576 src = fetchurl {
593− url = "${mirror}/stable/release-service/20.04.3/src/kdepim-addons-20.04.3.tar.xz";
594− sha256 = "db0c70df94891bd6f90db533287269909e3442bfd0f546fa3f951d71f6268e9d";
595− name = "kdepim-addons-20.04.3.tar.xz";
577+ url = "${mirror}/stable/release-service/20.08.0/src/kdepim-addons-20.08.0.tar.xz";
578+ sha256 = "4045f7879cc47829a82a4ada18a35cb3bdf89a489a15cd0bd48441c305b3cb06";
579+ name = "kdepim-addons-20.08.0.tar.xz";
596580 };
597581 };
598582 kdepim-apps-libs = {
599− version = "20.04.3";
583+ version = "20.08.0";
600584 src = fetchurl {
601− url = "${mirror}/stable/release-service/20.04.3/src/kdepim-apps-libs-20.04.3.tar.xz";
602− sha256 = "7d69ac9cecfe0035e4806f0ff43fd41ac3755d788fffea9fd51427e1bc7027e3";
603− name = "kdepim-apps-libs-20.04.3.tar.xz";
585+ url = "${mirror}/stable/release-service/20.08.0/src/kdepim-apps-libs-20.08.0.tar.xz";
586+ sha256 = "bf7ac0af294510e4127808f3f2c1e25368c97b78ff0a5405219abb67173598a0";
587+ name = "kdepim-apps-libs-20.08.0.tar.xz";
604588 };
605589 };
606590 kdepim-runtime = {
607− version = "20.04.3";
591+ version = "20.08.0";
608592 src = fetchurl {
609− url = "${mirror}/stable/release-service/20.04.3/src/kdepim-runtime-20.04.3.tar.xz";
610− sha256 = "1e4cffed12098baf29d8acfc4e4e12848d36ad8f55bf75d8c089a57e6f906494";
611− name = "kdepim-runtime-20.04.3.tar.xz";
593+ url = "${mirror}/stable/release-service/20.08.0/src/kdepim-runtime-20.08.0.tar.xz";
594+ sha256 = "f6e4ff70b9cb85e8590ab8d7432abe1b6a2daa14d09a2974f8902b882b16409d";
595+ name = "kdepim-runtime-20.08.0.tar.xz";
612596 };
613597 };
614598 kdesdk-kioslaves = {
615− version = "20.04.3";
599+ version = "20.08.0";
616600 src = fetchurl {
617− url = "${mirror}/stable/release-service/20.04.3/src/kdesdk-kioslaves-20.04.3.tar.xz";
618− sha256 = "7d55121100d048bdab5f045126261eaad55ed58a2de97b211ad6acf03e22344b";
619− name = "kdesdk-kioslaves-20.04.3.tar.xz";
601+ url = "${mirror}/stable/release-service/20.08.0/src/kdesdk-kioslaves-20.08.0.tar.xz";
602+ sha256 = "0ab8188c1746ec5786d94e5988487b766a04a9df1c275b25778ab2948e302776";
603+ name = "kdesdk-kioslaves-20.08.0.tar.xz";
620604 };
621605 };
622606 kdesdk-thumbnailers = {
623− version = "20.04.3";
607+ version = "20.08.0";
624608 src = fetchurl {
625− url = "${mirror}/stable/release-service/20.04.3/src/kdesdk-thumbnailers-20.04.3.tar.xz";
626− sha256 = "e526cbad484807e11e03d85e5fc706df118e8f3327846f396e8df024b770c566";
627− name = "kdesdk-thumbnailers-20.04.3.tar.xz";
609+ url = "${mirror}/stable/release-service/20.08.0/src/kdesdk-thumbnailers-20.08.0.tar.xz";
610+ sha256 = "8f2adb38ca24b82119eb52ef879f5fd6a5d48b9c012956a518cefefd86fbd6d3";
611+ name = "kdesdk-thumbnailers-20.08.0.tar.xz";
628612 };
629613 };
630614 kdf = {
631− version = "20.04.3";
615+ version = "20.08.0";
632616 src = fetchurl {
633− url = "${mirror}/stable/release-service/20.04.3/src/kdf-20.04.3.tar.xz";
634− sha256 = "f52e34c36cd924ae6f8fa1291d548abbf5e0bcf0c82d69a583f01dfe128332a8";
635− name = "kdf-20.04.3.tar.xz";
617+ url = "${mirror}/stable/release-service/20.08.0/src/kdf-20.08.0.tar.xz";
618+ sha256 = "2f5fddbaf09d3cfdfb3e18b0a9292ecb6bcf14969e4d031a4215f22fecda0892";
619+ name = "kdf-20.08.0.tar.xz";
636620 };
637621 };
638622 kdialog = {
639− version = "20.04.3";
623+ version = "20.08.0";
640624 src = fetchurl {
641− url = "${mirror}/stable/release-service/20.04.3/src/kdialog-20.04.3.tar.xz";
642− sha256 = "75b8214980f5043d23b0226827f049815147e1206ffd64c1fe9e091e63c27a62";
643− name = "kdialog-20.04.3.tar.xz";
625+ url = "${mirror}/stable/release-service/20.08.0/src/kdialog-20.08.0.tar.xz";
626+ sha256 = "669da86bebf2cfac4cda7c873bb57417aac8d293cee8c5950968495520954ed5";
627+ name = "kdialog-20.08.0.tar.xz";
644628 };
645629 };
646630 kdiamond = {
647− version = "20.04.3";
631+ version = "20.08.0";
648632 src = fetchurl {
649− url = "${mirror}/stable/release-service/20.04.3/src/kdiamond-20.04.3.tar.xz";
650− sha256 = "f1bd1c5471224d4ab2269637bd89e11e5903bf4f15f1b2a3ae01c252adad7096";
651− name = "kdiamond-20.04.3.tar.xz";
633+ url = "${mirror}/stable/release-service/20.08.0/src/kdiamond-20.08.0.tar.xz";
634+ sha256 = "56efcb8b2bf81d62324911f404e918f7bcd62f6fa2ee9d4e513df54e37631889";
635+ name = "kdiamond-20.08.0.tar.xz";
652636 };
653637 };
654638 keditbookmarks = {
655− version = "20.04.3";
639+ version = "20.08.0";
656640 src = fetchurl {
657− url = "${mirror}/stable/release-service/20.04.3/src/keditbookmarks-20.04.3.tar.xz";
658− sha256 = "ec25b40d0ab85e3f72eb334ea7d658d6fe19ae08d626d9fbf0ad71d57594ad88";
659− name = "keditbookmarks-20.04.3.tar.xz";
641+ url = "${mirror}/stable/release-service/20.08.0/src/keditbookmarks-20.08.0.tar.xz";
642+ sha256 = "7fab031ae4d62e3c9d37dce671af4580afe01e6e3411ef199115568e893b7df5";
643+ name = "keditbookmarks-20.08.0.tar.xz";
660644 };
661645 };
662646 kfind = {
663− version = "20.04.3";
647+ version = "20.08.0";
664648 src = fetchurl {
665− url = "${mirror}/stable/release-service/20.04.3/src/kfind-20.04.3.tar.xz";
666− sha256 = "ff0d412dcd4b5812eb781618c4bf52d33f4691af2b9def4ba56644b5a668ef6e";
667− name = "kfind-20.04.3.tar.xz";
649+ url = "${mirror}/stable/release-service/20.08.0/src/kfind-20.08.0.tar.xz";
650+ sha256 = "f47f1ee0dc1c75b90d70027eb0ce2b470912aff9db2c18a0380eb65b16e6c842";
651+ name = "kfind-20.08.0.tar.xz";
668652 };
669653 };
670654 kfloppy = {
671− version = "20.04.3";
655+ version = "20.08.0";
672656 src = fetchurl {
673− url = "${mirror}/stable/release-service/20.04.3/src/kfloppy-20.04.3.tar.xz";
674− sha256 = "4e0d392471eddd23847129b5538846edd1a834f02119d312aed3698e6bfd9e1c";
675− name = "kfloppy-20.04.3.tar.xz";
657+ url = "${mirror}/stable/release-service/20.08.0/src/kfloppy-20.08.0.tar.xz";
658+ sha256 = "85732b804ee19c1a1db82845d7ab8c1ba1872d8d40737ee5b6beef8798c457f3";
659+ name = "kfloppy-20.08.0.tar.xz";
676660 };
677661 };
678662 kfourinline = {
679− version = "20.04.3";
663+ version = "20.08.0";
680664 src = fetchurl {
681− url = "${mirror}/stable/release-service/20.04.3/src/kfourinline-20.04.3.tar.xz";
682− sha256 = "c339009355dea086c28baa454aac1c15d601e15685ba8006100f50475518875f";
683− name = "kfourinline-20.04.3.tar.xz";
665+ url = "${mirror}/stable/release-service/20.08.0/src/kfourinline-20.08.0.tar.xz";
666+ sha256 = "9b1d520d61ddd98ce629a50355a190bded41d6abea100d87f3650e15e0c358b6";
667+ name = "kfourinline-20.08.0.tar.xz";
684668 };
685669 };
686670 kgeography = {
687− version = "20.04.3";
671+ version = "20.08.0";
688672 src = fetchurl {
689− url = "${mirror}/stable/release-service/20.04.3/src/kgeography-20.04.3.tar.xz";
690− sha256 = "69b4b06cfb1f6abb5c12bb0bf9334f178af2018288ee507678efe594e0392887";
691− name = "kgeography-20.04.3.tar.xz";
673+ url = "${mirror}/stable/release-service/20.08.0/src/kgeography-20.08.0.tar.xz";
674+ sha256 = "7fd2b7449309d6c42e01038c93ce8dda9c7a8acb806b27b9ff58d4556711ff5e";
675+ name = "kgeography-20.08.0.tar.xz";
692676 };
693677 };
694678 kget = {
695− version = "20.04.3";
679+ version = "20.08.0";
696680 src = fetchurl {
697− url = "${mirror}/stable/release-service/20.04.3/src/kget-20.04.3.tar.xz";
698− sha256 = "930b7ed50d19e41bfead8e6d71d8ec4024d688907489c17fb9274a73e4c7c0c2";
699− name = "kget-20.04.3.tar.xz";
681+ url = "${mirror}/stable/release-service/20.08.0/src/kget-20.08.0.tar.xz";
682+ sha256 = "de46cbe0a53c7246d1aeb4f15d24b90633eaf37e236d67882e1454b61fea1a09";
683+ name = "kget-20.08.0.tar.xz";
700684 };
701685 };
702686 kgoldrunner = {
703− version = "20.04.3";
687+ version = "20.08.0";
704688 src = fetchurl {
705− url = "${mirror}/stable/release-service/20.04.3/src/kgoldrunner-20.04.3.tar.xz";
706− sha256 = "ab535067a8991a94bd7cd5a990a6120538206d241c8e8149c7b774cbdd1d0941";
707− name = "kgoldrunner-20.04.3.tar.xz";
689+ url = "${mirror}/stable/release-service/20.08.0/src/kgoldrunner-20.08.0.tar.xz";
690+ sha256 = "29caf1637daea69013061d170a749411b18f543af7e2f8a0f295f1eb5cb62586";
691+ name = "kgoldrunner-20.08.0.tar.xz";
708692 };
709693 };
710694 kgpg = {
711− version = "20.04.3";
695+ version = "20.08.0";
712696 src = fetchurl {
713− url = "${mirror}/stable/release-service/20.04.3/src/kgpg-20.04.3.tar.xz";
714− sha256 = "bcd3211ab8112f070215e8e6451021859fefc57b813bdad1b421a1f129e17cbb";
715− name = "kgpg-20.04.3.tar.xz";
697+ url = "${mirror}/stable/release-service/20.08.0/src/kgpg-20.08.0.tar.xz";
698+ sha256 = "102cc0d44b7621ebad1d5914bbb44a598689ebb95093e4a76713679996c2af0c";
699+ name = "kgpg-20.08.0.tar.xz";
716700 };
717701 };
718702 khangman = {
719− version = "20.04.3";
703+ version = "20.08.0";
720704 src = fetchurl {
721− url = "${mirror}/stable/release-service/20.04.3/src/khangman-20.04.3.tar.xz";
722− sha256 = "db827d20ce5f0522675d75c18fd4c804047cc2e5a2ca2f7a7421b5fc91952831";
723− name = "khangman-20.04.3.tar.xz";
705+ url = "${mirror}/stable/release-service/20.08.0/src/khangman-20.08.0.tar.xz";
706+ sha256 = "11f442e24f0a428c0338000f66687bc021f4290bcd8cc0acc3fd882ce3cf4b0b";
707+ name = "khangman-20.08.0.tar.xz";
724708 };
725709 };
726710 khelpcenter = {
727− version = "20.04.3";
711+ version = "20.08.0";
728712 src = fetchurl {
729− url = "${mirror}/stable/release-service/20.04.3/src/khelpcenter-20.04.3.tar.xz";
730− sha256 = "3930c321388f27925a63add5f11fe65eb34b7301fb22d78f16f5f3de8467a9ed";
731− name = "khelpcenter-20.04.3.tar.xz";
713+ url = "${mirror}/stable/release-service/20.08.0/src/khelpcenter-20.08.0.tar.xz";
714+ sha256 = "2c45fb76c5503441dcf9ab1cae386dd2e10a2ad1af08f60090d362e82364e98c";
715+ name = "khelpcenter-20.08.0.tar.xz";
732716 };
733717 };
734718 kidentitymanagement = {
735− version = "20.04.3";
719+ version = "20.08.0";
736720 src = fetchurl {
737− url = "${mirror}/stable/release-service/20.04.3/src/kidentitymanagement-20.04.3.tar.xz";
738− sha256 = "09e63cdb07bb38ba8c82d796212b1bd9d218dbe8adde215bff9c689c93b90917";
739− name = "kidentitymanagement-20.04.3.tar.xz";
721+ url = "${mirror}/stable/release-service/20.08.0/src/kidentitymanagement-20.08.0.tar.xz";
722+ sha256 = "4c7dca3e27f87203b27af219ebe07701e641a56dd7a8c1d7a3fa7cef2fe1c5af";
723+ name = "kidentitymanagement-20.08.0.tar.xz";
740724 };
741725 };
742726 kig = {
743− version = "20.04.3";
727+ version = "20.08.0";
744728 src = fetchurl {
745− url = "${mirror}/stable/release-service/20.04.3/src/kig-20.04.3.tar.xz";
746− sha256 = "ccbc8f10e79f420d8a97aa00616fc29ed771721bfe22eb74b160464ac6cc3023";
747− name = "kig-20.04.3.tar.xz";
729+ url = "${mirror}/stable/release-service/20.08.0/src/kig-20.08.0.tar.xz";
730+ sha256 = "fa9754f5a67e35fdfd8b836d423001fc48fe5c41fadbfceece834fb3f5b6cccd";
731+ name = "kig-20.08.0.tar.xz";
748732 };
749733 };
750734 kigo = {
751− version = "20.04.3";
735+ version = "20.08.0";
752736 src = fetchurl {
753− url = "${mirror}/stable/release-service/20.04.3/src/kigo-20.04.3.tar.xz";
754− sha256 = "ccc4f9638bfd3e1bf7f25621e10907f08cd0354858f9a174ab8f5c51c77e8a77";
755− name = "kigo-20.04.3.tar.xz";
737+ url = "${mirror}/stable/release-service/20.08.0/src/kigo-20.08.0.tar.xz";
738+ sha256 = "5e787cad2370b479feeae3be81b0972314429e0e896b9943445653731c9c6040";
739+ name = "kigo-20.08.0.tar.xz";
756740 };
757741 };
758742 killbots = {
759− version = "20.04.3";
743+ version = "20.08.0";
760744 src = fetchurl {
761− url = "${mirror}/stable/release-service/20.04.3/src/killbots-20.04.3.tar.xz";
762− sha256 = "66c48ddeb49118ea8139422c0370256f88a4e3104dbe664bc25d2c63edfdf326";
763− name = "killbots-20.04.3.tar.xz";
745+ url = "${mirror}/stable/release-service/20.08.0/src/killbots-20.08.0.tar.xz";
746+ sha256 = "3b647fd8af007619acdfc7c72d572a3184a8e8c5ecbeb472559c5e40e9d53257";
747+ name = "killbots-20.08.0.tar.xz";
764748 };
765749 };
766750 kimagemapeditor = {
767− version = "20.04.3";
751+ version = "20.08.0";
768752 src = fetchurl {
769− url = "${mirror}/stable/release-service/20.04.3/src/kimagemapeditor-20.04.3.tar.xz";
770− sha256 = "d86f8a9e0a1aba71236f7af844076758774ab1c10b4b2fa1d244c9b5d24adf33";
771− name = "kimagemapeditor-20.04.3.tar.xz";
753+ url = "${mirror}/stable/release-service/20.08.0/src/kimagemapeditor-20.08.0.tar.xz";
754+ sha256 = "17d3ccfc35aecd802729da6c78a78cb358cf68bd5079bcae6d83af0874e86a00";
755+ name = "kimagemapeditor-20.08.0.tar.xz";
772756 };
773757 };
774758 kimap = {
775− version = "20.04.3";
759+ version = "20.08.0";
776760 src = fetchurl {
777− url = "${mirror}/stable/release-service/20.04.3/src/kimap-20.04.3.tar.xz";
778− sha256 = "870d22a4f07080453ade2e1224acb563232211fe48e1beabe8c58d27730b4bfa";
779− name = "kimap-20.04.3.tar.xz";
761+ url = "${mirror}/stable/release-service/20.08.0/src/kimap-20.08.0.tar.xz";
762+ sha256 = "4ebb75312aac29274d8faa68f885c78a77c1173fc0200c08825670ac263cbec6";
763+ name = "kimap-20.08.0.tar.xz";
780764 };
781765 };
782766 kio-extras = {
783− version = "20.04.3";
767+ version = "20.08.0";
768+ src = fetchurl {
769+ url = "${mirror}/stable/release-service/20.08.0/src/kio-extras-20.08.0.tar.xz";
770+ sha256 = "6bfbb92dd56755ec0b2dee0cd889d6081ae00df339c05b4cb7a173a463275e2d";
771+ name = "kio-extras-20.08.0.tar.xz";
772+ };
773+ };
774+ kio-gdrive = {
775+ version = "20.08.0";
784776 src = fetchurl {
785− url = "${mirror}/stable/release-service/20.04.3/src/kio-extras-20.04.3.tar.xz";
786− sha256 = "ff0edabe83ee4958ce7559e935f6b7ae3f76aee43ee5774543368ca334b21090";
787− name = "kio-extras-20.04.3.tar.xz";
777+ url = "${mirror}/stable/release-service/20.08.0/src/kio-gdrive-20.08.0.tar.xz";
778+ sha256 = "c08f809d575a24887aacd1a046b01cf2c3df7b77813fecf89cb6cdbec13ab299";
779+ name = "kio-gdrive-20.08.0.tar.xz";
788780 };
789781 };
790782 kipi-plugins = {
791− version = "20.04.3";
783+ version = "20.08.0";
792784 src = fetchurl {
793− url = "${mirror}/stable/release-service/20.04.3/src/kipi-plugins-20.04.3.tar.xz";
794− sha256 = "e128ba8a2194bb0ce6a5eac97d56479003f08c1d740a56a6c8d976df1a71632a";
795− name = "kipi-plugins-20.04.3.tar.xz";
785+ url = "${mirror}/stable/release-service/20.08.0/src/kipi-plugins-20.08.0.tar.xz";
786+ sha256 = "f8f03a9797b4855839693ffca93245460e78fd2f6eeb763d16dd159711f40683";
787+ name = "kipi-plugins-20.08.0.tar.xz";
796788 };
797789 };
798790 kirigami-gallery = {
799− version = "20.04.3";
791+ version = "20.08.0";
800792 src = fetchurl {
801− url = "${mirror}/stable/release-service/20.04.3/src/kirigami-gallery-20.04.3.tar.xz";
802− sha256 = "1868c4782c8a9c7a80eb6b465a27cb7fc46dc9a8e47d2530559ba3b2f1131461";
803− name = "kirigami-gallery-20.04.3.tar.xz";
793+ url = "${mirror}/stable/release-service/20.08.0/src/kirigami-gallery-20.08.0.tar.xz";
794+ sha256 = "8cabcee747152b41b558c0a9eb1fd0d55fb155b3b807a57d2176023806a59f2b";
795+ name = "kirigami-gallery-20.08.0.tar.xz";
804796 };
805797 };
806798 kiriki = {
807− version = "20.04.3";
799+ version = "20.08.0";
808800 src = fetchurl {
809− url = "${mirror}/stable/release-service/20.04.3/src/kiriki-20.04.3.tar.xz";
810− sha256 = "1df78a7b9e91f20841411fc2561d077dcd897211e5c20f1f526670c9f3b7a97d";
811− name = "kiriki-20.04.3.tar.xz";
801+ url = "${mirror}/stable/release-service/20.08.0/src/kiriki-20.08.0.tar.xz";
802+ sha256 = "56db705674a43c249f2374eb1ce2c20e4b3e22223348959b3f5db67c0f52db4f";
803+ name = "kiriki-20.08.0.tar.xz";
812804 };
813805 };
814806 kiten = {
815− version = "20.04.3";
807+ version = "20.08.0";
816808 src = fetchurl {
817− url = "${mirror}/stable/release-service/20.04.3/src/kiten-20.04.3.tar.xz";
818− sha256 = "3b0bdd2b711ee67bbc194b301da3ed99d4ee75bb6ff18ab50c0a1b4c1c4ef162";
819− name = "kiten-20.04.3.tar.xz";
809+ url = "${mirror}/stable/release-service/20.08.0/src/kiten-20.08.0.tar.xz";
810+ sha256 = "17cb8344d679040b5c7be99049f73b88517cf127e3d045d469cdae9602945263";
811+ name = "kiten-20.08.0.tar.xz";
820812 };
821813 };
822814 kitinerary = {
823− version = "20.04.3";
815+ version = "20.08.0";
824816 src = fetchurl {
825− url = "${mirror}/stable/release-service/20.04.3/src/kitinerary-20.04.3.tar.xz";
826− sha256 = "8c7dab2e28891af268d22884ecbb9cd7031c4b34352ed3b576dbb6dcb5977c7e";
827− name = "kitinerary-20.04.3.tar.xz";
817+ url = "${mirror}/stable/release-service/20.08.0/src/kitinerary-20.08.0.tar.xz";
818+ sha256 = "a87ce5dd8e978dad8bcac7d92d89c4a5eeaa847e8819c2aa84ebce51dfe95f50";
819+ name = "kitinerary-20.08.0.tar.xz";
828820 };
829821 };
830822 kjumpingcube = {
831− version = "20.04.3";
823+ version = "20.08.0";
832824 src = fetchurl {
833− url = "${mirror}/stable/release-service/20.04.3/src/kjumpingcube-20.04.3.tar.xz";
834− sha256 = "1716e1de95e8610dc80d991c4518beedbdf6d4c40a07f71a1dba0971e0a6cb9b";
835− name = "kjumpingcube-20.04.3.tar.xz";
825+ url = "${mirror}/stable/release-service/20.08.0/src/kjumpingcube-20.08.0.tar.xz";
826+ sha256 = "5ea4187326a0ff0a77c0aef774d9ba9c3c20b438def85abe9e4b0822a8350a70";
827+ name = "kjumpingcube-20.08.0.tar.xz";
836828 };
837829 };
838830 kldap = {
839− version = "20.04.3";
831+ version = "20.08.0";
840832 src = fetchurl {
841− url = "${mirror}/stable/release-service/20.04.3/src/kldap-20.04.3.tar.xz";
842− sha256 = "ab32ef61da11f1401f9d648f6831a946dd6964ffd4f35f6c84ad9ca19dd422f1";
843− name = "kldap-20.04.3.tar.xz";
833+ url = "${mirror}/stable/release-service/20.08.0/src/kldap-20.08.0.tar.xz";
834+ sha256 = "db358a6ec50f5d3988583096ccc5fe1389999b4dd3a3c787d7797f6e0b32ee53";
835+ name = "kldap-20.08.0.tar.xz";
844836 };
845837 };
846838 kleopatra = {
847− version = "20.04.3";
839+ version = "20.08.0";
848840 src = fetchurl {
849− url = "${mirror}/stable/release-service/20.04.3/src/kleopatra-20.04.3.tar.xz";
850− sha256 = "59c6eb6b626b502f6b194ac4bbde8ed95e613d6b6fd54818c0206dd84575a34d";
851− name = "kleopatra-20.04.3.tar.xz";
841+ url = "${mirror}/stable/release-service/20.08.0/src/kleopatra-20.08.0.tar.xz";
842+ sha256 = "776fbb8d06edc83834745a8af05b23297aeba89b8dce3410a2d48f37a91b5a87";
843+ name = "kleopatra-20.08.0.tar.xz";
852844 };
853845 };
854846 klettres = {
855− version = "20.04.3";
847+ version = "20.08.0";
856848 src = fetchurl {
857− url = "${mirror}/stable/release-service/20.04.3/src/klettres-20.04.3.tar.xz";
858− sha256 = "ed943bce624a599f7759487d0ff3b16c340f2beadbad25dab30b6607dbd2695e";
859− name = "klettres-20.04.3.tar.xz";
849+ url = "${mirror}/stable/release-service/20.08.0/src/klettres-20.08.0.tar.xz";
850+ sha256 = "55748999e29ecec5fb3ce206c74bc44f7e83f4f239edd61c161e4df4e597bca2";
851+ name = "klettres-20.08.0.tar.xz";
860852 };
861853 };
862854 klickety = {
863− version = "20.04.3";
855+ version = "20.08.0";
864856 src = fetchurl {
865− url = "${mirror}/stable/release-service/20.04.3/src/klickety-20.04.3.tar.xz";
866− sha256 = "703158b1c1cafc16368fa09c4c58ea6d10942b90af693a851f9b5ec84add691d";
867− name = "klickety-20.04.3.tar.xz";
857+ url = "${mirror}/stable/release-service/20.08.0/src/klickety-20.08.0.tar.xz";
858+ sha256 = "0b6d71d54a5521ae8cc66eca1d397289a35733af2fc686b82bc01dd6777fa926";
859+ name = "klickety-20.08.0.tar.xz";
868860 };
869861 };
870862 klines = {
871− version = "20.04.3";
863+ version = "20.08.0";
872864 src = fetchurl {
873− url = "${mirror}/stable/release-service/20.04.3/src/klines-20.04.3.tar.xz";
874− sha256 = "83bebb2dbb7da8e325a378da3903246ff562c56dcf9ea4991dedb5b253c81f7d";
875− name = "klines-20.04.3.tar.xz";
865+ url = "${mirror}/stable/release-service/20.08.0/src/klines-20.08.0.tar.xz";
866+ sha256 = "778928fc55fe551eb836beba3f74b0f20602a0fae7366c71fa84a95ad6ca803a";
867+ name = "klines-20.08.0.tar.xz";
876868 };
877869 };
878870 kmag = {
879− version = "20.04.3";
871+ version = "20.08.0";
880872 src = fetchurl {
881− url = "${mirror}/stable/release-service/20.04.3/src/kmag-20.04.3.tar.xz";
882− sha256 = "f006b2e3b685accc343cdfc8b90d915e7c2647d983b66c2d38565d669ed6d464";
883− name = "kmag-20.04.3.tar.xz";
873+ url = "${mirror}/stable/release-service/20.08.0/src/kmag-20.08.0.tar.xz";
874+ sha256 = "b1a8fe75a03dbeac8f2080808f580bea588bf39c97534ddfa0cbf7d0de20efb7";
875+ name = "kmag-20.08.0.tar.xz";
884876 };
885877 };
886878 kmahjongg = {
887− version = "20.04.3";
879+ version = "20.08.0";
888880 src = fetchurl {
889− url = "${mirror}/stable/release-service/20.04.3/src/kmahjongg-20.04.3.tar.xz";
890− sha256 = "1f4fce58163323c23aa37f849e556ee4ed7fe33fb36e21754116e1d0e2c33673";
891− name = "kmahjongg-20.04.3.tar.xz";
881+ url = "${mirror}/stable/release-service/20.08.0/src/kmahjongg-20.08.0.tar.xz";
882+ sha256 = "05538c97613d6e3547161136b9d7aec9bb2918c9f4033a084e1576041b83d4e6";
883+ name = "kmahjongg-20.08.0.tar.xz";
892884 };
893885 };
894886 kmail = {
895− version = "20.04.3";
887+ version = "20.08.0";
896888 src = fetchurl {
897− url = "${mirror}/stable/release-service/20.04.3/src/kmail-20.04.3.tar.xz";
898− sha256 = "5b653c680097a7be4ff53bc902bc3fcda9edac99f699a63a1375a1df81240d03";
899− name = "kmail-20.04.3.tar.xz";
889+ url = "${mirror}/stable/release-service/20.08.0/src/kmail-20.08.0.tar.xz";
890+ sha256 = "0432ec1fd68868e9385dd3f6b9e2429feb5b5057317ef3940eb0e67a63e0c0f0";
891+ name = "kmail-20.08.0.tar.xz";
900892 };
901893 };
902894 kmail-account-wizard = {
903− version = "20.04.3";
895+ version = "20.08.0";
904896 src = fetchurl {
905− url = "${mirror}/stable/release-service/20.04.3/src/kmail-account-wizard-20.04.3.tar.xz";
906− sha256 = "ba789c679664a390480808431510d7d6ee1591a5f7be3dfceb5951347e3cc9b1";
907− name = "kmail-account-wizard-20.04.3.tar.xz";
897+ url = "${mirror}/stable/release-service/20.08.0/src/kmail-account-wizard-20.08.0.tar.xz";
898+ sha256 = "9f4eac46049acbc7452bbbf84569031d91f86c2577beecacb3a6200deefcc253";
899+ name = "kmail-account-wizard-20.08.0.tar.xz";
908900 };
909901 };
910902 kmailtransport = {
911− version = "20.04.3";
903+ version = "20.08.0";
912904 src = fetchurl {
913− url = "${mirror}/stable/release-service/20.04.3/src/kmailtransport-20.04.3.tar.xz";
914− sha256 = "45685bf61f24c9c7070a9f5b982d48005a7bf0ef04f391df2959772b17857cc2";
915− name = "kmailtransport-20.04.3.tar.xz";
905+ url = "${mirror}/stable/release-service/20.08.0/src/kmailtransport-20.08.0.tar.xz";
906+ sha256 = "af337017b884519065fea520fd66a8fc2e553d84ca3d8afc35739c18e67b4d73";
907+ name = "kmailtransport-20.08.0.tar.xz";
916908 };
917909 };
918910 kmbox = {
919− version = "20.04.3";
911+ version = "20.08.0";
920912 src = fetchurl {
921− url = "${mirror}/stable/release-service/20.04.3/src/kmbox-20.04.3.tar.xz";
922− sha256 = "50b2a8ba98cf24117ba66ddb9b51d1db575998b36ad1aa15fec0135446cc7561";
923− name = "kmbox-20.04.3.tar.xz";
913+ url = "${mirror}/stable/release-service/20.08.0/src/kmbox-20.08.0.tar.xz";
914+ sha256 = "58a2ecc7222a8ee5697102ca2bc871e7e30c823dcd906ac4160323fd1ba14d85";
915+ name = "kmbox-20.08.0.tar.xz";
924916 };
925917 };
926918 kmime = {
927− version = "20.04.3";
919+ version = "20.08.0";
928920 src = fetchurl {
929− url = "${mirror}/stable/release-service/20.04.3/src/kmime-20.04.3.tar.xz";
930− sha256 = "a416e16f61a2dd4274b1abc54af71ffe73b01c93137bc1fa462642bb947d150c";
931− name = "kmime-20.04.3.tar.xz";
921+ url = "${mirror}/stable/release-service/20.08.0/src/kmime-20.08.0.tar.xz";
922+ sha256 = "55f2160fa78202cf45a4b08b9bb2fec1bc54a3700f6c9aceeec8d7fc3a64a317";
923+ name = "kmime-20.08.0.tar.xz";
932924 };
933925 };
934926 kmines = {
935− version = "20.04.3";
927+ version = "20.08.0";
936928 src = fetchurl {
937− url = "${mirror}/stable/release-service/20.04.3/src/kmines-20.04.3.tar.xz";
938− sha256 = "8a729ffd6406d7d6173fbd050e40a566b5ce4e7b960f3971fff82fef9c18c4d3";
939− name = "kmines-20.04.3.tar.xz";
929+ url = "${mirror}/stable/release-service/20.08.0/src/kmines-20.08.0.tar.xz";
930+ sha256 = "d8d0f1a82fe279ed208a9005e8ffbe1277e25b33e9e0a1301013820e559ba750";
931+ name = "kmines-20.08.0.tar.xz";
940932 };
941933 };
942934 kmix = {
943− version = "20.04.3";
935+ version = "20.08.0";
944936 src = fetchurl {
945− url = "${mirror}/stable/release-service/20.04.3/src/kmix-20.04.3.tar.xz";
946− sha256 = "1830bc59d836d2155fd7a24c5afe3c7f5682a96217c159a062fd28b851414dc6";
947− name = "kmix-20.04.3.tar.xz";
937+ url = "${mirror}/stable/release-service/20.08.0/src/kmix-20.08.0.tar.xz";
938+ sha256 = "4553362d4d14fdaf019b1fc55b98aac16c2db56542996a3c2f87603c41bc2859";
939+ name = "kmix-20.08.0.tar.xz";
948940 };
949941 };
950942 kmousetool = {
951− version = "20.04.3";
943+ version = "20.08.0";
952944 src = fetchurl {
953− url = "${mirror}/stable/release-service/20.04.3/src/kmousetool-20.04.3.tar.xz";
954− sha256 = "acf710dcdc53e58d3a833345f88214b22dfbd5ab9fd26d9e26c883c18441c715";
955− name = "kmousetool-20.04.3.tar.xz";
945+ url = "${mirror}/stable/release-service/20.08.0/src/kmousetool-20.08.0.tar.xz";
946+ sha256 = "285d947548ee863de6274888b097e19aff39ed2bb8cdd33e37707c39c8417863";
947+ name = "kmousetool-20.08.0.tar.xz";
956948 };
957949 };
958950 kmouth = {
959− version = "20.04.3";
951+ version = "20.08.0";
960952 src = fetchurl {
961− url = "${mirror}/stable/release-service/20.04.3/src/kmouth-20.04.3.tar.xz";
962− sha256 = "edc1aab8edd13f3f10f99b79a27dabaffe22ac7048868dd7b66b33a662cc46b2";
963− name = "kmouth-20.04.3.tar.xz";
953+ url = "${mirror}/stable/release-service/20.08.0/src/kmouth-20.08.0.tar.xz";
954+ sha256 = "a783e73e8087d090cf4eba89fabcb9aee8c6b0858a6dea8a137323c1bbc110b1";
955+ name = "kmouth-20.08.0.tar.xz";
964956 };
965957 };
966958 kmplot = {
967− version = "20.04.3";
959+ version = "20.08.0";
968960 src = fetchurl {
969− url = "${mirror}/stable/release-service/20.04.3/src/kmplot-20.04.3.tar.xz";
970− sha256 = "57389abae04c204d0c2462709b70a919e0050b20867bcb23f3ab72788051e501";
971− name = "kmplot-20.04.3.tar.xz";
961+ url = "${mirror}/stable/release-service/20.08.0/src/kmplot-20.08.0.tar.xz";
962+ sha256 = "f2d31d8c9091c74c6d0e65a0cba77bac23eb6f78913b31d049a0e2c9ca4ec8c0";
963+ name = "kmplot-20.08.0.tar.xz";
972964 };
973965 };
974966 knavalbattle = {
975− version = "20.04.3";
967+ version = "20.08.0";
976968 src = fetchurl {
977− url = "${mirror}/stable/release-service/20.04.3/src/knavalbattle-20.04.3.tar.xz";
978− sha256 = "78feb74eb2e52d4738e5aa8969dc4db00307bb758623cbf34d7f245242f07279";
979− name = "knavalbattle-20.04.3.tar.xz";
969+ url = "${mirror}/stable/release-service/20.08.0/src/knavalbattle-20.08.0.tar.xz";
970+ sha256 = "887d2f4e24d522ab66c2a4e183b9d5359213d67382fa2350f2edff6478666aa8";
971+ name = "knavalbattle-20.08.0.tar.xz";
980972 };
981973 };
982974 knetwalk = {
983− version = "20.04.3";
975+ version = "20.08.0";
984976 src = fetchurl {
985− url = "${mirror}/stable/release-service/20.04.3/src/knetwalk-20.04.3.tar.xz";
986− sha256 = "6bc61fb70eb0cde3f312aa672f848447ed5eb5bbc2d48d65c6a010c12e154054";
987− name = "knetwalk-20.04.3.tar.xz";
977+ url = "${mirror}/stable/release-service/20.08.0/src/knetwalk-20.08.0.tar.xz";
978+ sha256 = "83fdf150c1c14f7c1807b73ce1d4bacfd10469f565541a379daa828755ddf5c6";
979+ name = "knetwalk-20.08.0.tar.xz";
988980 };
989981 };
990982 knights = {
991− version = "20.04.3";
983+ version = "20.08.0";
992984 src = fetchurl {
993− url = "${mirror}/stable/release-service/20.04.3/src/knights-20.04.3.tar.xz";
994− sha256 = "b695e1f141dc3fd1a5deca6179bddb0f3d4aa9103c5cc539c01a2a789adade4f";
995− name = "knights-20.04.3.tar.xz";
985+ url = "${mirror}/stable/release-service/20.08.0/src/knights-20.08.0.tar.xz";
986+ sha256 = "b754af5da0ee922834644c578f2133695cc446dfb8ac327fae357e7a6c027bf7";
987+ name = "knights-20.08.0.tar.xz";
996988 };
997989 };
998990 knotes = {
999− version = "20.04.3";
991+ version = "20.08.0";
1000992 src = fetchurl {
1001− url = "${mirror}/stable/release-service/20.04.3/src/knotes-20.04.3.tar.xz";
1002− sha256 = "90c47b902f738492286d9b3e0acb26e6a10504e1c933f921213cd1784309b796";
1003− name = "knotes-20.04.3.tar.xz";
993+ url = "${mirror}/stable/release-service/20.08.0/src/knotes-20.08.0.tar.xz";
994+ sha256 = "35454e609c6ea2f805c8976d2897d2b2b9137a61ad8d396be2b510881bbd7cf3";
995+ name = "knotes-20.08.0.tar.xz";
1004996 };
1005997 };
1006998 kolf = {
1007− version = "20.04.3";
999+ version = "20.08.0";
10081000 src = fetchurl {
1009− url = "${mirror}/stable/release-service/20.04.3/src/kolf-20.04.3.tar.xz";
1010− sha256 = "dc2fd28fbfaa21d75ad6482513adddb9bd04ac0432d2d72419f85d65140ee186";
1011− name = "kolf-20.04.3.tar.xz";
1001+ url = "${mirror}/stable/release-service/20.08.0/src/kolf-20.08.0.tar.xz";
1002+ sha256 = "dbc0d129e1d1fc8c597979c5ec96d612014aa56b0b0825be653b410995987305";
1003+ name = "kolf-20.08.0.tar.xz";
10121004 };
10131005 };
10141006 kollision = {
1015− version = "20.04.3";
1007+ version = "20.08.0";
10161008 src = fetchurl {
1017− url = "${mirror}/stable/release-service/20.04.3/src/kollision-20.04.3.tar.xz";
1018− sha256 = "49365efc2cfc4c9406cbedf84ad8a135df79536cba166cd77402955803a56207";
1019− name = "kollision-20.04.3.tar.xz";
1009+ url = "${mirror}/stable/release-service/20.08.0/src/kollision-20.08.0.tar.xz";
1010+ sha256 = "a7d59d6f4132a669ce4fe74b3b58168ce6f2036a27d37cc6362b471b58a70fe4";
1011+ name = "kollision-20.08.0.tar.xz";
10201012 };
10211013 };
10221014 kolourpaint = {
1023− version = "20.04.3";
1015+ version = "20.08.0";
10241016 src = fetchurl {
1025− url = "${mirror}/stable/release-service/20.04.3/src/kolourpaint-20.04.3.tar.xz";
1026− sha256 = "55ec6d42fcf10b15b80b6fdabacdf189d1cda283a19a1c04b6a4a58abb56bee8";
1027− name = "kolourpaint-20.04.3.tar.xz";
1017+ url = "${mirror}/stable/release-service/20.08.0/src/kolourpaint-20.08.0.tar.xz";
1018+ sha256 = "f2b5dee4e8c2b8245b2fd652c5ead015f637f62bc4b799735af255e2c5831629";
1019+ name = "kolourpaint-20.08.0.tar.xz";
10281020 };
10291021 };
10301022 kompare = {
1031− version = "20.04.3";
1023+ version = "20.08.0";
10321024 src = fetchurl {
1033− url = "${mirror}/stable/release-service/20.04.3/src/kompare-20.04.3.tar.xz";
1034− sha256 = "6c49547c3adbe96c184bae6eda47963ce42ede2808e5588ec3f8ea924853a941";
1035− name = "kompare-20.04.3.tar.xz";
1025+ url = "${mirror}/stable/release-service/20.08.0/src/kompare-20.08.0.tar.xz";
1026+ sha256 = "712d248edc6eae8dd94d41efccde94ccbc5753ecd01eb69cb3d80757a63805a3";
1027+ name = "kompare-20.08.0.tar.xz";
10361028 };
10371029 };
10381030 konqueror = {
1039− version = "20.04.3";
1031+ version = "20.08.0";
10401032 src = fetchurl {
1041− url = "${mirror}/stable/release-service/20.04.3/src/konqueror-20.04.3.tar.xz";
1042− sha256 = "d2f81f697e88eb4fe962aaa43942ef35e7a03df10f811a46ae6805a27e637e35";
1043− name = "konqueror-20.04.3.tar.xz";
1033+ url = "${mirror}/stable/release-service/20.08.0/src/konqueror-20.08.0.tar.xz";
1034+ sha256 = "4db172cff4bd3fd06ee1905dcf87013059e02902808e77acfc4bf2734d6ff73f";
1035+ name = "konqueror-20.08.0.tar.xz";
10441036 };
10451037 };
10461038 konquest = {
1047− version = "20.04.3";
1039+ version = "20.08.0";
10481040 src = fetchurl {
1049− url = "${mirror}/stable/release-service/20.04.3/src/konquest-20.04.3.tar.xz";
1050− sha256 = "004b3d8d38acecb0d5e78d037a47d137f0517d74768da461ce51fbd2a549578d";
1051− name = "konquest-20.04.3.tar.xz";
1041+ url = "${mirror}/stable/release-service/20.08.0/src/konquest-20.08.0.tar.xz";
1042+ sha256 = "e6938230c2fdd94903d13ed34f8d1e8db8221c9ceb571c5737f429291d4cca04";
1043+ name = "konquest-20.08.0.tar.xz";
10521044 };
10531045 };
10541046 konsole = {
1055− version = "20.04.3";
1047+ version = "20.08.0";
10561048 src = fetchurl {
1057− url = "${mirror}/stable/release-service/20.04.3/src/konsole-20.04.3.tar.xz";
1058− sha256 = "7874b6117d31eecd9fc475536c9bfc73c78d66d57b128cffb0bb931881564f15";
1059− name = "konsole-20.04.3.tar.xz";
1049+ url = "${mirror}/stable/release-service/20.08.0/src/konsole-20.08.0.tar.xz";
1050+ sha256 = "b641bc2f66195887a25ec588b638a78a0d00e6d2d41c126bca9a45f30f70aee9";
1051+ name = "konsole-20.08.0.tar.xz";
10601052 };
10611053 };
10621054 kontact = {
1063− version = "20.04.3";
1055+ version = "20.08.0";
10641056 src = fetchurl {
1065− url = "${mirror}/stable/release-service/20.04.3/src/kontact-20.04.3.tar.xz";
1066− sha256 = "c35a68a0a99195d1d9b63f7c8edaadb9e4f1dd6957e3823e2e44c8225ccafde7";
1067− name = "kontact-20.04.3.tar.xz";
1057+ url = "${mirror}/stable/release-service/20.08.0/src/kontact-20.08.0.tar.xz";
1058+ sha256 = "d759b475938079f87d5042d4fc6608c0263800cfc2156e83c874faa77c488646";
1059+ name = "kontact-20.08.0.tar.xz";
10681060 };
10691061 };
10701062 kontactinterface = {
1071− version = "20.04.3";
1063+ version = "20.08.0";
10721064 src = fetchurl {
1073− url = "${mirror}/stable/release-service/20.04.3/src/kontactinterface-20.04.3.tar.xz";
1074− sha256 = "9c0587df91b9de55218d7313c445c68d13b22aeb09dc142caf8d8036574e3b09";
1075− name = "kontactinterface-20.04.3.tar.xz";
1065+ url = "${mirror}/stable/release-service/20.08.0/src/kontactinterface-20.08.0.tar.xz";
1066+ sha256 = "6b20e160642063b966f359ecf2e1946db161728d42f4e6b15a77f6a19f151048";
1067+ name = "kontactinterface-20.08.0.tar.xz";
10761068 };
10771069 };
10781070 kopete = {
1079− version = "20.04.3";
1071+ version = "20.08.0";
10801072 src = fetchurl {
1081− url = "${mirror}/stable/release-service/20.04.3/src/kopete-20.04.3.tar.xz";
1082− sha256 = "b37a120e3239ee4e53aedf5756c63f62a737c0774021ec27b120b054e57f886b";
1083− name = "kopete-20.04.3.tar.xz";
1073+ url = "${mirror}/stable/release-service/20.08.0/src/kopete-20.08.0.tar.xz";
1074+ sha256 = "44805238ed04620101d3921e3eab0bb89d329c4d216b9cb49589459a3e4ea7e6";
1075+ name = "kopete-20.08.0.tar.xz";
10841076 };
10851077 };
10861078 korganizer = {
1087− version = "20.04.3";
1079+ version = "20.08.0";
10881080 src = fetchurl {
1089− url = "${mirror}/stable/release-service/20.04.3/src/korganizer-20.04.3.tar.xz";
1090− sha256 = "bf2ee5a3e50dca9ab0cde0b5b0d67dc561788527a216d4ef159144da5bf192a3";
1091− name = "korganizer-20.04.3.tar.xz";
1081+ url = "${mirror}/stable/release-service/20.08.0/src/korganizer-20.08.0.tar.xz";
1082+ sha256 = "c99470c92327e9e6c91276b4141bb36b08e3a9726e40edba6656d1014ee46b82";
1083+ name = "korganizer-20.08.0.tar.xz";
10921084 };
10931085 };
10941086 kpat = {
1095− version = "20.04.3";
1087+ version = "20.08.0";
10961088 src = fetchurl {
1097− url = "${mirror}/stable/release-service/20.04.3/src/kpat-20.04.3.tar.xz";
1098− sha256 = "2a207c9efa1a62c99f8b33cf44782c563ee032b706ef63548239a4c303ec9a66";
1099− name = "kpat-20.04.3.tar.xz";
1089+ url = "${mirror}/stable/release-service/20.08.0/src/kpat-20.08.0.tar.xz";
1090+ sha256 = "feaca3a018a8b2a94a183915b29ff671474911b1da3a149bf3ba70fdcd0a6f53";
1091+ name = "kpat-20.08.0.tar.xz";
11001092 };
11011093 };
11021094 kpimtextedit = {
1103− version = "20.04.3";
1095+ version = "20.08.0";
11041096 src = fetchurl {
1105− url = "${mirror}/stable/release-service/20.04.3/src/kpimtextedit-20.04.3.tar.xz";
1106− sha256 = "f6cc5cf0ca2e598ba0c98590f16a8fabf87e1592ad62e6832c787cf2c3616cb8";
1107− name = "kpimtextedit-20.04.3.tar.xz";
1097+ url = "${mirror}/stable/release-service/20.08.0/src/kpimtextedit-20.08.0.tar.xz";
1098+ sha256 = "3ae3b9f8a980d10e366351efaf2b186fd911402da5b5ee634f4687d43586ce34";
1099+ name = "kpimtextedit-20.08.0.tar.xz";
11081100 };
11091101 };
11101102 kpkpass = {
1111− version = "20.04.3";
1103+ version = "20.08.0";
11121104 src = fetchurl {
1113− url = "${mirror}/stable/release-service/20.04.3/src/kpkpass-20.04.3.tar.xz";
1114− sha256 = "1f8b9bd587c278773fb016bc9fb774b03f82bcdf3c95fdca8bfc070f9a3ff322";
1115− name = "kpkpass-20.04.3.tar.xz";
1105+ url = "${mirror}/stable/release-service/20.08.0/src/kpkpass-20.08.0.tar.xz";
1106+ sha256 = "553b841cf3fdf4809251941997f7dee8e09360a5b7df386e3540c73d176ba055";
1107+ name = "kpkpass-20.08.0.tar.xz";
11161108 };
11171109 };
11181110 kqtquickcharts = {
1119− version = "20.04.3";
1111+ version = "20.08.0";
11201112 src = fetchurl {
1121− url = "${mirror}/stable/release-service/20.04.3/src/kqtquickcharts-20.04.3.tar.xz";
1122− sha256 = "69ff44ceb85779f7d4f52e092a8a5d18231ea0704d67d34d15ef94acf0d668c7";
1123− name = "kqtquickcharts-20.04.3.tar.xz";
1113+ url = "${mirror}/stable/release-service/20.08.0/src/kqtquickcharts-20.08.0.tar.xz";
1114+ sha256 = "f17807dfa20de202615c56779ef6e4d355a275b576d6e0969357fdb359b1b235";
1115+ name = "kqtquickcharts-20.08.0.tar.xz";
11241116 };
11251117 };
11261118 krdc = {
1127− version = "20.04.3";
1119+ version = "20.08.0";
11281120 src = fetchurl {
1129− url = "${mirror}/stable/release-service/20.04.3/src/krdc-20.04.3.tar.xz";
1130− sha256 = "4e8f60b4abd05d45e59a773a63cc185529e9fbabb295524a59c835af547d4bc8";
1131− name = "krdc-20.04.3.tar.xz";
1121+ url = "${mirror}/stable/release-service/20.08.0/src/krdc-20.08.0.tar.xz";
1122+ sha256 = "96f4411dc80e746142796745c3b7fca4663aa37878391a00d1e70f2ba3be652c";
1123+ name = "krdc-20.08.0.tar.xz";
11321124 };
11331125 };
11341126 kreversi = {
1135− version = "20.04.3";
1127+ version = "20.08.0";
11361128 src = fetchurl {
1137− url = "${mirror}/stable/release-service/20.04.3/src/kreversi-20.04.3.tar.xz";
1138− sha256 = "b2d9220f5919361ff81473c8b597585cc4c004b16ee459691e26feeb2e0c3114";
1139− name = "kreversi-20.04.3.tar.xz";
1129+ url = "${mirror}/stable/release-service/20.08.0/src/kreversi-20.08.0.tar.xz";
1130+ sha256 = "341603d23ffaf94af6c246540bbe7ba86aca3e5afe3135a0511aca22cd6a4d7f";
1131+ name = "kreversi-20.08.0.tar.xz";
11401132 };
11411133 };
11421134 krfb = {
1143− version = "20.04.3";
1135+ version = "20.08.0";
11441136 src = fetchurl {
1145− url = "${mirror}/stable/release-service/20.04.3/src/krfb-20.04.3.tar.xz";
1146− sha256 = "44532435ef824ff09d877d6984dbdfdcc5fd941f9e2abed65829dba89afeee0d";
1147− name = "krfb-20.04.3.tar.xz";
1137+ url = "${mirror}/stable/release-service/20.08.0/src/krfb-20.08.0.tar.xz";
1138+ sha256 = "f7ca46cc216ecd3790d045a36a642c834a9af4024409075e7a5bf8b498c67e4b";
1139+ name = "krfb-20.08.0.tar.xz";
11481140 };
11491141 };
11501142 kross-interpreters = {
1151− version = "20.04.3";
1143+ version = "20.08.0";
11521144 src = fetchurl {
1153− url = "${mirror}/stable/release-service/20.04.3/src/kross-interpreters-20.04.3.tar.xz";
1154− sha256 = "7e5d1f771477831f42dc209c0333977af17a143ec8c7f60acbab9f5390818457";
1155− name = "kross-interpreters-20.04.3.tar.xz";
1145+ url = "${mirror}/stable/release-service/20.08.0/src/kross-interpreters-20.08.0.tar.xz";
1146+ sha256 = "7a27547b150d686524578fc256e1282f64554513d2724994020caf89e7a60b10";
1147+ name = "kross-interpreters-20.08.0.tar.xz";
11561148 };
11571149 };
11581150 kruler = {
1159− version = "20.04.3";
1151+ version = "20.08.0";
11601152 src = fetchurl {
1161− url = "${mirror}/stable/release-service/20.04.3/src/kruler-20.04.3.tar.xz";
1162− sha256 = "66a02829d860777184e281747dd696c6bd326d874a96173d9c47759b9e7243fe";
1163− name = "kruler-20.04.3.tar.xz";
1153+ url = "${mirror}/stable/release-service/20.08.0/src/kruler-20.08.0.tar.xz";
1154+ sha256 = "71ca2308b8cee2fdd01faac526d20c813cab3664443b78e751f9d7d024e4e2c0";
1155+ name = "kruler-20.08.0.tar.xz";
11641156 };
11651157 };
11661158 kshisen = {
1167− version = "20.04.3";
1159+ version = "20.08.0";
11681160 src = fetchurl {
1169− url = "${mirror}/stable/release-service/20.04.3/src/kshisen-20.04.3.tar.xz";
1170− sha256 = "ee91821b13dc13d54a0cdf64582eff820faf934df3654135c55bd3210b98bd52";
1171− name = "kshisen-20.04.3.tar.xz";
1161+ url = "${mirror}/stable/release-service/20.08.0/src/kshisen-20.08.0.tar.xz";
1162+ sha256 = "5b3cc83d3cd427dcbaa98e2536f58deb36ee4eefe0a35e6d5c9613a64abad0d8";
1163+ name = "kshisen-20.08.0.tar.xz";
11721164 };
11731165 };
11741166 ksirk = {
1175− version = "20.04.3";
1167+ version = "20.08.0";
11761168 src = fetchurl {
1177− url = "${mirror}/stable/release-service/20.04.3/src/ksirk-20.04.3.tar.xz";
1178− sha256 = "c3c86db84b2603a0cd11e7b0da5e3c66b81c26983ace113b836ec3579dce736a";
1179− name = "ksirk-20.04.3.tar.xz";
1169+ url = "${mirror}/stable/release-service/20.08.0/src/ksirk-20.08.0.tar.xz";
1170+ sha256 = "7e4acd8586a2c8619c3ca08138ca22cee46b4c46d5972a571665b09c6468cd06";
1171+ name = "ksirk-20.08.0.tar.xz";
11801172 };
11811173 };
11821174 ksmtp = {
1183− version = "20.04.3";
1175+ version = "20.08.0";
11841176 src = fetchurl {
1185− url = "${mirror}/stable/release-service/20.04.3/src/ksmtp-20.04.3.tar.xz";
1186− sha256 = "107d135e9337dfec6f16095c75dd0cf81bdc86cee6eeb6d212954a08a9c2e3ce";
1187− name = "ksmtp-20.04.3.tar.xz";
1177+ url = "${mirror}/stable/release-service/20.08.0/src/ksmtp-20.08.0.tar.xz";
1178+ sha256 = "3fe08534bdb7037a8fd9a8c1a37456abe80252994232cfe31c368dcdc3c328c2";
1179+ name = "ksmtp-20.08.0.tar.xz";
11881180 };
11891181 };
11901182 ksnakeduel = {
1191− version = "20.04.3";
1183+ version = "20.08.0";
11921184 src = fetchurl {
1193− url = "${mirror}/stable/release-service/20.04.3/src/ksnakeduel-20.04.3.tar.xz";
1194− sha256 = "99a033313a3093489d39e7d537d064287aeebbfea05accfe8a189f0296664bf2";
1195− name = "ksnakeduel-20.04.3.tar.xz";
1185+ url = "${mirror}/stable/release-service/20.08.0/src/ksnakeduel-20.08.0.tar.xz";
1186+ sha256 = "ebc5353ea2e5d16f2d966859b0ea081c81ed7d10c1975054e441545b79f60e5e";
1187+ name = "ksnakeduel-20.08.0.tar.xz";
11961188 };
11971189 };
11981190 kspaceduel = {
1199− version = "20.04.3";
1191+ version = "20.08.0";
12001192 src = fetchurl {
1201− url = "${mirror}/stable/release-service/20.04.3/src/kspaceduel-20.04.3.tar.xz";
1202− sha256 = "dda32d2a89645129c7ee83aca7b21bc01d5120e0d58e8f39516c0837be531e38";
1203− name = "kspaceduel-20.04.3.tar.xz";
1193+ url = "${mirror}/stable/release-service/20.08.0/src/kspaceduel-20.08.0.tar.xz";
1194+ sha256 = "6cd633521091ac8a1eed28b234657ba2db287c3b29ee2d071005f3438bbb1b07";
1195+ name = "kspaceduel-20.08.0.tar.xz";
12041196 };
12051197 };
12061198 ksquares = {
1207− version = "20.04.3";
1199+ version = "20.08.0";
12081200 src = fetchurl {
1209− url = "${mirror}/stable/release-service/20.04.3/src/ksquares-20.04.3.tar.xz";
1210− sha256 = "eb72d929cd59b076d20483ee03548d72df3dc894b631947ce3440aff0ecad730";
1211− name = "ksquares-20.04.3.tar.xz";
1201+ url = "${mirror}/stable/release-service/20.08.0/src/ksquares-20.08.0.tar.xz";
1202+ sha256 = "84b459e6c1058f637b4894a4f97dfd95b0c9bb70954059d24538f80918b45ed3";
1203+ name = "ksquares-20.08.0.tar.xz";
12121204 };
12131205 };
12141206 ksudoku = {
1215− version = "20.04.3";
1207+ version = "20.08.0";
12161208 src = fetchurl {
1217− url = "${mirror}/stable/release-service/20.04.3/src/ksudoku-20.04.3.tar.xz";
1218− sha256 = "2df6e5cf78eee919624aa71716ef35baa9215e44662cdd7b315cfbc328c6ac19";
1219− name = "ksudoku-20.04.3.tar.xz";
1209+ url = "${mirror}/stable/release-service/20.08.0/src/ksudoku-20.08.0.tar.xz";
1210+ sha256 = "0dbe6e03ca8b7203a307f97dad4a8035c20f3172d3e005b047557c2334c04a92";
1211+ name = "ksudoku-20.08.0.tar.xz";
12201212 };
12211213 };
12221214 ksystemlog = {
1223− version = "20.04.3";
1215+ version = "20.08.0";
12241216 src = fetchurl {
1225− url = "${mirror}/stable/release-service/20.04.3/src/ksystemlog-20.04.3.tar.xz";
1226− sha256 = "03a6f81d1b4aa8557f7da6777ef909a02fbd811b3a39df81312dc0a70bbb8f77";
1227− name = "ksystemlog-20.04.3.tar.xz";
1217+ url = "${mirror}/stable/release-service/20.08.0/src/ksystemlog-20.08.0.tar.xz";
1218+ sha256 = "359eaa1cc34fa06b2ef3788c249c2b3355d6d39cddbf809df07179c10630e9a4";
1219+ name = "ksystemlog-20.08.0.tar.xz";
12281220 };
12291221 };
12301222 kteatime = {
1231− version = "20.04.3";
1223+ version = "20.08.0";
12321224 src = fetchurl {
1233− url = "${mirror}/stable/release-service/20.04.3/src/kteatime-20.04.3.tar.xz";
1234− sha256 = "2ddc0df953a66376e5b0c11544a6a2ec9f173e4481a44a290aada20402c7d686";
1235− name = "kteatime-20.04.3.tar.xz";
1225+ url = "${mirror}/stable/release-service/20.08.0/src/kteatime-20.08.0.tar.xz";
1226+ sha256 = "c7142cd0329cf23fdb79d3c2d508cb00cb70c517db1f832d2a39ba7c4e103fd3";
1227+ name = "kteatime-20.08.0.tar.xz";
12361228 };
12371229 };
12381230 ktimer = {
1239− version = "20.04.3";
1231+ version = "20.08.0";
12401232 src = fetchurl {
1241− url = "${mirror}/stable/release-service/20.04.3/src/ktimer-20.04.3.tar.xz";
1242− sha256 = "e9881d68ed4fbbff5900d615f81145cd73e70a08092a83b87d71705ee5904395";
1243− name = "ktimer-20.04.3.tar.xz";
1233+ url = "${mirror}/stable/release-service/20.08.0/src/ktimer-20.08.0.tar.xz";
1234+ sha256 = "4a3722945f26df087158a5af69cc81ba10054a778f04fecd32ff816732dff0dd";
1235+ name = "ktimer-20.08.0.tar.xz";
12441236 };
12451237 };
12461238 ktnef = {
1247− version = "20.04.3";
1239+ version = "20.08.0";
12481240 src = fetchurl {
1249− url = "${mirror}/stable/release-service/20.04.3/src/ktnef-20.04.3.tar.xz";
1250− sha256 = "31f5f15ab27112f99ab7b2575a4f90bf612b99a3816544e6919ad4c5a2dc7145";
1251− name = "ktnef-20.04.3.tar.xz";
1241+ url = "${mirror}/stable/release-service/20.08.0/src/ktnef-20.08.0.tar.xz";
1242+ sha256 = "69d18a052cc522161821f98fb4103d38e1ff566622915b7138866e7737ffa62f";
1243+ name = "ktnef-20.08.0.tar.xz";
12521244 };
12531245 };
12541246 ktouch = {
1255− version = "20.04.3";
1247+ version = "20.08.0";
12561248 src = fetchurl {
1257− url = "${mirror}/stable/release-service/20.04.3/src/ktouch-20.04.3.tar.xz";
1258− sha256 = "7f1c456ae758a6e7eb58e83120289fa8eb5c56c3c98cd9c9f974cea5dd156ea8";
1259− name = "ktouch-20.04.3.tar.xz";
1249+ url = "${mirror}/stable/release-service/20.08.0/src/ktouch-20.08.0.tar.xz";
1250+ sha256 = "c4b218f672c0cb86930cdadf622d758a42b54732319e8ea86405b7f9b3281802";
1251+ name = "ktouch-20.08.0.tar.xz";
12601252 };
12611253 };
12621254 ktp-accounts-kcm = {
1263− version = "20.04.3";
1255+ version = "20.08.0";
12641256 src = fetchurl {
1265− url = "${mirror}/stable/release-service/20.04.3/src/ktp-accounts-kcm-20.04.3.tar.xz";
1266− sha256 = "d45588dbd1441ccb0576e7f76489217351bad5fd25d4636ae9da6f81654f5f4b";
1267− name = "ktp-accounts-kcm-20.04.3.tar.xz";
1257+ url = "${mirror}/stable/release-service/20.08.0/src/ktp-accounts-kcm-20.08.0.tar.xz";
1258+ sha256 = "912552aa0df62298323c5eaaf36975b71ef50be56a5b69ceddcd5f00d4acb4f9";
1259+ name = "ktp-accounts-kcm-20.08.0.tar.xz";
12681260 };
12691261 };
12701262 ktp-approver = {
1271− version = "20.04.3";
1263+ version = "20.08.0";
12721264 src = fetchurl {
1273− url = "${mirror}/stable/release-service/20.04.3/src/ktp-approver-20.04.3.tar.xz";
1274− sha256 = "9c91d44476151f39ef02e2eeede7dee7f24689643a07d51d44ca8d98577d24a2";
1275− name = "ktp-approver-20.04.3.tar.xz";
1265+ url = "${mirror}/stable/release-service/20.08.0/src/ktp-approver-20.08.0.tar.xz";
1266+ sha256 = "463a9009599b6e18b2e30793b6bce408e4c9a0edb2de458fb588204eb0aa2f3a";
1267+ name = "ktp-approver-20.08.0.tar.xz";
12761268 };
12771269 };
12781270 ktp-auth-handler = {
1279− version = "20.04.3";
1271+ version = "20.08.0";
12801272 src = fetchurl {
1281− url = "${mirror}/stable/release-service/20.04.3/src/ktp-auth-handler-20.04.3.tar.xz";
1282− sha256 = "6c73960c44ff42e8c0b6be54b308fc992ab8177f90954ebd960ea6d610e14568";
1283− name = "ktp-auth-handler-20.04.3.tar.xz";
1273+ url = "${mirror}/stable/release-service/20.08.0/src/ktp-auth-handler-20.08.0.tar.xz";
1274+ sha256 = "d2f1dd4c5f4043eebeb178dd20eedc95dea47a4c75f2df13cd1d9cd0288b699a";
1275+ name = "ktp-auth-handler-20.08.0.tar.xz";
12841276 };
12851277 };
12861278 ktp-call-ui = {
1287− version = "20.04.3";
1279+ version = "20.08.0";
12881280 src = fetchurl {
1289− url = "${mirror}/stable/release-service/20.04.3/src/ktp-call-ui-20.04.3.tar.xz";
1290− sha256 = "b997c6252c35f7e295f2389ac76c5dc12227e8a6bbfd1b42d72b622d488bcf98";
1291− name = "ktp-call-ui-20.04.3.tar.xz";
1281+ url = "${mirror}/stable/release-service/20.08.0/src/ktp-call-ui-20.08.0.tar.xz";
1282+ sha256 = "2744e739456fd3aba322eb3c47be84511450dd713838e133be4f1957a3b9a0bf";
1283+ name = "ktp-call-ui-20.08.0.tar.xz";
12921284 };
12931285 };
12941286 ktp-common-internals = {
1295− version = "20.04.3";
1287+ version = "20.08.0";
12961288 src = fetchurl {
1297− url = "${mirror}/stable/release-service/20.04.3/src/ktp-common-internals-20.04.3.tar.xz";
1298− sha256 = "0e7a1c61869d297831615c719e5c79f2b00a6572479d2c2eaca642de6d376efd";
1299− name = "ktp-common-internals-20.04.3.tar.xz";
1289+ url = "${mirror}/stable/release-service/20.08.0/src/ktp-common-internals-20.08.0.tar.xz";
1290+ sha256 = "9ee962e2afd5db0fc23da69468f008ff239e97ef77d8930f7e5960d732d8a4b2";
1291+ name = "ktp-common-internals-20.08.0.tar.xz";
13001292 };
13011293 };
13021294 ktp-contact-list = {
1303− version = "20.04.3";
1295+ version = "20.08.0";
13041296 src = fetchurl {
1305− url = "${mirror}/stable/release-service/20.04.3/src/ktp-contact-list-20.04.3.tar.xz";
1306− sha256 = "c909e21fb168c14c61d1d617b6854ff505eaf4693479d8d0bba746fde0ee11af";
1307− name = "ktp-contact-list-20.04.3.tar.xz";
1297+ url = "${mirror}/stable/release-service/20.08.0/src/ktp-contact-list-20.08.0.tar.xz";
1298+ sha256 = "ec00bf525450c972634e60dfb423f9cd2be7caa4181e84efa7d88fc6f079a995";
1299+ name = "ktp-contact-list-20.08.0.tar.xz";
13081300 };
13091301 };
13101302 ktp-contact-runner = {
1311− version = "20.04.3";
1303+ version = "20.08.0";
13121304 src = fetchurl {
1313− url = "${mirror}/stable/release-service/20.04.3/src/ktp-contact-runner-20.04.3.tar.xz";
1314− sha256 = "cb3313ca916a7e3fff78529ccc4a499763766957d22f65dee9663cd950c2b4a6";
1315− name = "ktp-contact-runner-20.04.3.tar.xz";
1305+ url = "${mirror}/stable/release-service/20.08.0/src/ktp-contact-runner-20.08.0.tar.xz";
1306+ sha256 = "1123adbdfdbdb8bb524ba39ab175f39964cef2ecf5eed9a0a1d0129d7ae8ecbc";
1307+ name = "ktp-contact-runner-20.08.0.tar.xz";
13161308 };
13171309 };
13181310 ktp-desktop-applets = {
1319− version = "20.04.3";
1311+ version = "20.08.0";
13201312 src = fetchurl {
1321− url = "${mirror}/stable/release-service/20.04.3/src/ktp-desktop-applets-20.04.3.tar.xz";
1322− sha256 = "40f1125d4d91e2586d06d45b59d12ac19ee93aaae8c3d4df75db196f7e91e875";
1323− name = "ktp-desktop-applets-20.04.3.tar.xz";
1313+ url = "${mirror}/stable/release-service/20.08.0/src/ktp-desktop-applets-20.08.0.tar.xz";
1314+ sha256 = "6a6eb5090f6273abb9ff1b70777c32bd4ba5fd0d270dfa0490ac370c31d0cab5";
1315+ name = "ktp-desktop-applets-20.08.0.tar.xz";
13241316 };
13251317 };
13261318 ktp-filetransfer-handler = {
1327− version = "20.04.3";
1319+ version = "20.08.0";
13281320 src = fetchurl {
1329− url = "${mirror}/stable/release-service/20.04.3/src/ktp-filetransfer-handler-20.04.3.tar.xz";
1330− sha256 = "74df7140bac0b87e3ff39e8ab692bb4c65a10612f328c8d60a84433ae865de52";
1331− name = "ktp-filetransfer-handler-20.04.3.tar.xz";
1321+ url = "${mirror}/stable/release-service/20.08.0/src/ktp-filetransfer-handler-20.08.0.tar.xz";
1322+ sha256 = "df16a920a233eaec25c73514e951f5f569a0f0f6d4ba46b60a0c2bc3da4ab6cd";
1323+ name = "ktp-filetransfer-handler-20.08.0.tar.xz";
13321324 };
13331325 };
13341326 ktp-kded-module = {
1335− version = "20.04.3";
1327+ version = "20.08.0";
13361328 src = fetchurl {
1337− url = "${mirror}/stable/release-service/20.04.3/src/ktp-kded-module-20.04.3.tar.xz";
1338− sha256 = "972a4a5d7108351a07be670654b4e78dfe9fb7657336c563040e1e831134aad2";
1339− name = "ktp-kded-module-20.04.3.tar.xz";
1329+ url = "${mirror}/stable/release-service/20.08.0/src/ktp-kded-module-20.08.0.tar.xz";
1330+ sha256 = "f321a7db60b0fcd9dd207c38c8097e6cdb3a22aba6730bc03f9ea67bc8d9bb2e";
1331+ name = "ktp-kded-module-20.08.0.tar.xz";
13401332 };
13411333 };
13421334 ktp-send-file = {
1343− version = "20.04.3";
1335+ version = "20.08.0";
13441336 src = fetchurl {
1345− url = "${mirror}/stable/release-service/20.04.3/src/ktp-send-file-20.04.3.tar.xz";
1346− sha256 = "fa67edd7ec516ed727d5df0d30ccf6b990cee40f8062a9966a8643d6f26c8344";
1347− name = "ktp-send-file-20.04.3.tar.xz";
1337+ url = "${mirror}/stable/release-service/20.08.0/src/ktp-send-file-20.08.0.tar.xz";
1338+ sha256 = "86d3ca20eb3c3fbfa169a355c0e64d1574433c6985d5188697ef18e521d82104";
1339+ name = "ktp-send-file-20.08.0.tar.xz";
13481340 };
13491341 };
13501342 ktp-text-ui = {
1351− version = "20.04.3";
1343+ version = "20.08.0";
13521344 src = fetchurl {
1353− url = "${mirror}/stable/release-service/20.04.3/src/ktp-text-ui-20.04.3.tar.xz";
1354− sha256 = "be6253246134aa6513b0ff36d25a833d469e6850da1f5c8c05666a555bbfd9b2";
1355− name = "ktp-text-ui-20.04.3.tar.xz";
1345+ url = "${mirror}/stable/release-service/20.08.0/src/ktp-text-ui-20.08.0.tar.xz";
1346+ sha256 = "a1f5c4c98761f61abd62b6e788a8ec5c4e2b4020e92f3c0c75770c0f01386676";
1347+ name = "ktp-text-ui-20.08.0.tar.xz";
13561348 };
13571349 };
13581350 ktuberling = {
1359− version = "20.04.3";
1351+ version = "20.08.0";
13601352 src = fetchurl {
1361− url = "${mirror}/stable/release-service/20.04.3/src/ktuberling-20.04.3.tar.xz";
1362− sha256 = "0fb7ef29c5bf02de56243e608a050fce992df56586d305a157ed3ac70f002a44";
1363− name = "ktuberling-20.04.3.tar.xz";
1353+ url = "${mirror}/stable/release-service/20.08.0/src/ktuberling-20.08.0.tar.xz";
1354+ sha256 = "8d56e4330b68d8597d502db311282a9d59f8ad91f8acfa7f029d354ac399b702";
1355+ name = "ktuberling-20.08.0.tar.xz";
13641356 };
13651357 };
13661358 kturtle = {
1367− version = "20.04.3";
1359+ version = "20.08.0";
13681360 src = fetchurl {
1369− url = "${mirror}/stable/release-service/20.04.3/src/kturtle-20.04.3.tar.xz";
1370− sha256 = "e04034812c62e22be0ee7eb91d89a9e0e0c73bb5cba8e914373f407c99e8c0cb";
1371− name = "kturtle-20.04.3.tar.xz";
1361+ url = "${mirror}/stable/release-service/20.08.0/src/kturtle-20.08.0.tar.xz";
1362+ sha256 = "9c086a0aec74d9d5aa5792f026e6b44b8fdc613cfdeba060fb4694fb3e9b27f9";
1363+ name = "kturtle-20.08.0.tar.xz";
13721364 };
13731365 };
13741366 kubrick = {
1375− version = "20.04.3";
1367+ version = "20.08.0";
13761368 src = fetchurl {
1377− url = "${mirror}/stable/release-service/20.04.3/src/kubrick-20.04.3.tar.xz";
1378− sha256 = "983310938ad0437902d886f433b0693a3a08faaca0f5553a3aa24e89e3215fb9";
1379− name = "kubrick-20.04.3.tar.xz";
1369+ url = "${mirror}/stable/release-service/20.08.0/src/kubrick-20.08.0.tar.xz";
1370+ sha256 = "2cf725a96d52d7be157690fb9ce6fe0dcc2cb853fe6e1f9d56ae6c23c09974cc";
1371+ name = "kubrick-20.08.0.tar.xz";
13801372 };
13811373 };
13821374 kwalletmanager = {
1383− version = "20.04.3";
1375+ version = "20.08.0";
13841376 src = fetchurl {
1385− url = "${mirror}/stable/release-service/20.04.3/src/kwalletmanager-20.04.3.tar.xz";
1386− sha256 = "3821d17f5238bd51b9d19ef5974e063aa6426f35afcd0cffa89af109c770151e";
1387− name = "kwalletmanager-20.04.3.tar.xz";
1377+ url = "${mirror}/stable/release-service/20.08.0/src/kwalletmanager-20.08.0.tar.xz";
1378+ sha256 = "4dea2e1b08cc996d6d4961393d9c8f24051b0a7f6373c4cf575ddf8324804b7a";
1379+ name = "kwalletmanager-20.08.0.tar.xz";
13881380 };
13891381 };
13901382 kwave = {
1391− version = "20.04.3";
1383+ version = "20.08.0";
13921384 src = fetchurl {
1393− url = "${mirror}/stable/release-service/20.04.3/src/kwave-20.04.3.tar.xz";
1394− sha256 = "111ea78c90371f566500e88d746812b17875e154e431b3694e3d226f3f19e988";
1395− name = "kwave-20.04.3.tar.xz";
1385+ url = "${mirror}/stable/release-service/20.08.0/src/kwave-20.08.0.tar.xz";
1386+ sha256 = "7291122e5112eea9b8026937682f77d78e43153c4dc38005ac31fd7235a18e69";
1387+ name = "kwave-20.08.0.tar.xz";
13961388 };
13971389 };
13981390 kwordquiz = {
1399− version = "20.04.3";
1391+ version = "20.08.0";
14001392 src = fetchurl {
1401− url = "${mirror}/stable/release-service/20.04.3/src/kwordquiz-20.04.3.tar.xz";
1402− sha256 = "464684309e098c4e8663d39cd98f53a640a93e1d8ac169a2a0ac3cc98d7f8e12";
1403− name = "kwordquiz-20.04.3.tar.xz";
1393+ url = "${mirror}/stable/release-service/20.08.0/src/kwordquiz-20.08.0.tar.xz";
1394+ sha256 = "c8350fcf5b4ed61a43d3d72aabfef645e7d1908ef753df36c0124601873b4951";
1395+ name = "kwordquiz-20.08.0.tar.xz";
14041396 };
14051397 };
14061398 libgravatar = {
1407− version = "20.04.3";
1399+ version = "20.08.0";
14081400 src = fetchurl {
1409− url = "${mirror}/stable/release-service/20.04.3/src/libgravatar-20.04.3.tar.xz";
1410− sha256 = "0a5eadd5c8492eb17225e0ff2d221f69231e72ca9b8a78080301639662a18acf";
1411− name = "libgravatar-20.04.3.tar.xz";
1401+ url = "${mirror}/stable/release-service/20.08.0/src/libgravatar-20.08.0.tar.xz";
1402+ sha256 = "9faf1ab53cebf2f54fb851ec5bcffc65b18a846a50e3d890b66b947ab93d6397";
1403+ name = "libgravatar-20.08.0.tar.xz";
14121404 };
14131405 };
14141406 libkcddb = {
1415− version = "20.04.3";
1407+ version = "20.08.0";
14161408 src = fetchurl {
1417− url = "${mirror}/stable/release-service/20.04.3/src/libkcddb-20.04.3.tar.xz";
1418− sha256 = "d205d3a458c0d54d7118e36006710fe2d2993de5b417c9d8936762fa710634b4";
1419− name = "libkcddb-20.04.3.tar.xz";
1409+ url = "${mirror}/stable/release-service/20.08.0/src/libkcddb-20.08.0.tar.xz";
1410+ sha256 = "516723e29ae37c84865eaf86f82481c4275ea8507e172fc8a0279572705fbc6a";
1411+ name = "libkcddb-20.08.0.tar.xz";
14201412 };
14211413 };
14221414 libkcompactdisc = {
1423− version = "20.04.3";
1415+ version = "20.08.0";
14241416 src = fetchurl {
1425− url = "${mirror}/stable/release-service/20.04.3/src/libkcompactdisc-20.04.3.tar.xz";
1426− sha256 = "5bc98eba521f66cb52645786cf875037397e4dbd3ec4c9a23687d936d1505d24";
1427− name = "libkcompactdisc-20.04.3.tar.xz";
1417+ url = "${mirror}/stable/release-service/20.08.0/src/libkcompactdisc-20.08.0.tar.xz";
1418+ sha256 = "043a0ca6dd5d85b4313495d0ae530fe96448da2f472a8af2a633d646be0c065c";
1419+ name = "libkcompactdisc-20.08.0.tar.xz";
14281420 };
14291421 };
14301422 libkdcraw = {
1431− version = "20.04.3";
1423+ version = "20.08.0";
14321424 src = fetchurl {
1433− url = "${mirror}/stable/release-service/20.04.3/src/libkdcraw-20.04.3.tar.xz";
1434− sha256 = "e37e9210a250955d1fe63d2d96571d0630572633e567eb047af9f24db2b86cb5";
1435− name = "libkdcraw-20.04.3.tar.xz";
1425+ url = "${mirror}/stable/release-service/20.08.0/src/libkdcraw-20.08.0.tar.xz";
1426+ sha256 = "8e2e1577a751eb0c570e5f6ad394d459ef3d127ee8950eee25a4ebf62a2eece7";
1427+ name = "libkdcraw-20.08.0.tar.xz";
14361428 };
14371429 };
14381430 libkdegames = {
1439− version = "20.04.3";
1431+ version = "20.08.0";
14401432 src = fetchurl {
1441− url = "${mirror}/stable/release-service/20.04.3/src/libkdegames-20.04.3.tar.xz";
1442− sha256 = "fda965e2ff166abe89cf008a5160262f061a6c3aeda4a71a834b5ed66ea6d0be";
1443− name = "libkdegames-20.04.3.tar.xz";
1433+ url = "${mirror}/stable/release-service/20.08.0/src/libkdegames-20.08.0.tar.xz";
1434+ sha256 = "d77f5e2d913c68286014fe1438b9909826931aaa944a0ce1753d1a449766d99c";
1435+ name = "libkdegames-20.08.0.tar.xz";
14441436 };
14451437 };
14461438 libkdepim = {
1447− version = "20.04.3";
1439+ version = "20.08.0";
14481440 src = fetchurl {
1449− url = "${mirror}/stable/release-service/20.04.3/src/libkdepim-20.04.3.tar.xz";
1450− sha256 = "f4ecc6d33aace0a0025afe390a113f79bb052b816c567ea31996aaf08fe873ea";
1451− name = "libkdepim-20.04.3.tar.xz";
1441+ url = "${mirror}/stable/release-service/20.08.0/src/libkdepim-20.08.0.tar.xz";
1442+ sha256 = "4f5f0688529d13c10c1c3509f64874a069a5d6cae84f81b258b1d081e86771e0";
1443+ name = "libkdepim-20.08.0.tar.xz";
14521444 };
14531445 };
14541446 libkeduvocdocument = {
1455− version = "20.04.3";
1447+ version = "20.08.0";
14561448 src = fetchurl {
1457− url = "${mirror}/stable/release-service/20.04.3/src/libkeduvocdocument-20.04.3.tar.xz";
1458− sha256 = "a53e17a84420fca8f9572d8439da2c63d1241a607952454003a4020104a25558";
1459− name = "libkeduvocdocument-20.04.3.tar.xz";
1449+ url = "${mirror}/stable/release-service/20.08.0/src/libkeduvocdocument-20.08.0.tar.xz";
1450+ sha256 = "21ee64628a012478eb8c53ce2374a57d587f6160f32f09231c78e9fac7600d5d";
1451+ name = "libkeduvocdocument-20.08.0.tar.xz";
14601452 };
14611453 };
14621454 libkexiv2 = {
1463− version = "20.04.3";
1455+ version = "20.08.0";
14641456 src = fetchurl {
1465− url = "${mirror}/stable/release-service/20.04.3/src/libkexiv2-20.04.3.tar.xz";
1466− sha256 = "12fa569aca07269e880bd976a6cc37b4f585fe2aac8837d437bc29999d95f6be";
1467− name = "libkexiv2-20.04.3.tar.xz";
1457+ url = "${mirror}/stable/release-service/20.08.0/src/libkexiv2-20.08.0.tar.xz";
1458+ sha256 = "d4e3fcdaf160c70165b1217931484d544d56ca7630d5f2c85484caebb2afe399";
1459+ name = "libkexiv2-20.08.0.tar.xz";
14681460 };
14691461 };
14701462 libkgapi = {
1471− version = "20.04.3";
1463+ version = "20.08.0";
14721464 src = fetchurl {
1473− url = "${mirror}/stable/release-service/20.04.3/src/libkgapi-20.04.3.tar.xz";
1474− sha256 = "9b689d8c4a1df0b792604cf5951b30d8343e984d890f4a3fb946a449723e520d";
1475− name = "libkgapi-20.04.3.tar.xz";
1465+ url = "${mirror}/stable/release-service/20.08.0/src/libkgapi-20.08.0.tar.xz";
1466+ sha256 = "215d21a89887522bbac09774723098dac1602bfc39e4ca23306d08b11d0cd89d";
1467+ name = "libkgapi-20.08.0.tar.xz";
14761468 };
14771469 };
14781470 libkgeomap = {
1479− version = "20.04.3";
1471+ version = "20.08.0";
14801472 src = fetchurl {
1481− url = "${mirror}/stable/release-service/20.04.3/src/libkgeomap-20.04.3.tar.xz";
1482− sha256 = "34e41b2505a34355a31a548bb8f94955b3dc4391c71201164574ff45b532818d";
1483− name = "libkgeomap-20.04.3.tar.xz";
1473+ url = "${mirror}/stable/release-service/20.08.0/src/libkgeomap-20.08.0.tar.xz";
1474+ sha256 = "bf39da71ec7cc40e536bf071abda61569acec4ae027d896738ae1ace74eaddf7";
1475+ name = "libkgeomap-20.08.0.tar.xz";
14841476 };
14851477 };
14861478 libkipi = {
1487− version = "20.04.3";
1479+ version = "20.08.0";
14881480 src = fetchurl {
1489− url = "${mirror}/stable/release-service/20.04.3/src/libkipi-20.04.3.tar.xz";
1490− sha256 = "4a72f0d1423a6a6f7017bf0598c99261575feb4d9af73520074f6f0b7f9e4c25";
1491− name = "libkipi-20.04.3.tar.xz";
1481+ url = "${mirror}/stable/release-service/20.08.0/src/libkipi-20.08.0.tar.xz";
1482+ sha256 = "2a66512b9c840e7e19f943066197a4ef68aea8cd059427732dec9cf5de84294e";
1483+ name = "libkipi-20.08.0.tar.xz";
14921484 };
14931485 };
14941486 libkleo = {
1495− version = "20.04.3";
1487+ version = "20.08.0";
14961488 src = fetchurl {
1497− url = "${mirror}/stable/release-service/20.04.3/src/libkleo-20.04.3.tar.xz";
1498− sha256 = "ef2a37a1c8793e4c89dcf49bc330044a617b4b04472679b179992b188e412c50";
1499− name = "libkleo-20.04.3.tar.xz";
1489+ url = "${mirror}/stable/release-service/20.08.0/src/libkleo-20.08.0.tar.xz";
1490+ sha256 = "44100f7a001ca7eb8cc4b2b9eeab5e8806a5d4eb2a01a69eeaf1843f4e023f85";
1491+ name = "libkleo-20.08.0.tar.xz";
15001492 };
15011493 };
15021494 libkmahjongg = {
1503− version = "20.04.3";
1495+ version = "20.08.0";
15041496 src = fetchurl {
1505− url = "${mirror}/stable/release-service/20.04.3/src/libkmahjongg-20.04.3.tar.xz";
1506− sha256 = "24fcff9d91c5143c7275c5c97c2be32e85f5c788749df3acc841fd28bee450a0";
1507− name = "libkmahjongg-20.04.3.tar.xz";
1497+ url = "${mirror}/stable/release-service/20.08.0/src/libkmahjongg-20.08.0.tar.xz";
1498+ sha256 = "1792a04f59fe188a7707c0f77e9ef598e9dfb6444c7aba574a4a46760aeaf63a";
1499+ name = "libkmahjongg-20.08.0.tar.xz";
15081500 };
15091501 };
15101502 libkomparediff2 = {
1511− version = "20.04.3";
1503+ version = "20.08.0";
15121504 src = fetchurl {
1513− url = "${mirror}/stable/release-service/20.04.3/src/libkomparediff2-20.04.3.tar.xz";
1514− sha256 = "e27a5fd3dd80a9c7c052ec3c824acc529073464788d1c6950d4d2c407b74c0b0";
1515− name = "libkomparediff2-20.04.3.tar.xz";
1505+ url = "${mirror}/stable/release-service/20.08.0/src/libkomparediff2-20.08.0.tar.xz";
1506+ sha256 = "0571d016675496341d6e841d88b2ff8682b2958d91a38a69a6130a0766ff6a1b";
1507+ name = "libkomparediff2-20.08.0.tar.xz";
15161508 };
15171509 };
15181510 libksane = {
1519− version = "20.04.3";
1511+ version = "20.08.0";
15201512 src = fetchurl {
1521− url = "${mirror}/stable/release-service/20.04.3/src/libksane-20.04.3.tar.xz";
1522− sha256 = "34827bcc5b9277292dd4434f2bf7610a28d54c86565f0410d4470c61f374c46e";
1523− name = "libksane-20.04.3.tar.xz";
1513+ url = "${mirror}/stable/release-service/20.08.0/src/libksane-20.08.0.tar.xz";
1514+ sha256 = "536e0f914095ddfeee132e227d9d2a840186da512b82d95fc9a7262a3a912ea6";
1515+ name = "libksane-20.08.0.tar.xz";
15241516 };
15251517 };
15261518 libksieve = {
1527− version = "20.04.3";
1519+ version = "20.08.0";
15281520 src = fetchurl {
1529− url = "${mirror}/stable/release-service/20.04.3/src/libksieve-20.04.3.tar.xz";
1530− sha256 = "8aacc0c41ac2b7bf48c8479c8fba581a325828b907053eba6b9b5ff4c63d0529";
1531− name = "libksieve-20.04.3.tar.xz";
1521+ url = "${mirror}/stable/release-service/20.08.0/src/libksieve-20.08.0.tar.xz";
1522+ sha256 = "af6b4a1b787efdf20792a8ded6ae4d8f49d4cef129b4b3fd7048441bb879b586";
1523+ name = "libksieve-20.08.0.tar.xz";
15321524 };
15331525 };
15341526 lokalize = {
1535− version = "20.04.3";
1527+ version = "20.08.0";
15361528 src = fetchurl {
1537− url = "${mirror}/stable/release-service/20.04.3/src/lokalize-20.04.3.tar.xz";
1538− sha256 = "fccba64af9faa5cbb5dfdb303009504993fe71282f0dbc9c748c5a28a327c379";
1539− name = "lokalize-20.04.3.tar.xz";
1529+ url = "${mirror}/stable/release-service/20.08.0/src/lokalize-20.08.0.tar.xz";
1530+ sha256 = "dd05509386b816aeb02797769c28e12cf8b3f38d88f722a699a77db94c9ab71e";
1531+ name = "lokalize-20.08.0.tar.xz";
15401532 };
15411533 };
15421534 lskat = {
1543− version = "20.04.3";
1535+ version = "20.08.0";
15441536 src = fetchurl {
1545− url = "${mirror}/stable/release-service/20.04.3/src/lskat-20.04.3.tar.xz";
1546− sha256 = "b7e33cc8097ee4bf4e5182a2a5db1e142c65b119424079f5e7f179720092815b";
1547− name = "lskat-20.04.3.tar.xz";
1537+ url = "${mirror}/stable/release-service/20.08.0/src/lskat-20.08.0.tar.xz";
1538+ sha256 = "9a6af851f0fb0b7e6f6d1983bf3c7f12a74022977e879a525424d2867762b471";
1539+ name = "lskat-20.08.0.tar.xz";
15481540 };
15491541 };
15501542 mailcommon = {
1551− version = "20.04.3";
1543+ version = "20.08.0";
15521544 src = fetchurl {
1553− url = "${mirror}/stable/release-service/20.04.3/src/mailcommon-20.04.3.tar.xz";
1554− sha256 = "80b6285c8152a64362f5f406b4a766b0937ff29acf87133b0326b6e7ce66809f";
1555− name = "mailcommon-20.04.3.tar.xz";
1545+ url = "${mirror}/stable/release-service/20.08.0/src/mailcommon-20.08.0.tar.xz";
1546+ sha256 = "fa110a41d5e4848d203d3c17fe18c584d892bf78f750c36a5e88a80c80dcd04a";
1547+ name = "mailcommon-20.08.0.tar.xz";
15561548 };
15571549 };
15581550 mailimporter = {
1559− version = "20.04.3";
1551+ version = "20.08.0";
15601552 src = fetchurl {
1561− url = "${mirror}/stable/release-service/20.04.3/src/mailimporter-20.04.3.tar.xz";
1562− sha256 = "13a95ee3d89d658222dcdc905311c72b1ba04e6b8aac863dee767a4d72d3d54e";
1563− name = "mailimporter-20.04.3.tar.xz";
1553+ url = "${mirror}/stable/release-service/20.08.0/src/mailimporter-20.08.0.tar.xz";
1554+ sha256 = "5263fdc50b772458cb584f799f80da765e0ac3c4f2e0fecee15305db829cd851";
1555+ name = "mailimporter-20.08.0.tar.xz";
15641556 };
15651557 };
15661558 marble = {
1567− version = "20.04.3";
1559+ version = "20.08.0";
15681560 src = fetchurl {
1569− url = "${mirror}/stable/release-service/20.04.3/src/marble-20.04.3.tar.xz";
1570− sha256 = "9c0b6fb13d53e1748de081c43e06cc132d5b07d46e594443b207fbaf74e1f95b";
1571− name = "marble-20.04.3.tar.xz";
1561+ url = "${mirror}/stable/release-service/20.08.0/src/marble-20.08.0.tar.xz";
1562+ sha256 = "0f61c29acc3f88a0eeb0e0923f8c5138188712aad6aa4d9445add186d5962381";
1563+ name = "marble-20.08.0.tar.xz";
15721564 };
15731565 };
15741566 mbox-importer = {
1575− version = "20.04.3";
1567+ version = "20.08.0";
15761568 src = fetchurl {
1577− url = "${mirror}/stable/release-service/20.04.3/src/mbox-importer-20.04.3.tar.xz";
1578− sha256 = "ce208091272052a909521cda31a74b2f4c8e8fabcb2937c24639673d1f43981d";
1579− name = "mbox-importer-20.04.3.tar.xz";
1569+ url = "${mirror}/stable/release-service/20.08.0/src/mbox-importer-20.08.0.tar.xz";
1570+ sha256 = "075afd543bec9c8c2d056b96704fbfd2fbc4498b289596d4fbb0cd49ff5c720b";
1571+ name = "mbox-importer-20.08.0.tar.xz";
15801572 };
15811573 };
15821574 messagelib = {
1583− version = "20.04.3";
1575+ version = "20.08.0";
15841576 src = fetchurl {
1585− url = "${mirror}/stable/release-service/20.04.3/src/messagelib-20.04.3.tar.xz";
1586− sha256 = "aa2c254f50ed4664b67df5857bba063d1400fe280f3a58658cfa59d3155b2adf";
1587− name = "messagelib-20.04.3.tar.xz";
1577+ url = "${mirror}/stable/release-service/20.08.0/src/messagelib-20.08.0.tar.xz";
1578+ sha256 = "13aa522b8ff8cf2d7ac7ca6ae4c92e1bd2379d13fc23cabaa36fd6d6bda261cd";
1579+ name = "messagelib-20.08.0.tar.xz";
15881580 };
15891581 };
15901582 minuet = {
1591− version = "20.04.3";
1583+ version = "20.08.0";
15921584 src = fetchurl {
1593− url = "${mirror}/stable/release-service/20.04.3/src/minuet-20.04.3.tar.xz";
1594− sha256 = "9afb598280a9b90013833005299fb0c33c3c7cc02b687f65616e04dc12e21d41";
1595− name = "minuet-20.04.3.tar.xz";
1585+ url = "${mirror}/stable/release-service/20.08.0/src/minuet-20.08.0.tar.xz";
1586+ sha256 = "f3e57e225ec6a0515d39bf868cdd934a6823071527f6da9910b839abc96c8fdb";
1587+ name = "minuet-20.08.0.tar.xz";
15961588 };
15971589 };
15981590 okular = {
1599− version = "20.04.3";
1591+ version = "20.08.0";
16001592 src = fetchurl {
1601− url = "${mirror}/stable/release-service/20.04.3/src/okular-20.04.3.tar.xz";
1602− sha256 = "60865a5d09f41d30572b72224fb61baf9dde18cf6e246565d852e672e7bc4cfe";
1603− name = "okular-20.04.3.tar.xz";
1593+ url = "${mirror}/stable/release-service/20.08.0/src/okular-20.08.0.tar.xz";
1594+ sha256 = "8d775292cc6b2cb703e5ff716337a49352cd6d3faa90d6d7ac2f4e9d006a4047";
1595+ name = "okular-20.08.0.tar.xz";
16041596 };
16051597 };
16061598 palapeli = {
1607− version = "20.04.3";
1599+ version = "20.08.0";
16081600 src = fetchurl {
1609− url = "${mirror}/stable/release-service/20.04.3/src/palapeli-20.04.3.tar.xz";
1610− sha256 = "8ae05cce4a1ccb5226c9895195c47825054363a127905dacd5b25fc2a4df3828";
1611− name = "palapeli-20.04.3.tar.xz";
1601+ url = "${mirror}/stable/release-service/20.08.0/src/palapeli-20.08.0.tar.xz";
1602+ sha256 = "bbbf4d6c0a2048e2bb5e2483acf1970748d9f109e25f3c5cbf6f04709a61aeab";
1603+ name = "palapeli-20.08.0.tar.xz";
16121604 };
16131605 };
16141606 parley = {
1615− version = "20.04.3";
1607+ version = "20.08.0";
16161608 src = fetchurl {
1617− url = "${mirror}/stable/release-service/20.04.3/src/parley-20.04.3.tar.xz";
1618− sha256 = "b5e74fbd458824d26c0ea7cb8ed5510e3f6e849c9dbda4bc7804b9b95a64da03";
1619− name = "parley-20.04.3.tar.xz";
1609+ url = "${mirror}/stable/release-service/20.08.0/src/parley-20.08.0.tar.xz";
1610+ sha256 = "b1c8d5f39a563ddcc6a00a7e1008608bd58bdcdfc23c11c822b15625f5a48d60";
1611+ name = "parley-20.08.0.tar.xz";
16201612 };
16211613 };
16221614 picmi = {
1623− version = "20.04.3";
1615+ version = "20.08.0";
16241616 src = fetchurl {
1625− url = "${mirror}/stable/release-service/20.04.3/src/picmi-20.04.3.tar.xz";
1626− sha256 = "57406f820d58132602b3e6524bad2d7aba3466f7c1a78a623077e7df5faf6838";
1627− name = "picmi-20.04.3.tar.xz";
1617+ url = "${mirror}/stable/release-service/20.08.0/src/picmi-20.08.0.tar.xz";
1618+ sha256 = "5003bcf33c08eebe24fb689790aef56eb418990a7c6588e2bd1c94ec6f398a5a";
1619+ name = "picmi-20.08.0.tar.xz";
16281620 };
16291621 };
16301622 pimcommon = {
1631− version = "20.04.3";
1623+ version = "20.08.0";
16321624 src = fetchurl {
1633− url = "${mirror}/stable/release-service/20.04.3/src/pimcommon-20.04.3.tar.xz";
1634− sha256 = "a5d295f7174cafeb27bc1aed03a715525b132f9dca734a183dd705a2c7ffa40b";
1635− name = "pimcommon-20.04.3.tar.xz";
1625+ url = "${mirror}/stable/release-service/20.08.0/src/pimcommon-20.08.0.tar.xz";
1626+ sha256 = "4280d7116d392dff4febbadbca6fa20c38b787da7af537ce4e64af28509bd82e";
1627+ name = "pimcommon-20.08.0.tar.xz";
16361628 };
16371629 };
16381630 pim-data-exporter = {
1639− version = "20.04.3";
1631+ version = "20.08.0";
16401632 src = fetchurl {
1641− url = "${mirror}/stable/release-service/20.04.3/src/pim-data-exporter-20.04.3.tar.xz";
1642− sha256 = "742727f09c984ff86f0406fa756b8ab50e695d6bd8a10abd7d55950c1c2c10de";
1643− name = "pim-data-exporter-20.04.3.tar.xz";
1633+ url = "${mirror}/stable/release-service/20.08.0/src/pim-data-exporter-20.08.0.tar.xz";
1634+ sha256 = "42f070d3aea3871004bea3fa712f01ef307ba12328495ded06d3115e7e8ed894";
1635+ name = "pim-data-exporter-20.08.0.tar.xz";
16441636 };
16451637 };
16461638 pim-sieve-editor = {
1647− version = "20.04.3";
1639+ version = "20.08.0";
16481640 src = fetchurl {
1649− url = "${mirror}/stable/release-service/20.04.3/src/pim-sieve-editor-20.04.3.tar.xz";
1650− sha256 = "e59c4eee3f7548fc724f7b79cbff2f90c10be92eb0cab7259dd57fd221f2b7dc";
1651− name = "pim-sieve-editor-20.04.3.tar.xz";
1641+ url = "${mirror}/stable/release-service/20.08.0/src/pim-sieve-editor-20.08.0.tar.xz";
1642+ sha256 = "65167f716ce2cc70a4ccbf7f9a5b2a873f36df54984dcc46af1d5694973e709a";
1643+ name = "pim-sieve-editor-20.08.0.tar.xz";
16521644 };
16531645 };
16541646 poxml = {
1655− version = "20.04.3";
1647+ version = "20.08.0";
16561648 src = fetchurl {
1657− url = "${mirror}/stable/release-service/20.04.3/src/poxml-20.04.3.tar.xz";
1658− sha256 = "a070eb5c12e14df691648a9a3e482c021c484f59dfaac413eeacc002cdc1833a";
1659− name = "poxml-20.04.3.tar.xz";
1649+ url = "${mirror}/stable/release-service/20.08.0/src/poxml-20.08.0.tar.xz";
1650+ sha256 = "07f5e8f0b215d864d48523c9a1b689f7434dfc0a561d5cf253ad69698770e096";
1651+ name = "poxml-20.08.0.tar.xz";
16601652 };
16611653 };
16621654 print-manager = {
1663− version = "20.04.3";
1655+ version = "20.08.0";
16641656 src = fetchurl {
1665− url = "${mirror}/stable/release-service/20.04.3/src/print-manager-20.04.3.tar.xz";
1666− sha256 = "9d877925cafdf7dfa0dcce5694f849b13ca8bb7c4552a800eebd26a3fc42d376";
1667− name = "print-manager-20.04.3.tar.xz";
1657+ url = "${mirror}/stable/release-service/20.08.0/src/print-manager-20.08.0.tar.xz";
1658+ sha256 = "6fe74bc4555f92b7d372d01878cbf25b4339f3f0047b52bd0c92571a2b835271";
1659+ name = "print-manager-20.08.0.tar.xz";
16681660 };
16691661 };
16701662 rocs = {
1671− version = "20.04.3";
1663+ version = "20.08.0";
16721664 src = fetchurl {
1673− url = "${mirror}/stable/release-service/20.04.3/src/rocs-20.04.3.tar.xz";
1674− sha256 = "1620ff8360568ab4201d526ea4489bd672f6715b6d200251d63ed139dcc58a94";
1675− name = "rocs-20.04.3.tar.xz";
1665+ url = "${mirror}/stable/release-service/20.08.0/src/rocs-20.08.0.tar.xz";
1666+ sha256 = "447fecd5e87171cae444e70146b5ce99ac94a558db5f7e1ff9053c31953ba48e";
1667+ name = "rocs-20.08.0.tar.xz";
16761668 };
16771669 };
16781670 signon-kwallet-extension = {
1679− version = "20.04.3";
1671+ version = "20.08.0";
16801672 src = fetchurl {
1681− url = "${mirror}/stable/release-service/20.04.3/src/signon-kwallet-extension-20.04.3.tar.xz";
1682− sha256 = "a391ceff9c86f2e3d8a74a26ffb4143d0adffc8669a51a019d39f16a8e207c1c";
1683− name = "signon-kwallet-extension-20.04.3.tar.xz";
1673+ url = "${mirror}/stable/release-service/20.08.0/src/signon-kwallet-extension-20.08.0.tar.xz";
1674+ sha256 = "ec65a9b05dd014ec541ba87e39b6ae8a7af8bf4017f58c7b566960e452f99493";
1675+ name = "signon-kwallet-extension-20.08.0.tar.xz";
16841676 };
16851677 };
16861678 spectacle = {
1687− version = "20.04.3";
1679+ version = "20.08.0";
16881680 src = fetchurl {
1689− url = "${mirror}/stable/release-service/20.04.3/src/spectacle-20.04.3.tar.xz";
1690− sha256 = "71e852aceaac1dc76cd9aa4aa8284ced1c149d7374d9e06f996f4259a72ccbd6";
1691− name = "spectacle-20.04.3.tar.xz";
1681+ url = "${mirror}/stable/release-service/20.08.0/src/spectacle-20.08.0.tar.xz";
1682+ sha256 = "8712c8fc19bc2cc39c5e51cf62dedfba423ad53225b629d667d7ffb8d3900692";
1683+ name = "spectacle-20.08.0.tar.xz";
16921684 };
16931685 };
16941686 step = {
1695− version = "20.04.3";
1687+ version = "20.08.0";
16961688 src = fetchurl {
1697− url = "${mirror}/stable/release-service/20.04.3/src/step-20.04.3.tar.xz";
1698− sha256 = "89d7e29b6e5f888886022701cbfd628c322daa3da43dda4c3fd90d1a137aa29d";
1699− name = "step-20.04.3.tar.xz";
1689+ url = "${mirror}/stable/release-service/20.08.0/src/step-20.08.0.tar.xz";
1690+ sha256 = "8415f807de351b85bc3c4feb9ac45b01300210b9517987c617cd49ba6d472418";
1691+ name = "step-20.08.0.tar.xz";
17001692 };
17011693 };
17021694 svgpart = {
1703− version = "20.04.3";
1695+ version = "20.08.0";
17041696 src = fetchurl {
1705− url = "${mirror}/stable/release-service/20.04.3/src/svgpart-20.04.3.tar.xz";
1706− sha256 = "2ffb67858ac5c01f5bb5d4728526786c5b6b6a8b70d688123c52efa084fae1b4";
1707− name = "svgpart-20.04.3.tar.xz";
1697+ url = "${mirror}/stable/release-service/20.08.0/src/svgpart-20.08.0.tar.xz";
1698+ sha256 = "3ebb9140ac13c7ece171622ead8c7fd1b1128cccde9635cbc912ca7f8da767a7";
1699+ name = "svgpart-20.08.0.tar.xz";
17081700 };
17091701 };
17101702 sweeper = {
1711− version = "20.04.3";
1703+ version = "20.08.0";
17121704 src = fetchurl {
1713− url = "${mirror}/stable/release-service/20.04.3/src/sweeper-20.04.3.tar.xz";
1714− sha256 = "16b247b9e3f3d3497f31f9dcb91ff06725a07f0f56a934fdf1ecf1af1ab1b426";
1715− name = "sweeper-20.04.3.tar.xz";
1705+ url = "${mirror}/stable/release-service/20.08.0/src/sweeper-20.08.0.tar.xz";
1706+ sha256 = "b0d7b983a5bb8ceb2454863181c6a2d55c42114f58f66241f46c3365d90a52ec";
1707+ name = "sweeper-20.08.0.tar.xz";
17161708 };
17171709 };
17181710 umbrello = {
1719− version = "20.04.3";
1711+ version = "20.08.0";
17201712 src = fetchurl {
1721− url = "${mirror}/stable/release-service/20.04.3/src/umbrello-20.04.3.tar.xz";
1722− sha256 = "c34a5f6ca945dd409921903abd2e0078b6a056a0d221d59674980ce424cf1e62";
1723− name = "umbrello-20.04.3.tar.xz";
1713+ url = "${mirror}/stable/release-service/20.08.0/src/umbrello-20.08.0.tar.xz";
1714+ sha256 = "49e9f7e0748b8f103f72bbc3fbe0ab7b3605646b5024512118dd9beafd64a041";
1715+ name = "umbrello-20.08.0.tar.xz";
17241716 };
17251717 };
17261718 yakuake = {
1727− version = "20.04.3";
1719+ version = "20.08.0";
17281720 src = fetchurl {
1729− url = "${mirror}/stable/release-service/20.04.3/src/yakuake-20.04.3.tar.xz";
1730− sha256 = "62466165becc848d05461f7b12b67615a517d2919b6fccd8441dfeed9a0a04fa";
1731− name = "yakuake-20.04.3.tar.xz";
1721+ url = "${mirror}/stable/release-service/20.08.0/src/yakuake-20.08.0.tar.xz";
1722+ sha256 = "1c13334e0e4c1a6a3f8e11ed6cd05b2cecdd0eb29201c41bd26ca62e22cc084a";
1723+ name = "yakuake-20.08.0.tar.xz";
17321724 };
17331725 };
17341726 zeroconf-ioslave = {
1735− version = "20.04.3";
1727+ version = "20.08.0";
17361728 src = fetchurl {
1737− url = "${mirror}/stable/release-service/20.04.3/src/zeroconf-ioslave-20.04.3.tar.xz";
1738− sha256 = "3b2ac8833499a53a78547ae34be4a29a6cb79d54601a8c638b225f1c2059d9f0";
1739− name = "zeroconf-ioslave-20.04.3.tar.xz";
1729+ url = "${mirror}/stable/release-service/20.08.0/src/zeroconf-ioslave-20.08.0.tar.xz";
1730+ sha256 = "78bdd0b377132abf30f1ed40c15eae3f0726d7075b311c3b23c71ad59725dc22";
1731+ name = "zeroconf-ioslave-20.08.0.tar.xz";
17401732 };
17411733 };
17421734}
pkgs/applications/misc/electrum/default.nix+17−4
@@ -3,7 +3,6 @@
33, fetchFromGitHub
44, wrapQtAppsHook
55, python3
6−, python3Packages
76, zbar
87, secp256k1
98, enableQt ? true
@@ -22,6 +21,20 @@
2221let
2322 version = "4.0.2";
2423
24+ # electrum is not compatible with dnspython 2.0.0 yet
25+ # use the latest 1.x release instead
26+ py = python3.override {
27+ packageOverrides = self: super: {
28+ dnspython = super.dnspython.overridePythonAttrs (oldAttrs: rec {
29+ version = "1.16.0";
30+ src = oldAttrs.src.override {
31+ inherit version;
32+ sha256 = "36c5e8e38d4369a08b6780b7f27d790a292b2b08eea01607865bf0936c558e01";
33+ };
34+ });
35+ };
36+ };
37+
2538 libsecp256k1_name =
2639 if stdenv.isLinux then "libsecp256k1.so.0"
2740 else if stdenv.isDarwin then "libsecp256k1.0.dylib"
@@ -45,7 +58,7 @@ let
4558 };
4659in
4760
48−python3Packages.buildPythonApplication {
61+py.pkgs.buildPythonApplication {
4962 pname = "electrum";
5063 inherit version;
5164
@@ -61,7 +74,7 @@ python3Packages.buildPythonApplication {
6174
6275 nativeBuildInputs = stdenv.lib.optionals enableQt [ wrapQtAppsHook ];
6376
64− propagatedBuildInputs = with python3Packages; [
77+ propagatedBuildInputs = with py.pkgs; [
6578 aiohttp
6679 aiohttp-socks
6780 aiorpcx
@@ -116,7 +129,7 @@ python3Packages.buildPythonApplication {
116129 wrapQtApp $out/bin/electrum
117130 '';
118131
119− checkInputs = with python3Packages; [ pytest ];
132+ checkInputs = with py.pkgs; [ pytest ];
120133
121134 checkPhase = ''
122135 py.test electrum/tests
pkgs/applications/misc/krename/default.nix+2
@@ -23,6 +23,8 @@ in mkDerivation rec {
2323
2424 propagatedBuildInputs = [ kconfig kcrash kinit kjsembed ];
2525
26+ NIX_LDFLAGS = "-ltag";
27+
2628 meta = with lib; {
2729 description = "A powerful batch renamer for KDE";
2830 homepage = "https://kde.org/applications/utilities/krename/";
pkgs/applications/misc/navi/default.nix+3−3
@@ -2,16 +2,16 @@
22
33rustPlatform.buildRustPackage rec {
44 pname = "navi";
5− version = "2.8.0";
5+ version = "2.9.0";
66
77 src = fetchFromGitHub {
88 owner = "denisidoro";
99 repo = "navi";
1010 rev = "v${version}";
11− sha256 = "0w63yx4c60r05nfswv61jw3l3zbl5n1s396a6f4ayn52fb6rxwg1";
11+ sha256 = "16rwhpyk0zqks9z9bv2a1a8vww2m6867kg33bjbr29hawjg68jql";
1212 };
1313
14− cargoSha256 = "06xpk04nxkm7h4nn235x8a4gi0qhscj8kkl2f9gqphlfmm56kjfn";
14+ cargoSha256 = "19w9gm389lj1zwhyjifhc2fzkvrvqvyc80lwxz070cnj11ir2l9m";
1515
1616 nativeBuildInputs = [ makeWrapper ];
1717
pkgs/applications/misc/obinskit/default.nix+2−1
@@ -1,4 +1,5 @@
11{ stdenv
2+, lib
23, fetchurl
34, libxkbcommon
45, systemd
@@ -50,7 +51,7 @@ stdenv.mkDerivation rec {
5051 postFixup = ''
5152 makeWrapper ${electron}/bin/electron $out/bin/${pname} \
5253 --add-flags $out/opt/obinskit/resources/app.asar \
53− --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib libxkbcommon systemd.lib xorg.libXt ]}"
54+ --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib libxkbcommon (lib.getLib systemd) xorg.libXt ]}"
5455 '';
5556
5657 meta = with stdenv.lib; {
pkgs/applications/misc/orca/default.nix+2−2
@@ -35,13 +35,13 @@
3535
3636buildPythonApplication rec {
3737 pname = "orca";
38− version = "3.36.4";
38+ version = "3.36.5";
3939
4040 format = "other";
4141
4242 src = fetchurl {
4343 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
44− sha256 = "1s6qrmbn3pywidwwfa24ly21c1cz6fnnsipi9vlp3sxswbdcwiwz";
44+ sha256 = "0nyb33p4y6nmln41pi70c8hiyjyasaryy10mazi7b2s6fy9pk25x";
4545 };
4646
4747 patches = [
pkgs/applications/misc/simplenote/default.nix+2−1
@@ -4,6 +4,7 @@
44, fetchurl
55, makeDesktopItem
66, makeWrapper
7+, lib
78, stdenv
89, udev
910, wrapGAppsHook
@@ -82,7 +83,7 @@ let
8283 '';
8384
8485 runtimeDependencies = [
85− udev.lib
86+ (lib.getLib udev)
8687 ];
8788
8889 postFixup = ''
pkgs/applications/networking/browsers/chromium/common.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, llvmPackages, gnChromium, ninja, which, nodejs, fetchpatch, gnutar
1+{ stdenv, lib, llvmPackages, gnChromium, ninja, which, nodejs, fetchpatch, gnutar
22
33# default dependencies
44, bzip2, flac, speex, libopus
@@ -197,7 +197,7 @@ let
197197 sed -i -e 's@"\(#!\)\?.*xdg-@"\1${xdg_utils}/bin/xdg-@' \
198198 chrome/browser/shell_integration_linux.cc
199199
200− sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${systemd.lib}/lib/\1!' \
200+ sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${lib.getLib systemd}/lib/\1!' \
201201 device/udev_linux/udev?_loader.cc
202202
203203 sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \
pkgs/applications/networking/browsers/firefox-bin/release_sources.nix+385−385
@@ -1,965 +1,965 @@
11{
2− version = "79.0";
2+ version = "80.0";
33 sources = [
4− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ach/firefox-79.0.tar.bz2";
4+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ach/firefox-80.0.tar.bz2";
55 locale = "ach";
66 arch = "linux-x86_64";
7− sha256 = "25571c5d9aa4294f84d3e8aceb501efcadcc7d80dae799ee7246391782079885";
7+ sha256 = "4679b0ce4913b2c240f873fe5898234362d0b2cd6777e73ce272f37950edfd02";
88 }
9− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/af/firefox-79.0.tar.bz2";
9+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/af/firefox-80.0.tar.bz2";
1010 locale = "af";
1111 arch = "linux-x86_64";
12− sha256 = "400edad1b17de72f33237d5c0fbe20dee9a2032aac41745339d62eaafd36b157";
12+ sha256 = "ae2f6e7d46344f56599ef1e7ba3f3321636ee378e8e1a4c0b8e652c5e71b932b";
1313 }
14− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/an/firefox-79.0.tar.bz2";
14+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/an/firefox-80.0.tar.bz2";
1515 locale = "an";
1616 arch = "linux-x86_64";
17− sha256 = "13971db840762cbe9b54c917c1cae459259df1bfc8783d0659accf539dc0bf05";
17+ sha256 = "8ae2ea7f6184f5f0cd5bc937924cfc5d813bb8bb0ea3e4e0770352b15291c043";
1818 }
19− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ar/firefox-79.0.tar.bz2";
19+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ar/firefox-80.0.tar.bz2";
2020 locale = "ar";
2121 arch = "linux-x86_64";
22− sha256 = "7c8f5692e483667ccc173d9205ab5b5b77b4e4d50a5643f4ac531b1809a97d80";
22+ sha256 = "54926c7b61e4d99f1d49f709fad198604c5e5af165d60a96c6f5cb1a94f73884";
2323 }
24− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ast/firefox-79.0.tar.bz2";
24+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ast/firefox-80.0.tar.bz2";
2525 locale = "ast";
2626 arch = "linux-x86_64";
27− sha256 = "50cc5928b1877be40e29f30b51cfd183d9196bf73f68234866eff9e0e50c2e36";
27+ sha256 = "589262534a8665387cbbb3c13f5003738bca4c5673884bda831a4858aa73de54";
2828 }
29− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/az/firefox-79.0.tar.bz2";
29+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/az/firefox-80.0.tar.bz2";
3030 locale = "az";
3131 arch = "linux-x86_64";
32− sha256 = "6f8f0b486652ac7bb4e3808a02b123acbd4babd6b272c503c6fc14159278d492";
32+ sha256 = "60bfac6b93deff04f63c67dc9944d3df8efb314054ed6ee8f93d3b09db8608b6";
3333 }
34− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/be/firefox-79.0.tar.bz2";
34+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/be/firefox-80.0.tar.bz2";
3535 locale = "be";
3636 arch = "linux-x86_64";
37− sha256 = "f2dd77674d83b888e2016177eb80c7855a7fa26318ec052fbb919fd2abab6561";
37+ sha256 = "48cdbcb785f190dce708db6ca1fc711d5d2411da0f544b3a5d03aba6665efa1b";
3838 }
39− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/bg/firefox-79.0.tar.bz2";
39+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/bg/firefox-80.0.tar.bz2";
4040 locale = "bg";
4141 arch = "linux-x86_64";
42− sha256 = "08514f73d202ed1f53f0ef23de3093ac7eb08049fedf3bb09b69c98148efb99b";
42+ sha256 = "a48fbe5f88ec729c1becbf7c63957ee48cd7692d153dcf709dd038ce1a218317";
4343 }
44− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/bn/firefox-79.0.tar.bz2";
44+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/bn/firefox-80.0.tar.bz2";
4545 locale = "bn";
4646 arch = "linux-x86_64";
47− sha256 = "7f5114a60d966e2dedb95c1b65696bd3b04d25eb057b9a109d8bb0dc43b46f40";
47+ sha256 = "38245ddeeaa699941f54ba3d3d0fc3e804b57d4e8a6a0d1c58cf25d7c271a23c";
4848 }
49− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/br/firefox-79.0.tar.bz2";
49+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/br/firefox-80.0.tar.bz2";
5050 locale = "br";
5151 arch = "linux-x86_64";
52− sha256 = "816dbbdd0f86874aad38733a30b54e683c7b18557c34d977ced6cd17ddf8b125";
52+ sha256 = "6766542a98977e6f2329b76345ab8f59d545479f1564261a47c0cb7b7db1e3d8";
5353 }
54− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/bs/firefox-79.0.tar.bz2";
54+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/bs/firefox-80.0.tar.bz2";
5555 locale = "bs";
5656 arch = "linux-x86_64";
57− sha256 = "6c975f990120e9c70121eea464e9c375df40f6aa78275922d005096135044067";
57+ sha256 = "9bcd21931680502a9a5459f82a6d103d8b367b09cfa9048f54d87ca654e39e34";
5858 }
59− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ca-valencia/firefox-79.0.tar.bz2";
59+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ca-valencia/firefox-80.0.tar.bz2";
6060 locale = "ca-valencia";
6161 arch = "linux-x86_64";
62− sha256 = "e993527db5fac86e5a503cb7615c073363d73c733837f7acc66b30d17b7a369d";
62+ sha256 = "a666b19726a6d10863cf351059dc45f610cd0356e2220a8d9e2a5bf2df0fde3a";
6363 }
64− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ca/firefox-79.0.tar.bz2";
64+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ca/firefox-80.0.tar.bz2";
6565 locale = "ca";
6666 arch = "linux-x86_64";
67− sha256 = "8ac5bfa08c2f082816c4f7bc45a0ebdadd04a078efcd172049899890ddcc3ffc";
67+ sha256 = "458e791ac8025a56a7a9444aeb8aa1138f5108c5a5cd1d87a31bbe71c6ed51ca";
6868 }
69− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/cak/firefox-79.0.tar.bz2";
69+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/cak/firefox-80.0.tar.bz2";
7070 locale = "cak";
7171 arch = "linux-x86_64";
72− sha256 = "76680375d4f2ffb8f70414e2f934fe442e30d50c1921f7eb596f1325ee01a155";
72+ sha256 = "890f462890cdc825e138d174e396b78e10f74111d01da47514a8e449ee470676";
7373 }
74− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/cs/firefox-79.0.tar.bz2";
74+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/cs/firefox-80.0.tar.bz2";
7575 locale = "cs";
7676 arch = "linux-x86_64";
77− sha256 = "99f83abcdc15839e879b7cced936fc3bb628d8b42f5381dad980d444d4fcfe1f";
77+ sha256 = "98e1bec6f176bc83da232b76b33e6dfe09db91c4be1424cf0c7b4e18e26b8d5e";
7878 }
79− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/cy/firefox-79.0.tar.bz2";
79+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/cy/firefox-80.0.tar.bz2";
8080 locale = "cy";
8181 arch = "linux-x86_64";
82− sha256 = "d81fee7d2b5b8177f1b28f4e4d05f4b266b876adcf5ed62a7d458465ca50bf42";
82+ sha256 = "06b649bc87eea5c81fa37873582a963d972cbc3d0a65fa9fcc12c67c107ccfbc";
8383 }
84− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/da/firefox-79.0.tar.bz2";
84+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/da/firefox-80.0.tar.bz2";
8585 locale = "da";
8686 arch = "linux-x86_64";
87− sha256 = "40fdbaa88e3ac77d4cc846bf01b00ba1cdb5d3241f7af8a47efc92c929c862e1";
87+ sha256 = "98328f0f7ec2b807717fd4ae6aaeb7daaae8a962eb929b760598f225f6d9e784";
8888 }
89− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/de/firefox-79.0.tar.bz2";
89+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/de/firefox-80.0.tar.bz2";
9090 locale = "de";
9191 arch = "linux-x86_64";
92− sha256 = "6635eb71b5f4dc01ceed02771cc4e7bf7b3ba340c75f471fb7ecfde8170f838b";
92+ sha256 = "401877f41fd2bda02d0cbb7737f029f648e1d2b3c9642b093ef8bd4342f13712";
9393 }
94− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/dsb/firefox-79.0.tar.bz2";
94+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/dsb/firefox-80.0.tar.bz2";
9595 locale = "dsb";
9696 arch = "linux-x86_64";
97− sha256 = "afe56bea25e44fbd3cd1fff7411cc20473ed0212500304ed865a985c2565594c";
97+ sha256 = "408ae85999139ba5c027bbf9ca20157b991e741349aae77176c012b862a7b4ff";
9898 }
99− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/el/firefox-79.0.tar.bz2";
99+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/el/firefox-80.0.tar.bz2";
100100 locale = "el";
101101 arch = "linux-x86_64";
102− sha256 = "b83801b722069d476bdb3325051f6e0bf2c34b6081320b82824aaf218d0f968a";
102+ sha256 = "430c1062e9edc9bc4a0a47268782cb7928214df074aec17e2e3a283b7bfa69d0";
103103 }
104− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/en-CA/firefox-79.0.tar.bz2";
104+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/en-CA/firefox-80.0.tar.bz2";
105105 locale = "en-CA";
106106 arch = "linux-x86_64";
107− sha256 = "e5a1a6e755cf35287f455a36c2019157fc7a0de6296c0af5949f7d33c55c871b";
107+ sha256 = "7f8d97a5643c959eb09119264c8829c7b7227c01f8e035b17f3c21eee3d1e0c9";
108108 }
109− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/en-GB/firefox-79.0.tar.bz2";
109+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/en-GB/firefox-80.0.tar.bz2";
110110 locale = "en-GB";
111111 arch = "linux-x86_64";
112− sha256 = "709d89f99e96d76a77b0a1a40d7f2ef49d6709b41336973c114fc25fee2f1d49";
112+ sha256 = "d2361c90c46dc43eae25ff53440157322351645d6a20ed077e2496fbc3b955bf";
113113 }
114− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/en-US/firefox-79.0.tar.bz2";
114+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/en-US/firefox-80.0.tar.bz2";
115115 locale = "en-US";
116116 arch = "linux-x86_64";
117− sha256 = "d57ce2ec9d39d4f0e1100a2faf7cfdc827eeb45db672511d5a6aea7229430f85";
117+ sha256 = "84191f06dd927cd16b8c0900e6c330f68cc8012bc48e9277891282a2d6f7bce7";
118118 }
119− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/eo/firefox-79.0.tar.bz2";
119+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/eo/firefox-80.0.tar.bz2";
120120 locale = "eo";
121121 arch = "linux-x86_64";
122− sha256 = "facef477b06aab7d67580c6931d97a26c5a7a9ae9555d92c7f31227d0e944dcd";
122+ sha256 = "8a9f5359cbb0d8a0d173d3302181ab41f463d8cf6b17f9c06e33432a95d79b0f";
123123 }
124− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/es-AR/firefox-79.0.tar.bz2";
124+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/es-AR/firefox-80.0.tar.bz2";
125125 locale = "es-AR";
126126 arch = "linux-x86_64";
127− sha256 = "43449d930cfd29ff06a1f38b3a36cf7b2bb7aa4feef1a4509f60f1370f08539e";
127+ sha256 = "0f5e7d4a23daab7c96cf706fe1c5a62d9a244d39bf6be97325cfcc1d699936c3";
128128 }
129− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/es-CL/firefox-79.0.tar.bz2";
129+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/es-CL/firefox-80.0.tar.bz2";
130130 locale = "es-CL";
131131 arch = "linux-x86_64";
132− sha256 = "fd821e8cf3c2f67f0993d08dc43026b1f5454a91102dc44706587d5744a63d1c";
132+ sha256 = "fd914b5892f2aa297054e79c6d6d863f1b4d88ab1a2bfae3d40192848c9efd64";
133133 }
134− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/es-ES/firefox-79.0.tar.bz2";
134+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/es-ES/firefox-80.0.tar.bz2";
135135 locale = "es-ES";
136136 arch = "linux-x86_64";
137− sha256 = "b1db4d75e75bd4329cc8ff4e637f920ebab47384442fae56584f170421a18657";
137+ sha256 = "b87aa07e99d0c8d3a17c76bc7e281f8309cda97565bbfa4dff653326fb2bbcb5";
138138 }
139− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/es-MX/firefox-79.0.tar.bz2";
139+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/es-MX/firefox-80.0.tar.bz2";
140140 locale = "es-MX";
141141 arch = "linux-x86_64";
142− sha256 = "b08ce5a33ada7d551b341693545ec7d9c30afc4529a3e33f55836a4e2bec1a41";
142+ sha256 = "ffb619b95658d5001a036e0906689f12520cc25d541c4b5b154e44e4b176da33";
143143 }
144− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/et/firefox-79.0.tar.bz2";
144+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/et/firefox-80.0.tar.bz2";
145145 locale = "et";
146146 arch = "linux-x86_64";
147− sha256 = "5fea2b490a7323cf9cec5e02fd148aab16c18a4bc107b1f267ca2b442eb2d53e";
147+ sha256 = "2558280c2fa85aa3a2fdfc59994de6a593ccbb6a7141e76c21e5318152b6e992";
148148 }
149− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/eu/firefox-79.0.tar.bz2";
149+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/eu/firefox-80.0.tar.bz2";
150150 locale = "eu";
151151 arch = "linux-x86_64";
152− sha256 = "98f89c8e3efcdc3585c6cd0cd6de6b5ab7ab7a55266328a2fd6198e1b739fd7f";
152+ sha256 = "0ad66a2dd10d1e5b0d44e6db28982d82430acb7cef6e465ad0c88fd7958606ef";
153153 }
154− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/fa/firefox-79.0.tar.bz2";
154+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/fa/firefox-80.0.tar.bz2";
155155 locale = "fa";
156156 arch = "linux-x86_64";
157− sha256 = "874beed2e6b23f7edc7b51465a758243468e99e835951bb908336f16dc7baf0c";
157+ sha256 = "39b1bc086dd14ced01668961dac12a5408f5cc261188b2c32b6114dc70c67e4d";
158158 }
159− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ff/firefox-79.0.tar.bz2";
159+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ff/firefox-80.0.tar.bz2";
160160 locale = "ff";
161161 arch = "linux-x86_64";
162− sha256 = "f84e37769376d2a05fd1d76903ff75c79e3631c2c7c5ceccdadde59de991aead";
162+ sha256 = "1511c50bd3ced8f570fe409ef609a6c9dc626d061156e5091e667b9314a5c4a0";
163163 }
164− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/fi/firefox-79.0.tar.bz2";
164+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/fi/firefox-80.0.tar.bz2";
165165 locale = "fi";
166166 arch = "linux-x86_64";
167− sha256 = "8898a7ba0aefe3e26c4239c8b4d3768f716004b18da5ce5799ac5fb159b699b0";
167+ sha256 = "4d9e7fe4eaa94e4a2195589cdaf9f58c4b55339751001e87bd42a6326ee26787";
168168 }
169− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/fr/firefox-79.0.tar.bz2";
169+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/fr/firefox-80.0.tar.bz2";
170170 locale = "fr";
171171 arch = "linux-x86_64";
172− sha256 = "3f6e7cd8ffa7bf343d28cd289ea14f88e4e0ccf7229ff122c118627ba909a400";
172+ sha256 = "99f293639744dd8e2615bc4d6290d2f5baeb9d646bc796d3bfac5de8a1c001f8";
173173 }
174− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/fy-NL/firefox-79.0.tar.bz2";
174+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/fy-NL/firefox-80.0.tar.bz2";
175175 locale = "fy-NL";
176176 arch = "linux-x86_64";
177− sha256 = "de4d6f8aa0564ff23eed16f2bb41486a62ed4fad935625eb1d26829aa281d71c";
177+ sha256 = "a8628d16e51d7355198415f086186c9874f37f9250e64512457aa725c8ba9f04";
178178 }
179− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ga-IE/firefox-79.0.tar.bz2";
179+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ga-IE/firefox-80.0.tar.bz2";
180180 locale = "ga-IE";
181181 arch = "linux-x86_64";
182− sha256 = "48a595094b959f74455f568d872b3426bb6ad9be60df256d5cc1d5ac7cc688a2";
182+ sha256 = "df63d7991979e8fdf8f6911f8df2122d9995c50c089596bc0f7c0e7179326051";
183183 }
184− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/gd/firefox-79.0.tar.bz2";
184+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/gd/firefox-80.0.tar.bz2";
185185 locale = "gd";
186186 arch = "linux-x86_64";
187− sha256 = "8c64d89f708238affb2bc356a5f86b491d368f6b838371c62ed647291925e72a";
187+ sha256 = "616906a45df46004e081cba3cdadd2782c3d402619193f5d19142977b7ff0fcb";
188188 }
189− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/gl/firefox-79.0.tar.bz2";
189+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/gl/firefox-80.0.tar.bz2";
190190 locale = "gl";
191191 arch = "linux-x86_64";
192− sha256 = "2d391f67f0f911112332a155436e5013ebb505620e5070d03b794949df2a4f36";
192+ sha256 = "bbff8f63ba3c029c97e5d40d3ecb41d757b5fccd59018dc81d7484f12c830686";
193193 }
194− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/gn/firefox-79.0.tar.bz2";
194+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/gn/firefox-80.0.tar.bz2";
195195 locale = "gn";
196196 arch = "linux-x86_64";
197− sha256 = "732951a35fc0ab79327a225ee02494eff4a17a8b5b348764f980610fcb1de6ef";
197+ sha256 = "62d7fbf8afb95d221df768fc190381a859e142a253b8df6b63ee276c4111077e";
198198 }
199− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/gu-IN/firefox-79.0.tar.bz2";
199+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/gu-IN/firefox-80.0.tar.bz2";
200200 locale = "gu-IN";
201201 arch = "linux-x86_64";
202− sha256 = "0c3f65ab3736b43832feea9459a6fc336d0611c3221eba091c6194494eaf252c";
202+ sha256 = "3e451729a93e315c9ae767d21c5fe25c505e327ab435c5a9c4f606e04ca61051";
203203 }
204− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/he/firefox-79.0.tar.bz2";
204+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/he/firefox-80.0.tar.bz2";
205205 locale = "he";
206206 arch = "linux-x86_64";
207− sha256 = "c62d4e52a2f308061fc6348531b708cfb26c0aee71a5f08f33b265af1789ea54";
207+ sha256 = "a48159e9c2798308ca4765f02ac90a0a2b05029ae0505ad59688d281fc06344f";
208208 }
209− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/hi-IN/firefox-79.0.tar.bz2";
209+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/hi-IN/firefox-80.0.tar.bz2";
210210 locale = "hi-IN";
211211 arch = "linux-x86_64";
212− sha256 = "e83f4fa9cd50d2389697b78eb6591b7d1c1a6b4a61ae91b429909cb3cdbe1a99";
212+ sha256 = "39341543e9e8e2d5a377ead92287413df77d2f1c00a7362eb42d8e640b8f75ab";
213213 }
214− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/hr/firefox-79.0.tar.bz2";
214+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/hr/firefox-80.0.tar.bz2";
215215 locale = "hr";
216216 arch = "linux-x86_64";
217− sha256 = "10ccf56a6f388a49ab6b5aa24ab3d82cf3ee685af5fd9592fec35055c1195d48";
217+ sha256 = "0067b77ff388004e0c60855868f1a45a282282b8c7360847b65ad2b53a558010";
218218 }
219− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/hsb/firefox-79.0.tar.bz2";
219+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/hsb/firefox-80.0.tar.bz2";
220220 locale = "hsb";
221221 arch = "linux-x86_64";
222− sha256 = "771b5bba633c08861acc056cf0cbd73752f6109f601b8d59685dcad23804e3db";
222+ sha256 = "5c3a47a28a8e67f6a5be72540d9ae85474e093b1a67254949794918a8294ded6";
223223 }
224− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/hu/firefox-79.0.tar.bz2";
224+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/hu/firefox-80.0.tar.bz2";
225225 locale = "hu";
226226 arch = "linux-x86_64";
227− sha256 = "0f8631c95cc683d0c9faa5153cd3b499fa89374f6d8c2d0ef161074b03355d2b";
227+ sha256 = "2c6e390d9348d2d9c1f2adc30b73c451aa6fdd281dfc040fa79dc7365a5414f4";
228228 }
229− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/hy-AM/firefox-79.0.tar.bz2";
229+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/hy-AM/firefox-80.0.tar.bz2";
230230 locale = "hy-AM";
231231 arch = "linux-x86_64";
232− sha256 = "e3f6989cf2716b455d5d962c88307a74cd57d57c8585f31a4007579534b168a3";
232+ sha256 = "ba3d7371aae296aa6417e3c5d2b4647c0d0d0cb4f20441be525f2dd2ad594125";
233233 }
234− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ia/firefox-79.0.tar.bz2";
234+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ia/firefox-80.0.tar.bz2";
235235 locale = "ia";
236236 arch = "linux-x86_64";
237− sha256 = "aa769627a633e32b8bab9dc1e0cb3e4030a9d6af36c66a6fd365520eb978a7a3";
237+ sha256 = "799ba99b5e5c9568d94c7ee7a3bc482eb6d827830ecdc8aef9a2e4d9b157634a";
238238 }
239− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/id/firefox-79.0.tar.bz2";
239+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/id/firefox-80.0.tar.bz2";
240240 locale = "id";
241241 arch = "linux-x86_64";
242− sha256 = "179529666d1dce606758f7a7ee700e1823a7c4f5840195ed57a5eb48f2ce21ac";
242+ sha256 = "97f9f9194178918d8af8453b165aaede0a236e75b973a8ab0374a36ea4a8f8cc";
243243 }
244− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/is/firefox-79.0.tar.bz2";
244+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/is/firefox-80.0.tar.bz2";
245245 locale = "is";
246246 arch = "linux-x86_64";
247− sha256 = "53f5231e74ee28eef4ecf954ac850f1e6070fb7be51e7c8a0aa8477e0c9325e3";
247+ sha256 = "f63efcd86ece79d4a996c23e22a1876e3db25bfc09e5132e1832c309711d9012";
248248 }
249− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/it/firefox-79.0.tar.bz2";
249+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/it/firefox-80.0.tar.bz2";
250250 locale = "it";
251251 arch = "linux-x86_64";
252− sha256 = "410c0c6f119b70006a947ea34ed1462247f4cfda996cf9797423784c8833776f";
252+ sha256 = "c1d5fcbe8a3fba613e5da888f5252043663b7a1fb801da5cf54934af11ea5782";
253253 }
254− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ja/firefox-79.0.tar.bz2";
254+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ja/firefox-80.0.tar.bz2";
255255 locale = "ja";
256256 arch = "linux-x86_64";
257− sha256 = "38f1f110e1490626908dad0e8f638453e70adc2afe66da5ae834a889e0ed13b4";
257+ sha256 = "75c5d37fdf2a488b0dbfb09c6bd020db90d699713350ca3c091d5e8096d41d18";
258258 }
259− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ka/firefox-79.0.tar.bz2";
259+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ka/firefox-80.0.tar.bz2";
260260 locale = "ka";
261261 arch = "linux-x86_64";
262− sha256 = "bd38f5fe5707a0ca0aee0de7d1ec8afcc92fa0faa8661b724b876c0faf5bccf7";
262+ sha256 = "364b16782a4948e986268aca5e07dd92367120e97aa1d3bcfd5b78e58f58025c";
263263 }
264− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/kab/firefox-79.0.tar.bz2";
264+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/kab/firefox-80.0.tar.bz2";
265265 locale = "kab";
266266 arch = "linux-x86_64";
267− sha256 = "d7c748eeeb4d26433147b02d08b57f41be742b86480220d4fa7ae08823ae7984";
267+ sha256 = "20a5bfaf08f75040d1c627f79ff8cb133d0574c83cb13f8902367e88a3742bfc";
268268 }
269− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/kk/firefox-79.0.tar.bz2";
269+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/kk/firefox-80.0.tar.bz2";
270270 locale = "kk";
271271 arch = "linux-x86_64";
272− sha256 = "8e3f43b8551b9844aeccfb21390ae1ce59eb7acde612efa4d9eeb4bcfc81bf60";
272+ sha256 = "f61bce593069f598b8b8fc035b09607f423d5600df7cb620360fb1aaf4cce68a";
273273 }
274− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/km/firefox-79.0.tar.bz2";
274+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/km/firefox-80.0.tar.bz2";
275275 locale = "km";
276276 arch = "linux-x86_64";
277− sha256 = "44819213495492477fc7401b816f45b2a7d3d4e6b5b04b2b5dbb73380fc60ef0";
277+ sha256 = "7056f40cc5fc9d59145f4e08a4b19aad8e2b473beb4d8a7b09d636559bcd8457";
278278 }
279− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/kn/firefox-79.0.tar.bz2";
279+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/kn/firefox-80.0.tar.bz2";
280280 locale = "kn";
281281 arch = "linux-x86_64";
282− sha256 = "89b97b079894174c2826e6106806d6bf9a46a3499e0e458a8219ba9f5ce6722e";
282+ sha256 = "c18b07bc5ee941f001e3ba9336d677f51b60dc08c2bf516b68882f647475b5b9";
283283 }
284− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ko/firefox-79.0.tar.bz2";
284+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ko/firefox-80.0.tar.bz2";
285285 locale = "ko";
286286 arch = "linux-x86_64";
287− sha256 = "731f9a98b4edfcf249fd08f94e8849a8f1c396ed577c0a1ed921b2d58863d029";
287+ sha256 = "7b58b30aa461119ef842ee886d06676fb5b00d05547e959bbaae4ab597cdcda6";
288288 }
289− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/lij/firefox-79.0.tar.bz2";
289+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/lij/firefox-80.0.tar.bz2";
290290 locale = "lij";
291291 arch = "linux-x86_64";
292− sha256 = "a3325d7298d0cffc04757e3d4617725145ab5dcb11d359b029f92e70cfa47905";
292+ sha256 = "8107773361daf1257a1a77d853ae5baa1e9ff393d16118fb1987723f2a7af33b";
293293 }
294− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/lt/firefox-79.0.tar.bz2";
294+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/lt/firefox-80.0.tar.bz2";
295295 locale = "lt";
296296 arch = "linux-x86_64";
297− sha256 = "2071fa08893ca0b55181478c677669577c9011e8f4d39b499aaec939046e45e4";
297+ sha256 = "356a337cdb3ea658e6723897da2f8d99179ebfac01d071f641c661eea1da52c3";
298298 }
299− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/lv/firefox-79.0.tar.bz2";
299+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/lv/firefox-80.0.tar.bz2";
300300 locale = "lv";
301301 arch = "linux-x86_64";
302− sha256 = "b6639a338afa0fe86e0324d844740caa9260b26e3f06d075348999253f0a0bc7";
302+ sha256 = "10a9272101d4b37ac5949f2606317da5f41d205cfdc0967cacd9c72aba550cbb";
303303 }
304− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/mk/firefox-79.0.tar.bz2";
304+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/mk/firefox-80.0.tar.bz2";
305305 locale = "mk";
306306 arch = "linux-x86_64";
307− sha256 = "e06db923b89559735663c93b551f31e48cd12b86f5fc7fdf78e8db88fba48d59";
307+ sha256 = "45618096f39f0c6e28a900e2a5985fc1ce5c9fbcd6abeeb2d21fb4b5bc095876";
308308 }
309− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/mr/firefox-79.0.tar.bz2";
309+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/mr/firefox-80.0.tar.bz2";
310310 locale = "mr";
311311 arch = "linux-x86_64";
312− sha256 = "dcd161187ddb20eaad0353c7ba0bf7d5d0149c8bc324151d41d013e5756a7e35";
312+ sha256 = "63d774fdd4f825780c7f667365a560b72dd1f31449d408553f8c51dfb6583dc4";
313313 }
314− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ms/firefox-79.0.tar.bz2";
314+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ms/firefox-80.0.tar.bz2";
315315 locale = "ms";
316316 arch = "linux-x86_64";
317− sha256 = "d309a899fe69b3b17a33c43093ce78e1942b497e3e3db252a46968884bb9d737";
317+ sha256 = "fa67faa072b03b64132320a19691eadc719f8598167aa39f21d097b1e8fe42ce";
318318 }
319− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/my/firefox-79.0.tar.bz2";
319+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/my/firefox-80.0.tar.bz2";
320320 locale = "my";
321321 arch = "linux-x86_64";
322− sha256 = "9f74bf01425741e1c08d5a637e20b3df7e5aefc0421da14eb3ecc8199a03a0d9";
322+ sha256 = "e40c7c534108dc7e9f978d3e6ea025e41b0e6120b9dd701a7935f90a7c4b834a";
323323 }
324− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/nb-NO/firefox-79.0.tar.bz2";
324+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/nb-NO/firefox-80.0.tar.bz2";
325325 locale = "nb-NO";
326326 arch = "linux-x86_64";
327− sha256 = "638a017eb9d5f7402565dd293c44b236460be99d718fa43cfa705a55eca949e3";
327+ sha256 = "99b52d2ecd2ce0154378630f80f3bb9371d0cb7c59d780e8abcbd47f7008a7c2";
328328 }
329− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ne-NP/firefox-79.0.tar.bz2";
329+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ne-NP/firefox-80.0.tar.bz2";
330330 locale = "ne-NP";
331331 arch = "linux-x86_64";
332− sha256 = "d7d0b87b0f3aa4c8cfe1d6a44b011c167b48e19384031a302d0e0eb5bf422951";
332+ sha256 = "49e9e67f879ecc519001ba500d136285c89a0fef3f7b8b1a693e8efd2af152cc";
333333 }
334− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/nl/firefox-79.0.tar.bz2";
334+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/nl/firefox-80.0.tar.bz2";
335335 locale = "nl";
336336 arch = "linux-x86_64";
337− sha256 = "88a6ed36cf8116634010f5a1ab27fb22f2519974ba10dd48deb2a6fbb2ac659e";
337+ sha256 = "ada875468cd865efa4023bfecc0cde06469fa3bf655944a2dfb945603d3ad483";
338338 }
339− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/nn-NO/firefox-79.0.tar.bz2";
339+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/nn-NO/firefox-80.0.tar.bz2";
340340 locale = "nn-NO";
341341 arch = "linux-x86_64";
342− sha256 = "aa6475e941d6e2f724447a94c2000f9f8983d872a317d4ccb1df421128687564";
342+ sha256 = "b04996dccdb1a34ae41066a58090eb1be8fef2d458cf1aeb0297650123ffbce8";
343343 }
344− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/oc/firefox-79.0.tar.bz2";
344+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/oc/firefox-80.0.tar.bz2";
345345 locale = "oc";
346346 arch = "linux-x86_64";
347− sha256 = "2535537159fd34b6680cb676d607e3810f78d2db2130e35c1086210c8fc40c0e";
347+ sha256 = "c6db46006f3bdaacd7a4ede17166e2bbcb4ef672d432363e86a819858327d867";
348348 }
349− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/pa-IN/firefox-79.0.tar.bz2";
349+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/pa-IN/firefox-80.0.tar.bz2";
350350 locale = "pa-IN";
351351 arch = "linux-x86_64";
352− sha256 = "ddf3f2da7c31bf2b52e9dc4ad9f3d2b25c42e4c621594bb48a9213d2a18ea91a";
352+ sha256 = "a52fde04d6f25f6ff0641ade83dbb88f4d15aff689a041cad36352705fcb43ae";
353353 }
354− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/pl/firefox-79.0.tar.bz2";
354+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/pl/firefox-80.0.tar.bz2";
355355 locale = "pl";
356356 arch = "linux-x86_64";
357− sha256 = "efb57f54e1cdf5a99b84856fa12d8591cc970d5850bab7595a5e804458b1f430";
357+ sha256 = "6918dd7bbde254eef27b740147d64550a1b4203979fedec6f9064006300e4638";
358358 }
359− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/pt-BR/firefox-79.0.tar.bz2";
359+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/pt-BR/firefox-80.0.tar.bz2";
360360 locale = "pt-BR";
361361 arch = "linux-x86_64";
362− sha256 = "704d84a395b6d24b33723121785cc17d36ffb95eec1c550895f61277add01cba";
362+ sha256 = "21bd4c8b68c7154889f4d06cec9eb3696dde94e2ec2b946f25a627ade2b16a7b";
363363 }
364− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/pt-PT/firefox-79.0.tar.bz2";
364+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/pt-PT/firefox-80.0.tar.bz2";
365365 locale = "pt-PT";
366366 arch = "linux-x86_64";
367− sha256 = "c8f67765c2bd151c68a973135ad67c46287aa11bd8055b1ee084e7c18bdc7a38";
367+ sha256 = "b30ab69cacd27d7a60a0387caea18712cfd4f4e2dd45f7bb51e3074e46dc3f05";
368368 }
369− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/rm/firefox-79.0.tar.bz2";
369+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/rm/firefox-80.0.tar.bz2";
370370 locale = "rm";
371371 arch = "linux-x86_64";
372− sha256 = "5fe367fc5338a867cf16322fd4cfb55899275825a6aababbcc95be1f2df54a79";
372+ sha256 = "9fdba8959e1276684bdd53c2c3d02e80768f3e9a289bccacf5a719f5ce51efbb";
373373 }
374− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ro/firefox-79.0.tar.bz2";
374+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ro/firefox-80.0.tar.bz2";
375375 locale = "ro";
376376 arch = "linux-x86_64";
377− sha256 = "f22ce12f453e7c08a1fa1277f80a24038a2906d556c5d96fd6c331b185f38bcb";
377+ sha256 = "e31d0a914b107736fb83e686c5c011b912b7a5b04fb394b7e769c40ab249b504";
378378 }
379− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ru/firefox-79.0.tar.bz2";
379+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ru/firefox-80.0.tar.bz2";
380380 locale = "ru";
381381 arch = "linux-x86_64";
382− sha256 = "057a5c87914e98c056a2213c348bbe72be46cad8566d7cdb0f68370b19f4b313";
382+ sha256 = "3b26ecd7fd38e224625def5087fe5e6ff1aa408e3a04a06e160e688402026113";
383383 }
384− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/si/firefox-79.0.tar.bz2";
384+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/si/firefox-80.0.tar.bz2";
385385 locale = "si";
386386 arch = "linux-x86_64";
387− sha256 = "9b97d6588b9f304e090dd5c0258f0209fc7229ccf7ce21d6fb0d6da1f829dd38";
387+ sha256 = "bb37483590bfe23951063e15626724a665cb03de6ce2916992ebad88759f2691";
388388 }
389− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/sk/firefox-79.0.tar.bz2";
389+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/sk/firefox-80.0.tar.bz2";
390390 locale = "sk";
391391 arch = "linux-x86_64";
392− sha256 = "621fb92cccbf325edf25ea274e90fe9533a0ce5fdb1e0bd9f266b4a1f3a47ffa";
392+ sha256 = "60be0fae9156d425708360e233a39e8b1d2be45216d8a155d06f020fb5808cd9";
393393 }
394− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/sl/firefox-79.0.tar.bz2";
394+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/sl/firefox-80.0.tar.bz2";
395395 locale = "sl";
396396 arch = "linux-x86_64";
397− sha256 = "f840e911bebf98a7917f15421fcd8feaeb72097659bd3fb0f3d1fcd2e348ec75";
397+ sha256 = "d1261f9dc8091df947df5e64b5123d8d4b39bf15ba6dbe5fc4844bce9f3be220";
398398 }
399− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/son/firefox-79.0.tar.bz2";
399+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/son/firefox-80.0.tar.bz2";
400400 locale = "son";
401401 arch = "linux-x86_64";
402− sha256 = "9b834f1895db63a263d3f2ce2567095b8000ad39d0753020f69a704dac7d12f7";
402+ sha256 = "76ae5c6f4890d5c29ee33ffd81923696f755e6fe0fa8081c75e72ed1599e5070";
403403 }
404− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/sq/firefox-79.0.tar.bz2";
404+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/sq/firefox-80.0.tar.bz2";
405405 locale = "sq";
406406 arch = "linux-x86_64";
407− sha256 = "7136196b26f6e9b963d86e1cd9a088f9d2a7751e08193a59dd27c00b08da4d4f";
407+ sha256 = "5aa679e980bd0808b0c924e4ad11bb6b3256afd031cb04f16f862eb9bfd4644d";
408408 }
409− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/sr/firefox-79.0.tar.bz2";
409+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/sr/firefox-80.0.tar.bz2";
410410 locale = "sr";
411411 arch = "linux-x86_64";
412− sha256 = "6cd5ce0c122a3b9cb6c066ab8df57277bec7d78e4fab9f15ef88c7ca16a6a3e1";
412+ sha256 = "a4941d40721de72abf22b97846cc16de49670d7f096829aa0d1775089734d36e";
413413 }
414− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/sv-SE/firefox-79.0.tar.bz2";
414+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/sv-SE/firefox-80.0.tar.bz2";
415415 locale = "sv-SE";
416416 arch = "linux-x86_64";
417− sha256 = "ed0104efacbe6c4054b5d6a2c4397c13db38d245bd557dfe8ed876334bb232a1";
417+ sha256 = "c50a2d0bb15cc95982e3d2997719a65eba6e0099ffb13b066e66e5aa951375fc";
418418 }
419− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ta/firefox-79.0.tar.bz2";
419+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ta/firefox-80.0.tar.bz2";
420420 locale = "ta";
421421 arch = "linux-x86_64";
422− sha256 = "4589d31f7ba58e6f149ddf64f6020b262cfa9a7b8c228ddbad5ac9032013bb74";
422+ sha256 = "53651d5b0ea3d36c6600c57f02c27202f2f5b938aef34de4164f325ef46d8666";
423423 }
424− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/te/firefox-79.0.tar.bz2";
424+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/te/firefox-80.0.tar.bz2";
425425 locale = "te";
426426 arch = "linux-x86_64";
427− sha256 = "3bae0a5ae9735ba623b8f3b4f333169f4f99fc37c43ee29e65221aae21060d9e";
427+ sha256 = "5225d57d4a5c83843ecc83735be2fbb4004d4411da5ea72340cd6306078fc426";
428428 }
429− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/th/firefox-79.0.tar.bz2";
429+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/th/firefox-80.0.tar.bz2";
430430 locale = "th";
431431 arch = "linux-x86_64";
432− sha256 = "eac036a449108ee78cf3d527a85abcb87b0c116d78e71d7a0274f326ebcf1218";
432+ sha256 = "b38092aef16253b180dfe0d297ee1bb8417dbb4851466625b80858a18b2d3801";
433433 }
434− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/tl/firefox-79.0.tar.bz2";
434+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/tl/firefox-80.0.tar.bz2";
435435 locale = "tl";
436436 arch = "linux-x86_64";
437− sha256 = "f8c9053e62b80b7ad1f20e622c25d01b8926c89b8780f1ae642d922d293d5018";
437+ sha256 = "5ac9aa87ad90d60a852f7cbfc611c05eeef09b2aba46da80a2ddb093ce5f1730";
438438 }
439− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/tr/firefox-79.0.tar.bz2";
439+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/tr/firefox-80.0.tar.bz2";
440440 locale = "tr";
441441 arch = "linux-x86_64";
442− sha256 = "8c6d089c9b0a1acdddbaf01d44b274da4a7d01751239dd017add9c7a0867dd38";
442+ sha256 = "b2a6aa22523f9d3396675c60ca7590e9c379a15c445727f01c3ada090a0557fa";
443443 }
444− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/trs/firefox-79.0.tar.bz2";
444+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/trs/firefox-80.0.tar.bz2";
445445 locale = "trs";
446446 arch = "linux-x86_64";
447− sha256 = "086b1b43a42f3c1487ead061b822b94274dd58b927df5b481f8079b960b52dc3";
447+ sha256 = "0e3e21f8c76bba90e730959e3f176c5b4406196a4b9f00aa4d85088495eeb337";
448448 }
449− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/uk/firefox-79.0.tar.bz2";
449+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/uk/firefox-80.0.tar.bz2";
450450 locale = "uk";
451451 arch = "linux-x86_64";
452− sha256 = "e3ee4bf352916f57bece093a079ef58f68a1d3c60d39e02ac7ba9587b98b6cf9";
452+ sha256 = "626f9af6252a003cf869067de439197d8b0dd0b73e654310f439579959036f5b";
453453 }
454− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ur/firefox-79.0.tar.bz2";
454+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ur/firefox-80.0.tar.bz2";
455455 locale = "ur";
456456 arch = "linux-x86_64";
457− sha256 = "7e485392f74814c874c2efd153add419a110c790514f4fef4bad0a4c5043751f";
457+ sha256 = "67e1108697c033ba3c6bcce7e36e5ab269f66a75674795e931aeeefadd7e949f";
458458 }
459− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/uz/firefox-79.0.tar.bz2";
459+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/uz/firefox-80.0.tar.bz2";
460460 locale = "uz";
461461 arch = "linux-x86_64";
462− sha256 = "7a9f0e8e1a776d1155c609bce03380ecad60c2259a05248ddabb65a6c2f8080f";
462+ sha256 = "90e6d82c75ee24925cc6fdb48674e7ace3e58fd2cf27441d8ba9b24002b03a03";
463463 }
464− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/vi/firefox-79.0.tar.bz2";
464+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/vi/firefox-80.0.tar.bz2";
465465 locale = "vi";
466466 arch = "linux-x86_64";
467− sha256 = "a50f5c651093bb205f5cf7d1c44c12994d0aa73cf3a3cf1dea22e3754c6943e0";
467+ sha256 = "dff1e18e968d514b91d4f3c419da0570478e1667485761be703349b5c6019124";
468468 }
469− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/xh/firefox-79.0.tar.bz2";
469+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/xh/firefox-80.0.tar.bz2";
470470 locale = "xh";
471471 arch = "linux-x86_64";
472− sha256 = "a94a46b428a87a3cd543dfcdbef46708931e18b377c548b11ca565067c953ebb";
472+ sha256 = "1d524f5c5e6003c4cb1e00676ab5c369752c80c763684d7550224c7bdc66ca68";
473473 }
474− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/zh-CN/firefox-79.0.tar.bz2";
474+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/zh-CN/firefox-80.0.tar.bz2";
475475 locale = "zh-CN";
476476 arch = "linux-x86_64";
477− sha256 = "911e0b9591dea07aab26e4e35e84645d79c132fcfcabe504ff242ac87d853834";
477+ sha256 = "8893528da90e46d8eb287ab857ee6e18d89355d7901e221c7820d7f1bdfc155f";
478478 }
479− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/zh-TW/firefox-79.0.tar.bz2";
479+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/zh-TW/firefox-80.0.tar.bz2";
480480 locale = "zh-TW";
481481 arch = "linux-x86_64";
482− sha256 = "58afd8192b08eb343da9385344b87ad0e72046cdda26495a5534a75f12d40d38";
482+ sha256 = "8b01036a6c807e22f66ccd93fa335e3fe71476e7a9993965172b85d2eada27ea";
483483 }
484− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ach/firefox-79.0.tar.bz2";
484+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ach/firefox-80.0.tar.bz2";
485485 locale = "ach";
486486 arch = "linux-i686";
487− sha256 = "055e0f66d0e5e3c9f3bc7ae94f6bd46a8ab0bb87dcefc2cace02f4ebbbabbf33";
487+ sha256 = "1bb95b52770a8cad2b339874ac4576e190790935dfbfccf22cfa8be41e3b7e5a";
488488 }
489− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/af/firefox-79.0.tar.bz2";
489+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/af/firefox-80.0.tar.bz2";
490490 locale = "af";
491491 arch = "linux-i686";
492− sha256 = "0705f3f63655b6b55604d9b2b801ea07bacf2f0060ce6a2ca6c1d6021c35a594";
492+ sha256 = "919522f2c9d8f0b3c7f7c7d4311735e68eee173883c80f4d168625b690d0f29c";
493493 }
494− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/an/firefox-79.0.tar.bz2";
494+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/an/firefox-80.0.tar.bz2";
495495 locale = "an";
496496 arch = "linux-i686";
497− sha256 = "f1735cdcb500df69cf66886f194d101393f8e5880b790fc135348e6515fc7ba5";
497+ sha256 = "878eba95507de8dc1788e01facd9710e39cb62d75229d6204601c58ea0df4cf5";
498498 }
499− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ar/firefox-79.0.tar.bz2";
499+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ar/firefox-80.0.tar.bz2";
500500 locale = "ar";
501501 arch = "linux-i686";
502− sha256 = "97dc4e314f361d7afc3e77d13d712f45306af21e4ef2e5737409b9932b341f92";
502+ sha256 = "4bfc935eb7a94eb6cb957b118c4811cbc0d1265a9fbcd4b4ecd3aea593658af1";
503503 }
504− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ast/firefox-79.0.tar.bz2";
504+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ast/firefox-80.0.tar.bz2";
505505 locale = "ast";
506506 arch = "linux-i686";
507− sha256 = "2cb19f22bc6372d4b3406d87b19acc4ec61cf60317869392145b7405a820b7ea";
507+ sha256 = "c64157e1ef1c361cf1dff89ed443f9b7fceab088c3bdac4058e262a1c068c97d";
508508 }
509− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/az/firefox-79.0.tar.bz2";
509+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/az/firefox-80.0.tar.bz2";
510510 locale = "az";
511511 arch = "linux-i686";
512− sha256 = "83fe4b78ca684c9a58702451e4f8bbc9ee4a67aeb066d74699f7e3d471e0a16c";
512+ sha256 = "6045ef88f6cda1ac9b87854c7ac0dbfe789f9a4b4f7d35f9612beff57d832b60";
513513 }
514− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/be/firefox-79.0.tar.bz2";
514+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/be/firefox-80.0.tar.bz2";
515515 locale = "be";
516516 arch = "linux-i686";
517− sha256 = "f08a685b2b99d3f508487215e426af802097599752ab82dfbd801c063588194a";
517+ sha256 = "6c0e25a6610a0da75f086a829a142f1b7f419e1357d7c97efaba4f1a9c95b5d2";
518518 }
519− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/bg/firefox-79.0.tar.bz2";
519+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/bg/firefox-80.0.tar.bz2";
520520 locale = "bg";
521521 arch = "linux-i686";
522− sha256 = "a5d3c78d91e813358e7b1c33c10854f43112398ee88310c078aa0b5db00b7518";
522+ sha256 = "1c8579439940499262e8e2096f16bd6767441b72a00774a35d76db9463fdaf34";
523523 }
524− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/bn/firefox-79.0.tar.bz2";
524+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/bn/firefox-80.0.tar.bz2";
525525 locale = "bn";
526526 arch = "linux-i686";
527− sha256 = "eab386c0bc37dbe0ab2c8b51a470bc9f65a8f59ad17223d95fe631507da8fefa";
527+ sha256 = "06eaec1ac31a6c2dc21eaa871aa2dd4f45a299458d5cc950c2d52454366ba1b3";
528528 }
529− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/br/firefox-79.0.tar.bz2";
529+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/br/firefox-80.0.tar.bz2";
530530 locale = "br";
531531 arch = "linux-i686";
532− sha256 = "125e5bfe77bac8d9155b07d057e3e8e8de3c3b4bb3aa3de192f2ae55ab9f4e33";
532+ sha256 = "3f8a1a9204ba24d2367f6ad995343eccdb48c981d726ed72e6f96b3579bb504f";
533533 }
534− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/bs/firefox-79.0.tar.bz2";
534+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/bs/firefox-80.0.tar.bz2";
535535 locale = "bs";
536536 arch = "linux-i686";
537− sha256 = "6d9fafc803b098e8fe93911e9d07baa28765dff6b072aa911f74b2076cef54f3";
537+ sha256 = "61da2d6bb7dc90615949b10ab45ac56d38ccd4007ab6f0ff730454994d303f6c";
538538 }
539− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ca-valencia/firefox-79.0.tar.bz2";
539+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ca-valencia/firefox-80.0.tar.bz2";
540540 locale = "ca-valencia";
541541 arch = "linux-i686";
542− sha256 = "91d71b2538e059c9aed1d7a564125c25bca6f6c8213eb247aea7357b1f27b9a3";
542+ sha256 = "15ea7d6e7eee13f2100111b8c9fd10cba728acdc27575ad0160b5baa5c5ba0f1";
543543 }
544− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ca/firefox-79.0.tar.bz2";
544+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ca/firefox-80.0.tar.bz2";
545545 locale = "ca";
546546 arch = "linux-i686";
547− sha256 = "5088cc39fd0b18926e6821348373f834a8b5d093ccaf9152cfc8da3157522734";
547+ sha256 = "140c3b74f0edd7ad47c07dfd5cff6fd224048560ccc691467a00d3c67cc1505e";
548548 }
549− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/cak/firefox-79.0.tar.bz2";
549+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/cak/firefox-80.0.tar.bz2";
550550 locale = "cak";
551551 arch = "linux-i686";
552− sha256 = "31c9be88e0263e0968fa2ebba0673234532d6a99d5cf97ab7b863b814d9d140e";
552+ sha256 = "614876abaaddbca2dd2c56eae7b865828fa446c07bc5401f7bfca7637edb2728";
553553 }
554− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/cs/firefox-79.0.tar.bz2";
554+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/cs/firefox-80.0.tar.bz2";
555555 locale = "cs";
556556 arch = "linux-i686";
557− sha256 = "a606452009ca9e9e7d5f44fc9b42a222e3f557ac4d338c90ab9335dbd96e6683";
557+ sha256 = "2dafa0635a3192a9049d7804f97beaccf6e62a8613e96ba241dff1728aef840f";
558558 }
559− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/cy/firefox-79.0.tar.bz2";
559+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/cy/firefox-80.0.tar.bz2";
560560 locale = "cy";
561561 arch = "linux-i686";
562− sha256 = "a8254adacb701007945e4cbb48d861358cfefd4f590e509264ecdd4e0e858235";
562+ sha256 = "1993cd996e6027b4dbc0e306ab8c09772e0013bdbdd2dc9c774a702555b2f21e";
563563 }
564− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/da/firefox-79.0.tar.bz2";
564+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/da/firefox-80.0.tar.bz2";
565565 locale = "da";
566566 arch = "linux-i686";
567− sha256 = "350ce9d092799302a8c3830fc756c7ddacc752f9b42e70bd73dc1d61a1d1d07b";
567+ sha256 = "8fb1663ba5f646cf65593fe6eb57a63f750b555f6c75fad7f4a9d3592bb46421";
568568 }
569− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/de/firefox-79.0.tar.bz2";
569+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/de/firefox-80.0.tar.bz2";
570570 locale = "de";
571571 arch = "linux-i686";
572− sha256 = "576c95fc5aadbaeba43991b2fb28e13cd3f18f2e81e6584a0208328a4f9c5ca6";
572+ sha256 = "9536de23132d6267f3535e08194679ec16afbcf1c3cf6beaec64cff7de38d701";
573573 }
574− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/dsb/firefox-79.0.tar.bz2";
574+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/dsb/firefox-80.0.tar.bz2";
575575 locale = "dsb";
576576 arch = "linux-i686";
577− sha256 = "024054a027af7a4e8f68a299ae24a47eaa2ab2e69a847cfaa053295cd454b947";
577+ sha256 = "277cd59ab97d33a89e621ca3819fea2cc58042cc373891fd4599cdbddbf483ef";
578578 }
579− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/el/firefox-79.0.tar.bz2";
579+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/el/firefox-80.0.tar.bz2";
580580 locale = "el";
581581 arch = "linux-i686";
582− sha256 = "63ff8a79ec70c7ce44d8375e5ee377754e329f32ad751b87de214707984eba7f";
582+ sha256 = "609c2e25ab34f793a85e60ff9fec4d4281bdd228026ef698fda1b25e956142ed";
583583 }
584− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/en-CA/firefox-79.0.tar.bz2";
584+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/en-CA/firefox-80.0.tar.bz2";
585585 locale = "en-CA";
586586 arch = "linux-i686";
587− sha256 = "eb8597936d2a3a2747827227082743a5b267ee12b45f16e901ab87ad897ae780";
587+ sha256 = "ca54e8fd35633530605149ca7aba49099098f96e880dd0629885e6c867c3d632";
588588 }
589− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/en-GB/firefox-79.0.tar.bz2";
589+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/en-GB/firefox-80.0.tar.bz2";
590590 locale = "en-GB";
591591 arch = "linux-i686";
592− sha256 = "8a1b4c0320439cd3ac22b46fc111564b7ed68ba9f04c7b20a276ac550ebd84e6";
592+ sha256 = "6a6e6b1b34fbaa578a035e430d10fd2911bf64e1917b170cd47ab565ddf9bdbd";
593593 }
594− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/en-US/firefox-79.0.tar.bz2";
594+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/en-US/firefox-80.0.tar.bz2";
595595 locale = "en-US";
596596 arch = "linux-i686";
597− sha256 = "d56bc3d81f7e1807852b326d3f0b00f9e745fe4f8b97c0ffc64aee979db4fa15";
597+ sha256 = "d87d71827f0161f7d3230217fc4f7c7bdca804ccc5f49b4d107151fbcdd7622b";
598598 }
599− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/eo/firefox-79.0.tar.bz2";
599+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/eo/firefox-80.0.tar.bz2";
600600 locale = "eo";
601601 arch = "linux-i686";
602− sha256 = "cd979e28dbf2032ed8f1e5c7c84eda3ddefdef4223749b6fd61ef2f727401a4e";
602+ sha256 = "50f158c96b8de9b789dbc138004646ae583b900fb067b59108ee4ad97e0cd2e1";
603603 }
604− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/es-AR/firefox-79.0.tar.bz2";
604+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/es-AR/firefox-80.0.tar.bz2";
605605 locale = "es-AR";
606606 arch = "linux-i686";
607− sha256 = "4875b4139be6ddcf1e7bff57c3045f29e7730a7bd0e38fffa0443bd0f3aa45a4";
607+ sha256 = "e5589a3a92ce6ee1b5756beb4cd6903e1526d74d457bf3fffd8b9072ded3c5a0";
608608 }
609− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/es-CL/firefox-79.0.tar.bz2";
609+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/es-CL/firefox-80.0.tar.bz2";
610610 locale = "es-CL";
611611 arch = "linux-i686";
612− sha256 = "68bf54d52e45e0b8e0cfd27ec39e3ff97307e91bcede2f2d2561ac5139d179b8";
612+ sha256 = "3188fad7ee67a0c98b370ac32a50136c41f69154f99fda13804d16356679a87f";
613613 }
614− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/es-ES/firefox-79.0.tar.bz2";
614+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/es-ES/firefox-80.0.tar.bz2";
615615 locale = "es-ES";
616616 arch = "linux-i686";
617− sha256 = "e324772591d019b5b27a00716c30ed0f8803dee83276b19b43f5808f584d5000";
617+ sha256 = "c9f37fa0ab8e4d3c16cbc20ae9ce0f0a568a9cc2c48fbcfa114b1ab2b9b462a7";
618618 }
619− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/es-MX/firefox-79.0.tar.bz2";
619+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/es-MX/firefox-80.0.tar.bz2";
620620 locale = "es-MX";
621621 arch = "linux-i686";
622− sha256 = "bf40f1eec6d42c5706a2ae0f840ec00778801d98476dd6055a7170e8ebe8033a";
622+ sha256 = "f07ee3d9317157e5205187bffddb0339fb810ff06aeb192d12e367acdfe89592";
623623 }
624− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/et/firefox-79.0.tar.bz2";
624+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/et/firefox-80.0.tar.bz2";
625625 locale = "et";
626626 arch = "linux-i686";
627− sha256 = "d0f45fa9c2e9559efe0376a53d1bfc7fed04a408d563419e283a0e1a4b4f0840";
627+ sha256 = "01aa2da0ec5504f601e774fb9a35e0b8bcaf59fee1cf8fe33a5d29c05fa75d68";
628628 }
629− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/eu/firefox-79.0.tar.bz2";
629+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/eu/firefox-80.0.tar.bz2";
630630 locale = "eu";
631631 arch = "linux-i686";
632− sha256 = "def48b817fcd432a3573a1d17bbc4dc8616e8b94366836406cf6341d610ba3aa";
632+ sha256 = "6d3f10b801660064e8f51fa45bc17bf1fec641cbb526e1da925b8eb71b863112";
633633 }
634− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/fa/firefox-79.0.tar.bz2";
634+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/fa/firefox-80.0.tar.bz2";
635635 locale = "fa";
636636 arch = "linux-i686";
637− sha256 = "08e4e0c50bb80aba30c2f3666cf568c39bd031938a1e2a6b9fd092da688e3b4f";
637+ sha256 = "0f519bd6d2e8d1e01ef3f6af13937a84fe4c551b56a6c438d01f2b7818c0c440";
638638 }
639− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ff/firefox-79.0.tar.bz2";
639+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ff/firefox-80.0.tar.bz2";
640640 locale = "ff";
641641 arch = "linux-i686";
642− sha256 = "3e9e75e5501d2a5d1d1d11e628d6b9acbd613f3a0f7aed005752f4d07f15686d";
642+ sha256 = "f72bf80190d3bf1a4b81aa06f6f0a7ea25267302747ead42a505461d4cd63e35";
643643 }
644− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/fi/firefox-79.0.tar.bz2";
644+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/fi/firefox-80.0.tar.bz2";
645645 locale = "fi";
646646 arch = "linux-i686";
647− sha256 = "61e0d7ee1d4b0d8dfbea3869766497d88dcbf0c467d41d07ea45309d03839a49";
647+ sha256 = "44aef7c10ed8815634d62bb60b7d5412901dd016ef7439b28a84219546b702b6";
648648 }
649− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/fr/firefox-79.0.tar.bz2";
649+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/fr/firefox-80.0.tar.bz2";
650650 locale = "fr";
651651 arch = "linux-i686";
652− sha256 = "9c502d317ae781e82a69a80c864958ea23eeed18b215b9f08a7ecc024bcc6249";
652+ sha256 = "a347e36231516c410e756e55fa8e03c660635a70c8315ec14e9b2c68deae9db8";
653653 }
654− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/fy-NL/firefox-79.0.tar.bz2";
654+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/fy-NL/firefox-80.0.tar.bz2";
655655 locale = "fy-NL";
656656 arch = "linux-i686";
657− sha256 = "05ed05024ebdb58eb2c178c30da5d0f013299ffbf42c26b7e28c0bd1053106f5";
657+ sha256 = "d53d4fad373b633e287db03675f89279e44b80c28ab50c238a05b286abb916b6";
658658 }
659− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ga-IE/firefox-79.0.tar.bz2";
659+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ga-IE/firefox-80.0.tar.bz2";
660660 locale = "ga-IE";
661661 arch = "linux-i686";
662− sha256 = "101f512b07c22c24d55fab970b1d5140f6f7a54d470652511e8d053d5d3ba265";
662+ sha256 = "279f93b6e57dbaa443df2221217e4ef60be015c0a4e6fad8806e97f46f074f9e";
663663 }
664− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/gd/firefox-79.0.tar.bz2";
664+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/gd/firefox-80.0.tar.bz2";
665665 locale = "gd";
666666 arch = "linux-i686";
667− sha256 = "2a7998045852b8f3bcc86aecf40b5582724da71eb14d1fa612184dacdc751fcc";
667+ sha256 = "b3c89bb8b8e4f9bae3686e601de8ad7c065940f8852d63a8e503095b0674e931";
668668 }
669− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/gl/firefox-79.0.tar.bz2";
669+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/gl/firefox-80.0.tar.bz2";
670670 locale = "gl";
671671 arch = "linux-i686";
672− sha256 = "0aa2c2ca4cdffedc5d17e4223c2cc6e96ce89bc69989ae10be683bcd61f4a143";
672+ sha256 = "cc9687f4d35a62ba0be5c362bf0d55ed1acdc4d1b4e0284cc4db04553c36786b";
673673 }
674− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/gn/firefox-79.0.tar.bz2";
674+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/gn/firefox-80.0.tar.bz2";
675675 locale = "gn";
676676 arch = "linux-i686";
677− sha256 = "4e9f93db434ef45712c11ef5e3e812dba5927183d73da81db3b9698f35c51585";
677+ sha256 = "c3d4cec222d099bd2a9f66c543c97d1c18c0abfa087c19fac3da08579c60d103";
678678 }
679− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/gu-IN/firefox-79.0.tar.bz2";
679+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/gu-IN/firefox-80.0.tar.bz2";
680680 locale = "gu-IN";
681681 arch = "linux-i686";
682− sha256 = "f2c3cbef250bfdac654ec2eaf438f51c059521b6a0d1694427013b949a323cdd";
682+ sha256 = "7af5a56a90bd0eadf93ffeb2b61f08232996b560588fa52d55ffe3023e08b3e8";
683683 }
684− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/he/firefox-79.0.tar.bz2";
684+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/he/firefox-80.0.tar.bz2";
685685 locale = "he";
686686 arch = "linux-i686";
687− sha256 = "3b4d9dc608998b2d76db3ab2f21826983a12284bffa22e76ec60a275c5a54f97";
687+ sha256 = "65222595c4df12375837f0994f9fe23a3a8f96fde8ec0d7be980ab16ea19bc71";
688688 }
689− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/hi-IN/firefox-79.0.tar.bz2";
689+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/hi-IN/firefox-80.0.tar.bz2";
690690 locale = "hi-IN";
691691 arch = "linux-i686";
692− sha256 = "840ff442beb5c0599f7c67a00adf840a8f4306f2bc6ac8f2397af0b876304741";
692+ sha256 = "ee52e1eaca1e61c5ee1cfd5e86fc0afed242f9162f36027f57052162b88b2500";
693693 }
694− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/hr/firefox-79.0.tar.bz2";
694+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/hr/firefox-80.0.tar.bz2";
695695 locale = "hr";
696696 arch = "linux-i686";
697− sha256 = "e0098a3069cb9b86becd2f77a671731bd849a568d2fffb6064528f802e5cd6c6";
697+ sha256 = "ae9936bd5b55e92250d73859b1d78505fcc3d3312d0772591720012ea820c367";
698698 }
699− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/hsb/firefox-79.0.tar.bz2";
699+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/hsb/firefox-80.0.tar.bz2";
700700 locale = "hsb";
701701 arch = "linux-i686";
702− sha256 = "8322028ef47168ecc2928284e0a96d36c9208dfa2a7f3eae6f7449fb77753e62";
702+ sha256 = "55e837eb12417899dbcab8d15f3c8e3604f7a071339b1f2ee608801ad7fe7912";
703703 }
704− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/hu/firefox-79.0.tar.bz2";
704+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/hu/firefox-80.0.tar.bz2";
705705 locale = "hu";
706706 arch = "linux-i686";
707− sha256 = "801b62419499f9ae9fa48848aafdad7258cc95f7b04b1ade6d3cbf6663a6b3dc";
707+ sha256 = "710a5e73c34cdc1b7a77e8465724b0e99c4084effb015c3dd71e3fc2f678149c";
708708 }
709− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/hy-AM/firefox-79.0.tar.bz2";
709+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/hy-AM/firefox-80.0.tar.bz2";
710710 locale = "hy-AM";
711711 arch = "linux-i686";
712− sha256 = "7b4af441958fbffbf43b7e1ff8e97d62dfd3aef2076bcdf1fb1eda8006093721";
712+ sha256 = "7e40874e151c69145db6a812d7050de5ea65b8939a394cbc468c3492abd189fe";
713713 }
714− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ia/firefox-79.0.tar.bz2";
714+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ia/firefox-80.0.tar.bz2";
715715 locale = "ia";
716716 arch = "linux-i686";
717− sha256 = "ee2bf28f2cb18a5cdeb51420042d624c40bbaea73e4c567eb801273f0c4c8095";
717+ sha256 = "5c6083dd765489f378b6855713e601d50ff84acf95674b8d3b873b29981dda99";
718718 }
719− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/id/firefox-79.0.tar.bz2";
719+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/id/firefox-80.0.tar.bz2";
720720 locale = "id";
721721 arch = "linux-i686";
722− sha256 = "1083dbcab9b2b297869ef7a4a65ee04b63e851805e7fe7f7977fbe6d2f69828c";
722+ sha256 = "b8cf9a69b6b52f816e355399e2bf6c1742f56d7d631dbee78a687a1cde9312dc";
723723 }
724− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/is/firefox-79.0.tar.bz2";
724+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/is/firefox-80.0.tar.bz2";
725725 locale = "is";
726726 arch = "linux-i686";
727− sha256 = "c2c475e280f3f52a134182ac6dc679273c29198605d9214f4ceeb09e57f2cdf5";
727+ sha256 = "532793a2e2d761ba36a3bdaa0a257e8828b5516193c4cf1f1ec1735efa510e6f";
728728 }
729− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/it/firefox-79.0.tar.bz2";
729+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/it/firefox-80.0.tar.bz2";
730730 locale = "it";
731731 arch = "linux-i686";
732− sha256 = "d7de926e398e6291e031f737da63fe223c7e4c70c01994bf74c8461e04af0840";
732+ sha256 = "a5309e5f3c387990ba1aa255684ec73f2e38dca0aa873f998effb7dd7b13e0a0";
733733 }
734− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ja/firefox-79.0.tar.bz2";
734+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ja/firefox-80.0.tar.bz2";
735735 locale = "ja";
736736 arch = "linux-i686";
737− sha256 = "a5f1c6bd8bd5aba351511838c04a35f26aa107ca43d87489ae24bac3831df165";
737+ sha256 = "f9dc927612114a5c8d9a4e0ee311356a0e5e819729f4ebd08ee5f03dcda52afd";
738738 }
739− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ka/firefox-79.0.tar.bz2";
739+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ka/firefox-80.0.tar.bz2";
740740 locale = "ka";
741741 arch = "linux-i686";
742− sha256 = "513c9c885f741162301a980daf84eff5aa42f45aaf766a9b3e1376fea83bb78a";
742+ sha256 = "37b82df19bd4897bc2c29eb3f5f94d107b6b97eeb5a1b3ff5ddcaf641dd0fb19";
743743 }
744− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/kab/firefox-79.0.tar.bz2";
744+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/kab/firefox-80.0.tar.bz2";
745745 locale = "kab";
746746 arch = "linux-i686";
747− sha256 = "15fd46b89f7ea425121d02aef931bbaf624391e7039d81e646d6551303598579";
747+ sha256 = "1ef2b402c518da26838c2c3e0d5c47fa8f3c5d74cb2f9a95999814476d3bc629";
748748 }
749− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/kk/firefox-79.0.tar.bz2";
749+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/kk/firefox-80.0.tar.bz2";
750750 locale = "kk";
751751 arch = "linux-i686";
752− sha256 = "82a29718fdff57e6d02f8cc6ae76bb604d0e14374e7881c120ff6e38c4b21995";
752+ sha256 = "d152f45918a163fccc9eec97f5543d8c206a3e9ac130de58260943e6aebb19a8";
753753 }
754− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/km/firefox-79.0.tar.bz2";
754+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/km/firefox-80.0.tar.bz2";
755755 locale = "km";
756756 arch = "linux-i686";
757− sha256 = "406c361b49d9e5cb6eb952e5be0eea3a8b9ff535a3edb6dc1c60ec6171d5ae49";
757+ sha256 = "2d9639684b0115f9db6eb73379e1d7b24670db83afd2e7d2bed2a7c62188f54c";
758758 }
759− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/kn/firefox-79.0.tar.bz2";
759+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/kn/firefox-80.0.tar.bz2";
760760 locale = "kn";
761761 arch = "linux-i686";
762− sha256 = "0839a7af990a70523355047e5cfd24e73d0c8816cd12f2a21aa8cc244d9ef90c";
762+ sha256 = "224e41e1c33e60f1de88fe8243742675e0813b7041f1bac3a9a29528c618df3b";
763763 }
764− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ko/firefox-79.0.tar.bz2";
764+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ko/firefox-80.0.tar.bz2";
765765 locale = "ko";
766766 arch = "linux-i686";
767− sha256 = "2ed856441ea51d642027b800911f134c27207dd8a53ee5a27b9674eb11417b05";
767+ sha256 = "16372732d44159e017875ee9d3bdbc5443bfb1eb577d62e8b28a05560caa2650";
768768 }
769− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/lij/firefox-79.0.tar.bz2";
769+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/lij/firefox-80.0.tar.bz2";
770770 locale = "lij";
771771 arch = "linux-i686";
772− sha256 = "653c7c4be39dfc49f89e5e6c591ebc953ef0bff5a9d827d348dad26e3f06bcd8";
772+ sha256 = "a796e32ed17c08499fc2e459a1bf753c7578f5555e0a7eb62757b4c5d4f6b735";
773773 }
774− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/lt/firefox-79.0.tar.bz2";
774+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/lt/firefox-80.0.tar.bz2";
775775 locale = "lt";
776776 arch = "linux-i686";
777− sha256 = "b61fe55f65029ab661d0b589cc5301c6131b778d55524de6b13779dd2d0d6c35";
777+ sha256 = "6687e81d9be17a992e34fbbc9f44edb86be75e1329292122e7978211d4c0b43a";
778778 }
779− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/lv/firefox-79.0.tar.bz2";
779+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/lv/firefox-80.0.tar.bz2";
780780 locale = "lv";
781781 arch = "linux-i686";
782− sha256 = "2f9a99d7a344984736cb422ccc106db8d175f31c1b1a108852494b7201ff67cc";
782+ sha256 = "7c4beca6385caaf9e05eb6f6cf508f51d559094cff3eb60e28d562ec7404d804";
783783 }
784− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/mk/firefox-79.0.tar.bz2";
784+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/mk/firefox-80.0.tar.bz2";
785785 locale = "mk";
786786 arch = "linux-i686";
787− sha256 = "0cdde250523fbdbb8b651660fccbe1afe65068c263e03fe7ce26d9758fba7bba";
787+ sha256 = "d8da49d2b43467ef4b29f55a15f71125ceb8388a55ded93ccd90e7d484d84feb";
788788 }
789− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/mr/firefox-79.0.tar.bz2";
789+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/mr/firefox-80.0.tar.bz2";
790790 locale = "mr";
791791 arch = "linux-i686";
792− sha256 = "0df4e48be06d800d1fa308841a1890f7b1c87e63b34901cdd1481a63a7080d24";
792+ sha256 = "304c8f8caf6ebdd5d928135f7fb94d490658e0fb6b7b73e2f1618b7b07234de2";
793793 }
794− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ms/firefox-79.0.tar.bz2";
794+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ms/firefox-80.0.tar.bz2";
795795 locale = "ms";
796796 arch = "linux-i686";
797− sha256 = "3fc1dcbe6c72acbee7a68ebf6a8b08b9961a5a04eb05f0cac86ac8fc56953917";
797+ sha256 = "a4cea6625395d522ab3d4000f6774ba5898a1f740c9b70b23f71f52e1231404d";
798798 }
799− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/my/firefox-79.0.tar.bz2";
799+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/my/firefox-80.0.tar.bz2";
800800 locale = "my";
801801 arch = "linux-i686";
802− sha256 = "aba83f9c9f41dc5660a480b6821dff2c405900d9370c3d1414a892ad0e44161a";
802+ sha256 = "1bbb703f65bc5d41174800ec789066d99ca10430605dfb2975b6d788b41c1220";
803803 }
804− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/nb-NO/firefox-79.0.tar.bz2";
804+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/nb-NO/firefox-80.0.tar.bz2";
805805 locale = "nb-NO";
806806 arch = "linux-i686";
807− sha256 = "34e9cfa0bd9a065b58edeffffff690abb6240e90f1d788146ac3976d9e7d9cc7";
807+ sha256 = "95592600fbb71a6346fa42f8647460fed047af96f38754a3322eef9bec7a22aa";
808808 }
809− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ne-NP/firefox-79.0.tar.bz2";
809+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ne-NP/firefox-80.0.tar.bz2";
810810 locale = "ne-NP";
811811 arch = "linux-i686";
812− sha256 = "8031d15b84eb3baa73064ba592434d4d36ae94c6bb3b7c9fa359f93486be3ea8";
812+ sha256 = "f902008b0c6390265e11209e573555b0854b0d0c879eb5c2637f18ce981223fc";
813813 }
814− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/nl/firefox-79.0.tar.bz2";
814+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/nl/firefox-80.0.tar.bz2";
815815 locale = "nl";
816816 arch = "linux-i686";
817− sha256 = "33f19d81143a26b7472b70558c2187a4ed39f67ba95e28332c7e8a8699aa33e9";
817+ sha256 = "9ef3bbe6b6975b50013a951559f6beaa34ddd5b183ccb33500c585e3c094fc05";
818818 }
819− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/nn-NO/firefox-79.0.tar.bz2";
819+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/nn-NO/firefox-80.0.tar.bz2";
820820 locale = "nn-NO";
821821 arch = "linux-i686";
822− sha256 = "ca27dd578f8054df63b77c314d3504a2277139cc2d54d43f8c202771ad12e76c";
822+ sha256 = "783427d27ef6be2bac3a219f72d61a6cc8b6105ec01c94476b06187d83fada90";
823823 }
824− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/oc/firefox-79.0.tar.bz2";
824+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/oc/firefox-80.0.tar.bz2";
825825 locale = "oc";
826826 arch = "linux-i686";
827− sha256 = "336cfde595de21f8ee355ec4e6a240da8a8946f357a100629ab0d0d883bee335";
827+ sha256 = "f5a6af6e4d2bee9ea6c8e27edfe593640f0410766eec4a029c7b6641731cca58";
828828 }
829− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/pa-IN/firefox-79.0.tar.bz2";
829+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/pa-IN/firefox-80.0.tar.bz2";
830830 locale = "pa-IN";
831831 arch = "linux-i686";
832− sha256 = "bb51ced0f4993862a7d025b1b504e29fb96e6341336c3fc61ffc6d3ffc18d884";
832+ sha256 = "8d45fd730fcbf898062231356d11892eda44a2dc124444fc0623de363a807a73";
833833 }
834− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/pl/firefox-79.0.tar.bz2";
834+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/pl/firefox-80.0.tar.bz2";
835835 locale = "pl";
836836 arch = "linux-i686";
837− sha256 = "c44b50bc19b0ba7cb198d144f05b10d5f453c110463dd945534ccd180b71c7d1";
837+ sha256 = "9c89d3be668a295ef53d1dba84d1b9db230956d5700de6a86a6c8b0dffce5781";
838838 }
839− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/pt-BR/firefox-79.0.tar.bz2";
839+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/pt-BR/firefox-80.0.tar.bz2";
840840 locale = "pt-BR";
841841 arch = "linux-i686";
842− sha256 = "6cda521f9c8a02c948dd1461fafff84e7e1b793815b6f25697a78751264dc689";
842+ sha256 = "8c591df0daa36ce3fd8380d34609cd1e1d26c8116db5bbe22828820c1f7f84aa";
843843 }
844− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/pt-PT/firefox-79.0.tar.bz2";
844+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/pt-PT/firefox-80.0.tar.bz2";
845845 locale = "pt-PT";
846846 arch = "linux-i686";
847− sha256 = "56e5ced26db5466aebcd7108dc3f499b243631bf61505a1fffb92b2eeb2cb5cc";
847+ sha256 = "e3ea46565734355a779e5b4b083c14e2f13d14f78f7347c36306fce57f4beb16";
848848 }
849− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/rm/firefox-79.0.tar.bz2";
849+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/rm/firefox-80.0.tar.bz2";
850850 locale = "rm";
851851 arch = "linux-i686";
852− sha256 = "47913299e22f8b955bd5307241d368cb3c29d6a0bb0d90d5ed7667b85b6aa0e3";
852+ sha256 = "c2355ccb07cd804aae65b31270e51d2d0a1ea438db44ab75c22aa57cb1bec71a";
853853 }
854− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ro/firefox-79.0.tar.bz2";
854+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ro/firefox-80.0.tar.bz2";
855855 locale = "ro";
856856 arch = "linux-i686";
857− sha256 = "528c36c4361f42a3d90f076800b0b73c8c1d630ae97ba33ff59e72d30d203cab";
857+ sha256 = "e7b729a18283dabd9f295a436e97c3bd42eb6666e77c42ef1b967598d6e0ae37";
858858 }
859− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ru/firefox-79.0.tar.bz2";
859+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ru/firefox-80.0.tar.bz2";
860860 locale = "ru";
861861 arch = "linux-i686";
862− sha256 = "ff1a33da0bd8bb7c2d7f460724c292b7433087ba5596258cc4bbbac2087d81b7";
862+ sha256 = "d9b2a3449ca0ed738db8bbd3f316a4973fa318c4abdb63aced9832419b579229";
863863 }
864− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/si/firefox-79.0.tar.bz2";
864+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/si/firefox-80.0.tar.bz2";
865865 locale = "si";
866866 arch = "linux-i686";
867− sha256 = "675d6238f6bcf07751ec5356f3f4824d681ef28ac26255e1bae84cdab23ac0a7";
867+ sha256 = "8a43a0b25befbb5f0a9477086ae85d58b1d4c448e06630d1c0ece950d24bb6a5";
868868 }
869− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/sk/firefox-79.0.tar.bz2";
869+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/sk/firefox-80.0.tar.bz2";
870870 locale = "sk";
871871 arch = "linux-i686";
872− sha256 = "141416a2320bf355cf9f3ca33ec3983b5089c5b2c9172cf03e00d21577b570c9";
872+ sha256 = "40a4e4b307ebea63a13e8073536c1d039ee400b4eff109a4ed086c5f073c12bf";
873873 }
874− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/sl/firefox-79.0.tar.bz2";
874+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/sl/firefox-80.0.tar.bz2";
875875 locale = "sl";
876876 arch = "linux-i686";
877− sha256 = "6d062305ad9e40add4f8c84d051647df8c6b3e083011e00d9380f3e2eb6f128b";
877+ sha256 = "19b163d77a8480099cc356f84c00d51c62cf97095ed2a3f2a16a654abcc0d413";
878878 }
879− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/son/firefox-79.0.tar.bz2";
879+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/son/firefox-80.0.tar.bz2";
880880 locale = "son";
881881 arch = "linux-i686";
882− sha256 = "2e2adcfe7f26adac4aa820acbe894fa567f53faf2854eca3febf2d7fb66c97ee";
882+ sha256 = "0c9b0546846cde59fc550f2a94abb8e909f1955ff5790aacd3bfdf63a668a1d8";
883883 }
884− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/sq/firefox-79.0.tar.bz2";
884+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/sq/firefox-80.0.tar.bz2";
885885 locale = "sq";
886886 arch = "linux-i686";
887− sha256 = "eeddc2cb86011cbec49ace8c954ae9724ebb9a800cacd4354cfbee782ce7e481";
887+ sha256 = "b153afd0d8efcb4563bf46df1f8d20408e179ecd94a4e294683eb5caa0141228";
888888 }
889− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/sr/firefox-79.0.tar.bz2";
889+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/sr/firefox-80.0.tar.bz2";
890890 locale = "sr";
891891 arch = "linux-i686";
892− sha256 = "88081a8c78e039aca0774b1ad61eb3508b9d4bf088cfd27e6b420431dcc6b95a";
892+ sha256 = "36a3dbe8a9fec700ab91134344db6d70dfe96d53bfcf366ac83b29ba7f405a35";
893893 }
894− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/sv-SE/firefox-79.0.tar.bz2";
894+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/sv-SE/firefox-80.0.tar.bz2";
895895 locale = "sv-SE";
896896 arch = "linux-i686";
897− sha256 = "51096fc91f7bd36b6bf66c57eb870cfbc62c42880ef2b7d3ae8032c49b5dc07d";
897+ sha256 = "708b43a83fc88ddec15a87a0f753690048dcb7500aee2a52c59c28912de5f401";
898898 }
899− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ta/firefox-79.0.tar.bz2";
899+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ta/firefox-80.0.tar.bz2";
900900 locale = "ta";
901901 arch = "linux-i686";
902− sha256 = "06f1af1fff1eff74d3aee7a7bffc7485911d350daf216bc8a3f6462b85ab28e7";
902+ sha256 = "e552b1ff45f4b904a7b76af41f44e9e349cf08f20981f44b95d7e89f727d3c12";
903903 }
904− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/te/firefox-79.0.tar.bz2";
904+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/te/firefox-80.0.tar.bz2";
905905 locale = "te";
906906 arch = "linux-i686";
907− sha256 = "5921702973c5c808f396fad81e736ffe7b9948996997cde5f721e55a6b0c172b";
907+ sha256 = "5ea5d027d0b6aacec730a865d8c70e8929c858b26a3ca0f798bb3a405e438aa6";
908908 }
909− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/th/firefox-79.0.tar.bz2";
909+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/th/firefox-80.0.tar.bz2";
910910 locale = "th";
911911 arch = "linux-i686";
912− sha256 = "5e8ff4f8b3204ed67545c4c68cc225ef7e28ce9c63108efdfb1ced7c77e2ce6e";
912+ sha256 = "32e0e810308c3fdb52b247d086193f0dbf1184ee2f6ac42c2a25766f158ed79c";
913913 }
914− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/tl/firefox-79.0.tar.bz2";
914+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/tl/firefox-80.0.tar.bz2";
915915 locale = "tl";
916916 arch = "linux-i686";
917− sha256 = "72b9a9cef7a4d166e9d33e0a89d00a1c270d1e6b4e5039356f6145bab0d8f6a0";
917+ sha256 = "d64ff747faf81f626ff91c18f72f786669f48ca84f55df58a25ffeadc1683325";
918918 }
919− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/tr/firefox-79.0.tar.bz2";
919+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/tr/firefox-80.0.tar.bz2";
920920 locale = "tr";
921921 arch = "linux-i686";
922− sha256 = "38cc4e45e3222633b7f85c59eb1fc8a993f4b77ffe9b50478ae894fb68f67304";
922+ sha256 = "22cfc8b33829476e0a058900f5a606020b249225e15c3a78a5baa314ea39a5eb";
923923 }
924− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/trs/firefox-79.0.tar.bz2";
924+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/trs/firefox-80.0.tar.bz2";
925925 locale = "trs";
926926 arch = "linux-i686";
927− sha256 = "f82d215f8a1a9b5b07ab71cadf75ef007e57b987d025c14fa671305dc5087182";
927+ sha256 = "a7db4c7fc442156414d658b04cb531fe5b4f4ac7b46e3a62229bb7528b40a43d";
928928 }
929− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/uk/firefox-79.0.tar.bz2";
929+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/uk/firefox-80.0.tar.bz2";
930930 locale = "uk";
931931 arch = "linux-i686";
932− sha256 = "014d024f4d14f465393f096147b661919dc1793289e68c4d13b6b01dba42d4d7";
932+ sha256 = "072b4d82b5a8c14764f3664ea5fd436aa616984e044e078002ef6c4ab3f5a804";
933933 }
934− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ur/firefox-79.0.tar.bz2";
934+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ur/firefox-80.0.tar.bz2";
935935 locale = "ur";
936936 arch = "linux-i686";
937− sha256 = "c2b7382f1e511dd7c79b3d5854059c403f633ec4423ec31dd9395d6dca4d31ee";
937+ sha256 = "c52f5cb761b5d8f7c6c3646c3fc2a5c4580d5dcaa0d8757f3f37b990a1b61191";
938938 }
939− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/uz/firefox-79.0.tar.bz2";
939+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/uz/firefox-80.0.tar.bz2";
940940 locale = "uz";
941941 arch = "linux-i686";
942− sha256 = "66e35eb3fe6aef2a3d4986a585072f96b55877b0a15ce81c41096e1f1c001f2a";
942+ sha256 = "4bc2ca5751a9d0cd69661799ab5ca6725bdc12055d07c975a6a7f90f44d93182";
943943 }
944− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/vi/firefox-79.0.tar.bz2";
944+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/vi/firefox-80.0.tar.bz2";
945945 locale = "vi";
946946 arch = "linux-i686";
947− sha256 = "d1cdb32bfb6f6d8e41d3f32de0c86654660d5d7ca4bfe0e763eeb799c0ead10f";
947+ sha256 = "1ce68d3b630754f961264558c424c0c9771d77f01858570ef0d15ed2098e99c8";
948948 }
949− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/xh/firefox-79.0.tar.bz2";
949+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xh/firefox-80.0.tar.bz2";
950950 locale = "xh";
951951 arch = "linux-i686";
952− sha256 = "508d17ec13f5b3e1d18641451374efb72331fe68b254f8a71bef4807c318bb9e";
952+ sha256 = "b7e4d8f55c8ff78491cf2e65510397f09b3b5995f7f7fd506c7e20027d330ee5";
953953 }
954− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/zh-CN/firefox-79.0.tar.bz2";
954+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/zh-CN/firefox-80.0.tar.bz2";
955955 locale = "zh-CN";
956956 arch = "linux-i686";
957− sha256 = "cf2f5617c652209daef0e6e5176181f2659e188f9007d7accb4041c030c54fad";
957+ sha256 = "3ab8f24ea6809b9a2b1cbecef55caa39dbf4ecd33b287b8ef77e5a76bb617337";
958958 }
959− { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/zh-TW/firefox-79.0.tar.bz2";
959+ { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/zh-TW/firefox-80.0.tar.bz2";
960960 locale = "zh-TW";
961961 arch = "linux-i686";
962− sha256 = "ec99c9201151f134d72450513c518816f244fec0af6de2bb4ee08d3286b709f1";
962+ sha256 = "4c306d3227ca8dc322780c0eeb8532a62db101c6cde8317acfa824bdddea4d12";
963963 }
964964 ];
965965}
pkgs/applications/networking/browsers/firefox/common.nix+8
@@ -141,6 +141,14 @@ stdenv.mkDerivation ({
141141
142142 postPatch = ''
143143 rm -rf obj-x86_64-pc-linux-gnu
144+ '' + lib.optionalString (lib.versionAtLeast ffversion "80") ''
145+ substituteInPlace dom/system/IOUtils.h \
146+ --replace '#include "nspr/prio.h"' '#include "prio.h"'
147+
148+ substituteInPlace dom/system/IOUtils.cpp \
149+ --replace '#include "nspr/prio.h"' '#include "prio.h"' \
150+ --replace '#include "nspr/private/pprio.h"' '#include "private/pprio.h"' \
151+ --replace '#include "nspr/prtypes.h"' '#include "prtypes.h"'
144152 '';
145153
146154 nativeBuildInputs =
pkgs/applications/networking/browsers/firefox/packages.nix+6−6
@@ -7,10 +7,10 @@ in
77rec {
88 firefox = common rec {
99 pname = "firefox";
10− ffversion = "79.0";
10+ ffversion = "80.0";
1111 src = fetchurl {
1212 url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
13− sha512 = "0zgf7wdcz992a4dy1rj0ax0k65an7h9p9iihka3jy4jd7w4g2d0x4mxz5iqn2y26hmgnkvjb921zh28biikahgygqja3z2pcx26ic0r";
13+ sha512 = "3rw30gs1wvd6m2sgsp1wm29rrbkxyf3jsdy8i0azfz9w7hqcfwnv76j3cdf18xghh954hpn3q6w1hr7pgab3z9zjxzyfcnh2mbabyvc";
1414 };
1515
1616 patches = [
@@ -35,10 +35,10 @@ rec {
3535
3636 firefox-esr-78 = common rec {
3737 pname = "firefox-esr";
38− ffversion = "78.1.0esr";
38+ ffversion = "78.2.0esr";
3939 src = fetchurl {
4040 url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
41− sha512 = "223v796vjsvgs3yw442c8qbsbh43l1aniial05rl70hx44rh9sg108ripj8q83p5l9m0sp67x6ixd2xvifizv6461a1zra1rvbb1caa";
41+ sha512 = "1dnvr9nyvnv5dkpnjnadff38lf9r7g37gk401c1i22d661ib5xj0gm2rnz1rjyrkvzrnr6p9f7liy3i41varja00g0x1racccj1my9q";
4242 };
4343
4444 patches = [
@@ -63,10 +63,10 @@ rec {
6363
6464 firefox-esr-68 = (common rec {
6565 pname = "firefox-esr";
66− ffversion = "68.11.0esr";
66+ ffversion = "68.12.0esr";
6767 src = fetchurl {
6868 url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
69− sha512 = "0zg41jnbnpsa07xaizwfsmfav0cgxdqnh8i4yanxy49a45gigk895zqrx2if7pfsmdnj9zpwj9prj8cpnpsfhv6p62f3g2596aa9kvx";
69+ sha512 = "169y4prlb4mi31jciz89kp35rpb1p2gxrk93qkwfzdk4imi9hk8mi2yvxknpr0rni3bn2x0zgrrc6ccr8swv5895sqvv1sc5r1056w3";
7070 };
7171
7272 patches = [
pkgs/applications/networking/browsers/opera/default.nix+1−1
@@ -104,7 +104,7 @@ in stdenv.mkDerivation rec {
104104 # This is a little tricky. Without it the app starts then crashes. Then it
105105 # brings up the crash report, which also crashes. `strace -f` hints at a
106106 # missing libudev.so.0.
107− systemd.lib
107+ (lib.getLib systemd)
108108 ];
109109
110110 installPhase = ''
pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix+3−3
@@ -91,19 +91,19 @@ let
9191 fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
9292
9393 # Upstream source
94− version = "9.5.3";
94+ version = "9.5.4";
9595
9696 lang = "en-US";
9797
9898 srcs = {
9999 x86_64-linux = fetchurl {
100100 url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz";
101− sha256 = "1kqvr0sag94xdkq85k426qq1hz2b52m315yz51w6hvc87d8332b4";
101+ sha256 = "sha256-XW2B2wTgqMU2w9XhPJNcUjGLrHykQIngMcG/fFTWb04=";
102102 };
103103
104104 i686-linux = fetchurl {
105105 url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz";
106− sha256 = "179g00xw964d6x11wvzs84r7d6rcczx7ganqrxrs499yklscc46b";
106+ sha256 = "sha256-EyDyAxB5Og1Cn04tuBF9ob8BxqULy2Ur07BuDxZlmqQ=";
107107 };
108108 };
109109in
pkgs/applications/networking/browsers/ungoogled-chromium/common.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, llvmPackages, gnChromium, ninja, which, nodejs, fetchpatch, gnutar
1+{ stdenv, lib, llvmPackages, gnChromium, ninja, which, nodejs, fetchpatch, gnutar
22
33# default dependencies
44, bzip2, flac, speex, libopus
@@ -197,7 +197,7 @@ let
197197 sed -i -e 's@"\(#!\)\?.*xdg-@"\1${xdg_utils}/bin/xdg-@' \
198198 chrome/browser/shell_integration_linux.cc
199199
200− sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${systemd.lib}/lib/\1!' \
200+ sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${lib.getLib systemd}/lib/\1!' \
201201 device/udev_linux/udev?_loader.cc
202202
203203 sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \
pkgs/applications/networking/cluster/luigi/default.nix+11−4
@@ -1,15 +1,22 @@
1−{ lib, python3Packages }:
1+{ lib, python3 }:
22
3−python3Packages.buildPythonApplication rec {
3+let
4+ python = python3.override {
5+ self = python;
6+ packageOverrides = self: super: {
7+ tornado = super.tornado_5;
8+ };
9+ };
10+in with python.pkgs; buildPythonApplication rec {
411 pname = "luigi";
512 version = "3.0.1";
613
7− src = python3Packages.fetchPypi {
14+ src = fetchPypi {
815 inherit pname version;
916 sha256 = "02c480f5pjgqsvqnkaw7f6n4nhdspmhq5w7lw8sgg2v3jghg8n7i";
1017 };
1118
12− propagatedBuildInputs = with python3Packages; [ dateutil tornado_4 python-daemon boto3 ];
19+ propagatedBuildInputs = [ dateutil tornado_5 python-daemon boto3 ];
1320
1421 # Requires tox, hadoop, and google cloud
1522 doCheck = false;
pkgs/applications/networking/instant-messengers/bluejeans/default.nix+2−1
@@ -1,4 +1,5 @@
11{ stdenv
2+, lib
23, fetchurl
34, rpmextract
45, libnotify
@@ -62,7 +63,7 @@ stdenv.mkDerivation rec {
6263 expat
6364 gdk-pixbuf
6465 dbus
65− udev.lib
66+ (lib.getLib udev)
6667 freetype
6768 nspr
6869 glib
pkgs/applications/networking/instant-messengers/franz/generic.nix+2−1
@@ -1,4 +1,5 @@
11{ stdenv
2+, lib
23, makeWrapper
34, wrapGAppsHook
45, autoPatchelfHook
@@ -64,7 +65,7 @@ stdenv.mkDerivation {
6465 expat
6566 stdenv.cc.cc
6667 ];
67− runtimeDependencies = [ udev.lib libnotify ];
68+ runtimeDependencies = [ (lib.getLib udev) libnotify ];
6869
6970 unpackPhase = "dpkg-deb -x $src .";
7071
pkgs/applications/networking/instant-messengers/rambox/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, xdg_utils, dpkg, makeWrapper, autoPatchelfHook
1+{ stdenv, lib, fetchurl, xdg_utils, dpkg, makeWrapper, autoPatchelfHook
22, libXtst, libXScrnSaver, gtk3, nss, alsaLib, udev, libnotify, wrapGAppsHook
33}:
44
@@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
2020
2121 nativeBuildInputs = [ dpkg makeWrapper autoPatchelfHook wrapGAppsHook ];
2222 buildInputs = [ libXtst libXScrnSaver gtk3 nss alsaLib ];
23− runtimeDependencies = [ udev.lib libnotify ];
23+ runtimeDependencies = [ (lib.getLib udev) libnotify ];
2424
2525 unpackPhase = "dpkg-deb -x $src .";
2626
pkgs/applications/networking/instant-messengers/signal-desktop/default.nix+1−1
@@ -81,7 +81,7 @@ in stdenv.mkDerivation rec {
8181 ];
8282
8383 runtimeDependencies = [
84− systemd.lib
84+ (lib.getLib systemd)
8585 libnotify
8686 libdbusmenu
8787 ];
pkgs/applications/networking/instant-messengers/teams/default.nix+1−1
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
3232 ];
3333
3434 runtimeDependencies = [
35− systemd.lib
35+ (lib.getLib systemd)
3636 pulseaudio
3737 ];
3838
pkgs/applications/networking/instant-messengers/vk-messenger/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, rpmextract, autoPatchelfHook
1+{ stdenv, lib, fetchurl, rpmextract, autoPatchelfHook
22, xorg, gtk3, gnome2, nss, alsaLib, udev, libnotify
33, wrapGAppsHook }:
44
@@ -24,7 +24,7 @@ in stdenv.mkDerivation {
2424 ]) ++ [
2525 gtk3 nss alsaLib
2626 ];
27− runtimeDependencies = [ udev.lib libnotify ];
27+ runtimeDependencies = [ (lib.getLib udev) libnotify ];
2828
2929 unpackPhase = ''
3030 rpmextract $src
pkgs/applications/networking/instant-messengers/wavebox/default.nix+1−1
@@ -40,7 +40,7 @@ in stdenv.mkDerivation {
4040 alsaLib gtk3 nss
4141 ];
4242
43− runtimeDependencies = [ udev.lib libnotify ];
43+ runtimeDependencies = [ (getLib udev) libnotify ];
4444
4545 installPhase = ''
4646 mkdir -p $out/bin $out/opt/wavebox
pkgs/applications/networking/instant-messengers/wire-desktop/default.nix+2−1
@@ -5,6 +5,7 @@
55, makeDesktopItem
66, makeWrapper
77, stdenv
8+, lib
89, udev
910, wrapGAppsHook
1011, cpio
@@ -107,7 +108,7 @@ let
107108 '';
108109
109110 runtimeDependencies = [
110− udev.lib
111+ (lib.getLib udev)
111112 ];
112113
113114 postFixup = ''
pkgs/applications/networking/mailreaders/mailspring/default.nix+2−1
@@ -1,4 +1,5 @@
11{ stdenv
2+, lib
23, fetchurl
34, autoPatchelfHook
45, alsaLib
@@ -45,7 +46,7 @@ stdenv.mkDerivation rec {
4546 runtimeDependencies = [
4647 coreutils
4748 openssl
48− udev.lib
49+ (lib.getLib udev)
4950 ];
5051
5152 unpackPhase = ''
pkgs/applications/networking/mailreaders/thunderbird-bin/68_sources.nix+245−245
@@ -1,615 +1,615 @@
11{
2− version = "68.11.0";
2+ version = "68.12.0";
33 sources = [
4− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/ar/thunderbird-68.11.0.tar.bz2";
4+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/ar/thunderbird-68.12.0.tar.bz2";
55 locale = "ar";
66 arch = "linux-x86_64";
7− sha256 = "878336931005573f76fb15c25fcf2593bfabde16356ec6b1f9b8913663b5fcaa";
7+ sha256 = "70cfb9e6a7a1f285f37a8f13c9a010237e6aabf815b77a12f54ee0deedd36400";
88 }
9− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/ast/thunderbird-68.11.0.tar.bz2";
9+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/ast/thunderbird-68.12.0.tar.bz2";
1010 locale = "ast";
1111 arch = "linux-x86_64";
12− sha256 = "5e3f29fb47ccb059d983946d6efec14b8ab00695fdd84a5cc7baa0cc40657cc5";
12+ sha256 = "5645657f20d37ffdb11f383f164f03c66ed2024244849b09bfa60075d5d07490";
1313 }
14− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/be/thunderbird-68.11.0.tar.bz2";
14+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/be/thunderbird-68.12.0.tar.bz2";
1515 locale = "be";
1616 arch = "linux-x86_64";
17− sha256 = "5cd4c3a3d6ac865b727b58cbb51def60779c0d731a9f6b8f01d4b8cdc90d42b5";
17+ sha256 = "d38cdcc2ba4534c23a1bb42b93f271623c497f48e1d255a23bf12a368ff339bd";
1818 }
19− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/bg/thunderbird-68.11.0.tar.bz2";
19+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/bg/thunderbird-68.12.0.tar.bz2";
2020 locale = "bg";
2121 arch = "linux-x86_64";
22− sha256 = "f359cf1bd12f14bd6636fdb0bd885ed829235559c20c86bd361668f057039f34";
22+ sha256 = "c8883242683dec57f9db502d96d2036ec46753f474a33c0f1ae31f97f2c3113c";
2323 }
24− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/br/thunderbird-68.11.0.tar.bz2";
24+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/br/thunderbird-68.12.0.tar.bz2";
2525 locale = "br";
2626 arch = "linux-x86_64";
27− sha256 = "6cfc9608b392b1e604eaefda5a5dcdc346bd88a1bc411532e8864a04631cf6f8";
27+ sha256 = "cfb669e2378f97689a14f23e2c55ef4987e2508695eb195be3af75ed1d648345";
2828 }
29− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/ca/thunderbird-68.11.0.tar.bz2";
29+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/ca/thunderbird-68.12.0.tar.bz2";
3030 locale = "ca";
3131 arch = "linux-x86_64";
32− sha256 = "9068b49e2d8a6f5e82b70ddda1b0a048d094328c96cf21848eefa431d358e6ca";
32+ sha256 = "9ae4b43e0d5d9edd83291f0be7d53d07e5c84f1d0ad4348654136543b7b53a54";
3333 }
34− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/cak/thunderbird-68.11.0.tar.bz2";
34+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/cak/thunderbird-68.12.0.tar.bz2";
3535 locale = "cak";
3636 arch = "linux-x86_64";
37− sha256 = "b3aef7c88302e2b9d0fcff8daa0d8ad4e2893d41e54ec29b746e79d5b03128b2";
37+ sha256 = "d6d635a15b913679ed943c3501dd03140d099ff36b48c8731a47eacda1b5232b";
3838 }
39− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/cs/thunderbird-68.11.0.tar.bz2";
39+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/cs/thunderbird-68.12.0.tar.bz2";
4040 locale = "cs";
4141 arch = "linux-x86_64";
42− sha256 = "a2338c8ac38a4cef41d8fab1e7857c290afa30af0b131a31e675368944d69ba9";
42+ sha256 = "616fbf24e36d63ce3cbc957d69b8972d517524c613a22bedcf5b57534f9a9a41";
4343 }
44− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/cy/thunderbird-68.11.0.tar.bz2";
44+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/cy/thunderbird-68.12.0.tar.bz2";
4545 locale = "cy";
4646 arch = "linux-x86_64";
47− sha256 = "b02118f945ee76653df0364da6b2b8c597fff2bf52f4e20b64f2b8ac69aaf60a";
47+ sha256 = "548c51228d2f3003bb94e1bee91cea0d2edb95bd0f86ee4259c8daef90a2dca8";
4848 }
49− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/da/thunderbird-68.11.0.tar.bz2";
49+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/da/thunderbird-68.12.0.tar.bz2";
5050 locale = "da";
5151 arch = "linux-x86_64";
52− sha256 = "a565beeaf67c01edf83a2478732fa9e245645d6e6b4fb566affe552762b8bc86";
52+ sha256 = "ad0e4b7a693d881b8875a5b8cc3e607a3883df759278129f0933522b9a6acd24";
5353 }
54− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/de/thunderbird-68.11.0.tar.bz2";
54+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/de/thunderbird-68.12.0.tar.bz2";
5555 locale = "de";
5656 arch = "linux-x86_64";
57− sha256 = "00a8f51254b2152ba37d964bfaca77cc06b9d778ef750eb6500e01510e298fb4";
57+ sha256 = "bf9b70b345ffe5df03365d819c5abc3339ed3af4d8a716cdfe7099134864a9b4";
5858 }
59− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/dsb/thunderbird-68.11.0.tar.bz2";
59+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/dsb/thunderbird-68.12.0.tar.bz2";
6060 locale = "dsb";
6161 arch = "linux-x86_64";
62− sha256 = "7cfcafbf7f46a4be23003a59390b0404d04ee344c883c29a18f42accb5fddc4c";
62+ sha256 = "a2cd7ffb0e8b4c3d1715c18e636d0dcd5efa245200d6d0f14048fc4b399b8121";
6363 }
64− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/el/thunderbird-68.11.0.tar.bz2";
64+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/el/thunderbird-68.12.0.tar.bz2";
6565 locale = "el";
6666 arch = "linux-x86_64";
67− sha256 = "b0d0865f8b64de26af8eeff6eb84f159f585e3f9f7590dab413e04167215dcf3";
67+ sha256 = "07836ce122936848e26cd5a1522967760bee67654582076c53e4ec183cc4c40e";
6868 }
69− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/en-GB/thunderbird-68.11.0.tar.bz2";
69+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/en-GB/thunderbird-68.12.0.tar.bz2";
7070 locale = "en-GB";
7171 arch = "linux-x86_64";
72− sha256 = "eb6731a9baaa1cd99584aec7c6dcce8f819d41106ac6ed4f42f02f747cb2afe4";
72+ sha256 = "c89fa35af79eca3cc26b492c602a3f8af0dbaf6ce4ee3af93d93f10daf4e9d6e";
7373 }
74− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/en-US/thunderbird-68.11.0.tar.bz2";
74+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/en-US/thunderbird-68.12.0.tar.bz2";
7575 locale = "en-US";
7676 arch = "linux-x86_64";
77− sha256 = "6ddd72732957282280a7209f2d5137229ca8af4ad7f02e112187fe333cc79a7f";
77+ sha256 = "6eeea0de838909f91da7270e42ae1513d2b801f412fc758f2f8c682d260a7c24";
7878 }
79− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/es-AR/thunderbird-68.11.0.tar.bz2";
79+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/es-AR/thunderbird-68.12.0.tar.bz2";
8080 locale = "es-AR";
8181 arch = "linux-x86_64";
82− sha256 = "0d620d929ed41ffd16cfd8297ec70e8cb9105e726af99d2cd207de50920a1f93";
82+ sha256 = "e9d84032a91f7feb2db3d22a500c564f273c2b637f97aaab2edf3209b93dda1d";
8383 }
84− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/es-ES/thunderbird-68.11.0.tar.bz2";
84+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/es-ES/thunderbird-68.12.0.tar.bz2";
8585 locale = "es-ES";
8686 arch = "linux-x86_64";
87− sha256 = "28bac94492c7444caab029f3cc3995275000496aab854f20368f941514cd7b11";
87+ sha256 = "a986e8a48b59354421193f2dd01e3c291fb6c98031af43531e723dc217a43d4a";
8888 }
89− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/et/thunderbird-68.11.0.tar.bz2";
89+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/et/thunderbird-68.12.0.tar.bz2";
9090 locale = "et";
9191 arch = "linux-x86_64";
92− sha256 = "49fe0adb4fc5c5135083ba53369030faa95d3a530e8eb49180f81e359229bf81";
92+ sha256 = "2f7508e83aba4fd64a817c7eb4b44d4ea9371956339a009ba541bf3a349693cf";
9393 }
94− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/eu/thunderbird-68.11.0.tar.bz2";
94+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/eu/thunderbird-68.12.0.tar.bz2";
9595 locale = "eu";
9696 arch = "linux-x86_64";
97− sha256 = "a422935f96d5a3033c6c2a7bd39f19e3f84211d99b57d3996b31e404414703e4";
97+ sha256 = "edbc5ff4ba45106233cdbf5255405c4ee52ba7e6811736958323a616881b943f";
9898 }
99− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/fi/thunderbird-68.11.0.tar.bz2";
99+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/fi/thunderbird-68.12.0.tar.bz2";
100100 locale = "fi";
101101 arch = "linux-x86_64";
102− sha256 = "649c3908ecccc8466e555aa76aac47bf7153da8b6f45ddf83f36f6ac676cb4c3";
102+ sha256 = "f4ad740a724efdbfec54445304ca75e9a16e0881bc18789b8ea35632d8857d4b";
103103 }
104− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/fr/thunderbird-68.11.0.tar.bz2";
104+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/fr/thunderbird-68.12.0.tar.bz2";
105105 locale = "fr";
106106 arch = "linux-x86_64";
107− sha256 = "8270cf0e0acfb7280b8616462cd87a1d8d929c7c5fd4839f9607cb588a97c025";
107+ sha256 = "ebf60a227c9fe5237eff22fb81f3c8bc02a593de823d6f0ad9b67f07af129dea";
108108 }
109− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/fy-NL/thunderbird-68.11.0.tar.bz2";
109+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/fy-NL/thunderbird-68.12.0.tar.bz2";
110110 locale = "fy-NL";
111111 arch = "linux-x86_64";
112− sha256 = "177a9f337719b2902ae964525803cd437b2cbcc8c7b85c7881e14f7e0d207875";
112+ sha256 = "b12983077a62c5bf7353f50dd951348a457ce07f5beb2a579f199c4d77ed0906";
113113 }
114− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/ga-IE/thunderbird-68.11.0.tar.bz2";
114+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/ga-IE/thunderbird-68.12.0.tar.bz2";
115115 locale = "ga-IE";
116116 arch = "linux-x86_64";
117− sha256 = "80d3625a04d027382ec3fdfdabd45d501fa4b451c82ec5cfdf5c3352a395a6ba";
117+ sha256 = "aa7c3a4b54fd6fef0f120a6748c45a3f379268f31e087cb3df07d270bf060bad";
118118 }
119− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/gd/thunderbird-68.11.0.tar.bz2";
119+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/gd/thunderbird-68.12.0.tar.bz2";
120120 locale = "gd";
121121 arch = "linux-x86_64";
122− sha256 = "0b2fc2582ef518529f204b5096601047b5b3406201b1fc9f7ea88736d1ce1e0a";
122+ sha256 = "39fadb2bd4c01da0eb188cb9f52ccd726ec9f7eb5ced44e2a30ee0cfac2527bf";
123123 }
124− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/gl/thunderbird-68.11.0.tar.bz2";
124+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/gl/thunderbird-68.12.0.tar.bz2";
125125 locale = "gl";
126126 arch = "linux-x86_64";
127− sha256 = "d1cfc4e646fa6ce03765a56ea4cc2ad3936ec8224f1a7f5e74a34c189be11721";
127+ sha256 = "b4ee1f89b0326b22fc7a5b980b857c2652d6881d096060a8bc083015b47762d8";
128128 }
129− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/he/thunderbird-68.11.0.tar.bz2";
129+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/he/thunderbird-68.12.0.tar.bz2";
130130 locale = "he";
131131 arch = "linux-x86_64";
132− sha256 = "588f22ff9dd4dea7c808c4786f2c897842dedbf2a04c0b4d28b3aa162f88773c";
132+ sha256 = "cefbc742672942e310dc9f4dbcefc8b66cf01d58ac64448ac8c0dc33fdace5ae";
133133 }
134− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/hr/thunderbird-68.11.0.tar.bz2";
134+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/hr/thunderbird-68.12.0.tar.bz2";
135135 locale = "hr";
136136 arch = "linux-x86_64";
137− sha256 = "126ae387a1c97d253c4ca60441a192d6a00f63f0483b2888371624337e4fd2a9";
137+ sha256 = "9e132811cb6bd98faee86e298b78e845727bfded84c0cdab41608ed1565f1aee";
138138 }
139− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/hsb/thunderbird-68.11.0.tar.bz2";
139+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/hsb/thunderbird-68.12.0.tar.bz2";
140140 locale = "hsb";
141141 arch = "linux-x86_64";
142− sha256 = "456c323f61f77c07ae73a260a3ad2641190f165d14c75da1dba33ed1f8d2a3d5";
142+ sha256 = "2a41d1e188fd5fed93a37a1bedc67cb745367447504a76836f79928194730d3b";
143143 }
144− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/hu/thunderbird-68.11.0.tar.bz2";
144+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/hu/thunderbird-68.12.0.tar.bz2";
145145 locale = "hu";
146146 arch = "linux-x86_64";
147− sha256 = "4790f014d95fe3ae00433e27fa291f7e4657b8062538ca52c46dd46ea41a05cb";
147+ sha256 = "9196df7850b9cff69f52b5db69ec3b64cfa312bba5669380c137b95a8140cf39";
148148 }
149− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/hy-AM/thunderbird-68.11.0.tar.bz2";
149+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/hy-AM/thunderbird-68.12.0.tar.bz2";
150150 locale = "hy-AM";
151151 arch = "linux-x86_64";
152− sha256 = "7d81493a67e27eb485c1cb702cb8305788733e133bcb22659026737cc2afe1e9";
152+ sha256 = "4a08137a9a714677ecf86a24f165047b809e22eff50d196b92c153e59f943c30";
153153 }
154− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/id/thunderbird-68.11.0.tar.bz2";
154+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/id/thunderbird-68.12.0.tar.bz2";
155155 locale = "id";
156156 arch = "linux-x86_64";
157− sha256 = "9f558c85ba88c6350da0445ca2d2b63205c8c1e6700388e1d4f7de0978321667";
157+ sha256 = "39784aab0bc3253af47cdcd95824eccdecae4dac819bacf6a04daa7b5c86d6e3";
158158 }
159− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/is/thunderbird-68.11.0.tar.bz2";
159+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/is/thunderbird-68.12.0.tar.bz2";
160160 locale = "is";
161161 arch = "linux-x86_64";
162− sha256 = "1f1f65bb573fb4fb563e890c043ff8c3283687575892853dd3e076473072b63f";
162+ sha256 = "a041d1af23e9c64967e4d014b6a84ddc80ad24e852146e448f6b380cdd672e67";
163163 }
164− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/it/thunderbird-68.11.0.tar.bz2";
164+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/it/thunderbird-68.12.0.tar.bz2";
165165 locale = "it";
166166 arch = "linux-x86_64";
167− sha256 = "de6c3adf83745370241c8935edccc412a60642ec758bd891d03c098b40b8792f";
167+ sha256 = "b0e3161c801fbaee2f589b1bc61a4fba9968f5f363a62cf0f8af855d23e4782c";
168168 }
169− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/ja/thunderbird-68.11.0.tar.bz2";
169+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/ja/thunderbird-68.12.0.tar.bz2";
170170 locale = "ja";
171171 arch = "linux-x86_64";
172− sha256 = "8b2ce4598af7323f59a31269c24bd05e369d9898266dc6e8cfa360dae7609273";
172+ sha256 = "ad416d47930d81be9ac2f20b3699f4c74471c36e08b14f9d5c6ee1af97c7c9d4";
173173 }
174− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/ka/thunderbird-68.11.0.tar.bz2";
174+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/ka/thunderbird-68.12.0.tar.bz2";
175175 locale = "ka";
176176 arch = "linux-x86_64";
177− sha256 = "be74a3edf9a1d931124c4351b51147be2e7a74f453d07482bce4f7721de701ce";
177+ sha256 = "3b30bc5f0971310d71e1909b4ed891481457ac8baf11c1e505c3400b2a7cfb63";
178178 }
179− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/kab/thunderbird-68.11.0.tar.bz2";
179+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/kab/thunderbird-68.12.0.tar.bz2";
180180 locale = "kab";
181181 arch = "linux-x86_64";
182− sha256 = "1be81ab7bb429b44e0c63c81ebf249b66a79d43a3dba39ba0af6242db165d6d3";
182+ sha256 = "abdc58d5d5ef251e63c0c40a48460f90e299a4420cbe4e290d519fbed4c335b8";
183183 }
184− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/kk/thunderbird-68.11.0.tar.bz2";
184+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/kk/thunderbird-68.12.0.tar.bz2";
185185 locale = "kk";
186186 arch = "linux-x86_64";
187− sha256 = "ee308381b1e0643b7e0683c365c763beb4afcaf21c9b0a1e8c8c2ec3c218c965";
187+ sha256 = "08018b951de59b1a92717fc82bd98a0c324a019ee0ae14888f09c5351a586284";
188188 }
189− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/ko/thunderbird-68.11.0.tar.bz2";
189+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/ko/thunderbird-68.12.0.tar.bz2";
190190 locale = "ko";
191191 arch = "linux-x86_64";
192− sha256 = "af2d7ee49a6295e41dbfcc7b8e19b8f146890f12baa36ffddbc7dfbfa39a8eb3";
192+ sha256 = "1178adc42b3a2ddac46dd50ad8436d1be50db409963e8fac3beb22a431f885fe";
193193 }
194− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/lt/thunderbird-68.11.0.tar.bz2";
194+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/lt/thunderbird-68.12.0.tar.bz2";
195195 locale = "lt";
196196 arch = "linux-x86_64";
197− sha256 = "8d384844274d048772fbc35da75f91ab6398ca64e26f089c4da116065584acf1";
197+ sha256 = "18d88a8cbb24d2a78af0de282187a743e707136fdb61912e5f64bf75730e3a76";
198198 }
199− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/ms/thunderbird-68.11.0.tar.bz2";
199+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/ms/thunderbird-68.12.0.tar.bz2";
200200 locale = "ms";
201201 arch = "linux-x86_64";
202− sha256 = "6e447b3ed1903a20001963021598d957270c88980ff04d3da6c819ab106a2210";
202+ sha256 = "e1754cfbf20e286fd6304b8d75337e3794893c5ebd9b242cf624090e6fc6e9ee";
203203 }
204− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/nb-NO/thunderbird-68.11.0.tar.bz2";
204+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/nb-NO/thunderbird-68.12.0.tar.bz2";
205205 locale = "nb-NO";
206206 arch = "linux-x86_64";
207− sha256 = "710a982216120cbec822d7a9f74d8ae789b4a234fb3a192797604c9a47a23a62";
207+ sha256 = "6379f6dca3d8bacb466044f0a7d11b32eb61166d3f14c37431f77843eb884c90";
208208 }
209− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/nl/thunderbird-68.11.0.tar.bz2";
209+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/nl/thunderbird-68.12.0.tar.bz2";
210210 locale = "nl";
211211 arch = "linux-x86_64";
212− sha256 = "2b02b7e3b5e310e5b7935cb72e59d6a385567100d22e87d196c4b4700851d439";
212+ sha256 = "66a56e218365bb260980848427609d390674e2ba3c70b9adc4121f73c861d9b8";
213213 }
214− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/nn-NO/thunderbird-68.11.0.tar.bz2";
214+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/nn-NO/thunderbird-68.12.0.tar.bz2";
215215 locale = "nn-NO";
216216 arch = "linux-x86_64";
217− sha256 = "128807f651cc0b09618bad42703970c391c17f5ff883c3ab11d115d0878fe1aa";
217+ sha256 = "ccdb135d43f5542151fe2c99a8e13cebfbc032367abb0308213433b753dc8125";
218218 }
219− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/pl/thunderbird-68.11.0.tar.bz2";
219+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/pl/thunderbird-68.12.0.tar.bz2";
220220 locale = "pl";
221221 arch = "linux-x86_64";
222− sha256 = "181721ac04e9911f57ec7b4f36a5db82e261da71a310dc502efab75a101bec03";
222+ sha256 = "5dc2151d1bb956c4b6fbd1b6185d9328f7091e60fdcd51bad5a9ebaa8fcbb7d7";
223223 }
224− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/pt-BR/thunderbird-68.11.0.tar.bz2";
224+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/pt-BR/thunderbird-68.12.0.tar.bz2";
225225 locale = "pt-BR";
226226 arch = "linux-x86_64";
227− sha256 = "e82f40343e28ecd0abafb71f421c6d7df40b7cfca4898503b32fb0500686d7c4";
227+ sha256 = "5ebf77d47bf45b058aaeca857060c908dbf7036bae2c2c5812ff145aed840203";
228228 }
229− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/pt-PT/thunderbird-68.11.0.tar.bz2";
229+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/pt-PT/thunderbird-68.12.0.tar.bz2";
230230 locale = "pt-PT";
231231 arch = "linux-x86_64";
232− sha256 = "96bea893919ff89441dd47e027a7d83aa691cc99abf4eaa342c941777ecf319a";
232+ sha256 = "73baa68f79b4a15795fc426dfc9a8d573a05e4ab8a663d122cfd802f93941825";
233233 }
234− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/rm/thunderbird-68.11.0.tar.bz2";
234+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/rm/thunderbird-68.12.0.tar.bz2";
235235 locale = "rm";
236236 arch = "linux-x86_64";
237− sha256 = "544f666af94043737503a30551ad5832f22ae529bc32495bef9d7443c8869072";
237+ sha256 = "29f8ba57d9000803bae795c2ff977347af9a1f0df123337eaab3bdcc20786734";
238238 }
239− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/ro/thunderbird-68.11.0.tar.bz2";
239+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/ro/thunderbird-68.12.0.tar.bz2";
240240 locale = "ro";
241241 arch = "linux-x86_64";
242− sha256 = "4c6e7793c206999e0a9510b390e4b47d82e19dc2da1cae8b4341b8afee440191";
242+ sha256 = "b8233ad81c6620c26a02457b9235ce0be0c5d93b81f88d9ddc84bc12f869dbad";
243243 }
244− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/ru/thunderbird-68.11.0.tar.bz2";
244+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/ru/thunderbird-68.12.0.tar.bz2";
245245 locale = "ru";
246246 arch = "linux-x86_64";
247− sha256 = "66e951339323a3a44326cada8c572d7040d33057a3a487d8078eb27efa791eb8";
247+ sha256 = "f959f786dbbb7d06cb33eca24efd9e2763c5ca73fc4ba47e9b933b6298d7f026";
248248 }
249− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/si/thunderbird-68.11.0.tar.bz2";
249+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/si/thunderbird-68.12.0.tar.bz2";
250250 locale = "si";
251251 arch = "linux-x86_64";
252− sha256 = "3ef89e462359d09d95216a132c462f0529948073a4f0aef6358362d0457e747e";
252+ sha256 = "dcf59c0c1ea0acdcc894463b04c54339a72dcceb25fe5478608265eb3ead226a";
253253 }
254− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/sk/thunderbird-68.11.0.tar.bz2";
254+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/sk/thunderbird-68.12.0.tar.bz2";
255255 locale = "sk";
256256 arch = "linux-x86_64";
257− sha256 = "476641e4d45cd114dca94f59ddee15fda5fbd432c50e4f29af09eb3298782854";
257+ sha256 = "2a06329fd4a9dd6333e2d73a44fca7eaf593032e8ace33736a03dbfffb2920a0";
258258 }
259− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/sl/thunderbird-68.11.0.tar.bz2";
259+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/sl/thunderbird-68.12.0.tar.bz2";
260260 locale = "sl";
261261 arch = "linux-x86_64";
262− sha256 = "5e85ff37554f47f585a155db65ae9e782c8604fa44db8d0dc9c3e2741704909d";
262+ sha256 = "f7bd3e3a407dbab07836342ff29fc143fe3904e7f878ea719522ade3fc4f6b84";
263263 }
264− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/sq/thunderbird-68.11.0.tar.bz2";
264+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/sq/thunderbird-68.12.0.tar.bz2";
265265 locale = "sq";
266266 arch = "linux-x86_64";
267− sha256 = "fc4f839973d6986979089c1dcc1e9b219007c34ecd2d587538db706e4b01eccd";
267+ sha256 = "0edc58751a6794494efab8b0a2ce852374a747ccb73b38455475f0099ea0f238";
268268 }
269− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/sr/thunderbird-68.11.0.tar.bz2";
269+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/sr/thunderbird-68.12.0.tar.bz2";
270270 locale = "sr";
271271 arch = "linux-x86_64";
272− sha256 = "85a32f352d2b535366dd10a49116e65de4c8ec87886b37e34ac55082c4c310fd";
272+ sha256 = "91ac5cc0646c062b00b3b064af53ba03c7e034b75afa13dca7586eb80578d377";
273273 }
274− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/sv-SE/thunderbird-68.11.0.tar.bz2";
274+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/sv-SE/thunderbird-68.12.0.tar.bz2";
275275 locale = "sv-SE";
276276 arch = "linux-x86_64";
277− sha256 = "19af3a847c9e28baed2db8f6b025dcfb0e688932b0483bae461c86861bfa67ea";
277+ sha256 = "5aa21e4b78f4294835197f784a651f17453d83fce98e7140e49c6da117464fd9";
278278 }
279− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/tr/thunderbird-68.11.0.tar.bz2";
279+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/tr/thunderbird-68.12.0.tar.bz2";
280280 locale = "tr";
281281 arch = "linux-x86_64";
282− sha256 = "deea2513814df3e7a9004316dc50f6fa2bac46e0d9456cf124e33e6e03a9b4c8";
282+ sha256 = "3ab2639dd126e3ed9b031fc10f4396c7d98ffa7b7ffca6a9b3f2f47590e3b83c";
283283 }
284− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/uk/thunderbird-68.11.0.tar.bz2";
284+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/uk/thunderbird-68.12.0.tar.bz2";
285285 locale = "uk";
286286 arch = "linux-x86_64";
287− sha256 = "22b34b43ccc74eb2dc565a0c63bde89ff0d22f710bd26868341be91f51489f94";
287+ sha256 = "59be2ddc7c65405e0b3854c2a551dab73df9736842ee362b2a20dc9088242a96";
288288 }
289− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/uz/thunderbird-68.11.0.tar.bz2";
289+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/uz/thunderbird-68.12.0.tar.bz2";
290290 locale = "uz";
291291 arch = "linux-x86_64";
292− sha256 = "26bb8336c617dc6fe485339b3c8da814f7aa0b46eb0a821db36309305ea87e58";
292+ sha256 = "ae196683b283525511fbd2e3ad428339672f2f1339566a323e01f6f649d333c1";
293293 }
294− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/vi/thunderbird-68.11.0.tar.bz2";
294+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/vi/thunderbird-68.12.0.tar.bz2";
295295 locale = "vi";
296296 arch = "linux-x86_64";
297− sha256 = "88705691ae084991c198865f1e93d1ed127496245313cb8f28dafac0a64793a5";
297+ sha256 = "9d66b8e4eefbb6b8c0d9893b056fc684310ae583921d626cb676cd8a7b4b39de";
298298 }
299− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/zh-CN/thunderbird-68.11.0.tar.bz2";
299+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/zh-CN/thunderbird-68.12.0.tar.bz2";
300300 locale = "zh-CN";
301301 arch = "linux-x86_64";
302− sha256 = "5ebf1ad54acb6d6d17985d80bff9a0b39726d1f62eea30ad9ca0f04577f640a1";
302+ sha256 = "2839f2f076a8a6e283a3ffdd6100986a11d19b9108fce074f8e7f127cb0f375e";
303303 }
304− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/zh-TW/thunderbird-68.11.0.tar.bz2";
304+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/zh-TW/thunderbird-68.12.0.tar.bz2";
305305 locale = "zh-TW";
306306 arch = "linux-x86_64";
307− sha256 = "b795b0127cf922f65a2ad2d8f17ebe64089c6d06fe7a701c289b7af5afe7c371";
307+ sha256 = "02ef645a7de8abc1c5dd92eb685d64570cf1db971cfe7e248111d6a17b3ddcd9";
308308 }
309− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/ar/thunderbird-68.11.0.tar.bz2";
309+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/ar/thunderbird-68.12.0.tar.bz2";
310310 locale = "ar";
311311 arch = "linux-i686";
312− sha256 = "d19d082b55d76862977b9357e9cf245697c24d207a6d6b3aacd81abf1443747b";
312+ sha256 = "5c4d899245a38626fa18d849bcf01d50125dee60d715d76224ca0bb4623f73be";
313313 }
314− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/ast/thunderbird-68.11.0.tar.bz2";
314+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/ast/thunderbird-68.12.0.tar.bz2";
315315 locale = "ast";
316316 arch = "linux-i686";
317− sha256 = "6cd6c484888fe96fb08eab2b6b2a4dc8495823efee6a373536c26e9679fc664e";
317+ sha256 = "f657bdc5b43b75e43578251abccf5c7b9e6d0848fd55c6105060daba33c36721";
318318 }
319− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/be/thunderbird-68.11.0.tar.bz2";
319+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/be/thunderbird-68.12.0.tar.bz2";
320320 locale = "be";
321321 arch = "linux-i686";
322− sha256 = "bdd2ac4571d6444ff9a3ffd72c1b55cf5f564c740b5ceafce7a2e2268f482dda";
322+ sha256 = "669a2cbfe600727b9d9a8ed5046272a1f19b80b6af9a6a6977ce1b89f60fa36e";
323323 }
324− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/bg/thunderbird-68.11.0.tar.bz2";
324+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/bg/thunderbird-68.12.0.tar.bz2";
325325 locale = "bg";
326326 arch = "linux-i686";
327− sha256 = "3354c7e4b505e99a53a10cdbeac5b6425b13182def27a82c839eaee6ba6e2f86";
327+ sha256 = "e1b33857544c10c0191316f6e3d16b34957196b35a922c884315714fe851389b";
328328 }
329− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/br/thunderbird-68.11.0.tar.bz2";
329+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/br/thunderbird-68.12.0.tar.bz2";
330330 locale = "br";
331331 arch = "linux-i686";
332− sha256 = "27339c12c5cdabea7a9a057cad70fa02cf4f69860e71b604f81a60f891345268";
332+ sha256 = "b9e4a530529449446fe5a302277878c4d2192ef7bb48206f8528024087f520ea";
333333 }
334− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/ca/thunderbird-68.11.0.tar.bz2";
334+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/ca/thunderbird-68.12.0.tar.bz2";
335335 locale = "ca";
336336 arch = "linux-i686";
337− sha256 = "b65b6d20d7251795e0a9f0ce88f8133d7742c6361375e4897a0bb2e043dd8c97";
337+ sha256 = "aa5e4ae20fa9e5dbb8c0ba275ba18d1ba94900094ba3186aac40ffb27396a96f";
338338 }
339− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/cak/thunderbird-68.11.0.tar.bz2";
339+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/cak/thunderbird-68.12.0.tar.bz2";
340340 locale = "cak";
341341 arch = "linux-i686";
342− sha256 = "173a85565dfb7b9d44b5757245f8b5f8a62fd15a8a15bfee0680a96ef8f84625";
342+ sha256 = "a812c9150feec48e2ebfb1786f5e30ade33203160fa4102382435641caeaf3b8";
343343 }
344− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/cs/thunderbird-68.11.0.tar.bz2";
344+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/cs/thunderbird-68.12.0.tar.bz2";
345345 locale = "cs";
346346 arch = "linux-i686";
347− sha256 = "9cb5def4eca0bb103516a66f90baf91f7b4e962d5ed59b4f09ae9f19e7f95b47";
347+ sha256 = "75813ad7dd0ae5c073964296dd687e5c1289178491adc98d40e853ed812bdca9";
348348 }
349− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/cy/thunderbird-68.11.0.tar.bz2";
349+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/cy/thunderbird-68.12.0.tar.bz2";
350350 locale = "cy";
351351 arch = "linux-i686";
352− sha256 = "8b51e01daf38091d3b1b32a249f3c6fb220ad8075bbfd16914cb72b24435d8bb";
352+ sha256 = "b3894f05cf905aa96612860dcef0bdb4bb9564901ef84172e11856a9fa9e0ca4";
353353 }
354− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/da/thunderbird-68.11.0.tar.bz2";
354+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/da/thunderbird-68.12.0.tar.bz2";
355355 locale = "da";
356356 arch = "linux-i686";
357− sha256 = "1269600ab71c691563482c6d5787a7670fdceeda3a07c61d7cf2477aa16fe075";
357+ sha256 = "a4f21bd2017043872a962167f98db358b824ae1821fcf03e2df1bef7783e07c0";
358358 }
359− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/de/thunderbird-68.11.0.tar.bz2";
359+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/de/thunderbird-68.12.0.tar.bz2";
360360 locale = "de";
361361 arch = "linux-i686";
362− sha256 = "46c5fcae1b11b7e31fff2e70397a560c502bb3360ed646dd09945fcee81efad7";
362+ sha256 = "3a079685f75d2ec0320ec9e366b4e037954d67fa3f9e3bda055b8cd7de8fbdd0";
363363 }
364− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/dsb/thunderbird-68.11.0.tar.bz2";
364+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/dsb/thunderbird-68.12.0.tar.bz2";
365365 locale = "dsb";
366366 arch = "linux-i686";
367− sha256 = "4dc661243d99edb84d0bafd45300bf18d86d5289ede3db066ff89cc4094afed1";
367+ sha256 = "295a0f56429b3638dd0dcbf8d97a6376636b67e22d493ce8dfaceeb579466d18";
368368 }
369− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/el/thunderbird-68.11.0.tar.bz2";
369+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/el/thunderbird-68.12.0.tar.bz2";
370370 locale = "el";
371371 arch = "linux-i686";
372− sha256 = "efd5f7f46d53bf34146a6f39149abb2aed9c47b735339cf767e32e6387ba50bb";
372+ sha256 = "86e4b98ede80cc07cc1aec043af82068a73b7c76820f70df8314e3b91c108d18";
373373 }
374− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/en-GB/thunderbird-68.11.0.tar.bz2";
374+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/en-GB/thunderbird-68.12.0.tar.bz2";
375375 locale = "en-GB";
376376 arch = "linux-i686";
377− sha256 = "ce97a84ba103a7e5bedba43ee47a5c603c1b5d9bf3bc1a8cab4c26ec9ace21c7";
377+ sha256 = "2cb03a17f88e3826181911ec6a7455528d1e4c051b065252c964c6c0794175e4";
378378 }
379− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/en-US/thunderbird-68.11.0.tar.bz2";
379+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/en-US/thunderbird-68.12.0.tar.bz2";
380380 locale = "en-US";
381381 arch = "linux-i686";
382− sha256 = "632f078407322995eef93db134f1da753a1b35696a668a5b8be29f908a34c223";
382+ sha256 = "11fe953ede0d99656534ac676f118e939024744c5301d378acbeac6792e668e5";
383383 }
384− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/es-AR/thunderbird-68.11.0.tar.bz2";
384+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/es-AR/thunderbird-68.12.0.tar.bz2";
385385 locale = "es-AR";
386386 arch = "linux-i686";
387− sha256 = "88b67f07b6069adcb82c04f818493e25bd145b5d874a7503453e88ea14200499";
387+ sha256 = "596264396a25adb873320222697e7f1a58aaab484de9c0d2e85f99962b6d893d";
388388 }
389− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/es-ES/thunderbird-68.11.0.tar.bz2";
389+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/es-ES/thunderbird-68.12.0.tar.bz2";
390390 locale = "es-ES";
391391 arch = "linux-i686";
392− sha256 = "a52a6917d77364e5f7ed06f4484abf7e607c53445ff338e65af6b9bad4626e0d";
392+ sha256 = "a9512af30e2b1613a6bd1ae6f4ce785f676b2cf70b80a37d85a5e1566bb2b35f";
393393 }
394− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/et/thunderbird-68.11.0.tar.bz2";
394+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/et/thunderbird-68.12.0.tar.bz2";
395395 locale = "et";
396396 arch = "linux-i686";
397− sha256 = "a0c15f0000a00984760419e6f737840b4637bf5aa014ee88093aa2a7a3258807";
397+ sha256 = "b7dcb196881a23e979edb5ae247a7c07b1cf1250cb4c159ce523d1a26be188c2";
398398 }
399− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/eu/thunderbird-68.11.0.tar.bz2";
399+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/eu/thunderbird-68.12.0.tar.bz2";
400400 locale = "eu";
401401 arch = "linux-i686";
402− sha256 = "d69e9af1a381743acc9ee1f800999b015129cba4fc112f312a04884c121535b0";
402+ sha256 = "4066164b4c9242a9885bc2de802c4f5b6b594c928db36ac72c94faabaad86679";
403403 }
404− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/fi/thunderbird-68.11.0.tar.bz2";
404+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/fi/thunderbird-68.12.0.tar.bz2";
405405 locale = "fi";
406406 arch = "linux-i686";
407− sha256 = "876673de48a047d75e0ac766dca338629069af1872308a7bc6a7e068da026d3a";
407+ sha256 = "a7c635cbbbc10725b28052ccc61603fb60b91e06bbf1f240561bdb8f941af55a";
408408 }
409− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/fr/thunderbird-68.11.0.tar.bz2";
409+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/fr/thunderbird-68.12.0.tar.bz2";
410410 locale = "fr";
411411 arch = "linux-i686";
412− sha256 = "d83d87dca716d4cd3850df1c5923e88f15e35354abc874202c8c12bf8d1a006f";
412+ sha256 = "7dba28adb1287e1aa9ae85840fc3aca42aaedd4b2c2aa6cc68d5f793549d19b7";
413413 }
414− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/fy-NL/thunderbird-68.11.0.tar.bz2";
414+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/fy-NL/thunderbird-68.12.0.tar.bz2";
415415 locale = "fy-NL";
416416 arch = "linux-i686";
417− sha256 = "0cce3392aaace190f9ea0247d89699f73d534762278f4776146a1f75bbc09996";
417+ sha256 = "bd763e264eb684ec3b0b1f2c68ce295d1df86994d15f5c66c487e4742bfef86e";
418418 }
419− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/ga-IE/thunderbird-68.11.0.tar.bz2";
419+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/ga-IE/thunderbird-68.12.0.tar.bz2";
420420 locale = "ga-IE";
421421 arch = "linux-i686";
422− sha256 = "83b7e660e8098718bd4b205ad2de53522bd94e7a602afb960b6381fe4c11a395";
422+ sha256 = "52f9b5694efbdd8ecc76aef58695423c6a4b547b5b0cfedca313386b7500685e";
423423 }
424− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/gd/thunderbird-68.11.0.tar.bz2";
424+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/gd/thunderbird-68.12.0.tar.bz2";
425425 locale = "gd";
426426 arch = "linux-i686";
427− sha256 = "447a887ef76e57b9c12a0991d7eaf903ce29d7621d4f9143edd18b56bdab81d3";
427+ sha256 = "6c9c1b0f11ad13e0780371d54fedb52d2463713db3bc52adb72c8ea9ff80eb8f";
428428 }
429− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/gl/thunderbird-68.11.0.tar.bz2";
429+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/gl/thunderbird-68.12.0.tar.bz2";
430430 locale = "gl";
431431 arch = "linux-i686";
432− sha256 = "288b865596e2b8b1087cbca98bd9c55f9aff1f1cb8d432953d20854b0b1e9ab8";
432+ sha256 = "608bf5c0d6148cc3014758829ba06135222b462242456ca0984e7dc12654c2cd";
433433 }
434− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/he/thunderbird-68.11.0.tar.bz2";
434+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/he/thunderbird-68.12.0.tar.bz2";
435435 locale = "he";
436436 arch = "linux-i686";
437− sha256 = "9d801a18324849e4a6faf3266c09eb5898c8122e89b020e35ea25a6b3899a4d2";
437+ sha256 = "f92d569a53f34bfdda4dac185834e5692526f13f20853d1943f165af33b54a37";
438438 }
439− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/hr/thunderbird-68.11.0.tar.bz2";
439+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/hr/thunderbird-68.12.0.tar.bz2";
440440 locale = "hr";
441441 arch = "linux-i686";
442− sha256 = "f20210372b36b43cdae8f7f1294927dfb364d1ca4db21ee8af1c059a06f3e45e";
442+ sha256 = "60d2f184219f8d17c2739ee3cc8463bed474142bd2caad74157b97db2306b27f";
443443 }
444− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/hsb/thunderbird-68.11.0.tar.bz2";
444+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/hsb/thunderbird-68.12.0.tar.bz2";
445445 locale = "hsb";
446446 arch = "linux-i686";
447− sha256 = "54daf67c97f2e7496fabe6bef2d1d9a60baccfee35d7331444d48fc6fe675c26";
447+ sha256 = "40ffece26101b2f6a7789511b026d99234bd34ec78e566e7e25065ae3201d693";
448448 }
449− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/hu/thunderbird-68.11.0.tar.bz2";
449+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/hu/thunderbird-68.12.0.tar.bz2";
450450 locale = "hu";
451451 arch = "linux-i686";
452− sha256 = "0791aa7bec49ff1bfe862f9114ed4b0013361f2f1fa0e4745ad49c8c0e0a9f84";
452+ sha256 = "e74da0bdb27fe3375dfbd1ab042892de3ded84f33a6f6d46e209fdcaa28183d0";
453453 }
454− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/hy-AM/thunderbird-68.11.0.tar.bz2";
454+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/hy-AM/thunderbird-68.12.0.tar.bz2";
455455 locale = "hy-AM";
456456 arch = "linux-i686";
457− sha256 = "e64bacff30d0b2b2a5038aa11d719c9ef3124d64b9923d52a9c5856f6584f9c2";
457+ sha256 = "fd93972c11842b56453449e72617deb3177d020c8f25cf4d5fb687f4a3ddb5c0";
458458 }
459− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/id/thunderbird-68.11.0.tar.bz2";
459+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/id/thunderbird-68.12.0.tar.bz2";
460460 locale = "id";
461461 arch = "linux-i686";
462− sha256 = "ba6108ba9b4f31f49e7c925a6051738276c67545f7f8d2b3cb378e8834dbd0ce";
462+ sha256 = "546825968ad86e4c5c6effefd0f924cc1d10489fff7968f17401e3f84c4d1ab0";
463463 }
464− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/is/thunderbird-68.11.0.tar.bz2";
464+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/is/thunderbird-68.12.0.tar.bz2";
465465 locale = "is";
466466 arch = "linux-i686";
467− sha256 = "a3eac36b640a61f2fc6bd62350bd8aaf020636035547c2b9d687df2bd2d7174b";
467+ sha256 = "1f2e2228c685be2d65d6e0b92eef8ff3e58d7b772f846d0707a9b02e6d0ad306";
468468 }
469− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/it/thunderbird-68.11.0.tar.bz2";
469+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/it/thunderbird-68.12.0.tar.bz2";
470470 locale = "it";
471471 arch = "linux-i686";
472− sha256 = "bf3cc19a7d1c1415cad867b72c5765dfced27511616a8cbd230516adf8d3f20a";
472+ sha256 = "41b27c8195432e1412e3c4645b823b8dd1f673eabf07ddc72f3d792d3f7488da";
473473 }
474− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/ja/thunderbird-68.11.0.tar.bz2";
474+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/ja/thunderbird-68.12.0.tar.bz2";
475475 locale = "ja";
476476 arch = "linux-i686";
477− sha256 = "d4788294f5e91c033c3c3251cfb614e50843631252a2b1fcc6389d099b1fee1e";
477+ sha256 = "68940d44d933bb7228d6f9a03406ca01903c54fdf57eb5a1e1033b12ef507df6";
478478 }
479− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/ka/thunderbird-68.11.0.tar.bz2";
479+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/ka/thunderbird-68.12.0.tar.bz2";
480480 locale = "ka";
481481 arch = "linux-i686";
482− sha256 = "8735be035cf0ab5d4b2102aab8b207c1cc686da8843b45f15c1be91931850968";
482+ sha256 = "ce0aff0fd47b00803ea66278b3514dcf65ecb5547878f8081f7ec6c1f411ce10";
483483 }
484− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/kab/thunderbird-68.11.0.tar.bz2";
484+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/kab/thunderbird-68.12.0.tar.bz2";
485485 locale = "kab";
486486 arch = "linux-i686";
487− sha256 = "a570fd29e5eacdc08ed484bce7336f90ae74744e80d8f2ac0f05395cb3363e51";
487+ sha256 = "3936b56eaa1e05a96626f7d10c8fcc3ba9014b1385b21243c049b133b923ddef";
488488 }
489− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/kk/thunderbird-68.11.0.tar.bz2";
489+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/kk/thunderbird-68.12.0.tar.bz2";
490490 locale = "kk";
491491 arch = "linux-i686";
492− sha256 = "186b7457a96a64da0564c1b411bb04598de1067362a6238f7327abe780cc6aa3";
492+ sha256 = "7fa0aa64d0f0dcc6f71d6a21647cc4fccef935b783deb5d19b88f5b96b4b4ec4";
493493 }
494− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/ko/thunderbird-68.11.0.tar.bz2";
494+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/ko/thunderbird-68.12.0.tar.bz2";
495495 locale = "ko";
496496 arch = "linux-i686";
497− sha256 = "3c9513362c6b7a64bf6e74bbfad6ef586b0085baeb9a8ad8eb2fbc73461e9f67";
497+ sha256 = "4bddd0ccb747bb12cdc6d88c2c9544354293000c586454bb5932f4d81afbf400";
498498 }
499− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/lt/thunderbird-68.11.0.tar.bz2";
499+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/lt/thunderbird-68.12.0.tar.bz2";
500500 locale = "lt";
501501 arch = "linux-i686";
502− sha256 = "e90df1606ec0e875fa02f7bf5a52b14d84f758bdc18ab0f395703c0129a18e57";
502+ sha256 = "f1a3514188c1b887afd2c662a1b6abf6fe37b558864be0cc79e87ed147188461";
503503 }
504− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/ms/thunderbird-68.11.0.tar.bz2";
504+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/ms/thunderbird-68.12.0.tar.bz2";
505505 locale = "ms";
506506 arch = "linux-i686";
507− sha256 = "ea686adcfb5cf4b1642e7dcb21053090ffb57d344b27269d807cebcf8469934c";
507+ sha256 = "7ea045d6db78ec7d6ebf164c8e3d28c2540a573238de518e934646573aec71dc";
508508 }
509− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/nb-NO/thunderbird-68.11.0.tar.bz2";
509+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/nb-NO/thunderbird-68.12.0.tar.bz2";
510510 locale = "nb-NO";
511511 arch = "linux-i686";
512− sha256 = "6f827fee307917b590b99b5c85b16337865f027059f52bc9ab12da33f80448b9";
512+ sha256 = "d2c0e2099ea60b9da95ebd9bd79a5d0a6a1ebc84b8b490511a68c81355f97761";
513513 }
514− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/nl/thunderbird-68.11.0.tar.bz2";
514+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/nl/thunderbird-68.12.0.tar.bz2";
515515 locale = "nl";
516516 arch = "linux-i686";
517− sha256 = "b88843831b982d1317e8bf64df99a8c7a1fa9f67461aa966b2737f12715c9cf3";
517+ sha256 = "48741be79422d80140ec862d004fa75a407f67490f67a3e440c01e0defe1f85f";
518518 }
519− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/nn-NO/thunderbird-68.11.0.tar.bz2";
519+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/nn-NO/thunderbird-68.12.0.tar.bz2";
520520 locale = "nn-NO";
521521 arch = "linux-i686";
522− sha256 = "ab8383a432f55944d417108b59d891953f2d322ec81d09e971ec63d1883d4b46";
522+ sha256 = "b40f0d7112cadab322c8b71cacce5d6df87fb80f40cc55ca22c279016c3ea805";
523523 }
524− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/pl/thunderbird-68.11.0.tar.bz2";
524+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/pl/thunderbird-68.12.0.tar.bz2";
525525 locale = "pl";
526526 arch = "linux-i686";
527− sha256 = "0f8c0feb68b090598a3db9295d4b4e09d9ffdedb69a73914228d7ef76b768414";
527+ sha256 = "e64b10526cb460f437427cc4a7ea90959cc693a75fd6a61b43e9d3fd76ded618";
528528 }
529− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/pt-BR/thunderbird-68.11.0.tar.bz2";
529+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/pt-BR/thunderbird-68.12.0.tar.bz2";
530530 locale = "pt-BR";
531531 arch = "linux-i686";
532− sha256 = "ca78fad9dce15534754571b14d82ede798b123210599ade352016420faf0db5a";
532+ sha256 = "bdb558f9430c06871954ec6c7d54267625184a0cba914a87ad199e8f32b03de2";
533533 }
534− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/pt-PT/thunderbird-68.11.0.tar.bz2";
534+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/pt-PT/thunderbird-68.12.0.tar.bz2";
535535 locale = "pt-PT";
536536 arch = "linux-i686";
537− sha256 = "cf79430e02259d9117feeaebb5fe02139c3e3d95013e48fe290550814200cf6e";
537+ sha256 = "4631e8247446653e91f239fdb5ad3c8531f3d007dbdc83818178a4cdc525edf4";
538538 }
539− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/rm/thunderbird-68.11.0.tar.bz2";
539+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/rm/thunderbird-68.12.0.tar.bz2";
540540 locale = "rm";
541541 arch = "linux-i686";
542− sha256 = "cc7d9614130f24969356b3496f4d322a9f73cafa5c7b60302ca8f2e2efe1f6ec";
542+ sha256 = "13e6aca7139fd89e83e7ae9b71253731f0954b0a83cc3560ecc00500b9bc1df7";
543543 }
544− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/ro/thunderbird-68.11.0.tar.bz2";
544+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/ro/thunderbird-68.12.0.tar.bz2";
545545 locale = "ro";
546546 arch = "linux-i686";
547− sha256 = "a8fcc2c6e0755fe701a56c2fa3bbf2d288d6351179ee74b8aa3da3180f14cdd1";
547+ sha256 = "023a567c42dad9bdbd465c8b99f12cf5f667ef4691e16971e09496c4a7db0f12";
548548 }
549− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/ru/thunderbird-68.11.0.tar.bz2";
549+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/ru/thunderbird-68.12.0.tar.bz2";
550550 locale = "ru";
551551 arch = "linux-i686";
552− sha256 = "b9f68985e70f8aa47c36cd4a4fc0fb41918d43f089cc760ace8ec879e2561770";
552+ sha256 = "9ec35bbce5f026a4262a5d708b53a767f47ac8e90314513d36a587d1a49dbb6b";
553553 }
554− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/si/thunderbird-68.11.0.tar.bz2";
554+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/si/thunderbird-68.12.0.tar.bz2";
555555 locale = "si";
556556 arch = "linux-i686";
557− sha256 = "a2563b3c9d0ecb567c366aa41cb6a10bde8d09b8c1065cd3934c8c221afee056";
557+ sha256 = "c540b94a45deeddf1f7f5a8cca8de7e944ee8ad9f8595a308836c159901ec0b6";
558558 }
559− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/sk/thunderbird-68.11.0.tar.bz2";
559+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/sk/thunderbird-68.12.0.tar.bz2";
560560 locale = "sk";
561561 arch = "linux-i686";
562− sha256 = "566906f011283fd27abf55e1e9a1bf7504e4028f7c4a631716ba590c07fe9d91";
562+ sha256 = "5296241664023773d2c0c4fa55e74eb6470482389c834d1934c252f79e79ebff";
563563 }
564− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/sl/thunderbird-68.11.0.tar.bz2";
564+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/sl/thunderbird-68.12.0.tar.bz2";
565565 locale = "sl";
566566 arch = "linux-i686";
567− sha256 = "8b74b751b3ee706be9aeb06726ffd3a989a57a1dc9794112262fa2aac45498ad";
567+ sha256 = "cd0376137d8018875873332fdfae3bc3c0d6b2a2b881dfa970d7d7999e8b312b";
568568 }
569− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/sq/thunderbird-68.11.0.tar.bz2";
569+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/sq/thunderbird-68.12.0.tar.bz2";
570570 locale = "sq";
571571 arch = "linux-i686";
572− sha256 = "9f7bcc51d4bb3f7c8d6ae49c61b88c17a7a59f6de8d2f62e0ee3fb3a68d30791";
572+ sha256 = "6fbf47759ca8c4d7cf30ca3af8a3fd35a01b7738422d29448cfd9eed81eba49b";
573573 }
574− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/sr/thunderbird-68.11.0.tar.bz2";
574+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/sr/thunderbird-68.12.0.tar.bz2";
575575 locale = "sr";
576576 arch = "linux-i686";
577− sha256 = "809c22c379c0c9943acb23de8b7023843ad6ecfedb9cf89006d6889ac1214203";
577+ sha256 = "636708320247c7c45622fd9179d5689da97472a9308f11810623129cf5a0e8d7";
578578 }
579− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/sv-SE/thunderbird-68.11.0.tar.bz2";
579+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/sv-SE/thunderbird-68.12.0.tar.bz2";
580580 locale = "sv-SE";
581581 arch = "linux-i686";
582− sha256 = "9381345ab9229f4b8465c183c936c17ab73680fa6aca27535daff9a2f9a133a3";
582+ sha256 = "9550c173b047e3ff774f4c3faf2c1f125b3abc34e6feb5801c108fda94e54e4e";
583583 }
584− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/tr/thunderbird-68.11.0.tar.bz2";
584+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/tr/thunderbird-68.12.0.tar.bz2";
585585 locale = "tr";
586586 arch = "linux-i686";
587− sha256 = "0f08bc1e65a8bccf8765cf26af5c09ebf6b77ff463af2f8f133dd2499c1d935c";
587+ sha256 = "ffe82a300c7fa7a0e826d11613f5187c003b009efa29f4755f17af0f88d9e73b";
588588 }
589− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/uk/thunderbird-68.11.0.tar.bz2";
589+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/uk/thunderbird-68.12.0.tar.bz2";
590590 locale = "uk";
591591 arch = "linux-i686";
592− sha256 = "37a1fee3bcf2fca901c542295d01a32545e814217985414419a270ad9576c14c";
592+ sha256 = "b018769149c0a4ff323b90b5d51465733629e7c527b39381ba9696cb077ad767";
593593 }
594− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/uz/thunderbird-68.11.0.tar.bz2";
594+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/uz/thunderbird-68.12.0.tar.bz2";
595595 locale = "uz";
596596 arch = "linux-i686";
597− sha256 = "50668670b10f3171b9033306d43c51ce24f1a48286c4156eff369530ae6d93d1";
597+ sha256 = "b0b59ac4d08c9f385f4ed7980065ce99ef24874734390a83af6e8fbd18173d99";
598598 }
599− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/vi/thunderbird-68.11.0.tar.bz2";
599+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/vi/thunderbird-68.12.0.tar.bz2";
600600 locale = "vi";
601601 arch = "linux-i686";
602− sha256 = "3588d2ed7c67459f5c091a1881821eaba72c9f3307624f7890549fcd1da120f6";
602+ sha256 = "901b40a99d84e7c7360fd5be6a14aa04ef6cc04fe1275cac26824b310bbd26e0";
603603 }
604− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/zh-CN/thunderbird-68.11.0.tar.bz2";
604+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/zh-CN/thunderbird-68.12.0.tar.bz2";
605605 locale = "zh-CN";
606606 arch = "linux-i686";
607− sha256 = "d8f2976535ef60e62c94338fd049365234a7b2a8658b32df231d1faa22529c0e";
607+ sha256 = "509478710f7c4fb404eec9fed0b6d22f4c5d76fee09ed833dffcefdacc53d55c";
608608 }
609− { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/zh-TW/thunderbird-68.11.0.tar.bz2";
609+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/zh-TW/thunderbird-68.12.0.tar.bz2";
610610 locale = "zh-TW";
611611 arch = "linux-i686";
612− sha256 = "aca4a8410429bde9926f6ce6a183439750f490fd68dda229531b2e16bb7068ef";
612+ sha256 = "a12dd777cc3eaf629cc7a6f4b8d4744cf63c3e778e559d9b3ce332414e509515";
613613 }
614614 ];
615615}
pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix+265−265
@@ -1,665 +1,665 @@
11{
2− version = "78.1.1";
2+ version = "78.2.1";
33 sources = [
4− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/af/thunderbird-78.1.1.tar.bz2";
4+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/af/thunderbird-78.2.1.tar.bz2";
55 locale = "af";
66 arch = "linux-x86_64";
7− sha256 = "540aa91a70379c4d6975820649abbe3063515bae031229f01ed7e794cf87395d";
7+ sha256 = "de73b113e488e76caca47b90abb4fa3f1c4d6ce04885d036f2e6aed81fe34038";
88 }
9− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/ar/thunderbird-78.1.1.tar.bz2";
9+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/ar/thunderbird-78.2.1.tar.bz2";
1010 locale = "ar";
1111 arch = "linux-x86_64";
12− sha256 = "18d1b4f33895b5c4b17199ca8412f8060f40660c7e45e024d0dda486ad290044";
12+ sha256 = "d6eeb95b1bd8e53663bd48570a0c2a03f570f906ca715ddf1d9f2cb8de37f3b7";
1313 }
14− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/ast/thunderbird-78.1.1.tar.bz2";
14+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/ast/thunderbird-78.2.1.tar.bz2";
1515 locale = "ast";
1616 arch = "linux-x86_64";
17− sha256 = "dd87c494ef5f142517aeec3d8890bc553664b323f2cadb46bca597101b275c91";
17+ sha256 = "f244c41515a2382d15697a47b88781120c649e319d86a1c6350fd20cade25809";
1818 }
19− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/be/thunderbird-78.1.1.tar.bz2";
19+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/be/thunderbird-78.2.1.tar.bz2";
2020 locale = "be";
2121 arch = "linux-x86_64";
22− sha256 = "90e0d5354f41244e2ebaeeeb65959d64fcef52f914a15af7b9808125e6e25639";
22+ sha256 = "188c8850324bbc04535d4a1dfe1ef1f2e52de8cc2e1df7432623f6afcf8dbf1f";
2323 }
24− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/bg/thunderbird-78.1.1.tar.bz2";
24+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/bg/thunderbird-78.2.1.tar.bz2";
2525 locale = "bg";
2626 arch = "linux-x86_64";
27− sha256 = "4e8f53fc2e1c3b8dddec3d62bfa104a458943c1b0794fcca3a1658b812359b97";
27+ sha256 = "3e7ab29fc795b577aa3bd2ac3df872c31a7ed22960e987d9bca6f348becb69a3";
2828 }
29− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/br/thunderbird-78.1.1.tar.bz2";
29+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/br/thunderbird-78.2.1.tar.bz2";
3030 locale = "br";
3131 arch = "linux-x86_64";
32− sha256 = "068c48e37b4d921cb33e2df27b32a8e9abfc29698c30779b1771f2ab61697f27";
32+ sha256 = "c1138c59275149aaa6071cf128e7b480b7f74fa0d8f237552a5c54ce1ae573e0";
3333 }
34− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/ca/thunderbird-78.1.1.tar.bz2";
34+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/ca/thunderbird-78.2.1.tar.bz2";
3535 locale = "ca";
3636 arch = "linux-x86_64";
37− sha256 = "1f09e12e53d7bc76551c47995b0fa5ff649db94013a66e4ee445e6901352ead6";
37+ sha256 = "4d18b0b11710ab3427bf917ebe17cdf5e98508f517cf5cc4c97822d42a019dd1";
3838 }
39− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/cak/thunderbird-78.1.1.tar.bz2";
39+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/cak/thunderbird-78.2.1.tar.bz2";
4040 locale = "cak";
4141 arch = "linux-x86_64";
42− sha256 = "e917249cbc16e1ccaf630a5335577e76d971f422fb7c7d9b7c7f05805de18d78";
42+ sha256 = "5231c3b6c9b57ab528905184b740dd23de470f8bc4814a13000c8fc1fe4877cc";
4343 }
44− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/cs/thunderbird-78.1.1.tar.bz2";
44+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/cs/thunderbird-78.2.1.tar.bz2";
4545 locale = "cs";
4646 arch = "linux-x86_64";
47− sha256 = "89926439c396b64a701d688b2520eb1364e5f2a348a645651396e7f91a4b774a";
47+ sha256 = "04d1614000f1854b5d82e0d1740beb43ed9bef440b43f7bedce32cccec48fd59";
4848 }
49− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/cy/thunderbird-78.1.1.tar.bz2";
49+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/cy/thunderbird-78.2.1.tar.bz2";
5050 locale = "cy";
5151 arch = "linux-x86_64";
52− sha256 = "65a124a1840efdc33b0426a0a8ab8426423425326f7905844c74f7503c6e60f4";
52+ sha256 = "0ef895fdc1878b77650846d2ea4624a50d06838a3c51a91523019bb4d00a1322";
5353 }
54− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/da/thunderbird-78.1.1.tar.bz2";
54+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/da/thunderbird-78.2.1.tar.bz2";
5555 locale = "da";
5656 arch = "linux-x86_64";
57− sha256 = "a572014192e6ba98994f8693b062400b7909bdcede065dd363a3ab182cf40293";
57+ sha256 = "e909f7ba1890cebcac435c2cfaab7db1791785e6b5b1e8b205ee3b9962624c8d";
5858 }
59− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/de/thunderbird-78.1.1.tar.bz2";
59+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/de/thunderbird-78.2.1.tar.bz2";
6060 locale = "de";
6161 arch = "linux-x86_64";
62− sha256 = "a0eeef52d89bee326402354eb1de3f531c9c255d31840ed91e93110c9f170aaa";
62+ sha256 = "cce1e0acc3c61a66e5eaa065e81e01edb298b6dbf07a2376bf5a96ad2c1e784d";
6363 }
64− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/dsb/thunderbird-78.1.1.tar.bz2";
64+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/dsb/thunderbird-78.2.1.tar.bz2";
6565 locale = "dsb";
6666 arch = "linux-x86_64";
67− sha256 = "35d0295ebd60415457a7defa40c5bdee2dbf40b08dad387aef0557dc511ce489";
67+ sha256 = "a5acad173a15e77e21057e7450d997387f88a608dd602df7509fa13743758445";
6868 }
69− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/el/thunderbird-78.1.1.tar.bz2";
69+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/el/thunderbird-78.2.1.tar.bz2";
7070 locale = "el";
7171 arch = "linux-x86_64";
72− sha256 = "135fe2424a1731e24c9602c40e0ae4f8fc551ed058fcd17516ce8f39a7d88bbe";
72+ sha256 = "7cb4dd233037415d9de96e0c292bd0a288ea62bc875b79a138aaf9639a8f8896";
7373 }
74− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/en-CA/thunderbird-78.1.1.tar.bz2";
74+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/en-CA/thunderbird-78.2.1.tar.bz2";
7575 locale = "en-CA";
7676 arch = "linux-x86_64";
77− sha256 = "b5741a82e8d59300c1f2046b4a4deaa2804d90ad8e8cda7cda9a39b7d6293b87";
77+ sha256 = "158547432a7f38ab87ac5334b891921ef54f199896fe459cf65c81344d900edc";
7878 }
79− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/en-GB/thunderbird-78.1.1.tar.bz2";
79+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/en-GB/thunderbird-78.2.1.tar.bz2";
8080 locale = "en-GB";
8181 arch = "linux-x86_64";
82− sha256 = "61b0e85a24f56b1b7ad03e9d8206313d50cfc6480627cd377a4a4b1bfdd9f13a";
82+ sha256 = "1f434d2aa74143eb8695fe54f031fdc7270b1dfe7365896b08f9a55c9dcc8197";
8383 }
84− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/en-US/thunderbird-78.1.1.tar.bz2";
84+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/en-US/thunderbird-78.2.1.tar.bz2";
8585 locale = "en-US";
8686 arch = "linux-x86_64";
87− sha256 = "9f0cc0edd2b23bc67824d3e8ed19b8c0a331e69a307b6d48c20e0e29e756e7e7";
87+ sha256 = "f5004ba1ac64911aec7dec3ec60a415500adfb0bfd566197f0f4fb139c71ff2a";
8888 }
89− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/es-AR/thunderbird-78.1.1.tar.bz2";
89+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/es-AR/thunderbird-78.2.1.tar.bz2";
9090 locale = "es-AR";
9191 arch = "linux-x86_64";
92− sha256 = "b0390addfb6133074aab52d1b6b73eccb9fae9031967fc94d57f95be30cce54d";
92+ sha256 = "49063e6e19b9c4ee1cd63826fda1c969d9739759a57ffabba5e2f93fc11de06a";
9393 }
94− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/es-ES/thunderbird-78.1.1.tar.bz2";
94+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/es-ES/thunderbird-78.2.1.tar.bz2";
9595 locale = "es-ES";
9696 arch = "linux-x86_64";
97− sha256 = "4d9f115bba5f9f32247465398e8ccd2f279776fadc3961f79b9fcc923c9cc363";
97+ sha256 = "216fe2514dc21190532b19af814b825d8a39c7dfe91a120848491f98c49f8ec4";
9898 }
99− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/et/thunderbird-78.1.1.tar.bz2";
99+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/et/thunderbird-78.2.1.tar.bz2";
100100 locale = "et";
101101 arch = "linux-x86_64";
102− sha256 = "6db8f8c69d8452e402724bf3fc6fb42242d2839307f6ad387f813a97286f4773";
102+ sha256 = "5a89262ffbdc536abf9d780d5d30ce7d0c626a4cf75bfe957689640f94323a34";
103103 }
104− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/eu/thunderbird-78.1.1.tar.bz2";
104+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/eu/thunderbird-78.2.1.tar.bz2";
105105 locale = "eu";
106106 arch = "linux-x86_64";
107− sha256 = "7c8165bc0a0feffd71431f3dd30ce99092a0816581363c2d317c6f40149234e1";
107+ sha256 = "f59c050361c617e4b2ca92f8e7081a135e976bb99ea4b650b80064aedef2c698";
108108 }
109− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/fa/thunderbird-78.1.1.tar.bz2";
109+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/fa/thunderbird-78.2.1.tar.bz2";
110110 locale = "fa";
111111 arch = "linux-x86_64";
112− sha256 = "9537892fa5e9ba5b3f79b96fafef1e8e37c4813f0515f965ce05b410bc7c9448";
112+ sha256 = "b9764595b4cb08584ccce801c08fa19dbbced21c3f89045800d83d531b0c825a";
113113 }
114− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/fi/thunderbird-78.1.1.tar.bz2";
114+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/fi/thunderbird-78.2.1.tar.bz2";
115115 locale = "fi";
116116 arch = "linux-x86_64";
117− sha256 = "31ca37c4d0f13d1a30b2d7541fa9fbe80add66c6d787bbec069cb904d1157e18";
117+ sha256 = "98169b3018a61ae6c2303300c1942c7d1d14a5318147a08a883b5a7b7042eba6";
118118 }
119− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/fr/thunderbird-78.1.1.tar.bz2";
119+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/fr/thunderbird-78.2.1.tar.bz2";
120120 locale = "fr";
121121 arch = "linux-x86_64";
122− sha256 = "c7507fd9096e9c47632be197054be68631c9d1812b7242b4de06774dbc9c3b1b";
122+ sha256 = "49563e87d9543c52d33b7168c78adaab0483f14ceef22759541e927c13620657";
123123 }
124− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/fy-NL/thunderbird-78.1.1.tar.bz2";
124+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/fy-NL/thunderbird-78.2.1.tar.bz2";
125125 locale = "fy-NL";
126126 arch = "linux-x86_64";
127− sha256 = "0a3d9d62861eb11bf409ac20905e787fdb273dd1d74b754f10790ff7deb7160d";
127+ sha256 = "1f3444faf91c24f8608ec59a4f705b42c7520079e4ad6756e693e92cdc8b142d";
128128 }
129− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/ga-IE/thunderbird-78.1.1.tar.bz2";
129+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/ga-IE/thunderbird-78.2.1.tar.bz2";
130130 locale = "ga-IE";
131131 arch = "linux-x86_64";
132− sha256 = "4bd0b50313e9a85a83d5b5a032710478feb2df52936bcdfd2621cf30a4d02efb";
132+ sha256 = "28b27f73016f0a4d53a6c47248c26458ca2bdceb46ae231f16086b8cabed5210";
133133 }
134− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/gd/thunderbird-78.1.1.tar.bz2";
134+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/gd/thunderbird-78.2.1.tar.bz2";
135135 locale = "gd";
136136 arch = "linux-x86_64";
137− sha256 = "a72ed3ea99e863f4a6150cfeeaa0052adf84f8f5ad52388b8bc30bf15d58a310";
137+ sha256 = "b81b247ebecd1727d27b64f96ba08b08cf59921e9b2e8ae732407b27e233c971";
138138 }
139− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/gl/thunderbird-78.1.1.tar.bz2";
139+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/gl/thunderbird-78.2.1.tar.bz2";
140140 locale = "gl";
141141 arch = "linux-x86_64";
142− sha256 = "5d9bae1205ac9490821b1b6d5b700a540bccbb21a3d41943d7f3ccb8576e2087";
142+ sha256 = "ea019d11fed7d87173b218d86fcee0dea7d4e20200bc73171fa8c1bc8f7288fe";
143143 }
144− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/he/thunderbird-78.1.1.tar.bz2";
144+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/he/thunderbird-78.2.1.tar.bz2";
145145 locale = "he";
146146 arch = "linux-x86_64";
147− sha256 = "7cd6417391db27934b6945edcdd9d14b46a69052af7bccd5a62fed588c77894a";
147+ sha256 = "6308a7e4e2cc35e48bbd67a1a7b8ab37112f47ab228c703a6db681ac7af79cb6";
148148 }
149− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/hr/thunderbird-78.1.1.tar.bz2";
149+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/hr/thunderbird-78.2.1.tar.bz2";
150150 locale = "hr";
151151 arch = "linux-x86_64";
152− sha256 = "b641cb7393e1e655adff946c82c43edf580e9fe3852b5c0cffe8f6d12759d190";
152+ sha256 = "3fb27f1e001817260981567fdb9949ad2f34818e9c919bd16fa0e939cf993cb4";
153153 }
154− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/hsb/thunderbird-78.1.1.tar.bz2";
154+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/hsb/thunderbird-78.2.1.tar.bz2";
155155 locale = "hsb";
156156 arch = "linux-x86_64";
157− sha256 = "39a27b797117eaed4e939e1c38ade2da13486f9050b5c4d87219cdd46abb67c4";
157+ sha256 = "2240e34fd713b39b410b584a8a6d06525f6abe0db2ee7b76b740a7252ec85e36";
158158 }
159− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/hu/thunderbird-78.1.1.tar.bz2";
159+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/hu/thunderbird-78.2.1.tar.bz2";
160160 locale = "hu";
161161 arch = "linux-x86_64";
162− sha256 = "5c9795de2316add4e482f9e074c861ef2e05411ea3792d6256d3c43359dc692f";
162+ sha256 = "f303a1f1219c7b23d71471a00174e6084cee3773af72e855faa63a5384b08aee";
163163 }
164− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/hy-AM/thunderbird-78.1.1.tar.bz2";
164+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/hy-AM/thunderbird-78.2.1.tar.bz2";
165165 locale = "hy-AM";
166166 arch = "linux-x86_64";
167− sha256 = "be1ba0a8fecf9a577cd63de519f92f48ddaf7c4b68fd629f94bb2ebff3cf16fb";
167+ sha256 = "3e74775e459ebdca2661e2e2f55307429dcc4d4a6623bbb8447946a75c94dd20";
168168 }
169− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/id/thunderbird-78.1.1.tar.bz2";
169+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/id/thunderbird-78.2.1.tar.bz2";
170170 locale = "id";
171171 arch = "linux-x86_64";
172− sha256 = "15eb3d6acda87645da2874cc92366fb50e821d7ec7885f87951366ddc66db2a0";
172+ sha256 = "0c9baf8cff28193f774e13c3a49cfd0ebcf27d8ef73ade151d2371ea69cbafac";
173173 }
174− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/is/thunderbird-78.1.1.tar.bz2";
174+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/is/thunderbird-78.2.1.tar.bz2";
175175 locale = "is";
176176 arch = "linux-x86_64";
177− sha256 = "06549f464526e931f23c0925b402eb3da6fbd9bd16595387604fe7edc62c4672";
177+ sha256 = "5c505948333d9259d87aa5f2b53f33ade1bbbfd29b9d5438c2688d34891e29bf";
178178 }
179− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/it/thunderbird-78.1.1.tar.bz2";
179+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/it/thunderbird-78.2.1.tar.bz2";
180180 locale = "it";
181181 arch = "linux-x86_64";
182− sha256 = "d81344b5dc0e131d1796f63de559a18b59dc70403a957eab737354ab05fd31c4";
182+ sha256 = "a99896e8ccf8d01099834ee502601cb9de993fd7101e426cb87c240a744f2f88";
183183 }
184− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/ja/thunderbird-78.1.1.tar.bz2";
184+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/ja/thunderbird-78.2.1.tar.bz2";
185185 locale = "ja";
186186 arch = "linux-x86_64";
187− sha256 = "48bd5534bfebd6c6f976ea4230ac7d364544c1467b2912f0db46fd23944d0908";
187+ sha256 = "83be10be5e946b785ac61e9a51c7054357c69af0a8e7bca524e27961dea4eef8";
188188 }
189− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/ka/thunderbird-78.1.1.tar.bz2";
189+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/ka/thunderbird-78.2.1.tar.bz2";
190190 locale = "ka";
191191 arch = "linux-x86_64";
192− sha256 = "8f581c4d9f6c2e8f79bf7be92bf06a69d0dfed017346e1c380a31f541c5155fa";
192+ sha256 = "585a1d805663225b1c154e27b54aa1aa5d8a1b96576c0f8ea36bde7844921474";
193193 }
194− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/kab/thunderbird-78.1.1.tar.bz2";
194+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/kab/thunderbird-78.2.1.tar.bz2";
195195 locale = "kab";
196196 arch = "linux-x86_64";
197− sha256 = "2cbcf1e64dcb914af8dfa0f8dab462d59d37992b3f4e22159e2edd340cb6e73a";
197+ sha256 = "85128be7e4c28a526d0a395e38e86e5e85dc6c154be6b16fb2df6675effe3d0d";
198198 }
199− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/kk/thunderbird-78.1.1.tar.bz2";
199+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/kk/thunderbird-78.2.1.tar.bz2";
200200 locale = "kk";
201201 arch = "linux-x86_64";
202− sha256 = "1fd067e9751c60dc6c6dcf1e5cfee3650758ae6593cb20fa5e6103cd01e6e6b7";
202+ sha256 = "09538c022bbcfcb2a77a7ab11b5569eb56b483817d199cfd0ede68ad556601d0";
203203 }
204− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/ko/thunderbird-78.1.1.tar.bz2";
204+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/ko/thunderbird-78.2.1.tar.bz2";
205205 locale = "ko";
206206 arch = "linux-x86_64";
207− sha256 = "efdd154ad42d1b8f257d0cf619afc4bdea44d7014882c82847cb5f21d7037469";
207+ sha256 = "3e6f472e69d40d46f388096e1d13bc6735860021fc655e3efd4e5b93b1a83240";
208208 }
209− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/lt/thunderbird-78.1.1.tar.bz2";
209+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/lt/thunderbird-78.2.1.tar.bz2";
210210 locale = "lt";
211211 arch = "linux-x86_64";
212− sha256 = "4256ec374ea5a22553469393e7fde51b46cd2ade5a620e9b0fc442e9d524494f";
212+ sha256 = "8b85c0874306afd3a39d8cf851d378f5f1bfce74129b16b02230c516001adc92";
213213 }
214− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/ms/thunderbird-78.1.1.tar.bz2";
214+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/ms/thunderbird-78.2.1.tar.bz2";
215215 locale = "ms";
216216 arch = "linux-x86_64";
217− sha256 = "40f6fc9fb01a83288a6952b7a6e625bd00659594f7fa21ee883c16501407b8be";
217+ sha256 = "b14e7baa06a2d4f98313a7f363b0d998f902164abad13a992878812cc5a0b6c3";
218218 }
219− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/nb-NO/thunderbird-78.1.1.tar.bz2";
219+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/nb-NO/thunderbird-78.2.1.tar.bz2";
220220 locale = "nb-NO";
221221 arch = "linux-x86_64";
222− sha256 = "b3f363ccbc5946c6e0e87ca4b75e12e4e4372688ae7a034c9cf37fd401794840";
222+ sha256 = "c3718581db153ad8b171b3c454e9d156e3d55ff0969217ac36435d13ac0c7c3a";
223223 }
224− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/nl/thunderbird-78.1.1.tar.bz2";
224+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/nl/thunderbird-78.2.1.tar.bz2";
225225 locale = "nl";
226226 arch = "linux-x86_64";
227− sha256 = "6963f3f09cf8a3370b06c894aa744c4ddbaa7c11df4e41f540a21427ec391135";
227+ sha256 = "802417acdc722e34c21936f840cd347ae86cf5ac8ad2ae05bd1e1ae078c4518c";
228228 }
229− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/nn-NO/thunderbird-78.1.1.tar.bz2";
229+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/nn-NO/thunderbird-78.2.1.tar.bz2";
230230 locale = "nn-NO";
231231 arch = "linux-x86_64";
232− sha256 = "da647b3c85db5ebbfbc530dd8d8fb1005928430775cd5c8a2999709614f4e35c";
232+ sha256 = "5034f1fe526cab8de8091d5f20851a678e742ed37fa80e8491f3891ed89c43a8";
233233 }
234− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/pa-IN/thunderbird-78.1.1.tar.bz2";
234+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/pa-IN/thunderbird-78.2.1.tar.bz2";
235235 locale = "pa-IN";
236236 arch = "linux-x86_64";
237− sha256 = "9df18348eedd3b43a13ac991b875fe12678929faa58712b09ee7364a8dedbd2e";
237+ sha256 = "01ae1e84d990433b7cbb12dc637deec37b32998803cb60f5834d386e080505f7";
238238 }
239− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/pl/thunderbird-78.1.1.tar.bz2";
239+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/pl/thunderbird-78.2.1.tar.bz2";
240240 locale = "pl";
241241 arch = "linux-x86_64";
242− sha256 = "7f60d5a0a819f6b69cd3f8444c12758f7cee17a681859c03cbea29ec27e1221e";
242+ sha256 = "84b877dba77c8be4400f4fc76128a85878781c4d8ff7845d265225211092674e";
243243 }
244− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/pt-BR/thunderbird-78.1.1.tar.bz2";
244+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/pt-BR/thunderbird-78.2.1.tar.bz2";
245245 locale = "pt-BR";
246246 arch = "linux-x86_64";
247− sha256 = "229073650b742b4566350ce82ea65f93f639a2b502bf706de4038c3c13ead354";
247+ sha256 = "4daabc0cad02b878d8e17af4402b6b52fdd7783f89192909a43bed09f8aae196";
248248 }
249− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/pt-PT/thunderbird-78.1.1.tar.bz2";
249+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/pt-PT/thunderbird-78.2.1.tar.bz2";
250250 locale = "pt-PT";
251251 arch = "linux-x86_64";
252− sha256 = "f8596511964a688747ce51cf0ca6bb6da65ea78b9b3ef70ced4f69fae8edbeb0";
252+ sha256 = "6ce92a7a1ea62398d22ee4e4fbdc383daa5d35d38c83cf1852953757563d17ba";
253253 }
254− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/rm/thunderbird-78.1.1.tar.bz2";
254+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/rm/thunderbird-78.2.1.tar.bz2";
255255 locale = "rm";
256256 arch = "linux-x86_64";
257− sha256 = "fb101dae4058f2cf804aacaf60c1354415cb0287432bb367a83e2ef8109375ce";
257+ sha256 = "d876eb51534d8a5796b486f22f9602bcb9c4cd9c99042583f95c4464f7ee99f8";
258258 }
259− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/ro/thunderbird-78.1.1.tar.bz2";
259+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/ro/thunderbird-78.2.1.tar.bz2";
260260 locale = "ro";
261261 arch = "linux-x86_64";
262− sha256 = "1cb1fc985122dea685fc1998764c60979a7c357d5e1e0646b8c4f45e856b4f00";
262+ sha256 = "ab4bfaea0914401188d486554963c9ab3014237e7116afdf274dce6e55725cae";
263263 }
264− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/ru/thunderbird-78.1.1.tar.bz2";
264+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/ru/thunderbird-78.2.1.tar.bz2";
265265 locale = "ru";
266266 arch = "linux-x86_64";
267− sha256 = "d89b9a418c78422e2a715e7e1c5d2bf57e90c2293ad63dc5e9f2645fdc910103";
267+ sha256 = "e722a13113896bde97dd72d0c7182c26734d7d546d8fe210bbce900854ac925c";
268268 }
269− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/si/thunderbird-78.1.1.tar.bz2";
269+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/si/thunderbird-78.2.1.tar.bz2";
270270 locale = "si";
271271 arch = "linux-x86_64";
272− sha256 = "584cd0dca877163073824e9dfbee4d6146e0ef8bd0b23cd2325462a1a72a41a4";
272+ sha256 = "595588d25de16c3781c85a9ed5e3c767d4df85f0820d4503770468b1669e9411";
273273 }
274− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/sk/thunderbird-78.1.1.tar.bz2";
274+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/sk/thunderbird-78.2.1.tar.bz2";
275275 locale = "sk";
276276 arch = "linux-x86_64";
277− sha256 = "cbb2b5678d11eef244a175d88207e00fc59584afd0b788a82319987368ff19c2";
277+ sha256 = "f30929cad216539754842c0d938b4d5b8ec5f4e813b3ff0d5108d9c4a0fc6df2";
278278 }
279− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/sl/thunderbird-78.1.1.tar.bz2";
279+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/sl/thunderbird-78.2.1.tar.bz2";
280280 locale = "sl";
281281 arch = "linux-x86_64";
282− sha256 = "e8727e9942c4555d6413a3ebe1d4b2ab2ea39da4f5b3b2ad7baaeb8abf49fd47";
282+ sha256 = "65d716b3fb5cad93d17704b62fd035a86ef6838cfff6ad95e571cedbb9e0974d";
283283 }
284− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/sq/thunderbird-78.1.1.tar.bz2";
284+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/sq/thunderbird-78.2.1.tar.bz2";
285285 locale = "sq";
286286 arch = "linux-x86_64";
287− sha256 = "31141f45121dab9c5ce3f3d6195264df91e61e434ee993c409c3cac164215737";
287+ sha256 = "38c652f6aae768ab7a8b0c1e975c676a3724ae22f5f7e3ffc6224ee032a9dc47";
288288 }
289− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/sr/thunderbird-78.1.1.tar.bz2";
289+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/sr/thunderbird-78.2.1.tar.bz2";
290290 locale = "sr";
291291 arch = "linux-x86_64";
292− sha256 = "dc9a868b1345da0633d090877ae6cddaa3a1b2bb1fc3113bc9de2aac1c30366c";
292+ sha256 = "7f73bcc8efb4452fedb0f9707c5e2b1d0db936fda4c6b9582207043aeddf8747";
293293 }
294− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/sv-SE/thunderbird-78.1.1.tar.bz2";
294+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/sv-SE/thunderbird-78.2.1.tar.bz2";
295295 locale = "sv-SE";
296296 arch = "linux-x86_64";
297− sha256 = "fab7e11f8de1fcd2e8719d20e818d8bd2c39f7539328fb79f2cce56d4f312a78";
297+ sha256 = "221974d62563b49f6c030b7a1f6307a71e60ce2a0e107b551363621320bba485";
298298 }
299− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/th/thunderbird-78.1.1.tar.bz2";
299+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/th/thunderbird-78.2.1.tar.bz2";
300300 locale = "th";
301301 arch = "linux-x86_64";
302− sha256 = "fa3173940d4e7109385d65b479297110545cc7e2e76e8a657f376553e370563a";
302+ sha256 = "a8641ee0dc5bcd40ec84a4d4640e74e44710b5ac10d629ea0dd42ad2370e8d3b";
303303 }
304− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/tr/thunderbird-78.1.1.tar.bz2";
304+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/tr/thunderbird-78.2.1.tar.bz2";
305305 locale = "tr";
306306 arch = "linux-x86_64";
307− sha256 = "a8cf6b95a6b890892d034c0b014a62f710bbafa34f3282a80e17828ad9365513";
307+ sha256 = "1d80d967b5ef98f0e642390c55618d454f2d82acec36bfd56db21e872490ff66";
308308 }
309− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/uk/thunderbird-78.1.1.tar.bz2";
309+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/uk/thunderbird-78.2.1.tar.bz2";
310310 locale = "uk";
311311 arch = "linux-x86_64";
312− sha256 = "a5086a87a87ccb605154aad5bc2986d6fe995391189b3e452640210e2016b08f";
312+ sha256 = "fcc24a9885db5511c0b2859e6472d436769da2670573177f7bf332fb363a3ee3";
313313 }
314− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/uz/thunderbird-78.1.1.tar.bz2";
314+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/uz/thunderbird-78.2.1.tar.bz2";
315315 locale = "uz";
316316 arch = "linux-x86_64";
317− sha256 = "b5bea650b678808b7fbcca432c1de0121dc19886b2f32e764e4fe1a797d1e8ab";
317+ sha256 = "b0f62e8fc5c6da398ad2e1a3488ddb37f0075c90ad54e6028293be7cfcd2f6f0";
318318 }
319− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/vi/thunderbird-78.1.1.tar.bz2";
319+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/vi/thunderbird-78.2.1.tar.bz2";
320320 locale = "vi";
321321 arch = "linux-x86_64";
322− sha256 = "8b8b57417b1d6faeb283b1b6037eac92841029bd73769d5cb8bc6c227e87efbf";
322+ sha256 = "0e38a1b645894ff81a481250ed434157fa2b70792b423c31dab61288612a82f2";
323323 }
324− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/zh-CN/thunderbird-78.1.1.tar.bz2";
324+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/zh-CN/thunderbird-78.2.1.tar.bz2";
325325 locale = "zh-CN";
326326 arch = "linux-x86_64";
327− sha256 = "4a0c8629e2a5e5f95799169dba4ee9c10b728bf503e090ed829cdd11fbeb57d1";
327+ sha256 = "04f37793bd17df88573d9d3f8c8412c26cfb3332395689a06f5fca6efb02b2ad";
328328 }
329− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/zh-TW/thunderbird-78.1.1.tar.bz2";
329+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/zh-TW/thunderbird-78.2.1.tar.bz2";
330330 locale = "zh-TW";
331331 arch = "linux-x86_64";
332− sha256 = "11a892d8ec3ec6e2dccbad4b97ce2fe7cb0a0b1dc309bef9819432f0be9d510c";
332+ sha256 = "6c1e5b71bb2a9e005971050c9643c52090828e1ecb3910d66d2d0dbaa107011c";
333333 }
334− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/af/thunderbird-78.1.1.tar.bz2";
334+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/af/thunderbird-78.2.1.tar.bz2";
335335 locale = "af";
336336 arch = "linux-i686";
337− sha256 = "a254eecebf45c16f55b7d72cc38da2c4d22f49704cdb5db72d2adfc199a7a78c";
337+ sha256 = "2601d98ad27a2ed7277f673876c2a7d206fe1cfd8c7c8febdead85884031a416";
338338 }
339− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/ar/thunderbird-78.1.1.tar.bz2";
339+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/ar/thunderbird-78.2.1.tar.bz2";
340340 locale = "ar";
341341 arch = "linux-i686";
342− sha256 = "3e735d996bb3bf2674f1c04f035489893169ab632208af1427756bc3c15b1600";
342+ sha256 = "5d126b1152b42b6bd6c29ac602b59ab88f3491b0b6f2a69aa1e6ae3d9ded04d6";
343343 }
344− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/ast/thunderbird-78.1.1.tar.bz2";
344+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/ast/thunderbird-78.2.1.tar.bz2";
345345 locale = "ast";
346346 arch = "linux-i686";
347− sha256 = "a8fe0f85c250b0f71b0bac30cd51e10e5d1ded4265775afe93f986ccde4fbc49";
347+ sha256 = "7b22fbd980df00d6b1a2c0f14d68a3a7daf06dcb6a13033ca2619371b098445c";
348348 }
349− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/be/thunderbird-78.1.1.tar.bz2";
349+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/be/thunderbird-78.2.1.tar.bz2";
350350 locale = "be";
351351 arch = "linux-i686";
352− sha256 = "279a98d38f6c33945ddd1e86c9263e72f9a52555e7f26c56a2f3062696436bbb";
352+ sha256 = "bd59d2a9e70944a736e8e5db100b2cbe937fb8021577fdd912087e2cbe38723f";
353353 }
354− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/bg/thunderbird-78.1.1.tar.bz2";
354+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/bg/thunderbird-78.2.1.tar.bz2";
355355 locale = "bg";
356356 arch = "linux-i686";
357− sha256 = "cb23b56841818af2e3e8dc922cace29c8538d22977ee951dee744bbc490c24a6";
357+ sha256 = "ce3906cafce8ce00c4b69f2b1b584f7e4148d2d40ac12916f1108f78d7d3cdae";
358358 }
359− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/br/thunderbird-78.1.1.tar.bz2";
359+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/br/thunderbird-78.2.1.tar.bz2";
360360 locale = "br";
361361 arch = "linux-i686";
362− sha256 = "f729274b064205cb9baf57be3732268a2c56893ac6b17ae6ddc0aed3269fda15";
362+ sha256 = "2f41237e0dd3dff4e0e4b196f8d02b988d7e5db3ac1984ea5577ce5052d43514";
363363 }
364− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/ca/thunderbird-78.1.1.tar.bz2";
364+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/ca/thunderbird-78.2.1.tar.bz2";
365365 locale = "ca";
366366 arch = "linux-i686";
367− sha256 = "eb434c12d8d841eb8426b95663591f742a9e62b630cadb7afebfa79ab1142a38";
367+ sha256 = "0ec94acd77cca38d37dd23fb240c3c9e3840defccb491704d01072c1cab1f543";
368368 }
369− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/cak/thunderbird-78.1.1.tar.bz2";
369+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/cak/thunderbird-78.2.1.tar.bz2";
370370 locale = "cak";
371371 arch = "linux-i686";
372− sha256 = "daa19634d796f849ab9b3a575bc53e451453902f82ce7384a7ae5ae4f99a2165";
372+ sha256 = "1c77ebb51a83c57c7d81ef278f9fceae07f98330a8ccf8f863c2f0b613141e23";
373373 }
374− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/cs/thunderbird-78.1.1.tar.bz2";
374+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/cs/thunderbird-78.2.1.tar.bz2";
375375 locale = "cs";
376376 arch = "linux-i686";
377− sha256 = "181cc3c70985d41a806395b353ccd98475c37ae8151fd5f59adbe25bf2059457";
377+ sha256 = "adf8c11ff60e697fc5087698088c42c95a15766ccebf24d77141a53dc255c366";
378378 }
379− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/cy/thunderbird-78.1.1.tar.bz2";
379+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/cy/thunderbird-78.2.1.tar.bz2";
380380 locale = "cy";
381381 arch = "linux-i686";
382− sha256 = "4cb93a1b38582e6fd4e4fc514c36e469b88bedf0bd36bee4d7a66d9c33c3c8ca";
382+ sha256 = "9b7c51652714c116c9bb22fab4f0fc6dcbce6ad2133cc860067898841d01b5b7";
383383 }
384− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/da/thunderbird-78.1.1.tar.bz2";
384+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/da/thunderbird-78.2.1.tar.bz2";
385385 locale = "da";
386386 arch = "linux-i686";
387− sha256 = "6eb46018b763d22e62739ec9dd98d5f3804f85b5b65ca3092c42d5d9a1a258ee";
387+ sha256 = "e7245ea0909efccaa9b94701061410437f16273c935484dd3638f5f4fa65aad9";
388388 }
389− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/de/thunderbird-78.1.1.tar.bz2";
389+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/de/thunderbird-78.2.1.tar.bz2";
390390 locale = "de";
391391 arch = "linux-i686";
392− sha256 = "dff12cffa89c1ad5666b92b66361e17c604f0ca34305fb0e3b06be5fa8fb0f96";
392+ sha256 = "302394d24f919b0a24dc574001458b265bfc90024bf21b3d98a43b31ae50adf7";
393393 }
394− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/dsb/thunderbird-78.1.1.tar.bz2";
394+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/dsb/thunderbird-78.2.1.tar.bz2";
395395 locale = "dsb";
396396 arch = "linux-i686";
397− sha256 = "efa2f9449703fc0941620650f1ca1332682b2866339413aa03f2438580d18f78";
397+ sha256 = "18ea8d27387581d49dd156957a089f1dbbe05f2772811aeddb1ebe81d26961e6";
398398 }
399− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/el/thunderbird-78.1.1.tar.bz2";
399+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/el/thunderbird-78.2.1.tar.bz2";
400400 locale = "el";
401401 arch = "linux-i686";
402− sha256 = "675cfc628dd02fe874a701e0e16986c797adac263605b304c1c69bb01552037f";
402+ sha256 = "bcec06d4b01268ca90d99a98a45c2ef5927ae4152b6b2d356332f3690de08f62";
403403 }
404− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/en-CA/thunderbird-78.1.1.tar.bz2";
404+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/en-CA/thunderbird-78.2.1.tar.bz2";
405405 locale = "en-CA";
406406 arch = "linux-i686";
407− sha256 = "a710c91df20b4b25d9e363b585344e1595ab96b9cc1df35e973e485834942957";
407+ sha256 = "475a1393917665c17bc5e787ef29dd886f1480d544f55d1caacb2a89503da685";
408408 }
409− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/en-GB/thunderbird-78.1.1.tar.bz2";
409+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/en-GB/thunderbird-78.2.1.tar.bz2";
410410 locale = "en-GB";
411411 arch = "linux-i686";
412− sha256 = "3acd3020cb6116588a0f061aa9ba5d620477e3265eefac3dc22f4705757fe025";
412+ sha256 = "dda5664fd8d843f3f29b85b855d54e00d15188c57e80c01d79a8be0a2eaa0be1";
413413 }
414− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/en-US/thunderbird-78.1.1.tar.bz2";
414+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/en-US/thunderbird-78.2.1.tar.bz2";
415415 locale = "en-US";
416416 arch = "linux-i686";
417− sha256 = "bf9ebc54aff457654b5ea1fc81437281f70d78de96d5a4d3586ae83fb8135d39";
417+ sha256 = "b299267b8a113dcd325bc6a928c561fe872535e1e876518e3075b85043aa7b23";
418418 }
419− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/es-AR/thunderbird-78.1.1.tar.bz2";
419+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/es-AR/thunderbird-78.2.1.tar.bz2";
420420 locale = "es-AR";
421421 arch = "linux-i686";
422− sha256 = "cf1c278a36c9303956ac8dc29a51226a42ea17cf64559c34bef318c79ba6ed74";
422+ sha256 = "e3e7cb829b07b7db95cad09c8887b9c91123665cd4601b685e3c7a7b0036992d";
423423 }
424− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/es-ES/thunderbird-78.1.1.tar.bz2";
424+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/es-ES/thunderbird-78.2.1.tar.bz2";
425425 locale = "es-ES";
426426 arch = "linux-i686";
427− sha256 = "4a9356476a18f292f763f1647611189ebe89ee368a3f01a7c75ef8dce48d91af";
427+ sha256 = "be8428e1cce22aff5000bdc11f632adfc4c1096060a7456d36230ebd6040d12d";
428428 }
429− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/et/thunderbird-78.1.1.tar.bz2";
429+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/et/thunderbird-78.2.1.tar.bz2";
430430 locale = "et";
431431 arch = "linux-i686";
432− sha256 = "03d3a43153b714f334a8f5d7d23e9080624488ec54400451b508c6aa50bcd594";
432+ sha256 = "deb81a63704b12ad2a945f5f0dcec878c3b7ec46f551f2d0122c03c52c031f73";
433433 }
434− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/eu/thunderbird-78.1.1.tar.bz2";
434+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/eu/thunderbird-78.2.1.tar.bz2";
435435 locale = "eu";
436436 arch = "linux-i686";
437− sha256 = "a7cca16186f0e2627dc6e06164b3cb2bb691cf798f7c41378ae90349521d9199";
437+ sha256 = "8a2935dd5f83854b4d98bdab67e7b376a7e1d19a2ff790234516ba8211ed7345";
438438 }
439− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/fa/thunderbird-78.1.1.tar.bz2";
439+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/fa/thunderbird-78.2.1.tar.bz2";
440440 locale = "fa";
441441 arch = "linux-i686";
442− sha256 = "6a19a79d409acdc25c69b5c8d75a18f2de665a7d18244d578e4ef0f65597daea";
442+ sha256 = "c39189bc1f740a1e5a372eaf3c6e99090f04ed8b1e86016c54ed25612d16f341";
443443 }
444− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/fi/thunderbird-78.1.1.tar.bz2";
444+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/fi/thunderbird-78.2.1.tar.bz2";
445445 locale = "fi";
446446 arch = "linux-i686";
447− sha256 = "4b82f0fadfb5f388948e33fd3408e9f6ece6737c8e5e4b53c164a124f017e553";
447+ sha256 = "4f23c9941975e67e6e40d7a504a24e4058a27786c5989dd3e25cfc4fab4c4c0e";
448448 }
449− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/fr/thunderbird-78.1.1.tar.bz2";
449+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/fr/thunderbird-78.2.1.tar.bz2";
450450 locale = "fr";
451451 arch = "linux-i686";
452− sha256 = "bc4fb423664576d4d94eb24383e3f4f23c199e52f1c985fd3bfccc947212f82a";
452+ sha256 = "4de9885664bf4828355d09ceae11fc7cfb603d4514255b4de464c0653ddd45b0";
453453 }
454− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/fy-NL/thunderbird-78.1.1.tar.bz2";
454+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/fy-NL/thunderbird-78.2.1.tar.bz2";
455455 locale = "fy-NL";
456456 arch = "linux-i686";
457− sha256 = "6eb76c3a4d3b31160dc0d0b807596095354c7c0740f5593f86042af1e1b03d48";
457+ sha256 = "82ae68d970a02ad57aa9c3dfb6c1ef7783c25211e9228c0bad515c3fef385f88";
458458 }
459− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/ga-IE/thunderbird-78.1.1.tar.bz2";
459+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/ga-IE/thunderbird-78.2.1.tar.bz2";
460460 locale = "ga-IE";
461461 arch = "linux-i686";
462− sha256 = "5321fff3eb4d341307233976de74624f6002abb8662f40ecbf77e3bdb5757add";
462+ sha256 = "e6035d81bfa5c58ab79e71b9895638f23e47e8ab2990794786c5e9f590bb70e2";
463463 }
464− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/gd/thunderbird-78.1.1.tar.bz2";
464+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/gd/thunderbird-78.2.1.tar.bz2";
465465 locale = "gd";
466466 arch = "linux-i686";
467− sha256 = "515207242fffd0513a550017f8bfb53061f0a0e3d795a111adf0154b55363d38";
467+ sha256 = "2c628c5ed8ad0c00c42b384f8b925887e624f6a6dee69c86800a9b5137f04886";
468468 }
469− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/gl/thunderbird-78.1.1.tar.bz2";
469+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/gl/thunderbird-78.2.1.tar.bz2";
470470 locale = "gl";
471471 arch = "linux-i686";
472− sha256 = "84c32bd92a783c680343aa5b01dbf58e37eda9ee466b16f817a79a135e37fbe5";
472+ sha256 = "49b8e22610f8e602a3870f541209251b61da8cb81df7f0a762d01002fef568e2";
473473 }
474− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/he/thunderbird-78.1.1.tar.bz2";
474+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/he/thunderbird-78.2.1.tar.bz2";
475475 locale = "he";
476476 arch = "linux-i686";
477− sha256 = "96d07263578fb16068e0f48309552ea9237d3dd5a46fc63e3293326778cb7af1";
477+ sha256 = "5bb7193eb498d1edd713e18bbac630ba881b0a9b7fca9b05c9b8e4dd1ea1edbf";
478478 }
479− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/hr/thunderbird-78.1.1.tar.bz2";
479+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/hr/thunderbird-78.2.1.tar.bz2";
480480 locale = "hr";
481481 arch = "linux-i686";
482− sha256 = "9c612aad3a12530052dd609c2f20a3739c458b3c7f3d761e7c00754f9b43db95";
482+ sha256 = "c31022ae9a1665cc0b22ab0e911730ccf5cd0dd24614fbd8d3bd51624760baa3";
483483 }
484− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/hsb/thunderbird-78.1.1.tar.bz2";
484+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/hsb/thunderbird-78.2.1.tar.bz2";
485485 locale = "hsb";
486486 arch = "linux-i686";
487− sha256 = "376e4d8eadb9bb8f301053d30260ab0cbeb3dc9f590564583f07547585105fe0";
487+ sha256 = "3e286b3ccf66300ead4d6b98a88a370fa1bac96244b143005c4974f075ceca92";
488488 }
489− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/hu/thunderbird-78.1.1.tar.bz2";
489+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/hu/thunderbird-78.2.1.tar.bz2";
490490 locale = "hu";
491491 arch = "linux-i686";
492− sha256 = "4e7e51dbbe359ec542e553f5b0691f1d191343261094828b2572dd5a03ec2c8a";
492+ sha256 = "6d0c88c46d0f4ffb296638e4e8217041d8fdaec3abaa6bda7b7cf97c4bcabc2a";
493493 }
494− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/hy-AM/thunderbird-78.1.1.tar.bz2";
494+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/hy-AM/thunderbird-78.2.1.tar.bz2";
495495 locale = "hy-AM";
496496 arch = "linux-i686";
497− sha256 = "735624e30d1986d6c822fcbee4694389cf8a0061eba40926265bd4ac998e2186";
497+ sha256 = "aac23dfa8c299623bca2e3b0501a636c630fbf3f5b08689911569a568b3ad060";
498498 }
499− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/id/thunderbird-78.1.1.tar.bz2";
499+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/id/thunderbird-78.2.1.tar.bz2";
500500 locale = "id";
501501 arch = "linux-i686";
502− sha256 = "ce6d668f38d1e74e7c8bbfc7408edc749eed9449908044bdd57b2dcd868cb89f";
502+ sha256 = "5bd5597cb6e91613a39c288d694f3af4f5686dcab1573e3b58c04dce3d1de865";
503503 }
504− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/is/thunderbird-78.1.1.tar.bz2";
504+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/is/thunderbird-78.2.1.tar.bz2";
505505 locale = "is";
506506 arch = "linux-i686";
507− sha256 = "589369ce68b6c78ad7753ddd14412eb68f438dbd7cae449f828288d25ee3f795";
507+ sha256 = "bcd926c704177945aa7b917fe12940e058d12e6cf8a3eedbf1ab205fb9c41b80";
508508 }
509− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/it/thunderbird-78.1.1.tar.bz2";
509+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/it/thunderbird-78.2.1.tar.bz2";
510510 locale = "it";
511511 arch = "linux-i686";
512− sha256 = "fd909d5aaa68a208050a0812f15024ef115b99fbde0edb0afe995c3b766c0d76";
512+ sha256 = "04ca02a4fed6e8d904173d9ce52c16e47d7e9b3d16f5483d986f8188ec79d65c";
513513 }
514− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/ja/thunderbird-78.1.1.tar.bz2";
514+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/ja/thunderbird-78.2.1.tar.bz2";
515515 locale = "ja";
516516 arch = "linux-i686";
517− sha256 = "160c2a1c36ef34339270abd59fed13b37414f8c37edd60463e0945e6751a0c74";
517+ sha256 = "1dbdc30ec3a06f2e7e7d38d9036fb90a2fdaad42356e9386ecc710d9a51f94b3";
518518 }
519− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/ka/thunderbird-78.1.1.tar.bz2";
519+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/ka/thunderbird-78.2.1.tar.bz2";
520520 locale = "ka";
521521 arch = "linux-i686";
522− sha256 = "e822a28e62aae6d6e84e6788d5311af45396248f48cc60152b4273d75359dd8f";
522+ sha256 = "2db1fa86ac87e0b8001b99c0eea30589db515c58e10548565533014481b1be9a";
523523 }
524− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/kab/thunderbird-78.1.1.tar.bz2";
524+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/kab/thunderbird-78.2.1.tar.bz2";
525525 locale = "kab";
526526 arch = "linux-i686";
527− sha256 = "2ea58cc79b80966b5bbc310fa32bd27621f95d4ffbd3646bf9e04f922c36ca6e";
527+ sha256 = "8499d0d8a0372617800b039c9198cc372783b8ff4ce385fc692e39b1dca22576";
528528 }
529− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/kk/thunderbird-78.1.1.tar.bz2";
529+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/kk/thunderbird-78.2.1.tar.bz2";
530530 locale = "kk";
531531 arch = "linux-i686";
532− sha256 = "a874bc02f065be73a54b70567b7a04be5fc6a9f766f3b054b12555763361ea2a";
532+ sha256 = "29b228042a7f06c22300b123cc0fcdf7a86005d0d4c3c282c97635ebc25ce826";
533533 }
534− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/ko/thunderbird-78.1.1.tar.bz2";
534+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/ko/thunderbird-78.2.1.tar.bz2";
535535 locale = "ko";
536536 arch = "linux-i686";
537− sha256 = "d9678f72569dfde84544fcb9afa7cb8d5a4a35baa52d4e560aa2b082a418ab00";
537+ sha256 = "a7af79975107cb32b408c7dd26827793c3c11f998705bc711c60f3dd6b7a1173";
538538 }
539− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/lt/thunderbird-78.1.1.tar.bz2";
539+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/lt/thunderbird-78.2.1.tar.bz2";
540540 locale = "lt";
541541 arch = "linux-i686";
542− sha256 = "1d7ec489dc52fae0f7597e40f8505bdd6a57a717389c75b66481749e85e2fab6";
542+ sha256 = "7a5010761d0af24a6852f32b1ebd6b543b1e1011888ded3f4a4297fc35f455b5";
543543 }
544− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/ms/thunderbird-78.1.1.tar.bz2";
544+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/ms/thunderbird-78.2.1.tar.bz2";
545545 locale = "ms";
546546 arch = "linux-i686";
547− sha256 = "5d0c7cc00139c39a69dfc9ba1dc5c83b56973f26679860d048952bcf09baa737";
547+ sha256 = "8573dc35bd69ff20d05aa06484a2243f5a35ec78c1c31dbccc067f0cb9e6617a";
548548 }
549− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/nb-NO/thunderbird-78.1.1.tar.bz2";
549+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/nb-NO/thunderbird-78.2.1.tar.bz2";
550550 locale = "nb-NO";
551551 arch = "linux-i686";
552− sha256 = "e72a25e7d53e6e0d470632c487d31e08afdb6c27543d50c93ff72ecac3f70bc6";
552+ sha256 = "722c0a4ce2a0d774f8971707ff553d9f2e62af10267ef491e670b020a2d8a49c";
553553 }
554− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/nl/thunderbird-78.1.1.tar.bz2";
554+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/nl/thunderbird-78.2.1.tar.bz2";
555555 locale = "nl";
556556 arch = "linux-i686";
557− sha256 = "19efd7323e671fe25b64ee44c85f698f608e6c2b18fdbfc9f0cc95b9cd8cd149";
557+ sha256 = "63a08123e795ab8e51a2c98f33b0b6424c1f5f2c09a5d1683585f9762813afaf";
558558 }
559− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/nn-NO/thunderbird-78.1.1.tar.bz2";
559+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/nn-NO/thunderbird-78.2.1.tar.bz2";
560560 locale = "nn-NO";
561561 arch = "linux-i686";
562− sha256 = "b4be21281c6a13de05e5d0b96e43454bab662140a00d3837f609e23f14360c90";
562+ sha256 = "8968de35faf9fe304631ece4e08a9944342a08dc518ac1eec0ba2d5c1ff268ed";
563563 }
564− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/pa-IN/thunderbird-78.1.1.tar.bz2";
564+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/pa-IN/thunderbird-78.2.1.tar.bz2";
565565 locale = "pa-IN";
566566 arch = "linux-i686";
567− sha256 = "f2795a504616404616f7d22022e105e9e4ea54025d60e262c405b867cb9c7936";
567+ sha256 = "57685a05321195019ef4d3c489dbb14ac0f1bd5ce51fda1f7573392de215e4e3";
568568 }
569− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/pl/thunderbird-78.1.1.tar.bz2";
569+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/pl/thunderbird-78.2.1.tar.bz2";
570570 locale = "pl";
571571 arch = "linux-i686";
572− sha256 = "52f80b074dc168ec00d0fd78f6376c1dfd357c2b7e7ed78bb1b9cf17536508a6";
572+ sha256 = "d98967c9d54f9314faae53472b9d1506576761cd3de09747d3b407e1f26931e4";
573573 }
574− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/pt-BR/thunderbird-78.1.1.tar.bz2";
574+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/pt-BR/thunderbird-78.2.1.tar.bz2";
575575 locale = "pt-BR";
576576 arch = "linux-i686";
577− sha256 = "d02867899a54eebffb2b6e600f7e6260b960d686a8bcd61ce705e9d0bbebe377";
577+ sha256 = "14fa89b2d8f659a90e19068130ce1a2da83137b7fb9a5a009d2363ccc2415009";
578578 }
579− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/pt-PT/thunderbird-78.1.1.tar.bz2";
579+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/pt-PT/thunderbird-78.2.1.tar.bz2";
580580 locale = "pt-PT";
581581 arch = "linux-i686";
582− sha256 = "659a7ff3a0dcbb4f3fec32eda6b5a2087191c8d49ea310662ad540433d869180";
582+ sha256 = "279f325e75157e0cedffe6a455e731373b077078f70b89bba76e12e2439350d8";
583583 }
584− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/rm/thunderbird-78.1.1.tar.bz2";
584+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/rm/thunderbird-78.2.1.tar.bz2";
585585 locale = "rm";
586586 arch = "linux-i686";
587− sha256 = "d9ee3c5e3cf2d7eedced9d12bf4d499ae931c262be166af6a14bbd4a2538788a";
587+ sha256 = "7432093e7516625957c3dcb90e8668fab1e22c0edba0411e3e2106d49e052fdf";
588588 }
589− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/ro/thunderbird-78.1.1.tar.bz2";
589+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/ro/thunderbird-78.2.1.tar.bz2";
590590 locale = "ro";
591591 arch = "linux-i686";
592− sha256 = "c3db9965a25d52d25cde0b52bffcc274ae32862fb29be368f27b102774d0971b";
592+ sha256 = "f5d5f564cf56c66d1f2f9717df7c7f021532dc1912384c9921ca286030f7d82c";
593593 }
594− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/ru/thunderbird-78.1.1.tar.bz2";
594+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/ru/thunderbird-78.2.1.tar.bz2";
595595 locale = "ru";
596596 arch = "linux-i686";
597− sha256 = "f0356ef5eadccfcdfc694d0bed9b1e4027e4883095f9c117403a68f1cb2810c8";
597+ sha256 = "4c4e31e74c4d10d88044fc49c24b3ae3ffb0b18e4a23295b60ac2d38d723753a";
598598 }
599− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/si/thunderbird-78.1.1.tar.bz2";
599+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/si/thunderbird-78.2.1.tar.bz2";
600600 locale = "si";
601601 arch = "linux-i686";
602− sha256 = "5b5d17a2b098fbe1c2d8686ab0e1adb7c72efedc38365ca9b39b1e122302c85c";
602+ sha256 = "689be324633f6a872a09d6498d8772562dceca9bca96f7029830c965ad2e4138";
603603 }
604− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/sk/thunderbird-78.1.1.tar.bz2";
604+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/sk/thunderbird-78.2.1.tar.bz2";
605605 locale = "sk";
606606 arch = "linux-i686";
607− sha256 = "b39bd41a38947ea467e1a89c5a173fd07cbce09562c10e6a60adb2150b04c9cf";
607+ sha256 = "194ff5a23a3a40ba98fb1968965c79f99246c6d93b81254d11df5d22530f1d86";
608608 }
609− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/sl/thunderbird-78.1.1.tar.bz2";
609+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/sl/thunderbird-78.2.1.tar.bz2";
610610 locale = "sl";
611611 arch = "linux-i686";
612− sha256 = "602e0feffc5b786930005c376ca3e8819b834a0cfc9a649bc46d86c27999144d";
612+ sha256 = "9746db435fe3dbf5ab51603780d52862a6afda0e40c1ebc915b309ac93e75e25";
613613 }
614− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/sq/thunderbird-78.1.1.tar.bz2";
614+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/sq/thunderbird-78.2.1.tar.bz2";
615615 locale = "sq";
616616 arch = "linux-i686";
617− sha256 = "fb265490d00c3a844f73e8f531b7c73f3787cb4e4ddc7cdcde72017fd7f3d612";
617+ sha256 = "86f675921cdf0de41855d5e2c3d2d56c163d915ac8a0f8cc9678d1a55f87e069";
618618 }
619− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/sr/thunderbird-78.1.1.tar.bz2";
619+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/sr/thunderbird-78.2.1.tar.bz2";
620620 locale = "sr";
621621 arch = "linux-i686";
622− sha256 = "1574eaee6effc4df2c88fc94597e295f352455a9f68501080385c08cb4ab7e35";
622+ sha256 = "587e4c867dd43621c8e5e04461c4a2dcf2b0f256476b5b72d8fc6722e573e347";
623623 }
624− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/sv-SE/thunderbird-78.1.1.tar.bz2";
624+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/sv-SE/thunderbird-78.2.1.tar.bz2";
625625 locale = "sv-SE";
626626 arch = "linux-i686";
627− sha256 = "8d55df4937fe28f7b9d0fcaebcde3fb9650de9f0b74f677111f339ae2365b822";
627+ sha256 = "a46294d3dafc8bfaaa7f5376c2db2402f31f24664e73045c653ea8660079b879";
628628 }
629− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/th/thunderbird-78.1.1.tar.bz2";
629+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/th/thunderbird-78.2.1.tar.bz2";
630630 locale = "th";
631631 arch = "linux-i686";
632− sha256 = "6a872a6c332c7b3bfc24721bf1114c85475a73ae5c7b16d8637b0eb0045e112d";
632+ sha256 = "6105278c11c3e586240d50c9612730e75caecd08765b5b5cfe010f37d71c971d";
633633 }
634− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/tr/thunderbird-78.1.1.tar.bz2";
634+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/tr/thunderbird-78.2.1.tar.bz2";
635635 locale = "tr";
636636 arch = "linux-i686";
637− sha256 = "26d2b8493a1508591b45f9ecc43598e244856c0d9bc3c185721a7239679c4e63";
637+ sha256 = "4bdd2c91e8f361d1b2ade88cec06accb244adf3d7f1d714feea3e4004ed31968";
638638 }
639− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/uk/thunderbird-78.1.1.tar.bz2";
639+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/uk/thunderbird-78.2.1.tar.bz2";
640640 locale = "uk";
641641 arch = "linux-i686";
642− sha256 = "ddb4b5fab55ded8f7bc2ae914f41af42b3b69c738727b055efd5e05b253ac872";
642+ sha256 = "40e2012a5b5dc05cb887a6c4cbb0c8f7bbc25cebd2de1247e5e8dc355cad78fe";
643643 }
644− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/uz/thunderbird-78.1.1.tar.bz2";
644+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/uz/thunderbird-78.2.1.tar.bz2";
645645 locale = "uz";
646646 arch = "linux-i686";
647− sha256 = "dce93fab320f90ece938ae2b2343c1d27a1143b0183318a9d9e0cbbcfb607982";
647+ sha256 = "15f4aafba6b2bcb102683d9a665d208ab21c5767cf6d59c45d996fa26ef1e12a";
648648 }
649− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/vi/thunderbird-78.1.1.tar.bz2";
649+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/vi/thunderbird-78.2.1.tar.bz2";
650650 locale = "vi";
651651 arch = "linux-i686";
652− sha256 = "cf1b4f96ef1a510d21b232e748ace6e567d27e382393a7d7f51ab392f026d55c";
652+ sha256 = "32640a1c8e42cc79774a3b75539010dfb65e32c703992001eb03916d4fb46e91";
653653 }
654− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/zh-CN/thunderbird-78.1.1.tar.bz2";
654+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/zh-CN/thunderbird-78.2.1.tar.bz2";
655655 locale = "zh-CN";
656656 arch = "linux-i686";
657− sha256 = "574acd0743a1202b6629883618278eb3ce113c518bc9c39f3d90e2dc12d4f644";
657+ sha256 = "09b52b6ebf0033738444bacfb53b84b1c98f7d3e10b32c001356083afbe4e89e";
658658 }
659− { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/zh-TW/thunderbird-78.1.1.tar.bz2";
659+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/zh-TW/thunderbird-78.2.1.tar.bz2";
660660 locale = "zh-TW";
661661 arch = "linux-i686";
662− sha256 = "51ccc5a4696841b3391a5dd9fb9ff1f55a9f6ccd6fbd86587ffb86c5f664f10f";
662+ sha256 = "606e416a158023f674eda141bf67f9b3956e3e231ba85605173d73cad0d22a59";
663663 }
664664 ];
665665}
pkgs/applications/networking/mailreaders/thunderbird/68.nix+3−3
@@ -71,13 +71,13 @@ assert waylandSupport -> gtk3Support == true;
7171
7272stdenv.mkDerivation rec {
7373 pname = "thunderbird";
74− version = "68.11.0";
74+ version = "68.12.0";
7575
7676 src = fetchurl {
7777 url =
7878 "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
7979 sha512 =
80− "1rdxizg1mpagh17fhnrbkilyv1i2zfcr6z62jf3ng31ns94za9kdg9f580srkp63png67jaj3b1kc33v5vb8wavl09n5d38g113x2m9";
80+ "33350vjgzvsg6sdhdld92z75k1xcf1wmngdcvzsj4f3y3aal73pyw03mlvgg6y36bm0j8fhaxvgbbg5zm7hxhn779z78970m4v9amg7";
8181 };
8282
8383 nativeBuildInputs = [
@@ -307,7 +307,7 @@ stdenv.mkDerivation rec {
307307 # package a Thunderbird >=71.0 since XUL shouldn't be anymore (in use)?
308308 postFixup = ''
309309 local xul="$out/lib/thunderbird/libxul.so"
310− patchelf --set-rpath "${libnotify}/lib:${systemd.lib}/lib:$(patchelf --print-rpath $xul)" $xul
310+ patchelf --set-rpath "${libnotify}/lib:${lib.getLib systemd}/lib:$(patchelf --print-rpath $xul)" $xul
311311 '';
312312
313313 doInstallCheck = true;
pkgs/applications/networking/mailreaders/thunderbird/default.nix+3−3
@@ -69,13 +69,13 @@ assert waylandSupport -> gtk3Support == true;
6969
7070stdenv.mkDerivation rec {
7171 pname = "thunderbird";
72− version = "78.1.1";
72+ version = "78.2.1";
7373
7474 src = fetchurl {
7575 url =
7676 "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
7777 sha512 =
78− "1lf15zl3p8y1vxv4s04y088flkspf0r0c6j8gfrlfzla5ckfcsbad3zbygh6y73m35j882g7fbacby5a4hiw891zq2kji5dn3nbahyi";
78+ "2iya9a5qaini524wrdrnxx6wsrgb8fa2b1m42mlypskxjjgb7n66vpxlbpi9x9mqzc63ca2ag36fjpbpsvbv5ppxvpfwk2j1zbfvb5w";
7979 };
8080
8181 nativeBuildInputs = [
@@ -301,7 +301,7 @@ stdenv.mkDerivation rec {
301301 # package a Thunderbird >=71.0 since XUL shouldn't be anymore (in use)?
302302 postFixup = ''
303303 local xul="$out/lib/thunderbird/libxul.so"
304− patchelf --set-rpath "${libnotify}/lib:${systemd.lib}/lib:$(patchelf --print-rpath $xul)" $xul
304+ patchelf --set-rpath "${libnotify}/lib:${lib.getLib systemd}/lib:$(patchelf --print-rpath $xul)" $xul
305305 '';
306306
307307 doInstallCheck = true;
pkgs/applications/networking/modem-manager-gui/default.nix+11−18
@@ -1,15 +1,14 @@
11{ stdenv
22, pkgconfig
33, python3
4−, fetchhg
5−, fetchpatch
4+, fetchFromGitLab
65, gtk3
76, glib
87, gdbm
98, gtkspell3
109, ofono
1110, itstool
12−, libappindicator-gtk3
11+, libayatana-appindicator-gtk3
1312, perlPackages
1413, glibcLocales
1514, meson
@@ -18,22 +17,16 @@
1817
1918stdenv.mkDerivation rec {
2019 pname = "modem-manager-gui";
21− version = "0.0.19.1";
20+ version = "0.0.20";
2221
23− src = fetchhg {
24− url = "https://linuxonly@bitbucket.org/linuxonly/modem-manager-gui";
25− rev = "version ${version}";
26− sha256 = "11iibh36567814h2bz41sa1072b86p1l13xyj670pwkh9k8kw8fd";
22+ src = fetchFromGitLab {
23+ domain = "salsa.debian.org";
24+ owner = "debian";
25+ repo = "modem-manager-gui";
26+ rev = "upstream%2F${version}";
27+ sha256 = "1pjx4rbsxa7gcs628yjkwb0zqrm5xq8pkmp0cfk4flfk1ryflmgr";
2728 };
2829
29− patches = [
30− # Fix docs build
31− (fetchpatch {
32− url = "https://bitbucket.org/linuxonly/modem-manager-gui/commits/68fb09c12413b7de9b7477cbf4241c3527568325/raw";
33− sha256 = "033nrlhjlk0zvadv5g9n2id53ajagswf77mda0ixnrskyi7wiig7";
34− })
35− ];
36−
3730 nativeBuildInputs = [
3831 pkgconfig
3932 python3
@@ -49,7 +42,7 @@ stdenv.mkDerivation rec {
4942 gdbm
5043 gtkspell3
5144 ofono
52− libappindicator-gtk3
45+ libayatana-appindicator-gtk3
5346 ];
5447
5548 postPatch = ''
@@ -66,7 +59,7 @@ stdenv.mkDerivation rec {
6659 '';
6760 homepage = "https://linuxonly.ru/page/modem-manager-gui";
6861 license = licenses.gpl3;
69− maintainers = with maintainers; [ ahuzik ];
62+ maintainers = with maintainers; [ ahuzik galagora ];
7063 platforms = platforms.linux;
7164 };
7265}
pkgs/applications/networking/msmtp/default.nix+2−2
@@ -9,11 +9,11 @@ let
99
1010in stdenv.mkDerivation rec {
1111 pname = "msmtp";
12− version = "1.8.11";
12+ version = "1.8.12";
1313
1414 src = fetchurl {
1515 url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz";
16− sha256 = "0q0fg235qk448l1xjcwyxr7vcpzk6w57jzhjbkb0m7nffyhhypzj";
16+ sha256 = "0m33m5bc7ajmgy7vivnzj3mhybg37259hx79xypj769kfyafyvx8";
1717 };
1818
1919 patches = [
pkgs/applications/networking/mullvad-vpn/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, makeWrapper, fetchurl, dpkg
1+{ stdenv, lib, makeWrapper, fetchurl, dpkg
22, alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype
33, gdk-pixbuf, glib, gnome2, pango, nspr, nss, gtk3
44, xorg, autoPatchelfHook, systemd, libnotify, libappindicator
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
6060
6161 unpackPhase = "dpkg-deb -x $src .";
6262
63− runtimeDependencies = [ systemd.lib libnotify libappindicator ];
63+ runtimeDependencies = [ (lib.getLib systemd) libnotify libappindicator ];
6464
6565 installPhase = ''
6666 runHook preInstall
pkgs/applications/networking/p2p/tremc/default.nixnew file+49
@@ -0,0 +1,49 @@
1+{ stdenv, fetchFromGitHub, python3Packages
2+, x11Support ? !stdenv.isDarwin
3+, xclip ? null
4+, pbcopy ? null
5+, useGeoIP ? false # Require /var/lib/geoip-databases/GeoIP.dat
6+}:
7+let
8+ wrapperPath = with stdenv.lib; makeBinPath (
9+ optional x11Support xclip ++
10+ optional stdenv.isDarwin pbcopy
11+ );
12+in
13+python3Packages.buildPythonPackage rec {
14+ version = "0.9.1";
15+ pname = "tremc";
16+
17+ src = fetchFromGitHub {
18+ owner = "tremc";
19+ repo = pname;
20+ rev = "0.9.1";
21+ sha256 = "1yhwvlcyv1s830p5a7q5x3mkb3mbvr5cn5nh7y62l5b6iyyynlvm";
22+ };
23+
24+ buildInputs = with python3Packages; [
25+ python
26+ wrapPython
27+ ];
28+
29+ pythonPath = with python3Packages; [
30+ ipy
31+ pyperclip
32+ ] ++
33+ stdenv.lib.optional useGeoIP GeoIP;
34+
35+ phases = [ "unpackPhase" "installPhase" ];
36+
37+ makeWrapperArgs = ["--prefix PATH : ${wrapperPath}"];
38+
39+ installPhase = ''
40+ make DESTDIR=$out install
41+ wrapPythonPrograms
42+ '';
43+
44+ meta = with stdenv.lib; {
45+ description = "Curses interface for transmission";
46+ homepage = "https://github.com/tremc/tremc";
47+ license = licenses.gpl3;
48+ };
49+}
pkgs/applications/networking/remote/citrix-workspace/generic.nix+1−1
@@ -90,7 +90,7 @@ stdenv.mkDerivation rec {
9090 openssl'
9191 pango
9292 speex
93− systemd.lib
93+ (lib.getLib systemd)
9494 stdenv.cc.cc
9595 xorg.libXaw
9696 xorg.libXmu
pkgs/applications/networking/termius/default.nix+2−1
@@ -5,6 +5,7 @@
55, makeDesktopItem
66, makeWrapper
77, stdenv
8+, lib
89, udev
910, wrapGAppsHook
1011}:
@@ -50,7 +51,7 @@ stdenv.mkDerivation rec {
5051 cp "${desktopItem}/share/applications/"* "$out/share/applications"
5152 '';
5253
53− runtimeDependencies = [ udev.lib ];
54+ runtimeDependencies = [ (lib.getLib udev) ];
5455
5556 postFixup = ''
5657 makeWrapper $out/opt/Termius/termius-app $out/bin/termius-app \
pkgs/applications/office/calligra/default.nix+9−18
@@ -7,7 +7,7 @@
77 knotifications, knotifyconfig, kparts, ktextwidgets, kwallet, kwidgetsaddons,
88 kwindowsystem, kxmlgui, sonnet, threadweaver,
99 kcontacts, akonadi, akonadi-calendar, akonadi-contacts,
10− eigen, git, gsl, ilmbase, kproperty, kreport, lcms2, marble, libgit2, libodfgen,
10+ eigen, git, gsl, ilmbase, kproperty, kreport, lcms2, marble, pcre, libgit2, libodfgen,
1111 librevenge, libvisio, libwpd, libwpg, libwps, okular, openexr, openjpeg, phonon,
1212 poppler, pstoedit, qca-qt5, vc
1313# TODO: package Spnav, m2mml LibEtonyek, Libqgit2
@@ -15,18 +15,14 @@
1515
1616mkDerivation rec {
1717 pname = "calligra";
18− version = "3.1.0";
18+ version = "3.2.0";
1919
2020 src = fetchurl {
2121 url = "mirror://kde/stable/${pname}/${version}/${pname}-${version}.tar.xz";
22− sha256 = "0w782k0hprpb6viixnqz34sp0z5csv3prdby46z22qqkcipcs638";
22+ sha256 = "sha256-flViKGZdeeZ8Bi/RFz1mdvCw187v3W4bC8+aeB6nCVE=";
2323 };
2424
25− patches = [ ./qt5_11.patch ];
26−
27− enableParallelBuilding = true;
28−
29− nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ];
25+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
3026
3127 buildInputs = [
3228 boost qtwebkit qtx11extras shared-mime-info
@@ -35,7 +31,7 @@ mkDerivation rec {
3531 kjobwidgets kcmutils kdelibs4support kio kross knotifications knotifyconfig kparts
3632 ktextwidgets kwallet kwidgetsaddons kwindowsystem kxmlgui sonnet threadweaver
3733 kcontacts akonadi akonadi-calendar akonadi-contacts
38− eigen git gsl ilmbase kproperty kreport lcms2 marble libgit2 libodfgen librevenge
34+ eigen git gsl ilmbase kproperty kreport lcms2 marble pcre libgit2 libodfgen librevenge
3935 libvisio libwpd libwpg libwps okular openexr openjpeg phonon poppler qca-qt5 vc
4036 ];
4137
@@ -43,13 +39,10 @@ mkDerivation rec {
4339
4440 NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR";
4541
46− postInstall = ''
47− for i in $out/bin/*; do
48− wrapProgram $i \
49− --prefix PATH ':' "${pstoedit.out}/bin" \
50− --prefix XDG_DATA_DIRS ':' "${breeze-icons}/share"
51− done
52− '';
42+ qtWrapperArgs = [
43+ "--prefix PATH : ${lib.getBin pstoedit}/bin"
44+ "--prefix XDG_DATA_DIRS : ${breeze-icons}/share"
45+ ];
5346
5447 meta = with lib; {
5548 description = "A suite of productivity applications";
@@ -64,7 +57,5 @@ mkDerivation rec {
6457 maintainers = with maintainers; [ phreedom ebzzry zraexy ];
6558 platforms = platforms.linux;
6659 license = with licenses; [ gpl2 lgpl2 ];
67− hydraPlatforms = [];
68− broken = true; # fails to start, kde home not found
6960 };
7061}
pkgs/applications/radio/noaa-apt/default.nixnew file+64
@@ -0,0 +1,64 @@
1+{ lib
2+, rustPlatform
3+, fetchFromGitHub
4+, pkg-config
5+, atk
6+, cairo
7+, gdk-pixbuf
8+, glib
9+, gtk3
10+, openssl
11+, pango
12+}:
13+
14+rustPlatform.buildRustPackage rec {
15+ pname = "noaa-apt";
16+ version = "1.2.0";
17+
18+ src = fetchFromGitHub {
19+ owner = "martinber";
20+ repo = "noaa-apt";
21+ rev = "v${version}";
22+ sha256 = "0fqki4a9c54rixdz5bpswvn433f9saw6yazgw4av3xdd7g2fdvvj";
23+ };
24+
25+ nativeBuildInputs = [
26+ pkg-config
27+ ];
28+
29+ buildInputs = [
30+ atk
31+ cairo
32+ gdk-pixbuf
33+ glib
34+ gtk3
35+ openssl
36+ pango
37+ ];
38+
39+ cargoSha256 = "1pzcq31inazmc9cz31fspzqkp0lpkjid8ai3g17sin1pfzby5jlh";
40+
41+ preBuild = ''
42+ # Used by macro pointing to resource location at compile time.
43+ export NOAA_APT_RES_DIR=$out/share/noaa-apt
44+ '';
45+
46+ postInstall = ''
47+ # Resources.
48+ mkdir -p $out/share/noaa-apt
49+ cp -R $src/res/* $out/share/noaa-apt/
50+
51+ # Desktop icon.
52+ install -Dm644 -t $out/share/applications $src/debian/ar.com.mbernardi.noaa-apt.desktop
53+ install -Dm644 -t $out/share/icons/hicolor/48x48/apps $src/debian/noaa-apt.png
54+ install -Dm644 -t $out/share/icons/hicolor/scalable/apps $src/debian/noaa-apt.svg
55+ '';
56+
57+ meta = with lib; {
58+ description = "NOAA APT image decoder.";
59+ homepage = "http://noaa-apt.mbernardi.com.ar/";
60+ license = licenses.gpl3Only;
61+ maintainers = with maintainers; [ trepetti ];
62+ changelog = "https://github.com/martinber/noaa-apt/releases/tag/v${version}";
63+ };
64+}
pkgs/applications/science/logic/alt-ergo/default.nix+5−7
@@ -2,29 +2,27 @@
22
33let
44 pname = "alt-ergo";
5− version = "2.3.2";
5+ version = "2.3.3";
66
77 src = fetchurl {
88 url = "https://alt-ergo.ocamlpro.com/http/alt-ergo-${version}/alt-ergo-${version}.tar.gz";
9− sha256 = "130hisjzkaslygipdaaqib92spzx9rapsd45dbh5ssczjn5qnhb9";
9+ sha256 = "124k2a4ikk4wdpmvgjpgl97x9skvr9qznk8m68dzsynzpv6yksaj";
1010 };
1111
12− preConfigure = "patchShebangs ./configure";
13−
1412 nativeBuildInputs = [ which ];
1513
1614in
1715
1816let alt-ergo-lib = ocamlPackages.buildDunePackage rec {
1917 pname = "alt-ergo-lib";
20− inherit version src preConfigure nativeBuildInputs;
18+ inherit version src nativeBuildInputs;
2119 configureFlags = pname;
2220 propagatedBuildInputs = with ocamlPackages; [ num ocplib-simplex stdlib-shims zarith ];
2321}; in
2422
2523let alt-ergo-parsers = ocamlPackages.buildDunePackage rec {
2624 pname = "alt-ergo-parsers";
27− inherit version src preConfigure nativeBuildInputs;
25+ inherit version src nativeBuildInputs;
2826 configureFlags = pname;
2927 buildInputs = with ocamlPackages; [ menhir ];
3028 propagatedBuildInputs = [ alt-ergo-lib ] ++ (with ocamlPackages; [ camlzip psmt2-frontend ]);
@@ -32,7 +30,7 @@ let alt-ergo-parsers = ocamlPackages.buildDunePackage rec {
3230
3331ocamlPackages.buildDunePackage {
3432
35− inherit pname version src preConfigure nativeBuildInputs;
33+ inherit pname version src nativeBuildInputs;
3634
3735 configureFlags = pname;
3836
pkgs/applications/science/logic/lean/default.nix+2−2
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 pname = "lean";
5− version = "3.18.4";
5+ version = "3.19.0";
66
77 src = fetchFromGitHub {
88 owner = "leanprover-community";
99 repo = "lean";
1010 rev = "v${version}";
11− sha256 = "1pmc2wi1pa346w89ayrrjv9xk6v6myg2zmx1wj4pd9qxv7ivrbsn";
11+ sha256 = "1dybq6104vc62x620izgblfd8dqc4ynaiw8ml07km78lq38anm6v";
1212 };
1313
1414 nativeBuildInputs = [ cmake ];
pkgs/applications/science/math/rofi-calc/default.nix+2−2
@@ -12,13 +12,13 @@
1212
1313stdenv.mkDerivation rec {
1414 pname = "rofi-calc";
15− version = "1.7";
15+ version = "1.8";
1616
1717 src = fetchFromGitHub {
1818 owner = "svenstaro";
1919 repo = pname;
2020 rev = "v${version}";
21− sha256 = "046x2zpvza7n0m81s75qkvmnpkvsvvyqqqjxcqzj7by0llpqs7wa";
21+ sha256 = "0vwb9c3xvd2cms6cw8j8parg7w4bsxvvrd1wgggr8sz2p8rrvy5p";
2222 };
2323
2424 nativeBuildInputs = [
pkgs/applications/version-management/gitlab/data.json+5−5
@@ -1,13 +1,13 @@
11{
2− "version": "13.0.12",
3− "repo_hash": "0m9pn1alxdib9ppf878wf186bvn0llik7vcpqijzcdzc18q9cldq",
2+ "version": "13.0.14",
3+ "repo_hash": "15is18x631ifsj4iwmrs1s9lc3i99hwsxxf5v42qldbmsys31l1k",
44 "owner": "gitlab-org",
55 "repo": "gitlab",
6− "rev": "v13.0.12-ee",
6+ "rev": "v13.0.14-ee",
77 "passthru": {
8− "GITALY_SERVER_VERSION": "13.0.12",
8+ "GITALY_SERVER_VERSION": "13.0.14",
99 "GITLAB_PAGES_VERSION": "1.18.0",
1010 "GITLAB_SHELL_VERSION": "13.2.0",
1111 "GITLAB_WORKHORSE_VERSION": "8.31.2"
1212 }
13−}
13+}
pkgs/applications/version-management/gitlab/gitaly/default.nix+2−2
@@ -19,14 +19,14 @@ let
1919 };
2020 };
2121in buildGoPackage rec {
22− version = "13.0.12";
22+ version = "13.0.14";
2323 pname = "gitaly";
2424
2525 src = fetchFromGitLab {
2626 owner = "gitlab-org";
2727 repo = "gitaly";
2828 rev = "v${version}";
29− sha256 = "00jzrib8f51b3wkl0zy9a9cr5j9kp6cmm49vxm27zgxpyz8k1axw";
29+ sha256 = "16ynkwiv0faa60msashj5w1bc4rdh7yv2qjmpcbf7dwq54gqmlbv";
3030 };
3131
3232 # Fix a check which assumes that hook files are writeable by their
pkgs/applications/virtualization/charliecloud/default.nix+22−8
@@ -1,22 +1,32 @@
1−{ stdenv, fetchFromGitHub, python }:
1+{ stdenv, fetchFromGitHub, python3, python3Packages, docker, autoreconfHook, coreutils, makeWrapper, gnused, gnutar, gzip, findutils, sudo, nixosTests }:
22
33stdenv.mkDerivation rec {
44
5− version = "0.12";
5+ version = "0.18";
66 pname = "charliecloud";
77
88 src = fetchFromGitHub {
99 owner = "hpc";
1010 repo = "charliecloud";
1111 rev = "v${version}";
12− sha256 = "177rcf1klcxsp6x9cw75cmz3y2izgd1hvi1rb9vc6iz9qx1nmk3v";
12+ sha256 = "0x2kvp95ld0yii93z9i0k9sknfx7jkgy4rkw9l369fl7f73ghsiq";
1313 };
1414
15− buildInputs = [ python ];
15+ nativeBuildInputs = [ autoreconfHook makeWrapper ];
16+ buildInputs = [
17+ docker
18+ (python3.withPackages (ps: [ ps.lark-parser ps.requests ]))
19+ ];
20+
21+ configureFlags = let
22+ pythonEnv = python3.withPackages (ps: [ ps.lark-parser ps.requests ]);
23+ in [
24+ "--with-python=${pythonEnv}/bin/python3"
25+ ];
1626
1727 preConfigure = ''
18− substituteInPlace Makefile --replace '/bin/bash' '${stdenv.shell}'
1928 patchShebangs test/
29+ substituteInPlace configure.ac --replace "/usr/bin/env" "${coreutils}/bin/env"
2030 '';
2131
2232 makeFlags = [
@@ -24,12 +34,16 @@ stdenv.mkDerivation rec {
2434 "LIBEXEC_DIR=lib/charliecloud"
2535 ];
2636
37+ # Charliecloud calls some external system tools.
38+ # Here we wrap those deps so they are resolved inside nixpkgs.
2739 postInstall = ''
28− mkdir -p $out/share/charliecloud
29− mv $out/lib/charliecloud/examples $out/share/charliecloud
30− mv $out/lib/charliecloud/test $out/share/charliecloud
40+ for file in $out/bin/* ; do \
41+ wrapProgram $file --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils docker gnused gnutar gzip findutils sudo ]}
42+ done
3143 '';
3244
45+ passthru.tests.charliecloud = nixosTests.charliecloud;
46+
3347 meta = {
3448 description = "User-defined software stacks (UDSS) for high-performance computing (HPC) centers";
3549 longDescription = ''
pkgs/applications/virtualization/docker/default.nix+7−7
@@ -136,8 +136,13 @@ rec {
136136
137137 extraPath = optionals (stdenv.isLinux) (makeBinPath [ iproute iptables e2fsprogs xz xfsprogs procps utillinux git ]);
138138
139− installPhase = optionalString (stdenv.isLinux) ''
139+ installPhase = ''
140140 cd ./go/src/${goPackagePath}
141+ install -Dm755 ./components/cli/docker $out/libexec/docker/docker
142+
143+ makeWrapper $out/libexec/docker/docker $out/bin/docker \
144+ --prefix PATH : "$out/libexec/docker:$extraPath"
145+ '' + optionalString (stdenv.isLinux) ''
141146 install -Dm755 ./components/engine/bundles/dynbinary-daemon/dockerd $out/libexec/docker/dockerd
142147
143148 makeWrapper $out/libexec/docker/dockerd $out/bin/dockerd \
@@ -153,11 +158,6 @@ rec {
153158 # systemd
154159 install -Dm644 ./components/engine/contrib/init/systemd/docker.service $out/etc/systemd/system/docker.service
155160 '' + ''
156− install -Dm755 ./components/cli/docker $out/libexec/docker/docker
157−
158− makeWrapper $out/libexec/docker/docker $out/bin/docker \
159− --prefix PATH : "$out/libexec/docker:$extraPath"
160−
161161 # completion (cli)
162162 installShellCompletion --bash ./components/cli/contrib/completion/bash/docker
163163 installShellCompletion --fish ./components/cli/contrib/completion/fish/docker.fish
@@ -180,7 +180,7 @@ rec {
180180 '';
181181
182182 preFixup = ''
183− find $out -type f -exec remove-references-to -t ${go} -t ${stdenv.cc.cc} '{}' +
183+ find $out -type f -exec remove-references-to -t ${stdenv.cc.cc} '{}' +
184184 '' + optionalString (stdenv.isLinux) ''
185185 find $out -type f -exec remove-references-to -t ${stdenv.glibc.dev} '{}' +
186186 '';
pkgs/applications/virtualization/singularity/default.nix−4
@@ -67,10 +67,6 @@ buildGoPackage rec {
6767 runHook postInstall
6868 '';
6969
70− postFixup = ''
71− find $out/libexec/ -type f -executable -exec remove-references-to -t ${go} '{}' + || true
72− '';
73−
7470 meta = with stdenv.lib; {
7571 homepage = "http://www.sylabs.io/";
7672 description = "Application containers for linux";
pkgs/applications/window-managers/windowchef/default.nixnew file+27
@@ -0,0 +1,27 @@
1+{ stdenv, fetchFromGitHub, libxcb, libXrandr
2+, xcbutil, xcbutilkeysyms, xcbutilwm, xcbproto
3+}:
4+
5+stdenv.mkDerivation rec {
6+ pname = "windowchef";
7+ version = "0.5.0";
8+
9+ src = fetchFromGitHub {
10+ owner = "tudurom";
11+ repo = "windowchef";
12+ rev = "v${version}";
13+ sha256 = "02fvb8fxnkpzb0vpbsl6rf7ssdrvw6mlm43qvl2sxq7zb88zdw96";
14+ };
15+
16+ buildInputs = [ libxcb libXrandr xcbutil xcbutilkeysyms xcbutilwm xcbproto];
17+
18+ makeFlags = [ "PREFIX=$(out)" ];
19+
20+ meta = with stdenv.lib; {
21+ description = "A stacking window manager that cooks windows with orders from the Waitron";
22+ homepage = "https://github.com/tudurom/windowchef";
23+ maintainers = with maintainers; [ bhougland ];
24+ license = licenses.isc;
25+ platforms = platforms.linux;
26+ };
27+}
pkgs/build-support/kernel/modules-closure.sh+11−1
@@ -68,7 +68,17 @@ done
6868
6969mkdir -p $out/lib/firmware
7070for module in $(cat closure); do
71− for i in $(modinfo -F firmware $module); do
71+ # for builtin modules, modinfo will reply with a wrong output looking like:
72+ # $ modinfo -F firmware unix
73+ # name: unix
74+ #
75+ # There is a pending attempt to fix this:
76+ # https://github.com/NixOS/nixpkgs/pull/96153
77+ # https://lore.kernel.org/linux-modules/20200823215433.j5gc5rnsmahpf43v@blumerang/T/#u
78+ #
79+ # For now, the workaround is just to filter out the extraneous lines out
80+ # of its output.
81+ for i in $(modinfo -b $kernel --set-version "$version" -F firmware $module | grep -v '^name:'); do
7282 mkdir -p "$out/lib/firmware/$(dirname "$i")"
7383 echo "firmware for $module: $i"
7484 cp "$firmware/lib/firmware/$i" "$out/lib/firmware/$i" 2>/dev/null || if test -z "$allowMissing"; then exit 1; fi
pkgs/build-support/rust/fetchcrate.nix+5−2
@@ -1,10 +1,13 @@
11{ lib, fetchurl, unzip }:
22
3−{ crateName
3+{ crateName ? args.pname
4+, pname ? null
45, version
56, sha256
67, ... } @ args:
78
9+assert pname == null || pname == crateName;
10+
811lib.overrideDerivation (fetchurl ({
912
1013 name = "${crateName}-${version}.tar.gz";
@@ -30,6 +33,6 @@ lib.overrideDerivation (fetchurl ({
3033 fi
3134 mv "$unpackDir/$fn" "$out"
3235 '';
33−} // removeAttrs args [ "crateName" "version" ]))
36+} // removeAttrs args [ "crateName" "pname" "version" ]))
3437# Hackety-hack: we actually need unzip hooks, too
3538(x: {nativeBuildInputs = x.nativeBuildInputs++ [unzip];})
pkgs/data/fonts/noto-fonts/default.nix+24−12
@@ -6,11 +6,12 @@
66, fetchzip
77, optipng
88, cairo
9−, python3Packages
9+, python3
1010, pkgconfig
1111, pngquant
1212, which
1313, imagemagick
14+, zopfli
1415}:
1516
1617let
@@ -110,25 +111,36 @@ in
110111 };
111112
112113 noto-fonts-emoji = let
113− version = "unstable-2019-10-22";
114+ version = "unstable-2020-08-20";
115+ emojiPythonEnv =
116+ python3.withPackages (p: with p; [ fonttools nototools ]);
114117 in stdenv.mkDerivation {
115118 pname = "noto-fonts-emoji";
116119 inherit version;
117120
118121 src = fetchFromGitHub {
119− owner = "googlei18n";
122+ owner = "googlefonts";
120123 repo = "noto-emoji";
121− rev = "018aa149d622a4fea11f01c61a7207079da301bc";
122− sha256 = "0qmnnjpp5lza6g5m3ki6hj46p891h9vl42k3acd0qw8i0jj5yn2c";
124+ rev = "1bc491419fa2925d018f27bfe702792031be0e68";
125+ sha256 = "1vak4s1p4wlwzpnqfb1c2sg62q82gnjpnmqrfz8xl6bd0z55imzy";
123126 };
124127
125− buildInputs = [ cairo ];
126− nativeBuildInputs = [ pngquant optipng which cairo pkgconfig imagemagick ]
127− ++ (with python3Packages; [ python fonttools nototools ]);
128+ nativeBuildInputs = [
129+ cairo
130+ imagemagick
131+ zopfli
132+ pngquant
133+ which
134+ pkgconfig
135+ emojiPythonEnv
136+ ];
128137
129138 postPatch = ''
130− sed -i 's,^PNGQUANT :=.*,PNGQUANT := ${pngquant}/bin/pngquant,' Makefile
131− patchShebangs flag_glyph_name.py
139+ patchShebangs *.py
140+ patchShebangs third_party/color_emoji/*.py
141+ # remove check for virtualenv, since we handle
142+ # python requirements using python.withPackages
143+ sed -i '/ifndef VIRTUAL_ENV/,+2d' Makefile
132144 '';
133145
134146 enableParallelBuilding = true;
@@ -141,7 +153,7 @@ in
141153 meta = with lib; {
142154 inherit version;
143155 description = "Color and Black-and-White emoji fonts";
144− homepage = "https://github.com/googlei18n/noto-emoji";
156+ homepage = "https://github.com/googlefonts/noto-emoji";
145157 license = with licenses; [ ofl asl20 ];
146158 platforms = platforms.all;
147159 maintainers = with maintainers; [ mathnerd314 ];
@@ -165,7 +177,7 @@ in
165177
166178 meta = with stdenv.lib; {
167179 description = "Noto Emoji with extended Blob support";
168− homepage = https://github.com/C1710/blobmoji;
180+ homepage = "https://github.com/C1710/blobmoji";
169181 license = with licenses; [ ofl asl20 ];
170182 platforms = platforms.all;
171183 maintainers = with maintainers; [ rileyinman ];
pkgs/data/fonts/noto-fonts/tools.nix+46−16
@@ -1,32 +1,62 @@
1−{ fetchFromGitHub, lib, fetchpatch, buildPythonPackage, isPy3k, fonttools, numpy, pillow, six, bash }:
1+{ fetchFromGitHub, lib, buildPythonPackage, pythonOlder
2+, afdko, appdirs, attrs, black, booleanoperations, brotlipy, click
3+, defcon, fontmath, fontparts, fontpens, fonttools, fs, lxml
4+, mutatormath, pathspec, psautohint, pyclipper, pytz, regex, scour
5+, toml, typed-ast, ufonormalizer, ufoprocessor, unicodedata2, zopfli
6+, pillow, six, bash, setuptools_scm }:
27
38buildPythonPackage rec {
49 pname = "nototools";
5− version = "unstable-2019-10-21";
10+ version = "0.2.12";
11+
12+ disabled = pythonOlder "3.6";
613
714 src = fetchFromGitHub {
815 owner = "googlefonts";
916 repo = "nototools";
10− rev = "cae92ce958bee37748bf0602f5d7d97bb6db98ca";
11− sha256 = "1jqr0dz23rjqiyxw1w69l6ry16dwdcf3c6cysiy793g2v7pir2yi";
17+ rev = "v${version}";
18+ sha256 = "0drmx1asni3g6616fa4gjn5n43qkcf7icvxq9y2krpjxq78wcmc5";
1219 };
1320
14− propagatedBuildInputs = [ fonttools numpy ];
15−
16− patches = lib.optionals isPy3k [
17− # Additional Python 3 compat https://github.com/googlefonts/nototools/pull/497
18− (fetchpatch {
19− url = "https://github.com/googlefonts/nototools/commit/ded1f311b3260f015b5c5b80f05f7185392c4eff.patch";
20− sha256 = "0bn0rlbddxicw0h1dnl0cibgj6xjalja2qcm563y7kk3z5cdwhgq";
21− })
22− ];
23−
2421 postPatch = ''
25− sed -ie "s^join(_DATA_DIR_PATH,^join(\"$out/third_party/ucd\",^" nototools/unicode_data.py
22+ sed -i 's/use_scm_version=.*,/version="${version}",/' setup.py
2623 '';
2724
25+ nativeBuildInputs = [ setuptools_scm ];
26+
27+ propagatedBuildInputs = [
28+ afdko
29+ appdirs
30+ attrs
31+ black
32+ booleanoperations
33+ brotlipy
34+ click
35+ defcon
36+ fontmath
37+ fontparts
38+ fontpens
39+ fonttools
40+ lxml
41+ mutatormath
42+ pathspec
43+ psautohint
44+ pyclipper
45+ pytz
46+ regex
47+ scour
48+ toml
49+ typed-ast
50+ ufonormalizer
51+ ufoprocessor
52+ unicodedata2
53+ zopfli
54+ ];
55+
2856 checkInputs = [
29− pillow six bash
57+ pillow
58+ six
59+ bash
3060 ];
3161
3262 checkPhase = ''
pkgs/data/fonts/recursive/default.nix+3−3
@@ -1,12 +1,12 @@
11{ lib, fetchzip }:
22
33let
4− version = "1.059";
4+ version = "1.062";
55in
66fetchzip {
77 name = "recursive-${version}";
88
9− url = "https://github.com/arrowtype/recursive/releases/download/${version}/Recursive-${version}.zip";
9+ url = "https://github.com/arrowtype/recursive/releases/download/${version}/ArrowType-Recursive-${version}.zip";
1010
1111 postFetch = ''
1212 mkdir -p $out/share/fonts/
@@ -15,7 +15,7 @@ fetchzip {
1515 unzip -j $downloadedFile \*.woff2 -d $out/share/fonts/woff2
1616 '';
1717
18− sha256 = "0dlv8nrcqdn5vn3s918in5ph6kx6rg607kgp66p6ibpbg2s8ljy7";
18+ sha256 = "06qilfa0c897shh7m7rpwia02nay8cjwnizzzba27ylzy5pwd96r";
1919
2020 meta = with lib; {
2121 homepage = "https://recursive.design/";
pkgs/data/fonts/twitter-color-emoji/default.nix+10−15
@@ -3,9 +3,8 @@
33
44{ stdenv
55, fetchFromGitHub
6−, fetchpatch
76, cairo
8−, graphicsmagick
7+, imagemagick
98, pkg-config
109, pngquant
1110, python3
@@ -15,7 +14,7 @@
1514}:
1615
1716let
18− version = "12.1.5";
17+ version = "13.0.1";
1918
2019 twemojiSrc = fetchFromGitHub {
2120 name = "twemoji";
@@ -25,6 +24,9 @@ let
2524 sha256 = "0acinlv2l3s1jga2i9wh16mvgkxw4ipzgvjx8c80zd104lpdpgd9";
2625 };
2726
27+ pythonEnv =
28+ python3.withPackages (p: [ p.fonttools p.nototools ]);
29+
2830in
2931stdenv.mkDerivation rec {
3032 pname = "twitter-color-emoji";
@@ -44,23 +46,14 @@ stdenv.mkDerivation rec {
4446
4547 nativeBuildInputs = [
4648 cairo
47− graphicsmagick
49+ imagemagick
4850 pkg-config
4951 pngquant
50− python3
51− python3.pkgs.nototools
52+ pythonEnv
5253 which
5354 zopfli
5455 ];
5556
56− patches = [
57− # ImageMagick -> GraphicsMagick
58− (fetchpatch {
59− url = "https://src.fedoraproject.org/rpms/twitter-twemoji-fonts/raw/07778605d50696f6aa929020e82611a01d254c90/f/noto-emoji-use-gm.patch";
60− sha256 = "06vg16z79s5adyjy8r3mr8fd391b1hi4xkqvbzkmnjwaai7p08lk";
61− })
62− ];
63−
6457 postPatch = let
6558 templateSubstitutions = stdenv.lib.concatStringsSep "; " [
6659 ''s#Noto Color Emoji#Twitter Color Emoji#''
@@ -74,7 +67,7 @@ stdenv.mkDerivation rec {
7467 ''s#http://scripts.sil.org/OFL#http://creativecommons.org/licenses/by/4.0/#''
7568 ];
7669 in ''
77− patchShebangs ./flag_glyph_name.py
70+ ${noto-fonts-emoji.postPatch}
7871
7972 sed '${templateSubstitutions}' NotoColorEmoji.tmpl.ttx.tmpl > TwitterColorEmoji.tmpl.ttx.tmpl
8073 pushd ${twemojiSrc.name}/assets/72x72/
@@ -88,6 +81,8 @@ stdenv.mkDerivation rec {
8881 "EMOJI=TwitterColorEmoji"
8982 "EMOJI_SRC_DIR=${twemojiSrc.name}/assets/72x72"
9083 "BODY_DIMENSIONS=76x72"
84+ # twemoji contains some codepoints noto doesn't like
85+ "BYPASS_SEQUENCE_CHECK=True"
9186 ];
9287
9388 enableParallelBuilding = true;
pkgs/data/themes/marwaita/default.nix+2−2
@@ -8,13 +8,13 @@
88
99stdenv.mkDerivation rec {
1010 pname = "marwaita";
11− version = "7.4.3";
11+ version = "7.5.1";
1212
1313 src = fetchFromGitHub {
1414 owner = "darkomarko42";
1515 repo = pname;
1616 rev = version;
17− sha256 = "1g8xyv0najy4lpwa9xplx3ylxvn86dyi58j7qanc6r9yddy85ln9";
17+ sha256 = "0ig5wc6dkbly6yrvd13h4lyr8x0y7k3d9iv4rhg0pnjgcpna83mw";
1818 };
1919
2020 buildInputs = [
pkgs/data/themes/venta/default.nixnew file+47
@@ -0,0 +1,47 @@
1+{ stdenv
2+, fetchFromGitHub
3+, gdk-pixbuf
4+, gtk-engine-murrine
5+, gtk_engines
6+, librsvg
7+}:
8+
9+stdenv.mkDerivation rec {
10+ pname = "venta";
11+ version = "2020-08-20";
12+
13+ src = fetchFromGitHub {
14+ owner = "darkomarko42";
15+ repo = pname;
16+ rev = "f9b7ea560def5c9d25a14015d265ba559d3501ca";
17+ sha256 = "13rdavspz1q3zk2h04jpd77hxdcifg42kd71qq13ryg4b5yzqqgb";
18+ };
19+
20+ buildInputs = [
21+ gdk-pixbuf
22+ gtk_engines
23+ librsvg
24+ ];
25+
26+ propagatedUserEnvPkgs = [
27+ gtk-engine-murrine
28+ ];
29+
30+ dontBuild = true;
31+
32+ installPhase = ''
33+ runHook preInstall
34+ mkdir -p $out/share/themes
35+ cp -a Venta* $out/share/themes
36+ rm $out/share/themes/*/COPYING
37+ runHook postInstall
38+ '';
39+
40+ meta = with stdenv.lib; {
41+ description = "Gtk theme based on windows 10 style";
42+ homepage = "https://www.pling.com/p/1386774/";
43+ license = licenses.gpl3Only;
44+ platforms = platforms.unix;
45+ maintainers = [ maintainers.romildo ];
46+ };
47+}
pkgs/desktops/deepin/dde-api/default.nix−1
@@ -108,7 +108,6 @@ buildGoPackage rec {
108108 installPhase = ''
109109 make install PREFIX="$out" SYSTEMD_LIB_DIR="$out/lib" -C go/src/${goPackagePath}
110110 mv $out/share/gocode $out/share/go
111− remove-references-to -t ${go} $out/lib/deepin-api/*
112111 '';
113112
114113 postFixup = ''
pkgs/desktops/deepin/dde-daemon/default.nix−1
@@ -134,7 +134,6 @@ buildGoPackage rec {
134134
135135 installPhase = ''
136136 make install PREFIX="$out" -C go/src/${goPackagePath}
137− remove-references-to -t ${go} $out/lib/deepin-daemon/*
138137 searchHardCodedPaths $out
139138 '';
140139
pkgs/desktops/deepin/startdde/default.nix−1
@@ -139,7 +139,6 @@ buildGoPackage rec {
139139 installPhase = ''
140140 make install PREFIX="$out" -C go/src/${goPackagePath}
141141 rm -rf $out/share/lightdm # this is uselesss for NixOS
142− remove-references-to -t ${go} $out/sbin/*
143142 '';
144143
145144 postFixup = ''
pkgs/desktops/plasma-5/addons/caffeine-plus.nixnew file+32
@@ -0,0 +1,32 @@
1+{ lib, mkDerivation, fetchFromGitHub, extra-cmake-modules
2+, kwindowsystem, plasma-framework }:
3+
4+mkDerivation rec {
5+ pname = "plasma-applet-caffeine-plus";
6+ version = "1.4";
7+
8+ src = fetchFromGitHub {
9+ owner = "qunxyz";
10+ repo = pname;
11+ rev = "v${version}";
12+ sha256 = "sha256-/Nz0kSDGok7GjqSQtjH/8q/u6blVTFPO6kfjEyt/jEo=";
13+ };
14+
15+ buildInputs = [
16+ kwindowsystem plasma-framework
17+ ];
18+
19+ nativeBuildInputs = [ extra-cmake-modules ];
20+
21+ cmakeFlags = [
22+ "-Wno-dev"
23+ ];
24+
25+ meta = with lib; {
26+ description = "Disable screensaver and auto suspend";
27+ license = licenses.gpl2;
28+ maintainers = with maintainers; [ peterhoeg ];
29+ inherit (src.meta) homepage;
30+ inherit (kwindowsystem.meta) platforms;
31+ };
32+}
pkgs/desktops/plasma-5/khotkeys.nix+3−2
@@ -1,6 +1,7 @@
11{
2− mkDerivation,
2+ mkDerivation, lib,
33 extra-cmake-modules, kdoctools,
4+ qtbase,
45 kcmutils, kdbusaddons, kdelibs4support, kglobalaccel, ki18n, kio, kxmlgui,
56 plasma-framework, plasma-workspace, qtx11extras
67}:
@@ -13,5 +14,5 @@ mkDerivation {
1314 plasma-framework plasma-workspace qtx11extras
1415 ];
1516 outputs = [ "bin" "dev" "out" ];
16− enableParallelBuilding = false;
17+ meta.broken = lib.versionOlder qtbase.version "5.14";
1718}
pkgs/development/androidndk-pkgs/default.nix+30
@@ -30,4 +30,34 @@
3030 androidndk = androidComposition.ndk-bundle;
3131 targetAndroidndkPkgs = targetPackages.androidndkPkgs_18b;
3232 };
33+
34+ "21" =
35+ let
36+ ndkVersion = "21.0.6113669";
37+
38+ buildAndroidComposition = buildPackages.buildPackages.androidenv.composeAndroidPackages {
39+ includeNDK = true;
40+ inherit ndkVersion;
41+ };
42+
43+ androidComposition = androidenv.composeAndroidPackages {
44+ includeNDK = true;
45+ inherit ndkVersion;
46+ };
47+ in
48+ import ./androidndk-pkgs.nix {
49+ inherit (buildPackages)
50+ makeWrapper;
51+ inherit (pkgs)
52+ stdenv
53+ runCommand wrapBintoolsWith wrapCCWith;
54+ # buildPackages.foo rather than buildPackages.buildPackages.foo would work,
55+ # but for splicing messing up on infinite recursion for the variants we
56+ # *dont't* use. Using this workaround, but also making a test to ensure
57+ # these two really are the same.
58+ buildAndroidndk = buildAndroidComposition.ndk-bundle;
59+ androidndk = androidComposition.ndk-bundle;
60+ targetAndroidndkPkgs = targetPackages.androidndkPkgs_21;
61+ };
62+
3363}
pkgs/development/compilers/binaryen/0001-Get-rid-of-git-dependency.patchdeleted−38
@@ -1,38 +0,0 @@
1−From 1c6af6c68ba3f49ae9e942844c739e934339d3b9 Mon Sep 17 00:00:00 2001
2−From: Maximilian Bosch <maximilian@mbosch.me>
3−Date: Sat, 14 Mar 2020 00:37:31 +0100
4−Subject: [PATCH] Get rid of git dependency
5−
6−---
7− CMakeLists.txt | 15 +--------------
8− 1 file changed, 1 insertion(+), 14 deletions(-)
9−
10−diff --git a/CMakeLists.txt b/CMakeLists.txt
11−index 4acf703e1..4e9bd60b5 100644
12−--- a/CMakeLists.txt
13−+++ b/CMakeLists.txt
14−@@ -7,20 +7,7 @@ IF(NOT CMAKE_BUILD_TYPE)
15− SET(CMAKE_BUILD_TYPE "Release")
16− ENDIF()
17−
18−-FIND_PACKAGE(Git QUIET REQUIRED)
19−-EXECUTE_PROCESS(COMMAND
20−- "${GIT_EXECUTABLE}" --git-dir=${CMAKE_CURRENT_SOURCE_DIR}/.git describe --tags
21−- RESULT_VARIABLE
22−- GIT_HASH_RESULT
23−- OUTPUT_VARIABLE
24−- GIT_HASH
25−- OUTPUT_STRIP_TRAILING_WHITESPACE)
26−-IF(${GIT_HASH_RESULT})
27−- MESSAGE(WARNING "Error running git describe to determine version")
28−- SET(BINARYEN_VERSION_INFO "(unable to determine version)")
29−-ELSE()
30−- SET(BINARYEN_VERSION_INFO "${GIT_HASH}")
31−-ENDIF()
32−+SET(BINARYEN_VERSION_INFO "@emscriptenv@")
33− CONFIGURE_FILE(config.h.in config.h)
34−
35− OPTION(BUILD_STATIC_LIB "Build as a static library" OFF)
36−--
37−2.25.0
38−
pkgs/development/compilers/binaryen/default.nix+15−26
@@ -1,38 +1,23 @@
1−{ stdenv, cmake, python3, fetchFromGitHub, emscriptenRev ? null, substituteAll }:
2−
3−let
4− defaultVersion = "95";
5−
6− # Map from git revs to SHA256 hashes
7− sha256s = {
8− version_95 = "1w4js9bm5qv5aws8bzz4f0n3ni2l7h4fidkq9v5bldf0zxncy8m3";
9− "1.39.1" = "0ygm9m5322h4vfpf3j63q32qxk2l26yk62hh7dkb49j51zwl1y3y";
10− };
11−in
1+{ stdenv, cmake, python3, fetchFromGitHub, fetchpatch, emscripten }:
122
133stdenv.mkDerivation rec {
14− version = if emscriptenRev == null
15− then defaultVersion
16− else "emscripten-${emscriptenRev}";
17− rev = if emscriptenRev == null
18− then "version_${version}"
19− else emscriptenRev;
204 pname = "binaryen";
5+ version = "96";
216
227 src = fetchFromGitHub {
238 owner = "WebAssembly";
249 repo = "binaryen";
25− sha256 =
26− if builtins.hasAttr rev sha256s
27− then builtins.getAttr rev sha256s
28− else null;
29− inherit rev;
10+ rev = "version_${version}";
11+ sha256 = "1mqpb6yy87aifpbcy0lczi3bp6kddrwi6d0g6lrhjrdxx2kvbdag";
3012 };
3113
32− patches = stdenv.lib.optional (emscriptenRev != null) (substituteAll {
33− src = ./0001-Get-rid-of-git-dependency.patch;
34− emscriptenv = "1.39.1";
35− });
14+ patches = [
15+ # Adds --minimize-wasm-changes option required by emscripten 2.0.1
16+ (fetchpatch {
17+ url = "https://patch-diff.githubusercontent.com/raw/WebAssembly/binaryen/pull/3044.patch";
18+ sha256 = "1hdbc9h9zhh2d3bl4sqv6v9psfmny715612bwpjdln0ibdvc129s";
19+ })
20+ ];
3621
3722 nativeBuildInputs = [ cmake python3 ];
3823
@@ -43,4 +28,8 @@ stdenv.mkDerivation rec {
4328 maintainers = with maintainers; [ asppsa ];
4429 license = licenses.asl20;
4530 };
31+
32+ passthru.tests = {
33+ inherit emscripten;
34+ };
4635}
pkgs/development/compilers/closure/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "closure-compiler";
5− version = "20200614";
5+ version = "20200719";
66
77 src = fetchurl {
88 url = "https://dl.google.com/closure-compiler/compiler-${version}.tar.gz";
9− sha256 = "0a54y2d9nfg60knfv34kf6sdsh065dzam86l3wprf8gvqffxxcli";
9+ sha256 = "18095i98mk5kc1vpaf6gvmvhiyl2x4zrcwd7ix5l98jydldiz7wx";
1010 };
1111
1212 sourceRoot = ".";
pkgs/development/compilers/emscripten/default.nix+89−48
@@ -1,63 +1,104 @@
1−{ emscriptenVersion, stdenv, fetchFromGitHub, emscriptenfastcomp, python, nodejs, closurecompiler
2−, jre, binaryen, enableWasm ? true , cmake
1+{ stdenv, fetchFromGitHub, python3, nodejs, closurecompiler
2+, jre, binaryen
3+, llvmPackages_11
4+, symlinkJoin, makeWrapper
5+, mkYarnModules
36}:
47
5−let
6− rev = emscriptenVersion;
7− appdir = "share/emscripten";
8− binaryenVersioned = binaryen.override { emscriptenRev = rev; };
9−in
8+stdenv.mkDerivation rec {
9+ pname = "emscripten";
10+ version = "2.0.1";
1011
11−stdenv.mkDerivation {
12− name = "emscripten-${rev}";
12+ llvmEnv = symlinkJoin {
13+ name = "emscripten-llvm-${version}";
14+ paths = with llvmPackages_11; [ clang-unwrapped lld llvm ];
15+ };
16+
17+ nodeModules = mkYarnModules {
18+ name = "emscripten-node-modules-${version}";
19+ inherit pname version;
20+ # it is vitally important the the package.json has name and version fields
21+ packageJSON = ./package.json;
22+ yarnLock = ./yarn.lock;
23+ yarnNix = ./yarn.nix;
24+ };
1325
1426 src = fetchFromGitHub {
1527 owner = "emscripten-core";
1628 repo = "emscripten";
17− sha256 = "1j3f0hpy05qskaiyv75l7wv4n0nzxhrh9b296zchx3f6f9h2rghq";
18− inherit rev;
29+ sha256 = "06dsd819qjv4n2ihrz1mpn5aigmbv0gpkm7iw06wrqx30nzphnpk";
30+ rev = version;
1931 };
2032
21− buildInputs = [ nodejs cmake python ];
33+ nativeBuildInputs = [ makeWrapper ];
34+ buildInputs = [ nodejs python3 ];
35+
36+ buildPhase = ''
37+ patchShebangs .
2238
23− buildCommand = ''
24− mkdir -p $out/${appdir}
25− cp -r $src/* $out/${appdir}
26− chmod -R +w $out/${appdir}
27− grep -rl '^#!/usr.*python' $out/${appdir} | xargs sed -i -s 's@^#!/usr.*python.*@#!${python}/bin/python@'
28− sed -i -e "s,EM_CONFIG = '~/.emscripten',EM_CONFIG = '$out/${appdir}/config'," $out/${appdir}/tools/shared.py
29− sed -i -e 's,^.*did not see a source tree above the LLVM.*$, return True,' $out/${appdir}/tools/shared.py
30− sed -i -e 's,def check_sanity(force=False):,def check_sanity(force=False):\n return,' $out/${appdir}/tools/shared.py
3139 # fixes cmake support
32− sed -i -e "s/print \('emcc (Emscript.*\)/sys.stderr.write(\1); sys.stderr.flush()/g" $out/${appdir}/emcc.py
33− mkdir $out/bin
34− ln -s $out/${appdir}/{em++,em-config,emar,embuilder.py,emcc,emcmake,emconfigure,emlink.py,emmake,emranlib,emrun,emscons} $out/bin
35−
36− echo "EMSCRIPTEN_ROOT = '$out/${appdir}'" > $out/${appdir}/config
37− echo "LLVM_ROOT = '${emscriptenfastcomp}/bin'" >> $out/${appdir}/config
38− echo "PYTHON = '${python}/bin/python'" >> $out/${appdir}/config
39− echo "NODE_JS = '${nodejs}/bin/node'" >> $out/${appdir}/config
40− echo "JS_ENGINES = [NODE_JS]" >> $out/${appdir}/config
41− echo "COMPILER_ENGINE = NODE_JS" >> $out/${appdir}/config
42− echo "CLOSURE_COMPILER = '${closurecompiler}/share/java/closure-compiler-v${closurecompiler.version}.jar'" >> $out/${appdir}/config
43− echo "JAVA = '${jre}/bin/java'" >> $out/${appdir}/config
40+ sed -i -e "s/print \('emcc (Emscript.*\)/sys.stderr.write(\1); sys.stderr.flush()/g" emcc.py
41+
42+ # disables cache in user home, use installation directory instead
43+ sed -i '/^def/!s/root_is_writable()/True/' tools/shared.py
44+ sed -i "/^def check_sanity/a\\ return" tools/shared.py
45+
46+ # required for wasm2c
47+ ln -s ${nodeModules}/node_modules .
48+
49+ echo "EMSCRIPTEN_ROOT = '$appdir'" > .emscripten
50+ echo "LLVM_ROOT = '${llvmEnv}/bin'" >> .emscripten
51+ echo "NODE_JS = '${nodejs}/bin/node'" >> .emscripten
52+ echo "JS_ENGINES = [NODE_JS]" >> .emscripten
53+ echo "CLOSURE_COMPILER = ['${closurecompiler}/bin/closure-compiler']" >> .emscripten
54+ echo "JAVA = '${jre}/bin/java'" >> .emscripten
4455 # to make the test(s) below work
45− echo "SPIDERMONKEY_ENGINE = []" >> $out/${appdir}/config
46− ''
47− + stdenv.lib.optionalString enableWasm ''
48− echo "BINARYEN_ROOT = '${binaryenVersioned}'" >> $out/share/emscripten/config
49− ''
50− +
51− ''
52− echo "--------------- running test -----------------"
53− # quick hack to get the test working
54− HOME=$TMPDIR
55− cp $out/${appdir}/config $HOME/.emscripten
56− export PATH=$PATH:$out/bin
57−
58− #export EMCC_DEBUG=2
59− ${python}/bin/python $src/tests/runner.py test_hello_world
60− echo "--------------- /running test -----------------"
56+ # echo "SPIDERMONKEY_ENGINE = []" >> .emscripten
57+ echo "BINARYEN_ROOT = '${binaryen}'" >> .emscripten
58+
59+ # make emconfigure/emcmake use the correct (wrapped) binaries
60+ sed -i "s|^EMCC =.*|EMCC='$out/bin/emcc'|" tools/shared.py
61+ sed -i "s|^EMXX =.*|EMXX='$out/bin/em++'|" tools/shared.py
62+ sed -i "s|^EMAR =.*|EMAR='$out/bin/emar'|" tools/shared.py
63+ sed -i "s|^EMRANLIB =.*|EMRANLIB='$out/bin/emranlib'|" tools/shared.py
64+
65+ # The tests use the C compiler to compile generated C code,
66+ # use the wrapped compiler
67+ sed -i 's/shared.CLANG_CC/"cc"/' tests/runner.py
68+ '';
69+
70+ installPhase = ''
71+ appdir=$out/share/emscripten
72+ mkdir -p $appdir
73+ cp -r . $appdir
74+ chmod -R +w $appdir
75+
76+ mkdir -p $out/bin
77+ for b in em++ em-config emar embuilder.py emcc emcmake emconfigure emlink.py emmake emranlib emrun emscons; do
78+ makeWrapper $appdir/$b $out/bin/$b \
79+ --set NODE_PATH ${nodeModules}/node_modules \
80+ --set EM_EXCLUSIVE_CACHE_ACCESS 1 \
81+ --set PYTHON ${python3}/bin/python
82+ done
83+
84+ # precompile libc (etc.) in all variants:
85+ pushd $TMPDIR
86+ echo 'int main() { return 42; }' >test.c
87+ for LTO in -flto ""; do
88+ # wasm2c doesn't work with PIC
89+ $out/bin/emcc -s WASM2C -s STANDALONE_WASM $LTO test.c
90+
91+ for RELOCATABLE in "" "-s RELOCATABLE"; do
92+ $out/bin/emcc $RELOCATABLE $LTO test.c
93+ done
94+ done
95+ popd
96+
97+ export PYTHON=${python3}/bin/python
98+ export NODE_PATH=${nodeModules}/node_modules
99+ pushd $appdir
100+ python tests/runner.py test_hello_world
101+ popd
61102 '';
62103
63104 meta = with stdenv.lib; {
pkgs/development/compilers/emscripten/fastcomp/default.nixdeleted−28
@@ -1,28 +0,0 @@
1−{ newScope, stdenv, binutils, wrapCCWith, symlinkJoin }:
2−let
3− callPackage = newScope (self // {inherit stdenv;});
4−
5− self = {
6− emscriptenfastcomp-unwrapped = callPackage ./emscripten-fastcomp.nix {};
7− emscriptenfastcomp-wrapped = wrapCCWith {
8− cc = self.emscriptenfastcomp-unwrapped;
9− # Never want Apple's cctools for WASM target
10− bintools = binutils;
11− libc = stdenv.cc.libc;
12− extraBuildCommands = ''
13− # hardening flags break WASM support
14− cat > $out/nix-support/add-hardening.sh
15− '';
16− };
17− emscriptenfastcomp = symlinkJoin {
18− name = "emscriptenfastcomp-${stdenv.lib.getVersion self.emscriptenfastcomp-unwrapped}";
19− paths = [ self.emscriptenfastcomp-wrapped self.emscriptenfastcomp-unwrapped ];
20− preferLocalBuild = false;
21− allowSubstitutes = true;
22− postBuild = ''
23− # replace unwrapped clang-3.9 binary by wrapper
24− ln -sf $out/bin/clang $out/bin/clang-[0-9]*
25− '';
26− };
27− };
28−in self
pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nixdeleted−53
@@ -1,53 +0,0 @@
1−{ emscriptenVersion, stdenv, fetchFromGitHub, cmake, python, gtest, gccForLibs, ... }:
2−
3−let
4− rev = emscriptenVersion;
5−in
6−stdenv.mkDerivation rec {
7− name = "emscripten-fastcomp-${rev}";
8−
9− src = fetchFromGitHub {
10− owner = "emscripten-core";
11− repo = "emscripten-fastcomp";
12− sha256 = "0bd0l5k2fa4k0nax2cpxi003pqffqivx4z4m2j5xdha1a12sid8i";
13− inherit rev;
14− };
15−
16− srcFL = fetchFromGitHub {
17− owner = "emscripten-core";
18− repo = "emscripten-fastcomp-clang";
19− sha256 = "1iw2qplhp489qzw0rma73sab7asnm27g4m95sr36c6kq9cq6agri";
20− inherit rev;
21− };
22−
23− nativeBuildInputs = [ cmake python gtest ];
24− preConfigure = ''
25− cp -Lr ${srcFL} tools/clang
26− chmod +w -R tools/clang
27− '';
28− cmakeFlags = [
29− "-DCMAKE_BUILD_TYPE=Release"
30− "-DLLVM_TARGETS_TO_BUILD='X86;JSBackend'"
31− "-DLLVM_INCLUDE_EXAMPLES=OFF"
32− "-DLLVM_INCLUDE_TESTS=ON"
33− #"-DLLVM_CONFIG=${llvm}/bin/llvm-config"
34− "-DLLVM_BUILD_TESTS=ON"
35− "-DCLANG_INCLUDE_TESTS=ON"
36− ] ++ (stdenv.lib.optional stdenv.isLinux
37− # necessary for clang to find crtend.o
38− "-DGCC_INSTALL_PREFIX=${gccForLibs}"
39− );
40− enableParallelBuilding = true;
41−
42− passthru = {
43− isClang = true;
44− };
45−
46− meta = with stdenv.lib; {
47− homepage = "https://github.com/emscripten-core/emscripten-fastcomp";
48− description = "Emscripten LLVM";
49− platforms = platforms.all;
50− maintainers = with maintainers; [ qknight matthewbauer ];
51− license = stdenv.lib.licenses.ncsa;
52− };
53−}
pkgs/development/compilers/emscripten/package.jsonnew file+15
@@ -0,0 +1,15 @@
1+{
2+ "name": "emscripten",
3+ "version": "2.0.1",
4+ "private": true,
5+ "devDependencies": {
6+ "ws": "~0.4.28"
7+ },
8+ "dependencies": {
9+ "google-closure-compiler": "20200224.0.0",
10+ "html-minifier-terser": "5.0.2",
11+ "source-map": "0.5.6",
12+ "wasm2c": "1.0.0",
13+ "acorn": "7.3.1"
14+ }
15+}
pkgs/development/compilers/emscripten/yarn.locknew file+346
@@ -0,0 +1,346 @@
1+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
2+# yarn lockfile v1
3+
4+
5+acorn@7.3.1:
6+ version "7.3.1"
7+ resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.3.1.tgz#85010754db53c3fbaf3b9ea3e083aa5c5d147ffd"
8+ integrity sha512-tLc0wSnatxAQHVHUapaHdz72pi9KUyHjq5KyHjGg9Y8Ifdc79pTh2XvI6I1/chZbnM7QtNKzh66ooDogPZSleA==
9+
10+ansi-styles@^3.2.1:
11+ version "3.2.1"
12+ resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
13+ integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
14+ dependencies:
15+ color-convert "^1.9.0"
16+
17+buffer-from@^1.0.0:
18+ version "1.1.1"
19+ resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
20+ integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
21+
22+camel-case@^3.0.0:
23+ version "3.0.0"
24+ resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-3.0.0.tgz#ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73"
25+ integrity sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=
26+ dependencies:
27+ no-case "^2.2.0"
28+ upper-case "^1.1.1"
29+
30+chalk@2.x:
31+ version "2.4.2"
32+ resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
33+ integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
34+ dependencies:
35+ ansi-styles "^3.2.1"
36+ escape-string-regexp "^1.0.5"
37+ supports-color "^5.3.0"
38+
39+clean-css@^4.2.1:
40+ version "4.2.3"
41+ resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.3.tgz#507b5de7d97b48ee53d84adb0160ff6216380f78"
42+ integrity sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==
43+ dependencies:
44+ source-map "~0.6.0"
45+
46+clone-buffer@^1.0.0:
47+ version "1.0.0"
48+ resolved "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58"
49+ integrity sha1-4+JbIHrE5wGvch4staFnksrD3Fg=
50+
51+clone-stats@^1.0.0:
52+ version "1.0.0"
53+ resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-1.0.0.tgz#b3782dff8bb5474e18b9b6bf0fdfe782f8777680"
54+ integrity sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=
55+
56+clone@^2.1.1:
57+ version "2.1.2"
58+ resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
59+ integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=
60+
61+cloneable-readable@^1.0.0:
62+ version "1.1.3"
63+ resolved "https://registry.yarnpkg.com/cloneable-readable/-/cloneable-readable-1.1.3.tgz#120a00cb053bfb63a222e709f9683ea2e11d8cec"
64+ integrity sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ==
65+ dependencies:
66+ inherits "^2.0.1"
67+ process-nextick-args "^2.0.0"
68+ readable-stream "^2.3.5"
69+
70+color-convert@^1.9.0:
71+ version "1.9.3"
72+ resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
73+ integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
74+ dependencies:
75+ color-name "1.1.3"
76+
77+color-name@1.1.3:
78+ version "1.1.3"
79+ resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
80+ integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
81+
82+commander@^2.20.0:
83+ version "2.20.3"
84+ resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
85+ integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
86+
87+commander@^4.0.0:
88+ version "4.1.1"
89+ resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068"
90+ integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==
91+
92+commander@~2.1.0:
93+ version "2.1.0"
94+ resolved "https://registry.yarnpkg.com/commander/-/commander-2.1.0.tgz#d121bbae860d9992a3d517ba96f56588e47c6781"
95+ integrity sha1-0SG7roYNmZKj1Re6lvVliOR8Z4E=
96+
97+core-util-is@~1.0.0:
98+ version "1.0.2"
99+ resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
100+ integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
101+
102+escape-string-regexp@^1.0.5:
103+ version "1.0.5"
104+ resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
105+ integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
106+
107+google-closure-compiler-java@^20200224.0.0:
108+ version "20200224.0.0"
109+ resolved "https://registry.yarnpkg.com/google-closure-compiler-java/-/google-closure-compiler-java-20200224.0.0.tgz#03d71aefd0a07010fd8a7057d09c76f6729767bc"
110+ integrity sha512-palFcDoScauZjWIsGDzMK6h+IctcRb55I3wJX8Ko/DTSz72xwadRdKm0lGt8OoYL7SKEO+IjgD7s8XrAGpLnlQ==
111+
112+google-closure-compiler-js@^20200224.0.0:
113+ version "20200224.0.0"
114+ resolved "https://registry.yarnpkg.com/google-closure-compiler-js/-/google-closure-compiler-js-20200224.0.0.tgz#cf4b598abf7be686c683e530529756805b8af500"
115+ integrity sha512-70VKN0kbnTRtu2dqxDjWZQGfEQIHj7b7oUUCsYPO5oEXCDfgxNc13oYUJXvrTONLRWlHCNl/I8FNrVOwZ3gY/g==
116+
117+google-closure-compiler-linux@^20200224.0.0:
118+ version "20200224.0.0"
119+ resolved "https://registry.yarnpkg.com/google-closure-compiler-linux/-/google-closure-compiler-linux-20200224.0.0.tgz#d9608b224b4d8f38d4d34e99a24da54bca6b1902"
120+ integrity sha512-/BaE889EPrXWOKJVolA9++e99xBDMzeFBf7zF7nBB8PUmU5DlvtsoLL82xnT6nbZC1ktHaETlVx+vYGju8zKBQ==
121+
122+google-closure-compiler-osx@^20200224.0.0:
123+ version "20200224.0.0"
124+ resolved "https://registry.yarnpkg.com/google-closure-compiler-osx/-/google-closure-compiler-osx-20200224.0.0.tgz#aee62d8b878a662fc73b92419603168c0c3a35ed"
125+ integrity sha512-WXVNW9nPUqjvCe38mUIlBGEPVPCTKLtdaXC+q+kQdonkJFHNrpdyYWa746Y8cNP/byQyDNpPsqcKseZTLh17sQ==
126+
127+google-closure-compiler-windows@^20200224.0.0:
128+ version "20200224.0.0"
129+ resolved "https://registry.yarnpkg.com/google-closure-compiler-windows/-/google-closure-compiler-windows-20200224.0.0.tgz#cae323b898625ca57b0e87aaddde021a414dda58"
130+ integrity sha512-l6w2D8r9+GC9CQTAYEMAuNI996Zb6YV5qG7+FR0gCoL6h6S3Mc7mi87bafgwaicsVcmmHE/9kCBuW4ZyTMs5Fg==
131+
132+google-closure-compiler@20200224.0.0:
133+ version "20200224.0.0"
134+ resolved "https://registry.yarnpkg.com/google-closure-compiler/-/google-closure-compiler-20200224.0.0.tgz#ec0e708d9716a48e12fff43fe37fa5cec732a283"
135+ integrity sha512-V81dRYygdHbZtOtU16VX26xAdJBB1UZyfSg3OTzdNl3l/xEIx1D/L7TYUqjeTXsxcy+JruJ/UfUlIJAOaMRTog==
136+ dependencies:
137+ chalk "2.x"
138+ google-closure-compiler-java "^20200224.0.0"
139+ google-closure-compiler-js "^20200224.0.0"
140+ minimist "1.x"
141+ vinyl "2.x"
142+ vinyl-sourcemaps-apply "^0.2.0"
143+ optionalDependencies:
144+ google-closure-compiler-linux "^20200224.0.0"
145+ google-closure-compiler-osx "^20200224.0.0"
146+ google-closure-compiler-windows "^20200224.0.0"
147+
148+has-flag@^3.0.0:
149+ version "3.0.0"
150+ resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
151+ integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
152+
153+he@^1.2.0:
154+ version "1.2.0"
155+ resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
156+ integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
157+
158+html-minifier-terser@5.0.2:
159+ version "5.0.2"
160+ resolved "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-5.0.2.tgz#0e67a0b062ae1dd0719fc73199479298f807ae16"
161+ integrity sha512-VAaitmbBuHaPKv9bj47XKypRhgDxT/cDLvsPiiF7w+omrN3K0eQhpigV9Z1ilrmHa9e0rOYcD6R/+LCDADGcnQ==
162+ dependencies:
163+ camel-case "^3.0.0"
164+ clean-css "^4.2.1"
165+ commander "^4.0.0"
166+ he "^1.2.0"
167+ param-case "^2.1.1"
168+ relateurl "^0.2.7"
169+ terser "^4.3.9"
170+
171+inherits@^2.0.1, inherits@~2.0.3:
172+ version "2.0.4"
173+ resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
174+ integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
175+
176+isarray@~1.0.0:
177+ version "1.0.0"
178+ resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
179+ integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
180+
181+lower-case@^1.1.1:
182+ version "1.1.4"
183+ resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"
184+ integrity sha1-miyr0bno4K6ZOkv31YdcOcQujqw=
185+
186+minimist@1.x:
187+ version "1.2.5"
188+ resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
189+ integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
190+
191+nan@~1.0.0:
192+ version "1.0.0"
193+ resolved "https://registry.yarnpkg.com/nan/-/nan-1.0.0.tgz#ae24f8850818d662fcab5acf7f3b95bfaa2ccf38"
194+ integrity sha1-riT4hQgY1mL8q1rPfzuVv6oszzg=
195+
196+no-case@^2.2.0:
197+ version "2.3.2"
198+ resolved "https://registry.yarnpkg.com/no-case/-/no-case-2.3.2.tgz#60b813396be39b3f1288a4c1ed5d1e7d28b464ac"
199+ integrity sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==
200+ dependencies:
201+ lower-case "^1.1.1"
202+
203+options@>=0.0.5:
204+ version "0.0.6"
205+ resolved "https://registry.yarnpkg.com/options/-/options-0.0.6.tgz#ec22d312806bb53e731773e7cdaefcf1c643128f"
206+ integrity sha1-7CLTEoBrtT5zF3Pnza788cZDEo8=
207+
208+param-case@^2.1.1:
209+ version "2.1.1"
210+ resolved "https://registry.yarnpkg.com/param-case/-/param-case-2.1.1.tgz#df94fd8cf6531ecf75e6bef9a0858fbc72be2247"
211+ integrity sha1-35T9jPZTHs915r75oIWPvHK+Ikc=
212+ dependencies:
213+ no-case "^2.2.0"
214+
215+process-nextick-args@^2.0.0, process-nextick-args@~2.0.0:
216+ version "2.0.1"
217+ resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
218+ integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
219+
220+readable-stream@^2.3.5:
221+ version "2.3.7"
222+ resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
223+ integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
224+ dependencies:
225+ core-util-is "~1.0.0"
226+ inherits "~2.0.3"
227+ isarray "~1.0.0"
228+ process-nextick-args "~2.0.0"
229+ safe-buffer "~5.1.1"
230+ string_decoder "~1.1.1"
231+ util-deprecate "~1.0.1"
232+
233+relateurl@^0.2.7:
234+ version "0.2.7"
235+ resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"
236+ integrity sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=
237+
238+remove-trailing-separator@^1.0.1:
239+ version "1.1.0"
240+ resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
241+ integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8=
242+
243+replace-ext@^1.0.0:
244+ version "1.0.1"
245+ resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.1.tgz#2d6d996d04a15855d967443631dd5f77825b016a"
246+ integrity sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==
247+
248+safe-buffer@~5.1.0, safe-buffer@~5.1.1:
249+ version "5.1.2"
250+ resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
251+ integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
252+
253+source-map-support@~0.5.12:
254+ version "0.5.19"
255+ resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
256+ integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==
257+ dependencies:
258+ buffer-from "^1.0.0"
259+ source-map "^0.6.0"
260+
261+source-map@0.5.6:
262+ version "0.5.6"
263+ resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
264+ integrity sha1-dc449SvwczxafwwRjYEzSiu19BI=
265+
266+source-map@^0.5.1:
267+ version "0.5.7"
268+ resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
269+ integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
270+
271+source-map@^0.6.0, source-map@~0.6.0, source-map@~0.6.1:
272+ version "0.6.1"
273+ resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
274+ integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
275+
276+string_decoder@~1.1.1:
277+ version "1.1.1"
278+ resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
279+ integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
280+ dependencies:
281+ safe-buffer "~5.1.0"
282+
283+supports-color@^5.3.0:
284+ version "5.5.0"
285+ resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
286+ integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
287+ dependencies:
288+ has-flag "^3.0.0"
289+
290+terser@^4.3.9:
291+ version "4.8.0"
292+ resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz#63056343d7c70bb29f3af665865a46fe03a0df17"
293+ integrity sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==
294+ dependencies:
295+ commander "^2.20.0"
296+ source-map "~0.6.1"
297+ source-map-support "~0.5.12"
298+
299+tinycolor@0.x:
300+ version "0.0.1"
301+ resolved "https://registry.yarnpkg.com/tinycolor/-/tinycolor-0.0.1.tgz#320b5a52d83abb5978d81a3e887d4aefb15a6164"
302+ integrity sha1-MgtaUtg6u1l42Bo+iH1K77FaYWQ=
303+
304+upper-case@^1.1.1:
305+ version "1.1.3"
306+ resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598"
307+ integrity sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=
308+
309+util-deprecate@~1.0.1:
310+ version "1.0.2"
311+ resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
312+ integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
313+
314+vinyl-sourcemaps-apply@^0.2.0:
315+ version "0.2.1"
316+ resolved "https://registry.yarnpkg.com/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz#ab6549d61d172c2b1b87be5c508d239c8ef87705"
317+ integrity sha1-q2VJ1h0XLCsbh75cUI0jnI74dwU=
318+ dependencies:
319+ source-map "^0.5.1"
320+
321+vinyl@2.x:
322+ version "2.2.0"
323+ resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.2.0.tgz#d85b07da96e458d25b2ffe19fece9f2caa13ed86"
324+ integrity sha512-MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg==
325+ dependencies:
326+ clone "^2.1.1"
327+ clone-buffer "^1.0.0"
328+ clone-stats "^1.0.0"
329+ cloneable-readable "^1.0.0"
330+ remove-trailing-separator "^1.0.1"
331+ replace-ext "^1.0.0"
332+
333+wasm2c@1.0.0:
334+ version "1.0.0"
335+ resolved "https://registry.yarnpkg.com/wasm2c/-/wasm2c-1.0.0.tgz#761671e141c46b8a7c6c54429db1e6bfa3cd0ec0"
336+ integrity sha512-4SIESF2JNxrry6XFa/UQcsQibn+bxPkQ/oqixiXz2o8fsMl8J4vtvhH/evgbi8vZajAlaukuihEcQTWb9tVLUA==
337+
338+ws@~0.4.28:
339+ version "0.4.32"
340+ resolved "https://registry.yarnpkg.com/ws/-/ws-0.4.32.tgz#787a6154414f3c99ed83c5772153b20feb0cec32"
341+ integrity sha1-eHphVEFPPJntg8V3IVOyD+sM7DI=
342+ dependencies:
343+ commander "~2.1.0"
344+ nan "~1.0.0"
345+ options ">=0.0.5"
346+ tinycolor "0.x"
pkgs/development/compilers/emscripten/yarn.nixnew file+437
@@ -0,0 +1,437 @@
1+{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec {
2+ offline_cache = linkFarm "offline" packages;
3+ packages = [
4+ {
5+ name = "acorn___acorn_7.3.1.tgz";
6+ path = fetchurl {
7+ name = "acorn___acorn_7.3.1.tgz";
8+ url = "https://registry.yarnpkg.com/acorn/-/acorn-7.3.1.tgz";
9+ sha1 = "85010754db53c3fbaf3b9ea3e083aa5c5d147ffd";
10+ };
11+ }
12+ {
13+ name = "ansi_styles___ansi_styles_3.2.1.tgz";
14+ path = fetchurl {
15+ name = "ansi_styles___ansi_styles_3.2.1.tgz";
16+ url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz";
17+ sha1 = "41fbb20243e50b12be0f04b8dedbf07520ce841d";
18+ };
19+ }
20+ {
21+ name = "buffer_from___buffer_from_1.1.1.tgz";
22+ path = fetchurl {
23+ name = "buffer_from___buffer_from_1.1.1.tgz";
24+ url = "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz";
25+ sha1 = "32713bc028f75c02fdb710d7c7bcec1f2c6070ef";
26+ };
27+ }
28+ {
29+ name = "camel_case___camel_case_3.0.0.tgz";
30+ path = fetchurl {
31+ name = "camel_case___camel_case_3.0.0.tgz";
32+ url = "https://registry.yarnpkg.com/camel-case/-/camel-case-3.0.0.tgz";
33+ sha1 = "ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73";
34+ };
35+ }
36+ {
37+ name = "chalk___chalk_2.4.2.tgz";
38+ path = fetchurl {
39+ name = "chalk___chalk_2.4.2.tgz";
40+ url = "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz";
41+ sha1 = "cd42541677a54333cf541a49108c1432b44c9424";
42+ };
43+ }
44+ {
45+ name = "clean_css___clean_css_4.2.3.tgz";
46+ path = fetchurl {
47+ name = "clean_css___clean_css_4.2.3.tgz";
48+ url = "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.3.tgz";
49+ sha1 = "507b5de7d97b48ee53d84adb0160ff6216380f78";
50+ };
51+ }
52+ {
53+ name = "clone_buffer___clone_buffer_1.0.0.tgz";
54+ path = fetchurl {
55+ name = "clone_buffer___clone_buffer_1.0.0.tgz";
56+ url = "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz";
57+ sha1 = "e3e25b207ac4e701af721e2cb5a16792cac3dc58";
58+ };
59+ }
60+ {
61+ name = "clone_stats___clone_stats_1.0.0.tgz";
62+ path = fetchurl {
63+ name = "clone_stats___clone_stats_1.0.0.tgz";
64+ url = "https://registry.yarnpkg.com/clone-stats/-/clone-stats-1.0.0.tgz";
65+ sha1 = "b3782dff8bb5474e18b9b6bf0fdfe782f8777680";
66+ };
67+ }
68+ {
69+ name = "clone___clone_2.1.2.tgz";
70+ path = fetchurl {
71+ name = "clone___clone_2.1.2.tgz";
72+ url = "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz";
73+ sha1 = "1b7f4b9f591f1e8f83670401600345a02887435f";
74+ };
75+ }
76+ {
77+ name = "cloneable_readable___cloneable_readable_1.1.3.tgz";
78+ path = fetchurl {
79+ name = "cloneable_readable___cloneable_readable_1.1.3.tgz";
80+ url = "https://registry.yarnpkg.com/cloneable-readable/-/cloneable-readable-1.1.3.tgz";
81+ sha1 = "120a00cb053bfb63a222e709f9683ea2e11d8cec";
82+ };
83+ }
84+ {
85+ name = "color_convert___color_convert_1.9.3.tgz";
86+ path = fetchurl {
87+ name = "color_convert___color_convert_1.9.3.tgz";
88+ url = "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz";
89+ sha1 = "bb71850690e1f136567de629d2d5471deda4c1e8";
90+ };
91+ }
92+ {
93+ name = "color_name___color_name_1.1.3.tgz";
94+ path = fetchurl {
95+ name = "color_name___color_name_1.1.3.tgz";
96+ url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz";
97+ sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25";
98+ };
99+ }
100+ {
101+ name = "commander___commander_2.20.3.tgz";
102+ path = fetchurl {
103+ name = "commander___commander_2.20.3.tgz";
104+ url = "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz";
105+ sha1 = "fd485e84c03eb4881c20722ba48035e8531aeb33";
106+ };
107+ }
108+ {
109+ name = "commander___commander_4.1.1.tgz";
110+ path = fetchurl {
111+ name = "commander___commander_4.1.1.tgz";
112+ url = "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz";
113+ sha1 = "9fd602bd936294e9e9ef46a3f4d6964044b18068";
114+ };
115+ }
116+ {
117+ name = "commander___commander_2.1.0.tgz";
118+ path = fetchurl {
119+ name = "commander___commander_2.1.0.tgz";
120+ url = "https://registry.yarnpkg.com/commander/-/commander-2.1.0.tgz";
121+ sha1 = "d121bbae860d9992a3d517ba96f56588e47c6781";
122+ };
123+ }
124+ {
125+ name = "core_util_is___core_util_is_1.0.2.tgz";
126+ path = fetchurl {
127+ name = "core_util_is___core_util_is_1.0.2.tgz";
128+ url = "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz";
129+ sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7";
130+ };
131+ }
132+ {
133+ name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz";
134+ path = fetchurl {
135+ name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz";
136+ url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz";
137+ sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4";
138+ };
139+ }
140+ {
141+ name = "google_closure_compiler_java___google_closure_compiler_java_20200224.0.0.tgz";
142+ path = fetchurl {
143+ name = "google_closure_compiler_java___google_closure_compiler_java_20200224.0.0.tgz";
144+ url = "https://registry.yarnpkg.com/google-closure-compiler-java/-/google-closure-compiler-java-20200224.0.0.tgz";
145+ sha1 = "03d71aefd0a07010fd8a7057d09c76f6729767bc";
146+ };
147+ }
148+ {
149+ name = "google_closure_compiler_js___google_closure_compiler_js_20200224.0.0.tgz";
150+ path = fetchurl {
151+ name = "google_closure_compiler_js___google_closure_compiler_js_20200224.0.0.tgz";
152+ url = "https://registry.yarnpkg.com/google-closure-compiler-js/-/google-closure-compiler-js-20200224.0.0.tgz";
153+ sha1 = "cf4b598abf7be686c683e530529756805b8af500";
154+ };
155+ }
156+ {
157+ name = "google_closure_compiler_linux___google_closure_compiler_linux_20200224.0.0.tgz";
158+ path = fetchurl {
159+ name = "google_closure_compiler_linux___google_closure_compiler_linux_20200224.0.0.tgz";
160+ url = "https://registry.yarnpkg.com/google-closure-compiler-linux/-/google-closure-compiler-linux-20200224.0.0.tgz";
161+ sha1 = "d9608b224b4d8f38d4d34e99a24da54bca6b1902";
162+ };
163+ }
164+ {
165+ name = "google_closure_compiler_osx___google_closure_compiler_osx_20200224.0.0.tgz";
166+ path = fetchurl {
167+ name = "google_closure_compiler_osx___google_closure_compiler_osx_20200224.0.0.tgz";
168+ url = "https://registry.yarnpkg.com/google-closure-compiler-osx/-/google-closure-compiler-osx-20200224.0.0.tgz";
169+ sha1 = "aee62d8b878a662fc73b92419603168c0c3a35ed";
170+ };
171+ }
172+ {
173+ name = "google_closure_compiler_windows___google_closure_compiler_windows_20200224.0.0.tgz";
174+ path = fetchurl {
175+ name = "google_closure_compiler_windows___google_closure_compiler_windows_20200224.0.0.tgz";
176+ url = "https://registry.yarnpkg.com/google-closure-compiler-windows/-/google-closure-compiler-windows-20200224.0.0.tgz";
177+ sha1 = "cae323b898625ca57b0e87aaddde021a414dda58";
178+ };
179+ }
180+ {
181+ name = "google_closure_compiler___google_closure_compiler_20200224.0.0.tgz";
182+ path = fetchurl {
183+ name = "google_closure_compiler___google_closure_compiler_20200224.0.0.tgz";
184+ url = "https://registry.yarnpkg.com/google-closure-compiler/-/google-closure-compiler-20200224.0.0.tgz";
185+ sha1 = "ec0e708d9716a48e12fff43fe37fa5cec732a283";
186+ };
187+ }
188+ {
189+ name = "has_flag___has_flag_3.0.0.tgz";
190+ path = fetchurl {
191+ name = "has_flag___has_flag_3.0.0.tgz";
192+ url = "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz";
193+ sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd";
194+ };
195+ }
196+ {
197+ name = "he___he_1.2.0.tgz";
198+ path = fetchurl {
199+ name = "he___he_1.2.0.tgz";
200+ url = "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz";
201+ sha1 = "84ae65fa7eafb165fddb61566ae14baf05664f0f";
202+ };
203+ }
204+ {
205+ name = "html_minifier_terser___html_minifier_terser_5.0.2.tgz";
206+ path = fetchurl {
207+ name = "html_minifier_terser___html_minifier_terser_5.0.2.tgz";
208+ url = "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-5.0.2.tgz";
209+ sha1 = "0e67a0b062ae1dd0719fc73199479298f807ae16";
210+ };
211+ }
212+ {
213+ name = "inherits___inherits_2.0.4.tgz";
214+ path = fetchurl {
215+ name = "inherits___inherits_2.0.4.tgz";
216+ url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz";
217+ sha1 = "0fa2c64f932917c3433a0ded55363aae37416b7c";
218+ };
219+ }
220+ {
221+ name = "isarray___isarray_1.0.0.tgz";
222+ path = fetchurl {
223+ name = "isarray___isarray_1.0.0.tgz";
224+ url = "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz";
225+ sha1 = "bb935d48582cba168c06834957a54a3e07124f11";
226+ };
227+ }
228+ {
229+ name = "lower_case___lower_case_1.1.4.tgz";
230+ path = fetchurl {
231+ name = "lower_case___lower_case_1.1.4.tgz";
232+ url = "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz";
233+ sha1 = "9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac";
234+ };
235+ }
236+ {
237+ name = "minimist___minimist_1.2.5.tgz";
238+ path = fetchurl {
239+ name = "minimist___minimist_1.2.5.tgz";
240+ url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz";
241+ sha1 = "67d66014b66a6a8aaa0c083c5fd58df4e4e97602";
242+ };
243+ }
244+ {
245+ name = "nan___nan_1.0.0.tgz";
246+ path = fetchurl {
247+ name = "nan___nan_1.0.0.tgz";
248+ url = "https://registry.yarnpkg.com/nan/-/nan-1.0.0.tgz";
249+ sha1 = "ae24f8850818d662fcab5acf7f3b95bfaa2ccf38";
250+ };
251+ }
252+ {
253+ name = "no_case___no_case_2.3.2.tgz";
254+ path = fetchurl {
255+ name = "no_case___no_case_2.3.2.tgz";
256+ url = "https://registry.yarnpkg.com/no-case/-/no-case-2.3.2.tgz";
257+ sha1 = "60b813396be39b3f1288a4c1ed5d1e7d28b464ac";
258+ };
259+ }
260+ {
261+ name = "options___options_0.0.6.tgz";
262+ path = fetchurl {
263+ name = "options___options_0.0.6.tgz";
264+ url = "https://registry.yarnpkg.com/options/-/options-0.0.6.tgz";
265+ sha1 = "ec22d312806bb53e731773e7cdaefcf1c643128f";
266+ };
267+ }
268+ {
269+ name = "param_case___param_case_2.1.1.tgz";
270+ path = fetchurl {
271+ name = "param_case___param_case_2.1.1.tgz";
272+ url = "https://registry.yarnpkg.com/param-case/-/param-case-2.1.1.tgz";
273+ sha1 = "df94fd8cf6531ecf75e6bef9a0858fbc72be2247";
274+ };
275+ }
276+ {
277+ name = "process_nextick_args___process_nextick_args_2.0.1.tgz";
278+ path = fetchurl {
279+ name = "process_nextick_args___process_nextick_args_2.0.1.tgz";
280+ url = "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz";
281+ sha1 = "7820d9b16120cc55ca9ae7792680ae7dba6d7fe2";
282+ };
283+ }
284+ {
285+ name = "readable_stream___readable_stream_2.3.7.tgz";
286+ path = fetchurl {
287+ name = "readable_stream___readable_stream_2.3.7.tgz";
288+ url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz";
289+ sha1 = "1eca1cf711aef814c04f62252a36a62f6cb23b57";
290+ };
291+ }
292+ {
293+ name = "relateurl___relateurl_0.2.7.tgz";
294+ path = fetchurl {
295+ name = "relateurl___relateurl_0.2.7.tgz";
296+ url = "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz";
297+ sha1 = "54dbf377e51440aca90a4cd274600d3ff2d888a9";
298+ };
299+ }
300+ {
301+ name = "remove_trailing_separator___remove_trailing_separator_1.1.0.tgz";
302+ path = fetchurl {
303+ name = "remove_trailing_separator___remove_trailing_separator_1.1.0.tgz";
304+ url = "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz";
305+ sha1 = "c24bce2a283adad5bc3f58e0d48249b92379d8ef";
306+ };
307+ }
308+ {
309+ name = "replace_ext___replace_ext_1.0.1.tgz";
310+ path = fetchurl {
311+ name = "replace_ext___replace_ext_1.0.1.tgz";
312+ url = "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.1.tgz";
313+ sha1 = "2d6d996d04a15855d967443631dd5f77825b016a";
314+ };
315+ }
316+ {
317+ name = "safe_buffer___safe_buffer_5.1.2.tgz";
318+ path = fetchurl {
319+ name = "safe_buffer___safe_buffer_5.1.2.tgz";
320+ url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz";
321+ sha1 = "991ec69d296e0313747d59bdfd2b745c35f8828d";
322+ };
323+ }
324+ {
325+ name = "source_map_support___source_map_support_0.5.19.tgz";
326+ path = fetchurl {
327+ name = "source_map_support___source_map_support_0.5.19.tgz";
328+ url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz";
329+ sha1 = "a98b62f86dcaf4f67399648c085291ab9e8fed61";
330+ };
331+ }
332+ {
333+ name = "source_map___source_map_0.5.6.tgz";
334+ path = fetchurl {
335+ name = "source_map___source_map_0.5.6.tgz";
336+ url = "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz";
337+ sha1 = "75ce38f52bf0733c5a7f0c118d81334a2bb5f412";
338+ };
339+ }
340+ {
341+ name = "source_map___source_map_0.5.7.tgz";
342+ path = fetchurl {
343+ name = "source_map___source_map_0.5.7.tgz";
344+ url = "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz";
345+ sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc";
346+ };
347+ }
348+ {
349+ name = "source_map___source_map_0.6.1.tgz";
350+ path = fetchurl {
351+ name = "source_map___source_map_0.6.1.tgz";
352+ url = "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz";
353+ sha1 = "74722af32e9614e9c287a8d0bbde48b5e2f1a263";
354+ };
355+ }
356+ {
357+ name = "string_decoder___string_decoder_1.1.1.tgz";
358+ path = fetchurl {
359+ name = "string_decoder___string_decoder_1.1.1.tgz";
360+ url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz";
361+ sha1 = "9cf1611ba62685d7030ae9e4ba34149c3af03fc8";
362+ };
363+ }
364+ {
365+ name = "supports_color___supports_color_5.5.0.tgz";
366+ path = fetchurl {
367+ name = "supports_color___supports_color_5.5.0.tgz";
368+ url = "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz";
369+ sha1 = "e2e69a44ac8772f78a1ec0b35b689df6530efc8f";
370+ };
371+ }
372+ {
373+ name = "terser___terser_4.8.0.tgz";
374+ path = fetchurl {
375+ name = "terser___terser_4.8.0.tgz";
376+ url = "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz";
377+ sha1 = "63056343d7c70bb29f3af665865a46fe03a0df17";
378+ };
379+ }
380+ {
381+ name = "tinycolor___tinycolor_0.0.1.tgz";
382+ path = fetchurl {
383+ name = "tinycolor___tinycolor_0.0.1.tgz";
384+ url = "https://registry.yarnpkg.com/tinycolor/-/tinycolor-0.0.1.tgz";
385+ sha1 = "320b5a52d83abb5978d81a3e887d4aefb15a6164";
386+ };
387+ }
388+ {
389+ name = "upper_case___upper_case_1.1.3.tgz";
390+ path = fetchurl {
391+ name = "upper_case___upper_case_1.1.3.tgz";
392+ url = "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz";
393+ sha1 = "f6b4501c2ec4cdd26ba78be7222961de77621598";
394+ };
395+ }
396+ {
397+ name = "util_deprecate___util_deprecate_1.0.2.tgz";
398+ path = fetchurl {
399+ name = "util_deprecate___util_deprecate_1.0.2.tgz";
400+ url = "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz";
401+ sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf";
402+ };
403+ }
404+ {
405+ name = "vinyl_sourcemaps_apply___vinyl_sourcemaps_apply_0.2.1.tgz";
406+ path = fetchurl {
407+ name = "vinyl_sourcemaps_apply___vinyl_sourcemaps_apply_0.2.1.tgz";
408+ url = "https://registry.yarnpkg.com/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz";
409+ sha1 = "ab6549d61d172c2b1b87be5c508d239c8ef87705";
410+ };
411+ }
412+ {
413+ name = "vinyl___vinyl_2.2.0.tgz";
414+ path = fetchurl {
415+ name = "vinyl___vinyl_2.2.0.tgz";
416+ url = "https://registry.yarnpkg.com/vinyl/-/vinyl-2.2.0.tgz";
417+ sha1 = "d85b07da96e458d25b2ffe19fece9f2caa13ed86";
418+ };
419+ }
420+ {
421+ name = "wasm2c___wasm2c_1.0.0.tgz";
422+ path = fetchurl {
423+ name = "wasm2c___wasm2c_1.0.0.tgz";
424+ url = "https://registry.yarnpkg.com/wasm2c/-/wasm2c-1.0.0.tgz";
425+ sha1 = "761671e141c46b8a7c6c54429db1e6bfa3cd0ec0";
426+ };
427+ }
428+ {
429+ name = "ws___ws_0.4.32.tgz";
430+ path = fetchurl {
431+ name = "ws___ws_0.4.32.tgz";
432+ url = "https://registry.yarnpkg.com/ws/-/ws-0.4.32.tgz";
433+ sha1 = "787a6154414f3c99ed83c5772153b20feb0cec32";
434+ };
435+ }
436+ ];
437+}
pkgs/development/compilers/flutter/default.nix+1
@@ -6,6 +6,7 @@ let
66 let files = builtins.attrNames (builtins.readDir dir);
77 in map (f: dir + ("/" + f)) files;
88in {
9+ mkFlutter = mkFlutter;
910 stable = mkFlutter rec {
1011 pname = "flutter";
1112 channel = "stable";
pkgs/development/compilers/gcc/10/default.nix+9−6
@@ -11,7 +11,7 @@
1111, enableLTO ? true
1212, texinfo ? null
1313, perl ? null # optional, for texi2pod (then pod2man)
14−, gmp, mpfr, libmpc, gettext, which
14+, gmp, mpfr, libmpc, gettext, which, patchelf
1515, libelf # optional, for link-time optimizations (LTO)
1616, isl ? null # optional, for the Graphite optimization framework.
1717, zlib ? null
@@ -151,11 +151,14 @@ stdenv.mkDerivation ({
151151
152152 # For building runtime libs
153153 depsBuildTarget =
154− if hostPlatform == buildPlatform then [
155− targetPackages.stdenv.cc.bintools # newly-built gcc will be used
156− ] else assert targetPlatform == hostPlatform; [ # build != host == target
157− stdenv.cc
158− ];
154+ (
155+ if hostPlatform == buildPlatform then [
156+ targetPackages.stdenv.cc.bintools # newly-built gcc will be used
157+ ] else assert targetPlatform == hostPlatform; [ # build != host == target
158+ stdenv.cc
159+ ]
160+ )
161+ ++ optional targetPlatform.isLinux patchelf;
159162
160163 buildInputs = [
161164 gmp mpfr libmpc libelf
pkgs/development/compilers/gcc/4.8/default.nix+9−6
@@ -11,7 +11,7 @@
1111, enableLTO ? true
1212, texinfo ? null
1313, perl ? null # optional, for texi2pod (then pod2man); required for Java
14−, gmp, mpfr, libmpc, gettext, which
14+, gmp, mpfr, libmpc, gettext, which, patchelf
1515, libelf # optional, for link-time optimizations (LTO)
1616, cloog ? null, isl ? null # optional, for the Graphite optimization framework.
1717, zlib ? null, boehmgc ? null
@@ -160,11 +160,14 @@ stdenv.mkDerivation ({
160160
161161 # For building runtime libs
162162 depsBuildTarget =
163− if hostPlatform == buildPlatform then [
164− targetPackages.stdenv.cc.bintools # newly-built gcc will be used
165− ] else assert targetPlatform == hostPlatform; [ # build != host == target
166− stdenv.cc
167− ];
163+ (
164+ if hostPlatform == buildPlatform then [
165+ targetPackages.stdenv.cc.bintools # newly-built gcc will be used
166+ ] else assert targetPlatform == hostPlatform; [ # build != host == target
167+ stdenv.cc
168+ ]
169+ )
170+ ++ optional targetPlatform.isLinux patchelf;
168171
169172 buildInputs = [
170173 gmp mpfr libmpc libelf
pkgs/development/compilers/gcc/4.9/default.nix+9−6
@@ -11,7 +11,7 @@
1111, enableLTO ? true
1212, texinfo ? null
1313, perl ? null # optional, for texi2pod (then pod2man); required for Java
14−, gmp, mpfr, libmpc, gettext, which
14+, gmp, mpfr, libmpc, gettext, which, patchelf
1515, libelf # optional, for link-time optimizations (LTO)
1616, cloog ? null, isl ? null # optional, for the Graphite optimization framework.
1717, zlib ? null, boehmgc ? null
@@ -173,11 +173,14 @@ stdenv.mkDerivation ({
173173
174174 # For building runtime libs
175175 depsBuildTarget =
176− if hostPlatform == buildPlatform then [
177− targetPackages.stdenv.cc.bintools # newly-built gcc will be used
178− ] else assert targetPlatform == hostPlatform; [ # build != host == target
179− stdenv.cc
180− ];
176+ (
177+ if hostPlatform == buildPlatform then [
178+ targetPackages.stdenv.cc.bintools # newly-built gcc will be used
179+ ] else assert targetPlatform == hostPlatform; [ # build != host == target
180+ stdenv.cc
181+ ]
182+ )
183+ ++ optional targetPlatform.isLinux patchelf;
181184
182185 buildInputs = [
183186 gmp mpfr libmpc libelf
pkgs/development/compilers/gcc/6/default.nix+9−6
@@ -13,7 +13,7 @@
1313, texinfo ? null
1414, flex
1515, perl ? null # optional, for texi2pod (then pod2man); required for Java
16−, gmp, mpfr, libmpc, gettext, which
16+, gmp, mpfr, libmpc, gettext, which, patchelf
1717, libelf # optional, for link-time optimizations (LTO)
1818, isl ? null # optional, for the Graphite optimization framework.
1919, zlib ? null, boehmgc ? null
@@ -191,11 +191,14 @@ stdenv.mkDerivation ({
191191
192192 # For building runtime libs
193193 depsBuildTarget =
194− if hostPlatform == buildPlatform then [
195− targetPackages.stdenv.cc.bintools # newly-built gcc will be used
196− ] else assert targetPlatform == hostPlatform; [ # build != host == target
197− stdenv.cc
198− ];
194+ (
195+ if hostPlatform == buildPlatform then [
196+ targetPackages.stdenv.cc.bintools # newly-built gcc will be used
197+ ] else assert targetPlatform == hostPlatform; [ # build != host == target
198+ stdenv.cc
199+ ]
200+ )
201+ ++ optional targetPlatform.isLinux patchelf;
199202
200203 buildInputs = [
201204 gmp mpfr libmpc libelf
pkgs/development/compilers/gcc/7/default.nix+9−6
@@ -10,7 +10,7 @@
1010, enableLTO ? true
1111, texinfo ? null
1212, perl ? null # optional, for texi2pod (then pod2man)
13−, gmp, mpfr, libmpc, gettext, which
13+, gmp, mpfr, libmpc, gettext, which, patchelf
1414, libelf # optional, for link-time optimizations (LTO)
1515, isl ? null # optional, for the Graphite optimization framework.
1616, zlib ? null
@@ -158,11 +158,14 @@ stdenv.mkDerivation ({
158158
159159 # For building runtime libs
160160 depsBuildTarget =
161− if hostPlatform == buildPlatform then [
162− targetPackages.stdenv.cc.bintools # newly-built gcc will be used
163− ] else assert targetPlatform == hostPlatform; [ # build != host == target
164− stdenv.cc
165− ];
161+ (
162+ if hostPlatform == buildPlatform then [
163+ targetPackages.stdenv.cc.bintools # newly-built gcc will be used
164+ ] else assert targetPlatform == hostPlatform; [ # build != host == target
165+ stdenv.cc
166+ ]
167+ )
168+ ++ optional targetPlatform.isLinux patchelf;
166169
167170 buildInputs = [
168171 gmp mpfr libmpc libelf
pkgs/development/compilers/gcc/8/default.nix+9−6
@@ -10,7 +10,7 @@
1010, enableLTO ? true
1111, texinfo ? null
1212, perl ? null # optional, for texi2pod (then pod2man)
13−, gmp, mpfr, libmpc, gettext, which
13+, gmp, mpfr, libmpc, gettext, which, patchelf
1414, libelf # optional, for link-time optimizations (LTO)
1515, isl ? null # optional, for the Graphite optimization framework.
1616, zlib ? null
@@ -148,11 +148,14 @@ stdenv.mkDerivation ({
148148
149149 # For building runtime libs
150150 depsBuildTarget =
151− if hostPlatform == buildPlatform then [
152− targetPackages.stdenv.cc.bintools # newly-built gcc will be used
153− ] else assert targetPlatform == hostPlatform; [ # build != host == target
154− stdenv.cc
155− ];
151+ (
152+ if hostPlatform == buildPlatform then [
153+ targetPackages.stdenv.cc.bintools # newly-built gcc will be used
154+ ] else assert targetPlatform == hostPlatform; [ # build != host == target
155+ stdenv.cc
156+ ]
157+ )
158+ ++ optional targetPlatform.isLinux patchelf;
156159
157160 buildInputs = [
158161 gmp mpfr libmpc libelf
pkgs/development/compilers/gcc/9/default.nix+9−6
@@ -12,7 +12,7 @@
1212, enableLTO ? true
1313, texinfo ? null
1414, perl ? null # optional, for texi2pod (then pod2man)
15−, gmp, mpfr, libmpc, gettext, which
15+, gmp, mpfr, libmpc, gettext, which, patchelf
1616, libelf # optional, for link-time optimizations (LTO)
1717, isl ? null # optional, for the Graphite optimization framework.
1818, zlib ? null
@@ -158,11 +158,14 @@ stdenv.mkDerivation ({
158158
159159 # For building runtime libs
160160 depsBuildTarget =
161− if hostPlatform == buildPlatform then [
162− targetPackages.stdenv.cc.bintools # newly-built gcc will be used
163− ] else assert targetPlatform == hostPlatform; [ # build != host == target
164− stdenv.cc
165− ];
161+ (
162+ if hostPlatform == buildPlatform then [
163+ targetPackages.stdenv.cc.bintools # newly-built gcc will be used
164+ ] else assert targetPlatform == hostPlatform; [ # build != host == target
165+ stdenv.cc
166+ ]
167+ )
168+ ++ optional targetPlatform.isLinux patchelf;
166169
167170 buildInputs = [
168171 gmp mpfr libmpc libelf
pkgs/development/compilers/gcc/builder.sh+11−1
@@ -241,7 +241,7 @@ postInstall() {
241241 # More dependencies with the previous gcc or some libs (gccbug stores the build command line)
242242 rm -rf $out/bin/gccbug
243243
244− if type "patchelf"; then
244+ if [[ buildConfig == *"linux"* ]]; then
245245 # Take out the bootstrap-tools from the rpath, as it's not needed at all having $out
246246 for i in $(find "$out"/libexec/gcc/*/*/* -type f -a \! -name '*.la'); do
247247 PREV_RPATH=`patchelf --print-rpath "$i"`
@@ -250,6 +250,16 @@ postInstall() {
250250 done
251251 fi
252252
253+ if [[ targetConfig == *"linux"* ]]; then
254+ # For some reason, when building for linux on darwin, the libs retain
255+ # RPATH to $out.
256+ for i in "$lib"/"$targetConfig"/lib/{libtsan,libasan,libubsan}.so.*.*.*; do
257+ PREV_RPATH=`patchelf --print-rpath "$i"`
258+ NEW_RPATH=`echo "$PREV_RPATH" | sed "s,:${out}[^:]*,,g"`
259+ patchelf --set-rpath "$NEW_RPATH" "$i" && echo OK
260+ done
261+ fi
262+
253263 if type "install_name_tool"; then
254264 for i in "${!outputLib}"/lib/*.*.dylib; do
255265 install_name_tool -id "$i" "$i" || true
pkgs/development/compilers/ghc/8.10.1.nix+9−2
@@ -62,8 +62,15 @@ let
6262 endif
6363 DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
6464 INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"}
65− '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
66− Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"}
65+ ''
66+ # We only need to build stage1 on most cross-compilation because
67+ # we will be running the compiler on the native system. In some
68+ # situations, like native Musl compilation, we need the compiler
69+ # to actually link to our new Libc. The iOS simulator is a special
70+ # exception because we can’t actually run simulators binaries
71+ # ourselves.
72+ + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
73+ Stage1Only = ${if (targetPlatform.system == hostPlatform.system && !targetPlatform.isiOS) then "NO" else "YES"}
6774 CrossCompilePrefix = ${targetPrefix}
6875 HADDOCK_DOCS = NO
6976 BUILD_SPHINX_HTML = NO
pkgs/development/compilers/ghc/8.6.5.nix+9−2
@@ -59,8 +59,15 @@ let
5959 endif
6060 DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
6161 INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"}
62− '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
63− Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"}
62+ ''
63+ # We only need to build stage1 on most cross-compilation because
64+ # we will be running the compiler on the native system. In some
65+ # situations, like native Musl compilation, we need the compiler
66+ # to actually link to our new Libc. The iOS simulator is a special
67+ # exception because we can’t actually run simulators binaries
68+ # ourselves.
69+ + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
70+ Stage1Only = ${if (targetPlatform.system == hostPlatform.system && !targetPlatform.isiOS) then "NO" else "YES"}
6471 CrossCompilePrefix = ${targetPrefix}
6572 HADDOCK_DOCS = NO
6673 BUILD_SPHINX_HTML = NO
pkgs/development/compilers/ghc/8.8.2.nix+9−2
@@ -59,8 +59,15 @@ let
5959 endif
6060 DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
6161 INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"}
62− '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
63− Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"}
62+ ''
63+ # We only need to build stage1 on most cross-compilation because
64+ # we will be running the compiler on the native system. In some
65+ # situations, like native Musl compilation, we need the compiler
66+ # to actually link to our new Libc. The iOS simulator is a special
67+ # exception because we can’t actually run simulators binaries
68+ # ourselves.
69+ + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
70+ Stage1Only = ${if (targetPlatform.system == hostPlatform.system && !targetPlatform.isiOS) then "NO" else "YES"}
6471 CrossCompilePrefix = ${targetPrefix}
6572 HADDOCK_DOCS = NO
6673 BUILD_SPHINX_HTML = NO
pkgs/development/compilers/ghc/8.8.3.nix+9−2
@@ -62,8 +62,15 @@ let
6262 endif
6363 DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
6464 INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"}
65− '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
66− Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"}
65+ ''
66+ # We only need to build stage1 on most cross-compilation because
67+ # we will be running the compiler on the native system. In some
68+ # situations, like native Musl compilation, we need the compiler
69+ # to actually link to our new Libc. The iOS simulator is a special
70+ # exception because we can’t actually run simulators binaries
71+ # ourselves.
72+ + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
73+ Stage1Only = ${if (targetPlatform.system == hostPlatform.system && !targetPlatform.isiOS) then "NO" else "YES"}
6774 CrossCompilePrefix = ${targetPrefix}
6875 HADDOCK_DOCS = NO
6976 BUILD_SPHINX_HTML = NO
pkgs/development/compilers/ghc/8.8.4.nix+9−2
@@ -62,8 +62,15 @@ let
6262 endif
6363 DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
6464 INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"}
65− '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
66− Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"}
65+ ''
66+ # We only need to build stage1 on most cross-compilation because
67+ # we will be running the compiler on the native system. In some
68+ # situations, like native Musl compilation, we need the compiler
69+ # to actually link to our new Libc. The iOS simulator is a special
70+ # exception because we can’t actually run simulators binaries
71+ # ourselves.
72+ + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
73+ Stage1Only = ${if (targetPlatform.system == hostPlatform.system && !targetPlatform.isiOS) then "NO" else "YES"}
6774 CrossCompilePrefix = ${targetPrefix}
6875 HADDOCK_DOCS = NO
6976 BUILD_SPHINX_HTML = NO
pkgs/development/compilers/ghc/head.nix+4−4
@@ -38,7 +38,7 @@
3838, # Whether to build terminfo.
3939 enableTerminfo ? !stdenv.targetPlatform.isWindows
4040
41−, version ? "8.11.20200731"
41+, version ? "8.11.20200824"
4242, # What flavour to build. An empty string indicates no
4343 # specific flavour and falls back to ghc default values.
4444 ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
@@ -69,7 +69,7 @@ let
6969 DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
7070 BIGNUM_BACKEND = ${if enableNativeBignum then "native" else "gmp"}
7171 '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
72− Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"}
72+ Stage1Only = ${if (targetPlatform.system == hostPlatform.system && !targetPlatform.isiOS) then "NO" else "YES"}
7373 CrossCompilePrefix = ${targetPrefix}
7474 HADDOCK_DOCS = NO
7575 BUILD_SPHINX_HTML = NO
@@ -110,8 +110,8 @@ stdenv.mkDerivation (rec {
110110
111111 src = fetchgit {
112112 url = "https://gitlab.haskell.org/ghc/ghc.git/";
113− rev = "380638a33691ba43fdcd2e18bca636750e5f66f1";
114− sha256 = "029cgiyhddvwnx5zx31i0vgj13zsvzb8fna99zr6ifscz6x7rid1";
113+ rev = "3f50154591ada9064351ccec4adfe6df53ca2439";
114+ sha256 = "1w2p5bc74aswspzvgvrhcb95hvj5ky38rgqqjvrri19z2qyiky6d";
115115 };
116116
117117 enableParallelBuilding = true;
pkgs/development/compilers/ghcjs-ng/8.6/dep-overrides.nix+5−2
@@ -1,11 +1,14 @@
11{ haskellLib }:
22
3−let inherit (haskellLib) doJailbreak dontHaddock;
3+let inherit (haskellLib) doJailbreak dontHaddock dontCheck;
44in self: super: {
5+ ghcjs = super.ghcjs.override {
6+ shelly = super.shelly_1_8_1;
7+ };
58 ghc-api-ghcjs = super.ghc-api-ghcjs.override
69 {
710 happy = self.happy_1_19_5;
811 };
9− haddock-library-ghcjs = doJailbreak super.haddock-library-ghcjs;
12+ haddock-library-ghcjs = doJailbreak (dontCheck super.haddock-library-ghcjs);
1013 haddock-api-ghcjs = doJailbreak (dontHaddock super.haddock-api-ghcjs);
1114}
pkgs/development/compilers/ghcjs-ng/default.nix+1−2
@@ -102,7 +102,6 @@ in stdenv.mkDerivation {
102102
103103 inherit passthru;
104104
105− meta.broken = true; # build does not succeed
106− meta.platforms = lib.platforms.none; # passthru.bootPkgs.ghc.meta.platforms;
105+ meta.platforms = passthru.bootPkgs.ghc.meta.platforms;
107106 meta.maintainers = [lib.maintainers.elvishjerricco];
108107 }
pkgs/development/compilers/kcc/default.nixnew file+25
@@ -0,0 +1,25 @@
1+{ stdenv, fetchFromGitHub, cmake, bison, flex, boost }:
2+
3+stdenv.mkDerivation rec {
4+ pname = "kcc";
5+
6+ version = "4.0.0";
7+
8+ src = fetchFromGitHub {
9+ owner = "KnightOS";
10+ repo = "kcc";
11+ rev = version;
12+ sha256 = "1cd226nqbxq32mppkljavq1kb74jqfqns9r7fskszr42hbygynk4";
13+ };
14+
15+ nativeBuildInputs = [ cmake bison flex ];
16+
17+ buildInputs = [ boost ];
18+
19+ meta = with stdenv.lib; {
20+ homepage = "https://knightos.org/";
21+ description = "KnightOS C compiler";
22+ license = licenses.gpl2Plus;
23+ maintainers = with maintainers; [ siraben ];
24+ };
25+}
pkgs/development/compilers/sagittarius-scheme/default.nix+2−2
@@ -16,10 +16,10 @@ let platformLdLibraryPath = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH"
1616in
1717stdenv.mkDerivation rec {
1818 pname = "sagittarius-scheme";
19− version = "0.9.6";
19+ version = "0.9.7";
2020 src = fetchurl {
2121 url = "https://bitbucket.org/ktakashi/${pname}/downloads/sagittarius-${version}.tar.gz";
22− sha256 = "03nvvvfd4gdlvq244zpnikxxajp6w8jj3ymw4bcq83x7zilb2imr";
22+ sha256 = "18pjj6f5qvixv5hbl1k4d3jqfcmi9qyx0gz0cjwrzpxa8brpwld8";
2323 };
2424 preBuild = ''
2525 # since we lack rpath during build, need to explicitly add build path
pkgs/development/coq-modules/gappalib/default.nix+4−4
@@ -1,10 +1,10 @@
11{ stdenv, fetchurl, which, coq, flocq }:
22
33stdenv.mkDerivation {
4− name = "coq${coq.coq-version}-gappalib-1.4.3";
4+ name = "coq${coq.coq-version}-gappalib-1.4.4";
55 src = fetchurl {
6− url = "https://gforge.inria.fr/frs/download.php/file/38302/gappalib-coq-1.4.3.tar.gz";
7− sha256 = "108k9dks04wbcqz38pf0zz11hz5imbzimpnkgjrk5gp1hifih370";
6+ url = "https://gforge.inria.fr/frs/download.php/file/38338/gappalib-coq-1.4.4.tar.gz";
7+ sha256 = "1ds9qp3ml07w5ali0rsczlwgdx4xcgasgbcnpi2lssgj1xpxgfpn";
88 };
99
1010 nativeBuildInputs = [ which ];
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
2424 };
2525
2626 passthru = {
27− compatibleCoqVersions = stdenv.lib.flip builtins.elem [ "8.8" "8.9" "8.10" "8.11" ];
27+ compatibleCoqVersions = stdenv.lib.flip builtins.elem [ "8.8" "8.9" "8.10" "8.11" "8.12" ];
2828 };
2929
3030}
pkgs/development/go-modules/generic/default.nix+1−1
@@ -235,7 +235,7 @@ let
235235 '';
236236
237237 preFixup = (args.preFixup or "") + ''
238− find $out/bin -type f -exec ${removeExpr removeReferences} '{}' + || true
238+ find $out/{bin,libexec,lib} -type f 2>/dev/null | xargs -r ${removeExpr removeReferences} || true
239239 '';
240240
241241 strictDeps = true;
pkgs/development/go-packages/generic/default.nix+1−2
@@ -211,8 +211,7 @@ let
211211 '';
212212
213213 preFixup = preFixup + ''
214− find $out/bin -type f -exec ${removeExpr removeReferences} '{}' + || true
215− find $out/libexec -type f -exec ${removeExpr removeReferences} '{}' + || true
214+ find $out/{bin,libexec,lib} -type f 2>/dev/null | xargs -r ${removeExpr removeReferences} || true
216215 '';
217216
218217 strictDeps = true;
pkgs/development/haskell-modules/configuration-common.nix+29−15
@@ -375,6 +375,7 @@ self: super: {
375375 tickle = dontCheck super.tickle;
376376 tpdb = dontCheck super.tpdb;
377377 translatable-intset = dontCheck super.translatable-intset;
378+ trifecta = if pkgs.stdenv.hostPlatform.isAarch64 then dontCheck super.trifecta else super.trifecta; # affected by this bug https://gitlab.haskell.org/ghc/ghc/-/issues/15275#note_295461
378379 ua-parser = dontCheck super.ua-parser;
379380 unagi-chan = dontCheck super.unagi-chan;
380381 wai-logger = dontCheck super.wai-logger;
@@ -920,7 +921,12 @@ self: super: {
920921 # Generate cli completions for dhall.
921922 dhall = generateOptparseApplicativeCompletion "dhall" super.dhall;
922923 dhall-json = generateOptparseApplicativeCompletions ["dhall-to-json" "dhall-to-yaml"] super.dhall-json;
923− dhall-nix = generateOptparseApplicativeCompletion "dhall-to-nix" (super.dhall-nix);
924+ dhall-nix = generateOptparseApplicativeCompletion "dhall-to-nix" (
925+ super.dhall-nix.overrideScope (self: super: {
926+ dhall = super.dhall_1_34_0;
927+ repline = self.repline_0_4_0_0;
928+ haskeline = self.haskeline_0_8_1_0;
929+ }));
924930
925931 # https://github.com/haskell-hvr/netrc/pull/2#issuecomment-469526558
926932 netrc = doJailbreak super.netrc;
@@ -1155,13 +1161,6 @@ self: super: {
11551161 # 2020-06-22: NOTE: QuickCheck upstreamed https://github.com/phadej/binary-instances/issues/7
11561162 binary-instances = dontCheck super.binary-instances;
11571163
1158− # Disabling the test suite lets the build succeed on older CPUs
1159− # that are unable to run the generated library because they
1160− # lack support for AES-NI, like some of our Hydra build slaves
1161− # do. See https://github.com/NixOS/nixpkgs/issues/81915 for
1162− # details.
1163− cryptonite = dontCheck super.cryptonite;
1164−
11651164 # The test suite depends on an impure cabal-install installation in
11661165 # $HOME, which we don't have in our build sandbox.
11671166 cabal-install-parsers = dontCheck super.cabal-install-parsers;
@@ -1333,6 +1332,12 @@ self: super: {
13331332 # https://github.com/ennocramer/monad-dijkstra/issues/4
13341333 monad-dijkstra = dontCheck (doJailbreak super.monad-dijkstra);
13351334
1335+ # Fixed upstream but not released to Hackage yet:
1336+ # https://github.com/k0001/hs-libsodium/issues/2
1337+ libsodium = overrideCabal super.libsodium (drv: {
1338+ libraryToolDepends = (drv.libraryToolDepends or []) ++ [self.c2hs];
1339+ });
1340+
13361341 # https://github.com/kowainik/policeman/issues/57
13371342 policeman = doJailbreak super.policeman;
13381343
@@ -1415,12 +1420,12 @@ self: super: {
14151420 });
14161421
14171422 # Testsuite trying to run `which haskeline-examples-Test`
1418− haskeline_0_8_0_0 = dontCheck super.haskeline_0_8_0_0;
1423+ haskeline_0_8_1_0 = dontCheck super.haskeline_0_8_1_0;
14191424
14201425 # Requires repline 0.4 which is the default only for ghc8101, override for the rest
14211426 zre = super.zre.override {
14221427 repline = self.repline_0_4_0_0.override {
1423− haskeline = self.haskeline_0_8_0_0;
1428+ haskeline = self.haskeline_0_8_1_0;
14241429 };
14251430 };
14261431
@@ -1441,26 +1446,35 @@ self: super: {
14411446
14421447 # Tests rely on `Int` being 64-bit: https://github.com/hspec/hspec/issues/431.
14431448 # Also, we need QuickCheck-2.14.x to build the test suite, which isn't easy in LTS-16.x.
1444− # So let's not go there any just disable the tests altogether.
1449+ # So let's not go there and just disable the tests altogether.
14451450 hspec-core = dontCheck super.hspec-core;
14461451
1452+ # github.com/ucsd-progsys/liquidhaskell/issues/1729
1453+ liquidhaskell = super.liquidhaskell.override { Diff = self.Diff_0_3_4; };
1454+ Diff_0_3_4 = dontCheck super.Diff_0_3_4;
1455+
1456+ # We want the latest version of cryptonite. This is a first step towards
1457+ # resolving https://github.com/NixOS/nixpkgs/issues/81915.
1458+ cryptonite = self.cryptonite_0_27;
1459+
14471460 # INSERT NEW OVERRIDES ABOVE THIS LINE
14481461
14491462} // (let
14501463 hlsScopeOverride = self: super: {
14511464 # haskell-language-server uses its own fork of ghcide
14521465 # Test disabled: it seems to freeze (is it just that it takes a long time ?)
1453− ghcide = dontCheck self.hls-ghcide;
1466+ ghcide = dontCheck super.hls-ghcide;
14541467 # we are faster than stack here
1455− hie-bios = dontCheck self.hie-bios_0_6_2;
1456− lsp-test = dontCheck self.lsp-test_0_11_0_4;
1468+ hie-bios = dontCheck super.hie-bios_0_7_0;
1469+ lsp-test = dontCheck super.lsp-test_0_11_0_4;
14571470 # fourmolu can‘t compile with an older aeson
14581471 aeson = dontCheck super.aeson_1_5_2_0;
14591472 # brittany has an aeson upper bound of 1.5
14601473 brittany = doJailbreak super.brittany;
14611474 };
14621475 in {
1463− haskell-language-server = dontCheck (super.haskell-language-server.overrideScope hlsScopeOverride);
1476+ # jailbreaking for hie-bios 0.7.0 (upstream PR: https://github.com/haskell/haskell-language-server/pull/357)
1477+ haskell-language-server = dontCheck (doJailbreak (super.haskell-language-server.overrideScope hlsScopeOverride));
14641478 hls-ghcide = dontCheck (super.hls-ghcide.overrideScope hlsScopeOverride);
14651479 fourmolu = super.fourmolu.overrideScope hlsScopeOverride;
14661480 }
pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix+9−1
@@ -62,14 +62,16 @@ self: super: {
6262
6363 # Jailbreak to fix the build.
6464 base-noprelude = doJailbreak super.base-noprelude;
65− pandoc = doJailbreak super.pandoc;
6665 system-fileio = doJailbreak super.system-fileio;
6766 unliftio-core = doJailbreak super.unliftio-core;
6867
6968 # Use the latest version to fix the build.
7069 dhall = self.dhall_1_34_0;
7170 lens = self.lens_4_19_2;
71+ optics = self.optics_0_3;
7272 optics-core = self.optics-core_0_3_0_1;
73+ optics-extra = self.optics-extra_0_3;
74+ optics-th = self.optics-th_0_3_0_2;
7375 repline = self.repline_0_4_0_0;
7476 singletons = self.singletons_2_7;
7577 th-desugar = self.th-desugar_1_11;
@@ -117,4 +119,10 @@ self: super: {
117119 executableHaskellDepends = drv.executableToolDepends or [] ++ [ self.repline ];
118120 }));
119121
122+ # We want the latest version of Pandoc.
123+ pandoc = self.pandoc_2_10_1;
124+ pandoc-citeproc = self.pandoc-citeproc_0_17_0_2;
125+ pandoc-plot = self.pandoc-plot_0_9_2_0;
126+ pandoc-types = self.pandoc-types_1_21;
127+
120128}
pkgs/development/haskell-modules/configuration-hackage2nix.yaml+75−37
@@ -64,7 +64,7 @@ core-packages:
6464#
6565# WARNING: This list is generated semiautomatically based on the most recent
6666# LTS package set. If you want to add entries to it, you must do so before the
67−# comment saying "# LTS Haskell x.y". Any changes after that commend will be
67+# comment saying "# LTS Haskell x.y". Any changes after that comment will be
6868# lost the next time `update-stackage.sh` runs.
6969default-package-overrides:
7070 # This was only intended for ghc-7.0.4, and has very old deps, one hidden behind a flag
@@ -72,7 +72,7 @@ default-package-overrides:
7272 # gi-gdkx11-4.x requires gtk-4.x, which is still under development and
7373 # not yet available in Nixpkgs
7474 - gi-gdkx11 < 4
75− # LTS Haskell 16.10
75+ # LTS Haskell 16.11
7676 - abstract-deque ==0.3
7777 - abstract-par ==0.3.3
7878 - AC-Angle ==1.0
@@ -207,7 +207,7 @@ default-package-overrides:
207207 - amazonka-workspaces ==1.6.1
208208 - amazonka-xray ==1.6.1
209209 - amqp ==0.20.0
210− - amqp-utils ==0.4.4.0
210+ - amqp-utils ==0.4.4.1
211211 - annotated-wl-pprint ==0.7.0
212212 - ansi-terminal ==0.10.3
213213 - ansi-wl-pprint ==0.6.9
@@ -262,7 +262,7 @@ default-package-overrides:
262262 - attoparsec-path ==0.0.0.1
263263 - audacity ==0.0.2
264264 - aur ==7.0.3
265− - aura ==3.1.7
265+ - aura ==3.1.8
266266 - authenticate ==1.3.5
267267 - authenticate-oauth ==1.6.0.1
268268 - auto ==0.4.3.1
@@ -366,7 +366,7 @@ default-package-overrides:
366366 - bv ==0.5
367367 - bv-little ==1.1.1
368368 - byteable ==0.1.1
369− - byte-count-reader ==0.10.0.1
369+ - byte-count-reader ==0.10.1.1
370370 - bytedump ==1.0
371371 - byte-order ==0.1.2.0
372372 - byteorder ==1.0.4
@@ -760,7 +760,7 @@ default-package-overrides:
760760 - extended-reals ==0.2.4.0
761761 - extensible-effects ==5.0.0.1
762762 - extensible-exceptions ==0.1.1.4
763− - extra ==1.7.5
763+ - extra ==1.7.6
764764 - extractable-singleton ==0.0.1
765765 - extrapolate ==0.4.2
766766 - fail ==4.9.0.0
@@ -808,7 +808,7 @@ default-package-overrides:
808808 - floatshow ==0.2.4
809809 - flow ==1.0.21
810810 - flush-queue ==1.0.0
811− - fmlist ==0.9.3
811+ - fmlist ==0.9.4
812812 - fmt ==0.6.1.2
813813 - fn ==0.3.0.2
814814 - focus ==1.0.1.3
@@ -1277,7 +1277,7 @@ default-package-overrides:
12771277 - jwt ==0.10.0
12781278 - kan-extensions ==5.2
12791279 - kanji ==3.4.1
1280− - katip ==0.8.4.0
1280+ - katip ==0.8.5.0
12811281 - kawhi ==0.3.0
12821282 - kazura-queue ==0.1.0.4
12831283 - kdt ==0.2.4
@@ -1348,7 +1348,7 @@ default-package-overrides:
13481348 - linux-file-extents ==0.2.0.0
13491349 - linux-namespaces ==0.1.3.0
13501350 - List ==0.6.2
1351− - ListLike ==4.7.1
1351+ - ListLike ==4.7.2
13521352 - list-predicate ==0.1.0.1
13531353 - listsafe ==0.1.0.1
13541354 - list-singleton ==1.0.0.4
@@ -1433,7 +1433,7 @@ default-package-overrides:
14331433 - midi ==0.2.2.2
14341434 - mighty-metropolis ==2.0.0
14351435 - mime-mail ==0.5.0
1436− - mime-mail-ses ==0.4.1
1436+ - mime-mail-ses ==0.4.2
14371437 - mime-types ==0.1.0.9
14381438 - mini-egison ==1.0.0
14391439 - minimal-configuration ==0.1.4
@@ -1558,7 +1558,7 @@ default-package-overrides:
15581558 - nonce ==1.0.7
15591559 - nondeterminism ==1.4
15601560 - non-empty ==0.3.2
1561− - nonempty-containers ==0.3.4.0
1561+ - nonempty-containers ==0.3.4.1
15621562 - nonemptymap ==0.0.6.0
15631563 - non-empty-sequence ==0.2.0.4
15641564 - nonempty-vector ==0.2.0.2
@@ -1613,7 +1613,7 @@ default-package-overrides:
16131613 - options ==1.2.1.1
16141614 - optparse-applicative ==0.15.1.0
16151615 - optparse-generic ==1.3.1
1616− - optparse-simple ==0.1.1.2
1616+ - optparse-simple ==0.1.1.3
16171617 - optparse-text ==0.1.1.0
16181618 - ordered-containers ==0.2.2
16191619 - ormolu ==0.1.2.0
@@ -1859,7 +1859,7 @@ default-package-overrides:
18591859 - regex-posix ==0.96.0.0
18601860 - regex-tdfa ==1.3.1.0
18611861 - regex-with-pcre ==1.1.0.0
1862− - registry ==0.1.9.1
1862+ - registry ==0.1.9.3
18631863 - reinterpret-cast ==0.1.0
18641864 - relapse ==1.0.0.0
18651865 - relational-query ==0.12.2.3
@@ -1902,7 +1902,7 @@ default-package-overrides:
19021902 - safe ==0.3.19
19031903 - safecopy ==0.10.3
19041904 - safe-decimal ==0.2.0.0
1905− - safe-exceptions ==0.1.7.0
1905+ - safe-exceptions ==0.1.7.1
19061906 - safe-exceptions-checked ==0.1.0
19071907 - safe-foldable ==0.1.0.0
19081908 - safeio ==0.0.5.0
@@ -1978,7 +1978,7 @@ default-package-overrides:
19781978 - servant-purescript ==0.10.0.0
19791979 - servant-rawm ==0.3.2.0
19801980 - servant-server ==0.16.2
1981− - servant-static-th ==0.2.3.0
1981+ - servant-static-th ==0.2.4.0
19821982 - servant-subscriber ==0.7.0.0
19831983 - servant-swagger ==1.1.7.1
19841984 - servant-swagger-ui ==0.3.4.3.23.11
@@ -2328,7 +2328,7 @@ default-package-overrides:
23282328 - unexceptionalio-trans ==0.5.1
23292329 - unicode ==0.0.1.1
23302330 - unicode-show ==0.1.0.4
2331− - unicode-transforms ==0.3.6
2331+ - unicode-transforms ==0.3.7
23322332 - unification-fd ==0.10.0.1
23332333 - union-find ==0.2
23342334 - uniplate ==1.6.12
@@ -2395,7 +2395,7 @@ default-package-overrides:
23952395 - vector-instances ==3.4
23962396 - vector-mmap ==0.0.3
23972397 - vector-rotcev ==0.1.0.0
2398− - vector-sized ==1.4.1.0
2398+ - vector-sized ==1.4.2
23992399 - vector-space ==0.16
24002400 - vector-split ==1.0.0.2
24012401 - vector-th-unbox ==0.2.1.7
@@ -2498,7 +2498,7 @@ default-package-overrides:
24982498 - xss-sanitize ==0.3.6
24992499 - xturtle ==0.2.0.0
25002500 - xxhash-ffi ==0.2.0.0
2501− - yaml ==0.11.4.0
2501+ - yaml ==0.11.5.0
25022502 - yamlparse-applicative ==0.1.0.1
25032503 - yesod ==1.6.1.0
25042504 - yesod-auth ==1.6.10
@@ -2560,12 +2560,13 @@ extra-packages:
25602560 - dbus <1 # for xmonad-0.26
25612561 - deepseq == 1.3.0.1 # required to build Cabal with GHC 6.12.3
25622562 - dhall == 1.29.0 # required for spago 0.14.0.
2563+ - Diff < 0.4 # required by liquidhaskell-0.8.10.2: https://github.com/ucsd-progsys/liquidhaskell/issues/1729
25632564 - doctemplates == 0.8 # required by pandoc-2.9.x
2564− - gi-gdk == 3.0.23 # required for gi-pango 1.0.23
2565− - gi-gtk == 3.0.35 # required for gi-pango 1.0.23
25662565 - generic-deriving == 1.10.5.* # new versions don't compile with GHC 7.10.x
25672566 - ghc-check == 0.3.0.1 # only version compatible with ghcide 0.2.0
25682567 - ghc-tcplugins-extra ==0.3.2 # required for polysemy-plugin 0.2.5.0
2568+ - gi-gdk == 3.0.23 # required for gi-pango 1.0.23
2569+ - gi-gtk == 3.0.35 # required for gi-pango 1.0.23
25692570 - gloss < 1.9.3 # new versions don't compile with GHC 7.8.x
25702571 - haddock == 2.22.* # required on GHC 8.0.x
25712572 - haddock == 2.23.* # required on GHC < 8.10.x
@@ -2579,9 +2580,9 @@ extra-packages:
25792580 - haskell-src-exts == 1.19.* # required by hindent and structured-haskell-mode
25802581 - hinotify == 0.3.9 # for xmonad-0.26: https://github.com/kolmodin/hinotify/issues/29
25812582 - hoogle == 5.0.14 # required by hie-hoogle
2583+ - hslua == 1.1.2 # required for pandoc 2.10
25822584 - html-conduit ^>= 1.2 # pre-lts-11.x versions neeed by git-annex 6.20180227
25832585 - http-conduit ^>= 2.2 # pre-lts-11.x versions neeed by git-annex 6.20180227
2584− - hslua == 1.1.2 # required for pandoc 2.10
25852586 - inline-c < 0.6 # required on GHC 8.0.x
25862587 - inline-c-cpp < 0.2 # required on GHC 8.0.x
25872588 - lens-labels == 0.1.* # required for proto-lens-descriptors
@@ -2604,6 +2605,7 @@ extra-packages:
26042605 - resourcet ==1.1.* # pre-lts-11.x versions neeed by git-annex 6.20180227
26052606 - seqid < 0.2 # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x
26062607 - seqid-streams < 0.2 # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x
2608+ - shelly ==1.8.1 # ghcjs depends on shelly < 1.9
26072609 - split < 0.2 # newer versions don't work with GHC 6.12.3
26082610 - tar < 0.4.2.0 # later versions don't work with GHC < 7.6.x
26092611 - transformers == 0.4.3.* # the latest version isn't supported by mtl yet
@@ -2756,17 +2758,26 @@ dont-distribute-packages:
27562758 - accelerate-examples
27572759 - accelerate-fft
27582760 - accelerate-fourier-benchmark
2761+ - accelerate-io-array
2762+ - accelerate-io-bmp
2763+ - accelerate-io-bytestring
2764+ - accelerate-io-cereal
2765+ - accelerate-io-JuicyPixels
2766+ - accelerate-io-repa
2767+ - accelerate-io-vector
27592768 - accelerate-llvm-ptx
27602769 - bindings-yices
27612770 - boolector
27622771 - ccelerate-cuda
2772+ - containers-accelerate
27632773 - cplex-hs
2764− - cuda # 2020-08-18 because of dependency nvidia-x11
27652774 - cublas
2775+ - cuda # 2020-08-18 because of dependency nvidia-x11
27662776 - cufft
27672777 - cusolver
27682778 - cusparse
27692779 - gloss-raster-accelerate
2780+ - hashable-accelerate
27702781 - libnvvm
27712782 - matlab
27722783 - nvvm
@@ -3670,6 +3681,7 @@ broken-packages:
36703681 - cap
36713682 - Capabilities
36723683 - capability
3684+ - capataz
36733685 - capnp
36743686 - capped-list
36753687 - capri
@@ -3959,8 +3971,9 @@ broken-packages:
39593971 - complexity
39603972 - compose-trans
39613973 - composite-aeson
3974+ - composite-aeson-path
39623975 - composite-aeson-refined
3963− - composite-base
3976+ - composite-binary
39643977 - composite-ekg
39653978 - composite-opaleye
39663979 - composite-swagger
@@ -4292,6 +4305,7 @@ broken-packages:
42924305 - data-transform
42934306 - data-type
42944307 - data-util
4308+ - data-validation
42954309 - data-variant
42964310 - database-id-groundhog
42974311 - database-study
@@ -4415,7 +4429,6 @@ broken-packages:
44154429 - dhall-check
44164430 - dhall-docs
44174431 - dhall-fly
4418− - dhall-nix
44194432 - dhall-text
44204433 - dhall-to-cabal
44214434 - dhall-yaml
@@ -4763,6 +4776,9 @@ broken-packages:
47634776 - EsounD
47644777 - espial
47654778 - ess
4779+ - essence-of-live-coding-gloss-example
4780+ - essence-of-live-coding-pulse-example
4781+ - essence-of-live-coding-warp
47664782 - estimators
47674783 - EstProgress
47684784 - estreps
@@ -5322,6 +5338,23 @@ broken-packages:
53225338 - ghcprofview
53235339 - ght
53245340 - gi-cairo-again
5341+ - gi-cairo-connector
5342+ - gi-cairo-render
5343+ - gi-dbusmenu
5344+ - gi-dbusmenugtk3
5345+ - gi-gdkx11
5346+ - gi-graphene
5347+ - gi-gsk
5348+ - gi-gstpbutils
5349+ - gi-gsttag
5350+ - gi-gtk-declarative
5351+ - gi-gtk-declarative-app-simple
5352+ - gi-gtk-hs
5353+ - gi-gtkosxapplication
5354+ - gi-handy
5355+ - gi-poppler
5356+ - gi-wnck
5357+ - gi-xlib
53255358 - giak
53265359 - Gifcurry
53275360 - ginsu
@@ -5402,6 +5435,7 @@ broken-packages:
54025435 - gloss-sodium
54035436 - glpk-headers
54045437 - glpk-hs
5438+ - gltf-codec
54055439 - glue
54065440 - GLUtil
54075441 - gmap
@@ -5793,6 +5827,7 @@ broken-packages:
57935827 - haskell-src-exts-prisms
57945828 - haskell-src-exts-qq
57955829 - haskell-src-exts-sc
5830+ - haskell-src-match
57965831 - haskell-src-meta-mwotton
57975832 - haskell-stack-trace-plugin
57985833 - haskell-token-utils
@@ -5876,6 +5911,7 @@ broken-packages:
58765911 - haskore-supercollider
58775912 - haskore-synthesizer
58785913 - HaskRel
5914+ - haskseg
58795915 - hasktorch
58805916 - hasktorch-codegen
58815917 - hasktorch-ffi-th
@@ -6959,6 +6995,7 @@ broken-packages:
69596995 - jsonsql
69606996 - jsontsv
69616997 - jsonxlsx
6998+ - jsop
69626999 - jspath
69637000 - juandelacosa
69647001 - judge
@@ -7060,6 +7097,7 @@ broken-packages:
70607097 - ks-test
70617098 - KSP
70627099 - ktx
7100+ - ktx-codec
70637101 - kubernetes-client
70647102 - kubernetes-client-core
70657103 - kuifje
@@ -7248,6 +7286,7 @@ broken-packages:
72487286 - libconfig
72497287 - libcspm
72507288 - libexpect
7289+ - libfuse3
72517290 - libGenI
72527291 - libhbb
72537292 - libinfluxdb
@@ -7265,7 +7304,6 @@ broken-packages:
72657304 - libraft
72667305 - librandomorg
72677306 - librato
7268− - libsodium
72697307 - libssh2
72707308 - libssh2-conduit
72717309 - libsystemd-daemon
@@ -7324,17 +7362,6 @@ broken-packages:
73247362 - lio-fs
73257363 - lio-simple
73267364 - lipsum-gen
7327− - liquid
7328− - liquid-base
7329− - liquid-bytestring
7330− - liquid-containers
7331− - liquid-fixpoint
7332− - liquid-ghc-prim
7333− - liquid-parallel
7334− - liquid-platform
7335− - liquid-prelude
7336− - liquid-vector
7337− - liquidhaskell
73387365 - liquidhaskell-cabal
73397366 - Liquorice
73407367 - list-fusion-probe
@@ -7403,6 +7430,7 @@ broken-packages:
74037430 - log4hs
74047431 - logentries
74057432 - logger
7433+ - logging-effect
74067434 - logging-effect-extra
74077435 - logging-effect-extra-file
74087436 - logging-effect-extra-handler
@@ -7475,6 +7503,7 @@ broken-packages:
74757503 - lye
74767504 - Lykah
74777505 - lz4-conduit
7506+ - lz4-frame-conduit
74787507 - lzma-enumerator
74797508 - lzma-streams
74807509 - lzo
@@ -7691,6 +7720,7 @@ broken-packages:
76917720 - ministg
76927721 - minst-idx
76937722 - mios
7723+ - MIP
76947724 - mirror-tweet
76957725 - misfortune
76967726 - miso-action-logger
@@ -7733,6 +7763,7 @@ broken-packages:
77337763 - monad-atom
77347764 - monad-atom-simple
77357765 - monad-branch
7766+ - monad-classes-logging
77367767 - monad-exception
77377768 - monad-finally
77387769 - monad-fork
@@ -7922,6 +7953,7 @@ broken-packages:
79227953 - mvc
79237954 - mvc-updates
79247955 - mvclient
7956+ - mwc-probability-transition
79257957 - mwc-random-accelerate
79267958 - mxnet
79277959 - mxnet-dataiter
@@ -8605,6 +8637,7 @@ broken-packages:
86058637 - polydata
86068638 - polydata-core
86078639 - polynomial
8640+ - polysemy-http
86088641 - polysemy-optics
86098642 - polysemy-RandomFu
86108643 - polysemy-webserver
@@ -8702,6 +8735,7 @@ broken-packages:
87028735 - pretty-ghci
87038736 - pretty-ncols
87048737 - prettyprinter-graphviz
8738+ - prettyprinter-lucid
87058739 - prettyprinter-vty
87068740 - preview
87078741 - prim
@@ -9257,6 +9291,7 @@ broken-packages:
92579291 - ruler
92589292 - ruler-core
92599293 - rungekutta
9294+ - runhs
92609295 - runmany
92619296 - runtime-arbitrary
92629297 - rvar
@@ -9530,6 +9565,7 @@ broken-packages:
95309565 - shadower
95319566 - shake-bindist
95329567 - shake-cabal-build
9568+ - shake-dhall
95339569 - shake-extras
95349570 - shake-minify
95359571 - shake-pack
@@ -9805,6 +9841,7 @@ broken-packages:
98059841 - spanout
98069842 - sparkle
98079843 - sparrow
9844+ - spars
98089845 - sparse
98099846 - sparse-lin-alg
98109847 - sparsebit
@@ -10045,6 +10082,7 @@ broken-packages:
1004510082 - superconstraints
1004610083 - superevent
1004710084 - supermonad
10085+ - supernova
1004810086 - supero
1004910087 - supervisor
1005010088 - supervisors
@@ -10218,7 +10256,6 @@ broken-packages:
1021810256 - termbox-bindings
1021910257 - terminal-text
1022010258 - termination-combinators
10221− - termonad
1022210259 - termplot
1022310260 - terntup
1022410261 - terrahs
@@ -10656,6 +10693,7 @@ broken-packages:
1065610693 - uri-parse
1065710694 - uri-template
1065810695 - uri-templater
10696+ - url-bytes
1065910697 - url-decoders
1066010698 - url-generic
1066110699 - URLb
pkgs/development/haskell-modules/hackage-packages.nix+1349−687
@@ -4559,6 +4559,24 @@ self: {
45594559 broken = true;
45604560 }) {};
45614561
4562+ "Diff_0_3_4" = callPackage
4563+ ({ mkDerivation, array, base, directory, pretty, process
4564+ , QuickCheck, test-framework, test-framework-quickcheck2
4565+ }:
4566+ mkDerivation {
4567+ pname = "Diff";
4568+ version = "0.3.4";
4569+ sha256 = "0bqcdvhxx8dmqc3793m6axg813wv9ldz2j37f1wygbbrbbndmdvp";
4570+ libraryHaskellDepends = [ array base pretty ];
4571+ testHaskellDepends = [
4572+ array base directory pretty process QuickCheck test-framework
4573+ test-framework-quickcheck2
4574+ ];
4575+ description = "O(ND) diff algorithm in haskell";
4576+ license = stdenv.lib.licenses.bsd3;
4577+ hydraPlatforms = stdenv.lib.platforms.none;
4578+ }) {};
4579+
45624580 "Diff" = callPackage
45634581 ({ mkDerivation, array, base, directory, pretty, process
45644582 , QuickCheck, test-framework, test-framework-quickcheck2
@@ -10767,8 +10785,8 @@ self: {
1076710785 ({ mkDerivation, base, bytestring, HsOpenSSL, unix }:
1076810786 mkDerivation {
1076910787 pname = "HsOpenSSL-x509-system";
10770− version = "0.1.0.3";
10771− sha256 = "14hzjdpv8ld3nw5fcx451w49vq0s8fhs1zh984vpm85b5ypbgp2v";
10788+ version = "0.1.0.4";
10789+ sha256 = "15mp70bqg1lzp971bzp6wym3bwzvxb76hzbgckygbfa722xyymhr";
1077210790 libraryHaskellDepends = [ base bytestring HsOpenSSL unix ];
1077310791 description = "Use the system's native CA certificate store with HsOpenSSL";
1077410792 license = stdenv.lib.licenses.bsd3;
@@ -12672,27 +12690,6 @@ self: {
1267212690 }) {};
1267312691
1267412692 "ListLike" = callPackage
12675− ({ mkDerivation, array, base, bytestring, containers, deepseq
12676− , dlist, fmlist, HUnit, QuickCheck, random, text, utf8-string
12677− , vector
12678− }:
12679− mkDerivation {
12680− pname = "ListLike";
12681− version = "4.7.1";
12682− sha256 = "1gccb84fma0plkwjdz8hgqa70a5lr6d9gnw6pfky993555ig29mp";
12683− libraryHaskellDepends = [
12684− array base bytestring containers deepseq dlist fmlist text
12685− utf8-string vector
12686− ];
12687− testHaskellDepends = [
12688− array base bytestring containers dlist fmlist HUnit QuickCheck
12689− random text utf8-string vector
12690− ];
12691− description = "Generalized support for list-like structures";
12692− license = stdenv.lib.licenses.bsd3;
12693− }) {};
12694−
12695− "ListLike_4_7_2" = callPackage
1269612693 ({ mkDerivation, array, base, bytestring, containers, deepseq
1269712694 , dlist, fmlist, HUnit, QuickCheck, random, text, utf8-string
1269812695 , vector
@@ -12711,7 +12708,6 @@ self: {
1271112708 ];
1271212709 description = "Generalized support for list-like structures";
1271312710 license = stdenv.lib.licenses.bsd3;
12714− hydraPlatforms = stdenv.lib.platforms.none;
1271512711 }) {};
1271612712
1271712713 "ListT" = callPackage
@@ -13101,6 +13097,8 @@ self: {
1310113097 ];
1310213098 description = "Library for using Mixed Integer Programming (MIP)";
1310313099 license = stdenv.lib.licenses.bsd3;
13100+ hydraPlatforms = stdenv.lib.platforms.none;
13101+ broken = true;
1310413102 }) {};
1310513103
1310613104 "MSQueue" = callPackage
@@ -13202,14 +13200,12 @@ self: {
1320213200 ({ mkDerivation, base }:
1320313201 mkDerivation {
1320413202 pname = "MapWith";
13205− version = "0.1.0.0";
13206− sha256 = "1dk5b9bi29917sf3mk3q85iqjkfc7vczwb8x8cg6w6gxfqn0444v";
13207− revision = "1";
13208− editedCabalFile = "1zkpqgxh2d1zg087766vixw5j9xh9i9z4vdp5gv87xzhc4ig9qbs";
13203+ version = "0.2.0.0";
13204+ sha256 = "1xkyaj83yblf42qawv4nyi8miaynydd8b3ysx62f9y10bqxk7dja";
1320913205 libraryHaskellDepends = [ base ];
1321013206 testHaskellDepends = [ base ];
1321113207 benchmarkHaskellDepends = [ base ];
13212− description = "mapWith: like fmap, but with additional arguments (isFirst, isLast, etc)";
13208+ description = "mapWith: like fmap, but with additional parameters (isFirst, isLast, etc)";
1321313209 license = stdenv.lib.licenses.bsd3;
1321413210 }) {};
1321513211
@@ -20637,8 +20633,8 @@ self: {
2063720633 ({ mkDerivation, base, bytestring, transformers, vector, vulkan }:
2063820634 mkDerivation {
2063920635 pname = "VulkanMemoryAllocator";
20640− version = "0.3.6";
20641− sha256 = "1zclpawaa1cx1p58asn7lla4lakkr869qnkdvrypxxqki3406hsz";
20636+ version = "0.3.7";
20637+ sha256 = "1y2dmk60dvk8d9n16in98cmin5ckvdx3knwlfzcs0jl6vyh8n51n";
2064220638 libraryHaskellDepends = [
2064320639 base bytestring transformers vector vulkan
2064420640 ];
@@ -21325,6 +21321,25 @@ self: {
2132521321 inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXinerama;
2132621322 inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXrender;};
2132721323
21324+ "X11_1_9_2" = callPackage
21325+ ({ mkDerivation, base, data-default, libX11, libXext, libXinerama
21326+ , libXrandr, libXrender, libXScrnSaver
21327+ }:
21328+ mkDerivation {
21329+ pname = "X11";
21330+ version = "1.9.2";
21331+ sha256 = "013yny4dwbs98kp7245j8dv81h4p1cdwn2rsf2hvhsplg6ixkc05";
21332+ libraryHaskellDepends = [ base data-default ];
21333+ librarySystemDepends = [
21334+ libX11 libXext libXinerama libXrandr libXrender libXScrnSaver
21335+ ];
21336+ description = "A binding to the X11 graphics library";
21337+ license = stdenv.lib.licenses.bsd3;
21338+ hydraPlatforms = stdenv.lib.platforms.none;
21339+ }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXScrnSaver;
21340+ inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXinerama;
21341+ inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXrender;};
21342+
2132821343 "X11-extras" = callPackage
2132921344 ({ mkDerivation, base, libX11, X11 }:
2133021345 mkDerivation {
@@ -22125,25 +22140,26 @@ self: {
2212522140 }) {};
2212622141
2212722142 "accelerate" = callPackage
22128− ({ mkDerivation, ansi-terminal, ansi-wl-pprint, base, base-orphans
22129− , bytestring, Cabal, cabal-doctest, constraints, containers
22130− , cryptonite, deepseq, directory, doctest, exceptions, filepath
22131− , ghc-prim, half, hashable, hashtables, hedgehog, lens, mtl, tasty
22132− , tasty-expected-failure, tasty-hedgehog, tasty-hunit
22133− , template-haskell, terminal-size, transformers, unique, unix
22143+ ({ mkDerivation, ansi-terminal, base, base-orphans, bytestring
22144+ , Cabal, cabal-doctest, containers, cryptonite, deepseq, directory
22145+ , doctest, exceptions, filepath, ghc-prim, half, hashable
22146+ , hashtables, hedgehog, lens, mtl, prettyprinter
22147+ , prettyprinter-ansi-terminal, primitive, tasty, template-haskell
22148+ , terminal-size, text, transformers, unique, unix
2213422149 , unordered-containers, vector
2213522150 }:
2213622151 mkDerivation {
2213722152 pname = "accelerate";
22138− version = "1.2.0.1";
22139− sha256 = "0vglmasqgq0h8fvm9z8l2b3sygqvix8vr6c3n357gkr2mpz6gq8h";
22153+ version = "1.3.0.0";
22154+ sha256 = "14md9fbxckgwpbkm7hdj95ny11w5b5cj103r8razg0aw2hgid5sb";
2214022155 setupHaskellDepends = [ base Cabal cabal-doctest ];
2214122156 libraryHaskellDepends = [
22142− ansi-terminal ansi-wl-pprint base base-orphans bytestring
22143− constraints containers cryptonite deepseq directory exceptions
22144− filepath ghc-prim half hashable hashtables hedgehog lens mtl tasty
22145− tasty-expected-failure tasty-hedgehog tasty-hunit template-haskell
22146− terminal-size transformers unique unix unordered-containers vector
22157+ ansi-terminal base base-orphans bytestring containers cryptonite
22158+ deepseq directory exceptions filepath ghc-prim half hashable
22159+ hashtables hedgehog lens mtl prettyprinter
22160+ prettyprinter-ansi-terminal primitive tasty template-haskell
22161+ terminal-size text transformers unique unix unordered-containers
22162+ vector
2214722163 ];
2214822164 testHaskellDepends = [ base doctest ];
2214922165 description = "An embedded language for accelerated array processing";
@@ -22173,7 +22189,7 @@ self: {
2217322189 }) {};
2217422190
2217522191 "accelerate-bignum" = callPackage
22176− ({ mkDerivation, accelerate, accelerate-io, accelerate-llvm
22192+ ({ mkDerivation, accelerate, accelerate-io-vector, accelerate-llvm
2217722193 , accelerate-llvm-native, accelerate-llvm-ptx, base, criterion
2217822194 , ghc-prim, hedgehog, llvm-hs-pure, mwc-random, tasty
2217922195 , tasty-hedgehog, template-haskell, vector, vector-th-unbox
@@ -22181,10 +22197,8 @@ self: {
2218122197 }:
2218222198 mkDerivation {
2218322199 pname = "accelerate-bignum";
22184− version = "0.2.0.0";
22185− sha256 = "0xhnd39fb17kb7q5z9z8svn8zlv6j1wxrbkv3vij4f1q2hkqkl0p";
22186− revision = "1";
22187− editedCabalFile = "0lfsmhky8shyy9xhm0j2as91vrmqqrrn9r0fsv2ljc4xjklg723r";
22200+ version = "0.3.0.0";
22201+ sha256 = "1xwqg3d2qilkfx8wmmhp2qq5cas3pnsrpyli3a9z0yxqamibxh33";
2218822202 libraryHaskellDepends = [
2218922203 accelerate accelerate-llvm accelerate-llvm-native
2219022204 accelerate-llvm-ptx base ghc-prim llvm-hs-pure template-haskell
@@ -22194,8 +22208,9 @@ self: {
2219422208 tasty tasty-hedgehog
2219522209 ];
2219622210 benchmarkHaskellDepends = [
22197− accelerate accelerate-io accelerate-llvm-native accelerate-llvm-ptx
22198− base criterion mwc-random vector vector-th-unbox wide-word
22211+ accelerate accelerate-io-vector accelerate-llvm-native
22212+ accelerate-llvm-ptx base criterion mwc-random vector
22213+ vector-th-unbox wide-word
2219922214 ];
2220022215 description = "Fixed-length large integer arithmetic for Accelerate";
2220122216 license = stdenv.lib.licenses.bsd3;
@@ -22211,8 +22226,8 @@ self: {
2221122226 }:
2221222227 mkDerivation {
2221322228 pname = "accelerate-blas";
22214− version = "0.2.0.1";
22215− sha256 = "00869y2zrh43sl0rap8bbgnzqdvrrxpc2qhzz0zdfasr3440py6k";
22229+ version = "0.3.0.0";
22230+ sha256 = "1ydym6fxvg1b5vx49r8dnn80spsq42ssbg4v01s1djklks054g7y";
2221622231 libraryHaskellDepends = [
2221722232 accelerate accelerate-llvm accelerate-llvm-native
2221822233 accelerate-llvm-ptx base blas-hs bytestring containers cublas cuda
@@ -22305,37 +22320,39 @@ self: {
2230522320
2230622321 "accelerate-examples" = callPackage
2230722322 ({ mkDerivation, accelerate, accelerate-fft, accelerate-io
22308− , accelerate-llvm-native, accelerate-llvm-ptx, ansi-wl-pprint, base
22309− , binary, bmp, bytestring, bytestring-lexing, cereal
22323+ , accelerate-io-bmp, accelerate-io-repa, accelerate-io-vector
22324+ , accelerate-llvm-native, accelerate-llvm-ptx, ansi-wl-pprint
22325+ , array, base, binary, bmp, bytestring, bytestring-lexing, cereal
2231022326 , colour-accelerate, containers, criterion, criterion-measurement
2231122327 , directory, fclabels, filepath, gloss, gloss-accelerate
2231222328 , gloss-raster-accelerate, gloss-rendering, HUnit, lens-accelerate
22313− , linear, linear-accelerate, matrix-market-attoparsec, mwc-random
22314− , normaldistribution, QuickCheck, random, repa, repa-io, scientific
22315− , test-framework, test-framework-hunit, test-framework-quickcheck2
22316− , vector, vector-algorithms
22329+ , linear-accelerate, matrix-market-attoparsec, mwc-random
22330+ , mwc-random-accelerate, normaldistribution, QuickCheck, random
22331+ , repa, repa-io, scientific, test-framework, test-framework-hunit
22332+ , test-framework-quickcheck2, vector, vector-algorithms
2231722333 }:
2231822334 mkDerivation {
2231922335 pname = "accelerate-examples";
22320− version = "1.2.0.1";
22321− sha256 = "0hzk6zas03yhh8xjjrh772knhbvisl0r6q10y4mcq552bcfd8yvj";
22336+ version = "1.3.0.0";
22337+ sha256 = "145m2bi8bini6z2jg6g99vnsc3m7pqz4dc9l34j8fg40fw65rwi0";
2232222338 configureFlags = [ "-f-opencl" ];
2232322339 isLibrary = true;
2232422340 isExecutable = true;
2232522341 libraryHaskellDepends = [
2232622342 accelerate accelerate-llvm-native accelerate-llvm-ptx
2232722343 ansi-wl-pprint base containers criterion directory fclabels HUnit
22328− linear mwc-random QuickCheck test-framework test-framework-hunit
22344+ QuickCheck test-framework test-framework-hunit
2232922345 test-framework-quickcheck2
2233022346 ];
2233122347 executableHaskellDepends = [
22332− accelerate accelerate-fft accelerate-io base binary bmp bytestring
22333− bytestring-lexing cereal colour-accelerate containers criterion
22334− criterion-measurement directory fclabels filepath gloss
22348+ accelerate accelerate-fft accelerate-io accelerate-io-bmp
22349+ accelerate-io-repa accelerate-io-vector array base binary bmp
22350+ bytestring bytestring-lexing cereal colour-accelerate containers
22351+ criterion criterion-measurement directory fclabels filepath gloss
2233522352 gloss-accelerate gloss-raster-accelerate gloss-rendering
2233622353 lens-accelerate linear-accelerate matrix-market-attoparsec
22337− mwc-random normaldistribution random repa repa-io scientific vector
22338− vector-algorithms
22354+ mwc-random mwc-random-accelerate normaldistribution random repa
22355+ repa-io scientific vector vector-algorithms
2233922356 ];
2234022357 description = "Examples using the Accelerate library";
2234122358 license = stdenv.lib.licenses.bsd3;
@@ -22351,10 +22368,8 @@ self: {
2235122368 }:
2235222369 mkDerivation {
2235322370 pname = "accelerate-fft";
22354− version = "1.2.0.0";
22355− sha256 = "19p9d59vdd3nq97xjprlb6fz2ajlk6gl37cdyvrm9inag4nnk6lp";
22356− revision = "2";
22357− editedCabalFile = "096vhbwbkyvjx8znjqnb3lz43kzqq0x7kcfv1gmmbjjrcmwaj2y5";
22371+ version = "1.3.0.0";
22372+ sha256 = "1a7cwzbs8r3rvaymrq2kfx83lqb3i7wz0gmz3ppz59f40rxn974x";
2235822373 libraryHaskellDepends = [
2235922374 accelerate accelerate-llvm accelerate-llvm-native
2236022375 accelerate-llvm-ptx base bytestring carray containers cuda cufft
@@ -22433,25 +22448,119 @@ self: {
2243322448 }) {};
2243422449
2243522450 "accelerate-io" = callPackage
22436− ({ mkDerivation, accelerate, array, base, bmp, bytestring, hedgehog
22437− , primitive, repa, tasty, tasty-hedgehog, vector
22438− }:
22451+ ({ mkDerivation, accelerate, base }:
2243922452 mkDerivation {
2244022453 pname = "accelerate-io";
22441− version = "1.2.0.0";
22442− sha256 = "13pqqsd5pbxmgsxnp9w141mnwscnlmbhxaz6f5jx4ssipnma2pwf";
22443− revision = "2";
22444− editedCabalFile = "0w8y40p71c6c7cj49n4kanwmsa53s2nydigiiidqp93yxhw0virq";
22454+ version = "1.3.0.0";
22455+ sha256 = "048md40pfacxa1mbzncybxzwp9fzmsaq8i94pd8ai677n2zyw5cg";
22456+ libraryHaskellDepends = [ accelerate base ];
22457+ description = "Convert between Accelerate arrays and raw pointers";
22458+ license = stdenv.lib.licenses.bsd3;
22459+ hydraPlatforms = stdenv.lib.platforms.none;
22460+ broken = true;
22461+ }) {};
22462+
22463+ "accelerate-io-JuicyPixels" = callPackage
22464+ ({ mkDerivation, accelerate, accelerate-io-vector, base
22465+ , JuicyPixels, vector
22466+ }:
22467+ mkDerivation {
22468+ pname = "accelerate-io-JuicyPixels";
22469+ version = "0.1.0.0";
22470+ sha256 = "0rr43lwmc16r99si1s4nimxxydlsxb6ck45absrxy6vnkln7x185";
2244522471 libraryHaskellDepends = [
22446− accelerate array base bmp bytestring primitive repa vector
22472+ accelerate accelerate-io-vector base JuicyPixels vector
2244722473 ];
22474+ description = "Convert between Accelerate arrays and JuicyPixels images";
22475+ license = stdenv.lib.licenses.bsd3;
22476+ hydraPlatforms = stdenv.lib.platforms.none;
22477+ }) {};
22478+
22479+ "accelerate-io-array" = callPackage
22480+ ({ mkDerivation, accelerate, array, base, hedgehog, primitive
22481+ , tasty, tasty-hedgehog
22482+ }:
22483+ mkDerivation {
22484+ pname = "accelerate-io-array";
22485+ version = "0.1.0.0";
22486+ sha256 = "1gcxd4m3h1xr8ia8z7c8sxznm90h2q3mzwhi5vsv8s1gh7sdym9m";
22487+ libraryHaskellDepends = [ accelerate array base primitive ];
2244822488 testHaskellDepends = [
22449− accelerate array base hedgehog tasty tasty-hedgehog vector
22489+ accelerate array base hedgehog tasty tasty-hedgehog
2245022490 ];
22451− description = "Read and write Accelerate arrays in various formats";
22491+ description = "Convert between Accelerate and array";
22492+ license = stdenv.lib.licenses.bsd3;
22493+ hydraPlatforms = stdenv.lib.platforms.none;
22494+ }) {};
22495+
22496+ "accelerate-io-bmp" = callPackage
22497+ ({ mkDerivation, accelerate, accelerate-io-bytestring, base, bmp }:
22498+ mkDerivation {
22499+ pname = "accelerate-io-bmp";
22500+ version = "0.1.0.0";
22501+ sha256 = "0x7bkn4j7s9dzlfk4q1lh6fyd4bir1zkm4x37c65nl9g86154sc8";
22502+ libraryHaskellDepends = [
22503+ accelerate accelerate-io-bytestring base bmp
22504+ ];
22505+ description = "Convert between Accelerate arrays and BMP images";
22506+ license = stdenv.lib.licenses.bsd3;
22507+ hydraPlatforms = stdenv.lib.platforms.none;
22508+ }) {};
22509+
22510+ "accelerate-io-bytestring" = callPackage
22511+ ({ mkDerivation, accelerate, base, bytestring }:
22512+ mkDerivation {
22513+ pname = "accelerate-io-bytestring";
22514+ version = "0.1.0.0";
22515+ sha256 = "15j42ahdcqpy4xbpp1xibfbjcrijy0hpfxp4k53qkb9bcqaknyq1";
22516+ libraryHaskellDepends = [ accelerate base bytestring ];
22517+ description = "Convert between Accelerate and ByteString";
22518+ license = stdenv.lib.licenses.bsd3;
22519+ hydraPlatforms = stdenv.lib.platforms.none;
22520+ }) {};
22521+
22522+ "accelerate-io-cereal" = callPackage
22523+ ({ mkDerivation, accelerate, accelerate-io-bytestring, base, cereal
22524+ }:
22525+ mkDerivation {
22526+ pname = "accelerate-io-cereal";
22527+ version = "0.1.0.0";
22528+ sha256 = "13im1kmrd2yjxxrmpzp2030jhhq9fm9xa76yl11xwpd82z10a2pl";
22529+ libraryHaskellDepends = [
22530+ accelerate accelerate-io-bytestring base cereal
22531+ ];
22532+ description = "Binary serialisation of Accelerate arrays using cereal";
22533+ license = stdenv.lib.licenses.bsd3;
22534+ hydraPlatforms = stdenv.lib.platforms.none;
22535+ }) {};
22536+
22537+ "accelerate-io-repa" = callPackage
22538+ ({ mkDerivation, accelerate, base, repa }:
22539+ mkDerivation {
22540+ pname = "accelerate-io-repa";
22541+ version = "0.1.0.0";
22542+ sha256 = "084gzvfwz6prwra5393lfm5hgvssxwij0cdf24fq5nahzn7x2wrp";
22543+ libraryHaskellDepends = [ accelerate base repa ];
22544+ description = "Convert between Accelerate and Repa arrays";
22545+ license = stdenv.lib.licenses.bsd3;
22546+ hydraPlatforms = stdenv.lib.platforms.none;
22547+ }) {};
22548+
22549+ "accelerate-io-vector" = callPackage
22550+ ({ mkDerivation, accelerate, base, hedgehog, primitive, tasty
22551+ , tasty-hedgehog, vector
22552+ }:
22553+ mkDerivation {
22554+ pname = "accelerate-io-vector";
22555+ version = "0.1.0.0";
22556+ sha256 = "1nh7n3qj4csxyzvkhkvfr9bii2vmqky51f32pz3bphrwfvhzdrri";
22557+ libraryHaskellDepends = [ accelerate base primitive vector ];
22558+ testHaskellDepends = [
22559+ accelerate base hedgehog tasty tasty-hedgehog vector
22560+ ];
22561+ description = "Convert between Accelerate and vector";
2245222562 license = stdenv.lib.licenses.bsd3;
2245322563 hydraPlatforms = stdenv.lib.platforms.none;
22454− broken = true;
2245522564 }) {};
2245622565
2245722566 "accelerate-kullback-liebler" = callPackage
@@ -22481,20 +22590,19 @@ self: {
2248122590 }) {};
2248222591
2248322592 "accelerate-llvm" = callPackage
22484− ({ mkDerivation, abstract-deque, accelerate, base, bytestring
22485− , chaselev-deque, containers, data-default-class, deepseq
22486− , directory, dlist, exceptions, filepath, llvm-hs, llvm-hs-pure
22487− , mtl, mwc-random, primitive, template-haskell
22488− , unordered-containers, vector
22593+ ({ mkDerivation, accelerate, base, bytestring, constraints
22594+ , containers, data-default-class, deepseq, directory, dlist
22595+ , exceptions, filepath, llvm-hs, llvm-hs-pure, mtl, primitive
22596+ , template-haskell, unordered-containers, vector
2248922597 }:
2249022598 mkDerivation {
2249122599 pname = "accelerate-llvm";
22492− version = "1.2.0.1";
22493− sha256 = "1cv5s7fgkdd3m95vy2rrq2kvzyzxx6vwgsc5nqcmfdp00z8znjhk";
22600+ version = "1.3.0.0";
22601+ sha256 = "1fjjfjav11s6grwl6ihqdrzx738bwki0l25qlp4zzz2hi2440qbp";
2249422602 libraryHaskellDepends = [
22495− abstract-deque accelerate base bytestring chaselev-deque containers
22603+ accelerate base bytestring constraints containers
2249622604 data-default-class deepseq directory dlist exceptions filepath
22497− llvm-hs llvm-hs-pure mtl mwc-random primitive template-haskell
22605+ llvm-hs llvm-hs-pure mtl primitive template-haskell
2249822606 unordered-containers vector
2249922607 ];
2250022608 description = "Accelerate backend component generating LLVM IR";
@@ -22505,19 +22613,19 @@ self: {
2250522613
2250622614 "accelerate-llvm-native" = callPackage
2250722615 ({ mkDerivation, accelerate, accelerate-llvm, base, bytestring
22508− , c2hs, Cabal, cereal, containers, directory, dlist, filepath, ghc
22509− , ghc-prim, hashable, libffi, llvm-hs, llvm-hs-pure, lockfree-queue
22510− , mtl, template-haskell, time, unique, unix, vector
22616+ , c2hs, cereal, containers, deepseq, directory, dlist, filepath
22617+ , ghc, ghc-prim, hashable, libffi, llvm-hs, llvm-hs-pure
22618+ , lockfree-queue, mtl, template-haskell, unique, unix, vector
2251122619 }:
2251222620 mkDerivation {
2251322621 pname = "accelerate-llvm-native";
22514− version = "1.2.0.1";
22515− sha256 = "0sml5rj3dnxlv14i4xbs1sadnprjga1iws7fl7sxkyjzxqc04vrj";
22622+ version = "1.3.0.0";
22623+ sha256 = "1x4wfbp83ppzknd98k2ad160a8kdqh96qqmyfzdqyvy44iskxcn6";
2251622624 libraryHaskellDepends = [
22517− accelerate accelerate-llvm base bytestring Cabal cereal containers
22518− directory dlist filepath ghc ghc-prim hashable libffi llvm-hs
22519− llvm-hs-pure lockfree-queue mtl template-haskell time unique unix
22520− vector
22625+ accelerate accelerate-llvm base bytestring cereal containers
22626+ deepseq directory dlist filepath ghc ghc-prim hashable libffi
22627+ llvm-hs llvm-hs-pure lockfree-queue mtl template-haskell unique
22628+ unix vector
2252122629 ];
2252222630 libraryToolDepends = [ c2hs ];
2252322631 testHaskellDepends = [ accelerate base ];
@@ -22530,17 +22638,18 @@ self: {
2253022638 "accelerate-llvm-ptx" = callPackage
2253122639 ({ mkDerivation, accelerate, accelerate-llvm, base, bytestring
2253222640 , containers, cuda, deepseq, directory, dlist, file-embed, filepath
22533− , hashable, llvm-hs, llvm-hs-pure, mtl, nvvm, pretty, process
22534− , template-haskell, time, unordered-containers
22641+ , ghc-heap, hashable, llvm-hs, llvm-hs-pure, mtl, nvvm, pretty
22642+ , process, template-haskell, unordered-containers
2253522643 }:
2253622644 mkDerivation {
2253722645 pname = "accelerate-llvm-ptx";
22538− version = "1.2.0.1";
22539− sha256 = "0c9hl19v4si0lnah4l63kqhpxz16zy0wi3cg28gz00mxzgqilivs";
22646+ version = "1.3.0.0";
22647+ sha256 = "0bb7p67dv5csbblnaxbm7hkq8y2qknz0yd1f0rav29igsv3a9rfx";
2254022648 libraryHaskellDepends = [
2254122649 accelerate accelerate-llvm base bytestring containers cuda deepseq
22542− directory dlist file-embed filepath hashable llvm-hs llvm-hs-pure
22543− mtl nvvm pretty process template-haskell time unordered-containers
22650+ directory dlist file-embed filepath ghc-heap hashable llvm-hs
22651+ llvm-hs-pure mtl nvvm pretty process template-haskell
22652+ unordered-containers
2254422653 ];
2254522654 testHaskellDepends = [ accelerate base ];
2254622655 description = "Accelerate backend for NVIDIA GPUs";
@@ -29131,26 +29240,6 @@ self: {
2913129240 }) {};
2913229241
2913329242 "amqp-utils" = callPackage
29134− ({ mkDerivation, amqp, base, bytestring, connection, containers
29135− , data-default-class, directory, hinotify, magic, network, process
29136− , text, time, tls, unix, utf8-string, x509-system
29137− }:
29138− mkDerivation {
29139− pname = "amqp-utils";
29140− version = "0.4.4.0";
29141− sha256 = "07zpmq9sx6lmnma4dxxph0jficghrlfbb568frh3d6fbdiqgmfgl";
29142− isLibrary = false;
29143− isExecutable = true;
29144− executableHaskellDepends = [
29145− amqp base bytestring connection containers data-default-class
29146− directory hinotify magic network process text time tls unix
29147− utf8-string x509-system
29148− ];
29149− description = "Generic Haskell AMQP tools";
29150− license = stdenv.lib.licenses.gpl3;
29151− }) {};
29152−
29153− "amqp-utils_0_4_4_1" = callPackage
2915429243 ({ mkDerivation, amqp, base, bytestring, connection, containers
2915529244 , data-default-class, directory, hinotify, magic, network, process
2915629245 , text, time, tls, unix, utf8-string, x509-system
@@ -29168,7 +29257,6 @@ self: {
2916829257 ];
2916929258 description = "AMQP toolset for the command line";
2917029259 license = stdenv.lib.licenses.gpl3;
29171− hydraPlatforms = stdenv.lib.platforms.none;
2917229260 }) {};
2917329261
2917429262 "amqp-worker" = callPackage
@@ -31827,10 +31915,8 @@ self: {
3182731915 }:
3182831916 mkDerivation {
3182931917 pname = "archive-libarchive";
31830− version = "1.0.0.0";
31831− sha256 = "0pqq76gnk6y71c5wwjhq99y2695v6bfyzjb8gakp6h3jivcpd2gb";
31832− revision = "1";
31833− editedCabalFile = "12wq8nisyr2i1861v2377llha63nqpiys9vk6dvg9rfz7f6qqdch";
31918+ version = "1.0.0.1";
31919+ sha256 = "079wm4c9bahvi693g6655ag9rz9l5g7i4b82q7zm0hz383f94zsl";
3183431920 libraryHaskellDepends = [
3183531921 base bytestring composition-prelude libarchive
3183631922 ];
@@ -34888,10 +34974,8 @@ self: {
3488834974 }:
3488934975 mkDerivation {
3489034976 pname = "aura";
34891− version = "3.1.7";
34892− sha256 = "0w7m65bh38gdq186b16pcnq7k2nakiy749m7z092cv4k5w72gal5";
34893− revision = "1";
34894− editedCabalFile = "1g8hm1bd4yssmy1qkarnwd8w2wz8c2m02gk1agh3pyv60f9q66s7";
34977+ version = "3.1.8";
34978+ sha256 = "19zm9bwpixqdg4a5mcrv2c8fyhygjzawjrwv1jwwhcczqsrjwvrw";
3489534979 isLibrary = true;
3489634980 isExecutable = true;
3489734981 libraryHaskellDepends = [
@@ -35047,8 +35131,8 @@ self: {
3504735131 }:
3504835132 mkDerivation {
3504935133 pname = "autoapply";
35050− version = "0.4";
35051− sha256 = "0b7la51399kcj9a4z9j49xd9v2zs172vygs3djz5qid7fsl37pgm";
35134+ version = "0.4.1";
35135+ sha256 = "1jgzfdi5p0pns6w7543yp2ljglnmym9qplyb4vafynzg3bjhzvz0";
3505235136 setupHaskellDepends = [ base Cabal cabal-doctest ];
3505335137 libraryHaskellDepends = [
3505435138 base logict mtl template-haskell th-desugar transformers
@@ -37803,8 +37887,8 @@ self: {
3780337887 pname = "base64-bytestring-type";
3780437888 version = "1.0.1";
3780537889 sha256 = "03kq4rjj6by02rf3hg815jfdqpdk0xygm5f46r2pn8mb99yd01zn";
37806− revision = "6";
37807− editedCabalFile = "05z53pc1gi62lzl262mc1qx12qqrds6ab6rflwpfcxbp0a67c825";
37890+ revision = "7";
37891+ editedCabalFile = "1vry5qh9w1adwyfrlx8x2772knwmdvxgq2nfzng7vybll2cqph4c";
3780837892 libraryHaskellDepends = [
3780937893 aeson base base-compat base64-bytestring binary bytestring cereal
3781037894 deepseq hashable http-api-data QuickCheck serialise text
@@ -46415,21 +46499,6 @@ self: {
4641546499 }) {};
4641646500
4641746501 "byte-count-reader" = callPackage
46418− ({ mkDerivation, base, extra, hspec, parsec, parsec-numbers, text
46419− }:
46420− mkDerivation {
46421− pname = "byte-count-reader";
46422− version = "0.10.0.1";
46423− sha256 = "0ibckpy0wz2f8590z92lvkmwcf29lv6sby1y3cz3cihxvp3bw3il";
46424− libraryHaskellDepends = [ base extra parsec parsec-numbers text ];
46425− testHaskellDepends = [
46426− base extra hspec parsec parsec-numbers text
46427− ];
46428− description = "Read strings describing a number of bytes like 2Kb and 0.5 MiB";
46429− license = stdenv.lib.licenses.gpl3;
46430− }) {};
46431−
46432− "byte-count-reader_0_10_1_1" = callPackage
4643346502 ({ mkDerivation, base, extra, hspec, parsec, parsec-numbers, text
4643446503 }:
4643546504 mkDerivation {
@@ -46442,7 +46511,6 @@ self: {
4644246511 ];
4644346512 description = "Read strings describing a number of bytes like 2Kb and 0.5 MiB";
4644446513 license = stdenv.lib.licenses.gpl3;
46445− hydraPlatforms = stdenv.lib.platforms.none;
4644646514 }) {};
4644746515
4644846516 "byte-order" = callPackage
@@ -48297,8 +48365,8 @@ self: {
4829748365 pname = "cabal-plan";
4829848366 version = "0.7.0.0";
4829948367 sha256 = "1wv375dq50fibzg6xa9vrr8q4lhaqcl254b9a2vc42rrjvhxxmzc";
48300− revision = "1";
48301− editedCabalFile = "0gc64mgk11nszilkbid351zxh5cpy85kqcc3mrkrw2fsbcga08as";
48368+ revision = "2";
48369+ editedCabalFile = "1c3w9d75kqxhyafjyl8fyzbrp80idvhd693rsd08gws8blkk1vzr";
4830248370 configureFlags = [ "-fexe" ];
4830348371 isLibrary = true;
4830448372 isExecutable = true;
@@ -49871,6 +49939,8 @@ self: {
4987149939 ];
4987249940 description = "OTP-like supervision trees in Haskell";
4987349941 license = stdenv.lib.licenses.mit;
49942+ hydraPlatforms = stdenv.lib.platforms.none;
49943+ broken = true;
4987449944 }) {};
4987549945
4987649946 "capnp" = callPackage
@@ -57317,10 +57387,8 @@ self: {
5731757387 ({ mkDerivation, accelerate, base }:
5731857388 mkDerivation {
5731957389 pname = "colour-accelerate";
57320− version = "0.3.0.0";
57321− sha256 = "0zvzra2w0sajw0hzg2k25khv8c5j1i17g8dnga70w73f3mmh3gbz";
57322− revision = "1";
57323− editedCabalFile = "1mbz9wdx396q8gdy6yqsc5vsxrkky9zkxczjblvc9zy542v252cn";
57390+ version = "0.4.0.0";
57391+ sha256 = "1j7ff2wb58yf346z2abr1v1yq498fxm498rdf1g62ppf6vkdplw8";
5732457392 libraryHaskellDepends = [ accelerate base ];
5732557393 description = "Working with colours in Accelerate";
5732657394 license = stdenv.lib.licenses.bsd3;
@@ -58541,8 +58609,8 @@ self: {
5854158609 }:
5854258610 mkDerivation {
5854358611 pname = "composite-aeson";
58544− version = "0.7.3.0";
58545− sha256 = "0wb15vq95kf6jigfy0n3jampnx8xmkxmh2lnxgfsc8zac9hwls55";
58612+ version = "0.7.4.0";
58613+ sha256 = "1k8m89cff8b3yc1af0l9vd13pav2hjy51gcadahn07zpwv1bszfj";
5854658614 libraryHaskellDepends = [
5854758615 aeson aeson-better-errors base composite-base containers
5854858616 contravariant generic-deriving hashable lens mmorph mtl profunctors
@@ -58561,14 +58629,27 @@ self: {
5856158629 broken = true;
5856258630 }) {};
5856358631
58632+ "composite-aeson-path" = callPackage
58633+ ({ mkDerivation, base, composite-aeson, path }:
58634+ mkDerivation {
58635+ pname = "composite-aeson-path";
58636+ version = "0.7.4.0";
58637+ sha256 = "08p988iq7y76px61dlj5jq35drmnrf4khi27wpqgh3pg9d96yihx";
58638+ libraryHaskellDepends = [ base composite-aeson path ];
58639+ description = "Formatting data for the path library";
58640+ license = stdenv.lib.licenses.bsd3;
58641+ hydraPlatforms = stdenv.lib.platforms.none;
58642+ broken = true;
58643+ }) {};
58644+
5856458645 "composite-aeson-refined" = callPackage
5856558646 ({ mkDerivation, aeson-better-errors, base, composite-aeson, mtl
5856658647 , refined
5856758648 }:
5856858649 mkDerivation {
5856958650 pname = "composite-aeson-refined";
58570− version = "0.7.3.0";
58571− sha256 = "0g0i8zwky1ygniyxpvgl1r78b4qak1mx1wpy2pj815zrd43x1y60";
58651+ version = "0.7.4.0";
58652+ sha256 = "049lrm5iip5y3c9m9x4sjangaigdprj1553sw2vrcvnvn8xfq57s";
5857258653 libraryHaskellDepends = [
5857358654 aeson-better-errors base composite-aeson mtl refined
5857458655 ];
@@ -58579,25 +58660,37 @@ self: {
5857958660 }) {};
5858058661
5858158662 "composite-base" = callPackage
58582− ({ mkDerivation, base, exceptions, hspec, lens, monad-control, mtl
58583− , profunctors, QuickCheck, template-haskell, text, transformers
58584− , transformers-base, unliftio-core, vinyl
58663+ ({ mkDerivation, base, deepseq, exceptions, hspec, lens
58664+ , monad-control, mtl, profunctors, QuickCheck, template-haskell
58665+ , text, transformers, transformers-base, unliftio-core, vinyl
5858558666 }:
5858658667 mkDerivation {
5858758668 pname = "composite-base";
58588− version = "0.7.3.0";
58589− sha256 = "07zbs89cqm7b78jfh2lwma3spsklc6wq0f58g14p27wgm253xkwp";
58669+ version = "0.7.4.0";
58670+ sha256 = "1ml1y1zh8znvaqydwcnv8n69rzmx7zy2bpzr65gy79xbczz3dxwz";
5859058671 libraryHaskellDepends = [
58591− base exceptions lens monad-control mtl profunctors template-haskell
58592− text transformers transformers-base unliftio-core vinyl
58593− ];
58594− testHaskellDepends = [
58595− base exceptions hspec lens monad-control mtl profunctors QuickCheck
58672+ base deepseq exceptions lens monad-control mtl profunctors
5859658673 template-haskell text transformers transformers-base unliftio-core
5859758674 vinyl
5859858675 ];
58676+ testHaskellDepends = [
58677+ base deepseq exceptions hspec lens monad-control mtl profunctors
58678+ QuickCheck template-haskell text transformers transformers-base
58679+ unliftio-core vinyl
58680+ ];
5859958681 description = "Shared utilities for composite-* packages";
5860058682 license = stdenv.lib.licenses.bsd3;
58683+ }) {};
58684+
58685+ "composite-binary" = callPackage
58686+ ({ mkDerivation, base, binary, composite-base }:
58687+ mkDerivation {
58688+ pname = "composite-binary";
58689+ version = "0.7.4.0";
58690+ sha256 = "07d88krkpplprnw57j4bqi71p8bmj0wz28yw41wgl2p5g2h7zccp";
58691+ libraryHaskellDepends = [ base binary composite-base ];
58692+ description = "Orphan binary instances";
58693+ license = stdenv.lib.licenses.bsd3;
5860158694 hydraPlatforms = stdenv.lib.platforms.none;
5860258695 broken = true;
5860358696 }) {};
@@ -58607,8 +58700,8 @@ self: {
5860758700 }:
5860858701 mkDerivation {
5860958702 pname = "composite-ekg";
58610− version = "0.7.3.0";
58611− sha256 = "1402ay8gxqp1fh2ija9ry5g366p5vx64ikmfal9hr2c42c2kmcf9";
58703+ version = "0.7.4.0";
58704+ sha256 = "0y8wnp6n1fvqfrkm1lqv8pdfq7a4k7gaxl3i9dh6xfzyamlghg82";
5861258705 libraryHaskellDepends = [
5861358706 base composite-base ekg-core lens text vinyl
5861458707 ];
@@ -58618,6 +58711,17 @@ self: {
5861858711 broken = true;
5861958712 }) {};
5862058713
58714+ "composite-hashable" = callPackage
58715+ ({ mkDerivation, base, composite-base, hashable }:
58716+ mkDerivation {
58717+ pname = "composite-hashable";
58718+ version = "0.7.4.0";
58719+ sha256 = "0zwv6m9nzz0g3ngmfznxh6wmprhcgdbfxrsgylnr6990ppk0bmg1";
58720+ libraryHaskellDepends = [ base composite-base hashable ];
58721+ description = "Orphan hashable instances";
58722+ license = stdenv.lib.licenses.bsd3;
58723+ }) {};
58724+
5862158725 "composite-opaleye" = callPackage
5862258726 ({ mkDerivation, base, bytestring, composite-base, hspec, lens
5862358727 , opaleye, postgresql-simple, product-profunctors, profunctors
@@ -58625,8 +58729,8 @@ self: {
5862558729 }:
5862658730 mkDerivation {
5862758731 pname = "composite-opaleye";
58628− version = "0.7.3.0";
58629− sha256 = "0b9h0z4v0268qgcwq53p59nkwbbg77dqm9snr4zif71xhmlfscpx";
58732+ version = "0.7.4.0";
58733+ sha256 = "0nzyslqgh7m9ryqw4rajq2m4kfknqzdq0aqnygyz0sblmgixn4hm";
5863058734 libraryHaskellDepends = [
5863158735 base bytestring composite-base lens opaleye postgresql-simple
5863258736 product-profunctors profunctors template-haskell text vinyl
@@ -58649,8 +58753,8 @@ self: {
5864958753 }:
5865058754 mkDerivation {
5865158755 pname = "composite-swagger";
58652− version = "0.7.3.0";
58653− sha256 = "1gzmksq2dfywird7gyjc95v3spgxsab3jbakg5il2fmkx35cc1za";
58756+ version = "0.7.4.0";
58757+ sha256 = "0a7pcs06m0w0mq60y3hhgn4a36gx5daypc1nh1ndsm6x3q3d99q8";
5865458758 libraryHaskellDepends = [
5865558759 base composite-base insert-ordered-containers lens swagger2
5865658760 template-haskell text vinyl
@@ -61407,6 +61511,25 @@ self: {
6140761511 hydraPlatforms = stdenv.lib.platforms.none;
6140861512 }) {};
6140961513
61514+ "containers-accelerate" = callPackage
61515+ ({ mkDerivation, accelerate, accelerate-llvm-native, base
61516+ , containers, half, hashable-accelerate, hedgehog, tasty
61517+ , tasty-hedgehog
61518+ }:
61519+ mkDerivation {
61520+ pname = "containers-accelerate";
61521+ version = "0.1.0.0";
61522+ sha256 = "1bfw5k6nq15szgwjkzd17inmlk0ii0pd6a4lrixi8gyjf6ksm6n1";
61523+ libraryHaskellDepends = [ accelerate base hashable-accelerate ];
61524+ testHaskellDepends = [
61525+ accelerate accelerate-llvm-native base containers half
61526+ hashable-accelerate hedgehog tasty tasty-hedgehog
61527+ ];
61528+ description = "Hashing-based container types";
61529+ license = stdenv.lib.licenses.bsd3;
61530+ hydraPlatforms = stdenv.lib.platforms.none;
61531+ }) {};
61532+
6141061533 "containers-benchmark" = callPackage
6141161534 ({ mkDerivation, base, bytestring, containers, criterion, deepseq
6141261535 , ghc-prim, random
@@ -61782,6 +61905,22 @@ self: {
6178261905 license = stdenv.lib.licenses.mit;
6178361906 }) {};
6178461907
61908+ "contravariant-extras_0_3_5_2" = callPackage
61909+ ({ mkDerivation, base, contravariant, template-haskell
61910+ , template-haskell-compat-v0208
61911+ }:
61912+ mkDerivation {
61913+ pname = "contravariant-extras";
61914+ version = "0.3.5.2";
61915+ sha256 = "0ikwzg0992j870yp0x2ssf4mv2hw2nml979apg493m72xnvr1jz9";
61916+ libraryHaskellDepends = [
61917+ base contravariant template-haskell template-haskell-compat-v0208
61918+ ];
61919+ description = "Extras for the \"contravariant\" package";
61920+ license = stdenv.lib.licenses.mit;
61921+ hydraPlatforms = stdenv.lib.platforms.none;
61922+ }) {};
61923+
6178561924 "control" = callPackage
6178661925 ({ mkDerivation, base, basic, stm, template-haskell, transformers
6178761926 }:
@@ -65622,8 +65761,8 @@ self: {
6562265761 }:
6562365762 mkDerivation {
6562465763 pname = "cublas";
65625− version = "0.5.0.0";
65626− sha256 = "0s47wrmlb35dpym4dz3688qx8m166i2a9d8pqnfdzxy67zv98g1f";
65764+ version = "0.6.0.0";
65765+ sha256 = "0yxyynvf9zlkc8yhra5j1sk1d8hbiqvzbsh02mc1y8hcf8nzyp61";
6562765766 setupHaskellDepends = [ base Cabal cuda directory filepath ];
6562865767 libraryHaskellDepends = [
6562965768 base cuda half storable-complex template-haskell
@@ -65705,10 +65844,8 @@ self: {
6570565844 }:
6570665845 mkDerivation {
6570765846 pname = "cuda";
65708− version = "0.10.1.0";
65709− sha256 = "10lyyc652ic3m4r5agszpv2r99y9fnsdwahb5pd4qiga770v45vp";
65710− revision = "2";
65711− editedCabalFile = "1nw135pd2ab3mmyq3xmkxynzfb54qr7a8xssq5ivrk83yzvs87im";
65847+ version = "0.10.2.0";
65848+ sha256 = "0fkjibnnxradhsbasx1mw0c088cfwypnk6a5002rxpzxid5qrp9l";
6571265849 isLibrary = true;
6571365850 isExecutable = true;
6571465851 setupHaskellDepends = [ base Cabal directory filepath ];
@@ -65768,8 +65905,8 @@ self: {
6576865905 }:
6576965906 mkDerivation {
6577065907 pname = "cufft";
65771− version = "0.9.0.1";
65772− sha256 = "1cf11ia4i19bpbs0wzkz2hqzc22hh2dvbn8m5frnwild83zal4n3";
65908+ version = "0.10.0.0";
65909+ sha256 = "1prma5srgfnhjvf1rvxd1kznv42k4svhk05j93mx1pcx7jd1cmvz";
6577365910 setupHaskellDepends = [
6577465911 base Cabal cuda directory filepath template-haskell
6577565912 ];
@@ -66187,8 +66324,8 @@ self: {
6618766324 }:
6618866325 mkDerivation {
6618966326 pname = "cusolver";
66190− version = "0.2.0.0";
66191− sha256 = "0v30wm32jcz7jy940y26zcqvjy1058bqf0v44xf73v53dlwkd07a";
66327+ version = "0.3.0.0";
66328+ sha256 = "0xskvpjqlckpfrfvnb2afj29p2gnzafq2v98pbvwsprmn60np9mq";
6619266329 setupHaskellDepends = [ base Cabal cuda directory filepath ];
6619366330 libraryHaskellDepends = [
6619466331 base cublas cuda cusparse half storable-complex template-haskell
@@ -66205,8 +66342,8 @@ self: {
6620566342 }:
6620666343 mkDerivation {
6620766344 pname = "cusparse";
66208− version = "0.2.0.0";
66209− sha256 = "1y6qnxfdcw3ik3mjp4410846pq1l628d02bdasll1xd4r4r87vh6";
66345+ version = "0.3.0.0";
66346+ sha256 = "0x2ab7sd7j1mmjns8332mm2nzikprq3w6fbrnbcfk5lz2x0bgir2";
6621066347 setupHaskellDepends = [ base Cabal cuda directory filepath ];
6621166348 libraryHaskellDepends = [ base cuda half storable-complex ];
6621266349 libraryToolDepends = [ c2hs ];
@@ -68766,6 +68903,20 @@ self: {
6876668903 broken = true;
6876768904 }) {};
6876868905
68906+ "data-validation" = callPackage
68907+ ({ mkDerivation, base, containers, hspec, template-haskell }:
68908+ mkDerivation {
68909+ pname = "data-validation";
68910+ version = "0.1.0.1";
68911+ sha256 = "0bc3i4pnz1v516cmsnay1hpmh9r7zglwyv2ai1ncxy2k4l78pih0";
68912+ libraryHaskellDepends = [ base containers template-haskell ];
68913+ testHaskellDepends = [ base containers hspec template-haskell ];
68914+ description = "A library for creating type safe validations";
68915+ license = stdenv.lib.licenses.asl20;
68916+ hydraPlatforms = stdenv.lib.platforms.none;
68917+ broken = true;
68918+ }) {};
68919+
6876968920 "data-variant" = callPackage
6877068921 ({ mkDerivation, base, safe }:
6877168922 mkDerivation {
@@ -68981,8 +69132,8 @@ self: {
6898169132 }:
6898269133 mkDerivation {
6898369134 pname = "dataflower";
68984− version = "0.2.2.0";
68985− sha256 = "169m0yngaslc2pysdpf65pmf9zr037ij7y95rqi6bp3dxcxfcwlg";
69135+ version = "0.3.0.0";
69136+ sha256 = "0nxir4syhbw5spqks3pxj71w781vn8mqxdiig9dqnrv5ks02bqp6";
6898669137 libraryHaskellDepends = [
6898769138 base hashable mtl pretty-show stm time transformers vector
6898869139 ];
@@ -72441,8 +72592,6 @@ self: {
7244172592 ];
7244272593 description = "Dhall to Nix compiler";
7244372594 license = stdenv.lib.licenses.bsd3;
72444− hydraPlatforms = stdenv.lib.platforms.none;
72445− broken = true;
7244672595 }) {};
7244772596
7244872597 "dhall-nixpkgs" = callPackage
@@ -76179,21 +76328,21 @@ self: {
7617976328 }) {};
7618076329
7618176330 "dobutokO-poetry" = callPackage
76182− ({ mkDerivation, base, dobutokO-poetry-general, mmsyn3, mmsyn6ukr
76183− , mmsyn7s, uniqueness-periods, vector
76331+ ({ mkDerivation, base, dobutokO-poetry-general, mmsyn2, mmsyn3
76332+ , mmsyn5, mmsyn6ukr, mmsyn7s, uniqueness-periods, vector
7618476333 }:
7618576334 mkDerivation {
7618676335 pname = "dobutokO-poetry";
76187− version = "0.15.0.0";
76188− sha256 = "1091wqxzg138bc8kk55fkgv5ripq48zyvm3in2b2g54zjy6l4f1p";
76336+ version = "0.16.3.0";
76337+ sha256 = "151ncvk2jz2nlgr52485p6mdqix7qlld96kzi9y3hxag2kpb0723";
7618976338 isLibrary = true;
7619076339 isExecutable = true;
7619176340 libraryHaskellDepends = [
76192− base dobutokO-poetry-general mmsyn3 mmsyn6ukr mmsyn7s
76341+ base dobutokO-poetry-general mmsyn2 mmsyn3 mmsyn5 mmsyn6ukr mmsyn7s
7619376342 uniqueness-periods vector
7619476343 ];
7619576344 executableHaskellDepends = [
76196− base dobutokO-poetry-general mmsyn3 mmsyn6ukr mmsyn7s
76345+ base dobutokO-poetry-general mmsyn2 mmsyn3 mmsyn5 mmsyn6ukr mmsyn7s
7619776346 uniqueness-periods vector
7619876347 ];
7619976348 description = "Helps to order the 7 or less Ukrainian words to obtain somewhat suitable for poetry or music text";
@@ -76915,8 +77064,8 @@ self: {
7691577064 }:
7691677065 mkDerivation {
7691777066 pname = "dom-lt";
76918− version = "0.2.1";
76919− sha256 = "16pf0lzzg0wwk5q44ybbc2hbrjs5hzsai0ssm836xiywsqwp61a7";
77067+ version = "0.2.2";
77068+ sha256 = "0hf0wf4fl671awf87f0r7r4a57cgm88x666081c0wy16qchahffw";
7692077069 libraryHaskellDepends = [ array base containers ];
7692177070 testHaskellDepends = [ base containers HUnit ];
7692277071 benchmarkHaskellDepends = [ base containers criterion deepseq ];
@@ -83348,19 +83497,19 @@ self: {
8334883497 license = stdenv.lib.licenses.bsd3;
8334983498 }) {};
8335083499
83351− "essence-of-live-coding_0_2_2" = callPackage
83500+ "essence-of-live-coding_0_2_3" = callPackage
8335283501 ({ mkDerivation, base, containers, foreign-store, mtl, QuickCheck
83353− , syb, test-framework, test-framework-quickcheck2, transformers
83354− , vector-sized
83502+ , syb, test-framework, test-framework-quickcheck2, time
83503+ , transformers, vector-sized
8335583504 }:
8335683505 mkDerivation {
8335783506 pname = "essence-of-live-coding";
83358− version = "0.2.2";
83359− sha256 = "1hczvr1byk8qjkb45w9nvjmbqfmxl15dgn7kvp0rby0dkrn85275";
83507+ version = "0.2.3";
83508+ sha256 = "19sc5wgby356bm5rh7sr41ydhw3v1pqbz76xyf7081kg77qcbc0m";
8336083509 isLibrary = true;
8336183510 isExecutable = true;
8336283511 libraryHaskellDepends = [
83363− base containers foreign-store syb transformers vector-sized
83512+ base containers foreign-store syb time transformers vector-sized
8336483513 ];
8336583514 executableHaskellDepends = [ base transformers ];
8336683515 testHaskellDepends = [
@@ -83387,14 +83536,14 @@ self: {
8338783536 license = stdenv.lib.licenses.bsd3;
8338883537 }) {};
8338983538
83390− "essence-of-live-coding-gloss_0_2_2" = callPackage
83539+ "essence-of-live-coding-gloss_0_2_3" = callPackage
8339183540 ({ mkDerivation, base, essence-of-live-coding, foreign-store, gloss
8339283541 , syb, transformers
8339383542 }:
8339483543 mkDerivation {
8339583544 pname = "essence-of-live-coding-gloss";
83396− version = "0.2.2";
83397− sha256 = "19kxrjyhikgb49qdb7rlap8bbjsvkyi2ni6a1m1hjyxjziypsw0y";
83545+ version = "0.2.3";
83546+ sha256 = "0msc2pfg7096azk4ggb267cfm2vh02kcksgdmzl46rc5if98xmi7";
8339883547 libraryHaskellDepends = [
8339983548 base essence-of-live-coding foreign-store gloss syb transformers
8340083549 ];
@@ -83409,8 +83558,8 @@ self: {
8340983558 }:
8341083559 mkDerivation {
8341183560 pname = "essence-of-live-coding-gloss-example";
83412− version = "0.2.2";
83413− sha256 = "07kgmbwm9swdavsypxnqf64fh9b2c2h9rmkm38hcl6lahdb2rb44";
83561+ version = "0.2.3";
83562+ sha256 = "08hzfi3mspxlkbhh8mr1q330yp94s6s9w55pla7x10qj8vda4shc";
8341483563 isLibrary = false;
8341583564 isExecutable = true;
8341683565 executableHaskellDepends = [
@@ -83419,6 +83568,8 @@ self: {
8341983568 ];
8342083569 description = "General purpose live coding framework - Gloss example";
8342183570 license = stdenv.lib.licenses.bsd3;
83571+ hydraPlatforms = stdenv.lib.platforms.none;
83572+ broken = true;
8342283573 }) {};
8342383574
8342483575 "essence-of-live-coding-pulse" = callPackage
@@ -83436,14 +83587,14 @@ self: {
8343683587 license = stdenv.lib.licenses.bsd3;
8343783588 }) {};
8343883589
83439− "essence-of-live-coding-pulse_0_2_2" = callPackage
83590+ "essence-of-live-coding-pulse_0_2_3" = callPackage
8344083591 ({ mkDerivation, base, essence-of-live-coding, foreign-store
8344183592 , pulse-simple, transformers
8344283593 }:
8344383594 mkDerivation {
8344483595 pname = "essence-of-live-coding-pulse";
83445− version = "0.2.2";
83446− sha256 = "15v4bzkx4j6mvprk1d215ywamjjvmf6g13cppd109aj4h40zcxbi";
83596+ version = "0.2.3";
83597+ sha256 = "1mxgicmy5xmmad0r0b3dn18ab9dn8r3rqglqxa6v75kl8lswm0c8";
8344783598 libraryHaskellDepends = [
8344883599 base essence-of-live-coding foreign-store pulse-simple transformers
8344983600 ];
@@ -83458,8 +83609,8 @@ self: {
8345883609 }:
8345983610 mkDerivation {
8346083611 pname = "essence-of-live-coding-pulse-example";
83461− version = "0.2.2";
83462− sha256 = "1476wxny2yhq2f2cn2bqrcm4dri39mql509pf9yq2kyd76lkrcgx";
83612+ version = "0.2.3";
83613+ sha256 = "0da3l6z0lnjlq62vx18s2jyvrydffxvcjhv2ydlwczrcy0wggdln";
8346383614 isLibrary = false;
8346483615 isExecutable = true;
8346583616 executableHaskellDepends = [
@@ -83468,6 +83619,8 @@ self: {
8346883619 ];
8346983620 description = "General purpose live coding framework - pulse backend example";
8347083621 license = stdenv.lib.licenses.bsd3;
83622+ hydraPlatforms = stdenv.lib.platforms.none;
83623+ broken = true;
8347183624 }) {};
8347283625
8347383626 "essence-of-live-coding-quickcheck" = callPackage
@@ -83486,14 +83639,14 @@ self: {
8348683639 license = stdenv.lib.licenses.bsd3;
8348783640 }) {};
8348883641
83489− "essence-of-live-coding-quickcheck_0_2_2" = callPackage
83642+ "essence-of-live-coding-quickcheck_0_2_3" = callPackage
8349083643 ({ mkDerivation, base, boltzmann-samplers, essence-of-live-coding
8349183644 , QuickCheck, syb, transformers
8349283645 }:
8349383646 mkDerivation {
8349483647 pname = "essence-of-live-coding-quickcheck";
83495− version = "0.2.2";
83496− sha256 = "1v7ijzs64bqn8nyp1msrrvk6kfkzx5a87ib74fmcasiww1y4lwgl";
83648+ version = "0.2.3";
83649+ sha256 = "0shbpc1ivqr3m9p76kf1vj7g1rqy3magxyh58w1mxymf4c61a9gr";
8349783650 libraryHaskellDepends = [
8349883651 base boltzmann-samplers essence-of-live-coding QuickCheck syb
8349983652 transformers
@@ -83509,14 +83662,16 @@ self: {
8350983662 }:
8351083663 mkDerivation {
8351183664 pname = "essence-of-live-coding-warp";
83512− version = "0.2.2";
83513− sha256 = "14ygm62ak6gprx0r545xmv5nk544p0gsip3017p7ziy3k01mwhgh";
83665+ version = "0.2.3";
83666+ sha256 = "1rpp6xm3s3fji1pcdajc06iw0zhk3mbd245h6a0z6ygf8id7sh50";
8351483667 libraryHaskellDepends = [
8351583668 base essence-of-live-coding http-types wai warp
8351683669 ];
8351783670 testHaskellDepends = [ base essence-of-live-coding http-client ];
8351883671 description = "General purpose live coding framework";
8351983672 license = stdenv.lib.licenses.bsd3;
83673+ hydraPlatforms = stdenv.lib.platforms.none;
83674+ broken = true;
8352083675 }) {};
8352183676
8352283677 "estimator" = callPackage
@@ -85968,8 +86123,8 @@ self: {
8596886123 }:
8596986124 mkDerivation {
8597086125 pname = "extra";
85971− version = "1.7.5";
85972− sha256 = "1cickrjvg4i25yn3qg4f0id0bmq115siysyqnh0yk9rwjlnrxyn9";
86126+ version = "1.7.6";
86127+ sha256 = "1mdqw88crblabxz4sg803ww6pkl5prnjnpjwh11n32y2npky5ask";
8597386128 libraryHaskellDepends = [
8597486129 base clock directory filepath process time unix
8597586130 ];
@@ -85980,6 +86135,25 @@ self: {
8598086135 license = stdenv.lib.licenses.bsd3;
8598186136 }) {};
8598286137
86138+ "extra_1_7_7" = callPackage
86139+ ({ mkDerivation, base, clock, directory, filepath, process
86140+ , QuickCheck, quickcheck-instances, time, unix
86141+ }:
86142+ mkDerivation {
86143+ pname = "extra";
86144+ version = "1.7.7";
86145+ sha256 = "1ark7b6xknc44v8jg5aymxffj5d0qr81frjpg2ffqrkwnhva0w5s";
86146+ libraryHaskellDepends = [
86147+ base clock directory filepath process time unix
86148+ ];
86149+ testHaskellDepends = [
86150+ base directory filepath QuickCheck quickcheck-instances unix
86151+ ];
86152+ description = "Extra functions I use";
86153+ license = stdenv.lib.licenses.bsd3;
86154+ hydraPlatforms = stdenv.lib.platforms.none;
86155+ }) {};
86156+
8598386157 "extract-dependencies" = callPackage
8598486158 ({ mkDerivation, async, base, Cabal, containers
8598586159 , package-description-remote
@@ -88878,9 +89052,8 @@ self: {
8887889052 }:
8887989053 mkDerivation {
8888089054 pname = "filestore";
88881− version = "0.6.4";
88882− sha256 = "1z967kviqsy3ma8xdfffx864f7ji6nsrbd5riis0nasm1bbwm8rr";
88883− enableSeparateDataOutput = true;
89055+ version = "0.6.5";
89056+ sha256 = "0z29273vdqjsrj4vby0gp7d12wg9nkzq9zgqg18db0p5948jw1dh";
8888489057 libraryHaskellDepends = [
8888589058 base bytestring containers Diff directory filepath old-locale
8888689059 parsec process split time utf8-string xml
@@ -91119,17 +91292,6 @@ self: {
9111991292 }) {};
9112091293
9112191294 "fmlist" = callPackage
91122− ({ mkDerivation, base }:
91123− mkDerivation {
91124− pname = "fmlist";
91125− version = "0.9.3";
91126− sha256 = "1w9nhm2zybdx4c1lalkajwqr8wcs731lfjld2r8gknd7y96x8pwf";
91127− libraryHaskellDepends = [ base ];
91128− description = "FoldMap lists";
91129− license = stdenv.lib.licenses.bsd3;
91130− }) {};
91131−
91132− "fmlist_0_9_4" = callPackage
9113391295 ({ mkDerivation, base }:
9113491296 mkDerivation {
9113591297 pname = "fmlist";
@@ -91138,7 +91300,6 @@ self: {
9113891300 libraryHaskellDepends = [ base ];
9113991301 description = "FoldMap lists";
9114091302 license = stdenv.lib.licenses.bsd3;
91141− hydraPlatforms = stdenv.lib.platforms.none;
9114291303 }) {};
9114391304
9114491305 "fmt" = callPackage
@@ -94406,8 +94567,8 @@ self: {
9440694567 }:
9440794568 mkDerivation {
9440894569 pname = "functor-combinators";
94409− version = "0.3.5.1";
94410− sha256 = "07hwsy8nly4sps3fsyfmq54cwfb850j1i1darwsyw24ignbd60j4";
94570+ version = "0.3.6.0";
94571+ sha256 = "0idf896xadp5v5k4m0s087xvvs9008sxw61djqb9v0x08rs5zy8f";
9441194572 libraryHaskellDepends = [
9441294573 assoc base bifunctors comonad constraints containers contravariant
9441394574 deriving-compat free invariant kan-extensions mmorph mtl
@@ -94917,8 +95078,8 @@ self: {
9491795078 }:
9491895079 mkDerivation {
9491995080 pname = "futhark";
94920− version = "0.16.3";
94921− sha256 = "0y9g7nldcx2y7h3gb652i5r3lfvbriaqfqs2gnxym1r9w9kki0si";
95081+ version = "0.16.4";
95082+ sha256 = "14k682phqdp2scmv064i6jyymf3j2f3bs25yw1qff76bkymv02vd";
9492295083 isLibrary = true;
9492395084 isExecutable = true;
9492495085 libraryHaskellDepends = [
@@ -96563,6 +96724,18 @@ self: {
9656396724 license = stdenv.lib.licenses.mit;
9656496725 }) {};
9656596726
96727+ "generic-functor" = callPackage
96728+ ({ mkDerivation, base }:
96729+ mkDerivation {
96730+ pname = "generic-functor";
96731+ version = "0.1.0.0";
96732+ sha256 = "02anlx3l0zn4hx9pckpdpp93yp1xyqcafpy6rk7s1zpv7nqk12z2";
96733+ libraryHaskellDepends = [ base ];
96734+ testHaskellDepends = [ base ];
96735+ description = "Deriving generalized functors with GHC.Generics";
96736+ license = stdenv.lib.licenses.mit;
96737+ }) {};
96738+
9656696739 "generic-lens" = callPackage
9656796740 ({ mkDerivation, base, doctest, generic-lens-core, HUnit
9656896741 , inspection-testing, lens, profunctors, text
@@ -96632,6 +96805,17 @@ self: {
9663296805 broken = true;
9663396806 }) {};
9663496807
96808+ "generic-match" = callPackage
96809+ ({ mkDerivation, base }:
96810+ mkDerivation {
96811+ pname = "generic-match";
96812+ version = "0.2.0.2";
96813+ sha256 = "16r43gzl3a8ycxbhggqk09mrm63r9db85nk1j2x4j4lzcwap7bid";
96814+ libraryHaskellDepends = [ base ];
96815+ description = "First class pattern matching";
96816+ license = stdenv.lib.licenses.mit;
96817+ }) {};
96818+
9663596819 "generic-maybe" = callPackage
9663696820 ({ mkDerivation, base, bytestring, containers, criterion, deepseq
9663796821 , directory, doctest, filepath, generic-deriving, ghc-prim, hlint
@@ -100041,6 +100225,8 @@ self: {
100041100225 ];
100042100226 description = "GI friendly Binding to the Cairo library";
100043100227 license = stdenv.lib.licenses.lgpl21;
100228+ hydraPlatforms = stdenv.lib.platforms.none;
100229+ broken = true;
100044100230 }) {};
100045100231
100046100232 "gi-cairo-render" = callPackage
@@ -100060,6 +100246,8 @@ self: {
100060100246 libraryToolDepends = [ c2hs ];
100061100247 description = "GI friendly Binding to the Cairo library";
100062100248 license = stdenv.lib.licenses.bsd3;
100249+ hydraPlatforms = stdenv.lib.platforms.none;
100250+ broken = true;
100063100251 }) {inherit (pkgs) cairo;};
100064100252
100065100253 "gi-dbusmenu" = callPackage
@@ -100079,6 +100267,8 @@ self: {
100079100267 libraryPkgconfigDepends = [ libdbusmenu ];
100080100268 description = "Dbusmenu bindings";
100081100269 license = stdenv.lib.licenses.lgpl21;
100270+ hydraPlatforms = stdenv.lib.platforms.none;
100271+ broken = true;
100082100272 }) {inherit (pkgs) libdbusmenu;};
100083100273
100084100274 "gi-dbusmenu_0_4_8" = callPackage
@@ -100099,6 +100289,7 @@ self: {
100099100289 description = "Dbusmenu bindings";
100100100290 license = stdenv.lib.licenses.lgpl21;
100101100291 hydraPlatforms = stdenv.lib.platforms.none;
100292+ broken = true;
100102100293 }) {inherit (pkgs) libdbusmenu;};
100103100294
100104100295 "gi-dbusmenugtk3" = callPackage
@@ -100123,6 +100314,8 @@ self: {
100123100314 libraryPkgconfigDepends = [ gtk3 libdbusmenu-gtk3 ];
100124100315 description = "DbusmenuGtk bindings";
100125100316 license = stdenv.lib.licenses.lgpl21;
100317+ hydraPlatforms = stdenv.lib.platforms.none;
100318+ broken = true;
100126100319 }) {inherit (pkgs) gtk3; inherit (pkgs) libdbusmenu-gtk3;};
100127100320
100128100321 "gi-dbusmenugtk3_0_4_9" = callPackage
@@ -100148,6 +100341,7 @@ self: {
100148100341 description = "DbusmenuGtk bindings";
100149100342 license = stdenv.lib.licenses.lgpl21;
100150100343 hydraPlatforms = stdenv.lib.platforms.none;
100344+ broken = true;
100151100345 }) {inherit (pkgs) gtk3; inherit (pkgs) libdbusmenu-gtk3;};
100152100346
100153100347 "gi-gdk" = callPackage
@@ -100287,6 +100481,8 @@ self: {
100287100481 libraryPkgconfigDepends = [ gtk3 ];
100288100482 description = "GdkX11 bindings";
100289100483 license = stdenv.lib.licenses.lgpl21;
100484+ hydraPlatforms = stdenv.lib.platforms.none;
100485+ broken = true;
100290100486 }) {inherit (pkgs) gtk3;};
100291100487
100292100488 "gi-gdkx11_4_0_2" = callPackage
@@ -100310,6 +100506,7 @@ self: {
100310100506 description = "GdkX11 bindings";
100311100507 license = stdenv.lib.licenses.lgpl21;
100312100508 hydraPlatforms = stdenv.lib.platforms.none;
100509+ broken = true;
100313100510 }) {gtk4-x11 = null;};
100314100511
100315100512 "gi-ggit" = callPackage
@@ -100486,6 +100683,8 @@ self: {
100486100683 libraryPkgconfigDepends = [ graphene-gobject ];
100487100684 description = "Graphene bindings";
100488100685 license = stdenv.lib.licenses.lgpl21;
100686+ hydraPlatforms = stdenv.lib.platforms.none;
100687+ broken = true;
100489100688 }) {graphene-gobject = null;};
100490100689
100491100690 "gi-graphene_1_0_2" = callPackage
@@ -100506,6 +100705,7 @@ self: {
100506100705 description = "Graphene bindings";
100507100706 license = stdenv.lib.licenses.lgpl21;
100508100707 hydraPlatforms = stdenv.lib.platforms.none;
100708+ broken = true;
100509100709 }) {graphene-gobject = null;};
100510100710
100511100711 "gi-gsk" = callPackage
@@ -100530,6 +100730,8 @@ self: {
100530100730 libraryPkgconfigDepends = [ gtk4 ];
100531100731 description = "Gsk bindings";
100532100732 license = stdenv.lib.licenses.lgpl21;
100733+ hydraPlatforms = stdenv.lib.platforms.none;
100734+ broken = true;
100533100735 }) {gtk4 = null;};
100534100736
100535100737 "gi-gst" = callPackage
@@ -100615,6 +100817,8 @@ self: {
100615100817 libraryPkgconfigDepends = [ gstreamer-pbutils ];
100616100818 description = "GStreamer Plugins Base Utils bindings";
100617100819 license = stdenv.lib.licenses.lgpl21;
100820+ hydraPlatforms = stdenv.lib.platforms.none;
100821+ broken = true;
100618100822 }) {gstreamer-pbutils = null;};
100619100823
100620100824 "gi-gsttag" = callPackage
@@ -100636,6 +100840,8 @@ self: {
100636100840 libraryPkgconfigDepends = [ gstreamer-tag ];
100637100841 description = "GStreamer Tag bindings";
100638100842 license = stdenv.lib.licenses.lgpl21;
100843+ hydraPlatforms = stdenv.lib.platforms.none;
100844+ broken = true;
100639100845 }) {gstreamer-tag = null;};
100640100846
100641100847 "gi-gstvideo" = callPackage
@@ -100755,6 +100961,8 @@ self: {
100755100961 ];
100756100962 description = "Declarative GTK+ programming in Haskell";
100757100963 license = stdenv.lib.licenses.mpl20;
100964+ hydraPlatforms = stdenv.lib.platforms.none;
100965+ broken = true;
100758100966 }) {};
100759100967
100760100968 "gi-gtk-declarative-app-simple" = callPackage
@@ -100773,6 +100981,8 @@ self: {
100773100981 ];
100774100982 description = "Declarative GTK+ programming in Haskell in the style of Pux";
100775100983 license = stdenv.lib.licenses.mpl20;
100984+ hydraPlatforms = stdenv.lib.platforms.none;
100985+ broken = true;
100776100986 }) {};
100777100987
100778100988 "gi-gtk-hs" = callPackage
@@ -100790,6 +101000,8 @@ self: {
100790101000 ];
100791101001 description = "A wrapper for gi-gtk, adding a few more idiomatic API parts on top";
100792101002 license = stdenv.lib.licenses.lgpl21;
101003+ hydraPlatforms = stdenv.lib.platforms.none;
101004+ broken = true;
100793101005 }) {};
100794101006
100795101007 "gi-gtk-hs_0_3_9" = callPackage
@@ -100808,6 +101020,7 @@ self: {
100808101020 description = "A wrapper for gi-gtk, adding a few more idiomatic API parts on top";
100809101021 license = stdenv.lib.licenses.lgpl21;
100810101022 hydraPlatforms = stdenv.lib.platforms.none;
101023+ broken = true;
100811101024 }) {};
100812101025
100813101026 "gi-gtkosxapplication" = callPackage
@@ -100829,6 +101042,8 @@ self: {
100829101042 libraryPkgconfigDepends = [ gtk-mac-integration-gtk3 ];
100830101043 description = "GtkosxApplication bindings";
100831101044 license = stdenv.lib.licenses.lgpl21;
101045+ hydraPlatforms = stdenv.lib.platforms.none;
101046+ broken = true;
100832101047 }) {gtk-mac-integration-gtk3 = null;};
100833101048
100834101049 "gi-gtksource" = callPackage
@@ -100877,6 +101092,8 @@ self: {
100877101092 libraryPkgconfigDepends = [ libhandy ];
100878101093 description = "libhandy bindings";
100879101094 license = stdenv.lib.licenses.lgpl21;
101095+ hydraPlatforms = stdenv.lib.platforms.none;
101096+ broken = true;
100880101097 }) {inherit (pkgs) libhandy;};
100881101098
100882101099 "gi-harfbuzz" = callPackage
@@ -101076,6 +101293,8 @@ self: {
101076101293 libraryPkgconfigDepends = [ poppler ];
101077101294 description = "Poppler bindings";
101078101295 license = stdenv.lib.licenses.lgpl21;
101296+ hydraPlatforms = stdenv.lib.platforms.none;
101297+ broken = true;
101079101298 }) {inherit (pkgs) poppler;};
101080101299
101081101300 "gi-secret" = callPackage
@@ -101238,6 +101457,8 @@ self: {
101238101457 libraryPkgconfigDepends = [ libwnck ];
101239101458 description = "Wnck bindings";
101240101459 license = stdenv.lib.licenses.lgpl21;
101460+ hydraPlatforms = stdenv.lib.platforms.none;
101461+ broken = true;
101241101462 }) {inherit (pkgs) libwnck;};
101242101463
101243101464 "gi-xlib" = callPackage
@@ -101257,6 +101478,8 @@ self: {
101257101478 libraryPkgconfigDepends = [ xlibsWrapper ];
101258101479 description = "xlib bindings";
101259101480 license = stdenv.lib.licenses.lgpl21;
101481+ hydraPlatforms = stdenv.lib.platforms.none;
101482+ broken = true;
101260101483 }) {inherit (pkgs) xlibsWrapper;};
101261101484
101262101485 "gi-xlib_2_0_9" = callPackage
@@ -101277,6 +101500,7 @@ self: {
101277101500 description = "xlib bindings";
101278101501 license = stdenv.lib.licenses.lgpl21;
101279101502 hydraPlatforms = stdenv.lib.platforms.none;
101503+ broken = true;
101280101504 }) {inherit (pkgs) xlibsWrapper;};
101281101505
101282101506 "giak" = callPackage
@@ -101343,6 +101567,39 @@ self: {
101343101567 license = stdenv.lib.licenses.mit;
101344101568 }) {};
101345101569
101570+ "ginger_0_10_1_0" = callPackage
101571+ ({ mkDerivation, aeson, aeson-pretty, base, bytestring
101572+ , data-default, filepath, http-types, mtl, optparse-applicative
101573+ , parsec, process, regex-tdfa, safe, scientific, tasty, tasty-hunit
101574+ , tasty-quickcheck, text, time, transformers, unordered-containers
101575+ , utf8-string, vector, yaml
101576+ }:
101577+ mkDerivation {
101578+ pname = "ginger";
101579+ version = "0.10.1.0";
101580+ sha256 = "0579ajr1rng0bd0pml69f6yz4aykvk8zcni0p7ck628qx4jzxihx";
101581+ isLibrary = true;
101582+ isExecutable = true;
101583+ enableSeparateDataOutput = true;
101584+ libraryHaskellDepends = [
101585+ aeson aeson-pretty base bytestring data-default filepath http-types
101586+ mtl parsec regex-tdfa safe scientific text time transformers
101587+ unordered-containers utf8-string vector
101588+ ];
101589+ executableHaskellDepends = [
101590+ aeson base bytestring data-default optparse-applicative process
101591+ text transformers unordered-containers utf8-string yaml
101592+ ];
101593+ testHaskellDepends = [
101594+ aeson base bytestring data-default mtl tasty tasty-hunit
101595+ tasty-quickcheck text time transformers unordered-containers
101596+ utf8-string
101597+ ];
101598+ description = "An implementation of the Jinja2 template language in Haskell";
101599+ license = stdenv.lib.licenses.mit;
101600+ hydraPlatforms = stdenv.lib.platforms.none;
101601+ }) {};
101602+
101346101603 "gingersnap" = callPackage
101347101604 ({ mkDerivation, aeson, base, bytestring, containers, deepseq
101348101605 , http-types, microspec, postgresql-simple, resource-pool
@@ -103295,14 +103552,16 @@ self: {
103295103552 }) {};
103296103553
103297103554 "gloss-accelerate" = callPackage
103298− ({ mkDerivation, accelerate, base, gloss, gloss-rendering }:
103555+ ({ mkDerivation, accelerate, base, gloss, gloss-rendering
103556+ , linear-accelerate
103557+ }:
103299103558 mkDerivation {
103300103559 pname = "gloss-accelerate";
103301− version = "2.0.0.1";
103302− sha256 = "106z8kax0m3hzk0381l8m7gxdapl3wf0fdr1ljwb5fgcjc00pac2";
103303− revision = "1";
103304− editedCabalFile = "0349yyzxn7r82mz4vr71dibzp0sh45b4a06hm0c0z9d7vlxj0sjj";
103305− libraryHaskellDepends = [ accelerate base gloss gloss-rendering ];
103560+ version = "2.1.0.0";
103561+ sha256 = "1l09li68r04qij11p7rf9dwfv9cdncj7nm6crq6bm834il3zg4zx";
103562+ libraryHaskellDepends = [
103563+ accelerate base gloss gloss-rendering linear-accelerate
103564+ ];
103306103565 description = "Extras to interface Gloss and Accelerate";
103307103566 license = stdenv.lib.licenses.bsd3;
103308103567 hydraPlatforms = stdenv.lib.platforms.none;
@@ -103449,10 +103708,8 @@ self: {
103449103708 }:
103450103709 mkDerivation {
103451103710 pname = "gloss-raster-accelerate";
103452− version = "2.0.0.0";
103453− sha256 = "1i0qx9wybr66i1x4n3p8ai2z6qx0k5lac422mhh4rvimcjx2bc9d";
103454− revision = "3";
103455− editedCabalFile = "0nk901zy01x7v7faa20j0yawqfw3nfl27xr19ip7bn3agmq4sqq2";
103711+ version = "2.1.0.0";
103712+ sha256 = "0yxlpz5wqfriijzkhqgjyv3g0wcmdy33ifbziqrdm9phvsjygvza";
103456103713 libraryHaskellDepends = [
103457103714 accelerate base colour-accelerate gloss gloss-accelerate
103458103715 ];
@@ -103529,6 +103786,26 @@ self: {
103529103786 broken = true;
103530103787 }) {inherit (pkgs) glpk;};
103531103788
103789+ "gltf-codec" = callPackage
103790+ ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring
103791+ , directory, filepath, scientific, shower, text
103792+ , unordered-containers, vector
103793+ }:
103794+ mkDerivation {
103795+ pname = "gltf-codec";
103796+ version = "0.1.0.1";
103797+ sha256 = "0qdwk4ygvhdp4x8bkw101b50wc8zfb6bb54zpxaxkmva40hcv2c2";
103798+ libraryHaskellDepends = [
103799+ aeson base base64-bytestring binary bytestring scientific text
103800+ unordered-containers vector
103801+ ];
103802+ testHaskellDepends = [ base bytestring directory filepath shower ];
103803+ description = "glTF scene loader";
103804+ license = stdenv.lib.licenses.bsd3;
103805+ hydraPlatforms = stdenv.lib.platforms.none;
103806+ broken = true;
103807+ }) {};
103808+
103532103809 "glue" = callPackage
103533103810 ({ mkDerivation, async, base, ekg-core, hashable, hspec
103534103811 , lifted-base, monad-control, monad-loops, QuickCheck
@@ -107905,6 +108182,36 @@ self: {
107905108182 license = stdenv.lib.licenses.asl20;
107906108183 }) {};
107907108184
108185+ "graphql-client" = callPackage
108186+ ({ mkDerivation, aeson, aeson-schemas, base, bytestring, file-embed
108187+ , http-client, http-client-tls, http-types, mtl
108188+ , optparse-applicative, path, path-io, tasty, tasty-hunit
108189+ , template-haskell, text, transformers, typed-process
108190+ , unliftio-core
108191+ }:
108192+ mkDerivation {
108193+ pname = "graphql-client";
108194+ version = "1.0.0";
108195+ sha256 = "1qzrlk3vkvavi14zz7dkndz8qh449s6rpbrd5phqclgbrah1hj3a";
108196+ isLibrary = true;
108197+ isExecutable = true;
108198+ libraryHaskellDepends = [
108199+ aeson aeson-schemas base http-client http-client-tls http-types mtl
108200+ template-haskell text transformers unliftio-core
108201+ ];
108202+ executableHaskellDepends = [
108203+ aeson aeson-schemas base bytestring file-embed http-client
108204+ http-client-tls http-types mtl optparse-applicative path path-io
108205+ template-haskell text transformers typed-process unliftio-core
108206+ ];
108207+ testHaskellDepends = [
108208+ aeson aeson-schemas base http-client http-client-tls http-types mtl
108209+ tasty tasty-hunit template-haskell text transformers unliftio-core
108210+ ];
108211+ description = "A client for Haskell programs to query a GraphQL API";
108212+ license = stdenv.lib.licenses.bsd3;
108213+ }) {};
108214+
107908108215 "graphql-w-persistent" = callPackage
107909108216 ({ mkDerivation, base, containers, json, text }:
107910108217 mkDerivation {
@@ -114050,6 +114357,22 @@ self: {
114050114357 license = stdenv.lib.licenses.bsd2;
114051114358 }) {};
114052114359
114360+ "happy_1_20_0" = callPackage
114361+ ({ mkDerivation, array, base, containers, mtl, process }:
114362+ mkDerivation {
114363+ pname = "happy";
114364+ version = "1.20.0";
114365+ sha256 = "1346r2x5ravs5fqma65bzjragqbb2g6v41wz9maknwm2jf7kl79v";
114366+ isLibrary = false;
114367+ isExecutable = true;
114368+ enableSeparateDataOutput = true;
114369+ executableHaskellDepends = [ array base containers mtl ];
114370+ testHaskellDepends = [ base process ];
114371+ description = "Happy is a parser generator for Haskell";
114372+ license = stdenv.lib.licenses.bsd2;
114373+ hydraPlatforms = stdenv.lib.platforms.none;
114374+ }) {};
114375+
114053114376 "happy-dot" = callPackage
114054114377 ({ mkDerivation, array, base, clock, happy, HUnit, language-dot
114055114378 , pretty, transformers, xml
@@ -114754,6 +115077,18 @@ self: {
114754115077 license = stdenv.lib.licenses.bsd3;
114755115078 }) {};
114756115079
115080+ "hashable-accelerate" = callPackage
115081+ ({ mkDerivation, accelerate, base, template-haskell }:
115082+ mkDerivation {
115083+ pname = "hashable-accelerate";
115084+ version = "0.1.0.0";
115085+ sha256 = "04cfwd1vyz4xm87ah3x1avs2yzqi6ygcd3sl70v50g492dfl6738";
115086+ libraryHaskellDepends = [ accelerate base template-haskell ];
115087+ description = "A class for types which can be converted into a hash value";
115088+ license = stdenv.lib.licenses.bsd3;
115089+ hydraPlatforms = stdenv.lib.platforms.none;
115090+ }) {};
115091+
114757115092 "hashable-extras" = callPackage
114758115093 ({ mkDerivation, base, bifunctors, bytestring, directory, doctest
114759115094 , filepath, hashable, transformers, transformers-compat
@@ -114924,6 +115259,17 @@ self: {
114924115259 license = stdenv.lib.licenses.bsd3;
114925115260 }) {};
114926115261
115262+ "hashmap-throw" = callPackage
115263+ ({ mkDerivation, base, exceptions, hashable, hashmap }:
115264+ mkDerivation {
115265+ pname = "hashmap-throw";
115266+ version = "0.1.0.0";
115267+ sha256 = "0dibdmpb6nyhn37xfdw8wgam4a2w8b3hl04ivg08d1ybq4a4m1k5";
115268+ libraryHaskellDepends = [ base exceptions hashable hashmap ];
115269+ description = "Throw behaviour for hashmap lookup";
115270+ license = stdenv.lib.licenses.mit;
115271+ }) {};
115272+
114927115273 "hashrename" = callPackage
114928115274 ({ mkDerivation, base, bytestring, cryptohash, directory, filepath
114929115275 }:
@@ -115231,15 +115577,15 @@ self: {
115231115577 broken = true;
115232115578 }) {};
115233115579
115234− "haskeline_0_8_0_0" = callPackage
115580+ "haskeline_0_8_1_0" = callPackage
115235115581 ({ mkDerivation, base, bytestring, containers, directory
115236115582 , exceptions, filepath, HUnit, process, stm, terminfo, text
115237115583 , transformers, unix
115238115584 }:
115239115585 mkDerivation {
115240115586 pname = "haskeline";
115241− version = "0.8.0.0";
115242− sha256 = "0gqsa5s0drim9m42hv4wrq61mnvcdylxysfxfw3acncwilfrn9pb";
115587+ version = "0.8.1.0";
115588+ sha256 = "0r6skxr45k0qq5vlh9dyl5g5ham994b8z0k3z3v56bi3npvyi6xw";
115243115589 configureFlags = [ "-fterminfo" ];
115244115590 isLibrary = true;
115245115591 isExecutable = true;
@@ -116567,6 +116913,8 @@ self: {
116567116913 pname = "haskell-src";
116568116914 version = "1.0.3.1";
116569116915 sha256 = "0cjigvshk4b8wqdk0v0hz9ag1kyjjsmqsy4a1m3n28ac008cg746";
116916+ revision = "1";
116917+ editedCabalFile = "1li6czcs54wnij6qnvpx6f66iiw023pggb3zl3jvp74qqflcf5sg";
116570116918 libraryHaskellDepends = [ array base pretty syb ];
116571116919 libraryToolDepends = [ happy ];
116572116920 description = "Support for manipulating Haskell source code";
@@ -116706,6 +117054,28 @@ self: {
116706117054 license = stdenv.lib.licenses.bsd3;
116707117055 }) {};
116708117056
117057+ "haskell-src-match" = callPackage
117058+ ({ mkDerivation, base, containers, filepath, haskell-src-exts
117059+ , hspec, interpolatedstring-perl6, pretty-simple, split
117060+ , template-haskell, text, transformers
117061+ }:
117062+ mkDerivation {
117063+ pname = "haskell-src-match";
117064+ version = "0.0.0.1";
117065+ sha256 = "0lhdnmzmwxsiw0if600apdvmkbqz44zwr7sypfclixl9c6h31wg0";
117066+ libraryHaskellDepends = [
117067+ base containers haskell-src-exts interpolatedstring-perl6
117068+ pretty-simple split template-haskell transformers
117069+ ];
117070+ testHaskellDepends = [
117071+ base filepath hspec interpolatedstring-perl6 template-haskell text
117072+ ];
117073+ description = "Testing code generators piece by piece";
117074+ license = stdenv.lib.licenses.bsd3;
117075+ hydraPlatforms = stdenv.lib.platforms.none;
117076+ broken = true;
117077+ }) {};
117078+
116709117079 "haskell-src-meta" = callPackage
116710117080 ({ mkDerivation, base, containers, haskell-src-exts, HUnit, pretty
116711117081 , syb, tasty, tasty-hunit, template-haskell, th-orphans
@@ -118586,6 +118956,8 @@ self: {
118586118956 ];
118587118957 description = "Simple unsupervised segmentation model";
118588118958 license = stdenv.lib.licenses.bsd3;
118959+ hydraPlatforms = stdenv.lib.platforms.none;
118960+ broken = true;
118589118961 }) {};
118590118962
118591118963 "hasktags" = callPackage
@@ -122670,8 +123042,8 @@ self: {
122670123042 }:
122671123043 mkDerivation {
122672123044 pname = "hercules-ci-agent";
122673− version = "0.7.3";
122674− sha256 = "19mz8cqrk7v49h8k2bcpv31qnplx7r10k010gzcwmhhfyrlyrqyg";
123045+ version = "0.7.4";
123046+ sha256 = "0yj9njd168xpj4har99mbb9rr5dqsbnzqs1061s3czrzlp229z3l";
122675123047 isLibrary = true;
122676123048 isExecutable = true;
122677123049 libraryHaskellDepends = [
@@ -124545,7 +124917,7 @@ self: {
124545124917 license = stdenv.lib.licenses.bsd3;
124546124918 }) {};
124547124919
124548− "hie-bios_0_6_2" = callPackage
124920+ "hie-bios_0_7_0" = callPackage
124549124921 ({ mkDerivation, aeson, base, base16-bytestring, bytestring
124550124922 , conduit, conduit-extra, containers, cryptohash-sha1, deepseq
124551124923 , directory, extra, file-embed, filepath, ghc, hslogger
@@ -124555,8 +124927,8 @@ self: {
124555124927 }:
124556124928 mkDerivation {
124557124929 pname = "hie-bios";
124558− version = "0.6.2";
124559− sha256 = "0x0lgrkbp4f9r96cf65d8qg55hp2qb14xd3zzap5yhybhlp54w8m";
124930+ version = "0.7.0";
124931+ sha256 = "17jfiyxq1m0n1i9a565niczivkkxdd36l9gxqbhfafxsykggliab";
124560124932 isLibrary = true;
124561124933 isExecutable = true;
124562124934 libraryHaskellDepends = [
@@ -136143,6 +136515,32 @@ self: {
136143136515 license = stdenv.lib.licenses.bsd3;
136144136516 }) {};
136145136517
136518+ "http-api-data_0_4_2" = callPackage
136519+ ({ mkDerivation, attoparsec, attoparsec-iso8601, base, base-compat
136520+ , bytestring, containers, cookie, hashable, hspec, hspec-discover
136521+ , http-types, HUnit, nats, QuickCheck, quickcheck-instances, tagged
136522+ , text, time-compat, transformers, unordered-containers, uuid-types
136523+ }:
136524+ mkDerivation {
136525+ pname = "http-api-data";
136526+ version = "0.4.2";
136527+ sha256 = "0xzfvxxh33ivlnrnzmm19cni3jgb5ph18n9hykkw3d6l3rhwzcnl";
136528+ libraryHaskellDepends = [
136529+ attoparsec attoparsec-iso8601 base base-compat bytestring
136530+ containers cookie hashable http-types tagged text time-compat
136531+ transformers unordered-containers uuid-types
136532+ ];
136533+ testHaskellDepends = [
136534+ base base-compat bytestring cookie hspec HUnit nats QuickCheck
136535+ quickcheck-instances text time-compat unordered-containers
136536+ uuid-types
136537+ ];
136538+ testToolDepends = [ hspec-discover ];
136539+ description = "Converting to/from HTTP API data like URL pieces, headers and query parameters";
136540+ license = stdenv.lib.licenses.bsd3;
136541+ hydraPlatforms = stdenv.lib.platforms.none;
136542+ }) {};
136543+
136146136544 "http-attoparsec" = callPackage
136147136545 ({ mkDerivation, attoparsec, base, bytestring, http-types }:
136148136546 mkDerivation {
@@ -136183,7 +136581,7 @@ self: {
136183136581 license = stdenv.lib.licenses.mit;
136184136582 }) {};
136185136583
136186− "http-client_0_7_2" = callPackage
136584+ "http-client_0_7_2_1" = callPackage
136187136585 ({ mkDerivation, array, async, base, blaze-builder, bytestring
136188136586 , case-insensitive, containers, cookie, deepseq, directory
136189136587 , exceptions, filepath, ghc-prim, hspec, http-types, memory
@@ -136192,8 +136590,8 @@ self: {
136192136590 }:
136193136591 mkDerivation {
136194136592 pname = "http-client";
136195− version = "0.7.2";
136196− sha256 = "1ld8bx1bnf1gpvdy9wn14b31k94rjvl40zqrgd7nb20zd2l354vp";
136593+ version = "0.7.2.1";
136594+ sha256 = "0b699f07yqa525xqqcs4cn32fryjc2212sv8v83yfqlqwdwzr7jg";
136197136595 libraryHaskellDepends = [
136198136596 array base blaze-builder bytestring case-insensitive containers
136199136597 cookie deepseq exceptions filepath ghc-prim http-types memory
@@ -136776,6 +137174,31 @@ self: {
136776137174 license = stdenv.lib.licenses.publicDomain;
136777137175 }) {};
136778137176
137177+ "http-link-header_1_1_1" = callPackage
137178+ ({ mkDerivation, attoparsec, base, bytestring, criterion, directory
137179+ , errors, hspec, hspec-attoparsec, http-api-data, network-uri
137180+ , QuickCheck, text, transformers
137181+ }:
137182+ mkDerivation {
137183+ pname = "http-link-header";
137184+ version = "1.1.1";
137185+ sha256 = "0bgffcmdswmpw3gl2yricz56y0cxb4x8l0j0qs60c6h16rcp5xwh";
137186+ libraryHaskellDepends = [
137187+ attoparsec base bytestring errors http-api-data network-uri text
137188+ ];
137189+ testHaskellDepends = [
137190+ attoparsec base bytestring errors hspec hspec-attoparsec
137191+ http-api-data network-uri QuickCheck text
137192+ ];
137193+ benchmarkHaskellDepends = [
137194+ attoparsec base bytestring criterion directory errors http-api-data
137195+ network-uri text transformers
137196+ ];
137197+ description = "A parser and writer for the HTTP Link header per RFC 5988";
137198+ license = stdenv.lib.licenses.publicDomain;
137199+ hydraPlatforms = stdenv.lib.platforms.none;
137200+ }) {};
137201+
136779137202 "http-listen" = callPackage
136780137203 ({ mkDerivation, base, bytestring, exceptions, HTTP, network
136781137204 , transformers
@@ -141518,6 +141941,42 @@ self: {
141518141941 license = stdenv.lib.licenses.mit;
141519141942 }) {};
141520141943
141944+ "ihaskell_0_10_1_2" = callPackage
141945+ ({ mkDerivation, aeson, base, base64-bytestring, bytestring, cereal
141946+ , cmdargs, containers, directory, filepath, ghc, ghc-boot
141947+ , ghc-parser, ghc-paths, haskeline, haskell-src-exts, here, hlint
141948+ , hspec, hspec-contrib, http-client, http-client-tls, HUnit
141949+ , ipython-kernel, mtl, parsec, process, random, raw-strings-qq
141950+ , setenv, shelly, split, stm, strict, text, time, transformers
141951+ , unix, unordered-containers, utf8-string, vector
141952+ }:
141953+ mkDerivation {
141954+ pname = "ihaskell";
141955+ version = "0.10.1.2";
141956+ sha256 = "1gs2j0qgxzf346nlnq0zx12yj528ykxia5r3rlldpf6f01zs89v8";
141957+ isLibrary = true;
141958+ isExecutable = true;
141959+ enableSeparateDataOutput = true;
141960+ libraryHaskellDepends = [
141961+ aeson base base64-bytestring bytestring cereal cmdargs containers
141962+ directory filepath ghc ghc-boot ghc-parser ghc-paths haskeline
141963+ haskell-src-exts hlint http-client http-client-tls ipython-kernel
141964+ mtl parsec process random shelly split stm strict text time
141965+ transformers unix unordered-containers utf8-string vector
141966+ ];
141967+ executableHaskellDepends = [
141968+ aeson base bytestring containers directory ghc ipython-kernel
141969+ process strict text transformers unix unordered-containers
141970+ ];
141971+ testHaskellDepends = [
141972+ base directory ghc ghc-paths here hspec hspec-contrib HUnit
141973+ raw-strings-qq setenv shelly text transformers
141974+ ];
141975+ description = "A Haskell backend kernel for the IPython project";
141976+ license = stdenv.lib.licenses.mit;
141977+ hydraPlatforms = stdenv.lib.platforms.none;
141978+ }) {};
141979+
141521141980 "ihaskell-aeson" = callPackage
141522141981 ({ mkDerivation, aeson, aeson-pretty, base, bytestring, here
141523141982 , ihaskell, text
@@ -143033,22 +143492,22 @@ self: {
143033143492 }) {};
143034143493
143035143494 "indigo" = callPackage
143036− ({ mkDerivation, base, constraints, containers, fmt, hedgehog
143037− , hspec-expectations, HUnit, lorentz, morley, morley-prelude
143038− , reflection, singletons, tasty, tasty-discover, tasty-hedgehog
143039− , tasty-hunit-compat, template-haskell, vinyl
143495+ ({ mkDerivation, base, cleveland, constraints, containers, fmt
143496+ , hedgehog, hspec-expectations, HUnit, lorentz, morley
143497+ , morley-prelude, reflection, singletons, tasty, tasty-discover
143498+ , tasty-hedgehog, tasty-hunit-compat, template-haskell, vinyl
143040143499 }:
143041143500 mkDerivation {
143042143501 pname = "indigo";
143043− version = "0.1.0.0";
143044− sha256 = "03bspqbw8iz25d58xvy18qzk7wrm5k48k6bvnnslkikqy2bnkcr1";
143502+ version = "0.2.0";
143503+ sha256 = "070ha5s8yirci7zdnh8gy8hdh158zsj7z7blwsr7inw753fsh1jp";
143045143504 libraryHaskellDepends = [
143046143505 base constraints containers lorentz morley morley-prelude
143047143506 reflection singletons template-haskell vinyl
143048143507 ];
143049143508 testHaskellDepends = [
143050− base containers fmt hedgehog hspec-expectations HUnit lorentz
143051− morley morley-prelude singletons tasty tasty-hedgehog
143509+ base cleveland containers fmt hedgehog hspec-expectations HUnit
143510+ lorentz morley morley-prelude singletons tasty tasty-hedgehog
143052143511 tasty-hunit-compat
143053143512 ];
143054143513 testToolDepends = [ tasty-discover ];
@@ -143056,7 +143515,7 @@ self: {
143056143515 license = stdenv.lib.licenses.mit;
143057143516 hydraPlatforms = stdenv.lib.platforms.none;
143058143517 broken = true;
143059− }) {};
143518+ }) {cleveland = null;};
143060143519
143061143520 "inf-interval" = callPackage
143062143521 ({ mkDerivation, array, base, deepseq, QuickCheck, text, vector }:
@@ -144665,8 +145124,8 @@ self: {
144665145124 ({ mkDerivation, base, containers, text, vector, word8 }:
144666145125 mkDerivation {
144667145126 pname = "intmap-graph";
144668− version = "1.1.0.0";
144669− sha256 = "0yg88vvq53kbzw2r8i1w1g4am4bkp8qzgy9qsc7wknb3zwlzs89w";
145127+ version = "1.3.0.0";
145128+ sha256 = "0g4kf7d4yh29jlb5a2f8awjbmaan2f7m1ybkcihayp83lvjld4v0";
144670145129 libraryHaskellDepends = [ base containers text vector word8 ];
144671145130 description = "A graph library that allows to explore edges after their type";
144672145131 license = stdenv.lib.licenses.bsd3;
@@ -144732,15 +145191,15 @@ self: {
144732145191 license = stdenv.lib.licenses.mit;
144733145192 }) {};
144734145193
144735− "intro_0_8_0_0" = callPackage
145194+ "intro_0_9_0_0" = callPackage
144736145195 ({ mkDerivation, base, bytestring, containers, extra, hashable
144737145196 , lens, mtl, optics, QuickCheck, safe, text, transformers
144738145197 , unordered-containers, writer-cps-mtl
144739145198 }:
144740145199 mkDerivation {
144741145200 pname = "intro";
144742− version = "0.8.0.0";
144743− sha256 = "1vmhmpcikxlmad2c55bdlsa7j1x30irjb7dp69qii650qslh2rf3";
145201+ version = "0.9.0.0";
145202+ sha256 = "0x48bj9nri2zhsjpwx08nvjmpsjq6zd61npa02zsf357wylxir0x";
144744145203 libraryHaskellDepends = [
144745145204 base bytestring containers extra hashable mtl safe text
144746145205 transformers unordered-containers writer-cps-mtl
@@ -145599,6 +146058,29 @@ self: {
145599146058 license = stdenv.lib.licenses.mit;
145600146059 }) {};
145601146060
146061+ "ipython-kernel_0_10_2_1" = callPackage
146062+ ({ mkDerivation, aeson, base, bytestring, cereal, cereal-text
146063+ , containers, cryptonite, directory, filepath, memory, mtl, parsec
146064+ , process, temporary, text, transformers, unordered-containers
146065+ , uuid, zeromq4-haskell
146066+ }:
146067+ mkDerivation {
146068+ pname = "ipython-kernel";
146069+ version = "0.10.2.1";
146070+ sha256 = "016w7bmji3k1cnnl3vq35zq6fnqdvc2x762zfzv4ync2jz63rq38";
146071+ isLibrary = true;
146072+ isExecutable = true;
146073+ enableSeparateDataOutput = true;
146074+ libraryHaskellDepends = [
146075+ aeson base bytestring cereal cereal-text containers cryptonite
146076+ directory filepath memory mtl parsec process temporary text
146077+ transformers unordered-containers uuid zeromq4-haskell
146078+ ];
146079+ description = "A library for creating kernels for IPython frontends";
146080+ license = stdenv.lib.licenses.mit;
146081+ hydraPlatforms = stdenv.lib.platforms.none;
146082+ }) {};
146083+
145602146084 "irc" = callPackage
145603146085 ({ mkDerivation, attoparsec, base, bytestring, HUnit, QuickCheck
145604146086 , test-framework, test-framework-hunit, test-framework-quickcheck2
@@ -146950,8 +147432,8 @@ self: {
146950147432 ({ mkDerivation, base, binary, ixset-typed }:
146951147433 mkDerivation {
146952147434 pname = "ixset-typed-binary-instance";
146953− version = "0.1.0.0";
146954− sha256 = "1qa00y5cn3i2b66h87i6sfx6xx4yvgq7gk6maij5b9w4c821h4m4";
147435+ version = "0.1.0.2";
147436+ sha256 = "1jgqc1ys5pvfkha8pyddz5f01qsmv9a83xw0q75njk8zhqajlyvx";
146955147437 libraryHaskellDepends = [ base binary ixset-typed ];
146956147438 description = "Binary instance for ixset-typed";
146957147439 license = stdenv.lib.licenses.mit;
@@ -146977,8 +147459,8 @@ self: {
146977147459 ({ mkDerivation, base, hashable, ixset-typed }:
146978147460 mkDerivation {
146979147461 pname = "ixset-typed-hashable-instance";
146980− version = "0.1.0.1";
146981− sha256 = "14cd3kzhqv8w9f756drhjpmrr32i6n9sjmp9fk2gngsigaksnvnk";
147462+ version = "0.1.0.2";
147463+ sha256 = "0bwajqlj1kpis2616lrmcymmag66fkmdrsrj0r3kf8j6090zxmyv";
146982147464 libraryHaskellDepends = [ base hashable ixset-typed ];
146983147465 description = "Hashable instance for ixset-typed";
146984147466 license = stdenv.lib.licenses.mit;
@@ -149432,25 +149914,27 @@ self: {
149432149914 "jsop" = callPackage
149433149915 ({ mkDerivation, aeson, base, containers, generics-sop, lens
149434149916 , lens-aeson, monoidal-containers, protolude, string-interpolate
149435− , tasty, tasty-discover, tasty-hspec, text
149917+ , tasty, tasty-discover, tasty-hspec, text, unordered-containers
149436149918 }:
149437149919 mkDerivation {
149438149920 pname = "jsop";
149439− version = "0.1.0.0";
149440− sha256 = "0yaxcpxgn00jf3igvncg59ca6hz28sf791872n617v3vh7arv8y3";
149921+ version = "0.2.0.1";
149922+ sha256 = "05qacp69pk4fm1b1mrk2ax8f8mbfzsb71bkj2qraa116xym61j38";
149441149923 libraryHaskellDepends = [
149442149924 aeson base containers generics-sop lens lens-aeson
149443149925 monoidal-containers protolude string-interpolate tasty
149444− tasty-discover tasty-hspec text
149926+ tasty-discover tasty-hspec text unordered-containers
149445149927 ];
149446149928 testHaskellDepends = [
149447149929 aeson base containers generics-sop lens lens-aeson
149448149930 monoidal-containers protolude string-interpolate tasty
149449− tasty-discover tasty-hspec text
149931+ tasty-discover tasty-hspec text unordered-containers
149450149932 ];
149451149933 testToolDepends = [ tasty-discover ];
149452149934 description = "Cherry picking in JSON objects";
149453149935 license = stdenv.lib.licenses.bsd3;
149936+ hydraPlatforms = stdenv.lib.platforms.none;
149937+ broken = true;
149454149938 }) {};
149455149939
149456149940 "jspath" = callPackage
@@ -149558,18 +150042,18 @@ self: {
149558150042 }) {};
149559150043
149560150044 "juicy-gcode" = callPackage
149561− ({ mkDerivation, base, configurator, lens, linear, matrix
150045+ ({ mkDerivation, base, configurator, gitrev, lens, linear, matrix
149562150046 , optparse-applicative, svg-tree, text
149563150047 }:
149564150048 mkDerivation {
149565150049 pname = "juicy-gcode";
149566− version = "0.1.0.10";
149567− sha256 = "17ps1kkbjvlvyjzbqagwikw960nn8q4dzjvng0waknr2gaa125bj";
150050+ version = "0.2.0.1";
150051+ sha256 = "1jpdxxfg3wdj9kz41a1pklyshrxxakf2bahcc7y1l7p7jklb3lbi";
149568150052 isLibrary = false;
149569150053 isExecutable = true;
149570150054 executableHaskellDepends = [
149571− base configurator lens linear matrix optparse-applicative svg-tree
149572− text
150055+ base configurator gitrev lens linear matrix optparse-applicative
150056+ svg-tree text
149573150057 ];
149574150058 description = "SVG to G-Code converter";
149575150059 license = stdenv.lib.licenses.bsd3;
@@ -150293,41 +150777,6 @@ self: {
150293150777 }) {};
150294150778
150295150779 "katip" = callPackage
150296− ({ mkDerivation, aeson, async, auto-update, base, blaze-builder
150297− , bytestring, containers, criterion, deepseq, directory, either
150298− , filepath, hostname, microlens, microlens-th, monad-control, mtl
150299− , old-locale, quickcheck-instances, regex-tdfa, resourcet
150300− , safe-exceptions, scientific, semigroups, stm, string-conv, tasty
150301− , tasty-golden, tasty-hunit, tasty-quickcheck, template-haskell
150302− , text, time, time-locale-compat, transformers, transformers-base
150303− , transformers-compat, unix, unliftio-core, unordered-containers
150304− }:
150305− mkDerivation {
150306− pname = "katip";
150307− version = "0.8.4.0";
150308− sha256 = "0hkhvkdyk4m5pdr0yj1lbdwqvrfr7sq49jw683mk0lxjlyc39xm6";
150309− libraryHaskellDepends = [
150310− aeson async auto-update base bytestring containers either hostname
150311− microlens microlens-th monad-control mtl old-locale resourcet
150312− safe-exceptions scientific semigroups stm string-conv
150313− template-haskell text time transformers transformers-base
150314− transformers-compat unix unliftio-core unordered-containers
150315− ];
150316− testHaskellDepends = [
150317− aeson base bytestring containers directory microlens
150318− quickcheck-instances regex-tdfa safe-exceptions stm tasty
150319− tasty-golden tasty-hunit tasty-quickcheck template-haskell text
150320− time time-locale-compat unordered-containers
150321− ];
150322− benchmarkHaskellDepends = [
150323− aeson async base blaze-builder criterion deepseq directory filepath
150324− safe-exceptions text time transformers unix
150325− ];
150326− description = "A structured logging framework";
150327− license = stdenv.lib.licenses.bsd3;
150328− }) {};
150329−
150330− "katip_0_8_5_0" = callPackage
150331150780 ({ mkDerivation, aeson, async, auto-update, base, blaze-builder
150332150781 , bytestring, containers, criterion, deepseq, directory, either
150333150782 , filepath, hostname, microlens, microlens-th, monad-control, mtl
@@ -150360,7 +150809,6 @@ self: {
150360150809 ];
150361150810 description = "A structured logging framework";
150362150811 license = stdenv.lib.licenses.bsd3;
150363− hydraPlatforms = stdenv.lib.platforms.none;
150364150812 }) {};
150365150813
150366150814 "katip-datadog" = callPackage
@@ -152191,6 +152639,27 @@ self: {
152191152639 broken = true;
152192152640 }) {egl = null; inherit (pkgs) glew;};
152193152641
152642+ "ktx-codec" = callPackage
152643+ ({ mkDerivation, base, binary, bytestring, containers, directory
152644+ , filepath, shower, text, vector
152645+ }:
152646+ mkDerivation {
152647+ pname = "ktx-codec";
152648+ version = "0.0.1.1";
152649+ sha256 = "1qvkcmxilvlwsbp5pidkh3njwsj6k19ybz8jw5mcm90zdhx3gya0";
152650+ libraryHaskellDepends = [
152651+ base binary bytestring containers text vector
152652+ ];
152653+ testHaskellDepends = [
152654+ base binary bytestring containers directory filepath shower text
152655+ vector
152656+ ];
152657+ description = "Khronos texture format";
152658+ license = stdenv.lib.licenses.bsd3;
152659+ hydraPlatforms = stdenv.lib.platforms.none;
152660+ broken = true;
152661+ }) {};
152662+
152194152663 "kubernetes-client" = callPackage
152195152664 ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
152196152665 , bytestring, connection, containers, data-default-class, either
@@ -153786,8 +154255,8 @@ self: {
153786154255 }:
153787154256 mkDerivation {
153788154257 pname = "language-dickinson";
153789− version = "1.3.0.0";
153790− sha256 = "0pi983l9s182c4xcqj7xq3idv8wnshx7zva5a5wfhws403y5yy7v";
154258+ version = "1.3.0.1";
154259+ sha256 = "0681w4rz547if52yk0k32drhllx0k906nir0gs6xv0pqxkjc07ri";
153791154260 isLibrary = true;
153792154261 isExecutable = true;
153793154262 enableSeparateDataOutput = true;
@@ -156345,12 +156814,10 @@ self: {
156345156814 ({ mkDerivation, accelerate, base, lens }:
156346156815 mkDerivation {
156347156816 pname = "lens-accelerate";
156348− version = "0.2.0.0";
156349− sha256 = "099vvakv7gq9sr9mh3hxj5byxxb4dw8lw7y1g3c4j1kz4gf2vxfk";
156350− revision = "1";
156351− editedCabalFile = "0ggm157i4bmgh7k0dv9zncgn4agwk7zn5wvsknxsnfqzy45qabi9";
156817+ version = "0.3.0.0";
156818+ sha256 = "1sk3iy5qv24mifx0gwd5z714lf3y3s4zpbff09mqk42whk2sdd0y";
156352156819 libraryHaskellDepends = [ accelerate base lens ];
156353− description = "Instances to mix lens with accelerate";
156820+ description = "Instances to mix lens with Accelerate";
156354156821 license = stdenv.lib.licenses.bsd3;
156355156822 hydraPlatforms = stdenv.lib.platforms.none;
156356156823 broken = true;
@@ -157296,8 +157763,8 @@ self: {
157296157763 }:
157297157764 mkDerivation {
157298157765 pname = "libarchive";
157299− version = "2.2.5.2";
157300− sha256 = "1qydgw1c74c0xp2d5d85qbyyng9rgqgxgvj6fhh94wzgkxj99al6";
157766+ version = "3.0.0.0";
157767+ sha256 = "0qwnp5jzmlvi7bpbh1dhz3lp91qf5phr8hb7m3h5q0a50d72dqpp";
157301157768 setupHaskellDepends = [ base Cabal chs-cabal ];
157302157769 libraryHaskellDepends = [
157303157770 base bytestring composition-prelude deepseq dlist filepath mtl
@@ -157418,6 +157885,26 @@ self: {
157418157885 license = stdenv.lib.licenses.publicDomain;
157419157886 }) {ffi = null;};
157420157887
157888+ "libfuse3" = callPackage
157889+ ({ mkDerivation, base, bytestring, clock, fuse3, resourcet, time
157890+ , unix
157891+ }:
157892+ mkDerivation {
157893+ pname = "libfuse3";
157894+ version = "0.1.0.0";
157895+ sha256 = "0qwlaqcpmi7dfsjk219z0hrqmayg46qx1cwj1vcz1nfv8jlm8yif";
157896+ isLibrary = true;
157897+ isExecutable = true;
157898+ libraryHaskellDepends = [
157899+ base bytestring clock resourcet time unix
157900+ ];
157901+ libraryPkgconfigDepends = [ fuse3 ];
157902+ description = "A Haskell binding for libfuse-3.x";
157903+ license = stdenv.lib.licenses.mit;
157904+ hydraPlatforms = stdenv.lib.platforms.none;
157905+ broken = true;
157906+ }) {inherit (pkgs) fuse3;};
157907+
157421157908 "libgit" = callPackage
157422157909 ({ mkDerivation, base, mtl, process }:
157423157910 mkDerivation {
@@ -157968,8 +158455,6 @@ self: {
157968158455 testPkgconfigDepends = [ libsodium ];
157969158456 description = "Low-level bindings to the libsodium C library";
157970158457 license = stdenv.lib.licenses.isc;
157971− hydraPlatforms = stdenv.lib.platforms.none;
157972− broken = true;
157973158458 }) {inherit (pkgs) libsodium;};
157974158459
157975158460 "libssh2" = callPackage
@@ -158869,10 +159354,8 @@ self: {
158869159354 }:
158870159355 mkDerivation {
158871159356 pname = "linear-accelerate";
158872− version = "0.6.0.0";
158873− sha256 = "1bwqbs4816xrrc0bcf3nllad1an7c8gv2n9d1qv3ybk7s4fw288s";
158874− revision = "1";
158875− editedCabalFile = "1sf1jqpymhkdl5xn1br13qkw3zyg7pqmmwcczcw19zpgwk4ai19v";
159357+ version = "0.7.0.0";
159358+ sha256 = "1rdbmchbvrg5g0ndfppswydn15qbp2k9dvx7wapfpy8971qqf2df";
158876159359 setupHaskellDepends = [ base Cabal cabal-doctest ];
158877159360 libraryHaskellDepends = [
158878159361 accelerate base distributive lens linear
@@ -159706,23 +160189,19 @@ self: {
159706160189 benchmarkHaskellDepends = [ aeson attoparsec base criterion text ];
159707160190 description = "Liquid template language library";
159708160191 license = stdenv.lib.licenses.bsd3;
159709− hydraPlatforms = stdenv.lib.platforms.none;
159710− broken = true;
159711160192 }) {};
159712160193
159713160194 "liquid-base" = callPackage
159714160195 ({ mkDerivation, base, Cabal, liquid-ghc-prim, liquidhaskell }:
159715160196 mkDerivation {
159716160197 pname = "liquid-base";
159717− version = "4.14.0.0";
159718− sha256 = "07qy1xc04wbd46cd0zgw3znczang1h1sgllxswjjimaw1wp49xh3";
160198+ version = "4.14.1.0";
160199+ sha256 = "0w5pwksyf8fbr8v8j5mshcysxlbz4lxdvmayc3pj8cm8xcdrvzkm";
159719160200 enableSeparateDataOutput = true;
159720160201 setupHaskellDepends = [ base Cabal liquidhaskell ];
159721160202 libraryHaskellDepends = [ base liquid-ghc-prim liquidhaskell ];
159722160203 description = "Drop-in base replacement for LiquidHaskell";
159723160204 license = stdenv.lib.licenses.bsd3;
159724− hydraPlatforms = stdenv.lib.platforms.none;
159725− broken = true;
159726160205 }) {};
159727160206
159728160207 "liquid-bytestring" = callPackage
@@ -159738,8 +160217,6 @@ self: {
159738160217 libraryHaskellDepends = [ bytestring liquid-base liquidhaskell ];
159739160218 description = "LiquidHaskell specs for the bytestring package";
159740160219 license = stdenv.lib.licenses.bsd3;
159741− hydraPlatforms = stdenv.lib.platforms.none;
159742− broken = true;
159743160220 }) {};
159744160221
159745160222 "liquid-containers" = callPackage
@@ -159755,8 +160232,6 @@ self: {
159755160232 libraryHaskellDepends = [ containers liquid-base liquidhaskell ];
159756160233 description = "LiquidHaskell specs for the containers package";
159757160234 license = stdenv.lib.licenses.bsd3;
159758− hydraPlatforms = stdenv.lib.platforms.none;
159759− broken = true;
159760160235 }) {};
159761160236
159762160237 "liquid-fixpoint" = callPackage
@@ -159769,8 +160244,8 @@ self: {
159769160244 }:
159770160245 mkDerivation {
159771160246 pname = "liquid-fixpoint";
159772− version = "0.8.10.1";
159773− sha256 = "0mavpfwsm3a6cnw2p75hvjch1j0nb8qm1rflq304iz6msg9zbhsv";
160247+ version = "0.8.10.2";
160248+ sha256 = "1sdd88p5mz9xfqk9pbn138ixxdrq089iy5imskvhx66dwwrmrr8l";
159774160249 configureFlags = [ "-fbuild-external" ];
159775160250 isLibrary = true;
159776160251 isExecutable = true;
@@ -159790,8 +160265,6 @@ self: {
159790160265 doCheck = false;
159791160266 description = "Predicate Abstraction-based Horn-Clause/Implication Constraint Solver";
159792160267 license = stdenv.lib.licenses.bsd3;
159793− hydraPlatforms = stdenv.lib.platforms.none;
159794− broken = true;
159795160268 }) {inherit (pkgs) git; inherit (pkgs) nettools;
159796160269 inherit (pkgs) ocaml; inherit (pkgs) z3;};
159797160270
@@ -159806,8 +160279,6 @@ self: {
159806160279 libraryHaskellDepends = [ ghc-prim liquidhaskell ];
159807160280 description = "Drop-in ghc-prim replacement for LiquidHaskell";
159808160281 license = stdenv.lib.licenses.bsd3;
159809− hydraPlatforms = stdenv.lib.platforms.none;
159810− broken = true;
159811160282 }) {};
159812160283
159813160284 "liquid-parallel" = callPackage
@@ -159822,22 +160293,18 @@ self: {
159822160293 libraryHaskellDepends = [ liquid-base liquidhaskell parallel ];
159823160294 description = "LiquidHaskell specs for the parallel package";
159824160295 license = stdenv.lib.licenses.bsd3;
159825− hydraPlatforms = stdenv.lib.platforms.none;
159826− broken = true;
159827160296 }) {};
159828160297
159829160298 "liquid-platform" = callPackage
159830160299 ({ mkDerivation }:
159831160300 mkDerivation {
159832160301 pname = "liquid-platform";
159833− version = "0.8.10.1";
159834− sha256 = "1l1qpg08fhf2xbj7i3hy36idm2z4yggg7mlzyncjkjlqxdnmm44k";
160302+ version = "0.8.10.2";
160303+ sha256 = "1rhpq04nl9gcm9rwjd261ssn8q59pdcpfna0xwkcv3gmkgirwzgf";
159835160304 isLibrary = false;
159836160305 isExecutable = true;
159837160306 description = "A battery-included platform for LiquidHaskell";
159838160307 license = stdenv.lib.licenses.bsd3;
159839− hydraPlatforms = stdenv.lib.platforms.none;
159840− broken = true;
159841160308 }) {};
159842160309
159843160310 "liquid-prelude" = callPackage
@@ -159846,16 +160313,14 @@ self: {
159846160313 }:
159847160314 mkDerivation {
159848160315 pname = "liquid-prelude";
159849− version = "0.8.10.1";
159850− sha256 = "0pcz59spsg3x4c5553yksfqgdjlh2c33id10b6p8hnm6hyqcbjvn";
160316+ version = "0.8.10.2";
160317+ sha256 = "0s52kd2x4h24j6z7cjkrarnqr7kp198qal55y84740rllskv3ijh";
159851160318 setupHaskellDepends = [ base Cabal liquidhaskell ];
159852160319 libraryHaskellDepends = [
159853160320 bytestring containers liquid-base liquidhaskell
159854160321 ];
159855160322 description = "General utility modules for LiquidHaskell";
159856160323 license = stdenv.lib.licenses.bsd3;
159857− hydraPlatforms = stdenv.lib.platforms.none;
159858− broken = true;
159859160324 }) {};
159860160325
159861160326 "liquid-vector" = callPackage
@@ -159869,8 +160334,6 @@ self: {
159869160334 libraryHaskellDepends = [ liquid-base liquidhaskell vector ];
159870160335 description = "LiquidHaskell specs for the vector package";
159871160336 license = stdenv.lib.licenses.bsd3;
159872− hydraPlatforms = stdenv.lib.platforms.none;
159873− broken = true;
159874160337 }) {};
159875160338
159876160339 "liquidhaskell" = callPackage
@@ -159886,10 +160349,8 @@ self: {
159886160349 }:
159887160350 mkDerivation {
159888160351 pname = "liquidhaskell";
159889− version = "0.8.10.1";
159890− sha256 = "0xyxb0sifqgp1hl6lcydf7svw6w968hd3dgmnlly8ddpdmhsw9jm";
159891− revision = "1";
159892− editedCabalFile = "0bg9660c5454jiimgwciimd114r81gfjdad6nzbgyhkvilfd0wad";
160352+ version = "0.8.10.2";
160353+ sha256 = "0byh5lia3kb44sgmilya881dp9il3n5qvrn16brnkvl9xhr9rdyi";
159893160354 isLibrary = true;
159894160355 isExecutable = true;
159895160356 enableSeparateDataOutput = true;
@@ -159897,9 +160358,9 @@ self: {
159897160358 aeson base binary bytestring Cabal cereal cmdargs containers
159898160359 data-default deepseq Diff directory extra filepath fingertree ghc
159899160360 ghc-boot ghc-paths ghc-prim githash gitrev hashable hscolour
159900− liquid-fixpoint mtl optics optparse-simple parsec pretty split syb
159901− template-haskell temporary text time transformers
159902− unordered-containers vector
160361+ liquid-fixpoint mtl optics optparse-applicative optparse-simple
160362+ parsec pretty split syb template-haskell temporary text time
160363+ transformers unordered-containers vector
159903160364 ];
159904160365 executableHaskellDepends = [ base ];
159905160366 testHaskellDepends = [
@@ -159911,8 +160372,6 @@ self: {
159911160372 testSystemDepends = [ z3 ];
159912160373 description = "Liquid Types for Haskell";
159913160374 license = stdenv.lib.licenses.bsd3;
159914− hydraPlatforms = stdenv.lib.platforms.none;
159915− broken = true;
159916160375 }) {inherit (pkgs) z3;};
159917160376
159918160377 "liquidhaskell-cabal" = callPackage
@@ -160983,12 +161442,17 @@ self: {
160983161442 }) {};
160984161443
160985161444 "llvm-pretty" = callPackage
160986− ({ mkDerivation, base, containers, monadLib, parsec, pretty }:
161445+ ({ mkDerivation, base, containers, microlens, microlens-th
161446+ , monadLib, parsec, pretty, template-haskell, th-abstraction
161447+ }:
160987161448 mkDerivation {
160988161449 pname = "llvm-pretty";
160989− version = "0.7.1.1";
160990− sha256 = "17lb4jfkaxz2ahjfvq2mxnb82k209qg13rhdg76v3j8yahr5z0a2";
160991− libraryHaskellDepends = [ base containers monadLib parsec pretty ];
161450+ version = "0.11.0";
161451+ sha256 = "17jw5i68fz2vk40dcqf8k7j6j6h8acg4fhnyygb72jbk17md4q94";
161452+ libraryHaskellDepends = [
161453+ base containers microlens microlens-th monadLib parsec pretty
161454+ template-haskell th-abstraction
161455+ ];
160992161456 description = "A pretty printing library inspired by the llvm binding";
160993161457 license = stdenv.lib.licenses.bsd3;
160994161458 hydraPlatforms = stdenv.lib.platforms.none;
@@ -161579,18 +162043,19 @@ self: {
161579162043
161580162044 "log-elasticsearch" = callPackage
161581162045 ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring
161582− , bloodhound, bytestring, deepseq, http-client, http-client-tls
161583− , log-base, semigroups, text, text-show, time, transformers
161584− , unordered-containers, vector
162046+ , bytestring, deepseq, http-client, http-client-tls, http-types
162047+ , log-base, network-uri, semigroups, text, text-show, time
162048+ , transformers, unordered-containers, vector
161585162049 }:
161586162050 mkDerivation {
161587162051 pname = "log-elasticsearch";
161588− version = "0.10.2.0";
161589− sha256 = "0kcixyklnak34v8vmmpw8vpm1mvf3wll6xpcdvfg1c75wc9n1hqy";
162052+ version = "0.11.0.0";
162053+ sha256 = "1l64mxk3zmlfsqwlhsq62jp8rawj3jbw9izihg7555q51pbqlg5w";
161590162054 libraryHaskellDepends = [
161591− aeson aeson-pretty base base64-bytestring bloodhound bytestring
161592− deepseq http-client http-client-tls log-base semigroups text
161593− text-show time transformers unordered-containers vector
162055+ aeson aeson-pretty base base64-bytestring bytestring deepseq
162056+ http-client http-client-tls http-types log-base network-uri
162057+ semigroups text text-show time transformers unordered-containers
162058+ vector
161594162059 ];
161595162060 description = "Structured logging solution (Elasticsearch back end)";
161596162061 license = stdenv.lib.licenses.bsd3;
@@ -161833,6 +162298,8 @@ self: {
161833162298 ];
161834162299 description = "A mtl-style monad transformer for general purpose & compositional logging";
161835162300 license = stdenv.lib.licenses.bsd3;
162301+ hydraPlatforms = stdenv.lib.platforms.none;
162302+ broken = true;
161836162303 }) {};
161837162304
161838162305 "logging-effect-extra" = callPackage
@@ -162013,6 +162480,19 @@ self: {
162013162480 license = stdenv.lib.licenses.bsd3;
162014162481 }) {};
162015162482
162483+ "logict_0_7_0_3" = callPackage
162484+ ({ mkDerivation, base, mtl, tasty, tasty-hunit }:
162485+ mkDerivation {
162486+ pname = "logict";
162487+ version = "0.7.0.3";
162488+ sha256 = "0psihirap7mrn3ly1h9dvgvgjsqbqwji8m13fm48zl205mpfh73r";
162489+ libraryHaskellDepends = [ base mtl ];
162490+ testHaskellDepends = [ base mtl tasty tasty-hunit ];
162491+ description = "A backtracking logic-programming monad";
162492+ license = stdenv.lib.licenses.bsd3;
162493+ hydraPlatforms = stdenv.lib.platforms.none;
162494+ }) {};
162495+
162016162496 "logict-state" = callPackage
162017162497 ({ mkDerivation, base, logict, mtl, transformers }:
162018162498 mkDerivation {
@@ -162560,8 +163040,8 @@ self: {
162560163040 }:
162561163041 mkDerivation {
162562163042 pname = "lorentz";
162563− version = "0.5.0";
162564− sha256 = "0wvvxc49bc8cyfhhwzzhrdf3sia03d8hx2cxpjg3jab8bbxbqza1";
163043+ version = "0.6.0";
163044+ sha256 = "1mzw2m46g5gffhihjfwimrhwqlky3z420b5wifdvxybm5vfc0qm2";
162565163045 libraryHaskellDepends = [
162566163046 aeson-pretty base bimap bytestring constraints containers
162567163047 data-default first-class-families fmt interpolate lens morley
@@ -163093,8 +163573,8 @@ self: {
163093163573 ({ mkDerivation, base, lucid }:
163094163574 mkDerivation {
163095163575 pname = "lucid-cdn";
163096− version = "0.1.1.1";
163097− sha256 = "1dl44rc5b3wrgfcllp6h1sw4w18jgglh1grh5w9g37rcxi2cxwll";
163576+ version = "0.2.0.0";
163577+ sha256 = "1b4s4yfhxnixc33kz0hnj2v5vrwag4vnssp8ma0vjgh17b9g4qzr";
163098163578 libraryHaskellDepends = [ base lucid ];
163099163579 description = "Curated list of CDN imports for lucid";
163100163580 license = stdenv.lib.licenses.mit;
@@ -163553,14 +164033,44 @@ self: {
163553164033 broken = true;
163554164034 }) {};
163555164035
164036+ "lz4-frame-conduit" = callPackage
164037+ ({ mkDerivation, base, bytestring, conduit, conduit-extra
164038+ , containers, hspec, inline-c, optparse-applicative, QuickCheck
164039+ , raw-strings-qq, resourcet, template-haskell, text, unliftio
164040+ , unliftio-core
164041+ }:
164042+ mkDerivation {
164043+ pname = "lz4-frame-conduit";
164044+ version = "0.1.0.0";
164045+ sha256 = "0nvvf42m4vbadl869hgyqrzbzbxp9q7rlbrldi4y6zw48ig21r1d";
164046+ isLibrary = true;
164047+ isExecutable = true;
164048+ libraryHaskellDepends = [
164049+ base bytestring conduit conduit-extra containers inline-c
164050+ raw-strings-qq resourcet template-haskell unliftio unliftio-core
164051+ ];
164052+ executableHaskellDepends = [
164053+ base bytestring conduit conduit-extra optparse-applicative
164054+ resourcet text
164055+ ];
164056+ testHaskellDepends = [
164057+ base bytestring conduit conduit-extra hspec QuickCheck resourcet
164058+ unliftio-core
164059+ ];
164060+ description = "Conduit implementing the official LZ4 frame streaming format";
164061+ license = stdenv.lib.licenses.mit;
164062+ hydraPlatforms = stdenv.lib.platforms.none;
164063+ broken = true;
164064+ }) {};
164065+
163556164066 "lz4-hs" = callPackage
163557164067 ({ mkDerivation, base, bytestring, c2hs, criterion, filepath, tasty
163558164068 , tasty-hunit, temporary
163559164069 }:
163560164070 mkDerivation {
163561164071 pname = "lz4-hs";
163562− version = "0.1.4.1";
163563− sha256 = "15jm8lbwhgp29yvnwsxsmbixvgpxrnw7jc96zwmzbqx365r4dfqr";
164072+ version = "0.1.5.0";
164073+ sha256 = "0qqv6n7hjcjkc1pzhwkdr9l1kfb8rqndx2lfm6j4bhmvrwwrn8lw";
163564164074 libraryHaskellDepends = [ base bytestring ];
163565164075 libraryToolDepends = [ c2hs ];
163566164076 testHaskellDepends = [ base bytestring tasty tasty-hunit ];
@@ -169564,25 +170074,6 @@ self: {
169564170074 }) {};
169565170075
169566170076 "mime-mail-ses" = callPackage
169567− ({ mkDerivation, base, base64-bytestring, byteable, bytestring
169568− , conduit, cryptohash, http-client, http-client-tls, http-conduit
169569− , http-types, mime-mail, old-locale, text, time, transformers
169570− , xml-conduit, xml-types
169571− }:
169572− mkDerivation {
169573− pname = "mime-mail-ses";
169574− version = "0.4.1";
169575− sha256 = "1w6k4cm5yab9dhg7yn6mp7jzk1zdwpnzc6c1xb3vz3rdwp8jjvx7";
169576− libraryHaskellDepends = [
169577− base base64-bytestring byteable bytestring conduit cryptohash
169578− http-client http-client-tls http-conduit http-types mime-mail
169579− old-locale text time transformers xml-conduit xml-types
169580− ];
169581− description = "Send mime-mail messages via Amazon SES";
169582− license = stdenv.lib.licenses.mit;
169583− }) {};
169584−
169585− "mime-mail-ses_0_4_2" = callPackage
169586170077 ({ mkDerivation, base, base16-bytestring, base64-bytestring
169587170078 , byteable, bytestring, case-insensitive, conduit, cryptohash
169588170079 , http-client, http-client-tls, http-conduit, http-types, mime-mail
@@ -169609,7 +170100,6 @@ self: {
169609170100 ];
169610170101 description = "Send mime-mail messages via Amazon SES";
169611170102 license = stdenv.lib.licenses.mit;
169612− hydraPlatforms = stdenv.lib.platforms.none;
169613170103 }) {};
169614170104
169615170105 "mime-string" = callPackage
@@ -171685,6 +172175,8 @@ self: {
171685172175 ];
171686172176 description = "monad-classes based typeclass for Ollie's logging-effect LoggingT";
171687172177 license = stdenv.lib.licenses.bsd3;
172178+ hydraPlatforms = stdenv.lib.platforms.none;
172179+ broken = true;
171688172180 }) {};
171689172181
171690172182 "monad-codec" = callPackage
@@ -173747,8 +174239,8 @@ self: {
173747174239 }:
173748174240 mkDerivation {
173749174241 pname = "morley";
173750− version = "1.5.0";
173751− sha256 = "151idw4dhdlsw9ga8q0mp3vnv520ljmkr0wm2hhhd7k0xliy177a";
174242+ version = "1.6.0";
174243+ sha256 = "0i06yh7v2zz8lcjhc96k5wsfj9i401mgs05myg46ml04zz4pw408";
173752174244 isLibrary = true;
173753174245 isExecutable = true;
173754174246 libraryHaskellDepends = [
@@ -176956,6 +177448,8 @@ self: {
176956177448 ];
176957177449 description = "A Markov stochastic transition operator with logging";
176958177450 license = stdenv.lib.licenses.bsd3;
177451+ hydraPlatforms = stdenv.lib.platforms.none;
177452+ broken = true;
176959177453 }) {};
176960177454
176961177455 "mwc-random" = callPackage
@@ -177001,10 +177495,8 @@ self: {
177001177495 ({ mkDerivation, accelerate, base, mwc-random }:
177002177496 mkDerivation {
177003177497 pname = "mwc-random-accelerate";
177004− version = "0.1.0.0";
177005− sha256 = "1qrji6b39zp5wrgz5c59xv06l3khhp4fv2ybdmx4ac5i28yx7yih";
177006− revision = "3";
177007− editedCabalFile = "1a7xx3mcli9fx5lqg1zxwqbrgzvgbssn3vprh4wp8zg58pqic6ic";
177498+ version = "0.2.0.0";
177499+ sha256 = "1a8b36l60p29461y0gacgjzarlyrncl54r7x4zh2rgvs2w7mjdc5";
177008177500 libraryHaskellDepends = [ accelerate base mwc-random ];
177009177501 description = "Generate Accelerate arrays filled with high quality pseudorandom numbers";
177010177502 license = stdenv.lib.licenses.bsd3;
@@ -180687,8 +181179,8 @@ self: {
180687181179 }:
180688181180 mkDerivation {
180689181181 pname = "network-uri-json";
180690− version = "0.3.1.1";
180691− sha256 = "0akyhgi79pzhvfq47risrqmr6hi409fnz1ivwpwwfc4laimf3mky";
181182+ version = "0.4.0.0";
181183+ sha256 = "1hnsk8xsa89p4ywvyb4xfdk3l16mlhmb73sy1vbgckc7mlv3mmb4";
180692181184 libraryHaskellDepends = [ aeson base network-uri text ];
180693181185 testHaskellDepends = [
180694181186 aeson base hspec network-arbitrary network-uri test-invariant text
@@ -181757,8 +182249,8 @@ self: {
181757182249 }:
181758182250 mkDerivation {
181759182251 pname = "nix-tree";
181760− version = "0.1.0.0";
181761− sha256 = "0agj882mfnr53jlpn1cnds31b78qw3a13md1ap6jj2rnxs2zjcai";
182252+ version = "0.1.1.0";
182253+ sha256 = "1dciwsw7cv1f73awrqr3gw3zj3mizaw53q3ibkawq9gbfsfg8yiz";
181762182254 isLibrary = false;
181763182255 isExecutable = true;
181764182256 executableHaskellDepends = [
@@ -182445,8 +182937,8 @@ self: {
182445182937 }:
182446182938 mkDerivation {
182447182939 pname = "nonempty-containers";
182448− version = "0.3.4.0";
182449− sha256 = "1np8gypq49j90clavh17wzxp9y6z23lngal815jsg4p35qc0h01l";
182940+ version = "0.3.4.1";
182941+ sha256 = "0cpn0f0gnir9w366hw2906316qx5yc06rrrlv67xba1p66507m83";
182450182942 libraryHaskellDepends = [
182451182943 aeson base comonad containers deepseq nonempty-vector semigroupoids
182452182944 these vector
@@ -183778,12 +184270,14 @@ self: {
183778184270 }:
183779184271 mkDerivation {
183780184272 pname = "nvvm";
183781− version = "0.9.0.0";
183782− sha256 = "00ggaycs5z2b617kgjv851ahrakd4v8w374qbym19r1ccrxkdhhb";
184273+ version = "0.10.0.0";
184274+ sha256 = "188zf4hlqgjj5xgsfvrkynhq8pc29qfkaz6rp61ij3adc30410al";
183783184275 setupHaskellDepends = [
183784184276 base Cabal cuda directory filepath template-haskell
183785184277 ];
183786− libraryHaskellDepends = [ base bytestring cuda template-haskell ];
184278+ libraryHaskellDepends = [
184279+ base bytestring cuda directory filepath template-haskell
184280+ ];
183787184281 libraryToolDepends = [ c2hs ];
183788184282 description = "FFI bindings to NVVM";
183789184283 license = stdenv.lib.licenses.bsd3;
@@ -185190,6 +185684,35 @@ self: {
185190185684 license = stdenv.lib.licenses.bsd3;
185191185685 }) {};
185192185686
185687+ "opaleye_0_7_0_0" = callPackage
185688+ ({ mkDerivation, aeson, base, base16-bytestring, bytestring
185689+ , case-insensitive, containers, contravariant, dotenv, hspec
185690+ , hspec-discover, multiset, postgresql-simple, pretty
185691+ , product-profunctors, profunctors, QuickCheck, scientific
185692+ , semigroups, text, time, time-locale-compat, transformers, uuid
185693+ , void
185694+ }:
185695+ mkDerivation {
185696+ pname = "opaleye";
185697+ version = "0.7.0.0";
185698+ sha256 = "1a4ymnfw7gdqf2b5lsrfhxf53ybjfcyx31fdxn52fv89jc2h2yiy";
185699+ libraryHaskellDepends = [
185700+ aeson base base16-bytestring bytestring case-insensitive
185701+ contravariant postgresql-simple pretty product-profunctors
185702+ profunctors scientific semigroups text time time-locale-compat
185703+ transformers uuid void
185704+ ];
185705+ testHaskellDepends = [
185706+ aeson base bytestring containers contravariant dotenv hspec
185707+ hspec-discover multiset postgresql-simple product-profunctors
185708+ profunctors QuickCheck semigroups text time transformers uuid
185709+ ];
185710+ testToolDepends = [ hspec-discover ];
185711+ description = "An SQL-generating DSL targeting PostgreSQL";
185712+ license = stdenv.lib.licenses.bsd3;
185713+ hydraPlatforms = stdenv.lib.platforms.none;
185714+ }) {};
185715+
185193185716 "opaleye-classy" = callPackage
185194185717 ({ mkDerivation, base, bytestring, lens, mtl, opaleye
185195185718 , postgresql-simple, product-profunctors, transformers
@@ -185979,14 +186502,14 @@ self: {
185979186502 license = stdenv.lib.licenses.asl20;
185980186503 }) {};
185981186504
185982− "opentelemetry_0_6_0" = callPackage
186505+ "opentelemetry_0_6_1" = callPackage
185983186506 ({ mkDerivation, base, bytestring, exceptions, ghc-trace-events
185984186507 , hashable
185985186508 }:
185986186509 mkDerivation {
185987186510 pname = "opentelemetry";
185988− version = "0.6.0";
185989− sha256 = "0gl3xax7gz89fc12lyw468qhailgja06skj6siscq9pip03gj6ck";
186511+ version = "0.6.1";
186512+ sha256 = "0i88ciig40gil4gaj95qw28c2racdr2jb6rcpnsf60fzkqc8b3fk";
185990186513 libraryHaskellDepends = [
185991186514 base bytestring exceptions ghc-trace-events hashable
185992186515 ];
@@ -186030,7 +186553,7 @@ self: {
186030186553 broken = true;
186031186554 }) {};
186032186555
186033− "opentelemetry-extra_0_6_0" = callPackage
186556+ "opentelemetry-extra_0_6_1" = callPackage
186034186557 ({ mkDerivation, aeson, async, base, binary, bytestring, clock
186035186558 , containers, directory, exceptions, filepath, gauge
186036186559 , generic-arbitrary, ghc-events, hashable, hashtables, http-client
@@ -186041,8 +186564,8 @@ self: {
186041186564 }:
186042186565 mkDerivation {
186043186566 pname = "opentelemetry-extra";
186044− version = "0.6.0";
186045− sha256 = "025fsryqzv0cfny1myrhs4bdrdg8sfp86rvxf671sbl8nli48x1a";
186567+ version = "0.6.1";
186568+ sha256 = "0ggxkhcrjj8sg6zf9jnp1j05wwlsay6k95c79j9j3dvw8qy2yjbx";
186046186569 isLibrary = true;
186047186570 isExecutable = true;
186048186571 libraryHaskellDepends = [
@@ -186111,7 +186634,7 @@ self: {
186111186634 broken = true;
186112186635 }) {};
186113186636
186114− "opentelemetry-lightstep_0_6_0" = callPackage
186637+ "opentelemetry-lightstep_0_6_1" = callPackage
186115186638 ({ mkDerivation, aeson, async, base, bytestring, clock, containers
186116186639 , exceptions, filepath, ghc-events, http-client, http-client-tls
186117186640 , http-types, network, opentelemetry, opentelemetry-extra
@@ -186120,8 +186643,8 @@ self: {
186120186643 }:
186121186644 mkDerivation {
186122186645 pname = "opentelemetry-lightstep";
186123− version = "0.6.0";
186124− sha256 = "09xqda7hxx4dn85hs2zh7y3jjxvi7xprcpv8mmam38hzyhjw2rv7";
186646+ version = "0.6.1";
186647+ sha256 = "1a7rrm5aahqh63j0rr7nvd4y3q64m8qr7is0r0a17fwkkpppmyln";
186125186648 isLibrary = true;
186126186649 isExecutable = true;
186127186650 libraryHaskellDepends = [
@@ -186155,14 +186678,14 @@ self: {
186155186678 broken = true;
186156186679 }) {};
186157186680
186158− "opentelemetry-wai_0_6_0" = callPackage
186681+ "opentelemetry-wai_0_6_1" = callPackage
186159186682 ({ mkDerivation, base, bytestring, http-types, opentelemetry, text
186160186683 , wai
186161186684 }:
186162186685 mkDerivation {
186163186686 pname = "opentelemetry-wai";
186164− version = "0.6.0";
186165− sha256 = "1bqq1fs7krckx43w2j4pvfncbyy60rrh6w8n1pcvb629dary5lwn";
186687+ version = "0.6.1";
186688+ sha256 = "0g1a044sphd35z9crc8wbxsk4hfh1gpfi4g8rr1k4f842hznj7nf";
186166186689 libraryHaskellDepends = [
186167186690 base bytestring http-types opentelemetry text wai
186168186691 ];
@@ -187069,24 +187592,6 @@ self: {
187069187592 }) {};
187070187593
187071187594 "optparse-simple" = callPackage
187072− ({ mkDerivation, base, bytestring, directory, githash
187073− , optparse-applicative, template-haskell, transformers
187074− }:
187075− mkDerivation {
187076− pname = "optparse-simple";
187077− version = "0.1.1.2";
187078− sha256 = "1r00hkri42vyx552l8hcd1779fxiyl9w4k0pql915zsprirn8w82";
187079− isLibrary = true;
187080− isExecutable = true;
187081− libraryHaskellDepends = [
187082− base githash optparse-applicative template-haskell transformers
187083− ];
187084− testHaskellDepends = [ base bytestring directory ];
187085− description = "Simple interface to optparse-applicative";
187086− license = stdenv.lib.licenses.bsd3;
187087− }) {};
187088−
187089− "optparse-simple_0_1_1_3" = callPackage
187090187595 ({ mkDerivation, base, bytestring, directory, githash
187091187596 , optparse-applicative, template-haskell, transformers
187092187597 }:
@@ -187102,7 +187607,6 @@ self: {
187102187607 testHaskellDepends = [ base bytestring directory ];
187103187608 description = "Simple interface to optparse-applicative";
187104187609 license = stdenv.lib.licenses.bsd3;
187105− hydraPlatforms = stdenv.lib.platforms.none;
187106187610 }) {};
187107187611
187108187612 "optparse-text" = callPackage
@@ -189072,7 +189576,7 @@ self: {
189072189576 broken = true;
189073189577 }) {};
189074189578
189075− "pandoc-plot_0_9_1_0" = callPackage
189579+ "pandoc-plot_0_9_2_0" = callPackage
189076189580 ({ mkDerivation, base, bytestring, containers, criterion
189077189581 , data-default, directory, filepath, githash, hashable, hspec
189078189582 , hspec-expectations, lifted-async, mtl, optparse-applicative
@@ -189081,8 +189585,8 @@ self: {
189081189585 }:
189082189586 mkDerivation {
189083189587 pname = "pandoc-plot";
189084− version = "0.9.1.0";
189085− sha256 = "0vfcn0h5x9jsf3jjriqd6wfa9cpi7icz4k8pkqmhjz5sgs2yv7i4";
189588+ version = "0.9.2.0";
189589+ sha256 = "0fryriyqlmfc82nqbqw7a8n7325wwag29v3ag61s600jw66i9fsc";
189086189590 isLibrary = true;
189087189591 isExecutable = true;
189088189592 libraryHaskellDepends = [
@@ -189521,7 +190025,7 @@ self: {
189521190025 license = stdenv.lib.licenses.bsd3;
189522190026 }) {};
189523190027
189524− "pantry_0_5_1_1" = callPackage
190028+ "pantry_0_5_1_2" = callPackage
189525190029 ({ mkDerivation, aeson, ansi-terminal, base, bytestring, Cabal
189526190030 , casa-client, casa-types, conduit, conduit-extra, containers
189527190031 , cryptonite, cryptonite-conduit, digest, exceptions, filelock
@@ -189535,8 +190039,8 @@ self: {
189535190039 }:
189536190040 mkDerivation {
189537190041 pname = "pantry";
189538− version = "0.5.1.1";
189539− sha256 = "1q1q8jflhd5r70czsclkj27yqk4v8b1njdw8f4qb3xvf9c3gzl70";
190042+ version = "0.5.1.2";
190043+ sha256 = "1ix1y334l4a7zcqm8i849g67mgvkqzikbhcbkqc1d6hg1lhc7xzr";
189540190044 libraryHaskellDepends = [
189541190045 aeson ansi-terminal base bytestring Cabal casa-client casa-types
189542190046 conduit conduit-extra containers cryptonite cryptonite-conduit
@@ -191533,8 +192037,8 @@ self: {
191533192037 ({ mkDerivation, base, binary, path }:
191534192038 mkDerivation {
191535192039 pname = "path-binary-instance";
191536− version = "0.1.0.0";
191537− sha256 = "1mrmp58s7f88hyq493h39c1f19r92yh2qw1diml61iwhm765j7ir";
192040+ version = "0.1.0.1";
192041+ sha256 = "19ck3ja66vcgl90wyw6r9d2h50kdv9gjs7sxjgciam6v6867vb0y";
191538192042 libraryHaskellDepends = [ base binary path ];
191539192043 description = "Binary instance for Path";
191540192044 license = stdenv.lib.licenses.mit;
@@ -191594,8 +192098,8 @@ self: {
191594192098 ({ mkDerivation, base, path }:
191595192099 mkDerivation {
191596192100 pname = "path-like";
191597− version = "0.2.0.1";
191598− sha256 = "03d5kqs6xr22dl7gjydi1nlzy13wsc0dkmd93pwf37yp85y4bxrp";
192101+ version = "0.2.0.2";
192102+ sha256 = "1hr58zcgcybd34zzas5kf0jgcm5z2wdlbhskwj9233503nnlwkq9";
191599192103 libraryHaskellDepends = [ base path ];
191600192104 description = "PathLike, FileLike and DirLike type classes for the Path library";
191601192105 license = stdenv.lib.licenses.mit;
@@ -193683,8 +194187,8 @@ self: {
193683194187 }:
193684194188 mkDerivation {
193685194189 pname = "persistent-mongoDB";
193686− version = "2.10.0.0";
193687− sha256 = "1z895y21raak3x9qw05hgif5qyvr6c7pkc59wzg7irk8mxijyf4n";
194190+ version = "2.10.0.1";
194191+ sha256 = "194cxlxyaxwzgm7a7q8530bh842s5s1vmq33pclldp78nfy1dczm";
193688194192 libraryHaskellDepends = [
193689194193 aeson base bson bytestring cereal conduit http-api-data mongoDB
193690194194 network path-pieces persistent resource-pool resourcet text time
@@ -193896,24 +194400,23 @@ self: {
193896194400 }) {};
193897194401
193898194402 "persistent-redis" = callPackage
193899− ({ mkDerivation, aeson, attoparsec, base, binary, bytestring, hedis
193900− , http-api-data, monad-control, mtl, path-pieces, persistent
193901− , persistent-template, scientific, template-haskell, text, time
193902− , transformers, utf8-string
194403+ ({ mkDerivation, aeson, base, binary, bytestring, hedis
194404+ , http-api-data, mtl, path-pieces, persistent, persistent-template
194405+ , scientific, template-haskell, text, time, transformers
194406+ , utf8-string
193903194407 }:
193904194408 mkDerivation {
193905194409 pname = "persistent-redis";
193906− version = "2.5.2.2";
193907− sha256 = "1mkdc3s39h0zqzf86zzwyfxfpc4fasrhpfdypkj8mkljbh7v1i1l";
194410+ version = "2.5.2.5";
194411+ sha256 = "0h2bwr5svj36n3axnrgnrzkysg4ywf9d97x4fwwsjgn01gwr262k";
193908194412 libraryHaskellDepends = [
193909− aeson attoparsec base binary bytestring hedis http-api-data
193910− monad-control mtl path-pieces persistent scientific text time
193911− transformers utf8-string
194413+ aeson base binary bytestring hedis http-api-data mtl path-pieces
194414+ persistent scientific text time transformers utf8-string
193912194415 ];
193913194416 testHaskellDepends = [
193914− aeson attoparsec base binary bytestring hedis http-api-data
193915− monad-control mtl path-pieces persistent persistent-template
193916− scientific template-haskell text time transformers utf8-string
194417+ aeson base binary bytestring hedis http-api-data mtl path-pieces
194418+ persistent persistent-template scientific template-haskell text
194419+ time transformers utf8-string
193917194420 ];
193918194421 description = "Backend for persistent library using Redis";
193919194422 license = stdenv.lib.licenses.bsd3;
@@ -194144,6 +194647,30 @@ self: {
194144194647 license = stdenv.lib.licenses.mit;
194145194648 }) {};
194146194649
194650+ "persistent-test_2_0_3_2" = callPackage
194651+ ({ mkDerivation, aeson, base, blaze-html, bytestring, conduit
194652+ , containers, exceptions, hspec, hspec-expectations, HUnit
194653+ , monad-control, monad-logger, mtl, path-pieces, persistent
194654+ , persistent-template, QuickCheck, quickcheck-instances, random
194655+ , resourcet, text, time, transformers, transformers-base, unliftio
194656+ , unliftio-core, unordered-containers
194657+ }:
194658+ mkDerivation {
194659+ pname = "persistent-test";
194660+ version = "2.0.3.2";
194661+ sha256 = "0d7a6m4qm6xzyv7h2fqn9hgv7r7q6dwh7x04ddsrygjxdgpwgqf3";
194662+ libraryHaskellDepends = [
194663+ aeson base blaze-html bytestring conduit containers exceptions
194664+ hspec hspec-expectations HUnit monad-control monad-logger mtl
194665+ path-pieces persistent persistent-template QuickCheck
194666+ quickcheck-instances random resourcet text time transformers
194667+ transformers-base unliftio unliftio-core unordered-containers
194668+ ];
194669+ description = "Tests for Persistent";
194670+ license = stdenv.lib.licenses.mit;
194671+ hydraPlatforms = stdenv.lib.platforms.none;
194672+ }) {};
194673+
194147194674 "persistent-typed-db" = callPackage
194148194675 ({ mkDerivation, aeson, base, bytestring, conduit, esqueleto, hspec
194149194676 , http-api-data, monad-logger, path-pieces, persistent
@@ -198377,6 +198904,40 @@ self: {
198377198904 broken = true;
198378198905 }) {};
198379198906
198907+ "polysemy-http" = callPackage
198908+ ({ mkDerivation, aeson, ansi-terminal, base-noprelude, bytestring
198909+ , case-insensitive, co-log-core, co-log-polysemy, composition
198910+ , containers, data-default, either, hedgehog, http-client
198911+ , http-client-tls, http-conduit, http-types, lens, mono-traversable
198912+ , network, polysemy, polysemy-plugin, relude, servant
198913+ , servant-client, servant-server, string-interpolate, tasty
198914+ , tasty-hedgehog, template-haskell, text, warp
198915+ }:
198916+ mkDerivation {
198917+ pname = "polysemy-http";
198918+ version = "0.1.0.0";
198919+ sha256 = "025dch3cq8bgyy78yg4jrcxxmkdyl03y38zrgjhfv00rrwcffhm0";
198920+ libraryHaskellDepends = [
198921+ aeson ansi-terminal base-noprelude bytestring case-insensitive
198922+ co-log-core co-log-polysemy composition containers data-default
198923+ either http-client http-client-tls http-conduit http-types lens
198924+ mono-traversable polysemy polysemy-plugin relude string-interpolate
198925+ template-haskell text
198926+ ];
198927+ testHaskellDepends = [
198928+ aeson ansi-terminal base-noprelude bytestring case-insensitive
198929+ co-log-core co-log-polysemy composition containers data-default
198930+ either hedgehog http-client http-client-tls http-conduit http-types
198931+ lens mono-traversable network polysemy polysemy-plugin relude
198932+ servant servant-client servant-server string-interpolate tasty
198933+ tasty-hedgehog template-haskell text warp
198934+ ];
198935+ description = "Polysemy effect for http-client";
198936+ license = "BSD-2-Clause-Patent";
198937+ hydraPlatforms = stdenv.lib.platforms.none;
198938+ broken = true;
198939+ }) {};
198940+
198380198941 "polysemy-optics" = callPackage
198381198942 ({ mkDerivation, base, optics, polysemy, polysemy-zoo }:
198382198943 mkDerivation {
@@ -201980,6 +202541,8 @@ self: {
201980202541 libraryHaskellDepends = [ base lucid prettyprinter text ];
201981202542 description = "A prettyprinter backend for lucid";
201982202543 license = stdenv.lib.licenses.bsd3;
202544+ hydraPlatforms = stdenv.lib.platforms.none;
202545+ broken = true;
201983202546 }) {};
201984202547
201985202548 "prettyprinter-vty" = callPackage
@@ -203532,8 +204095,8 @@ self: {
203532204095 }:
203533204096 mkDerivation {
203534204097 pname = "prolog";
203535− version = "0.3";
203536− sha256 = "02i79irax13rny953k6fvswsgbif9nnvysnnbq3k4w37b3g5maiv";
204098+ version = "0.3.2";
204099+ sha256 = "1clh7gfqh2yf17jc453y8cc8qcga9h0j5a60nfr1sjd5byr8j8ab";
203537204100 libraryHaskellDepends = [
203538204101 base containers mtl parsec syb template-haskell th-lift
203539204102 transformers
@@ -204138,8 +204701,8 @@ self: {
204138204701 }:
204139204702 mkDerivation {
204140204703 pname = "proto-lens-jsonpb";
204141− version = "0.2.0.1";
204142− sha256 = "0hsjn0iy0bbpb1sczk6vj2vah5f60w8cpm2gach5zlb9qpvkg4x4";
204704+ version = "0.2.0.2";
204705+ sha256 = "1r98841byxkg5941yjrw15n56i0x68qr3gk29bimwcfifdf0idm2";
204143204706 libraryHaskellDepends = [
204144204707 aeson attoparsec base base64-bytestring bytestring
204145204708 proto-lens-runtime text vector
@@ -204792,6 +205355,21 @@ self: {
204792205355 license = stdenv.lib.licenses.mit;
204793205356 }) {};
204794205357
205358+ "psql-utils" = callPackage
205359+ ({ mkDerivation, aeson, base, hashable, postgresql-simple
205360+ , resource-pool, time
205361+ }:
205362+ mkDerivation {
205363+ pname = "psql-utils";
205364+ version = "0.1.0.0";
205365+ sha256 = "09s26lqqdy2qah6i0yim9g2h61hramhij7r9kbcccbc3fgv4sd6s";
205366+ libraryHaskellDepends = [
205367+ aeson base hashable postgresql-simple resource-pool time
205368+ ];
205369+ description = "PostgreSQL Simple util tools";
205370+ license = stdenv.lib.licenses.bsd3;
205371+ }) {};
205372+
204795205373 "psqueues" = callPackage
204796205374 ({ mkDerivation, array, base, containers, criterion, deepseq
204797205375 , fingertree-psqueue, ghc-prim, hashable, HUnit, mtl, PSQueue
@@ -207453,6 +208031,31 @@ self: {
207453208031 license = stdenv.lib.licenses.bsd3;
207454208032 }) {};
207455208033
208034+ "quickjs-hs" = callPackage
208035+ ({ mkDerivation, aeson, base, bytestring, containers, exceptions
208036+ , HUnit, inline-c, mtl, QuickCheck, scientific, string-conv, tasty
208037+ , tasty-hunit, tasty-quickcheck, text, time, transformers
208038+ , unliftio-core, unordered-containers, vector
208039+ }:
208040+ mkDerivation {
208041+ pname = "quickjs-hs";
208042+ version = "0.1.2.1";
208043+ sha256 = "0dbypa7p3x5j2nmbw2qvs4aik74jfkfa9b0mmv2290p6sj9ag1hd";
208044+ revision = "1";
208045+ editedCabalFile = "0f18980s2sky2fnrdnadyhivjhbzxcq9m3isnji8q2gbzpbywca7";
208046+ libraryHaskellDepends = [
208047+ aeson base bytestring containers exceptions inline-c mtl scientific
208048+ string-conv text time transformers unliftio-core
208049+ unordered-containers vector
208050+ ];
208051+ testHaskellDepends = [
208052+ aeson base exceptions HUnit QuickCheck tasty tasty-hunit
208053+ tasty-quickcheck text unordered-containers vector
208054+ ];
208055+ description = "Wrapper for the QuickJS Javascript Engine";
208056+ license = stdenv.lib.licenses.mit;
208057+ }) {};
208058+
207456208059 "quicklz" = callPackage
207457208060 ({ mkDerivation, base, bytestring, QuickCheck, test-framework
207458208061 , test-framework-quickcheck2
@@ -208686,6 +209289,8 @@ self: {
208686209289 pname = "random";
208687209290 version = "1.2.0";
208688209291 sha256 = "1pmr7zbbqg58kihhhwj8figf5jdchhi7ik2apsyxbgsqq3vrqlg4";
209292+ revision = "1";
209293+ editedCabalFile = "11l9bcjy63qvcm4n7djp2l1l8668hbckkkdb2nj5g6iyy9pb2sa9";
208689209294 libraryHaskellDepends = [ base bytestring deepseq mtl splitmix ];
208690209295 testHaskellDepends = [
208691209296 base bytestring containers doctest mwc-random primitive smallcheck
@@ -210786,28 +211391,35 @@ self: {
210786211391 license = stdenv.lib.licenses.publicDomain;
210787211392 }) {};
210788211393
210789− "reanimate_0_4_1_0" = callPackage
211394+ "reanimate_0_4_2_0" = callPackage
210790211395 ({ mkDerivation, aeson, ansi-terminal, array, attoparsec, base
210791− , base64-bytestring, bytestring, cassava, cereal, chiphunk, colour
210792− , containers, cubicbezier, directory, earcut, filepath, fsnotify
210793− , geojson, hashable, hmatrix, JuicyPixels, lens, linear, matrix
210794− , mtl, neat-interpolation, open-browser, optparse-applicative
210795− , parallel, process, random, random-shuffle, reanimate-svg, split
210796− , temporary, text, time, vector, vector-space, websockets, xml
211396+ , base64-bytestring, bytestring, cassava, cereal, colour
211397+ , containers, cubicbezier, directory, filelock, filepath, fsnotify
211398+ , geojson, ghcid, hashable, hgeometry, hgeometry-combinatorial
211399+ , JuicyPixels, lens, linear, matrix, mtl, neat-interpolation
211400+ , open-browser, optparse-applicative, parallel, process, QuickCheck
211401+ , random, random-shuffle, reanimate-svg, split, tasty, tasty-golden
211402+ , tasty-hunit, tasty-quickcheck, tasty-rerun, temporary, text, time
211403+ , vector, vector-space, websockets, xml
210797211404 }:
210798211405 mkDerivation {
210799211406 pname = "reanimate";
210800− version = "0.4.1.0";
210801− sha256 = "12mql2i3433y3cj4x3rcilmvja4cnyk9y5cykw16sg30kbp1riki";
211407+ version = "0.4.2.0";
211408+ sha256 = "0dihh2k0cvh17qb37pfn1h6g620yzp923wrjqy22qbmlld896snk";
210802211409 enableSeparateDataOutput = true;
210803211410 libraryHaskellDepends = [
210804211411 aeson ansi-terminal array attoparsec base base64-bytestring
210805− bytestring cassava cereal chiphunk colour containers cubicbezier
210806− directory earcut filepath fsnotify geojson hashable hmatrix
210807− JuicyPixels lens linear matrix mtl neat-interpolation open-browser
210808− optparse-applicative parallel process random random-shuffle
210809− reanimate-svg split temporary text time vector vector-space
210810− websockets xml
211412+ bytestring cassava cereal colour containers cubicbezier directory
211413+ filelock filepath fsnotify geojson ghcid hashable hgeometry
211414+ hgeometry-combinatorial JuicyPixels lens linear matrix mtl
211415+ neat-interpolation open-browser optparse-applicative parallel
211416+ process random random-shuffle reanimate-svg split temporary text
211417+ time vector vector-space websockets xml
211418+ ];
211419+ testHaskellDepends = [
211420+ base bytestring directory filepath linear process QuickCheck tasty
211421+ tasty-golden tasty-hunit tasty-quickcheck tasty-rerun temporary
211422+ text vector
210811211423 ];
210812211424 description = "Animation library based on SVGs";
210813211425 license = stdenv.lib.licenses.publicDomain;
@@ -210973,8 +211585,8 @@ self: {
210973211585 }:
210974211586 mkDerivation {
210975211587 pname = "recommender-als";
210976− version = "0.2.0.0";
210977− sha256 = "14nw3ns52da4jlbwblbavchxzv1pjhc1zkjzcwfrqznxgsd5525p";
211588+ version = "0.2.1.1";
211589+ sha256 = "0qc91hn42mc2pmljb836chdas1jzsrqbg44cjylx31y0y72dmhdq";
210978211590 libraryHaskellDepends = [
210979211591 base containers data-default-class hmatrix parallel random vector
210980211592 ];
@@ -213453,35 +214065,6 @@ self: {
213453214065 }) {};
213454214066
213455214067 "registry" = callPackage
213456− ({ mkDerivation, async, base, bytestring, containers, directory
213457− , exceptions, generic-lens, hashable, hedgehog, io-memoize, mmorph
213458− , MonadRandom, mtl, multimap, protolude, random, resourcet
213459− , semigroupoids, semigroups, tasty, tasty-discover, tasty-hedgehog
213460− , tasty-th, template-haskell, text, transformers-base, universum
213461− }:
213462− mkDerivation {
213463− pname = "registry";
213464− version = "0.1.9.1";
213465− sha256 = "0vnx2sq3m6mqm1wcicknf7b8pfamx4pbn51hmzs6arwnvsq23vng";
213466− libraryHaskellDepends = [
213467− base containers exceptions hashable mmorph mtl protolude resourcet
213468− semigroupoids semigroups template-haskell text transformers-base
213469− ];
213470− testHaskellDepends = [
213471− async base bytestring containers directory exceptions generic-lens
213472− hashable hedgehog io-memoize mmorph MonadRandom mtl multimap
213473− protolude random resourcet semigroupoids semigroups tasty
213474− tasty-discover tasty-hedgehog tasty-th template-haskell text
213475− transformers-base universum
213476− ];
213477− testToolDepends = [ tasty-discover ];
213478− description = "data structure for assembling components";
213479− license = stdenv.lib.licenses.mit;
213480− hydraPlatforms = stdenv.lib.platforms.none;
213481− broken = true;
213482− }) {};
213483−
213484− "registry_0_1_9_3" = callPackage
213485214068 ({ mkDerivation, async, base, bytestring, containers, directory
213486214069 , exceptions, generic-lens, hashable, hedgehog, io-memoize, mmorph
213487214070 , MonadRandom, mtl, multimap, protolude, random, resourcet
@@ -214504,8 +215087,8 @@ self: {
214504215087 pname = "repa-io";
214505215088 version = "3.4.1.1";
214506215089 sha256 = "1nm9kfin6fv016r02l74c9hf8pr1rz7s33i833cqpyw8m6bcmnxm";
214507− revision = "4";
214508− editedCabalFile = "1lswfxmfn31gm2ayqwns9q9kpbad69scxpq6ybyzxkb9jd0jx4bl";
215090+ revision = "5";
215091+ editedCabalFile = "1v9bza21a3h0pkaxs628jjfli157d44i757da250fxwwamk8sg88";
214509215092 libraryHaskellDepends = [
214510215093 base binary bmp bytestring old-time repa vector
214511215094 ];
@@ -219009,6 +219592,8 @@ self: {
219009219592 testHaskellDepends = [ base directory hspec process ];
219010219593 description = "Stack wrapper for single-file Haskell programs";
219011219594 license = stdenv.lib.licenses.bsd3;
219595+ hydraPlatforms = stdenv.lib.platforms.none;
219596+ broken = true;
219012219597 }) {};
219013219598
219014219599 "runmany" = callPackage
@@ -219263,10 +219848,8 @@ self: {
219263219848 }:
219264219849 mkDerivation {
219265219850 pname = "safe-exceptions";
219266− version = "0.1.7.0";
219267− sha256 = "0sd0zfsm9pcll5bzzj523rbn45adjrnavdkz52hgmdjjgdcdrk8q";
219268− revision = "6";
219269− editedCabalFile = "0x82m44qwf3fls3ypbdca958l9hhfqyfip6rzzxi7648f0sasv21";
219851+ version = "0.1.7.1";
219852+ sha256 = "0gkxacfiqp55xzbmpz5i5c4kqma8jal49q7c8gl9n9qq5c5dvxjb";
219270219853 libraryHaskellDepends = [ base deepseq exceptions transformers ];
219271219854 testHaskellDepends = [ base hspec void ];
219272219855 description = "Safe, consistent, and easy exception handling";
@@ -219364,8 +219947,8 @@ self: {
219364219947 pname = "safe-json";
219365219948 version = "1.1.0";
219366219949 sha256 = "18zsf2dccgf755a8g4ar3zc7ilmampsrvqa6f9p27zrayl7j87hw";
219367− revision = "3";
219368− editedCabalFile = "12jjph25vffkj55ds468zv144qxwyrb6qmp2g1pb03732n6z9596";
219950+ revision = "4";
219951+ editedCabalFile = "12z5z68bfrzv3laagbssdcv7g97bpk2wf1bjirrivbhdbslf6l4q";
219369219952 libraryHaskellDepends = [
219370219953 aeson base bytestring containers dlist hashable scientific tasty
219371219954 tasty-hunit tasty-quickcheck text time unordered-containers
@@ -223130,21 +223713,19 @@ self: {
223130223713
223131223714 "semantic-source" = callPackage
223132223715 ({ mkDerivation, aeson, base, bytestring, containers, deepseq
223133− , doctest, generic-monoid, hashable, hedgehog, lingo, pathtype
223134− , QuickCheck, semilattices, tasty, tasty-hedgehog, tasty-hunit
223135− , text
223716+ , hashable, hedgehog, lingo, pathtype, semilattices, tasty
223717+ , tasty-hedgehog, tasty-hunit, text
223136223718 }:
223137223719 mkDerivation {
223138223720 pname = "semantic-source";
223139− version = "0.1.0.0";
223140− sha256 = "179rxsn1cyh77yn7vzmii38ipgcjpavlyf5xbx4j8zzgh1jklmc5";
223721+ version = "0.1.0.1";
223722+ sha256 = "1v4q9yc91lrx02wdhxp1njzm8g9qlwr40593lwcn6bxlad5sk6yd";
223141223723 libraryHaskellDepends = [
223142− aeson base bytestring containers deepseq generic-monoid hashable
223143− lingo pathtype semilattices text
223724+ aeson base bytestring containers deepseq hashable lingo pathtype
223725+ semilattices text
223144223726 ];
223145223727 testHaskellDepends = [
223146− base doctest hedgehog QuickCheck tasty tasty-hedgehog tasty-hunit
223147− text
223728+ base hedgehog tasty tasty-hedgehog tasty-hunit text
223148223729 ];
223149223730 description = "Types and functionality for working with source code";
223150223731 license = stdenv.lib.licenses.mit;
@@ -225661,14 +226242,14 @@ self: {
225661226242 license = stdenv.lib.licenses.bsd3;
225662226243 }) {};
225663226244
225664− "servant-lucid_0_9_0_1" = callPackage
226245+ "servant-lucid_0_9_0_2" = callPackage
225665226246 ({ mkDerivation, base, http-media, lucid, servant, servant-server
225666226247 , text, wai, warp
225667226248 }:
225668226249 mkDerivation {
225669226250 pname = "servant-lucid";
225670− version = "0.9.0.1";
225671− sha256 = "1jhs9qy36vccy90s24cd9bmhqs604xqd9m8a4fbkjxrcpgdzfjgq";
226251+ version = "0.9.0.2";
226252+ sha256 = "0l68dffx746j3p2l5x59cj5cdng2dw6vjq5x5h44m0ccbsmlckpz";
225672226253 libraryHaskellDepends = [ base http-media lucid servant text ];
225673226254 testHaskellDepends = [ base lucid servant-server wai warp ];
225674226255 description = "Servant support for lucid";
@@ -226225,8 +226806,8 @@ self: {
226225226806 }:
226226226807 mkDerivation {
226227226808 pname = "servant-reflex";
226228− version = "0.3.4";
226229− sha256 = "1k7dkzs2lsdjj94ai7p225zm09l9sgbxpb4av14xgy9m54rih5kk";
226809+ version = "0.3.5";
226810+ sha256 = "0b4ppjnfas6pwypd16vkq98q1fs0l7cw32hhliv582xfvc0v3k8l";
226230226811 isLibrary = true;
226231226812 isExecutable = true;
226232226813 libraryHaskellDepends = [
@@ -226516,8 +227097,8 @@ self: {
226516227097 }:
226517227098 mkDerivation {
226518227099 pname = "servant-static-th";
226519− version = "0.2.3.0";
226520− sha256 = "0gyfjrrq7anhn4b613gnaa0r2xm8rkminx1nrrbpn6bw47axadj4";
227100+ version = "0.2.4.0";
227101+ sha256 = "1xmikym19kq912apmh6zcdjzbz23mhn580pvsy5ll35ylqziaflk";
226521227102 isLibrary = true;
226522227103 isExecutable = true;
226523227104 libraryHaskellDepends = [
@@ -228248,14 +228829,16 @@ self: {
228248228829 }:
228249228830 mkDerivation {
228250228831 pname = "shake-dhall";
228251− version = "0.1.1.2";
228252− sha256 = "0jlbq9d6sjrbywd0afgsqqw1ffjlh5k4mr5v2bn45js29hipkivk";
228832+ version = "0.1.1.3";
228833+ sha256 = "1crakjnib9hvqph8f0wn0ii0y4hp9vix40kd8fpz85mdqfsynf5q";
228253228834 libraryHaskellDepends = [
228254228835 base containers dhall directory filepath shake text
228255228836 ];
228256228837 testHaskellDepends = [ base tasty tasty-hunit ];
228257228838 description = "Dhall dependencies";
228258228839 license = stdenv.lib.licenses.bsd3;
228840+ hydraPlatforms = stdenv.lib.platforms.none;
228841+ broken = true;
228259228842 }) {};
228260228843
228261228844 "shake-elm" = callPackage
@@ -228439,12 +229022,12 @@ self: {
228439229022 license = stdenv.lib.licenses.mit;
228440229023 }) {};
228441229024
228442− "shake-plus_0_3_2_0" = callPackage
229025+ "shake-plus_0_3_3_0" = callPackage
228443229026 ({ mkDerivation, base, extra, path, rio, shake }:
228444229027 mkDerivation {
228445229028 pname = "shake-plus";
228446− version = "0.3.2.0";
228447− sha256 = "0cgn1hgxp3kly7yp4s8mx714p1gnf30jpp6vjl47l19vc21hfzj5";
229029+ version = "0.3.3.0";
229030+ sha256 = "13a5n6gh1msrygi671lk5y83shcd75yz64x3r2smxif5hsfazwqv";
228448229031 libraryHaskellDepends = [ base extra path rio shake ];
228449229032 description = "Re-export of Shake using well-typed paths and ReaderT";
228450229033 license = stdenv.lib.licenses.mit;
@@ -228452,18 +229035,19 @@ self: {
228452229035 }) {};
228453229036
228454229037 "shake-plus-extended" = callPackage
228455− ({ mkDerivation, base, comonad, extra, ixset-typed
228456− , ixset-typed-binary-instance, ixset-typed-hashable-instance, path
228457− , path-binary-instance, rio, shake, shake-plus, within
229038+ ({ mkDerivation, aeson, base, binary-instances, comonad, extra
229039+ , http-conduit, ixset-typed, ixset-typed-binary-instance
229040+ , ixset-typed-hashable-instance, path, path-binary-instance, rio
229041+ , shake, shake-plus, within
228458229042 }:
228459229043 mkDerivation {
228460229044 pname = "shake-plus-extended";
228461− version = "0.3.0.0";
228462− sha256 = "040g0h0a03wmwhbqn06jxwf5h0lwsiqfa1x1x9wzyw8m52f5ngn4";
229045+ version = "0.4.0.0";
229046+ sha256 = "1y12hcsyp8slzacjz8dim64m9sr09z7ppv3s4l30wyha9r395x8i";
228463229047 libraryHaskellDepends = [
228464− base comonad extra ixset-typed ixset-typed-binary-instance
228465− ixset-typed-hashable-instance path path-binary-instance rio shake
228466− shake-plus within
229048+ aeson base binary-instances comonad extra http-conduit ixset-typed
229049+ ixset-typed-binary-instance ixset-typed-hashable-instance path
229050+ path-binary-instance rio shake shake-plus within
228467229051 ];
228468229052 description = "Experimental extensions to shake-plus";
228469229053 license = stdenv.lib.licenses.mit;
@@ -228578,6 +229162,32 @@ self: {
228578229162 maintainers = with stdenv.lib.maintainers; [ psibi ];
228579229163 }) {};
228580229164
229165+ "shakespeare_2_0_25" = callPackage
229166+ ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
229167+ , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec
229168+ , process, scientific, template-haskell, text, th-lift, time
229169+ , transformers, unordered-containers, vector
229170+ }:
229171+ mkDerivation {
229172+ pname = "shakespeare";
229173+ version = "2.0.25";
229174+ sha256 = "1fjv3yg425d87d3dih0l3ff95g5a5yp9w85m58sjara6xqivj9s4";
229175+ libraryHaskellDepends = [
229176+ aeson base blaze-html blaze-markup bytestring containers directory
229177+ exceptions ghc-prim parsec process scientific template-haskell text
229178+ th-lift time transformers unordered-containers vector
229179+ ];
229180+ testHaskellDepends = [
229181+ aeson base blaze-html blaze-markup bytestring containers directory
229182+ exceptions ghc-prim hspec HUnit parsec process template-haskell
229183+ text time transformers
229184+ ];
229185+ description = "A toolkit for making compile-time interpolated templates";
229186+ license = stdenv.lib.licenses.mit;
229187+ hydraPlatforms = stdenv.lib.platforms.none;
229188+ maintainers = with stdenv.lib.maintainers; [ psibi ];
229189+ }) {};
229190+
228581229191 "shakespeare-babel" = callPackage
228582229192 ({ mkDerivation, base, classy-prelude, data-default, directory
228583229193 , process, shakespeare, template-haskell
@@ -229132,6 +229742,38 @@ self: {
229132229742 license = stdenv.lib.licenses.mit;
229133229743 }) {};
229134229744
229745+ "shelly_1_8_1" = callPackage
229746+ ({ mkDerivation, async, base, bytestring, containers, directory
229747+ , enclosed-exceptions, exceptions, filepath, hspec, hspec-contrib
229748+ , HUnit, lifted-async, lifted-base, monad-control, mtl, process
229749+ , system-fileio, system-filepath, text, time, transformers
229750+ , transformers-base, unix, unix-compat
229751+ }:
229752+ mkDerivation {
229753+ pname = "shelly";
229754+ version = "1.8.1";
229755+ sha256 = "023fbvbqs5gdwm30j5517gbdcc7fvz0md70dgwgpypkskj3i926y";
229756+ revision = "1";
229757+ editedCabalFile = "0crf0m077wky76f5nav2p9q4fa5q4yhv5l4bq9hd073dzdaywhz0";
229758+ isLibrary = true;
229759+ isExecutable = true;
229760+ libraryHaskellDepends = [
229761+ async base bytestring containers directory enclosed-exceptions
229762+ exceptions lifted-async lifted-base monad-control mtl process
229763+ system-fileio system-filepath text time transformers
229764+ transformers-base unix unix-compat
229765+ ];
229766+ testHaskellDepends = [
229767+ async base bytestring containers directory enclosed-exceptions
229768+ exceptions filepath hspec hspec-contrib HUnit lifted-async
229769+ lifted-base monad-control mtl process system-fileio system-filepath
229770+ text time transformers transformers-base unix unix-compat
229771+ ];
229772+ description = "shell-like (systems) programming in Haskell";
229773+ license = stdenv.lib.licenses.bsd3;
229774+ hydraPlatforms = stdenv.lib.platforms.none;
229775+ }) {};
229776+
229135229777 "shelly" = callPackage
229136229778 ({ mkDerivation, async, base, bytestring, containers, directory
229137229779 , enclosed-exceptions, exceptions, filepath, hspec, hspec-contrib
@@ -235576,18 +236218,18 @@ self: {
235576236218 "souffle-haskell" = callPackage
235577236219 ({ mkDerivation, array, base, containers, deepseq, directory, extra
235578236220 , filepath, hedgehog, hspec, hspec-hedgehog, megaparsec, mtl
235579− , process, template-haskell, temporary, text, type-errors-pretty
235580− , vector
236221+ , neat-interpolation, process, template-haskell, temporary, text
236222+ , type-errors-pretty, vector
235581236223 }:
235582236224 mkDerivation {
235583236225 pname = "souffle-haskell";
235584− version = "1.1.0";
235585− sha256 = "0s8zl7f6v89m6a3yhlmji1lb8k3rfwzyyg307m3f35a9kms0988p";
236226+ version = "2.0.0";
236227+ sha256 = "0x6v1g5in762w1hhwcg5ipa0c491wp0mflqljjpl99da6kr1l93f";
235586236228 isLibrary = true;
235587236229 isExecutable = true;
235588236230 libraryHaskellDepends = [
235589− array base deepseq directory filepath mtl process template-haskell
235590− temporary text type-errors-pretty vector
236231+ array base containers deepseq directory filepath mtl process
236232+ template-haskell temporary text type-errors-pretty vector
235591236233 ];
235592236234 executableHaskellDepends = [
235593236235 array base containers deepseq directory extra filepath megaparsec
@@ -235595,9 +236237,9 @@ self: {
235595236237 vector
235596236238 ];
235597236239 testHaskellDepends = [
235598− array base deepseq directory filepath hedgehog hspec hspec-hedgehog
235599− mtl process template-haskell temporary text type-errors-pretty
235600− vector
236240+ array base containers deepseq directory filepath hedgehog hspec
236241+ hspec-hedgehog mtl neat-interpolation process template-haskell
236242+ temporary text type-errors-pretty vector
235601236243 ];
235602236244 description = "Souffle Datalog bindings for Haskell";
235603236245 license = stdenv.lib.licenses.mit;
@@ -236009,6 +236651,19 @@ self: {
236009236651 broken = true;
236010236652 }) {};
236011236653
236654+ "spars" = callPackage
236655+ ({ mkDerivation, base, containers }:
236656+ mkDerivation {
236657+ pname = "spars";
236658+ version = "0.1.0.0";
236659+ sha256 = "1q1vpwrr96k41p9zj5x7mjd3817iq9a762q3jfqkwd0cb41iyka6";
236660+ libraryHaskellDepends = [ base containers ];
236661+ description = "A sparse set-based parsing library for Haskell";
236662+ license = stdenv.lib.licenses.mit;
236663+ hydraPlatforms = stdenv.lib.platforms.none;
236664+ broken = true;
236665+ }) {};
236666+
236012236667 "sparse" = callPackage
236013236668 ({ mkDerivation, array, base, bytestring, containers, contravariant
236014236669 , criterion, deepseq, directory, doctest, filepath, hlint
@@ -243692,6 +244347,28 @@ self: {
243692244347 broken = true;
243693244348 }) {};
243694244349
244350+ "supernova" = callPackage
244351+ ({ mkDerivation, aeson, async, base, bifunctor, binary, bytestring
244352+ , Cabal, crc32c, exceptions, lens-family-core, logging, managed
244353+ , network, proto-lens, proto-lens-runtime, proto-lens-setup
244354+ , streamly, text, unliftio
244355+ }:
244356+ mkDerivation {
244357+ pname = "supernova";
244358+ version = "0.0.1";
244359+ sha256 = "0v0x1xk63kxrf2ihhdr24z7ami557d3w2zizd0g8xqp02pr5gs8z";
244360+ setupHaskellDepends = [ base Cabal proto-lens-setup ];
244361+ libraryHaskellDepends = [
244362+ base bifunctor binary bytestring crc32c exceptions lens-family-core
244363+ logging managed network proto-lens proto-lens-runtime text unliftio
244364+ ];
244365+ testHaskellDepends = [ aeson async base bytestring streamly text ];
244366+ description = "Apache Pulsar client for Haskell";
244367+ license = stdenv.lib.licenses.asl20;
244368+ hydraPlatforms = stdenv.lib.platforms.none;
244369+ broken = true;
244370+ }) {};
244371+
243695244372 "supero" = callPackage
243696244373 ({ mkDerivation, base, containers, cpphs, directory, filepath
243697244374 , haskell-src-exts, mtl, process, time, uniplate
@@ -248765,6 +249442,18 @@ self: {
248765249442 license = stdenv.lib.licenses.mit;
248766249443 }) {};
248767249444
249445+ "template-haskell-compat-v0208_0_1_4" = callPackage
249446+ ({ mkDerivation, base, template-haskell }:
249447+ mkDerivation {
249448+ pname = "template-haskell-compat-v0208";
249449+ version = "0.1.4";
249450+ sha256 = "0byc81m07v5a765vs4jpwgmgkf54c2n5yaqz8ava1sspmmf2p9fh";
249451+ libraryHaskellDepends = [ base template-haskell ];
249452+ description = "A backwards compatibility layer for Template Haskell newer than 2.8";
249453+ license = stdenv.lib.licenses.mit;
249454+ hydraPlatforms = stdenv.lib.platforms.none;
249455+ }) {};
249456+
248768249457 "template-haskell-util" = callPackage
248769249458 ({ mkDerivation, base, GenericPretty, ghc-prim, template-haskell }:
248770249459 mkDerivation {
@@ -249605,8 +250294,6 @@ self: {
249605250294 ];
249606250295 description = "Terminal emulator configurable in Haskell";
249607250296 license = stdenv.lib.licenses.bsd3;
249608− hydraPlatforms = stdenv.lib.platforms.none;
249609− broken = true;
249610250297 }) {inherit (pkgs) gtk3; inherit (pkgs) pcre2;
249611250298 vte_291 = pkgs.vte;};
249612250299
@@ -254913,8 +255600,8 @@ self: {
254913255600 pname = "token-bucket";
254914255601 version = "0.1.0.1";
254915255602 sha256 = "1l3axqdkrjf28pxhrvdvlpf9wi79czsfvhi33w4v2wbj0g00j9ii";
254916− revision = "5";
254917− editedCabalFile = "049d9bk5f8qa6d7gjgg4nqd56xz1mrxr1rxcwxsrk4vkqcpmzs6q";
255603+ revision = "6";
255604+ editedCabalFile = "15p4iycphz4q58kgq00kmz0ik0hzv3vx47k2dkp93xavb0dny46v";
254918255605 libraryHaskellDepends = [ base ];
254919255606 testHaskellDepends = [ base time ];
254920255607 description = "Rate limiter using lazy bucket algorithm";
@@ -256959,8 +257646,8 @@ self: {
256959257646 pname = "tree-diff";
256960257647 version = "0.1";
256961257648 sha256 = "1156nbqn0pn9lp4zjsy4vv5g5wmy4zxwmbqdgvq349rydynh3ng3";
256962− revision = "4";
256963− editedCabalFile = "0zl94ppd94szvmqa7vnpbcr2zfppbqm4k6isidzks2mz2ji9dc1i";
257649+ revision = "5";
257650+ editedCabalFile = "1b60x9cgp7hn42hc97q866ybhg5hx3sp45j6gngpbwryg29r2p4h";
256964257651 libraryHaskellDepends = [
256965257652 aeson ansi-terminal ansi-wl-pprint base base-compat bytestring
256966257653 bytestring-builder containers hashable parsec parsers pretty
@@ -258954,8 +259641,8 @@ self: {
258954259641 }:
258955259642 mkDerivation {
258956259643 pname = "twirp";
258957− version = "0.2.0.0";
258958− sha256 = "00dc6bil998fdvb5p0r2782cy3nknw6s8k5a0cv4yqmha4iyn32m";
259644+ version = "0.2.0.1";
259645+ sha256 = "05np0zvnvy8wrm9lirrkwhd0n8f44j4xwr6lrywxxy9r00mx8bbl";
258959259646 libraryHaskellDepends = [
258960259647 aeson base bytestring http-media http-types proto-lens
258961259648 proto-lens-jsonpb proto-lens-runtime servant text wai
@@ -261725,28 +262412,6 @@ self: {
261725262412 }) {};
261726262413
261727262414 "unicode-transforms" = callPackage
261728− ({ mkDerivation, base, bitarray, bytestring, deepseq, filepath
261729− , gauge, getopt-generics, optparse-applicative, path, path-io
261730− , QuickCheck, split, text
261731− }:
261732− mkDerivation {
261733− pname = "unicode-transforms";
261734− version = "0.3.6";
261735− sha256 = "1akscvyssif4hki3g6hy0jmjyr8cqly1whzvzj0km2b3qh0x09l3";
261736− isLibrary = true;
261737− isExecutable = true;
261738− libraryHaskellDepends = [ base bitarray bytestring text ];
261739− testHaskellDepends = [
261740− base deepseq getopt-generics QuickCheck split text
261741− ];
261742− benchmarkHaskellDepends = [
261743− base deepseq filepath gauge optparse-applicative path path-io text
261744− ];
261745− description = "Unicode normalization";
261746− license = stdenv.lib.licenses.bsd3;
261747− }) {};
261748−
261749− "unicode-transforms_0_3_7" = callPackage
261750262415 ({ mkDerivation, base, bytestring, deepseq, filepath, gauge
261751262416 , getopt-generics, ghc-prim, hspec, path, path-io, QuickCheck
261752262417 , split, text
@@ -261766,7 +262431,6 @@ self: {
261766262431 ];
261767262432 description = "Unicode normalization";
261768262433 license = stdenv.lib.licenses.bsd3;
261769− hydraPlatforms = stdenv.lib.platforms.none;
261770262434 }) {};
261771262435
261772262436 "unicode-tricks" = callPackage
@@ -262455,7 +263119,7 @@ self: {
262455263119 license = stdenv.lib.licenses.mit;
262456263120 }) {};
262457263121
262458− "universum_1_7_0" = callPackage
263122+ "universum_1_7_1" = callPackage
262459263123 ({ mkDerivation, base, bytestring, containers, deepseq, doctest
262460263124 , gauge, ghc-prim, Glob, hashable, hedgehog, microlens
262461263125 , microlens-mtl, mtl, safe-exceptions, stm, tasty, tasty-hedgehog
@@ -262463,8 +263127,8 @@ self: {
262463263127 }:
262464263128 mkDerivation {
262465263129 pname = "universum";
262466− version = "1.7.0";
262467− sha256 = "079sck4cfhvx4zda5qiz7vs3050l87ik9hx8yjc6bihrzlqvmgfb";
263130+ version = "1.7.1";
263131+ sha256 = "0jsdzhy0h5d6znnrdgzr29b6qkriidck5s6yp52pci30rfv1d29z";
262468263132 libraryHaskellDepends = [
262469263133 base bytestring containers deepseq ghc-prim hashable microlens
262470263134 microlens-mtl mtl safe-exceptions stm text transformers
@@ -263638,6 +264302,31 @@ self: {
263638264302 license = stdenv.lib.licenses.bsd3;
263639264303 }) {};
263640264304
264305+ "url-bytes" = callPackage
264306+ ({ mkDerivation, base, byteslice, bytesmith, bytestring, deepseq
264307+ , gauge, HUnit, primitive, tasty, tasty-hunit, template-haskell
264308+ , uri-bytestring, weigh
264309+ }:
264310+ mkDerivation {
264311+ pname = "url-bytes";
264312+ version = "0.1.0.0";
264313+ sha256 = "0nbxnmz1m2icg3vvdndr4zydwr8nbgxhb70ak2jzc6d92c3vhvqi";
264314+ libraryHaskellDepends = [
264315+ base byteslice bytesmith primitive template-haskell
264316+ ];
264317+ testHaskellDepends = [
264318+ base byteslice HUnit primitive tasty tasty-hunit
264319+ ];
264320+ benchmarkHaskellDepends = [
264321+ base byteslice bytestring deepseq gauge primitive uri-bytestring
264322+ weigh
264323+ ];
264324+ description = "Memory efficient url type and parser";
264325+ license = stdenv.lib.licenses.mit;
264326+ hydraPlatforms = stdenv.lib.platforms.none;
264327+ broken = true;
264328+ }) {};
264329+
263641264330 "url-decoders" = callPackage
263642264331 ({ mkDerivation, base, base-prelude, binary-parser, bytestring
263643264332 , criterion, http-types, QuickCheck, quickcheck-instances, rerebase
@@ -266127,23 +266816,6 @@ self: {
266127266816 }) {};
266128266817
266129266818 "vector-sized" = callPackage
266130− ({ mkDerivation, adjunctions, base, binary, comonad, deepseq
266131− , distributive, finite-typelits, hashable, indexed-list-literals
266132− , primitive, vector
266133− }:
266134− mkDerivation {
266135− pname = "vector-sized";
266136− version = "1.4.1.0";
266137− sha256 = "14l6c8l8l29f6kdffknd70kkccfjcf105i1zd0kchgsgjnr9p6l1";
266138− libraryHaskellDepends = [
266139− adjunctions base binary comonad deepseq distributive
266140− finite-typelits hashable indexed-list-literals primitive vector
266141− ];
266142− description = "Size tagged vectors";
266143− license = stdenv.lib.licenses.bsd3;
266144− }) {};
266145−
266146− "vector-sized_1_4_2" = callPackage
266147266819 ({ mkDerivation, adjunctions, base, binary, comonad, deepseq
266148266820 , distributive, finite-typelits, hashable, indexed-list-literals
266149266821 , primitive, vector
@@ -266158,7 +266830,6 @@ self: {
266158266830 ];
266159266831 description = "Size tagged vectors";
266160266832 license = stdenv.lib.licenses.bsd3;
266161− hydraPlatforms = stdenv.lib.platforms.none;
266162266833 }) {};
266163266834
266164266835 "vector-space" = callPackage
@@ -267655,8 +268326,8 @@ self: {
267655268326 ({ mkDerivation, base, bytestring, transformers, vector, vulkan }:
267656268327 mkDerivation {
267657268328 pname = "vulkan";
267658− version = "3.6.5";
267659− sha256 = "17r0rn2xs5l5x9vwa5vyc4q11gyw2v29qs7vqicla0qb4hh140fj";
268329+ version = "3.6.6";
268330+ sha256 = "09mq11jqrd9sgx4xcy3xxji21yfhzl9a49mh5fp80y2mxsxdl0v9";
267660268331 libraryHaskellDepends = [ base bytestring transformers vector ];
267661268332 librarySystemDepends = [ vulkan ];
267662268333 description = "Bindings to the Vulkan graphics API";
@@ -272193,14 +272864,14 @@ self: {
272193272864 license = stdenv.lib.licenses.mit;
272194272865 }) {};
272195272866
272196− "within_0_2_0_0" = callPackage
272867+ "within_0_2_0_1" = callPackage
272197272868 ({ mkDerivation, base, comonad, exceptions, free, hashable, path
272198272869 , path-like
272199272870 }:
272200272871 mkDerivation {
272201272872 pname = "within";
272202− version = "0.2.0.0";
272203− sha256 = "1jvfxcxyavadcbslb50a6ad7bmnwz45d6zaxyc38y61kh0r82242";
272873+ version = "0.2.0.1";
272874+ sha256 = "1yzfzizx45ngvvbshgw9z8hxl8z7vcr1gann6wnxq4b9669h29ic";
272204272875 libraryHaskellDepends = [
272205272876 base comonad exceptions free hashable path path-like
272206272877 ];
@@ -275657,8 +276328,8 @@ self: {
275657276328 }:
275658276329 mkDerivation {
275659276330 pname = "xmobar";
275660− version = "0.35.1";
275661− sha256 = "1fizszhij2if9wxwzi728l93j9p5y9kfqnwnxk6nl66g64rsbp5x";
276331+ version = "0.36";
276332+ sha256 = "0kqnadgsqn7m3zw2vk22ssf4aw67rij9l1lpjfsnv2qw0m5apsdl";
275662276333 configureFlags = [
275663276334 "-fwith_alsa" "-fwith_conduit" "-fwith_datezone" "-fwith_dbus"
275664276335 "-fwith_inotify" "-fwith_iwlib" "-fwith_mpd" "-fwith_mpris"
@@ -276805,35 +277476,6 @@ self: {
276805277476 }) {};
276806277477
276807277478 "yaml" = callPackage
276808− ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring
276809− , conduit, containers, directory, filepath, hspec, HUnit, libyaml
276810− , mockery, mtl, raw-strings-qq, resourcet, scientific
276811− , template-haskell, temporary, text, transformers
276812− , unordered-containers, vector
276813− }:
276814− mkDerivation {
276815− pname = "yaml";
276816− version = "0.11.4.0";
276817− sha256 = "0v69d10ni6ydj4g63ajcmnx6a2j3kbl91vpz678l7k5mkd3chkns";
276818− configureFlags = [ "-fsystem-libyaml" ];
276819− isLibrary = true;
276820− isExecutable = true;
276821− libraryHaskellDepends = [
276822− aeson attoparsec base bytestring conduit containers directory
276823− filepath libyaml mtl resourcet scientific template-haskell text
276824− transformers unordered-containers vector
276825− ];
276826− testHaskellDepends = [
276827− aeson attoparsec base base-compat bytestring conduit containers
276828− directory filepath hspec HUnit libyaml mockery mtl raw-strings-qq
276829− resourcet scientific template-haskell temporary text transformers
276830− unordered-containers vector
276831− ];
276832− description = "Support for parsing and rendering YAML documents";
276833− license = stdenv.lib.licenses.bsd3;
276834− }) {};
276835−
276836− "yaml_0_11_5_0" = callPackage
276837277479 ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring
276838277480 , conduit, containers, directory, filepath, hspec, HUnit, libyaml
276839277481 , mockery, mtl, raw-strings-qq, resourcet, scientific
@@ -276860,7 +277502,6 @@ self: {
276860277502 ];
276861277503 description = "Support for parsing and rendering YAML documents";
276862277504 license = stdenv.lib.licenses.bsd3;
276863− hydraPlatforms = stdenv.lib.platforms.none;
276864277505 }) {};
276865277506
276866277507 "yaml-combinators" = callPackage
@@ -279935,15 +280576,20 @@ self: {
279935280576 }) {};
279936280577
279937280578 "yhseq" = callPackage
279938− ({ mkDerivation, base, hspec, hspec-discover }:
280579+ ({ mkDerivation, base, containers, hspec, hspec-discover, vector }:
279939280580 mkDerivation {
279940280581 pname = "yhseq";
279941− version = "0.2.1.2";
279942− sha256 = "1mxjfbnic6pn4jnyc83afpmgq4wnb09f72d359pwx693mfi6vbiy";
279943− libraryHaskellDepends = [ base ];
279944− testHaskellDepends = [ base hspec hspec-discover ];
280582+ version = "0.3.0.1";
280583+ sha256 = "1daipppqia4ig7xa9wxy2g3gcxrcwhxm1g6j5l81v56vfh0smg9r";
280584+ isLibrary = true;
280585+ isExecutable = true;
280586+ libraryHaskellDepends = [ base containers vector ];
280587+ executableHaskellDepends = [ base containers vector ];
280588+ testHaskellDepends = [
280589+ base containers hspec hspec-discover vector
280590+ ];
279945280591 testToolDepends = [ hspec-discover ];
279946− description = "Calculation of Y-sequence Hexirp edition";
280592+ description = "Calculation of YH sequence system";
279947280593 license = stdenv.lib.licenses.asl20;
279948280594 }) {};
279949280595
@@ -280993,8 +281639,8 @@ self: {
280993281639 }:
280994281640 mkDerivation {
280995281641 pname = "zenacy-html";
280996− version = "2.0.1";
280997− sha256 = "074iidhiwzajz207q4k7f8sdg6w4421qfwr2s905226jd2xm1680";
281642+ version = "2.0.2";
281643+ sha256 = "12m953skm4ms6y211ahjrr6gkmrh4p3h2snpcpg1fc039nxgkc9p";
280998281644 isLibrary = true;
280999281645 isExecutable = true;
281000281646 libraryHaskellDepends = [
@@ -281018,6 +281664,22 @@ self: {
281018281664 license = stdenv.lib.licenses.mit;
281019281665 }) {};
281020281666
281667+ "zenacy-unicode" = callPackage
281668+ ({ mkDerivation, base, bytestring, HUnit, test-framework
281669+ , test-framework-hunit, text, vector, word8
281670+ }:
281671+ mkDerivation {
281672+ pname = "zenacy-unicode";
281673+ version = "1.0.0";
281674+ sha256 = "03sksmmmn380nvh0f139g63b4yx42ziimv79xjja7yx6mhaa0pqf";
281675+ libraryHaskellDepends = [ base bytestring vector word8 ];
281676+ testHaskellDepends = [
281677+ base bytestring HUnit test-framework test-framework-hunit text
281678+ ];
281679+ description = "Unicode utilities for Haskell";
281680+ license = stdenv.lib.licenses.mit;
281681+ }) {};
281682+
281021281683 "zenc" = callPackage
281022281684 ({ mkDerivation, base }:
281023281685 mkDerivation {
@@ -281765,8 +282427,8 @@ self: {
281765282427 }:
281766282428 mkDerivation {
281767282429 pname = "zipper-extra";
281768− version = "0.1.3.1";
281769− sha256 = "1n6amxaydfannxhgnbj5g315m96h5wvgrdw89n6761vii76csky4";
282430+ version = "0.1.3.2";
282431+ sha256 = "0cq21hf40qp025ir9kihsp6b09bsrlgiqd5cfq688w57c2vhcmci";
281770282432 libraryHaskellDepends = [
281771282433 base comonad comonad-extras exceptions split
281772282434 ];
pkgs/development/interpreters/python/tests.nix+75−70
@@ -6,67 +6,81 @@
66}:
77
88let
9− envs = let
10− inherit python;
11− pythonEnv = python.withPackages(ps: with ps; [ ]);
12− pythonVirtualEnv = python.withPackages(ps: with ps; [ virtualenv ]);
13− in {
14− # Plain Python interpreter
15− plain = rec {
16− env = python;
17− interpreter = env.interpreter;
18− is_venv = "False";
19− is_nixenv = "False";
20− is_virtualenv = "False";
21− };
22− } // lib.optionalAttrs (!python.isPyPy) {
23− # Use virtualenv from a Nix env.
24− nixenv-virtualenv = rec {
25− env = runCommand "${python.name}-virtualenv" {} ''
26− ${pythonVirtualEnv.interpreter} -m virtualenv $out
27− '';
28− interpreter = "${env}/bin/${python.executable}";
29− is_venv = "False";
30− is_nixenv = "True";
31− is_virtualenv = "True";
32− };
33− } // lib.optionalAttrs (python.implementation != "graal") {
34− # Python Nix environment (python.buildEnv)
35− nixenv = rec {
36− env = pythonEnv;
37− interpreter = env.interpreter;
38− is_venv = "False";
39− is_nixenv = "True";
40− is_virtualenv = "False";
41− };
42− } // lib.optionalAttrs (python.isPy3k && (!python.isPyPy)) rec {
43− # Venv built using plain Python
44− # Python 2 does not support venv
45− # TODO: PyPy executable name is incorrect, it should be pypy-c or pypy-3c instead of pypy and pypy3.
46− plain-venv = rec {
47− env = runCommand "${python.name}-venv" {} ''
48− ${python.interpreter} -m venv $out
49− '';
50− interpreter = "${env}/bin/${python.executable}";
51− is_venv = "True";
52− is_nixenv = "False";
53− is_virtualenv = "False";
54− };
9+ environmentTests = let
10+ envs = let
11+ inherit python;
12+ pythonEnv = python.withPackages(ps: with ps; [ ]);
13+ pythonVirtualEnv = python.withPackages(ps: with ps; [ virtualenv ]);
14+ in {
15+ # Plain Python interpreter
16+ plain = rec {
17+ env = python;
18+ interpreter = env.interpreter;
19+ is_venv = "False";
20+ is_nixenv = "False";
21+ is_virtualenv = "False";
22+ };
23+ } // lib.optionalAttrs (!python.isPyPy) {
24+ # Use virtualenv from a Nix env.
25+ nixenv-virtualenv = rec {
26+ env = runCommand "${python.name}-virtualenv" {} ''
27+ ${pythonVirtualEnv.interpreter} -m virtualenv $out
28+ '';
29+ interpreter = "${env}/bin/${python.executable}";
30+ is_venv = "False";
31+ is_nixenv = "True";
32+ is_virtualenv = "True";
33+ };
34+ } // lib.optionalAttrs (python.implementation != "graal") {
35+ # Python Nix environment (python.buildEnv)
36+ nixenv = rec {
37+ env = pythonEnv;
38+ interpreter = env.interpreter;
39+ is_venv = "False";
40+ is_nixenv = "True";
41+ is_virtualenv = "False";
42+ };
43+ } // lib.optionalAttrs (python.isPy3k && (!python.isPyPy)) rec {
44+ # Venv built using plain Python
45+ # Python 2 does not support venv
46+ # TODO: PyPy executable name is incorrect, it should be pypy-c or pypy-3c instead of pypy and pypy3.
47+ plain-venv = rec {
48+ env = runCommand "${python.name}-venv" {} ''
49+ ${python.interpreter} -m venv $out
50+ '';
51+ interpreter = "${env}/bin/${python.executable}";
52+ is_venv = "True";
53+ is_nixenv = "False";
54+ is_virtualenv = "False";
55+ };
5556
56− } // lib.optionalAttrs (python.pythonAtLeast "3.8") {
57− # Venv built using Python Nix environment (python.buildEnv)
58− # TODO: Cannot create venv from a nix env
59− # Error: Command '['/nix/store/ddc8nqx73pda86ibvhzdmvdsqmwnbjf7-python3-3.7.6-venv/bin/python3.7', '-Im', 'ensurepip', '--upgrade', '--default-pip']' returned non-zero exit status 1.
60− nixenv-venv = rec {
61− env = runCommand "${python.name}-venv" {} ''
62− ${pythonEnv.interpreter} -m venv $out
63− '';
64− interpreter = "${env}/bin/${pythonEnv.executable}";
65− is_venv = "True";
66− is_nixenv = "True";
67− is_virtualenv = "False";
57+ } // lib.optionalAttrs (python.pythonAtLeast "3.8") {
58+ # Venv built using Python Nix environment (python.buildEnv)
59+ # TODO: Cannot create venv from a nix env
60+ # Error: Command '['/nix/store/ddc8nqx73pda86ibvhzdmvdsqmwnbjf7-python3-3.7.6-venv/bin/python3.7', '-Im', 'ensurepip', '--upgrade', '--default-pip']' returned non-zero exit status 1.
61+ nixenv-venv = rec {
62+ env = runCommand "${python.name}-venv" {} ''
63+ ${pythonEnv.interpreter} -m venv $out
64+ '';
65+ interpreter = "${env}/bin/${pythonEnv.executable}";
66+ is_venv = "True";
67+ is_nixenv = "True";
68+ is_virtualenv = "False";
69+ };
6870 };
69− };
71+
72+ testfun = name: attrs: runCommand "${python.name}-tests-${name}" ({
73+ inherit (python) pythonVersion;
74+ } // attrs) ''
75+ cp -r ${./tests/test_environments} tests
76+ chmod -R +w tests
77+ substituteAllInPlace tests/test_python.py
78+ ${attrs.interpreter} -m unittest discover --verbose tests #/test_python.py
79+ mkdir $out
80+ touch $out/success
81+ '';
82+
83+ in lib.mapAttrs testfun envs;
7084
7185 # All PyPy package builds are broken at the moment
7286 integrationTests = lib.optionalAttrs (python.pythonAtLeast "3.7" && (!python.isPyPy)) rec {
@@ -76,15 +90,6 @@ let
7690 };
7791 };
7892
79− testfun = name: attrs: runCommand "${python.name}-tests-${name}" ({
80− inherit (python) pythonVersion;
81− } // attrs) ''
82− cp -r ${./tests} tests
83− chmod -R +w tests
84− substituteAllInPlace tests/test_python.py
85− ${attrs.interpreter} -m unittest discover --verbose tests #/test_python.py
86− mkdir $out
87− touch $out/success
88− '';
8993
90−in lib.mapAttrs testfun envs // integrationTests
94+
95+in environmentTests // integrationTests
pkgs/development/interpreters/python/tests/test_python.py → pkgs/development/interpreters/python/tests/test_environments/test_python.pyrenamed

The content is the same.

pkgs/development/interpreters/rakudo/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "rakudo";
5− version = "2020.08.1";
5+ version = "2020.08.2";
66
77 src = fetchurl {
88 url = "https://www.rakudo.org/dl/rakudo/rakudo-${version}.tar.gz";
9− sha256 = "1jwlqppm2g6ivzpipkcyihsxzsii3qyx1f35n7wj5dsf99b3hkfm";
9+ sha256 = "16qsq6alvk2x44x39j2fzxigvm5cvmz85i0nkjcw0wz29yyf8lch";
1010 };
1111
1212 buildInputs = [ icu zlib gmp perl ];
pkgs/development/interpreters/rakudo/nqp.nix+3−3
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "nqp";
5− version = "2020.08.1";
5+ version = "2020.08.2";
66
77 src = fetchurl {
8− url = "https://github.com/perl6/nqp/releases/download/${version}/nqp-${version}.tar.gz";
9− sha256 = "0pxmg22dx6rhfgrxq4gbwqf6d2nahw6iprjvrg8brkbcbyj3ryhd";
8+ url = "https://github.com/raku/nqp/releases/download/${version}/nqp-${version}.tar.gz";
9+ sha256 = "14zr1swprxl284k0h1w72pcypj24sga15170ylaqjb8wxy8h1mqw";
1010 };
1111
1212 buildInputs = [ perl ];
pkgs/development/libraries/enchant/2.x.nix+2−2
@@ -10,13 +10,13 @@
1010
1111stdenv.mkDerivation rec {
1212 pname = "enchant";
13− version = "2.2.8";
13+ version = "2.2.9";
1414
1515 outputs = [ "out" "dev" ];
1616
1717 src = fetchurl {
1818 url = "https://github.com/AbiWord/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz";
19− sha256 = "0m9m564qqwbssvvf7y3dlz1yxzqsjiqy1yd2zsmb3l0d7y2y5df7";
19+ sha256 = "0g1gf86jzxxhnhkn7jvgi0k9agzav2zr8pjnpgdwpvgmfci3v6mj";
2020 };
2121
2222 nativeBuildInputs = [
pkgs/development/libraries/gtk-layer-shell/default.nix+19−7
@@ -2,7 +2,10 @@
22, fetchFromGitHub
33, meson
44, ninja
5−, pkgconfig
5+, pkg-config
6+, gtk-doc
7+, docbook-xsl-nons
8+, docbook_xml_dtd_43
69, wayland
710, gtk3
811, gobject-introspection
@@ -10,30 +13,39 @@
1013
1114stdenv.mkDerivation rec {
1215 pname = "gtk-layer-shell";
13− version = "0.1.0";
16+ version = "0.2.0";
17+
18+ outputs = [ "out" "dev" "devdoc" ];
1419
1520 src = fetchFromGitHub {
1621 owner = "wmww";
1722 repo = "gtk-layer-shell";
1823 rev = "v${version}";
19− sha256 = "1fwvlbwp5w1zly6mksvlzbx18ikq4bh7pdj9q0k94qlj6x2zdwg8";
24+ sha256 = "0kas84z44p3vz92sljbnahh43wfj69knqsy1za729j8phrlwqdmg";
2025 };
2126
2227 nativeBuildInputs = [
23− meson ninja pkgconfig
28+ meson
29+ ninja
30+ pkg-config
31+ gobject-introspection
32+ gtk-doc
33+ docbook-xsl-nons
34+ docbook_xml_dtd_43
2435 ];
2536
2637 buildInputs = [
27− wayland gtk3 gobject-introspection
38+ wayland
39+ gtk3
2840 ];
2941
3042 mesonFlags = [
31− "-Dout=${placeholder "out"}"
43+ "-Ddocs=true"
3244 ];
3345
3446 meta = with stdenv.lib; {
3547 description = "A library to create panels and other desktop components for Wayland using the Layer Shell protocol";
36− license = licenses.mit;
48+ license = licenses.lgpl3Plus;
3749 maintainers = with maintainers; [ eonpatapon ];
3850 platforms = platforms.unix;
3951 };
pkgs/development/libraries/kde-frameworks/default.nix+1
@@ -146,6 +146,7 @@ let
146146 kbookmarks = callPackage ./kbookmarks.nix {};
147147 kcmutils = callPackage ./kcmutils {};
148148 kconfigwidgets = callPackage ./kconfigwidgets {};
149+ kdav = callPackage ./kdav.nix {};
149150 kdeclarative = callPackage ./kdeclarative.nix {};
150151 kded = callPackage ./kded.nix {};
151152 kdesignerplugin = callPackage ./kdesignerplugin.nix {};
pkgs/development/libraries/kde-frameworks/fetch.sh+1−1
@@ -1 +1 @@
1−WGET_ARGS=(https://download.kde.org/stable/frameworks/5.71/)
1+WGET_ARGS=(https://download.kde.org/stable/frameworks/5.73/)
pkgs/applications/kde/kdav.nix → pkgs/development/libraries/kde-frameworks/kdav.nixrenamed+1−2
@@ -1,5 +1,5 @@
11{
2− mkDerivation, lib, kdepimTeam,
2+ mkDerivation, lib,
33 extra-cmake-modules, kdoctools,
44 kcoreaddons, kio, qtxmlpatterns,
55}:
@@ -8,7 +8,6 @@ mkDerivation {
88 name = "kdav";
99 meta = {
1010 license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
11− maintainers = kdepimTeam;
1211 };
1312 nativeBuildInputs = [ extra-cmake-modules kdoctools ];
1413 buildInputs = [ kcoreaddons kio qtxmlpatterns ];
pkgs/development/libraries/kde-frameworks/kdesu/kdesu-search-for-wrapped-daemon-first.patch+2−2
@@ -21,14 +21,14 @@ index 44fbacd..6b5abf5 100644
2121- if (!QFile::exists(daemon)) { // if not in libexec, find it in PATH
2222- daemon = QStandardPaths::findExecutable(QStringLiteral("kdesud"));
2323- if (daemon.isEmpty()) {
24−- qWarning() << "kdesud daemon not found.";
24+- qCWarning(KSU_LOG) << "kdesud daemon not found.";
2525+ QString daemon = QFile::decodeName("/run/wrappers/bin/kdesud");
2626+ if (!QFile::exists(daemon)) { // if not in wrappers
2727+ daemon = QFile::decodeName(CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/kdesud");
2828+ if (!QFile::exists(daemon)) { // if not in libexec, find it in PATH
2929+ daemon = QStandardPaths::findExecutable(QStringLiteral("kdesud"));
3030+ if (daemon.isEmpty()) {
31−+ qWarning() << "kdesud daemon not found.";
31++ qCWarning(KSU_LOG) << "kdesud daemon not found.";
3232+ }
3333 }
3434 }
pkgs/development/libraries/kde-frameworks/krunner.nix−7
@@ -9,13 +9,6 @@ let
99 self = mkDerivation {
1010 name = "krunner";
1111 meta = { maintainers = [ lib.maintainers.ttuegel ]; };
12− patches = [
13− # Un-deprecate virtual method to restore binary compatibility.
14− (assert !(lib.versionOlder "5.72" self.version); fetchpatch {
15− url = "https://invent.kde.org/frameworks/krunner/-/commit/8f7ce559b84ee0c21de0256e6591793e4b95f411.diff";
16− sha256 = "124xqxpgmc5fdn1mcf8x1564pqc5y81j7lhzcirql2xcs0sbcyby";
17− })
18− ];
1912 nativeBuildInputs = [ extra-cmake-modules ];
2013 buildInputs = [
2114 kconfig kcoreaddons ki18n kio kservice qtdeclarative solid
pkgs/development/libraries/kde-frameworks/kwayland.nix+2−2
@@ -1,7 +1,7 @@
11{
22 mkDerivation, lib, propagateBin,
33 extra-cmake-modules,
4− qtbase, wayland, wayland-protocols
4+ plasma-wayland-protocols, qtbase, wayland, wayland-protocols
55}:
66
77mkDerivation {
@@ -11,7 +11,7 @@ mkDerivation {
1111 broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
1212 };
1313 nativeBuildInputs = [ extra-cmake-modules ];
14− buildInputs = [ wayland wayland-protocols ];
14+ buildInputs = [ plasma-wayland-protocols wayland wayland-protocols ];
1515 propagatedBuildInputs = [ qtbase ];
1616 setupHook = propagateBin; # XDG_CONFIG_DIRS
1717}
pkgs/development/libraries/kde-frameworks/srcs.nix+336−328
@@ -4,659 +4,667 @@
44
55{
66 attica = {
7− version = "5.71.0";
7+ version = "5.73.0";
88 src = fetchurl {
9− url = "${mirror}/stable/frameworks/5.71/attica-5.71.0.tar.xz";
10− sha256 = "9e24fd7f58c66879a05e056b781637196eea69d3276ed470643c505f9fd46d3d";
11− name = "attica-5.71.0.tar.xz";
9+ url = "${mirror}/stable/frameworks/5.73/attica-5.73.0.tar.xz";
10+ sha256 = "011240a6ff59e2b39bcf6d4ba6128e6e60c6318c185e7316a71cfec28e69c69a";
11+ name = "attica-5.73.0.tar.xz";
1212 };
1313 };
1414 baloo = {
15− version = "5.71.0";
15+ version = "5.73.0";
1616 src = fetchurl {
17− url = "${mirror}/stable/frameworks/5.71/baloo-5.71.0.tar.xz";
18− sha256 = "23378213d00ecf1f26eeb417987984f5a63bbd643359403dfd20638cbc1ec84b";
19− name = "baloo-5.71.0.tar.xz";
17+ url = "${mirror}/stable/frameworks/5.73/baloo-5.73.0.tar.xz";
18+ sha256 = "887077ae3e090d673d2ffe7eb869a0ab6f5d14e9dae2dccd619e4689699a2dfe";
19+ name = "baloo-5.73.0.tar.xz";
2020 };
2121 };
2222 bluez-qt = {
23− version = "5.71.0";
23+ version = "5.73.0";
2424 src = fetchurl {
25− url = "${mirror}/stable/frameworks/5.71/bluez-qt-5.71.0.tar.xz";
26− sha256 = "7014e946f16db62218fe8e9af808999922d447034355f17b9e09b31321e53bad";
27− name = "bluez-qt-5.71.0.tar.xz";
25+ url = "${mirror}/stable/frameworks/5.73/bluez-qt-5.73.0.tar.xz";
26+ sha256 = "70264edb82b2627c0ec3740374b90b8402e0f432fe4a10650fa3d22191d8cfd4";
27+ name = "bluez-qt-5.73.0.tar.xz";
2828 };
2929 };
3030 breeze-icons = {
31− version = "5.71.0";
31+ version = "5.73.0";
3232 src = fetchurl {
33− url = "${mirror}/stable/frameworks/5.71/breeze-icons-5.71.0.tar.xz";
34− sha256 = "72217c46e071b204a80ff8064b1b7319c7a7f9f0b08e69d8add2065e5d301155";
35− name = "breeze-icons-5.71.0.tar.xz";
33+ url = "${mirror}/stable/frameworks/5.73/breeze-icons-5.73.0.tar.xz";
34+ sha256 = "b6caff26f69008a3e0d53ae5fcfcf070b70ad1b17d407daecbbabeb6a606a08b";
35+ name = "breeze-icons-5.73.0.tar.xz";
3636 };
3737 };
3838 extra-cmake-modules = {
39− version = "5.71.0";
39+ version = "5.73.0";
4040 src = fetchurl {
41− url = "${mirror}/stable/frameworks/5.71/extra-cmake-modules-5.71.0.tar.xz";
42− sha256 = "64f41c0b4b3164c7be8fcab5c0181253d97d1e9d62455fd540cb463afd051878";
43− name = "extra-cmake-modules-5.71.0.tar.xz";
41+ url = "${mirror}/stable/frameworks/5.73/extra-cmake-modules-5.73.0.tar.xz";
42+ sha256 = "c5e3ef0253f7d5ab3adf9185950e34fd620a3d5baaf3bcc15892f971fc3274c4";
43+ name = "extra-cmake-modules-5.73.0.tar.xz";
4444 };
4545 };
4646 frameworkintegration = {
47− version = "5.71.0";
47+ version = "5.73.0";
4848 src = fetchurl {
49− url = "${mirror}/stable/frameworks/5.71/frameworkintegration-5.71.0.tar.xz";
50− sha256 = "f5ba2d5c363dcb09177424b82d9a59ce0f0a6b2dea372799dcba000452764961";
51− name = "frameworkintegration-5.71.0.tar.xz";
49+ url = "${mirror}/stable/frameworks/5.73/frameworkintegration-5.73.0.tar.xz";
50+ sha256 = "21ef7f1a6d48f9fb14ccac9bc37e803c92cf83c9e235a5ca8bd7eb08fd0a6fb3";
51+ name = "frameworkintegration-5.73.0.tar.xz";
5252 };
5353 };
5454 kactivities = {
55− version = "5.71.0";
55+ version = "5.73.0";
5656 src = fetchurl {
57− url = "${mirror}/stable/frameworks/5.71/kactivities-5.71.0.tar.xz";
58− sha256 = "b4e63fec6532e4bdc41470985cea46b0a88c1b2298b80286cbf0ed2d2139b66f";
59− name = "kactivities-5.71.0.tar.xz";
57+ url = "${mirror}/stable/frameworks/5.73/kactivities-5.73.0.tar.xz";
58+ sha256 = "5098f2535175ac12da91568ca554e3f5d970ae05415da1a8ba17305cb8ac3a1a";
59+ name = "kactivities-5.73.0.tar.xz";
6060 };
6161 };
6262 kactivities-stats = {
63− version = "5.71.0";
63+ version = "5.73.0";
6464 src = fetchurl {
65− url = "${mirror}/stable/frameworks/5.71/kactivities-stats-5.71.0.tar.xz";
66− sha256 = "79fe4f674d7bae457ce6af0357104a8691f5822963b0ef1f99cd5a43e3666978";
67− name = "kactivities-stats-5.71.0.tar.xz";
65+ url = "${mirror}/stable/frameworks/5.73/kactivities-stats-5.73.0.tar.xz";
66+ sha256 = "df4b00c52e83608b2dd7345cd220143e07b65cb431cead5e9abb1e4ffd6ecd5a";
67+ name = "kactivities-stats-5.73.0.tar.xz";
6868 };
6969 };
7070 kapidox = {
71− version = "5.71.0";
71+ version = "5.73.0";
7272 src = fetchurl {
73− url = "${mirror}/stable/frameworks/5.71/kapidox-5.71.0.tar.xz";
74− sha256 = "da75660fc2808f38441ec0f59d3c58ce29fcfdcea29e251308a11a92546f1ed5";
75− name = "kapidox-5.71.0.tar.xz";
73+ url = "${mirror}/stable/frameworks/5.73/kapidox-5.73.0.tar.xz";
74+ sha256 = "b49ff6673906817ed95a3de56535594de02a9f95bcb2726abe52d0c0e0161be5";
75+ name = "kapidox-5.73.0.tar.xz";
7676 };
7777 };
7878 karchive = {
79− version = "5.71.0";
79+ version = "5.73.0";
8080 src = fetchurl {
81− url = "${mirror}/stable/frameworks/5.71/karchive-5.71.0.tar.xz";
82− sha256 = "cc81e856365dec2bcf3ec78aa01d42347ca390a2311ea12050f309dfbdb09624";
83− name = "karchive-5.71.0.tar.xz";
81+ url = "${mirror}/stable/frameworks/5.73/karchive-5.73.0.tar.xz";
82+ sha256 = "25481ebbba8f58d9ab45bde804ab0d873c45550b482e27e7856b362cd9aa434f";
83+ name = "karchive-5.73.0.tar.xz";
8484 };
8585 };
8686 kauth = {
87− version = "5.71.0";
87+ version = "5.73.0";
8888 src = fetchurl {
89− url = "${mirror}/stable/frameworks/5.71/kauth-5.71.0.tar.xz";
90− sha256 = "a0de83bd662e20253011216ab8cba597f8db7429f8706237e7307580125025b5";
91− name = "kauth-5.71.0.tar.xz";
89+ url = "${mirror}/stable/frameworks/5.73/kauth-5.73.0.tar.xz";
90+ sha256 = "e334705bfc3f81c5e2f66315d40badd26d88426128432788f790ebefce1694d9";
91+ name = "kauth-5.73.0.tar.xz";
9292 };
9393 };
9494 kbookmarks = {
95− version = "5.71.0";
95+ version = "5.73.0";
9696 src = fetchurl {
97− url = "${mirror}/stable/frameworks/5.71/kbookmarks-5.71.0.tar.xz";
98− sha256 = "e00db1e62a769863a1bf90bb508f108f2740298aa40173cad34ef34a1c23a01a";
99− name = "kbookmarks-5.71.0.tar.xz";
97+ url = "${mirror}/stable/frameworks/5.73/kbookmarks-5.73.0.tar.xz";
98+ sha256 = "b925ec1b8a1b4a2b7f2526fdbc7761de065b3c9573e41ac274773ed1b576aa51";
99+ name = "kbookmarks-5.73.0.tar.xz";
100100 };
101101 };
102102 kcalendarcore = {
103− version = "5.71.0";
103+ version = "5.73.0";
104104 src = fetchurl {
105− url = "${mirror}/stable/frameworks/5.71/kcalendarcore-5.71.0.tar.xz";
106− sha256 = "d5138db971f6be606be8ae7d761bad778af3cacada8e85fb2f469190c347cd94";
107− name = "kcalendarcore-5.71.0.tar.xz";
105+ url = "${mirror}/stable/frameworks/5.73/kcalendarcore-5.73.0.tar.xz";
106+ sha256 = "e3486b41b833c0ba72f839d8a61bdffaf9b3ece3da20f478c2981b3296e7b713";
107+ name = "kcalendarcore-5.73.0.tar.xz";
108108 };
109109 };
110110 kcmutils = {
111− version = "5.71.0";
111+ version = "5.73.0";
112112 src = fetchurl {
113− url = "${mirror}/stable/frameworks/5.71/kcmutils-5.71.0.tar.xz";
114− sha256 = "27743a81e9aa48baac12bb844e48d3098250699122ed6040b1e3c50a5e8f276d";
115− name = "kcmutils-5.71.0.tar.xz";
113+ url = "${mirror}/stable/frameworks/5.73/kcmutils-5.73.0.tar.xz";
114+ sha256 = "b28bf672bbe21e8d1b4e6ea924c1bb318c81c43dcbb86bebb3f5775e18945ca9";
115+ name = "kcmutils-5.73.0.tar.xz";
116116 };
117117 };
118118 kcodecs = {
119− version = "5.71.0";
119+ version = "5.73.0";
120120 src = fetchurl {
121− url = "${mirror}/stable/frameworks/5.71/kcodecs-5.71.0.tar.xz";
122− sha256 = "3392c4df652e3a44a2b941ccb419dee9521642e503104de403ec1c6be9f43a28";
123− name = "kcodecs-5.71.0.tar.xz";
121+ url = "${mirror}/stable/frameworks/5.73/kcodecs-5.73.0.tar.xz";
122+ sha256 = "3bcb22b4f3b2f164759ab912d117c3b4b50695ae38d524f2cfb79a29488cce67";
123+ name = "kcodecs-5.73.0.tar.xz";
124124 };
125125 };
126126 kcompletion = {
127− version = "5.71.0";
127+ version = "5.73.0";
128128 src = fetchurl {
129− url = "${mirror}/stable/frameworks/5.71/kcompletion-5.71.0.tar.xz";
130− sha256 = "bf0b6ce1ee133900f169662dbd35da6f766d3e4e02c0c102a9402e20450a22a4";
131− name = "kcompletion-5.71.0.tar.xz";
129+ url = "${mirror}/stable/frameworks/5.73/kcompletion-5.73.0.tar.xz";
130+ sha256 = "72b0650e5ae9f30ad4ec30b55e660c826d93edfda0ef4f9436f226cbb8a9705a";
131+ name = "kcompletion-5.73.0.tar.xz";
132132 };
133133 };
134134 kconfig = {
135− version = "5.71.0";
135+ version = "5.73.0";
136136 src = fetchurl {
137− url = "${mirror}/stable/frameworks/5.71/kconfig-5.71.0.tar.xz";
138− sha256 = "618ff0d168abf8fb73dc83431b9a76f7859d522bea100ff07c7e1632e129e3f4";
139− name = "kconfig-5.71.0.tar.xz";
137+ url = "${mirror}/stable/frameworks/5.73/kconfig-5.73.0.tar.xz";
138+ sha256 = "6046bbb8da5f3261aac7f868bfa8a8ce1015a3a8257fe0b2d37dce9e2bc3952e";
139+ name = "kconfig-5.73.0.tar.xz";
140140 };
141141 };
142142 kconfigwidgets = {
143− version = "5.71.0";
143+ version = "5.73.0";
144144 src = fetchurl {
145− url = "${mirror}/stable/frameworks/5.71/kconfigwidgets-5.71.0.tar.xz";
146− sha256 = "5778523c49a5294e9376ce8ee6db1a51ffaa506418a19e8632f73287a596276f";
147− name = "kconfigwidgets-5.71.0.tar.xz";
145+ url = "${mirror}/stable/frameworks/5.73/kconfigwidgets-5.73.0.tar.xz";
146+ sha256 = "ed8a0a8158f895aebd46c4a725f77178d942cd9476a864a615a9df343da51f8e";
147+ name = "kconfigwidgets-5.73.0.tar.xz";
148148 };
149149 };
150150 kcontacts = {
151− version = "5.71.0";
151+ version = "5.73.0";
152152 src = fetchurl {
153− url = "${mirror}/stable/frameworks/5.71/kcontacts-5.71.0.tar.xz";
154− sha256 = "57f511a624406b27a7de25c83deb4104c95e851f9fda4f6d94450155ab08f4bd";
155− name = "kcontacts-5.71.0.tar.xz";
153+ url = "${mirror}/stable/frameworks/5.73/kcontacts-5.73.0.tar.xz";
154+ sha256 = "4351bf80f5a5417ba7e99fe557a851d1c7173fd7511fc1426375c66692e748bb";
155+ name = "kcontacts-5.73.0.tar.xz";
156156 };
157157 };
158158 kcoreaddons = {
159− version = "5.71.0";
159+ version = "5.73.0";
160160 src = fetchurl {
161− url = "${mirror}/stable/frameworks/5.71/kcoreaddons-5.71.0.tar.xz";
162− sha256 = "e95008b032e299cf47f596739d9236701e2f55e507734f33b8ea497882fd130b";
163− name = "kcoreaddons-5.71.0.tar.xz";
161+ url = "${mirror}/stable/frameworks/5.73/kcoreaddons-5.73.0.tar.xz";
162+ sha256 = "24a7713eaef2f40e648a586e22b030192321f9fecdbae77013b00446fa0d6d51";
163+ name = "kcoreaddons-5.73.0.tar.xz";
164164 };
165165 };
166166 kcrash = {
167− version = "5.71.0";
167+ version = "5.73.0";
168168 src = fetchurl {
169− url = "${mirror}/stable/frameworks/5.71/kcrash-5.71.0.tar.xz";
170− sha256 = "526242aa9fde7cff11ecaa88bf75d6fbbfc412f46bf19a7a9e185f2adb616005";
171− name = "kcrash-5.71.0.tar.xz";
169+ url = "${mirror}/stable/frameworks/5.73/kcrash-5.73.0.tar.xz";
170+ sha256 = "49b6f4d6109ddf3a6b93f833f59483e5a1a748e4b829c4739fdaaaef59c9b583";
171+ name = "kcrash-5.73.0.tar.xz";
172+ };
173+ };
174+ kdav = {
175+ version = "5.73.0";
176+ src = fetchurl {
177+ url = "${mirror}/stable/frameworks/5.73/kdav-5.73.0.tar.xz";
178+ sha256 = "03c8af96e7bb1b1d2d633e54c6362c7c2de078b8aba5654042b7a11d968efa31";
179+ name = "kdav-5.73.0.tar.xz";
172180 };
173181 };
174182 kdbusaddons = {
175− version = "5.71.0";
183+ version = "5.73.0";
176184 src = fetchurl {
177− url = "${mirror}/stable/frameworks/5.71/kdbusaddons-5.71.0.tar.xz";
178− sha256 = "b441f525248d9d675333cebedf97ee0232a3a9b7aa9aff84d825dfcdb3bcd23c";
179− name = "kdbusaddons-5.71.0.tar.xz";
185+ url = "${mirror}/stable/frameworks/5.73/kdbusaddons-5.73.0.tar.xz";
186+ sha256 = "f7f7e57b4d4650cf90a191b08b1fe874d0005c34163b9177dcc787415841e8ba";
187+ name = "kdbusaddons-5.73.0.tar.xz";
180188 };
181189 };
182190 kdeclarative = {
183− version = "5.71.0";
191+ version = "5.73.0";
184192 src = fetchurl {
185− url = "${mirror}/stable/frameworks/5.71/kdeclarative-5.71.0.tar.xz";
186− sha256 = "ace0e52f561a9cfba1de4b77144a0a68037a1229530fb39070dc837da80ac8f8";
187− name = "kdeclarative-5.71.0.tar.xz";
193+ url = "${mirror}/stable/frameworks/5.73/kdeclarative-5.73.0.tar.xz";
194+ sha256 = "713ae2ea41e1bac8f6d47cffa376d62c7805eb3e4cc41c3168c1f1b2ca70a598";
195+ name = "kdeclarative-5.73.0.tar.xz";
188196 };
189197 };
190198 kded = {
191− version = "5.71.0";
199+ version = "5.73.0";
192200 src = fetchurl {
193− url = "${mirror}/stable/frameworks/5.71/kded-5.71.0.tar.xz";
194− sha256 = "404c8caae0f4abe2ef85c2e82b5db2b14ae4b607fa30e4f16d15dad53c269fcc";
195− name = "kded-5.71.0.tar.xz";
201+ url = "${mirror}/stable/frameworks/5.73/kded-5.73.0.tar.xz";
202+ sha256 = "f21647a5f35eebaa9bf12b5d5da25c24611c1971f94f27c510d22a48c79b0895";
203+ name = "kded-5.73.0.tar.xz";
196204 };
197205 };
198206 kdelibs4support = {
199− version = "5.71.0";
207+ version = "5.73.0";
200208 src = fetchurl {
201− url = "${mirror}/stable/frameworks/5.71/portingAids/kdelibs4support-5.71.0.tar.xz";
202− sha256 = "1110ed68a29e38059d195817735d58df45e59b57fa9ac48ef2036c1037a23fb7";
203− name = "kdelibs4support-5.71.0.tar.xz";
209+ url = "${mirror}/stable/frameworks/5.73/portingAids/kdelibs4support-5.73.0.tar.xz";
210+ sha256 = "ca6f58c97b331d130a555b950c36cd7f625ca923fd185b0f73e20ac5b98c5d9b";
211+ name = "kdelibs4support-5.73.0.tar.xz";
204212 };
205213 };
206214 kdesignerplugin = {
207− version = "5.71.0";
215+ version = "5.73.0";
208216 src = fetchurl {
209− url = "${mirror}/stable/frameworks/5.71/portingAids/kdesignerplugin-5.71.0.tar.xz";
210− sha256 = "e77a96c2a6cd518f3040e9366f013f0128200791b6c93c3c5b2310af16fb040b";
211− name = "kdesignerplugin-5.71.0.tar.xz";
217+ url = "${mirror}/stable/frameworks/5.73/portingAids/kdesignerplugin-5.73.0.tar.xz";
218+ sha256 = "379db9fd0ec135706630dbd54e1b446e51dd3b64189754c281993d761c1d20b2";
219+ name = "kdesignerplugin-5.73.0.tar.xz";
212220 };
213221 };
214222 kdesu = {
215− version = "5.71.0";
223+ version = "5.73.0";
216224 src = fetchurl {
217− url = "${mirror}/stable/frameworks/5.71/kdesu-5.71.0.tar.xz";
218− sha256 = "b183e67c089b02f984284b5eb3c05f7216d289bef7ae08a9e6c6f991b2a1a23a";
219− name = "kdesu-5.71.0.tar.xz";
225+ url = "${mirror}/stable/frameworks/5.73/kdesu-5.73.0.tar.xz";
226+ sha256 = "4dd07697decad6a544025178732bd279ef64766e1929a2135f6de58b1092944d";
227+ name = "kdesu-5.73.0.tar.xz";
220228 };
221229 };
222230 kdewebkit = {
223− version = "5.71.0";
231+ version = "5.73.0";
224232 src = fetchurl {
225− url = "${mirror}/stable/frameworks/5.71/portingAids/kdewebkit-5.71.0.tar.xz";
226− sha256 = "04b8b90734ddf6d5e72ffa69707d473e1d1f8605ba06d4ceca83f4a1d195c65d";
227− name = "kdewebkit-5.71.0.tar.xz";
233+ url = "${mirror}/stable/frameworks/5.73/portingAids/kdewebkit-5.73.0.tar.xz";
234+ sha256 = "d8208c4f7a98b6749c793649e2e5fbe3939e253289a9f6b74b559f6546b34b0b";
235+ name = "kdewebkit-5.73.0.tar.xz";
228236 };
229237 };
230238 kdnssd = {
231− version = "5.71.0";
239+ version = "5.73.0";
232240 src = fetchurl {
233− url = "${mirror}/stable/frameworks/5.71/kdnssd-5.71.0.tar.xz";
234− sha256 = "bc269f0a74eee99d6c49550fc608450ced753a599cd03f77ea577af4c2e87958";
235− name = "kdnssd-5.71.0.tar.xz";
241+ url = "${mirror}/stable/frameworks/5.73/kdnssd-5.73.0.tar.xz";
242+ sha256 = "bee7f654f704d928b1219b75a289042474c1450e9f8acb02a905a4a177bc5b7d";
243+ name = "kdnssd-5.73.0.tar.xz";
236244 };
237245 };
238246 kdoctools = {
239− version = "5.71.0";
247+ version = "5.73.0";
240248 src = fetchurl {
241− url = "${mirror}/stable/frameworks/5.71/kdoctools-5.71.0.tar.xz";
242− sha256 = "1e2fcaa97a014e82f68c0c36591ce84568ead7abd59b66e534789103e162cd09";
243− name = "kdoctools-5.71.0.tar.xz";
249+ url = "${mirror}/stable/frameworks/5.73/kdoctools-5.73.0.tar.xz";
250+ sha256 = "d8dd74776d47e009d4a204d69a78428603ca99317095d7b7edca49c3d93b1b5d";
251+ name = "kdoctools-5.73.0.tar.xz";
244252 };
245253 };
246254 kemoticons = {
247− version = "5.71.0";
255+ version = "5.73.0";
248256 src = fetchurl {
249− url = "${mirror}/stable/frameworks/5.71/kemoticons-5.71.0.tar.xz";
250− sha256 = "20bcb111971cc2e8c17b38a0c20aff7cf453174f885c4b4bcc5899141113e2fc";
251− name = "kemoticons-5.71.0.tar.xz";
257+ url = "${mirror}/stable/frameworks/5.73/kemoticons-5.73.0.tar.xz";
258+ sha256 = "0c0a26b029a8fd3d8db97bac931feb7834912aa2f7680660e98d91e868d10778";
259+ name = "kemoticons-5.73.0.tar.xz";
252260 };
253261 };
254262 kfilemetadata = {
255− version = "5.71.0";
263+ version = "5.73.0";
256264 src = fetchurl {
257− url = "${mirror}/stable/frameworks/5.71/kfilemetadata-5.71.0.tar.xz";
258− sha256 = "2e302958065157c1f9ea4a189bbca40b7dbed019767a3380e34e0b6a633c75fe";
259− name = "kfilemetadata-5.71.0.tar.xz";
265+ url = "${mirror}/stable/frameworks/5.73/kfilemetadata-5.73.0.tar.xz";
266+ sha256 = "1ae217aab920741e445211e20b1b60dfcf80f4a6d1864aa63321dac7c3802894";
267+ name = "kfilemetadata-5.73.0.tar.xz";
260268 };
261269 };
262270 kglobalaccel = {
263− version = "5.71.0";
271+ version = "5.73.0";
264272 src = fetchurl {
265− url = "${mirror}/stable/frameworks/5.71/kglobalaccel-5.71.0.tar.xz";
266− sha256 = "218d77aa4f6089d57932d627c4a46a8a4a5e964c2bfcee0d1c54338c25c7a06c";
267− name = "kglobalaccel-5.71.0.tar.xz";
273+ url = "${mirror}/stable/frameworks/5.73/kglobalaccel-5.73.0.tar.xz";
274+ sha256 = "0062db9adde4dab0be6b64430010c0a5653355d0d1680abc9ec8e71988ff871f";
275+ name = "kglobalaccel-5.73.0.tar.xz";
268276 };
269277 };
270278 kguiaddons = {
271− version = "5.71.0";
279+ version = "5.73.0";
272280 src = fetchurl {
273− url = "${mirror}/stable/frameworks/5.71/kguiaddons-5.71.0.tar.xz";
274− sha256 = "c1f7bf540a689319962275916c0434f47ba5ed8f7d46a78704393163e32eccd2";
275− name = "kguiaddons-5.71.0.tar.xz";
281+ url = "${mirror}/stable/frameworks/5.73/kguiaddons-5.73.0.tar.xz";
282+ sha256 = "45b4c5e0195abd79930635bbf20886b15b1b68b13fe4c56068579b91ef147350";
283+ name = "kguiaddons-5.73.0.tar.xz";
276284 };
277285 };
278286 kholidays = {
279− version = "5.71.0";
287+ version = "5.73.0";
280288 src = fetchurl {
281− url = "${mirror}/stable/frameworks/5.71/kholidays-5.71.0.tar.xz";
282− sha256 = "5469718d6ede7edb2ab06bbaff8af01567ba77ffe2160c2c2d47c666cfebf417";
283− name = "kholidays-5.71.0.tar.xz";
289+ url = "${mirror}/stable/frameworks/5.73/kholidays-5.73.0.tar.xz";
290+ sha256 = "b0ae4b77aa7c183959bc18baa09a1a4f7208fcad2a238c1590377bf6cf8b68ab";
291+ name = "kholidays-5.73.0.tar.xz";
284292 };
285293 };
286294 khtml = {
287− version = "5.71.0";
295+ version = "5.73.0";
288296 src = fetchurl {
289− url = "${mirror}/stable/frameworks/5.71/portingAids/khtml-5.71.0.tar.xz";
290− sha256 = "df8d2a4776f98e1490a21e71e31a2ea7694bc7452da35f88623b19214b6e1c10";
291− name = "khtml-5.71.0.tar.xz";
297+ url = "${mirror}/stable/frameworks/5.73/portingAids/khtml-5.73.0.tar.xz";
298+ sha256 = "378a5aaa6c796d313a63b4cf1365cdd980f2bc21e9033354f2f1317d1db9c262";
299+ name = "khtml-5.73.0.tar.xz";
292300 };
293301 };
294302 ki18n = {
295− version = "5.71.0";
303+ version = "5.73.0";
296304 src = fetchurl {
297− url = "${mirror}/stable/frameworks/5.71/ki18n-5.71.0.tar.xz";
298− sha256 = "f2fc8c40c10576da8b74070b7dc8e752fdd04204cb2bfe522f37a0458fbaf881";
299− name = "ki18n-5.71.0.tar.xz";
305+ url = "${mirror}/stable/frameworks/5.73/ki18n-5.73.0.tar.xz";
306+ sha256 = "97eef22d6cdd65c57edfe54fa9760a69005e15b7d8f4270f6185916c33e14689";
307+ name = "ki18n-5.73.0.tar.xz";
300308 };
301309 };
302310 kiconthemes = {
303− version = "5.71.0";
311+ version = "5.73.0";
304312 src = fetchurl {
305− url = "${mirror}/stable/frameworks/5.71/kiconthemes-5.71.0.tar.xz";
306− sha256 = "3fa986207e9d967840bd7a3f1af1e4d0105905012a0e4cf56f7ef1b3740b3496";
307− name = "kiconthemes-5.71.0.tar.xz";
313+ url = "${mirror}/stable/frameworks/5.73/kiconthemes-5.73.0.tar.xz";
314+ sha256 = "4490109a0a42675e4cd3497433e10fd4be24ef644a283edf46b308314d130356";
315+ name = "kiconthemes-5.73.0.tar.xz";
308316 };
309317 };
310318 kidletime = {
311− version = "5.71.0";
319+ version = "5.73.0";
312320 src = fetchurl {
313− url = "${mirror}/stable/frameworks/5.71/kidletime-5.71.0.tar.xz";
314− sha256 = "1bcacd6c9ec8d65f93434f51d865723a50609ec074f88da2890a8f37ea8d207d";
315− name = "kidletime-5.71.0.tar.xz";
321+ url = "${mirror}/stable/frameworks/5.73/kidletime-5.73.0.tar.xz";
322+ sha256 = "52a8af3f061101c406a592ec277a2c84846e3910af1d3dbfc3e15beb9cfd24a2";
323+ name = "kidletime-5.73.0.tar.xz";
316324 };
317325 };
318326 kimageformats = {
319− version = "5.71.0";
327+ version = "5.73.0";
320328 src = fetchurl {
321− url = "${mirror}/stable/frameworks/5.71/kimageformats-5.71.0.tar.xz";
322− sha256 = "0d6d6a8664e4a01df27e9970ec9ec10a92c1d43a00a3e9ef0471d740b4c93d94";
323− name = "kimageformats-5.71.0.tar.xz";
329+ url = "${mirror}/stable/frameworks/5.73/kimageformats-5.73.0.tar.xz";
330+ sha256 = "473d0f67d5357bbf08aa4f4504ceaceabc720b1f5433b456ddc5f8ad0d7e3b8b";
331+ name = "kimageformats-5.73.0.tar.xz";
324332 };
325333 };
326334 kinit = {
327− version = "5.71.0";
335+ version = "5.73.0";
328336 src = fetchurl {
329− url = "${mirror}/stable/frameworks/5.71/kinit-5.71.0.tar.xz";
330− sha256 = "6ea625bced2c19b0f3e5bb504775dd6764358f02412364a16cbad731c5c299b6";
331− name = "kinit-5.71.0.tar.xz";
337+ url = "${mirror}/stable/frameworks/5.73/kinit-5.73.0.tar.xz";
338+ sha256 = "0c61e90f3db83b4dc5f2438cf7880a02b600a5739cb05e5ee372aeff98b8b770";
339+ name = "kinit-5.73.0.tar.xz";
332340 };
333341 };
334342 kio = {
335− version = "5.71.0";
343+ version = "5.73.0";
336344 src = fetchurl {
337− url = "${mirror}/stable/frameworks/5.71/kio-5.71.0.tar.xz";
338− sha256 = "b972c8dede50be3e89babb5a536054759db2a87003e6df770c598c7c1c94b8d6";
339− name = "kio-5.71.0.tar.xz";
345+ url = "${mirror}/stable/frameworks/5.73/kio-5.73.0.tar.xz";
346+ sha256 = "05da159e6cf5ef9aa4dd7ede86ce28a5581624a1b3f0b4718c5b7e30c4aa2a66";
347+ name = "kio-5.73.0.tar.xz";
340348 };
341349 };
342350 kirigami2 = {
343− version = "5.71.0";
351+ version = "5.73.0";
344352 src = fetchurl {
345− url = "${mirror}/stable/frameworks/5.71/kirigami2-5.71.0.tar.xz";
346− sha256 = "f323efb96a809dc9e572a0e68e04c4f485fc27f9ae65ffa3988830e348151356";
347− name = "kirigami2-5.71.0.tar.xz";
353+ url = "${mirror}/stable/frameworks/5.73/kirigami2-5.73.0.tar.xz";
354+ sha256 = "9b2a097071f77804f6f2f2a478e5db602c8b5fee00de34fc44842f31223401bb";
355+ name = "kirigami2-5.73.0.tar.xz";
348356 };
349357 };
350358 kitemmodels = {
351− version = "5.71.0";
359+ version = "5.73.0";
352360 src = fetchurl {
353− url = "${mirror}/stable/frameworks/5.71/kitemmodels-5.71.0.tar.xz";
354− sha256 = "68205f09d63a916f236e2b3b729c0055377d852de48f7cf29fa7174ca97b84e7";
355− name = "kitemmodels-5.71.0.tar.xz";
361+ url = "${mirror}/stable/frameworks/5.73/kitemmodels-5.73.0.tar.xz";
362+ sha256 = "6569e289ac9263d87ef6641fe2f3914b9ace6814832ac9c61825b1c6805ae371";
363+ name = "kitemmodels-5.73.0.tar.xz";
356364 };
357365 };
358366 kitemviews = {
359− version = "5.71.0";
367+ version = "5.73.0";
360368 src = fetchurl {
361− url = "${mirror}/stable/frameworks/5.71/kitemviews-5.71.0.tar.xz";
362− sha256 = "2843ef166ff5bf69c1132bbc09545b59ad208313c0acad71d0cd951fde1d33de";
363− name = "kitemviews-5.71.0.tar.xz";
369+ url = "${mirror}/stable/frameworks/5.73/kitemviews-5.73.0.tar.xz";
370+ sha256 = "ec29707d789bee58c47ee538319560a168642f69e96cacb78818825e47177727";
371+ name = "kitemviews-5.73.0.tar.xz";
364372 };
365373 };
366374 kjobwidgets = {
367− version = "5.71.0";
375+ version = "5.73.0";
368376 src = fetchurl {
369− url = "${mirror}/stable/frameworks/5.71/kjobwidgets-5.71.0.tar.xz";
370− sha256 = "63f3b2fc1c062b1a485ff543e2d5afa68a9f9a918676bf3a6a5dc8f56f5f30e3";
371− name = "kjobwidgets-5.71.0.tar.xz";
377+ url = "${mirror}/stable/frameworks/5.73/kjobwidgets-5.73.0.tar.xz";
378+ sha256 = "61d105c8f17dcfb85ad6c1e3bd2423ebeb430b9c290d193229bc953ac174f2bf";
379+ name = "kjobwidgets-5.73.0.tar.xz";
372380 };
373381 };
374382 kjs = {
375− version = "5.71.0";
383+ version = "5.73.0";
376384 src = fetchurl {
377− url = "${mirror}/stable/frameworks/5.71/portingAids/kjs-5.71.0.tar.xz";
378− sha256 = "702224482139e500da1ea4e0d2b5132bf762f87f426f294587a0f2f47b9a9734";
379− name = "kjs-5.71.0.tar.xz";
385+ url = "${mirror}/stable/frameworks/5.73/portingAids/kjs-5.73.0.tar.xz";
386+ sha256 = "97b52557212a33d59a4b3a8c34ea8a94cd5f840fb0798e770164d3cb1e755be5";
387+ name = "kjs-5.73.0.tar.xz";
380388 };
381389 };
382390 kjsembed = {
383− version = "5.71.0";
391+ version = "5.73.0";
384392 src = fetchurl {
385− url = "${mirror}/stable/frameworks/5.71/portingAids/kjsembed-5.71.0.tar.xz";
386− sha256 = "9352a31b5f735d71d6db4b09825ca01adb337e37f2b0cfce48c679e932238486";
387− name = "kjsembed-5.71.0.tar.xz";
393+ url = "${mirror}/stable/frameworks/5.73/portingAids/kjsembed-5.73.0.tar.xz";
394+ sha256 = "cc9896930c01a6bdbfaddada9516380c9a54e5d719836f1788d8e3a74108e1d3";
395+ name = "kjsembed-5.73.0.tar.xz";
388396 };
389397 };
390398 kmediaplayer = {
391− version = "5.71.0";
399+ version = "5.73.0";
392400 src = fetchurl {
393− url = "${mirror}/stable/frameworks/5.71/portingAids/kmediaplayer-5.71.0.tar.xz";
394− sha256 = "72492a6c877dded4f2333f140c025fdc4a271a68695c635c0dbc09b08d832eca";
395− name = "kmediaplayer-5.71.0.tar.xz";
401+ url = "${mirror}/stable/frameworks/5.73/portingAids/kmediaplayer-5.73.0.tar.xz";
402+ sha256 = "69aa3bbedfc8b9a0dd9f4ac260cded9d7b5894477bf4b5b09065d0aae8e44ab2";
403+ name = "kmediaplayer-5.73.0.tar.xz";
396404 };
397405 };
398406 knewstuff = {
399− version = "5.71.0";
407+ version = "5.73.0";
400408 src = fetchurl {
401− url = "${mirror}/stable/frameworks/5.71/knewstuff-5.71.0.tar.xz";
402− sha256 = "aba867855d69641f73db30405e787fc9ea22e3386a45be9626ba84cbe208f855";
403− name = "knewstuff-5.71.0.tar.xz";
409+ url = "${mirror}/stable/frameworks/5.73/knewstuff-5.73.0.tar.xz";
410+ sha256 = "7669e62973f7e228975a07f15bb1c7f716edd81ce82d5f578a80b1f501abda1e";
411+ name = "knewstuff-5.73.0.tar.xz";
404412 };
405413 };
406414 knotifications = {
407− version = "5.71.0";
415+ version = "5.73.0";
408416 src = fetchurl {
409− url = "${mirror}/stable/frameworks/5.71/knotifications-5.71.0.tar.xz";
410− sha256 = "b900146340621d54f6113600e85d287b28225d82515affb8690704433e5d0440";
411− name = "knotifications-5.71.0.tar.xz";
417+ url = "${mirror}/stable/frameworks/5.73/knotifications-5.73.0.tar.xz";
418+ sha256 = "c8e9f36716db33baca93a0386d3bb6426408eee3843eb5854bdd8ad7579f372c";
419+ name = "knotifications-5.73.0.tar.xz";
412420 };
413421 };
414422 knotifyconfig = {
415− version = "5.71.0";
423+ version = "5.73.0";
416424 src = fetchurl {
417− url = "${mirror}/stable/frameworks/5.71/knotifyconfig-5.71.0.tar.xz";
418− sha256 = "226b7f956f7013027621c4018b4376b76129ea4195df67fc7df4435c54baf50e";
419− name = "knotifyconfig-5.71.0.tar.xz";
425+ url = "${mirror}/stable/frameworks/5.73/knotifyconfig-5.73.0.tar.xz";
426+ sha256 = "641a167a58856e99036d44b3e7472b44cdfbbf68e5d75b9af988d0b71dc10af4";
427+ name = "knotifyconfig-5.73.0.tar.xz";
420428 };
421429 };
422430 kpackage = {
423− version = "5.71.0";
431+ version = "5.73.0";
424432 src = fetchurl {
425− url = "${mirror}/stable/frameworks/5.71/kpackage-5.71.0.tar.xz";
426− sha256 = "c4b924e7c506cb75bdaaf68bd881e79a73999bd6436f29157f56c76f32b48cba";
427− name = "kpackage-5.71.0.tar.xz";
433+ url = "${mirror}/stable/frameworks/5.73/kpackage-5.73.0.tar.xz";
434+ sha256 = "480b1e11733fe272d1a5680afea39bcc940f01bd3d1267be0981e3c92e098c4f";
435+ name = "kpackage-5.73.0.tar.xz";
428436 };
429437 };
430438 kparts = {
431− version = "5.71.0";
439+ version = "5.73.0";
432440 src = fetchurl {
433− url = "${mirror}/stable/frameworks/5.71/kparts-5.71.0.tar.xz";
434− sha256 = "d038f97dfdccdd85dbac09c0f64cf852191ec2e535fd7928740e03d4ffe63b90";
435− name = "kparts-5.71.0.tar.xz";
441+ url = "${mirror}/stable/frameworks/5.73/kparts-5.73.0.tar.xz";
442+ sha256 = "5546d2a474c80a601ba013642775682b087d086bd26d0b0d025b68d680c98bf2";
443+ name = "kparts-5.73.0.tar.xz";
436444 };
437445 };
438446 kpeople = {
439− version = "5.71.0";
447+ version = "5.73.0";
440448 src = fetchurl {
441− url = "${mirror}/stable/frameworks/5.71/kpeople-5.71.0.tar.xz";
442− sha256 = "d63d5f5cbbedc2e4ef85fa8c2ff4adcd5cb9e05d1d1ee0e7b2c2d151193f5403";
443− name = "kpeople-5.71.0.tar.xz";
449+ url = "${mirror}/stable/frameworks/5.73/kpeople-5.73.0.tar.xz";
450+ sha256 = "9e0d3119c168f7843251c808cc149de15c1fd692062f431972023fdaa84d21c4";
451+ name = "kpeople-5.73.0.tar.xz";
444452 };
445453 };
446454 kplotting = {
447− version = "5.71.0";
455+ version = "5.73.0";
448456 src = fetchurl {
449− url = "${mirror}/stable/frameworks/5.71/kplotting-5.71.0.tar.xz";
450− sha256 = "84bacfbd86105e454f3d97f4ac4062e2f992556fca66d2c73806d1d12095bec1";
451− name = "kplotting-5.71.0.tar.xz";
457+ url = "${mirror}/stable/frameworks/5.73/kplotting-5.73.0.tar.xz";
458+ sha256 = "b5055ed9a3149c059623d88875816e9fac8d6d25d29fdfd48e0d8a16dfe01b14";
459+ name = "kplotting-5.73.0.tar.xz";
452460 };
453461 };
454462 kpty = {
455− version = "5.71.0";
463+ version = "5.73.0";
456464 src = fetchurl {
457− url = "${mirror}/stable/frameworks/5.71/kpty-5.71.0.tar.xz";
458− sha256 = "7629d35ff783aff8fe801db30eb146efe50620f7500c4f7f1bf7d2619568c6b9";
459− name = "kpty-5.71.0.tar.xz";
465+ url = "${mirror}/stable/frameworks/5.73/kpty-5.73.0.tar.xz";
466+ sha256 = "d3bf99062589dbd1dbe302c8ed2528845f245e7f0f17ca865cdd100f7589ce9c";
467+ name = "kpty-5.73.0.tar.xz";
460468 };
461469 };
462470 kquickcharts = {
463− version = "5.71.0";
471+ version = "5.73.0";
464472 src = fetchurl {
465− url = "${mirror}/stable/frameworks/5.71/kquickcharts-5.71.0.tar.xz";
466− sha256 = "a1befe13903676a9779030b02b91da9889540e689e1f6a0afd54ff484109642a";
467− name = "kquickcharts-5.71.0.tar.xz";
473+ url = "${mirror}/stable/frameworks/5.73/kquickcharts-5.73.0.tar.xz";
474+ sha256 = "e37e13a5d907d872679eab38ba8e983b2fb98a11e07a3c15d32cfaad09075cfe";
475+ name = "kquickcharts-5.73.0.tar.xz";
468476 };
469477 };
470478 kross = {
471− version = "5.71.0";
479+ version = "5.73.0";
472480 src = fetchurl {
473− url = "${mirror}/stable/frameworks/5.71/portingAids/kross-5.71.0.tar.xz";
474− sha256 = "ac42ed4ec39ddaea0a4668803271f6f5de513fcdd1243d02b296544ab601bb1c";
475− name = "kross-5.71.0.tar.xz";
481+ url = "${mirror}/stable/frameworks/5.73/portingAids/kross-5.73.0.tar.xz";
482+ sha256 = "aa27b434da981f64c40985a61ee041417667844c6077c9fb52456635be67546e";
483+ name = "kross-5.73.0.tar.xz";
476484 };
477485 };
478486 krunner = {
479− version = "5.71.0";
487+ version = "5.73.0";
480488 src = fetchurl {
481− url = "${mirror}/stable/frameworks/5.71/krunner-5.71.0.tar.xz";
482− sha256 = "fb3ce4c587a1b114550487b5716f0aba53b775018b6eef2ae48b8d6fdda40952";
483− name = "krunner-5.71.0.tar.xz";
489+ url = "${mirror}/stable/frameworks/5.73/krunner-5.73.0.tar.xz";
490+ sha256 = "b4e8427083b6546327eeb36b05a7e438e58f922d4cc5ae0c24cd8241924e9e09";
491+ name = "krunner-5.73.0.tar.xz";
484492 };
485493 };
486494 kservice = {
487− version = "5.71.0";
495+ version = "5.73.0";
488496 src = fetchurl {
489− url = "${mirror}/stable/frameworks/5.71/kservice-5.71.0.tar.xz";
490− sha256 = "6b7f4784cb514ec966f3cb01d26aa2dbdfd2425919efa57a4efa6117fcafc9ce";
491− name = "kservice-5.71.0.tar.xz";
497+ url = "${mirror}/stable/frameworks/5.73/kservice-5.73.0.tar.xz";
498+ sha256 = "a64bf7543870240f0d8f8c2bcf43759d98962ba94a4ed34bd23232df25bb408b";
499+ name = "kservice-5.73.0.tar.xz";
492500 };
493501 };
494502 ktexteditor = {
495− version = "5.71.0";
503+ version = "5.73.0";
496504 src = fetchurl {
497− url = "${mirror}/stable/frameworks/5.71/ktexteditor-5.71.0.tar.xz";
498− sha256 = "6e50b6669b288f8e624cba11bca53b78748faf6cb978628f02664038cfa294da";
499− name = "ktexteditor-5.71.0.tar.xz";
505+ url = "${mirror}/stable/frameworks/5.73/ktexteditor-5.73.0.tar.xz";
506+ sha256 = "032b3ac31aa099ed67471f78401d13cf318646b0b9b5e20bb94796ac3ed6cf18";
507+ name = "ktexteditor-5.73.0.tar.xz";
500508 };
501509 };
502510 ktextwidgets = {
503− version = "5.71.0";
511+ version = "5.73.0";
504512 src = fetchurl {
505− url = "${mirror}/stable/frameworks/5.71/ktextwidgets-5.71.0.tar.xz";
506− sha256 = "0a7fae03d8b59ec8a4f7c49a228536ea4121bd3d8f19fb1ff9831ada428509f4";
507− name = "ktextwidgets-5.71.0.tar.xz";
513+ url = "${mirror}/stable/frameworks/5.73/ktextwidgets-5.73.0.tar.xz";
514+ sha256 = "2a8b086fce8136b5b4af4a28b417343fb66148c1961e5d65bf40ccae2d4386e5";
515+ name = "ktextwidgets-5.73.0.tar.xz";
508516 };
509517 };
510518 kunitconversion = {
511− version = "5.71.0";
519+ version = "5.73.0";
512520 src = fetchurl {
513− url = "${mirror}/stable/frameworks/5.71/kunitconversion-5.71.0.tar.xz";
514− sha256 = "65bfba8e88e2cf6de40e06ce24fe5f48948cc92f16ce78eb8538de532dcf36cb";
515− name = "kunitconversion-5.71.0.tar.xz";
521+ url = "${mirror}/stable/frameworks/5.73/kunitconversion-5.73.0.tar.xz";
522+ sha256 = "97d008e8bdb2d1f89d2093294a8be0b13b0e0160658fa7d3de6c99a5fd5e2935";
523+ name = "kunitconversion-5.73.0.tar.xz";
516524 };
517525 };
518526 kwallet = {
519− version = "5.71.0";
527+ version = "5.73.0";
520528 src = fetchurl {
521− url = "${mirror}/stable/frameworks/5.71/kwallet-5.71.0.tar.xz";
522− sha256 = "d53b5bc4bbe054101b012d63672efc30af6a5aea58f467037cab4735b6ace9b5";
523− name = "kwallet-5.71.0.tar.xz";
529+ url = "${mirror}/stable/frameworks/5.73/kwallet-5.73.0.tar.xz";
530+ sha256 = "4a9c8a538054fc51b30679d5180d09bb6d12a833f595a8d6875b6d4c29074de1";
531+ name = "kwallet-5.73.0.tar.xz";
524532 };
525533 };
526534 kwayland = {
527− version = "5.71.0";
535+ version = "5.73.0";
528536 src = fetchurl {
529− url = "${mirror}/stable/frameworks/5.71/kwayland-5.71.0.tar.xz";
530− sha256 = "369ba54b485214687e719bc9216e3bb50849df3af9a3ec0e95cf5d5687c847c2";
531− name = "kwayland-5.71.0.tar.xz";
537+ url = "${mirror}/stable/frameworks/5.73/kwayland-5.73.0.tar.xz";
538+ sha256 = "ee34a490a7bbc5e83eb36a6ac70492a76cb054d3077d0a8db216fd8b07f27bfe";
539+ name = "kwayland-5.73.0.tar.xz";
532540 };
533541 };
534542 kwidgetsaddons = {
535− version = "5.71.0";
543+ version = "5.73.0";
536544 src = fetchurl {
537− url = "${mirror}/stable/frameworks/5.71/kwidgetsaddons-5.71.0.tar.xz";
538− sha256 = "897077995bcf4125d0f90d2964500e718d2a3fd5f117e1b7906177ad13a5082e";
539− name = "kwidgetsaddons-5.71.0.tar.xz";
545+ url = "${mirror}/stable/frameworks/5.73/kwidgetsaddons-5.73.0.tar.xz";
546+ sha256 = "0722d853747b85ca7d46f278dc99c28b872185406b97b811523c1aa9b5e75eb6";
547+ name = "kwidgetsaddons-5.73.0.tar.xz";
540548 };
541549 };
542550 kwindowsystem = {
543− version = "5.71.0";
551+ version = "5.73.0";
544552 src = fetchurl {
545− url = "${mirror}/stable/frameworks/5.71/kwindowsystem-5.71.0.tar.xz";
546− sha256 = "a3613aea6fa73ebc53f28c011a6bca31ed157e29f85df767e617c44399360cda";
547− name = "kwindowsystem-5.71.0.tar.xz";
553+ url = "${mirror}/stable/frameworks/5.73/kwindowsystem-5.73.0.tar.xz";
554+ sha256 = "0e27ad2cd5e4699efdc02daec181b4ffb0b9e31ec4c96f0f67899804aebbcde8";
555+ name = "kwindowsystem-5.73.0.tar.xz";
548556 };
549557 };
550558 kxmlgui = {
551− version = "5.71.0";
559+ version = "5.73.0";
552560 src = fetchurl {
553− url = "${mirror}/stable/frameworks/5.71/kxmlgui-5.71.0.tar.xz";
554− sha256 = "2e4b2563daeedf35a54d38002c05d7c39017a36c0b8a19c236ea87324eebf7cc";
555− name = "kxmlgui-5.71.0.tar.xz";
561+ url = "${mirror}/stable/frameworks/5.73/kxmlgui-5.73.0.tar.xz";
562+ sha256 = "093131f5f51497ec61e99bd3e19de9421643d3f6ddf0099a823a3d624596ebcb";
563+ name = "kxmlgui-5.73.0.tar.xz";
556564 };
557565 };
558566 kxmlrpcclient = {
559− version = "5.71.0";
567+ version = "5.73.0";
560568 src = fetchurl {
561− url = "${mirror}/stable/frameworks/5.71/portingAids/kxmlrpcclient-5.71.0.tar.xz";
562− sha256 = "5947de8ec9cd57d8ccf6ea8a764066733d2633d93e11f94ecfb47a75e1e7a91f";
563− name = "kxmlrpcclient-5.71.0.tar.xz";
569+ url = "${mirror}/stable/frameworks/5.73/portingAids/kxmlrpcclient-5.73.0.tar.xz";
570+ sha256 = "c0d089c389f59bb7cb6fba629f3e122e70fda19a69f419ff8bd1d9fcee95a047";
571+ name = "kxmlrpcclient-5.73.0.tar.xz";
564572 };
565573 };
566574 modemmanager-qt = {
567− version = "5.71.0";
575+ version = "5.73.0";
568576 src = fetchurl {
569− url = "${mirror}/stable/frameworks/5.71/modemmanager-qt-5.71.0.tar.xz";
570− sha256 = "b2e5e2a8b8fe2e9fb22bb7dc77177a975727991c6c0ee19d5a9b0a2ab513531d";
571− name = "modemmanager-qt-5.71.0.tar.xz";
577+ url = "${mirror}/stable/frameworks/5.73/modemmanager-qt-5.73.0.tar.xz";
578+ sha256 = "87f3864b2b53b4e309bca1feefa613455f60e4699969a569694f6813447e1fcd";
579+ name = "modemmanager-qt-5.73.0.tar.xz";
572580 };
573581 };
574582 networkmanager-qt = {
575− version = "5.71.0";
583+ version = "5.73.0";
576584 src = fetchurl {
577− url = "${mirror}/stable/frameworks/5.71/networkmanager-qt-5.71.0.tar.xz";
578− sha256 = "7fe6a0c9d9b25c434c6a200de19f722d942165252cc9161f1d8fcddf64147034";
579− name = "networkmanager-qt-5.71.0.tar.xz";
585+ url = "${mirror}/stable/frameworks/5.73/networkmanager-qt-5.73.0.tar.xz";
586+ sha256 = "b909feafc0a9a18b59744e0f1973c5357f67bbd50b59afa82cf55955dae7d41f";
587+ name = "networkmanager-qt-5.73.0.tar.xz";
580588 };
581589 };
582590 oxygen-icons5 = {
583− version = "5.71.0";
591+ version = "5.73.0";
584592 src = fetchurl {
585− url = "${mirror}/stable/frameworks/5.71/oxygen-icons5-5.71.0.tar.xz";
586− sha256 = "a75a82164e2af5b6f269a386762ff2abba052dbfca18c9aed8d738c9cd958b04";
587− name = "oxygen-icons5-5.71.0.tar.xz";
593+ url = "${mirror}/stable/frameworks/5.73/oxygen-icons5-5.73.0.tar.xz";
594+ sha256 = "662cd9644e393c69dccb538cdd4280253be812f80704c992ada228c0c32c2bbc";
595+ name = "oxygen-icons5-5.73.0.tar.xz";
588596 };
589597 };
590598 plasma-framework = {
591− version = "5.71.0";
599+ version = "5.73.0";
592600 src = fetchurl {
593− url = "${mirror}/stable/frameworks/5.71/plasma-framework-5.71.0.tar.xz";
594− sha256 = "a54c8603ca261c89609a3009536a9217ce3415a7fd63527ed36f266399613067";
595− name = "plasma-framework-5.71.0.tar.xz";
601+ url = "${mirror}/stable/frameworks/5.73/plasma-framework-5.73.0.tar.xz";
602+ sha256 = "e5415143f0a08cd75cf758b0692021d2a2febdcb1364e2aa1e5c8fbeee148c93";
603+ name = "plasma-framework-5.73.0.tar.xz";
596604 };
597605 };
598606 prison = {
599− version = "5.71.0";
607+ version = "5.73.0";
600608 src = fetchurl {
601− url = "${mirror}/stable/frameworks/5.71/prison-5.71.0.tar.xz";
602− sha256 = "44762ee7a3993bd7527f0b33ee09bacc1d5a518641b79932e5490a511ac7e87f";
603− name = "prison-5.71.0.tar.xz";
609+ url = "${mirror}/stable/frameworks/5.73/prison-5.73.0.tar.xz";
610+ sha256 = "a2b135ffdf1af240366f3fb077c02c02094fb1706c6e84fab5186802544a5b87";
611+ name = "prison-5.73.0.tar.xz";
604612 };
605613 };
606614 purpose = {
607− version = "5.71.0";
615+ version = "5.73.0";
608616 src = fetchurl {
609− url = "${mirror}/stable/frameworks/5.71/purpose-5.71.0.tar.xz";
610− sha256 = "de0531a84f671a15fe4a6348220e922a3230178554e26baf392a1f295044e4be";
611− name = "purpose-5.71.0.tar.xz";
617+ url = "${mirror}/stable/frameworks/5.73/purpose-5.73.0.tar.xz";
618+ sha256 = "6f4d440cb708b636430e3206f879ca5c2e6cdfcf62f92ce173d43e291fbeed32";
619+ name = "purpose-5.73.0.tar.xz";
612620 };
613621 };
614622 qqc2-desktop-style = {
615− version = "5.71.0";
623+ version = "5.73.0";
616624 src = fetchurl {
617− url = "${mirror}/stable/frameworks/5.71/qqc2-desktop-style-5.71.0.tar.xz";
618− sha256 = "b968ce6fc7c1d111aa2c63584dddc0f74e9066a0b4ea26d1194e46e2f7b38700";
619− name = "qqc2-desktop-style-5.71.0.tar.xz";
625+ url = "${mirror}/stable/frameworks/5.73/qqc2-desktop-style-5.73.0.tar.xz";
626+ sha256 = "290b3637be0c3740e92cdbb1421aef8bf1a8df36218f9d7d120e8422d14c3fdd";
627+ name = "qqc2-desktop-style-5.73.0.tar.xz";
620628 };
621629 };
622630 solid = {
623− version = "5.71.0";
631+ version = "5.73.0";
624632 src = fetchurl {
625− url = "${mirror}/stable/frameworks/5.71/solid-5.71.0.tar.xz";
626− sha256 = "72a7bdd8306ec4cda5f504819e0ff3f8baca6530fa04e33f10b6b89dc010505b";
627− name = "solid-5.71.0.tar.xz";
633+ url = "${mirror}/stable/frameworks/5.73/solid-5.73.0.tar.xz";
634+ sha256 = "7366b64438a1ca7a42126e67d352e371227b46418ce961321d358f2eb90c0933";
635+ name = "solid-5.73.0.tar.xz";
628636 };
629637 };
630638 sonnet = {
631− version = "5.71.0";
639+ version = "5.73.0";
632640 src = fetchurl {
633− url = "${mirror}/stable/frameworks/5.71/sonnet-5.71.0.tar.xz";
634− sha256 = "cd663b3e1b23aef58d85f72dfdc92aaae33f358b22ad1fc36fde6c66eb7f0e72";
635− name = "sonnet-5.71.0.tar.xz";
641+ url = "${mirror}/stable/frameworks/5.73/sonnet-5.73.0.tar.xz";
642+ sha256 = "009f76fc4317e407d30c4e162a807d620a95217f5db271a14b1f9fc4339d232c";
643+ name = "sonnet-5.73.0.tar.xz";
636644 };
637645 };
638646 syndication = {
639− version = "5.71.0";
647+ version = "5.73.0";
640648 src = fetchurl {
641− url = "${mirror}/stable/frameworks/5.71/syndication-5.71.0.tar.xz";
642− sha256 = "c515fd48d3736b55c8e7990c72471bfddd55363c4bcb049713be741eaa7b07e0";
643− name = "syndication-5.71.0.tar.xz";
649+ url = "${mirror}/stable/frameworks/5.73/syndication-5.73.0.tar.xz";
650+ sha256 = "2a65972ef5183edb0bd8b3804dae129ae8f4a4469287711e77fc636e90b8a954";
651+ name = "syndication-5.73.0.tar.xz";
644652 };
645653 };
646654 syntax-highlighting = {
647− version = "5.71.0";
655+ version = "5.73.0";
648656 src = fetchurl {
649− url = "${mirror}/stable/frameworks/5.71/syntax-highlighting-5.71.0.tar.xz";
650− sha256 = "845ae0c7b8523c23c3ad704a6c551260a358d96b0094a5c2b062879e58173f84";
651− name = "syntax-highlighting-5.71.0.tar.xz";
657+ url = "${mirror}/stable/frameworks/5.73/syntax-highlighting-5.73.0.tar.xz";
658+ sha256 = "51ed4a68ba42d0dc88d91a0c11ac55ada199b7e93b0ff74b80b5e9304fe8901b";
659+ name = "syntax-highlighting-5.73.0.tar.xz";
652660 };
653661 };
654662 threadweaver = {
655− version = "5.71.0";
663+ version = "5.73.0";
656664 src = fetchurl {
657− url = "${mirror}/stable/frameworks/5.71/threadweaver-5.71.0.tar.xz";
658− sha256 = "039e73d70f38af38a63235cfb554111ee0d58a6ac168bff0745f0d029c5c528d";
659− name = "threadweaver-5.71.0.tar.xz";
665+ url = "${mirror}/stable/frameworks/5.73/threadweaver-5.73.0.tar.xz";
666+ sha256 = "7e1152a1cf73f841c3be5d73cb0d5e6e29ec700be859c94275c5c00e49488d38";
667+ name = "threadweaver-5.73.0.tar.xz";
660668 };
661669 };
662670}
pkgs/development/libraries/kpmcore/default.nix+6−7
@@ -3,15 +3,12 @@
33, libatasmart, parted
44, utillinux }:
55
6−let
6+stdenv.mkDerivation rec {
77 pname = "kpmcore";
8−
9−in stdenv.mkDerivation rec {
10− name = "${pname}-${version}";
118 version = "3.3.0";
129
1310 src = fetchurl {
14− url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
11+ url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz";
1512 sha256 = "0s6v0jfrhjg31ri5p6h9n4w29jvasf5dj954j3vfpzl91lygmmmq";
1613 };
1714
@@ -24,12 +21,14 @@ in stdenv.mkDerivation rec {
2421
2522 utillinux # needs blkid (note that this is not provided by utillinux-compat)
2623 ];
24+
2725 nativeBuildInputs = [ extra-cmake-modules ];
26+
2827 enableParallelBuilding = true;
2928
3029 meta = with stdenv.lib; {
3130 maintainers = with lib.maintainers; [ peterhoeg ];
32− # The build requires at least Qt 5.12:
33− broken = lib.versionOlder qtbase.version "5.12.0";
31+ # The build requires at least Qt 5.14:
32+ broken = lib.versionOlder qtbase.version "5.14";
3433 };
3534}
pkgs/development/libraries/libpipeline/default.nix+2−2
@@ -1,11 +1,11 @@
11{ stdenv, fetchurl }:
22
33stdenv.mkDerivation rec {
4− name = "libpipeline-1.5.1";
4+ name = "libpipeline-1.5.3";
55
66 src = fetchurl {
77 url = "mirror://savannah/libpipeline/${name}.tar.gz";
8− sha256 = "0bwh5xz5f2czwb7f564jz1mp4znm8pldnvf65fs0hpw4gmmp0cyn";
8+ sha256 = "1c5dl017xil2ssb6a5vg927bnsbc9vymfgi9ahvqbb8gypx0igsx";
99 };
1010
1111 patches = stdenv.lib.optionals stdenv.isDarwin [ ./fix-on-osx.patch ];
pkgs/development/libraries/libseccomp/default.nix+10−9
@@ -1,17 +1,17 @@
1−{ stdenv, fetchurl, getopt, makeWrapper, utillinux }:
1+{ stdenv, fetchurl, getopt, makeWrapper, utillinux, gperf }:
22
33stdenv.mkDerivation rec {
44 pname = "libseccomp";
5− version = "2.4.3";
5+ version = "2.5.0";
66
77 src = fetchurl {
88 url = "https://github.com/seccomp/libseccomp/releases/download/v${version}/libseccomp-${version}.tar.gz";
9− sha256 = "07crwxqzvl5k2b90a47ii9wgvi09s9hsy5b5jddw9ylp351d25fg";
9+ sha256 = "1wql62cg8f95cwpy057cl764nni9g4sdn5lqj68x22kjs8w71yhz";
1010 };
1111
1212 outputs = [ "out" "lib" "dev" "man" ];
1313
14− buildInputs = [ getopt makeWrapper ];
14+ buildInputs = [ getopt makeWrapper gperf ];
1515
1616 patchPhase = ''
1717 patchShebangs .
@@ -25,13 +25,14 @@ stdenv.mkDerivation rec {
2525
2626 meta = with stdenv.lib; {
2727 description = "High level library for the Linux Kernel seccomp filter";
28− homepage = "https://github.com/seccomp/libseccomp";
29− license = licenses.lgpl21;
30− platforms = platforms.linux;
28+ homepage = "https://github.com/seccomp/libseccomp";
29+ license = licenses.lgpl21;
30+ platforms = platforms.linux;
3131 badPlatforms = [
3232 "alpha-linux"
33− "riscv64-linux" "riscv32-linux"
34− "sparc-linux" "sparc64-linux"
33+ "riscv32-linux"
34+ "sparc-linux"
35+ "sparc64-linux"
3536 ];
3637 maintainers = with maintainers; [ thoughtpolice ];
3738 };
pkgs/development/libraries/libthreadar/default.nixnew file+35
@@ -0,0 +1,35 @@
1+{ stdenv, fetchurl }:
2+
3+with stdenv.lib;
4+
5+stdenv.mkDerivation rec {
6+ version = "1.3.0";
7+ pname = "libthreadar";
8+
9+ src = fetchurl {
10+ url = "mirror://sourceforge/libthreadar/${pname}-${version}.tar.gz";
11+ sha256 = "0g2wxykawlsj6ma9slbbk0bxynqvmkwhaln2fiwc21x7nhjvpn9z";
12+ };
13+
14+ outputs = [ "out" "dev" ];
15+
16+ configureFlags = [
17+ "--disable-build-html"
18+ ];
19+
20+ postInstall = ''
21+ # Disable html help
22+ rm -r "$out"/share
23+ '';
24+
25+ meta = {
26+ homepage = "http://libthreadar.sourceforge.net/";
27+ description = ''
28+ Libthreadar is a C++ library providing a small set of C++ classes to manipulate
29+ threads in a very simple and efficient way from your C++ code.
30+ '';
31+ maintainers = with maintainers; [ izorkin ];
32+ license = licenses.lgpl3;
33+ platforms = platforms.unix;
34+ };
35+}
pkgs/development/libraries/mimalloc/default.nix+2−2
@@ -7,13 +7,13 @@ let
77in
88stdenv.mkDerivation rec {
99 pname = "mimalloc";
10− version = "1.6.3";
10+ version = "1.6.4";
1111
1212 src = fetchFromGitHub {
1313 owner = "microsoft";
1414 repo = pname;
1515 rev = "v${version}";
16− sha256 = "0hk30adrm0s1g5flfaqfr3lc72y3hlmhqnyrqd7p0y91rsaw86b9";
16+ sha256 = "0b6ymi2a9is2q6n49dvlnjxknikj0rfff5ygbc4n7894h5mllvvr";
1717 };
1818
1919 nativeBuildInputs = [ cmake ninja ];
pkgs/development/libraries/nspr/default.nix+2−2
@@ -2,7 +2,7 @@
22, CoreServices ? null
33, buildPackages }:
44
5−let version = "4.27"; in
5+let version = "4.28"; in
66
77stdenv.mkDerivation {
88 pname = "nspr";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
1010
1111 src = fetchurl {
1212 url = "mirror://mozilla/nspr/releases/v${version}/src/nspr-${version}.tar.gz";
13− sha256 = "16z82qc1l4cqn66p59ai0dy9ycllywn4jlxhip1a605bns952jbd";
13+ sha256 = "0miv8ggil1xdywxw2sxaa05kqw7ahjgaimf7zjc6y2x8367grpk3";
1414 };
1515
1616 patches = [
pkgs/development/libraries/nss/default.nix+2−2
@@ -5,7 +5,7 @@ let
55 url = "http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz";
66 sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw";
77 };
8− version = "3.55";
8+ version = "3.56";
99 underscoreVersion = builtins.replaceStrings ["."] ["_"] version;
1010
1111in stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
1414
1515 src = fetchurl {
1616 url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${pname}-${version}.tar.gz";
17− sha256 = "0100hm7n1xrp144xy665z46s0wf1jpkqkncc6bk2w22snhyjwsgw";
17+ sha256 = "174f0ki2f8szkgv02jlsg2ci332sl9dabr2vcwnyjp1vxplf0xgq";
1818 };
1919
2020 depsBuildBuild = [ buildPackages.stdenv.cc ];
pkgs/development/libraries/plasma-wayland-protocols/default.nixnew file+24
@@ -0,0 +1,24 @@
1+{ mkDerivation, fetchurl, lib
2+, extra-cmake-modules
3+, qtbase
4+}:
5+
6+mkDerivation rec {
7+ pname = "plasma-wayland-protocols";
8+ version = "1.1.1";
9+
10+ src = fetchurl {
11+ url = "mirror://kde/stable/${pname}/${version}/${pname}-${version}.tar.xz";
12+ sha256 = "sha256-xUkzg9EVFxw0NeqaIbOWaGBjKoRFRP+sj1SJBDalHTg=";
13+ };
14+
15+ nativeBuildInputs = [ extra-cmake-modules ];
16+
17+ buildInputs = [ qtbase ];
18+
19+ meta = {
20+ description = "Plasma Wayland Protocols";
21+ license = lib.licenses.lgpl21Plus;
22+ platforms = qtbase.meta.platforms;
23+ };
24+}
pkgs/development/libraries/qca-qt5/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "qca-qt5";
5− version = "2.2.1";
5+ version = "2.3.1";
66
77 src = fetchurl {
88 url = "http://download.kde.org/stable/qca/${version}/qca-${version}.tar.xz";
9− sha256 = "00kv1vsrc8fp556hm8s6yw3240vx3l4067q6vfxrb3gdwgcd45np";
9+ sha256 = "sha256-wThREJq+/EYjNwmJ+uOnRb9rGss8KhOolYU5gj6XTks=";
1010 };
1111
1212 buildInputs = [ openssl qtbase ];
pkgs/development/libraries/qt-5/modules/qtbase.nix+2−2
@@ -8,7 +8,7 @@
88 darwin, libiconv,
99
1010 dbus, fontconfig, freetype, glib, harfbuzz, icu, libX11, libXcomposite,
11− libXcursor, libXext, libXi, libXrender, libinput, libjpeg, libpng, libtiff,
11+ libXcursor, libXext, libXi, libXrender, libinput, libjpeg, libpng,
1212 libxcb, libxkbcommon, libxml2, libxslt, openssl, pcre16, pcre2, sqlite, udev,
1313 xcbutil, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, xcbutilwm,
1414 zlib,
@@ -48,7 +48,7 @@ stdenv.mkDerivation {
4848 harfbuzz icu
4949
5050 # Image formats
51− libjpeg libpng libtiff
51+ libjpeg libpng
5252 (if compareVersion "5.9.0" < 0 then pcre16 else pcre2)
5353 ]
5454 ++ (
pkgs/development/libraries/qt-5/modules/qtimageformats.nix+2−1
@@ -1,6 +1,7 @@
1−{ qtModule, qtbase }:
1+{ qtModule, qtbase, libtiff }:
22
33qtModule {
44 name = "qtimageformats";
55 qtInputs = [ qtbase ];
6+ propagatedBuildInputs = [ libtiff ];
67}
pkgs/development/libraries/qt-5/modules/qtwebengine.nix+1−1
@@ -79,7 +79,7 @@ qtModule {
7979 ''
8080 # Patch library paths in Chromium sources
8181 + optionalString (!stdenv.isDarwin) ''
82− sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${systemd.lib}/lib/\1!' \
82+ sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${lib.getLib systemd}/lib/\1!' \
8383 src/3rdparty/chromium/device/udev_linux/udev?_loader.cc
8484
8585 sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \
pkgs/development/libraries/x265/default.nix+2
@@ -84,9 +84,11 @@ stdenv.mkDerivation rec {
8484 "-DENABLE_SHARED=ON"
8585 "-DHIGH_BIT_DEPTH=OFF"
8686 "-DENABLE_HDR10_PLUS=OFF"
87+ ] ++ stdenv.lib.optionals is64bit [
8788 "-DEXTRA_LIB=${libx265-10}/lib/libx265.a;${libx265-12}/lib/libx265.a"
8889 "-DLINKED_10BIT=ON"
8990 "-DLINKED_12BIT=ON"
91+ ] ++ [
9092 (mkFlag cliSupport "ENABLE_CLI")
9193 ] ++ cmakeFlagsAll;
9294
pkgs/development/lua-modules/generated-packages.nix+68
@@ -691,6 +691,74 @@ lua-messagepack = buildLuarocksPackage {
691691 license.fullName = "MIT/X11";
692692 };
693693};
694+lua-resty-http = buildLuarocksPackage {
695+ pname = "lua-resty-http";
696+ version = "0.15-0";
697+
698+ src = fetchurl {
699+ url = mirror://luarocks/lua-resty-http-0.15-0.src.rock;
700+ sha256 = "1121abcz9y8kis2wdg7i1m75y8lplk3k49v02y804bywbl2km4fz";
701+ };
702+ disabled = (luaOlder "5.1");
703+ propagatedBuildInputs = [ lua ];
704+
705+ meta = with stdenv.lib; {
706+ homepage = "https://github.com/ledgetech/lua-resty-http";
707+ description = "Lua HTTP client cosocket driver for OpenResty / ngx_lua.";
708+ license.fullName = "2-clause BSD";
709+ };
710+};
711+lua-resty-jwt = buildLuarocksPackage {
712+ pname = "lua-resty-jwt";
713+ version = "0.2.2-0";
714+
715+ src = fetchurl {
716+ url = mirror://luarocks/lua-resty-jwt-0.2.2-0.src.rock;
717+ sha256 = "1a4wwiwcjwgr59g2940a2h0i6n1c7xjy2px5bls3x5br4shwhswa";
718+ };
719+ disabled = (luaOlder "5.1");
720+ propagatedBuildInputs = [ lua ];
721+
722+ meta = with stdenv.lib; {
723+ homepage = "https://github.com/cdbattags/lua-resty-jwt";
724+ description = "JWT for ngx_lua and LuaJIT.";
725+ license.fullName = "Apache License Version 2";
726+ };
727+};
728+lua-resty-openidc = buildLuarocksPackage {
729+ pname = "lua-resty-openidc";
730+ version = "1.7.2-1";
731+
732+ src = fetchurl {
733+ url = mirror://luarocks/lua-resty-openidc-1.7.2-1.src.rock;
734+ sha256 = "01mya69r4fncfrpqh5pn2acg18q3slds8zm976qgkjby0pzwzzw7";
735+ };
736+ disabled = (luaOlder "5.1");
737+ propagatedBuildInputs = [ lua lua-resty-http lua-resty-session lua-resty-jwt ];
738+
739+ meta = with stdenv.lib; {
740+ homepage = "https://github.com/zmartzone/lua-resty-openidc";
741+ description = "A library for NGINX implementing the OpenID Connect Relying Party (RP) and the OAuth 2.0 Resource Server (RS) functionality";
742+ license.fullName = "Apache 2.0";
743+ };
744+};
745+lua-resty-session = buildLuarocksPackage {
746+ pname = "lua-resty-session";
747+ version = "3.6-1";
748+
749+ src = fetchurl {
750+ url = mirror://luarocks/lua-resty-session-3.6-1.src.rock;
751+ sha256 = "1r5626x247d1vi5bzqfk11bl4d5c39h1iqj6mgndnwpnz43cag5i";
752+ };
753+ disabled = (luaOlder "5.1");
754+ propagatedBuildInputs = [ lua ];
755+
756+ meta = with stdenv.lib; {
757+ homepage = "https://github.com/bungle/lua-resty-session";
758+ description = "Session Library for OpenResty – Flexible and Secure";
759+ license.fullName = "BSD";
760+ };
761+};
694762lua-term = buildLuarocksPackage {
695763 pname = "lua-term";
696764 version = "0.7-1";
pkgs/development/mobile/androidenv/compose-android-packages.nix+1−1
@@ -14,7 +14,7 @@
1414, lldbVersions ? [ ]
1515, cmakeVersions ? [ ]
1616, includeNDK ? false
17−, ndkVersion ? "18.1.5063045"
17+, ndkVersion ? "21.0.6113669"
1818, useGoogleAPIs ? false
1919, useGoogleTVAddOns ? false
2020, includeExtras ? []
pkgs/development/mobile/androidenv/generated/addons.nix−128
@@ -672,70 +672,6 @@
672672 };
673673
674674
675− "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha4" = {
676− name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha4";
677− path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha4";
678− revision = "1";
679− displayName = "com.android.support.constraint:constraint-layout-solver:1.0.0-alpha4";
680− archives = {
681−
682− all = fetchurl {
683− url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha4.zip";
684− sha1 = "2aa2aceecc6ba172742d0af0b43f11d03924eeb8";
685− };
686−
687− };
688− };
689−
690−
691− "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha4" = {
692− name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha4";
693− path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha4";
694− revision = "1";
695− displayName = "com.android.support.constraint:constraint-layout-solver:1.0.0-alpha4";
696− archives = {
697−
698− all = fetchurl {
699− url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha4.zip";
700− sha1 = "2aa2aceecc6ba172742d0af0b43f11d03924eeb8";
701− };
702−
703− };
704− };
705−
706−
707− "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha4" = {
708− name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha4";
709− path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha4";
710− revision = "1";
711− displayName = "com.android.support.constraint:constraint-layout-solver:1.0.0-alpha4";
712− archives = {
713−
714− all = fetchurl {
715− url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha4.zip";
716− sha1 = "2aa2aceecc6ba172742d0af0b43f11d03924eeb8";
717− };
718−
719− };
720− };
721−
722−
723− "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha8" = {
724− name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha8";
725− path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha8";
726− revision = "1";
727− displayName = "Solver for ConstraintLayout 1.0.0-alpha8";
728− archives = {
729−
730− all = fetchurl {
731− url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha8.zip";
732− sha1 = "cd13d16a8f0198c1d6040ec8b1d0d4e5bb7feb6a";
733− };
734−
735− };
736− };
737−
738−
739675 "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha8" = {
740676 name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha8";
741677 path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha8";
@@ -896,70 +832,6 @@
896832 };
897833
898834
899− "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha4" = {
900− name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha4";
901− path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha4";
902− revision = "1";
903− displayName = "com.android.support.constraint:constraint-layout:1.0.0-alpha4";
904− archives = {
905−
906− all = fetchurl {
907− url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha4.zip";
908− sha1 = "645a9be1f0c1177301e71cd0ddccf1dd67c554fe";
909− };
910−
911− };
912− };
913−
914−
915− "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha4" = {
916− name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha4";
917− path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha4";
918− revision = "1";
919− displayName = "com.android.support.constraint:constraint-layout:1.0.0-alpha4";
920− archives = {
921−
922− all = fetchurl {
923− url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha4.zip";
924− sha1 = "645a9be1f0c1177301e71cd0ddccf1dd67c554fe";
925− };
926−
927− };
928− };
929−
930−
931− "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha4" = {
932− name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha4";
933− path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha4";
934− revision = "1";
935− displayName = "com.android.support.constraint:constraint-layout:1.0.0-alpha4";
936− archives = {
937−
938− all = fetchurl {
939− url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha4.zip";
940− sha1 = "645a9be1f0c1177301e71cd0ddccf1dd67c554fe";
941− };
942−
943− };
944− };
945−
946−
947− "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha8" = {
948− name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha8";
949− path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha8";
950− revision = "1";
951− displayName = "ConstraintLayout for Android 1.0.0-alpha8";
952− archives = {
953−
954− all = fetchurl {
955− url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha8.zip";
956− sha1 = "7912ba03b04831f918f523648f118c4ee4da7604";
957− };
958−
959− };
960− };
961−
962−
963835 "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha8" = {
964836 name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha8";
965837 path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha8";
pkgs/development/mobile/androidenv/ndk-bundle/default.nix+4−2
@@ -7,12 +7,14 @@ deployAndroidPackage {
77 inherit package os;
88 buildInputs = [ autoPatchelfHook makeWrapper pkgs.python2 ]
99 ++ lib.optional (os == "linux") [ pkgs.glibc pkgs.stdenv.cc.cc pkgs.ncurses5 pkgs.zlib pkgs.libcxx.out ];
10− patchInstructions = lib.optionalString (os == "linux") ''
10+ patchInstructions = lib.optionalString (os == "linux") (''
1111 patchShebangs .
1212
13+ '' + lib.optionalString (builtins.compareVersions (lib.getVersion package) "21" > 0) ''
1314 patch -p1 \
1415 --no-backup-if-mismatch < ${./make_standalone_toolchain.py_18.patch}
1516 wrapProgram $(pwd)/build/tools/make_standalone_toolchain.py --prefix PATH : "${runtime_paths}"
17+ '' + ''
1618
1719 # TODO: allow this stuff
1820 rm -rf docs tests
@@ -46,6 +48,6 @@ deployAndroidPackage {
4648 do
4749 ln -sf ../libexec/android-sdk/ndk-bundle/$i $out/bin/$i
4850 done
49− '';
51+ '');
5052 noAuditTmpdir = true; # Audit script gets invoked by the build/ component in the path for the make standalone script
5153}
pkgs/development/ocaml-modules/cohttp/async.nixnew file+22
@@ -0,0 +1,22 @@
1+{ stdenv, buildDunePackage, async, cohttp, conduit-async, uri, ppx_sexp_conv
2+, logs, magic-mime }:
3+
4+if !stdenv.lib.versionAtLeast cohttp.version "0.99" then
5+ cohttp
6+else if !stdenv.lib.versionAtLeast async.version "0.13" then
7+ throw "cohttp-async needs async-0.13 (hence OCaml >= 4.08)"
8+else
9+
10+ buildDunePackage {
11+ pname = "cohttp-async";
12+ useDune2 = true;
13+ inherit (cohttp) version src;
14+
15+ buildInputs = [ ppx_sexp_conv ];
16+
17+ propagatedBuildInputs = [ async cohttp conduit-async logs magic-mime uri ];
18+
19+ meta = cohttp.meta // {
20+ description = "CoHTTP implementation for the Async concurrency library";
21+ };
22+ }
pkgs/development/ocaml-modules/conduit/async.nixnew file+19
@@ -0,0 +1,19 @@
1+{ stdenv, buildDunePackage, async, async_ssl, ppx_sexp_conv, conduit }:
2+
3+if !stdenv.lib.versionAtLeast conduit.version "1.0"
4+then conduit
5+else
6+
7+buildDunePackage {
8+ pname = "conduit-async";
9+ useDune2 = true;
10+ inherit (conduit) version src;
11+
12+ buildInputs = [ ppx_sexp_conv ];
13+
14+ propagatedBuildInputs = [ async async_ssl conduit ];
15+
16+ meta = conduit.meta // {
17+ description = "A network connection establishment library for Async";
18+ };
19+}
pkgs/development/ocaml-modules/conduit/default.nix+1−1
@@ -18,7 +18,7 @@ buildDunePackage rec {
1818 propagatedBuildInputs = [ astring ipaddr ipaddr-sexp sexplib uri ];
1919
2020 meta = {
21− description = "Network connection library for TCP and SSL";
21+ description = "A network connection establishment library";
2222 license = stdenv.lib.licenses.isc;
2323 maintainers = with stdenv.lib.maintainers; [ alexfmpe vbgl ];
2424 homepage = "https://github.com/mirage/ocaml-conduit";
pkgs/development/ocaml-modules/eliom/default.nix+2−2
@@ -14,11 +14,11 @@ else
1414stdenv.mkDerivation rec
1515{
1616 pname = "eliom";
17− version = "6.12.0";
17+ version = "6.12.1";
1818
1919 src = fetchzip {
2020 url = "https://github.com/ocsigen/eliom/archive/${version}.tar.gz";
21− sha256 = "015jh72v6ch9h9czd8sn5kjz3pv6lsnvvnhdjgrplwj443dn1xp8";
21+ sha256 = "04c1sz113015gyhj3w7flw7l4bv0v50q6n04kk8dybcravzy2xgx";
2222 };
2323
2424 buildInputs = [ ocaml which findlib js_of_ocaml-ocamlbuild js_of_ocaml-ppx_deriving_json opaline
pkgs/development/ocaml-modules/janestreet/0.13.nix+10
@@ -1,5 +1,6 @@
11{ janePackage
22, ctypes
3+, dune-configurator
34, num
45, octavius
56, ppxlib
@@ -417,6 +418,15 @@ rec {
417418 propagatedBuildInputs = [ async shell ];
418419 };
419420
421+ async_ssl = janePackage {
422+ pname = "async_ssl";
423+ useDune2 = true;
424+ hash = "0z5dbiam5k7ipx9ph4r8nqv0a1ldx1ymxw3xjxgrdjda90lmwf2k";
425+ meta.description = "Async wrappers for SSL";
426+ buildInputs = [ dune-configurator ];
427+ propagatedBuildInputs = [ async ctypes openssl ];
428+ };
429+
420430 core_bench = janePackage {
421431 pname = "core_bench";
422432 hash = "1nk0i3z8rqrljbf4bc7ljp71g0a4361nh85s2ang0lgxri74zacm";
pkgs/development/ocaml-modules/mirage-crypto/default.nix+2−2
@@ -4,11 +4,11 @@ buildDunePackage rec {
44 minimumOCamlVersion = "4.08";
55
66 pname = "mirage-crypto";
7− version = "0.8.4";
7+ version = "0.8.5";
88
99 src = fetchurl {
1010 url = "https://github.com/mirage/mirage-crypto/releases/download/v${version}/mirage-crypto-v${version}.tbz";
11− sha256 = "1w09wllls4rp1abq0awffxf69dn0xciy6hsqz413ing5r151wjxr";
11+ sha256 = "0l6q0z5ghhy0djfscb2i2xg4dpmxs4xkwh16kc473cmb4hsxsmyk";
1212 };
1313
1414 useDune2 = true;
pkgs/development/ocaml-modules/mirage-stack/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildDunePackage rec {
44 pname = "mirage-stack";
5− version = "2.0.1";
5+ version = "2.1.0";
66
77 src = fetchurl {
88 url = "https://github.com/mirage/mirage-stack/releases/download/v${version}/mirage-stack-v${version}.tbz";
9− sha256 = "1xdy59bxnki1r0jwm3s8fwarhhbxr0lsqqiag5b1j41hciiqp9jq";
9+ sha256 = "1y110i4kjr03b0ji3q5h0bi3n3q8mdkfflb3fyq5rvpi5l45vvdb";
1010 };
1111
1212 propagatedBuildInputs = [ mirage-protocols ];
pkgs/development/ocaml-modules/posix/base.nixnew file+26
@@ -0,0 +1,26 @@
1+{ lib, buildDunePackage, fetchFromGitHub
2+, ctypes, integers
3+}:
4+
5+buildDunePackage rec {
6+ pname = "posix-base";
7+ version = "2.0.0";
8+
9+ src = fetchFromGitHub {
10+ owner = "savonet";
11+ repo = "ocaml-posix";
12+ rev = "v${version}";
13+ sha256 = "18px8hfqcfy2lk8105ki3hrxxigs44gs046ba0fqda6wzd0hr82b";
14+ };
15+
16+ useDune2 = true;
17+
18+ propagatedBuildInputs = [ ctypes integers ];
19+
20+ meta = {
21+ homepage = "https://www.liquidsoap.info/ocaml-posix/";
22+ description = "Base module for the posix bindings";
23+ license = lib.licenses.mit;
24+ maintainers = [ lib.maintainers.vbgl ];
25+ };
26+}
pkgs/development/ocaml-modules/posix/socket.nixnew file+16
@@ -0,0 +1,16 @@
1+{ lib, buildDunePackage, posix-base }:
2+
3+buildDunePackage {
4+ pname = "posix-socket";
5+
6+ inherit (posix-base) version src useDune2;
7+
8+ propagatedBuildInputs = [ posix-base ];
9+
10+ doCheck = true;
11+
12+ meta = posix-base.meta // {
13+ description = "Bindings for posix sockets";
14+ };
15+
16+}
pkgs/development/ocaml-modules/posix/types.nixnew file+15
@@ -0,0 +1,15 @@
1+{ lib, buildDunePackage, posix-base }:
2+
3+buildDunePackage {
4+ pname = "posix-types";
5+
6+ inherit (posix-base) version src useDune2;
7+
8+ minimumOCamlVersion = "4.03";
9+
10+ propagatedBuildInputs = [ posix-base ];
11+
12+ meta = posix-base.meta // {
13+ description = "Bindings for the types defined in <sys/types.h>";
14+ };
15+}
pkgs/development/ocaml-modules/webbrowser/default.nixnew file+26
@@ -0,0 +1,26 @@
1+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg
2+, astring, bos, cmdliner, rresult
3+}:
4+
5+stdenv.mkDerivation rec {
6+ name = "ocaml${ocaml.version}-webbrowser-${version}";
7+ version = "0.6.1";
8+ src = fetchurl {
9+ url = "https://erratique.ch/software/webbrowser/releases/webbrowser-${version}.tbz";
10+ sha256 = "137a948bx7b71zfv4za3hhznrn5lzbbrgzjy0das83zms508isx3";
11+ };
12+
13+ nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ];
14+ buildInputs = [];
15+ propagatedBuildInputs = [ astring bos cmdliner rresult ];
16+
17+ inherit (topkg) buildPhase installPhase;
18+
19+ meta = {
20+ description = "Open and reload URIs in browsers from OCaml";
21+ homepage = "https://erratique.ch/software/webbrowser";
22+ license = stdenv.lib.licenses.isc;
23+ maintainers = [ stdenv.lib.maintainers.vbgl ];
24+ inherit (ocaml.meta) platforms;
25+ };
26+}
pkgs/development/python-modules/afdko/default.nixnew file+55
@@ -0,0 +1,55 @@
1+{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, python
2+, fonttools, defcon, lxml, fs, unicodedata2, zopfli, brotlipy, fontpens
3+, brotli, fontmath, mutatormath, booleanoperations
4+, ufoprocessor, ufonormalizer, psautohint
5+, setuptools_scm
6+, pytest
7+}:
8+
9+buildPythonPackage rec {
10+ pname = "afdko";
11+ version = "3.5.0";
12+
13+ disabled = pythonOlder "3.6";
14+
15+ src = fetchPypi {
16+ inherit pname version;
17+ sha256 = "0wid4l70bxm297xgayyrgw5glhp6n92gh4sz1nd4rncgf1ziz8ck";
18+ };
19+
20+ nativeBuildInputs = [ setuptools_scm ];
21+
22+ propagatedBuildInputs = [
23+ booleanoperations
24+ fonttools
25+ lxml # fonttools[lxml], defcon[lxml] extra
26+ fs # fonttools[ufo] extra
27+ unicodedata2 # fonttools[unicode] extra
28+ brotlipy # fonttools[woff] extra
29+ zopfli # fonttools[woff] extra
30+ fontpens
31+ brotli
32+ defcon
33+ fontmath
34+ mutatormath
35+ ufoprocessor
36+ ufonormalizer
37+ psautohint
38+ ];
39+
40+ # tests are broken on non x86_64
41+ # https://github.com/adobe-type-tools/afdko/issues/1163
42+ # https://github.com/adobe-type-tools/afdko/issues/1216
43+ doCheck = stdenv.isx86_64;
44+ checkInputs = [ pytest ];
45+ checkPhase = ''
46+ PATH="$PATH:$out/bin" py.test
47+ '';
48+
49+ meta = with stdenv.lib; {
50+ description = "Adobe Font Development Kit for OpenType";
51+ homepage = "https://adobe-type-tools.github.io/afdko/";
52+ license = licenses.asl20;
53+ maintainers = [ maintainers.sternenseemann ];
54+ };
55+}
pkgs/development/python-modules/blis/default.nix+4−2
@@ -20,11 +20,13 @@ buildPythonPackage rec {
2020 cython
2121 ];
2222
23+ propagatedBuildInputs = [
24+ numpy
25+ ];
26+
2327
2428 checkInputs = [
25− cython
2629 hypothesis
27− numpy
2830 pytest
2931 ];
3032
pkgs/development/python-modules/booleanoperations/default.nixnew file+34
@@ -0,0 +1,34 @@
1+{ lib, buildPythonPackage, fetchPypi
2+, fonttools, fs, pyclipper, defcon, fontpens
3+, setuptools_scm, pytest
4+}:
5+
6+buildPythonPackage rec {
7+ pname = "booleanOperations";
8+ version = "0.9.0";
9+
10+ src = fetchPypi {
11+ inherit pname version;
12+ sha256 = "1f41lb19m8azchl1aqz6j5ycbspb8jsf1cnn42hlydxd68f85ylc";
13+ extension = "zip";
14+ };
15+
16+ nativeBuildInputs = [ setuptools_scm ];
17+
18+ propagatedBuildInputs = [
19+ fonttools
20+ fs
21+ pyclipper
22+ defcon
23+ fontpens
24+ ];
25+
26+ checkInputs = [ pytest ];
27+
28+ meta = with lib; {
29+ description = "Boolean operations on paths";
30+ homepage = "https://github.com/typemytype/booleanOperations";
31+ license = licenses.mit;
32+ maintainers = [ maintainers.sternenseemann ];
33+ };
34+}
pkgs/development/python-modules/deepdiff/default.nix+2−6
@@ -3,6 +3,7 @@
33, fetchPypi
44, mock
55, jsonpickle
6+, mmh3
67, ordered-set
78, numpy
89, pytestCheckHook
@@ -24,14 +25,9 @@ buildPythonPackage rec {
2425 pytestCheckHook
2526 ];
2627
27− disabledTests = [
28− # skipped tests require murmur module
29− "test_prep_str_murmur3_64bit"
30− "test_prep_str_murmur3_128bit"
31− ];
32−
3328 propagatedBuildInputs = [
3429 jsonpickle
30+ mmh3
3531 ordered-set
3632 ];
3733
pkgs/development/python-modules/defcon/default.nixnew file+35
@@ -0,0 +1,35 @@
1+{ lib, buildPythonPackage, fetchPypi, pythonOlder
2+, fonttools
3+, pytest, pytestrunner, lxml, fs, unicodedata2, fontpens
4+}:
5+
6+buildPythonPackage rec {
7+ pname = "defcon";
8+ version = "0.7.2";
9+
10+ src = fetchPypi {
11+ inherit pname version;
12+ sha256 = "1lfqsvxmq1j0nvp26gidnqkj1dyxv7jalc6i7fz1r3nc7niflrqr";
13+ extension = "zip";
14+ };
15+
16+ propagatedBuildInputs = [
17+ fonttools
18+ ];
19+
20+ checkInputs = [
21+ pytest
22+ pytestrunner
23+ lxml
24+ fs
25+ unicodedata2
26+ fontpens
27+ ];
28+
29+ meta = with lib; {
30+ description = "A set of UFO based objects for use in font editing applications";
31+ homepage = "https://github.com/robotools/defcon";
32+ license = licenses.mit;
33+ maintainers = [ maintainers.sternenseemann ];
34+ };
35+}
pkgs/development/python-modules/django/1_11.nixdeleted−34
@@ -1,34 +0,0 @@
1−{ stdenv, buildPythonPackage, fetchurl, substituteAll,
2− geos, gdal, pytz,
3− withGdal ? false
4−}:
5−
6−buildPythonPackage rec {
7− pname = "Django";
8− version = "1.11.28";
9−
10− src = fetchurl {
11− url = "https://www.djangoproject.com/m/releases/1.11/${pname}-${version}.tar.gz";
12− sha256 = "1ss1jyip7mlbfjn27m0j6wx80s8h4ksg6g5annkgwigp8xgy6g5k";
13− };
14−
15− patches = stdenv.lib.optionals withGdal [
16− (substituteAll {
17− src = ./1.10-gis-libs.template.patch;
18− geos = geos;
19− gdal = gdal;
20− extension = stdenv.hostPlatform.extensions.sharedLibrary;
21− })
22− ];
23−
24− propagatedBuildInputs = [ pytz ];
25−
26− # too complicated to setup
27− doCheck = false;
28−
29− meta = with stdenv.lib; {
30− description = "A high-level Python Web framework";
31− homepage = "https://www.djangoproject.com/";
32− license = licenses.bsd3;
33− };
34−}
pkgs/development/python-modules/dogpile.cache/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, buildPythonPackage, fetchPypi
2−, pytest, pytestcov, mock, Mako, decorator
2+, pytest, pytestcov, mock, Mako, decorator, stevedore
33}:
44
55buildPythonPackage rec {
@@ -26,7 +26,7 @@ buildPythonPackage rec {
2626
2727 checkInputs = [ pytest pytestcov mock Mako ];
2828
29− propagatedBuildInputs = [ decorator ];
29+ propagatedBuildInputs = [ decorator stevedore ];
3030
3131 meta = with stdenv.lib; {
3232 description = "A caching front-end based on the Dogpile lock";
pkgs/development/python-modules/flit/default.nix+2−2
@@ -7,7 +7,7 @@
77, requests_download
88, zipfile36
99, pythonOlder
10−, pytest_4
10+, pytest
1111, testpath
1212, responses
1313, pytoml
@@ -39,7 +39,7 @@ buildPythonPackage rec {
3939 zipfile36
4040 ];
4141
42− checkInputs = [ pytest_4 testpath responses ];
42+ checkInputs = [ pytest testpath responses ];
4343
4444 # Disable test that needs some ini file.
4545 # Disable test that wants hg
pkgs/development/python-modules/fontmath/default.nixnew file+25
@@ -0,0 +1,25 @@
1+{ lib, buildPythonPackage, fetchPypi
2+, fonttools
3+, pytest, pytestrunner
4+}:
5+
6+buildPythonPackage rec {
7+ pname = "fontMath";
8+ version = "0.6.0";
9+
10+ src = fetchPypi {
11+ inherit pname version;
12+ sha256 = "09xdqdjyjlx5k9ymi36d7hkgvn55zzjzd65l2yqidkfazlmh14ss";
13+ extension = "zip";
14+ };
15+
16+ propagatedBuildInputs = [ fonttools ];
17+ checkInputs = [ pytest pytestrunner ];
18+
19+ meta = with lib; {
20+ description = "A collection of objects that implement fast font, glyph, etc. math";
21+ homepage = "https://github.com/robotools/fontMath/";
22+ license = licenses.mit;
23+ maintainers = [ maintainers.sternenseemann ];
24+ };
25+}
pkgs/development/python-modules/fontparts/default.nixnew file+39
@@ -0,0 +1,39 @@
1+{ lib, buildPythonPackage, fetchPypi, python
2+, fonttools, lxml, fs, unicodedata2
3+, defcon, fontpens, fontmath, booleanoperations
4+, pytest
5+}:
6+
7+buildPythonPackage rec {
8+ pname = "fontParts";
9+ version = "0.9.2";
10+
11+ src = fetchPypi {
12+ inherit pname version;
13+ sha256 = "0hwzdppmrrw1xz49x36h6mcsrwya1f3zpqrc206y73j4pbn7fh0k";
14+ extension = "zip";
15+ };
16+
17+ propagatedBuildInputs = [
18+ booleanoperations
19+ fonttools
20+ unicodedata2 # fonttools[unicode] extra
21+ lxml # fonttools[lxml] extra
22+ fs # fonttools[ufo] extra
23+ defcon
24+ fontpens # defcon[pens] extra
25+ fontmath
26+ ];
27+
28+ checkPhase = ''
29+ ${python.interpreter} Lib/fontParts/fontshell/test.py
30+ '';
31+ checkInputs = [ pytest ];
32+
33+ meta = with lib; {
34+ description = "An API for interacting with the parts of fonts during the font development process.";
35+ homepage = "https://github.com/robotools/fontParts";
36+ license = licenses.mit;
37+ maintainers = [ maintainers.sternenseemann ];
38+ };
39+}
pkgs/development/python-modules/fontpens/default.nixnew file+38
@@ -0,0 +1,38 @@
1+{ lib, buildPythonPackage, fetchPypi, fonttools }:
2+
3+buildPythonPackage rec {
4+ pname = "fontPens";
5+ version = "0.2.4";
6+
7+ src = fetchPypi {
8+ inherit pname version;
9+ sha256 = "1za15dzsnymq6d9x7xdfqwgw4a3003wj75fn2crhyidkfd2s3nd6";
10+ extension = "zip";
11+ };
12+
13+ propagatedBuildInputs = [ fonttools ];
14+
15+ # can't run normal tests due to circular dependency with fontParts
16+ doCheck = false;
17+ pythonImportsCheck = [ "fontPens" ] ++ (builtins.map (s: "fontPens." + s) [
18+ "angledMarginPen"
19+ "digestPointPen"
20+ "flattenPen"
21+ "guessSmoothPointPen"
22+ "marginPen"
23+ "penTools"
24+ "printPen"
25+ "printPointPen"
26+ "recordingPointPen"
27+ "thresholdPen"
28+ "thresholdPointPen"
29+ "transformPointPen"
30+ ]);
31+
32+ meta = with lib; {
33+ description = "A collection of classes implementing the pen protocol for manipulating glyphs";
34+ homepage = "https://github.com/robotools/fontPens";
35+ license = licenses.bsd3;
36+ maintainers = [ maintainers.sternenseemann ];
37+ };
38+}
pkgs/development/python-modules/fonttools/default.nix+47−15
@@ -1,38 +1,70 @@
11{ lib
22, buildPythonPackage
3−, fetchPypi
4−, isPy27
5−, numpy
3+, fetchFromGitHub
4+, pythonOlder
5+, brotlipy
6+, zopfli
7+, fs
8+, lxml
9+, scipy
10+, munkres
11+, unicodedata2
12+, sympy
13+, matplotlib
14+, reportlab
615, pytest
7−, pytestrunner
16+, pytest-randomly
817, glibcLocales
918}:
1019
1120buildPythonPackage rec {
1221 pname = "fonttools";
13− version = "4.13.0";
14− disabled = isPy27;
22+ version = "4.14.0";
23+ disabled = pythonOlder "3.6";
1524
16− src = fetchPypi {
17− inherit pname version;
18− sha256 = "63987cd374c39a75146748f8be8637634221e53fef15cdf76f17777676d8545a";
19− extension = "zip";
25+ src = fetchFromGitHub {
26+ owner = pname;
27+ repo = pname;
28+ rev = version;
29+ sha256 = "0aiaxjg2v2391gxnhp4nvmgfb3ygm6x7n080s5mnkfjq2bq319in";
2030 };
2131
22− buildInputs = [
23− numpy
24− ];
25−
32+ # all dependencies are optional, but
33+ # we run the checks with them
2634 checkInputs = [
2735 pytest
28− pytestrunner
36+ pytest-randomly
2937 glibcLocales
38+ # etree extra
39+ lxml
40+ # ufo extra
41+ fs
42+ # woff extra
43+ brotlipy
44+ zopfli
45+ # unicode extra
46+ unicodedata2
47+ # interpolatable extra
48+ scipy
49+ munkres
50+ # symfont
51+ sympy
52+ # varLib
53+ matplotlib
54+ # pens
55+ reportlab
3056 ];
3157
3258 preCheck = ''
3359 export LC_ALL="en_US.UTF-8"
3460 '';
3561
62+ # avoid timing issues with timestamps in subset_test.py and ttx_test.py
63+ checkPhase = ''
64+ pytest Tests fontTools \
65+ -k 'not ttcompile_timestamp_calcs and not recalc_timestamp'
66+ '';
67+
3668 meta = {
3769 homepage = "https://github.com/fonttools/fonttools";
3870 description = "A library to manipulate font files from Python";
pkgs/development/python-modules/google-api-python-client/default.nix+2−2
@@ -4,11 +4,11 @@
44
55buildPythonPackage rec {
66 pname = "google-api-python-client";
7− version = "1.10.1";
7+ version = "1.11.0";
88
99 src = fetchPypi {
1010 inherit pname version;
11− sha256 = "0v4yzrmrp1l3nlkw9ibllgblwy8y45anzfkkky2vghkl6w8411xa";
11+ sha256 = "0yxrz897kpjypfqzcy0ry90hc34w47q4fzqidp81h6pg01c03x6a";
1212 };
1313
1414 # No tests included in archive
pkgs/development/python-modules/jinja2/default.nix+4−2
@@ -3,7 +3,9 @@
33, isPy3k
44, fetchPypi
55, pytest
6−, markupsafe }:
6+, markupsafe
7+, setuptools
8+}:
79
810buildPythonPackage rec {
911 pname = "Jinja2";
@@ -15,7 +17,7 @@ buildPythonPackage rec {
1517 };
1618
1719 checkInputs = [ pytest ];
18− propagatedBuildInputs = [ markupsafe ];
20+ propagatedBuildInputs = [ markupsafe setuptools ];
1921
2022 # Multiple tests run out of stack space on 32bit systems with python2.
2123 # See https://github.com/pallets/jinja/issues/1158
pkgs/development/python-modules/jupyterhub-tmpauthenticator/default.nixnew file+31
@@ -0,0 +1,31 @@
1+{ lib
2+, buildPythonPackage
3+, fetchPypi
4+, pythonOlder
5+, jupyterhub
6+}:
7+
8+buildPythonPackage rec {
9+ pname = "jupyterhub-tmpauthenticator";
10+ version = "0.6";
11+ disabled = pythonOlder "3.5";
12+
13+ src = fetchPypi {
14+ inherit pname version;
15+ sha256 = "064x1ypxwx1l270ic97p8czbzb7swl9758v40k3w2gaqf9762f0l";
16+ };
17+
18+ propagatedBuildInputs = [ jupyterhub ];
19+
20+ # No tests available in the package
21+ doCheck = false;
22+
23+ pythonImportsCheck = [ "tmpauthenticator" ];
24+
25+ meta = with lib; {
26+ description = "Simple Jupyterhub authenticator that allows anyone to log in.";
27+ license = with licenses; [ bsd3 ];
28+ homepage = "https://github.com/jupyterhub/tmpauthenticator";
29+ maintainers = with maintainers; [ chiroptical ];
30+ };
31+}
pkgs/development/python-modules/kombu/default.nix+2−2
@@ -12,11 +12,11 @@
1212
1313buildPythonPackage rec {
1414 pname = "kombu";
15− version = "5.0.0";
15+ version = "4.6.11";
1616
1717 src = fetchPypi {
1818 inherit pname version;
19− sha256 = "7c949fe33573a971f06c8836ca025390088f3747533b78438f9a57344a142b59";
19+ sha256 = "ca1b45faac8c0b18493d02a8571792f3c40291cf2bcf1f55afed3d8f3aa7ba74";
2020 };
2121
2222 postPatch = ''
pkgs/development/python-modules/lml/default.nixnew file+30
@@ -0,0 +1,30 @@
1+{ lib
2+, buildPythonPackage
3+, fetchPypi
4+, nose
5+, mock
6+}:
7+
8+buildPythonPackage rec {
9+ pname = "lml";
10+ version = "0.0.9";
11+
12+ src = fetchPypi {
13+ inherit pname version;
14+ sha256 = "6luoF7Styen1whclzSR1+RKTO34t/fB5Ku2AB3FU9j8=";
15+ };
16+
17+ checkInputs = [
18+ nose
19+ mock
20+ ];
21+
22+ checkPhase = "nosetests";
23+
24+ meta = {
25+ description = "Load me later. A lazy plugin management system for Python";
26+ homepage = "http://lml.readthedocs.io/";
27+ license = lib.licenses.bsd3;
28+ maintainers = with lib.maintainers; [ jtojnar ];
29+ };
30+}
pkgs/development/python-modules/ludios_wpull/default.nix+5−3
@@ -8,15 +8,16 @@
88, lxml
99, namedlist
1010, sqlalchemy
11−, tornado_4
11+, tornado
1212, Yapsy
13+, pythonAtLeast
1314}:
1415
1516buildPythonPackage rec {
1617 pname = "ludios_wpull";
1718 version = "3.0.7";
1819
19− disabled = !isPy3k;
20+ disabled = (!isPy3k) || (pythonAtLeast "3.8");
2021
2122 src = fetchFromGitHub {
2223 rev = version;
@@ -25,7 +26,7 @@ buildPythonPackage rec {
2526 sha256 = "1j96avm0ynbazypzp766wh26n4qc73y7wgsiqfrdfl6x7rx20wgf";
2627 };
2728
28− propagatedBuildInputs = [ chardet dnspython html5-parser lxml namedlist sqlalchemy tornado_4 Yapsy ];
29+ propagatedBuildInputs = [ chardet dnspython html5-parser lxml namedlist sqlalchemy tornado Yapsy ];
2930
3031 # Test suite has tests that fail on all platforms
3132 doCheck = false;
@@ -35,5 +36,6 @@ buildPythonPackage rec {
3536 homepage = "https://github.com/ludios/wpull";
3637 license = lib.licenses.gpl3;
3738 maintainers = with lib.maintainers; [ ivan ];
39+ broken = lib.versions.major tornado.version != "4";
3840 };
3941}
pkgs/development/python-modules/mathlibtools/default.nixnew file+26
@@ -0,0 +1,26 @@
1+{ lib, buildPythonPackage, fetchPypi, PyGithub, GitPython, toml, click, tqdm,
2+ paramiko, networkx, pydot, pyyaml }:
3+
4+buildPythonPackage rec {
5+ pname = "mathlibtools";
6+ version = "0.0.10";
7+
8+ src = fetchPypi {
9+ inherit pname version;
10+ sha256 = "0d708bgsxjhhchqc56afi1h7k87vbfn7v40f4y1zlv7hsjc69s36";
11+ };
12+
13+ propagatedBuildInputs = [
14+ PyGithub GitPython toml click tqdm paramiko networkx pydot pyyaml
15+ ];
16+
17+ # requires internet access
18+ doCheck = false;
19+
20+ meta = with lib; {
21+ homepage = "https://github.com/leanprover-community/mathlib-tools";
22+ description = "leanproject is a supporting tool for Lean's mathlib";
23+ license = licenses.asl20;
24+ maintainers = with maintainers; [ gebner ];
25+ };
26+}
pkgs/development/python-modules/mautrix/default.nix+2−2
@@ -4,11 +4,11 @@
44
55buildPythonPackage rec {
66 pname = "mautrix";
7− version = "0.6.1";
7+ version = "0.5.8";
88
99 src = fetchPypi {
1010 inherit pname version;
11− sha256 = "a86c6448fb3c0f5e149f3347fbf0cd776431aec16a137a9b45298b6fe5991e42";
11+ sha256 = "1hqg32n7pmjhap0ybfcf05zgfcyyirb4fm1m7gf44dwh40da6qz0";
1212 };
1313
1414 propagatedBuildInputs = [
pkgs/development/python-modules/mmh3/default.nixnew file+23
@@ -0,0 +1,23 @@
1+{ lib
2+, fetchPypi
3+, buildPythonPackage
4+}:
5+
6+buildPythonPackage rec {
7+ pname = "mmh3";
8+ version = "2.5.1";
9+
10+ src = fetchPypi {
11+ inherit pname version;
12+ sha256 = "0265pvfbcsijf51szsh14qk3l3zgs0rb5rbrw11zwan52yi0jlhq";
13+ };
14+
15+ pythonImportsCheck = [ "mmh3" ];
16+
17+ meta = with lib; {
18+ description = "Python wrapper for MurmurHash3, a set of fast and robust hash functions";
19+ homepage = "https://pypi.org/project/mmh3/";
20+ license = licenses.cc0;
21+ maintainers = [ maintainers.danieldk ];
22+ };
23+}
pkgs/development/python-modules/mutatormath/default.nixnew file+25
@@ -0,0 +1,25 @@
1+{ lib, buildPythonPackage, fetchPypi
2+, defcon, fontmath
3+, unicodedata2, fs
4+}:
5+
6+buildPythonPackage rec {
7+ pname = "MutatorMath";
8+ version = "3.0.1";
9+
10+ src = fetchPypi {
11+ inherit pname version;
12+ sha256 = "0r1qq45np49x14zz1zwkaayqrn7m8dn2jlipjldg2ihnmpzw29w1";
13+ extension = "zip";
14+ };
15+
16+ propagatedBuildInputs = [ fontmath unicodedata2 defcon ];
17+ checkInputs = [ unicodedata2 fs ];
18+
19+ meta = with lib; {
20+ description = "Piecewise linear interpolation in multiple dimensions with multiple, arbitrarily placed, masters";
21+ homepage = "https://github.com/LettError/MutatorMath";
22+ license = licenses.bsd3;
23+ maintainers = [ maintainers.sternenseemann ];
24+ };
25+}
pkgs/development/python-modules/nix-prefetch-github/default.nix+5−6
@@ -15,17 +15,13 @@
1515
1616buildPythonPackage rec {
1717 pname = "nix-prefetch-github";
18− version = "2.4";
18+ version = "3.0";
1919
2020 src = fetchPypi {
2121 inherit pname version;
22− sha256 = "sha256-PVB/cL0NVB5pHxRMjg8TLatvIvHjfCvaRWBanVHYT+E=";
22+ sha256 = "sha256-EN+EbVXUaf+id5UsK4EBm/9k9FYaH79g08kblvW60XA=";
2323 };
2424
25− # The tests for this package require nix and network access. That's
26− # why we cannot execute them inside the building process.
27− doCheck = false;
28−
2925 propagatedBuildInputs = [
3026 attrs
3127 click
@@ -34,6 +30,9 @@ buildPythonPackage rec {
3430 ];
3531
3632 checkInputs = [ pytestCheckHook pytest-black pytestcov pytest-isort git ];
33+ checkPhase = ''
34+ pytest -m 'not network'
35+ '';
3736
3837 # latest version of isort will cause tests to fail
3938 # ignore tests which are impure
pkgs/development/python-modules/phonenumbers/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "phonenumbers";
5− version = "8.12.7";
5+ version = "8.12.8";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "652c418f8e97c8438f227a524ddf8d7d325c4a47e4924ce865b827c24ec3194d";
9+ sha256 = "3a8b8f7b60ea00b83ca588b5ca57e48d9a3c223aa42f1a3d5fa88566424216c3";
1010 };
1111
1212 meta = {
pkgs/development/python-modules/pint/default.nix+6−5
@@ -1,10 +1,10 @@
11{ lib
22, buildPythonPackage
33, fetchPypi
4−, isPy27
54, pythonOlder
6−, funcsigs
75, setuptools_scm
6+, importlib-metadata
7+, packaging
88# Check Inputs
99, pytestCheckHook
1010, numpy
@@ -24,9 +24,10 @@ buildPythonPackage rec {
2424
2525 disabled = pythonOlder "3.6";
2626
27− propagatedBuildInputs = [
28− setuptools_scm
29− ] ++ lib.optional isPy27 funcsigs;
27+ nativeBuildInputs = [ setuptools_scm ];
28+
29+ propagatedBuildInputs = [ packaging ]
30+ ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
3031
3132 # Test suite explicitly requires pytest
3233 checkInputs = [
pkgs/development/python-modules/psautohint/default.nixnew file+40
@@ -0,0 +1,40 @@
1+{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder
2+, fonttools, lxml, fs
3+, setuptools_scm
4+, pytest, pytestcov, pytest_xdist, pytest-randomly
5+}:
6+
7+buildPythonPackage rec {
8+ pname = "psautohint";
9+ version = "2.1.0";
10+
11+ disabled = pythonOlder "3.6";
12+
13+ src = fetchFromGitHub {
14+ owner = "adobe-type-tools";
15+ repo = pname;
16+ sha256 = "1k1rx1adqxdxj5v3788lwnvygylp73sps1p0q44hws2vmsag2s8r";
17+ rev = "v${version}";
18+ fetchSubmodules = true; # data dir for tests
19+ };
20+
21+ postPatch = ''
22+ echo '#define PSAUTOHINT_VERSION "${version}"' > libpsautohint/src/version.h
23+ sed -i '/use_scm_version/,+3d' setup.py
24+ sed -i '/setup(/a \ version="${version}",' setup.py
25+ '';
26+
27+ nativeBuildInputs = [ setuptools_scm ];
28+
29+ propagatedBuildInputs = [ fonttools lxml fs ];
30+
31+ checkInputs = [ pytest pytestcov pytest_xdist pytest-randomly ];
32+ checkPhase = "pytest tests";
33+
34+ meta = with lib; {
35+ description = "Script to normalize the XML and other data inside of a UFO";
36+ homepage = "https://github.com/adobe-type-tools/psautohint";
37+ license = licenses.bsd3;
38+ maintainers = [ maintainers.sternenseemann ];
39+ };
40+}
pkgs/development/python-modules/pure-eval/default.nixnew file+27
@@ -0,0 +1,27 @@
1+{ lib, buildPythonPackage, fetchFromGitHub, setuptools_scm, toml, pytest }:
2+
3+buildPythonPackage rec {
4+ pname = "pure_eval";
5+ version = "0.1.0";
6+
7+ src = fetchFromGitHub {
8+ owner = "alexmojaki";
9+ repo = pname;
10+ rev = "v${version}";
11+ sha256 = "1d3gpc9mrmwdk6l87x7ll23vwv6l8l2iqvi63r86j7bj5s8m2ci8";
12+ };
13+
14+ SETUPTOOLS_SCM_PRETEND_VERSION = version;
15+
16+ buildInputs = [ setuptools_scm ];
17+ propagatedBuildInputs = [ toml ];
18+
19+ checkInputs = [ pytest ];
20+
21+ meta = with lib; {
22+ description = "Safely evaluate AST nodes without side effects";
23+ homepage = "http://github.com/alexmojaki/pure_eval";
24+ license = licenses.mit;
25+ maintainers = with maintainers; [ gebner ];
26+ };
27+}
pkgs/development/python-modules/pyexcel-io/default.nixnew file+31
@@ -0,0 +1,31 @@
1+{ lib
2+, buildPythonPackage
3+, fetchPypi
4+, lml
5+}:
6+
7+buildPythonPackage rec {
8+ pname = "pyexcel-io";
9+ version = "0.5.20";
10+
11+ src = fetchPypi {
12+ inherit pname version;
13+ sha256 = "CN/jlVO5ljWbFD3j2exD4ZbxE41HyrtzrwShaCG4TXk=";
14+ };
15+
16+ propagatedBuildInputs = [
17+ lml
18+ ];
19+
20+ # Tests depend on stuff that depends on this.
21+ doCheck = false;
22+
23+ pythonImportsCheck = [ "pyexcel_io" ];
24+
25+ meta = {
26+ description = "One interface to read and write the data in various excel formats, import the data into and export the data from databases";
27+ homepage = "http://docs.pyexcel.org/";
28+ license = lib.licenses.bsd3;
29+ maintainers = with lib.maintainers; [ jtojnar ];
30+ };
31+}
pkgs/development/python-modules/pyexcel-ods/default.nixnew file+41
@@ -0,0 +1,41 @@
1+{ lib
2+, buildPythonPackage
3+, fetchPypi
4+, pyexcel-io
5+, odfpy
6+, nose
7+, pyexcel
8+, pyexcel-xls
9+, psutil
10+}:
11+
12+buildPythonPackage rec {
13+ pname = "pyexcel-ods";
14+ version = "0.5.6";
15+
16+ src = fetchPypi {
17+ inherit pname version;
18+ sha256 = "O+Uv2KrdvYvJKG9+sUj0VT1MlyUtaVw6nse5XmZmoiM=";
19+ };
20+
21+ propagatedBuildInputs = [
22+ pyexcel-io
23+ odfpy
24+ ];
25+
26+ checkInputs = [
27+ nose
28+ pyexcel
29+ pyexcel-xls
30+ psutil
31+ ];
32+
33+ checkPhase = "nosetests";
34+
35+ meta = {
36+ description = "Plug-in to pyexcel providing the capbility to read, manipulate and write data in ods formats using odfpy";
37+ homepage = "http://docs.pyexcel.org/";
38+ license = lib.licenses.bsd3;
39+ maintainers = with lib.maintainers; [ jtojnar ];
40+ };
41+}
pkgs/development/python-modules/pyexcel-xls/default.nixnew file+41
@@ -0,0 +1,41 @@
1+{ lib
2+, buildPythonPackage
3+, fetchPypi
4+, pyexcel-io
5+, xlrd
6+, xlwt
7+, nose
8+, pyexcel
9+, mock
10+}:
11+
12+buildPythonPackage rec {
13+ pname = "pyexcel-xls";
14+ version = "0.5.9";
15+
16+ src = fetchPypi {
17+ inherit pname version;
18+ sha256 = "1Wyt6gpmBoRFaXbZgFJVTTu+KnivxfmpHIaR9iZghVU=";
19+ };
20+
21+ propagatedBuildInputs = [
22+ pyexcel-io
23+ xlrd
24+ xlwt
25+ ];
26+
27+ checkInputs = [
28+ nose
29+ pyexcel
30+ mock
31+ ];
32+
33+ checkPhase = "nosetests";
34+
35+ meta = {
36+ description = "A wrapper library to read, manipulate and write data in xls using xlrd and xlwt";
37+ homepage = "http://docs.pyexcel.org/";
38+ license = lib.licenses.bsd3;
39+ maintainers = with lib.maintainers; [ jtojnar ];
40+ };
41+}
pkgs/development/python-modules/pyexcel/default.nixnew file+45
@@ -0,0 +1,45 @@
1+{ lib
2+, buildPythonPackage
3+, fetchPypi
4+, isPy27
5+, lml
6+, pyexcel-io
7+, texttable
8+, nose
9+}:
10+
11+buildPythonPackage rec {
12+ pname = "pyexcel";
13+ version = "0.6.4";
14+ disabled = isPy27;
15+
16+ src = fetchPypi {
17+ inherit pname version;
18+ sha256 = "pPNYnimHhW7SL6X6OLwagZoadTD7IdUSbO7vAqQPQu8=";
19+ };
20+
21+ propagatedBuildInputs = [
22+ lml
23+ pyexcel-io
24+ texttable
25+ ];
26+
27+ checkInputs = [
28+ nose
29+ ];
30+
31+ # Tests depend on pyexcel-xls & co. causing circular dependency.
32+ # https://github.com/pyexcel/pyexcel/blob/dev/tests/requirements.txt
33+ doCheck = false;
34+
35+ pythonImportsCheck = [ "pyexcel" ];
36+
37+ checkPhase = "nosetests";
38+
39+ meta = {
40+ description = "Single API for reading, manipulating and writing data in csv, ods, xls, xlsx and xlsm files";
41+ homepage = "http://docs.pyexcel.org/";
42+ license = lib.licenses.bsd3;
43+ maintainers = with lib.maintainers; [ jtojnar ];
44+ };
45+}
pkgs/development/python-modules/pyipp/default.nix+2−2
@@ -4,14 +4,14 @@
44
55buildPythonPackage rec {
66 pname = "pyipp";
7− version = "0.10.1";
7+ version = "0.11.0";
88 disabled = isPy27;
99
1010 src = fetchFromGitHub {
1111 owner = "ctalkington";
1212 repo = "python-ipp";
1313 rev = version;
14− sha256 = "0y9mkrx66f4m77jzfgdgmvlqismvimb6hm61j2va7zapm8dyabvr";
14+ sha256 = "0ar3mkyfa9qi3av3885bvacpwlxh420if9ymdj8i4x06ymzc213d";
1515 };
1616
1717 propagatedBuildInputs = [
pkgs/development/python-modules/pyside2/default.nix+2−2
@@ -3,11 +3,11 @@
33
44stdenv.mkDerivation rec {
55 pname = "pyside2";
6− version = "5.14.2";
6+ version = "5.15.0";
77
88 src = fetchurl {
99 url = "https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/pyside-setup-opensource-src-${version}.tar.xz";
10− sha256 = "1cwjpv8qmjksi7cj4naw54h2afphw44chrf1pmfjamyyj8vz6ykw";
10+ sha256 = "0s3bgddcsf6w297nyxv08xpc2nnr3sli980p24nf4xivvr9yxkgi";
1111 };
1212
1313 patches = [
pkgs/development/python-modules/pytest-randomly/default.nixnew file+31

This diff is too big to show here.

pkgs/development/python-modules/pytorch/bin.nixnew file+68

This diff is too big to show here.

pkgs/development/python-modules/pytorch/binary-hashes.nixnew file+10

This diff is too big to show here.

pkgs/development/python-modules/pytorch/default.nix+8−6

This diff is too big to show here.

pkgs/development/python-modules/pyudev/default.nix+1−1

This diff is too big to show here.

pkgs/development/python-modules/qtconsole/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/reportlab/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/rq/default.nix+7−5

This diff is too big to show here.

pkgs/development/python-modules/samsungctl/default.nixnew file+29

This diff is too big to show here.

pkgs/development/python-modules/samsungtvws/default.nixnew file+36

This diff is too big to show here.

pkgs/development/python-modules/sentry-sdk/default.nix+5−1

This diff is too big to show here.

pkgs/development/python-modules/splinter/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/tldextract/default.nix+2−1

This diff is too big to show here.

pkgs/development/python-modules/trimesh/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/ufonormalizer/default.nixnew file+19

This diff is too big to show here.

pkgs/development/python-modules/ufoprocessor/default.nixnew file+35

This diff is too big to show here.

pkgs/development/python-modules/ujson/2.nixnew file+28

This diff is too big to show here.

pkgs/development/python-modules/unicodedata2/default.nixnew file+23

This diff is too big to show here.

pkgs/development/python-modules/zopfli/default.nixnew file+21

This diff is too big to show here.

pkgs/development/tools/build-managers/cmake/default.nix+12−9

This diff is too big to show here.

pkgs/development/tools/coursier/default.nix+2−2

This diff is too big to show here.

pkgs/development/tools/dot-http/default.nixnew file+28

This diff is too big to show here.

pkgs/development/tools/haskell/haskell-language-server/hls-ghcide.nix+2−2

This diff is too big to show here.

pkgs/development/tools/misc/kimg/default.nixnew file+26

This diff is too big to show here.

pkgs/development/tools/misc/objconv/default.nix+2−2

This diff is too big to show here.

pkgs/development/tools/node-webkit/nw12.nix+2−2

This diff is too big to show here.

pkgs/development/tools/nwjs/default.nix+2−2

This diff is too big to show here.

pkgs/development/tools/packer/default.nix+2−2

This diff is too big to show here.

pkgs/development/tools/parsing/tree-sitter/default.nix+4−1

This diff is too big to show here.

pkgs/development/tools/profiling/sysprof/default.nix+2−1

This diff is too big to show here.

pkgs/development/tools/rust/cargo-embed/default.nixnew file+27

This diff is too big to show here.

pkgs/development/tools/rust/cargo-flash/default.nixnew file+27

This diff is too big to show here.

pkgs/development/tools/rust/cargo-make/Cargo.lockdeleted−1283

This diff is too big to show here.

pkgs/development/tools/rust/cargo-make/default.nix+7−17

This diff is too big to show here.

pkgs/development/tools/so/default.nixnew file+27

This diff is too big to show here.

pkgs/development/tools/wxformbuilder/default.nixnew file+35

This diff is too big to show here.

pkgs/development/web/cypress/default.nix+2−2

This diff is too big to show here.

pkgs/development/web/deno/default.nix+3−3

This diff is too big to show here.

pkgs/development/web/deno/deps.nix+4−4

This diff is too big to show here.

pkgs/games/exult/arch.patchdeleted−123

This diff is too big to show here.

pkgs/games/exult/default.nix+4−11

This diff is too big to show here.

pkgs/games/gemrb/default.nix+11−8

This diff is too big to show here.

pkgs/games/katago/default.nix+27−24

This diff is too big to show here.

pkgs/games/klavaro/default.nix+2−2

This diff is too big to show here.

pkgs/misc/logging/beats/6.x.nix+2−2

This diff is too big to show here.

pkgs/misc/logging/beats/7.x.nix+2−2

This diff is too big to show here.

pkgs/misc/vscode-extensions/updateSettings.nix+3−3

This diff is too big to show here.

pkgs/misc/vscode-extensions/vscodeEnv.nix+7−7

This diff is too big to show here.

pkgs/misc/vscode-extensions/vscodeEnvTest.nix+1−2

This diff is too big to show here.

pkgs/misc/vscode-extensions/vscodeExts2nix.nix+6−6

This diff is too big to show here.

pkgs/misc/vscode-extensions/vscodeWithConfiguration.nix+13−13

This diff is too big to show here.

pkgs/os-specific/linux/bcc/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/firmware/fwupd/default.nix+5

This diff is too big to show here.

pkgs/os-specific/linux/fscrypt/default.nix−4

This diff is too big to show here.

pkgs/os-specific/linux/kernel/hardened/patches.json+12−12

This diff is too big to show here.

pkgs/os-specific/linux/kernel/linux-5.7.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/kernel/linux-5.8.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/klibc/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/microcode/amd.nix+1−1

This diff is too big to show here.

pkgs/os-specific/linux/nvidia-x11/generic.nix+4−1

This diff is too big to show here.

pkgs/os-specific/linux/rdma-core/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch+3−3

This diff is too big to show here.

pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch+3−3

This diff is too big to show here.

pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch+5−5

This diff is too big to show here.

pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch+2−2

This diff is too big to show here.

pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch+62−45

This diff is too big to show here.

pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch+4−4

This diff is too big to show here.

pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch+19−19

This diff is too big to show here.

pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch+2−2

This diff is too big to show here.

pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch+14−14

This diff is too big to show here.

pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch+4−4

This diff is too big to show here.

pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch+5−5

This diff is too big to show here.

pkgs/os-specific/linux/systemd/0012-Install-default-configuration-into-out-share-factory.patch+36−35

This diff is too big to show here.

pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patch+4−4

This diff is too big to show here.

pkgs/os-specific/linux/systemd/0014-add-rootprefix-to-lookup-dir-paths.patch+2−2

This diff is too big to show here.

pkgs/os-specific/linux/systemd/0015-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch+4−4

This diff is too big to show here.

pkgs/os-specific/linux/systemd/0016-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch+4−4

This diff is too big to show here.

pkgs/os-specific/linux/systemd/0017-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch+2−2

This diff is too big to show here.

pkgs/os-specific/linux/systemd/0018-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch+2−2

This diff is too big to show here.

pkgs/os-specific/linux/systemd/default.nix+12−51

This diff is too big to show here.

pkgs/os-specific/linux/zfs/default.nix+17−7

This diff is too big to show here.

pkgs/servers/dns/knot-dns/default.nix+2−3

This diff is too big to show here.

pkgs/servers/gonic/default.nixnew file+59

This diff is too big to show here.

pkgs/servers/gonic/deps.nixnew file+795

This diff is too big to show here.

pkgs/servers/home-assistant/component-packages.nix+273−273

This diff is too big to show here.

pkgs/servers/home-assistant/default.nix+2−2

This diff is too big to show here.

pkgs/servers/home-assistant/parse-requirements.py+8−3

This diff is too big to show here.

pkgs/servers/matrix-synapse/default.nix+2−2

This diff is too big to show here.

pkgs/servers/monitoring/loki/default.nix+2−2

This diff is too big to show here.

pkgs/servers/monitoring/prometheus/postfix-exporter.nix+2−2

This diff is too big to show here.

pkgs/servers/sql/postgresql/ext/timescaledb.nix+2−2

This diff is too big to show here.

pkgs/servers/tegola/default.nix+4−2

This diff is too big to show here.

pkgs/shells/xonsh/default.nix+12−2

This diff is too big to show here.

pkgs/shells/zsh/oh-my-zsh/default.nix+3−10

This diff is too big to show here.

pkgs/tools/admin/lego/default.nix+3−1

This diff is too big to show here.

pkgs/tools/admin/lxd/default.nix+2−2

This diff is too big to show here.

pkgs/tools/admin/salt/default.nix+1−1

This diff is too big to show here.

pkgs/tools/admin/salt/pepper/default.nix+7−6

This diff is too big to show here.

pkgs/tools/backup/dar/default.nix+18−6

This diff is too big to show here.

pkgs/tools/backup/grab-site/default.nix+11−3

This diff is too big to show here.

pkgs/tools/compression/bzip2/1_1.nixnew file+45

This diff is too big to show here.

pkgs/tools/filesystems/nixpart/0.4/blivet.nix+1−1

This diff is too big to show here.

pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix+2−2

This diff is too big to show here.

pkgs/tools/misc/bashcards/default.nix+2−2

This diff is too big to show here.

pkgs/tools/misc/broot/default.nix+4−6

This diff is too big to show here.

pkgs/tools/misc/eva/default.nix+6

This diff is too big to show here.

pkgs/tools/misc/grub/2.0x.nix+2−2

This diff is too big to show here.

pkgs/tools/misc/hakuneko/default.nix+2−1

This diff is too big to show here.

pkgs/tools/misc/lsd/default.nix+3−3

This diff is too big to show here.

pkgs/tools/misc/ostree/default.nix+2−2

This diff is too big to show here.

pkgs/tools/misc/parallel/default.nix+2−2

This diff is too big to show here.

pkgs/tools/misc/plantuml/default.nix+2−2

This diff is too big to show here.

pkgs/tools/misc/sd-mux-ctrl/default.nixnew file+28

This diff is too big to show here.

pkgs/tools/misc/somafm-cli/default.nixnew file+33

This diff is too big to show here.

pkgs/tools/misc/staruml/default.nix+2−2

This diff is too big to show here.

pkgs/tools/networking/circus/default.nix+10−3

This diff is too big to show here.

pkgs/tools/networking/dd-agent/datadog-agent.nix+1−1

This diff is too big to show here.

pkgs/tools/networking/toss/default.nixnew file+20

This diff is too big to show here.

pkgs/tools/networking/wireguard-tools/default.nix+2−2

This diff is too big to show here.

pkgs/tools/package-management/librepo/default.nix+2−2

This diff is too big to show here.

pkgs/tools/package-management/nix-template/default.nixnew file+23

This diff is too big to show here.

pkgs/tools/package-management/nix/default.nix+4−4

This diff is too big to show here.

pkgs/tools/package-management/nixpkgs-review/default.nix+2−2

This diff is too big to show here.

pkgs/tools/security/bitwarden/default.nix+2−1

This diff is too big to show here.

pkgs/tools/security/encryptr/default.nix+2−2

This diff is too big to show here.

pkgs/tools/security/gopass/default.nix+17−12

This diff is too big to show here.

pkgs/tools/security/kbs2/default.nix+5−3

This diff is too big to show here.

pkgs/tools/security/keybase/gui.nix+2−2

This diff is too big to show here.

pkgs/tools/security/rustscan/default.nixnew file+37

This diff is too big to show here.

pkgs/tools/system/htop/default.nix+22−13

This diff is too big to show here.

pkgs/tools/text/podiff/default.nix+3−3

This diff is too big to show here.

pkgs/tools/typesetting/lowdown/default.nix+2−2

This diff is too big to show here.

pkgs/tools/virtualization/cri-tools/default.nix+2−2

This diff is too big to show here.

pkgs/top-level/all-packages.nix+78−16

This diff is too big to show here.

pkgs/top-level/ocaml-packages.nix+13−1

This diff is too big to show here.

pkgs/top-level/perl-packages.nix+3−3

This diff is too big to show here.

pkgs/top-level/python-packages.nix+61−9

This diff is too big to show here.