git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #115435 from NixOS/staging-next

Staging next

commitf5e8bdd07d1afaabf6b37afc5497b1e498b8046f authorFrederik Rietdijk <freddyrietdijk@fridh.nl> dateFri 19 Mar 2021, 18:17 (6 years ago) parentfe7df3f1ecb97e
376 files changed+3994−2501
doc/languages-frameworks/rust.section.md+14−6 lib/systems/default.nix+5 nixos/modules/services/misc/redmine.nix+1−1 nixos/modules/services/web-apps/dokuwiki.nix+2−2 nixos/modules/services/web-apps/wordpress.nix+2−2 nixos/tests/dokuwiki.nix+2−2 pkgs/applications/audio/espeak/default.nix+2−1 pkgs/applications/audio/espeak/edit.nix+2−2 pkgs/applications/audio/mp3gain/default.nix+2−1 pkgs/applications/audio/mpg123/default.nix+2−2 pkgs/applications/audio/pd-plugins/helmholtz/default.nix+2−1 pkgs/applications/audio/pd-plugins/puremapping/default.nix+2−1 pkgs/applications/audio/pd-plugins/timbreid/default.nix+2−1 pkgs/applications/audio/sunvox/default.nix+1−1 pkgs/applications/editors/android-studio/common.nix+1−1 pkgs/applications/editors/edit/default.nix+11−2 pkgs/applications/editors/fte/default.nix+2−1 pkgs/applications/editors/monodevelop/default.nix+2−2 pkgs/applications/editors/netbeans/default.nix+2−2 pkgs/applications/editors/textadept/10/default.nix+2−2 pkgs/applications/editors/textadept/11/default.nix+2−2 pkgs/applications/editors/vscode/generic.nix+3−5 pkgs/applications/graphics/avocode/default.nix+2−2 pkgs/applications/graphics/imagej/default.nix+1−2 pkgs/applications/graphics/zgrviewer/default.nix+2−1 pkgs/applications/kde/fetch.sh+1−1 pkgs/applications/kde/srcs.nix+896−896 pkgs/applications/misc/audio/soxr/arm64-check.patch+79 pkgs/applications/misc/audio/soxr/default.nix+5 pkgs/applications/misc/avrdudess/default.nix+1−1 pkgs/applications/misc/kdbplus/default.nix+1−1 pkgs/applications/misc/keepass/default.nix+2−2 pkgs/applications/misc/lyx/default.nix+2−2 pkgs/applications/misc/megasync/default.nix+1−2 pkgs/applications/misc/milu/default.nix+1−2 pkgs/applications/misc/omegat.nix+1−2 pkgs/applications/misc/openjump/default.nix+1−2 pkgs/applications/networking/browsers/firefox/common.nix+2−1 pkgs/applications/networking/browsers/palemoon/default.nix+2−2 pkgs/applications/networking/browsers/vivaldi/widevine.nix+1−1 pkgs/applications/networking/browsers/webbrowser/default.nix+2−2 pkgs/applications/networking/instant-messengers/torchat/default.nix+2−1 pkgs/applications/networking/mailreaders/mblaze/default.nix+2−2 pkgs/applications/networking/mailreaders/thunderbird/68.nix+1−1 pkgs/applications/networking/mailreaders/thunderbird/default.nix+1−1 pkgs/applications/networking/mpop/default.nix+2−2 pkgs/applications/networking/p2p/transgui/default.nix+2−2 pkgs/applications/office/ib/controller/default.nix+2−1 pkgs/applications/science/biology/snpeff/default.nix+2−2 pkgs/applications/science/math/perseus/default.nix+1−1 pkgs/applications/science/math/weka/default.nix+1−2 pkgs/applications/science/robotics/betaflight-configurator/default.nix+2−2 pkgs/applications/version-management/mercurial/4.9.nix+2−2 pkgs/applications/version-management/mercurial/default.nix+2−2 pkgs/applications/video/vlc/default.nix+2−2 pkgs/applications/window-managers/wmii-hg/default.nix+2−2 pkgs/build-support/bintools-wrapper/default.nix+4 pkgs/build-support/buildenv/default.nix+5−3 pkgs/build-support/cc-wrapper/cc-wrapper.sh+12−4 pkgs/build-support/cc-wrapper/default.nix+5 pkgs/build-support/expand-response-params/default.nix+1−1 pkgs/build-support/fetchnuget/default.nix+1−1 pkgs/build-support/release/ant-build.nix+2−1 pkgs/build-support/rust/default.nix+2 pkgs/build-support/rust/hooks/cargo-build-hook.sh+8−2 pkgs/build-support/rust/hooks/cargo-check-hook.sh+7−2 pkgs/build-support/rust/hooks/cargo-install-hook.sh+1−1 pkgs/build-support/rust/hooks/cargo-setup-hook.sh+3−1 pkgs/data/misc/iana-etc/default.nix+2−2 pkgs/desktops/gnome-3/extensions/night-theme-switcher/default.nix+2−1 pkgs/desktops/plasma-5/fetch.sh+1−1 pkgs/desktops/plasma-5/ksysguard.nix+3−2 pkgs/desktops/plasma-5/kwin/default.nix+2−2 pkgs/desktops/plasma-5/libkscreen/libkscreen-backends-path.patch+3−6 pkgs/desktops/plasma-5/plasma-browser-integration.nix+2−2 pkgs/desktops/plasma-5/plasma-desktop/hwclock-path.patch+3−3 pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch+43−33 pkgs/desktops/plasma-5/plasma-workspace/0002-absolute-wallpaper-install-dir.patch+6−6 pkgs/desktops/plasma-5/plasma-workspace/default.nix+4 pkgs/desktops/plasma-5/srcs.nix+220−196 pkgs/development/arduino/arduino-core/default.nix+1−2 pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py+1 pkgs/development/compilers/adoptopenjdk-bin/sources.json+204−204 pkgs/development/compilers/factor-lang/default.nix+2−2 pkgs/development/compilers/graalvm/default.nix+1−1 pkgs/development/compilers/gwt/2.4.0.nix+1−1 pkgs/development/compilers/kotlin/default.nix+1−2 pkgs/development/compilers/ocaml/generic.nix+4 pkgs/development/compilers/openjdk/11.nix+2−2 pkgs/development/compilers/openjdk/12.nix+2−2 pkgs/development/compilers/openjdk/13.nix+2−2 pkgs/development/compilers/openjdk/14.nix+2−2 pkgs/development/compilers/openjdk/8.nix+2−2 pkgs/development/compilers/openjdk/darwin/11.nix+2−1 pkgs/development/compilers/openjdk/darwin/8.nix+2−1 pkgs/development/compilers/openjdk/darwin/default.nix+2−1 pkgs/development/compilers/openjdk/default.nix+2−2 pkgs/development/compilers/rust/1_49.nix → pkgs/development/compilers/rust/1_50.nix+13−13 pkgs/development/haskell-modules/with-packages-wrapper.nix+1−2 pkgs/development/interpreters/angelscript/2.22.nix+2−4 pkgs/development/interpreters/angelscript/default.nix+2−4 pkgs/development/interpreters/clojurescript/lumo/default.nix+1−1 pkgs/development/interpreters/groovy/default.nix+1−2 pkgs/development/interpreters/maude/default.nix+2−1 pkgs/development/interpreters/octave/build-env.nix+2−5 pkgs/development/interpreters/perl/aarch64-darwin.patch+46 pkgs/development/interpreters/perl/default.nix+4−1 pkgs/development/interpreters/perl/wrapper.nix+2−3 pkgs/development/interpreters/python/cpython/2.7/default.nix+6 pkgs/development/interpreters/python/cpython/3.7/no-win64-workaround.patch+37 pkgs/development/interpreters/python/cpython/default.nix+5 pkgs/development/interpreters/python/wrapper.nix+9−4 pkgs/development/interpreters/qnial/default.nix+1−2 pkgs/development/interpreters/ruby/default.nix+17−7 pkgs/development/interpreters/ruby/do-not-regenerate-revision.h.patch+23 pkgs/development/interpreters/ruby/do-not-update-gems-baseruby.patch+14 pkgs/development/interpreters/ruby/patchsets.nix+4−5 pkgs/development/interpreters/ruby/rvm-patchsets.nix+2−2 pkgs/development/interpreters/spidermonkey/78.nix+13−4 pkgs/development/interpreters/unicon-lang/default.nix+2−2 pkgs/development/libraries/AntTweakBar/default.nix+2−1 pkgs/development/libraries/amrnb/default.nix+1−1 pkgs/development/libraries/amrwb/default.nix+1−1 pkgs/development/libraries/boost-process/default.nix+1−1 pkgs/development/libraries/dav1d/default.nix+5−3 pkgs/development/libraries/ffmpeg-full/default.nix−5 pkgs/development/libraries/ffmpeg/4.nix+2−2 pkgs/development/libraries/freetts/default.nix+2−1 pkgs/development/libraries/gdal/2.4.nix+2−1 pkgs/development/libraries/gdal/default.nix+1−2 pkgs/development/libraries/gdal/gdal-1_11.nix+2−1 pkgs/development/libraries/glib/default.nix+7−2 pkgs/development/libraries/gsm/default.nix+2 pkgs/development/libraries/gtdialog/default.nix+2−2 pkgs/development/libraries/gtk/2.x.nix+12−2 pkgs/development/libraries/gtk/3.x.nix+14−2 pkgs/development/libraries/gtk/4.x.nix+12−1 pkgs/development/libraries/gtk/hooks/clean-immodules-cache.sh+15 pkgs/development/libraries/gtk/hooks/gtk2-clean-immodules-cache.sh−12 pkgs/development/libraries/gtk/hooks/gtk3-clean-immodules-cache.sh−11 pkgs/development/libraries/gtk/hooks/gtk4-clean-immodules-cache.sh−11 pkgs/development/libraries/hawknl/default.nix+1−1 pkgs/development/libraries/herqq/default.nix+2−2 pkgs/development/libraries/hunspell/dictionaries.nix+6−5 pkgs/development/libraries/hwloc/default.nix+2−2 pkgs/development/libraries/irrlicht/default.nix+2−1 pkgs/development/libraries/irrlicht/mac.nix+2−2 pkgs/development/libraries/jama/default.nix+1−1 pkgs/development/libraries/java/geoipjava/default.nix+2−1 pkgs/development/libraries/java/rhino/default.nix+2−1 pkgs/development/libraries/kde-frameworks/attica.nix+1−1 pkgs/development/libraries/kde-frameworks/fetch.sh+1−1 pkgs/development/libraries/kde-frameworks/karchive.nix+1−1 pkgs/development/libraries/kde-frameworks/kcodecs.nix+1−1 pkgs/development/libraries/kde-frameworks/kcompletion.nix+1−8 pkgs/development/libraries/kde-frameworks/kconfig.nix+1−1 pkgs/development/libraries/kde-frameworks/kcoreaddons.nix+1−1 pkgs/development/libraries/kde-frameworks/kdbusaddons.nix+1−1 pkgs/development/libraries/kde-frameworks/kdesu/kdesu-search-for-wrapped-daemon-first.patch+2−2 pkgs/development/libraries/kde-frameworks/kdnssd.nix+1−1 pkgs/development/libraries/kde-frameworks/kfilemetadata/cmake-install-paths.patch+1−1 pkgs/development/libraries/kde-frameworks/ki18n.nix+1−1 pkgs/development/libraries/kde-frameworks/kidletime.nix+1−1 pkgs/development/libraries/kde-frameworks/kinit/0001-kinit-libpath.patch+1−1 pkgs/development/libraries/kde-frameworks/kinit/0002-start_kdeinit-path.patch+1−1 pkgs/development/libraries/kde-frameworks/kinit/0003-kdeinit-extra-libs.patch+1−1 pkgs/development/libraries/kde-frameworks/kio/default.nix+1−6 pkgs/development/libraries/kde-frameworks/kirigami2.nix+1−1 pkgs/development/libraries/kde-frameworks/kitemmodels.nix+1−1 pkgs/development/libraries/kde-frameworks/kitemviews.nix+1−1 pkgs/development/libraries/kde-frameworks/kplotting.nix+1−1 pkgs/development/libraries/kde-frameworks/kwayland.nix+1−1 pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix+1−1 pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix+1−1 pkgs/development/libraries/kde-frameworks/solid.nix+1−1 pkgs/development/libraries/kde-frameworks/sonnet.nix+1−1 pkgs/development/libraries/kde-frameworks/srcs.nix+332−332 pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix+1−1 pkgs/development/libraries/kde-frameworks/threadweaver.nix+1−1 pkgs/development/libraries/lib3ds/default.nix+1−1 pkgs/development/libraries/libb64/default.nix+1−1 pkgs/development/libraries/libdeflate/default.nix+3−1 pkgs/development/libraries/libedit/default.nix+2−2 pkgs/development/libraries/libf2c/default.nix+1−1 pkgs/development/libraries/libgcrypt/default.nix+3−14 pkgs/development/libraries/libgphoto2/default.nix+2−2 pkgs/development/libraries/libimagequant/default.nix+2−2 pkgs/development/libraries/libixp-hg/default.nix+2−1 pkgs/development/libraries/libjson/default.nix+1−1 pkgs/development/libraries/liblangtag/default.nix+2−3 pkgs/development/libraries/libndctl/default.nix+2−2 pkgs/development/libraries/libproxy/default.nix+4−37 pkgs/development/libraries/libqmi/default.nix+39−12 pkgs/development/libraries/libqrtr-glib/default.nix+46 pkgs/development/libraries/libspotify/default.nix+1−1 pkgs/development/libraries/libtiff/default.nix+7−4 pkgs/development/libraries/libwacom/default.nix+2−2 pkgs/development/libraries/minizip2/default.nix+2−2 pkgs/development/libraries/muparser/default.nix+2−3 pkgs/development/libraries/mygui/default.nix+2−2 pkgs/development/libraries/nvidia-video-sdk/default.nix+1−1 pkgs/development/libraries/openexrid-unstable/default.nix+2−1 pkgs/development/libraries/openfx/default.nix+1−1 pkgs/development/libraries/openvdb/default.nix+2−1 pkgs/development/libraries/poppler/default.nix+2−2 pkgs/development/libraries/protobuf/3.15.nix+6 pkgs/development/libraries/python-qt/default.nix+2−2 pkgs/development/libraries/science/math/liblapack/default.nix+26−3 pkgs/development/libraries/slib/default.nix+2−1 pkgs/development/libraries/tnt/default.nix+1−1 pkgs/development/libraries/wtk/default.nix+1−1 pkgs/development/misc/avr8-burn-omat/default.nix+1−1 pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix+1−2 pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix+1−2 pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix+1−2 pkgs/development/ocaml-modules/ocaml-cairo/default.nix+2−2 pkgs/development/pharo/launcher/default.nix+2−1 pkgs/development/pharo/vm/build-vm.nix+1−2 pkgs/development/pharo/vm/share.nix+1−1 pkgs/development/python-modules/Cython/default.nix+11−2 pkgs/development/python-modules/aioambient/default.nix+2−2 pkgs/development/python-modules/aioflo/default.nix+2−2 pkgs/development/python-modules/aioguardian/default.nix+2−2 pkgs/development/python-modules/aiohttp/default.nix+35−40 pkgs/development/python-modules/aiorecollect/default.nix+2−2 pkgs/development/python-modules/astroid/default.nix+20−15 pkgs/development/python-modules/async-upnp-client/default.nix+2−2 pkgs/development/python-modules/build/default.nix+30−9 pkgs/development/python-modules/check-manifest/default.nix+24−3 pkgs/development/python-modules/curio/default.nix+15 pkgs/development/python-modules/lxml/default.nix+3−2 pkgs/development/python-modules/parso/default.nix+10 pkgs/development/python-modules/poetry-core/default.nix+2−2 pkgs/development/python-modules/psutil/default.nix+12−7 pkgs/development/python-modules/py-cpuinfo/default.nix+18−4 pkgs/development/python-modules/pyairvisual/default.nix+2−2 pkgs/development/python-modules/pyflunearyou/default.nix+2−2 pkgs/development/python-modules/pyiqvia/default.nix+2−2 pkgs/development/python-modules/pylint/default.nix+44−27 pkgs/development/python-modules/pyopenssl/default.nix+3−2 pkgs/development/python-modules/pyopenuv/default.nix+2−2 pkgs/development/python-modules/pytest-catchlog/default.nix+2−1 pkgs/development/python-modules/pytest-forked/default.nix+7−1 pkgs/development/python-modules/pytest-freezegun/default.nix+2−1 pkgs/development/python-modules/pytest-timeout/default.nix+1−1 pkgs/development/python-modules/pytest-xdist/default.nix+4−1 pkgs/development/python-modules/pytest/default.nix+12−10 pkgs/development/python-modules/python-simple-hipchat/default.nix+1−1 pkgs/development/python-modules/pytile/default.nix−4 pkgs/development/python-modules/regenmaschine/default.nix+2−2 pkgs/development/python-modules/setuptools-rust/default.nix+4−1 pkgs/development/python-modules/setuptools-rust/pyo3-test/default.nix+21 pkgs/development/python-modules/simplejson/default.nix+14−18 pkgs/development/python-modules/trio/default.nix+4−2 pkgs/development/python-modules/urllib3/2.nix+74 pkgs/development/python-modules/urllib3/default.nix+53−11 pkgs/development/ruby-modules/gem/default.nix+6 pkgs/development/tools/analysis/emma/default.nix+1−1 pkgs/development/tools/analysis/randoop/default.nix+1−1 pkgs/development/tools/build-managers/bazel/bazel_4/default.nix+1−1 pkgs/development/tools/build-managers/cmake/default.nix+4−6 pkgs/development/tools/build-managers/cmake/setup-hook.sh−3 pkgs/development/tools/build-managers/gradle/default.nix+2−2 pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch+4−4 pkgs/development/tools/build-managers/meson/default.nix+2−2 pkgs/development/tools/build-managers/meson/more-env-vars.patch+5−5 pkgs/development/tools/build-managers/msbuild/default.nix+1−1 pkgs/development/tools/continuous-integration/gocd-agent/default.nix+1−1 pkgs/development/tools/continuous-integration/gocd-server/default.nix+1−1 pkgs/development/tools/database/sqldeveloper/default.nix+1−2 pkgs/development/tools/eclipse-mat/default.nix+1−1 pkgs/development/tools/electron/generic.nix+1−1 pkgs/development/tools/galen/default.nix+1−1 pkgs/development/tools/kubie/default.nix+3−3 pkgs/development/tools/misc/autoconf-archive/default.nix+2−2 pkgs/development/tools/misc/jscoverage/default.nix+2−1 pkgs/development/tools/misc/premake/3.nix+1−1 pkgs/development/tools/misc/saleae-logic/default.nix+1−1 pkgs/development/tools/ocaml/opam/1.2.2.nix+2−2 pkgs/development/tools/ocaml/opam/default.nix+2−2 pkgs/development/tools/ocaml/opam/opam.nix.pl+2−1 pkgs/development/tools/parsing/re2c/default.nix+24 pkgs/development/tools/phantomjs/default.nix+1−1 pkgs/development/tools/react-native-debugger/default.nix+1−1 pkgs/development/tools/rust/maturin/default.nix+4−1 pkgs/development/tools/rust/maturin/pyo3-test/Cargo.lock.patch+688 pkgs/development/tools/rust/maturin/pyo3-test/default.nix+12 pkgs/development/tools/rust/maturin/pyo3-test/generic.nix+45 pkgs/development/tools/sauce-connect/default.nix+1−1 pkgs/development/tools/slimerjs/default.nix+2−4 pkgs/development/tools/thrust/default.nix+2−2 pkgs/development/web/grails/default.nix+1−1 pkgs/development/web/twitter-bootstrap/default.nix+1−1 pkgs/games/crafty/default.nix+1−1 pkgs/games/dwarf-fortress/twbt/default.nix+1−1 pkgs/games/exult/default.nix+2−2 pkgs/games/gogui/default.nix+1−2 pkgs/games/keen4/default.nix+1−1 pkgs/games/nexuiz/default.nix+1−2 pkgs/games/rigsofrods/default.nix+2−2 pkgs/games/simutrans/default.nix+2−2 pkgs/games/steam/fonts.nix+1−1 pkgs/games/terraria-server/default.nix+2−2 pkgs/games/tremulous/default.nix+2−1 pkgs/games/urbanterror/default.nix+2−1 pkgs/games/worldofgoo/default.nix+1−1 pkgs/games/xonotic/default.nix+2−1 pkgs/games/zod/default.nix+2−2 pkgs/misc/drivers/foo2zjs/default.nix+2−1 pkgs/misc/emulators/atari800/default.nix+2−2 pkgs/misc/emulators/nestopia/default.nix+1−1 pkgs/misc/source-and-tags/default.nix+1−1 pkgs/misc/vscode-extensions/python/extract-nuget.nix+1−1 pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/default.nix+2−2 pkgs/os-specific/darwin/xcode/sdk-pkgs.nix+2−10 pkgs/os-specific/linux/ati-drivers/default.nix+1−1 pkgs/os-specific/linux/bluez/default.nix+2−2 pkgs/os-specific/linux/iproute/default.nix+2−2 pkgs/os-specific/linux/lsiutil/default.nix+1−1 pkgs/os-specific/linux/msr-tools/default.nix+1−1 pkgs/os-specific/linux/net-tools/default.nix+2−2 pkgs/os-specific/linux/numactl/default.nix+3−1 pkgs/os-specific/linux/seturgent/default.nix+2−1 pkgs/servers/amqp/rabbitmq-server/default.nix+2−1 pkgs/servers/computing/storm/default.nix+1−1 pkgs/servers/http/jboss/default.nix+1−1 pkgs/servers/http/tomcat/axis2/default.nix+2−1 pkgs/servers/jellyfin/10.5.x.nix+1−1 pkgs/servers/monitoring/nagios/default.nix+2−1 pkgs/servers/monitoring/net-snmp/default.nix+2−2 pkgs/servers/nosql/riak/2.2.0.nix+2−1 pkgs/servers/rainloop/default.nix+1−1 pkgs/servers/search/elasticsearch/plugins.nix+1−1 pkgs/servers/sql/mysql/jdbc/default.nix+2−1 pkgs/servers/web-apps/moodle/moodle-utils.nix+3−2 pkgs/servers/x11/xorg/default.nix+6−6 pkgs/servers/x11/xorg/tarballs.list+2−2 pkgs/stdenv/darwin/default.nix+4−4 pkgs/stdenv/darwin/make-bootstrap-tools.nix+1−1 pkgs/stdenv/generic/make-derivation.nix+1 pkgs/tools/archivers/zpaq/default.nix+1−2 pkgs/tools/archivers/zpaq/zpaqd.nix+1−1 pkgs/tools/cd-dvd/uif2iso/default.nix+2−1 pkgs/tools/compression/bzip2/default.nix+4−2 pkgs/tools/graphics/fgallery/default.nix+2−2 pkgs/tools/graphics/pdfread/default.nix+2−2 pkgs/tools/graphics/structure-synth/default.nix+2−2 pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix+1−1 pkgs/tools/misc/debian-devscripts/default.nix+2−2 pkgs/tools/misc/ent/default.nix+1−1 pkgs/tools/misc/gams/default.nix+2−1 pkgs/tools/misc/graylog/plugins.nix+1−1 pkgs/tools/misc/jdiskreport/default.nix+1−2 pkgs/tools/misc/mc/default.nix+1−2 pkgs/tools/misc/megacli/default.nix+2−1 pkgs/tools/misc/phoronix-test-suite/default.nix+2−2 pkgs/tools/misc/thin-provisioning-tools/default.nix+2−2 pkgs/tools/misc/umlet/default.nix+1−1 pkgs/tools/misc/vorbisgain/default.nix+2−1 pkgs/tools/networking/dd-agent/5.nix+1−1 pkgs/tools/networking/p2p/azureus/default.nix+1−1 pkgs/tools/security/bmrsa/11.nix+1−1 pkgs/tools/security/chntpw/default.nix+2−2 pkgs/tools/security/pcsc-scm-scl011/default.nix+1−1 pkgs/tools/security/pinentry/mac.nix+6 pkgs/tools/security/rarcrack/default.nix+2−1 pkgs/tools/security/sonar-scanner-cli/default.nix+1−1 pkgs/tools/text/xml/basex/default.nix+2−1 pkgs/tools/typesetting/tex/lkproof/default.nix+1−1 pkgs/tools/typesetting/tex/pgf/3.x.nix+1−1 pkgs/tools/typesetting/tex/pgfplots/default.nix+1−1 pkgs/tools/virtualization/ec2-ami-tools/default.nix+1−2 pkgs/tools/virtualization/ec2-api-tools/default.nix+1−2 pkgs/top-level/all-packages.nix+19−11 pkgs/top-level/dotnet-packages.nix+1−1 pkgs/top-level/python-packages.nix+36−5
doc/languages-frameworks/rust.section.md+14−6
@@ -72,8 +72,8 @@ For `cargoHash` you can use:
7272Per the instructions in the [Cargo Book](https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html)
7373best practices guide, Rust applications should always commit the `Cargo.lock`
7474file in git to ensure a reproducible build. However, a few packages do not, and
75−Nix depends on this file, so if it missing you can use `cargoPatches` to apply
76−it in the `patchPhase`. Consider sending a PR upstream with a note to the
75+Nix depends on this file, so if it is missing you can use `cargoPatches` to
76+apply it in the `patchPhase`. Consider sending a PR upstream with a note to the
7777maintainer describing why it's important to include in the application.
7878
7979The fetcher will verify that the `Cargo.lock` file is in sync with the `src`
@@ -157,7 +157,7 @@ path) can be passed directly to `buildRustPackage`:
157157
158158```nix
159159pkgs.rustPlatform.buildRustPackage {
160− (...)
160+ /* ... */
161161 target = "x86_64-fortanix-unknown-sgx";
162162}
163163```
@@ -192,6 +192,13 @@ rustPlatform.buildRustPackage {
192192Please note that the code will be compiled twice here: once in `release` mode
193193for the `buildPhase`, and again in `debug` mode for the `checkPhase`.
194194
195+Test flags, e.g., `--features xxx/yyy`, can be passed to `cargo test` via the
196+`cargoTestFlags` attribute.
197+
198+Another attribute, called `checkFlags`, is used to pass arguments to the test
199+binary itself, as stated
200+(here)[https://doc.rust-lang.org/cargo/commands/cargo-test.html].
201+
195202#### Tests relying on the structure of the `target/` directory
196203
197204Some tests may rely on the structure of the `target/` directory. Those tests
@@ -321,9 +328,10 @@ attributes can also be used:
321328 variable `buildAndTestSubdir` can be used to build a crate in a
322329 Cargo workspace. Additional maturin flags can be passed through
323330 `maturinBuildFlags`.
324−* `cargoCheckHook`: run tests using Cargo. Additional flags can be
325− passed to Cargo using `checkFlags` and `checkFlagsArray`. By
326− default, tests are run in parallel. This can be disabled by setting
331+* `cargoCheckHook`: run tests using Cargo. The build type for checks
332+ can be set using `cargoCheckType`. Additional flags can be passed to
333+ the tests using `checkFlags` and `checkFlagsArray`. By default,
334+ tests are run in parallel. This can be disabled by setting
327335 `dontUseCargoParallelTests`.
328336* `cargoInstallHook`: install binaries and static/shared libraries
329337 that were built using `cargoBuildHook`.
lib/systems/default.nix+5
@@ -107,6 +107,11 @@ rec {
107107 powerpc64le = "ppc64le";
108108 }.${final.parsed.cpu.name} or final.parsed.cpu.name;
109109
110+ darwinArch = {
111+ armv7a = "armv7";
112+ aarch64 = "arm64";
113+ }.${final.parsed.cpu.name} or final.parsed.cpu.name;
114+
110115 emulator = pkgs: let
111116 qemu-user = pkgs.qemu.override {
112117 smartcardSupport = false;
nixos/modules/services/misc/redmine.nix+1−1
@@ -28,7 +28,7 @@ let
2828 unpack = id: (name: source:
2929 pkgs.stdenv.mkDerivation {
3030 name = "redmine-${id}-${name}";
31− buildInputs = [ pkgs.unzip ];
31+ nativeBuildInputs = [ pkgs.unzip ];
3232 buildCommand = ''
3333 mkdir -p $out
3434 cd $out
nixos/modules/services/web-apps/dokuwiki.nix+2−2
@@ -193,7 +193,7 @@ let
193193 };
194194 sourceRoot = ".";
195195 # We need unzip to build this package
196− buildInputs = [ pkgs.unzip ];
196+ nativeBuildInputs = [ pkgs.unzip ];
197197 # Installing simply means copying all files to the output directory
198198 installPhase = "mkdir -p $out; cp -R * $out/";
199199 };
@@ -220,7 +220,7 @@ let
220220 sha256 = "4de5ff31d54dd61bbccaf092c9e74c1af3a4c53e07aa59f60457a8f00cfb23a6";
221221 };
222222 # We need unzip to build this package
223− buildInputs = [ pkgs.unzip ];
223+ nativeBuildInputs = [ pkgs.unzip ];
224224 # Installing simply means copying all files to the output directory
225225 installPhase = "mkdir -p $out; cp -R * $out/";
226226 };
nixos/modules/services/web-apps/wordpress.nix+2−2
@@ -109,7 +109,7 @@ let
109109 sha256 = "1rhba5h5fjlhy8p05zf0p14c9iagfh96y91r36ni0rmk6y891lyd";
110110 };
111111 # We need unzip to build this package
112− buildInputs = [ pkgs.unzip ];
112+ nativeBuildInputs = [ pkgs.unzip ];
113113 # Installing simply means copying all files to the output directory
114114 installPhase = "mkdir -p $out; cp -R * $out/";
115115 };
@@ -136,7 +136,7 @@ let
136136 sha256 = "0rjwm811f4aa4q43r77zxlpklyb85q08f9c8ns2akcarrvj5ydx3";
137137 };
138138 # We need unzip to build this package
139− buildInputs = [ pkgs.unzip ];
139+ nativeBuildInputs = [ pkgs.unzip ];
140140 # Installing simply means copying all files to the output directory
141141 installPhase = "mkdir -p $out; cp -R * $out/";
142142 };
nixos/tests/dokuwiki.nix+2−2
@@ -9,7 +9,7 @@ let
99 sha256 = "4de5ff31d54dd61bbccaf092c9e74c1af3a4c53e07aa59f60457a8f00cfb23a6";
1010 };
1111 # We need unzip to build this package
12− buildInputs = [ pkgs.unzip ];
12+ nativeBuildInputs = [ pkgs.unzip ];
1313 # Installing simply means copying all files to the output directory
1414 installPhase = "mkdir -p $out; cp -R * $out/";
1515 };
@@ -24,7 +24,7 @@ let
2424 sha256 = "e40ed7dd6bbe7fe3363bbbecb4de481d5e42385b5a0f62f6a6ce6bf3a1f9dfa8";
2525 };
2626 # We need unzip to build this package
27− buildInputs = [ pkgs.unzip ];
27+ nativeBuildInputs = [ pkgs.unzip ];
2828 sourceRoot = ".";
2929 # Installing simply means copying all files to the output directory
3030 installPhase = "mkdir -p $out; cp -R * $out/";
pkgs/applications/audio/espeak/default.nix+2−1
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
88 sha256 = "0n86gwh9pw0jqqpdz7mxggllfr8k0r7pc67ayy7w5z6z79kig6mz";
99 };
1010
11− buildInputs = [ unzip portaudio ];
11+ nativeBuildInputs = [ unzip ];
12+ buildInputs = [ portaudio ];
1213
1314 patches = [
1415 ./gcc6.patch
pkgs/applications/audio/espeak/edit.nix+2−2
@@ -8,8 +8,8 @@ stdenv.mkDerivation rec {
88 sha256 = "0x8s7vpb7rw5x37yjzy1f98m4f2csdg89libb74fm36gn8ly0hli";
99 };
1010
11− nativeBuildInputs = [ pkg-config ];
12− buildInputs = [ unzip portaudio wxGTK ];
11+ nativeBuildInputs = [ pkg-config unzip ];
12+ buildInputs = [ portaudio wxGTK ];
1313
1414 # TODO:
1515 # Uhm, seems like espeakedit still wants espeak-data/ in $HOME, even thought
pkgs/applications/audio/mp3gain/default.nix+2−1
@@ -7,7 +7,8 @@ stdenv.mkDerivation {
77 sha256 = "0varr6y7k8zarr56b42r0ad9g3brhn5vv3xjg1c0v19jxwr4gh2w";
88 };
99
10− buildInputs = [ unzip mpg123 ];
10+ nativeBuildInputs = [ unzip ];
11+ buildInputs = [ mpg123 ];
1112
1213 sourceRoot = ".";
1314
pkgs/applications/audio/mpg123/default.nix+2−2
@@ -7,11 +7,11 @@
77}:
88
99stdenv.mkDerivation rec {
10− name = "mpg123-1.26.3";
10+ name = "mpg123-1.26.4";
1111
1212 src = fetchurl {
1313 url = "mirror://sourceforge/mpg123/${name}.tar.bz2";
14− sha256 = "0vkcfdx0mqq6lmpczsmpa2jsb0s6dryx3i7gvr32i3w9b9w9ij9h";
14+ sha256 = "sha256-CBmRVA33pmaykEmthw8pPPoohjs2SIq01Yzqp7WEZFQ=";
1515 };
1616
1717 outputs = [ "out" "conplay" ];
pkgs/applications/audio/pd-plugins/helmholtz/default.nix+2−1
@@ -10,7 +10,8 @@ stdenv.mkDerivation {
1010 sha256 = "0h1fj7lmvq9j6rmw33rb8k0byxb898bi2xhcwkqalb84avhywgvs";
1111 };
1212
13− buildInputs = [ unzip puredata ];
13+ nativeBuildInputs = [ unzip ];
14+ buildInputs = [ puredata ];
1415
1516 unpackPhase = ''
1617 unzip $src
pkgs/applications/audio/pd-plugins/puremapping/default.nix+2−1
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
1010 sha256 = "1h7qgqd8srrxw2y1rkdw5js4k6f5vc8x6nlm2mq9mq9vjck7n1j7";
1111 };
1212
13− buildInputs = [ unzip puredata ];
13+ nativeBuildInputs = [ unzip ];
14+ buildInputs = [ puredata ];
1415
1516 unpackPhase = ''
1617 unzip $src
pkgs/applications/audio/pd-plugins/timbreid/default.nix+2−1
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
99 sha256 = "14k2xk5zrzrw1zprdbwx45hrlc7ck8vq4drpd3l455i5r8yk4y6b";
1010 };
1111
12− buildInputs = [ unzip puredata fftw ];
12+ nativeBuildInputs = [ unzip ];
13+ buildInputs = [ puredata fftw ];
1314
1415 unpackPhase = ''
1516 mkdir source
pkgs/applications/audio/sunvox/default.nix+1−1
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
2020 sha256 = "0lqzr68n2c6aifw2vbyars91wn1chmgb9xfdk463g4vjqiava3ih";
2121 };
2222
23− buildInputs = [ unzip ];
23+ nativeBuildInputs = [ unzip ];
2424
2525 unpackPhase = "unzip $src";
2626
pkgs/applications/editors/android-studio/common.nix+1−1
@@ -65,9 +65,9 @@ let
6565 sha256 = sha256Hash;
6666 };
6767
68+ nativeBuildInputs = [ unzip ];
6869 buildInputs = [
6970 makeWrapper
70− unzip
7171 ];
7272 installPhase = ''
7373 cp -r . $out
pkgs/applications/editors/edit/default.nix+11−2
@@ -10,8 +10,17 @@ stdenv.mkDerivation {
1010 sha256 = "0rsmp7ydmrq3xx5q19566is9a2v2w5yfsphivfc7j4ljp32jlyyy";
1111 };
1212
13− nativeBuildInputs = [ unzip pkg-config cwebbin ];
14− buildInputs = [ ncurses libX11 libXft ];
13+ nativeBuildInputs = [
14+ unzip
15+ pkg-config
16+ cwebbin
17+ ];
18+
19+ buildInputs = [
20+ ncurses
21+ libX11
22+ libXft
23+ ];
1524
1625 preBuild = ''
1726 ctangle *.w
pkgs/applications/editors/fte/default.nix+2−1
@@ -3,7 +3,8 @@
33stdenv.mkDerivation rec {
44 name = "fte-0.50.02";
55
6− buildInputs = [ unzip perl libX11 libXpm gpm ncurses slang ];
6+ nativeBuildInputs = [ unzip ];
7+ buildInputs = [ perl libX11 libXpm gpm ncurses slang ];
78
89 ftesrc = fetchurl {
910 url = "mirror://sourceforge/fte/fte-20110708-src.zip";
pkgs/applications/editors/monodevelop/default.nix+2−2
@@ -34,10 +34,10 @@ stdenv.mkDerivation rec {
3434 patchFlags = [ "-p2" ];
3535 patches = [ ./git-revert-12d610fb3f6dce121df538e36f21d8c2eeb0a6e3.patch ];
3636
37− nativeBuildInputs = [ pkg-config ];
37+ nativeBuildInputs = [ pkg-config unzip ];
3838 buildInputs = [
3939 autoconf automake shared-mime-info intltool
40− mono gtk-sharp-2_0 gnome-sharp unzip
40+ mono gtk-sharp-2_0 gnome-sharp
4141 dotnetPackages.NUnit
4242 dotnetPackages.NUnitRunners
4343 dotnetPackages.Nuget
pkgs/applications/editors/netbeans/default.nix+2−2
@@ -56,8 +56,8 @@ stdenv.mkDerivation {
5656 ln -s ${desktopItem}/share/applications/* $out/share/applications
5757 '';
5858
59− nativeBuildInputs = [ makeWrapper ];
60− buildInputs = [ perl python unzip libicns imagemagick ];
59+ nativeBuildInputs = [ makeWrapper unzip ];
60+ buildInputs = [ perl python libicns imagemagick ];
6161
6262 meta = {
6363 description = "An integrated development environment for Java, C, C++ and PHP";
pkgs/applications/editors/textadept/10/default.nix+2−2
@@ -4,9 +4,9 @@ stdenv.mkDerivation rec {
44 version = "10.8";
55 pname = "textadept";
66
7− nativeBuildInputs = [ pkg-config ];
7+ nativeBuildInputs = [ pkg-config unzip ];
88 buildInputs = [
9− gtk2 ncurses glib unzip zip
9+ gtk2 ncurses glib zip
1010 ];
1111
1212 src = fetchhg {
pkgs/applications/editors/textadept/11/default.nix+2−2
@@ -4,9 +4,9 @@ stdenv.mkDerivation rec {
44 version = "11.0_beta";
55 pname = "textadept11";
66
7− nativeBuildInputs = [ pkg-config ];
7+ nativeBuildInputs = [ pkg-config unzip ];
88 buildInputs = [
9− gtk2 ncurses glib unzip zip
9+ gtk2 ncurses glib zip
1010 ];
1111
1212 src = fetchFromGitHub {
pkgs/applications/editors/vscode/generic.nix+3−5
@@ -60,14 +60,12 @@ in
6060 '';
6161 };
6262
63− buildInputs = (if stdenv.isDarwin
64− then [ unzip ]
65− else [ gtk2 at-spi2-atk wrapGAppsHook ] ++ atomEnv.packages)
66− ++ [ libsecret libXScrnSaver libxshmfence ];
63+ buildInputs = [ libsecret libXScrnSaver libxshmfence ]
64+ ++ lib.optionals (!stdenv.isDarwin) ([ gtk2 at-spi2-atk wrapGAppsHook ] ++ atomEnv.packages);
6765
6866 runtimeDependencies = lib.optional (stdenv.isLinux) [ (lib.getLib systemd) fontconfig.lib libdbusmenu ];
6967
70− nativeBuildInputs = lib.optional (!stdenv.isDarwin) autoPatchelfHook;
68+ nativeBuildInputs = [unzip] ++ lib.optional (!stdenv.isDarwin) autoPatchelfHook;
7169
7270 dontBuild = true;
7371 dontConfigure = true;
pkgs/applications/graphics/avocode/default.nix+2−2
@@ -58,8 +58,8 @@ stdenv.mkDerivation rec {
5858 comment = "The bridge between designers and developers";
5959 };
6060
61− nativeBuildInputs = [makeWrapper wrapGAppsHook];
62− buildInputs = [ unzip gtk3 gnome3.adwaita-icon-theme ];
61+ nativeBuildInputs = [makeWrapper wrapGAppsHook unzip];
62+ buildInputs = [ gtk3 gnome3.adwaita-icon-theme ];
6363
6464 # src is producing multiple folder on unzip so we must
6565 # override unpackCmd to extract it into newly created folder
pkgs/applications/graphics/imagej/default.nix+1−2
@@ -15,8 +15,7 @@ let
1515 url = "https://wsr.imagej.net/distros/cross-platform/ij150.zip";
1616 sha256 = "97aba6fc5eb908f5160243aebcdc4965726693cb1353d9c0d71b8f5dd832cb7b";
1717 };
18− nativeBuildInputs = [ makeWrapper ];
19− buildInputs = [ unzip ];
18+ nativeBuildInputs = [ makeWrapper unzip ];
2019 inherit jre;
2120
2221 # JAR files that are intended to be used by other packages
pkgs/applications/graphics/zgrviewer/default.nix+2−1
@@ -6,7 +6,8 @@ stdenv.mkDerivation rec {
66 url = "mirror://sourceforge/zvtm/${pname}/${version}/${pname}-${version}.zip";
77 sha256 = "1yg2rck81sqqrgfi5kn6c1bz42dr7d0zqpcsdjhicssi1y159f23";
88 };
9− buildInputs = [jre unzip];
9+ nativeBuildInputs = [ unzip ];
10+ buildInputs = [jre];
1011 buildPhase = "";
1112 installPhase = ''
1213 mkdir -p "$out"/{bin,share/java/zvtm/plugins,share/doc/zvtm}
pkgs/applications/kde/fetch.sh+1−1
@@ -1 +1 @@
1−WGET_ARGS=( http://download.kde.org/stable/release-service/20.12.1/src -A '*.tar.xz' )
1+WGET_ARGS=( http://download.kde.org/stable/release-service/20.12.2/src -A '*.tar.xz' )
pkgs/applications/kde/srcs.nix+896−896
@@ -4,1795 +4,1795 @@
44
55{
66 akonadi = {
7− version = "20.12.1";
7+ version = "20.12.2";
88 src = fetchurl {
9− url = "${mirror}/stable/release-service/20.12.1/src/akonadi-20.12.1.tar.xz";
10− sha256 = "1173365c84fq5vn58blsmbdp9x34gf2yrwvsi89i0l7xhpz8zx5k";
11− name = "akonadi-20.12.1.tar.xz";
9+ url = "${mirror}/stable/release-service/20.12.2/src/akonadi-20.12.2.tar.xz";
10+ sha256 = "0659vgj8y77i0axdwwajaw6kxfa48j6s56nl6xhnv8686ss8plkw";
11+ name = "akonadi-20.12.2.tar.xz";
1212 };
1313 };
1414 akonadi-calendar = {
15− version = "20.12.1";
15+ version = "20.12.2";
1616 src = fetchurl {
17− url = "${mirror}/stable/release-service/20.12.1/src/akonadi-calendar-20.12.1.tar.xz";
18− sha256 = "0zzy4f03zypj4crjy0fhk5xjgipflal3gpfibav2wcmgx034znw5";
19− name = "akonadi-calendar-20.12.1.tar.xz";
17+ url = "${mirror}/stable/release-service/20.12.2/src/akonadi-calendar-20.12.2.tar.xz";
18+ sha256 = "0vzv4yycb2nnz5ifsydv0k080wgnhjzim6lfd6qrh38mgxpb2hzw";
19+ name = "akonadi-calendar-20.12.2.tar.xz";
2020 };
2121 };
2222 akonadi-calendar-tools = {
23− version = "20.12.1";
23+ version = "20.12.2";
2424 src = fetchurl {
25− url = "${mirror}/stable/release-service/20.12.1/src/akonadi-calendar-tools-20.12.1.tar.xz";
26− sha256 = "1x5zmv32iaf17n9b8y034yhwq0dhwjwxw3i5cj97k4dpyar5s72q";
27− name = "akonadi-calendar-tools-20.12.1.tar.xz";
25+ url = "${mirror}/stable/release-service/20.12.2/src/akonadi-calendar-tools-20.12.2.tar.xz";
26+ sha256 = "06bzha5h14x6m4xzbbz2h3s00v4pc2a8d716dav9bqi0pvvq3cj0";
27+ name = "akonadi-calendar-tools-20.12.2.tar.xz";
2828 };
2929 };
3030 akonadiconsole = {
31− version = "20.12.1";
31+ version = "20.12.2";
3232 src = fetchurl {
33− url = "${mirror}/stable/release-service/20.12.1/src/akonadiconsole-20.12.1.tar.xz";
34− sha256 = "0rf7ckra0yjkwspmd4401lssiss2p8qrw9rd6j5gbw7kii05bcmz";
35− name = "akonadiconsole-20.12.1.tar.xz";
33+ url = "${mirror}/stable/release-service/20.12.2/src/akonadiconsole-20.12.2.tar.xz";
34+ sha256 = "12fslhpxah99fzvg3a1g67n69mi4xvgz9ra787pdvzrs0lca9xa0";
35+ name = "akonadiconsole-20.12.2.tar.xz";
3636 };
3737 };
3838 akonadi-contacts = {
39− version = "20.12.1";
39+ version = "20.12.2";
4040 src = fetchurl {
41− url = "${mirror}/stable/release-service/20.12.1/src/akonadi-contacts-20.12.1.tar.xz";
42− sha256 = "0gxcs8nn07y6ln5ymsbdhcm63zqxcq2ja2sxziim65bfg9g85arl";
43− name = "akonadi-contacts-20.12.1.tar.xz";
41+ url = "${mirror}/stable/release-service/20.12.2/src/akonadi-contacts-20.12.2.tar.xz";
42+ sha256 = "05y1rpvq1shiqlgql56k052glsslawy742q4n2hs301xhg0izavz";
43+ name = "akonadi-contacts-20.12.2.tar.xz";
4444 };
4545 };
4646 akonadi-import-wizard = {
47− version = "20.12.1";
47+ version = "20.12.2";
4848 src = fetchurl {
49− url = "${mirror}/stable/release-service/20.12.1/src/akonadi-import-wizard-20.12.1.tar.xz";
50− sha256 = "1wdhgvv2zblyhcxrvby7ic3449hdmcnn3hvcswgwrgbcy4bzz7zz";
51− name = "akonadi-import-wizard-20.12.1.tar.xz";
49+ url = "${mirror}/stable/release-service/20.12.2/src/akonadi-import-wizard-20.12.2.tar.xz";
50+ sha256 = "1gqjr5k6kkxi77vq0f6mc5mr31qvjsiicj6sxwpbm0c34vydfzym";
51+ name = "akonadi-import-wizard-20.12.2.tar.xz";
5252 };
5353 };
5454 akonadi-mime = {
55− version = "20.12.1";
55+ version = "20.12.2";
5656 src = fetchurl {
57− url = "${mirror}/stable/release-service/20.12.1/src/akonadi-mime-20.12.1.tar.xz";
58− sha256 = "1xsrc8572zlslabn47km58sr48wdb0pmfrh3jbn9227w9iwir3z5";
59− name = "akonadi-mime-20.12.1.tar.xz";
57+ url = "${mirror}/stable/release-service/20.12.2/src/akonadi-mime-20.12.2.tar.xz";
58+ sha256 = "0zdgkny32zwa2r2yhi285f56jkj0ini6p3sv5hi7f43mi7r5m994";
59+ name = "akonadi-mime-20.12.2.tar.xz";
6060 };
6161 };
6262 akonadi-notes = {
63− version = "20.12.1";
63+ version = "20.12.2";
6464 src = fetchurl {
65− url = "${mirror}/stable/release-service/20.12.1/src/akonadi-notes-20.12.1.tar.xz";
66− sha256 = "15d23wm0kymifcxcbip0hpnzwmzdjwxmcvqvmwgq00vy81j6k7wm";
67− name = "akonadi-notes-20.12.1.tar.xz";
65+ url = "${mirror}/stable/release-service/20.12.2/src/akonadi-notes-20.12.2.tar.xz";
66+ sha256 = "0rbg2vwk0a1zbfw5cmz0jx3yzap7j6yi7c0igq1fgg3an7sw4j2v";
67+ name = "akonadi-notes-20.12.2.tar.xz";
6868 };
6969 };
7070 akonadi-search = {
71− version = "20.12.1";
71+ version = "20.12.2";
7272 src = fetchurl {
73− url = "${mirror}/stable/release-service/20.12.1/src/akonadi-search-20.12.1.tar.xz";
74− sha256 = "065qp3nf8274fh0bna8hjs28p030wgfnr3gnp7b2791kzp25l488";
75− name = "akonadi-search-20.12.1.tar.xz";
73+ url = "${mirror}/stable/release-service/20.12.2/src/akonadi-search-20.12.2.tar.xz";
74+ sha256 = "0m7l7f26gj018d5pipbgmmxiqky98avpypxbydrms6afdglvi5ja";
75+ name = "akonadi-search-20.12.2.tar.xz";
7676 };
7777 };
7878 akregator = {
79− version = "20.12.1";
79+ version = "20.12.2";
8080 src = fetchurl {
81− url = "${mirror}/stable/release-service/20.12.1/src/akregator-20.12.1.tar.xz";
82− sha256 = "0xs5adbq9ra0ziccl1z0nsm6kvrf8vjwa8djd3nwc2csjw8wim5k";
83− name = "akregator-20.12.1.tar.xz";
81+ url = "${mirror}/stable/release-service/20.12.2/src/akregator-20.12.2.tar.xz";
82+ sha256 = "11y2mmf2svbxvqb1bjwzrivkq8w508fwg7513bzl62pbjqa8g3gk";
83+ name = "akregator-20.12.2.tar.xz";
8484 };
8585 };
8686 analitza = {
87− version = "20.12.1";
87+ version = "20.12.2";
8888 src = fetchurl {
89− url = "${mirror}/stable/release-service/20.12.1/src/analitza-20.12.1.tar.xz";
90− sha256 = "1qnqqbrjpzndbffjwqlyfqmxxxz04fi3i2g8dx6y8q79z927fzkd";
91− name = "analitza-20.12.1.tar.xz";
89+ url = "${mirror}/stable/release-service/20.12.2/src/analitza-20.12.2.tar.xz";
90+ sha256 = "09qpqjyps9h8wc8dvbnj8iz2xc4naxjdicqxsbfwfly5wbf8xq6x";
91+ name = "analitza-20.12.2.tar.xz";
9292 };
9393 };
9494 ark = {
95− version = "20.12.1";
95+ version = "20.12.2";
9696 src = fetchurl {
97− url = "${mirror}/stable/release-service/20.12.1/src/ark-20.12.1.tar.xz";
98− sha256 = "18zaaawwhlci23hkzjl535qsi8wdjc05hij3r76225jb1jb6cwrm";
99− name = "ark-20.12.1.tar.xz";
97+ url = "${mirror}/stable/release-service/20.12.2/src/ark-20.12.2.tar.xz";
98+ sha256 = "1p8ylvk4g1x2mmfdprz911iivcvr4mciam427b6ygdrhqc7rbbqb";
99+ name = "ark-20.12.2.tar.xz";
100100 };
101101 };
102102 artikulate = {
103− version = "20.12.1";
103+ version = "20.12.2";
104104 src = fetchurl {
105− url = "${mirror}/stable/release-service/20.12.1/src/artikulate-20.12.1.tar.xz";
106− sha256 = "1cvpya408r521p9398mk0xn8pb6awqm74qcjy2r0ylx0l6bkv3ca";
107− name = "artikulate-20.12.1.tar.xz";
105+ url = "${mirror}/stable/release-service/20.12.2/src/artikulate-20.12.2.tar.xz";
106+ sha256 = "0s6vjhipb4i6bv9ff7nzm9gza8jghih9kf7f7ynq10109fk8gy6i";
107+ name = "artikulate-20.12.2.tar.xz";
108108 };
109109 };
110110 audiocd-kio = {
111− version = "20.12.1";
111+ version = "20.12.2";
112112 src = fetchurl {
113− url = "${mirror}/stable/release-service/20.12.1/src/audiocd-kio-20.12.1.tar.xz";
114− sha256 = "1rlr1w0cy3q31jsaqiv50frqcl3x5jq31pnrkmyhgy23mays8ly1";
115− name = "audiocd-kio-20.12.1.tar.xz";
113+ url = "${mirror}/stable/release-service/20.12.2/src/audiocd-kio-20.12.2.tar.xz";
114+ sha256 = "0kd7yxl571pwrijwn78pigdclwqpmd50b5cj4lna481q78f91zsa";
115+ name = "audiocd-kio-20.12.2.tar.xz";
116116 };
117117 };
118118 baloo-widgets = {
119− version = "20.12.1";
119+ version = "20.12.2";
120120 src = fetchurl {
121− url = "${mirror}/stable/release-service/20.12.1/src/baloo-widgets-20.12.1.tar.xz";
122− sha256 = "115y0cdlsdzx6c017gr8x6in9jxyw0sqyamakqgfyy5phn203yr3";
123− name = "baloo-widgets-20.12.1.tar.xz";
121+ url = "${mirror}/stable/release-service/20.12.2/src/baloo-widgets-20.12.2.tar.xz";
122+ sha256 = "0w9jrx2mz1kyn2az6jx4kympl6zd950waz4zj97cjrcq2dg5a85g";
123+ name = "baloo-widgets-20.12.2.tar.xz";
124124 };
125125 };
126126 blinken = {
127− version = "20.12.1";
127+ version = "20.12.2";
128128 src = fetchurl {
129− url = "${mirror}/stable/release-service/20.12.1/src/blinken-20.12.1.tar.xz";
130− sha256 = "05dbmh1lk1ag735yiv7vql6fx15lw9a3qihxflzhbfrgng7dsxks";
131− name = "blinken-20.12.1.tar.xz";
129+ url = "${mirror}/stable/release-service/20.12.2/src/blinken-20.12.2.tar.xz";
130+ sha256 = "0a0nkmbx1bkqjs7cf5qqm877wqvzdx9cxm9395jfxcycn5pyfps9";
131+ name = "blinken-20.12.2.tar.xz";
132132 };
133133 };
134134 bomber = {
135− version = "20.12.1";
135+ version = "20.12.2";
136136 src = fetchurl {
137− url = "${mirror}/stable/release-service/20.12.1/src/bomber-20.12.1.tar.xz";
138− sha256 = "07iy6b8hwklb5mgrf8sagmrza78p3yf7i4x7w9lb2z9v2x5qw22y";
139− name = "bomber-20.12.1.tar.xz";
137+ url = "${mirror}/stable/release-service/20.12.2/src/bomber-20.12.2.tar.xz";
138+ sha256 = "08lyj6rn9jhhwzpwh2c14v8jiwishi1wk19nm5wazy2iajbd88jv";
139+ name = "bomber-20.12.2.tar.xz";
140140 };
141141 };
142142 bovo = {
143− version = "20.12.1";
143+ version = "20.12.2";
144144 src = fetchurl {
145− url = "${mirror}/stable/release-service/20.12.1/src/bovo-20.12.1.tar.xz";
146− sha256 = "1wrw81xrayhjadvjfi0zdc0vw445f4zmd32n0rca78i68ls5qbxv";
147− name = "bovo-20.12.1.tar.xz";
145+ url = "${mirror}/stable/release-service/20.12.2/src/bovo-20.12.2.tar.xz";
146+ sha256 = "05xx11rqqsxm084hfxnx1wzmr2wdpny3w608h8g5vby2jgdj47b7";
147+ name = "bovo-20.12.2.tar.xz";
148148 };
149149 };
150150 calendarsupport = {
151− version = "20.12.1";
151+ version = "20.12.2";
152152 src = fetchurl {
153− url = "${mirror}/stable/release-service/20.12.1/src/calendarsupport-20.12.1.tar.xz";
154− sha256 = "1accj2vx6zvqp632i5c85q4rzpg54xlihzf1rs80sdb9lch8nwrp";
155− name = "calendarsupport-20.12.1.tar.xz";
153+ url = "${mirror}/stable/release-service/20.12.2/src/calendarsupport-20.12.2.tar.xz";
154+ sha256 = "0gz3p4az49430zwgmlqjcfzjlgnaf7cl1x0qaaxyl8il14ambrbd";
155+ name = "calendarsupport-20.12.2.tar.xz";
156156 };
157157 };
158158 cantor = {
159− version = "20.12.1";
159+ version = "20.12.2";
160160 src = fetchurl {
161− url = "${mirror}/stable/release-service/20.12.1/src/cantor-20.12.1.tar.xz";
162− sha256 = "1qj6lmcgmqr110qw2r906b0kp73f9gzvm75ry1gdb77bza5g67x2";
163− name = "cantor-20.12.1.tar.xz";
161+ url = "${mirror}/stable/release-service/20.12.2/src/cantor-20.12.2.tar.xz";
162+ sha256 = "1w513a06xshdw4fcn6wmliygpjsyvqcbmfjg2bdibpsnznmk4y4p";
163+ name = "cantor-20.12.2.tar.xz";
164164 };
165165 };
166166 cervisia = {
167− version = "20.12.1";
167+ version = "20.12.2";
168168 src = fetchurl {
169− url = "${mirror}/stable/release-service/20.12.1/src/cervisia-20.12.1.tar.xz";
170− sha256 = "0hnpysp01z5a3gmm2jr2m1y7a5hcfl32lhmnrm0rg589pdxb30xf";
171− name = "cervisia-20.12.1.tar.xz";
169+ url = "${mirror}/stable/release-service/20.12.2/src/cervisia-20.12.2.tar.xz";
170+ sha256 = "08m962r6wkvih1yfj22z3nyfx6r3ac9pcc7i7dxxdkfcxhqpprhb";
171+ name = "cervisia-20.12.2.tar.xz";
172172 };
173173 };
174174 dolphin = {
175− version = "20.12.1";
175+ version = "20.12.2";
176176 src = fetchurl {
177− url = "${mirror}/stable/release-service/20.12.1/src/dolphin-20.12.1.tar.xz";
178− sha256 = "0n2g8mqq28xrjy17jyja4siaf2ac2b8gppqc19wjxn981zs545mp";
179− name = "dolphin-20.12.1.tar.xz";
177+ url = "${mirror}/stable/release-service/20.12.2/src/dolphin-20.12.2.tar.xz";
178+ sha256 = "19mss2vs074xv5qc644y87f8v99mdndhhd7hclqgq6gckxcjzy2r";
179+ name = "dolphin-20.12.2.tar.xz";
180180 };
181181 };
182182 dolphin-plugins = {
183− version = "20.12.1";
183+ version = "20.12.2";
184184 src = fetchurl {
185− url = "${mirror}/stable/release-service/20.12.1/src/dolphin-plugins-20.12.1.tar.xz";
186− sha256 = "0kn79c3w6qx70d7f8kdavl5ifq1pmcs4dc88i0zma8hskgvcjvcj";
187− name = "dolphin-plugins-20.12.1.tar.xz";
185+ url = "${mirror}/stable/release-service/20.12.2/src/dolphin-plugins-20.12.2.tar.xz";
186+ sha256 = "0zjy429cqb6nspmiharvszjhpn662y23s9wbdqs04h2p6pi8raxn";
187+ name = "dolphin-plugins-20.12.2.tar.xz";
188188 };
189189 };
190190 dragon = {
191− version = "20.12.1";
191+ version = "20.12.2";
192192 src = fetchurl {
193− url = "${mirror}/stable/release-service/20.12.1/src/dragon-20.12.1.tar.xz";
194− sha256 = "0nj2cba4w7q4q1w7lv63s9zgqrvha5figp5w9apklqps4z1d2p0s";
195− name = "dragon-20.12.1.tar.xz";
193+ url = "${mirror}/stable/release-service/20.12.2/src/dragon-20.12.2.tar.xz";
194+ sha256 = "0yssqbfgm92bls5cfy0xcqnqfqx00ns2i6rlwdlx38kfh0r47cag";
195+ name = "dragon-20.12.2.tar.xz";
196196 };
197197 };
198198 elisa = {
199− version = "20.12.1";
199+ version = "20.12.2";
200200 src = fetchurl {
201− url = "${mirror}/stable/release-service/20.12.1/src/elisa-20.12.1.tar.xz";
202− sha256 = "1lmgxi7xdyzjyi15ighkp2ylc6riqzgjmnfjc7p6na88vl2h2diy";
203− name = "elisa-20.12.1.tar.xz";
201+ url = "${mirror}/stable/release-service/20.12.2/src/elisa-20.12.2.tar.xz";
202+ sha256 = "1sl55kynkwxaypdm6zjdk85yxxq9754xm6ybxm7qdafq691g9zjr";
203+ name = "elisa-20.12.2.tar.xz";
204204 };
205205 };
206206 eventviews = {
207− version = "20.12.1";
207+ version = "20.12.2";
208208 src = fetchurl {
209− url = "${mirror}/stable/release-service/20.12.1/src/eventviews-20.12.1.tar.xz";
210− sha256 = "10nq8gx1bybhjx5dnrx2x5gslg8nw3vazy22jz03slgspm0gsajc";
211− name = "eventviews-20.12.1.tar.xz";
209+ url = "${mirror}/stable/release-service/20.12.2/src/eventviews-20.12.2.tar.xz";
210+ sha256 = "1g4aqhh2b5s45m0qqp46wazcc7rzcp3mmds4q9x3isckqpijzp39";
211+ name = "eventviews-20.12.2.tar.xz";
212212 };
213213 };
214214 ffmpegthumbs = {
215− version = "20.12.1";
215+ version = "20.12.2";
216216 src = fetchurl {
217− url = "${mirror}/stable/release-service/20.12.1/src/ffmpegthumbs-20.12.1.tar.xz";
218− sha256 = "17p9xqyfsaibhkfkhbx9mxjkdl5xdc3h91gsrkkwkqyfa5vs9c5g";
219− name = "ffmpegthumbs-20.12.1.tar.xz";
217+ url = "${mirror}/stable/release-service/20.12.2/src/ffmpegthumbs-20.12.2.tar.xz";
218+ sha256 = "0iw1g7x31jkbmniawvjwy8wk573rv05idk08q1vavxa5vixxqsbg";
219+ name = "ffmpegthumbs-20.12.2.tar.xz";
220220 };
221221 };
222222 filelight = {
223− version = "20.12.1";
223+ version = "20.12.2";
224224 src = fetchurl {
225− url = "${mirror}/stable/release-service/20.12.1/src/filelight-20.12.1.tar.xz";
226− sha256 = "0k7ia3q1j520n3i1va7v4nhdfycxv54sis6vq62ihm53kb0jrj4i";
227− name = "filelight-20.12.1.tar.xz";
225+ url = "${mirror}/stable/release-service/20.12.2/src/filelight-20.12.2.tar.xz";
226+ sha256 = "0m38il0rz7zip9rxing4j5fppwyrjgv1d7n3vrp3x4wnmd08j46q";
227+ name = "filelight-20.12.2.tar.xz";
228228 };
229229 };
230230 granatier = {
231− version = "20.12.1";
231+ version = "20.12.2";
232232 src = fetchurl {
233− url = "${mirror}/stable/release-service/20.12.1/src/granatier-20.12.1.tar.xz";
234− sha256 = "0mhqjg0wznvf1dc7f9dmw6ccva84g09cds2jls37zzblqbfdnzw3";
235− name = "granatier-20.12.1.tar.xz";
233+ url = "${mirror}/stable/release-service/20.12.2/src/granatier-20.12.2.tar.xz";
234+ sha256 = "0gssfcqq1czh5l1dwi5lpj0f9bgv2jf0wma9i5j0aqrf9b086g7f";
235+ name = "granatier-20.12.2.tar.xz";
236236 };
237237 };
238238 grantlee-editor = {
239− version = "20.12.1";
239+ version = "20.12.2";
240240 src = fetchurl {
241− url = "${mirror}/stable/release-service/20.12.1/src/grantlee-editor-20.12.1.tar.xz";
242− sha256 = "1684k6gpmvbbxjha5qkvfvas2lws0zm5v5s41z6yjxyshrbc29jh";
243− name = "grantlee-editor-20.12.1.tar.xz";
241+ url = "${mirror}/stable/release-service/20.12.2/src/grantlee-editor-20.12.2.tar.xz";
242+ sha256 = "0fbb9zia4kjc7rw4s27vsy6isvkx56k50gn6y1cyfl0gqy70v4cw";
243+ name = "grantlee-editor-20.12.2.tar.xz";
244244 };
245245 };
246246 grantleetheme = {
247− version = "20.12.1";
247+ version = "20.12.2";
248248 src = fetchurl {
249− url = "${mirror}/stable/release-service/20.12.1/src/grantleetheme-20.12.1.tar.xz";
250− sha256 = "1w87pz09lb3n511w0qir70c317j4gqgc7iyw3cgs2pqzz9f19vcx";
251− name = "grantleetheme-20.12.1.tar.xz";
249+ url = "${mirror}/stable/release-service/20.12.2/src/grantleetheme-20.12.2.tar.xz";
250+ sha256 = "1cv23ias36mp4zm84fk21f3f7nx3jz7xpiyz0nvz6xcsiww77762";
251+ name = "grantleetheme-20.12.2.tar.xz";
252252 };
253253 };
254254 gwenview = {
255− version = "20.12.1";
255+ version = "20.12.2";
256256 src = fetchurl {
257− url = "${mirror}/stable/release-service/20.12.1/src/gwenview-20.12.1.tar.xz";
258− sha256 = "0xjipr1ib8r42xsd75ack2198q6gf3xxl1zc9ir2ihdk3sg6lsb1";
259− name = "gwenview-20.12.1.tar.xz";
257+ url = "${mirror}/stable/release-service/20.12.2/src/gwenview-20.12.2.tar.xz";
258+ sha256 = "0cr6jjnvin8jv6hnajxg6zlph5syg2zjrcwd784dlzv23hna9v5n";
259+ name = "gwenview-20.12.2.tar.xz";
260260 };
261261 };
262262 incidenceeditor = {
263− version = "20.12.1";
263+ version = "20.12.2";
264264 src = fetchurl {
265− url = "${mirror}/stable/release-service/20.12.1/src/incidenceeditor-20.12.1.tar.xz";
266− sha256 = "1hdyy1sisavxjhwgpxh4ab4a3cvsvjj6hfa9w8kn8ypipd6nmqac";
267− name = "incidenceeditor-20.12.1.tar.xz";
265+ url = "${mirror}/stable/release-service/20.12.2/src/incidenceeditor-20.12.2.tar.xz";
266+ sha256 = "1q48ydma2rcpn3dnf9p08mqfs481n5fhc9m5wl2cvm6as54sfmp8";
267+ name = "incidenceeditor-20.12.2.tar.xz";
268268 };
269269 };
270270 itinerary = {
271− version = "20.12.1";
271+ version = "20.12.2";
272272 src = fetchurl {
273− url = "${mirror}/stable/release-service/20.12.1/src/itinerary-20.12.1.tar.xz";
274− sha256 = "02mmbj32ankv06mlgdrfyppkfi1dkgy9ky22d6bnz3l1vyld76s9";
275− name = "itinerary-20.12.1.tar.xz";
273+ url = "${mirror}/stable/release-service/20.12.2/src/itinerary-20.12.2.tar.xz";
274+ sha256 = "1dkgsiqww9z6k0xbvn15w630jdhmxr1kkz5dcv1n9yl7bgj32s35";
275+ name = "itinerary-20.12.2.tar.xz";
276276 };
277277 };
278278 juk = {
279− version = "20.12.1";
279+ version = "20.12.2";
280280 src = fetchurl {
281− url = "${mirror}/stable/release-service/20.12.1/src/juk-20.12.1.tar.xz";
282− sha256 = "0rx4dmnk15xrf9knwsvjmf963xn59rlzwwsa6wrjjpi8r6br8x4r";
283− name = "juk-20.12.1.tar.xz";
281+ url = "${mirror}/stable/release-service/20.12.2/src/juk-20.12.2.tar.xz";
282+ sha256 = "1dc6n07hkd8as2q1i2l3jzqcijw3qd4ihx1205nzn7z256bby58n";
283+ name = "juk-20.12.2.tar.xz";
284284 };
285285 };
286286 k3b = {
287− version = "20.12.1";
287+ version = "20.12.2";
288288 src = fetchurl {
289− url = "${mirror}/stable/release-service/20.12.1/src/k3b-20.12.1.tar.xz";
290− sha256 = "02ybzn8gg82r7i7rg8swyza30zwsf3fassmp6hqffn15g4kc2lrp";
291− name = "k3b-20.12.1.tar.xz";
289+ url = "${mirror}/stable/release-service/20.12.2/src/k3b-20.12.2.tar.xz";
290+ sha256 = "0gqg8r2p6nksbdg4c8wqz57dj8d1cw7cmrgzc1l2pin4v3qdx94g";
291+ name = "k3b-20.12.2.tar.xz";
292292 };
293293 };
294294 kaccounts-integration = {
295− version = "20.12.1";
295+ version = "20.12.2";
296296 src = fetchurl {
297− url = "${mirror}/stable/release-service/20.12.1/src/kaccounts-integration-20.12.1.tar.xz";
298− sha256 = "01xy3ih2fw4xnf5jkadrbq1dzmvvvrslbq4afj9501vhzyfqgm92";
299− name = "kaccounts-integration-20.12.1.tar.xz";
297+ url = "${mirror}/stable/release-service/20.12.2/src/kaccounts-integration-20.12.2.tar.xz";
298+ sha256 = "15py7fp6sajvx0c7zi7zhfx16sqn8kkkvglkvcq0b9kglswpvkfj";
299+ name = "kaccounts-integration-20.12.2.tar.xz";
300300 };
301301 };
302302 kaccounts-providers = {
303− version = "20.12.1";
303+ version = "20.12.2";
304304 src = fetchurl {
305− url = "${mirror}/stable/release-service/20.12.1/src/kaccounts-providers-20.12.1.tar.xz";
306− sha256 = "1f3gr63jwm7b8nkpdmpkgvsrhrpaxf7wcl0gczhdli1v6svjv8vq";
307− name = "kaccounts-providers-20.12.1.tar.xz";
305+ url = "${mirror}/stable/release-service/20.12.2/src/kaccounts-providers-20.12.2.tar.xz";
306+ sha256 = "0205l3k3nzx6cnar90zrbgmabapyry4a991lqflkpxgdrkh0ajc0";
307+ name = "kaccounts-providers-20.12.2.tar.xz";
308308 };
309309 };
310310 kaddressbook = {
311− version = "20.12.1";
311+ version = "20.12.2";
312312 src = fetchurl {
313− url = "${mirror}/stable/release-service/20.12.1/src/kaddressbook-20.12.1.tar.xz";
314− sha256 = "0j6mjj902h5zpipywp5xhbifrbgrb1lz1cg317md7ya4wc7z36fp";
315− name = "kaddressbook-20.12.1.tar.xz";
313+ url = "${mirror}/stable/release-service/20.12.2/src/kaddressbook-20.12.2.tar.xz";
314+ sha256 = "0xqsl7fav1vqq4iqy2m02s92rnr28pi1ak3sv0ra7q1gb89rhi0y";
315+ name = "kaddressbook-20.12.2.tar.xz";
316316 };
317317 };
318318 kajongg = {
319− version = "20.12.1";
319+ version = "20.12.2";
320320 src = fetchurl {
321− url = "${mirror}/stable/release-service/20.12.1/src/kajongg-20.12.1.tar.xz";
322− sha256 = "0v9sq5l6w3x78dpimdlbm36g9n4qy06xr0bzfzn2jf3bzgzrn2zk";
323− name = "kajongg-20.12.1.tar.xz";
321+ url = "${mirror}/stable/release-service/20.12.2/src/kajongg-20.12.2.tar.xz";
322+ sha256 = "0vh6qb3d54nnxrxacq9fn7jq1hshhhnvw9ff0wgh214jlr0gnbqk";
323+ name = "kajongg-20.12.2.tar.xz";
324324 };
325325 };
326326 kalarm = {
327− version = "20.12.1";
327+ version = "20.12.2";
328328 src = fetchurl {
329− url = "${mirror}/stable/release-service/20.12.1/src/kalarm-20.12.1.tar.xz";
330− sha256 = "0k4fxrzxb6vvpdqlln4g7iz1s34d9jkk415c44f1i34kl2mfsyq0";
331− name = "kalarm-20.12.1.tar.xz";
329+ url = "${mirror}/stable/release-service/20.12.2/src/kalarm-20.12.2.tar.xz";
330+ sha256 = "1lpg1viwn868hw0dd8zs11iafkhzlr3cydfplnh4ss6visga50kb";
331+ name = "kalarm-20.12.2.tar.xz";
332332 };
333333 };
334334 kalarmcal = {
335− version = "20.12.1";
335+ version = "20.12.2";
336336 src = fetchurl {
337− url = "${mirror}/stable/release-service/20.12.1/src/kalarmcal-20.12.1.tar.xz";
338− sha256 = "104fbq2mf20p67rs7x76h36qk8d0srkkll2pq39ln4hc7nhsrws5";
339− name = "kalarmcal-20.12.1.tar.xz";
337+ url = "${mirror}/stable/release-service/20.12.2/src/kalarmcal-20.12.2.tar.xz";
338+ sha256 = "17lll9671318dxhxpnjaih31xz5b971gw6kmrgz2ljq5nz1l027b";
339+ name = "kalarmcal-20.12.2.tar.xz";
340340 };
341341 };
342342 kalgebra = {
343− version = "20.12.1";
343+ version = "20.12.2";
344344 src = fetchurl {
345− url = "${mirror}/stable/release-service/20.12.1/src/kalgebra-20.12.1.tar.xz";
346− sha256 = "10y9zygpik418y5781xmy5xysvf3xa97sbzdbch8lrvxwprbmkzm";
347− name = "kalgebra-20.12.1.tar.xz";
345+ url = "${mirror}/stable/release-service/20.12.2/src/kalgebra-20.12.2.tar.xz";
346+ sha256 = "0dwvm4b0wpkd3i79q3xs2v3majwa56hgq8r4vv071a8ci8fn27bz";
347+ name = "kalgebra-20.12.2.tar.xz";
348348 };
349349 };
350350 kalzium = {
351− version = "20.12.1";
351+ version = "20.12.2";
352352 src = fetchurl {
353− url = "${mirror}/stable/release-service/20.12.1/src/kalzium-20.12.1.tar.xz";
354− sha256 = "1n1ar12zq2maa4dn5yq7m6l3m60n7c98c460mrd6rp7f73kadnsj";
355− name = "kalzium-20.12.1.tar.xz";
353+ url = "${mirror}/stable/release-service/20.12.2/src/kalzium-20.12.2.tar.xz";
354+ sha256 = "0jdg0akxmylbvh80cz31cycrdqvyafsv9j7hfpdhrizdy7vvqywg";
355+ name = "kalzium-20.12.2.tar.xz";
356356 };
357357 };
358358 kamera = {
359− version = "20.12.1";
359+ version = "20.12.2";
360360 src = fetchurl {
361− url = "${mirror}/stable/release-service/20.12.1/src/kamera-20.12.1.tar.xz";
362− sha256 = "1bj01d9h26ifq8nsa1bw49xfihmisnbk7p557zpqvixxayq6v8dq";
363− name = "kamera-20.12.1.tar.xz";
361+ url = "${mirror}/stable/release-service/20.12.2/src/kamera-20.12.2.tar.xz";
362+ sha256 = "1licmi05g1qpfh88annqd89av77jsmhxnsidgkvf4ffczwd097l6";
363+ name = "kamera-20.12.2.tar.xz";
364364 };
365365 };
366366 kamoso = {
367− version = "20.12.1";
367+ version = "20.12.2";
368368 src = fetchurl {
369− url = "${mirror}/stable/release-service/20.12.1/src/kamoso-20.12.1.tar.xz";
370− sha256 = "087m9lphj6s0xssaryyh91gh9v3ji5423rjd549dkd3vscgda4lb";
371− name = "kamoso-20.12.1.tar.xz";
369+ url = "${mirror}/stable/release-service/20.12.2/src/kamoso-20.12.2.tar.xz";
370+ sha256 = "0ar19nlw2bxrbn4wky8ky3x5m70rf7fb0fviniblqcrggyymgmb9";
371+ name = "kamoso-20.12.2.tar.xz";
372372 };
373373 };
374374 kanagram = {
375− version = "20.12.1";
375+ version = "20.12.2";
376376 src = fetchurl {
377− url = "${mirror}/stable/release-service/20.12.1/src/kanagram-20.12.1.tar.xz";
378− sha256 = "0bflybrm3kz1p1n6fksihvd8m0h0jj968b2wjz88663bs48jqf6q";
379− name = "kanagram-20.12.1.tar.xz";
377+ url = "${mirror}/stable/release-service/20.12.2/src/kanagram-20.12.2.tar.xz";
378+ sha256 = "00p2mpprbq9zi1zzscb4d0fdj2knnfkjxclf3q982jz4laxyqalf";
379+ name = "kanagram-20.12.2.tar.xz";
380380 };
381381 };
382382 kapman = {
383− version = "20.12.1";
383+ version = "20.12.2";
384384 src = fetchurl {
385− url = "${mirror}/stable/release-service/20.12.1/src/kapman-20.12.1.tar.xz";
386− sha256 = "1hs88q4h5l58fvr09vb5ns9pdj4k064ax5ccnj9yan4bn0s9b4f9";
387− name = "kapman-20.12.1.tar.xz";
385+ url = "${mirror}/stable/release-service/20.12.2/src/kapman-20.12.2.tar.xz";
386+ sha256 = "1fs33p9g52k5nywpih7nns3mh0apfhnn174k9711vwnamr73ph6k";
387+ name = "kapman-20.12.2.tar.xz";
388388 };
389389 };
390390 kapptemplate = {
391− version = "20.12.1";
391+ version = "20.12.2";
392392 src = fetchurl {
393− url = "${mirror}/stable/release-service/20.12.1/src/kapptemplate-20.12.1.tar.xz";
394− sha256 = "1a8fpwbvs2zmmak7zyv75z67ja31vx68s9lz9vldmiik9rrslyy6";
395− name = "kapptemplate-20.12.1.tar.xz";
393+ url = "${mirror}/stable/release-service/20.12.2/src/kapptemplate-20.12.2.tar.xz";
394+ sha256 = "19rnxw0q8w890ns237vpaapipm3zjz7n0rn9yzxa5cqaf30l7jv5";
395+ name = "kapptemplate-20.12.2.tar.xz";
396396 };
397397 };
398398 kate = {
399− version = "20.12.1";
399+ version = "20.12.2";
400400 src = fetchurl {
401− url = "${mirror}/stable/release-service/20.12.1/src/kate-20.12.1.tar.xz";
402− sha256 = "13m24b3fxb1d1k9rg2xfa7i28cjx68g9dbjrbd34acmpg01vp6vk";
403− name = "kate-20.12.1.tar.xz";
401+ url = "${mirror}/stable/release-service/20.12.2/src/kate-20.12.2.tar.xz";
402+ sha256 = "1kdznizqh28parijpsi67jmb8mlx4gn7z4szlh5kjd1mv9rikvm7";
403+ name = "kate-20.12.2.tar.xz";
404404 };
405405 };
406406 katomic = {
407− version = "20.12.1";
407+ version = "20.12.2";
408408 src = fetchurl {
409− url = "${mirror}/stable/release-service/20.12.1/src/katomic-20.12.1.tar.xz";
410− sha256 = "15s5kwddd1m9g5lhpc61bj6yzxpwzcc8fm24yhslb8l44nk685id";
411− name = "katomic-20.12.1.tar.xz";
409+ url = "${mirror}/stable/release-service/20.12.2/src/katomic-20.12.2.tar.xz";
410+ sha256 = "1sxh6x09is33b3zdgj3d6zn9z19qc25v4hskffmw5xivnwz9vzfl";
411+ name = "katomic-20.12.2.tar.xz";
412412 };
413413 };
414414 kbackup = {
415− version = "20.12.1";
415+ version = "20.12.2";
416416 src = fetchurl {
417− url = "${mirror}/stable/release-service/20.12.1/src/kbackup-20.12.1.tar.xz";
418− sha256 = "043dkgpdk56jmx0z8izlgj8r9j8h9rvjc3yalpqd5nrlgmj0smym";
419− name = "kbackup-20.12.1.tar.xz";
417+ url = "${mirror}/stable/release-service/20.12.2/src/kbackup-20.12.2.tar.xz";
418+ sha256 = "138x20p27a0yx4n6xamc660nk0zzrap7zhkkwpy9ayh07rgh1222";
419+ name = "kbackup-20.12.2.tar.xz";
420420 };
421421 };
422422 kblackbox = {
423− version = "20.12.1";
423+ version = "20.12.2";
424424 src = fetchurl {
425− url = "${mirror}/stable/release-service/20.12.1/src/kblackbox-20.12.1.tar.xz";
426− sha256 = "001yf4j14xzpabwg37yisls5na9rpxpgs45d4wdlqa90d50syzl7";
427− name = "kblackbox-20.12.1.tar.xz";
425+ url = "${mirror}/stable/release-service/20.12.2/src/kblackbox-20.12.2.tar.xz";
426+ sha256 = "1c6by0hi9bzs6j1y0qxrvz6ahdxhzivnw9hg4jndmhgbsqqix4q5";
427+ name = "kblackbox-20.12.2.tar.xz";
428428 };
429429 };
430430 kblocks = {
431− version = "20.12.1";
431+ version = "20.12.2";
432432 src = fetchurl {
433− url = "${mirror}/stable/release-service/20.12.1/src/kblocks-20.12.1.tar.xz";
434− sha256 = "029dxqg2d6c08r99ng16lc3b1dnnrj5bpz25zgv90aygzx31qq4s";
435− name = "kblocks-20.12.1.tar.xz";
433+ url = "${mirror}/stable/release-service/20.12.2/src/kblocks-20.12.2.tar.xz";
434+ sha256 = "06slcac3hvdmb5lymyqb1z8mn3r756xz2ghwdqz1d2mn3n2jd0bw";
435+ name = "kblocks-20.12.2.tar.xz";
436436 };
437437 };
438438 kbounce = {
439− version = "20.12.1";
439+ version = "20.12.2";
440440 src = fetchurl {
441− url = "${mirror}/stable/release-service/20.12.1/src/kbounce-20.12.1.tar.xz";
442− sha256 = "1vdc7xhbh0wpvk66sqs0xly0mmbpw922vg4kjjn21awamv4r52pm";
443− name = "kbounce-20.12.1.tar.xz";
441+ url = "${mirror}/stable/release-service/20.12.2/src/kbounce-20.12.2.tar.xz";
442+ sha256 = "19xvvxmbwpwkwsm0mxjnh92m352lkshsjgi8yrax1hdblymr60v1";
443+ name = "kbounce-20.12.2.tar.xz";
444444 };
445445 };
446446 kbreakout = {
447− version = "20.12.1";
447+ version = "20.12.2";
448448 src = fetchurl {
449− url = "${mirror}/stable/release-service/20.12.1/src/kbreakout-20.12.1.tar.xz";
450− sha256 = "11bx32lffagmyvxx2wss794fy3icz9k5yq4mjs2qxpf9pyvg6qgd";
451− name = "kbreakout-20.12.1.tar.xz";
449+ url = "${mirror}/stable/release-service/20.12.2/src/kbreakout-20.12.2.tar.xz";
450+ sha256 = "1n1vrj08j1drc1apikhgwdbmb5daypgnkw6yxhqc3xi2a3wglkqz";
451+ name = "kbreakout-20.12.2.tar.xz";
452452 };
453453 };
454454 kbruch = {
455− version = "20.12.1";
455+ version = "20.12.2";
456456 src = fetchurl {
457− url = "${mirror}/stable/release-service/20.12.1/src/kbruch-20.12.1.tar.xz";
458− sha256 = "06sbr6wrn4nh69hq96i5rgzbr9g0rc6c54h9g2zpnpff339lnsqi";
459− name = "kbruch-20.12.1.tar.xz";
457+ url = "${mirror}/stable/release-service/20.12.2/src/kbruch-20.12.2.tar.xz";
458+ sha256 = "0hjwmzsdlpg8przlmpp0xsa19v7376bpjk5kwyajywhayzzw99xp";
459+ name = "kbruch-20.12.2.tar.xz";
460460 };
461461 };
462462 kcachegrind = {
463− version = "20.12.1";
463+ version = "20.12.2";
464464 src = fetchurl {
465− url = "${mirror}/stable/release-service/20.12.1/src/kcachegrind-20.12.1.tar.xz";
466− sha256 = "0v06y1mybda4rmvjrjxhmxp7bj0wp6v45xahn08j253d20k7qixi";
467− name = "kcachegrind-20.12.1.tar.xz";
465+ url = "${mirror}/stable/release-service/20.12.2/src/kcachegrind-20.12.2.tar.xz";
466+ sha256 = "0ich4hxfmq909zkn06p8pgxpf7sg9ndq51b533h2clbq3m9qwy2w";
467+ name = "kcachegrind-20.12.2.tar.xz";
468468 };
469469 };
470470 kcalc = {
471− version = "20.12.1";
471+ version = "20.12.2";
472472 src = fetchurl {
473− url = "${mirror}/stable/release-service/20.12.1/src/kcalc-20.12.1.tar.xz";
474− sha256 = "1p59i6k0kq4xgcfsgcsb9z3yrrzgk564fh0apwmbawrmg6pp78dw";
475− name = "kcalc-20.12.1.tar.xz";
473+ url = "${mirror}/stable/release-service/20.12.2/src/kcalc-20.12.2.tar.xz";
474+ sha256 = "0dv8519wnlfdp2d2ml2r5qx3gjh8g6im742vqqk7m1660ijgc8zx";
475+ name = "kcalc-20.12.2.tar.xz";
476476 };
477477 };
478478 kcalutils = {
479− version = "20.12.1";
479+ version = "20.12.2";
480480 src = fetchurl {
481− url = "${mirror}/stable/release-service/20.12.1/src/kcalutils-20.12.1.tar.xz";
482− sha256 = "0b7w9n8sf31qbpxiw998xd4dls46mxf2bvl4n937vgzisfwb5sxs";
483− name = "kcalutils-20.12.1.tar.xz";
481+ url = "${mirror}/stable/release-service/20.12.2/src/kcalutils-20.12.2.tar.xz";
482+ sha256 = "1k4cr1iq945zs6c35f3s1w8kfm3kh7aybmk5py3lsz0zmlab36hc";
483+ name = "kcalutils-20.12.2.tar.xz";
484484 };
485485 };
486486 kcharselect = {
487− version = "20.12.1";
487+ version = "20.12.2";
488488 src = fetchurl {
489− url = "${mirror}/stable/release-service/20.12.1/src/kcharselect-20.12.1.tar.xz";
490− sha256 = "1ss5zwp0zggk9phdccj7bcn8h49p9avzg8qm38c3wnwddgaw1pdb";
491− name = "kcharselect-20.12.1.tar.xz";
489+ url = "${mirror}/stable/release-service/20.12.2/src/kcharselect-20.12.2.tar.xz";
490+ sha256 = "0fqf6bw98l499a144xk7hslxm6zdlpa0lcq0bgwnfsd0fs03wlp3";
491+ name = "kcharselect-20.12.2.tar.xz";
492492 };
493493 };
494494 kcolorchooser = {
495− version = "20.12.1";
495+ version = "20.12.2";
496496 src = fetchurl {
497− url = "${mirror}/stable/release-service/20.12.1/src/kcolorchooser-20.12.1.tar.xz";
498− sha256 = "07qvwk8amvmgiwxrl6gbyf25ms666hradmg1vl8lf3hmfxx6j40z";
499− name = "kcolorchooser-20.12.1.tar.xz";
497+ url = "${mirror}/stable/release-service/20.12.2/src/kcolorchooser-20.12.2.tar.xz";
498+ sha256 = "08y4qzr43nikgzli14yzj7w8vqzl905f0rwx0ri5247259jna3rk";
499+ name = "kcolorchooser-20.12.2.tar.xz";
500500 };
501501 };
502502 kcron = {
503− version = "20.12.1";
503+ version = "20.12.2";
504504 src = fetchurl {
505− url = "${mirror}/stable/release-service/20.12.1/src/kcron-20.12.1.tar.xz";
506− sha256 = "01xabwaxhxgwk6kh44rz3fm20jis2f6g9mrska5s03gxk7n0p1dc";
507− name = "kcron-20.12.1.tar.xz";
505+ url = "${mirror}/stable/release-service/20.12.2/src/kcron-20.12.2.tar.xz";
506+ sha256 = "025a647zl125568l8vqnljir110jbnkxd4921a892ip7pnhp0v95";
507+ name = "kcron-20.12.2.tar.xz";
508508 };
509509 };
510510 kdebugsettings = {
511− version = "20.12.1";
511+ version = "20.12.2";
512512 src = fetchurl {
513− url = "${mirror}/stable/release-service/20.12.1/src/kdebugsettings-20.12.1.tar.xz";
514− sha256 = "1jlxp6v6yci4cff1mcz0w7dz0hfjig0wck9cc9maaw1a9swqc3r1";
515− name = "kdebugsettings-20.12.1.tar.xz";
513+ url = "${mirror}/stable/release-service/20.12.2/src/kdebugsettings-20.12.2.tar.xz";
514+ sha256 = "1dzdvscklgbcfjalcc1mfh3vgiai2dvbsz00b4c96r8jxpm7bvcn";
515+ name = "kdebugsettings-20.12.2.tar.xz";
516516 };
517517 };
518518 kdeconnect-kde = {
519− version = "20.12.1";
519+ version = "20.12.2";
520520 src = fetchurl {
521− url = "${mirror}/stable/release-service/20.12.1/src/kdeconnect-kde-20.12.1.tar.xz";
522− sha256 = "0q11319ydibn1jgch98r66gzh3n6nb67l7xgzg0crdalm3dvf5gw";
523− name = "kdeconnect-kde-20.12.1.tar.xz";
521+ url = "${mirror}/stable/release-service/20.12.2/src/kdeconnect-kde-20.12.2.tar.xz";
522+ sha256 = "0wcx1bn121b62pwdkf7k24sa03kgixvrbp5y5iy11im7kj5i3ji1";
523+ name = "kdeconnect-kde-20.12.2.tar.xz";
524524 };
525525 };
526526 kde-dev-scripts = {
527− version = "20.12.1";
527+ version = "20.12.2";
528528 src = fetchurl {
529− url = "${mirror}/stable/release-service/20.12.1/src/kde-dev-scripts-20.12.1.tar.xz";
530− sha256 = "0hlabgf75qmww1161nd4ggqccp6h9ibsfkzpxdqvgxr9f1f31zz5";
531− name = "kde-dev-scripts-20.12.1.tar.xz";
529+ url = "${mirror}/stable/release-service/20.12.2/src/kde-dev-scripts-20.12.2.tar.xz";
530+ sha256 = "03kqd01yhii2b6g4gsjg09vwmzv53vr5d7y3d4db13kgg0f1z352";
531+ name = "kde-dev-scripts-20.12.2.tar.xz";
532532 };
533533 };
534534 kde-dev-utils = {
535− version = "20.12.1";
535+ version = "20.12.2";
536536 src = fetchurl {
537− url = "${mirror}/stable/release-service/20.12.1/src/kde-dev-utils-20.12.1.tar.xz";
538− sha256 = "1bir6ifq5wlwgdna48s5c1al7hfq6vl9pi2yvbnzf0rz4ix1sw4r";
539− name = "kde-dev-utils-20.12.1.tar.xz";
537+ url = "${mirror}/stable/release-service/20.12.2/src/kde-dev-utils-20.12.2.tar.xz";
538+ sha256 = "105pp4yhgynn3gq0bi7q1vyy1qn8pcd0hgx17v674hf8afy4627r";
539+ name = "kde-dev-utils-20.12.2.tar.xz";
540540 };
541541 };
542542 kdeedu-data = {
543− version = "20.12.1";
543+ version = "20.12.2";
544544 src = fetchurl {
545− url = "${mirror}/stable/release-service/20.12.1/src/kdeedu-data-20.12.1.tar.xz";
546− sha256 = "1hzrwkb2333dkvp1n50p18gfci21klafibaknm4hdrk96b3s4fxp";
547− name = "kdeedu-data-20.12.1.tar.xz";
545+ url = "${mirror}/stable/release-service/20.12.2/src/kdeedu-data-20.12.2.tar.xz";
546+ sha256 = "04x8papz62m5kanrqpjddzijda761i4j8y4cmqpnxkg2jrwfqqls";
547+ name = "kdeedu-data-20.12.2.tar.xz";
548548 };
549549 };
550550 kdegraphics-mobipocket = {
551− version = "20.12.1";
551+ version = "20.12.2";
552552 src = fetchurl {
553− url = "${mirror}/stable/release-service/20.12.1/src/kdegraphics-mobipocket-20.12.1.tar.xz";
554− sha256 = "1n3x4cf5ck0lfn70d9g0iiy4pddc0r49gwir71q5six5l4pz21hd";
555− name = "kdegraphics-mobipocket-20.12.1.tar.xz";
553+ url = "${mirror}/stable/release-service/20.12.2/src/kdegraphics-mobipocket-20.12.2.tar.xz";
554+ sha256 = "02a4ivpvfziaa464l8c9ivydagcb912ld95isgvc5jl4g85lm166";
555+ name = "kdegraphics-mobipocket-20.12.2.tar.xz";
556556 };
557557 };
558558 kdegraphics-thumbnailers = {
559− version = "20.12.1";
559+ version = "20.12.2";
560560 src = fetchurl {
561− url = "${mirror}/stable/release-service/20.12.1/src/kdegraphics-thumbnailers-20.12.1.tar.xz";
562− sha256 = "0lrijvphyc6wbkb499zf0gjpmqrjgrx5li93kvpsil1ivfpflv7w";
563− name = "kdegraphics-thumbnailers-20.12.1.tar.xz";
561+ url = "${mirror}/stable/release-service/20.12.2/src/kdegraphics-thumbnailers-20.12.2.tar.xz";
562+ sha256 = "1p47fvb6mdk23rx9jhm9x60sny9z6plgdjih5lzy9k3hvl0sl8zk";
563+ name = "kdegraphics-thumbnailers-20.12.2.tar.xz";
564564 };
565565 };
566566 kdenetwork-filesharing = {
567− version = "20.12.1";
567+ version = "20.12.2";
568568 src = fetchurl {
569− url = "${mirror}/stable/release-service/20.12.1/src/kdenetwork-filesharing-20.12.1.tar.xz";
570− sha256 = "0axi5vdgqkjdcbq0x34b3lnh1497vk54p9aca9d2wfhkd55zjbcv";
571− name = "kdenetwork-filesharing-20.12.1.tar.xz";
569+ url = "${mirror}/stable/release-service/20.12.2/src/kdenetwork-filesharing-20.12.2.tar.xz";
570+ sha256 = "0y60az09hkhd1hvwa7h7c834dc0mfnd89f78v8m31il8g2xniziz";
571+ name = "kdenetwork-filesharing-20.12.2.tar.xz";
572572 };
573573 };
574574 kdenlive = {
575− version = "20.12.1";
575+ version = "20.12.2";
576576 src = fetchurl {
577− url = "${mirror}/stable/release-service/20.12.1/src/kdenlive-20.12.1.tar.xz";
578− sha256 = "0n543nswn0gxasc1445nqg35z5466a3ssivigxz4acqw66nj4vlv";
579− name = "kdenlive-20.12.1.tar.xz";
577+ url = "${mirror}/stable/release-service/20.12.2/src/kdenlive-20.12.2.tar.xz";
578+ sha256 = "0gh1cjhakdl7hx236rsxiv62mafd2vvvpg5ndwlp0zfpsx7kzjrz";
579+ name = "kdenlive-20.12.2.tar.xz";
580580 };
581581 };
582582 kdepim-addons = {
583− version = "20.12.1";
583+ version = "20.12.2";
584584 src = fetchurl {
585− url = "${mirror}/stable/release-service/20.12.1/src/kdepim-addons-20.12.1.tar.xz";
586− sha256 = "1dc5sl9ksk5i2sgs2vf41blb5cdpl8fv3vzmrrz9sl3r75pga5m0";
587− name = "kdepim-addons-20.12.1.tar.xz";
585+ url = "${mirror}/stable/release-service/20.12.2/src/kdepim-addons-20.12.2.tar.xz";
586+ sha256 = "0zj22ggn98sqz3nnvzffhbv2cq672j885f2p8qla6swhyw91cq8n";
587+ name = "kdepim-addons-20.12.2.tar.xz";
588588 };
589589 };
590590 kdepim-runtime = {
591− version = "20.12.1";
591+ version = "20.12.2";
592592 src = fetchurl {
593− url = "${mirror}/stable/release-service/20.12.1/src/kdepim-runtime-20.12.1.tar.xz";
594− sha256 = "1np7xbdhm2wczm04cmsr25a74421i28iln39myiybq01im2ahapq";
595− name = "kdepim-runtime-20.12.1.tar.xz";
593+ url = "${mirror}/stable/release-service/20.12.2/src/kdepim-runtime-20.12.2.tar.xz";
594+ sha256 = "0p5c4l4xixcvpzx7mri2jxa3nwk4824lp5sy93sspf2nlgdv3zsn";
595+ name = "kdepim-runtime-20.12.2.tar.xz";
596596 };
597597 };
598598 kdesdk-kioslaves = {
599− version = "20.12.1";
599+ version = "20.12.2";
600600 src = fetchurl {
601− url = "${mirror}/stable/release-service/20.12.1/src/kdesdk-kioslaves-20.12.1.tar.xz";
602− sha256 = "18yy2s39sxfzi5lcky1jvlv7z77ygidhnfa4zhwas27yhcc6h0w4";
603− name = "kdesdk-kioslaves-20.12.1.tar.xz";
601+ url = "${mirror}/stable/release-service/20.12.2/src/kdesdk-kioslaves-20.12.2.tar.xz";
602+ sha256 = "1xgp3fi6nnygjw2p832ylmhsj70dm33c4rf3h79sc2dp7aihnapy";
603+ name = "kdesdk-kioslaves-20.12.2.tar.xz";
604604 };
605605 };
606606 kdesdk-thumbnailers = {
607− version = "20.12.1";
607+ version = "20.12.2";
608608 src = fetchurl {
609− url = "${mirror}/stable/release-service/20.12.1/src/kdesdk-thumbnailers-20.12.1.tar.xz";
610− sha256 = "1hgqd2d2a9iwaxvd4xd7sdj7pyf3p3v2xg6v9dyy9y39q2f1qs23";
611− name = "kdesdk-thumbnailers-20.12.1.tar.xz";
609+ url = "${mirror}/stable/release-service/20.12.2/src/kdesdk-thumbnailers-20.12.2.tar.xz";
610+ sha256 = "0jk2x2b8qwhfbf9hy8j0yslggn3zwp18q21ip299b4cpx1w72bgq";
611+ name = "kdesdk-thumbnailers-20.12.2.tar.xz";
612612 };
613613 };
614614 kdf = {
615− version = "20.12.1";
615+ version = "20.12.2";
616616 src = fetchurl {
617− url = "${mirror}/stable/release-service/20.12.1/src/kdf-20.12.1.tar.xz";
618− sha256 = "0ba67hs4vlb3qyvdzhnpmf8p62df12s8aqw4hzf9vnxff3qix5k1";
619− name = "kdf-20.12.1.tar.xz";
617+ url = "${mirror}/stable/release-service/20.12.2/src/kdf-20.12.2.tar.xz";
618+ sha256 = "0fx9b5njsmvzznrgz2r9xz8yh977v865zvsih60hdrz6gaflg1rx";
619+ name = "kdf-20.12.2.tar.xz";
620620 };
621621 };
622622 kdialog = {
623− version = "20.12.1";
623+ version = "20.12.2";
624624 src = fetchurl {
625− url = "${mirror}/stable/release-service/20.12.1/src/kdialog-20.12.1.tar.xz";
626− sha256 = "13n6bc3aqi9v6i4p4vkwzjv4rsqinx45n028ls6ndlapayd750f4";
627− name = "kdialog-20.12.1.tar.xz";
625+ url = "${mirror}/stable/release-service/20.12.2/src/kdialog-20.12.2.tar.xz";
626+ sha256 = "1v2yflxpqg2h2jgxql1mnk8c1v1n4ljard5bgh1dw898r7b8g2xd";
627+ name = "kdialog-20.12.2.tar.xz";
628628 };
629629 };
630630 kdiamond = {
631− version = "20.12.1";
631+ version = "20.12.2";
632632 src = fetchurl {
633− url = "${mirror}/stable/release-service/20.12.1/src/kdiamond-20.12.1.tar.xz";
634− sha256 = "0iaq3cai1sn3vlym4zshfziviy9k4s7pm92c7bzwa9adfak6y9h4";
635− name = "kdiamond-20.12.1.tar.xz";
633+ url = "${mirror}/stable/release-service/20.12.2/src/kdiamond-20.12.2.tar.xz";
634+ sha256 = "17z1g2jxz26pqx5xjc5h7w5s2xy72p00ydnfhsv1bi1kfd79ry8k";
635+ name = "kdiamond-20.12.2.tar.xz";
636636 };
637637 };
638638 keditbookmarks = {
639− version = "20.12.1";
639+ version = "20.12.2";
640640 src = fetchurl {
641− url = "${mirror}/stable/release-service/20.12.1/src/keditbookmarks-20.12.1.tar.xz";
642− sha256 = "1a41zpl2wzqdmp13m915agcc2nlxndyamy5aqyn98y3s8k5n6d9p";
643− name = "keditbookmarks-20.12.1.tar.xz";
641+ url = "${mirror}/stable/release-service/20.12.2/src/keditbookmarks-20.12.2.tar.xz";
642+ sha256 = "0slma1vrm0cmr2v970ingbckqa3viw6jgfss0z7fpx4bilw65bd7";
643+ name = "keditbookmarks-20.12.2.tar.xz";
644644 };
645645 };
646646 kfind = {
647− version = "20.12.1";
647+ version = "20.12.2";
648648 src = fetchurl {
649− url = "${mirror}/stable/release-service/20.12.1/src/kfind-20.12.1.tar.xz";
650− sha256 = "0rlxq4dl221ycxcybav7yf88wz23v07n5yzp7jgrd602lk5k8jdp";
651− name = "kfind-20.12.1.tar.xz";
649+ url = "${mirror}/stable/release-service/20.12.2/src/kfind-20.12.2.tar.xz";
650+ sha256 = "0vfi5ipwncq7d4z1gbilw6kyyrn5d986wr3f2zhsyhpwmsh9ycnb";
651+ name = "kfind-20.12.2.tar.xz";
652652 };
653653 };
654654 kfloppy = {
655− version = "20.12.1";
655+ version = "20.12.2";
656656 src = fetchurl {
657− url = "${mirror}/stable/release-service/20.12.1/src/kfloppy-20.12.1.tar.xz";
658− sha256 = "1wpcv2ipx0izg60rbgf8qwhys3bhw8i36qpsvh8bihkzij28xc84";
659− name = "kfloppy-20.12.1.tar.xz";
657+ url = "${mirror}/stable/release-service/20.12.2/src/kfloppy-20.12.2.tar.xz";
658+ sha256 = "1sz6bgw54w8s4bdyyajy0zgxw5kcm45p0gizf7ghw33x5vxryg4g";
659+ name = "kfloppy-20.12.2.tar.xz";
660660 };
661661 };
662662 kfourinline = {
663− version = "20.12.1";
663+ version = "20.12.2";
664664 src = fetchurl {
665− url = "${mirror}/stable/release-service/20.12.1/src/kfourinline-20.12.1.tar.xz";
666− sha256 = "1fv68smci1f59xzqzqj36qry2ibgr0ps731vhvafn210q8h2f5b5";
667− name = "kfourinline-20.12.1.tar.xz";
665+ url = "${mirror}/stable/release-service/20.12.2/src/kfourinline-20.12.2.tar.xz";
666+ sha256 = "1ld2srgmriab70j08nvqbaswjp2miljwd8rbpy2dyvzfprmci3xk";
667+ name = "kfourinline-20.12.2.tar.xz";
668668 };
669669 };
670670 kgeography = {
671− version = "20.12.1";
671+ version = "20.12.2";
672672 src = fetchurl {
673− url = "${mirror}/stable/release-service/20.12.1/src/kgeography-20.12.1.tar.xz";
674− sha256 = "13jsrfv17lzlwi9rg7i8q2sfl8n19k15qdbv1y5lggykvf8prp8h";
675− name = "kgeography-20.12.1.tar.xz";
673+ url = "${mirror}/stable/release-service/20.12.2/src/kgeography-20.12.2.tar.xz";
674+ sha256 = "0v1355y3fwzq63hq0wz9rskzncnlfdybmqcx23pk57jazsmv6ndi";
675+ name = "kgeography-20.12.2.tar.xz";
676676 };
677677 };
678678 kget = {
679− version = "20.12.1";
679+ version = "20.12.2";
680680 src = fetchurl {
681− url = "${mirror}/stable/release-service/20.12.1/src/kget-20.12.1.tar.xz";
682− sha256 = "03s8wpfrzl3j6whxbfbmbydghaghcnr8xbskf4wkyk9kvyk4bqha";
683− name = "kget-20.12.1.tar.xz";
681+ url = "${mirror}/stable/release-service/20.12.2/src/kget-20.12.2.tar.xz";
682+ sha256 = "1xya4raai9jqqzb3kga3mrm7jznkaa0fr4sq8j28qd45bgx2385p";
683+ name = "kget-20.12.2.tar.xz";
684684 };
685685 };
686686 kgoldrunner = {
687− version = "20.12.1";
687+ version = "20.12.2";
688688 src = fetchurl {
689− url = "${mirror}/stable/release-service/20.12.1/src/kgoldrunner-20.12.1.tar.xz";
690− sha256 = "0n96clxf0bmhm8hlyvd7q9w1zhjn5irvh2vrf9d79ng44zgygjvh";
691− name = "kgoldrunner-20.12.1.tar.xz";
689+ url = "${mirror}/stable/release-service/20.12.2/src/kgoldrunner-20.12.2.tar.xz";
690+ sha256 = "1ai5hfhwlsiw6ywpmwg9q85hsn3ih44v7n3wj70fsrldh87cn9ps";
691+ name = "kgoldrunner-20.12.2.tar.xz";
692692 };
693693 };
694694 kgpg = {
695− version = "20.12.1";
695+ version = "20.12.2";
696696 src = fetchurl {
697− url = "${mirror}/stable/release-service/20.12.1/src/kgpg-20.12.1.tar.xz";
698− sha256 = "05wwdbx90wg3rm6hcin1dykbrbzz82g01dxnkgh21zzab72wmx8a";
699− name = "kgpg-20.12.1.tar.xz";
697+ url = "${mirror}/stable/release-service/20.12.2/src/kgpg-20.12.2.tar.xz";
698+ sha256 = "1szg6fmmnxi94s5r2gxn4mlsiqahharyh05bisy5w7cl9w9c70xg";
699+ name = "kgpg-20.12.2.tar.xz";
700700 };
701701 };
702702 khangman = {
703− version = "20.12.1";
703+ version = "20.12.2";
704704 src = fetchurl {
705− url = "${mirror}/stable/release-service/20.12.1/src/khangman-20.12.1.tar.xz";
706− sha256 = "0ljavjbh69qyp2323pqlkibzjkwgddmdjd35m0m5n4nwvnz3l5y7";
707− name = "khangman-20.12.1.tar.xz";
705+ url = "${mirror}/stable/release-service/20.12.2/src/khangman-20.12.2.tar.xz";
706+ sha256 = "1bhcdr2v6zgawn819vbqnvgrm52xymgjyr396qbx5mc0srz88bzk";
707+ name = "khangman-20.12.2.tar.xz";
708708 };
709709 };
710710 khelpcenter = {
711− version = "20.12.1";
711+ version = "20.12.2";
712712 src = fetchurl {
713− url = "${mirror}/stable/release-service/20.12.1/src/khelpcenter-20.12.1.tar.xz";
714− sha256 = "1cba8siq3g78xjap4mhfkgvk9n031qy81ir08fpwk6zp9fkkgqb6";
715− name = "khelpcenter-20.12.1.tar.xz";
713+ url = "${mirror}/stable/release-service/20.12.2/src/khelpcenter-20.12.2.tar.xz";
714+ sha256 = "1mxs0imw64av8dybh91xxy4mmdcikjkqv6apsw29pp3s29irxpdx";
715+ name = "khelpcenter-20.12.2.tar.xz";
716716 };
717717 };
718718 kidentitymanagement = {
719− version = "20.12.1";
719+ version = "20.12.2";
720720 src = fetchurl {
721− url = "${mirror}/stable/release-service/20.12.1/src/kidentitymanagement-20.12.1.tar.xz";
722− sha256 = "1f8l8xbwy7qk5hadvknr45ihhg1j7zpqvpf5wxj3h6zg9fmadly9";
723− name = "kidentitymanagement-20.12.1.tar.xz";
721+ url = "${mirror}/stable/release-service/20.12.2/src/kidentitymanagement-20.12.2.tar.xz";
722+ sha256 = "1vcpfcriinx0ywz3jz26810h2cqmlfvyyxd0mzh3jp7rl0kkasgj";
723+ name = "kidentitymanagement-20.12.2.tar.xz";
724724 };
725725 };
726726 kig = {
727− version = "20.12.1";
727+ version = "20.12.2";
728728 src = fetchurl {
729− url = "${mirror}/stable/release-service/20.12.1/src/kig-20.12.1.tar.xz";
730− sha256 = "0ns4rhk822p7jjqy9wnhkbrbais4ih1viw405rl5r5xlqn9bvsiz";
731− name = "kig-20.12.1.tar.xz";
729+ url = "${mirror}/stable/release-service/20.12.2/src/kig-20.12.2.tar.xz";
730+ sha256 = "08wvgykrhzf2j4qb0fz4irbyaxjp5ka7jmmjn8y27srz0x4zgkrz";
731+ name = "kig-20.12.2.tar.xz";
732732 };
733733 };
734734 kigo = {
735− version = "20.12.1";
735+ version = "20.12.2";
736736 src = fetchurl {
737− url = "${mirror}/stable/release-service/20.12.1/src/kigo-20.12.1.tar.xz";
738− sha256 = "0lvcc423mw3gs6c5x4lrlny07q93pa8ivaqphq6y4771n5y5dqqa";
739− name = "kigo-20.12.1.tar.xz";
737+ url = "${mirror}/stable/release-service/20.12.2/src/kigo-20.12.2.tar.xz";
738+ sha256 = "1a4hv5g2wdpvf56zrr0rna6hdvm2cy6sz1jlhj7hf1lcx3lgfj9g";
739+ name = "kigo-20.12.2.tar.xz";
740740 };
741741 };
742742 killbots = {
743− version = "20.12.1";
743+ version = "20.12.2";
744744 src = fetchurl {
745− url = "${mirror}/stable/release-service/20.12.1/src/killbots-20.12.1.tar.xz";
746− sha256 = "0cdlixd7rakcxa8f5pf3pmq86mlipg7yhygnii858165v0gwkpx3";
747− name = "killbots-20.12.1.tar.xz";
745+ url = "${mirror}/stable/release-service/20.12.2/src/killbots-20.12.2.tar.xz";
746+ sha256 = "01lmkflndqmrzyrabmh5jqrk2zywcn5s82aag3m0wdqbyrqc5pas";
747+ name = "killbots-20.12.2.tar.xz";
748748 };
749749 };
750750 kimagemapeditor = {
751− version = "20.12.1";
751+ version = "20.12.2";
752752 src = fetchurl {
753− url = "${mirror}/stable/release-service/20.12.1/src/kimagemapeditor-20.12.1.tar.xz";
754− sha256 = "0vj2w3bgkq020gdi5q1zh650ipf4zc0hvzx5fpjknx4hd8b52rf8";
755− name = "kimagemapeditor-20.12.1.tar.xz";
753+ url = "${mirror}/stable/release-service/20.12.2/src/kimagemapeditor-20.12.2.tar.xz";
754+ sha256 = "06awvhcjg8nd0wjcqqzccnlpci6cd35flvfs3k05czk70sgqzysq";
755+ name = "kimagemapeditor-20.12.2.tar.xz";
756756 };
757757 };
758758 kimap = {
759− version = "20.12.1";
759+ version = "20.12.2";
760760 src = fetchurl {
761− url = "${mirror}/stable/release-service/20.12.1/src/kimap-20.12.1.tar.xz";
762− sha256 = "1x6lapmb3srw3pddi7rmlzjdsw54x94pkr6jyrncpfpqqsgb3l4v";
763− name = "kimap-20.12.1.tar.xz";
761+ url = "${mirror}/stable/release-service/20.12.2/src/kimap-20.12.2.tar.xz";
762+ sha256 = "14kjgn6b1qnfr3zsr3r73wf15n47qqx9vw5z11yv161andrr105d";
763+ name = "kimap-20.12.2.tar.xz";
764764 };
765765 };
766766 kio-extras = {
767− version = "20.12.1";
767+ version = "20.12.2";
768768 src = fetchurl {
769− url = "${mirror}/stable/release-service/20.12.1/src/kio-extras-20.12.1.tar.xz";
770− sha256 = "1ym07jzy4w21frf3j5aadxg8ny7bgrm5dbhrc3xdyyj2rwh3iygg";
771− name = "kio-extras-20.12.1.tar.xz";
769+ url = "${mirror}/stable/release-service/20.12.2/src/kio-extras-20.12.2.tar.xz";
770+ sha256 = "1r2sw8i7lf0zyb5bvz4002vdi2bf9jv01735caiw9smxr1lgcz93";
771+ name = "kio-extras-20.12.2.tar.xz";
772772 };
773773 };
774774 kio-gdrive = {
775− version = "20.12.1";
775+ version = "20.12.2";
776776 src = fetchurl {
777− url = "${mirror}/stable/release-service/20.12.1/src/kio-gdrive-20.12.1.tar.xz";
778− sha256 = "0axh8138rcfpa0a7s5w8zi8i6chz3z1q7560v497x6rd3d1z2zp0";
779− name = "kio-gdrive-20.12.1.tar.xz";
777+ url = "${mirror}/stable/release-service/20.12.2/src/kio-gdrive-20.12.2.tar.xz";
778+ sha256 = "0rwwakhsn9bnmxxnr0620jyp00x7iqqsaz5nd2lmhyjkc4mqv2km";
779+ name = "kio-gdrive-20.12.2.tar.xz";
780780 };
781781 };
782782 kipi-plugins = {
783− version = "20.12.1";
783+ version = "20.12.2";
784784 src = fetchurl {
785− url = "${mirror}/stable/release-service/20.12.1/src/kipi-plugins-20.12.1.tar.xz";
786− sha256 = "0pv5f6v37n75vrz4vaw755bjyyqk1mm9dla26k0jy3qr76g8bg9d";
787− name = "kipi-plugins-20.12.1.tar.xz";
785+ url = "${mirror}/stable/release-service/20.12.2/src/kipi-plugins-20.12.2.tar.xz";
786+ sha256 = "120yi7kfqv74368c78s4gfg7fp2h32v1c3jic2lnsy5y3iad22l8";
787+ name = "kipi-plugins-20.12.2.tar.xz";
788788 };
789789 };
790790 kirigami-gallery = {
791− version = "20.12.1";
791+ version = "20.12.2";
792792 src = fetchurl {
793− url = "${mirror}/stable/release-service/20.12.1/src/kirigami-gallery-20.12.1.tar.xz";
794− sha256 = "00f3alhlvlphcz81465nfrdvvabbzy5n1s06bvwzsvf290h5chbh";
795− name = "kirigami-gallery-20.12.1.tar.xz";
793+ url = "${mirror}/stable/release-service/20.12.2/src/kirigami-gallery-20.12.2.tar.xz";
794+ sha256 = "039ddgrvw1l4jvc3yjs0c6fi8kss5ma8hs6cbs8xvw0cyi9604qw";
795+ name = "kirigami-gallery-20.12.2.tar.xz";
796796 };
797797 };
798798 kiriki = {
799− version = "20.12.1";
799+ version = "20.12.2";
800800 src = fetchurl {
801− url = "${mirror}/stable/release-service/20.12.1/src/kiriki-20.12.1.tar.xz";
802− sha256 = "07qsmyf1ylgcwy704s8x9g1h4kalsipqz4z3bj1z5m5a2y9l8y8q";
803− name = "kiriki-20.12.1.tar.xz";
801+ url = "${mirror}/stable/release-service/20.12.2/src/kiriki-20.12.2.tar.xz";
802+ sha256 = "0bslysqnnxkjfyxv8vkfmvwjhlw2zdlghbngg21k1ljvgr2jfx6j";
803+ name = "kiriki-20.12.2.tar.xz";
804804 };
805805 };
806806 kiten = {
807− version = "20.12.1";
807+ version = "20.12.2";
808808 src = fetchurl {
809− url = "${mirror}/stable/release-service/20.12.1/src/kiten-20.12.1.tar.xz";
810− sha256 = "0dfz2wdscgn0f967lnhzpyb3iz1iw068x0l10542pm5dh32afs4m";
811− name = "kiten-20.12.1.tar.xz";
809+ url = "${mirror}/stable/release-service/20.12.2/src/kiten-20.12.2.tar.xz";
810+ sha256 = "18p4g9cqn25s2zjygwvi9s81ma0b8rhfj9z0i2kd415b2sxalk3y";
811+ name = "kiten-20.12.2.tar.xz";
812812 };
813813 };
814814 kitinerary = {
815− version = "20.12.1";
815+ version = "20.12.2";
816816 src = fetchurl {
817− url = "${mirror}/stable/release-service/20.12.1/src/kitinerary-20.12.1.tar.xz";
818− sha256 = "07zjd3ikbx6rw39ndy04aia8q35r75p5n52fijwnc4fkfc40xyxz";
819− name = "kitinerary-20.12.1.tar.xz";
817+ url = "${mirror}/stable/release-service/20.12.2/src/kitinerary-20.12.2.tar.xz";
818+ sha256 = "0z9jyj9wlda44qdncjnp6cyp7dwk89dl9nj68j5birmn83ykaawp";
819+ name = "kitinerary-20.12.2.tar.xz";
820820 };
821821 };
822822 kjumpingcube = {
823− version = "20.12.1";
823+ version = "20.12.2";
824824 src = fetchurl {
825− url = "${mirror}/stable/release-service/20.12.1/src/kjumpingcube-20.12.1.tar.xz";
826− sha256 = "0li9bq7j30fbdzg981i6jkpxgrv1z84bpig8m5mxfyfhs5c55j69";
827− name = "kjumpingcube-20.12.1.tar.xz";
825+ url = "${mirror}/stable/release-service/20.12.2/src/kjumpingcube-20.12.2.tar.xz";
826+ sha256 = "04qry2b82yk2k4v1pj8pvqi27my42k5ssmc5rpzkh0vq8pzwgkjh";
827+ name = "kjumpingcube-20.12.2.tar.xz";
828828 };
829829 };
830830 kldap = {
831− version = "20.12.1";
831+ version = "20.12.2";
832832 src = fetchurl {
833− url = "${mirror}/stable/release-service/20.12.1/src/kldap-20.12.1.tar.xz";
834− sha256 = "02w4hk9j1f1d81k0j8dzrj4hxwk2xwrf48305hzmm658wjvkv4k3";
835− name = "kldap-20.12.1.tar.xz";
833+ url = "${mirror}/stable/release-service/20.12.2/src/kldap-20.12.2.tar.xz";
834+ sha256 = "1njgsxbqgz0grqagf695qv285x8slgnp4rg377jz1cnz597nzl6b";
835+ name = "kldap-20.12.2.tar.xz";
836836 };
837837 };
838838 kleopatra = {
839− version = "20.12.1";
839+ version = "20.12.2";
840840 src = fetchurl {
841− url = "${mirror}/stable/release-service/20.12.1/src/kleopatra-20.12.1.tar.xz";
842− sha256 = "1g06mq8vl1jhkyrjfrgsbl44v7yq04m8xbb8dxlyhyv40dwlz7l6";
843− name = "kleopatra-20.12.1.tar.xz";
841+ url = "${mirror}/stable/release-service/20.12.2/src/kleopatra-20.12.2.tar.xz";
842+ sha256 = "12ayl3gar9bi06v418sflr6fr5k86m8x2ls4laig1ymansbvnwlz";
843+ name = "kleopatra-20.12.2.tar.xz";
844844 };
845845 };
846846 klettres = {
847− version = "20.12.1";
847+ version = "20.12.2";
848848 src = fetchurl {
849− url = "${mirror}/stable/release-service/20.12.1/src/klettres-20.12.1.tar.xz";
850− sha256 = "0k66xdkyv6i1zgk9nvz9633pmxygv1bwm4nkbg3izlh4g23rn3kk";
851− name = "klettres-20.12.1.tar.xz";
849+ url = "${mirror}/stable/release-service/20.12.2/src/klettres-20.12.2.tar.xz";
850+ sha256 = "0ixykb36a7hgz89zxc8x7fp0di67vmalvpa9rivdff3lp7il87n3";
851+ name = "klettres-20.12.2.tar.xz";
852852 };
853853 };
854854 klickety = {
855− version = "20.12.1";
855+ version = "20.12.2";
856856 src = fetchurl {
857− url = "${mirror}/stable/release-service/20.12.1/src/klickety-20.12.1.tar.xz";
858− sha256 = "17ml80p02sndhac5q6lkf7bb1kz9snsia991fghhahcjvd1g2qn6";
859− name = "klickety-20.12.1.tar.xz";
857+ url = "${mirror}/stable/release-service/20.12.2/src/klickety-20.12.2.tar.xz";
858+ sha256 = "0dgv6bnz7aw95nxjqkhcanl06hpdx4g8qwkrvnfsiphjbldhfig7";
859+ name = "klickety-20.12.2.tar.xz";
860860 };
861861 };
862862 klines = {
863− version = "20.12.1";
863+ version = "20.12.2";
864864 src = fetchurl {
865− url = "${mirror}/stable/release-service/20.12.1/src/klines-20.12.1.tar.xz";
866− sha256 = "1ba71n90x0s8nf300p53libzfjd0j9r6m0fng636m1qjaz6z9a3c";
867− name = "klines-20.12.1.tar.xz";
865+ url = "${mirror}/stable/release-service/20.12.2/src/klines-20.12.2.tar.xz";
866+ sha256 = "14mrqfw7y5xcq237a6prfqy8pj34iz5mnfqs373p0jbvdqkc5843";
867+ name = "klines-20.12.2.tar.xz";
868868 };
869869 };
870870 kmag = {
871− version = "20.12.1";
871+ version = "20.12.2";
872872 src = fetchurl {
873− url = "${mirror}/stable/release-service/20.12.1/src/kmag-20.12.1.tar.xz";
874− sha256 = "0m4zy1ybk2p4wzdfrdf64n06ck39sn7s0nb82miizcpscaxqswhj";
875− name = "kmag-20.12.1.tar.xz";
873+ url = "${mirror}/stable/release-service/20.12.2/src/kmag-20.12.2.tar.xz";
874+ sha256 = "1vwn5n3c8kq3d3d7sssqpq8iz9g0af4xnvcvjqh4s7fcxmsr3ryv";
875+ name = "kmag-20.12.2.tar.xz";
876876 };
877877 };
878878 kmahjongg = {
879− version = "20.12.1";
879+ version = "20.12.2";
880880 src = fetchurl {
881− url = "${mirror}/stable/release-service/20.12.1/src/kmahjongg-20.12.1.tar.xz";
882− sha256 = "1hszrp81pffg7rp0rk54qx49v3acmqfdi0if47kh9w124iicsi3z";
883− name = "kmahjongg-20.12.1.tar.xz";
881+ url = "${mirror}/stable/release-service/20.12.2/src/kmahjongg-20.12.2.tar.xz";
882+ sha256 = "055nihkvfij6a71qn6lw3sbb74zz5r7cp2dghlkai9405ri4gdyc";
883+ name = "kmahjongg-20.12.2.tar.xz";
884884 };
885885 };
886886 kmail = {
887− version = "20.12.1";
887+ version = "20.12.2";
888888 src = fetchurl {
889− url = "${mirror}/stable/release-service/20.12.1/src/kmail-20.12.1.tar.xz";
890− sha256 = "128l57x29mqg3fcx50hviqydl7gw6n2zbjnmzrj7fzgl6gafcdgw";
891− name = "kmail-20.12.1.tar.xz";
889+ url = "${mirror}/stable/release-service/20.12.2/src/kmail-20.12.2.tar.xz";
890+ sha256 = "09idfdh04687jzh125jw2244ymaqhx6j3563m2cbf2spph0r1vqj";
891+ name = "kmail-20.12.2.tar.xz";
892892 };
893893 };
894894 kmail-account-wizard = {
895− version = "20.12.1";
895+ version = "20.12.2";
896896 src = fetchurl {
897− url = "${mirror}/stable/release-service/20.12.1/src/kmail-account-wizard-20.12.1.tar.xz";
898− sha256 = "1gl4pvn7lyyc9rsk70yp5mikpdbakp4zgwx3plypqhmqd1z92pin";
899− name = "kmail-account-wizard-20.12.1.tar.xz";
897+ url = "${mirror}/stable/release-service/20.12.2/src/kmail-account-wizard-20.12.2.tar.xz";
898+ sha256 = "0a9pz1m3jabi21nrlcj0fqrj1hsgmarw91sxx5qvs74fp2b59368";
899+ name = "kmail-account-wizard-20.12.2.tar.xz";
900900 };
901901 };
902902 kmailtransport = {
903− version = "20.12.1";
903+ version = "20.12.2";
904904 src = fetchurl {
905− url = "${mirror}/stable/release-service/20.12.1/src/kmailtransport-20.12.1.tar.xz";
906− sha256 = "08i4fmhkpxil7q6vn045xha54x00jkm19kibphx2q3sb3c6s3plm";
907− name = "kmailtransport-20.12.1.tar.xz";
905+ url = "${mirror}/stable/release-service/20.12.2/src/kmailtransport-20.12.2.tar.xz";
906+ sha256 = "11knn52fc5r637s1w3fzbkapjx6xs1n9v9933ji17zhry7c5rlzv";
907+ name = "kmailtransport-20.12.2.tar.xz";
908908 };
909909 };
910910 kmbox = {
911− version = "20.12.1";
911+ version = "20.12.2";
912912 src = fetchurl {
913− url = "${mirror}/stable/release-service/20.12.1/src/kmbox-20.12.1.tar.xz";
914− sha256 = "1w172gqanhpkmcd9hc62lsmrkylg8mlfyk3nq3n89k6m2dkcfvqd";
915− name = "kmbox-20.12.1.tar.xz";
913+ url = "${mirror}/stable/release-service/20.12.2/src/kmbox-20.12.2.tar.xz";
914+ sha256 = "0r76s03g4da2sds6y632gvg228gwsl7gs8ml9rf0fdjb8ymql1hl";
915+ name = "kmbox-20.12.2.tar.xz";
916916 };
917917 };
918918 kmime = {
919− version = "20.12.1";
919+ version = "20.12.2";
920920 src = fetchurl {
921− url = "${mirror}/stable/release-service/20.12.1/src/kmime-20.12.1.tar.xz";
922− sha256 = "0hr5mh8a4b9bi0dqs055x4mpig7awqy9sd6j0i8lxix4cngcb6a2";
923− name = "kmime-20.12.1.tar.xz";
921+ url = "${mirror}/stable/release-service/20.12.2/src/kmime-20.12.2.tar.xz";
922+ sha256 = "1jpfhsac2pji80cad0yab59lq7q7c1han0gajvwys1j15jyj11gi";
923+ name = "kmime-20.12.2.tar.xz";
924924 };
925925 };
926926 kmines = {
927− version = "20.12.1";
927+ version = "20.12.2";
928928 src = fetchurl {
929− url = "${mirror}/stable/release-service/20.12.1/src/kmines-20.12.1.tar.xz";
930− sha256 = "18jzzn03c6mlmc02qg5fimid77b8gs0h4lci6wmj11fmb94g1hic";
931− name = "kmines-20.12.1.tar.xz";
929+ url = "${mirror}/stable/release-service/20.12.2/src/kmines-20.12.2.tar.xz";
930+ sha256 = "0378cd1zh6w8slap4wry8m69l27nvi7j2dwz2vwkl76zh31q4pwi";
931+ name = "kmines-20.12.2.tar.xz";
932932 };
933933 };
934934 kmix = {
935− version = "20.12.1";
935+ version = "20.12.2";
936936 src = fetchurl {
937− url = "${mirror}/stable/release-service/20.12.1/src/kmix-20.12.1.tar.xz";
938− sha256 = "1q1jz33mwnr5nr2mw92g40g7paclaxhwcvqik91la6dnvl0vpi8p";
939− name = "kmix-20.12.1.tar.xz";
937+ url = "${mirror}/stable/release-service/20.12.2/src/kmix-20.12.2.tar.xz";
938+ sha256 = "12kij1y2lbyx71bg32pwb9s9p928pyw44flz9bv2jrzkkf4zwfxk";
939+ name = "kmix-20.12.2.tar.xz";
940940 };
941941 };
942942 kmousetool = {
943− version = "20.12.1";
943+ version = "20.12.2";
944944 src = fetchurl {
945− url = "${mirror}/stable/release-service/20.12.1/src/kmousetool-20.12.1.tar.xz";
946− sha256 = "1nahq9cgffcd4llqc8lwkicxjw8nwphvpws9xkalwsswb7ai9jrk";
947− name = "kmousetool-20.12.1.tar.xz";
945+ url = "${mirror}/stable/release-service/20.12.2/src/kmousetool-20.12.2.tar.xz";
946+ sha256 = "0ybrczxsmfrj43nr931ylbdgpqmcfx47ifbv2qjn72i8iggrv0cl";
947+ name = "kmousetool-20.12.2.tar.xz";
948948 };
949949 };
950950 kmouth = {
951− version = "20.12.1";
951+ version = "20.12.2";
952952 src = fetchurl {
953− url = "${mirror}/stable/release-service/20.12.1/src/kmouth-20.12.1.tar.xz";
954− sha256 = "0qhparw2qszv7z7lrzb76kyvkcgr9sgry9ir9965dd0sp4c1fhgc";
955− name = "kmouth-20.12.1.tar.xz";
953+ url = "${mirror}/stable/release-service/20.12.2/src/kmouth-20.12.2.tar.xz";
954+ sha256 = "1vq41r1vhr5iaxlb5dzpq3vwqk1rn1zxw3k4j7g2xq5xxmibj944";
955+ name = "kmouth-20.12.2.tar.xz";
956956 };
957957 };
958958 kmplot = {
959− version = "20.12.1";
959+ version = "20.12.2";
960960 src = fetchurl {
961− url = "${mirror}/stable/release-service/20.12.1/src/kmplot-20.12.1.tar.xz";
962− sha256 = "0iz61jjr7z0j5bh5nqdv9nbdbiz0jhda89bxjds0n9636q42rifm";
963− name = "kmplot-20.12.1.tar.xz";
961+ url = "${mirror}/stable/release-service/20.12.2/src/kmplot-20.12.2.tar.xz";
962+ sha256 = "0l6j68zg9xdrgglw7gnji0spjf7pcggym90cccw67jdn2wxc8g6q";
963+ name = "kmplot-20.12.2.tar.xz";
964964 };
965965 };
966966 knavalbattle = {
967− version = "20.12.1";
967+ version = "20.12.2";
968968 src = fetchurl {
969− url = "${mirror}/stable/release-service/20.12.1/src/knavalbattle-20.12.1.tar.xz";
970− sha256 = "0k7kqnc8zp3n0ckrmmih12x6h1vgn9s7hrgp7n37bns2g39ij0xn";
971− name = "knavalbattle-20.12.1.tar.xz";
969+ url = "${mirror}/stable/release-service/20.12.2/src/knavalbattle-20.12.2.tar.xz";
970+ sha256 = "0x47rzs7afqygcy45crc10ix4dsivnpmxis9r0w4lpzbq3qzd585";
971+ name = "knavalbattle-20.12.2.tar.xz";
972972 };
973973 };
974974 knetwalk = {
975− version = "20.12.1";
975+ version = "20.12.2";
976976 src = fetchurl {
977− url = "${mirror}/stable/release-service/20.12.1/src/knetwalk-20.12.1.tar.xz";
978− sha256 = "0px8yfi5h9nipgdjcgskrm66dr23yg5ks0kyxjsly6mv41qxjiw8";
979− name = "knetwalk-20.12.1.tar.xz";
977+ url = "${mirror}/stable/release-service/20.12.2/src/knetwalk-20.12.2.tar.xz";
978+ sha256 = "11h7b5amm4bcng0h8hfcn1r1nkd82h0rl47wvnqczsgjqp2r9h6a";
979+ name = "knetwalk-20.12.2.tar.xz";
980980 };
981981 };
982982 knights = {
983− version = "20.12.1";
983+ version = "20.12.2";
984984 src = fetchurl {
985− url = "${mirror}/stable/release-service/20.12.1/src/knights-20.12.1.tar.xz";
986− sha256 = "098ywblshbr3qx7b8m4qj0036dq3c3mackmsbjnr85acb0204bjb";
987− name = "knights-20.12.1.tar.xz";
985+ url = "${mirror}/stable/release-service/20.12.2/src/knights-20.12.2.tar.xz";
986+ sha256 = "1p5w61x4ldb5sp77l1c0v7aczi62xpvf1084316byhb5cqmxsqm9";
987+ name = "knights-20.12.2.tar.xz";
988988 };
989989 };
990990 knotes = {
991− version = "20.12.1";
991+ version = "20.12.2";
992992 src = fetchurl {
993− url = "${mirror}/stable/release-service/20.12.1/src/knotes-20.12.1.tar.xz";
994− sha256 = "11gfk2p240a2gqxgkn9ymf7ds2zpij8h2vbbkax6ariddmhmlqk0";
995− name = "knotes-20.12.1.tar.xz";
993+ url = "${mirror}/stable/release-service/20.12.2/src/knotes-20.12.2.tar.xz";
994+ sha256 = "11dvczl04lmzlhbmqp508bqrsrqqmmprp3nsvakmmidpgnvcm26l";
995+ name = "knotes-20.12.2.tar.xz";
996996 };
997997 };
998998 kolf = {
999− version = "20.12.1";
999+ version = "20.12.2";
10001000 src = fetchurl {
1001− url = "${mirror}/stable/release-service/20.12.1/src/kolf-20.12.1.tar.xz";
1002− sha256 = "12b424dl6rizj2pdcd4cr01lmp4kmirii79k40v22hn0yn6a9qdv";
1003− name = "kolf-20.12.1.tar.xz";
1001+ url = "${mirror}/stable/release-service/20.12.2/src/kolf-20.12.2.tar.xz";
1002+ sha256 = "1jw22m7a2jdw9zmssiihwm35zpq7bg8zk0a68fh5nxbyv43q8fj5";
1003+ name = "kolf-20.12.2.tar.xz";
10041004 };
10051005 };
10061006 kollision = {
1007− version = "20.12.1";
1007+ version = "20.12.2";
10081008 src = fetchurl {
1009− url = "${mirror}/stable/release-service/20.12.1/src/kollision-20.12.1.tar.xz";
1010− sha256 = "1hxv4qd5dl61d5440r4hnd9r24prn78ibmnk3m06c15zc3hfdsdn";
1011− name = "kollision-20.12.1.tar.xz";
1009+ url = "${mirror}/stable/release-service/20.12.2/src/kollision-20.12.2.tar.xz";
1010+ sha256 = "0g0mf9p1pz9wahc92k9iw1vb8v64y1kj7zgiyzmil6qr1pjyzlgm";
1011+ name = "kollision-20.12.2.tar.xz";
10121012 };
10131013 };
10141014 kolourpaint = {
1015− version = "20.12.1";
1015+ version = "20.12.2";
10161016 src = fetchurl {
1017− url = "${mirror}/stable/release-service/20.12.1/src/kolourpaint-20.12.1.tar.xz";
1018− sha256 = "1a2wgrf9hirvj61k2nd8x7rv5v8i9r1vrvpdmi9ik4qdg6lpvqay";
1019− name = "kolourpaint-20.12.1.tar.xz";
1017+ url = "${mirror}/stable/release-service/20.12.2/src/kolourpaint-20.12.2.tar.xz";
1018+ sha256 = "13pb09r9qrgwaii9x3a6qk3qgk288a821p4xgiwaiv9lcbjz56fn";
1019+ name = "kolourpaint-20.12.2.tar.xz";
10201020 };
10211021 };
10221022 kompare = {
1023− version = "20.12.1";
1023+ version = "20.12.2";
10241024 src = fetchurl {
1025− url = "${mirror}/stable/release-service/20.12.1/src/kompare-20.12.1.tar.xz";
1026− sha256 = "13di8dzp7xzlfacas5f92h1vwiqf64cd0rkc4yv4l2g8aq2jzcqh";
1027− name = "kompare-20.12.1.tar.xz";
1025+ url = "${mirror}/stable/release-service/20.12.2/src/kompare-20.12.2.tar.xz";
1026+ sha256 = "18n5sw52kwwmbgyb2q5lizpa57by8gmx665bj68wi2hvzdihmxmv";
1027+ name = "kompare-20.12.2.tar.xz";
10281028 };
10291029 };
10301030 konqueror = {
1031− version = "20.12.1";
1031+ version = "20.12.2";
10321032 src = fetchurl {
1033− url = "${mirror}/stable/release-service/20.12.1/src/konqueror-20.12.1.tar.xz";
1034− sha256 = "026f8fybr8azq3diw2k3p3qpmqj9lk6n9ipcl3xkwdss7i5v5w3y";
1035− name = "konqueror-20.12.1.tar.xz";
1033+ url = "${mirror}/stable/release-service/20.12.2/src/konqueror-20.12.2.tar.xz";
1034+ sha256 = "0zvr71yz2053y341b12zw92v0yk5whgivcr0iyz488lfw9wq0n4d";
1035+ name = "konqueror-20.12.2.tar.xz";
10361036 };
10371037 };
10381038 konquest = {
1039− version = "20.12.1";
1039+ version = "20.12.2";
10401040 src = fetchurl {
1041− url = "${mirror}/stable/release-service/20.12.1/src/konquest-20.12.1.tar.xz";
1042− sha256 = "1s08mvj7z91r86i0zwkcv05fnnr4lzhp596qr38d2yv6rxf5vr57";
1043− name = "konquest-20.12.1.tar.xz";
1041+ url = "${mirror}/stable/release-service/20.12.2/src/konquest-20.12.2.tar.xz";
1042+ sha256 = "0p4y7s37a3vchplpidlv4bc94gwnsm4k7sl4s2ra0prqga83yxbj";
1043+ name = "konquest-20.12.2.tar.xz";
10441044 };
10451045 };
10461046 konsole = {
1047− version = "20.12.1";
1047+ version = "20.12.2";
10481048 src = fetchurl {
1049− url = "${mirror}/stable/release-service/20.12.1/src/konsole-20.12.1.tar.xz";
1050− sha256 = "1v39sx00c115apnm32wn00yir69z1h0y3lblmjmvbjk24hwvx45n";
1051− name = "konsole-20.12.1.tar.xz";
1049+ url = "${mirror}/stable/release-service/20.12.2/src/konsole-20.12.2.tar.xz";
1050+ sha256 = "0wq8xbppg4fla8x669rvkz4mrpbpaplr0ysdvnc4djbwnzabs6zw";
1051+ name = "konsole-20.12.2.tar.xz";
10521052 };
10531053 };
10541054 kontact = {
1055− version = "20.12.1";
1055+ version = "20.12.2";
10561056 src = fetchurl {
1057− url = "${mirror}/stable/release-service/20.12.1/src/kontact-20.12.1.tar.xz";
1058− sha256 = "0dr59jj97zxkgc61zgwa8i26m81sfxvymxcrh5midwd24z8nslkz";
1059− name = "kontact-20.12.1.tar.xz";
1057+ url = "${mirror}/stable/release-service/20.12.2/src/kontact-20.12.2.tar.xz";
1058+ sha256 = "05pvrbsbrz39znim2jrcslnji8n4imig8f717jv89nlmllp5sk2i";
1059+ name = "kontact-20.12.2.tar.xz";
10601060 };
10611061 };
10621062 kontactinterface = {
1063− version = "20.12.1";
1063+ version = "20.12.2";
10641064 src = fetchurl {
1065− url = "${mirror}/stable/release-service/20.12.1/src/kontactinterface-20.12.1.tar.xz";
1066− sha256 = "0sdlgmwvir2s9ys466i4bj4raf2af43w838and64jwsr9qb1hg4j";
1067− name = "kontactinterface-20.12.1.tar.xz";
1065+ url = "${mirror}/stable/release-service/20.12.2/src/kontactinterface-20.12.2.tar.xz";
1066+ sha256 = "0i3kxim4rc4mvqlq06g0a8h106gb93v4s0kymysd4a4yw3pq4fas";
1067+ name = "kontactinterface-20.12.2.tar.xz";
10681068 };
10691069 };
10701070 kontrast = {
1071− version = "20.12.1";
1071+ version = "20.12.2";
10721072 src = fetchurl {
1073− url = "${mirror}/stable/release-service/20.12.1/src/kontrast-20.12.1.tar.xz";
1074− sha256 = "0cs31sn4va2hhfi7ps3bz9sy2hlxb8cawn5vijfdhzb9mmc962br";
1075− name = "kontrast-20.12.1.tar.xz";
1073+ url = "${mirror}/stable/release-service/20.12.2/src/kontrast-20.12.2.tar.xz";
1074+ sha256 = "0cqqclyqm0z59n296jh6pnb2zdzligmvsd2icb1qzxn2r69inipa";
1075+ name = "kontrast-20.12.2.tar.xz";
10761076 };
10771077 };
10781078 konversation = {
1079− version = "20.12.1";
1079+ version = "20.12.2";
10801080 src = fetchurl {
1081− url = "${mirror}/stable/release-service/20.12.1/src/konversation-20.12.1.tar.xz";
1082− sha256 = "1x6pyiv73avc3qmxlbnwwzk3gz6qbr991p896f9yb4rqfqj8j7j4";
1083− name = "konversation-20.12.1.tar.xz";
1081+ url = "${mirror}/stable/release-service/20.12.2/src/konversation-20.12.2.tar.xz";
1082+ sha256 = "0m13qpvzxm5arawsqh2hygs266jv9915lhc3xhs0b1wbhjb3ii8l";
1083+ name = "konversation-20.12.2.tar.xz";
10841084 };
10851085 };
10861086 kopete = {
1087− version = "20.12.1";
1087+ version = "20.12.2";
10881088 src = fetchurl {
1089− url = "${mirror}/stable/release-service/20.12.1/src/kopete-20.12.1.tar.xz";
1090− sha256 = "1cfbl3jalmaphwrzw443l4q5k1fx4nja65ajgrv3nly8rfabfnfl";
1091− name = "kopete-20.12.1.tar.xz";
1089+ url = "${mirror}/stable/release-service/20.12.2/src/kopete-20.12.2.tar.xz";
1090+ sha256 = "0ahcxkvi5ibdl3krm3aw5gamcyfi4s4af2wl6r3sk73l7q4kpxvi";
1091+ name = "kopete-20.12.2.tar.xz";
10921092 };
10931093 };
10941094 korganizer = {
1095− version = "20.12.1";
1095+ version = "20.12.2";
10961096 src = fetchurl {
1097− url = "${mirror}/stable/release-service/20.12.1/src/korganizer-20.12.1.tar.xz";
1098− sha256 = "1ci6ca6w3a77gf3d7fh9rjkblm5qa2jic176rwmax79qgvjjq8wm";
1099− name = "korganizer-20.12.1.tar.xz";
1097+ url = "${mirror}/stable/release-service/20.12.2/src/korganizer-20.12.2.tar.xz";
1098+ sha256 = "1f2j60gdx3hxz64lhx9cyi7sa75s2qr8zghhk8h1wgdwaz9hvjz8";
1099+ name = "korganizer-20.12.2.tar.xz";
11001100 };
11011101 };
11021102 kosmindoormap = {
1103− version = "20.12.1";
1103+ version = "20.12.2";
11041104 src = fetchurl {
1105− url = "${mirror}/stable/release-service/20.12.1/src/kosmindoormap-20.12.1.tar.xz";
1106− sha256 = "186kfqaznxyxqchwqsrb4dvk4v69rhqwfg93fcjsp43l14ml5rnx";
1107− name = "kosmindoormap-20.12.1.tar.xz";
1105+ url = "${mirror}/stable/release-service/20.12.2/src/kosmindoormap-20.12.2.tar.xz";
1106+ sha256 = "0rr6lgfbjdvnxipx0dnzp4hlrvq61ha015mz7qkly88ckwp6m05q";
1107+ name = "kosmindoormap-20.12.2.tar.xz";
11081108 };
11091109 };
11101110 kpat = {
1111− version = "20.12.1";
1111+ version = "20.12.2";
11121112 src = fetchurl {
1113− url = "${mirror}/stable/release-service/20.12.1/src/kpat-20.12.1.tar.xz";
1114− sha256 = "1kd3i7qhjwxi04x8dkc7q9rgx73zyx3njm5rhq0hc1v32m8nn659";
1115− name = "kpat-20.12.1.tar.xz";
1113+ url = "${mirror}/stable/release-service/20.12.2/src/kpat-20.12.2.tar.xz";
1114+ sha256 = "1gcv343aabwcgx3kb9khkvilnxipq200pz14d8qdj41lsa71cynx";
1115+ name = "kpat-20.12.2.tar.xz";
11161116 };
11171117 };
11181118 kpimtextedit = {
1119− version = "20.12.1";
1119+ version = "20.12.2";
11201120 src = fetchurl {
1121− url = "${mirror}/stable/release-service/20.12.1/src/kpimtextedit-20.12.1.tar.xz";
1122− sha256 = "15m26qssw80nxv1m51jq3q629nginhh4hb69a5y15jgvrv4k59b4";
1123− name = "kpimtextedit-20.12.1.tar.xz";
1121+ url = "${mirror}/stable/release-service/20.12.2/src/kpimtextedit-20.12.2.tar.xz";
1122+ sha256 = "1ccvzwbxbsbb4b5hfjvf30fv44b1byjzb08x4vagbrqb47ck763y";
1123+ name = "kpimtextedit-20.12.2.tar.xz";
11241124 };
11251125 };
11261126 kpkpass = {
1127− version = "20.12.1";
1127+ version = "20.12.2";
11281128 src = fetchurl {
1129− url = "${mirror}/stable/release-service/20.12.1/src/kpkpass-20.12.1.tar.xz";
1130− sha256 = "09idbgf9gnzyr520indlzhwb9pr5hx3dag26qrfi7l8ywzdkrsr2";
1131− name = "kpkpass-20.12.1.tar.xz";
1129+ url = "${mirror}/stable/release-service/20.12.2/src/kpkpass-20.12.2.tar.xz";
1130+ sha256 = "1m0cqlrpjmfam0lyjjzpd8wgsv9v0x6fr76qr5ndyrfbfcv0qin3";
1131+ name = "kpkpass-20.12.2.tar.xz";
11321132 };
11331133 };
11341134 kpmcore = {
1135− version = "20.12.1";
1135+ version = "20.12.2";
11361136 src = fetchurl {
1137− url = "${mirror}/stable/release-service/20.12.1/src/kpmcore-20.12.1.tar.xz";
1138− sha256 = "0nyqz1jfr9h9n80npvp7yyizbyga6iv8yljq52myk6b40vs9q41v";
1139− name = "kpmcore-20.12.1.tar.xz";
1137+ url = "${mirror}/stable/release-service/20.12.2/src/kpmcore-20.12.2.tar.xz";
1138+ sha256 = "1z8fln51jsgar69m2x8rb95zxbq6r28cycpa7y52gaiywahbsin4";
1139+ name = "kpmcore-20.12.2.tar.xz";
11401140 };
11411141 };
11421142 kpublictransport = {
1143− version = "20.12.1";
1143+ version = "20.12.2";
11441144 src = fetchurl {
1145− url = "${mirror}/stable/release-service/20.12.1/src/kpublictransport-20.12.1.tar.xz";
1146− sha256 = "0saqykqb9rrm3ngvcx910dmhyh1hc3n0x3qfzlzrxlq678ag94hq";
1147− name = "kpublictransport-20.12.1.tar.xz";
1145+ url = "${mirror}/stable/release-service/20.12.2/src/kpublictransport-20.12.2.tar.xz";
1146+ sha256 = "1n7gy9pnykxd39ralfxrrvbsgxn68f1jzvbmkyvj759xrl2na1kq";
1147+ name = "kpublictransport-20.12.2.tar.xz";
11481148 };
11491149 };
11501150 kqtquickcharts = {
1151− version = "20.12.1";
1151+ version = "20.12.2";
11521152 src = fetchurl {
1153− url = "${mirror}/stable/release-service/20.12.1/src/kqtquickcharts-20.12.1.tar.xz";
1154− sha256 = "0025vj4n0k3g5bsmjq6ydx80izvpx6g73jxz27hp69vbl8p4ylpc";
1155− name = "kqtquickcharts-20.12.1.tar.xz";
1153+ url = "${mirror}/stable/release-service/20.12.2/src/kqtquickcharts-20.12.2.tar.xz";
1154+ sha256 = "06lrvckmddyxl11kyic99dhfn8il88hs1vsnr89y3m8543ij885n";
1155+ name = "kqtquickcharts-20.12.2.tar.xz";
11561156 };
11571157 };
11581158 krdc = {
1159− version = "20.12.1";
1159+ version = "20.12.2";
11601160 src = fetchurl {
1161− url = "${mirror}/stable/release-service/20.12.1/src/krdc-20.12.1.tar.xz";
1162− sha256 = "067xrhs55di2ff0lxvcl2x7qblmv2pbrgjkc5bjsx6ai6w9bv4dh";
1163− name = "krdc-20.12.1.tar.xz";
1161+ url = "${mirror}/stable/release-service/20.12.2/src/krdc-20.12.2.tar.xz";
1162+ sha256 = "0wzv25pdalwgcb74dav4jkxpvak0nix46njn04w2vhy3rdlgplzr";
1163+ name = "krdc-20.12.2.tar.xz";
11641164 };
11651165 };
11661166 kreversi = {
1167− version = "20.12.1";
1167+ version = "20.12.2";
11681168 src = fetchurl {
1169− url = "${mirror}/stable/release-service/20.12.1/src/kreversi-20.12.1.tar.xz";
1170− sha256 = "1yw9lxzqyxk6fsh2lzsrp2cmdw545hszdz9253lm6b5ppax6z42a";
1171− name = "kreversi-20.12.1.tar.xz";
1169+ url = "${mirror}/stable/release-service/20.12.2/src/kreversi-20.12.2.tar.xz";
1170+ sha256 = "1c0xisbbq6p6ghl5rvhiddpgsa91m4bq8hmrpdw8s02j4g8aix39";
1171+ name = "kreversi-20.12.2.tar.xz";
11721172 };
11731173 };
11741174 krfb = {
1175− version = "20.12.1";
1175+ version = "20.12.2";
11761176 src = fetchurl {
1177− url = "${mirror}/stable/release-service/20.12.1/src/krfb-20.12.1.tar.xz";
1178− sha256 = "0pfxd0nci9g4wkh4qcgk3yhm9rl9yx2d4jpfxgdmiacfp9hkqxj6";
1179− name = "krfb-20.12.1.tar.xz";
1177+ url = "${mirror}/stable/release-service/20.12.2/src/krfb-20.12.2.tar.xz";
1178+ sha256 = "0js84sc9s8h7b1zkdg2k83qhh2q3dz5yfk17am480b3889pyjyd8";
1179+ name = "krfb-20.12.2.tar.xz";
11801180 };
11811181 };
11821182 kross-interpreters = {
1183− version = "20.12.1";
1183+ version = "20.12.2";
11841184 src = fetchurl {
1185− url = "${mirror}/stable/release-service/20.12.1/src/kross-interpreters-20.12.1.tar.xz";
1186− sha256 = "1csk3xkkkqvffms5ivy08hyd2mizg7ywcrdapxx40m5kwsn6vpxs";
1187− name = "kross-interpreters-20.12.1.tar.xz";
1185+ url = "${mirror}/stable/release-service/20.12.2/src/kross-interpreters-20.12.2.tar.xz";
1186+ sha256 = "04g8fqcr88k7b8sivkqasj8d5fywhmm69g4spv1rpm4m89gr70jn";
1187+ name = "kross-interpreters-20.12.2.tar.xz";
11881188 };
11891189 };
11901190 kruler = {
1191− version = "20.12.1";
1191+ version = "20.12.2";
11921192 src = fetchurl {
1193− url = "${mirror}/stable/release-service/20.12.1/src/kruler-20.12.1.tar.xz";
1194− sha256 = "1jiz9s647bndpi4gg3f7wwg0c0cv8wf1myjxwdpx5a0ggdr2xh3q";
1195− name = "kruler-20.12.1.tar.xz";
1193+ url = "${mirror}/stable/release-service/20.12.2/src/kruler-20.12.2.tar.xz";
1194+ sha256 = "0xayhfav4723m5z5bgv4zxa95zvsfgvfh0wf80y8c7wwfgsyn9ja";
1195+ name = "kruler-20.12.2.tar.xz";
11961196 };
11971197 };
11981198 kshisen = {
1199− version = "20.12.1";
1199+ version = "20.12.2";
12001200 src = fetchurl {
1201− url = "${mirror}/stable/release-service/20.12.1/src/kshisen-20.12.1.tar.xz";
1202− sha256 = "1awnpj66080g2y41014g2pgb5llyqw56b54z6ydhfya4a0a8gsds";
1203− name = "kshisen-20.12.1.tar.xz";
1201+ url = "${mirror}/stable/release-service/20.12.2/src/kshisen-20.12.2.tar.xz";
1202+ sha256 = "079sr9k8zg01imy2c54wx371fcxlzsm122ng0zl4cn69dndczjkf";
1203+ name = "kshisen-20.12.2.tar.xz";
12041204 };
12051205 };
12061206 ksirk = {
1207− version = "20.12.1";
1207+ version = "20.12.2";
12081208 src = fetchurl {
1209− url = "${mirror}/stable/release-service/20.12.1/src/ksirk-20.12.1.tar.xz";
1210− sha256 = "11bcmxjjyf095i790f5r3cr5hskw2x9458vwfm7yd57qx3r01axz";
1211− name = "ksirk-20.12.1.tar.xz";
1209+ url = "${mirror}/stable/release-service/20.12.2/src/ksirk-20.12.2.tar.xz";
1210+ sha256 = "10ksb77ljwfm25m8jrxh4cbss0lrjdmiigjbmyppxcls1rz8a6cn";
1211+ name = "ksirk-20.12.2.tar.xz";
12121212 };
12131213 };
12141214 ksmtp = {
1215− version = "20.12.1";
1215+ version = "20.12.2";
12161216 src = fetchurl {
1217− url = "${mirror}/stable/release-service/20.12.1/src/ksmtp-20.12.1.tar.xz";
1218− sha256 = "1yahcgchfhk742n6hmpr2b2fll6jrw0vs1hrfvms3n7w7vxnkyxg";
1219− name = "ksmtp-20.12.1.tar.xz";
1217+ url = "${mirror}/stable/release-service/20.12.2/src/ksmtp-20.12.2.tar.xz";
1218+ sha256 = "0rcs5zcrj8sscr0h0vx4ndbj3ziyxns5glk5bzpj1092b11pwllw";
1219+ name = "ksmtp-20.12.2.tar.xz";
12201220 };
12211221 };
12221222 ksnakeduel = {
1223− version = "20.12.1";
1223+ version = "20.12.2";
12241224 src = fetchurl {
1225− url = "${mirror}/stable/release-service/20.12.1/src/ksnakeduel-20.12.1.tar.xz";
1226− sha256 = "1647m2a918kr762fmvffj2ipamhvcihc8yg8z80b8lwinpspcdfc";
1227− name = "ksnakeduel-20.12.1.tar.xz";
1225+ url = "${mirror}/stable/release-service/20.12.2/src/ksnakeduel-20.12.2.tar.xz";
1226+ sha256 = "1cd1nldrmhimc1f059hqjkb8g8yjri7gf9cyxz7j0p48dxg93ns4";
1227+ name = "ksnakeduel-20.12.2.tar.xz";
12281228 };
12291229 };
12301230 kspaceduel = {
1231− version = "20.12.1";
1231+ version = "20.12.2";
12321232 src = fetchurl {
1233− url = "${mirror}/stable/release-service/20.12.1/src/kspaceduel-20.12.1.tar.xz";
1234− sha256 = "17i2saa48xq62j0aca555lqjxf6ry3wkxw5vm5v32g3kwkr10m78";
1235− name = "kspaceduel-20.12.1.tar.xz";
1233+ url = "${mirror}/stable/release-service/20.12.2/src/kspaceduel-20.12.2.tar.xz";
1234+ sha256 = "0mz3s5q8fyl76ck8b9s65w2q90a5cz2p4clnbxam8f72fk2g0g1v";
1235+ name = "kspaceduel-20.12.2.tar.xz";
12361236 };
12371237 };
12381238 ksquares = {
1239− version = "20.12.1";
1239+ version = "20.12.2";
12401240 src = fetchurl {
1241− url = "${mirror}/stable/release-service/20.12.1/src/ksquares-20.12.1.tar.xz";
1242− sha256 = "085bvcx5p13j32017c0vm3zvcr0r0dzcbxpp21mvrp1xzy2dw7v2";
1243− name = "ksquares-20.12.1.tar.xz";
1241+ url = "${mirror}/stable/release-service/20.12.2/src/ksquares-20.12.2.tar.xz";
1242+ sha256 = "11mfyyjrdlh8dzpzwvyr48rfg758hr14sb0cw1zvd7d7cz86dr31";
1243+ name = "ksquares-20.12.2.tar.xz";
12441244 };
12451245 };
12461246 ksudoku = {
1247− version = "20.12.1";
1247+ version = "20.12.2";
12481248 src = fetchurl {
1249− url = "${mirror}/stable/release-service/20.12.1/src/ksudoku-20.12.1.tar.xz";
1250− sha256 = "0a0i87ddxa75admnxl181dsqmab4cwbb6pncl34z4sppf272z8km";
1251− name = "ksudoku-20.12.1.tar.xz";
1249+ url = "${mirror}/stable/release-service/20.12.2/src/ksudoku-20.12.2.tar.xz";
1250+ sha256 = "01i4niy1nlikbw1j7qlwldcaniwb1pl4hr4p6icgsvfzr8pjl09z";
1251+ name = "ksudoku-20.12.2.tar.xz";
12521252 };
12531253 };
12541254 ksystemlog = {
1255− version = "20.12.1";
1255+ version = "20.12.2";
12561256 src = fetchurl {
1257− url = "${mirror}/stable/release-service/20.12.1/src/ksystemlog-20.12.1.tar.xz";
1258− sha256 = "0535s6sq4wccdxv0xw12x3zzjkp0746s3hmlk93sginwq5fixxc0";
1259− name = "ksystemlog-20.12.1.tar.xz";
1257+ url = "${mirror}/stable/release-service/20.12.2/src/ksystemlog-20.12.2.tar.xz";
1258+ sha256 = "1fyrpkk5ipp5q8sairmyx9bayndbbr9srrwdhp7grhbiw8kbjlc7";
1259+ name = "ksystemlog-20.12.2.tar.xz";
12601260 };
12611261 };
12621262 kteatime = {
1263− version = "20.12.1";
1263+ version = "20.12.2";
12641264 src = fetchurl {
1265− url = "${mirror}/stable/release-service/20.12.1/src/kteatime-20.12.1.tar.xz";
1266− sha256 = "0j9c3wy398z61ciyf91hv7l3bxski827di9ib94wyjkwqd6516zx";
1267− name = "kteatime-20.12.1.tar.xz";
1265+ url = "${mirror}/stable/release-service/20.12.2/src/kteatime-20.12.2.tar.xz";
1266+ sha256 = "18rpnvagrcmd62qss31rkv81kkjcz9kcisj9q0j41p770jvan8id";
1267+ name = "kteatime-20.12.2.tar.xz";
12681268 };
12691269 };
12701270 ktimer = {
1271− version = "20.12.1";
1271+ version = "20.12.2";
12721272 src = fetchurl {
1273− url = "${mirror}/stable/release-service/20.12.1/src/ktimer-20.12.1.tar.xz";
1274− sha256 = "0iac06mzszg6g1flbs0mzj8ddnvh6kdgbhakjxl969in4c1frz9w";
1275− name = "ktimer-20.12.1.tar.xz";
1273+ url = "${mirror}/stable/release-service/20.12.2/src/ktimer-20.12.2.tar.xz";
1274+ sha256 = "17sw7wl9844sg180h0x2skaj4bnkv6qin6cwklsp058wyf06w5wy";
1275+ name = "ktimer-20.12.2.tar.xz";
12761276 };
12771277 };
12781278 ktnef = {
1279− version = "20.12.1";
1279+ version = "20.12.2";
12801280 src = fetchurl {
1281− url = "${mirror}/stable/release-service/20.12.1/src/ktnef-20.12.1.tar.xz";
1282− sha256 = "1pq4mabh7glpxl2iwj5rrfwim4x6xfg2vlpx7z0d0n13gh85b4fd";
1283− name = "ktnef-20.12.1.tar.xz";
1281+ url = "${mirror}/stable/release-service/20.12.2/src/ktnef-20.12.2.tar.xz";
1282+ sha256 = "147dxalzgqfmacr0f44pbxg0ks5p7ck607gkbzf5asxgn4dlvgxq";
1283+ name = "ktnef-20.12.2.tar.xz";
12841284 };
12851285 };
12861286 ktorrent = {
1287− version = "20.12.1";
1287+ version = "20.12.2";
12881288 src = fetchurl {
1289− url = "${mirror}/stable/release-service/20.12.1/src/ktorrent-20.12.1.tar.xz";
1290− sha256 = "0m43wsz0k87ncvg3zdffsp06nwdrlfnw52fi1ry12z2rnkcm4pwc";
1291− name = "ktorrent-20.12.1.tar.xz";
1289+ url = "${mirror}/stable/release-service/20.12.2/src/ktorrent-20.12.2.tar.xz";
1290+ sha256 = "1fvbg3700my5algzif4dyy7zsc74qrby7ldfbj7snlxa4scws042";
1291+ name = "ktorrent-20.12.2.tar.xz";
12921292 };
12931293 };
12941294 ktouch = {
1295− version = "20.12.1";
1295+ version = "20.12.2";
12961296 src = fetchurl {
1297− url = "${mirror}/stable/release-service/20.12.1/src/ktouch-20.12.1.tar.xz";
1298− sha256 = "10lm2p8w26c9n6lhvw3301myfss0dq7hl7rawzb3hsy1lqvmvdib";
1299− name = "ktouch-20.12.1.tar.xz";
1297+ url = "${mirror}/stable/release-service/20.12.2/src/ktouch-20.12.2.tar.xz";
1298+ sha256 = "0j3xzm5ghnfvqb98xwrjzkrdm991af8rgnay38s081ykvj2hxj3n";
1299+ name = "ktouch-20.12.2.tar.xz";
13001300 };
13011301 };
13021302 ktp-accounts-kcm = {
1303− version = "20.12.1";
1303+ version = "20.12.2";
13041304 src = fetchurl {
1305− url = "${mirror}/stable/release-service/20.12.1/src/ktp-accounts-kcm-20.12.1.tar.xz";
1306− sha256 = "0440s2rrh03x8h5bp6xywidngrb1pinndsigaj4k4yvz122j2y53";
1307− name = "ktp-accounts-kcm-20.12.1.tar.xz";
1305+ url = "${mirror}/stable/release-service/20.12.2/src/ktp-accounts-kcm-20.12.2.tar.xz";
1306+ sha256 = "0dyr3600yrd2hjs2s54210h1kj95w5mz9pl2fpwzcqgkmmd9vss5";
1307+ name = "ktp-accounts-kcm-20.12.2.tar.xz";
13081308 };
13091309 };
13101310 ktp-approver = {
1311− version = "20.12.1";
1311+ version = "20.12.2";
13121312 src = fetchurl {
1313− url = "${mirror}/stable/release-service/20.12.1/src/ktp-approver-20.12.1.tar.xz";
1314− sha256 = "14ygpqvjhyzryrlinz0i2a6nyn1gnxs0hwx35imiz8hg4sb9402k";
1315− name = "ktp-approver-20.12.1.tar.xz";
1313+ url = "${mirror}/stable/release-service/20.12.2/src/ktp-approver-20.12.2.tar.xz";
1314+ sha256 = "1h3fi19qqmik6f7h12manb8yval0qqj7jdhrpp07ck67m7mibwzr";
1315+ name = "ktp-approver-20.12.2.tar.xz";
13161316 };
13171317 };
13181318 ktp-auth-handler = {
1319− version = "20.12.1";
1319+ version = "20.12.2";
13201320 src = fetchurl {
1321− url = "${mirror}/stable/release-service/20.12.1/src/ktp-auth-handler-20.12.1.tar.xz";
1322− sha256 = "1bysipq957kqbl33zj88m1g987b02v25gmh5lpnmrnlqznxw0ws7";
1323− name = "ktp-auth-handler-20.12.1.tar.xz";
1321+ url = "${mirror}/stable/release-service/20.12.2/src/ktp-auth-handler-20.12.2.tar.xz";
1322+ sha256 = "158n88pcxj7hdmsmhcqbfpqc4lhrpzighxgb4wdrzizi9dwpxb3h";
1323+ name = "ktp-auth-handler-20.12.2.tar.xz";
13241324 };
13251325 };
13261326 ktp-call-ui = {
1327− version = "20.12.1";
1327+ version = "20.12.2";
13281328 src = fetchurl {
1329− url = "${mirror}/stable/release-service/20.12.1/src/ktp-call-ui-20.12.1.tar.xz";
1330− sha256 = "154zgg84ln823al40s5fwxf10k3p73mz4fjn2lyhdqgsx68l08sy";
1331− name = "ktp-call-ui-20.12.1.tar.xz";
1329+ url = "${mirror}/stable/release-service/20.12.2/src/ktp-call-ui-20.12.2.tar.xz";
1330+ sha256 = "0xhf79gqr6b8hiscv6jnmjnl8nb7c6vsvxn7hzvri9nm7hfmldya";
1331+ name = "ktp-call-ui-20.12.2.tar.xz";
13321332 };
13331333 };
13341334 ktp-common-internals = {
1335− version = "20.12.1";
1335+ version = "20.12.2";
13361336 src = fetchurl {
1337− url = "${mirror}/stable/release-service/20.12.1/src/ktp-common-internals-20.12.1.tar.xz";
1338− sha256 = "1f8l1ywccxga3ff8qvf4ybabkd57apidkx7ky49dfi785kgvym16";
1339− name = "ktp-common-internals-20.12.1.tar.xz";
1337+ url = "${mirror}/stable/release-service/20.12.2/src/ktp-common-internals-20.12.2.tar.xz";
1338+ sha256 = "06m8g80lj2cnx5cnfi6m1fy6pg6rm78kxg7v1493xcsfzizlc276";
1339+ name = "ktp-common-internals-20.12.2.tar.xz";
13401340 };
13411341 };
13421342 ktp-contact-list = {
1343− version = "20.12.1";
1343+ version = "20.12.2";
13441344 src = fetchurl {
1345− url = "${mirror}/stable/release-service/20.12.1/src/ktp-contact-list-20.12.1.tar.xz";
1346− sha256 = "122p2xp6wqmvk7mbplgnilsbnk6hfzrgbxpr39n462pkwbmvs44j";
1347− name = "ktp-contact-list-20.12.1.tar.xz";
1345+ url = "${mirror}/stable/release-service/20.12.2/src/ktp-contact-list-20.12.2.tar.xz";
1346+ sha256 = "037si47l8nc18d7yzh6d7i3gy710y5npxv4wcal6yg8mlr2qzjli";
1347+ name = "ktp-contact-list-20.12.2.tar.xz";
13481348 };
13491349 };
13501350 ktp-contact-runner = {
1351− version = "20.12.1";
1351+ version = "20.12.2";
13521352 src = fetchurl {
1353− url = "${mirror}/stable/release-service/20.12.1/src/ktp-contact-runner-20.12.1.tar.xz";
1354− sha256 = "1w8jp1nmjwaaqpim2jfpbv3d7w9asn93qi2ag2d6wx6mcc2q84jb";
1355− name = "ktp-contact-runner-20.12.1.tar.xz";
1353+ url = "${mirror}/stable/release-service/20.12.2/src/ktp-contact-runner-20.12.2.tar.xz";
1354+ sha256 = "1pv7smf5mld5rgld2nsqjwgl7vwsf99f3z4hamlbq6bpdg02w936";
1355+ name = "ktp-contact-runner-20.12.2.tar.xz";
13561356 };
13571357 };
13581358 ktp-desktop-applets = {
1359− version = "20.12.1";
1359+ version = "20.12.2";
13601360 src = fetchurl {
1361− url = "${mirror}/stable/release-service/20.12.1/src/ktp-desktop-applets-20.12.1.tar.xz";
1362− sha256 = "0z3vv7q5kk27fm32bmhffpj6w72mldcdxsq6p3d33zf6rkz2rb74";
1363− name = "ktp-desktop-applets-20.12.1.tar.xz";
1361+ url = "${mirror}/stable/release-service/20.12.2/src/ktp-desktop-applets-20.12.2.tar.xz";
1362+ sha256 = "1mx1q1gk756pkbpwghsvkspj3npgfzp2lf4jqldkyygvyqn3gxx4";
1363+ name = "ktp-desktop-applets-20.12.2.tar.xz";
13641364 };
13651365 };
13661366 ktp-filetransfer-handler = {
1367− version = "20.12.1";
1367+ version = "20.12.2";
13681368 src = fetchurl {
1369− url = "${mirror}/stable/release-service/20.12.1/src/ktp-filetransfer-handler-20.12.1.tar.xz";
1370− sha256 = "0b8ha1jxhrdk67mzwrd0ypz99shlfr6sanxbbv0j3xh77sjcqpq3";
1371− name = "ktp-filetransfer-handler-20.12.1.tar.xz";
1369+ url = "${mirror}/stable/release-service/20.12.2/src/ktp-filetransfer-handler-20.12.2.tar.xz";
1370+ sha256 = "16ys5cyx1pzcv0affy8agp0sbci9rkvpknfffldrvlgqppxza5rd";
1371+ name = "ktp-filetransfer-handler-20.12.2.tar.xz";
13721372 };
13731373 };
13741374 ktp-kded-module = {
1375− version = "20.12.1";
1375+ version = "20.12.2";
13761376 src = fetchurl {
1377− url = "${mirror}/stable/release-service/20.12.1/src/ktp-kded-module-20.12.1.tar.xz";
1378− sha256 = "1hbb5pj3gaw9sg5rj2rb7a8xqrixfhr040rcdjsln337zyy98iqf";
1379− name = "ktp-kded-module-20.12.1.tar.xz";
1377+ url = "${mirror}/stable/release-service/20.12.2/src/ktp-kded-module-20.12.2.tar.xz";
1378+ sha256 = "1wkvi5l9fvq24c3vdflg0azjxykid61i6mi59cnrnr866a1rbgrg";
1379+ name = "ktp-kded-module-20.12.2.tar.xz";
13801380 };
13811381 };
13821382 ktp-send-file = {
1383− version = "20.12.1";
1383+ version = "20.12.2";
13841384 src = fetchurl {
1385− url = "${mirror}/stable/release-service/20.12.1/src/ktp-send-file-20.12.1.tar.xz";
1386− sha256 = "1vgfqa062h5yxdsz71h2zz247mzv6mn0zm7dz1v8p4pzns9kscq1";
1387− name = "ktp-send-file-20.12.1.tar.xz";
1385+ url = "${mirror}/stable/release-service/20.12.2/src/ktp-send-file-20.12.2.tar.xz";
1386+ sha256 = "0j32c81rabbxh3m0jnnahny01qz2h7yc7l90w39r2jkv9r5f3yvf";
1387+ name = "ktp-send-file-20.12.2.tar.xz";
13881388 };
13891389 };
13901390 ktp-text-ui = {
1391− version = "20.12.1";
1391+ version = "20.12.2";
13921392 src = fetchurl {
1393− url = "${mirror}/stable/release-service/20.12.1/src/ktp-text-ui-20.12.1.tar.xz";
1394− sha256 = "13cx2pv4wqmrgbi4sg51fhp418r50ajjhc9yz5mv7ad2gxml5c61";
1395− name = "ktp-text-ui-20.12.1.tar.xz";
1393+ url = "${mirror}/stable/release-service/20.12.2/src/ktp-text-ui-20.12.2.tar.xz";
1394+ sha256 = "09wkpyadf3dvnrbxrasr66yw4hqnb3kbk6va9bs836fvcaiwagwd";
1395+ name = "ktp-text-ui-20.12.2.tar.xz";
13961396 };
13971397 };
13981398 ktuberling = {
1399− version = "20.12.1";
1399+ version = "20.12.2";
14001400 src = fetchurl {
1401− url = "${mirror}/stable/release-service/20.12.1/src/ktuberling-20.12.1.tar.xz";
1402− sha256 = "06la1cvwvpiqjdwv7icdg55dd8pkc587bfwwjdq2fhp2pyh3ws6j";
1403− name = "ktuberling-20.12.1.tar.xz";
1401+ url = "${mirror}/stable/release-service/20.12.2/src/ktuberling-20.12.2.tar.xz";
1402+ sha256 = "0yndqhgw9s2hydfsz2x3lr1m22ii2whc4kcp2jbkj9ssiymp8s68";
1403+ name = "ktuberling-20.12.2.tar.xz";
14041404 };
14051405 };
14061406 kturtle = {
1407− version = "20.12.1";
1407+ version = "20.12.2";
14081408 src = fetchurl {
1409− url = "${mirror}/stable/release-service/20.12.1/src/kturtle-20.12.1.tar.xz";
1410− sha256 = "12jr4sbchjpvc730cy4bp2cccdsd8vw901dgyq0nar8p0pvg4ybb";
1411− name = "kturtle-20.12.1.tar.xz";
1409+ url = "${mirror}/stable/release-service/20.12.2/src/kturtle-20.12.2.tar.xz";
1410+ sha256 = "1a46c6j7jng9l789wdpp7qj639872dfj268hj8nq63n27f82whr0";
1411+ name = "kturtle-20.12.2.tar.xz";
14121412 };
14131413 };
14141414 kubrick = {
1415− version = "20.12.1";
1415+ version = "20.12.2";
14161416 src = fetchurl {
1417− url = "${mirror}/stable/release-service/20.12.1/src/kubrick-20.12.1.tar.xz";
1418− sha256 = "1hdkm9vw9wpc8b3mw0yy9cz5ylm0h75zbg51rw4glai48bb3gs8i";
1419− name = "kubrick-20.12.1.tar.xz";
1417+ url = "${mirror}/stable/release-service/20.12.2/src/kubrick-20.12.2.tar.xz";
1418+ sha256 = "0g3zxdbj5l28msvs8gpn15g739pwwids7wxmky6w3b4qyn427j8m";
1419+ name = "kubrick-20.12.2.tar.xz";
14201420 };
14211421 };
14221422 kwalletmanager = {
1423− version = "20.12.1";
1423+ version = "20.12.2";
14241424 src = fetchurl {
1425− url = "${mirror}/stable/release-service/20.12.1/src/kwalletmanager-20.12.1.tar.xz";
1426− sha256 = "0nsg2xjzz6qvjqpxj1bbzzikvcl1ipqjwwab2kdwg71vlp99ravj";
1427− name = "kwalletmanager-20.12.1.tar.xz";
1425+ url = "${mirror}/stable/release-service/20.12.2/src/kwalletmanager-20.12.2.tar.xz";
1426+ sha256 = "02lx3p7860pigslx6s3bjg54sjjv1q93f9aknv5d32iblv2gaxiw";
1427+ name = "kwalletmanager-20.12.2.tar.xz";
14281428 };
14291429 };
14301430 kwave = {
1431− version = "20.12.1";
1431+ version = "20.12.2";
14321432 src = fetchurl {
1433− url = "${mirror}/stable/release-service/20.12.1/src/kwave-20.12.1.tar.xz";
1434− sha256 = "1w5r7di9401dm60p3bkp8qg41pvlz4226szki5s6pmmq89dixdgq";
1435− name = "kwave-20.12.1.tar.xz";
1433+ url = "${mirror}/stable/release-service/20.12.2/src/kwave-20.12.2.tar.xz";
1434+ sha256 = "0nankggamy1jxllnsv642kav57kwkbxpkd2mz6rarjinfnnqi7kd";
1435+ name = "kwave-20.12.2.tar.xz";
14361436 };
14371437 };
14381438 kwordquiz = {
1439− version = "20.12.1";
1439+ version = "20.12.2";
14401440 src = fetchurl {
1441− url = "${mirror}/stable/release-service/20.12.1/src/kwordquiz-20.12.1.tar.xz";
1442− sha256 = "1dvbvfwaja4n2v9binj8pbdjizqz4zp49fiq8b4k5jxygcsgnx2p";
1443− name = "kwordquiz-20.12.1.tar.xz";
1441+ url = "${mirror}/stable/release-service/20.12.2/src/kwordquiz-20.12.2.tar.xz";
1442+ sha256 = "1iik5khnsarxjipmd8znbiqs20bd65hanhmdmp7awqs7p0k4a0sq";
1443+ name = "kwordquiz-20.12.2.tar.xz";
14441444 };
14451445 };
14461446 libgravatar = {
1447− version = "20.12.1";
1447+ version = "20.12.2";
14481448 src = fetchurl {
1449− url = "${mirror}/stable/release-service/20.12.1/src/libgravatar-20.12.1.tar.xz";
1450− sha256 = "12byf7p0fwsfy61gcv112bhq3zczjy5n1dm32x2lrjyis2dh2z9j";
1451− name = "libgravatar-20.12.1.tar.xz";
1449+ url = "${mirror}/stable/release-service/20.12.2/src/libgravatar-20.12.2.tar.xz";
1450+ sha256 = "07pnj708wrvfmmy7j2vsx9j1sl9wx3hd7vfnpqa4zd24ci7x7y3d";
1451+ name = "libgravatar-20.12.2.tar.xz";
14521452 };
14531453 };
14541454 libkcddb = {
1455− version = "20.12.1";
1455+ version = "20.12.2";
14561456 src = fetchurl {
1457− url = "${mirror}/stable/release-service/20.12.1/src/libkcddb-20.12.1.tar.xz";
1458− sha256 = "07ky4ly72689gb58jxqqzq5bgmb9wslxkqj0ldam6v82ldk8ss7k";
1459− name = "libkcddb-20.12.1.tar.xz";
1457+ url = "${mirror}/stable/release-service/20.12.2/src/libkcddb-20.12.2.tar.xz";
1458+ sha256 = "1px7cgc75ypxaqknamqgxps4796388j99ycrbgrlyrhzws1mva8k";
1459+ name = "libkcddb-20.12.2.tar.xz";
14601460 };
14611461 };
14621462 libkcompactdisc = {
1463− version = "20.12.1";
1463+ version = "20.12.2";
14641464 src = fetchurl {
1465− url = "${mirror}/stable/release-service/20.12.1/src/libkcompactdisc-20.12.1.tar.xz";
1466− sha256 = "101szps2js8dhxdn913mj9b2z953rp47ikkbrrdjl1fq1i8dh6ib";
1467− name = "libkcompactdisc-20.12.1.tar.xz";
1465+ url = "${mirror}/stable/release-service/20.12.2/src/libkcompactdisc-20.12.2.tar.xz";
1466+ sha256 = "0yj2gkl1d76mf2lp02apxh4lmb9rnzvp0c8y0992ssnfsrivalp4";
1467+ name = "libkcompactdisc-20.12.2.tar.xz";
14681468 };
14691469 };
14701470 libkdcraw = {
1471− version = "20.12.1";
1471+ version = "20.12.2";
14721472 src = fetchurl {
1473− url = "${mirror}/stable/release-service/20.12.1/src/libkdcraw-20.12.1.tar.xz";
1474− sha256 = "1vkjyccyax622a3jvqdfnppansabxaxplyk9prn302zqmgvl05h3";
1475− name = "libkdcraw-20.12.1.tar.xz";
1473+ url = "${mirror}/stable/release-service/20.12.2/src/libkdcraw-20.12.2.tar.xz";
1474+ sha256 = "1hgw087frq9yzzwp2mkl3xqz2gd4v82kyiym2316i1xpmbkgcqfm";
1475+ name = "libkdcraw-20.12.2.tar.xz";
14761476 };
14771477 };
14781478 libkdegames = {
1479− version = "20.12.1";
1479+ version = "20.12.2";
14801480 src = fetchurl {
1481− url = "${mirror}/stable/release-service/20.12.1/src/libkdegames-20.12.1.tar.xz";
1482− sha256 = "1zy44k98xjjydsa35bagf152kfb394wxpdx0c06vcf404jkhk7ng";
1483− name = "libkdegames-20.12.1.tar.xz";
1481+ url = "${mirror}/stable/release-service/20.12.2/src/libkdegames-20.12.2.tar.xz";
1482+ sha256 = "0fcl06z5zl1hycj8f8q9dz6fc9lb0dqd5ciha4yig98ybzi3zn8r";
1483+ name = "libkdegames-20.12.2.tar.xz";
14841484 };
14851485 };
14861486 libkdepim = {
1487− version = "20.12.1";
1487+ version = "20.12.2";
14881488 src = fetchurl {
1489− url = "${mirror}/stable/release-service/20.12.1/src/libkdepim-20.12.1.tar.xz";
1490− sha256 = "0kp2xssl1qbl3ziskxl3hhvyp8nc35d2fijk6hl99j3sxpdi2s4f";
1491− name = "libkdepim-20.12.1.tar.xz";
1489+ url = "${mirror}/stable/release-service/20.12.2/src/libkdepim-20.12.2.tar.xz";
1490+ sha256 = "0f9c96w7ijlvfg9dr0w9wwaf05fn0z32zx8nn8jp42pzcbn6yr56";
1491+ name = "libkdepim-20.12.2.tar.xz";
14921492 };
14931493 };
14941494 libkeduvocdocument = {
1495− version = "20.12.1";
1495+ version = "20.12.2";
14961496 src = fetchurl {
1497− url = "${mirror}/stable/release-service/20.12.1/src/libkeduvocdocument-20.12.1.tar.xz";
1498− sha256 = "0kqnhaabfi91clqg7nlnjcybl5ca0p3ysn5zlwhxz1fcjxm83g4w";
1499− name = "libkeduvocdocument-20.12.1.tar.xz";
1497+ url = "${mirror}/stable/release-service/20.12.2/src/libkeduvocdocument-20.12.2.tar.xz";
1498+ sha256 = "0lki60mv82ygss2bxgwg178xabvfn85zlg0pwk2gj30zg0jiaw66";
1499+ name = "libkeduvocdocument-20.12.2.tar.xz";
15001500 };
15011501 };
15021502 libkexiv2 = {
1503− version = "20.12.1";
1503+ version = "20.12.2";
15041504 src = fetchurl {
1505− url = "${mirror}/stable/release-service/20.12.1/src/libkexiv2-20.12.1.tar.xz";
1506− sha256 = "1vylyl3gxk3xais7c640kdnp4s4jwd9y2xxkwmf36ax0dv8wdcv0";
1507− name = "libkexiv2-20.12.1.tar.xz";
1505+ url = "${mirror}/stable/release-service/20.12.2/src/libkexiv2-20.12.2.tar.xz";
1506+ sha256 = "10j82xk7y7vf9y9ss83hc9fd9c1dbd55nwjf28bj7myqaji4wdpb";
1507+ name = "libkexiv2-20.12.2.tar.xz";
15081508 };
15091509 };
15101510 libkgapi = {
1511− version = "20.12.1";
1511+ version = "20.12.2";
15121512 src = fetchurl {
1513− url = "${mirror}/stable/release-service/20.12.1/src/libkgapi-20.12.1.tar.xz";
1514− sha256 = "0cx8lbzq8ambz2lbslakczzcfmhri4268p7zf7hnf3ymd17a5y8d";
1515− name = "libkgapi-20.12.1.tar.xz";
1513+ url = "${mirror}/stable/release-service/20.12.2/src/libkgapi-20.12.2.tar.xz";
1514+ sha256 = "1yaas07ixxjnb5a37dq93skqs0vk08rdr9ll30jr7kdll311s5ni";
1515+ name = "libkgapi-20.12.2.tar.xz";
15161516 };
15171517 };
15181518 libkipi = {
1519− version = "20.12.1";
1519+ version = "20.12.2";
15201520 src = fetchurl {
1521− url = "${mirror}/stable/release-service/20.12.1/src/libkipi-20.12.1.tar.xz";
1522− sha256 = "1ln4f1n9ghiqb9h4lpw6qcwz7wrvm8jlcqn1ingjh9s58zw8wqsg";
1523− name = "libkipi-20.12.1.tar.xz";
1521+ url = "${mirror}/stable/release-service/20.12.2/src/libkipi-20.12.2.tar.xz";
1522+ sha256 = "1axjvkrmjszxyh0fdm9k25g4gpzmn4hsw222k2qj3smvnhdj37zk";
1523+ name = "libkipi-20.12.2.tar.xz";
15241524 };
15251525 };
15261526 libkleo = {
1527− version = "20.12.1";
1527+ version = "20.12.2";
15281528 src = fetchurl {
1529− url = "${mirror}/stable/release-service/20.12.1/src/libkleo-20.12.1.tar.xz";
1530− sha256 = "0dq86pg0jchlpsynk0355wwq3pggqkj0mxhyvgi6a0xb2riy2r4a";
1531− name = "libkleo-20.12.1.tar.xz";
1529+ url = "${mirror}/stable/release-service/20.12.2/src/libkleo-20.12.2.tar.xz";
1530+ sha256 = "0xsljfiqqggdp31c7irjn6lgacdds5kb7sr3khg24bsgip9488k1";
1531+ name = "libkleo-20.12.2.tar.xz";
15321532 };
15331533 };
15341534 libkmahjongg = {
1535− version = "20.12.1";
1535+ version = "20.12.2";
15361536 src = fetchurl {
1537− url = "${mirror}/stable/release-service/20.12.1/src/libkmahjongg-20.12.1.tar.xz";
1538− sha256 = "0cq0bcl7hkgj1v7giqzbrvlds2933ji52fg53cakz29fkgxibj3x";
1539− name = "libkmahjongg-20.12.1.tar.xz";
1537+ url = "${mirror}/stable/release-service/20.12.2/src/libkmahjongg-20.12.2.tar.xz";
1538+ sha256 = "1yl2smx0ybr164pl8nv5a7jibq3pmpf0v4ijvardp53j51bs2c2q";
1539+ name = "libkmahjongg-20.12.2.tar.xz";
15401540 };
15411541 };
15421542 libkomparediff2 = {
1543− version = "20.12.1";
1543+ version = "20.12.2";
15441544 src = fetchurl {
1545− url = "${mirror}/stable/release-service/20.12.1/src/libkomparediff2-20.12.1.tar.xz";
1546− sha256 = "04klqvhh8zl5lyblpqgm92wycq4r0hh6gx18nqnsgx6lknlrx9y3";
1547− name = "libkomparediff2-20.12.1.tar.xz";
1545+ url = "${mirror}/stable/release-service/20.12.2/src/libkomparediff2-20.12.2.tar.xz";
1546+ sha256 = "03fn3l1qhzivck7jzfp7fwpgix701paj03rzvc46rs4f1bfmb1d9";
1547+ name = "libkomparediff2-20.12.2.tar.xz";
15481548 };
15491549 };
15501550 libksane = {
1551− version = "20.12.1";
1551+ version = "20.12.2";
15521552 src = fetchurl {
1553− url = "${mirror}/stable/release-service/20.12.1/src/libksane-20.12.1.tar.xz";
1554− sha256 = "07xsfs0lkh35nj0fy7y1r46nkdmm26nbpsm846v18lh7wflxi36j";
1555− name = "libksane-20.12.1.tar.xz";
1553+ url = "${mirror}/stable/release-service/20.12.2/src/libksane-20.12.2.tar.xz";
1554+ sha256 = "1bhwfsyfd2z4hagfggz3ckxbyqrifcbwyn79h59qpng7nkzsgw4b";
1555+ name = "libksane-20.12.2.tar.xz";
15561556 };
15571557 };
15581558 libksieve = {
1559− version = "20.12.1";
1559+ version = "20.12.2";
15601560 src = fetchurl {
1561− url = "${mirror}/stable/release-service/20.12.1/src/libksieve-20.12.1.tar.xz";
1562− sha256 = "07zgcsdl38fdy5pskp51rj5p7m3pz9szwidyg24mdyzb08k5xpdz";
1563− name = "libksieve-20.12.1.tar.xz";
1561+ url = "${mirror}/stable/release-service/20.12.2/src/libksieve-20.12.2.tar.xz";
1562+ sha256 = "0rjchcpc4sx53siv3b9hq6s12qh96rrb4xmnk3gjhsvqq9gmyq3j";
1563+ name = "libksieve-20.12.2.tar.xz";
15641564 };
15651565 };
15661566 libktorrent = {
1567− version = "20.12.1";
1567+ version = "20.12.2";
15681568 src = fetchurl {
1569− url = "${mirror}/stable/release-service/20.12.1/src/libktorrent-20.12.1.tar.xz";
1570− sha256 = "18mcrb064gizqb699cs9bvm918gg06wm6sq33pi87kwki5cniamv";
1571− name = "libktorrent-20.12.1.tar.xz";
1569+ url = "${mirror}/stable/release-service/20.12.2/src/libktorrent-20.12.2.tar.xz";
1570+ sha256 = "15ywv00vklvqw7x6id4vycf4rmi4j3s6z70c68h1b6v8n9j3rz3b";
1571+ name = "libktorrent-20.12.2.tar.xz";
15721572 };
15731573 };
15741574 lokalize = {
1575− version = "20.12.1";
1575+ version = "20.12.2";
15761576 src = fetchurl {
1577− url = "${mirror}/stable/release-service/20.12.1/src/lokalize-20.12.1.tar.xz";
1578− sha256 = "0mxzk9s0yrjf8gj70dpl1wbvnrkzc3ncqab2bj3yx0xk05hagjlx";
1579− name = "lokalize-20.12.1.tar.xz";
1577+ url = "${mirror}/stable/release-service/20.12.2/src/lokalize-20.12.2.tar.xz";
1578+ sha256 = "1ms7x5aw5z63q2xy6f3x8dl1k39yjqbabzh8qznaqs172bwmwzz7";
1579+ name = "lokalize-20.12.2.tar.xz";
15801580 };
15811581 };
15821582 lskat = {
1583− version = "20.12.1";
1583+ version = "20.12.2";
15841584 src = fetchurl {
1585− url = "${mirror}/stable/release-service/20.12.1/src/lskat-20.12.1.tar.xz";
1586− sha256 = "0p8n2cgfdxxjbx4jcpqf85h6k36nggj32h982yj3ig5dh1csym5d";
1587− name = "lskat-20.12.1.tar.xz";
1585+ url = "${mirror}/stable/release-service/20.12.2/src/lskat-20.12.2.tar.xz";
1586+ sha256 = "087zrwy5pabyy7zpkplxn9is2msr9kpa8r7bpc6kxylx85sd4nsr";
1587+ name = "lskat-20.12.2.tar.xz";
15881588 };
15891589 };
15901590 mailcommon = {
1591− version = "20.12.1";
1591+ version = "20.12.2";
15921592 src = fetchurl {
1593− url = "${mirror}/stable/release-service/20.12.1/src/mailcommon-20.12.1.tar.xz";
1594− sha256 = "191d6l314njlj227qhz7qqmkjkz9zm7xnvm9rlfj302san90a338";
1595− name = "mailcommon-20.12.1.tar.xz";
1593+ url = "${mirror}/stable/release-service/20.12.2/src/mailcommon-20.12.2.tar.xz";
1594+ sha256 = "0qbbr5m5glcp7rh3aljkrfs27ypdcb5b72q602irivhbgv56c6v5";
1595+ name = "mailcommon-20.12.2.tar.xz";
15961596 };
15971597 };
15981598 mailimporter = {
1599− version = "20.12.1";
1599+ version = "20.12.2";
16001600 src = fetchurl {
1601− url = "${mirror}/stable/release-service/20.12.1/src/mailimporter-20.12.1.tar.xz";
1602− sha256 = "0jqdckpwlipc4zxxwnvysl44ri19h0hgr37dp36k99sxa3688jxc";
1603− name = "mailimporter-20.12.1.tar.xz";
1601+ url = "${mirror}/stable/release-service/20.12.2/src/mailimporter-20.12.2.tar.xz";
1602+ sha256 = "16alrfyvgwih9i7fzvmfhbmlsp0l942qml43w2rwkg974g8188yv";
1603+ name = "mailimporter-20.12.2.tar.xz";
16041604 };
16051605 };
16061606 marble = {
1607− version = "20.12.1";
1607+ version = "20.12.2";
16081608 src = fetchurl {
1609− url = "${mirror}/stable/release-service/20.12.1/src/marble-20.12.1.tar.xz";
1610− sha256 = "0w398igxx7pmyd4bj65ppbxfc4fiz4hsjmcffya88dnxxz73djb5";
1611− name = "marble-20.12.1.tar.xz";
1609+ url = "${mirror}/stable/release-service/20.12.2/src/marble-20.12.2.tar.xz";
1610+ sha256 = "0kgiwsx58yhng92v5c90bz02vsn70p6y7gf6qr5fvljbldrxq3a2";
1611+ name = "marble-20.12.2.tar.xz";
16121612 };
16131613 };
16141614 markdownpart = {
1615− version = "20.12.1";
1615+ version = "20.12.2";
16161616 src = fetchurl {
1617− url = "${mirror}/stable/release-service/20.12.1/src/markdownpart-20.12.1.tar.xz";
1618− sha256 = "1389hswbhcssl9ybb605h9i50fv6jajggldkiyfwqxbi7aysghwk";
1619− name = "markdownpart-20.12.1.tar.xz";
1617+ url = "${mirror}/stable/release-service/20.12.2/src/markdownpart-20.12.2.tar.xz";
1618+ sha256 = "08fifhw40q2xhi3lp76a3b7jgipq3v1gvp1f5id83jvv9bg5m85k";
1619+ name = "markdownpart-20.12.2.tar.xz";
16201620 };
16211621 };
16221622 mbox-importer = {
1623− version = "20.12.1";
1623+ version = "20.12.2";
16241624 src = fetchurl {
1625− url = "${mirror}/stable/release-service/20.12.1/src/mbox-importer-20.12.1.tar.xz";
1626− sha256 = "1kgbiq933f93sb8m2nqmpp1x6qkqqcm2hcb3ihk5741dcpdmxx9n";
1627− name = "mbox-importer-20.12.1.tar.xz";
1625+ url = "${mirror}/stable/release-service/20.12.2/src/mbox-importer-20.12.2.tar.xz";
1626+ sha256 = "1jiapp7pblanra83p720nj1rzqd566ij28za9jrkn3nj3xv2zm62";
1627+ name = "mbox-importer-20.12.2.tar.xz";
16281628 };
16291629 };
16301630 messagelib = {
1631− version = "20.12.1";
1631+ version = "20.12.2";
16321632 src = fetchurl {
1633− url = "${mirror}/stable/release-service/20.12.1/src/messagelib-20.12.1.tar.xz";
1634− sha256 = "0yjh7s80ksyyi78vxjw4i5f1bmsfziphwm6flgnw18gfzj3pyyy7";
1635− name = "messagelib-20.12.1.tar.xz";
1633+ url = "${mirror}/stable/release-service/20.12.2/src/messagelib-20.12.2.tar.xz";
1634+ sha256 = "07mzwsn0bmfsrsn6wlmz7kwrix4d33b007jvx37nckmarr6xcx54";
1635+ name = "messagelib-20.12.2.tar.xz";
16361636 };
16371637 };
16381638 minuet = {
1639− version = "20.12.1";
1639+ version = "20.12.2";
16401640 src = fetchurl {
1641− url = "${mirror}/stable/release-service/20.12.1/src/minuet-20.12.1.tar.xz";
1642− sha256 = "13jlz2m57x379zyv4x5zk2h6jc0qcz1zymkyrzs431bfmhyhdna2";
1643− name = "minuet-20.12.1.tar.xz";
1641+ url = "${mirror}/stable/release-service/20.12.2/src/minuet-20.12.2.tar.xz";
1642+ sha256 = "00d08qwfa4pvlcysp1af3n91bwb8idkl6gjwxrin3kliwns0ivfj";
1643+ name = "minuet-20.12.2.tar.xz";
16441644 };
16451645 };
16461646 okular = {
1647− version = "20.12.1";
1647+ version = "20.12.2";
16481648 src = fetchurl {
1649− url = "${mirror}/stable/release-service/20.12.1/src/okular-20.12.1.tar.xz";
1650− sha256 = "0gpm7n47yijsjg4yba561j5pbvd98hgvr93w1kvzk851nb87m89c";
1651− name = "okular-20.12.1.tar.xz";
1649+ url = "${mirror}/stable/release-service/20.12.2/src/okular-20.12.2.tar.xz";
1650+ sha256 = "1959flll9rrwsgb3gpifvsciyvl70j46xb0acfx9zrvsddvbpabq";
1651+ name = "okular-20.12.2.tar.xz";
16521652 };
16531653 };
16541654 palapeli = {
1655− version = "20.12.1";
1655+ version = "20.12.2";
16561656 src = fetchurl {
1657− url = "${mirror}/stable/release-service/20.12.1/src/palapeli-20.12.1.tar.xz";
1658− sha256 = "05d3f0snbg0iz78ggxk7hv1qn3blvpnpclhrhzcw1c5znr7al2xm";
1659− name = "palapeli-20.12.1.tar.xz";
1657+ url = "${mirror}/stable/release-service/20.12.2/src/palapeli-20.12.2.tar.xz";
1658+ sha256 = "1z80892gp6hg75vl6aicfvf5013412b5xglrpsp86lbx2r7d6ikw";
1659+ name = "palapeli-20.12.2.tar.xz";
16601660 };
16611661 };
16621662 parley = {
1663− version = "20.12.1";
1663+ version = "20.12.2";
16641664 src = fetchurl {
1665− url = "${mirror}/stable/release-service/20.12.1/src/parley-20.12.1.tar.xz";
1666− sha256 = "00xc1dv3fj783brfqh3ggvrwv26m840k35vrx2izzq5lqx2g1p5a";
1667− name = "parley-20.12.1.tar.xz";
1665+ url = "${mirror}/stable/release-service/20.12.2/src/parley-20.12.2.tar.xz";
1666+ sha256 = "16lymvvwglzvrfl74p7w9l2vahhrkm58fn6iicn5w1751bavjiq7";
1667+ name = "parley-20.12.2.tar.xz";
16681668 };
16691669 };
16701670 partitionmanager = {
1671− version = "20.12.1";
1671+ version = "20.12.2";
16721672 src = fetchurl {
1673− url = "${mirror}/stable/release-service/20.12.1/src/partitionmanager-20.12.1.tar.xz";
1674− sha256 = "1zypkah2smmqclni2r8571sd6qd5cbc0915r6gzf800yyccsfb65";
1675− name = "partitionmanager-20.12.1.tar.xz";
1673+ url = "${mirror}/stable/release-service/20.12.2/src/partitionmanager-20.12.2.tar.xz";
1674+ sha256 = "1f0nmz99fhp6c48sg92fwssxdvmwx2bj4l7phb0gqfnfqk4sw1xd";
1675+ name = "partitionmanager-20.12.2.tar.xz";
16761676 };
16771677 };
16781678 picmi = {
1679− version = "20.12.1";
1679+ version = "20.12.2";
16801680 src = fetchurl {
1681− url = "${mirror}/stable/release-service/20.12.1/src/picmi-20.12.1.tar.xz";
1682− sha256 = "0aiaq99sb57vvz5wjwdwm0jj456nj26qs4m6vwibb1f0f8js4i03";
1683− name = "picmi-20.12.1.tar.xz";
1681+ url = "${mirror}/stable/release-service/20.12.2/src/picmi-20.12.2.tar.xz";
1682+ sha256 = "024afpylfb6n6dd0g1iif257a0mgzmmmjl24h2riz4cyfvd26mkc";
1683+ name = "picmi-20.12.2.tar.xz";
16841684 };
16851685 };
16861686 pimcommon = {
1687− version = "20.12.1";
1687+ version = "20.12.2";
16881688 src = fetchurl {
1689− url = "${mirror}/stable/release-service/20.12.1/src/pimcommon-20.12.1.tar.xz";
1690− sha256 = "1w5avmvssqnvxl31xrlh1xfns6q386w8ixlzfbzjkz5m95m4wr57";
1691− name = "pimcommon-20.12.1.tar.xz";
1689+ url = "${mirror}/stable/release-service/20.12.2/src/pimcommon-20.12.2.tar.xz";
1690+ sha256 = "0fbmahp9m1jzi626rggmp09j3338z8f86hszvwfnk7ydn16hy5rs";
1691+ name = "pimcommon-20.12.2.tar.xz";
16921692 };
16931693 };
16941694 pim-data-exporter = {
1695− version = "20.12.1";
1695+ version = "20.12.2";
16961696 src = fetchurl {
1697− url = "${mirror}/stable/release-service/20.12.1/src/pim-data-exporter-20.12.1.tar.xz";
1698− sha256 = "0k9lh3llkzx0n5x8q14hkbjjrkczm10kr246bzr1zz8lcv1za1jc";
1699− name = "pim-data-exporter-20.12.1.tar.xz";
1697+ url = "${mirror}/stable/release-service/20.12.2/src/pim-data-exporter-20.12.2.tar.xz";
1698+ sha256 = "13z8r2rq1453zprvpjnf5y5v3x1828l8gyvbivf0dmfhb3hi1bih";
1699+ name = "pim-data-exporter-20.12.2.tar.xz";
17001700 };
17011701 };
17021702 pim-sieve-editor = {
1703− version = "20.12.1";
1703+ version = "20.12.2";
17041704 src = fetchurl {
1705− url = "${mirror}/stable/release-service/20.12.1/src/pim-sieve-editor-20.12.1.tar.xz";
1706− sha256 = "0lifarfkpcpdvwmn61gmfd45k5i0dbf3sjrb0z1yaqsq7m158di1";
1707− name = "pim-sieve-editor-20.12.1.tar.xz";
1705+ url = "${mirror}/stable/release-service/20.12.2/src/pim-sieve-editor-20.12.2.tar.xz";
1706+ sha256 = "11ji1033yq4lwpi2b331i4f5kpak66h6zyviv344wyab05ljkyhd";
1707+ name = "pim-sieve-editor-20.12.2.tar.xz";
17081708 };
17091709 };
17101710 poxml = {
1711− version = "20.12.1";
1711+ version = "20.12.2";
17121712 src = fetchurl {
1713− url = "${mirror}/stable/release-service/20.12.1/src/poxml-20.12.1.tar.xz";
1714− sha256 = "1smjvblx0jcv3afs2sr4qcmvhqd44iw24hvr9fppa3nxhrmjwmlk";
1715− name = "poxml-20.12.1.tar.xz";
1713+ url = "${mirror}/stable/release-service/20.12.2/src/poxml-20.12.2.tar.xz";
1714+ sha256 = "1hnm13x102fq7g4pginhdpq473dw9y52kw497773b72my94yj2zz";
1715+ name = "poxml-20.12.2.tar.xz";
17161716 };
17171717 };
17181718 print-manager = {
1719− version = "20.12.1";
1719+ version = "20.12.2";
17201720 src = fetchurl {
1721− url = "${mirror}/stable/release-service/20.12.1/src/print-manager-20.12.1.tar.xz";
1722− sha256 = "1nx442bi41gd64i4j0nc8hx0wdv6ayvnp2wydn4l7sgsf0ms4x6y";
1723− name = "print-manager-20.12.1.tar.xz";
1721+ url = "${mirror}/stable/release-service/20.12.2/src/print-manager-20.12.2.tar.xz";
1722+ sha256 = "1r19fsgnqdlmrpgbby13nj4v97nqlxlx8c0f7yv3izgncpavr0id";
1723+ name = "print-manager-20.12.2.tar.xz";
17241724 };
17251725 };
17261726 rocs = {
1727− version = "20.12.1";
1727+ version = "20.12.2";
17281728 src = fetchurl {
1729− url = "${mirror}/stable/release-service/20.12.1/src/rocs-20.12.1.tar.xz";
1730− sha256 = "11gg2pmx21wfrw63qv7w8bjzcsxf86j5ripa2dwqfl3355wvi5mb";
1731− name = "rocs-20.12.1.tar.xz";
1729+ url = "${mirror}/stable/release-service/20.12.2/src/rocs-20.12.2.tar.xz";
1730+ sha256 = "06sy6g32cigls1znvh5wvs7gw9h492d8zjqm6b50wsw0hbx61kvz";
1731+ name = "rocs-20.12.2.tar.xz";
17321732 };
17331733 };
17341734 signon-kwallet-extension = {
1735− version = "20.12.1";
1735+ version = "20.12.2";
17361736 src = fetchurl {
1737− url = "${mirror}/stable/release-service/20.12.1/src/signon-kwallet-extension-20.12.1.tar.xz";
1738− sha256 = "0m48a5mqmwrjl4wc4m30n5csl7fwp8g70pv0nib0v36lp0424xjb";
1739− name = "signon-kwallet-extension-20.12.1.tar.xz";
1737+ url = "${mirror}/stable/release-service/20.12.2/src/signon-kwallet-extension-20.12.2.tar.xz";
1738+ sha256 = "0ycr0dn8bp51dc510gqxik0rm0wk5728px7cps9csy33izfjpx9p";
1739+ name = "signon-kwallet-extension-20.12.2.tar.xz";
17401740 };
17411741 };
17421742 spectacle = {
1743− version = "20.12.1";
1743+ version = "20.12.2";
17441744 src = fetchurl {
1745− url = "${mirror}/stable/release-service/20.12.1/src/spectacle-20.12.1.tar.xz";
1746− sha256 = "04jsm0ipfaccc80qxnhhbfc9fn009cxa7dys89iqfqza6ssvq51l";
1747− name = "spectacle-20.12.1.tar.xz";
1745+ url = "${mirror}/stable/release-service/20.12.2/src/spectacle-20.12.2.tar.xz";
1746+ sha256 = "0v0vzspr0vwqi7m7yhnhavxzkfqdnz1g06ispfl1lmpjg1xh90by";
1747+ name = "spectacle-20.12.2.tar.xz";
17481748 };
17491749 };
17501750 step = {
1751− version = "20.12.1";
1751+ version = "20.12.2";
17521752 src = fetchurl {
1753− url = "${mirror}/stable/release-service/20.12.1/src/step-20.12.1.tar.xz";
1754− sha256 = "05xj4zv4r82nnz5rzb0rmrps4dagnkw9f5lapil5mi1i1gwqfi2k";
1755− name = "step-20.12.1.tar.xz";
1753+ url = "${mirror}/stable/release-service/20.12.2/src/step-20.12.2.tar.xz";
1754+ sha256 = "1drdv95rimdsgarcc00jlfm3jmcan2ln32yq0q2nbbxsj0c502k7";
1755+ name = "step-20.12.2.tar.xz";
17561756 };
17571757 };
17581758 svgpart = {
1759− version = "20.12.1";
1759+ version = "20.12.2";
17601760 src = fetchurl {
1761− url = "${mirror}/stable/release-service/20.12.1/src/svgpart-20.12.1.tar.xz";
1762− sha256 = "09n0pf5saww8gppmd501i3dfr13yvn4r2rfbdz42zlvcpcpgxdry";
1763− name = "svgpart-20.12.1.tar.xz";
1761+ url = "${mirror}/stable/release-service/20.12.2/src/svgpart-20.12.2.tar.xz";
1762+ sha256 = "1v1qd5sgb89gkvb62jad8ava2y599a4acb6hkqyh758y798ylgwj";
1763+ name = "svgpart-20.12.2.tar.xz";
17641764 };
17651765 };
17661766 sweeper = {
1767− version = "20.12.1";
1767+ version = "20.12.2";
17681768 src = fetchurl {
1769− url = "${mirror}/stable/release-service/20.12.1/src/sweeper-20.12.1.tar.xz";
1770− sha256 = "06a9a9vbkfhmlcc927ysa0qnp5qqbl5iywhkgbvyz90nsdaw3jjl";
1771− name = "sweeper-20.12.1.tar.xz";
1769+ url = "${mirror}/stable/release-service/20.12.2/src/sweeper-20.12.2.tar.xz";
1770+ sha256 = "0yh6dqw37v8l54635k7g27dnsrl319kfxrkiiy09cx6pjzf87k1h";
1771+ name = "sweeper-20.12.2.tar.xz";
17721772 };
17731773 };
17741774 umbrello = {
1775− version = "20.12.1";
1775+ version = "20.12.2";
17761776 src = fetchurl {
1777− url = "${mirror}/stable/release-service/20.12.1/src/umbrello-20.12.1.tar.xz";
1778− sha256 = "07fxxyw5zn1xj05kjr16rkgpj7ms9xvgpj4zlg428037gfa8g9vl";
1779− name = "umbrello-20.12.1.tar.xz";
1777+ url = "${mirror}/stable/release-service/20.12.2/src/umbrello-20.12.2.tar.xz";
1778+ sha256 = "0zzic469brh0w41w4ni66mfrj0p44xm1h32iwbb7imgnpw6dqksf";
1779+ name = "umbrello-20.12.2.tar.xz";
17801780 };
17811781 };
17821782 yakuake = {
1783− version = "20.12.1";
1783+ version = "20.12.2";
17841784 src = fetchurl {
1785− url = "${mirror}/stable/release-service/20.12.1/src/yakuake-20.12.1.tar.xz";
1786− sha256 = "02pal9xx1wbpw7dimvs2aw1xnyjqlvbjlybkkfhf8x7c6m1r63aa";
1787− name = "yakuake-20.12.1.tar.xz";
1785+ url = "${mirror}/stable/release-service/20.12.2/src/yakuake-20.12.2.tar.xz";
1786+ sha256 = "16irzxl6xfyanr7lrvap0ng911lml10bbjr0axk2a7m0gc1llrn4";
1787+ name = "yakuake-20.12.2.tar.xz";
17881788 };
17891789 };
17901790 zeroconf-ioslave = {
1791− version = "20.12.1";
1791+ version = "20.12.2";
17921792 src = fetchurl {
1793− url = "${mirror}/stable/release-service/20.12.1/src/zeroconf-ioslave-20.12.1.tar.xz";
1794− sha256 = "1lx94qgrqhyva3nv7sgzy0blbdgx3b6m0g0i0psg74qckdh8glas";
1795− name = "zeroconf-ioslave-20.12.1.tar.xz";
1793+ url = "${mirror}/stable/release-service/20.12.2/src/zeroconf-ioslave-20.12.2.tar.xz";
1794+ sha256 = "0yqni8vwwwya3cv006cf5svs1jhn6369clvrl6m79iacy0iirynk";
1795+ name = "zeroconf-ioslave-20.12.2.tar.xz";
17961796 };
17971797 };
17981798}
pkgs/applications/misc/audio/soxr/arm64-check.patchnew file+79
@@ -0,0 +1,79 @@
1+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2+From: Misty De Meo <mistydemeo@gmail.com>
3+Date: Tue, 15 Sep 2020 16:57:26 -0700
4+Subject: [PATCH] Check for __arm64__, not just __arm__
5+
6+On at least one 64-bit ARM processor I've tested (Apple Silicon on macOS),
7+__arm__ isn't defined but __arm64__ is. As a result, some of the
8+ARM-specific macros are missing and calls to them fail.
9+---
10+ src/cr-core.c | 2 +-
11+ src/dev32s.h | 2 +-
12+ src/pffft-wrap.c | 2 +-
13+ src/pffft.c | 4 ++--
14+ 4 files changed, 5 insertions(+), 5 deletions(-)
15+
16+diff --git a/src/cr-core.c b/src/cr-core.c
17+index 159a5d9..fe5ea8a 100644
18+--- a/src/cr-core.c
19++++ b/src/cr-core.c
20+@@ -80,7 +80,7 @@ static void cubic_stage_fn(stage_t * p, fifo_t * output_fifo)
21+ #define DEFINED_X86 0
22+ #endif
23+
24+-#if defined __arm__
25++#if defined(__arm__) || defined(__arm64__)
26+ #define DEFINED_ARM 1
27+ #else
28+ #define DEFINED_ARM 0
29+diff --git a/src/dev32s.h b/src/dev32s.h
30+index 7edae86..a14d7ad 100644
31+--- a/src/dev32s.h
32++++ b/src/dev32s.h
33+@@ -31,7 +31,7 @@ SIMD_INLINE(void) vStorSum(float * a, v4_t b) {
34+ v4_t t = vAdd(_mm_movehl_ps(b, b), b);
35+ _mm_store_ss(a, vAdd(t, _mm_shuffle_ps(t,t,1)));}
36+
37+-#elif defined __arm__
38++#elif defined(__arm__) || defined(__arm64__)
39+
40+ #include <arm_neon.h>
41+
42+diff --git a/src/pffft-wrap.c b/src/pffft-wrap.c
43+index c920f06..1641fc4 100644
44+--- a/src/pffft-wrap.c
45++++ b/src/pffft-wrap.c
46+@@ -40,7 +40,7 @@ static void pffft_zconvolve(PFFFT_Setup *s, const float *a, const float *b, floa
47+
48+ float ar, ai, br, bi;
49+
50+-#ifdef __arm__
51++#if defined(__arm__) || defined(__arm64__)
52+ __builtin_prefetch(va);
53+ __builtin_prefetch(vb);
54+ __builtin_prefetch(va+2);
55+diff --git a/src/pffft.c b/src/pffft.c
56+index 46c841e..8c775a9 100644
57+--- a/src/pffft.c
58++++ b/src/pffft.c
59+@@ -157,7 +157,7 @@ typedef __m128 v4sf;
60+ /*
61+ ARM NEON support macros
62+ */
63+-#elif !defined(PFFFT_SIMD_DISABLE) && defined(__arm__)
64++#elif !defined(PFFFT_SIMD_DISABLE) && (defined(__arm__) || defined(__arm64__))
65+ # include <arm_neon.h>
66+ typedef float32x4_t v4sf;
67+ # define SIMD_SZ 4
68+@@ -1732,7 +1732,7 @@ void pffft_zconvolve_accumulate(PFFFT_Setup *s, const float *a, const float *b,
69+ const v4sf * RESTRICT vb = (const v4sf*)b;
70+ v4sf * RESTRICT vab = (v4sf*)ab;
71+
72+-#ifdef __arm__
73++#if defined(__arm__) || defined(__arm64__)
74+ __builtin_prefetch(va);
75+ __builtin_prefetch(vb);
76+ __builtin_prefetch(vab);
77+--
78+2.30.1
79+
pkgs/applications/misc/audio/soxr/default.nix+5
@@ -8,6 +8,11 @@ stdenv.mkDerivation rec {
88 sha256 = "12aql6svkplxq5fjycar18863hcq84c5kx8g6f4rj0lcvigw24di";
99 };
1010
11+ patches = [
12+ # Remove once https://sourceforge.net/p/soxr/code/merge-requests/5/ is merged.
13+ ./arm64-check.patch
14+ ];
15+
1116 outputs = [ "out" "doc" ]; # headers are just two and very small
1217
1318 preConfigure = if stdenv.isDarwin then ''
pkgs/applications/misc/avrdudess/default.nix+1−1
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
88 sha256 = "18llpvjsfhypzijrvfbzmcg3g141f307mzsrg11wcdxh9syxqak6";
99 };
1010
11− buildInputs = [ unzip ];
11+ nativeBuildInputs = [ unzip ];
1212
1313 phases = [ "buildPhase" ];
1414
pkgs/applications/misc/kdbplus/default.nix+1−1
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
2222 };
2323
2424 dontStrip = true;
25− buildInputs = [ unzip ];
25+ nativeBuildInputs = [ unzip ];
2626
2727 phases = "unpackPhase installPhase";
2828 unpackPhase = "mkdir ${pname}-${version} && cd ${pname}-${version} && unzip -qq ${src}";
pkgs/applications/misc/keepass/default.nix+2−2
@@ -12,8 +12,8 @@ with builtins; buildDotnetPackage rec {
1212
1313 sourceRoot = ".";
1414
15− nativeBuildInputs = [ makeWrapper ];
16− buildInputs = [ unzip icoutils ];
15+ nativeBuildInputs = [ makeWrapper unzip ];
16+ buildInputs = [ icoutils ];
1717
1818 patches = [
1919 (substituteAll {
pkgs/applications/misc/lyx/default.nix+2−2
@@ -3,12 +3,12 @@
33}:
44
55mkDerivation rec {
6− version = "2.3.6";
6+ version = "2.3.6.1";
77 pname = "lyx";
88
99 src = fetchurl {
1010 url = "ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/${pname}-${version}.tar.xz";
11− sha256 = "160whjwwrmxizdakjlkf9xc86bhqfnslw47fixgqq4qhbapcxxkg";
11+ sha256 = "sha256-xr7SYzQZiY4Bp8w1AxDX2TS/WRyrcln8JYGqTADq+ng=";
1212 };
1313
1414 # LaTeX is used from $PATH, as people often want to have it with extra pkgs
pkgs/applications/misc/megasync/default.nix+1−2
@@ -38,7 +38,7 @@ mkDerivation rec {
3838 };
3939
4040 nativeBuildInputs =
41− [ autoconf automake doxygen lsb-release pkg-config qttools swig ];
41+ [ autoconf automake doxygen lsb-release pkg-config qttools swig unzip ];
4242 buildInputs = [
4343 c-ares
4444 cryptopp
@@ -53,7 +53,6 @@ mkDerivation rec {
5353 qtbase
5454 qtx11extras
5555 sqlite
56− unzip
5756 wget
5857 ];
5958
pkgs/applications/misc/milu/default.nix+1−2
@@ -22,10 +22,9 @@ stdenv.mkDerivation {
2222 cp bin/milu $out/bin
2323 '';
2424
25− nativeBuildInputs = [ pkg-config ];
25+ nativeBuildInputs = [ pkg-config unzip ];
2626 buildInputs = [
2727 glib
28− unzip
2928 llvmPackages.libclang
3029 ];
3130
pkgs/applications/misc/omegat.nix+1−2
@@ -9,8 +9,7 @@ stdenv.mkDerivation {
99 sha256 = "0axz7r30p34z5hgvdglznc82g7yvm3g56dv5190jixskx6ba58rs";
1010 };
1111
12− nativeBuildInputs = [ makeWrapper ];
13− buildInputs = [ unzip ];
12+ nativeBuildInputs = [ makeWrapper unzip ];
1413
1514 unpackCmd = "unzip -o $curSrc"; # tries to go interactive without -o
1615
pkgs/applications/misc/openjump/default.nix+1−2
@@ -18,8 +18,7 @@ stdenv.mkDerivation {
1818 cd $out; unzip $src
1919 '';
2020
21− nativeBuildInputs = [ makeWrapper ];
22− buildInputs = [ unzip ];
21+ nativeBuildInputs = [ makeWrapper unzip ];
2322
2423 installPhase = ''
2524 dir=$(echo $out/OpenJUMP-*)
pkgs/applications/networking/browsers/firefox/common.nix+2−1
@@ -161,7 +161,7 @@ buildStdenv.mkDerivation ({
161161 xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file
162162 xorg.pixman yasm libGLU libGL
163163 xorg.xorgproto
164− xorg.libXext unzip makeWrapper
164+ xorg.libXext makeWrapper
165165 libevent libstartup_notification /* cairo */
166166 libpng jemalloc glib
167167 nasm icu67 libvpx_1_8
@@ -222,6 +222,7 @@ buildStdenv.mkDerivation ({
222222 rust-cbindgen
223223 rustc
224224 which
225+ unzip
225226 ]
226227 ++ lib.optional gtk3Support wrapGAppsHook
227228 ++ lib.optionals buildStdenv.isDarwin [ xcbuild rsync ]
pkgs/applications/networking/browsers/palemoon/default.nix+2−2
@@ -43,14 +43,14 @@ in stdenv.mkDerivation rec {
4343 '';
4444
4545 nativeBuildInputs = [
46− desktop-file-utils file gnum4 perl pkg-config python2 wget which wrapGAppsHook
46+ desktop-file-utils file gnum4 perl pkg-config python2 wget which wrapGAppsHook unzip
4747 ];
4848
4949 buildInputs = [
5050 alsaLib bzip2 cairo dbus dbus-glib ffmpeg fontconfig freetype
5151 gnome2.GConf gtk2 hunspell libevent libjpeg libnotify
5252 libstartup_notification libGLU libGL
53− libpulseaudio unzip yasm zip zlib
53+ libpulseaudio yasm zip zlib
5454 ]
5555 ++ (with xorg; [
5656 libX11 libXext libXft libXi libXrender libXScrnSaver
pkgs/applications/networking/browsers/vivaldi/widevine.nix+1−1
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "0l743f2yyaq1vvc3iicajgnfpjxjsfvjcqvanndbxs23skgjcv6r";
1212 };
1313
14− buildInputs = [ unzip ];
14+ nativeBuildInputs = [ unzip ];
1515
1616 unpackPhase = ''
1717 unzip $src
pkgs/applications/networking/browsers/webbrowser/default.nix+2−2
@@ -41,12 +41,12 @@ in stdenv.mkDerivation rec {
4141 };
4242
4343 nativeBuildInputs = [
44− gnum4 makeWrapper perl pkg-config python2
44+ gnum4 makeWrapper perl pkg-config python2 unzip
4545 ];
4646
4747 buildInputs = [
4848 alsaLib dbus dbus-glib ffmpeg fontconfig freetype yasm zip jack2 gtk2
49− unzip gnome2.GConf xorg.libXt
49+ gnome2.GConf xorg.libXt
5050 ];
5151
5252 enableParallelBuilding = true;
pkgs/applications/networking/instant-messengers/torchat/default.nix+2−1
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
99 sha256 = "0rb4lvv40pz6ab5kxq40ycvh7kh1yxn7swzgv2ff2nbhi62xnzp0";
1010 };
1111
12− buildInputs = [ python unzip wxPython wrapPython ];
12+ nativeBuildInputs = [ unzip ];
13+ buildInputs = [ python wxPython wrapPython ];
1314 pythonPath = [ wxPython ];
1415
1516 preConfigure = "cd torchat/src; rm portable.txt";
pkgs/applications/networking/mailreaders/mblaze/default.nix+2−2
@@ -2,7 +2,7 @@
22
33stdenv.mkDerivation rec {
44 pname = "mblaze";
5− version = "1.0";
5+ version = "1.1";
66
77 nativeBuildInputs = [ installShellFiles ];
88 buildInputs = [ ruby ] ++ lib.optionals stdenv.isDarwin [ libiconv ];
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 owner = "leahneukirchen";
1212 repo = "mblaze";
1313 rev = "v${version}";
14− sha256 = "0hxy3mjjv4hg856sl1r15fdmqaw4s9c26b3lidsd5x0kpqy601ai";
14+ sha256 = "sha256-Ho2Qoxs93ig4yYUOaoqdYnLA8Y4+7CfRM0dju89JOa4=";
1515 };
1616
1717 makeFlags = [ "PREFIX=$(out)" ];
pkgs/applications/networking/mailreaders/thunderbird/68.nix+1−1
@@ -98,6 +98,7 @@ stdenv.mkDerivation rec {
9898 rustc
9999 which
100100 yasm
101+ unzip
101102 ] ++ lib.optional gtk3Support wrapGAppsHook;
102103
103104 buildInputs = [
@@ -125,7 +126,6 @@ stdenv.mkDerivation rec {
125126 pango
126127 perl
127128 sqlite
128− unzip
129129 xorg.libX11
130130 xorg.libXScrnSaver
131131 xorg.libXcursor
pkgs/applications/networking/mailreaders/thunderbird/default.nix+1−1
@@ -99,6 +99,7 @@ stdenv.mkDerivation rec {
9999 rustc
100100 which
101101 yasm
102+ unzip
102103 ] ++ lib.optional gtk3Support wrapGAppsHook;
103104
104105 buildInputs = [
@@ -126,7 +127,6 @@ stdenv.mkDerivation rec {
126127 pango
127128 perl
128129 sqlite
129− unzip
130130 xorg.libX11
131131 xorg.libXScrnSaver
132132 xorg.libXcursor
pkgs/applications/networking/mpop/default.nix+2−2
@@ -4,11 +4,11 @@ with lib;
44
55stdenv.mkDerivation rec {
66 pname = "mpop";
7− version = "1.4.11";
7+ version = "1.4.12";
88
99 src = fetchurl {
1010 url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz";
11− sha256 = "1gcxvhin5y0q47svqbf90r5aip0cgywm8sq6m84ygda7km8xylwv";
11+ sha256 = "sha256-X2NVtS2cNgYZYjpAxmwaVXHjk7Q/5YN1wN41QprDSAo=";
1212 };
1313
1414 nativeBuildInputs = [ pkg-config ];
pkgs/applications/networking/p2p/transgui/default.nix+2−2
@@ -12,9 +12,9 @@ stdenv.mkDerivation rec {
1212 sha256 = "1dyx778756zhvz5sxgdvy49p2c0x44w4nmcfd90wqrmgfknncnf5";
1313 };
1414
15− nativeBuildInputs = [ pkg-config ];
15+ nativeBuildInputs = [ pkg-config unzip ];
1616 buildInputs = [
17− unzip fpc lazarus stdenv.cc
17+ fpc lazarus stdenv.cc
1818 libX11 glib gtk2 gdk-pixbuf pango atk cairo openssl
1919 ];
2020
pkgs/applications/office/ib/controller/default.nix+2−1
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
1111
1212 phases = [ "unpackPhase" "installPhase" ];
1313
14− buildInputs = [ unzip jdk ib-tws ];
14+ nativeBuildInputs = [ unzip ];
15+ buildInputs = [ jdk ib-tws ];
1516
1617 installPhase = ''
1718 mkdir -p $out $out/bin $out/etc/ib/controller $out/share/IBController
pkgs/applications/science/biology/snpeff/default.nix+2−2
@@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
99 sha256 = "0i12mv93bfv8xjwc3rs2x73d6hkvi7kgbbbx3ry984l3ly4p6nnm";
1010 };
1111
12− nativeBuildInputs = [ makeWrapper ];
13− buildInputs = [ unzip jre ];
12+ nativeBuildInputs = [ makeWrapper unzip ];
13+ buildInputs = [ jre ];
1414
1515 sourceRoot = "snpEff";
1616
pkgs/applications/science/math/perseus/default.nix+1−1
@@ -3,7 +3,7 @@
33stdenv.mkDerivation {
44 name = "perseus-4-beta";
55 version = "4-beta";
6− buildInputs = [ unzip ];
6+ nativeBuildInputs = [ unzip ];
77
88 hardeningDisable = [ "stackprotector" ];
99
pkgs/applications/science/math/weka/default.nix+1−2
@@ -9,8 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "0zwmhspmqb0a7cm6k6i0s6q3w19ws1g9dx3cp2v3g3vsif6cdh31";
1010 };
1111
12− nativeBuildInputs = [ makeWrapper ];
13− buildInputs = [ unzip ];
12+ nativeBuildInputs = [ makeWrapper unzip ];
1413
1514 # The -Xmx1000M comes suggested from their download page:
1615 # http://www.cs.waikato.ac.nz/ml/weka/downloading.html
pkgs/applications/science/robotics/betaflight-configurator/default.nix+2−2
@@ -19,9 +19,9 @@ stdenv.mkDerivation rec {
1919 sha256 = "07r60n9422g5sm7x5b62p044cp961l51vx0s8ig2hy24s74hkam1";
2020 };
2121
22− nativeBuildInputs = [ wrapGAppsHook ];
22+ nativeBuildInputs = [ wrapGAppsHook unzip ];
2323
24− buildInputs = [ unzip gsettings-desktop-schemas gtk3 ];
24+ buildInputs = [ gsettings-desktop-schemas gtk3 ];
2525
2626 installPhase = ''
2727 mkdir -p $out/bin \
pkgs/applications/version-management/mercurial/4.9.nix+2−2
@@ -21,8 +21,8 @@ in python2Packages.buildPythonApplication {
2121
2222 inherit python; # pass it so that the same version can be used in hg2git
2323
24− nativeBuildInputs = [ makeWrapper ];
25− buildInputs = [ docutils unzip ]
24+ nativeBuildInputs = [ makeWrapper unzip ];
25+ buildInputs = [ docutils ]
2626 ++ lib.optionals stdenv.isDarwin [ ApplicationServices ];
2727
2828 propagatedBuildInputs = [ hg-git dulwich ];
pkgs/applications/version-management/mercurial/default.nix+2−2
@@ -19,8 +19,8 @@ in python3Packages.buildPythonApplication rec {
1919
2020 passthru = { inherit python; }; # pass it so that the same version can be used in hg2git
2121
22− nativeBuildInputs = [ makeWrapper ];
23− buildInputs = [ docutils unzip ]
22+ nativeBuildInputs = [ makeWrapper unzip ];
23+ buildInputs = [ docutils ]
2424 ++ lib.optionals stdenv.isDarwin [ ApplicationServices ];
2525
2626 makeFlags = [ "PREFIX=$(out)" ];
pkgs/applications/video/vlc/default.nix+2−2
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
3838 zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread
3939 libbluray dbus fribidi libvorbis libtheora speex lua5 libgcrypt libgpgerror
4040 libupnp libcaca libpulseaudio flac schroedinger libxml2 librsvg mpeg2dec
41− systemd gnutls avahi libcddb SDL SDL_image libmtp unzip taglib libarchive
41+ systemd gnutls avahi libcddb SDL SDL_image libmtp taglib libarchive
4242 libkate libtiger libv4l samba libssh2 liboggz libass libdvbpsi libva
4343 xorg.xlibsWrapper xorg.libXv xorg.libXvMC xorg.libXpm xorg.xcbutilkeysyms
4444 libdc1394 libraw1394 libopus libebml libmatroska libvdpau libsamplerate
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
4949 ++ optional jackSupport libjack2
5050 ++ optionals chromecastSupport [ protobuf libmicrodns ];
5151
52− nativeBuildInputs = [ autoreconfHook perl pkg-config removeReferencesTo ]
52+ nativeBuildInputs = [ autoreconfHook perl pkg-config removeReferencesTo unzip ]
5353 ++ optionals withQt5 [ wrapQtAppsHook ];
5454
5555 enableParallelBuilding = true;
pkgs/applications/window-managers/wmii-hg/default.nix+2−2
@@ -29,8 +29,8 @@ stdenv.mkDerivation rec {
2929 EOF
3030 '';
3131
32− nativeBuildInputs = [ pkg-config ];
33− buildInputs = [ unzip libixp_hg txt2tags dash python which
32+ nativeBuildInputs = [ pkg-config unzip ];
33+ buildInputs = [ libixp_hg txt2tags dash python which
3434 libX11 libXrender libXext libXinerama libXrandr libXft ];
3535
3636 # For some reason including mercurial in buildInputs did not help
pkgs/build-support/bintools-wrapper/default.nix+4
@@ -306,6 +306,10 @@ stdenv.mkDerivation {
306306 done
307307 ''
308308
309+ + optionalString stdenv.targetPlatform.isDarwin ''
310+ echo "-arch ${targetPlatform.darwinArch}" >> $out/nix-support/libc-ldflags
311+ ''
312+
309313 + ''
310314 for flags in "$out/nix-support"/*flags*; do
311315 substituteInPlace "$flags" --replace $'\n' ' '
pkgs/build-support/buildenv/default.nix+5−3
@@ -36,8 +36,9 @@ lib.makeOverridable
3636, # Shell commands to run after building the symlink tree.
3737 postBuild ? ""
3838
39−, # Additional inputs. Handy e.g. if using makeWrapper in `postBuild`.
40− buildInputs ? []
39+# Additional inputs
40+, nativeBuildInputs ? [] # Handy e.g. if using makeWrapper in `postBuild`.
41+, buildInputs ? []
4142
4243, passthru ? {}
4344, meta ? {}
@@ -53,7 +54,8 @@ in
5354runCommand name
5455 rec {
5556 inherit manifest ignoreCollisions checkCollisionContents passthru
56− meta pathsToLink extraPrefix postBuild buildInputs;
57+ meta pathsToLink extraPrefix postBuild
58+ nativeBuildInputs buildInputs;
5759 pkgs = builtins.toJSON (map (drv: {
5860 paths =
5961 # First add the usual output(s): respect if user has chosen explicitly,
pkgs/build-support/cc-wrapper/cc-wrapper.sh+12−4
@@ -198,7 +198,15 @@ fi
198198
199199PATH="$path_backup"
200200# Old bash workaround, see above.
201−exec @prog@ \
202− ${extraBefore+"${extraBefore[@]}"} \
203− ${params+"${params[@]}"} \
204− ${extraAfter+"${extraAfter[@]}"}
201+
202+if (( "${NIX_CC_USE_RESPONSE_FILE:-@use_response_file_by_default@}" >= 1 )); then
203+ exec @prog@ @<(printf "%q\n" \
204+ ${extraBefore+"${extraBefore[@]}"} \
205+ ${params+"${params[@]}"} \
206+ ${extraAfter+"${extraAfter[@]}"})
207+else
208+ exec @prog@ \
209+ ${extraBefore+"${extraBefore[@]}"} \
210+ ${params+"${params[@]}"} \
211+ ${extraAfter+"${extraAfter[@]}"}
212+fi
pkgs/build-support/cc-wrapper/default.nix+5
@@ -160,6 +160,7 @@ stdenv.mkDerivation {
160160 local dst="$1"
161161 local wrapper="$2"
162162 export prog="$3"
163+ export use_response_file_by_default=${if isClang then "1" else "0"}
163164 substituteAll "$wrapper" "$out/bin/$dst"
164165 chmod +x "$out/bin/$dst"
165166 }
@@ -484,6 +485,10 @@ stdenv.mkDerivation {
484485 substituteAll ${../wrapper-common/utils.bash} $out/nix-support/utils.bash
485486 ''
486487
488+ + optionalString stdenv.targetPlatform.isDarwin ''
489+ echo "-arch ${targetPlatform.darwinArch}" >> $out/nix-support/cc-cflags
490+ ''
491+
487492 ##
488493 ## Extra custom steps
489494 ##
pkgs/build-support/expand-response-params/default.nix+1−1
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
1010 src=$PWD
1111 '';
1212 buildPhase = ''
13− "$CC" -std=c99 -O3 -o "expand-response-params" expand-response-params.c
13+ NIX_CC_USE_RESPONSE_FILE=0 "$CC" -std=c99 -O3 -o "expand-response-params" expand-response-params.c
1414 '';
1515 installPhase = ''
1616 mkdir -p $prefix/bin
pkgs/build-support/fetchnuget/default.nix+1−1
@@ -19,7 +19,7 @@ else
1919
2020 sourceRoot = ".";
2121
22− buildInputs = [ unzip ];
22+ nativeBuildInputs = [ unzip ];
2323
2424 dontBuild = true;
2525
pkgs/build-support/release/ant-build.nix+2−1
@@ -108,7 +108,8 @@ stdenv.mkDerivation (
108108 {
109109 name = name + (if src ? version then "-" + src.version else "");
110110
111− buildInputs = [ant jre zip unzip] ++ lib.optional (args ? buildInputs) args.buildInputs ;
111+ nativeBuildInputs = [ unzip ];
112+ buildInputs = [ant jre zip] ++ lib.optional (args ? buildInputs) args.buildInputs ;
112113
113114 postHook = ''
114115 mkdir -p $out/nix-support
pkgs/build-support/rust/default.nix+2
@@ -103,6 +103,8 @@ stdenv.mkDerivation ((removeAttrs args ["depsExtraArgs"]) // lib.optionalAttrs u
103103
104104 cargoBuildType = buildType;
105105
106+ cargoCheckType = checkType;
107+
106108 patchRegistryDeps = ./patch-registry-deps;
107109
108110 nativeBuildInputs = nativeBuildInputs ++ [
pkgs/build-support/rust/hooks/cargo-build-hook.sh+8−2
@@ -9,6 +9,10 @@ cargoBuildHook() {
99 pushd "${buildAndTestSubdir}"
1010 fi
1111
12+ if [ "${cargoBuildType}" != "debug" ]; then
13+ cargoBuildProfileFlag="--${cargoBuildType}"
14+ fi
15+
1216 (
1317 set -x
1418 env \
@@ -19,7 +23,7 @@ cargoBuildHook() {
1923 cargo build -j $NIX_BUILD_CORES \
2024 --target @rustTargetPlatformSpec@ \
2125 --frozen \
22− --${cargoBuildType} \
26+ ${cargoBuildProfileFlag} \
2327 ${cargoBuildFlags}
2428 )
2529
@@ -32,4 +36,6 @@ cargoBuildHook() {
3236 echo "Finished cargoBuildHook"
3337}
3438
35−buildPhase=cargoBuildHook
39+if [ -z "${dontCargoBuild-}" ] && [ -z "${buildPhase-}" ]; then
40+ buildPhase=cargoBuildHook
41+fi
pkgs/build-support/rust/hooks/cargo-check-hook.sh+7−2
@@ -1,4 +1,5 @@
11declare -a checkFlags
2+declare -a cargoTestFlags
23
34cargoCheckHook() {
45 echo "Executing cargoCheckHook"
@@ -15,7 +16,11 @@ cargoCheckHook() {
1516 threads=1
1617 fi
1718
18− argstr="--${cargoBuildType} --target @rustTargetPlatformSpec@ --frozen";
19+ if [ "${cargoBuildType}" != "debug" ]; then
20+ cargoBuildProfileFlag="--${cargoBuildType}"
21+ fi
22+
23+ argstr="${cargoBuildProfileFlag} --target @rustTargetPlatformSpec@ --frozen ${cargoTestFlags}";
1924
2025 (
2126 set -x
@@ -36,6 +41,6 @@ cargoCheckHook() {
3641 runHook postCheck
3742}
3843
39−if [ -z "${checkPhase-}" ]; then
44+if [ -z "${dontCargoCheck-}" ] && [ -z "${checkPhase-}" ]; then
4045 checkPhase=cargoCheckHook
4146fi
pkgs/build-support/rust/hooks/cargo-install-hook.sh+1−1
@@ -43,7 +43,7 @@ cargoInstallHook() {
4343}
4444
4545
46−if [ -z "${installPhase-}" ]; then
46+if [ -z "${dontCargoInstall-}" ] && [ -z "${installPhase-}" ]; then
4747 installPhase=cargoInstallHook
4848 postBuildHooks+=(cargoInstallPostBuildHook)
4949fi
pkgs/build-support/rust/hooks/cargo-setup-hook.sh+3−1
@@ -77,7 +77,9 @@ cargoSetupPostPatchHook() {
7777 echo "Finished cargoSetupPostPatchHook"
7878}
7979
80−postUnpackHooks+=(cargoSetupPostUnpackHook)
80+if [ -z "${dontCargoSetupPostUnpack-}" ]; then
81+ postUnpackHooks+=(cargoSetupPostUnpackHook)
82+fi
8183
8284if [ -z ${cargoVendorDir-} ]; then
8385 postPatchHooks+=(cargoSetupPostPatchHook)
pkgs/data/misc/iana-etc/default.nix+2−2
@@ -1,11 +1,11 @@
11{ lib, fetchzip }:
22
33let
4− version = "20200729";
4+ version = "20210225";
55in fetchzip {
66 name = "iana-etc-${version}";
77 url = "https://github.com/Mic92/iana-etc/releases/download/${version}/iana-etc-${version}.tar.gz";
8− sha256 = "05cymmisfvpyd7fwzc6axvm5fsi1v6hzs0pjr4xp1i95wvpz7qpm";
8+ sha256 = "sha256-NVvZG3EJEYOXFDTBXD5m9sg/8msyMiBMkiZr+ZxWZ/g=";
99
1010 postFetch = ''
1111 tar -xzvf $downloadedFile --strip-components=1
pkgs/desktops/gnome-3/extensions/night-theme-switcher/default.nix+2−1
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
1111 sha256 = "0z11y18bgdc0y41hrrzzgi4lagm2cg06x12jgdnary1ycng7xja0";
1212 };
1313
14− buildInputs = [ glib gnome3.gnome-shell unzip ];
14+ nativeBuildInputs = [ unzip ];
15+ buildInputs = [ glib gnome3.gnome-shell ];
1516
1617 uuid = "nightthemeswitcher@romainvigier.fr";
1718
pkgs/desktops/plasma-5/fetch.sh+1−1
@@ -1 +1 @@
1−WGET_ARGS=( https://download.kde.org/stable/plasma/5.20.5/ -A '*.tar.xz' )
1+WGET_ARGS=( https://download.kde.org/stable/plasma/5.21.1/ -A '*.tar.xz' )
pkgs/desktops/plasma-5/ksysguard.nix+3−2
@@ -3,7 +3,8 @@
33 extra-cmake-modules, kdoctools,
44 libcap, libpcap, lm_sensors,
55 kconfig, kcoreaddons, kdelibs4support, ki18n, kiconthemes, kitemviews,
6− knewstuff, libksysguard, qtbase
6+ knewstuff, libksysguard, qtbase,
7+ networkmanager-qt, libnl
78}:
89
910mkDerivation {
@@ -12,6 +13,6 @@ mkDerivation {
1213 nativeBuildInputs = [ extra-cmake-modules kdoctools ];
1314 buildInputs = [
1415 kconfig kcoreaddons kitemviews knewstuff kiconthemes libksysguard
15− kdelibs4support ki18n libcap libpcap lm_sensors
16+ kdelibs4support ki18n libcap libpcap lm_sensors networkmanager-qt libnl
1617 ];
1718}
pkgs/desktops/plasma-5/kwin/default.nix+2−2
@@ -12,7 +12,7 @@
1212 kcoreaddons, kcrash, kdeclarative, kdecoration, kglobalaccel, ki18n,
1313 kiconthemes, kidletime, kinit, kio, knewstuff, knotifications, kpackage,
1414 kscreenlocker, kservice, kwayland, kwayland-server, kwidgetsaddons, kwindowsystem, kxmlgui,
15− plasma-framework, libcap, libdrm, mesa
15+ plasma-framework, libcap, libdrm, mesa, pipewire
1616}:
1717
1818# TODO (ttuegel): investigate qmlplugindump failure
@@ -31,7 +31,7 @@ mkDerivation {
3131 kcoreaddons kcrash kdeclarative kdecoration kglobalaccel ki18n kiconthemes
3232 kidletime kinit kio knewstuff knotifications kpackage kscreenlocker kservice
3333 kwayland kwayland-server kwidgetsaddons kwindowsystem kxmlgui plasma-framework
34− libcap libdrm mesa
34+ libcap libdrm mesa pipewire
3535 ];
3636 outputs = [ "dev" "out" ];
3737 patches = [
pkgs/desktops/plasma-5/libkscreen/libkscreen-backends-path.patch+3−6
@@ -2,7 +2,7 @@ Index: libkscreen-5.9.4/src/backendmanager.cpp
22===================================================================
33--- libkscreen-5.9.4.orig/src/backendmanager.cpp
44+++ libkscreen-5.9.4/src/backendmanager.cpp
5−@@ -178,17 +178,11 @@ QFileInfo BackendManager::preferredBacke
5+@@ -172,14 +172,11 @@ QFileInfo BackendManager::preferredBackend(const QString &backend)
66 QFileInfoList BackendManager::listBackends()
77 {
88 // Compile a list of installed backends first
@@ -10,10 +10,7 @@ Index: libkscreen-5.9.4/src/backendmanager.cpp
1010- const QStringList paths = QCoreApplication::libraryPaths();
1111- QFileInfoList finfos;
1212- for (const QString &path : paths) {
13−- const QDir dir(path + QLatin1String("/kf5/kscreen/"),
14−- backendFilter,
15−- QDir::SortFlags(QDir::QDir::Name),
16−- QDir::NoDotAndDotDot | QDir::Files);
13+- const QDir dir(path + QLatin1String("/kf5/kscreen/"), backendFilter, QDir::SortFlags(QDir::QDir::Name), QDir::NoDotAndDotDot | QDir::Files);
1714- finfos.append(dir.entryInfoList());
1815- }
1916- return finfos;
@@ -24,4 +21,4 @@ Index: libkscreen-5.9.4/src/backendmanager.cpp
2421+ return dir.entryInfoList();
2522 }
2623
27− KScreen::AbstractBackend *BackendManager::loadBackendPlugin(QPluginLoader *loader, const QString &name,
24+ KScreen::AbstractBackend *BackendManager::loadBackendPlugin(QPluginLoader *loader, const QString &name, const QVariantMap &arguments)
pkgs/desktops/plasma-5/plasma-browser-integration.nix+2−2
@@ -3,7 +3,7 @@
33 extra-cmake-modules,
44 qtbase,
55 kfilemetadata, kio, ki18n, kconfig , kdbusaddons, knotifications, kpurpose,
6− krunner, kwindowsystem, kactivities,
6+ krunner, kwindowsystem, kactivities, plasma-workspace
77}:
88
99mkDerivation {
@@ -13,6 +13,6 @@ mkDerivation {
1313 ];
1414 buildInputs = [
1515 qtbase kfilemetadata kio ki18n kconfig kdbusaddons knotifications kpurpose
16− krunner kwindowsystem kactivities
16+ krunner kwindowsystem kactivities plasma-workspace
1717 ];
1818}
pkgs/desktops/plasma-5/plasma-desktop/hwclock-path.patch+3−3
@@ -3,14 +3,14 @@ Index: plasma-desktop-5.8.5/kcms/dateandtime/helper.cpp
33--- plasma-desktop-5.8.5.orig/kcms/dateandtime/helper.cpp
44+++ plasma-desktop-5.8.5/kcms/dateandtime/helper.cpp
55@@ -48,10 +48,6 @@
6− #include <sys/stat.h>
6+ #include <sys/types.h>
77 #endif
8−
8+
99-// We cannot rely on the $PATH environment variable, because D-Bus activation
1010-// clears it. So we have to use a reasonable default.
1111-static const QString exePath = QStringLiteral("/usr/sbin:/usr/bin:/sbin:/bin");
1212-
13− int ClockHelper::ntp( const QStringList& ntpServers, bool ntpEnabled )
13+ int ClockHelper::ntp(const QStringList &ntpServers, bool ntpEnabled)
1414 {
1515 int ret = 0;
1616@@ -227,7 +223,7 @@ int ClockHelper::tzreset()
pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch+43−33
@@ -1,4 +1,4 @@
1−From d653bc84c8aed33072237ed858194a8a73b6a2e7 Mon Sep 17 00:00:00 2001
1+From 65ed69a38a9ffee21f0eb36de1f7a3f152111cad Mon Sep 17 00:00:00 2001
22From: Tom Hall <tahall256@protonmail.ch>
33Date: Mon, 7 Sep 2020 18:09:52 +0100
44Subject: [PATCH] startkde
@@ -7,27 +7,27 @@ Subject: [PATCH] startkde
77 startkde/plasma-session/startup.cpp | 2 +-
88 startkde/startplasma-waylandsession.cpp | 2 +-
99 startkde/startplasma-x11.cpp | 2 +-
10− startkde/startplasma.cpp | 22 +++++++++-------------
11− 4 files changed, 12 insertions(+), 16 deletions(-)
10+ startkde/startplasma.cpp | 16 ++++++++--------
11+ 4 files changed, 11 insertions(+), 11 deletions(-)
1212
1313diff --git a/startkde/plasma-session/startup.cpp b/startkde/plasma-session/startup.cpp
14−index 89cc144ba..8ca9e81d2 100644
14+index c3e77d4..88cb0e9 100644
1515--- a/startkde/plasma-session/startup.cpp
1616+++ b/startkde/plasma-session/startup.cpp
17−@@ -211,7 +211,7 @@ Startup::Startup(QObject *parent):
17+@@ -223,7 +223,7 @@ Startup::Startup(QObject *parent)
1818 upAndRunning(QStringLiteral("ksmserver"));
1919 const AutoStart autostart;
2020
2121- QProcess::execute(QStringLiteral(CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/start_kdeinit_wrapper"), QStringList());
2222+ QProcess::execute(QStringLiteral(NIXPKGS_START_KDEINIT_WRAPPER), QStringList());
2323
24− KJob* phase1;
24+ KJob *phase1;
2525 QProcessEnvironment kdedProcessEnv;
2626diff --git a/startkde/startplasma-waylandsession.cpp b/startkde/startplasma-waylandsession.cpp
27−index f59654d18..5e3a93db0 100644
27+index 4fbfe18..6ba916c 100644
2828--- a/startkde/startplasma-waylandsession.cpp
2929+++ b/startkde/startplasma-waylandsession.cpp
30−@@ -61,7 +61,7 @@ int main(int argc, char** argv)
30+@@ -65,7 +65,7 @@ int main(int argc, char **argv)
3131 waitForKonqi();
3232 out << "startplasma-waylandsession: Shutting down...\n";
3333
@@ -37,10 +37,10 @@ index f59654d18..5e3a93db0 100644
3737 cleanupX11();
3838 out << "startplasma-waylandsession: Done.\n";
3939diff --git a/startkde/startplasma-x11.cpp b/startkde/startplasma-x11.cpp
40−index ae1c4d101..0df24b5be 100644
40+index 4ddf9f8..e0e59cd 100644
4141--- a/startkde/startplasma-x11.cpp
4242+++ b/startkde/startplasma-x11.cpp
43−@@ -110,7 +110,7 @@ int main(int argc, char** argv)
43+@@ -110,7 +110,7 @@ int main(int argc, char **argv)
4444
4545 out << "startkde: Shutting down...\n";
4646
@@ -50,10 +50,10 @@ index ae1c4d101..0df24b5be 100644
5050 cleanupPlasmaEnvironment();
5151 cleanupX11();
5252diff --git a/startkde/startplasma.cpp b/startkde/startplasma.cpp
53−index a055d5635..62afb1513 100644
53+index 9809197..1250e3e 100644
5454--- a/startkde/startplasma.cpp
5555+++ b/startkde/startplasma.cpp
56−@@ -41,7 +41,7 @@ QTextStream out(stderr);
56+@@ -46,7 +46,7 @@ QTextStream out(stderr);
5757 void messageBox(const QString &text)
5858 {
5959 out << text;
@@ -61,46 +61,56 @@ index a055d5635..62afb1513 100644
6161+ runSync(QStringLiteral(NIXPKGS_XMESSAGE), {QStringLiteral("-geometry"), QStringLiteral("500x100"), text});
6262 }
6363
64− QStringList allServices(const QLatin1String& prefix)
65−@@ -262,15 +262,15 @@ void setupX11()
66− // If the user has overwritten fonts, the cursor font may be different now
67− // so don't move this up.
64+ QStringList allServices(const QLatin1String &prefix)
65+@@ -267,8 +267,8 @@ void setupX11()
66+ // If the user has overwritten fonts, the cursor font may be different now
67+ // so don't move this up.
6868
6969- runSync(QStringLiteral("xsetroot"), {QStringLiteral("-cursor_name"), QStringLiteral("left_ptr")});
70−- runSync(QStringLiteral("xprop"), {QStringLiteral("-root"), QStringLiteral("-f"), QStringLiteral("KDE_FULL_SESSION"), QStringLiteral("8t"), QStringLiteral("-set"), QStringLiteral("KDE_FULL_SESSION"), QStringLiteral("true")});
71−- runSync(QStringLiteral("xprop"), {QStringLiteral("-root"), QStringLiteral("-f"), QStringLiteral("KDE_SESSION_VERSION"), QStringLiteral("32c"), QStringLiteral("-set"), QStringLiteral("KDE_SESSION_VERSION"), QStringLiteral("5")});
70+- runSync(QStringLiteral("xprop"),
7271+ runSync(QStringLiteral(NIXPKGS_XSETROOT), {QStringLiteral("-cursor_name"), QStringLiteral("left_ptr")});
73−+ runSync(QStringLiteral(NIXPKGS_XPROP), {QStringLiteral("-root"), QStringLiteral("-f"), QStringLiteral("KDE_FULL_SESSION"), QStringLiteral("8t"), QStringLiteral("-set"), QStringLiteral("KDE_FULL_SESSION"), QStringLiteral("true")});
74−+ runSync(QStringLiteral(NIXPKGS_XPROP), {QStringLiteral("-root"), QStringLiteral("-f"), QStringLiteral("KDE_SESSION_VERSION"), QStringLiteral("32c"), QStringLiteral("-set"), QStringLiteral("KDE_SESSION_VERSION"), QStringLiteral("5")});
75− }
72++ runSync(QStringLiteral(NIXPKGS_XPROP),
73+ {QStringLiteral("-root"),
74+ QStringLiteral("-f"),
75+ QStringLiteral("KDE_FULL_SESSION"),
76+@@ -276,7 +276,7 @@ void setupX11()
77+ QStringLiteral("-set"),
78+ QStringLiteral("KDE_FULL_SESSION"),
79+ QStringLiteral("true")});
80+- runSync(QStringLiteral("xprop"),
81++ runSync(QStringLiteral(NIXPKGS_XPROP),
82+ {QStringLiteral("-root"),
83+ QStringLiteral("-f"),
84+ QStringLiteral("KDE_SESSION_VERSION"),
85+@@ -288,8 +288,8 @@ void setupX11()
7686
7787 void cleanupX11()
7888 {
79−- runSync(QStringLiteral("xprop"), { QStringLiteral("-root"), QStringLiteral("-remove"), QStringLiteral("KDE_FULL_SESSION") });
80−- runSync(QStringLiteral("xprop"), { QStringLiteral("-root"), QStringLiteral("-remove"), QStringLiteral("KDE_SESSION_VERSION") });
81−+ runSync(QStringLiteral(NIXPKGS_XPROP), { QStringLiteral("-root"), QStringLiteral("-remove"), QStringLiteral("KDE_FULL_SESSION") });
82−+ runSync(QStringLiteral(NIXPKGS_XPROP), { QStringLiteral("-root"), QStringLiteral("-remove"), QStringLiteral("KDE_SESSION_VERSION") });
89+- runSync(QStringLiteral("xprop"), {QStringLiteral("-root"), QStringLiteral("-remove"), QStringLiteral("KDE_FULL_SESSION")});
90+- runSync(QStringLiteral("xprop"), {QStringLiteral("-root"), QStringLiteral("-remove"), QStringLiteral("KDE_SESSION_VERSION")});
91++ runSync(QStringLiteral(NIXPKGS_XPROP), {QStringLiteral("-root"), QStringLiteral("-remove"), QStringLiteral("KDE_FULL_SESSION")});
92++ runSync(QStringLiteral(NIXPKGS_XPROP), {QStringLiteral("-root"), QStringLiteral("-remove"), QStringLiteral("KDE_SESSION_VERSION")});
8393 }
8494
8595 // TODO: Check if Necessary
86−@@ -306,7 +302,7 @@ void setupFontDpi()
87− //TODO port to c++?
96+@@ -321,7 +321,7 @@ void setupFontDpi()
97+ // TODO port to c++?
8898 const QByteArray input = "Xft.dpi: " + QByteArray::number(fontsCfg.readEntry("forceFontDPI", 0));
8999 QProcess p;
90−- p.start(QStringLiteral("xrdb"), { QStringLiteral("-quiet"), QStringLiteral("-merge"), QStringLiteral("-nocpp") });
91−+ p.start(QStringLiteral(NIXPKGS_XRDB), { QStringLiteral("-quiet"), QStringLiteral("-merge"), QStringLiteral("-nocpp") });
100+- p.start(QStringLiteral("xrdb"), {QStringLiteral("-quiet"), QStringLiteral("-merge"), QStringLiteral("-nocpp")});
101++ p.start(QStringLiteral(NIXPKGS_XRDB), {QStringLiteral("-quiet"), QStringLiteral("-merge"), QStringLiteral("-nocpp")});
92102 p.setProcessChannelMode(QProcess::ForwardedChannels);
93103 p.write(input);
94104 p.closeWriteChannel();
95−@@ -328,7 +324,7 @@ QProcess* setupKSplash()
105+@@ -343,7 +343,7 @@ QProcess *setupKSplash()
96106 KConfigGroup ksplashCfg = cfg.group("KSplash");
97107 if (ksplashCfg.readEntry("Engine", QStringLiteral("KSplashQML")) == QLatin1String("KSplashQML")) {
98108 p = new QProcess;
99−- p->start(QStringLiteral("ksplashqml"), { ksplashCfg.readEntry("Theme", QStringLiteral("Breeze")) });
100−+ p->start(QStringLiteral(CMAKE_INSTALL_FULL_BINDIR "/ksplashqml"), { ksplashCfg.readEntry("Theme", QStringLiteral("Breeze")) });
109+- p->start(QStringLiteral("ksplashqml"), {ksplashCfg.readEntry("Theme", QStringLiteral("Breeze"))});
110++ p->start(QStringLiteral(CMAKE_INSTALL_FULL_BINDIR "/ksplashqml"), {ksplashCfg.readEntry("Theme", QStringLiteral("Breeze"))});
101111 }
102112 }
103113 return p;
104114--
105−2.28.0
115+2.30.0
106116
pkgs/desktops/plasma-5/plasma-workspace/0002-absolute-wallpaper-install-dir.patch+6−6
@@ -1,23 +1,23 @@
1−From f43f15870f14b8fa17ba0765c0d7e2b225fafc3f Mon Sep 17 00:00:00 2001
1+From 914d2ec5e669ecf8771cc1308028990f733fb8cc Mon Sep 17 00:00:00 2001
22From: Thomas Tuegel <ttuegel@mailbox.org>
33Date: Wed, 5 Feb 2020 05:03:11 -0600
4−Subject: [PATCH 2/2] absolute-wallpaper-install-dir
4+Subject: [PATCH] absolute-wallpaper-install-dir
55
66---
77 sddm-theme/theme.conf.cmake | 2 +-
88 1 file changed, 1 insertion(+), 1 deletion(-)
99
1010diff --git a/sddm-theme/theme.conf.cmake b/sddm-theme/theme.conf.cmake
11−index 8494a5c8a..f723c1e1b 100644
11+index a560da3..f723c1e 100644
1212--- a/sddm-theme/theme.conf.cmake
1313+++ b/sddm-theme/theme.conf.cmake
1414@@ -4,5 +4,5 @@ logo=${KDE_INSTALL_FULL_DATADIR}/sddm/themes/breeze/default-logo.svg
1515 type=image
1616 color=#1d99f3
1717 fontSize=10
18−-background=${KDE_INSTALL_FULL_WALLPAPERDIR}/Next/contents/images/5120x2880.jpg
19−+background=${NIXPKGS_BREEZE_WALLPAPERS}/Next/contents/images/5120x2880.jpg
18+-background=${KDE_INSTALL_FULL_WALLPAPERDIR}/Next/contents/images/5120x2880.png
19++background=${NIXPKGS_BREEZE_WALLPAPERS}/Next/contents/images/5120x2880.png
2020 needsFullUserModel=false
2121--
22−2.25.1
22+2.30.0
2323
pkgs/desktops/plasma-5/plasma-workspace/default.nix+4
@@ -16,6 +16,8 @@
1616
1717 qtgraphicaleffects, qtquickcontrols, qtquickcontrols2, qtscript, qttools,
1818 qtwayland, qtx11extras, qqc2-desktop-style,
19+
20+ pipewire, libdrm
1921}:
2022
2123let inherit (lib) getBin getLib; in
@@ -36,6 +38,8 @@ mkDerivation {
3638
3739 qtgraphicaleffects qtquickcontrols qtquickcontrols2 qtscript qtwayland
3840 qtx11extras qqc2-desktop-style
41+
42+ pipewire libdrm
3943 ];
4044 propagatedUserEnvPkgs = [ qtgraphicaleffects ];
4145 outputs = [ "out" "dev" ];
pkgs/desktops/plasma-5/srcs.nix+220−196
@@ -4,395 +4,419 @@
44
55{
66 bluedevil = {
7− version = "5.20.5";
7+ version = "5.21.1";
88 src = fetchurl {
9− url = "${mirror}/stable/plasma/5.20.5/bluedevil-5.20.5.tar.xz";
10− sha256 = "0bpbvfd6m3ddax484p33a1chvf9mf2mi61cli0vacsan7j84xpmk";
11− name = "bluedevil-5.20.5.tar.xz";
9+ url = "${mirror}/stable/plasma/5.21.1/bluedevil-5.21.1.tar.xz";
10+ sha256 = "0b69gacp5cbl32m92k2j36cqq38lpxlybx3wnzj1148j6wvfbajn";
11+ name = "bluedevil-5.21.1.tar.xz";
1212 };
1313 };
1414 breeze = {
15− version = "5.20.5";
15+ version = "5.21.1";
1616 src = fetchurl {
17− url = "${mirror}/stable/plasma/5.20.5/breeze-5.20.5.tar.xz";
18− sha256 = "01zm5hcal6flihd89wn70zi363cmcglfvnc2q6x97lq89silaf6l";
19− name = "breeze-5.20.5.tar.xz";
17+ url = "${mirror}/stable/plasma/5.21.1/breeze-5.21.1.tar.xz";
18+ sha256 = "1xdpsc4nf0556x9iimszi287jjks8qpqi45n81iccbcz91i5bnb5";
19+ name = "breeze-5.21.1.tar.xz";
2020 };
2121 };
2222 breeze-grub = {
23− version = "5.20.5";
23+ version = "5.21.1";
2424 src = fetchurl {
25− url = "${mirror}/stable/plasma/5.20.5/breeze-grub-5.20.5.tar.xz";
26− sha256 = "17g2jac96sj6pfacmyi6vvn74lfi9yhmigprcm2pwqg9z093n1m2";
27− name = "breeze-grub-5.20.5.tar.xz";
25+ url = "${mirror}/stable/plasma/5.21.1/breeze-grub-5.21.1.tar.xz";
26+ sha256 = "0w0kkdqliliy72f41xps0a2mr0rf4kn08immichcvrm47r9bjr37";
27+ name = "breeze-grub-5.21.1.tar.xz";
2828 };
2929 };
3030 breeze-gtk = {
31− version = "5.20.5";
31+ version = "5.21.1";
3232 src = fetchurl {
33− url = "${mirror}/stable/plasma/5.20.5/breeze-gtk-5.20.5.tar.xz";
34− sha256 = "1jknfswjcd4abbf249i3gclip4m4v8bp9b5x050zafyjkdcwxd5l";
35− name = "breeze-gtk-5.20.5.tar.xz";
33+ url = "${mirror}/stable/plasma/5.21.1/breeze-gtk-5.21.1.tar.xz";
34+ sha256 = "14xq2796n8927362851kffpvxxscw82sm5j9ghsb24hr860zcdk7";
35+ name = "breeze-gtk-5.21.1.tar.xz";
3636 };
3737 };
3838 breeze-plymouth = {
39− version = "5.20.5";
39+ version = "5.21.1";
4040 src = fetchurl {
41− url = "${mirror}/stable/plasma/5.20.5/breeze-plymouth-5.20.5.tar.xz";
42− sha256 = "0yiqqwms0qrnbxqb8nwmgssrp1f92jwjg8rfzapaq5jxdycl1d9m";
43− name = "breeze-plymouth-5.20.5.tar.xz";
41+ url = "${mirror}/stable/plasma/5.21.1/breeze-plymouth-5.21.1.tar.xz";
42+ sha256 = "0xgxmh5gnjz8r5h97arsb1ddvizfpajw6zfwrkrsiw0kxkb0ppn9";
43+ name = "breeze-plymouth-5.21.1.tar.xz";
4444 };
4545 };
4646 discover = {
47− version = "5.20.5";
47+ version = "5.21.1";
4848 src = fetchurl {
49− url = "${mirror}/stable/plasma/5.20.5/discover-5.20.5.tar.xz";
50− sha256 = "08dmc8rvbfi1zyk9if588h6948xqcqm9jxdp26q84mzq517x9fn5";
51− name = "discover-5.20.5.tar.xz";
49+ url = "${mirror}/stable/plasma/5.21.1/discover-5.21.1.tar.xz";
50+ sha256 = "1a1wmils7ijkvn1x5gqrdg3rv7mcnh0gaaig9ca555qqc2ab0ivl";
51+ name = "discover-5.21.1.tar.xz";
5252 };
5353 };
5454 drkonqi = {
55− version = "5.20.5";
55+ version = "5.21.1";
5656 src = fetchurl {
57− url = "${mirror}/stable/plasma/5.20.5/drkonqi-5.20.5.tar.xz";
58− sha256 = "1rl212qmmikbnkyryibpp6gxh4jpklynhgr45ym5gcn3903i3vh9";
59− name = "drkonqi-5.20.5.tar.xz";
57+ url = "${mirror}/stable/plasma/5.21.1/drkonqi-5.21.1.tar.xz";
58+ sha256 = "1iqk9mg5bi5yn9ccalwva8yshamrmsx4kfww8imxv8mhmq9p4mib";
59+ name = "drkonqi-5.21.1.tar.xz";
6060 };
6161 };
6262 kactivitymanagerd = {
63− version = "5.20.5";
63+ version = "5.21.1";
6464 src = fetchurl {
65− url = "${mirror}/stable/plasma/5.20.5/kactivitymanagerd-5.20.5.tar.xz";
66− sha256 = "1jzss3waq8jjzbs3rrxxk9dmr974pj5ryw4rdj8bpkc451wc4068";
67− name = "kactivitymanagerd-5.20.5.tar.xz";
65+ url = "${mirror}/stable/plasma/5.21.1/kactivitymanagerd-5.21.1.tar.xz";
66+ sha256 = "1wzwkyylk4qsiab7jzlw62mfv5r3pxdk3vqyydca112836nhbdj3";
67+ name = "kactivitymanagerd-5.21.1.tar.xz";
6868 };
6969 };
7070 kde-cli-tools = {
71− version = "5.20.5";
71+ version = "5.21.1";
7272 src = fetchurl {
73− url = "${mirror}/stable/plasma/5.20.5/kde-cli-tools-5.20.5.tar.xz";
74− sha256 = "0z32fwc9l8c3xfy1l7v0i26ay8icnxqwrnxz6h8qgjlv6p8b4h04";
75− name = "kde-cli-tools-5.20.5.tar.xz";
73+ url = "${mirror}/stable/plasma/5.21.1/kde-cli-tools-5.21.1.tar.xz";
74+ sha256 = "0835323rbb3akhzdnjxb2myfbfz0wh3c5j1jih4l9zqr0ixx9lb3";
75+ name = "kde-cli-tools-5.21.1.tar.xz";
7676 };
7777 };
7878 kdecoration = {
79− version = "5.20.5";
79+ version = "5.21.1";
8080 src = fetchurl {
81− url = "${mirror}/stable/plasma/5.20.5/kdecoration-5.20.5.tar.xz";
82− sha256 = "1kc166f2gqgspsnvxyk8k3k3mmd1ndhgr1dyjzknqdys32dkm5vf";
83− name = "kdecoration-5.20.5.tar.xz";
81+ url = "${mirror}/stable/plasma/5.21.1/kdecoration-5.21.1.tar.xz";
82+ sha256 = "1qy848hvqiar3vj7cz0srszybqj9sf5lfip8ws0fwllqgsa5v505";
83+ name = "kdecoration-5.21.1.tar.xz";
8484 };
8585 };
8686 kde-gtk-config = {
87− version = "5.20.5";
87+ version = "5.21.1";
8888 src = fetchurl {
89− url = "${mirror}/stable/plasma/5.20.5/kde-gtk-config-5.20.5.tar.xz";
90− sha256 = "1f3fvr201wr7jdh1hg8ff7yis7hnv7653hvx0531hx1x2hfdva1r";
91− name = "kde-gtk-config-5.20.5.tar.xz";
89+ url = "${mirror}/stable/plasma/5.21.1/kde-gtk-config-5.21.1.tar.xz";
90+ sha256 = "0nq741x9flnyzhgj5h4r1774b11211ab0lcclhlji9ch7kqxs8dc";
91+ name = "kde-gtk-config-5.21.1.tar.xz";
9292 };
9393 };
9494 kdeplasma-addons = {
95− version = "5.20.5";
95+ version = "5.21.1";
9696 src = fetchurl {
97− url = "${mirror}/stable/plasma/5.20.5/kdeplasma-addons-5.20.5.tar.xz";
98− sha256 = "1sypmn72fp6l57px3pq9ivzj2r2l3k9vy5006idnfgblzahvpi2n";
99− name = "kdeplasma-addons-5.20.5.tar.xz";
97+ url = "${mirror}/stable/plasma/5.21.1/kdeplasma-addons-5.21.1.tar.xz";
98+ sha256 = "0xpki1kabdm4fwifx0xsb0isig9dnzks4zfglrkg9g0nafahsbf8";
99+ name = "kdeplasma-addons-5.21.1.tar.xz";
100100 };
101101 };
102102 kgamma5 = {
103− version = "5.20.5";
103+ version = "5.21.1";
104104 src = fetchurl {
105− url = "${mirror}/stable/plasma/5.20.5/kgamma5-5.20.5.tar.xz";
106− sha256 = "1gy0pgsk3xi129y8h78lcif60ajs3y5fxzj1pl7mn6g72f7mwxld";
107− name = "kgamma5-5.20.5.tar.xz";
105+ url = "${mirror}/stable/plasma/5.21.1/kgamma5-5.21.1.tar.xz";
106+ sha256 = "1316l73jj4b41mrsk1vba3g4mdj0q6hxazqqkvzrcinzwr34p3l2";
107+ name = "kgamma5-5.21.1.tar.xz";
108108 };
109109 };
110110 khotkeys = {
111− version = "5.20.5";
111+ version = "5.21.1";
112112 src = fetchurl {
113− url = "${mirror}/stable/plasma/5.20.5/khotkeys-5.20.5.tar.xz";
114− sha256 = "1iw8rxdl9q45jqsnmqdm1lkymzkyxkrfgch51kxfj34vd4mi66h8";
115− name = "khotkeys-5.20.5.tar.xz";
113+ url = "${mirror}/stable/plasma/5.21.1/khotkeys-5.21.1.tar.xz";
114+ sha256 = "1kp6s1qgzz6j5z4widy5hqnwyh90vw3adf47jk54msdzlh2ak0q7";
115+ name = "khotkeys-5.21.1.tar.xz";
116116 };
117117 };
118118 kinfocenter = {
119− version = "5.20.5";
119+ version = "5.21.1";
120120 src = fetchurl {
121− url = "${mirror}/stable/plasma/5.20.5/kinfocenter-5.20.5.tar.xz";
122− sha256 = "0k3vvfwrfwmmicw8p81fpqljvmj3n8342avavc49ajmnygls7ssm";
123− name = "kinfocenter-5.20.5.tar.xz";
121+ url = "${mirror}/stable/plasma/5.21.1/kinfocenter-5.21.1.tar.xz";
122+ sha256 = "1fy5985f4zf9v656dfb30c95pkbasx2302qamdxpfhrl465nqn5d";
123+ name = "kinfocenter-5.21.1.tar.xz";
124124 };
125125 };
126126 kmenuedit = {
127− version = "5.20.5";
127+ version = "5.21.1";
128128 src = fetchurl {
129− url = "${mirror}/stable/plasma/5.20.5/kmenuedit-5.20.5.tar.xz";
130− sha256 = "0apmhglw74ppps52fhspjdsiy19b219lf68aj8jlpiiqcn80mggf";
131− name = "kmenuedit-5.20.5.tar.xz";
129+ url = "${mirror}/stable/plasma/5.21.1/kmenuedit-5.21.1.tar.xz";
130+ sha256 = "1cksy6fn9mx96jnlglzmg0n9817vmypl1lwxdyxncxzw275k0c05";
131+ name = "kmenuedit-5.21.1.tar.xz";
132132 };
133133 };
134134 kscreen = {
135− version = "5.20.5";
135+ version = "5.21.1";
136136 src = fetchurl {
137− url = "${mirror}/stable/plasma/5.20.5/kscreen-5.20.5.tar.xz";
138− sha256 = "1njjkrdgdd6g8avf7ik9fd7j9g4zdbjghli7svcfz2z8h6na626y";
139− name = "kscreen-5.20.5.tar.xz";
137+ url = "${mirror}/stable/plasma/5.21.1/kscreen-5.21.1.tar.xz";
138+ sha256 = "0w199x0ig7vv7ki17v5paipw1jkkiavj6296zmpbnxn88n6i8jw3";
139+ name = "kscreen-5.21.1.tar.xz";
140140 };
141141 };
142142 kscreenlocker = {
143− version = "5.20.5";
143+ version = "5.21.1";
144144 src = fetchurl {
145− url = "${mirror}/stable/plasma/5.20.5/kscreenlocker-5.20.5.tar.xz";
146− sha256 = "07y0lhwh4pc5rsdfr5yqb645v37ya97vh3dmy2riw9908hiyybw0";
147− name = "kscreenlocker-5.20.5.tar.xz";
145+ url = "${mirror}/stable/plasma/5.21.1/kscreenlocker-5.21.1.tar.xz";
146+ sha256 = "1qpmysv7cby0bir4qyr1if3zc1ky43fyzhhxfqc69mcx803iabyv";
147+ name = "kscreenlocker-5.21.1.tar.xz";
148148 };
149149 };
150150 ksshaskpass = {
151− version = "5.20.5";
151+ version = "5.21.1";
152152 src = fetchurl {
153− url = "${mirror}/stable/plasma/5.20.5/ksshaskpass-5.20.5.tar.xz";
154− sha256 = "1xk55ampbrz56pl739m6r150qcsjq0nw2sxxkpqykgwjh275y4ry";
155− name = "ksshaskpass-5.20.5.tar.xz";
153+ url = "${mirror}/stable/plasma/5.21.1/ksshaskpass-5.21.1.tar.xz";
154+ sha256 = "11avkc3qqskq8pkdsq1jikpdh9izghv3algbf67lwl236s8mmdzk";
155+ name = "ksshaskpass-5.21.1.tar.xz";
156156 };
157157 };
158158 ksysguard = {
159− version = "5.20.5";
159+ version = "5.21.1";
160160 src = fetchurl {
161− url = "${mirror}/stable/plasma/5.20.5/ksysguard-5.20.5.tar.xz";
162− sha256 = "0ddb3m6rygjisv31bc722vxzyb2q14940szfzijcv48z5ixj5x9j";
163− name = "ksysguard-5.20.5.tar.xz";
161+ url = "${mirror}/stable/plasma/5.21.1/ksysguard-5.21.1.tar.xz";
162+ sha256 = "1fnccjs04b3pvdb8wwmw03g8x4h7zw5q4pxh0gfy7w705w3wkxwm";
163+ name = "ksysguard-5.21.1.tar.xz";
164164 };
165165 };
166166 kwallet-pam = {
167− version = "5.20.5";
167+ version = "5.21.1";
168168 src = fetchurl {
169− url = "${mirror}/stable/plasma/5.20.5/kwallet-pam-5.20.5.tar.xz";
170− sha256 = "1wn1zm8bfxxsjvx4rbds60v9ckizj55znpq477vnzrh2xfx13rjk";
171− name = "kwallet-pam-5.20.5.tar.xz";
169+ url = "${mirror}/stable/plasma/5.21.1/kwallet-pam-5.21.1.tar.xz";
170+ sha256 = "0ybdyalppfypvq26j6lxjfz2zm41kw1nlsyh857z06f0s65257zb";
171+ name = "kwallet-pam-5.21.1.tar.xz";
172172 };
173173 };
174174 kwayland-integration = {
175− version = "5.20.5";
175+ version = "5.21.1";
176176 src = fetchurl {
177− url = "${mirror}/stable/plasma/5.20.5/kwayland-integration-5.20.5.tar.xz";
178− sha256 = "0rqzq851apw1p4c7salk7rcygjdw7ra0x95xw57vh68w19kn9wrk";
179− name = "kwayland-integration-5.20.5.tar.xz";
177+ url = "${mirror}/stable/plasma/5.21.1/kwayland-integration-5.21.1.tar.xz";
178+ sha256 = "0s0gljcfv3sjh63d8bcjmzqgvxrqzjbxj8dsyi68w187dxzca8b4";
179+ name = "kwayland-integration-5.21.1.tar.xz";
180180 };
181181 };
182182 kwayland-server = {
183− version = "5.20.5";
183+ version = "5.21.1";
184184 src = fetchurl {
185− url = "${mirror}/stable/plasma/5.20.5/kwayland-server-5.20.5.tar.xz";
186− sha256 = "0ajxjj2cbrg6rpry3r48q3zhxxkr09498j5in0v1jwijp83n9wz0";
187− name = "kwayland-server-5.20.5.tar.xz";
185+ url = "${mirror}/stable/plasma/5.21.1/kwayland-server-5.21.1.tar.xz";
186+ sha256 = "00d14d8q3jw1h2yyn49wpxndwl5v1clxnialrqgkyli6qkwkf29m";
187+ name = "kwayland-server-5.21.1.tar.xz";
188188 };
189189 };
190190 kwin = {
191− version = "5.20.5";
191+ version = "5.21.1";
192192 src = fetchurl {
193− url = "${mirror}/stable/plasma/5.20.5/kwin-5.20.5.tar.xz";
194− sha256 = "0kiq46gdvfv2811125kw1ncnk1pmpnqkvrz7p3lry72sjd1ja57c";
195− name = "kwin-5.20.5.tar.xz";
193+ url = "${mirror}/stable/plasma/5.21.1/kwin-5.21.1.tar.xz";
194+ sha256 = "035w7b9cfg3hv9kw3rab1y9xw4r51psz7csx7nki05nwzx84812s";
195+ name = "kwin-5.21.1.tar.xz";
196196 };
197197 };
198198 kwrited = {
199− version = "5.20.5";
199+ version = "5.21.1";
200200 src = fetchurl {
201− url = "${mirror}/stable/plasma/5.20.5/kwrited-5.20.5.tar.xz";
202− sha256 = "1h0vbb0bz4r26g4yf88jfzkbi8xbyf44c2y9nmlrmr5lws4bpcmz";
203− name = "kwrited-5.20.5.tar.xz";
201+ url = "${mirror}/stable/plasma/5.21.1/kwrited-5.21.1.tar.xz";
202+ sha256 = "15xsjkxqx48wpzjawv4qpbgh8a48sfrmldgcwhn1cscq8s0marh3";
203+ name = "kwrited-5.21.1.tar.xz";
204204 };
205205 };
206206 libkscreen = {
207− version = "5.20.5";
207+ version = "5.21.1";
208208 src = fetchurl {
209− url = "${mirror}/stable/plasma/5.20.5/libkscreen-5.20.5.tar.xz";
210− sha256 = "0641kk7s4xy5y94rn6xzjnrp4sbl7yn9w9qzlw4925858pgrr9qv";
211− name = "libkscreen-5.20.5.tar.xz";
209+ url = "${mirror}/stable/plasma/5.21.1/libkscreen-5.21.1.tar.xz";
210+ sha256 = "0hrgmnvyv5v5d15wj1gynyzk83jj8p9cjhz0q2l41n2rh81rw52z";
211+ name = "libkscreen-5.21.1.tar.xz";
212212 };
213213 };
214214 libksysguard = {
215− version = "5.20.5";
215+ version = "5.21.1";
216216 src = fetchurl {
217− url = "${mirror}/stable/plasma/5.20.5/libksysguard-5.20.5.tar.xz";
218− sha256 = "0v2x7sl5gg8a9i1cwx8prv03pcls4q3wfxxs5qs6g5ami1f679d8";
219− name = "libksysguard-5.20.5.tar.xz";
217+ url = "${mirror}/stable/plasma/5.21.1/libksysguard-5.21.1.tar.xz";
218+ sha256 = "14zafjp0ikqgkdr8a04idj08xami2xn8cw3scgwfcix3y7mv0ip8";
219+ name = "libksysguard-5.21.1.tar.xz";
220220 };
221221 };
222222 milou = {
223− version = "5.20.5";
223+ version = "5.21.1";
224224 src = fetchurl {
225− url = "${mirror}/stable/plasma/5.20.5/milou-5.20.5.tar.xz";
226− sha256 = "1hmpdj2zi6nidm6058a6kjgzij8qy9xihv20hi2dhk0f8ys42k3h";
227− name = "milou-5.20.5.tar.xz";
225+ url = "${mirror}/stable/plasma/5.21.1/milou-5.21.1.tar.xz";
226+ sha256 = "095mk7592r4fwkw5f3p8mgc0p2wg8wi347qx8s1yblwjcml86a5f";
227+ name = "milou-5.21.1.tar.xz";
228228 };
229229 };
230230 oxygen = {
231− version = "5.20.5";
231+ version = "5.21.1";
232232 src = fetchurl {
233− url = "${mirror}/stable/plasma/5.20.5/oxygen-5.20.5.tar.xz";
234− sha256 = "166jk8ix0dnv92svymaxjwbc08k6q8nag9xr2dc033x5lr2l59qr";
235− name = "oxygen-5.20.5.tar.xz";
233+ url = "${mirror}/stable/plasma/5.21.1/oxygen-5.21.1.tar.xz";
234+ sha256 = "1s5bzdj5l515g4biarrzmkc7vpi0hqbk75rjjkr11fsvkghhphwg";
235+ name = "oxygen-5.21.1.tar.xz";
236236 };
237237 };
238238 plasma-browser-integration = {
239− version = "5.20.5";
239+ version = "5.21.1";
240240 src = fetchurl {
241− url = "${mirror}/stable/plasma/5.20.5/plasma-browser-integration-5.20.5.tar.xz";
242− sha256 = "03zzmzdlc5a3nrx6izb66s7l3cmangkfjda2mf17g2097rrnb9n2";
243− name = "plasma-browser-integration-5.20.5.tar.xz";
241+ url = "${mirror}/stable/plasma/5.21.1/plasma-browser-integration-5.21.1.tar.xz";
242+ sha256 = "0m99il47932ybsdp5z7apgb9l991wdhbrm3sninflcrg6ag9myp3";
243+ name = "plasma-browser-integration-5.21.1.tar.xz";
244244 };
245245 };
246246 plasma-desktop = {
247− version = "5.20.5";
247+ version = "5.21.1";
248248 src = fetchurl {
249− url = "${mirror}/stable/plasma/5.20.5/plasma-desktop-5.20.5.tar.xz";
250− sha256 = "1fc74zgxkp65pj8p58prd5rq7nqspjfcgr70say2imagyj9nwrdx";
251− name = "plasma-desktop-5.20.5.tar.xz";
249+ url = "${mirror}/stable/plasma/5.21.1/plasma-desktop-5.21.1.tar.xz";
250+ sha256 = "1ligy1ps3ajrsg6lvb9ailirgc52sswbknp0zn53n8gka176c555";
251+ name = "plasma-desktop-5.21.1.tar.xz";
252252 };
253253 };
254254 plasma-disks = {
255− version = "5.20.5";
255+ version = "5.21.1";
256256 src = fetchurl {
257− url = "${mirror}/stable/plasma/5.20.5/plasma-disks-5.20.5.tar.xz";
258− sha256 = "0bcwf3g2vy2gf0igg0dyl9x5qc0xx0d5z05n4mi7asg5acl596r1";
259− name = "plasma-disks-5.20.5.tar.xz";
257+ url = "${mirror}/stable/plasma/5.21.1/plasma-disks-5.21.1.tar.xz";
258+ sha256 = "0py662wlqbx5408rjbxnsa5ccnsaqx2wfy84fvjs4vl73wqmi2nl";
259+ name = "plasma-disks-5.21.1.tar.xz";
260+ };
261+ };
262+ plasma-firewall = {
263+ version = "5.21.1";
264+ src = fetchurl {
265+ url = "${mirror}/stable/plasma/5.21.1/plasma-firewall-5.21.1.tar.xz";
266+ sha256 = "19q7w9m1vj7gs5d3prraciw00iy0ywjfxlpjhxjiq0s0s0icf1hb";
267+ name = "plasma-firewall-5.21.1.tar.xz";
260268 };
261269 };
262270 plasma-integration = {
263− version = "5.20.5";
271+ version = "5.21.1";
264272 src = fetchurl {
265− url = "${mirror}/stable/plasma/5.20.5/plasma-integration-5.20.5.tar.xz";
266− sha256 = "1wydjnmryf2kvfgg6m9kafa5waimccqr531qrq3nisdjc5p1w9x8";
267− name = "plasma-integration-5.20.5.tar.xz";
273+ url = "${mirror}/stable/plasma/5.21.1/plasma-integration-5.21.1.tar.xz";
274+ sha256 = "0i51grmjkf9k6z1aq4j69wqdwdnn4rcryvi7b9lfpqaz1phsqhq7";
275+ name = "plasma-integration-5.21.1.tar.xz";
268276 };
269277 };
270278 plasma-nano = {
271− version = "5.20.5";
279+ version = "5.21.1";
272280 src = fetchurl {
273− url = "${mirror}/stable/plasma/5.20.5/plasma-nano-5.20.5.tar.xz";
274− sha256 = "0h276i1dxbiziw258wf6az9mnysp3xxfh7nlxv0g2w1vfnhm23v5";
275− name = "plasma-nano-5.20.5.tar.xz";
281+ url = "${mirror}/stable/plasma/5.21.1/plasma-nano-5.21.1.tar.xz";
282+ sha256 = "0qz14rmnlpk8mc1lgk854zlp032znc27j0wg6a7zsljikbx90dzm";
283+ name = "plasma-nano-5.21.1.tar.xz";
276284 };
277285 };
278286 plasma-nm = {
279− version = "5.20.5";
287+ version = "5.21.1";
280288 src = fetchurl {
281− url = "${mirror}/stable/plasma/5.20.5/plasma-nm-5.20.5.tar.xz";
282− sha256 = "060f32adr0wlv2bs9swjyxcil7n74cnk48j8b8984wwhk6zz53a6";
283− name = "plasma-nm-5.20.5.tar.xz";
289+ url = "${mirror}/stable/plasma/5.21.1/plasma-nm-5.21.1.tar.xz";
290+ sha256 = "0lg9fkk4lag5pi648jv66b8mzp645xx75y4zylj87yz3i8h9may4";
291+ name = "plasma-nm-5.21.1.tar.xz";
284292 };
285293 };
286294 plasma-pa = {
287− version = "5.20.5";
295+ version = "5.21.1";
288296 src = fetchurl {
289− url = "${mirror}/stable/plasma/5.20.5/plasma-pa-5.20.5.tar.xz";
290− sha256 = "0xvkbrz3290xxfvv1rqqv7w57j3gdng8m2jyjj1j6dmaackl512d";
291− name = "plasma-pa-5.20.5.tar.xz";
297+ url = "${mirror}/stable/plasma/5.21.1/plasma-pa-5.21.1.tar.xz";
298+ sha256 = "17vxvvrii3q46k22k3v94hicvxw7cdfl4rgaqbb8rvy94f2dhvir";
299+ name = "plasma-pa-5.21.1.tar.xz";
292300 };
293301 };
294302 plasma-phone-components = {
295− version = "5.20.5";
303+ version = "5.21.1";
296304 src = fetchurl {
297− url = "${mirror}/stable/plasma/5.20.5/plasma-phone-components-5.20.5.tar.xz";
298− sha256 = "14h790b2jfs2j2lvv3dwqm20v3nlvah2909g4mhm9kwfdsmgnjms";
299− name = "plasma-phone-components-5.20.5.tar.xz";
305+ url = "${mirror}/stable/plasma/5.21.1/plasma-phone-components-5.21.1.tar.xz";
306+ sha256 = "1fzjwc1x40n8wxq9fqm83j07yg9zniilmafcsv0rd80k6v99691i";
307+ name = "plasma-phone-components-5.21.1.tar.xz";
300308 };
301309 };
302310 plasma-sdk = {
303− version = "5.20.5";
311+ version = "5.21.1";
304312 src = fetchurl {
305− url = "${mirror}/stable/plasma/5.20.5/plasma-sdk-5.20.5.tar.xz";
306− sha256 = "13cqn700nadqgmn54sy8qbf7waqkgvhzndh73jvmhb0z699z4s6y";
307− name = "plasma-sdk-5.20.5.tar.xz";
313+ url = "${mirror}/stable/plasma/5.21.1/plasma-sdk-5.21.1.tar.xz";
314+ sha256 = "0s18lgp8baan9s9qr8wwaq3ah668255whz9xpl2xl1qv9qnr5v28";
315+ name = "plasma-sdk-5.21.1.tar.xz";
316+ };
317+ };
318+ plasma-systemmonitor = {
319+ version = "5.21.1";
320+ src = fetchurl {
321+ url = "${mirror}/stable/plasma/5.21.1/plasma-systemmonitor-5.21.1.tar.xz";
322+ sha256 = "1mfmlnsa2iy4wrdi2hghrapd7j02k3xkv4cfv44pw29i5iihvx6a";
323+ name = "plasma-systemmonitor-5.21.1.tar.xz";
308324 };
309325 };
310326 plasma-tests = {
311− version = "5.20.5";
327+ version = "5.21.1";
312328 src = fetchurl {
313− url = "${mirror}/stable/plasma/5.20.5/plasma-tests-5.20.5.tar.xz";
314− sha256 = "0h6wccqp46s3i8dqc6rrh68l8fk662yvz0fdscqv295g1zwhb45j";
315− name = "plasma-tests-5.20.5.tar.xz";
329+ url = "${mirror}/stable/plasma/5.21.1/plasma-tests-5.21.1.tar.xz";
330+ sha256 = "1qxlwvxwkqgxy6kvd9dqp7wg02gc4j37az20gxglm5s4jf9j47kr";
331+ name = "plasma-tests-5.21.1.tar.xz";
316332 };
317333 };
318334 plasma-thunderbolt = {
319− version = "5.20.5";
335+ version = "5.21.1";
320336 src = fetchurl {
321− url = "${mirror}/stable/plasma/5.20.5/plasma-thunderbolt-5.20.5.tar.xz";
322− sha256 = "06l5zpgn5zmid0rkp8lx228nw72nd991s2cg29yg2h51zyvff4v0";
323− name = "plasma-thunderbolt-5.20.5.tar.xz";
337+ url = "${mirror}/stable/plasma/5.21.1/plasma-thunderbolt-5.21.1.tar.xz";
338+ sha256 = "1v6yjxk30wpr86f1m7zn9sm5vvagcjmqz8b3s9sliv0z69n50fzx";
339+ name = "plasma-thunderbolt-5.21.1.tar.xz";
324340 };
325341 };
326342 plasma-vault = {
327− version = "5.20.5";
343+ version = "5.21.1";
328344 src = fetchurl {
329− url = "${mirror}/stable/plasma/5.20.5/plasma-vault-5.20.5.tar.xz";
330− sha256 = "0b9jnzx5040sgzqsnzjz61sxnlsmbqfsk8mvqclgqphgiqsbcnm2";
331− name = "plasma-vault-5.20.5.tar.xz";
345+ url = "${mirror}/stable/plasma/5.21.1/plasma-vault-5.21.1.tar.xz";
346+ sha256 = "0mfjmmn3s2piqg8idmndh1klrr3fllka0lx6ckx7bmj1g7z3kr0d";
347+ name = "plasma-vault-5.21.1.tar.xz";
332348 };
333349 };
334350 plasma-workspace = {
335− version = "5.20.5";
351+ version = "5.21.1";
336352 src = fetchurl {
337− url = "${mirror}/stable/plasma/5.20.5/plasma-workspace-5.20.5.tar.xz";
338− sha256 = "0966nqyqs7hb7fp3a3jxhm64iqwbafd29sbagigx9d7gj8qg8zim";
339− name = "plasma-workspace-5.20.5.tar.xz";
353+ url = "${mirror}/stable/plasma/5.21.1/plasma-workspace-5.21.1.tar.xz";
354+ sha256 = "0aq2158sijlgz3baslj57kzhmdx3m0zir80qz1svw94grfszjc2a";
355+ name = "plasma-workspace-5.21.1.tar.xz";
340356 };
341357 };
342358 plasma-workspace-wallpapers = {
343− version = "5.20.5";
359+ version = "5.21.1";
344360 src = fetchurl {
345− url = "${mirror}/stable/plasma/5.20.5/plasma-workspace-wallpapers-5.20.5.tar.xz";
346− sha256 = "03z7pcba8kkmb70dn7gsqldxgb8lky6qw040p5ik1j07516xm6z3";
347− name = "plasma-workspace-wallpapers-5.20.5.tar.xz";
361+ url = "${mirror}/stable/plasma/5.21.1/plasma-workspace-wallpapers-5.21.1.tar.xz";
362+ sha256 = "1pfgzzfhwdgczhrgizwi7rvav1hawwv6zra8nlqnfia8rc4mjs3n";
363+ name = "plasma-workspace-wallpapers-5.21.1.tar.xz";
348364 };
349365 };
350366 plymouth-kcm = {
351− version = "5.20.5";
367+ version = "5.21.1";
352368 src = fetchurl {
353− url = "${mirror}/stable/plasma/5.20.5/plymouth-kcm-5.20.5.tar.xz";
354− sha256 = "0lwir088h3mjdxc6zzbd74g7alfnsrhf7m0p7ma6prncdj25pcyz";
355− name = "plymouth-kcm-5.20.5.tar.xz";
369+ url = "${mirror}/stable/plasma/5.21.1/plymouth-kcm-5.21.1.tar.xz";
370+ sha256 = "1il5a60db4brgs0ifmbxhq1ncqg80pkz5pnddbb3vwiwgwrsjziw";
371+ name = "plymouth-kcm-5.21.1.tar.xz";
356372 };
357373 };
358374 polkit-kde-agent = {
359− version = "1-5.20.5";
375+ version = "1-5.21.1";
360376 src = fetchurl {
361− url = "${mirror}/stable/plasma/5.20.5/polkit-kde-agent-1-5.20.5.tar.xz";
362− sha256 = "1rkvnci93xvxga6cvw99aaivkn8897kyqdw7p9hmk09qvg2qb92v";
363− name = "polkit-kde-agent-1-5.20.5.tar.xz";
377+ url = "${mirror}/stable/plasma/5.21.1/polkit-kde-agent-1-5.21.1.tar.xz";
378+ sha256 = "1lm6rl3lfimlfw7yaqk81jdrdi31qbz951vzcss4prwa1iqdi7b2";
379+ name = "polkit-kde-agent-1-5.21.1.tar.xz";
364380 };
365381 };
366382 powerdevil = {
367− version = "5.20.5";
383+ version = "5.21.1";
384+ src = fetchurl {
385+ url = "${mirror}/stable/plasma/5.21.1/powerdevil-5.21.1.tar.xz";
386+ sha256 = "08a9wl97lpcm0qz438ha8avdc6ybsij5vvy3p0ijkdn1psq2974b";
387+ name = "powerdevil-5.21.1.tar.xz";
388+ };
389+ };
390+ qqc2-breeze-style = {
391+ version = "5.21.1";
368392 src = fetchurl {
369− url = "${mirror}/stable/plasma/5.20.5/powerdevil-5.20.5.tar.xz";
370− sha256 = "1w3figagjxmrbc7hs81bllfkpq6f9mn4mwj7zjzxjf7d5fkmryrj";
371− name = "powerdevil-5.20.5.tar.xz";
393+ url = "${mirror}/stable/plasma/5.21.1/qqc2-breeze-style-5.21.1.tar.xz";
394+ sha256 = "1k4zl5hbbyk2v9gila8whkh7yniv3nwcgdc73ysc75ivqyzydsix";
395+ name = "qqc2-breeze-style-5.21.1.tar.xz";
372396 };
373397 };
374398 sddm-kcm = {
375− version = "5.20.5";
399+ version = "5.21.1";
376400 src = fetchurl {
377− url = "${mirror}/stable/plasma/5.20.5/sddm-kcm-5.20.5.tar.xz";
378− sha256 = "1zw9y6knrx848f529m45iszr0xplr9lnck242ddmzj3x7qz0x1az";
379− name = "sddm-kcm-5.20.5.tar.xz";
401+ url = "${mirror}/stable/plasma/5.21.1/sddm-kcm-5.21.1.tar.xz";
402+ sha256 = "0j76zwmn2r62hjzv1gni44a9admd38x2s8s30qfc1dzc7nkv61sh";
403+ name = "sddm-kcm-5.21.1.tar.xz";
380404 };
381405 };
382406 systemsettings = {
383− version = "5.20.5";
407+ version = "5.21.1";
384408 src = fetchurl {
385− url = "${mirror}/stable/plasma/5.20.5/systemsettings-5.20.5.tar.xz";
386− sha256 = "1b1j9hl9nzd4qqs255yd3svsb492w8i6l6ccihllwzqwkb1kpq5j";
387− name = "systemsettings-5.20.5.tar.xz";
409+ url = "${mirror}/stable/plasma/5.21.1/systemsettings-5.21.1.tar.xz";
410+ sha256 = "0kzg3raa2f3lwb5qs10g8kzmv6px8fk4z2sq5jnjl3n9zqgzykkr";
411+ name = "systemsettings-5.21.1.tar.xz";
388412 };
389413 };
390414 xdg-desktop-portal-kde = {
391− version = "5.20.5";
415+ version = "5.21.1";
392416 src = fetchurl {
393− url = "${mirror}/stable/plasma/5.20.5/xdg-desktop-portal-kde-5.20.5.tar.xz";
394− sha256 = "07g70517p89araa305if2xgwpfd7sdbknl880hqn2mqaqd9m83gl";
395− name = "xdg-desktop-portal-kde-5.20.5.tar.xz";
417+ url = "${mirror}/stable/plasma/5.21.1/xdg-desktop-portal-kde-5.21.1.tar.xz";
418+ sha256 = "1xfnwycrq51sz1r57misrz8acq6yd1vrr5gjir4f1ynfclhf9aj6";
419+ name = "xdg-desktop-portal-kde-5.21.1.tar.xz";
396420 };
397421 };
398422}
pkgs/development/arduino/arduino-core/default.nix+1−2
@@ -116,13 +116,12 @@ stdenv.mkDerivation rec {
116116 # the glib setup hook will populate GSETTINGS_SCHEMAS_PATH,
117117 # wrapGAppHooks (among other things) adds it to XDG_DATA_DIRS
118118 # so 'save as...' works:
119− nativeBuildInputs = [ glib wrapGAppsHook ];
119+ nativeBuildInputs = [ glib wrapGAppsHook unzip ];
120120 buildInputs = [
121121 jdk
122122 ant
123123 libusb-compat-0_1
124124 libusb1
125− unzip
126125 zlib
127126 ncurses5
128127 readline
pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py+1
@@ -63,3 +63,4 @@ for release in releases:
6363
6464with open("sources.json", "w") as f:
6565 json.dump(out, f, indent=2, sort_keys=True)
66+ f.write('\n')
pkgs/development/compilers/adoptopenjdk-bin/sources.json+204−204
@@ -4,92 +4,92 @@
44 "jdk": {
55 "hotspot": {
66 "aarch64": {
7− "build": "11",
8− "sha256": "f90c6f941a95e20e305870700328804e5b48acb69d4928dc9c4627b3c755ae8a",
9− "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11.1/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.9_11.tar.gz",
10− "version": "11.0.9"
7+ "build": "9",
8+ "sha256": "420c5d1e5dc66b2ed7dedd30a7bdf94bfaed10d5e1b07dc579722bf60a8114a9",
9+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.10_9.tar.gz",
10+ "version": "11.0.10"
1111 },
1212 "armv6l": {
13− "build": "11",
14− "sha256": "082a13a9a5fbcf7ca45e67ab39e9682a9ef9e3779395e37aa0bf235e42a8eaf5",
15− "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11/OpenJDK11U-jdk_arm_linux_hotspot_11.0.9_11.tar.gz",
16− "version": "11.0.9"
13+ "build": "9",
14+ "sha256": "34908da9c200f5ef71b8766398b79fd166f8be44d87f97510667698b456c8d44",
15+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_arm_linux_hotspot_11.0.10_9.tar.gz",
16+ "version": "11.0.10"
1717 },
1818 "armv7l": {
19− "build": "11",
20− "sha256": "082a13a9a5fbcf7ca45e67ab39e9682a9ef9e3779395e37aa0bf235e42a8eaf5",
21− "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11/OpenJDK11U-jdk_arm_linux_hotspot_11.0.9_11.tar.gz",
22− "version": "11.0.9"
19+ "build": "9",
20+ "sha256": "34908da9c200f5ef71b8766398b79fd166f8be44d87f97510667698b456c8d44",
21+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_arm_linux_hotspot_11.0.10_9.tar.gz",
22+ "version": "11.0.10"
2323 },
2424 "packageType": "jdk",
2525 "vmType": "hotspot",
2626 "x86_64": {
27− "build": "11",
28− "sha256": "a3c52b73a76bed0f113604165eb4f2020b767e188704d8cc0bfc8bc4eb596712",
29− "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11.1/OpenJDK11U-jdk_x64_linux_hotspot_11.0.9_11.tar.gz",
30− "version": "11.0.9"
27+ "build": "9",
28+ "sha256": "ae78aa45f84642545c01e8ef786dfd700d2226f8b12881c844d6a1f71789cb99",
29+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.10_9.tar.gz",
30+ "version": "11.0.10"
3131 }
3232 },
3333 "openj9": {
3434 "aarch64": {
35− "build": "11",
36− "sha256": "f0426b6d37085d471a7f577ce6f28af7cc8fe35b9b0b09a5111eccaed80a0447",
37− "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11_openj9-0.23.0/OpenJDK11U-jdk_aarch64_linux_openj9_11.0.9_11_openj9-0.23.0.tar.gz",
38− "version": "11.0.9"
35+ "build": "9",
36+ "sha256": "0ce9a8c38d154540610dfe03e59389734deb91c5cb9258408404c5026d4afa41",
37+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jdk_aarch64_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz",
38+ "version": "11.0.10-ea"
3939 },
4040 "packageType": "jdk",
4141 "vmType": "openj9",
4242 "x86_64": {
43− "build": "11",
44− "sha256": "812d58fac39465802039291a1bc530b4feaaa61b58664d9c458a075921ae8091",
45− "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11_openj9-0.23.0/OpenJDK11U-jdk_x64_linux_openj9_11.0.9_11_openj9-0.23.0.tar.gz",
46− "version": "11.0.9"
43+ "build": "9",
44+ "sha256": "941d5df125d2ad426391340f539408b13d61d00ed31dd79142ff1ac84864a79f",
45+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jdk_x64_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz",
46+ "version": "11.0.10"
4747 }
4848 }
4949 },
5050 "jre": {
5151 "hotspot": {
5252 "aarch64": {
53− "build": "11",
54− "sha256": "89b9b3108afda968a97961c5602a896bae31fea7c95195b54be5ad68b3af9e45",
55− "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11.1/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.9_11.tar.gz",
56− "version": "11.0.9"
53+ "build": "9",
54+ "sha256": "5f9a894bd694f598f2befa4a605169685ac8bcb8ec68d25e587e8db4d2307b74",
55+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.10_9.tar.gz",
56+ "version": "11.0.10"
5757 },
5858 "armv6l": {
59− "build": "11",
60− "sha256": "8e52de3c7a24edb74e423631fa90a09f7af3193aa9e6e4837b337192669530b0",
61− "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11/OpenJDK11U-jre_arm_linux_hotspot_11.0.9_11.tar.gz",
62− "version": "11.0.9"
59+ "build": "9",
60+ "sha256": "2f2da2149c089c84f00b0eda63c31b77c8b51a1c080e18a70ecb5a78ba40d8c6",
61+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_arm_linux_hotspot_11.0.10_9.tar.gz",
62+ "version": "11.0.10"
6363 },
6464 "armv7l": {
65− "build": "11",
66− "sha256": "8e52de3c7a24edb74e423631fa90a09f7af3193aa9e6e4837b337192669530b0",
67− "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11/OpenJDK11U-jre_arm_linux_hotspot_11.0.9_11.tar.gz",
68− "version": "11.0.9"
65+ "build": "9",
66+ "sha256": "2f2da2149c089c84f00b0eda63c31b77c8b51a1c080e18a70ecb5a78ba40d8c6",
67+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_arm_linux_hotspot_11.0.10_9.tar.gz",
68+ "version": "11.0.10"
6969 },
7070 "packageType": "jre",
7171 "vmType": "hotspot",
7272 "x86_64": {
73− "build": "11",
74− "sha256": "2ed263b662afb8b5d2964d1c9941d20031d07e5af68679ebefdca35d40bb91b1",
75− "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11.1/OpenJDK11U-jre_x64_linux_hotspot_11.0.9_11.tar.gz",
76− "version": "11.0.9"
73+ "build": "9",
74+ "sha256": "25fdcf9427095ac27c8bdfc82096ad2e615693a3f6ea06c700fca7ffb271131a",
75+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_x64_linux_hotspot_11.0.10_9.tar.gz",
76+ "version": "11.0.10"
7777 }
7878 },
7979 "openj9": {
8080 "aarch64": {
81− "build": "11",
82− "sha256": "b73f406dba1560dc194ac891452a1aacc2ba3b3e5e7b55e91a64559f8c2d9539",
83− "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11_openj9-0.23.0/OpenJDK11U-jre_aarch64_linux_openj9_11.0.9_11_openj9-0.23.0.tar.gz",
84− "version": "11.0.9"
81+ "build": "9",
82+ "sha256": "c48d2b19bf7040c74dfdcac9e395ba7b8f937522ee756c820465f2e8e3dffec2",
83+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jre_aarch64_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz",
84+ "version": "11.0.10-ea"
8585 },
8686 "packageType": "jre",
8787 "vmType": "openj9",
8888 "x86_64": {
89− "build": "11",
90− "sha256": "54c845c167c197ba789eb6c3508faa5b1c95c9abe2ac26878123b6eecc87a111",
91− "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11_openj9-0.23.0/OpenJDK11U-jre_x64_linux_openj9_11.0.9_11_openj9-0.23.0.tar.gz",
92− "version": "11.0.9"
89+ "build": "9",
90+ "sha256": "7e5f97071f8b86c22c36ddfd7f821c3e8ec531c1128e2e6c931b2e64118a517a",
91+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jre_x64_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz",
92+ "version": "11.0.10"
9393 }
9494 }
9595 }
@@ -100,20 +100,20 @@
100100 "packageType": "jdk",
101101 "vmType": "hotspot",
102102 "x86_64": {
103− "build": "11",
104− "sha256": "7b21961ffb2649e572721a0dfad64169b490e987937b661cb4e13a594c21e764",
105− "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11.1/OpenJDK11U-jdk_x64_mac_hotspot_11.0.9_11.tar.gz",
106− "version": "11.0.9"
103+ "build": "9",
104+ "sha256": "ee7c98c9d79689aca6e717965747b8bf4eec5413e89d5444cc2bd6dbd59e3811",
105+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_x64_mac_hotspot_11.0.10_9.tar.gz",
106+ "version": "11.0.10"
107107 }
108108 },
109109 "openj9": {
110110 "packageType": "jdk",
111111 "vmType": "openj9",
112112 "x86_64": {
113− "build": "11",
114− "sha256": "382238443d4495d976f9e1a66b0f6e3bc250d3d009b64d2c29d44022afd7e418",
115− "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11.1_openj9-0.23.0/OpenJDK11U-jdk_x64_mac_openj9_11.0.9_11_openj9-0.23.0.tar.gz",
116− "version": "11.0.9"
113+ "build": "9",
114+ "sha256": "58f931dc30160b04da2d94af32e0dfa384f4b2cf92b7217c0937fd057e668d54",
115+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jdk_x64_mac_openj9_11.0.10_9_openj9-0.24.0.tar.gz",
116+ "version": "11.0.10"
117117 }
118118 }
119119 },
@@ -122,20 +122,20 @@
122122 "packageType": "jre",
123123 "vmType": "hotspot",
124124 "x86_64": {
125− "build": "11",
126− "sha256": "cd8965dc8dbd0b5b3b25b6a336857d9bb622965e039b77e3048bc825e5512e95",
127− "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11.1/OpenJDK11U-jre_x64_mac_hotspot_11.0.9_11.tar.gz",
128− "version": "11.0.9"
125+ "build": "9",
126+ "sha256": "215e94323d7c74fe31e5383261e3bfc8e9ca3dc03212738c48d29868b02fe875",
127+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_x64_mac_hotspot_11.0.10_9.tar.gz",
128+ "version": "11.0.10"
129129 }
130130 },
131131 "openj9": {
132132 "packageType": "jre",
133133 "vmType": "openj9",
134134 "x86_64": {
135− "build": "11",
136− "sha256": "33a868f12bbe9326f658e60abe48dac658df33578b3719f551355855a87d1911",
137− "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11.1_openj9-0.23.0/OpenJDK11U-jre_x64_mac_openj9_11.0.9_11_openj9-0.23.0.tar.gz",
138− "version": "11.0.9"
135+ "build": "9",
136+ "sha256": "6e353f0b38a7192ad3e0522009065c7c24356e0d9329899477b21e39d2a7a8da",
137+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jre_x64_mac_openj9_11.0.10_9_openj9-0.24.0.tar.gz",
138+ "version": "11.0.10"
139139 }
140140 }
141141 }
@@ -146,19 +146,19 @@
146146 "jdk": {
147147 "hotspot": {
148148 "aarch64": {
149− "build": "8",
149+ "build": "8.1",
150150 "sha256": "0e6081cb51f8a6f3062bef4f4c45dbe1fccfd3f3b4b5d52522a3edb76581e3af",
151151 "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_aarch64_linux_hotspot_13.0.2_8.tar.gz",
152152 "version": "13.0.2"
153153 },
154154 "armv6l": {
155− "build": "8",
155+ "build": "8.1",
156156 "sha256": "9beec080f2b2a7f6883b024272f4e8d5a0b027325e83647be318215781af1d1a",
157157 "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_arm_linux_hotspot_13.0.2_8.tar.gz",
158158 "version": "13.0.2"
159159 },
160160 "armv7l": {
161− "build": "8",
161+ "build": "8.1",
162162 "sha256": "9beec080f2b2a7f6883b024272f4e8d5a0b027325e83647be318215781af1d1a",
163163 "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_arm_linux_hotspot_13.0.2_8.tar.gz",
164164 "version": "13.0.2"
@@ -166,7 +166,7 @@
166166 "packageType": "jdk",
167167 "vmType": "hotspot",
168168 "x86_64": {
169− "build": "8",
169+ "build": "8.1",
170170 "sha256": "9ccc063569f19899fd08e41466f8c4cd4e05058abdb5178fa374cb365dcf5998",
171171 "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_x64_linux_hotspot_13.0.2_8.tar.gz",
172172 "version": "13.0.2"
@@ -176,7 +176,7 @@
176176 "packageType": "jdk",
177177 "vmType": "openj9",
178178 "x86_64": {
179− "build": "8",
179+ "build": "8.1",
180180 "sha256": "aeecf6d30d0c847db81d07793cf97e5dc44890c29366d7d9f8f9f397f6c52590",
181181 "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8_openj9-0.18.0/OpenJDK13U-jdk_x64_linux_openj9_13.0.2_8_openj9-0.18.0.tar.gz",
182182 "version": "13.0.2"
@@ -186,7 +186,7 @@
186186 "jre": {
187187 "hotspot": {
188188 "aarch64": {
189− "build": "8",
189+ "build": "8.1",
190190 "sha256": "6c4b69d1609f4c65c576c80d6aa101de80048f8ce5566f890e8fff5349228bae",
191191 "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jre_aarch64_linux_hotspot_13.0.2_8.tar.gz",
192192 "version": "13.0.2"
@@ -194,7 +194,7 @@
194194 "packageType": "jre",
195195 "vmType": "hotspot",
196196 "x86_64": {
197− "build": "8",
197+ "build": "8.1",
198198 "sha256": "897f16fe8e056395209e35d2384013bd1ff250e717465769079e3f4793628c34",
199199 "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jre_x64_linux_hotspot_13.0.2_8.tar.gz",
200200 "version": "13.0.2"
@@ -204,7 +204,7 @@
204204 "packageType": "jre",
205205 "vmType": "openj9",
206206 "x86_64": {
207− "build": "8",
207+ "build": "8.1",
208208 "sha256": "a0ab38607811e282f64082edc68a2dea3fa6a5113391efb124a6d7d02883110a",
209209 "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8_openj9-0.18.0/OpenJDK13U-jre_x64_linux_openj9_13.0.2_8_openj9-0.18.0.tar.gz",
210210 "version": "13.0.2"
@@ -218,7 +218,7 @@
218218 "packageType": "jdk",
219219 "vmType": "hotspot",
220220 "x86_64": {
221− "build": "8",
221+ "build": "8.1",
222222 "sha256": "0ddb24efdf5aab541898d19b7667b149a1a64a8bd039b708fc58ee0284fa7e07",
223223 "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_x64_mac_hotspot_13.0.2_8.tar.gz",
224224 "version": "13.0.2"
@@ -228,7 +228,7 @@
228228 "packageType": "jdk",
229229 "vmType": "openj9",
230230 "x86_64": {
231− "build": "8",
231+ "build": "8.1",
232232 "sha256": "dd8d92eec98a3455ec5cd065a0a6672cc1aef280c6a68c507c372ccc1d98fbaa",
233233 "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8_openj9-0.18.0/OpenJDK13U-jdk_x64_mac_openj9_13.0.2_8_openj9-0.18.0.tar.gz",
234234 "version": "13.0.2"
@@ -240,7 +240,7 @@
240240 "packageType": "jre",
241241 "vmType": "hotspot",
242242 "x86_64": {
243− "build": "8",
243+ "build": "8.1",
244244 "sha256": "3149b9ebf0db1eaf2dc152df9efae82003e7971efb1cf550060e6a4798fe8c5c",
245245 "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jre_x64_mac_hotspot_13.0.2_8.tar.gz",
246246 "version": "13.0.2"
@@ -250,7 +250,7 @@
250250 "packageType": "jre",
251251 "vmType": "openj9",
252252 "x86_64": {
253− "build": "8",
253+ "build": "8.1",
254254 "sha256": "6a8a636fca4c7e368241e232a37cd73c9867cdec8f0869fd158b1f58c6128cc2",
255255 "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8_openj9-0.18.0/OpenJDK13U-jre_x64_mac_openj9_13.0.2_8_openj9-0.18.0.tar.gz",
256256 "version": "13.0.2"
@@ -394,92 +394,92 @@
394394 "jdk": {
395395 "hotspot": {
396396 "aarch64": {
397− "build": "9",
398− "sha256": "84398a1566d66ee5a88f3326fb7f0b70504eb510190f8f798bdb386481a3900e",
399− "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jdk_aarch64_linux_hotspot_15.0.1_9.tar.gz",
400− "version": "15.0.1"
397+ "build": "7",
398+ "sha256": "6e8b6b037148cf20a284b5b257ec7bfdf9cc31ccc87778d0dfd95a2fddf228d4",
399+ "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_aarch64_linux_hotspot_15.0.2_7.tar.gz",
400+ "version": "15.0.2"
401401 },
402402 "armv6l": {
403− "build": "9",
404− "sha256": "bef5e9f4ab8a87645fa2b3d0ffb9f2b97374caa03cd1296597e8c86e8360d5a2",
405− "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jdk_arm_linux_hotspot_15.0.1_9.tar.gz",
406− "version": "15.0.1"
403+ "build": "7",
404+ "sha256": "ff39c0380224e419d940382c4d651cb1e6297a794854e0cc459c1fd4973b3368",
405+ "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_arm_linux_hotspot_15.0.2_7.tar.gz",
406+ "version": "15.0.2"
407407 },
408408 "armv7l": {
409− "build": "9",
410− "sha256": "bef5e9f4ab8a87645fa2b3d0ffb9f2b97374caa03cd1296597e8c86e8360d5a2",
411− "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jdk_arm_linux_hotspot_15.0.1_9.tar.gz",
412− "version": "15.0.1"
409+ "build": "7",
410+ "sha256": "ff39c0380224e419d940382c4d651cb1e6297a794854e0cc459c1fd4973b3368",
411+ "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_arm_linux_hotspot_15.0.2_7.tar.gz",
412+ "version": "15.0.2"
413413 },
414414 "packageType": "jdk",
415415 "vmType": "hotspot",
416416 "x86_64": {
417− "build": "9",
418− "sha256": "61045ecb9434e3320dbc2c597715f9884586b7a18a56d29851b4d4a4d48a2a5e",
419− "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jdk_x64_linux_hotspot_15.0.1_9.tar.gz",
420− "version": "15.0.1"
417+ "build": "7",
418+ "sha256": "94f20ca8ea97773571492e622563883b8869438a015d02df6028180dd9acc24d",
419+ "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_x64_linux_hotspot_15.0.2_7.tar.gz",
420+ "version": "15.0.2"
421421 }
422422 },
423423 "openj9": {
424424 "aarch64": {
425− "build": "9",
426− "sha256": "6206643ec4a57597f73880423b72fc06c1018d92cc6b02972ec3ea3fe4d853a2",
427− "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9_openj9-0.23.0/OpenJDK15U-jdk_aarch64_linux_openj9_15.0.1_9_openj9-0.23.0.tar.gz",
428− "version": "15.0.1"
425+ "build": "7",
426+ "sha256": "b69a4bc87ed2e985d252cff02d53f1a11b8d83d39e0800cd4a1cab4521375314",
427+ "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7_openj9-0.24.0/OpenJDK15U-jdk_aarch64_linux_openj9_15.0.2_7_openj9-0.24.0.tar.gz",
428+ "version": "15.0.2-ea"
429429 },
430430 "packageType": "jdk",
431431 "vmType": "openj9",
432432 "x86_64": {
433− "build": "9",
434− "sha256": "b1561f7a69c977bfc9991e61e96dcb200c39300dd9ad423254af117c189e4a8d",
435− "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9_openj9-0.23.0/OpenJDK15U-jdk_x64_linux_openj9_15.0.1_9_openj9-0.23.0.tar.gz",
436− "version": "15.0.1"
433+ "build": "7",
434+ "sha256": "5515ccd79b1b5e8d8a615b80d5fe1272f7bb41100e46d94fb78ee611ea014816",
435+ "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7_openj9-0.24.0/OpenJDK15U-jdk_x64_linux_openj9_15.0.2_7_openj9-0.24.0.tar.gz",
436+ "version": "15.0.2"
437437 }
438438 }
439439 },
440440 "jre": {
441441 "hotspot": {
442442 "aarch64": {
443− "build": "9",
444− "sha256": "9eecdd39239545b922878abf51015030ba9aed4dda5c4574ddbc669a71ddab31",
445− "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jre_aarch64_linux_hotspot_15.0.1_9.tar.gz",
446− "version": "15.0.1"
443+ "build": "7",
444+ "sha256": "1c1fc968d76004b0be0042027712835dcbe3570a6fc3a208157a4ab6adabbef2",
445+ "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jre_aarch64_linux_hotspot_15.0.2_7.tar.gz",
446+ "version": "15.0.2"
447447 },
448448 "armv6l": {
449− "build": "9",
450− "sha256": "f289d1b9fc05099889eaa9a52d352275d44698f3448153cc2ef05f2fa1c04cca",
451− "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jre_arm_linux_hotspot_15.0.1_9.tar.gz",
452− "version": "15.0.1"
449+ "build": "7",
450+ "sha256": "304be224952dbea7000cda6223b2978b3eefdf2e3749032c3b381a213c8d9c5e",
451+ "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jre_arm_linux_hotspot_15.0.2_7.tar.gz",
452+ "version": "15.0.2"
453453 },
454454 "armv7l": {
455− "build": "9",
456− "sha256": "f289d1b9fc05099889eaa9a52d352275d44698f3448153cc2ef05f2fa1c04cca",
457− "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jre_arm_linux_hotspot_15.0.1_9.tar.gz",
458− "version": "15.0.1"
455+ "build": "7",
456+ "sha256": "304be224952dbea7000cda6223b2978b3eefdf2e3749032c3b381a213c8d9c5e",
457+ "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jre_arm_linux_hotspot_15.0.2_7.tar.gz",
458+ "version": "15.0.2"
459459 },
460460 "packageType": "jre",
461461 "vmType": "hotspot",
462462 "x86_64": {
463− "build": "9",
464− "sha256": "e619197c7a5757631f6ea9c912ab47528ebf64c27cf788cdad22bc9245779411",
465− "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jre_x64_linux_hotspot_15.0.1_9.tar.gz",
466− "version": "15.0.1"
463+ "build": "7",
464+ "sha256": "31af7efdb1cc0ffd001bc145c3d255266889ad6b502133283ae8bf233d11334c",
465+ "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jre_x64_linux_hotspot_15.0.2_7.tar.gz",
466+ "version": "15.0.2"
467467 }
468468 },
469469 "openj9": {
470470 "aarch64": {
471− "build": "9",
472− "sha256": "1db3c28e8c423d005fcf3b0c8a081061e56c51966273e32e3930d4c57c21bf49",
473− "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9_openj9-0.23.0/OpenJDK15U-jre_aarch64_linux_openj9_15.0.1_9_openj9-0.23.0.tar.gz",
474− "version": "15.0.1"
471+ "build": "7",
472+ "sha256": "37492012e75d75021dfb2b25fe5cc73664c03fee85532cec30ce4f5a4e5389c6",
473+ "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7_openj9-0.24.0/OpenJDK15U-jre_aarch64_linux_openj9_15.0.2_7_openj9-0.24.0.tar.gz",
474+ "version": "15.0.2-ea"
475475 },
476476 "packageType": "jre",
477477 "vmType": "openj9",
478478 "x86_64": {
479− "build": "9",
480− "sha256": "e47fdadfe91f554f3e343b24e678b6862673f9b1dce3703efd1447950188357b",
481− "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9_openj9-0.23.0/OpenJDK15U-jre_x64_linux_openj9_15.0.1_9_openj9-0.23.0.tar.gz",
482− "version": "15.0.1"
479+ "build": "7",
480+ "sha256": "a4ae1b7275fcfd6d87a3387edacc8e353dc95ee44f00ca5a348ea90331ec2084",
481+ "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7_openj9-0.24.0/OpenJDK15U-jre_x64_linux_openj9_15.0.2_7_openj9-0.24.0.tar.gz",
482+ "version": "15.0.2"
483483 }
484484 }
485485 }
@@ -490,20 +490,20 @@
490490 "packageType": "jdk",
491491 "vmType": "hotspot",
492492 "x86_64": {
493− "build": "9",
494− "sha256": "d32f9429c4992cef7be559a15c542011503d6bc38c89379800cd209a9d7ec539",
495− "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jdk_x64_mac_hotspot_15.0.1_9.tar.gz",
496− "version": "15.0.1"
493+ "build": "7",
494+ "sha256": "d358a7ff03905282348c6c80562a4da2e04eb377b60ad2152be4c90f8d580b7f",
495+ "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_x64_mac_hotspot_15.0.2_7.tar.gz",
496+ "version": "15.0.2"
497497 }
498498 },
499499 "openj9": {
500500 "packageType": "jdk",
501501 "vmType": "openj9",
502502 "x86_64": {
503− "build": "9",
504− "sha256": "c9b19fd1fda9c581aa0bcddbf5f821204c351a1de29da1c5aa51cb680ee99517",
505− "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9.1_openj9-0.23.0/OpenJDK15U-jdk_x64_mac_openj9_15.0.1_9_openj9-0.23.0.tar.gz",
506− "version": "15.0.1"
503+ "build": "7",
504+ "sha256": "1336ae5529af3a0e35ae569e4188944831aeed7080a482f2490fc619380cbe53",
505+ "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7_openj9-0.24.0/OpenJDK15U-jdk_x64_mac_openj9_15.0.2_7_openj9-0.24.0.tar.gz",
506+ "version": "15.0.2"
507507 }
508508 }
509509 },
@@ -512,20 +512,20 @@
512512 "packageType": "jre",
513513 "vmType": "hotspot",
514514 "x86_64": {
515− "build": "9",
516− "sha256": "fde1713fc51e824a08f8eeb5e2b8a2acf21424d5f9a0e70cfd2e85a77c827bc4",
517− "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jre_x64_mac_hotspot_15.0.1_9.tar.gz",
518− "version": "15.0.1"
515+ "build": "7",
516+ "sha256": "6a7150fa3ca8277394ff5bae6f56a70f61d2144a5dbbea4f008d86a3e5498795",
517+ "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jre_x64_mac_hotspot_15.0.2_7.tar.gz",
518+ "version": "15.0.2"
519519 }
520520 },
521521 "openj9": {
522522 "packageType": "jre",
523523 "vmType": "openj9",
524524 "x86_64": {
525− "build": "9",
526− "sha256": "e7c3710d6cc23480ac66eba79b48d9e2bebec34ba688f3053bb5eba406a2c315",
527− "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9.1_openj9-0.23.0/OpenJDK15U-jre_x64_mac_openj9_15.0.1_9_openj9-0.23.0.tar.gz",
528− "version": "15.0.1"
525+ "build": "7",
526+ "sha256": "2c0ba5e66764d660037343db4bf32f1ed75ad27661e54e9a4df23d40cae448b0",
527+ "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7_openj9-0.24.0/OpenJDK15U-jre_x64_mac_openj9_15.0.2_7_openj9-0.24.0.tar.gz",
528+ "version": "15.0.2"
529529 }
530530 }
531531 }
@@ -536,92 +536,92 @@
536536 "jdk": {
537537 "hotspot": {
538538 "aarch64": {
539− "build": "10",
540− "sha256": "cfbde5191027c6d25af44af8a3d64625c6e22422dea8c4af6fe9240e7e249baa",
541− "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jdk_aarch64_linux_hotspot_8u272b10.tar.gz",
542− "version": "8.0.272"
539+ "build": "8",
540+ "sha256": "9c07cf2099bbc6c850c46fd870bd243f5fcb6635181eabb312bdffe43ffc5080",
541+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_aarch64_linux_hotspot_jdk8u282-b08.tar.gz",
542+ "version": "8.0.282"
543543 },
544544 "armv6l": {
545− "build": "10",
546− "sha256": "b005e9e8a912aa6605debdea3685a223c077d5a4ba7c90bca02d804c5f39d0b9",
547− "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jdk_arm_linux_hotspot_8u272b10.tar.gz",
548− "version": "8.0.272"
545+ "build": "1",
546+ "sha256": "e2e41a8705061dfcc766bfb6b7edd4c699e94aac68e4deeb28c8e76734a46fb7",
547+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u275-b01/OpenJDK8U-jdk_arm_linux_hotspot_8u275b01.tar.gz",
548+ "version": "8.0.275"
549549 },
550550 "armv7l": {
551− "build": "10",
552− "sha256": "b005e9e8a912aa6605debdea3685a223c077d5a4ba7c90bca02d804c5f39d0b9",
553− "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jdk_arm_linux_hotspot_8u272b10.tar.gz",
554− "version": "8.0.272"
551+ "build": "1",
552+ "sha256": "e2e41a8705061dfcc766bfb6b7edd4c699e94aac68e4deeb28c8e76734a46fb7",
553+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u275-b01/OpenJDK8U-jdk_arm_linux_hotspot_8u275b01.tar.gz",
554+ "version": "8.0.275"
555555 },
556556 "packageType": "jdk",
557557 "vmType": "hotspot",
558558 "x86_64": {
559− "build": "10",
560− "sha256": "6f124b69d07d8d3edf39b9aa5c58473f63a380b686ddb73a5495e01d25c2939a",
561− "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jdk_x64_linux_hotspot_8u272b10.tar.gz",
562− "version": "8.0.272"
559+ "build": "8",
560+ "sha256": "e6e6e0356649b9696fa5082cfcb0663d4bef159fc22d406e3a012e71fce83a5c",
561+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u282b08.tar.gz",
562+ "version": "8.0.282"
563563 }
564564 },
565565 "openj9": {
566566 "aarch64": {
567− "build": "10",
568− "sha256": "bbc78dc8caf25372578a95287bcf672c4bf62af23939d4a988634b2a1356cd89",
569− "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10_openj9-0.23.0/OpenJDK8U-jdk_aarch64_linux_openj9_8u272b10_openj9-0.23.0.tar.gz",
570− "version": "8.0.272"
567+ "build": "8",
568+ "sha256": "e107d3b8092f71ee042284b0fc0f0430ef214916812ce02aa6d549aa81b6dc70",
569+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jdk_aarch64_linux_openj9_8u282b08_openj9-0.24.0.tar.gz",
570+ "version": "8.0.282-ea"
571571 },
572572 "packageType": "jdk",
573573 "vmType": "openj9",
574574 "x86_64": {
575− "build": "10",
576− "sha256": "ca852f976e5b27ccd9b73a527a517496bda865b2ae2a85517ca74486fb8de7da",
577− "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10_openj9-0.23.0/OpenJDK8U-jdk_x64_linux_openj9_8u272b10_openj9-0.23.0.tar.gz",
578− "version": "8.0.272"
575+ "build": "8",
576+ "sha256": "ef10c776dccdff02da6222002a3c023c1cc47d50dd1f6f81314da3d1fe28d13e",
577+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jdk_x64_linux_openj9_8u282b08_openj9-0.24.0.tar.gz",
578+ "version": "8.0.282"
579579 }
580580 }
581581 },
582582 "jre": {
583583 "hotspot": {
584584 "aarch64": {
585− "build": "10",
586− "sha256": "ed3a862d83dd1f19037fc6ccf73500f2ecf453eb245af8b70bec3fb80d084289",
587− "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jre_aarch64_linux_hotspot_8u272b10.tar.gz",
588− "version": "8.0.272"
585+ "build": "8",
586+ "sha256": "5ffa116636b90bac486faba2882a2121aca1398a5426ef3e4ad0d913985e680d",
587+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jre_aarch64_linux_hotspot_jdk8u282-b08.tar.gz",
588+ "version": "8.0.282"
589589 },
590590 "armv6l": {
591− "build": "10",
592− "sha256": "906113d909d81b930c4eb519512d1cc9f9be9789dfd349128d6e7efaeeb36e1c",
593− "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jre_arm_linux_hotspot_8u272b10.tar.gz",
594− "version": "8.0.272"
591+ "build": "1",
592+ "sha256": "2e228d39d00ba8d974fd8ccdaaee0225833e79594251b64c724485c4fc94870f",
593+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u275-b01/OpenJDK8U-jre_arm_linux_hotspot_8u275b01.tar.gz",
594+ "version": "8.0.275"
595595 },
596596 "armv7l": {
597− "build": "10",
598− "sha256": "906113d909d81b930c4eb519512d1cc9f9be9789dfd349128d6e7efaeeb36e1c",
599− "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jre_arm_linux_hotspot_8u272b10.tar.gz",
600− "version": "8.0.272"
597+ "build": "1",
598+ "sha256": "2e228d39d00ba8d974fd8ccdaaee0225833e79594251b64c724485c4fc94870f",
599+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u275-b01/OpenJDK8U-jre_arm_linux_hotspot_8u275b01.tar.gz",
600+ "version": "8.0.275"
601601 },
602602 "packageType": "jre",
603603 "vmType": "hotspot",
604604 "x86_64": {
605− "build": "10",
606− "sha256": "e6894601a559c5226c6dc337308df263444d356a6430f4aabb66e02607c82956",
607− "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jre_x64_linux_hotspot_8u272b10.tar.gz",
608− "version": "8.0.272"
605+ "build": "8",
606+ "sha256": "3b2e2c6ad3ee04a58ffb8d629e3e242b0ae87b38cfd06425e4446b1f9490f521",
607+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jre_x64_linux_hotspot_8u282b08.tar.gz",
608+ "version": "8.0.282"
609609 }
610610 },
611611 "openj9": {
612612 "aarch64": {
613− "build": "10",
614− "sha256": "b0891c3493a9fc6135700d065a826fc67223d54e9d0da3c41b57e6cb6897b726",
615− "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10_openj9-0.23.0/OpenJDK8U-jre_aarch64_linux_openj9_8u272b10_openj9-0.23.0.tar.gz",
616− "version": "8.0.272"
613+ "build": "8",
614+ "sha256": "1ffc7ac14546ee5e16e0efd616073baaf1b80f55abf61257095f132ded9da1e5",
615+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jre_aarch64_linux_openj9_8u282b08_openj9-0.24.0.tar.gz",
616+ "version": "8.0.282-ea"
617617 },
618618 "packageType": "jre",
619619 "vmType": "openj9",
620620 "x86_64": {
621− "build": "10",
622− "sha256": "a4e58f3c15ca3bc15cb3aaa9f116de972809ca52ae81e0726f84c059442174d5",
623− "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10_openj9-0.23.0/OpenJDK8U-jre_x64_linux_openj9_8u272b10_openj9-0.23.0.tar.gz",
624− "version": "8.0.272"
621+ "build": "8",
622+ "sha256": "4fad259c32eb23ec98925c8b2cf28aaacbdb55e034db74c31a7636e75b6af08d",
623+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jre_x64_linux_openj9_8u282b08_openj9-0.24.0.tar.gz",
624+ "version": "8.0.282"
625625 }
626626 }
627627 }
@@ -632,20 +632,20 @@
632632 "packageType": "jdk",
633633 "vmType": "hotspot",
634634 "x86_64": {
635− "build": "10",
636− "sha256": "091f9ee39b0bdbc8af8ec19f51aaa0f73e416c2e93a8fb2c79b82f4caac83ab6",
637− "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jdk_x64_mac_hotspot_8u272b10.tar.gz",
638− "version": "8.0.272"
635+ "build": "8",
636+ "sha256": "1766d756f6e4a5d41b539f2ecf83e5a33e9336bd75f1602e8f4b4afbb8f47aaa",
637+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_x64_mac_hotspot_8u282b08.tar.gz",
638+ "version": "8.0.282"
639639 }
640640 },
641641 "openj9": {
642642 "packageType": "jdk",
643643 "vmType": "openj9",
644644 "x86_64": {
645− "build": "10",
646− "sha256": "bbd66ec27a4ea9b0b0952f501e1837e69c24262f64b316dab0408d1a8633a527",
647− "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10.1_openj9-0.23.0/OpenJDK8U-jdk_x64_mac_openj9_8u272b10_openj9-0.23.0.tar.gz",
648− "version": "8.0.272"
645+ "build": "8",
646+ "sha256": "265d4fb01b61ed7a3a9fae6a50bcf6322687b5f08de8598d8e42263cbd8b5772",
647+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jdk_x64_mac_openj9_8u282b08_openj9-0.24.0.tar.gz",
648+ "version": "8.0.282"
649649 }
650650 }
651651 },
@@ -654,20 +654,20 @@
654654 "packageType": "jre",
655655 "vmType": "hotspot",
656656 "x86_64": {
657− "build": "10",
658− "sha256": "afb9c08cb8b93d8e7d4f1e48ced3d43cfb3082491595a2eaf1f00c48abd25428",
659− "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jre_x64_mac_hotspot_8u272b10.tar.gz",
660− "version": "8.0.272"
657+ "build": "8",
658+ "sha256": "9e7a40d570d5151aae23a2fb017359248f5fb82c547c3ecd860c992770228afb",
659+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jre_x64_mac_hotspot_8u282b08.tar.gz",
660+ "version": "8.0.282"
661661 }
662662 },
663663 "openj9": {
664664 "packageType": "jre",
665665 "vmType": "openj9",
666666 "x86_64": {
667− "build": "10",
668− "sha256": "4d90e85240113189d897a86731e672b37a6e345c056f35c7719cb27f3d08385b",
669− "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10.1_openj9-0.23.0/OpenJDK8U-jre_x64_mac_openj9_8u272b10_openj9-0.23.0.tar.gz",
670− "version": "8.0.272"
667+ "build": "8",
668+ "sha256": "884aa20b3aaed504b18ee21575c8da20838f80fb96036e78e70ff6ef613a5283",
669+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jre_x64_mac_openj9_8u282b08_openj9-0.24.0.tar.gz",
670+ "version": "8.0.282"
671671 }
672672 }
673673 }
pkgs/development/compilers/factor-lang/default.nix+2−2
@@ -19,10 +19,10 @@ stdenv.mkDerivation rec {
1919 ./fuel-dir.patch
2020 ];
2121
22− nativeBuildInputs = [ makeWrapper ];
22+ nativeBuildInputs = [ makeWrapper unzip ];
2323 buildInputs = with xorg; [ git rlwrap curl pkg-config perl
2424 libX11 pango cairo gtk2 gdk-pixbuf gtkglext
25− mesa libXmu libXt libICE libSM openssl unzip ];
25+ mesa libXmu libXt libICE libSM openssl ];
2626
2727 buildPhase = ''
2828 sed -ie '4i GIT_LABEL = heads/master-${rev}' GNUmakefile
pkgs/development/compilers/graalvm/default.nix+1−1
@@ -89,7 +89,7 @@ let
8989 makeMxCache = list:
9090 stdenv.mkDerivation {
9191 name = "mx-cache";
92− buildInputs = [ unzip ];
92+ nativeBuildInputs = [ unzip ];
9393 buildCommand = with lib; ''
9494 mkdir $out
9595 ${lib.concatMapStrings
pkgs/development/compilers/gwt/2.4.0.nix+1−1
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
88 sha256 = "1gvyg00vx7fdqgfl2w7nhql78clg3abs6fxxy7m03pprdm5qmm17";
99 };
1010
11− buildInputs = [ unzip ];
11+ nativeBuildInputs = [ unzip ];
1212
1313 installPhase = ''
1414 mkdir -p $out
pkgs/development/compilers/kotlin/default.nix+1−2
@@ -12,8 +12,7 @@ in stdenv.mkDerivation {
1212 };
1313
1414 propagatedBuildInputs = [ jre ] ;
15− buildInputs = [ unzip ] ;
16− nativeBuildInputs = [ makeWrapper ];
15+ nativeBuildInputs = [ makeWrapper unzip ];
1716
1817 installPhase = ''
1918 mkdir -p $out
pkgs/development/compilers/ocaml/generic.nix+4
@@ -66,6 +66,10 @@ stdenv.mkDerivation (args // {
6666 preConfigure = optionalString (!lib.versionAtLeast version "4.04") ''
6767 CAT=$(type -tp cat)
6868 sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang
69+ '' + optionalString (stdenv.isDarwin && stdenv.isAarch64) ''
70+ # Do what upstream does by default now: https://github.com/ocaml/ocaml/pull/10176
71+ # This is required for aarch64-darwin, everything else works as is.
72+ AS="${stdenv.cc}/bin/cc -c" ASPP="${stdenv.cc}/bin/cc -c"
6973 '';
7074 postBuild = ''
7175 mkdir -p $out/include
pkgs/development/compilers/openjdk/11.nix+2−2
@@ -25,9 +25,9 @@ let
2525 sha256 = "06pm3hpz4ggiqwvkgzxr39y9kga7vk4flakfznz5979bvgb926vw";
2626 };
2727
28− nativeBuildInputs = [ pkg-config autoconf ];
28+ nativeBuildInputs = [ pkg-config autoconf unzip ];
2929 buildInputs = [
30− cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib
30+ cpio file which zip perl zlib cups freetype alsaLib libjpeg giflib
3131 libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
3232 libXi libXinerama libXcursor libXrandr fontconfig openjdk11-bootstrap
3333 ] ++ lib.optionals (!headless && enableGnome2) [
pkgs/development/compilers/openjdk/12.nix+2−2
@@ -22,9 +22,9 @@ let
2222 sha256 = "1ndlxmikyy298z7lqpr1bd0zxq7yx6xidj8y3c8mw9m9fy64h9c7";
2323 };
2424
25− nativeBuildInputs = [ pkg-config autoconf ];
25+ nativeBuildInputs = [ pkg-config autoconf unzip ];
2626 buildInputs = [
27− cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib
27+ cpio file which zip perl zlib cups freetype alsaLib libjpeg giflib
2828 libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
2929 libXi libXinerama libXcursor libXrandr fontconfig openjdk11
3030 ] ++ lib.optionals (!headless && enableGnome2) [
pkgs/development/compilers/openjdk/13.nix+2−2
@@ -22,9 +22,9 @@ let
2222 sha256 = "1871ziss7ny19rw8f7bay5vznmhpqbfi4ihn3yygs06wyxhm0zmv";
2323 };
2424
25− nativeBuildInputs = [ pkg-config autoconf ];
25+ nativeBuildInputs = [ pkg-config autoconf unzip ];
2626 buildInputs = [
27− cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib
27+ cpio file which zip perl zlib cups freetype alsaLib libjpeg giflib
2828 libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
2929 libXi libXinerama libXcursor libXrandr fontconfig openjdk13-bootstrap
3030 ] ++ lib.optionals (!headless && enableGnome2) [
pkgs/development/compilers/openjdk/14.nix+2−2
@@ -22,9 +22,9 @@ let
2222 sha256 = "1s1pc6ihzf0awp4hbaqfxmbica0hnrg8nr7s0yd2hfn7nan8xmf3";
2323 };
2424
25− nativeBuildInputs = [ pkg-config autoconf ];
25+ nativeBuildInputs = [ pkg-config autoconf unzip ];
2626 buildInputs = [
27− cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib
27+ cpio file which zip perl zlib cups freetype alsaLib libjpeg giflib
2828 libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
2929 libXi libXinerama libXcursor libXrandr fontconfig openjdk14-bootstrap
3030 ] ++ lib.optionals (!headless && enableGnome2) [
pkgs/development/compilers/openjdk/8.nix+2−2
@@ -83,9 +83,9 @@ let
8383
8484 outputs = [ "out" "jre" ];
8585
86− nativeBuildInputs = [ pkg-config lndir ];
86+ nativeBuildInputs = [ pkg-config lndir unzip ];
8787 buildInputs = [
88− cpio file which unzip zip perl openjdk8-bootstrap zlib cups freetype alsaLib
88+ cpio file which zip perl openjdk8-bootstrap zlib cups freetype alsaLib
8989 libjpeg giflib libX11 libICE libXext libXrender libXtst libXt libXtst
9090 libXi libXinerama libXcursor libXrandr fontconfig
9191 ] ++ lib.optionals (!headless && enableGnome2) [
pkgs/development/compilers/openjdk/darwin/11.nix+2−1
@@ -15,7 +15,8 @@ let
1515 curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/zulu-mac/";
1616 };
1717
18− buildInputs = [ unzip freetype ];
18+ nativeBuildInputs = [ unzip ];
19+ buildInputs = [ freetype ];
1920
2021 installPhase = ''
2122 mkdir -p $out
pkgs/development/compilers/openjdk/darwin/8.nix+2−1
@@ -18,7 +18,8 @@ let
1818 curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/zulu-linux/";
1919 };
2020
21− buildInputs = [ unzip freetype ];
21+ nativeBuildInputs = [ unzip ];
22+ buildInputs = [ freetype ];
2223
2324 installPhase = ''
2425 mkdir -p $out
pkgs/development/compilers/openjdk/darwin/default.nix+2−1
@@ -15,7 +15,8 @@ let
1515 curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/";
1616 };
1717
18− buildInputs = [ unzip freetype ];
18+ nativeBuildInputs = [ unzip ];
19+ buildInputs = [ freetype ];
1920
2021 installPhase = ''
2122 mkdir -p $out
pkgs/development/compilers/openjdk/default.nix+2−2
@@ -22,9 +22,9 @@ let
2222 sha256 = "1h8n5figc9q0k9p8b0qggyhvqagvxanfih1lj5j492c74cd1mx1l";
2323 };
2424
25− nativeBuildInputs = [ pkg-config autoconf ];
25+ nativeBuildInputs = [ pkg-config autoconf unzip ];
2626 buildInputs = [
27− cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib
27+ cpio file which zip perl zlib cups freetype alsaLib libjpeg giflib
2828 libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
2929 libXi libXinerama libXcursor libXrandr fontconfig openjdk15-bootstrap
3030 ] ++ lib.optionals (!headless && enableGnome2) [
pkgs/development/compilers/rust/1_49.nix → pkgs/development/compilers/rust/1_50.nixrenamed+13−13
@@ -19,8 +19,8 @@
1919} @ args:
2020
2121import ./default.nix {
22− rustcVersion = "1.49.0";
23− rustcSha256 = "0yf7kll517398dgqsr7m3gldzj0iwsp3ggzxrayckpqzvylfy2mm";
22+ rustcVersion = "1.50.0";
23+ rustcSha256 = "0pjs7j62maiyvkmhp9zrxl528g2n0fphp4rq6ap7aqdv0a6qz5wm";
2424
2525 llvmSharedForBuild = pkgsBuildBuild.llvm_11.override { enableSharedLibraries = true; };
2626 llvmSharedForHost = pkgsBuildHost.llvm_11.override { enableSharedLibraries = true; };
@@ -33,22 +33,22 @@ import ./default.nix {
3333
3434 # Note: the version MUST be one version prior to the version we're
3535 # building
36− bootstrapVersion = "1.48.0";
36+ bootstrapVersion = "1.49.0";
3737
3838 # fetch hashes by running `print-hashes.sh ${bootstrapVersion}`
3939 bootstrapHashes = {
40− i686-unknown-linux-gnu = "7fdb8836a1f0427d5b47e6a2d496f67ebff04350407411f57cf20c9b3544e26f";
41− x86_64-unknown-linux-gnu = "950420a35b2dd9091f1b93a9ccd5abc026ca7112e667f246b1deb79204e2038b";
42− x86_64-unknown-linux-musl = "4ed9627f57b4e0b9807fc5e7513d9731f4791668b7f875b9e44e65e21072c56f";
43− arm-unknown-linux-gnueabihf = "e68a81eebd4570343a0fc35cb8ee24cad911d6cee2e374f284b76546ca6636d5";
44− armv7-unknown-linux-gnueabihf = "3aed4a63ebdd57690a31d11afbe95e6407edc224a6769be5694a1ed43bf899cb";
45− aarch64-unknown-linux-gnu = "c4769418d8d89f432e4a3a21ad60f99629e4b13bbfc29aef7d9d51c4e8ee8a8a";
46− aarch64-unknown-linux-musl = "ac4de580a28e45a9773b389b296d13bfeeb08263cb1f8343859577a54940dae9";
47− x86_64-apple-darwin = "20e727cad10f43e3abcedb2a80979ae26923038e0e8a855e8a783da255054113";
48− powerpc64le-unknown-linux-gnu = "e6457a0214f3b1b04bd5b2618bba7e3826e254216420dede2971b571a1c13bb1";
40+ i686-unknown-linux-gnu = "5371bfa2c8e566aa283acdfa93d24b981c789d7c040ac1ca74e76bff1c7f6598";
41+ x86_64-unknown-linux-gnu = "8b14446df82f3707d69cf58fed92f18e0bff91621c62baf89288ef70e3e92981";
42+ x86_64-unknown-linux-musl = "f92a5a4adcfac4206a223d089a364a8375d1b6f112f3f2efa3f6d53d08a61904";
43+ arm-unknown-linux-gnueabihf = "e5d93576eef874a9b22be9aa157cac5c8cdebebde8b57f0693248d4a589df42c";
44+ armv7-unknown-linux-gnueabihf = "34ba3c979b144ef27d3c71d177cc1774551edf26e79d36719c86a51d9b9e34c0";
45+ aarch64-unknown-linux-gnu = "b551bd482041307fa3373a687d6d6a2c4c0931c2e0a68b8b75dc80bc5cf5f002";
46+ aarch64-unknown-linux-musl = "0a43d96a508c720520328112d609916d062f866a5c35f1db8f906284035d6d98";
47+ x86_64-apple-darwin = "fe3e248bc4b0ee0a2595693687ad845c8a8bda824a56c9321520bcca02433716";
48+ powerpc64le-unknown-linux-gnu = "365d7721dd2521e5dad12aa73651bad2be375e798e443636d2c523cad5b54359";
4949 };
5050
51− selectRustPackage = pkgs: pkgs.rust_1_49;
51+ selectRustPackage = pkgs: pkgs.rust_1_50;
5252
5353 rustcPatches = [
5454 ];
pkgs/development/haskell-modules/with-packages-wrapper.nix+1−2
@@ -57,9 +57,8 @@ symlinkJoin {
5757 # as a dedicated drv attribute, like `compiler-name`
5858 name = ghc.name + "-with-packages";
5959 paths = paths ++ [ghc];
60+ nativeBuildInputs = [ makeWrapper ];
6061 postBuild = ''
61− . ${makeWrapper}/nix-support/setup-hook
62−
6362 # wrap compiler executables with correct env variables
6463
6564 for prg in ${ghcCommand} ${ghcCommand}i ${ghcCommand}-${ghc.version} ${ghcCommand}i-${ghc.version}; do
pkgs/development/interpreters/angelscript/2.22.nix+2−4
@@ -8,13 +8,11 @@ let
88 url="http://www.angelcode.com/angelscript/sdk/files/angelscript_${version}.zip";
99 sha256 = "1pp853lbnz383ilp9wbgc3wv1dn7lpx3idz8dmzda94rckl7sd43";
1010 };
11− buildInputs = [
12− unzip
13− ];
1411in
1512stdenv.mkDerivation {
1613 inherit (s) name version;
17− inherit buildInputs;
14+ nativeBuildInputs = [ unzip ];
15+
1816 src = fetchurl {
1917 inherit (s) url sha256;
2018 };
pkgs/development/interpreters/angelscript/default.nix+2−4
@@ -8,13 +8,11 @@ let
88 url="http://www.angelcode.com/angelscript/sdk/files/angelscript_${version}.zip";
99 sha256 = "sha256-AQ3UXiPnNNRvWJHXDiaGB6EsuasSUD3aQvhC2dt+iFc=";
1010 };
11− buildInputs = [
12− unzip
13− ];
11+
1412in
1513stdenv.mkDerivation {
1614 inherit (s) name version;
17− inherit buildInputs;
15+ nativeBuildInputs = [ unzip ];
1816 src = fetchurl {
1917 inherit (s) url sha256;
2018 };
pkgs/development/interpreters/clojurescript/lumo/default.nix+1−1
@@ -149,11 +149,11 @@ stdenv.mkDerivation {
149149 sha256 = "12agi6bacqic2wq6q3l28283badzamspajmajzqm7fbdl2aq1a4p";
150150 };
151151
152+ nativeBuildInputs = [ unzip ];
152153 buildInputs = [
153154 nodejs
154155 clojure
155156 jre
156− unzip
157157 python
158158 openssl
159159 gnutar
pkgs/development/interpreters/groovy/default.nix+1−2
@@ -11,8 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "1xdpjqx7qaq0syw448b32q36g12pgh1hn6knyqi3k5isp0f09qmr";
1212 };
1313
14− nativeBuildInputs = [ makeWrapper ];
15− buildInputs = [ unzip ];
14+ nativeBuildInputs = [ makeWrapper unzip ];
1615
1716 installPhase = ''
1817 mkdir -p $out
pkgs/development/interpreters/maude/default.nix+2−1
@@ -22,8 +22,9 @@ stdenv.mkDerivation {
2222 sha256 = "b112d7843f65217e3b5a9d40461698ef8dab7cbbe830af21216dfb924dc88a2f";
2323 };
2424
25+ nativeBuildInputs = [ unzip ];
2526 buildInputs = [
26− flex bison ncurses buddy tecla gmpxx libsigsegv makeWrapper unzip cln yices
27+ flex bison ncurses buddy tecla gmpxx libsigsegv makeWrapper cln yices
2728 ];
2829
2930 hardeningDisable = [ "stackprotector" ] ++
pkgs/development/interpreters/octave/build-env.nix+2−5
@@ -20,17 +20,14 @@ in buildEnv {
2020 inherit ignoreCollisions;
2121 extraOutputsToInstall = [ "out" ] ++ extraOutputsToInstall;
2222
23− buildInputs = [ makeWrapper texinfo wrapOctave ];
23+ nativeBuildInputs = [ makeWrapper ];
24+ buildInputs = [ texinfo wrapOctave ];
2425
2526 # During "build" we must first unlink the /share symlink to octave's /share
2627 # Then, we can re-symlink the all of octave/share, except for /share/octave
2728 # in env/share/octave, re-symlink everything from octave/share/octave and then
2829 # perform the pkg install.
2930 postBuild = ''
30− . "${makeWrapper}/nix-support/setup-hook"
31− # The `makeWrapper` used here is the one defined in
32− # ${makeWrapper}/nix-support/setup-hook
33−
3431 if [ -L "$out/bin" ]; then
3532 unlink $out/bin
3633 mkdir -p "$out/bin"
pkgs/development/interpreters/perl/aarch64-darwin.patchnew file+46
@@ -0,0 +1,46 @@
1+diff --git a/hints/darwin.sh b/hints/darwin.sh
2+index 0a91bc083c0..fdfbdd4a3b9 100644
3+--- a/hints/darwin.sh
4++++ b/hints/darwin.sh
5+@@ -301,7 +301,7 @@ case "$osvers" in # Note: osvers is the kernel version, not the 10.x
6+ # We now use MACOSX_DEPLOYMENT_TARGET, if set, as an override by
7+ # capturing its value and adding it to the flags.
8+ case "$MACOSX_DEPLOYMENT_TARGET" in
9+- 10.*)
10++ [1-9][0-9].*)
11+ add_macosx_version_min ccflags $MACOSX_DEPLOYMENT_TARGET
12+ add_macosx_version_min ldflags $MACOSX_DEPLOYMENT_TARGET
13+ ;;
14+@@ -313,7 +313,7 @@ case "$osvers" in # Note: osvers is the kernel version, not the 10.x
15+
16+ *** Unexpected MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET
17+ ***
18+-*** Please either set it to 10.something, or to empty.
19++*** Please either set it to a valid macOS version number (e.g., 10.15) or to empty.
20+
21+ EOM
22+ exit 1
23+@@ -327,7 +327,7 @@ EOM
24+ # "ProductVersion: 10.11" "10.11"
25+ prodvers=`sw_vers|awk '/^ProductVersion:/{print $2}'|awk -F. '{print $1"."$2}'`
26+ case "$prodvers" in
27+- 10.*)
28++ [1-9][0-9].*)
29+ add_macosx_version_min ccflags $prodvers
30+ add_macosx_version_min ldflags $prodvers
31+ ;;
32+@@ -342,11 +342,10 @@ EOM
33+ exit 1
34+ esac
35+
36+- # The X in 10.X
37+- prodvers_minor=$(echo $prodvers|awk -F. '{print $2}')
38++ darwin_major=$(echo $osvers|awk -F. '{print $1}')
39+
40+- # macOS (10.12) deprecated syscall().
41+- if [ "$prodvers_minor" -ge 12 ]; then
42++ # macOS 10.12 (darwin 16.0.0) deprecated syscall().
43++ if [ "$darwin_major" -ge 16 ]; then
44+ d_syscall='undef'
45+ # If deploying to pre-10.12, suppress Time::HiRes's detection of the system clock_gettime()
46+ case "$MACOSX_DEPLOYMENT_TARGET" in
pkgs/development/interpreters/perl/default.nix+4−1
@@ -41,7 +41,10 @@ let
4141 ]
4242 ++ optional stdenv.isSunOS ./ld-shared.patch
4343 ++ optionals stdenv.isDarwin [ ./cpp-precomp.patch ./sw_vers.patch ]
44− ++ optional crossCompiling ./MakeMaker-cross.patch;
44+ ++ optional crossCompiling ./MakeMaker-cross.patch
45+ # Backporting https://github.com/Perl/perl5/pull/17946, can be
46+ # removed if there's ever a 5.30.x release with it included.
47+ ++ optional (versionOlder version "5.32.1") ./aarch64-darwin.patch;
4548
4649 # This is not done for native builds because pwd may need to come from
4750 # bootstrap tools when building bootstrap perl.
pkgs/development/interpreters/perl/wrapper.nix+2−3
@@ -17,11 +17,10 @@ let
1717 inherit ignoreCollisions;
1818 extraOutputsToInstall = [ "out" ] ++ extraOutputsToInstall;
1919
20+ nativeBuildInputs = [ makeWrapper ];
21+
2022 # we create wrapper for the binaries in the different packages
2123 postBuild = ''
22−
23− . "${makeWrapper}/nix-support/setup-hook"
24−
2524 if [ -L "$out/bin" ]; then
2625 unlink "$out/bin"
2726 fi
pkgs/development/interpreters/python/cpython/2.7/default.nix+6
@@ -106,6 +106,12 @@ let
106106
107107 ./CVE-2021-3177.patch
108108
109+ # The workaround is for unittests on Win64, which we don't support.
110+ # It does break aarch64-darwin, which we do support. See:
111+ # * https://bugs.python.org/issue35523
112+ # * https://github.com/python/cpython/commit/e6b247c8e524
113+ ../3.7/no-win64-workaround.patch
114+
109115 ] ++ optionals (x11Support && stdenv.isDarwin) [
110116 ./use-correct-tcl-tk-on-darwin.patch
111117 ] ++ optionals stdenv.isLinux [
pkgs/development/interpreters/python/cpython/3.7/no-win64-workaround.patchnew file+37
@@ -0,0 +1,37 @@
1+From e6b247c8e524dbe5fc03b3492f628d0d5348bc49 Mon Sep 17 00:00:00 2001
2+From: Victor Stinner <vstinner@redhat.com>
3+Date: Tue, 18 Dec 2018 14:47:21 +0100
4+Subject: [PATCH] bpo-35523: Remove ctypes callback workaround (GH-11211)
5+
6+Remove ctypes callback workaround: no longer create a callback at startup.
7+Avoid SELinux alert on "import ctypes" and "import uuid".
8+---
9+ Lib/ctypes/__init__.py | 5 -----
10+ .../next/Library/2018-12-18-13-52-13.bpo-35523.SkoMno.rst | 2 ++
11+ 2 files changed, 2 insertions(+), 5 deletions(-)
12+ create mode 100644 Misc/NEWS.d/next/Library/2018-12-18-13-52-13.bpo-35523.SkoMno.rst
13+
14+diff --git a/Lib/ctypes/__init__.py b/Lib/ctypes/__init__.py
15+index 6146773988648..5f78beda5866e 100644
16+--- a/Lib/ctypes/__init__.py
17++++ b/Lib/ctypes/__init__.py
18+@@ -266,11 +266,6 @@ def _reset_cache():
19+ # _SimpleCData.c_char_p_from_param
20+ POINTER(c_char).from_param = c_char_p.from_param
21+ _pointer_type_cache[None] = c_void_p
22+- # XXX for whatever reasons, creating the first instance of a callback
23+- # function is needed for the unittests on Win64 to succeed. This MAY
24+- # be a compiler bug, since the problem occurs only when _ctypes is
25+- # compiled with the MS SDK compiler. Or an uninitialized variable?
26+- CFUNCTYPE(c_int)(lambda: None)
27+
28+ def create_unicode_buffer(init, size=None):
29+ """create_unicode_buffer(aString) -> character array
30+diff --git a/Misc/NEWS.d/next/Library/2018-12-18-13-52-13.bpo-35523.SkoMno.rst b/Misc/NEWS.d/next/Library/2018-12-18-13-52-13.bpo-35523.SkoMno.rst
31+new file mode 100644
32+index 0000000000000..94a9fd257383e
33+--- /dev/null
34++++ b/Misc/NEWS.d/next/Library/2018-12-18-13-52-13.bpo-35523.SkoMno.rst
35+@@ -0,0 +1,2 @@
36++Remove :mod:`ctypes` callback workaround: no longer create a callback at
37++startup. Avoid SELinux alert on ``import ctypes`` and ``import uuid``.
pkgs/development/interpreters/python/cpython/default.nix+5
@@ -185,6 +185,11 @@ in with passthru; stdenv.mkDerivation {
185185 # Backport a fix for discovering `rpmbuild` command when doing `python setup.py bdist_rpm` to 3.5, 3.6, 3.7.
186186 # See: https://bugs.python.org/issue11122
187187 ./3.7/fix-hardcoded-path-checking-for-rpmbuild.patch
188+ # The workaround is for unittests on Win64, which we don't support.
189+ # It does break aarch64-darwin, which we do support. See:
190+ # * https://bugs.python.org/issue35523
191+ # * https://github.com/python/cpython/commit/e6b247c8e524
192+ ./3.7/no-win64-workaround.patch
188193 ] ++ optionals (isPy37 || isPy38 || isPy39) [
189194 # Fix darwin build https://bugs.python.org/issue34027
190195 ./3.7/darwin-libutil.patch
pkgs/development/interpreters/python/wrapper.nix+9−4
@@ -1,10 +1,15 @@
1−{ lib, stdenv, python, buildEnv, makeWrapper
1+{ lib, stdenv, buildEnv, makeWrapper
2+
3+# manually pased
4+, python
5+, requiredPythonModules
6+
7+# extra opts
28, extraLibs ? []
39, extraOutputsToInstall ? []
410, postBuild ? ""
511, ignoreCollisions ? false
612, permitUserSite ? false
7−, requiredPythonModules
813# Wrap executables with the given argument.
914, makeWrapperArgs ? []
1015, }:
@@ -22,9 +27,9 @@ let
2227 inherit ignoreCollisions;
2328 extraOutputsToInstall = [ "out" ] ++ extraOutputsToInstall;
2429
25− postBuild = ''
26− . "${makeWrapper}/nix-support/setup-hook"
30+ nativeBuildInputs = [ makeWrapper ];
2731
32+ postBuild = ''
2833 if [ -L "$out/bin" ]; then
2934 unlink "$out/bin"
3035 fi
pkgs/development/interpreters/qnial/default.nix+1−2
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
1111 owner = "vrthra";
1212 };
1313
14− nativeBuildInputs = [ makeWrapper ];
14+ nativeBuildInputs = [ makeWrapper unzip ];
1515
1616 preConfigure = ''
1717 cd build;
@@ -25,7 +25,6 @@ stdenv.mkDerivation {
2525 '';
2626
2727 buildInputs = [
28− unzip
2928 pkg-config
3029 ncurses
3130 ];
pkgs/development/interpreters/ruby/default.nix+17−7
@@ -27,6 +27,7 @@ let
2727 ver = version;
2828 tag = ver.gitTag;
2929 atLeast27 = lib.versionAtLeast ver.majMin "2.7";
30+ atLeast30 = lib.versionAtLeast ver.majMin "3.0";
3031 baseruby = self.override {
3132 useRailsExpress = false;
3233 docSupport = false;
@@ -109,7 +110,9 @@ let
109110 (import ./patchsets.nix {
110111 inherit patchSet useRailsExpress ops fetchpatch;
111112 patchLevel = ver.patchLevel;
112− }).${ver.majMinTiny};
113+ }).${ver.majMinTiny}
114+ ++ op atLeast27 ./do-not-regenerate-revision.h.patch
115+ ++ op (atLeast30 && useRailsExpress) ./do-not-update-gems-baseruby.patch;
113116
114117 postUnpack = opString rubygemsSupport ''
115118 rm -rf $sourceRoot/{lib,test}/rubygems*
@@ -121,17 +124,12 @@ let
121124 sed -i configure.ac -e '/config.guess/d'
122125 cp --remove-destination ${config}/config.guess tool/
123126 cp --remove-destination ${config}/config.sub tool/
127+ '' + opString (!atLeast30) ''
124128 # Make the build reproducible for ruby <= 2.7
125129 # See https://github.com/ruby/io-console/commit/679a941d05d869f5e575730f6581c027203b7b26#diff-d8422f096931c58d4463e2489f62a228b0f24f0492950ba88c8c89a0d741cfe6
126130 sed -i ext/io/console/io-console.gemspec -e '/s\.date/d'
127131 '';
128132
129− # Force the revision.h generation. Somehow `revision.tmp` is an empty
130− # file and because we don't add `git` to buildInputs, hence the check is
131− # always true.
132− # https://github.com/ruby/ruby/commit/97a5af62a318fcd93a4e5e4428d576c0280ddbae
133− buildFlags = lib.optionals atLeast27 [ "REVISION_LATEST=0" ];
134−
135133 configureFlags = ["--enable-shared" "--enable-pthread" "--with-soname=ruby-${version}"]
136134 ++ op useRailsExpress "--with-baseruby=${baseruby}/bin/ruby"
137135 ++ op (!jitSupport) "--disable-jit-support"
@@ -149,6 +147,10 @@ let
149147
150148 preConfigure = opString docSupport ''
151149 configureFlagsArray+=("--with-ridir=$devdoc/share/ri")
150+
151+ # rdoc creates XDG_DATA_DIR (defaulting to $HOME/.local/share) even if
152+ # it's not going to be used.
153+ export HOME=$TMPDIR
152154 '';
153155
154156 # fails with "16993 tests, 2229489 assertions, 105 failures, 14 errors, 89 skips"
@@ -261,4 +263,12 @@ in {
261263 git = "0kbgznf1yprfp9645k31ra5f4757b7fichzi0hdg6nxkj90853s0";
262264 };
263265 };
266+
267+ ruby_3_0 = generic {
268+ version = rubyVersion "3" "0" "0" "";
269+ sha256 = {
270+ src = "0a4fmxafxvkg1m738g2lmkhipwnmd96kzqy1m9kvk3n1l50x2gm1";
271+ git = "0fvnxv97m94nridlc5nvvrlg53pr5g042dkfc5ysd327s7xj4cjp";
272+ };
273+ };
264274}
pkgs/development/interpreters/ruby/do-not-regenerate-revision.h.patchnew file+23
@@ -0,0 +1,23 @@
1+Do not regenerate revision.h
2+
3+Ruby's makefile compares the shipped version with the git revision to regenerate
4+revision.h [1], but since we don't include git in buildInputs, this comparison
5+fails and it can't find $(REVISION_H).
6+
7+[1] https://github.com/ruby/ruby/commit/97a5af62a318fcd93a4e5e4428d576c0280ddbae
8+
9+diff -Naur ruby.old/defs/gmake.mk ruby.new/defs/gmake.mk
10+--- ruby.old/defs/gmake.mk
11++++ ruby.new/defs/gmake.mk
12+@@ -325,11 +325,9 @@
13+
14+ REVISION_IN_HEADER := $(shell sed -n 's/^\#define RUBY_FULL_REVISION "\(.*\)"/\1/p' $(srcdir)/revision.h 2>/dev/null)
15+ REVISION_LATEST := $(shell $(CHDIR) $(srcdir) && git log -1 --format=%H 2>/dev/null)
16+-ifneq ($(REVISION_IN_HEADER),$(REVISION_LATEST))
17+ # GNU make treat the target as unmodified when its dependents get
18+ # updated but it is not updated, while others may not.
19+ $(srcdir)/revision.h: $(REVISION_H)
20+-endif
21+
22+ # Query on the generated rdoc
23+ #
pkgs/development/interpreters/ruby/do-not-update-gems-baseruby.patchnew file+14
@@ -0,0 +1,14 @@
1+Do not update gems when building with base ruby
2+
3+diff -Naur ruby.old/defs/gmake.mk ruby.new/defs/gmake.mk
4+--- ruby.old/common.mk
5++++ ruby.new/common.mk
6+@@ -1298,7 +1298,7 @@ update-config_files: PHONY
7+ config.guess config.sub
8+
9+ refresh-gems: update-bundled_gems prepare-gems
10+-prepare-gems: $(HAVE_BASERUBY:yes=update-gems) $(HAVE_BASERUBY:yes=extract-gems)
11++prepare-gems:
12+
13+ update-gems$(gnumake:yes=-nongnumake): PHONY
14+ $(ECHO) Downloading bundled gem files...
pkgs/development/interpreters/ruby/patchsets.nix+4−5
@@ -1,11 +1,6 @@
11{ patchSet, useRailsExpress, ops, patchLevel, fetchpatch }:
22
33{
4− "2.5.8" = ops useRailsExpress [
5− "${patchSet}/patches/ruby/2.5/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch"
6− "${patchSet}/patches/ruby/2.5/head/railsexpress/02-improve-gc-stats.patch"
7− "${patchSet}/patches/ruby/2.5/head/railsexpress/03-more-detailed-stacktrace.patch"
8− ];
94 "2.6.6" = ops useRailsExpress [
105 "${patchSet}/patches/ruby/2.6/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch"
116 "${patchSet}/patches/ruby/2.6/head/railsexpress/02-improve-gc-stats.patch"
@@ -16,4 +11,8 @@
1611 "${patchSet}/patches/ruby/2.7/head/railsexpress/02-improve-gc-stats.patch"
1712 "${patchSet}/patches/ruby/2.7/head/railsexpress/03-more-detailed-stacktrace.patch"
1813 ];
14+ "3.0.0" = ops useRailsExpress [
15+ "${patchSet}/patches/ruby/3.0/head/railsexpress/01-improve-gc-stats.patch"
16+ "${patchSet}/patches/ruby/3.0/head/railsexpress/02-malloc-trim.patch"
17+ ];
1918}
pkgs/development/interpreters/ruby/rvm-patchsets.nix+2−2
@@ -3,6 +3,6 @@
33fetchFromGitHub {
44 owner = "skaes";
55 repo = "rvm-patchsets";
6− rev = "e2f4b82e47aeaf2a3b894da3b46ba6f0ca92cbb6";
7− sha256 = "059mvf8jcjrfplr8hv2y6ibc41id979k0zwfh6zdnb7dynym4bsg";
6+ rev = "28c6469ce841ff3033c376e78a7043009a3bdc5c";
7+ sha256 = "0kh08hahrwif61sq0qlvgyqiymxi8c8h2dw4s3ln4aq696k4gba9";
88}
pkgs/development/interpreters/spidermonkey/78.nix+13−4
@@ -1,6 +1,5 @@
11{ lib, stdenv
22, fetchurl
3−, fetchpatch
43, autoconf213
54, pkg-config
65, perl
@@ -21,11 +20,11 @@
2120
2221stdenv.mkDerivation rec {
2322 pname = "spidermonkey";
24− version = "78.4.0";
23+ version = "78.8.0";
2524
2625 src = fetchurl {
2726 url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz";
28− sha256 = "1z3hj45bnd12z3g6ajv9qrgclca7fymi1sxj9l9nh9q6y6xz0g4f";
27+ sha256 = "0451hhjrj9hb6limxim7sbhvw4gs6dd2gmnfxjjx07z3wbgdzwhw";
2928 };
3029
3130 outputs = [ "out" "dev" ];
@@ -96,9 +95,19 @@ stdenv.mkDerivation rec {
9695
9796 enableParallelBuilding = true;
9897
98+ postPatch = ''
99+ # This patch is a manually applied fix of
100+ # https://bugzilla.mozilla.org/show_bug.cgi?id=1644600
101+ # Once that bug is fixed, this can be removed.
102+ # This is needed in, for example, `zeroad`.
103+ substituteInPlace js/public/StructuredClone.h \
104+ --replace "class SharedArrayRawBufferRefs {" \
105+ "class JS_PUBLIC_API SharedArrayRawBufferRefs {"
106+ '';
107+
99108 meta = with lib; {
100109 description = "Mozilla's JavaScript engine written in C/C++";
101− homepage = "https://developer.mozilla.org/en/SpiderMonkey";
110+ homepage = "https://spidermonkey.dev/";
102111 license = licenses.gpl2; # TODO: MPL/GPL/LGPL tri-license.
103112 maintainers = with maintainers; [ abbradar lostnet ];
104113 platforms = platforms.linux;
pkgs/development/interpreters/unicon-lang/default.nix+2−2
@@ -7,7 +7,8 @@ stdenv.mkDerivation {
77 url = "http://unicon.org/dist/uni-2-4-2010.zip";
88 sha256 = "1g9l2dfp99dqih2ir2limqfjgagh3v9aqly6x0l3qavx3qkkwf61";
99 };
10− buildInputs = [ libnsl libX11 libXt unzip ];
10+ nativeBuildInputs = [ unzip ];
11+ buildInputs = [ libnsl libX11 libXt ];
1112
1213 hardeningDisable = [ "fortify" ];
1314
@@ -41,4 +42,3 @@ stdenv.mkDerivation {
4142 homepage = "http://unicon.org";
4243 };
4344}
44−
pkgs/development/libraries/AntTweakBar/default.nix+2−1
@@ -3,7 +3,8 @@
33stdenv.mkDerivation {
44 name = "AntTweakBar-1.16";
55
6− buildInputs = [ unzip xorg.libX11 libGLU libGL ];
6+ nativeBuildInputs = [ unzip ];
7+ buildInputs = [ xorg.libX11 libGLU libGL ];
78
89 src = fetchurl {
910 url = "mirror://sourceforge/project/anttweakbar/AntTweakBar_116.zip";
pkgs/development/libraries/amrnb/default.nix+1−1
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
1212 sha256 = "1qgiw02n2a6r32pimnd97v2jkvnw449xrqmaxiivjy2jcr5h141q";
1313 };
1414
15− buildInputs = [ unzip ];
15+ nativeBuildInputs = [ unzip ];
1616
1717 configureFlags = [ "--cache-file=config.cache" "--with-downloader=true" ];
1818
pkgs/development/libraries/amrwb/default.nix+1−1
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414 sha256 = "1p6m9nd08mv525w14py9qzs9zwsa5i3vxf5bgcmcvc408jqmkbsw";
1515 };
1616
17− buildInputs = [ unzip ];
17+ nativeBuildInputs = [ unzip ];
1818
1919 configureFlags = [ "--cache-file=config.cache" "--with-downloader=true" ];
2020
pkgs/development/libraries/boost-process/default.nix+1−1
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
88 sha256 = "1v9y9pffb2b7p642kp9ic4z6kg42ziizmyvbgrqd1ci0i4gn0831";
99 };
1010
11− buildInputs = [ unzip ];
11+ nativeBuildInputs = [ unzip ];
1212
1313 unpackPhase = ''
1414 mkdir $name
pkgs/development/libraries/dav1d/default.nix+5−3
@@ -1,5 +1,6 @@
11{ lib, stdenv, fetchFromGitLab
22, meson, ninja, nasm, pkg-config
3+, xxHash
34, withTools ? false # "dav1d" binary
45, withExamples ? false, SDL2 # "dav1dplay" binary
56, useVulkan ? false, libplacebo, vulkan-loader, vulkan-headers
@@ -9,19 +10,20 @@ assert useVulkan -> withExamples;
910
1011stdenv.mkDerivation rec {
1112 pname = "dav1d";
12− version = "0.8.1";
13+ version = "0.8.2";
1314
1415 src = fetchFromGitLab {
1516 domain = "code.videolan.org";
1617 owner = "videolan";
1718 repo = pname;
1819 rev = version;
19− sha256 = "1820fpmmq1vxjzjmza6ydk4fgxipb8gmcc5skybki64qn7410v7x";
20+ sha256 = "0plmnxpz66yv3nqv1kgbyyfnwfqi9dqs0zbsdj488i6464a1m6si";
2021 };
2122
2223 nativeBuildInputs = [ meson ninja nasm pkg-config ];
2324 # TODO: doxygen (currently only HTML and not build by default).
24− buildInputs = lib.optional withExamples SDL2
25+ buildInputs = [ xxHash ]
26+ ++ lib.optional withExamples SDL2
2527 ++ lib.optionals useVulkan [ libplacebo vulkan-loader vulkan-headers ];
2628
2729 mesonFlags= [
pkgs/development/libraries/ffmpeg-full/default.nix−5
@@ -246,11 +246,6 @@ stdenv.mkDerivation rec {
246246
247247 # this should go away in the next release
248248 patches = [
249− (fetchpatch {
250− url = "https://git.videolan.org/?p=ffmpeg.git;a=patch;h=7c59e1b0f285cd7c7b35fcd71f49c5fd52cf9315";
251− sha256 = "sha256-dqpmpDFETTuWHWolMoLaubU4BeDEuQaBNA0wmzL1f8o=";
252− name = "fix_libsrt.patch";
253− })
254249 # Patch ffmpeg for svt-av1 until version 4.4
255250 (fetchpatch {
256251 url = "https://raw.githubusercontent.com/AOMediaCodec/SVT-AV1/v0.8.4/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch";
pkgs/development/libraries/ffmpeg/4.nix+2−2
@@ -5,8 +5,8 @@
55}@args:
66
77callPackage ./generic.nix (rec {
8− version = "4.3.1";
8+ version = "4.3.2";
99 branch = "4.3";
10− sha256 = "1nghcpm2r9ir2h6xpqfn9381jq6aiwlkwlnyplxywvkbjiisr97l";
10+ sha256 = "0flik4y7c5kchj65p3p908mk1dsncqgzjdvzysjs12rmf1m6sfmb";
1111 darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ];
1212} // args)
pkgs/development/libraries/freetts/default.nix+2−1
@@ -6,7 +6,8 @@ stdenv.mkDerivation {
66 url = "mirror://sourceforge/freetts/freetts-1.2.2-src.zip";
77 sha256 = "0mnikqhpf4f4jdr0irmibr8yy0dnffx1i257y22iamxi7a6by2r7";
88 };
9− buildInputs = [ apacheAnt unzip sharutils jdk ];
9+ nativeBuildInputs = [ unzip ];
10+ buildInputs = [ apacheAnt sharutils jdk ];
1011 unpackPhase = ''
1112 unzip $src -x META-INF/*
1213 '';
pkgs/development/libraries/gdal/2.4.nix+2−1
@@ -16,7 +16,8 @@ stdenv.mkDerivation rec {
1616 sha256 = "1n6w0m2603q9cldlz0wyscp75ci561dipc36jqbf3mjmylybv0x3";
1717 };
1818
19− buildInputs = [ unzip libjpeg libtiff libgeotiff libpng proj openssl sqlite
19+ nativeBuildInputs = [ unzip ];
20+ buildInputs = [ libjpeg libtiff libgeotiff libpng proj openssl sqlite
2021 libspatialite poppler hdf4 qhull giflib expat libxml2 proj ]
2122 ++ (with pythonPackages; [ python numpy wrapPython ])
2223 ++ lib.optional stdenv.isDarwin libiconv
pkgs/development/libraries/gdal/default.nix+1−2
@@ -18,10 +18,9 @@ stdenv.mkDerivation rec {
1818
1919 sourceRoot = "source/gdal";
2020
21− nativeBuildInputs = [ autoreconfHook pkg-config ];
21+ nativeBuildInputs = [ autoreconfHook pkg-config unzip ];
2222
2323 buildInputs = [
24− unzip
2524 libjpeg
2625 libtiff
2726 libpng
pkgs/development/libraries/gdal/gdal-1_11.nix+2−1
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
1111 sha256 = "0hphxzvy23v3vqxx1y22hhhg4cypihrb8555y12nb4mrhzlw7zfl";
1212 };
1313
14− buildInputs = [ unzip libjpeg libtiff libgeotiff libpng python pythonPackages.numpy proj openssl ];
14+ nativeBuildInputs = [ unzip ];
15+ buildInputs = [ libjpeg libtiff libgeotiff libpng python pythonPackages.numpy proj openssl ];
1516
1617 patches = [
1718 # This ensures that the python package is installed into gdal's prefix,
pkgs/development/libraries/glib/default.nix+7−2
@@ -92,6 +92,7 @@ stdenv.mkDerivation rec {
9292 buildInputs = [
9393 libelf setupHook pcre
9494 bash gnum4 # install glib-gettextize and m4 macros for other apps to use
95+ gtk-doc
9596 ] ++ optionals stdenv.isLinux [
9697 libselinux
9798 util-linuxMinimal # for libmount
@@ -99,8 +100,10 @@ stdenv.mkDerivation rec {
99100 AppKit Carbon Cocoa CoreFoundation CoreServices Foundation
100101 ]);
101102
103+ strictDeps = true;
104+
102105 nativeBuildInputs = [
103− meson ninja pkg-config perl python3 gettext gtk-doc docbook_xsl docbook_xml_dtd_45
106+ meson ninja pkg-config perl python3 gettext gtk-doc docbook_xsl docbook_xml_dtd_45 libxml2
104107 ];
105108
106109 propagatedBuildInputs = [ zlib libffi gettext libiconv ];
@@ -120,6 +123,8 @@ stdenv.mkDerivation rec {
120123 "-DG_DISABLE_CAST_CHECKS"
121124 ];
122125
126+ hardeningDisable = [ "pie" ];
127+
123128 postPatch = ''
124129 chmod +x gio/tests/gengiotypefuncs.py
125130 patchShebangs gio/tests/gengiotypefuncs.py
@@ -144,7 +149,7 @@ stdenv.mkDerivation rec {
144149 cp -r ${buildPackages.glib.devdoc} $devdoc
145150 '';
146151
147− checkInputs = [ tzdata libxml2 desktop-file-utils shared-mime-info ];
152+ checkInputs = [ tzdata desktop-file-utils shared-mime-info ];
148153
149154 preCheck = optionalString doCheck ''
150155 export LD_LIBRARY_PATH="$NIX_BUILD_TOP/${pname}-${version}/glib/.libs''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"
pkgs/development/libraries/gsm/default.nix+2
@@ -18,6 +18,8 @@ stdenv.mkDerivation rec {
1818 };
1919
2020 patchPhase = ''
21+ substituteInPlace Makefile \
22+ --replace "= gcc " "?= gcc "
2123 # Fix include directory
2224 sed -e 's,$(GSM_INSTALL_ROOT)/inc,$(GSM_INSTALL_ROOT)/include/gsm,' -i Makefile
2325 '' + optionalString (!staticSupport) (
pkgs/development/libraries/gtdialog/default.nix+2−2
@@ -9,9 +9,9 @@ let
99 url="https://foicica.com/gtdialog/download/gtdialog_1.4.zip";
1010 sha256="1lhsaz56s8m838fi6vnfcd2r6djymvy3n2pbqhii88hraapq3rfk";
1111 };
12− nativeBuildInputs = [ pkg-config ];
12+ nativeBuildInputs = [ pkg-config unzip ];
1313 buildInputs = [
14− cdk unzip gtk2 glib ncurses
14+ cdk gtk2 glib ncurses
1515 ];
1616in
1717stdenv.mkDerivation {
pkgs/development/libraries/gtk/2.x.nix+12−2
@@ -1,4 +1,4 @@
1−{ config, lib, stdenv, fetchurl, pkg-config, gettext, glib, atk, pango, cairo, perl, xorg
1+{ config, lib, substituteAll, stdenv, fetchurl, pkg-config, gettext, glib, atk, pango, cairo, perl, xorg
22, gdk-pixbuf, xlibsWrapper, gobject-introspection
33, xineramaSupport ? stdenv.isLinux
44, cupsSupport ? config.gtk2.cups or stdenv.isLinux, cups ? null
@@ -12,6 +12,16 @@ assert cupsSupport -> cups != null;
1212
1313with lib;
1414
15+let
16+
17+ gtkCleanImmodulesCache = substituteAll {
18+ src = ./hooks/clean-immodules-cache.sh;
19+ gtk_module_path = "gtk-2.0";
20+ gtk_binary_version = "2.10.0";
21+ };
22+
23+in
24+
1525stdenv.mkDerivation rec {
1626 pname = "gtk+";
1727 version = "2.24.32";
@@ -27,8 +37,8 @@ stdenv.mkDerivation rec {
2737 enableParallelBuilding = true;
2838
2939 setupHooks = [
30− ./hooks/gtk2-clean-immodules-cache.sh
3140 ./hooks/drop-icon-theme-cache.sh
41+ gtkCleanImmodulesCache
3242 ];
3343
3444 nativeBuildInputs = setupHooks ++ [ perl pkg-config gettext gobject-introspection ];
pkgs/development/libraries/gtk/3.x.nix+14−2
@@ -1,4 +1,6 @@
1−{ lib, stdenv
1+{ lib
2+, stdenv
3+, substituteAll
24, fetchurl
35, fetchpatch
46, pkg-config
@@ -48,6 +50,16 @@
4850
4951assert cupsSupport -> cups != null;
5052
53+let
54+
55+ gtkCleanImmodulesCache = substituteAll {
56+ src = ./hooks/clean-immodules-cache.sh;
57+ gtk_module_path = "gtk-3.0";
58+ gtk_binary_version = "3.0.0";
59+ };
60+
61+in
62+
5163stdenv.mkDerivation rec {
5264 pname = "gtk+3";
5365 version = "3.24.24";
@@ -56,8 +68,8 @@ stdenv.mkDerivation rec {
5668 outputBin = "dev";
5769
5870 setupHooks = [
59− ./hooks/gtk3-clean-immodules-cache.sh
6071 ./hooks/drop-icon-theme-cache.sh
72+ gtkCleanImmodulesCache
6173 ];
6274
6375 src = fetchurl {
pkgs/development/libraries/gtk/4.x.nix+12−1
@@ -1,5 +1,6 @@
11{ lib
22, stdenv
3+, substituteAll
34, fetchurl
45, pkg-config
56, gettext
@@ -53,6 +54,16 @@
5354
5455assert cupsSupport -> cups != null;
5556
57+let
58+
59+ gtkCleanImmodulesCache = substituteAll {
60+ src = ./hooks/clean-immodules-cache.sh;
61+ gtk_module_path = "gtk-4.0";
62+ gtk_binary_version = "4.0.0";
63+ };
64+
65+in
66+
5667stdenv.mkDerivation rec {
5768 pname = "gtk4";
5869 version = "4.0.3";
@@ -61,8 +72,8 @@ stdenv.mkDerivation rec {
6172 outputBin = "dev";
6273
6374 setupHooks = [
64− ./hooks/gtk4-clean-immodules-cache.sh
6575 ./hooks/drop-icon-theme-cache.sh
76+ gtkCleanImmodulesCache
6677 ];
6778
6879 src = fetchurl {
pkgs/development/libraries/gtk/hooks/clean-immodules-cache.shnew file+15
@@ -0,0 +1,15 @@
1+# shellcheck shell=bash
2+
3+fixupOutputHooks+=(_gtkCleanImmodulesCache)
4+
5+# Clean comments that link to generator of the file
6+_gtkCleanImmodulesCache() {
7+ # gtk_module_path is where the modules are installed
8+ # https://gitlab.gnome.org/GNOME/gtk/-/blob/3.24.24/gtk/gtkmodules.c#L68
9+ # gtk_binary_version can be retrived with:
10+ # pkg-config --variable=gtk_binary_version gtk+-3.0
11+ local f="${prefix:?}/lib/@gtk_module_path@/@gtk_binary_version@/immodules.cache"
12+ if [ -f "$f" ]; then
13+ sed 's|Created by .*bin/gtk-query-|Created by bin/gtk-query-|' -i "$f"
14+ fi
15+}
pkgs/development/libraries/gtk/hooks/gtk2-clean-immodules-cache.shdeleted−12
@@ -1,12 +0,0 @@
1−# shellcheck shell=bash
2−
3−fixupOutputHooks+=(_gtk2CleanComments)
4−
5−# Clean comments that link to generator of the file
6−_gtk2CleanComments() {
7− local f="${prefix:?}/lib/gtk-2.0/2.10.0/immodules.cache"
8− if [ -f "$f" ]; then
9− sed 's|Created by .*bin/gtk-query-|Created by bin/gtk-query-|' -i "$f"
10− fi
11−}
12−
pkgs/development/libraries/gtk/hooks/gtk3-clean-immodules-cache.shdeleted−11
@@ -1,11 +0,0 @@
1−# shellcheck shell=bash
2−
3−fixupOutputHooks+=(_gtk3CleanComments)
4−
5−# Clean comments that link to generator of the file
6−_gtk3CleanComments() {
7− local f="${prefix:?}/lib/gtk-3.0/3.0.0/immodules.cache"
8− if [ -f "$f" ]; then
9− sed 's|Created by .*bin/gtk-query-|Created by bin/gtk-query-|' -i "$f"
10− fi
11−}
pkgs/development/libraries/gtk/hooks/gtk4-clean-immodules-cache.shdeleted−11
@@ -1,11 +0,0 @@
1−# shellcheck shell=bash
2−
3−fixupOutputHooks+=(_gtk4CleanComments)
4−
5−# Clean comments that link to generator of the file
6−_gtk4CleanComments() {
7− local f="${prefix:?}/lib/gtk-4.0/4.0.0/immodules.cache"
8− if [ -f "$f" ]; then
9− sed 's|Created by .*bin/gtk-query-|Created by bin/gtk-query-|' -i "$f"
10− fi
11−}
pkgs/development/libraries/hawknl/default.nix+1−1
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
88 sha256 = "11shn2fbxj3w0j77w0234pqyj1368x686kkgv09q5yqhi1cdp028";
99 };
1010
11− buildInputs = [ unzip ];
11+ nativeBuildInputs = [ unzip ];
1212
1313 makefile = "makefile.linux";
1414
pkgs/development/libraries/herqq/default.nix+2−2
@@ -4,8 +4,8 @@ mkDerivation rec {
44 version = "unstable-20-06-26";
55 pname = "herqq";
66
7− nativeBuildInputs = [ qmake ];
8− buildInputs = [ qtbase unzip qtmultimedia ];
7+ nativeBuildInputs = [ qmake unzip ];
8+ buildInputs = [ qtbase qtmultimedia ];
99
1010 outputs = [ "out" "dev" ];
1111
pkgs/development/libraries/hunspell/dictionaries.nix+6−5
@@ -45,7 +45,8 @@ let
4545 platforms = platforms.all;
4646 };
4747 phases = "unpackPhase patchPhase buildPhase installPhase";
48− buildInputs = [ bash coreutils unzip which zip ];
48+ nativeBuildInputs = [ unzip ];
49+ buildInputs = [ bash coreutils which zip ];
4950 patchPhase = ''
5051 substituteInPlace ortograf/herramientas/make_dict.sh \
5152 --replace /bin/bash bash \
@@ -86,7 +87,7 @@ let
8687 license = licenses.lgpl3;
8788 platforms = platforms.all;
8889 };
89− buildInputs = [ unzip ];
90+ nativeBuildInputs = [ unzip ];
9091 phases = "unpackPhase installPhase";
9192 sourceRoot = ".";
9293 unpackCmd = ''
@@ -126,7 +127,7 @@ let
126127 maintainers = with maintainers; [ renzo ];
127128 platforms = platforms.all;
128129 };
129− buildInputs = [ unzip ];
130+ nativeBuildInputs = [ unzip ];
130131 phases = "unpackPhase installPhase";
131132 sourceRoot = ".";
132133 unpackCmd = ''
@@ -155,7 +156,7 @@ let
155156 maintainers = with maintainers; [ renzo ];
156157 platforms = platforms.all;
157158 };
158− buildInputs = [ unzip ];
159+ nativeBuildInputs = [ unzip ];
159160 phases = "unpackPhase installPhase";
160161 sourceRoot = ".";
161162 unpackCmd = ''
@@ -182,7 +183,7 @@ let
182183 maintainers = with maintainers; [ renzo ];
183184 platforms = platforms.all;
184185 };
185− buildInputs = [ unzip ];
186+ nativeBuildInputs = [ unzip ];
186187 phases = "unpackPhase patchPhase installPhase";
187188 sourceRoot = ".";
188189 prePatch = ''
pkgs/development/libraries/hwloc/default.nix+2−2
@@ -7,7 +7,7 @@ assert x11Support -> libX11 != null && cairo != null;
77with lib;
88
99let
10− version = "2.4.0";
10+ version = "2.4.1";
1111 versmm = versions.major version + "." + versions.minor version;
1212 name = "hwloc-${version}";
1313
@@ -16,7 +16,7 @@ in stdenv.mkDerivation {
1616
1717 src = fetchurl {
1818 url = "https://www.open-mpi.org/software/hwloc/v${versmm}/downloads/${name}.tar.bz2";
19− sha256 = "1s9q70mrr4igbjw4m26din81i68f4wbfpv6wdc4i2aalvd51n7rb";
19+ sha256 = "sha256-OSQh5p8mEgyKuV0VH+mJ8rS2nas8dzV0HE4KbX3l3mM=";
2020 };
2121
2222 configureFlags = [
pkgs/development/libraries/irrlicht/default.nix+2−1
@@ -27,7 +27,8 @@ stdenv.mkDerivation rec {
2727 mkdir -p $out/lib
2828 '';
2929
30− buildInputs = [ unzip libGLU libGL libXrandr libX11 libXxf86vm ];
30+ nativeBuildInputs = [ unzip ];
31+ buildInputs = [ libGLU libGL libXrandr libX11 libXxf86vm ];
3132
3233 meta = {
3334 homepage = "http://irrlicht.sourceforge.net/";
pkgs/development/libraries/irrlicht/mac.nix+2−2
@@ -31,8 +31,8 @@ stdenv.mkDerivation rec {
3131 "-DIRRLICHT_BUILD_TOOLS=OFF"
3232 ];
3333
34− nativeBuildInputs = [ cmake ];
35− buildInputs = [ unzip OpenGL Cocoa IOKit ];
34+ nativeBuildInputs = [ cmake unzip ];
35+ buildInputs = [ OpenGL Cocoa IOKit ];
3636
3737 meta = {
3838 homepage = "http://irrlicht.sourceforge.net/";
pkgs/development/libraries/jama/default.nix+1−1
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "031ns526fvi2nv7jzzv02i7i5sjcyr0gj884i3an67qhsx8vyckl";
1010 };
1111
12− buildInputs = [ unzip ];
12+ nativeBuildInputs = [ unzip ];
1313 propagatedBuildInputs = [ tnt ];
1414
1515 unpackPhase = ''
pkgs/development/libraries/java/geoipjava/default.nix+2−1
@@ -6,7 +6,8 @@ stdenv.mkDerivation {
66 url = "https://geolite.maxmind.com/download/geoip/api/java/GeoIPJava-1.2.5.zip";
77 sha256 = "1gb2d0qvvq7xankz7l7ymbr3qprwk9bifpy4hlgw0sq4i6a55ypd";
88 };
9− buildInputs = [ jdk unzip ];
9+ nativeBuildInputs = [ unzip ];
10+ buildInputs = [ jdk ];
1011 buildPhase =
1112 ''
1213 cd source
pkgs/development/libraries/java/rhino/default.nix+2−1
@@ -31,7 +31,8 @@ stdenv.mkDerivation {
3131 ln -sv "${xbeans}" "build/tmp-xbean/xbean.zip"
3232 '';
3333
34− buildInputs = [ unzip ant javac jvm ];
34+ nativeBuildInputs = [ unzip ];
35+ buildInputs = [ ant javac jvm ];
3536
3637 buildPhase = "ant jar";
3738 doCheck = false;
pkgs/development/libraries/kde-frameworks/attica.nix+1−1
@@ -4,7 +4,7 @@ mkDerivation {
44 name = "attica";
55 meta = {
66 maintainers = [ lib.maintainers.ttuegel ];
7− broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
7+ broken = builtins.compareVersions qtbase.version "5.14.0" < 0;
88 };
99 nativeBuildInputs = [ extra-cmake-modules ];
1010 buildInputs = [ qtbase ];
pkgs/development/libraries/kde-frameworks/fetch.sh+1−1
@@ -1 +1 @@
1−WGET_ARGS=( https://download.kde.org/stable/frameworks/5.78/ -A '*.tar.xz' )
1+WGET_ARGS=( https://download.kde.org/stable/frameworks/5.79/ -A '*.tar.xz' )
pkgs/development/libraries/kde-frameworks/karchive.nix+1−1
@@ -8,7 +8,7 @@ mkDerivation {
88 name = "karchive";
99 meta = {
1010 maintainers = [ lib.maintainers.ttuegel ];
11− broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
11+ broken = builtins.compareVersions qtbase.version "5.14.0" < 0;
1212 };
1313 nativeBuildInputs = [ extra-cmake-modules ];
1414 buildInputs = [ bzip2 lzma zlib ];
pkgs/development/libraries/kde-frameworks/kcodecs.nix+1−1
@@ -4,7 +4,7 @@ mkDerivation {
44 name = "kcodecs";
55 meta = {
66 maintainers = [ lib.maintainers.ttuegel ];
7− broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
7+ broken = builtins.compareVersions qtbase.version "5.14.0" < 0;
88 };
99 nativeBuildInputs = [ extra-cmake-modules ];
1010 buildInputs = [ qttools gperf ];
pkgs/development/libraries/kde-frameworks/kcompletion.nix+1−8
@@ -1,5 +1,5 @@
11{
2− mkDerivation, lib, fetchpatch,
2+ mkDerivation, lib,
33 extra-cmake-modules,
44 kconfig, kwidgetsaddons, qtbase, qttools
55}:
@@ -7,13 +7,6 @@
77mkDerivation {
88 name = "kcompletion";
99 meta = { maintainers = [ lib.maintainers.ttuegel ]; };
10− patches = [
11− # https://mail.kde.org/pipermail/distributions/2021-January/000928.html
12− (fetchpatch {
13− url = "https://invent.kde.org/frameworks/kcompletion/commit/7acda936f06193e9fc85ae5cf9ccc8d65971f657.patch";
14− sha256 = "150ff506rhr5pin5363ks222vhv8qd77y5s5nyylcbdjry3ljd3n";
15− })
16− ];
1710 nativeBuildInputs = [ extra-cmake-modules ];
1811 buildInputs = [ kconfig kwidgetsaddons qttools ];
1912 propagatedBuildInputs = [ qtbase ];
pkgs/development/libraries/kde-frameworks/kconfig.nix+1−1
@@ -4,7 +4,7 @@ mkDerivation {
44 name = "kconfig";
55 meta = {
66 maintainers = [ lib.maintainers.ttuegel ];
7− broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
7+ broken = builtins.compareVersions qtbase.version "5.14.0" < 0;
88 };
99 nativeBuildInputs = [ extra-cmake-modules ];
1010 buildInputs = [ qttools ];
pkgs/development/libraries/kde-frameworks/kcoreaddons.nix+1−1
@@ -8,7 +8,7 @@ mkDerivation {
88 name = "kcoreaddons";
99 meta = {
1010 maintainers = [ lib.maintainers.ttuegel ];
11− broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
11+ broken = builtins.compareVersions qtbase.version "5.14.0" < 0;
1212 };
1313 nativeBuildInputs = [ extra-cmake-modules ];
1414 buildInputs = [ qttools shared-mime-info ];
pkgs/development/libraries/kde-frameworks/kdbusaddons.nix+1−1
@@ -8,7 +8,7 @@ mkDerivation {
88 name = "kdbusaddons";
99 meta = {
1010 maintainers = [ lib.maintainers.ttuegel ];
11− broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
11+ broken = builtins.compareVersions qtbase.version "5.14.0" < 0;
1212 };
1313 nativeBuildInputs = [ extra-cmake-modules ];
1414 buildInputs = [ qttools qtx11extras ];
pkgs/development/libraries/kde-frameworks/kdesu/kdesu-search-for-wrapped-daemon-first.patch+2−2
@@ -17,14 +17,14 @@ index 44fbacd..6b5abf5 100644
1717
1818 static QString findDaemon()
1919 {
20−- QString daemon = QFile::decodeName(CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/kdesud");
20+- QString daemon = QFile::decodeName(KDE_INSTALL_FULL_LIBEXECDIR_KF5 "/kdesud");
2121- if (!QFile::exists(daemon)) { // if not in libexec, find it in PATH
2222- daemon = QStandardPaths::findExecutable(QStringLiteral("kdesud"));
2323- if (daemon.isEmpty()) {
2424- 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
27−+ daemon = QFile::decodeName(CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/kdesud");
27++ daemon = QFile::decodeName(KDE_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()) {
pkgs/development/libraries/kde-frameworks/kdnssd.nix+1−1
@@ -8,7 +8,7 @@ mkDerivation {
88 name = "kdnssd";
99 meta = {
1010 maintainers = [ lib.maintainers.ttuegel ];
11− broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
11+ broken = builtins.compareVersions qtbase.version "5.14.0" < 0;
1212 };
1313 nativeBuildInputs = [ extra-cmake-modules ];
1414 buildInputs = [ avahi qttools ];
pkgs/development/libraries/kde-frameworks/kfilemetadata/cmake-install-paths.patch+1−1
@@ -6,7 +6,7 @@ Index: kfilemetadata-5.18.0/src/CMakeLists.txt
66
77 install(EXPORT KF5FileMetaDataTargets
88 NAMESPACE KF5::
9−- DESTINATION ${LIB_INSTALL_DIR}/cmake/KF5FileMetaData
9+- DESTINATION ${KDE_INSTALL_LIBDIR}/cmake/KF5FileMetaData
1010+ DESTINATION ${KDE_INSTALL_FULL_CMAKEPACKAGEDIR}/KF5FileMetaData
1111 FILE KF5FileMetaDataTargets.cmake)
1212
pkgs/development/libraries/kde-frameworks/ki18n.nix+1−1
@@ -8,7 +8,7 @@ mkDerivation {
88 name = "ki18n";
99 meta = {
1010 maintainers = [ lib.maintainers.ttuegel ];
11− broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
11+ broken = builtins.compareVersions qtbase.version "5.14.0" < 0;
1212 };
1313 nativeBuildInputs = [ extra-cmake-modules ];
1414 propagatedNativeBuildInputs = [ gettext python3 ];
pkgs/development/libraries/kde-frameworks/kidletime.nix+1−1
@@ -8,7 +8,7 @@ mkDerivation {
88 name = "kidletime";
99 meta = {
1010 maintainers = [ lib.maintainers.ttuegel ];
11− broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
11+ broken = builtins.compareVersions qtbase.version "5.14.0" < 0;
1212 };
1313 nativeBuildInputs = [ extra-cmake-modules ];
1414 buildInputs = [ qtx11extras ];
pkgs/development/libraries/kde-frameworks/kinit/0001-kinit-libpath.patch+1−1
@@ -20,7 +20,7 @@ index 8fff17a..0801b75 100644
2020- // https://sourceware.org/bugzilla/show_bug.cgi?id=13945
2121- // - so we try hacking it in ourselves
2222- QString install_lib_dir = QFile::decodeName(
23−- CMAKE_INSTALL_PREFIX "/" LIB_INSTALL_DIR "/");
23+- CMAKE_INSTALL_PREFIX "/" KDE_INSTALL_LIBDIR "/");
2424- QString orig_libpath = libpath;
2525- libpath = install_lib_dir + libpath;
2626- l.setFileName(libpath);
pkgs/development/libraries/kde-frameworks/kinit/0002-start_kdeinit-path.patch+1−1
@@ -15,7 +15,7 @@ index 891f50c..ef664ad 100644
1515 #include <string.h>
1616 #include <unistd.h>
1717
18−-#define EXECUTE CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/start_kdeinit"
18+-#define EXECUTE KDE_INSTALL_FULL_LIBEXECDIR_KF5 "/start_kdeinit"
1919+#define EXECUTE "/run/wrappers/bin/start_kdeinit"
2020
2121 #if KDEINIT_OOM_PROTECT
pkgs/development/libraries/kde-frameworks/kinit/0003-kdeinit-extra-libs.patch+1−1
@@ -33,7 +33,7 @@ index 0801b75..622dd5f 100644
3333-// Completely unrelated to plugins.
3434-static QString findSharedLib(const QString &lib)
3535-{
36−- QString path = QFile::decodeName(CMAKE_INSTALL_PREFIX "/" LIB_INSTALL_DIR "/") + lib;
36+- QString path = QFile::decodeName(CMAKE_INSTALL_PREFIX "/" KDE_INSTALL_LIBDIR "/") + lib;
3737- if (QFile::exists(path)) {
3838- return path;
3939- }
pkgs/development/libraries/kde-frameworks/kio/default.nix+1−6
@@ -24,10 +24,5 @@ mkDerivation {
2424 patches = [
2525 ./samba-search-path.patch
2626 ./kio-debug-module-loader.patch
27− # https://mail.kde.org/pipermail/distributions/2021-February/000938.html
28− (fetchpatch {
29− url = "https://invent.kde.org/frameworks/kio/commit/a183dd0d1ee0659e5341c7cb4117df27edd6f125.patch";
30− sha256 = "1msnzi93zggxgarx962gnlz1slx13nc3l54wib3rdlj0xnnlfdnd";
31− })
32− ];
27+ ];
3328}
pkgs/development/libraries/kde-frameworks/kirigami2.nix+1−1
@@ -3,7 +3,7 @@
33mkDerivation {
44 name = "kirigami2";
55 meta = {
6− broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
6+ broken = builtins.compareVersions qtbase.version "5.14.0" < 0;
77 };
88 nativeBuildInputs = [ extra-cmake-modules ];
99 buildInputs = [ qtbase qtquickcontrols2 qttranslations qtgraphicaleffects ];
pkgs/development/libraries/kde-frameworks/kitemmodels.nix+1−1
@@ -8,7 +8,7 @@ mkDerivation {
88 name = "kitemmodels";
99 meta = {
1010 maintainers = [ lib.maintainers.ttuegel ];
11− broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
11+ broken = builtins.compareVersions qtbase.version "5.14.0" < 0;
1212 };
1313 nativeBuildInputs = [ extra-cmake-modules ];
1414 propagatedBuildInputs = [ qtbase ];
pkgs/development/libraries/kde-frameworks/kitemviews.nix+1−1
@@ -8,7 +8,7 @@ mkDerivation {
88 name = "kitemviews";
99 meta = {
1010 maintainers = [ lib.maintainers.ttuegel ];
11− broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
11+ broken = builtins.compareVersions qtbase.version "5.14.0" < 0;
1212 };
1313 nativeBuildInputs = [ extra-cmake-modules ];
1414 buildInputs = [ qttools ];
pkgs/development/libraries/kde-frameworks/kplotting.nix+1−1
@@ -6,7 +6,7 @@ mkDerivation {
66 name = "kplotting";
77 meta = {
88 maintainers = [ lib.maintainers.ttuegel ];
9− broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
9+ broken = builtins.compareVersions qtbase.version "5.14.0" < 0;
1010 };
1111 nativeBuildInputs = [ extra-cmake-modules ];
1212 propagatedBuildInputs = [ qtbase qttools ];
pkgs/development/libraries/kde-frameworks/kwayland.nix+1−1
@@ -8,7 +8,7 @@ mkDerivation {
88 name = "kwayland";
99 meta = {
1010 maintainers = [ lib.maintainers.ttuegel ];
11− broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
11+ broken = builtins.compareVersions qtbase.version "5.14.0" < 0;
1212 };
1313 nativeBuildInputs = [ extra-cmake-modules ];
1414 buildInputs = [ plasma-wayland-protocols wayland wayland-protocols ];
pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix+1−1
@@ -8,7 +8,7 @@ mkDerivation {
88 name = "kwidgetsaddons";
99 meta = {
1010 maintainers = [ lib.maintainers.ttuegel ];
11− broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
11+ broken = builtins.compareVersions qtbase.version "5.14.0" < 0;
1212 };
1313 nativeBuildInputs = [ extra-cmake-modules ];
1414 buildInputs = [ qttools ];
pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix+1−1
@@ -9,7 +9,7 @@ mkDerivation {
99 name = "kwindowsystem";
1010 meta = {
1111 maintainers = [ lib.maintainers.ttuegel ];
12− broken = lib.versionOlder qtbase.version "5.7.0";
12+ broken = lib.versionOlder qtbase.version "5.14.0";
1313 };
1414 nativeBuildInputs = [ extra-cmake-modules ];
1515 buildInputs = [ libpthreadstubs libXdmcp qttools qtx11extras ];
pkgs/development/libraries/kde-frameworks/solid.nix+1−1
@@ -8,7 +8,7 @@ mkDerivation {
88 name = "solid";
99 meta = {
1010 maintainers = [ lib.maintainers.ttuegel ];
11− broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
11+ broken = builtins.compareVersions qtbase.version "5.14.0" < 0;
1212 };
1313 nativeBuildInputs = [ bison extra-cmake-modules flex media-player-info ];
1414 buildInputs = [ qtdeclarative qttools ];
pkgs/development/libraries/kde-frameworks/sonnet.nix+1−1
@@ -7,7 +7,7 @@ mkDerivation {
77 name = "sonnet";
88 meta = {
99 maintainers = [ lib.maintainers.ttuegel ];
10− broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
10+ broken = builtins.compareVersions qtbase.version "5.14.0" < 0;
1111 };
1212 nativeBuildInputs = [ extra-cmake-modules ];
1313 buildInputs = [ aspell qttools ];
pkgs/development/libraries/kde-frameworks/srcs.nix+332−332
@@ -4,667 +4,667 @@
44
55{
66 attica = {
7− version = "5.78.0";
7+ version = "5.79.0";
88 src = fetchurl {
9− url = "${mirror}/stable/frameworks/5.78/attica-5.78.0.tar.xz";
10− sha256 = "0xlnsh9py1v7di305qic0kzpwbq0yw41rilkq1f8p9zsixl99w8m";
11− name = "attica-5.78.0.tar.xz";
9+ url = "${mirror}/stable/frameworks/5.79/attica-5.79.0.tar.xz";
10+ sha256 = "1p6rcpfq3ifz8c8ws5k085mzg7fya2dpv7ryd6iqwi083ys49wla";
11+ name = "attica-5.79.0.tar.xz";
1212 };
1313 };
1414 baloo = {
15− version = "5.78.0";
15+ version = "5.79.0";
1616 src = fetchurl {
17− url = "${mirror}/stable/frameworks/5.78/baloo-5.78.0.tar.xz";
18− sha256 = "1p8s0lgbqajpzbrc2pb1vzga0bsfwqjb4pzvvgqdlb419ijcjlpi";
19− name = "baloo-5.78.0.tar.xz";
17+ url = "${mirror}/stable/frameworks/5.79/baloo-5.79.0.tar.xz";
18+ sha256 = "0l7z7260pjw6gmcnzp0v57dsypl2yxnm8dxfcdiln8gw2fisryc0";
19+ name = "baloo-5.79.0.tar.xz";
2020 };
2121 };
2222 bluez-qt = {
23− version = "5.78.0";
23+ version = "5.79.0";
2424 src = fetchurl {
25− url = "${mirror}/stable/frameworks/5.78/bluez-qt-5.78.0.tar.xz";
26− sha256 = "1g83sfvl8zmyc9l5kr2bb9pdfis01m1ib9pz6qq1k5zv5aq3cyz9";
27− name = "bluez-qt-5.78.0.tar.xz";
25+ url = "${mirror}/stable/frameworks/5.79/bluez-qt-5.79.0.tar.xz";
26+ sha256 = "0snips4ak77zpz6x9bzr5lmal712lz64xns1bwlz80svzcikznpj";
27+ name = "bluez-qt-5.79.0.tar.xz";
2828 };
2929 };
3030 breeze-icons = {
31− version = "5.78.0";
31+ version = "5.79.0";
3232 src = fetchurl {
33− url = "${mirror}/stable/frameworks/5.78/breeze-icons-5.78.0.tar.xz";
34− sha256 = "1fa9lirik0ic03nb56xmiirpbcg57l1b3q7dkn9r5h6scc0nsps2";
35− name = "breeze-icons-5.78.0.tar.xz";
33+ url = "${mirror}/stable/frameworks/5.79/breeze-icons-5.79.0.tar.xz";
34+ sha256 = "06sd7grh7r6wnx8p8mhp7vfhsg3bnyafy94fj6jz6gg9m0308cn6";
35+ name = "breeze-icons-5.79.0.tar.xz";
3636 };
3737 };
3838 extra-cmake-modules = {
39− version = "5.78.0";
39+ version = "5.79.0";
4040 src = fetchurl {
41− url = "${mirror}/stable/frameworks/5.78/extra-cmake-modules-5.78.0.tar.xz";
42− sha256 = "1y8js21adfzl6g5q46gj7dl8q2jhfvx0ba3ipmbclkpj4461zppf";
43− name = "extra-cmake-modules-5.78.0.tar.xz";
41+ url = "${mirror}/stable/frameworks/5.79/extra-cmake-modules-5.79.0.tar.xz";
42+ sha256 = "1n5yd3ggz5pq4qs7f86aqvzvfmxx2khsn1i1m67xhrn5k7dh55mj";
43+ name = "extra-cmake-modules-5.79.0.tar.xz";
4444 };
4545 };
4646 frameworkintegration = {
47− version = "5.78.0";
47+ version = "5.79.0";
4848 src = fetchurl {
49− url = "${mirror}/stable/frameworks/5.78/frameworkintegration-5.78.0.tar.xz";
50− sha256 = "0rvi82fqck8jaxnrh5fd8m581civ174hpczanmw6n7birxvmk2wh";
51− name = "frameworkintegration-5.78.0.tar.xz";
49+ url = "${mirror}/stable/frameworks/5.79/frameworkintegration-5.79.0.tar.xz";
50+ sha256 = "0c0i8hqqvi65bh1ghb6ql1a8vqihxck6xhpki4g0ryipilvqmj21";
51+ name = "frameworkintegration-5.79.0.tar.xz";
5252 };
5353 };
5454 kactivities = {
55− version = "5.78.0";
55+ version = "5.79.0";
5656 src = fetchurl {
57− url = "${mirror}/stable/frameworks/5.78/kactivities-5.78.0.tar.xz";
58− sha256 = "11v7rcw6lk4xd28i9al5p7bxklw5hdm97hvszhh1qd7kfrzblkhi";
59− name = "kactivities-5.78.0.tar.xz";
57+ url = "${mirror}/stable/frameworks/5.79/kactivities-5.79.0.tar.xz";
58+ sha256 = "0d3ds43iqqlbii9xwp7f20nz338xqmq70a4v84zb5ks1mnhkz47l";
59+ name = "kactivities-5.79.0.tar.xz";
6060 };
6161 };
6262 kactivities-stats = {
63− version = "5.78.0";
63+ version = "5.79.0";
6464 src = fetchurl {
65− url = "${mirror}/stable/frameworks/5.78/kactivities-stats-5.78.0.tar.xz";
66− sha256 = "0afnwswng85jfkpbmbmprkqfngjxv2qpds3s2xlb5nzrpl43hc7s";
67− name = "kactivities-stats-5.78.0.tar.xz";
65+ url = "${mirror}/stable/frameworks/5.79/kactivities-stats-5.79.0.tar.xz";
66+ sha256 = "0s5r8891flkmrwga15ihqrmj4i12khxwp97kaa84j4mqva6zdx93";
67+ name = "kactivities-stats-5.79.0.tar.xz";
6868 };
6969 };
7070 kapidox = {
71− version = "5.78.0";
71+ version = "5.79.0";
7272 src = fetchurl {
73− url = "${mirror}/stable/frameworks/5.78/kapidox-5.78.0.tar.xz";
74− sha256 = "1d8ia33nrsvg8gf9mna0r2f0sdi4c37p8mxl59hcfqdimy7inkvp";
75− name = "kapidox-5.78.0.tar.xz";
73+ url = "${mirror}/stable/frameworks/5.79/kapidox-5.79.0.tar.xz";
74+ sha256 = "0qk4ksxdaiphlpd51mgwdddxq5vq8n55dd80s2a5q93jkcywhli7";
75+ name = "kapidox-5.79.0.tar.xz";
7676 };
7777 };
7878 karchive = {
79− version = "5.78.0";
79+ version = "5.79.0";
8080 src = fetchurl {
81− url = "${mirror}/stable/frameworks/5.78/karchive-5.78.0.tar.xz";
82− sha256 = "1lqjy040c5wb76fvnvdaxsgqm63bcx9bmjinvia1caqkh11a5rw2";
83− name = "karchive-5.78.0.tar.xz";
81+ url = "${mirror}/stable/frameworks/5.79/karchive-5.79.0.tar.xz";
82+ sha256 = "01qf46k7gp11fh53afcpmbfx0w5bi0k8jflb2db8nss7ri3bzlhc";
83+ name = "karchive-5.79.0.tar.xz";
8484 };
8585 };
8686 kauth = {
87− version = "5.78.0";
87+ version = "5.79.0";
8888 src = fetchurl {
89− url = "${mirror}/stable/frameworks/5.78/kauth-5.78.0.tar.xz";
90− sha256 = "1c0xyv54g8gcxaaz602ai1v4jlk7xndc65qjad66qiig958b1czg";
91− name = "kauth-5.78.0.tar.xz";
89+ url = "${mirror}/stable/frameworks/5.79/kauth-5.79.0.tar.xz";
90+ sha256 = "18bqfn47iyhf1zfkw3mgdxz154f9gqbkn41c3ca94qjm91mb40da";
91+ name = "kauth-5.79.0.tar.xz";
9292 };
9393 };
9494 kbookmarks = {
95− version = "5.78.0";
95+ version = "5.79.0";
9696 src = fetchurl {
97− url = "${mirror}/stable/frameworks/5.78/kbookmarks-5.78.0.tar.xz";
98− sha256 = "0b7g0fkyyqdwpfw53kdw73jcyk8wz5k2ipmwzlpx2fr5gs2v00c3";
99− name = "kbookmarks-5.78.0.tar.xz";
97+ url = "${mirror}/stable/frameworks/5.79/kbookmarks-5.79.0.tar.xz";
98+ sha256 = "109rjikqxv7mbhv22p41rbfz43510y6k7p0ahggynv0x5y5xzkqd";
99+ name = "kbookmarks-5.79.0.tar.xz";
100100 };
101101 };
102102 kcalendarcore = {
103− version = "5.78.0";
103+ version = "5.79.0";
104104 src = fetchurl {
105− url = "${mirror}/stable/frameworks/5.78/kcalendarcore-5.78.0.tar.xz";
106− sha256 = "1v97swaqf9bmdvfagzif1ihsnd5d900nzv8aadic0a7ax5zqi41h";
107− name = "kcalendarcore-5.78.0.tar.xz";
105+ url = "${mirror}/stable/frameworks/5.79/kcalendarcore-5.79.0.tar.xz";
106+ sha256 = "19vc1ji0jlk899rmr6i53l51diadn67mh6z6j787bp29jlcmnciv";
107+ name = "kcalendarcore-5.79.0.tar.xz";
108108 };
109109 };
110110 kcmutils = {
111− version = "5.78.0";
111+ version = "5.79.0";
112112 src = fetchurl {
113− url = "${mirror}/stable/frameworks/5.78/kcmutils-5.78.0.tar.xz";
114− sha256 = "1ly21k3lrn6fx1j4vp0km8z9sb2l0adx0rhp9c1sasr8aflmy5k8";
115− name = "kcmutils-5.78.0.tar.xz";
113+ url = "${mirror}/stable/frameworks/5.79/kcmutils-5.79.0.tar.xz";
114+ sha256 = "1wry88rikj7mz460m3c7gr6fwcdpdlx9jrxna2ikybnk9aw8dlkk";
115+ name = "kcmutils-5.79.0.tar.xz";
116116 };
117117 };
118118 kcodecs = {
119− version = "5.78.0";
119+ version = "5.79.0";
120120 src = fetchurl {
121− url = "${mirror}/stable/frameworks/5.78/kcodecs-5.78.0.tar.xz";
122− sha256 = "0ypwx29v7gbcdpkvlpk0r5v7d8rd3xnqlnk1k11c75dvy3763d1n";
123− name = "kcodecs-5.78.0.tar.xz";
121+ url = "${mirror}/stable/frameworks/5.79/kcodecs-5.79.0.tar.xz";
122+ sha256 = "1ab4dz6nvmd6fzsl7wbrvjlz0c0fk0bjb0jcklrj205pkhiaf7y8";
123+ name = "kcodecs-5.79.0.tar.xz";
124124 };
125125 };
126126 kcompletion = {
127− version = "5.78.0";
127+ version = "5.79.0";
128128 src = fetchurl {
129− url = "${mirror}/stable/frameworks/5.78/kcompletion-5.78.0.tar.xz";
130− sha256 = "1a9z252m7v2fhd71dnibczb8yjq090ylcysx5pgwhc2j3djp4fd7";
131− name = "kcompletion-5.78.0.tar.xz";
129+ url = "${mirror}/stable/frameworks/5.79/kcompletion-5.79.0.tar.xz";
130+ sha256 = "1znp6h4pggkl1hcbbw47vjkgmpc1rj6mx01p05x0ad143mwqpzwv";
131+ name = "kcompletion-5.79.0.tar.xz";
132132 };
133133 };
134134 kconfig = {
135− version = "5.78.0";
135+ version = "5.79.0";
136136 src = fetchurl {
137− url = "${mirror}/stable/frameworks/5.78/kconfig-5.78.0.tar.xz";
138− sha256 = "1fzzrypi8pxb0vprh65bpqrpgpwlwwlspf2mz5w83s90snbiwymj";
139− name = "kconfig-5.78.0.tar.xz";
137+ url = "${mirror}/stable/frameworks/5.79/kconfig-5.79.0.tar.xz";
138+ sha256 = "02jirbphrg6dyxd444ghzhy053s85pq4lgpppca3nmvzr2572j7r";
139+ name = "kconfig-5.79.0.tar.xz";
140140 };
141141 };
142142 kconfigwidgets = {
143− version = "5.78.0";
143+ version = "5.79.0";
144144 src = fetchurl {
145− url = "${mirror}/stable/frameworks/5.78/kconfigwidgets-5.78.0.tar.xz";
146− sha256 = "0fgclbyxjyjid21x2059wh7dns73acjnh4qrgzhg0nsx2h8cvm47";
147− name = "kconfigwidgets-5.78.0.tar.xz";
145+ url = "${mirror}/stable/frameworks/5.79/kconfigwidgets-5.79.0.tar.xz";
146+ sha256 = "1lrh2dis3invj9vclpa1mca8hrks1b82c5hkf0g0lilg69lir83y";
147+ name = "kconfigwidgets-5.79.0.tar.xz";
148148 };
149149 };
150150 kcontacts = {
151− version = "5.78.0";
151+ version = "5.79.0";
152152 src = fetchurl {
153− url = "${mirror}/stable/frameworks/5.78/kcontacts-5.78.0.tar.xz";
154− sha256 = "1xjm0l8did9qmjgfvy9hsa7jbfv5mqimnwl7iiz6gxvm8sm14gcw";
155− name = "kcontacts-5.78.0.tar.xz";
153+ url = "${mirror}/stable/frameworks/5.79/kcontacts-5.79.0.tar.xz";
154+ sha256 = "0jflvfkyd7llv54dxyd1a4h1l4xgrqggxadiqv0c6ijn4dvlsmy9";
155+ name = "kcontacts-5.79.0.tar.xz";
156156 };
157157 };
158158 kcoreaddons = {
159− version = "5.78.0";
159+ version = "5.79.0";
160160 src = fetchurl {
161− url = "${mirror}/stable/frameworks/5.78/kcoreaddons-5.78.0.tar.xz";
162− sha256 = "01rvijlb3b3s5r3213am9zyk7xhfqbnfxnq175hggq0mbm6zjpv3";
163− name = "kcoreaddons-5.78.0.tar.xz";
161+ url = "${mirror}/stable/frameworks/5.79/kcoreaddons-5.79.0.tar.xz";
162+ sha256 = "0n9nh4vkk19crp30dac3x9mzgzl4kv38jw6dcg4fwfp77gcin8kg";
163+ name = "kcoreaddons-5.79.0.tar.xz";
164164 };
165165 };
166166 kcrash = {
167− version = "5.78.0";
167+ version = "5.79.0";
168168 src = fetchurl {
169− url = "${mirror}/stable/frameworks/5.78/kcrash-5.78.0.tar.xz";
170− sha256 = "0rrxzjxwi3kib0w86gc4gkkyzvnkg6l1x81ybclvk275zi724jkj";
171− name = "kcrash-5.78.0.tar.xz";
169+ url = "${mirror}/stable/frameworks/5.79/kcrash-5.79.0.tar.xz";
170+ sha256 = "0w74d0j1ckbcd8q8lc57g3y7g50v222mgsvli77ql29imzx79apc";
171+ name = "kcrash-5.79.0.tar.xz";
172172 };
173173 };
174174 kdav = {
175− version = "5.78.0";
175+ version = "5.79.0";
176176 src = fetchurl {
177− url = "${mirror}/stable/frameworks/5.78/kdav-5.78.0.tar.xz";
178− sha256 = "1iqh5z5rry644mcrlppbbf72nxli607varki61m1zgvcvwvaq00j";
179− name = "kdav-5.78.0.tar.xz";
177+ url = "${mirror}/stable/frameworks/5.79/kdav-5.79.0.tar.xz";
178+ sha256 = "1573qan4xz8k33zfghwdmlr7pgbd4sfj0pshwv6bkx78kprd3xfl";
179+ name = "kdav-5.79.0.tar.xz";
180180 };
181181 };
182182 kdbusaddons = {
183− version = "5.78.0";
183+ version = "5.79.0";
184184 src = fetchurl {
185− url = "${mirror}/stable/frameworks/5.78/kdbusaddons-5.78.0.tar.xz";
186− sha256 = "16fk4jpx93q4l0wf3vgxg7vxajjqmbxd91y08khfahr2fssx14ag";
187− name = "kdbusaddons-5.78.0.tar.xz";
185+ url = "${mirror}/stable/frameworks/5.79/kdbusaddons-5.79.0.tar.xz";
186+ sha256 = "17sklakn9nsrjajb3nwg8ibhx64c4m86pr6ln567rdr6cahcaw90";
187+ name = "kdbusaddons-5.79.0.tar.xz";
188188 };
189189 };
190190 kdeclarative = {
191− version = "5.78.0";
191+ version = "5.79.0";
192192 src = fetchurl {
193− url = "${mirror}/stable/frameworks/5.78/kdeclarative-5.78.0.tar.xz";
194− sha256 = "15s75xfy8lvwvkd789vg6y3zcxafav46g7r97psn97ans6gk2na7";
195− name = "kdeclarative-5.78.0.tar.xz";
193+ url = "${mirror}/stable/frameworks/5.79/kdeclarative-5.79.0.tar.xz";
194+ sha256 = "05b1apviqy3dn2isqxf0bxj86r9q40pjlcqq8y15s36d6ykijyzh";
195+ name = "kdeclarative-5.79.0.tar.xz";
196196 };
197197 };
198198 kded = {
199− version = "5.78.0";
199+ version = "5.79.0";
200200 src = fetchurl {
201− url = "${mirror}/stable/frameworks/5.78/kded-5.78.0.tar.xz";
202− sha256 = "0lmxqax0x2hxllzhbvwgywdg483zarhs7f2i0d1ffigr3nn6q59m";
203− name = "kded-5.78.0.tar.xz";
201+ url = "${mirror}/stable/frameworks/5.79/kded-5.79.0.tar.xz";
202+ sha256 = "1gyb864rqbdi64mjc165fhcvnsw06z2zi8dg728428nzmw0dysbm";
203+ name = "kded-5.79.0.tar.xz";
204204 };
205205 };
206206 kdelibs4support = {
207− version = "5.78.0";
207+ version = "5.79.0";
208208 src = fetchurl {
209− url = "${mirror}/stable/frameworks/5.78/portingAids/kdelibs4support-5.78.0.tar.xz";
210− sha256 = "1iclzch3sh0j73prm2ccjvd3z89hp4638kxdblzqqxxdyali9ycq";
211− name = "kdelibs4support-5.78.0.tar.xz";
209+ url = "${mirror}/stable/frameworks/5.79/portingAids/kdelibs4support-5.79.0.tar.xz";
210+ sha256 = "049l0mlf71xan8ls4hkp8s6lrnhn2i22jcnki1d5wci01dgffhm5";
211+ name = "kdelibs4support-5.79.0.tar.xz";
212212 };
213213 };
214214 kdesignerplugin = {
215− version = "5.78.0";
215+ version = "5.79.0";
216216 src = fetchurl {
217− url = "${mirror}/stable/frameworks/5.78/portingAids/kdesignerplugin-5.78.0.tar.xz";
218− sha256 = "1chg3g8xc8nmlzg4niciphfrclmiqcfb6jxwajv1j8j3s3vk7wwz";
219− name = "kdesignerplugin-5.78.0.tar.xz";
217+ url = "${mirror}/stable/frameworks/5.79/portingAids/kdesignerplugin-5.79.0.tar.xz";
218+ sha256 = "1jgqr76sx6d3jmqc350k49lqym5jkixnl3dq66430pvlrfv47w2n";
219+ name = "kdesignerplugin-5.79.0.tar.xz";
220220 };
221221 };
222222 kdesu = {
223− version = "5.78.0";
223+ version = "5.79.0";
224224 src = fetchurl {
225− url = "${mirror}/stable/frameworks/5.78/kdesu-5.78.0.tar.xz";
226− sha256 = "072bnj6hxph864gn81hr24aklh7mq974fibglihwyak0zbml5yfm";
227− name = "kdesu-5.78.0.tar.xz";
225+ url = "${mirror}/stable/frameworks/5.79/kdesu-5.79.0.tar.xz";
226+ sha256 = "1hlz5pr72qk64gwp30qx92jhlszri5qjsisvl4cxs01ylnrqy0c1";
227+ name = "kdesu-5.79.0.tar.xz";
228228 };
229229 };
230230 kdewebkit = {
231− version = "5.78.0";
231+ version = "5.79.0";
232232 src = fetchurl {
233− url = "${mirror}/stable/frameworks/5.78/portingAids/kdewebkit-5.78.0.tar.xz";
234− sha256 = "0mcnlc4s372ghdjypksdjh6casradsxwa47aaac4d4yg2qk7mqb1";
235− name = "kdewebkit-5.78.0.tar.xz";
233+ url = "${mirror}/stable/frameworks/5.79/portingAids/kdewebkit-5.79.0.tar.xz";
234+ sha256 = "0d81p49n2ryig9xp5id1dx4rpjjd2spl78m0xlq6rczyk7yf73pz";
235+ name = "kdewebkit-5.79.0.tar.xz";
236236 };
237237 };
238238 kdnssd = {
239− version = "5.78.0";
239+ version = "5.79.1";
240240 src = fetchurl {
241− url = "${mirror}/stable/frameworks/5.78/kdnssd-5.78.0.tar.xz";
242− sha256 = "1rsjbi5x05ii17xl8zvcrfjmjsq0g6vqh90qflnyys6lzhyvs0sf";
243− name = "kdnssd-5.78.0.tar.xz";
241+ url = "${mirror}/stable/frameworks/5.79/kdnssd-5.79.1.tar.xz";
242+ sha256 = "160qyll887wblrw0lhax749lzwhlp92sckj4g259955p8gnsw5lp";
243+ name = "kdnssd-5.79.1.tar.xz";
244244 };
245245 };
246246 kdoctools = {
247− version = "5.78.0";
247+ version = "5.79.0";
248248 src = fetchurl {
249− url = "${mirror}/stable/frameworks/5.78/kdoctools-5.78.0.tar.xz";
250− sha256 = "0qngw9li2am0phkys45cph3qj01fjhjhvp3dsk3ymr60szryw23s";
251− name = "kdoctools-5.78.0.tar.xz";
249+ url = "${mirror}/stable/frameworks/5.79/kdoctools-5.79.0.tar.xz";
250+ sha256 = "03bvj3grjw6a56shdy8c3mdp11pwmc72ccp3ia00bz310ahpphzb";
251+ name = "kdoctools-5.79.0.tar.xz";
252252 };
253253 };
254254 kemoticons = {
255− version = "5.78.0";
255+ version = "5.79.0";
256256 src = fetchurl {
257− url = "${mirror}/stable/frameworks/5.78/kemoticons-5.78.0.tar.xz";
258− sha256 = "14alh2n5igk3cpm1j7ms7y0xph61qy5k3n2bw8y4y5wkb8qmqg3m";
259− name = "kemoticons-5.78.0.tar.xz";
257+ url = "${mirror}/stable/frameworks/5.79/kemoticons-5.79.0.tar.xz";
258+ sha256 = "04x1yfdcyvx3x4aqha69rsaa78j4iw6qam3hp5a4di0yf653mphp";
259+ name = "kemoticons-5.79.0.tar.xz";
260260 };
261261 };
262262 kfilemetadata = {
263− version = "5.78.0";
263+ version = "5.79.0";
264264 src = fetchurl {
265− url = "${mirror}/stable/frameworks/5.78/kfilemetadata-5.78.0.tar.xz";
266− sha256 = "111w47f74kmn81hvjxjhp6n6kc4533a76fzvrv6wbprqiwc6bncx";
267− name = "kfilemetadata-5.78.0.tar.xz";
265+ url = "${mirror}/stable/frameworks/5.79/kfilemetadata-5.79.0.tar.xz";
266+ sha256 = "0yxjapq88pfcma82mc9gz03x1bb81xl6xzrinr6jgz09206ra395";
267+ name = "kfilemetadata-5.79.0.tar.xz";
268268 };
269269 };
270270 kglobalaccel = {
271− version = "5.78.0";
271+ version = "5.79.0";
272272 src = fetchurl {
273− url = "${mirror}/stable/frameworks/5.78/kglobalaccel-5.78.0.tar.xz";
274− sha256 = "08mqjdigb5lzx0kqhmw5m8gnvs01fzg3j0dan70v5203wbfnw69z";
275− name = "kglobalaccel-5.78.0.tar.xz";
273+ url = "${mirror}/stable/frameworks/5.79/kglobalaccel-5.79.0.tar.xz";
274+ sha256 = "0qqxvv3m7b44makgdcsxdhzamm4ahm1pn94rn6cpsrqsyci8axy8";
275+ name = "kglobalaccel-5.79.0.tar.xz";
276276 };
277277 };
278278 kguiaddons = {
279− version = "5.78.0";
279+ version = "5.79.0";
280280 src = fetchurl {
281− url = "${mirror}/stable/frameworks/5.78/kguiaddons-5.78.0.tar.xz";
282− sha256 = "1l3ppihibhcjajmd55dr6mcc1xd4ni2iw2rdpk2l11ran4nys2dd";
283− name = "kguiaddons-5.78.0.tar.xz";
281+ url = "${mirror}/stable/frameworks/5.79/kguiaddons-5.79.0.tar.xz";
282+ sha256 = "118wiy3pbmbazfivmh0w2g5l10qcp10b34r3d02pj7rs2a74h05w";
283+ name = "kguiaddons-5.79.0.tar.xz";
284284 };
285285 };
286286 kholidays = {
287− version = "5.78.0";
287+ version = "5.79.0";
288288 src = fetchurl {
289− url = "${mirror}/stable/frameworks/5.78/kholidays-5.78.0.tar.xz";
290− sha256 = "147ma06mrbydf2gyrh526bjh1f0xlnxiw89xp6n3wq0qmmdvhs17";
291− name = "kholidays-5.78.0.tar.xz";
289+ url = "${mirror}/stable/frameworks/5.79/kholidays-5.79.0.tar.xz";
290+ sha256 = "1lbbq6y1xkffh9qma7hr5hi712kl85kv51gij0mj69ssv1iq2a8n";
291+ name = "kholidays-5.79.0.tar.xz";
292292 };
293293 };
294294 khtml = {
295− version = "5.78.0";
295+ version = "5.79.0";
296296 src = fetchurl {
297− url = "${mirror}/stable/frameworks/5.78/portingAids/khtml-5.78.0.tar.xz";
298− sha256 = "0pai60cbl8p01xb97191nyzmsf7q00vcqvy8cdr8gfvrlx8k7dhn";
299− name = "khtml-5.78.0.tar.xz";
297+ url = "${mirror}/stable/frameworks/5.79/portingAids/khtml-5.79.0.tar.xz";
298+ sha256 = "1916kpb3kr0d7lbf0b65lrwkxnlgickm7vrmlc3qwlmf3fyqvkhy";
299+ name = "khtml-5.79.0.tar.xz";
300300 };
301301 };
302302 ki18n = {
303− version = "5.78.0";
303+ version = "5.79.0";
304304 src = fetchurl {
305− url = "${mirror}/stable/frameworks/5.78/ki18n-5.78.0.tar.xz";
306− sha256 = "0mafvkrgmdcj869dzqmgphdwhl6a2bf2lw99w7frxh2qw4n2sd8k";
307− name = "ki18n-5.78.0.tar.xz";
305+ url = "${mirror}/stable/frameworks/5.79/ki18n-5.79.0.tar.xz";
306+ sha256 = "12sa7ycxc7m7nrsm6x7f822c8p586hy0syny5ya8vpmhwk1j3gik";
307+ name = "ki18n-5.79.0.tar.xz";
308308 };
309309 };
310310 kiconthemes = {
311− version = "5.78.0";
311+ version = "5.79.0";
312312 src = fetchurl {
313− url = "${mirror}/stable/frameworks/5.78/kiconthemes-5.78.0.tar.xz";
314− sha256 = "0ssd1298pqm0g46m92b5d4yfrqxgmwf465lcbia41lndjd6px27v";
315− name = "kiconthemes-5.78.0.tar.xz";
313+ url = "${mirror}/stable/frameworks/5.79/kiconthemes-5.79.0.tar.xz";
314+ sha256 = "0bbs8q0dpz4qyxsd1qk5jxazn600m5j2axzccxyrr21r9plbs4nx";
315+ name = "kiconthemes-5.79.0.tar.xz";
316316 };
317317 };
318318 kidletime = {
319− version = "5.78.0";
319+ version = "5.79.0";
320320 src = fetchurl {
321− url = "${mirror}/stable/frameworks/5.78/kidletime-5.78.0.tar.xz";
322− sha256 = "0aw6g6p3bmp32zk22fwp2f1d20vbf7921ixnyf7a0w535r58d5ma";
323− name = "kidletime-5.78.0.tar.xz";
321+ url = "${mirror}/stable/frameworks/5.79/kidletime-5.79.0.tar.xz";
322+ sha256 = "0pp2ii4cvxygz40ai0b3rpqdjgpq4nya2hrms9c3yxb5hizrrrak";
323+ name = "kidletime-5.79.0.tar.xz";
324324 };
325325 };
326326 kimageformats = {
327− version = "5.78.0";
327+ version = "5.79.0";
328328 src = fetchurl {
329− url = "${mirror}/stable/frameworks/5.78/kimageformats-5.78.0.tar.xz";
330− sha256 = "0gv2w49cdzji8h9swaazpmbn0qqzn4ncnxj7f9rqp686q17czm7c";
331− name = "kimageformats-5.78.0.tar.xz";
329+ url = "${mirror}/stable/frameworks/5.79/kimageformats-5.79.0.tar.xz";
330+ sha256 = "09ffc44vzcin2ikyhm0awba7ag7pbnam4cilvfr3lwnj022y7j7c";
331+ name = "kimageformats-5.79.0.tar.xz";
332332 };
333333 };
334334 kinit = {
335− version = "5.78.0";
335+ version = "5.79.0";
336336 src = fetchurl {
337− url = "${mirror}/stable/frameworks/5.78/kinit-5.78.0.tar.xz";
338− sha256 = "16shlmm6q0vaf05gkrgqpmjrs5fgb8jrfgq331x7ic567hhzv4vv";
339− name = "kinit-5.78.0.tar.xz";
337+ url = "${mirror}/stable/frameworks/5.79/kinit-5.79.0.tar.xz";
338+ sha256 = "0ppri3gaiwawydjfw8ji6accrpwc8ms0sb1s5pn59wqiyv52f5rv";
339+ name = "kinit-5.79.0.tar.xz";
340340 };
341341 };
342342 kio = {
343− version = "5.78.0";
343+ version = "5.79.0";
344344 src = fetchurl {
345− url = "${mirror}/stable/frameworks/5.78/kio-5.78.0.tar.xz";
346− sha256 = "086nhyjk5sjvp97fs6kkmc99jh2303sbmpfki1qvcwzdq6idn4g2";
347− name = "kio-5.78.0.tar.xz";
345+ url = "${mirror}/stable/frameworks/5.79/kio-5.79.0.tar.xz";
346+ sha256 = "1ri5dv8lc4ywc7jknlszri812y91mgggjx5z5qfkv971njm6fz3n";
347+ name = "kio-5.79.0.tar.xz";
348348 };
349349 };
350350 kirigami2 = {
351− version = "5.78.0";
351+ version = "5.79.0";
352352 src = fetchurl {
353− url = "${mirror}/stable/frameworks/5.78/kirigami2-5.78.0.tar.xz";
354− sha256 = "0667wcxyhil332g6gk12bjg5y0c1zk15354wx6mg8krxl3i2nkjy";
355− name = "kirigami2-5.78.0.tar.xz";
353+ url = "${mirror}/stable/frameworks/5.79/kirigami2-5.79.0.tar.xz";
354+ sha256 = "01rb678qz1avzi7393wylwnc13ndzx2pgqnz3bd0zki0pjfrrlzp";
355+ name = "kirigami2-5.79.0.tar.xz";
356356 };
357357 };
358358 kitemmodels = {
359− version = "5.78.0";
359+ version = "5.79.0";
360360 src = fetchurl {
361− url = "${mirror}/stable/frameworks/5.78/kitemmodels-5.78.0.tar.xz";
362− sha256 = "1yn8gi7dml7mxyk93fzx5id2pckw6qbbkifwzmhq5i3vzpq1qdja";
363− name = "kitemmodels-5.78.0.tar.xz";
361+ url = "${mirror}/stable/frameworks/5.79/kitemmodels-5.79.0.tar.xz";
362+ sha256 = "1g9xa0h3kq0m5v1yvwgr8f6lrq8n2x1qzqqjbbbbyg8ayavv4abs";
363+ name = "kitemmodels-5.79.0.tar.xz";
364364 };
365365 };
366366 kitemviews = {
367− version = "5.78.0";
367+ version = "5.79.0";
368368 src = fetchurl {
369− url = "${mirror}/stable/frameworks/5.78/kitemviews-5.78.0.tar.xz";
370− sha256 = "10ysirhlgbzyiybb1ap111w89v3czing43ap10n5pldgh1c8ky05";
371− name = "kitemviews-5.78.0.tar.xz";
369+ url = "${mirror}/stable/frameworks/5.79/kitemviews-5.79.0.tar.xz";
370+ sha256 = "0p21hyxhain2mr19lzfml23ilpgqwr2i27p1qg39jnwyb74jw0nl";
371+ name = "kitemviews-5.79.0.tar.xz";
372372 };
373373 };
374374 kjobwidgets = {
375− version = "5.78.0";
375+ version = "5.79.0";
376376 src = fetchurl {
377− url = "${mirror}/stable/frameworks/5.78/kjobwidgets-5.78.0.tar.xz";
378− sha256 = "0cdy7w14wr08xf9na1jzbrwjvmiw5q2ciniafzf9cn55yxrvmhwv";
379− name = "kjobwidgets-5.78.0.tar.xz";
377+ url = "${mirror}/stable/frameworks/5.79/kjobwidgets-5.79.0.tar.xz";
378+ sha256 = "059a58hp0npip07w7idjrl5sjjgl4i3bdqzv1k22hlvzdsyibggr";
379+ name = "kjobwidgets-5.79.0.tar.xz";
380380 };
381381 };
382382 kjs = {
383− version = "5.78.0";
383+ version = "5.79.0";
384384 src = fetchurl {
385− url = "${mirror}/stable/frameworks/5.78/portingAids/kjs-5.78.0.tar.xz";
386− sha256 = "0sjnwj6x7dgvqh333yii5vlh7pbl1kc7zrbdjkqi38cfnbcf2w4h";
387− name = "kjs-5.78.0.tar.xz";
385+ url = "${mirror}/stable/frameworks/5.79/portingAids/kjs-5.79.0.tar.xz";
386+ sha256 = "1v51xjmwxi1x85b4hlj8m12zxl5w0d160kjjbrrxqfn64i4302ga";
387+ name = "kjs-5.79.0.tar.xz";
388388 };
389389 };
390390 kjsembed = {
391− version = "5.78.0";
391+ version = "5.79.0";
392392 src = fetchurl {
393− url = "${mirror}/stable/frameworks/5.78/portingAids/kjsembed-5.78.0.tar.xz";
394− sha256 = "0r8hxbqn5k0wsk4swym7hi15mnhd9dyvcgz8lycqnvlrz0walvr9";
395− name = "kjsembed-5.78.0.tar.xz";
393+ url = "${mirror}/stable/frameworks/5.79/portingAids/kjsembed-5.79.0.tar.xz";
394+ sha256 = "18kjq5mim7b1a5mlhkwpwvnszjqxilhi4laqladh97wkmvsr85py";
395+ name = "kjsembed-5.79.0.tar.xz";
396396 };
397397 };
398398 kmediaplayer = {
399− version = "5.78.0";
399+ version = "5.79.0";
400400 src = fetchurl {
401− url = "${mirror}/stable/frameworks/5.78/portingAids/kmediaplayer-5.78.0.tar.xz";
402− sha256 = "0yy0k2cgchj1pnk2q7gq4iihscf6rgiwdpfn6i0i8zcczkm2gyls";
403− name = "kmediaplayer-5.78.0.tar.xz";
401+ url = "${mirror}/stable/frameworks/5.79/portingAids/kmediaplayer-5.79.0.tar.xz";
402+ sha256 = "1lgrcib9acbzgs1kv44bqfisrayiir2r1iygrrncp117fj9cqx8b";
403+ name = "kmediaplayer-5.79.0.tar.xz";
404404 };
405405 };
406406 knewstuff = {
407− version = "5.78.0";
407+ version = "5.79.0";
408408 src = fetchurl {
409− url = "${mirror}/stable/frameworks/5.78/knewstuff-5.78.0.tar.xz";
410− sha256 = "1fb1ka7ljfw4wyf8sy0r5vy9nmji286p26wjzgsf2rzzskaspc6m";
411− name = "knewstuff-5.78.0.tar.xz";
409+ url = "${mirror}/stable/frameworks/5.79/knewstuff-5.79.0.tar.xz";
410+ sha256 = "0bsg0r0s12ck2cafkvnmjldr32ykivcpqjs1zfzqqbvy5w05a81y";
411+ name = "knewstuff-5.79.0.tar.xz";
412412 };
413413 };
414414 knotifications = {
415− version = "5.78.0";
415+ version = "5.79.0";
416416 src = fetchurl {
417− url = "${mirror}/stable/frameworks/5.78/knotifications-5.78.0.tar.xz";
418− sha256 = "0f93xql467jbz964lpjrsip77wf0s8qygggkjb85y8xgpcdw4zrr";
419− name = "knotifications-5.78.0.tar.xz";
417+ url = "${mirror}/stable/frameworks/5.79/knotifications-5.79.0.tar.xz";
418+ sha256 = "11g4xsa0z9680k4blxb1axn874p6s2vd5p9h376ln3blhjmy17hj";
419+ name = "knotifications-5.79.0.tar.xz";
420420 };
421421 };
422422 knotifyconfig = {
423− version = "5.78.0";
423+ version = "5.79.0";
424424 src = fetchurl {
425− url = "${mirror}/stable/frameworks/5.78/knotifyconfig-5.78.0.tar.xz";
426− sha256 = "0nzs76ii447xv3dqcg14a045xc74bnvwghfdmlb0vmh22p3a60fz";
427− name = "knotifyconfig-5.78.0.tar.xz";
425+ url = "${mirror}/stable/frameworks/5.79/knotifyconfig-5.79.0.tar.xz";
426+ sha256 = "0c6d95bf8876czjd39cla7pd3li8sm684h04f77czf6sh1mil49d";
427+ name = "knotifyconfig-5.79.0.tar.xz";
428428 };
429429 };
430430 kpackage = {
431− version = "5.78.0";
431+ version = "5.79.0";
432432 src = fetchurl {
433− url = "${mirror}/stable/frameworks/5.78/kpackage-5.78.0.tar.xz";
434− sha256 = "0d0vfh3ifaj2xifw370rfapw2yf24h7f8xwbhmx787dr6w86m47c";
435− name = "kpackage-5.78.0.tar.xz";
433+ url = "${mirror}/stable/frameworks/5.79/kpackage-5.79.0.tar.xz";
434+ sha256 = "1xkkw4lk9hx2irni5d2k7873bffgd2w41qvvp25d786dz612fy27";
435+ name = "kpackage-5.79.0.tar.xz";
436436 };
437437 };
438438 kparts = {
439− version = "5.78.0";
439+ version = "5.79.0";
440440 src = fetchurl {
441− url = "${mirror}/stable/frameworks/5.78/kparts-5.78.0.tar.xz";
442− sha256 = "1np1vshzihh2r51gzy54yvm6h898ffw5b20c3r6jaa0837g3mlvp";
443− name = "kparts-5.78.0.tar.xz";
441+ url = "${mirror}/stable/frameworks/5.79/kparts-5.79.0.tar.xz";
442+ sha256 = "0d9dsgf6q44gqril6h9w5jfsavk0m5gclbmjdxjkcvrz3xfbjhd9";
443+ name = "kparts-5.79.0.tar.xz";
444444 };
445445 };
446446 kpeople = {
447− version = "5.78.0";
447+ version = "5.79.0";
448448 src = fetchurl {
449− url = "${mirror}/stable/frameworks/5.78/kpeople-5.78.0.tar.xz";
450− sha256 = "0ccc10qfhw69s12sfgpql988pf7pssx9k8j9xcywil4y7xidk05i";
451− name = "kpeople-5.78.0.tar.xz";
449+ url = "${mirror}/stable/frameworks/5.79/kpeople-5.79.0.tar.xz";
450+ sha256 = "0dj8hcjl0r673j7m2k83mxy2787jfi9pz6cvmfqfczbzpw20ycf4";
451+ name = "kpeople-5.79.0.tar.xz";
452452 };
453453 };
454454 kplotting = {
455− version = "5.78.0";
455+ version = "5.79.0";
456456 src = fetchurl {
457− url = "${mirror}/stable/frameworks/5.78/kplotting-5.78.0.tar.xz";
458− sha256 = "00wd3rgp4c0sngfbdz613792sidsykbnazsq05lf4pk46py4xcvc";
459− name = "kplotting-5.78.0.tar.xz";
457+ url = "${mirror}/stable/frameworks/5.79/kplotting-5.79.0.tar.xz";
458+ sha256 = "0lawpg7i36wppm95jxhhc7ghc88kb1s34px6w8p7n6cm2gxkhwn6";
459+ name = "kplotting-5.79.0.tar.xz";
460460 };
461461 };
462462 kpty = {
463− version = "5.78.0";
463+ version = "5.79.0";
464464 src = fetchurl {
465− url = "${mirror}/stable/frameworks/5.78/kpty-5.78.0.tar.xz";
466− sha256 = "1nhijlp98bnnqj9c0i3g1xfpdhghw7241av4wzwhhxny67addlf3";
467− name = "kpty-5.78.0.tar.xz";
465+ url = "${mirror}/stable/frameworks/5.79/kpty-5.79.0.tar.xz";
466+ sha256 = "1qd09r17nmsnqxggmsdw0j6l0620f11ya6mx7bc9zs2y08mgvjka";
467+ name = "kpty-5.79.0.tar.xz";
468468 };
469469 };
470470 kquickcharts = {
471− version = "5.78.0";
471+ version = "5.79.0";
472472 src = fetchurl {
473− url = "${mirror}/stable/frameworks/5.78/kquickcharts-5.78.0.tar.xz";
474− sha256 = "1zq5bp3w42sqvlvkc7vx6l7h142ihzgzqpa2435j9apvx0kvjqhp";
475− name = "kquickcharts-5.78.0.tar.xz";
473+ url = "${mirror}/stable/frameworks/5.79/kquickcharts-5.79.0.tar.xz";
474+ sha256 = "1p9a3mq7xxyavzmgjmz47vrv0hm1h9g8fsligi3r3n5az7klra6f";
475+ name = "kquickcharts-5.79.0.tar.xz";
476476 };
477477 };
478478 kross = {
479− version = "5.78.0";
479+ version = "5.79.0";
480480 src = fetchurl {
481− url = "${mirror}/stable/frameworks/5.78/portingAids/kross-5.78.0.tar.xz";
482− sha256 = "07ylcvkz5xf6b9n65373a8zpp5nsby5c99l912bdxf05hrjcw8b1";
483− name = "kross-5.78.0.tar.xz";
481+ url = "${mirror}/stable/frameworks/5.79/portingAids/kross-5.79.0.tar.xz";
482+ sha256 = "00hpyxcn2fwaz32gggqjcmx4blbcdxj3yvhldnmmkmi3k0r68dfc";
483+ name = "kross-5.79.0.tar.xz";
484484 };
485485 };
486486 krunner = {
487− version = "5.78.0";
487+ version = "5.79.0";
488488 src = fetchurl {
489− url = "${mirror}/stable/frameworks/5.78/krunner-5.78.0.tar.xz";
490− sha256 = "00hy62g9i9vdzgv9ljfqjv0m45lrsmxynmp3fyp5c3amj9r64pkm";
491− name = "krunner-5.78.0.tar.xz";
489+ url = "${mirror}/stable/frameworks/5.79/krunner-5.79.0.tar.xz";
490+ sha256 = "0v7faai6ar06cw7gikhccsa92aii085dk81g4xpyskmxlpvrraci";
491+ name = "krunner-5.79.0.tar.xz";
492492 };
493493 };
494494 kservice = {
495− version = "5.78.0";
495+ version = "5.79.0";
496496 src = fetchurl {
497− url = "${mirror}/stable/frameworks/5.78/kservice-5.78.0.tar.xz";
498− sha256 = "181maly1xij1jp7f0x9ajbv5q6qszqd273sdz1snkg5j4398mric";
499− name = "kservice-5.78.0.tar.xz";
497+ url = "${mirror}/stable/frameworks/5.79/kservice-5.79.0.tar.xz";
498+ sha256 = "1drzj4s1zbh5pffnh3r1wjsk7g1vr0np2h28mlfm4hy3bywxzrnp";
499+ name = "kservice-5.79.0.tar.xz";
500500 };
501501 };
502502 ktexteditor = {
503− version = "5.78.0";
503+ version = "5.79.0";
504504 src = fetchurl {
505− url = "${mirror}/stable/frameworks/5.78/ktexteditor-5.78.0.tar.xz";
506− sha256 = "1r148n3nx3jyw2vn4rfxdl2mkywr5fn78s5ya7vq44pw2bmwar2n";
507− name = "ktexteditor-5.78.0.tar.xz";
505+ url = "${mirror}/stable/frameworks/5.79/ktexteditor-5.79.0.tar.xz";
506+ sha256 = "1csms6cl8pp9slzwzdgsxhah1b218maakkxmiqk0ngx2sf4lbfc3";
507+ name = "ktexteditor-5.79.0.tar.xz";
508508 };
509509 };
510510 ktextwidgets = {
511− version = "5.78.0";
511+ version = "5.79.0";
512512 src = fetchurl {
513− url = "${mirror}/stable/frameworks/5.78/ktextwidgets-5.78.0.tar.xz";
514− sha256 = "1gpqxvlmqm5nj5kgx2dmvl8ynjqw995wnpl9ja5c82d8bczkn4z8";
515− name = "ktextwidgets-5.78.0.tar.xz";
513+ url = "${mirror}/stable/frameworks/5.79/ktextwidgets-5.79.0.tar.xz";
514+ sha256 = "1bnhq4jpybckdlw5518n2hbfilbpadafvchnxigg9p7671pkp85l";
515+ name = "ktextwidgets-5.79.0.tar.xz";
516516 };
517517 };
518518 kunitconversion = {
519− version = "5.78.0";
519+ version = "5.79.0";
520520 src = fetchurl {
521− url = "${mirror}/stable/frameworks/5.78/kunitconversion-5.78.0.tar.xz";
522− sha256 = "17a3lpc60qn9qd53mlrjxwg5gyqvq0vnnz9wdrak481nf2c0qycc";
523− name = "kunitconversion-5.78.0.tar.xz";
521+ url = "${mirror}/stable/frameworks/5.79/kunitconversion-5.79.0.tar.xz";
522+ sha256 = "19snm2mvvbs2aqpq7k9b3g1fbg40kpmbjmqn38g6m065mpw3372l";
523+ name = "kunitconversion-5.79.0.tar.xz";
524524 };
525525 };
526526 kwallet = {
527− version = "5.78.0";
527+ version = "5.79.0";
528528 src = fetchurl {
529− url = "${mirror}/stable/frameworks/5.78/kwallet-5.78.0.tar.xz";
530− sha256 = "1a8n5d9y9qwcb4d9zbr1xhk3w390n7f6mmx52nq5akna51zrjc4p";
531− name = "kwallet-5.78.0.tar.xz";
529+ url = "${mirror}/stable/frameworks/5.79/kwallet-5.79.0.tar.xz";
530+ sha256 = "1qickn20ry8qccirdc7rvdf40dxgb13y4n0wi80qz87xzmps3f3p";
531+ name = "kwallet-5.79.0.tar.xz";
532532 };
533533 };
534534 kwayland = {
535− version = "5.78.0";
535+ version = "5.79.0";
536536 src = fetchurl {
537− url = "${mirror}/stable/frameworks/5.78/kwayland-5.78.0.tar.xz";
538− sha256 = "052avcafjnib55s2lp1fzhx7dk9mlyg4v143gfp9j8wvlqaa8sxb";
539− name = "kwayland-5.78.0.tar.xz";
537+ url = "${mirror}/stable/frameworks/5.79/kwayland-5.79.0.tar.xz";
538+ sha256 = "14grhcav772zfdjmwnjms819by2djm8dnv71cj4ps45iq0gba6ck";
539+ name = "kwayland-5.79.0.tar.xz";
540540 };
541541 };
542542 kwidgetsaddons = {
543− version = "5.78.0";
543+ version = "5.79.0";
544544 src = fetchurl {
545− url = "${mirror}/stable/frameworks/5.78/kwidgetsaddons-5.78.0.tar.xz";
546− sha256 = "0b2y9ilk2zz4zw2m1lcwrmn3hni5jh6kalclx5l9fi98686b1az4";
547− name = "kwidgetsaddons-5.78.0.tar.xz";
545+ url = "${mirror}/stable/frameworks/5.79/kwidgetsaddons-5.79.0.tar.xz";
546+ sha256 = "0jpfwxa397cvqr1q92b2nva7wy2ngv08kz5l94xrz0wzkagxfixc";
547+ name = "kwidgetsaddons-5.79.0.tar.xz";
548548 };
549549 };
550550 kwindowsystem = {
551− version = "5.78.0";
551+ version = "5.79.0";
552552 src = fetchurl {
553− url = "${mirror}/stable/frameworks/5.78/kwindowsystem-5.78.0.tar.xz";
554− sha256 = "003jypnib16qpm7l76zqbhhbqq2g23hm245l9dskbansxpncmfbc";
555− name = "kwindowsystem-5.78.0.tar.xz";
553+ url = "${mirror}/stable/frameworks/5.79/kwindowsystem-5.79.0.tar.xz";
554+ sha256 = "15pi2vnvdchj9f3yp1p7hqxmnwd606a6fwq4h7li4pvb4w3gibmq";
555+ name = "kwindowsystem-5.79.0.tar.xz";
556556 };
557557 };
558558 kxmlgui = {
559− version = "5.78.0";
559+ version = "5.79.0";
560560 src = fetchurl {
561− url = "${mirror}/stable/frameworks/5.78/kxmlgui-5.78.0.tar.xz";
562− sha256 = "05yxgxbvv8anl4m40jwwfx183y69fdljj4g7daip0nk7hs4vc37q";
563− name = "kxmlgui-5.78.0.tar.xz";
561+ url = "${mirror}/stable/frameworks/5.79/kxmlgui-5.79.0.tar.xz";
562+ sha256 = "1j8fb5i1v7pqs5as1h43nc0s2pm3i9cwks2h5388yld325ysx0v9";
563+ name = "kxmlgui-5.79.0.tar.xz";
564564 };
565565 };
566566 kxmlrpcclient = {
567− version = "5.78.0";
567+ version = "5.79.0";
568568 src = fetchurl {
569− url = "${mirror}/stable/frameworks/5.78/portingAids/kxmlrpcclient-5.78.0.tar.xz";
570− sha256 = "0591c23sjwfhrf7d7z6bgikjal1h70vpjx7xmr1ypwck6pxj8z2x";
571− name = "kxmlrpcclient-5.78.0.tar.xz";
569+ url = "${mirror}/stable/frameworks/5.79/portingAids/kxmlrpcclient-5.79.0.tar.xz";
570+ sha256 = "1cwvglsfv5m3mb5bjl7rfas1samyw703qjfiz1pf6vxgmpxdcr4a";
571+ name = "kxmlrpcclient-5.79.0.tar.xz";
572572 };
573573 };
574574 modemmanager-qt = {
575− version = "5.78.0";
575+ version = "5.79.0";
576576 src = fetchurl {
577− url = "${mirror}/stable/frameworks/5.78/modemmanager-qt-5.78.0.tar.xz";
578− sha256 = "09y3pjav7dzfmplacwn0j281d59rdhlad16myaxh6hbf9zdkmnyr";
579− name = "modemmanager-qt-5.78.0.tar.xz";
577+ url = "${mirror}/stable/frameworks/5.79/modemmanager-qt-5.79.0.tar.xz";
578+ sha256 = "0xfbchyaaqxjj66zb19k4vxi9azijf0llbql6fzxln687s3z65wd";
579+ name = "modemmanager-qt-5.79.0.tar.xz";
580580 };
581581 };
582582 networkmanager-qt = {
583− version = "5.78.0";
583+ version = "5.79.0";
584584 src = fetchurl {
585− url = "${mirror}/stable/frameworks/5.78/networkmanager-qt-5.78.0.tar.xz";
586− sha256 = "0wfyczlki8sb2wydyslpi111y4hfc6xvnar8cxj75bsn83pd9wya";
587− name = "networkmanager-qt-5.78.0.tar.xz";
585+ url = "${mirror}/stable/frameworks/5.79/networkmanager-qt-5.79.0.tar.xz";
586+ sha256 = "04iaqa2q73zvscx300bah6mnl79dai9yrmq11d1vyil99af36m6s";
587+ name = "networkmanager-qt-5.79.0.tar.xz";
588588 };
589589 };
590590 oxygen-icons5 = {
591− version = "5.78.0";
591+ version = "5.79.0";
592592 src = fetchurl {
593− url = "${mirror}/stable/frameworks/5.78/oxygen-icons5-5.78.0.tar.xz";
594− sha256 = "1xp3zg59srxfc0z5cf45x7am98rsjq3p3ms2975il03389w55kr9";
595− name = "oxygen-icons5-5.78.0.tar.xz";
593+ url = "${mirror}/stable/frameworks/5.79/oxygen-icons5-5.79.0.tar.xz";
594+ sha256 = "1j6l9r4l82gp5qcpn3xw4dzfbhsawbpk8mypnfckk73x1bjcaqss";
595+ name = "oxygen-icons5-5.79.0.tar.xz";
596596 };
597597 };
598598 plasma-framework = {
599− version = "5.78.0";
599+ version = "5.79.0";
600600 src = fetchurl {
601− url = "${mirror}/stable/frameworks/5.78/plasma-framework-5.78.0.tar.xz";
602− sha256 = "10c4d7mvnjdpjcjzxy8r5k1h3pxw9d4h9ii8bkngb2kjfblf3bj6";
603− name = "plasma-framework-5.78.0.tar.xz";
601+ url = "${mirror}/stable/frameworks/5.79/plasma-framework-5.79.0.tar.xz";
602+ sha256 = "15hbfqdyas27kj6rd24n6d80r1dcsiiv0zgjkp12x8dnjyd3vz4x";
603+ name = "plasma-framework-5.79.0.tar.xz";
604604 };
605605 };
606606 prison = {
607− version = "5.78.0";
607+ version = "5.79.0";
608608 src = fetchurl {
609− url = "${mirror}/stable/frameworks/5.78/prison-5.78.0.tar.xz";
610− sha256 = "0ygsdjcxr7l7jgllf6c38rbpc4byikg7zx71dzmas7ikg4axylfk";
611− name = "prison-5.78.0.tar.xz";
609+ url = "${mirror}/stable/frameworks/5.79/prison-5.79.0.tar.xz";
610+ sha256 = "1rn66n67g914w1klgsirqff62qv4p2l64ahzsxnbixfwy1dwlpa2";
611+ name = "prison-5.79.0.tar.xz";
612612 };
613613 };
614614 purpose = {
615− version = "5.78.0";
615+ version = "5.79.0";
616616 src = fetchurl {
617− url = "${mirror}/stable/frameworks/5.78/purpose-5.78.0.tar.xz";
618− sha256 = "13v2w4kx7ir9wqyahn6rlq7li7kxigxppffjccwpfihzpnyig029";
619− name = "purpose-5.78.0.tar.xz";
617+ url = "${mirror}/stable/frameworks/5.79/purpose-5.79.0.tar.xz";
618+ sha256 = "1mlph5mzwfqwlkvm3df3in3r3airnx4hxhy0p56ri3k3m9k2rqpz";
619+ name = "purpose-5.79.0.tar.xz";
620620 };
621621 };
622622 qqc2-desktop-style = {
623− version = "5.78.0";
623+ version = "5.79.0";
624624 src = fetchurl {
625− url = "${mirror}/stable/frameworks/5.78/qqc2-desktop-style-5.78.0.tar.xz";
626− sha256 = "0a9kxfrvx0qv079vd9vx4924vs5g8qbicdp1wfv3c80ilbmn1sik";
627− name = "qqc2-desktop-style-5.78.0.tar.xz";
625+ url = "${mirror}/stable/frameworks/5.79/qqc2-desktop-style-5.79.0.tar.xz";
626+ sha256 = "1cykbdbzxkblwp0dmgc4r3csml9l81zhfsqcjamfai6srl10vbij";
627+ name = "qqc2-desktop-style-5.79.0.tar.xz";
628628 };
629629 };
630630 solid = {
631− version = "5.78.0";
631+ version = "5.79.0";
632632 src = fetchurl {
633− url = "${mirror}/stable/frameworks/5.78/solid-5.78.0.tar.xz";
634− sha256 = "1qgx9fsaxsypjfzyp3dq79skp7vhhv59ssqb1aq4168gdsai15qj";
635− name = "solid-5.78.0.tar.xz";
633+ url = "${mirror}/stable/frameworks/5.79/solid-5.79.0.tar.xz";
634+ sha256 = "033ss326q450phf918a5py3z6ajnjj6f1nws8ngp05zi028nkhrl";
635+ name = "solid-5.79.0.tar.xz";
636636 };
637637 };
638638 sonnet = {
639− version = "5.78.0";
639+ version = "5.79.0";
640640 src = fetchurl {
641− url = "${mirror}/stable/frameworks/5.78/sonnet-5.78.0.tar.xz";
642− sha256 = "1jw00bkhjf029yr6qh7mkdpizcc96103fsf68ydkbykfqsb0xry2";
643− name = "sonnet-5.78.0.tar.xz";
641+ url = "${mirror}/stable/frameworks/5.79/sonnet-5.79.0.tar.xz";
642+ sha256 = "09b1rb88ck50g67nmki06ixxsfnz3x3jd0f334qaz147h2jklvyq";
643+ name = "sonnet-5.79.0.tar.xz";
644644 };
645645 };
646646 syndication = {
647− version = "5.78.0";
647+ version = "5.79.0";
648648 src = fetchurl {
649− url = "${mirror}/stable/frameworks/5.78/syndication-5.78.0.tar.xz";
650− sha256 = "0sy2419xrkb5yqj70x2gakb53hqz7j5631pjkvai92gvk01bcbd1";
651− name = "syndication-5.78.0.tar.xz";
649+ url = "${mirror}/stable/frameworks/5.79/syndication-5.79.0.tar.xz";
650+ sha256 = "1jyz0c67zscgspvisn43wrdgk4pxs4i3r9pyknm8nvxwiff2p1ji";
651+ name = "syndication-5.79.0.tar.xz";
652652 };
653653 };
654654 syntax-highlighting = {
655− version = "5.78.0";
655+ version = "5.79.1";
656656 src = fetchurl {
657− url = "${mirror}/stable/frameworks/5.78/syntax-highlighting-5.78.0.tar.xz";
658− sha256 = "1m6ngf6nij3p09p7dhngjr9jhmc6dl12vd2x4dkj5fs8wlfbfplb";
659− name = "syntax-highlighting-5.78.0.tar.xz";
657+ url = "${mirror}/stable/frameworks/5.79/syntax-highlighting-5.79.1.tar.xz";
658+ sha256 = "143ra8j0x1biijclnjhp6b69v04m65avp2nic9jzj9y5wjz5x0mj";
659+ name = "syntax-highlighting-5.79.1.tar.xz";
660660 };
661661 };
662662 threadweaver = {
663− version = "5.78.0";
663+ version = "5.79.0";
664664 src = fetchurl {
665− url = "${mirror}/stable/frameworks/5.78/threadweaver-5.78.0.tar.xz";
666− sha256 = "1llqfmpbq0mysa1h7vx16v020zw776sqkrh85kah9478bj7ffwnr";
667− name = "threadweaver-5.78.0.tar.xz";
665+ url = "${mirror}/stable/frameworks/5.79/threadweaver-5.79.0.tar.xz";
666+ sha256 = "062r9nhggw3dlvgpb2l6fqyyzqv35a9lgvikh2pjdicx9r2s8z19";
667+ name = "threadweaver-5.79.0.tar.xz";
668668 };
669669 };
670670}
pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix+1−1
@@ -6,7 +6,7 @@ mkDerivation {
66 name = "syntax-highlighting";
77 meta = {
88 maintainers = [ lib.maintainers.ttuegel ];
9− broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
9+ broken = builtins.compareVersions qtbase.version "5.14.0" < 0;
1010 };
1111 nativeBuildInputs = [ extra-cmake-modules perl ];
1212 buildInputs = [ qttools ];
pkgs/development/libraries/kde-frameworks/threadweaver.nix+1−1
@@ -8,7 +8,7 @@ mkDerivation {
88 name = "threadweaver";
99 meta = {
1010 maintainers = [ lib.maintainers.ttuegel ];
11− broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
11+ broken = builtins.compareVersions qtbase.version "5.14.0" < 0;
1212 };
1313 nativeBuildInputs = [ extra-cmake-modules ];
1414 propagatedBuildInputs = [ qtbase ];
pkgs/development/libraries/lib3ds/default.nix+1−1
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
88 sha256 = "1qr9arfdkjf7q11xhvxwzmhxqz3nhcjkyb8zzfjpz9jm54q0rc7m";
99 };
1010
11− buildInputs = [ unzip ];
11+ nativeBuildInputs = [ unzip ];
1212
1313 meta = {
1414 description = "Library for managing 3D-Studio Release 3 and 4 \".3DS\" files";
pkgs/development/libraries/libb64/default.nix+1−1
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "1lxzi6v10qsl2r6633dx0zwqyvy0j19nmwclfd0d7qybqmhqsg9l";
1010 };
1111
12− buildInputs = [ unzip ];
12+ nativeBuildInputs = [ unzip ];
1313
1414 installPhase = ''
1515 mkdir -p $out $out/lib $out/bin $out/include
pkgs/development/libraries/libdeflate/default.nix+3−1
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchFromGitHub }:
1+{ stdenv, lib, fetchFromGitHub, fixDarwinDylibNames }:
22
33stdenv.mkDerivation rec {
44 pname = "libdeflate";
@@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
1515 substituteInPlace Makefile --replace /usr/local $out
1616 '';
1717
18+ nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
19+
1820 configurePhase = ''
1921 make programs/config.h
2022 '';
pkgs/development/libraries/libedit/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "libedit";
5− version = "20191231-3.1";
5+ version = "20210216-3.1";
66
77 src = fetchurl {
88 url = "https://thrysoee.dk/editline/${pname}-${version}.tar.gz";
9− sha256 = "0wch48nml28jj6ild889745dsg2agm7mpvrmbl1gi98nw6vjrf6v";
9+ sha256 = "sha256-IoP3QdKquTXIxSwEtXv5UtAsLALmURcvisgR93sfx3o=";
1010 };
1111
1212 outputs = [ "out" "dev" ];
pkgs/development/libraries/libf2c/default.nix+1−1
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
2222 cp f2c.h $out/include
2323 '';
2424
25− buildInputs = [ unzip ];
25+ nativeBuildInputs = [ unzip ];
2626
2727 hardeningDisable = [ "format" ];
2828
pkgs/development/libraries/libgcrypt/default.nix+3−14
@@ -1,27 +1,16 @@
1−{ lib, stdenv, fetchurl, gettext, libgpgerror, enableCapabilities ? false, libcap
2−, buildPackages, fetchpatch
3−}:
1+{ lib, stdenv, fetchurl, gettext, libgpgerror, enableCapabilities ? false, libcap, buildPackages }:
42
53assert enableCapabilities -> stdenv.isLinux;
64
75stdenv.mkDerivation rec {
86 pname = "libgcrypt";
9− version = "1.9.1";
7+ version = "1.9.2";
108
119 src = fetchurl {
1210 url = "mirror://gnupg/libgcrypt/${pname}-${version}.tar.bz2";
13− sha256 = "1nb50bgzp83q6r5cz4v40y1mcbhpqwqyxlay87xp1lrbkf5pm9n5";
11+ sha256 = "sha256-ssENCRUTsnHkcXcnRgex/7o9lbGIu/qHl/lIrskFPFo=";
1412 };
1513
16− patches = [
17− # fix build on 32bit musl
18− (fetchpatch {
19− name = "fix_building_with_disable-asm_on_x86.patch";
20− url = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=commitdiff_plain;h=af23ab5c5482d625ff52e60606cf044e2b0106c8";
21− sha256 = "1m8apm8wra6fk89ggha4d0bba5absihm38zvb2khklqh9q5hj9jw";
22− })
23− ];
24−
2514 outputs = [ "out" "dev" "info" ];
2615 outputBin = "dev";
2716
pkgs/development/libraries/libgphoto2/default.nix+2−2
@@ -7,13 +7,13 @@
77
88stdenv.mkDerivation rec {
99 pname = "libgphoto2";
10− version = "2.5.26";
10+ version = "2.5.27";
1111
1212 src = fetchFromGitHub {
1313 owner = "gphoto";
1414 repo = "libgphoto2";
1515 rev = "libgphoto2-${builtins.replaceStrings [ "." ] [ "_" ] version}-release";
16− sha256 = "0lnlxflj04ng9a0hm2nb2067kqs4kp9kx1z4gg395cgbfd7lx6j6";
16+ sha256 = "sha256-c7fBl6GBLAU+RL5WFC4PL+n/nEHZUfqIJ9qq1+qNNCg=";
1717 };
1818
1919 patches = [];
pkgs/development/libraries/libimagequant/default.nix+2−2
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 pname = "libimagequant";
5− version = "2.14.0";
5+ version = "2.14.1";
66
77 src = fetchFromGitHub {
88 owner = "ImageOptim";
99 repo = pname;
1010 rev = version;
11− sha256 = "sha256-XP/GeZC8TCgBPqtScY9eneZHFter1kdWf/yko0p2VYQ=";
11+ sha256 = "sha256-yWtwBTAs6dlrZz3Bd/4DUb488IJsahPKwjluukTlv/o=";
1212 };
1313
1414 preConfigure = ''
pkgs/development/libraries/libixp-hg/default.nix+2−1
@@ -14,7 +14,8 @@ stdenv.mkDerivation rec {
1414 sed -i -e "s|^PREFIX.*=.*$|PREFIX = $out|" config.mk
1515 '';
1616
17− buildInputs = [ unzip txt2tags ];
17+ nativeBuildInputs = [ unzip ];
18+ buildInputs = [ txt2tags ];
1819
1920 meta = {
2021 homepage = "http://repo.cat-v.org/libixp/"; # see also https://libs.suckless.org/deprecated/libixp
pkgs/development/libraries/libjson/default.nix+1−1
@@ -9,7 +9,7 @@ in stdenv.mkDerivation {
99 sha256 = "0xkk5qc7kjcdwz9l04kmiz1nhmi7iszl3k165phf53h3a4wpl9h7";
1010 };
1111 patches = [ ./install-fix.patch ];
12− buildInputs = [ unzip ];
12+ nativeBuildInputs = [ unzip ];
1313 makeFlags = [ "prefix=$(out)" ];
1414 preInstall = "mkdir -p $out/lib";
1515
pkgs/development/libraries/liblangtag/default.nix+2−3
@@ -35,9 +35,8 @@ stdenv.mkDerivation rec {
3535 "--with-locale-alias=${stdenv.cc.libc}/share/locale/locale.alias"
3636 ];
3737
38− buildInputs = [ gettext glib libxml2 gobject-introspection gnome-common
39− unzip ];
40− nativeBuildInputs = [ autoreconfHook gtk-doc gettext pkg-config ];
38+ buildInputs = [ gettext glib libxml2 gobject-introspection gnome-common ];
39+ nativeBuildInputs = [ autoreconfHook gtk-doc gettext pkg-config unzip ];
4140
4241 meta = {
4342 inherit version;
pkgs/development/libraries/libndctl/default.nix+2−2
@@ -5,13 +5,13 @@
55
66stdenv.mkDerivation rec {
77 pname = "libndctl";
8− version = "70.1";
8+ version = "71.1";
99
1010 src = fetchFromGitHub {
1111 owner = "pmem";
1212 repo = "ndctl";
1313 rev = "v${version}";
14− sha256 = "09ymdibcr18vpmyf2n0xrnzgccfvr7iy3p2l5lbh7cgz7djyl5wq";
14+ sha256 = "sha256-osux3DiKRh8ftHwyfFI+WSFx20+yJsg1nVx5nuoKJu4=";
1515 };
1616
1717 outputs = [ "out" "lib" "man" "dev" ];
pkgs/development/libraries/libproxy/default.nix+4−37
@@ -3,10 +3,9 @@
33, pkg-config
44, cmake
55, zlib
6−, fetchpatch
76, dbus
87, networkmanager
9−, spidermonkey_60
8+, spidermonkey_68
109, pcre
1110, gsettings-desktop-schemas
1211, glib
@@ -19,13 +18,13 @@
1918
2019stdenv.mkDerivation rec {
2120 pname = "libproxy";
22− version = "0.4.15";
21+ version = "0.4.17";
2322
2423 src = fetchFromGitHub {
2524 owner = "libproxy";
2625 repo = "libproxy";
2726 rev = version;
28− sha256 = "10swd3x576pinx33iwsbd4h15fbh2snmfxzcmab4c56nb08qlbrs";
27+ sha256 = "0v8q4ln0pd5231kidpi8wpwh0chcjwcmawcki53czlpdrc09z96r";
2928 };
3029
3130 outputs = [ "out" "dev" "py3" ];
@@ -46,7 +45,7 @@ stdenv.mkDerivation rec {
4645 JavaScriptCore
4746 ] else [
4847 glib
49− spidermonkey_60
48+ spidermonkey_68
5049 dbus
5150 networkmanager
5251 ]);
@@ -57,38 +56,6 @@ stdenv.mkDerivation rec {
5756 "-DPYTHON3_SITEPKG_DIR=${placeholder "py3"}/${python3.sitePackages}"
5857 ];
5958
60− patches = [
61− # Make build with spidermonkey_60
62− (fetchpatch {
63− url = "https://github.com/libproxy/libproxy/pull/86.patch";
64− sha256 = "17c06ilinrnzr7xnnmw9pc6zrncyaxcdd6r6k1ah5p156skbykfs";
65− })
66− (fetchpatch {
67− url = "https://github.com/libproxy/libproxy/pull/87.patch";
68− sha256 = "0sagzfwm16f33inbkwsp88w9wmrd034rjmw0y8d122f7k1qfx6zc";
69− })
70− (fetchpatch {
71− url = "https://github.com/libproxy/libproxy/pull/95.patch";
72− sha256 = "18vyr6wlis9zfwml86606jpgb9mss01l9aj31iiciml8p857aixi";
73− })
74− (fetchpatch {
75− name = "CVE-2020-25219.patch";
76− url = "https://github.com/libproxy/libproxy/commit/a83dae404feac517695c23ff43ce1e116e2bfbe0.patch";
77− sha256 = "0wdh9qjq99aw0jnf2840237i3hagqzy42s09hz9chfgrw8pyr72k";
78− })
79− (fetchpatch {
80− name = "CVE-2020-26154.patch";
81− url = "https://github.com/libproxy/libproxy/commit/4411b523545b22022b4be7d0cac25aa170ae1d3e.patch";
82− sha256 = "0pdy9sw49lxpaiwq073cisk0npir5bkch70nimdmpszxwp3fv1d8";
83− })
84−
85− ] ++ lib.optionals stdenv.isDarwin [
86− (fetchpatch {
87− url = "https://github.com/libproxy/libproxy/commit/44158f03f8522116758d335688ed840dfcb50ac8.patch";
88− sha256 = "0axfvb6j7gcys6fkwi9dkn006imhvm3kqr83gpwban8419n0q5v1";
89− })
90− ];
91−
9259 postFixup = lib.optionalString stdenv.isLinux ''
9360 # config_gnome3 uses the helper to find GNOME proxy settings
9461 wrapProgram $out/libexec/pxgsettings --prefix XDG_DATA_DIRS : "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}"
pkgs/development/libraries/libqmi/default.nix+39−12
@@ -1,33 +1,54 @@
1−{ lib, stdenv, fetchurl, pkg-config, gobject-introspection, glib, python3, libgudev, libmbim }:
1+{ lib
2+, stdenv
3+, fetchurl
4+, pkg-config
5+, gobject-introspection
6+, gtk-doc
7+, docbook-xsl-nons
8+, docbook_xml_dtd_43
9+, glib
10+, python3
11+, libgudev
12+, libmbim
13+, libqrtr-glib
14+}:
215
316stdenv.mkDerivation rec {
417 pname = "libqmi";
5− version = "1.26.10";
18+ version = "1.28.2";
19+
20+ outputs = [ "out" "dev" "devdoc" ];
621
722 src = fetchurl {
823 url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz";
9− sha256 = "sha256-fABD8GyHXlzx3jwMlMzH9bBYYry82eT7DV0UJ30dq1k=";
24+ sha256 = "jIw+5xmHTSUpvOmzWwKP5DWzbwA5eaNg060JOESdt4M=";
1025 };
1126
12− outputs = [ "out" "dev" "devdoc" ];
13−
14− configureFlags = [
15− "--with-udev-base-dir=${placeholder "out"}/lib/udev"
16− "--enable-introspection"
17− ];
18−
1927 nativeBuildInputs = [
2028 pkg-config
2129 gobject-introspection
2230 python3
31+ gtk-doc
32+ docbook-xsl-nons
33+ docbook_xml_dtd_43
2334 ];
2435
2536 buildInputs = [
26− glib
2737 libgudev
2838 libmbim
2939 ];
3040
41+ propagatedBuildInputs = [
42+ glib
43+ libqrtr-glib
44+ ];
45+
46+ configureFlags = [
47+ "--with-udev-base-dir=${placeholder "out"}/lib/udev"
48+ "--enable-gtk-doc"
49+ "--enable-introspection"
50+ ];
51+
3152 enableParallelBuilding = true;
3253
3354 doCheck = true;
@@ -35,7 +56,13 @@ stdenv.mkDerivation rec {
3556 meta = with lib; {
3657 homepage = "https://www.freedesktop.org/wiki/Software/libqmi/";
3758 description = "Modem protocol helper library";
59+ maintainers = teams.freedesktop.members;
3860 platforms = platforms.linux;
39− license = licenses.gpl2;
61+ license = with licenses; [
62+ # Library
63+ lgpl2Plus
64+ # Tools
65+ gpl2Plus
66+ ];
4067 };
4168}
pkgs/development/libraries/libqrtr-glib/default.nixnew file+46
@@ -0,0 +1,46 @@
1+{ lib
2+, stdenv
3+, fetchurl
4+, pkg-config
5+, gobject-introspection
6+, gtk-doc
7+, docbook-xsl-nons
8+, docbook_xml_dtd_43
9+, glib
10+}:
11+
12+stdenv.mkDerivation rec {
13+ pname = "libqrtr-glib";
14+ version = "1.0.0";
15+
16+ outputs = [ "out" "dev" "devdoc" ];
17+
18+ src = fetchurl {
19+ url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz";
20+ sha256 = "MNh5sq3m+PRh3vOmd3VdtcAji6v2iNXIPAOz5qvjXO4=";
21+ };
22+
23+ nativeBuildInputs = [
24+ pkg-config
25+ gobject-introspection
26+ gtk-doc
27+ docbook-xsl-nons
28+ docbook_xml_dtd_43
29+ ];
30+
31+ buildInputs = [
32+ glib
33+ ];
34+
35+ configureFlags = [
36+ "--enable-gtk-doc"
37+ ];
38+
39+ meta = with lib; {
40+ homepage = "https://gitlab.freedesktop.org/mobile-broadband/libqrtr-glib";
41+ description = "Qualcomm IPC Router protocol helper library";
42+ maintainers = teams.freedesktop.members;
43+ platforms = platforms.linux;
44+ license = licenses.lgpl2Plus;
45+ };
46+}
pkgs/development/libraries/libspotify/default.nix+1−1
@@ -47,7 +47,7 @@ else stdenv.mkDerivation {
4747
4848
4949 # darwin-specific
50− buildInputs = lib.optional (stdenv.hostPlatform.system == "x86_64-darwin") unzip;
50+ nativeBuildInputs = lib.optional (stdenv.hostPlatform.system == "x86_64-darwin") unzip;
5151
5252 # linux-specific
5353 installFlags = lib.optional isLinux
pkgs/development/libraries/libtiff/default.nix+7−4
@@ -4,18 +4,19 @@
44, pkg-config
55, cmake
66
7−, zlib
7+, libdeflate
88, libjpeg
99, xz
10+, zlib
1011}:
1112
1213stdenv.mkDerivation rec {
13− version = "4.1.0";
1414 pname = "libtiff";
15+ version = "4.2.0";
1516
1617 src = fetchurl {
1718 url = "https://download.osgeo.org/libtiff/tiff-${version}.tar.gz";
18− sha256 = "0d46bdvxdiv59lxnb0xz9ywm8arsr6xsapi5s6y6vnys2wjz6aax";
19+ sha256 = "1jrkjv0xya9radddn8idxvs2gqzp3l2b1s8knlizmn7ad3jq817b";
1920 };
2021
2122 cmakeFlags = if stdenv.isDarwin then [
@@ -35,7 +36,9 @@ stdenv.mkDerivation rec {
3536
3637 nativeBuildInputs = [ cmake pkg-config ];
3738
38− propagatedBuildInputs = [ zlib libjpeg xz ]; #TODO: opengl support (bogus configure detection)
39+ propagatedBuildInputs = [ libjpeg xz zlib ]; #TODO: opengl support (bogus configure detection)
40+
41+ buildInputs = [ libdeflate ]; # TODO: move all propagatedBuildInputs to buildInputs.
3942
4043 enableParallelBuilding = true;
4144
pkgs/development/libraries/libwacom/default.nix+2−2
@@ -2,7 +2,7 @@
22
33stdenv.mkDerivation rec {
44 pname = "libwacom";
5− version = "1.8";
5+ version = "1.9";
66
77 outputs = [ "out" "dev" ];
88
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 owner = "linuxwacom";
1111 repo = "libwacom";
1212 rev = "libwacom-${version}";
13− sha256 = "sha256-vkBkOE4aVX/6xKjslkqlZkh5jdYVEawvvBLpj8PpuiA=";
13+ sha256 = "sha256-o1xCSrWKPzz1GePEVB1jgx2cGzRtw0I6c4wful08Vx4=";
1414 };
1515
1616 nativeBuildInputs = [ pkg-config meson ninja doxygen ];
pkgs/development/libraries/minizip2/default.nix+2−2
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 pname = "minizip";
5− version = "2.10.4";
5+ version = "2.10.6";
66
77 src = fetchFromGitHub {
88 owner = "nmoinvaz";
99 repo = pname;
1010 rev = version;
11− sha256 = "15bbagngvm738prkzv7lfs64pn4pq7jkhwz571j0w0nb5nw9c01x";
11+ sha256 = "sha256-OAm4OZeQdP2Q/UKYI9bR7OV9RmLmYF/j2NpK5TPoE60=";
1212 };
1313
1414 nativeBuildInputs = [ cmake pkg-config ];
pkgs/development/libraries/muparser/default.nix+2−3
@@ -10,9 +10,8 @@ stdenv.mkDerivation rec {
1010 sha256 = "00l92k231yb49wijzkspa2l58mapn6vh2dlxnlg0pawjjfv33s6z";
1111 };
1212
13− buildInputs = [
14− unzip
15− ] ++ lib.optionals stdenv.isDarwin [setfile];
13+ nativeBuildInputs = [ unzip ];
14+ buildInputs = lib.optionals stdenv.isDarwin [setfile];
1615
1716 meta = {
1817 homepage = "http://muparser.sourceforge.net";
pkgs/development/libraries/mygui/default.nix+2−2
@@ -14,8 +14,8 @@ in stdenv.mkDerivation rec {
1414 sha256 = "0a4zi8w18pjj813n7kmxldl1d9r1jp0iyhkw7pbqgl8f7qaq994w";
1515 };
1616
17− nativeBuildInputs = [ cmake pkg-config ];
18− buildInputs = [ libX11 unzip ois freetype libuuid boost ]
17+ nativeBuildInputs = [ cmake pkg-config unzip ];
18+ buildInputs = [ libX11 ois freetype libuuid boost ]
1919 ++ (if withOgre then [ ogre ] else [ libGL libGLU ]);
2020
2121 # Tools are disabled due to compilation failures.
pkgs/development/libraries/nvidia-video-sdk/default.nix+1−1
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
99 sha256 = "08h1vnqsv22js9v3pyim5yb80z87baxb7s2g5gsvvjax07j7w8h5";
1010 };
1111
12− buildInputs = [ unzip ];
12+ nativeBuildInputs = [ unzip ];
1313
1414 # We only need the header files. The library files are
1515 # in the nvidia_x11 driver.
pkgs/development/libraries/openexrid-unstable/default.nix+2−1
@@ -25,7 +25,8 @@ stdenv.mkDerivation {
2525 -I${openfx.dev}/include/OpenFX
2626 '';
2727
28− buildInputs = [ unzip re2 openfx zlib ilmbase libGLU libGL openexr ];
28+ nativeBuildInputs = [ unzip ];
29+ buildInputs = [ re2 openfx zlib ilmbase libGLU libGL openexr ];
2930
3031 enableParallelBuilding = true;
3132
pkgs/development/libraries/openfx/default.nix+1−1
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
1111 sha256 = "0k9ggzr6bisn77mipjfvawg3mv4bz50b63v8f7w1jhldi1sfy548";
1212 };
1313
14− buildInputs = [ unzip ];
14+ nativeBuildInputs = [ unzip ];
1515
1616 outputs = [ "dev" "out" ];
1717
pkgs/development/libraries/openvdb/default.nix+2−1
@@ -14,7 +14,8 @@ stdenv.mkDerivation rec
1414
1515 outputs = [ "out" ];
1616
17− buildInputs = [ unzip openexr boost tbb jemalloc c-blosc ilmbase ];
17+ nativeBuildInputs = [ unzip ];
18+ buildInputs = [ openexr boost tbb jemalloc c-blosc ilmbase ];
1819
1920 setSourceRoot = ''
2021 sourceRoot=$(echo */openvdb)
pkgs/development/libraries/poppler/default.nix+2−2
@@ -12,11 +12,11 @@ let
1212in
1313stdenv.mkDerivation rec {
1414 name = "poppler-${suffix}-${version}";
15− version = "21.01.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too!
15+ version = "21.02.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too!
1616
1717 src = fetchurl {
1818 url = "${meta.homepage}/poppler-${version}.tar.xz";
19− sha256 = "sha256-AW3eNOX4aOqYoyypm2QzJaloIoFQCUK3ET9OyI0g4vM=";
19+ sha256 = "sha256-XBR1nJmJHm5HKs7W1fD/Haz4XYDNkCbTZcVcZT7feSw=";
2020 };
2121
2222 outputs = [ "out" "dev" ];
pkgs/development/libraries/protobuf/3.15.nixnew file+6
@@ -0,0 +1,6 @@
1+{ callPackage, ... }:
2+
3+callPackage ./generic-v3.nix {
4+ version = "3.15.5";
5+ sha256 = "1znxzy4illsr4a08642h6s83jawzrq40m6pzkp05q0cpm8hcpvda";
6+}
pkgs/development/libraries/python-qt/default.nix+2−2
@@ -13,9 +13,9 @@ stdenv.mkDerivation rec {
1313
1414 hardeningDisable = [ "all" ];
1515
16− nativeBuildInputs = [ qmake qtwebengine qtxmlpatterns qttools ];
16+ nativeBuildInputs = [ qmake qtwebengine qtxmlpatterns qttools unzip ];
1717
18− buildInputs = [ python unzip ];
18+ buildInputs = [ python ];
1919
2020 qmakeFlags = [ "PythonQt.pro"
2121 "INCLUDEPATH+=${python}/include/python3.6"
pkgs/development/libraries/science/math/liblapack/default.nix+26−3
@@ -3,7 +3,6 @@
33 fetchFromGitHub,
44 gfortran,
55 cmake,
6− python2,
76 shared ? true
87}:
98let
@@ -11,7 +10,7 @@ let
1110 version = "3.9.0";
1211in
1312
14−stdenv.mkDerivation {
13+stdenv.mkDerivation rec {
1514 pname = "liblapack";
1615 inherit version;
1716
@@ -22,17 +21,41 @@ stdenv.mkDerivation {
2221 sha256 = "0sxnc97z67i7phdmcnq8f8lmxgw10wdwvr8ami0w3pb179cgrbpb";
2322 };
2423
25− nativeBuildInputs = [ gfortran python2 cmake ];
24+ nativeBuildInputs = [ gfortran cmake ];
25+
26+ # Configure stage fails on aarch64-darwin otherwise, due to either clang 11 or gfortran 10.
27+ hardeningDisable = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ "stackprotector" ];
2628
2729 cmakeFlags = [
2830 "-DCMAKE_Fortran_FLAGS=-fPIC"
2931 "-DLAPACKE=ON"
3032 "-DCBLAS=ON"
33+ "-DBUILD_TESTING=ON"
3134 ]
3235 ++ optional shared "-DBUILD_SHARED_LIBS=ON";
3336
3437 doCheck = true;
3538
39+ # Some CBLAS related tests fail on Darwin:
40+ # 14 - CBLAS-xscblat2 (Failed)
41+ # 15 - CBLAS-xscblat3 (Failed)
42+ # 17 - CBLAS-xdcblat2 (Failed)
43+ # 18 - CBLAS-xdcblat3 (Failed)
44+ # 20 - CBLAS-xccblat2 (Failed)
45+ # 21 - CBLAS-xccblat3 (Failed)
46+ # 23 - CBLAS-xzcblat2 (Failed)
47+ # 24 - CBLAS-xzcblat3 (Failed)
48+ #
49+ # Upstream issue to track:
50+ # * https://github.com/Reference-LAPACK/lapack/issues/440
51+ ctestArgs = lib.optionalString stdenv.isDarwin "-E '^(CBLAS-(x[sdcz]cblat[23]))$'";
52+
53+ checkPhase = ''
54+ runHook preCheck
55+ ctest ${ctestArgs}
56+ runHook postCheck
57+ '';
58+
3659 meta = with lib; {
3760 inherit version;
3861 description = "Linear Algebra PACKage";
pkgs/development/libraries/slib/default.nix+2−1
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
1010
1111 patches = [ ./catalog-in-library-vicinity.patch ];
1212
13− buildInputs = [ unzip scheme texinfo ];
13+ nativeBuildInputs = [ unzip ];
14+ buildInputs = [ scheme texinfo ];
1415
1516 postInstall = ''
1617 ln -s mklibcat{.scm,}
pkgs/development/libraries/tnt/default.nix+1−1
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
99 sha256 = "1bzkfdb598584qlc058n8wqq9vbz714gr5r57401rsa9qaxhk5j7";
1010 };
1111
12− buildInputs = [ unzip ];
12+ nativeBuildInputs = [ unzip ];
1313
1414 installPhase = ''
1515 mkdir -p $out/include
pkgs/development/libraries/wtk/default.nix+1−1
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313
1414 builder = ./builder.sh;
1515
16− buildInputs = [ unzip ];
16+ nativeBuildInputs = [ unzip ];
1717
1818 libraries = [ xorg.libXpm xorg.libXt xorg.libX11 xorg.libICE xorg.libSM stdenv.cc.cc ];
1919
pkgs/development/misc/avr8-burn-omat/default.nix+1−1
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
88 sha256 = "02k0fd0cd3y1yqip36wr3bkxbywp8913w4y7jdg6qwqxjnii58ln";
99 };
1010
11− buildInputs = [ unzip ];
11+ nativeBuildInputs = [ unzip ];
1212
1313 phases = "unpackPhase installPhase";
1414
pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix+1−2
@@ -64,8 +64,7 @@ stdenv.mkDerivation {
6464 }
6565 else throw "Platform: ${stdenv.system} not supported!";
6666
67− nativeBuildInputs = [ makeWrapper ];
68− buildInputs = [ unzip ];
67+ nativeBuildInputs = [ makeWrapper unzip ];
6968
7069 buildCommand = ''
7170 mkdir -p $out
pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix+1−2
@@ -64,8 +64,7 @@ stdenv.mkDerivation {
6464 }
6565 else throw "Platform: ${stdenv.system} not supported!";
6666
67− nativeBuildInputs = [ makeWrapper ];
68− buildInputs = [ unzip ];
67+ nativeBuildInputs = [ makeWrapper unzip ];
6968
7069 buildCommand = ''
7170 mkdir -p $out
pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix+1−2
@@ -64,8 +64,7 @@ stdenv.mkDerivation {
6464 }
6565 else throw "Platform: ${stdenv.system} not supported!";
6666
67− nativeBuildInputs = [ makeWrapper ];
68− buildInputs = [ unzip ];
67+ nativeBuildInputs = [ makeWrapper unzip ];
6968
7069 buildCommand = ''
7170 mkdir -p $out
pkgs/development/ocaml-modules/ocaml-cairo/default.nix+2−2
@@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
1919
2020 patches = [ ./META.patch ];
2121
22− nativeBuildInputs = [ pkg-config ];
23− buildInputs = [ ocaml automake gnum4 autoconf unzip
22+ nativeBuildInputs = [ pkg-config unzip ];
23+ buildInputs = [ ocaml automake gnum4 autoconf
2424 findlib freetype lablgtk cairo gdk-pixbuf gtk2 pango ];
2525
2626 createFindlibDestdir = true;
pkgs/development/pharo/launcher/default.nix+2−1
@@ -23,7 +23,8 @@ stdenv.mkDerivation rec {
2323 # because upstream tarball has no top-level directory.
2424 sourceRoot = ".";
2525
26− buildInputs = [ bash pharo unzip ];
26+ nativeBuildInputs = [ unzip ];
27+ buildInputs = [ bash pharo ];
2728
2829 installPhase = ''
2930 mkdir -p $prefix/share/pharo-launcher
pkgs/development/pharo/vm/build-vm.nix+1−2
@@ -53,10 +53,9 @@ stdenv.mkDerivation rec {
5353 # http://forum.world.st/OSProcess-fork-issue-with-Debian-built-VM-td4947326.html
5454 #
5555 # (stack protection is disabled above for gcc 4.8 compatibility.)
56− nativeBuildInputs = [ autoreconfHook ];
56+ nativeBuildInputs = [ autoreconfHook unzip ];
5757 buildInputs = [
5858 bash
59− unzip
6059 glibc
6160 openssl
6261 gcc48
pkgs/development/pharo/vm/share.nix+1−1
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
3636 sha256 = "0xbdi679ryb2zg412xy6zkh22l20pmbl92m3qhfgzjvgybna8z2a";
3737 };
3838
39− buildInputs = [ unzip ];
39+ nativeBuildInputs = [ unzip ];
4040
4141 installPhase = ''
4242 mkdir -p $prefix/lib
pkgs/development/python-modules/Cython/default.nix+11−2
@@ -26,11 +26,11 @@ let
2626
2727in buildPythonPackage rec {
2828 pname = "Cython";
29− version = "0.29.21";
29+ version = "0.29.22";
3030
3131 src = fetchPypi {
3232 inherit pname version;
33− sha256 = "1bcwpra7c6k30yvic3sw2v3rq2dr40ypc4zqif6kr52mpn4wnyp5";
33+ sha256 = "sha256-32uDx6bR2WfqiaKQPkqTE3djSil0WWUuRVFzTEgZVAY=";
3434 };
3535
3636 nativeBuildInputs = [
@@ -49,6 +49,15 @@ in buildPythonPackage rec {
4949 url = "https://github.com/cython/cython/commit/28251032f86c266065e4976080230481b1a1bb29.patch";
5050 sha256 = "19rg7xs8gr90k3ya5c634bs8gww1sxyhdavv07cyd2k71afr83gy";
5151 })
52+
53+ # backport Cython 3.0 trashcan support (https://github.com/cython/cython/pull/2842) to 0.X series.
54+ # it does not affect Python code unless the code explicitly uses the feature.
55+ # trashcan support is needed to avoid stack overflows during object deallocation in sage (https://trac.sagemath.org/ticket/27267)
56+ (fetchpatch {
57+ name = "trashcan.patch";
58+ url = "https://git.sagemath.org/sage.git/plain/build/pkgs/cython/patches/trashcan.patch?id=4569a839f070a1a38d5dbce2a4d19233d25aeed2";
59+ sha256 = "sha256-+pOF1XNTEtNseLpqPzrc1Jfwt5hGx7doUoccIhNneYY=";
60+ })
5261 ];
5362
5463 checkPhase = ''
pkgs/development/python-modules/aioambient/default.nix+2−2
@@ -16,7 +16,7 @@
1616
1717buildPythonPackage rec {
1818 pname = "aioambient";
19− version = "1.2.3";
19+ version = "1.2.4";
2020 format = "pyproject";
2121 disabled = pythonOlder "3.6";
2222
@@ -24,7 +24,7 @@ buildPythonPackage rec {
2424 owner = "bachya";
2525 repo = pname;
2626 rev = version;
27− sha256 = "1jg93rjn1gxc66qmipw4z1c09l8hgfsydacjgkfjq7vg547lragp";
27+ sha256 = "sha256-uqvM5F0rpw+xeCXYl4lGMt3r0ugPsUmSvujmTJ9HABk=";
2828 };
2929
3030 nativeBuildInputs = [ poetry-core ];
pkgs/development/python-modules/aioflo/default.nix+2−2
@@ -12,14 +12,14 @@
1212
1313buildPythonPackage rec {
1414 pname = "aioflo";
15− version = "0.4.2";
15+ version = "0.4.3";
1616 format = "pyproject";
1717
1818 src = fetchFromGitHub {
1919 owner = "bachya";
2020 repo = pname;
2121 rev = version;
22− sha256 = "1ppsinmjph6snj7s4hg28p3qa67kpkadc98ikjjg6w65vcm3dlaz";
22+ sha256 = "sha256-Dap3yjFIS+k/LLNg+vmYmiFQCOEPNp27p0GCMpn/edA=";
2323 };
2424
2525 nativeBuildInputs = [ poetry-core ];
pkgs/development/python-modules/aioguardian/default.nix+2−2
@@ -15,14 +15,14 @@
1515
1616buildPythonPackage rec {
1717 pname = "aioguardian";
18− version = "1.0.4";
18+ version = "1.0.7";
1919 disabled = pythonAtLeast "3.9";
2020
2121 src = fetchFromGitHub {
2222 owner = "bachya";
2323 repo = pname;
2424 rev = version;
25− sha256 = "1cbxcsxh9c8r2zx3lsjdns26sm2qmlwnqgah2sfzbgp1lay23vvq";
25+ sha256 = "sha256-KMhq86hcqoYloS/6VHsl+3KVEZBbN97ABrZlmEr32Z8=";
2626 };
2727
2828 format = "pyproject";
pkgs/development/python-modules/aiohttp/default.nix+35−40
@@ -3,82 +3,77 @@
33, buildPythonPackage
44, fetchPypi
55, pythonOlder
6+, async-timeout
67, attrs
78, chardet
8−, multidict
9−, async-timeout
10−, yarl
119, idna-ssl
10+, multidict
1211, typing-extensions
13−, pytestrunner
14−, pytestCheckHook
15−, gunicorn
12+, yarl
1613, async_generator
17−, pytest_xdist
18−, pytestcov
19−, pytest-mock
20−, trustme
2114, brotlipy
2215, freezegun
23−, isPy38
16+, gunicorn
17+, pytest-mock
18+, pytest-xdist
19+, pytestCheckHook
2420, re-assert
21+, trustme
2522}:
2623
2724buildPythonPackage rec {
2825 pname = "aiohttp";
29− version = "3.7.3";
30− # https://github.com/aio-libs/aiohttp/issues/4525 python3.8 failures
31− disabled = pythonOlder "3.5";
26+ version = "3.7.4.post0";
27+ disabled = pythonOlder "3.6";
3228
3329 src = fetchPypi {
3430 inherit pname version;
35− sha256 = "9c1a81af067e72261c9cbe33ea792893e83bc6aa987bfbd6fdc1e5e7b22777c4";
31+ sha256 = "493d3299ebe5f5a7c66b9819eacdcfbbaaf1a8e84911ddffcdc48888497afecf";
3632 };
3733
38− checkInputs = [
39− pytestrunner pytestCheckHook gunicorn async_generator pytest_xdist
40− pytest-mock pytestcov trustme brotlipy freezegun
41− re-assert
42− ];
34+ postPatch = ''
35+ substituteInPlace setup.cfg --replace " --cov=aiohttp" ""
36+ '';
4337
4438 propagatedBuildInputs = [
39+ async-timeout
4540 attrs
4641 chardet
4742 multidict
48− async-timeout
4943 typing-extensions
5044 yarl
5145 ] ++ lib.optionals (pythonOlder "3.7") [
5246 idna-ssl
5347 ];
5448
49+ checkInputs = [
50+ async_generator
51+ brotlipy
52+ freezegun
53+ gunicorn
54+ pytest-mock
55+ pytest-xdist
56+ pytestCheckHook
57+ re-assert
58+ trustme
59+ ];
60+
61+ pytestFlagsArray = [
62+ "-n auto"
63+ ];
64+
5565 disabledTests = [
56− # disable tests which attempt to do loopback connections
57− "get_valid_log_format_exc"
58− "test_access_logger_atoms"
59− "aiohttp_request_coroutine"
60− "server_close_keepalive_connection"
61− "connector"
62− "client_disconnect"
63− "handle_keepalive_on_closed_connection"
64− "proxy_https_bad_response"
65− "partially_applied_handler"
66− "middleware"
66+ # Disable tests that require network access
6767 "test_mark_formdata_as_processed"
68− # no longer compatible with pytest>=6
69− "aiohttp_plugin_async_fixture"
7068 ] ++ lib.optionals stdenv.is32bit [
7169 "test_cookiejar"
72− ] ++ lib.optionals isPy38 [
73− # Python 3.8 https://github.com/aio-libs/aiohttp/issues/4525
74− "test_read_boundary_with_incomplete_chunk"
75− "test_read_incomplete_chunk"
76− "test_request_tracing_exception"
7770 ] ++ lib.optionals stdenv.isDarwin [
78− "test_addresses" # https://github.com/aio-libs/aiohttp/issues/3572
71+ "test_addresses" # https://github.com/aio-libs/aiohttp/issues/3572, remove >= v4.0.0
7972 "test_close"
8073 ];
8174
75+ __darwinAllowLocalNetworking = true;
76+
8277 # aiohttp in current folder shadows installed version
8378 # Probably because we run `python -m pytest` instead of `pytest` in the hook.
8479 preCheck = ''
pkgs/development/python-modules/aiorecollect/default.nix+2−2
@@ -13,14 +13,14 @@
1313
1414buildPythonPackage rec {
1515 pname = "aiorecollect";
16− version = "1.0.2";
16+ version = "1.0.3";
1717 format = "pyproject";
1818
1919 src = fetchFromGitHub {
2020 owner = "bachya";
2121 repo = pname;
2222 rev = version;
23− sha256 = "0dlz8zmqcn6g6000lfgcy5krpfafzdzrznmk6iwra65wcs7l9392";
23+ sha256 = "sha256-S4HL8vJS/dTKsR5egKRSHqZYPClcET5Le06euHPyIkU=";
2424 };
2525
2626 nativeBuildInputs = [ poetry-core ];
pkgs/development/python-modules/astroid/default.nix+20−15
@@ -1,34 +1,39 @@
1−{ lib, fetchPypi, buildPythonPackage, pythonOlder, isPyPy, pythonAtLeast
2−, lazy-object-proxy, six, wrapt, typing, typed-ast
3−, pytestrunner, pytest
1+{ lib
2+, buildPythonPackage
3+, fetchPypi
4+, pythonOlder
5+, isPyPy
6+, lazy-object-proxy
7+, wrapt
8+, typed-ast
9+, pytestCheckHook
410}:
511
612buildPythonPackage rec {
713 pname = "astroid";
8− version = "2.4.2";
14+ version = "2.5";
915
10− disabled = pythonOlder "3.4" || pythonAtLeast "3.9";
16+ disabled = pythonOlder "3.6";
1117
1218 src = fetchPypi {
1319 inherit pname version;
14− sha256 = "2f4078c2a41bf377eea06d71c9d2ba4eb8f6b1af2135bec27bbbb7d8f12bb703";
20+ sha256 = "03dzhjrsc5d2whyjngfrwvxn42058k0cjjr85x2wqzai8psr475k";
1521 };
1622
17− postPatch = ''
18− substituteInPlace astroid/__pkginfo__.py --replace "lazy_object_proxy==1.4.*" "lazy_object_proxy"
19− '';
20−
2123 # From astroid/__pkginfo__.py
22− propagatedBuildInputs = [ lazy-object-proxy six wrapt ]
23− ++ lib.optional (pythonOlder "3.5") typing
24− ++ lib.optional (!isPyPy) typed-ast;
24+ propagatedBuildInputs = [
25+ lazy-object-proxy
26+ wrapt
27+ ] ++ lib.optional (!isPyPy && pythonOlder "3.8") typed-ast;
2528
26− checkInputs = [ pytestrunner pytest ];
29+ checkInputs = [
30+ pytestCheckHook
31+ ];
2732
2833 meta = with lib; {
2934 description = "An abstract syntax tree for Python with inference support";
3035 homepage = "https://github.com/PyCQA/astroid";
31− license = licenses.lgpl2;
36+ license = licenses.lgpl21Plus;
3237 platforms = platforms.all;
3338 maintainers = with maintainers; [ nand0p ];
3439 };
pkgs/development/python-modules/async-upnp-client/default.nix+2−2
@@ -1,6 +1,6 @@
11{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder
22, voluptuous, aiohttp, async-timeout, python-didl-lite, defusedxml
3−, pytest_6, pytest-asyncio }:
3+, pytestCheckHook, pytest-asyncio }:
44
55buildPythonPackage rec {
66 pname = "async-upnp-client";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
2323 ];
2424
2525 checkInputs = [
26− pytest_6
26+ pytestCheckHook
2727 pytest-asyncio
2828 ];
2929
pkgs/development/python-modules/build/default.nix+30−9
@@ -1,25 +1,29 @@
11{ lib
22, buildPythonPackage
33, fetchPypi
4+, filelock
45, flit-core
5−, toml
6−, pep517
7−, packaging
6+, importlib-metadata
87, isPy3k
9−, typing
8+, packaging
9+, pep517
10+, pytest-mock
11+, pytest-xdist
12+, pytestCheckHook
1013, pythonOlder
11−, importlib-metadata
14+, toml
15+, typing
1216}:
1317
1418buildPythonPackage rec {
1519 pname = "build";
16− version = "0.1.0";
20+ version = "0.3.0";
1721
1822 format = "pyproject";
1923
2024 src = fetchPypi {
2125 inherit pname version;
22− sha256 = "1d6m21lijwm04g50nwgsgj7x3vhblzw7jv05ah8psqgzk20bbch8";
26+ sha256 = "sha256-DrlbLI13DXxMm5LGjCJ8NQu/ZfPsg1UazpCXwYzBX90=";
2327 };
2428
2529 nativeBuildInputs = [
@@ -36,8 +40,25 @@ buildPythonPackage rec {
3640 importlib-metadata
3741 ];
3842
39− # No tests in archive
40− doCheck = false;
43+ checkInputs = [
44+ filelock
45+ pytestCheckHook
46+ pytest-mock
47+ pytest-xdist
48+ ];
49+
50+ disabledTests = [
51+ "test_isolation"
52+ "test_isolated_environment_install"
53+ "test_default_pip_is_never_too_old"
54+ "test_build_isolated - StopIteration"
55+ "test_build_raises_build_exception"
56+ "test_build_raises_build_backend_exception"
57+ "test_projectbuilder.py"
58+ "test_projectbuilder.py"
59+ ];
60+
61+ pythonImportsCheck = [ "build" ];
4162
4263 meta = with lib; {
4364 description = "Simple, correct PEP517 package builder";
pkgs/development/python-modules/check-manifest/default.nix+24−3
@@ -1,4 +1,14 @@
1−{ lib, buildPythonPackage, fetchPypi, pep517, toml, mock, breezy, git, build }:
1+{ lib
2+, breezy
3+, build
4+, buildPythonPackage
5+, fetchPypi
6+, git
7+, mock
8+, pep517
9+, pytestCheckHook
10+, toml
11+}:
212
313buildPythonPackage rec {
414 pname = "check-manifest";
@@ -14,9 +24,20 @@ buildPythonPackage rec {
1424 substituteInPlace tests.py --replace "test_build_sdist" "no_test_build_sdist"
1525 '';
1626
17− propagatedBuildInputs = [ build pep517 toml ];
27+ propagatedBuildInputs = [
28+ build
29+ pep517
30+ toml
31+ ];
1832
19− checkInputs = [ mock breezy git ];
33+ checkInputs = [
34+ breezy
35+ git
36+ mock
37+ pytestCheckHook
38+ ];
39+
40+ pythonImportsCheck = [ "check_manifest" ];
2041
2142 meta = with lib; {
2243 homepage = "https://github.com/mgedmin/check-manifest";
pkgs/development/python-modules/curio/default.nix+15
@@ -1,6 +1,7 @@
11{ lib
22, buildPythonPackage
33, fetchPypi
4+, fetchpatch
45, isPy3k
56, pytestCheckHook
67, sphinx
@@ -16,6 +17,20 @@ buildPythonPackage rec {
1617 sha256 = "57edce81c837f3c2cf42fbb346dee26e537d1659e6605269fb13bd179e068744";
1718 };
1819
20+ patches = [
21+ # Fix the flaky test due to slow moving time on Apple Silicon chips.
22+ # Remove when https://github.com/dabeaz/curio/pull/339 is in the next release.
23+ (fetchpatch {
24+ url = "https://github.com/dabeaz/curio/commit/132376724bbfaa0a52d3d63d0791aa4ac1eb6f5f.patch";
25+ sha256 = "sha256-AxO0xRcR9l9/NKEJFwyZIoYcyZxpqOhpdNaeaYokVb4=";
26+ })
27+ # Same as above
28+ (fetchpatch {
29+ url = "https://github.com/dabeaz/curio/commit/8ac2f12a2cdacbc750b01fc7459cee8879bc1ee3.patch";
30+ sha256 = "sha256-2Si3fuDLrI09QuzJd1TrE0QY02G9e9m+1eHFTB/MrWU=";
31+ })
32+ ];
33+
1934 disabled = !isPy3k;
2035
2136 checkInputs = [ pytestCheckHook sphinx ];
pkgs/development/python-modules/lxml/default.nix+3−2
@@ -1,8 +1,9 @@
1−{ lib, buildPythonPackage, fetchFromGitHub
1+{ stdenv, lib, buildPythonPackage, fetchFromGitHub
22, cython
33, libxml2
44, libxslt
55, zlib
6+, xcodebuild
67}:
78
89buildPythonPackage rec {
@@ -17,7 +18,7 @@ buildPythonPackage rec {
1718 };
1819
1920 # setuptoolsBuildPhase needs dependencies to be passed through nativeBuildInputs
20− nativeBuildInputs = [ libxml2.dev libxslt.dev cython ];
21+ nativeBuildInputs = [ libxml2.dev libxslt.dev cython ] ++ lib.optionals stdenv.isDarwin [ xcodebuild ];
2122 buildInputs = [ libxml2 libxslt zlib ];
2223
2324 # tests are meant to be ran "in-place" in the same directory as src
pkgs/development/python-modules/parso/default.nix+10
@@ -1,6 +1,7 @@
11{ lib
22, buildPythonPackage
33, fetchPypi
4+, fetchpatch
45, pythonOlder
56, pytestCheckHook
67}:
@@ -15,6 +16,15 @@ buildPythonPackage rec {
1516 sha256 = "8519430ad07087d4c997fda3a7918f7cfa27cb58972a8c89c2a0295a1c940e9e";
1617 };
1718
19+ patches = [
20+ # Fix the flaky test due to slow moving time on Apple Silicon chips.
21+ # Remove when https://github.com/davidhalter/parso/pull/177 is in the next release.
22+ (fetchpatch {
23+ url = "https://github.com/davidhalter/parso/pull/177/commits/2799a7a3c2cf87fdc2d0c19a0890acea425091ce.patch";
24+ sha256 = "sha256-A5EQly1wR/7lo+L8Pp0UPSUIhC0WcblXEWQNvRMlZYA=";
25+ })
26+ ];
27+
1828 checkInputs = [ pytestCheckHook ];
1929
2030 meta = with lib; {
pkgs/development/python-modules/poetry-core/default.nix+2−2
@@ -13,14 +13,14 @@
1313
1414buildPythonPackage rec {
1515 pname = "poetry-core";
16− version = "1.0.0";
16+ version = "1.0.2";
1717 format = "pyproject";
1818
1919 src = fetchFromGitHub {
2020 owner = "python-poetry";
2121 repo = pname;
2222 rev = version;
23− sha256 = "02pqkwzbg43xz2zsw8q7m0sfkj8wbw07in83gy0bk0znhljhp0vw";
23+ sha256 = "sha256-OE6oc/3HYrMmgPnINxvSZ27m8YeZk5Gnn9ok8GlSIZ0=";
2424 };
2525
2626 nativeBuildInputs = [
pkgs/development/python-modules/psutil/default.nix+12−7
@@ -1,6 +1,6 @@
11{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, python
22, darwin
3−, pytest
3+, pytestCheckHook
44, mock
55, ipaddress
66, unittest2
@@ -18,15 +18,20 @@ buildPythonPackage rec {
1818 # arch doesn't report frequency is the same way
1919 # tests segfaults on darwin https://github.com/giampaolo/psutil/issues/1715
2020 doCheck = !stdenv.isDarwin && stdenv.isx86_64;
21− checkInputs = [ pytest ]
21+ checkInputs = [ pytestCheckHook ]
2222 ++ lib.optionals isPy27 [ mock ipaddress unittest2 ];
23− # out must be referenced as test import paths are relative
23+ pytestFlagsArray = [
24+ "$out/${python.sitePackages}/psutil/tests/test_system.py"
25+ ];
2426 # disable tests which don't work in sandbox
2527 # cpu_times is flakey on darwin
26− checkPhase = ''
27− pytest $out/${python.sitePackages}/psutil/tests/test_system.py \
28− -k 'not user and not disk_io_counters and not sensors_battery and not cpu_times'
29− '';
28+ disabledTests = [
29+ "user"
30+ "disk_io_counters"
31+ "sensors_battery"
32+ "cpu_times"
33+ "cpu_freq"
34+ ];
3035
3136 buildInputs = lib.optionals stdenv.isDarwin [ darwin.IOKit ];
3237
pkgs/development/python-modules/py-cpuinfo/default.nix+18−4
@@ -1,6 +1,7 @@
11{ lib
22, stdenv
33, fetchFromGitHub
4+, fetchpatch
45, buildPythonPackage
56, pytestCheckHook
67, sysctl
@@ -17,6 +18,23 @@ buildPythonPackage rec {
1718 sha256 = "10qfaibyb2syiwiyv74l7d97vnmlk079qirgnw3ncklqjs0s3gbi";
1819 };
1920
21+ patches = [
22+ # Make it detect Apple Silicon, remove after https://github.com/workhorsy/py-cpuinfo/pull/161 is merged.
23+ (fetchpatch {
24+ url = "https://github.com/workhorsy/py-cpuinfo/commit/54c32da6678f9d75ec5acf4534056cdc85c2a04d.patch";
25+ sha256 = "sha256-3R46KrpACAQ1V0CQtz48V5mQXxvplUQrXnACtiE8WqY=";
26+ })
27+ # Continuation of the patch above
28+ (fetchpatch {
29+ url = "https://github.com/workhorsy/py-cpuinfo/commit/0d00f4b99750f292c85ff23e1039ea9489cb7ec8.patch";
30+ sha256 = "sha256-mHoXoCAEG2v3xpQppRFWzSvhYCp5i9CZkbEgtiLVzMs=";
31+ })
32+ ];
33+
34+ checkInputs = [
35+ pytestCheckHook
36+ ];
37+
2038 # On Darwin sysctl is used to read CPU information.
2139 postPatch = lib.optionalString stdenv.isDarwin ''
2240 substituteInPlace cpuinfo/cpuinfo.py \
@@ -24,10 +42,6 @@ buildPythonPackage rec {
2442 --replace "_run_and_get_stdout(['sysctl'" "_run_and_get_stdout(['${sysctl}/bin/sysctl'"
2543 '';
2644
27− checkInputs = [
28− pytestCheckHook
29− ];
30−
3145 meta = {
3246 description = "Get CPU info with pure Python 2 & 3";
3347 longDescription = ''
pkgs/development/python-modules/pyairvisual/default.nix+2−2
@@ -15,7 +15,7 @@
1515
1616buildPythonPackage rec {
1717 pname = "pyairvisual";
18− version = "5.0.6";
18+ version = "5.0.7";
1919 format = "pyproject";
2020
2121 disabled = pythonOlder "3.6";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
2424 owner = "bachya";
2525 repo = pname;
2626 rev = version;
27− sha256 = "sha256-7u8AwIr1Ah/7zCfXFwj/C/CaD/B3uLRkZ8Gf6d18Xp0=";
27+ sha256 = "sha256-r/AJl36dv6+C92tc3kpX4/VzG69qdh4ERCyQxDOHdVU=";
2828 };
2929
3030 nativeBuildInputs = [ poetry-core ];
pkgs/development/python-modules/pyflunearyou/default.nix+2−2
@@ -15,7 +15,7 @@
1515
1616buildPythonPackage rec {
1717 pname = "pyflunearyou";
18− version = "2.0.0";
18+ version = "2.0.1";
1919 format = "pyproject";
2020 disabled = pythonOlder "3.6";
2121
@@ -23,7 +23,7 @@ buildPythonPackage rec {
2323 owner = "bachya";
2424 repo = pname;
2525 rev = version;
26− sha256 = "18vxwfyvicbx8idpa0h0alp4ygnwfph6g4kq93hfm0fc94gi6h94";
26+ sha256 = "sha256-2a4OKPmy9tFLJqRg9bEXqrbr3RKVHmKPSYDrtAEqvdo=";
2727 };
2828
2929 nativeBuildInputs = [ poetry-core ];
pkgs/development/python-modules/pyiqvia/default.nix+2−2
@@ -12,7 +12,7 @@
1212
1313buildPythonPackage rec {
1414 pname = "pyiqvia";
15− version = "0.3.2";
15+ version = "0.3.3";
1616 format = "pyproject";
1717
1818 disabled = pythonOlder "3.6";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
2121 owner = "bachya";
2222 repo = pname;
2323 rev = version;
24− sha256 = "089lah23939m523jmjkaw2li0fikp2nswxznfvzwnr6wjpp3m9as";
24+ sha256 = "sha256-XYWoHKa/yq7MtGVM6eVgLtR2E3VmqsjX3TNcQcd7dEQ=";
2525 };
2626
2727 nativeBuildInputs = [ poetry-core ];
pkgs/development/python-modules/pylint/default.nix+44−27
@@ -1,50 +1,67 @@
1−{ stdenv, lib, buildPythonPackage, fetchPypi, pythonOlder, astroid, installShellFiles,
2− isort, mccabe, pytestCheckHook, pytest-benchmark, pytestrunner, toml }:
1+{ stdenv
2+, lib
3+, buildPythonPackage
4+, fetchPypi
5+, pythonOlder
6+, installShellFiles
7+, astroid
8+, isort
9+, mccabe
10+, toml
11+, pytest-benchmark
12+, pytest-xdist
13+, pytestCheckHook
14+}:
315
416buildPythonPackage rec {
517 pname = "pylint";
6− version = "2.6.2";
18+ version = "2.7.1";
719
8− disabled = pythonOlder "3.5";
20+ disabled = pythonOlder "3.6";
921
1022 src = fetchPypi {
1123 inherit pname version;
12− sha256 = "sha256-cYt0eG6n7QeqDFi/VyFU1Geflg0m6WQcwd4gSjC4f8k=";
24+ sha256 = "10nrvzk1naf5ryawmi59wp99k31053sz37q3x9li2hj2cf7i1kl1";
1325 };
1426
15− nativeBuildInputs = [ pytestrunner installShellFiles ];
27+ nativeBuildInputs = [
28+ installShellFiles
29+ ];
1630
17− checkInputs = [ pytestCheckHook pytest-benchmark ];
31+ propagatedBuildInputs = [
32+ astroid
33+ isort
34+ mccabe
35+ toml
36+ ];
1837
19− propagatedBuildInputs = [ astroid isort mccabe toml ];
20−
21− postPatch = lib.optionalString stdenv.isDarwin ''
22− # Remove broken darwin test
23− rm -vf pylint/test/test_functional.py
38+ postInstall = ''
39+ mkdir -p $out/share/emacs/site-lisp
40+ cp -v "elisp/"*.el $out/share/emacs/site-lisp/
41+ installManPage man/*.1
2442 '';
2543
26− disabledTests = [
27− # https://github.com/PyCQA/pylint/issues/3198
28− "test_by_module_statement_value"
29− # has issues with local directories
30− "test_version"
31− ] ++ lib.optionals stdenv.isDarwin [
32− "test_parallel_execution"
33− "test_py3k_jobs_option"
34− ];
44+ checkInputs = [
45+ pytest-benchmark
46+ pytest-xdist
47+ pytestCheckHook
48+ ];
49+
50+ dontUseSetuptoolsCheck = true;
3551
3652 # calls executable in one of the tests
3753 preCheck = ''
3854 export PATH=$PATH:$out/bin
3955 '';
4056
41− dontUseSetuptoolsCheck = true;
57+ pytestFlagsArray = [
58+ "-n auto"
59+ ];
4260
43− postInstall = ''
44− mkdir -p $out/share/emacs/site-lisp
45− cp "elisp/"*.el $out/share/emacs/site-lisp/
46− installManPage man/*.1
47− '';
61+ disabledTests = lib.optionals stdenv.isDarwin [
62+ "test_parallel_execution"
63+ "test_py3k_jobs_option"
64+ ];
4865
4966 meta = with lib; {
5067 homepage = "https://pylint.pycqa.org/";
pkgs/development/python-modules/pyopenssl/default.nix+3−2
@@ -64,11 +64,12 @@ let
6464in
6565
6666buildPythonPackage rec {
67− pname = "pyOpenSSL";
67+ pname = "pyopenssl";
6868 version = "20.0.1";
6969
7070 src = fetchPypi {
71− inherit pname version;
71+ pname = "pyOpenSSL";
72+ inherit version;
7273 sha256 = "4c231c759543ba02560fcd2480c48dcec4dae34c9da7d3747c508227e0624b51";
7374 };
7475
pkgs/development/python-modules/pyopenuv/default.nix+2−2
@@ -13,14 +13,14 @@
1313
1414buildPythonPackage rec {
1515 pname = "pyopenuv";
16− version = "2.0.1";
16+ version = "2.0.2";
1717 format = "pyproject";
1818
1919 src = fetchFromGitHub {
2020 owner = "bachya";
2121 repo = pname;
2222 rev = version;
23− sha256 = "1pzdcy65gndrlyhrwyc1rwsh8n4w79wla8n9fr13m00vac3cqkl0";
23+ sha256 = "sha256-QVgNwu/NXSV9nbRN0POBCdKCv6xdp4uSEzFAiHkhVaQ=";
2424 };
2525
2626 nativeBuildInputs = [ poetry-core ];
pkgs/development/python-modules/pytest-catchlog/default.nix+2−1
@@ -10,7 +10,8 @@ buildPythonPackage rec {
1010 extension = "zip";
1111 };
1212
13− buildInputs = [ pytest unzip ];
13+ nativeBuildInputs = [ unzip ];
14+ buildInputs = [ pytest ];
1415 checkPhase = "make test";
1516
1617 # Requires pytest < 3.1
pkgs/development/python-modules/pytest-forked/default.nix+7−1
@@ -18,7 +18,13 @@ buildPythonPackage rec {
1818
1919 nativeBuildInputs = [ setuptools_scm ];
2020
21− propagatedBuildInputs = [ py pytest ];
21+ buildInputs = [
22+ pytest
23+ ];
24+
25+ propagatedBuildInputs = [
26+ py
27+ ];
2228
2329 checkInputs = [ pytestCheckHook ];
2430
pkgs/development/python-modules/pytest-freezegun/default.nix+2−1
@@ -18,9 +18,10 @@ buildPythonPackage rec {
1818 sha256 = "10c4pbh03b4s1q8cjd75lr0fvyf9id0zmdk29566qqsmaz28npas";
1919 };
2020
21+ buildInputs = [ pytest ];
22+
2123 propagatedBuildInputs = [
2224 freezegun
23− pytest
2425 ];
2526
2627 checkInputs = [
pkgs/development/python-modules/pytest-timeout/default.nix+1−1
@@ -16,7 +16,7 @@ buildPythonPackage rec {
1616 sha256 = "0xnsigs0kmpq1za0d4i522sp3f71x5bgpdh3ski0rs74yqy13cr0";
1717 };
1818
19− propagatedBuildInputs = [ pytest ];
19+ buildInputs = [ pytest ];
2020
2121 checkInputs = [ pytestCheckHook pexpect pytestcov ];
2222
pkgs/development/python-modules/pytest-xdist/default.nix+4−1
@@ -22,8 +22,11 @@ buildPythonPackage rec {
2222 };
2323
2424 nativeBuildInputs = [ setuptools_scm ];
25+ buildInputs = [
26+ pytest
27+ ];
2528 checkInputs = [ pytestCheckHook filelock ];
26− propagatedBuildInputs = [ execnet pytest pytest-forked psutil ];
29+ propagatedBuildInputs = [ execnet pytest-forked psutil ];
2730
2831 # access file system
2932 disabledTests = [
pkgs/development/python-modules/pytest/default.nix+12−10
@@ -1,19 +1,16 @@
11{ lib, buildPythonPackage, pythonOlder, fetchPypi, isPy3k, isPyPy
22, atomicwrites
33, attrs
4−, funcsigs
54, hypothesis
65, iniconfig
7−, mock
86, more-itertools
97, packaging
108, pathlib2
119, pluggy
1210, py
1311, pygments
14−, python
1512, setuptools
16−, setuptools_scm
13+, setuptools-scm
1714, six
1815, toml
1916, wcwidth
@@ -21,18 +18,17 @@
2118}:
2219
2320buildPythonPackage rec {
24− version = "6.1.2";
2521 pname = "pytest";
26−
22+ version = "6.2.2";
2723 disabled = !isPy3k;
2824
2925 src = fetchPypi {
3026 inherit pname version;
31− sha256 = "c0a7e94a8cdbc5422a51ccdad8e6f1024795939cc89159a0ae7f0b316ad3823e";
27+ sha256 = "sha256-nR7fnn0LhNcuo9vN/SKzX7VDpejypgCS3VeJNr9j1/k=";
3228 };
3329
34− checkInputs = [ hypothesis pygments ];
35− nativeBuildInputs = [ setuptools_scm ];
30+ nativeBuildInputs = [ setuptools-scm ];
31+
3632 propagatedBuildInputs = [
3733 atomicwrites
3834 attrs
@@ -47,6 +43,11 @@ buildPythonPackage rec {
4743 wcwidth
4844 ] ++ lib.optionals (pythonOlder "3.6") [ pathlib2 ];
4945
46+ checkInputs = [
47+ hypothesis
48+ pygments
49+ ];
50+
5051 doCheck = !isPyPy; # https://github.com/pytest-dev/pytest/issues/3460
5152
5253 preCheck = ''
@@ -80,8 +81,9 @@ buildPythonPackage rec {
8081 ];
8182
8283 meta = with lib; {
83− homepage = "https://docs.pytest.org";
8484 description = "Framework for writing tests";
85+ homepage = "https://docs.pytest.org";
86+ changelog = "https://github.com/pytest-dev/pytest/releases/tag/${version}";
8587 maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ];
8688 license = licenses.mit;
8789 };
pkgs/development/python-modules/python-simple-hipchat/default.nix+1−1
@@ -10,7 +10,7 @@ buildPythonPackage rec {
1010 sha256 = "0zy6prrj85jjc4xmxgfg8h94j81k6zhfxfffcbvq9b10jis1rgav";
1111 };
1212
13− buildInputs = [ unzip ];
13+ nativeBuildInputs = [ unzip ];
1414
1515 meta = with lib; {
1616 description = "Easy peasy wrapper for HipChat's v1 API";
pkgs/development/python-modules/pytile/default.nix−4
@@ -25,10 +25,6 @@ buildPythonPackage rec {
2525
2626 format = "pyproject";
2727
28− postPatch = ''
29− substituteInPlace pyproject.toml --replace 'aiohttp = "^3.7.4"' 'aiohttp = "^3.7.3"'
30− '';
31−
3228 nativeBuildInputs = [ poetry-core ];
3329
3430 propagatedBuildInputs = [
pkgs/development/python-modules/regenmaschine/default.nix+2−2
@@ -14,14 +14,14 @@
1414
1515buildPythonPackage rec {
1616 pname = "regenmaschine";
17− version = "3.1.1";
17+ version = "3.1.2";
1818 format = "pyproject";
1919
2020 src = fetchFromGitHub {
2121 owner = "bachya";
2222 repo = pname;
2323 rev = version;
24− sha256 = "0m6i7vspp8ssdk2k32kznql1j8gkp300kzb7pk67hzvpijdy3mca";
24+ sha256 = "sha256-lARti3Sb/jh7h8x+lFLqkM/BlL6XmELm46owsL041Cw=";
2525 };
2626
2727 nativeBuildInputs = [ poetry-core ];
pkgs/development/python-modules/setuptools-rust/default.nix+4−1
@@ -1,4 +1,5 @@
1−{ lib
1+{ callPackage
2+, lib
23, buildPythonPackage
34, fetchPypi
45, isPy27
@@ -26,6 +27,8 @@ buildPythonPackage rec {
2627 doCheck = false;
2728 pythonImportsCheck = [ "setuptools_rust" ];
2829
30+ passthru.tests.pyo3 = callPackage ./pyo3-test {};
31+
2932 meta = with lib; {
3033 description = "Setuptools plugin for Rust support";
3134 homepage = "https://github.com/PyO3/setuptools-rust";
pkgs/development/python-modules/setuptools-rust/pyo3-test/default.nixnew file+21
@@ -0,0 +1,21 @@
1+{ callPackage
2+, rustPlatform
3+, setuptools-rust
4+}:
5+
6+callPackage ../../../tools/rust/maturin/pyo3-test/generic.nix {
7+ # Isolated builds break for this package, because PyO3 is not
8+ # in the build root of the Python Package:
9+ #
10+ # https://github.com/pypa/pip/issues/6276
11+ #
12+ format = "setuptools";
13+
14+ nativeBuildInputs = [ setuptools-rust ] ++ (with rustPlatform; [
15+ cargoSetupHook
16+ rust.cargo
17+ rust.rustc
18+ ]);
19+
20+ sourceRoot = "source/examples/word-count";
21+}
pkgs/development/python-modules/simplejson/default.nix+14−18
@@ -2,39 +2,35 @@
22, buildPythonPackage
33, fetchFromGitHub
44, stdenv
5−, pytest
5+, pytestCheckHook
66}:
77
88buildPythonPackage rec {
99 pname = "simplejson";
10− version = "3.17.0";
10+ version = "3.17.2";
1111 doCheck = !stdenv.isDarwin;
1212
1313 src = fetchFromGitHub {
1414 owner = pname;
1515 repo = pname;
1616 rev = "v${version}";
17− sha256 = "1b1hhh1dia673vhq3jl2br1iqwb9yjii6iak56w96s9972vjbz3z";
17+ sha256 = "sha256-2ZC7aKyUUcth43Ce0j6JdjrJ4gb4QfJDlY2M5TLMQ+o=";
1818 };
1919
20− # Package does not need pytest, but its a bit easier debugging.
21− checkInputs = [ pytest ];
22− # Ignore warnings because test does not expect them in stderr
23− # See https://github.com/simplejson/simplejson/issues/241
24− checkPhase = ''
25− PYTHONWARNINGS="ignore" pytest simplejson/tests
26− '';
20+ checkInputs = [ pytestCheckHook ];
2721
28− meta = {
29− description = "A simple, fast, extensible JSON encoder/decoder for Python";
22+ pythonImportsCheck = [ "simplejson" ];
23+
24+ meta = with lib; {
25+ description = "Extensible JSON encoder/decoder for Python";
3026 longDescription = ''
31− simplejson is compatible with Python 2.4 and later with no
32− external dependencies. It covers the full JSON specification
33− for both encoding and decoding, with unicode support. By
34− default, encoding is done in an encoding neutral fashion (plain
35− ASCII with \uXXXX escapes for unicode characters).
27+ simplejson covers the full JSON specification for both encoding
28+ and decoding, with unicode support. By default, encoding is done
29+ in an encoding neutral fashion (plain ASCII with \uXXXX escapes
30+ for unicode characters).
3631 '';
3732 homepage = "https://github.com/simplejson/simplejson";
38− license = with lib.licenses; [ mit afl21 ];
33+ license = with licenses; [ mit afl21 ];
34+ maintainers = with maintainers; [ fab ];
3935 };
4036}
pkgs/development/python-modules/trio/default.nix+4−2
@@ -18,12 +18,12 @@
1818
1919buildPythonPackage rec {
2020 pname = "trio";
21− version = "0.17.0";
21+ version = "0.18.0";
2222 disabled = pythonOlder "3.6";
2323
2424 src = fetchPypi {
2525 inherit pname version;
26− sha256 = "0zcxirpdvvl54pbfkgw7vz984879xwvdygqfpggnam24is2zjp78";
26+ sha256 = "0xm0bd1rrlb4l9q0nf2n1wg7xh42ljdnm4i4j0651zi73zk6m9l7";
2727 };
2828
2929 checkInputs = [ astor pytestCheckHook pyopenssl trustme jedi pylint yapf ];
@@ -34,6 +34,8 @@ buildPythonPackage rec {
3434 "getprotobyname"
3535 "waitpid"
3636 "static_tool_sees_all_symbols"
37+ # tests pytest more than python
38+ "fallback_when_no_hook_claims_it"
3739 ];
3840
3941 propagatedBuildInputs = [
pkgs/development/python-modules/urllib3/2.nixnew file+74
@@ -0,0 +1,74 @@
1+{ lib
2+, stdenv
3+, brotli
4+, buildPythonPackage
5+, certifi
6+, cryptography
7+, dateutil
8+, fetchPypi
9+, idna
10+, mock
11+, pyopenssl
12+, pysocks
13+, pytest-freezegun
14+, pytest-timeout
15+, pytestCheckHook
16+, pythonOlder
17+, tornado
18+, trustme
19+}:
20+
21+buildPythonPackage rec {
22+ pname = "urllib3";
23+ version = "1.26.2";
24+
25+ src = fetchPypi {
26+ inherit pname version;
27+ sha256 = "19188f96923873c92ccb987120ec4acaa12f0461fa9ce5d3d0772bc965a39e08";
28+ };
29+
30+ propagatedBuildInputs = [
31+ brotli
32+ certifi
33+ cryptography
34+ idna
35+ pyopenssl
36+ pysocks
37+ ];
38+
39+ checkInputs = [
40+ dateutil
41+ mock
42+ pytest-freezegun
43+ pytest-timeout
44+ pytestCheckHook
45+ tornado
46+ trustme
47+ ];
48+
49+ # Tests in urllib3 are mostly timeout-based instead of event-based and
50+ # are therefore inherently flaky. On your own machine, the tests will
51+ # typically build fine, but on a loaded cluster such as Hydra random
52+ # timeouts will occur.
53+ #
54+ # The urllib3 test suite has two different timeouts in their test suite
55+ # (see `test/__init__.py`):
56+ # - SHORT_TIMEOUT
57+ # - LONG_TIMEOUT
58+ # When CI is in the env, LONG_TIMEOUT will be significantly increased.
59+ # Still, failures can occur and for that reason tests are disabled.
60+ doCheck = false;
61+
62+ preCheck = ''
63+ export CI # Increases LONG_TIMEOUT
64+ '';
65+
66+ pythonImportsCheck = [ "urllib3" ];
67+
68+ meta = with lib; {
69+ description = "Powerful, sanity-friendly HTTP client for Python";
70+ homepage = "https://github.com/shazow/urllib3";
71+ license = licenses.mit;
72+ maintainers = with maintainers; [ fab ];
73+ };
74+}
pkgs/development/python-modules/urllib3/default.nix+53−11
@@ -1,33 +1,75 @@
1−{ lib, buildPythonPackage, fetchPypi
2−, pytest, mock, tornado, pyopenssl, cryptography
3−, idna, certifi, ipaddress, pysocks }:
1+{ lib
2+, stdenv
3+, brotli
4+, buildPythonPackage
5+, certifi
6+, cryptography
7+, dateutil
8+, fetchPypi
9+, idna
10+, mock
11+, pyopenssl
12+, pysocks
13+, pytest-freezegun
14+, pytest-timeout
15+, pytestCheckHook
16+, pythonOlder
17+, tornado
18+, trustme
19+}:
420
521buildPythonPackage rec {
622 pname = "urllib3";
723 version = "1.26.3";
24+ disabled = pythonOlder "3.6";
825
926 src = fetchPypi {
1027 inherit pname version;
1128 sha256 = "de3eedaad74a2683334e282005cd8d7f22f4d55fa690a2a1020a416cb0a47e73";
1229 };
1330
14− NOSE_EXCLUDE = lib.concatStringsSep "," [
15− "test_headers" "test_headerdict" "test_can_validate_ip_san" "test_delayed_body_read_timeout"
16− "test_timeout_errors_cause_retries" "test_select_multiple_interrupts_with_event"
31+ propagatedBuildInputs = [
32+ brotli
33+ certifi
34+ cryptography
35+ idna
36+ pyopenssl
37+ pysocks
1738 ];
1839
19− checkPhase = ''
20− nosetests -v --cover-min-percentage 1
21− '';
40+ checkInputs = [
41+ dateutil
42+ mock
43+ pytest-freezegun
44+ pytest-timeout
45+ pytestCheckHook
46+ tornado
47+ trustme
48+ ];
2249
50+ # Tests in urllib3 are mostly timeout-based instead of event-based and
51+ # are therefore inherently flaky. On your own machine, the tests will
52+ # typically build fine, but on a loaded cluster such as Hydra random
53+ # timeouts will occur.
54+ #
55+ # The urllib3 test suite has two different timeouts in their test suite
56+ # (see `test/__init__.py`):
57+ # - SHORT_TIMEOUT
58+ # - LONG_TIMEOUT
59+ # When CI is in the env, LONG_TIMEOUT will be significantly increased.
60+ # Still, failures can occur and for that reason tests are disabled.
2361 doCheck = false;
2462
25− checkInputs = [ pytest mock tornado ];
26− propagatedBuildInputs = [ pyopenssl cryptography idna certifi ipaddress pysocks ];
63+ preCheck = ''
64+ export CI # Increases LONG_TIMEOUT
65+ '';
66+
67+ pythonImportsCheck = [ "urllib3" ];
2768
2869 meta = with lib; {
2970 description = "Powerful, sanity-friendly HTTP client for Python";
3071 homepage = "https://github.com/shazow/urllib3";
3172 license = licenses.mit;
73+ maintainers = with maintainers; [ fab ];
3274 };
3375}
pkgs/development/ruby-modules/gem/default.nix+6
@@ -129,6 +129,12 @@ stdenv.mkDerivation ((builtins.removeAttrs attrs ["source"]) // {
129129 runHook postUnpack
130130 '';
131131
132+ # As of ruby 3.0, ruby headers require -fdeclspec when building with clang
133+ # Introduced in https://github.com/ruby/ruby/commit/0958e19ffb047781fe1506760c7cbd8d7fe74e57
134+ NIX_CFLAGS_COMPILE = lib.optionals (stdenv.cc.isClang && lib.versionAtLeast ruby.version.major "3") [
135+ "-fdeclspec"
136+ ];
137+
132138 buildPhase = attrs.buildPhase or ''
133139 runHook preBuild
134140
pkgs/development/tools/analysis/emma/default.nix+1−1
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
88 sha256 = "0xxy39s2lvgs56vicjzpcz936l1vjaplliwa0dm7v3iyvw6jn7vj";
99 };
1010
11− buildInputs = [unzip];
11+ nativeBuildInputs = [ unzip ];
1212
1313 installPhase = ''
1414 mkdir -p $out/lib/jars
pkgs/development/tools/analysis/randoop/default.nix+1−1
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "0v3vla3k6csfb8w0j9njrhcjj4n7yh172n9wv6z397f1sa0fs202";
1010 };
1111
12− buildInputs = [ unzip ];
12+ nativeBuildInputs = [ unzip ];
1313
1414 installPhase = ''
1515 mkdir -p $out/lib $out/doc
pkgs/development/tools/build-managers/bazel/bazel_4/default.nix+1−1
@@ -315,7 +315,7 @@ stdenv.mkDerivation rec {
315315 src_for_updater = stdenv.mkDerivation rec {
316316 name = "updater-sources";
317317 inherit src;
318− buildInputs = [ unzip ];
318+ nativeBuildInputs = [ unzip ];
319319 inherit sourceRoot;
320320 installPhase = ''
321321 cp -r . "$out"
pkgs/development/tools/build-managers/cmake/default.nix+4−6
@@ -1,5 +1,5 @@
11{ stdenv, lib, fetchurl, pkg-config
2−, bzip2, curl, expat, libarchive, xz, zlib, libuv, rhash
2+, bzip2, curlMinimal, expat, libarchive, xz, zlib, libuv, rhash
33, buildPackages
44# darwin attributes
55, ps
@@ -20,12 +20,12 @@ stdenv.mkDerivation (rec {
2020 + lib.optionalString useNcurses "-cursesUI"
2121 + lib.optionalString withQt5 "-qt5UI"
2222 + lib.optionalString useQt4 "-qt4UI";
23− version = "3.19.4";
23+ version = "3.19.6";
2424
2525 src = fetchurl {
2626 url = "${meta.homepage}files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz";
2727 # compare with https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}-SHA-256.txt
28− sha256 = "sha256-fQIyufHFfo3oHzgHHvggPmgg/n7siuRqHfEl2I28wuE=";
28+ sha256 = "sha256-7IerZ8RfR8QoXyBCgMXN5I4ckgz8/tFVWyf7OxodILo=";
2929 };
3030
3131 patches = [
@@ -50,7 +50,7 @@ stdenv.mkDerivation (rec {
5050 nativeBuildInputs = [ setupHook pkg-config ];
5151
5252 buildInputs = []
53− ++ lib.optionals useSharedLibraries [ bzip2 curl expat libarchive xz zlib libuv rhash ]
53+ ++ lib.optionals useSharedLibraries [ bzip2 curlMinimal expat libarchive xz zlib libuv rhash ]
5454 ++ lib.optional useOpenSSL openssl
5555 ++ lib.optional useNcurses ncurses
5656 ++ lib.optional useQt4 qt4
@@ -64,8 +64,6 @@ stdenv.mkDerivation (rec {
6464 --subst-var-by libc_bin ${lib.getBin stdenv.cc.libc} \
6565 --subst-var-by libc_dev ${lib.getDev stdenv.cc.libc} \
6666 --subst-var-by libc_lib ${lib.getLib stdenv.cc.libc}
67− substituteInPlace Modules/FindCxxTest.cmake \
68− --replace "$""{PYTHON_EXECUTABLE}" ${stdenv.shell}
6967 ''
7068 # CC_FOR_BUILD and CXX_FOR_BUILD are used to bootstrap cmake
7169 + ''
pkgs/development/tools/build-managers/cmake/setup-hook.sh−3
@@ -50,9 +50,6 @@ cmakeConfigurePhase() {
5050 # because we usually do not package the framework
5151 cmakeFlags="-DCMAKE_FIND_FRAMEWORK=LAST $cmakeFlags"
5252
53− # on macOS i686 was only relevant for 10.5 or earlier.
54− cmakeFlags="-DCMAKE_OSX_ARCHITECTURES=x86_64 $cmakeFlags"
55−
5653 # we never want to use the global macOS SDK
5754 cmakeFlags="-DCMAKE_OSX_SYSROOT= $cmakeFlags"
5855
pkgs/development/tools/build-managers/gradle/default.nix+2−2
@@ -33,8 +33,8 @@ rec {
3333 echo ${stdenv.cc.cc} > $out/nix-support/manual-runtime-dependencies
3434 '';
3535
36− nativeBuildInputs = [ makeWrapper ];
37− buildInputs = [ unzip java ];
36+ nativeBuildInputs = [ makeWrapper unzip ];
37+ buildInputs = [ java ];
3838
3939 meta = {
4040 description = "Enterprise-grade build system";
pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch+4−4
@@ -1,14 +1,14 @@
11--- a/mesonbuild/coredata.py
22+++ b/mesonbuild/coredata.py
3−@@ -491,7 +491,6 @@ class CoreData:
3+@@ -506,7 +506,6 @@ class CoreData:
44 return value
5− if option.endswith('dir') and value.is_absolute() and \
6− option not in builtin_dir_noprefix_options:
5+ if option.name.endswith('dir') and value.is_absolute() and \
6+ option not in BULITIN_DIR_NOPREFIX_OPTIONS:
77- # Value must be a subdir of the prefix
88 # commonpath will always return a path in the native format, so we
99 # must use pathlib.PurePath to do the same conversion before
1010 # comparing.
11−@@ -503,7 +502,7 @@ class CoreData:
11+@@ -518,7 +517,7 @@ class CoreData:
1212 try:
1313 value = value.relative_to(prefix)
1414 except ValueError:
pkgs/development/tools/build-managers/meson/default.nix+2−2
@@ -9,11 +9,11 @@
99
1010python3.pkgs.buildPythonApplication rec {
1111 pname = "meson";
12− version = "0.56.0";
12+ version = "0.57.1";
1313
1414 src = python3.pkgs.fetchPypi {
1515 inherit pname version;
16− sha256 = "04vj250bwrzq7c0z1r96b0z0vgirvn0m367wm3ygqmfdy67x6799";
16+ sha256 = "19n8alcpzv6npgp27iqljkmvdmr7s2c7zm8y997j1nlvpa1cgqbj";
1717 };
1818
1919 patches = [
pkgs/development/tools/build-managers/meson/more-env-vars.patch+5−5
@@ -1,8 +1,8 @@
1−diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
2−index 219b62ec8..e3ceaddbd 100644
3−--- a/mesonbuild/envconfig.py
4−+++ b/mesonbuild/envconfig.py
5−@@ -94,7 +94,7 @@ def get_env_var_pair(for_machine: MachineChoice,
1+diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
2+index 756dd8193..a5cc6ef8b 100644
3+--- a/mesonbuild/environment.py
4++++ b/mesonbuild/environment.py
5+@@ -151,7 +151,7 @@ def _get_env_var(for_machine: MachineChoice, is_cross: bool, var_name: str) -> T
66 # compiling we fall back on the unprefixed host version. This
77 # allows native builds to never need to worry about the 'BUILD_*'
88 # ones.
pkgs/development/tools/build-managers/msbuild/default.nix+1−1
@@ -23,13 +23,13 @@ stdenv.mkDerivation rec {
2323 nativeBuildInputs = [
2424 dotnet-sdk
2525 mono
26+ unzip
2627 ];
2728
2829 buildInputs = [
2930 dotnetPackages.Nuget
3031 glibcLocales
3132 makeWrapper
32− unzip
3333 ];
3434
3535 # https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=msbuild
pkgs/development/tools/continuous-integration/gocd-agent/default.nix+1−1
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717 maintainers = with maintainers; [ grahamc swarren83 ];
1818 };
1919
20− buildInputs = [ unzip ];
20+ nativeBuildInputs = [ unzip ];
2121
2222 buildCommand = "
2323 unzip $src -d $out
pkgs/development/tools/continuous-integration/gocd-server/default.nix+1−1
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818 maintainers = with maintainers; [ grahamc swarren83 ];
1919 };
2020
21− buildInputs = [ unzip ];
21+ nativeBuildInputs = [ unzip ];
2222
2323 buildCommand = "
2424 unzip $src -d $out
pkgs/development/tools/database/sqldeveloper/default.nix+1−2
@@ -49,8 +49,7 @@ in
4949 sha256 = "1h53gl41ydr7kim6q9ckg3xyhb0rhmwj7jnis0xz6vms52b3h59k";
5050 };
5151
52− nativeBuildInputs = [ makeWrapper ];
53− buildInputs = [ unzip ];
52+ nativeBuildInputs = [ makeWrapper unzip ];
5453
5554 unpackCmd = "unzip $curSrc";
5655
pkgs/development/tools/eclipse-mat/default.nix+1−1
@@ -79,6 +79,7 @@ stdenv.mkDerivation rec {
7979 mv $out/share/pixmaps/eclipse64.png $out/share/pixmaps/eclipse.png
8080 '';
8181
82+ nativeBuildInputs = [ unzip ];
8283 buildInputs = [
8384 fontconfig
8485 freetype
@@ -91,7 +92,6 @@ stdenv.mkDerivation rec {
9192 libXtst
9293 makeWrapper
9394 zlib
94− unzip
9595 shared-mime-info
9696 webkitgtk
9797 ];
pkgs/development/tools/electron/generic.nix+1−1
@@ -97,7 +97,7 @@ let
9797 };
9898
9999 darwin = {
100− buildInputs = [ unzip ];
100+ nativeBuildInputs = [ unzip ];
101101
102102 buildCommand = ''
103103 mkdir -p $out/Applications
pkgs/development/tools/galen/default.nix+1−1
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "13dq8cf0yy24vym6z7p8hb0mybgpcl4j5crsaq8a6pjfxz6d17mq";
1212 };
1313
14− buildInputs = [ unzip ];
14+ nativeBuildInputs = [ unzip ];
1515
1616 buildPhase = ''
1717 mkdir -p $out/bin
pkgs/development/tools/kubie/default.nix+3−3
@@ -2,16 +2,16 @@
22
33rustPlatform.buildRustPackage rec {
44 pname = "kubie";
5− version = "0.11.1";
5+ version = "0.12.1";
66
77 src = fetchFromGitHub {
88 rev = "v${version}";
99 owner = "sbstp";
1010 repo = "kubie";
11− sha256 = "0q21qd9fhchggby18gzyvds517n9vq7b1rr0gmzik4036ykg1lm2";
11+ sha256 = "sha256-y4/azFr2fngmUxQw3c2xAhAppYHeD6Bz7IvZ6GTdsEQ=";
1212 };
1313
14− cargoSha256 = "0dp4prv8c2a6mxl7wskpc65qlfjphdxshb4q2bswqa5i21h8r534";
14+ cargoSha256 = "sha256-/Vg3qojBWN2tp8QaKmHrzy3cDWlkT6067Wprcjlu31U=";
1515
1616 nativeBuildInputs = [ installShellFiles ];
1717
pkgs/development/tools/misc/autoconf-archive/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "autoconf-archive";
5− version = "2019.01.06";
5+ version = "2021.02.19";
66
77 src = fetchurl {
88 url = "mirror://gnu/autoconf-archive/autoconf-archive-${version}.tar.xz";
9− sha256 = "0gqya7nf4j5k98dkky0c3bnr0paciya91vkqazg7knlq621mq68p";
9+ sha256 = "sha256-6KbrnSjdy6j/7z+iEWUyOem/I5q6agGmt8/Hzq7GnL0=";
1010 };
1111
1212 buildInputs = [ xz ];
pkgs/development/tools/misc/jscoverage/default.nix+2−1
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
1212 ./jsfalse_to_null.patch
1313 ];
1414
15− buildInputs = [ autoconf makedepend perl python unzip zip ];
15+ nativeBuildInputs = [ unzip ];
16+ buildInputs = [ autoconf makedepend perl python zip ];
1617
1718 # It works without MOZ_FIX_LINK_PATHS, circumventing an impurity
1819 # issue. Maybe we could kick js/ (spidermonkey) completely and
pkgs/development/tools/misc/premake/3.nix+1−1
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
1212 sha256 = "b59841a519e75d5b6566848a2c5be2f91455bf0cc6ae4d688fcbd4c40db934d5";
1313 };
1414
15− buildInputs = [unzip];
15+ nativeBuildInputs = [ unzip ];
1616
1717 installPhase = ''
1818 install -Dm755 bin/premake $out/bin/premake
pkgs/development/tools/misc/saleae-logic/default.nix+1−1
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
4444 categories = "Development";
4545 };
4646
47− buildInputs = [ unzip ];
47+ nativeBuildInputs = [ unzip ];
4848
4949 installPhase = ''
5050 # Copy prebuilt app to $out
pkgs/development/tools/ocaml/opam/1.2.2.nix+2−2
@@ -47,8 +47,8 @@ in stdenv.mkDerivation {
4747 pname = "opam";
4848 version = "1.2.2";
4949
50− nativeBuildInputs = [ makeWrapper ];
51− buildInputs = [ unzip curl ncurses ocaml ];
50+ nativeBuildInputs = [ makeWrapper unzip ];
51+ buildInputs = [ curl ncurses ocaml ];
5252
5353 src = srcs.opam;
5454
pkgs/development/tools/ocaml/opam/default.nix+2−2
@@ -63,8 +63,8 @@ in stdenv.mkDerivation {
6363 pname = "opam";
6464 version = "2.0.8";
6565
66− nativeBuildInputs = [ makeWrapper ];
67− buildInputs = [ unzip curl ncurses ocaml getconf ] ++ lib.optional stdenv.isLinux bubblewrap;
66+ nativeBuildInputs = [ makeWrapper unzip ];
67+ buildInputs = [ curl ncurses ocaml getconf ] ++ lib.optional stdenv.isLinux bubblewrap;
6868
6969 src = srcs.opam;
7070
pkgs/development/tools/ocaml/opam/opam.nix.pl+2−1
@@ -68,7 +68,8 @@ in stdenv.mkDerivation {
6868 pname = "opam";
6969 version = "$OPAM_RELEASE";
7070
71− buildInputs = [ unzip curl ncurses ocaml makeWrapper getconf ] ++ lib.optional stdenv.isLinux bubblewrap;
71+ nativeBuildInputs = [ unzip ];
72+ buildInputs = [ curl ncurses ocaml makeWrapper getconf ] ++ lib.optional stdenv.isLinux bubblewrap;
7273
7374 src = srcs.opam;
7475
pkgs/development/tools/parsing/re2c/default.nix+24
@@ -12,6 +12,30 @@ stdenv.mkDerivation rec {
1212 };
1313
1414 patches = [
15+ (fetchpatch {
16+ name = "CVE-2018-21232-part1.patch";
17+ url = "https://github.com/skvadrik/re2c/commit/fd634998f813340768c333cdad638498602856e5.patch";
18+ sha256 = "1blyg5lyhqd4ymisih65xl0g36ig71ijia4skkkd59rdvj78aiw6";
19+ })
20+
21+ (fetchpatch {
22+ name = "CVE-2018-21232-part2.patch";
23+ url = "https://github.com/skvadrik/re2c/commit/7b5643476bd99c994c4f51b8143f942982d85521.patch";
24+ sha256 = "0rhmgqrinpk49r9x75ygrs14lz72aw5ad5kr6qp9bdyl8gs082qp";
25+ })
26+
27+ (fetchpatch {
28+ name = "CVE-2018-21232-part3.patch";
29+ url = "https://github.com/skvadrik/re2c/commit/4d9c809355b574f2a58eac119f5e076c48e4d1e2.patch";
30+ sha256 = "0k86wg9icw1gkqpf7rq2w6xsq4caxw3rc0zfxf39liwa35027rai";
31+ })
32+
33+ (fetchpatch {
34+ name = "CVE-2018-21232-part4.patch";
35+ url = "https://github.com/skvadrik/re2c/commit/89be91f3df00657261870adbc590209fdb2bc405.patch";
36+ sha256 = "1aygy9va7jwby93chlskwg7z90fn07x5hym0gziwlkx8k900p3a3";
37+ })
38+
1539 (fetchpatch {
1640 name = "CVE-2020-11958.patch";
1741 url = "https://github.com/skvadrik/re2c/commit/c4603ba5ce229db83a2a4fb93e6d4b4e3ec3776a.patch";
pkgs/development/tools/phantomjs/default.nix+1−1
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
2929 sha256 = "0j0aq8dgzmb210xdrh0v3d4nblskl3zsckl8bzf1a603wcx085cg";
3030 };
3131
32− buildInputs = lib.optional stdenv.isDarwin unzip;
32+ nativeBuildInputs = lib.optional stdenv.isDarwin unzip;
3333
3434 buildPhase = lib.optionalString (!stdenv.isDarwin) ''
3535 patchelf \
pkgs/development/tools/react-native-debugger/default.nix+1−1
@@ -44,7 +44,7 @@ in stdenv.mkDerivation rec {
4444 sha256 = "sha256-UXKObJKk9UUgWtm8U+nXWvIJUr4NLm2f//pGTHJISYA=";
4545 };
4646
47− buildInputs = [ unzip ];
47+ nativeBuildInputs = [ unzip ];
4848 buildCommand = ''
4949 shopt -s extglob
5050 mkdir -p $out
pkgs/development/tools/rust/maturin/default.nix+4−1
@@ -1,4 +1,5 @@
1−{ lib
1+{ callPackage
2+, lib
23, stdenv
34, fetchFromGitHub
45, rustPlatform
@@ -28,6 +29,8 @@ rustPlatform.buildRustPackage rec {
2829 # Requires network access, fails in sandbox.
2930 doCheck = false;
3031
32+ passthru.tests.pyo3 = callPackage ./pyo3-test {};
33+
3134 meta = with lib; {
3235 description = "Build and publish Rust crates Python packages";
3336 longDescription = ''
pkgs/development/tools/rust/maturin/pyo3-test/Cargo.lock.patchnew file+688
@@ -0,0 +1,688 @@
1+diff --git a/Cargo.lock b/Cargo.lock
2+new file mode 100644
3+index 000000000..5e698d4ff
4+--- /dev/null
5++++ b/Cargo.lock
6+@@ -0,0 +1,682 @@
7++# This file is automatically @generated by Cargo.
8++# It is not intended for manual editing.
9++[[package]]
10++name = "ahash"
11++version = "0.4.7"
12++source = "registry+https://github.com/rust-lang/crates.io-index"
13++checksum = "739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e"
14++
15++[[package]]
16++name = "assert_approx_eq"
17++version = "1.1.0"
18++source = "registry+https://github.com/rust-lang/crates.io-index"
19++checksum = "3c07dab4369547dbe5114677b33fbbf724971019f3818172d59a97a61c774ffd"
20++
21++[[package]]
22++name = "autocfg"
23++version = "1.0.1"
24++source = "registry+https://github.com/rust-lang/crates.io-index"
25++checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
26++
27++[[package]]
28++name = "bitflags"
29++version = "1.2.1"
30++source = "registry+https://github.com/rust-lang/crates.io-index"
31++checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
32++
33++[[package]]
34++name = "byteorder"
35++version = "1.4.2"
36++source = "registry+https://github.com/rust-lang/crates.io-index"
37++checksum = "ae44d1a3d5a19df61dd0c8beb138458ac2a53a7ac09eba97d55592540004306b"
38++
39++[[package]]
40++name = "cfg-if"
41++version = "1.0.0"
42++source = "registry+https://github.com/rust-lang/crates.io-index"
43++checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
44++
45++[[package]]
46++name = "const_fn"
47++version = "0.4.5"
48++source = "registry+https://github.com/rust-lang/crates.io-index"
49++checksum = "28b9d6de7f49e22cf97ad17fc4036ece69300032f45f78f30b4a4482cdc3f4a6"
50++
51++[[package]]
52++name = "crossbeam-channel"
53++version = "0.5.0"
54++source = "registry+https://github.com/rust-lang/crates.io-index"
55++checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775"
56++dependencies = [
57++ "cfg-if",
58++ "crossbeam-utils",
59++]
60++
61++[[package]]
62++name = "crossbeam-deque"
63++version = "0.8.0"
64++source = "registry+https://github.com/rust-lang/crates.io-index"
65++checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9"
66++dependencies = [
67++ "cfg-if",
68++ "crossbeam-epoch",
69++ "crossbeam-utils",
70++]
71++
72++[[package]]
73++name = "crossbeam-epoch"
74++version = "0.9.1"
75++source = "registry+https://github.com/rust-lang/crates.io-index"
76++checksum = "a1aaa739f95311c2c7887a76863f500026092fb1dce0161dab577e559ef3569d"
77++dependencies = [
78++ "cfg-if",
79++ "const_fn",
80++ "crossbeam-utils",
81++ "lazy_static",
82++ "memoffset",
83++ "scopeguard",
84++]
85++
86++[[package]]
87++name = "crossbeam-utils"
88++version = "0.8.1"
89++source = "registry+https://github.com/rust-lang/crates.io-index"
90++checksum = "02d96d1e189ef58269ebe5b97953da3274d83a93af647c2ddd6f9dab28cedb8d"
91++dependencies = [
92++ "autocfg",
93++ "cfg-if",
94++ "lazy_static",
95++]
96++
97++[[package]]
98++name = "ctor"
99++version = "0.1.19"
100++source = "registry+https://github.com/rust-lang/crates.io-index"
101++checksum = "e8f45d9ad417bcef4817d614a501ab55cdd96a6fdb24f49aab89a54acfd66b19"
102++dependencies = [
103++ "quote",
104++ "syn",
105++]
106++
107++[[package]]
108++name = "either"
109++version = "1.6.1"
110++source = "registry+https://github.com/rust-lang/crates.io-index"
111++checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
112++
113++[[package]]
114++name = "getrandom"
115++version = "0.1.16"
116++source = "registry+https://github.com/rust-lang/crates.io-index"
117++checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
118++dependencies = [
119++ "cfg-if",
120++ "libc",
121++ "wasi",
122++]
123++
124++[[package]]
125++name = "ghost"
126++version = "0.1.2"
127++source = "registry+https://github.com/rust-lang/crates.io-index"
128++checksum = "1a5bcf1bbeab73aa4cf2fde60a846858dc036163c7c33bec309f8d17de785479"
129++dependencies = [
130++ "proc-macro2",
131++ "quote",
132++ "syn",
133++]
134++
135++[[package]]
136++name = "glob"
137++version = "0.3.0"
138++source = "registry+https://github.com/rust-lang/crates.io-index"
139++checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
140++
141++[[package]]
142++name = "hashbrown"
143++version = "0.9.1"
144++source = "registry+https://github.com/rust-lang/crates.io-index"
145++checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04"
146++dependencies = [
147++ "ahash",
148++]
149++
150++[[package]]
151++name = "hermit-abi"
152++version = "0.1.18"
153++source = "registry+https://github.com/rust-lang/crates.io-index"
154++checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c"
155++dependencies = [
156++ "libc",
157++]
158++
159++[[package]]
160++name = "indoc"
161++version = "0.3.6"
162++source = "registry+https://github.com/rust-lang/crates.io-index"
163++checksum = "47741a8bc60fb26eb8d6e0238bbb26d8575ff623fdc97b1a2c00c050b9684ed8"
164++dependencies = [
165++ "indoc-impl",
166++ "proc-macro-hack",
167++]
168++
169++[[package]]
170++name = "indoc-impl"
171++version = "0.3.6"
172++source = "registry+https://github.com/rust-lang/crates.io-index"
173++checksum = "ce046d161f000fffde5f432a0d034d0341dc152643b2598ed5bfce44c4f3a8f0"
174++dependencies = [
175++ "proc-macro-hack",
176++ "proc-macro2",
177++ "quote",
178++ "syn",
179++ "unindent",
180++]
181++
182++[[package]]
183++name = "instant"
184++version = "0.1.9"
185++source = "registry+https://github.com/rust-lang/crates.io-index"
186++checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec"
187++dependencies = [
188++ "cfg-if",
189++]
190++
191++[[package]]
192++name = "inventory"
193++version = "0.1.10"
194++source = "registry+https://github.com/rust-lang/crates.io-index"
195++checksum = "0f0f7efb804ec95e33db9ad49e4252f049e37e8b0a4652e3cd61f7999f2eff7f"
196++dependencies = [
197++ "ctor",
198++ "ghost",
199++ "inventory-impl",
200++]
201++
202++[[package]]
203++name = "inventory-impl"
204++version = "0.1.10"
205++source = "registry+https://github.com/rust-lang/crates.io-index"
206++checksum = "75c094e94816723ab936484666968f5b58060492e880f3c8d00489a1e244fa51"
207++dependencies = [
208++ "proc-macro2",
209++ "quote",
210++ "syn",
211++]
212++
213++[[package]]
214++name = "itoa"
215++version = "0.4.7"
216++source = "registry+https://github.com/rust-lang/crates.io-index"
217++checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736"
218++
219++[[package]]
220++name = "lazy_static"
221++version = "1.4.0"
222++source = "registry+https://github.com/rust-lang/crates.io-index"
223++checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
224++
225++[[package]]
226++name = "libc"
227++version = "0.2.86"
228++source = "registry+https://github.com/rust-lang/crates.io-index"
229++checksum = "b7282d924be3275cec7f6756ff4121987bc6481325397dde6ba3e7802b1a8b1c"
230++
231++[[package]]
232++name = "lock_api"
233++version = "0.4.2"
234++source = "registry+https://github.com/rust-lang/crates.io-index"
235++checksum = "dd96ffd135b2fd7b973ac026d28085defbe8983df057ced3eb4f2130b0831312"
236++dependencies = [
237++ "scopeguard",
238++]
239++
240++[[package]]
241++name = "memoffset"
242++version = "0.6.1"
243++source = "registry+https://github.com/rust-lang/crates.io-index"
244++checksum = "157b4208e3059a8f9e78d559edc658e13df41410cb3ae03979c83130067fdd87"
245++dependencies = [
246++ "autocfg",
247++]
248++
249++[[package]]
250++name = "num-bigint"
251++version = "0.3.1"
252++source = "registry+https://github.com/rust-lang/crates.io-index"
253++checksum = "5e9a41747ae4633fce5adffb4d2e81ffc5e89593cb19917f8fb2cc5ff76507bf"
254++dependencies = [
255++ "autocfg",
256++ "num-integer",
257++ "num-traits",
258++]
259++
260++[[package]]
261++name = "num-complex"
262++version = "0.3.1"
263++source = "registry+https://github.com/rust-lang/crates.io-index"
264++checksum = "747d632c0c558b87dbabbe6a82f3b4ae03720d0646ac5b7b4dae89394be5f2c5"
265++dependencies = [
266++ "num-traits",
267++]
268++
269++[[package]]
270++name = "num-integer"
271++version = "0.1.44"
272++source = "registry+https://github.com/rust-lang/crates.io-index"
273++checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db"
274++dependencies = [
275++ "autocfg",
276++ "num-traits",
277++]
278++
279++[[package]]
280++name = "num-traits"
281++version = "0.2.14"
282++source = "registry+https://github.com/rust-lang/crates.io-index"
283++checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
284++dependencies = [
285++ "autocfg",
286++]
287++
288++[[package]]
289++name = "num_cpus"
290++version = "1.13.0"
291++source = "registry+https://github.com/rust-lang/crates.io-index"
292++checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3"
293++dependencies = [
294++ "hermit-abi",
295++ "libc",
296++]
297++
298++[[package]]
299++name = "parking_lot"
300++version = "0.11.1"
301++source = "registry+https://github.com/rust-lang/crates.io-index"
302++checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb"
303++dependencies = [
304++ "instant",
305++ "lock_api",
306++ "parking_lot_core",
307++]
308++
309++[[package]]
310++name = "parking_lot_core"
311++version = "0.8.3"
312++source = "registry+https://github.com/rust-lang/crates.io-index"
313++checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018"
314++dependencies = [
315++ "cfg-if",
316++ "instant",
317++ "libc",
318++ "redox_syscall",
319++ "smallvec",
320++ "winapi",
321++]
322++
323++[[package]]
324++name = "paste"
325++version = "0.1.18"
326++source = "registry+https://github.com/rust-lang/crates.io-index"
327++checksum = "45ca20c77d80be666aef2b45486da86238fabe33e38306bd3118fe4af33fa880"
328++dependencies = [
329++ "paste-impl",
330++ "proc-macro-hack",
331++]
332++
333++[[package]]
334++name = "paste-impl"
335++version = "0.1.18"
336++source = "registry+https://github.com/rust-lang/crates.io-index"
337++checksum = "d95a7db200b97ef370c8e6de0088252f7e0dfff7d047a28528e47456c0fc98b6"
338++dependencies = [
339++ "proc-macro-hack",
340++]
341++
342++[[package]]
343++name = "ppv-lite86"
344++version = "0.2.10"
345++source = "registry+https://github.com/rust-lang/crates.io-index"
346++checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
347++
348++[[package]]
349++name = "proc-macro-hack"
350++version = "0.5.19"
351++source = "registry+https://github.com/rust-lang/crates.io-index"
352++checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
353++
354++[[package]]
355++name = "proc-macro2"
356++version = "1.0.24"
357++source = "registry+https://github.com/rust-lang/crates.io-index"
358++checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"
359++dependencies = [
360++ "unicode-xid",
361++]
362++
363++[[package]]
364++name = "proptest"
365++version = "0.10.1"
366++source = "registry+https://github.com/rust-lang/crates.io-index"
367++checksum = "12e6c80c1139113c28ee4670dc50cc42915228b51f56a9e407f0ec60f966646f"
368++dependencies = [
369++ "bitflags",
370++ "byteorder",
371++ "lazy_static",
372++ "num-traits",
373++ "quick-error",
374++ "rand",
375++ "rand_chacha",
376++ "rand_xorshift",
377++ "regex-syntax",
378++]
379++
380++[[package]]
381++name = "pyo3"
382++version = "0.13.2"
383++dependencies = [
384++ "assert_approx_eq",
385++ "cfg-if",
386++ "ctor",
387++ "hashbrown",
388++ "indoc",
389++ "inventory",
390++ "libc",
391++ "num-bigint",
392++ "num-complex",
393++ "parking_lot",
394++ "paste",
395++ "proptest",
396++ "pyo3",
397++ "pyo3-macros",
398++ "rustversion",
399++ "serde",
400++ "serde_json",
401++ "trybuild",
402++ "unindent",
403++]
404++
405++[[package]]
406++name = "pyo3-macros"
407++version = "0.13.2"
408++dependencies = [
409++ "pyo3-macros-backend",
410++ "quote",
411++ "syn",
412++]
413++
414++[[package]]
415++name = "pyo3-macros-backend"
416++version = "0.13.2"
417++dependencies = [
418++ "proc-macro2",
419++ "quote",
420++ "syn",
421++]
422++
423++[[package]]
424++name = "quick-error"
425++version = "1.2.3"
426++source = "registry+https://github.com/rust-lang/crates.io-index"
427++checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
428++
429++[[package]]
430++name = "quote"
431++version = "1.0.9"
432++source = "registry+https://github.com/rust-lang/crates.io-index"
433++checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
434++dependencies = [
435++ "proc-macro2",
436++]
437++
438++[[package]]
439++name = "rand"
440++version = "0.7.3"
441++source = "registry+https://github.com/rust-lang/crates.io-index"
442++checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
443++dependencies = [
444++ "getrandom",
445++ "libc",
446++ "rand_chacha",
447++ "rand_core",
448++ "rand_hc",
449++]
450++
451++[[package]]
452++name = "rand_chacha"
453++version = "0.2.2"
454++source = "registry+https://github.com/rust-lang/crates.io-index"
455++checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
456++dependencies = [
457++ "ppv-lite86",
458++ "rand_core",
459++]
460++
461++[[package]]
462++name = "rand_core"
463++version = "0.5.1"
464++source = "registry+https://github.com/rust-lang/crates.io-index"
465++checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
466++dependencies = [
467++ "getrandom",
468++]
469++
470++[[package]]
471++name = "rand_hc"
472++version = "0.2.0"
473++source = "registry+https://github.com/rust-lang/crates.io-index"
474++checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
475++dependencies = [
476++ "rand_core",
477++]
478++
479++[[package]]
480++name = "rand_xorshift"
481++version = "0.2.0"
482++source = "registry+https://github.com/rust-lang/crates.io-index"
483++checksum = "77d416b86801d23dde1aa643023b775c3a462efc0ed96443add11546cdf1dca8"
484++dependencies = [
485++ "rand_core",
486++]
487++
488++[[package]]
489++name = "rayon"
490++version = "1.5.0"
491++source = "registry+https://github.com/rust-lang/crates.io-index"
492++checksum = "8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674"
493++dependencies = [
494++ "autocfg",
495++ "crossbeam-deque",
496++ "either",
497++ "rayon-core",
498++]
499++
500++[[package]]
501++name = "rayon-core"
502++version = "1.9.0"
503++source = "registry+https://github.com/rust-lang/crates.io-index"
504++checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a"
505++dependencies = [
506++ "crossbeam-channel",
507++ "crossbeam-deque",
508++ "crossbeam-utils",
509++ "lazy_static",
510++ "num_cpus",
511++]
512++
513++[[package]]
514++name = "redox_syscall"
515++version = "0.2.5"
516++source = "registry+https://github.com/rust-lang/crates.io-index"
517++checksum = "94341e4e44e24f6b591b59e47a8a027df12e008d73fd5672dbea9cc22f4507d9"
518++dependencies = [
519++ "bitflags",
520++]
521++
522++[[package]]
523++name = "regex-syntax"
524++version = "0.6.22"
525++source = "registry+https://github.com/rust-lang/crates.io-index"
526++checksum = "b5eb417147ba9860a96cfe72a0b93bf88fee1744b5636ec99ab20c1aa9376581"
527++
528++[[package]]
529++name = "rustapi-module"
530++version = "0.1.0"
531++dependencies = [
532++ "pyo3",
533++]
534++
535++[[package]]
536++name = "rustversion"
537++version = "1.0.4"
538++source = "registry+https://github.com/rust-lang/crates.io-index"
539++checksum = "cb5d2a036dc6d2d8fd16fde3498b04306e29bd193bf306a57427019b823d5acd"
540++
541++[[package]]
542++name = "ryu"
543++version = "1.0.5"
544++source = "registry+https://github.com/rust-lang/crates.io-index"
545++checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
546++
547++[[package]]
548++name = "scopeguard"
549++version = "1.1.0"
550++source = "registry+https://github.com/rust-lang/crates.io-index"
551++checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
552++
553++[[package]]
554++name = "serde"
555++version = "1.0.123"
556++source = "registry+https://github.com/rust-lang/crates.io-index"
557++checksum = "92d5161132722baa40d802cc70b15262b98258453e85e5d1d365c757c73869ae"
558++dependencies = [
559++ "serde_derive",
560++]
561++
562++[[package]]
563++name = "serde_derive"
564++version = "1.0.123"
565++source = "registry+https://github.com/rust-lang/crates.io-index"
566++checksum = "9391c295d64fc0abb2c556bad848f33cb8296276b1ad2677d1ae1ace4f258f31"
567++dependencies = [
568++ "proc-macro2",
569++ "quote",
570++ "syn",
571++]
572++
573++[[package]]
574++name = "serde_json"
575++version = "1.0.62"
576++source = "registry+https://github.com/rust-lang/crates.io-index"
577++checksum = "ea1c6153794552ea7cf7cf63b1231a25de00ec90db326ba6264440fa08e31486"
578++dependencies = [
579++ "itoa",
580++ "ryu",
581++ "serde",
582++]
583++
584++[[package]]
585++name = "smallvec"
586++version = "1.6.1"
587++source = "registry+https://github.com/rust-lang/crates.io-index"
588++checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e"
589++
590++[[package]]
591++name = "syn"
592++version = "1.0.60"
593++source = "registry+https://github.com/rust-lang/crates.io-index"
594++checksum = "c700597eca8a5a762beb35753ef6b94df201c81cca676604f547495a0d7f0081"
595++dependencies = [
596++ "proc-macro2",
597++ "quote",
598++ "unicode-xid",
599++]
600++
601++[[package]]
602++name = "termcolor"
603++version = "1.1.2"
604++source = "registry+https://github.com/rust-lang/crates.io-index"
605++checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4"
606++dependencies = [
607++ "winapi-util",
608++]
609++
610++[[package]]
611++name = "toml"
612++version = "0.5.8"
613++source = "registry+https://github.com/rust-lang/crates.io-index"
614++checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa"
615++dependencies = [
616++ "serde",
617++]
618++
619++[[package]]
620++name = "trybuild"
621++version = "1.0.41"
622++source = "registry+https://github.com/rust-lang/crates.io-index"
623++checksum = "99471a206425fba51842a9186315f32d91c56eadc21ea4c21f847b59cf778f8b"
624++dependencies = [
625++ "glob",
626++ "lazy_static",
627++ "serde",
628++ "serde_json",
629++ "termcolor",
630++ "toml",
631++]
632++
633++[[package]]
634++name = "unicode-xid"
635++version = "0.2.1"
636++source = "registry+https://github.com/rust-lang/crates.io-index"
637++checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
638++
639++[[package]]
640++name = "unindent"
641++version = "0.1.7"
642++source = "registry+https://github.com/rust-lang/crates.io-index"
643++checksum = "f14ee04d9415b52b3aeab06258a3f07093182b88ba0f9b8d203f211a7a7d41c7"
644++
645++[[package]]
646++name = "wasi"
647++version = "0.9.0+wasi-snapshot-preview1"
648++source = "registry+https://github.com/rust-lang/crates.io-index"
649++checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
650++
651++[[package]]
652++name = "winapi"
653++version = "0.3.9"
654++source = "registry+https://github.com/rust-lang/crates.io-index"
655++checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
656++dependencies = [
657++ "winapi-i686-pc-windows-gnu",
658++ "winapi-x86_64-pc-windows-gnu",
659++]
660++
661++[[package]]
662++name = "winapi-i686-pc-windows-gnu"
663++version = "0.4.0"
664++source = "registry+https://github.com/rust-lang/crates.io-index"
665++checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
666++
667++[[package]]
668++name = "winapi-util"
669++version = "0.1.5"
670++source = "registry+https://github.com/rust-lang/crates.io-index"
671++checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
672++dependencies = [
673++ "winapi",
674++]
675++
676++[[package]]
677++name = "winapi-x86_64-pc-windows-gnu"
678++version = "0.4.0"
679++source = "registry+https://github.com/rust-lang/crates.io-index"
680++checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
681++
682++[[package]]
683++name = "word-count"
684++version = "0.1.0"
685++dependencies = [
686++ "pyo3",
687++ "rayon",
688++]
pkgs/development/tools/rust/maturin/pyo3-test/default.nixnew file+12
@@ -0,0 +1,12 @@
1+{ callPackage
2+, rustPlatform
3+}:
4+
5+callPackage ./generic.nix {
6+ buildAndTestSubdir = "examples/word-count";
7+
8+ nativeBuildInputs = with rustPlatform; [
9+ cargoSetupHook
10+ maturinBuildHook
11+ ];
12+}
pkgs/development/tools/rust/maturin/pyo3-test/generic.nixnew file+45
@@ -0,0 +1,45 @@
1+# Derivation prototype, used by maturin and setuptools-rust
2+# passthrough tests.
3+
4+{ lib
5+, fetchFromGitHub
6+, python3Packages
7+, rustPlatform
8+
9+, nativeBuildInputs
10+
11+, buildAndTestSubdir ? null
12+, format ? "pyproject"
13+, sourceRoot ? "source"
14+}:
15+
16+python3Packages.buildPythonPackage rec {
17+ pname = "word-count";
18+ version = "0.13.2";
19+
20+ src = fetchFromGitHub {
21+ owner = "PyO3";
22+ repo = "pyo3";
23+ rev = "v${version}";
24+ hash = "sha256-NOMrrfo8WjlPhtGxWUOPJS/UDDdbLQRCXR++Zd6JmIA=";
25+ };
26+
27+ cargoDeps = rustPlatform.fetchCargoTarball {
28+ inherit src sourceRoot patches;
29+ name = "${pname}-${version}";
30+ hash = "sha256-//TmozgWy9zrSpMKX92XdHj4fw/T1Elfgn4YhhR7ot0=";
31+ };
32+
33+ patches = [ ./Cargo.lock.patch ];
34+
35+ inherit buildAndTestSubdir format nativeBuildInputs sourceRoot;
36+
37+ pythonImportsCheck = [ "word_count" ];
38+
39+ meta = with lib; {
40+ description = "PyO3 word count example";
41+ homepage = "https://github.com/PyO3/pyo3";
42+ license = licenses.asl20;
43+ maintainers = [ maintainers.danieldk ];
44+ };
45+}
pkgs/development/tools/sauce-connect/default.nix+1−1
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
1919 }
2020 );
2121
22− buildInputs = [ unzip ];
22+ nativeBuildInputs = [ unzip ];
2323
2424 patchPhase = lib.optionalString stdenv.isLinux ''
2525 patchelf \
pkgs/development/tools/slimerjs/default.nix+2−4
@@ -10,13 +10,11 @@ let
1010 sha256="1w4sfrv520isbs7r1rlzl5y3idrpad7znw9fc92yz40jlwz7sxs4";
1111 rev = version;
1212 };
13− buildInputs = [
14− unzip zip
15− ];
1613in
1714stdenv.mkDerivation {
1815 inherit (s) name version;
19− inherit buildInputs;
16+ buildInputs = [ zip ];
17+ nativeBuildInputs = [ unzip ];
2018 #src = fetchurl {
2119 # inherit (s) url sha256;
2220 #};
pkgs/development/tools/thrust/default.nix+2−2
@@ -22,8 +22,8 @@ in stdenv.mkDerivation rec {
2222 sha256 = "07rrnlj0gk500pvar4b1wdqm05p4n9yjwn911x93bd2qwc8r5ymc";
2323 };
2424
25− nativeBuildInputs = [ makeWrapper ];
26− buildInputs = [ thrustEnv unzip ];
25+ nativeBuildInputs = [ makeWrapper unzip ];
26+ buildInputs = [ thrustEnv ];
2727
2828 phases = [ "installPhase" "fixupPhase" ];
2929
pkgs/development/web/grails/default.nix+1−1
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818 sha256 = "0l99x3g485qjpdd7ga553xpi1s6rq21p8v16qjzqwdhyld961qsr";
1919 };
2020
21− buildInputs = [ unzip ];
21+ nativeBuildInputs = [ unzip ];
2222
2323 dontBuild = true;
2424
pkgs/development/web/twitter-bootstrap/default.nix+1−1
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "sha256-CiEUUa0mCrUSp+XCoWNs8plJxhWHZZD+K+UBJSDu1CM=";
1010 };
1111
12− buildInputs = [ unzip ];
12+ nativeBuildInputs = [ unzip ];
1313
1414 dontBuild = true;
1515 installPhase = ''
pkgs/games/crafty/default.nix+1−1
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
1919 sha256 = "12g70mgfifwssfvndzq94pin34dizlixhsga75vgj7dakysi2p7f";
2020 };
2121
22− buildInputs = [ unzip ];
22+ nativeBuildInputs = [ unzip ];
2323
2424 unpackPhase = ''
2525 mkdir "craftysrc"
pkgs/games/dwarf-fortress/twbt/default.nix+1−1
@@ -71,7 +71,7 @@ stdenvNoCC.mkDerivation rec {
7171
7272 outputs = [ "lib" "art" "out" ];
7373
74− buildInputs = [ unzip ];
74+ nativeBuildInputs = [ unzip ];
7575
7676 installPhase = ''
7777 mkdir -p $lib/hack/{plugins,lua} $art/data/art
pkgs/games/exult/default.nix+2−2
@@ -21,8 +21,8 @@ stdenv.mkDerivation rec {
2121
2222 configureFlags = [ "--disable-tools" ];
2323
24− nativeBuildInputs = [ pkg-config ];
25− buildInputs = [ SDL2 libogg libvorbis zlib unzip ];
24+ nativeBuildInputs = [ pkg-config unzip ];
25+ buildInputs = [ SDL2 libogg libvorbis zlib ];
2626
2727 enableParallelBuilding = true;
2828
pkgs/games/gogui/default.nix+1−2
@@ -5,8 +5,7 @@ let
55in stdenv.mkDerivation {
66 pname = "gogui";
77 inherit version;
8− nativeBuildInputs = [ makeWrapper ];
9− buildInputs = [ unzip ];
8+ nativeBuildInputs = [ makeWrapper unzip ];
109 src = fetchurl {
1110 url = "mirror://sourceforge/project/gogui/gogui/${version}/gogui-${version}.zip";
1211 sha256 = "0qk6p1bhi1816n638bg11ljyj6zxvm75jdf02aabzdmmd9slns1j";
pkgs/games/keen4/default.nix+1−1
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
99 sha256 = "12rnc9ksl7v6l8wsxvr26ylkafzq80dbsa7yafzw9pqc8pafkhx1";
1010 };
1111
12− buildInputs = [unzip];
12+ nativeBuildInputs = [ unzip ];
1313
1414 inherit dosbox;
1515
pkgs/games/nexuiz/default.nix+1−2
@@ -21,9 +21,8 @@ in stdenv.mkDerivation {
2121 sha256 = "0010jrxc68qqinkvdh1qn2b8z3sa5v1kcd8d1m4llp3pr6y7xqm5";
2222 };
2323
24+ nativeBuildInputs = [ unzip ];
2425 buildInputs = [
25− # required for both
26− unzip
2726 # glx
2827 libX11 libGLU libGL libXpm libXext libXxf86vm libXxf86dga alsaLib
2928 # sdl
pkgs/games/rigsofrods/default.nix+2−2
@@ -23,9 +23,9 @@ stdenv.mkDerivation rec {
2323 ln -s $out/share/rigsofrods/{RoR,RoRConfig} $out/bin
2424 '';
2525
26− nativeBuildInputs = [ cmake pkg-config ];
26+ nativeBuildInputs = [ cmake pkg-config unzip ];
2727 buildInputs = [ wxGTK30 freeimage zziplib libGLU libGL boost
28− libuuid openal ogre ois curl gtk2 mygui unzip angelscript
28+ libuuid openal ogre ois curl gtk2 mygui angelscript
2929 ogrepaged mysocketw libxcb ];
3030
3131 meta = with lib; {
pkgs/games/simutrans/default.nix+2−2
@@ -115,8 +115,8 @@ let
115115
116116 sourceRoot = ".";
117117
118− nativeBuildInputs = [ pkg-config ];
119− buildInputs = [ zlib libpng bzip2 SDL SDL_mixer unzip ];
118+ nativeBuildInputs = [ pkg-config unzip ];
119+ buildInputs = [ zlib libpng bzip2 SDL SDL_mixer ];
120120
121121 configurePhase = let
122122 # Configuration as per the readme.txt and config.template
pkgs/games/steam/fonts.nix+1−1
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
88 sha256 = "1cgygmwich5f1jhhbmbkkpnzasjl8gy36xln76n6r2gjh6awqfx0";
99 };
1010
11− buildInputs = [ unzip ];
11+ nativeBuildInputs = [ unzip ];
1212
1313 sourceRoot = ".";
1414
pkgs/games/terraria-server/default.nix+2−2
@@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
1010 sha256 = "18hcy7jfizyyp0h66rga8z948xg3nyk32rzl7hgv7ar1w43airhh";
1111 };
1212
13− buildInputs = [ file unzip ];
14− nativeBuildInputs = [ autoPatchelfHook ];
13+ buildInputs = [ file ];
14+ nativeBuildInputs = [ autoPatchelfHook unzip ];
1515
1616 installPhase = ''
1717 mkdir -p $out/bin
pkgs/games/tremulous/default.nix+2−1
@@ -15,7 +15,8 @@ stdenv.mkDerivation rec {
1515 url = "http://releases.mercenariesguild.net/tremded/mg_tremded_source_1.01.tar.gz";
1616 sha256 = "1njrqlhzjvy9myddzkagszwdcf3m4h08wip888w2rmbshs6kz6ql";
1717 };
18− buildInputs = [ unzip libGLU libGL libX11 SDL openal ];
18+ nativeBuildInputs = [ unzip ];
19+ buildInputs = [ libGLU libGL libX11 SDL openal ];
1920 unpackPhase = ''
2021 unzip $src1
2122 cd tremulous
pkgs/games/urbanterror/default.nix+2−1
@@ -15,7 +15,8 @@ stdenv.mkDerivation rec {
1515 })
1616 ];
1717
18− buildInputs = [ unzip SDL libGL libGLU openal curl libXxf86vm ];
18+ nativeBuildInputs = [ unzip ];
19+ buildInputs = [ SDL libGL libGLU openal curl libXxf86vm ];
1920 sourceRoot = "ioq3-for-UrbanTerror-4-release-${version}";
2021
2122 configurePhase = ''
pkgs/games/worldofgoo/default.nix+1−1
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
3434 sha256 = "175e4b0499a765f1564942da4bd65029f8aae1de8231749c56bec672187d53ee";
3535 };
3636
37− buildInputs = [ unzip ];
37+ nativeBuildInputs = [ unzip ];
3838 sourceRoot = pname;
3939 phases = [ "unpackPhase installPhase" ];
4040
pkgs/games/xonotic/default.nix+2−1
@@ -62,7 +62,8 @@ let
6262 sha256 = "0axxw04fyz6jlfqd0kp7hdrqa0li31sx1pbipf2j5qp9wvqicsay";
6363 };
6464
65− buildInputs = [ unzip libjpeg zlib libvorbis curl ]
65+ nativeBuildInputs = [ unzip ];
66+ buildInputs = [ libjpeg zlib libvorbis curl ]
6667 ++ lib.optional withGLX [ libX11.dev libGLU.dev libGL.dev libXpm.dev libXext.dev libXxf86vm.dev alsaLib.dev ]
6768 ++ lib.optional withSDL [ SDL2.dev ];
6869
pkgs/games/zod/default.nix+2−2
@@ -24,8 +24,8 @@ stdenv.mkDerivation {
2424 sourceRoot=`pwd`/src
2525 '';
2626
27− nativeBuildInputs = [ makeWrapper ];
28− buildInputs = [ unrar unzip SDL SDL_image SDL_ttf SDL_mixer libmysqlclient ];
27+ nativeBuildInputs = [ makeWrapper unrar unzip ];
28+ buildInputs = [ SDL SDL_image SDL_ttf SDL_mixer libmysqlclient ];
2929
3030 NIX_LDFLAGS = "-L${libmysqlclient}/lib/mysql";
3131
pkgs/misc/drivers/foo2zjs/default.nix+2−1
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
88 sha256 = "1rmw4jmxn2lqp124mapvnic0ma8ipyvisx2vj848mvad5g5w9x3z";
99 };
1010
11− buildInputs = [ foomatic-filters bc unzip ghostscript systemd vim ];
11+ nativeBuildInputs = [ unzip ];
12+ buildInputs = [ foomatic-filters bc ghostscript systemd vim ];
1213
1314 patches = [ ./no-hardcode-fw.diff ];
1415
pkgs/misc/emulators/atari800/default.nix+2−2
@@ -13,9 +13,9 @@ stdenv.mkDerivation rec {
1313 sha256 = "15l08clqqayi9izrgsz9achan6gl4x57wqsc8mad3yn0xayzz3qy";
1414 };
1515
16− nativeBuildInputs = [ autoreconfHook ];
16+ nativeBuildInputs = [ autoreconfHook unzip ];
1717
18− buildInputs = [ unzip zlib SDL readline libGLU libGL libX11 ];
18+ buildInputs = [ zlib SDL readline libGLU libGL libX11 ];
1919
2020 configureFlags = [
2121 "--target=default"
pkgs/misc/emulators/nestopia/default.nix+1−1
@@ -28,7 +28,6 @@ stdenv.mkDerivation rec {
2828 libGLU libGL
2929 libarchive
3030 libao
31− unzip
3231 xdg-utils
3332 gnome3.adwaita-icon-theme
3433 ];
@@ -37,6 +36,7 @@ stdenv.mkDerivation rec {
3736 pkg-config
3837 makeWrapper
3938 wrapGAppsHook
39+ unzip
4040 ];
4141
4242 installPhase = ''
pkgs/misc/source-and-tags/default.nix+1−1
@@ -15,7 +15,7 @@
1515 phases = "unpackPhase buildPhase";
1616 inherit src srcDir tagSuffix;
1717 name = "${name}-source-with-tags";
18− buildInputs = [ unzip ];
18+ nativeBuildInputs = [ unzip ];
1919 # using separate tag directory so that you don't have to glob that much files when starting your editor
2020 # is this a good choice?
2121 buildPhase =
pkgs/misc/vscode-extensions/python/extract-nuget.nix+1−1
@@ -4,7 +4,7 @@
44stdenv.mkDerivation {
55 inherit name version src;
66
7− buildInputs = [ unzip ];
7+ nativeBuildInputs = [ unzip ];
88 dontBuild = true;
99 unpackPhase = "unzip $src";
1010 installPhase = ''
pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, appleDerivation, yacc, flex }:
1+{ lib, stdenv, appleDerivation, yacc, flex }:
22
33appleDerivation {
44 nativeBuildInputs = [ yacc flex ];
@@ -26,7 +26,7 @@ appleDerivation {
2626 cp migcom.1 $out/share/man/man1
2727
2828 substituteInPlace $out/bin/mig \
29− --replace 'arch=`/usr/bin/arch`' 'arch=i386' \
29+ --replace 'arch=`/usr/bin/arch`' 'arch=${stdenv.targetPlatform.darwinArch}' \
3030 --replace '/usr/bin/' "" \
3131 --replace '/bin/rmdir' "rmdir" \
3232 --replace 'C=''${MIGCC}' "C=cc"
pkgs/os-specific/darwin/xcode/sdk-pkgs.nix+2−10
@@ -14,12 +14,6 @@ let
1414
1515minSdkVersion = targetPlatform.minSdkVersion or "9.0";
1616
17−iosPlatformArch = { parsed, ... }: {
18− armv7a = "armv7";
19− aarch64 = "arm64";
20− x86_64 = "x86_64";
21−}.${parsed.cpu.name};
22−
2317in
2418
2519rec {
@@ -35,9 +29,7 @@ rec {
3529 binutils = wrapBintoolsWith {
3630 libc = targetIosSdkPkgs.libraries;
3731 bintools = binutils-unwrapped;
38− extraBuildCommands = ''
39− echo "-arch ${iosPlatformArch targetPlatform}" >> $out/nix-support/libc-ldflags
40− '' + lib.optionalString (sdk.platform == "iPhoneSimulator") ''
32+ extraBuildCommands = lib.optionalString (sdk.platform == "iPhoneSimulator") ''
4133 echo "-platform_version ios-sim ${minSdkVersion} ${sdk.version}" >> $out/nix-support/libc-ldflags
4234 '' + lib.optionalString (sdk.platform == "iPhoneOS") ''
4335 echo "-platform_version ios ${minSdkVersion} ${sdk.version}" >> $out/nix-support/libc-ldflags
@@ -52,7 +44,7 @@ rec {
5244 extraBuildCommands = ''
5345 tr '\n' ' ' < $out/nix-support/cc-cflags > cc-cflags.tmp
5446 mv cc-cflags.tmp $out/nix-support/cc-cflags
55− echo "-target ${targetPlatform.config} -arch ${iosPlatformArch targetPlatform}" >> $out/nix-support/cc-cflags
47+ echo "-target ${targetPlatform.config}" >> $out/nix-support/cc-cflags
5648 echo "-isystem ${sdk}/usr/include${lib.optionalString (lib.versionAtLeast "10" sdk.version) " -isystem ${sdk}/usr/include/c++/4.2.1/ -stdlib=libstdc++"}" >> $out/nix-support/cc-cflags
5749 '' + lib.optionalString (sdk.platform == "iPhoneSimulator") ''
5850 echo "-mios-simulator-version-min=${minSdkVersion}" >> $out/nix-support/cc-cflags
pkgs/os-specific/linux/ati-drivers/default.nix+1−1
@@ -85,11 +85,11 @@ stdenv.mkDerivation rec {
8585 (lib.versionAtLeast kernel.version "4.9") )
8686 [ ./patches/4.9-get_user_pages.patch ];
8787
88+ nativeBuildInputs = [ unzip ];
8889 buildInputs =
8990 [ xorg.libXrender xorg.libXext xorg.libX11 xorg.libXinerama xorg.libSM
9091 xorg.libXrandr xorg.libXxf86vm xorg.xorgproto xorg.imake xorg.libICE
9192 patchelf
92− unzip
9393 libGLU libGL
9494 fontconfig
9595 freetype
pkgs/os-specific/linux/bluez/default.nix+2−2
@@ -19,11 +19,11 @@
1919 ];
2020in stdenv.mkDerivation rec {
2121 pname = "bluez";
22− version = "5.55";
22+ version = "5.56";
2323
2424 src = fetchurl {
2525 url = "mirror://kernel/linux/bluetooth/${pname}-${version}.tar.xz";
26− sha256 = "124v9s4y1s7s6klx5vlmzpk1jlr4x84ch7r7scm7x2f42dqp2qw8";
26+ sha256 = "sha256-WcTbqfyKripqX48S8ZvBsMLcJzVcfKMSPu0/5r19C50=";
2727 };
2828
2929 buildInputs = [
pkgs/os-specific/linux/iproute/default.nix+2−2
@@ -5,11 +5,11 @@
55
66stdenv.mkDerivation rec {
77 pname = "iproute2";
8− version = "5.10.0";
8+ version = "5.11.0";
99
1010 src = fetchurl {
1111 url = "mirror://kernel/linux/utils/net/${pname}/${pname}-${version}.tar.xz";
12− sha256 = "1sakmhvh40gh4x55vzgy6cyvizqkhqalcfpvs6r0c14w62p38jm5";
12+ sha256 = "0m2wa14rhmdb6k07minmw5lk97vz4vn56ndka5849cqjh88fmqn5";
1313 };
1414
1515 preConfigure = ''
pkgs/os-specific/linux/lsiutil/default.nix+1−1
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
1818
1919 srcs = [ src "Source/lsiutil.tar.gz" ];
2020
21− buildInputs = [ unzip ];
21+ nativeBuildInputs = [ unzip ];
2222
2323 sourceRoot = "lsiutil";
2424
pkgs/os-specific/linux/msr-tools/default.nix+1−1
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "07hxmddg0l31kjfmaq84ni142lbbvgq6391r8bd79wpm819pnigr";
1010 };
1111
12− buildInputs = [ unzip ];
12+ nativeBuildInputs = [ unzip ];
1313
1414 preInstall = ''
1515 mkdir -p $out/bin
pkgs/os-specific/linux/net-tools/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "net-tools";
5− version = "1.60_p20180626073013";
5+ version = "2.10";
66
77 src = fetchurl {
88 url = "mirror://gentoo/distfiles/${pname}-${version}.tar.xz";
9− sha256 = "0mzsjjmz5kn676w2glmxwwd8bj0xy9dhhn21aplb435b767045q4";
9+ sha256 = "sha256-smJDWlJB6Jv6UcPKvVEzdTlS96e3uT8y4Iy52W9YDWk=";
1010 };
1111
1212 preBuild =
pkgs/os-specific/linux/numactl/default.nix+3−1
@@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
1717 patchShebangs test
1818 '';
1919
20+ LDFLAGS = lib.optionalString stdenv.hostPlatform.isRiscV "-latomic";
21+
2022 # You probably shouldn't ever run these! They will reconfigure Linux
2123 # NUMA settings, which on my build machine makes the rest of package
2224 # building ~5% slower until reboot. Ugh!
@@ -26,6 +28,6 @@ stdenv.mkDerivation rec {
2628 description = "Library and tools for non-uniform memory access (NUMA) machines";
2729 homepage = "https://github.com/numactl/numactl";
2830 license = with licenses; [ gpl2 lgpl21 ]; # libnuma is lgpl21
29− platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ];
31+ platforms = platforms.linux;
3032 };
3133}
pkgs/os-specific/linux/seturgent/default.nix+2−1
@@ -8,8 +8,9 @@ stdenv.mkDerivation {
88 sha256 = "0q1sr6aljkw2jr9b4xxzbc01qvnd5vk3pxrypif9yd8xjw4wqwri";
99 };
1010
11+ nativeBuildInputs = [ unzip ];
1112 buildInputs = [
12− libX11 xorgproto unzip
13+ libX11 xorgproto
1314 ];
1415
1516 installPhase = ''
pkgs/servers/amqp/rabbitmq-server/default.nix+2−1
@@ -16,8 +16,9 @@ stdenv.mkDerivation rec {
1616 sha256 = "0b252l9r45h8r5gibdqcn6hhbm8g6rfzhm1k9d39pwhs5x77cjqv";
1717 };
1818
19+ nativeBuildInputs = [ unzip ];
1920 buildInputs =
20− [ erlang elixir python libxml2 libxslt xmlto docbook_xml_dtd_45 docbook_xsl zip unzip rsync glibcLocales ]
21+ [ erlang elixir python libxml2 libxslt xmlto docbook_xml_dtd_45 docbook_xsl zip rsync glibcLocales ]
2122 ++ lib.optionals stdenv.isDarwin [ AppKit Carbon Cocoa ];
2223
2324 outputs = [ "out" "man" "doc" ];
pkgs/servers/computing/storm/default.nix+1−1
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515 sha256 = "0xc6lfilfkkjyds59b6c770gj21v9srzpln31c9qb3ls6hzic8gn";
1616 };
1717
18− buildInputs = [ zip unzip ];
18+ nativeBuildInputs = [ zip unzip ];
1919
2020 installPhase = ''
2121 mkdir -p $out/share/${name}
pkgs/servers/http/jboss/default.nix+1−1
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
77 sha256 = "1bdjw0ib9qr498vpfbg8klqw6rl11vbz7vwn6gp1r5gpqkd3zzc8";
88 };
99
10− buildInputs = [ unzip ];
10+ nativeBuildInputs = [ unzip ];
1111
1212 phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
1313
pkgs/servers/http/tomcat/axis2/default.nix+2−1
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
99 sha256 = "0dh0s9bfh95wmmw8nyf2yw95biq7d9zmrbg8k4vzcyz1if228lac";
1010 };
1111
12− buildInputs = [ unzip apacheAnt jdk ];
12+ nativeBuildInputs = [ unzip ];
13+ buildInputs = [ apacheAnt jdk ];
1314 builder = ./builder.sh;
1415
1516 meta = {
pkgs/servers/jellyfin/10.5.x.nix+1−1
@@ -26,8 +26,8 @@ in stdenv.mkDerivation rec {
2626 sha256 = "1s3hva1j5w74qc9wyqnmr5clk4smzfi7wvx8qrzrwy81mx7r5w27";
2727 };
2828
29+ nativeBuildInputs = [ unzip ];
2930 buildInputs = [
30− unzip
3131 makeWrapper
3232 ];
3333
pkgs/servers/monitoring/nagios/default.nix+2−1
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
1010 };
1111
1212 patches = [ ./nagios.patch ];
13− buildInputs = [ php perl gd libpng zlib unzip ];
13+ nativeBuildInputs = [ unzip ];
14+ buildInputs = [ php perl gd libpng zlib ];
1415
1516 configureFlags = [ "--localstatedir=/var/lib/nagios" ];
1617 buildFlags = [ "all" ];
pkgs/servers/monitoring/net-snmp/default.nix+2−2
@@ -37,8 +37,8 @@ stdenv.mkDerivation rec {
3737 substituteInPlace testing/fulltests/support/simple_TESTCONF.sh --replace "/bin/netstat" "${nettools}/bin/netstat"
3838 '';
3939
40− nativeBuildInputs = [ autoreconfHook nettools removeReferencesTo ];
41− buildInputs = with perlPackages; [ file perl unzip openssl ncurses JSON Tk TermReadKey ];
40+ nativeBuildInputs = [ autoreconfHook nettools removeReferencesTo unzip ];
41+ buildInputs = with perlPackages; [ file perl openssl ncurses JSON Tk TermReadKey ];
4242
4343 enableParallelBuilding = true;
4444 doCheck = false; # tries to use networking
pkgs/servers/nosql/riak/2.2.0.nix+2−1
@@ -28,8 +28,9 @@ in
2828stdenv.mkDerivation {
2929 name = "riak-2.2.0";
3030
31+ nativeBuildInputs = [ unzip ];
3132 buildInputs = [
32− which unzip erlang pam
33+ which erlang pam
3334 ];
3435
3536 src = srcs.riak;
pkgs/servers/rainloop/default.nix+1−1
@@ -4,7 +4,7 @@
44 pname = "rainloop${lib.optionalString (edition != "") "-${edition}"}";
55 version = "1.14.0";
66
7− buildInputs = [ unzip ];
7+ nativeBuildInputs = [ unzip ];
88
99 unpackPhase = ''
1010 mkdir rainloop
pkgs/servers/search/elasticsearch/plugins.nix+1−1
@@ -21,7 +21,7 @@ let
2121 # Work around the "unpacker appears to have produced no directories"
2222 # case that happens when the archive doesn't have a subdirectory.
2323 setSourceRoot = "sourceRoot=$(pwd)";
24− buildInputs = [ unzip ];
24+ nativeBuildInputs = [ unzip ];
2525 meta = a.meta // {
2626 platforms = elasticsearch.meta.platforms;
2727 maintainers = (a.meta.maintainers or []) ++ (with lib.maintainers; [ offline ]);
pkgs/servers/sql/mysql/jdbc/default.nix+2−1
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
99 sha256 = "0dfjshrrx0ndfb6xbdpwhn1f1jkw0km57rgpar0ny8ixmgdnlwnm";
1010 };
1111
12− buildInputs = [ unzip ant ];
12+ nativeBuildInputs = [ unzip ];
13+ buildInputs = [ ant ];
1314
1415 meta = {
1516 platforms = lib.platforms.unix;
pkgs/servers/web-apps/moodle/moodle-utils.nix+3−2
@@ -8,15 +8,16 @@ let
88 configurePhase ? ":",
99 buildPhase ? ":",
1010 buildInputs ? [ ],
11+ nativeBuildInputs ? [ ],
1112 ...
1213 }:
1314 stdenv.mkDerivation (a // {
1415 name = name;
1516
1617 inherit pluginType;
17− inherit configurePhase buildPhase;
18+ inherit configurePhase buildPhase buildInputs;
1819
19− buildInputs = [ unzip ] ++ buildInputs;
20+ nativeBuildInputs = [ unzip ] ++ nativeBuildInputs;
2021
2122 installPhase = ''
2223 runHook preInstall
pkgs/servers/x11/xorg/default.nix+6−6
@@ -1015,11 +1015,11 @@ lib.makeScope newScope (self: with self; {
10151015 }) {};
10161016
10171017 libXt = callPackage ({ stdenv, pkg-config, fetchurl, libICE, xorgproto, libSM, libX11 }: stdenv.mkDerivation {
1018− name = "libXt-1.2.0";
1018+ name = "libXt-1.2.1";
10191019 builder = ./builder.sh;
10201020 src = fetchurl {
1021− url = "mirror://xorg/individual/lib/libXt-1.2.0.tar.bz2";
1022− sha256 = "0cbqlyssr8aia88c8i7z59z9d0kp3p2hp6683xhz9ndyv8qza7dk";
1021+ url = "mirror://xorg/individual/lib/libXt-1.2.1.tar.bz2";
1022+ sha256 = "0q1x7842r8rcn2m0q4q9f69h4qa097fyizs8brzx5ns62s7w1737";
10231023 };
10241024 hardeningDisable = [ "bindnow" "relro" ];
10251025 nativeBuildInputs = [ pkg-config ];
@@ -1340,11 +1340,11 @@ lib.makeScope newScope (self: with self; {
13401340 }) {};
13411341
13421342 utilmacros = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation {
1343− name = "util-macros-1.19.2";
1343+ name = "util-macros-1.19.3";
13441344 builder = ./builder.sh;
13451345 src = fetchurl {
1346− url = "mirror://xorg/individual/util/util-macros-1.19.2.tar.bz2";
1347− sha256 = "04p7ydqxgq37jklnfj18b70zsifiz4h50wvrk94i2112mmv37r6p";
1346+ url = "mirror://xorg/individual/util/util-macros-1.19.3.tar.bz2";
1347+ sha256 = "0w8ryfqylprz37zj9grl4jzdsqq67ibfwq5raj7vm1i7kmp2x08g";
13481348 };
13491349 hardeningDisable = [ "bindnow" "relro" ];
13501350 nativeBuildInputs = [ pkg-config ];
pkgs/servers/x11/xorg/tarballs.list+2−2
@@ -202,7 +202,7 @@ mirror://xorg/individual/lib/libXres-1.2.0.tar.bz2
202202mirror://xorg/individual/lib/libXScrnSaver-1.2.3.tar.bz2
203203mirror://xorg/individual/lib/libxshmfence-1.3.tar.bz2
204204mirror://xorg/individual/lib/libXTrap-1.0.1.tar.bz2
205−mirror://xorg/individual/lib/libXt-1.2.0.tar.bz2
205+mirror://xorg/individual/lib/libXt-1.2.1.tar.bz2
206206mirror://xorg/individual/lib/libXtst-1.2.3.tar.bz2
207207mirror://xorg/individual/lib/libXv-1.0.11.tar.bz2
208208mirror://xorg/individual/lib/libXvMC-1.0.12.tar.bz2
@@ -216,6 +216,6 @@ mirror://xorg/individual/util/gccmakedep-1.0.3.tar.bz2
216216mirror://xorg/individual/util/imake-1.0.8.tar.bz2
217217mirror://xorg/individual/util/lndir-1.0.3.tar.bz2
218218mirror://xorg/individual/util/makedepend-1.0.6.tar.bz2
219−mirror://xorg/individual/util/util-macros-1.19.2.tar.bz2
219+mirror://xorg/individual/util/util-macros-1.19.3.tar.bz2
220220mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2
221221mirror://xorg/individual/xserver/xorg-server-1.20.10.tar.bz2
pkgs/stdenv/darwin/default.nix+4−4
@@ -322,7 +322,7 @@ in rec {
322322 libxml2 gettext sharutils gmp libarchive ncurses pkg-config libedit groff
323323 openssh sqlite sed serf openldap db cyrus-sasl expat apr-util subversion xz
324324 findfreetype libssh curl cmake autoconf automake libtool ed cpio coreutils
325− libssh2 nghttp2 libkrb5 ninja;
325+ libssh2 nghttp2 libkrb5 ninja brotli;
326326
327327 llvmPackages_7 = super.llvmPackages_7 // (let
328328 tools = super.llvmPackages_7.tools.extend (_: _: {
@@ -359,7 +359,7 @@ in rec {
359359 [ bootstrapTools ] ++
360360 (with pkgs; [
361361 xz.bin xz.out libcxx libcxxabi llvmPackages_7.compiler-rt
362− llvmPackages_7.clang-unwrapped zlib libxml2.out curl.out openssl.out
362+ llvmPackages_7.clang-unwrapped zlib libxml2.out curl.out brotli.lib openssl.out
363363 libssh2.out nghttp2.lib libkrb5 coreutils gnugrep pcre.out gmp libiconv
364364 ]) ++
365365 (with pkgs.darwin; [ dyld Libsystem CF ICU locale ]);
@@ -411,7 +411,7 @@ in rec {
411411 [ bootstrapTools ] ++
412412 (with pkgs; [
413413 xz.bin xz.out bash libcxx libcxxabi llvmPackages_7.compiler-rt
414− llvmPackages_7.clang-unwrapped zlib libxml2.out curl.out openssl.out
414+ llvmPackages_7.clang-unwrapped zlib libxml2.out curl.out brotli.lib openssl.out
415415 libssh2.out nghttp2.lib libkrb5 coreutils gnugrep pcre.out gmp libiconv
416416 ]) ++
417417 (with pkgs.darwin; [ dyld ICU Libsystem locale ]);
@@ -533,7 +533,7 @@ in rec {
533533 gzip ncurses.out ncurses.dev ncurses.man gnused bash gawk
534534 gnugrep llvmPackages.clang-unwrapped llvmPackages.clang-unwrapped.lib patch pcre.out gettext
535535 binutils.bintools darwin.binutils darwin.binutils.bintools
536− curl.out openssl.out libssh2.out nghttp2.lib libkrb5
536+ curl.out brotli.lib openssl.out libssh2.out nghttp2.lib libkrb5
537537 cc.expand-response-params libxml2.out
538538 ]) ++ (with pkgs.darwin; [
539539 dyld Libsystem CF cctools ICU libiconv locale libtapi
pkgs/stdenv/darwin/make-bootstrap-tools.nix+1−1
@@ -18,7 +18,7 @@ in rec {
1818 bzip2_ = bzip2.override (args: { linkStatic = true; });
1919
2020 # Avoid messing with libkrb5 and libnghttp2.
21− curl_ = curl.override (args: { gssSupport = false; http2Support = false; });
21+ curl_ = curlMinimal.override (args: { gssSupport = false; http2Support = false; });
2222
2323 build = stdenv.mkDerivation {
2424 name = "stdenv-bootstrap-tools";
pkgs/stdenv/generic/make-derivation.nix+1
@@ -251,6 +251,7 @@ in rec {
251251 lib.optional (!stdenv.hostPlatform.isRedox) stdenv.hostPlatform.uname.system)}"]
252252 ++ lib.optional (stdenv.hostPlatform.uname.processor != null) "-DCMAKE_SYSTEM_PROCESSOR=${stdenv.hostPlatform.uname.processor}"
253253 ++ lib.optional (stdenv.hostPlatform.uname.release != null) "-DCMAKE_SYSTEM_VERSION=${stdenv.hostPlatform.release}"
254+ ++ lib.optional (stdenv.hostPlatform.isDarwin) "-DCMAKE_OSX_ARCHITECTURES=${stdenv.hostPlatform.darwinArch}"
254255 ++ lib.optional (stdenv.buildPlatform.uname.system != null) "-DCMAKE_HOST_SYSTEM_NAME=${stdenv.buildPlatform.uname.system}"
255256 ++ lib.optional (stdenv.buildPlatform.uname.processor != null) "-DCMAKE_HOST_SYSTEM_PROCESSOR=${stdenv.buildPlatform.uname.processor}"
256257 ++ lib.optional (stdenv.buildPlatform.uname.release != null) "-DCMAKE_HOST_SYSTEM_VERSION=${stdenv.buildPlatform.uname.release}";
pkgs/tools/archivers/zpaq/default.nix+1−2
@@ -11,8 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "0v44rlg9gvwc4ggr2lhcqll8ppal3dk7zsg5bqwcc5lg3ynk2pz4";
1212 };
1313
14− nativeBuildInputs = [ perl /* for pod2man */ ];
15− buildInputs = [ unzip ];
14+ nativeBuildInputs = [ perl /* for pod2man */ unzip ];
1615
1716 preBuild = let
1817 CPPFLAGS = with stdenv; ""
pkgs/tools/archivers/zpaq/zpaqd.nix+1−1
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
2424
2525 sourceRoot = ".";
2626
27− buildInputs = [ unzip ];
27+ nativeBuildInputs = [ unzip ];
2828
2929 buildPhase = ''
3030 g++ ${compileFlags} -fPIC --shared libzpaq.cpp -o libzpaq.so
pkgs/tools/cd-dvd/uif2iso/default.nix+2−1
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
99 sha256 = "1v18fmlzhkkhv8xdc9dyvl8vamwg3ka4dsrg7vvmk1f2iczdx3dp";
1010 };
1111
12− buildInputs = [unzip zlib];
12+ nativeBuildInputs = [ unzip ];
13+ buildInputs = [zlib];
1314
1415 installPhase = ''
1516 make -C . prefix="$out" install;
pkgs/tools/compression/bzip2/default.nix+4−2
@@ -10,7 +10,7 @@
1010
1111stdenv.mkDerivation rec {
1212 pname = "bzip2";
13− version = "1.0.6.0.1";
13+ version = "1.0.6.0.2";
1414
1515 /* We use versions patched to use autotools style properly,
1616 saving lots of trouble. */
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
2323 "ftp://ftp.mplayerhq.hu/pub/linux/suse"
2424 "http://ftp.suse.com/pub" # the original patched version but slow
2525 ];
26− sha256 = "0b5b5p8c7bslc6fslcr1nj9136412v3qcvbg6yxi9argq9g72v8c";
26+ sha256 = "sha256-FnhwNy4OHe8d5M6iYCClkxzcB/EHXg0veXwv43ZlxbA=";
2727 };
2828
2929 nativeBuildInputs = [ autoreconfHook ];
@@ -46,6 +46,8 @@ stdenv.mkDerivation rec {
4646
4747 meta = with lib; {
4848 description = "High-quality data compression program";
49+ homepage = "https://www.sourceware.org/bzip2";
50+ changelog = "https://sourceware.org/git/?p=bzip2.git;a=blob;f=CHANGES;hb=HEAD";
4951 license = licenses.bsdOriginal;
5052 platforms = platforms.all;
5153 maintainers = with maintainers; [ mic92 ];
pkgs/tools/graphics/fgallery/default.nix+2−2
@@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
1616 sha256 = "18wlvqbxcng8pawimbc8f2422s8fnk840hfr6946lzsxr0ijakvf";
1717 };
1818
19− nativeBuildInputs = [ makeWrapper ];
20− buildInputs = [ unzip ] ++ (with perlPackages; [ perl ImageExifTool CpanelJSONXS ]);
19+ nativeBuildInputs = [ makeWrapper unzip ];
20+ buildInputs = (with perlPackages; [ perl ImageExifTool CpanelJSONXS ]);
2121
2222 installPhase = ''
2323 mkdir -p "$out/bin"
pkgs/tools/graphics/pdfread/default.nix+2−2
@@ -13,8 +13,8 @@ stdenv.mkDerivation {
1313 sha256 = "0mzxpnk97f0ww5ds7h4wsval3g4lnrhv6rhspjs7cy4i41gmk8an";
1414 };
1515
16− nativeBuildInputs = [ makeWrapper ];
17− buildInputs = [ unzip python ];
16+ nativeBuildInputs = [ makeWrapper unzip ];
17+ buildInputs = [ python ];
1818
1919 broken = true; # Not found.
2020
pkgs/tools/graphics/structure-synth/default.nix+2−2
@@ -10,8 +10,8 @@ stdenv.mkDerivation {
1010 sha256 = "1kiammx46719az6jzrav8yrwz82nk4m72ybj0kpbnvp9wfl3swbb";
1111 };
1212
13− buildInputs = [ qt4 unzip libGLU ];
14− nativeBuildInputs = [ qmake4Hook makeWrapper ];
13+ buildInputs = [ qt4 libGLU ];
14+ nativeBuildInputs = [ qmake4Hook makeWrapper unzip ];
1515
1616 # Thanks to https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=672000#15:
1717 patches = [ ./gcc47.patch ];
pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix+1−1
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
1717 maintainers = [ maintainers.gebner ];
1818 };
1919
20− buildInputs = [ unzip ];
20+ nativeBuildInputs = [ unzip ];
2121
2222 makeFlags = [ "installpath=$(out)/share/tegaki/models/zinnia/" ];
2323}
pkgs/tools/misc/debian-devscripts/default.nix+2−2
@@ -16,8 +16,8 @@ in stdenv.mkDerivation rec {
1616 sha256 = "0xy1nvqrnifx46g8ch69pk31by0va6hn10wpi1fkrsrgncanjjh1";
1717 };
1818
19− nativeBuildInputs = [ makeWrapper ];
20− buildInputs = [ unzip xz dpkg libxslt python setuptools curl gnupg diffutils ] ++
19+ nativeBuildInputs = [ makeWrapper unzip ];
20+ buildInputs = [ xz dpkg libxslt python setuptools curl gnupg diffutils ] ++
2121 (with perlPackages; [ perl CryptSSLeay LWP TimeDate DBFile FileDesktopEntry ParseDebControl LWPProtocolHttps ]);
2222
2323 preConfigure = ''
pkgs/tools/misc/ent/default.nix+1−1
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
1212 # case that happens when the archive doesn't have a subdirectory.
1313 setSourceRoot = "sourceRoot=`pwd`";
1414
15− buildInputs = [ unzip ];
15+ nativeBuildInputs = [ unzip ];
1616
1717 buildFlags = lib.optional stdenv.cc.isClang "CC=clang";
1818
pkgs/tools/misc/gams/default.nix+2−1
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
1010 sha256 = "4f95389579f33ff7c2586838a2c19021aa0746279555cbb51aa6e0efd09bd297";
1111 };
1212 unpackCmd = "unzip $src";
13− buildInputs = [ unzip file ];
13+ nativeBuildInputs = [ unzip ];
14+ buildInputs = [ file ];
1415 dontBuild = true;
1516
1617 installPhase = ''
pkgs/tools/misc/graylog/plugins.nix+1−1
@@ -15,7 +15,7 @@ let
1515 stdenv.mkDerivation (a // {
1616 inherit installPhase;
1717 dontUnpack = true;
18− buildInputs = [ unzip ];
18+ nativeBuildInputs = [ unzip ];
1919 meta = a.meta // {
2020 platforms = graylog.meta.platforms;
2121 maintainers = (a.meta.maintainers or []) ++ [ maintainers.fadenb ];
pkgs/tools/misc/jdiskreport/default.nix+1−2
@@ -18,8 +18,7 @@ stdenv.mkDerivation {
1818 sha256 = "0d5mzkwsbh9s9b1vyvpaawqc09b0q41l2a7pmwf7386b1fsx6d58";
1919 };
2020
21− nativeBuildInputs = [ copyDesktopItems ];
22− buildInputs = [ unzip ];
21+ nativeBuildInputs = [ copyDesktopItems unzip ];
2322 inherit jre;
2423
2524 installPhase = ''
pkgs/tools/misc/mc/default.nix+1−2
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
2727 sha256 = "sha256-xt6txQWV8tmiLcbCmanyizk+NYNG6/bKREqEadwWbCc=";
2828 };
2929
30− nativeBuildInputs = [ pkg-config autoreconfHook ];
30+ nativeBuildInputs = [ pkg-config autoreconfHook unzip ];
3131
3232 buildInputs = [
3333 file
@@ -39,7 +39,6 @@ stdenv.mkDerivation rec {
3939 openssl
4040 perl
4141 slang
42− unzip
4342 zip
4443 ] ++ lib.optionals (!stdenv.isDarwin) [ e2fsprogs gpm ];
4544
pkgs/tools/misc/megacli/default.nix+2−1
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
99 sha256 = "1sdn58fbmd3fj4nzbajq3gcyw71ilgdh45r5p4sa6xmb7np55cfr";
1010 };
1111
12− buildInputs = [rpmextract ncurses5 unzip];
12+ nativeBuildInputs = [ unzip ];
13+ buildInputs = [rpmextract ncurses5];
1314 libPath =
1415 lib.makeLibraryPath
1516 [ stdenv.cc.cc stdenv.cc.libc ncurses5 ];
pkgs/tools/misc/phoronix-test-suite/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "phoronix-test-suite";
5− version = "10.2.1";
5+ version = "10.2.2";
66
77 src = fetchurl {
88 url = "https://phoronix-test-suite.com/releases/${pname}-${version}.tar.gz";
9− sha256 = "sha256-2HB4TPbyG+cTY6O1k0tRPrnKyg41SYnVM919Hii3gpg=";
9+ sha256 = "sha256-g5hUmsn01Msopxzmi/G4LcZISXMD2wFqreaHMkFzF1Y=";
1010 };
1111
1212 buildInputs = [ php ];
pkgs/tools/misc/thin-provisioning-tools/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, autoreconfHook, expat, libaio, boost, binutils }:
1+{ lib, stdenv, fetchFromGitHub, autoreconfHook, expat, libaio, boost }:
22
33stdenv.mkDerivation rec {
44 pname = "thin-provisioning-tools";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313
1414 nativeBuildInputs = [ autoreconfHook ];
1515
16− buildInputs = [ expat libaio boost binutils ];
16+ buildInputs = [ expat libaio boost ];
1717
1818 enableParallelBuilding = true;
1919
pkgs/tools/misc/umlet/default.nix+1−1
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "0jfyxjxsjx29xhs3fl0f574nyncmk9j5jp8zlgd401mcaznn9c7l";
1212 };
1313
14− buildInputs = [ unzip ];
14+ nativeBuildInputs = [ unzip ];
1515
1616 installPhase = ''
1717 mkdir -p "$out/bin"
pkgs/tools/misc/vorbisgain/default.nix+2−1
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
1010
1111 hardeningDisable = [ "format" ];
1212
13− buildInputs = [ unzip libogg libvorbis ];
13+ nativeBuildInputs = [ unzip ];
14+ buildInputs = [ libogg libvorbis ];
1415
1516 patchPhase = ''
1617 chmod -v +x configure
pkgs/tools/networking/dd-agent/5.nix+1−1
@@ -50,8 +50,8 @@ in stdenv.mkDerivation rec {
5050
5151 patches = [ ./40103-iostat-fix.patch ];
5252
53+ nativeBuildInputs = [ unzip ];
5354 buildInputs = [
54− unzip
5555 makeWrapper
5656 ] ++ (with python'.pkgs; [
5757 requests
pkgs/tools/networking/p2p/azureus/default.nix+1−1
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
77 url = "http://tarballs.nixos.org/Azureus2.3.0.6.jar";
88 sha256 = "1hwrh3n0b0jbpsdk15zrs7pw175418phhmg6pn4xi1bvilxq1wrd";
99 };
10−# buildInputs = [unzip];
10+
1111 inherit jdk swt;
1212
1313 meta = {
pkgs/tools/security/bmrsa/11.nix+1−1
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "0ksd9xkvm9lkvj4yl5sl0zmydp1wn3xhc55b28gj70gi4k75kcl4";
1010 };
1111
12− buildInputs = [ unzip ];
12+ nativeBuildInputs = [ unzip ];
1313
1414 unpackPhase = ''
1515 mkdir bmrsa
pkgs/tools/security/chntpw/default.nix+2−2
@@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
1010 sha256 = "1k1cxsj0221dpsqi5yibq2hr7n8xywnicl8yyaicn91y8h2hkqln";
1111 };
1212
13− buildInputs = [ unzip ]
14− ++ lib.optionals stdenv.isLinux [ stdenv.glibc.out stdenv.glibc.static ];
13+ nativeBuildInputs = [ unzip ];
14+ buildInputs = lib.optionals stdenv.isLinux [ stdenv.glibc.out stdenv.glibc.static ];
1515
1616 patches = [
1717 ./00-chntpw-build-arch-autodetect.patch
pkgs/tools/security/pcsc-scm-scl011/default.nix+1−1
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414 sha256 = "0ik26sxgqgsqplksl87z61vwmx51k7plaqmrkdid7xidgfhfxr42";
1515 };
1616
17− buildInputs = [ unzip ];
17+ nativeBuildInputs = [ unzip ];
1818
1919 unpackPhase = ''
2020 unzip $src
pkgs/tools/security/pinentry/mac.nix+6
@@ -14,6 +14,12 @@ stdenv.mkDerivation {
1414 nativeBuildInputs = [ xcbuildHook ];
1515 buildInputs = [ libiconv ncurses Cocoa ];
1616
17+ preBuild = ''
18+ # Only build for what we care about (also allows arm64)
19+ substituteInPlace pinentry-mac.xcodeproj/project.pbxproj \
20+ --replace "i386 x86_64 ppc" "${stdenv.targetPlatform.darwinArch}"
21+ '';
22+
1723 installPhase = ''
1824 mkdir -p $out/Applications
1925 mv Products/Release/pinentry-mac.app $out/Applications
pkgs/tools/security/rarcrack/default.nix+2−1
@@ -11,7 +11,8 @@ stdenv.mkDerivation {
1111 sha256 = "134fq84896w5vp8vg4qg0ybpb466njibigyd7bqqm1xydr07qrgn";
1212 };
1313
14− buildInputs = [ libxml2 file p7zip unrar unzip ];
14+ nativeBuildInputs = [ unzip ];
15+ buildInputs = [ libxml2 file p7zip unrar ];
1516 buildFlags = lib.optional stdenv.cc.isClang "CC=clang";
1617 installFlags = [ "PREFIX=\${out}" ];
1718
pkgs/tools/security/sonar-scanner-cli/default.nix+1−1
@@ -21,7 +21,7 @@ in stdenv.mkDerivation rec {
2121
2222 src = fetchurl sonarScannerArchPackage.${stdenv.hostPlatform.system};
2323
24− buildInputs = [ unzip ];
24+ nativeBuildInputs = [ unzip ];
2525
2626 installPhase = ''
2727 mkdir -p $out/lib
pkgs/tools/text/xml/basex/default.nix+2−1
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
99 hash = "sha256-IZhRg2JcYQXQKU/lYZpLLcsSdjZZO+toY5yvk+RKUCY=";
1010 };
1111
12− buildInputs = [ unzip jre ];
12+ nativeBuildInputs = [ unzip ];
13+ buildInputs = [ jre ];
1314
1415 desktopItem = makeDesktopItem {
1516 name = "basex";
pkgs/tools/typesetting/tex/lkproof/default.nix+1−1
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
88 sha256 = "1qjkjhpc4rm62qxn18r83zdlwnj1wvnkcpdiqlv7w4bakh0gvjly";
99 };
1010
11− buildInputs = [ unzip ];
11+ nativeBuildInputs = [ unzip ];
1212
1313 installPhase = "
1414 mkdir -p $out/share/texmf-nix/tex/generic/lkproof
pkgs/tools/typesetting/tex/pgf/3.x.nix+1−1
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
88 sha256 = "0kj769hyp4z2zmdv3f8xv443wcfqn5nkkbzxzqgfxjizlz81aav7";
99 };
1010
11− buildInputs = [ unzip ];
11+ nativeBuildInputs = [ unzip ];
1212
1313 # Multiple files problem
1414 unpackPhase = ''
pkgs/tools/typesetting/tex/pgfplots/default.nix+1−1
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
88 sha256 = "1xajrmq35i0qlsfwydy5zzg6f1jg88hqqh5b3xsmglzrarnllbdi";
99 };
1010
11− buildInputs = [ unzip ];
11+ nativeBuildInputs = [ unzip ];
1212
1313 unpackPhase = "unzip $src";
1414
pkgs/tools/virtualization/ec2-ami-tools/default.nix+1−2
@@ -5,8 +5,7 @@ stdenv.mkDerivation rec {
55
66 version = "1.5.7";
77
8− nativeBuildInputs = [ makeWrapper ];
9− buildInputs = [ unzip ];
8+ nativeBuildInputs = [ makeWrapper unzip ];
109
1110 src = fetchurl {
1211 url = "https://s3.amazonaws.com/ec2-downloads/${pname}-${version}.zip";
pkgs/tools/virtualization/ec2-api-tools/default.nix+1−2
@@ -8,8 +8,7 @@ stdenv.mkDerivation rec {
88 sha256 = "0figmvcm82ghmpz3018ihysz8zpxpysgbpdx7rmciq9y80qbw6l5";
99 };
1010
11− nativeBuildInputs = [ makeWrapper ];
12− buildInputs = [ unzip ];
11+ nativeBuildInputs = [ makeWrapper unzip ];
1312
1413 installPhase =
1514 ''
pkgs/top-level/all-packages.nix+19−11
@@ -420,7 +420,7 @@ in
420420 else makeOverridable (import ../build-support/fetchurl) {
421421 inherit lib stdenvNoCC buildPackages;
422422 inherit cacert;
423− curl = buildPackages.curl.override (old: rec {
423+ curl = buildPackages.curlMinimal.override (old: rec {
424424 # break dependency cycles
425425 fetchurl = stdenv.fetchurlBoot;
426426 zlib = buildPackages.zlib.override { fetchurl = stdenv.fetchurlBoot; };
@@ -3562,13 +3562,16 @@ in
35623562 cutensor = cutensor_cudatoolkit_10;
35633563
35643564 curlFull = curl.override {
3565− idnSupport = true;
35663565 ldapSupport = true;
3566+ };
3567+
3568+ curl = curlMinimal.override {
3569+ idnSupport = true;
35673570 gssSupport = true;
35683571 brotliSupport = true;
35693572 };
35703573
3571− curl = callPackage ../tools/networking/curl { };
3574+ curlMinimal = callPackage ../tools/networking/curl { };
35723575
35733576 curl_unix_socket = callPackage ../tools/networking/curl-unix-socket { };
35743577
@@ -6104,6 +6107,8 @@ in
61046107
61056108 libqmi = callPackage ../development/libraries/libqmi { };
61066109
6110+ libqrtr-glib = callPackage ../development/libraries/libqrtr-glib { };
6111+
61076112 libmbim = callPackage ../development/libraries/libmbim { };
61086113
61096114 libmongo-client = callPackage ../development/libraries/libmongo-client { };
@@ -7230,7 +7235,7 @@ in
72307235
72317236 pinentry_mac = callPackage ../tools/security/pinentry/mac.nix {
72327237 inherit (darwin.apple_sdk.frameworks) Cocoa;
7233− xcbuildHook = xcbuild6Hook;
7238+ xcbuildHook = if stdenv.targetPlatform.isAarch64 then xcbuildHook else xcbuild6Hook;
72347239 };
72357240
72367241 pingtcp = callPackage ../tools/networking/pingtcp { };
@@ -10954,14 +10959,14 @@ in
1095410959 rust_1_45 = callPackage ../development/compilers/rust/1_45.nix {
1095510960 inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
1095610961 };
10957− rust_1_49 = callPackage ../development/compilers/rust/1_49.nix {
10962+ rust_1_50 = callPackage ../development/compilers/rust/1_50.nix {
1095810963 inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
1095910964 };
10960− rust = rust_1_49;
10965+ rust = rust_1_50;
1096110966
1096210967 rustPackages_1_45 = rust_1_45.packages.stable;
10963− rustPackages_1_49 = rust_1_49.packages.stable;
10964− rustPackages = rustPackages_1_49;
10968+ rustPackages_1_50 = rust_1_50.packages.stable;
10969+ rustPackages = rustPackages_1_50;
1096510970
1096610971 inherit (rustPackages) cargo clippy rustc rustPlatform;
1096710972
@@ -11726,13 +11731,15 @@ in
1172611731 bison = buildPackages.bison_3_5;
1172711732 })
1172811733 ruby_2_6
11729− ruby_2_7;
11734+ ruby_2_7
11735+ ruby_3_0;
1173011736
1173111737 ruby = ruby_2_6;
1173211738 rubyPackages = rubyPackages_2_6;
1173311739
1173411740 rubyPackages_2_6 = recurseIntoAttrs ruby_2_6.gems;
1173511741 rubyPackages_2_7 = recurseIntoAttrs ruby_2_7.gems;
11742+ rubyPackages_3_0 = recurseIntoAttrs ruby_3_0.gems;
1173611743
1173711744 mruby = callPackage ../development/compilers/mruby { };
1173811745
@@ -16262,7 +16269,7 @@ in
1626216269
1626316270 newman = callPackage ../development/web/newman {};
1626416271
16265− newt = callPackage ../development/libraries/newt { };
16272+ newt = callPackage ../development/libraries/newt { python = python3; };
1626616273
1626716274 nghttp2 = callPackage ../development/libraries/nghttp2 { };
1626816275 libnghttp2 = nghttp2.lib;
@@ -16594,8 +16601,9 @@ in
1659416601 python = python37;
1659516602 };
1659616603
16597− protobuf = protobuf3_14;
16604+ protobuf = protobuf3_15;
1659816605
16606+ protobuf3_15 = callPackage ../development/libraries/protobuf/3.15.nix { };
1659916607 protobuf3_14 = callPackage ../development/libraries/protobuf/3.14.nix { };
1660016608 protobuf3_13 = callPackage ../development/libraries/protobuf/3.13.nix { };
1660116609 protobuf3_12 = callPackage ../development/libraries/protobuf/3.12.nix { };
pkgs/top-level/dotnet-packages.nix+1−1
@@ -897,7 +897,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
897897 sha256 = "07r63xam6icm17pf6amh1qkmna13nxa3ncdan7a3ql307i5isriz";
898898 };
899899
900− buildInputs = [ unzip ];
900+ nativeBuildInputs = [ unzip ];
901901
902902 phases = [ "unpackPhase" "installPhase" ];
903903
pkgs/top-level/python-packages.nix+36−5
@@ -124,6 +124,16 @@ in {
124124 venvShellHook
125125 wheelUnpackHook;
126126
127+ # Not all packages are compatible with the latest pytest yet.
128+ # We need to override the hook to select an older pytest, however,
129+ # it should not override the version of pytest that is used for say
130+ # Python 2. This is an ugly hack that is needed now because the hook
131+ # propagates the package.
132+ pytestCheckHook_6_1 = if isPy3k then
133+ self.pytestCheckHook.override { pytest = self.pytest_6_1; }
134+ else
135+ self.pytestCheckHook;
136+
127137 # helpers
128138
129139 # We use build packages because we are making a setup hook to be used as a
@@ -250,7 +260,9 @@ in {
250260
251261 aiohomekit = callPackage ../development/python-modules/aiohomekit { };
252262
253− aiohttp = callPackage ../development/python-modules/aiohttp { };
263+ aiohttp = callPackage ../development/python-modules/aiohttp {
264+ pytestCheckHook = self.pytestCheckHook_6_1;
265+ };
254266
255267 aiohttp-cors = callPackage ../development/python-modules/aiohttp-cors { };
256268
@@ -536,7 +548,9 @@ in {
536548
537549 async-timeout = callPackage ../development/python-modules/async_timeout { };
538550
539− async-upnp-client = callPackage ../development/python-modules/async-upnp-client { };
551+ async-upnp-client = callPackage ../development/python-modules/async-upnp-client {
552+ pytestCheckHook = self.pytestCheckHook_6_1;
553+ };
540554
541555 asyncwhois = callPackage ../development/python-modules/asyncwhois { };
542556
@@ -6369,6 +6383,14 @@ in {
63696383 };
63706384 };
63716385
6386+ pytest_6_1 = self.pytest_6.overridePythonAttrs (oldAttrs: rec {
6387+ version = "6.1.2";
6388+ src = oldAttrs.src.override {
6389+ inherit version;
6390+ sha256 = "c0a7e94a8cdbc5422a51ccdad8e6f1024795939cc89159a0ae7f0b316ad3823e";
6391+ };
6392+ });
6393+
63726394 pytest-aiohttp = callPackage ../development/python-modules/pytest-aiohttp { };
63736395
63746396 pytest-annotate = callPackage ../development/python-modules/pytest-annotate { };
@@ -8330,7 +8352,9 @@ in {
83308352
83318353 trimesh = callPackage ../development/python-modules/trimesh { };
83328354
8333− trio = callPackage ../development/python-modules/trio { };
8355+ trio = callPackage ../development/python-modules/trio {
8356+ pytestCheckHook = self.pytestCheckHook_6_1;
8357+ };
83348358
83358359 trollius = callPackage ../development/python-modules/trollius { };
83368360
@@ -8521,7 +8545,12 @@ in {
85218545
85228546 urlgrabber = callPackage ../development/python-modules/urlgrabber { };
85238547
8524− urllib3 = callPackage ../development/python-modules/urllib3 { };
8548+ urllib3 = if isPy3k then
8549+ callPackage ../development/python-modules/urllib3 {
8550+ pytestCheckHook = self.pytestCheckHook_6_1;
8551+ }
8552+ else
8553+ callPackage ../development/python-modules/urllib3/2.nix { };
85258554
85268555 urwid = callPackage ../development/python-modules/urwid { };
85278556
@@ -8722,7 +8751,9 @@ in {
87228751
87238752 webthing = callPackage ../development/python-modules/webthing { };
87248753
8725− werkzeug = callPackage ../development/python-modules/werkzeug { };
8754+ werkzeug = callPackage ../development/python-modules/werkzeug {
8755+ pytestCheckHook = self.pytestCheckHook_6_1;
8756+ };
87268757
87278758 west = callPackage ../development/python-modules/west { };
87288759