git.iko.soy/typeable/nixpkgs
on master help sign in
Merge staging-next into master
commit2fcb11a2442b27834db87b2f62511037c31b5e36 authorFrederik Rietdijk <freddyrietdijk@fridh.nl> dateFri 1 Mar 2019, 09:06 (8 years ago) parent456ff62fc4a8f6
682 files changed+2751−1768
doc/languages-frameworks/python.section.md+18−4 nixos/doc/manual/release-notes/rl-1903.xml+14 nixos/modules/services/x11/desktop-managers/xfce.nix+1−1 nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix+4−4 pkgs/applications/audio/audacious/default.nix+1−1 pkgs/applications/audio/cozy-audiobooks/default.nix+1−1 pkgs/applications/audio/easytag/default.nix+1−1 pkgs/applications/audio/gpodder/default.nix+1−1 pkgs/applications/audio/gtklick/default.nix+1−1 pkgs/applications/audio/gtkpod/default.nix+1−1 pkgs/applications/audio/lollypop/default.nix+1 pkgs/applications/audio/pavucontrol/default.nix+1−1 pkgs/applications/audio/picard/default.nix+1−1 pkgs/applications/audio/quodlibet/default.nix+1−1 pkgs/applications/audio/rhythmbox/default.nix+1−1 pkgs/applications/audio/sonata/default.nix+1−1 pkgs/applications/audio/sound-juicer/default.nix+1−1 pkgs/applications/editors/bluefish/default.nix+1−1 pkgs/applications/editors/gnome-latex/default.nix+3−3 pkgs/applications/graphics/avocode/default.nix+1−1 pkgs/applications/graphics/dosage/default.nix+1−1 pkgs/applications/graphics/gthumb/default.nix+4−3 pkgs/applications/graphics/shotwell/default.nix+1−1 pkgs/applications/graphics/synfigstudio/default.nix+2−2 pkgs/applications/graphics/vimiv/default.nix+2−2 pkgs/applications/misc/electrum/ltc.nix+3−1 pkgs/applications/misc/font-manager/default.nix+1−1 pkgs/applications/misc/gnome-recipes/default.nix+2−2 pkgs/applications/misc/gnome-usage/default.nix+1−1 pkgs/applications/misc/gummi/default.nix+1−1 pkgs/applications/misc/hamster-time-tracker/default.nix+2−2 pkgs/applications/misc/kitty/default.nix+3−3 pkgs/applications/misc/octoprint/default.nix+8−3 pkgs/applications/misc/pcmanfm/default.nix+1−1 pkgs/applications/misc/safeeyes/default.nix+1−1 pkgs/applications/misc/tootle/default.nix+2−2 pkgs/applications/networking/browsers/brave/default.nix+1−1 pkgs/applications/networking/browsers/chromium/default.nix+1−1 pkgs/applications/networking/browsers/eolie/default.nix+1 pkgs/applications/networking/browsers/firefox-bin/default.nix+2−2 pkgs/applications/networking/browsers/firefox/wrapper.nix+1−1 pkgs/applications/networking/browsers/google-chrome/default.nix+1−1 pkgs/applications/networking/browsers/midori/default.nix+2−2 pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix+2−2 pkgs/applications/networking/feedreaders/feedreader/default.nix+6−7 pkgs/applications/networking/ftp/taxi/default.nix+2−2 pkgs/applications/networking/instant-messengers/coyim/default.nix+2−2 pkgs/applications/networking/instant-messengers/dino/default.nix+3−3 pkgs/applications/networking/instant-messengers/ekiga/default.nix+1−1 pkgs/applications/networking/instant-messengers/gajim/default.nix+2−2 pkgs/applications/networking/mailreaders/astroid/default.nix+7−4 pkgs/applications/networking/mailreaders/mailnag/default.nix+3−2 pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix+2−2 pkgs/applications/networking/mailreaders/thunderbird/default.nix+1−1 pkgs/applications/networking/remote/remmina/default.nix+2−2 pkgs/applications/networking/weather/meteo/default.nix+5−1 pkgs/applications/office/abiword/default.nix+2−2 pkgs/applications/office/gnumeric/default.nix+1−1 pkgs/applications/office/grisbi/default.nix+1−1 pkgs/applications/office/homebank/default.nix+1−1 pkgs/applications/office/libreoffice/default.nix+2−2 pkgs/applications/office/libreoffice/still.nix+2−2 pkgs/applications/office/paperwork/default.nix+4−4 pkgs/applications/office/tryton/default.nix+1−1 pkgs/applications/science/math/nasc/default.nix+4−2 pkgs/applications/science/math/wxmaxima/default.nix+1−1 pkgs/applications/science/spyder/default.nix+32−10 pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix+2 pkgs/applications/version-management/meld/default.nix+1−1 pkgs/applications/video/pitivi/default.nix+1−1 pkgs/applications/video/screenkey/default.nix+2−2 pkgs/applications/virtualization/open-vm-tools/default.nix+2−2 pkgs/applications/virtualization/virt-manager/default.nix+1−1 pkgs/build-support/build-fhs-userenv/env.nix+1 pkgs/build-support/buildenv/builder.pl+12 pkgs/build-support/buildenv/default.nix+10−2 pkgs/build-support/substitute-files/substitute-all-files.nix+1 pkgs/build-support/substitute/substitute-all.nix+1 pkgs/desktops/gnome-3/apps/accerciser/default.nix+1−1 pkgs/desktops/gnome-3/apps/evolution/default.nix+11−9 pkgs/desktops/gnome-3/apps/file-roller/default.nix+2−2 pkgs/desktops/gnome-3/apps/gedit/default.nix+5−4 pkgs/desktops/gnome-3/apps/ghex/default.nix+9−6 pkgs/desktops/gnome-3/apps/glade/default.nix+1−1 pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix+1−1 pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix+3−3 pkgs/desktops/gnome-3/apps/gnome-characters/default.nix+4−4 pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix+3−2 pkgs/desktops/gnome-3/apps/gnome-documents/default.nix+1−1 pkgs/desktops/gnome-3/apps/gnome-logs/default.nix+1−1 pkgs/desktops/gnome-3/apps/gnome-maps/default.nix+1−1 pkgs/desktops/gnome-3/apps/gnome-music/default.nix+2−2 pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix+1−1 pkgs/desktops/gnome-3/apps/gnome-notes/default.nix+1−1 pkgs/desktops/gnome-3/apps/gnome-photos/default.nix+1−1 pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix+1−1 pkgs/desktops/gnome-3/apps/gnome-todo/default.nix+5−5 pkgs/desktops/gnome-3/apps/gnome-weather/default.nix+1−1 pkgs/desktops/gnome-3/apps/seahorse/default.nix+1−1 pkgs/desktops/gnome-3/apps/vinagre/default.nix+1−1 pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix+2−2 pkgs/desktops/gnome-3/core/baobab/default.nix+1−1 pkgs/desktops/gnome-3/core/caribou/default.nix+2−2 pkgs/desktops/gnome-3/core/dconf/default.nix+10−1 pkgs/desktops/gnome-3/core/empathy/default.nix+1−1 pkgs/desktops/gnome-3/core/epiphany/default.nix+3−3 pkgs/desktops/gnome-3/core/evince/default.nix+6−5 pkgs/desktops/gnome-3/core/evolution-data-server/default.nix+4−3 pkgs/desktops/gnome-3/core/gdm/default.nix+2−2 pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix+1−1 pkgs/desktops/gnome-3/core/gnome-calculator/default.nix+1−1 pkgs/desktops/gnome-3/core/gnome-contacts/default.nix+1−1 pkgs/desktops/gnome-3/core/gnome-control-center/default.nix+7−4 pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix+2−2 pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix+11−7 pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix+9−6 pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix+3−3 pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix+16−10 pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix+1−1 pkgs/desktops/gnome-3/core/gnome-session/default.nix+2−2 pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix+5−5 pkgs/desktops/gnome-3/core/gnome-shell/default.nix+10−9 pkgs/desktops/gnome-3/core/gnome-software/default.nix+3−2 pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix+1−1 pkgs/desktops/gnome-3/core/gnome-terminal/default.nix+2−2 pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix+1−1 pkgs/desktops/gnome-3/core/gnome-user-share/default.nix+13−9 pkgs/desktops/gnome-3/core/grilo-plugins/default.nix+5−5 pkgs/desktops/gnome-3/core/gucharmap/default.nix+2−2 pkgs/desktops/gnome-3/core/mutter/3.28.nix+6−5 pkgs/desktops/gnome-3/core/mutter/default.nix+12−9 pkgs/desktops/gnome-3/core/nautilus/default.nix+2−2 pkgs/desktops/gnome-3/core/simple-scan/default.nix+3−3 pkgs/desktops/gnome-3/core/totem/default.nix+7−6 pkgs/desktops/gnome-3/core/tracker-miners/default.nix+3−3 pkgs/desktops/gnome-3/core/vino/default.nix+1−1 pkgs/desktops/gnome-3/core/yelp/default.nix+1−1 pkgs/desktops/gnome-3/core/zenity/default.nix+9−6 pkgs/desktops/gnome-3/default.nix+13−15 pkgs/desktops/gnome-3/devtools/devhelp/default.nix+1−1 pkgs/desktops/gnome-3/devtools/nemiver/default.nix+2−2 pkgs/desktops/gnome-3/games/atomix/default.nix+1−1 pkgs/desktops/gnome-3/games/five-or-more/default.nix+1−1 pkgs/desktops/gnome-3/games/four-in-a-row/default.nix+1−1 pkgs/desktops/gnome-3/games/gnome-chess/default.nix+1−1 pkgs/desktops/gnome-3/games/gnome-klotski/default.nix+1−1 pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix+1−1 pkgs/desktops/gnome-3/games/gnome-mines/default.nix+1−1 pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix+1−1 pkgs/desktops/gnome-3/games/gnome-robots/default.nix+1−1 pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix+2−2 pkgs/desktops/gnome-3/games/gnome-taquin/default.nix+1−1 pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix+1−1 pkgs/desktops/gnome-3/games/hitori/default.nix+1−1 pkgs/desktops/gnome-3/games/iagno/default.nix+1−1 pkgs/desktops/gnome-3/games/lightsoff/default.nix+1−1 pkgs/desktops/gnome-3/games/quadrapassel/default.nix+1−1 pkgs/desktops/gnome-3/games/swell-foop/default.nix+1−1 pkgs/desktops/gnome-3/games/tali/default.nix+1−1 pkgs/desktops/gnome-3/misc/gitg/default.nix+4−3 pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix+2−2 pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix+2−2 pkgs/desktops/gnome-3/misc/gnome-panel/default.nix+2−2 pkgs/desktops/gnome-3/misc/gnome-screensaver/default.nix+2−2 pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix+1−1 pkgs/desktops/gnome-3/misc/metacity/default.nix+2−2 pkgs/desktops/gnome-3/misc/pomodoro/default.nix+1−1 pkgs/desktops/mate/pluma/default.nix+1−1 pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix+5−4 pkgs/development/compilers/llvm/4/libc++/default.nix−5 pkgs/development/compilers/llvm/4/libc++/libc++.a−1 pkgs/development/compilers/llvm/5/libc++/default.nix−5 pkgs/development/compilers/llvm/5/libc++/libc++.a−1 pkgs/development/compilers/llvm/6/libc++/default.nix−5 pkgs/development/compilers/llvm/6/libc++/libc++.a−1 pkgs/development/compilers/llvm/7/libc++/default.nix−5 pkgs/development/compilers/llvm/7/libc++/libc++.a−1 pkgs/development/compilers/nasm/default.nix+8−5 pkgs/development/haskell-modules/configuration-nix.nix+1−1 pkgs/development/haskell-modules/hackage-packages.nix+22−23 pkgs/development/interpreters/python/build-python-package-pyproject.nix+53 pkgs/development/interpreters/python/build-python-package.nix+3−1 pkgs/development/interpreters/python/mk-python-derivation.nix+5 pkgs/development/libraries/amtk/default.nix+2−2 pkgs/development/libraries/aravis/default.nix+1−1 pkgs/development/libraries/ffmpeg/4.nix+2−2 pkgs/development/libraries/fontconfig/make-fonts-cache.nix+1 pkgs/development/libraries/gegl/4.0.nix+2−2 pkgs/development/libraries/geocode-glib/default.nix+3−3 pkgs/development/libraries/gtk+/3.x.nix+9−9 pkgs/development/libraries/libdrm/default.nix+2−2 pkgs/development/libraries/libev/default.nix+2−2 pkgs/development/libraries/libgda/default.nix+2−2 pkgs/development/libraries/libgdata/default.nix+1−2 pkgs/development/libraries/libidn2/default.nix+2−2 pkgs/development/libraries/libpng/default.nix+1−2 pkgs/development/libraries/librsvg/default.nix+2−2 pkgs/development/libraries/libuv/default.nix+5−5 pkgs/development/libraries/mesa/default.nix+2−2 pkgs/development/libraries/mpfr/default.nix+6−3 pkgs/development/libraries/nghttp2/default.nix+2−2 pkgs/development/libraries/nss/default.nix+2−2 pkgs/development/libraries/openssl/default.nix+2−2 pkgs/development/libraries/osm-gps-map/default.nix+3−4 pkgs/development/libraries/wayland/default.nix+2 pkgs/development/python-modules/Cython/default.nix+2−2 pkgs/development/python-modules/Mako/default.nix+3−3 pkgs/development/python-modules/Pygments/default.nix+2−2 pkgs/development/python-modules/Wand/default.nix+2−2 pkgs/development/python-modules/WazeRouteCalculator/default.nix+2−2 pkgs/development/python-modules/XlsxWriter/default.nix+2−2 pkgs/development/python-modules/absl-py/default.nix+2−2 pkgs/development/python-modules/adal/default.nix+2−2 pkgs/development/python-modules/aioconsole/default.nix+2−2 pkgs/development/python-modules/aiodns/default.nix+4−5 pkgs/development/python-modules/aiohue/default.nix+2−2 pkgs/development/python-modules/alembic/default.nix+2−2 pkgs/development/python-modules/alerta-server/default.nix+6−4 pkgs/development/python-modules/alerta/default.nix+6−4 pkgs/development/python-modules/altair/default.nix+7−8 pkgs/development/python-modules/amqp/default.nix+2−2 pkgs/development/python-modules/androguard/default.nix+2−2 pkgs/development/python-modules/apipkg/default.nix+3−3 pkgs/development/python-modules/arelle/default.nix+7−4 pkgs/development/python-modules/argon2_cffi/default.nix+2−2 pkgs/development/python-modules/arrow/default.nix+5−4 pkgs/development/python-modules/aspy.yaml/default.nix+2−2 pkgs/development/python-modules/astral/default.nix+2−2 pkgs/development/python-modules/astunparse/default.nix+2−2 pkgs/development/python-modules/asyncssh/default.nix+2−2 pkgs/development/python-modules/atom/default.nix+2−2 pkgs/development/python-modules/atomicwrites/default.nix+2−2 pkgs/development/python-modules/atomman/default.nix+2−2 pkgs/development/python-modules/attrdict/default.nix+2−2 pkgs/development/python-modules/audio-metadata/default.nix+2−2 pkgs/development/python-modules/autobahn/default.nix+2−2 pkgs/development/python-modules/av/default.nix+6−5 pkgs/development/python-modules/awkward/default.nix+2−2 pkgs/development/python-modules/aws-adfs/default.nix+2−2 pkgs/development/python-modules/aws-sam-translator/default.nix+2−2 pkgs/development/python-modules/aws-xray-sdk/default.nix+2−2 pkgs/development/python-modules/azure-common/default.nix+2−2 pkgs/development/python-modules/azure-mgmt-compute/default.nix+2−2 pkgs/development/python-modules/azure-mgmt-network/default.nix+2−2 pkgs/development/python-modules/azure-mgmt-nspkg/default.nix+2−2 pkgs/development/python-modules/azure-mgmt-resource/default.nix+2−2 pkgs/development/python-modules/azure-mgmt-storage/default.nix+2−2 pkgs/development/python-modules/backports_ssl_match_hostname/default.nix+2−2 pkgs/development/python-modules/beautifulsoup4/default.nix+7−5 pkgs/development/python-modules/bidict/default.nix+2−2 pkgs/development/python-modules/billiard/default.nix+4−4 pkgs/development/python-modules/bleach/default.nix+2−2 pkgs/development/python-modules/boltztrap2/default.nix+2−2 pkgs/development/python-modules/bootstrapped-pip/default.nix+6−6 pkgs/development/python-modules/boto3/default.nix+2−2 pkgs/development/python-modules/botocore/default.nix+2−2 pkgs/development/python-modules/buildout-nix/default.nix+2−2 pkgs/development/python-modules/buildout/default.nix+2−2 pkgs/development/python-modules/cachetools/default.nix+2−2 pkgs/development/python-modules/cairocffi/default.nix+2−2 pkgs/development/python-modules/cassandra-driver/default.nix+5−1 pkgs/development/python-modules/celery/default.nix+5−28 pkgs/development/python-modules/cffi/default.nix+2−2 pkgs/development/python-modules/chainer/default.nix+2−2 pkgs/development/python-modules/chalice/default.nix+2−2 pkgs/development/python-modules/channels/default.nix+2−2 pkgs/development/python-modules/characteristic/default.nix+4 pkgs/development/python-modules/chardet/default.nix+2−2 pkgs/development/python-modules/cherrypy/default.nix+22−7 pkgs/development/python-modules/cloudpickle/default.nix+2−2 pkgs/development/python-modules/cmd2/default.nix+2−2 pkgs/development/python-modules/cmdline/default.nix+2−2 pkgs/development/python-modules/colander/default.nix+2−2 pkgs/development/python-modules/colorama/default.nix+2−2 pkgs/development/python-modules/colorlover/default.nix+2−2 pkgs/development/python-modules/configparser/default.nix+8−7 pkgs/development/python-modules/cornice/default.nix+2−2 pkgs/development/python-modules/cryptography/default.nix+2−4 pkgs/development/python-modules/cryptography_vectors/default.nix+2−2 pkgs/development/python-modules/cupy/default.nix+2−2 pkgs/development/python-modules/cvxopt/default.nix+2−2 pkgs/development/python-modules/cx_oracle/default.nix+2−2 pkgs/development/python-modules/cypari2/default.nix+4−1 pkgs/development/python-modules/dask/default.nix+2−2 pkgs/development/python-modules/datadog/default.nix+2−2 pkgs/development/python-modules/datashape/default.nix+2 pkgs/development/python-modules/dateutil/default.nix+11−3 pkgs/development/python-modules/decorator/default.nix+2−2 pkgs/development/python-modules/deluge-client/default.nix+2−2 pkgs/development/python-modules/derpconf/default.nix+2−2 pkgs/development/python-modules/detox/default.nix+2−2 pkgs/development/python-modules/diff-match-patch/default.nix+2−2 pkgs/development/python-modules/dill/default.nix+2−2 pkgs/development/python-modules/distro/default.nix+6−5 pkgs/development/python-modules/django-picklefield/default.nix+2−2 pkgs/development/python-modules/django/2_1.nix+2−2 pkgs/development/python-modules/django_contrib_comments/default.nix+2−2 pkgs/development/python-modules/django_guardian/default.nix+2−2 pkgs/development/python-modules/django_modelcluster/default.nix+2−2 pkgs/development/python-modules/dnspython/default.nix+2−2 pkgs/development/python-modules/docker-pycreds/default.nix+2−2 pkgs/development/python-modules/docker/default.nix+2−2 pkgs/development/python-modules/dogpile.cache/default.nix+6−5 pkgs/development/python-modules/dulwich/default.nix+2−2 pkgs/development/python-modules/easy-thumbnails/default.nix+2−2 pkgs/development/python-modules/editorconfig/default.nix+1−1 pkgs/development/python-modules/entrypoints/default.nix+4−12 pkgs/development/python-modules/envs/default.nix+2−2 pkgs/development/python-modules/execnet/default.nix+5−2 pkgs/development/python-modules/fb-re2/default.nix+4−6 pkgs/development/python-modules/fints/default.nix+2−2 pkgs/development/python-modules/fiona/default.nix+21−9 pkgs/development/python-modules/flake8/default.nix+11−37 pkgs/development/python-modules/flaky/default.nix+2−2 pkgs/development/python-modules/flask-jwt-extended/default.nix+2−2 pkgs/development/python-modules/flask-paginate/default.nix+2−2 pkgs/development/python-modules/flask-socketio/default.nix+2−2 pkgs/development/python-modules/flit/default.nix+2−2 pkgs/development/python-modules/fonttools/default.nix+2−2 pkgs/development/python-modules/freezegun/default.nix+1−1 pkgs/development/python-modules/fs-s3fs/default.nix+2−2 pkgs/development/python-modules/fs/default.nix+2−2 pkgs/development/python-modules/gensim/default.nix+3−2 pkgs/development/python-modules/geopy/default.nix+2−2 pkgs/development/python-modules/gevent/default.nix+2−2 pkgs/development/python-modules/gidgethub/default.nix+10−6 pkgs/development/python-modules/gin-config/default.nix+2−2 pkgs/development/python-modules/git-annex-adapter/default.nix+11−11 pkgs/development/python-modules/git-annex-adapter/git-annex-path.patch+75 pkgs/development/python-modules/github3_py/default.nix+2−2 pkgs/development/python-modules/globus-sdk/default.nix+2−2 pkgs/development/python-modules/glom/default.nix+2−2 pkgs/development/python-modules/gmusicapi/default.nix+2−2 pkgs/development/python-modules/google-music-proto/default.nix+2−2 pkgs/development/python-modules/google_auth/default.nix+2−2 pkgs/development/python-modules/google_cloud_bigquery/default.nix+2−2 pkgs/development/python-modules/google_cloud_dataproc/default.nix+2−2 pkgs/development/python-modules/google_cloud_kms/default.nix+2−2 pkgs/development/python-modules/google_cloud_storage/default.nix+2−2 pkgs/development/python-modules/google_cloud_texttospeech/default.nix+2−2 pkgs/development/python-modules/googleapis_common_protos/default.nix+2−2 pkgs/development/python-modules/gphoto2/default.nix+2−2 pkgs/development/python-modules/green/default.nix+2−2 pkgs/development/python-modules/grpcio-tools/default.nix+2−2 pkgs/development/python-modules/grpcio/default.nix+2−2 pkgs/development/python-modules/gsd/default.nix+2−2 pkgs/development/python-modules/gspread/default.nix+2−2 pkgs/development/python-modules/gssapi/default.nix+6−4 pkgs/development/python-modules/gst-python/default.nix+1−1 pkgs/development/python-modules/gym/default.nix+2−2 pkgs/development/python-modules/h2/default.nix+2−2 pkgs/development/python-modules/ha-ffmpeg/default.nix+2−2 pkgs/development/python-modules/hdbscan/default.nix+2−2 pkgs/development/python-modules/hkdf/default.nix+4−1 pkgs/development/python-modules/howdoi/default.nix+15−3 pkgs/development/python-modules/html5lib/default.nix+3 pkgs/development/python-modules/httplib2/default.nix+5−2 pkgs/development/python-modules/hyperframe/default.nix+2−2 pkgs/development/python-modules/hypothesis/default.nix+2−2 pkgs/development/python-modules/identify/default.nix+2−2 pkgs/development/python-modules/idna/default.nix+2−2 pkgs/development/python-modules/imgaug/default.nix+2−2 pkgs/development/python-modules/inflect/default.nix+2−2 pkgs/development/python-modules/ipykernel/default.nix+2−1 pkgs/development/python-modules/ipython/default.nix+2−2 pkgs/development/python-modules/iso3166/default.nix+1−1 pkgs/development/python-modules/jaraco_collections/default.nix+2−2 pkgs/development/python-modules/jaraco_functools/default.nix+2−2 pkgs/development/python-modules/jaraco_itertools/default.nix+2−2 pkgs/development/python-modules/jaraco_stream/default.nix+2−2 pkgs/development/python-modules/jaraco_text/default.nix+2−2 pkgs/development/python-modules/jdatetime/default.nix+2−2 pkgs/development/python-modules/jenkins-job-builder/default.nix+9−5 pkgs/development/python-modules/jsonpickle/default.nix+2−2 pkgs/development/python-modules/jupyter-repo2docker/default.nix+2−2 pkgs/development/python-modules/kazoo/default.nix+2−2 pkgs/development/python-modules/keras-preprocessing/default.nix+2−2 pkgs/development/python-modules/keyring/default.nix+2−2 pkgs/development/python-modules/kombu/default.nix+5−5 pkgs/development/python-modules/ldappool/default.nix+2−2 pkgs/development/python-modules/ledgerblue/default.nix+2−2 pkgs/development/python-modules/libagent/default.nix+2−2 pkgs/development/python-modules/libnacl/default.nix+1−1 pkgs/development/python-modules/librosa/default.nix+2−2 pkgs/development/python-modules/libsexy/default.nix+4−4 pkgs/development/python-modules/limnoria/default.nix+2−2 pkgs/development/python-modules/luftdaten/default.nix+2−2 pkgs/development/python-modules/lxml/default.nix+2−2 pkgs/development/python-modules/manhole/default.nix+2−2 pkgs/development/python-modules/markupsafe/default.nix+2−2 pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix+2−2 pkgs/development/python-modules/marshmallow/default.nix+2−2 pkgs/development/python-modules/matplotlib/2.nix+3−1 pkgs/development/python-modules/mautrix-appservice/default.nix+2−2 pkgs/development/python-modules/mecab-python3/default.nix+2−2 pkgs/development/python-modules/micawber/default.nix+2−2 pkgs/development/python-modules/monty/default.nix+22−14 pkgs/development/python-modules/more-itertools/2.7.nix+31 pkgs/development/python-modules/more-itertools/default.nix+2−2 pkgs/development/python-modules/moviepy/default.nix+2−2 pkgs/development/python-modules/mpi4py/default.nix+1−1 pkgs/development/python-modules/mpmath/default.nix+2−2 pkgs/development/python-modules/msgpack/default.nix+2−2 pkgs/development/python-modules/mt-940/default.nix+2−2 pkgs/development/python-modules/multiprocess/default.nix+2−2 pkgs/development/python-modules/murmurhash/default.nix+6−2 pkgs/development/python-modules/mutagen/default.nix+9−2 pkgs/development/python-modules/mwclient/default.nix+6−5 pkgs/development/python-modules/mypy-protobuf/default.nix+2−2 pkgs/development/python-modules/mypy/default.nix+2−2 pkgs/development/python-modules/mysql_python/default.nix+3−2 pkgs/development/python-modules/mysqlclient/default.nix+2−2 pkgs/development/python-modules/natsort/default.nix+2−2 pkgs/development/python-modules/nest-asyncio/default.nix+2−2 pkgs/development/python-modules/nilearn/default.nix+2−2 pkgs/development/python-modules/nipype/default.nix+2−4 pkgs/development/python-modules/nipype/move-uneeded-requires.patch−31 pkgs/development/python-modules/nose-randomly/default.nix+2−2 pkgs/development/python-modules/numpy/default.nix+2−2 pkgs/development/python-modules/oauthlib/default.nix+12−10 pkgs/development/python-modules/odfpy/default.nix+2−2 pkgs/development/python-modules/openpyxl/default.nix+2−2 pkgs/development/python-modules/ovh/default.nix+2−2 pkgs/development/python-modules/packaging/default.nix+2−2 pkgs/development/python-modules/pamela/default.nix+2−2 pkgs/development/python-modules/pamqp/default.nix+2−2 pkgs/development/python-modules/paperspace/default.nix+2−2 pkgs/development/python-modules/parameterized/default.nix+4−5 pkgs/development/python-modules/parse/default.nix+2−2 pkgs/development/python-modules/parso/default.nix+2−2 pkgs/development/python-modules/partd/default.nix+1−1 pkgs/development/python-modules/pastedeploy/default.nix+11−4 pkgs/development/python-modules/pastescript/default.nix+2−2 pkgs/development/python-modules/pathos/default.nix+2−2 pkgs/development/python-modules/pbr/default.nix+2−2 pkgs/development/python-modules/pdf2image/default.nix+2−2 pkgs/development/python-modules/pex/default.nix+2−2 pkgs/development/python-modules/pg8000/default.nix+2−2 pkgs/development/python-modules/pgspecial/default.nix+1−1 pkgs/development/python-modules/phonenumbers/default.nix+2−2 pkgs/development/python-modules/phonopy/default.nix+2−2 pkgs/development/python-modules/pid/default.nix+2−2 pkgs/development/python-modules/pillow/default.nix+2−2 pkgs/development/python-modules/pint/default.nix+11−5 pkgs/development/python-modules/pip-tools/default.nix+2−2 pkgs/development/python-modules/pip/default.nix+2−2 pkgs/development/python-modules/pkgconfig/default.nix+2 pkgs/development/python-modules/pkginfo/default.nix+2−2 pkgs/development/python-modules/plaid-python/default.nix+2−2 pkgs/development/python-modules/plaster-pastedeploy/default.nix+10−1 pkgs/development/python-modules/plotly/default.nix+2−2 pkgs/development/python-modules/pluginbase/default.nix+2−2 pkgs/development/python-modules/plyfile/default.nix+2−2 pkgs/development/python-modules/portend/default.nix+6−2 pkgs/development/python-modules/pox/default.nix+2−2 pkgs/development/python-modules/ppft/default.nix+2−2 pkgs/development/python-modules/praw/default.nix+2−2 pkgs/development/python-modules/premailer/default.nix+2−2 pkgs/development/python-modules/process-tests/default.nix+2−2 pkgs/development/python-modules/progressbar2/default.nix+2−2 pkgs/development/python-modules/prometheus_client/default.nix+2−2 pkgs/development/python-modules/prompt_toolkit/default.nix+2−2 pkgs/development/python-modules/protobuf/default.nix+3−2 pkgs/development/python-modules/psutil/default.nix+3−11 pkgs/development/python-modules/psycopg2/default.nix+3−3 pkgs/development/python-modules/pvlib/default.nix+2−2 pkgs/development/python-modules/py_scrypt/default.nix+2−2 pkgs/development/python-modules/py_stringmatching/default.nix+2−2 pkgs/development/python-modules/pyaml/default.nix+2−2 pkgs/development/python-modules/pyasn1-modules/default.nix+2−2 pkgs/development/python-modules/pybase64/default.nix+2−2 pkgs/development/python-modules/pycapnp/default.nix+2−2 pkgs/development/python-modules/pychromecast/default.nix+2−2 pkgs/development/python-modules/pycodestyle/default.nix+3−11 pkgs/development/python-modules/pycontracts/default.nix+2−2 pkgs/development/python-modules/pycryptodome/default.nix+2−2 pkgs/development/python-modules/pycryptodomex/default.nix+2−2 pkgs/development/python-modules/pycurl/default.nix+1 pkgs/development/python-modules/pyepsg/default.nix+2−2 pkgs/development/python-modules/pyfftw/default.nix+4−4 pkgs/development/python-modules/pyfiglet/default.nix+2−2 pkgs/development/python-modules/pyflakes/default.nix+3−6 pkgs/development/python-modules/pygame/default.nix+8−4 pkgs/development/python-modules/pyjet/default.nix+2−2 pkgs/development/python-modules/pyjwt/default.nix+2−12 pkgs/development/python-modules/pykeepass/default.nix+2−2 pkgs/development/python-modules/pykerberos/default.nix+1−1 pkgs/development/python-modules/pylast/default.nix+2−2 pkgs/development/python-modules/pylibgen/default.nix+8−5 pkgs/development/python-modules/pylti/default.nix+2−2 pkgs/development/python-modules/pymatgen/default.nix+2−2 pkgs/development/python-modules/pymc3/default.nix+2−2 pkgs/development/python-modules/pymediainfo/default.nix+2−2 pkgs/development/python-modules/pynacl/default.nix+22−7 pkgs/development/python-modules/pynmea2/default.nix+2−2 pkgs/development/python-modules/pyopencl/default.nix+2−2 pkgs/development/python-modules/pyopenssl/default.nix+2−2 pkgs/development/python-modules/pyowm/default.nix+2−2 pkgs/development/python-modules/pyqt/5.x.nix+1−1 pkgs/development/python-modules/pyramid/default.nix+2−2 pkgs/development/python-modules/pyramid_jinja2/default.nix+2−2 pkgs/development/python-modules/pyro-ppl/default.nix+2−2 pkgs/development/python-modules/pyrr/default.nix+2−2 pkgs/development/python-modules/pyrsistent/default.nix+2−2 pkgs/development/python-modules/pyside/default.nix+2−3 pkgs/development/python-modules/pyside/shiboken.nix+1−1 pkgs/development/python-modules/pyspread/default.nix+2−2 pkgs/development/python-modules/pytest-asyncio/default.nix+2−2 pkgs/development/python-modules/pytest-cov/default.nix+2−2 pkgs/development/python-modules/pytest-django/default.nix+2−2 pkgs/development/python-modules/pytest-fixture-config/default.nix+4−4 pkgs/development/python-modules/pytest-flake8/default.nix+2−2 pkgs/development/python-modules/pytest-flakes/default.nix+2−1 pkgs/development/python-modules/pytest-forked/default.nix+2−2 pkgs/development/python-modules/pytest-localserver/default.nix+4−4 pkgs/development/python-modules/pytest-mock/default.nix+5−5 pkgs/development/python-modules/pytest-quickcheck/default.nix+2−2 pkgs/development/python-modules/pytest-server-fixtures/default.nix+2−2 pkgs/development/python-modules/pytest-services/default.nix+35 pkgs/development/python-modules/pytest-shutil/default.nix+5−4 pkgs/development/python-modules/pytest-timeout/default.nix+5 pkgs/development/python-modules/pytest-virtualenv/default.nix+6−4 pkgs/development/python-modules/pytest-xdist/default.nix+2−2 pkgs/development/python-modules/pytest/3.10.nix+47 pkgs/development/python-modules/pytest/default.nix+3−3 pkgs/development/python-modules/python-binance/default.nix+2−2 pkgs/development/python-modules/python-daemon/default.nix+2−2 pkgs/development/python-modules/python-editor/default.nix+2−2 pkgs/development/python-modules/python-rapidjson/default.nix+2−2 pkgs/development/python-modules/python-slugify/default.nix+2−2 pkgs/development/python-modules/python-socketio/default.nix+2−2 pkgs/development/python-modules/python-utils/default.nix+2−2 pkgs/development/python-modules/pythonix/default.nix+1 pkgs/development/python-modules/pytools/default.nix+2−2 pkgs/development/python-modules/pytz/default.nix+2−2 pkgs/development/python-modules/pytzdata/default.nix+2−2 pkgs/development/python-modules/pyunifi/default.nix+2−2 pkgs/development/python-modules/pyupdate/default.nix+2−2 pkgs/development/python-modules/pyzmq/default.nix+2−2 pkgs/development/python-modules/qiskit/default.nix+2−2 pkgs/development/python-modules/qtawesome/default.nix+11−2 pkgs/development/python-modules/qtconsole/default.nix+1−1 pkgs/development/python-modules/qtpy/default.nix+2−2 pkgs/development/python-modules/quantities/default.nix+2−2 pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix+32 pkgs/development/python-modules/redis/default.nix+2−2 pkgs/development/python-modules/regex/default.nix+5−2 pkgs/development/python-modules/requests-oauthlib/default.nix+2−2 pkgs/development/python-modules/requests-toolbelt/default.nix+7−3 pkgs/development/python-modules/requests/default.nix+2−2 pkgs/development/python-modules/restructuredtext_lint/default.nix+2−2 pkgs/development/python-modules/rhpl/default.nix+2−1 pkgs/development/python-modules/root_numpy/default.nix+2−2 pkgs/development/python-modules/rope/default.nix+2−2 pkgs/development/python-modules/ruamel_yaml/default.nix+2−2 pkgs/development/python-modules/s3transfer/default.nix+2−2 pkgs/development/python-modules/salmon-mail/default.nix+2−2 pkgs/development/python-modules/schedule/default.nix+2−2 pkgs/development/python-modules/scikit-image/default.nix+2−2 pkgs/development/python-modules/scipy/default.nix+2−2 pkgs/development/python-modules/setuptools/default.nix+2−2 pkgs/development/python-modules/setuptools_scm/default.nix+2−2 pkgs/development/python-modules/shapely/default.nix+18−13 pkgs/development/python-modules/shapely/library-paths.patch+109 pkgs/development/python-modules/six/default.nix+2−2 pkgs/development/python-modules/smart_open/default.nix+2−2 pkgs/development/python-modules/soco/default.nix+2−2 pkgs/development/python-modules/sopel/default.nix+2−2 pkgs/development/python-modules/sortedcontainers/default.nix+2−2 pkgs/development/python-modules/soupsieve/default.nix+36 pkgs/development/python-modules/spglib/default.nix+2−2 pkgs/development/python-modules/sphinx-testing/default.nix+2−2 pkgs/development/python-modules/sphinx_rtd_theme/default.nix+10−2 pkgs/development/python-modules/sphinxcontrib-openapi/default.nix+2−2 pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix+2−2 pkgs/development/python-modules/sqlmap/default.nix+2−2 pkgs/development/python-modules/sqlobject/default.nix+2−2 pkgs/development/python-modules/srptools/default.nix+2−2 pkgs/development/python-modules/stripe/default.nix+2−2 pkgs/development/python-modules/structlog/default.nix+2−2 pkgs/development/python-modules/tabulate/default.nix+2−2 pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix+2−2 pkgs/development/python-modules/texttable/default.nix+2−2 pkgs/development/python-modules/thespian/default.nix+2−2 pkgs/development/python-modules/tifffile/default.nix+2−2 pkgs/development/python-modules/tox/default.nix+2−2 pkgs/development/python-modules/tqdm/default.nix+5−3 pkgs/development/python-modules/traits/default.nix+2−2 pkgs/development/python-modules/trezor_agent/default.nix+2−2 pkgs/development/python-modules/trio/default.nix+2−2 pkgs/development/python-modules/trollius/default.nix+2 pkgs/development/python-modules/trustme/default.nix+2−2 pkgs/development/python-modules/twine/default.nix+2−2 pkgs/development/python-modules/twitter-common-collections/default.nix+2−2 pkgs/development/python-modules/twitter-common-confluence/default.nix+2−2 pkgs/development/python-modules/twitter-common-dirutil/default.nix+2−2 pkgs/development/python-modules/twitter-common-lang/default.nix+2−2 pkgs/development/python-modules/twitter-common-log/default.nix+2−2 pkgs/development/python-modules/twitter-common-options/default.nix+2−2 pkgs/development/python-modules/txaio/default.nix+2−2 pkgs/development/python-modules/typed-ast/default.nix+2−2 pkgs/development/python-modules/uproot-methods/default.nix+2−2 pkgs/development/python-modules/uproot/default.nix+2−2 pkgs/development/python-modules/vega_datasets/default.nix+2−2 pkgs/development/python-modules/venusian/default.nix+2−2 pkgs/development/python-modules/vidstab/default.nix+2−2 pkgs/development/python-modules/virtualenv-clone/default.nix+2−2 pkgs/development/python-modules/virtualenv/default.nix+2−2 pkgs/development/python-modules/virtualenv/virtualenv-change-prefix.patch+12−12 pkgs/development/python-modules/virtualenvwrapper/default.nix+2−2 pkgs/development/python-modules/voluptuous-serialize/default.nix+2−2 pkgs/development/python-modules/waitress/default.nix+2−2 pkgs/development/python-modules/wheel/default.nix+2−2 pkgs/development/python-modules/whoosh/default.nix+2−2 pkgs/development/python-modules/wrapt/default.nix+2−2 pkgs/development/python-modules/wsproto/default.nix+9−3 pkgs/development/python-modules/wurlitzer/default.nix+28 pkgs/development/python-modules/xkcdpass/default.nix+2−2 pkgs/development/python-modules/xlrd/default.nix+5−5 pkgs/development/python-modules/xml2rfc/default.nix+2−2 pkgs/development/python-modules/xmltodict/default.nix+2−2 pkgs/development/python-modules/xstatic-bootstrap/default.nix+2−2 pkgs/development/python-modules/yamllint/default.nix+2−2 pkgs/development/python-modules/yapf/default.nix+2−2 pkgs/development/python-modules/yattag/default.nix+2−2 pkgs/development/python-modules/zconfig/default.nix+2−2 pkgs/development/python-modules/zm-py/default.nix+2−2 pkgs/development/python-modules/zope_configuration/default.nix+2−2 pkgs/development/python-modules/zope_deprecation/default.nix+2−2 pkgs/development/python-modules/zope_i18n/default.nix+2−2 pkgs/development/tools/build-managers/cmake/application-services.patch+37−3 pkgs/development/tools/build-managers/cmake/default.nix+16−11 pkgs/development/tools/build-managers/ninja/default.nix+7 pkgs/development/tools/build-managers/pants/default.nix+7−7 pkgs/development/tools/devpi-client/default.nix+1−1 pkgs/development/tools/misc/d-feet/default.nix+1−1 pkgs/development/tools/parsing/bison/3.x.nix+2−2 pkgs/development/tools/profiling/sysprof/default.nix+1−1 pkgs/misc/emulators/cdemu/analyzer.nix+1−1 pkgs/misc/emulators/cdemu/gui.nix+1−1 pkgs/os-specific/darwin/cctools/ld-tbd-v2.patch+98 pkgs/os-specific/darwin/cctools/port.nix+39−12 pkgs/os-specific/darwin/cctools/support-ios.patch+13 pkgs/os-specific/darwin/cctools/undo-unknown-triple.patch+17 pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix+8−2 pkgs/os-specific/linux/iw/default.nix+5−4 pkgs/os-specific/linux/piper/default.nix+1−1 pkgs/servers/home-assistant/default.nix+21−4 pkgs/servers/matrix-synapse/default.nix+1−1 pkgs/servers/x11/xorg/default.nix+47−21 pkgs/servers/x11/xorg/tarballs.list+9−7 pkgs/stdenv/generic/make-derivation.nix+3 pkgs/tools/admin/awscli/default.nix+9−2 pkgs/tools/audio/beets/default.nix+10−9 pkgs/tools/audio/gvolicon/default.nix+1−1 pkgs/tools/audio/pasystray/default.nix+1−1 pkgs/tools/backup/borg/default.nix+21−7 pkgs/tools/backup/ddar/default.nix+1 pkgs/tools/compression/xar/default.nix+2−2 pkgs/tools/graphics/luxcorerender/default.nix+2−2 pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix+1−1 pkgs/tools/misc/papis/default.nix+13 pkgs/tools/misc/vdirsyncer/default.nix+6 pkgs/tools/networking/dhcpcd/default.nix+2−2 pkgs/tools/networking/gupnp-tools/default.nix+1−1 pkgs/tools/networking/linkchecker/default.nix+1 pkgs/tools/networking/network-manager/applet.nix+3−3 pkgs/tools/networking/network-manager/fortisslvpn/default.nix+2−2 pkgs/tools/networking/network-manager/iodine/default.nix+2−2 pkgs/tools/networking/network-manager/l2tp/default.nix+2−2 pkgs/tools/networking/network-manager/openconnect/default.nix+2−2 pkgs/tools/networking/network-manager/openvpn/default.nix+2−2 pkgs/tools/networking/network-manager/vpnc/default.nix+2−2 pkgs/tools/networking/openconnect/default.nix+4−9 pkgs/tools/networking/unbound/default.nix+2−2 pkgs/tools/security/gnupg/22.nix+2−2 pkgs/tools/security/onioncircuits/default.nix+3−2 pkgs/tools/security/vulnix/default.nix+1−1 pkgs/tools/text/groff/default.nix+4−1 pkgs/tools/text/groff/mdate-determinism.patch+13 pkgs/top-level/all-packages.nix+30−50 pkgs/top-level/python-packages.nix+23−5
doc/languages-frameworks/python.section.md+18−4
@@ -602,11 +602,10 @@ as the interpreter unless overridden otherwise.
602602All parameters from `stdenv.mkDerivation` function are still supported. The following are specific to `buildPythonPackage`:
603603
604604* `catchConflicts ? true`: If `true`, abort package build if a package name appears more than once in dependency tree. Default is `true`.
605−* `checkInputs ? []`: Dependencies needed for running the `checkPhase`. These are added to `buildInputs` when `doCheck = true`.
606605* `disabled` ? false: If `true`, package is not build for the particular Python interpreter version.
607606* `dontWrapPythonPrograms ? false`: Skip wrapping of python programs.
608−* `installFlags ? []`: A list of strings. Arguments to be passed to `pip install`. To pass options to `python setup.py install`, use `--install-option`. E.g., `installFlags=["--install-option='--cpp_implementation'"].
609−* `format ? "setuptools"`: Format of the source. Valid options are `"setuptools"`, `"flit"`, `"wheel"`, and `"other"`. `"setuptools"` is for when the source has a `setup.py` and `setuptools` is used to build a wheel, `flit`, in case `flit` should be used to build a wheel, and `wheel` in case a wheel is provided. Use `other` when a custom `buildPhase` and/or `installPhase` is needed.
607+* `installFlags ? []`: A list of strings. Arguments to be passed to `pip install`. To pass options to `python setup.py install`, use `--install-option`. E.g., `installFlags=["--install-option='--cpp_implementation'"]`.
608+* `format ? "setuptools"`: Format of the source. Valid options are `"setuptools"`, `"pyproject"`, `"flit"`, `"wheel"`, and `"other"`. `"setuptools"` is for when the source has a `setup.py` and `setuptools` is used to build a wheel, `flit`, in case `flit` should be used to build a wheel, and `wheel` in case a wheel is provided. Use `other` when a custom `buildPhase` and/or `installPhase` is needed.
610609* `makeWrapperArgs ? []`: A list of strings. Arguments to be passed to `makeWrapper`, which wraps generated binaries. By default, the arguments to `makeWrapper` set `PATH` and `PYTHONPATH` environment variables before calling the binary. Additional arguments here can allow a developer to set environment variables which will be available when the binary is run. For example, `makeWrapperArgs = ["--set FOO BAR" "--set BAZ QUX"]`.
611610* `namePrefix`: Prepends text to `${name}` parameter. In case of libraries, this defaults to `"python3.5-"` for Python 3.5, etc., and in case of applications to `""`.
612611* `pythonPath ? []`: List of packages to be added into `$PYTHONPATH`. Packages in `pythonPath` are not propagated (contrary to `propagatedBuildInputs`).
@@ -615,6 +614,14 @@ All parameters from `stdenv.mkDerivation` function are still supported. The foll
615614* `removeBinByteCode ? true`: Remove bytecode from `/bin`. Bytecode is only created when the filenames end with `.py`.
616615* `setupPyBuildFlags ? []`: List of flags passed to `setup.py build_ext` command.
617616
617+The `stdenv.mkDerivation` function accepts various parameters for describing build inputs (see "Specifying dependencies"). The following are of special
618+interest for Python packages, either because these are primarily used, or because their behaviour is different:
619+
620+* `nativeBuildInputs ? []`: Build-time only dependencies. Typically executables as well as the items listed in `setup_requires`.
621+* `buildInputs ? []`: Build and/or run-time dependencies that need to be be compiled for the host machine. Typically non-Python libraries which are being linked.
622+* `checkInputs ? []`: Dependencies needed for running the `checkPhase`. These are added to `nativeBuildInputs` when `doCheck = true`. Items listed in `tests_require` go here.
623+* `propagatedBuildInputs ? []`: Aside from propagating dependencies, `buildPythonPackage` also injects code into and wraps executables with the paths included in this list. Items listed in `install_requires` go here.
624+
618625##### Overriding Python packages
619626
620627The `buildPythonPackage` function has a `overridePythonAttrs` method that
@@ -874,7 +881,6 @@ example of such a situation is when `py.test` is used.
874881 '';
875882 }
876883 ```
877−- Unicode issues can typically be fixed by including `glibcLocales` in `buildInputs` and exporting `LC_ALL=en_US.utf-8`.
878884- Tests that attempt to access `$HOME` can be fixed by using the following work-around before running tests (e.g. `preCheck`): `export HOME=$(mktemp -d)`
879885
880886## FAQ
@@ -1123,6 +1129,14 @@ LLVM implementation. To use that one instead, Intel recommends users set it with
11231129Note that `mkl` is only available on `x86_64-{linux,darwin}` platforms;
11241130moreover, Hydra is not building and distributing pre-compiled binaries using it.
11251131
1132+### What inputs do `setup_requires`, `install_requires` and `tests_require` map to?
1133+
1134+In a `setup.py` or `setup.cfg` it is common to declare dependencies:
1135+
1136+* `setup_requires` corresponds to `nativeBuildInputs`
1137+* `install_requires` corresponds to `propagatedBuildInputs`
1138+* `tests_require` corresponds to `checkInputs`
1139+
11261140## Contributing
11271141
11281142### Contributing guidelines
nixos/doc/manual/release-notes/rl-1903.xml+14
@@ -182,6 +182,20 @@
182182 </listitem>
183183 </itemizedlist>
184184 </listitem>
185+ <listitem>
186+ <para>
187+ The <varname>buildPythonPackage</varname> function now sets <varname>strictDeps = true</varname>
188+ to help distinguish between native and non-native dependencies in order to
189+ improve cross-compilation compatibility. Note however that this may break
190+ user expressions.
191+ </para>
192+ </listitem>
193+ <listitem>
194+ <para>
195+ The <varname>buildPythonPackage</varname> function now sets <varname>LANG = C.UTF-8</varname>
196+ to enable Unicode support. The <varname>glibcLocales</varname> package is no longer needed as a build input.
197+ </para>
198+ </listitem>
185199 <listitem>
186200 <para>
187201 The Syncthing state and configuration data has been moved from
nixos/modules/services/x11/desktop-managers/xfce.nix+1−1
@@ -53,7 +53,7 @@ in
5353
5454 # Supplies some abstract icons such as:
5555 # utilities-terminal, accessories-text-editor
56− gnome3.defaultIconTheme
56+ gnome3.adwaita-icon-theme
5757
5858 hicolor-icon-theme
5959 tango-icon-theme
nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix+4−4
@@ -96,8 +96,8 @@ in
9696
9797 package = mkOption {
9898 type = types.package;
99− default = pkgs.gnome3.defaultIconTheme;
100− defaultText = "pkgs.gnome3.defaultIconTheme";
99+ default = pkgs.gnome3.adwaita-icon-theme;
100+ defaultText = "pkgs.gnome3.adwaita-icon-theme";
101101 description = ''
102102 The package path that contains the icon theme given in the name option.
103103 '';
@@ -116,8 +116,8 @@ in
116116 cursorTheme = {
117117
118118 package = mkOption {
119− default = pkgs.gnome3.defaultIconTheme;
120− defaultText = "pkgs.gnome3.defaultIconTheme";
119+ default = pkgs.gnome3.adwaita-icon-theme;
120+ defaultText = "pkgs.gnome3.adwaita-icon-theme";
121121 description = ''
122122 The package path that contains the cursor theme given in the name option.
123123 '';
pkgs/applications/audio/audacious/default.nix+1−1
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
2626
2727 buildInputs = [
2828 gettext glib gtk3 libmowgli dbus-glib libxml2
29− xorg.libXcomposite gnome3.defaultIconTheme alsaLib libjack2
29+ xorg.libXcomposite gnome3.adwaita-icon-theme alsaLib libjack2
3030 libpulseaudio fluidsynth libmad libogg libvorbis libcdio
3131 libcddb flac ffmpeg mpg123 libcue libmms libbs2b libsndfile
3232 libmodplug libsamplerate soxr lirc curl wavpack neon faad2
pkgs/applications/audio/cozy-audiobooks/default.nix+1−1
@@ -43,7 +43,7 @@ python3Packages.buildPythonApplication rec {
4343 gtk3
4444 cairo
4545 gettext
46− gnome3.defaultIconTheme
46+ gnome3.adwaita-icon-theme
4747 ] ++ (with gst_all_1; [
4848 gstreamer
4949 gst-plugins-good
pkgs/applications/audio/easytag/default.nix+1−1
@@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
1919 nativeBuildInputs = [ pkgconfig intltool itstool libxml2 wrapGAppsHook ];
2020 buildInputs = [
2121 gtk3 glib libid3tag id3lib taglib libvorbis libogg opusfile flac
22− gsettings-desktop-schemas gnome3.defaultIconTheme
22+ gsettings-desktop-schemas gnome3.adwaita-icon-theme
2323 ];
2424
2525 doCheck = false; # fails 1 out of 9 tests
pkgs/applications/audio/gpodder/default.nix+1−1
@@ -28,7 +28,7 @@ python3Packages.buildPythonApplication rec {
2828 buildInputs = [
2929 python3
3030 gobject-introspection
31− gnome3.defaultIconTheme
31+ gnome3.adwaita-icon-theme
3232 ];
3333
3434 checkInputs = with python3Packages; [
pkgs/applications/audio/gtklick/default.nix+1−1
@@ -14,7 +14,7 @@ pythonPackages.buildPythonApplication rec {
1414 pyGtkGlade
1515 ];
1616
17− buildInputs = [ gettext ];
17+ nativeBuildInputs = [ gettext ];
1818
1919 propagatedBuildInputs = [ klick ];
2020
pkgs/applications/audio/gtkpod/default.nix+1−1
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515 buildInputs = [
1616 curl gettext
1717 flex libgpod libid3tag flac libvorbis gtk3 gdk_pixbuf
18− gdl gnome3.defaultIconTheme gnome3.anjuta
18+ gdl gnome3.adwaita-icon-theme gnome3.anjuta
1919 ] ++ (with perlPackages; [ perl XMLParser ]);
2020
2121 patchPhase = ''
pkgs/applications/audio/lollypop/default.nix+1
@@ -28,6 +28,7 @@ python3.pkgs.buildPythonApplication rec {
2828 ];
2929
3030 buildInputs = with gst_all_1; [
31+ gobject-introspection
3132 gst-libav
3233 gst-plugins-bad
3334 gst-plugins-base
pkgs/applications/audio/pavucontrol/default.nix+1−1
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616 '';
1717
1818 buildInputs = [ libpulseaudio gtkmm3 libcanberra-gtk3 makeWrapper
19− gnome3.defaultIconTheme ];
19+ gnome3.adwaita-icon-theme ];
2020
2121 nativeBuildInputs = [ pkgconfig intltool ];
2222
pkgs/applications/audio/picard/default.nix+1−1
@@ -13,7 +13,7 @@ in pythonPackages.buildPythonApplication rec {
1313 sha256 = "1p2bvfzby0nk1vh04yfmsvjcldgkj6m6s1hcv9v13hc8q1cbdfk5";
1414 };
1515
16− buildInputs = [ gettext ];
16+ nativeBuildInputs = [ gettext ];
1717
1818 propagatedBuildInputs = with pythonPackages; [
1919 pyqt5
pkgs/applications/audio/quodlibet/default.nix+1−1
@@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec {
2020
2121 checkInputs = with python3.pkgs; [ pytest pytest_xdist pyflakes pycodestyle polib xvfb_run dbus.daemon glibcLocales ];
2222
23− buildInputs = [ gnome3.defaultIconTheme libsoup glib glib-networking gtk3 webkitgtk gdk_pixbuf keybinder3 gtksourceview libmodplug libappindicator-gtk3 kakasi gobject-introspection ]
23+ buildInputs = [ gnome3.adwaita-icon-theme libsoup glib glib-networking gtk3 webkitgtk gdk_pixbuf keybinder3 gtksourceview libmodplug libappindicator-gtk3 kakasi gobject-introspection ]
2424 ++ (if xineBackend then [ xineLib ] else with gst_all_1;
2525 [ gstreamer gst-plugins-base ] ++ optionals withGstPlugins [ gst-plugins-good gst-plugins-ugly gst-plugins-bad ]);
2626
pkgs/applications/audio/rhythmbox/default.nix+1−1
@@ -50,7 +50,7 @@ in stdenv.mkDerivation rec {
5050 gtk3
5151 gnome3.libpeas
5252 totem-pl-parser
53− gnome3.defaultIconTheme
53+ gnome3.adwaita-icon-theme
5454
5555 gst_all_1.gstreamer
5656 gst_all_1.gst-plugins-base
pkgs/applications/audio/sonata/default.nix+1−1
@@ -19,7 +19,7 @@ in buildPythonApplication rec {
1919 nativeBuildInputs = [ pkgconfig ];
2020 buildInputs = [
2121 intltool wrapGAppsHook
22− gnome3.defaultIconTheme
22+ gnome3.adwaita-icon-theme
2323 gnome3.gsettings-desktop-schemas
2424 ];
2525
pkgs/applications/audio/sound-juicer/default.nix+1−1
@@ -15,7 +15,7 @@ in stdenv.mkDerivation rec{
1515
1616 nativeBuildInputs = [ pkgconfig intltool itstool libxml2 wrapGAppsHook ];
1717 buildInputs = [
18− glib gtk3 brasero libcanberra-gtk3 gnome3.defaultIconTheme
18+ glib gtk3 brasero libcanberra-gtk3 gnome3.adwaita-icon-theme
1919 gnome3.gsettings-desktop-schemas libmusicbrainz5 libdiscid isocodes
2020 gst_all_1.gstreamer gst_all_1.gst-plugins-base
2121 gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad
pkgs/applications/editors/bluefish/default.nix+1−1
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 };
1212
1313 nativeBuildInputs = [ intltool pkgconfig wrapGAppsHook ];
14− buildInputs = [ gnome3.defaultIconTheme gtk libxml2
14+ buildInputs = [ gnome3.adwaita-icon-theme gtk libxml2
1515 enchant gucharmap python ];
1616
1717 meta = with stdenv.lib; {
pkgs/applications/editors/gnome-latex/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, wrapGAppsHook
1+{ stdenv, fetchurl, wrapGAppsHook, gsettings-desktop-schemas, gspell, gtksourceview4, libgee
22, tepl, amtk, gnome3, glib, pkgconfig, intltool, itstool, libxml2 }:
33let
44 version = "3.30.2";
@@ -21,9 +21,9 @@ in stdenv.mkDerivation {
2121 intltool
2222 ];
2323
24− buildInputs = with gnome3; [
24+ buildInputs = [
2525 amtk
26− defaultIconTheme
26+ gnome3.adwaita-icon-theme
2727 glib
2828 gsettings-desktop-schemas
2929 gspell
pkgs/applications/graphics/avocode/default.nix+1−1
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 sha256 = "1slxxr3j0djqdnbk645sriwl99jp9imndyxiwd8aqggmmlp145a2";
1313 };
1414
15− libPath = stdenv.lib.makeLibraryPath (with xorg; with gnome3; [
15+ libPath = stdenv.lib.makeLibraryPath (with xorg; [
1616 stdenv.cc.cc.lib
1717 gdk_pixbuf
1818 glib
pkgs/applications/graphics/dosage/default.nix+1−1
@@ -11,7 +11,7 @@ pythonPackages.buildPythonApplication rec {
1111 rev = "b2fdc13feb65b93762928f7e99bac7b1b7b31591";
1212 sha256 = "1p6vllqaf9s6crj47xqp97hkglch1kd4y8y4lxvzx3g2shhhk9hh";
1313 };
14− buildInputs = with pythonPackages; [ pytest responses ];
14+ checkInputs = with pythonPackages; [ pytest responses ];
1515 propagatedBuildInputs = with pythonPackages; [ colorama lxml requests pbr ];
1616
1717 disabled = pythonPackages.pythonOlder "3.3";
pkgs/applications/graphics/gthumb/default.nix+4−3
@@ -1,5 +1,6 @@
11{ stdenv, fetchurl, gnome3, itstool, libxml2, pkgconfig, intltool,
22 exiv2, libjpeg, libtiff, gst_all_1, libraw, libsoup, libsecret,
3+ glib, gtk3, gsettings-desktop-schemas,
34 libchamplain, librsvg, libwebp, json-glib, webkitgtk, lcms2, bison,
45 flex, wrapGAppsHook, shared-mime-info }:
56
@@ -16,10 +17,10 @@ in stdenv.mkDerivation rec {
1617
1718 nativeBuildInputs = [ itstool libxml2 intltool pkgconfig bison flex wrapGAppsHook ];
1819
19− buildInputs = with gnome3; [
20− glib gtk gsettings-desktop-schemas gst_all_1.gstreamer gst_all_1.gst-plugins-base
20+ buildInputs = [
21+ glib gtk3 gsettings-desktop-schemas gst_all_1.gstreamer gst_all_1.gst-plugins-base
2122 exiv2 libjpeg libtiff libraw libsoup libsecret libchamplain
22− librsvg libwebp json-glib webkitgtk lcms2 defaultIconTheme
23+ librsvg libwebp json-glib webkitgtk lcms2 gnome3.adwaita-icon-theme
2324 ];
2425
2526 enableParallelBuilding = true;
pkgs/applications/graphics/shotwell/default.nix+1−1
@@ -25,7 +25,7 @@ in stdenv.mkDerivation rec {
2525 gst_all_1.gstreamer gst_all_1.gst-plugins-base gnome3.libgee
2626 libgudev gnome3.gexiv2 gnome3.gsettings-desktop-schemas
2727 libraw json-glib glib gdk_pixbuf librsvg gnome3.rest
28− gcr gnome3.defaultIconTheme libgdata
28+ gcr gnome3.adwaita-icon-theme libgdata
2929 ];
3030
3131 postPatch = ''
pkgs/applications/graphics/synfigstudio/default.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv, fetchFromGitHub, boost, cairo, gettext, glibmm, gtk3, gtkmm3
22, libjack2, libsigcxx, libxmlxx, makeWrapper, mlt-qt5, pango, pkgconfig
3−, imagemagick, intltool, autoreconfHook, which, defaultIconTheme
3+, imagemagick, intltool, autoreconfHook, which, gnome3
44}:
55
66let
@@ -105,7 +105,7 @@ stdenv.mkDerivation rec {
105105 buildInputs = [
106106 ETL boost cairo glibmm gtk3 gtkmm3 imagemagick intltool
107107 libjack2 libsigcxx libxmlxx makeWrapper mlt-qt5
108− synfig which defaultIconTheme
108+ synfig which gnome3.adwaita-icon-theme
109109 ];
110110
111111 postInstall = ''
pkgs/applications/graphics/vimiv/default.nix+2−2
@@ -1,5 +1,5 @@
11{ lib, python3Packages, fetchFromGitHub, imagemagick, librsvg, gtk3, jhead
2−, hicolor-icon-theme, defaultIconTheme
2+, hicolor-icon-theme, gnome3
33
44# Test requirements
55, dbus, xvfb_run, xdotool
@@ -38,7 +38,7 @@ python3Packages.buildPythonApplication rec {
3838 '';
3939
4040 checkInputs = [ python3Packages.nose dbus.daemon xvfb_run xdotool ];
41− buildInputs = [ hicolor-icon-theme defaultIconTheme librsvg ];
41+ buildInputs = [ hicolor-icon-theme gnome3.adwaita-icon-theme librsvg ];
4242 propagatedBuildInputs = with python3Packages; [ pillow pygobject3 gtk3 ];
4343
4444 makeWrapperArgs = [
pkgs/applications/misc/electrum/ltc.nix+3−1
@@ -4,7 +4,7 @@
44}:
55
66python3Packages.buildPythonApplication rec {
7− name = "electrum-ltc-${version}";
7+ pname = "electrum-ltc";
88 version = "3.1.3.1";
99
1010 src = fetchurl {
@@ -12,6 +12,8 @@ python3Packages.buildPythonApplication rec {
1212 sha256 = "0kxcx1xf6h9z8x0k483d6ykpnmfr30n6z3r6lgqxvbl42pq75li7";
1313 };
1414
15+ nativeBuildInputs = with python3Packages; [ pyqt5 ];
16+
1517 propagatedBuildInputs = with python3Packages; [
1618 pyaes
1719 ecdsa
pkgs/applications/misc/font-manager/default.nix+1−1
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
3535 sqlite
3636 librsvg
3737 gnome3.gtk
38− gnome3.defaultIconTheme
38+ gnome3.adwaita-icon-theme
3939 ];
4040
4141 patches = [ ./correct-post-install.patch ];
pkgs/applications/misc/gnome-recipes/default.nix+2−2
@@ -13,7 +13,7 @@
1313, glib
1414, libsoup
1515, gnome-online-accounts
16−, rest
16+, librest
1717, json-glib
1818, gnome-autoar
1919, gspell
@@ -46,7 +46,7 @@ in stdenv.mkDerivation rec {
4646 glib
4747 libsoup
4848 gnome-online-accounts
49− rest
49+ librest
5050 json-glib
5151 gnome-autoar
5252 gspell
pkgs/applications/misc/gnome-usage/default.nix+1−1
@@ -15,7 +15,7 @@ in stdenv.mkDerivation rec {
1515
1616 nativeBuildInputs = [ meson ninja pkgconfig vala gettext libxml2 desktop-file-utils wrapGAppsHook ];
1717
18− buildInputs = [ glib gtk3 libgtop gnome3.defaultIconTheme ];
18+ buildInputs = [ glib gtk3 libgtop gnome3.adwaita-icon-theme ];
1919
2020 postPatch = ''
2121 chmod +x build-aux/meson/postinstall.sh
pkgs/applications/misc/gummi/default.nix+1−1
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
1919 ];
2020 buildInputs = [
2121 glib gnome2.gtksourceview gnome2.pango gtk2-x11 gtkspell2 poppler
22− gnome3.defaultIconTheme
22+ gnome3.adwaita-icon-theme
2323 ];
2424
2525 preConfigure = ''
pkgs/applications/misc/hamster-time-tracker/default.nix+2−2
@@ -18,9 +18,9 @@ pythonPackages.buildPythonApplication rec {
1818 sha256 = "1a85rcg561792kdyv744cgzw7mmpmgv6d6li1sijfdpqa1ninf8g";
1919 };
2020
21− nativeBuildInputs = [ wafHook ];
21+ nativeBuildInputs = [ wafHook intltool ];
2222 buildInputs = [
23− docbook2x libxslt gnome-doc-utils intltool dbus-glib hicolor-icon-theme
23+ docbook2x libxslt gnome-doc-utils dbus-glib hicolor-icon-theme
2424 ];
2525
2626 propagatedBuildInputs = with pythonPackages; [ pygobject2 pygtk pyxdg gnome_python dbus-python ];
pkgs/applications/misc/kitty/default.nix+3−3
@@ -7,8 +7,8 @@
77
88with python3Packages;
99buildPythonApplication rec {
10+ pname = "kitty";
1011 version = "0.13.3";
11− name = "kitty-${version}";
1212 format = "other";
1313
1414 src = fetchFromGitHub {
@@ -24,7 +24,7 @@ buildPythonApplication rec {
2424 wayland-protocols wayland dbus
2525 ];
2626
27− nativeBuildInputs = [ pkgconfig which sphinx ];
27+ nativeBuildInputs = [ pkgconfig which sphinx ncurses ];
2828
2929 outputs = [ "out" "terminfo" ];
3030
@@ -36,7 +36,7 @@ buildPythonApplication rec {
3636 ];
3737
3838 buildPhase = ''
39− python3 setup.py linux-package
39+ ${python.interpreter} setup.py linux-package
4040 '';
4141
4242 installPhase = ''
pkgs/applications/misc/octoprint/default.nix+8−3
@@ -32,14 +32,17 @@ let
3232 "flask"
3333 "future"
3434 "futures"
35+ "monotonic"
3536 "pkginfo"
3637 "psutil"
3738 "pyserial"
3839 "python-dateutil"
3940 "requests"
4041 "rsa"
42+ "sarge"
4143 "scandir"
4244 "semantic_version"
45+ "watchdog"
4346 "websocket-client"
4447 "werkzeug"
4548 "wrapt"
@@ -47,13 +50,13 @@ let
4750
4851in py.pkgs.buildPythonApplication rec {
4952 pname = "OctoPrint";
50− version = "1.3.9";
53+ version = "1.3.10";
5154
5255 src = fetchFromGitHub {
5356 owner = "foosel";
5457 repo = "OctoPrint";
5558 rev = version;
56− sha256 = "1yqbsfmkx4wiykjrh66a05lhn15qhpc9ay67l37kv8bhdqf2xkj4";
59+ sha256 = "1pvh7ay76zrvfzcsadh3sl48sgf3by9vpiaqlrkscsw02zirx9r7";
5760 };
5861
5962 propagatedBuildInputs = with py.pkgs; [
@@ -75,7 +78,9 @@ in py.pkgs.buildPythonApplication rec {
7578 setup.py
7679 '';
7780
78− checkPhase = "nosetests";
81+ checkPhase = ''
82+ HOME=$(mktemp -d) nosetests
83+ '';
7984
8085 meta = with stdenv.lib; {
8186 homepage = https://octoprint.org/;
pkgs/applications/misc/pcmanfm/default.nix+1−1
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313 sha256 = "0mb8hg76x1z0szdyl0w7jpz0bdblc6a29is1vvnh79z37qxh8138";
1414 };
1515
16− buildInputs = [ glib gtk libfm' libX11 pango gnome3.defaultIconTheme ];
16+ buildInputs = [ glib gtk libfm' libX11 pango gnome3.adwaita-icon-theme ];
1717 nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool ];
1818
1919 configureFlags = optional withGtk3 "--with-gtk=3";
pkgs/applications/misc/safeeyes/default.nix+1−1
@@ -17,7 +17,7 @@ in buildPythonApplication rec {
1717 buildInputs = [
1818 gtk3
1919 gobject-introspection
20− gnome3.defaultIconTheme
20+ gnome3.adwaita-icon-theme
2121 gnome3.adwaita-icon-theme
2222 ];
2323
pkgs/applications/misc/tootle/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchFromGitHub
2−, meson, ninja, pkgconfig, python3
2+, meson, ninja, pkgconfig, python3, libgee, gsettings-desktop-schemas
33, gnome3, pantheon, gobject-introspection, wrapGAppsHook
44, gtk3, json-glib, glib, glib-networking, hicolor-icon-theme
55}:
@@ -28,7 +28,7 @@ in stdenv.mkDerivation rec {
2828 ];
2929 buildInputs = [
3030 gtk3 pantheon.granite json-glib glib glib-networking hicolor-icon-theme
31− gnome3.libgee gnome3.libsoup gnome3.gsettings-desktop-schemas
31+ libgee gnome3.libsoup gsettings-desktop-schemas
3232 ];
3333
3434 postPatch = ''
pkgs/applications/networking/browsers/brave/default.nix+1−1
@@ -89,7 +89,7 @@ in stdenv.mkDerivation rec {
8989
9090 nativeBuildInputs = [ dpkg wrapGAppsHook ];
9191
92− buildInputs = [ glib gnome3.gsettings_desktop_schemas gnome3.defaultIconTheme ];
92+ buildInputs = [ glib gnome3.gsettings_desktop_schemas gnome3.adwaita-icon-theme ];
9393
9494 unpackPhase = "dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner";
9595
pkgs/applications/networking/browsers/chromium/default.nix+1−1
@@ -84,7 +84,7 @@ in stdenv.mkDerivation {
8484 gsettings-desktop-schemas glib gtk3
8585
8686 # needed for XDG_ICON_DIRS
87− gnome3.defaultIconTheme
87+ gnome3.adwaita-icon-theme
8888 ];
8989
9090 outputs = ["out" "sandbox"];
pkgs/applications/networking/browsers/eolie/default.nix+1
@@ -28,6 +28,7 @@ python3.pkgs.buildPythonApplication rec {
2828
2929 buildInputs = with gst_all_1; [
3030 glib-networking
31+ gobject-introspection
3132 gst-libav
3233 gst-plugins-base
3334 gst-plugins-ugly
pkgs/applications/networking/browsers/firefox-bin/default.nix+2−2
@@ -31,7 +31,7 @@
3131, libgnome
3232, libgnomeui
3333, libnotify
34−, defaultIconTheme
34+, gnome3
3535, libGLU_combined
3636, nspr
3737, nss
@@ -142,7 +142,7 @@ stdenv.mkDerivation {
142142
143143 inherit gtk3;
144144
145− buildInputs = [ wrapGAppsHook gtk3 defaultIconTheme ];
145+ buildInputs = [ wrapGAppsHook gtk3 gnome3.adwaita-icon-theme ];
146146
147147 # "strip" after "patchelf" may break binaries.
148148 # See: https://github.com/NixOS/patchelf/issues/10
pkgs/applications/networking/browsers/firefox/wrapper.nix+1−1
@@ -131,7 +131,7 @@ let
131131 --set GDK_BACKEND "wayland" \
132132 ''}${lib.optionalString (browser ? gtk3)
133133 ''--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
134− --suffix XDG_DATA_DIRS : '${gnome3.defaultIconTheme}/share'
134+ --suffix XDG_DATA_DIRS : '${gnome3.adwaita-icon-theme}/share'
135135 ''
136136 }
137137
pkgs/applications/networking/browsers/google-chrome/default.nix+1−1
@@ -77,7 +77,7 @@ in stdenv.mkDerivation rec {
7777 gsettings-desktop-schemas glib gtk
7878
7979 # needed for XDG_ICON_DIRS
80− gnome.defaultIconTheme
80+ gnome.adwaita-icon-theme
8181 ];
8282
8383 unpackPhase = ''
pkgs/applications/networking/browsers/midori/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, cmake, ninja, pkgconfig, intltool, vala, wrapGAppsHook, gcr
1+{ stdenv, fetchurl, cmake, ninja, pkgconfig, intltool, vala, wrapGAppsHook, gcr, libpeas
22, gtk3, webkitgtk, sqlite, gsettings-desktop-schemas, libsoup, glib-networking, gnome3
33}:
44
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717
1818 buildInputs = [
1919 gtk3 webkitgtk sqlite gsettings-desktop-schemas gcr
20− (libsoup.override { gnomeSupport = true; }) gnome3.libpeas
20+ (libsoup.override { gnomeSupport = true; }) libpeas
2121 glib-networking
2222 ];
2323
pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix+2−2
@@ -39,7 +39,7 @@
3939# Wrapper runtime
4040, coreutils
4141, glibcLocales
42−, defaultIconTheme
42+, gnome3
4343, runtimeShell
4444, shared-mime-info
4545, gsettings-desktop-schemas
@@ -252,7 +252,7 @@ stdenv.mkDerivation rec {
252252 EOF
253253
254254 WRAPPER_XDG_DATA_DIRS=${concatMapStringsSep ":" (x: "${x}/share") [
255− defaultIconTheme
255+ gnome3.adwaita-icon-theme
256256 shared-mime-info
257257 ]}
258258 WRAPPER_XDG_DATA_DIRS+=":"${concatMapStringsSep ":" (x: "${x}/share/gsettings-schemas/${x.name}") [
pkgs/applications/networking/feedreaders/feedreader/default.nix+6−7
@@ -1,8 +1,7 @@
1−{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, vala, gettext, python3
2−, appstream-glib, desktop-file-utils, wrapGAppsHook, curl, gnome3, gst_all_1
3−, json-glib, libnotify, libsecret, sqlite, gumbo, glib, gtk3, libgee, libpeas
4−, libsoup, librest, webkitgtk, gsettings-desktop-schemas, gdk_pixbuf, libxml2
5−, hicolor-icon-theme
1+{ stdenv, fetchFromGitHub, fetchpatch, meson, ninja, pkgconfig, vala, gettext, python3
2+, appstream-glib, desktop-file-utils, glibcLocales, wrapGAppsHook
3+, gtk3, libgee, libpeas, librest, webkitgtk, gsettings-desktop-schemas
4+, curl, glib, gnome3, gst_all_1, json-glib, libnotify, libsecret, sqlite, gumbo, libxml2
65}:
76
87stdenv.mkDerivation rec {
@@ -23,8 +22,8 @@ stdenv.mkDerivation rec {
2322
2423 buildInputs = [
2524 curl glib json-glib libnotify libsecret sqlite gumbo gtk3
26− libgee libpeas libsoup librest webkitgtk gsettings-desktop-schemas
27− gdk_pixbuf gnome3.gnome-online-accounts hicolor-icon-theme
25+ libgee libpeas gnome3.libsoup librest webkitgtk gsettings-desktop-schemas
26+ gnome3.gnome-online-accounts
2827 ] ++ (with gst_all_1; [
2928 gstreamer gst-plugins-base gst-plugins-good
3029 ]);
pkgs/applications/networking/ftp/taxi/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, python3
2−, gtk3, gnome3, libsoup, libsecret, gobject-introspection, wrapGAppsHook }:
2+, gtk3, libgee, libsoup, libsecret, gobject-introspection, wrapGAppsHook }:
33
44stdenv.mkDerivation rec {
55 pname = "taxi";
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
2626
2727 buildInputs = [
2828 pantheon.granite
29− gnome3.libgee
29+ libgee
3030 gtk3
3131 libsecret
3232 libsoup
pkgs/applications/networking/instant-messengers/coyim/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, buildGoPackage, fetchFromGitHub, pkgconfig,
2− cairo, gdk_pixbuf, glib, gnome3, wrapGAppsHook }:
2+ cairo, gdk_pixbuf, glib, gnome3, wrapGAppsHook, gtk3 }:
33
44buildGoPackage rec {
55 name = "coyim-${version}";
@@ -14,7 +14,7 @@ buildGoPackage rec {
1414 sha256 = "1sna1n9dz1crws6cb1yjhy2kznbngjlbiw2diycshvbfigf7y7xl";
1515 };
1616
17− nativeBuildInputs = [ pkgconfig wrapGAppsHook glib cairo gdk_pixbuf gnome3.gtk gnome3.defaultIconTheme ];
17+ nativeBuildInputs = [ pkgconfig wrapGAppsHook glib cairo gdk_pixbuf gtk3 gnome3.adwaita-icon-theme ];
1818
1919 meta = with stdenv.lib; {
2020 description = "a safe and secure chat client";
pkgs/applications/networking/instant-messengers/dino/default.nix+3−3
@@ -2,7 +2,7 @@
22, vala, cmake, ninja, wrapGAppsHook, pkgconfig, gettext
33, gobject-introspection, gnome3, glib, gdk_pixbuf, gtk3, glib-networking
44, xorg, libXdmcp, libxkbcommon
5−, libnotify, libsoup
5+, libnotify, libsoup, libgee
66, libgcrypt
77, epoxy
88, at-spi2-core
@@ -39,8 +39,8 @@ stdenv.mkDerivation rec {
3939 gobject-introspection
4040 glib-networking
4141 glib
42− gnome3.libgee
43− gnome3.defaultIconTheme
42+ libgee
43+ gnome3.adwaita-icon-theme
4444 sqlite
4545 gdk_pixbuf
4646 gtk3
pkgs/applications/networking/instant-messengers/ekiga/default.nix+1−1
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515 buildInputs = [ cyrus_sasl gettext openldap ptlib opal libXv rarian intltool
1616 evolution-data-server gnome-doc-utils avahi
1717 libsigcxx gtk dbus-glib libnotify libXext xorgproto sqlite
18− gnome3.libsoup glib gnome3.defaultIconTheme boost
18+ gnome3.libsoup glib gnome3.adwaita-icon-theme boost
1919 autoreconfHook pkgconfig libxml2 unixODBC db nspr
2020 nss zlib libsecret libXrandr which libxslt libtasn1
2121 gmp nettle makeWrapper ]
pkgs/applications/networking/instant-messengers/gajim/default.nix+2−2
@@ -1,7 +1,7 @@
11{ lib, fetchurl, gettext, wrapGAppsHook
22
33# Native dependencies
4−, python3, gtk3, gobject-introspection, defaultIconTheme
4+, python3, gtk3, gobject-introspection, gnome3
55
66# Test dependencies
77, xvfb_run, dbus
@@ -33,7 +33,7 @@ python3.pkgs.buildPythonApplication rec {
3333 '';
3434
3535 buildInputs = [
36− gobject-introspection gtk3 defaultIconTheme
36+ gobject-introspection gtk3 gnome3.adwaita-icon-theme
3737 ] ++ lib.optionals enableJingle [ farstream gstreamer gst-plugins-base gst-libav gst-plugins-ugly ]
3838 ++ lib.optional enableSecrets libsecret
3939 ++ lib.optional enableSpelling gspell
pkgs/applications/networking/mailreaders/astroid/default.nix+7−4
@@ -1,5 +1,6 @@
11{ stdenv, fetchFromGitHub, cmake, pkgconfig, gnome3, gmime3, webkitgtk
22, libsass, notmuch, boost, wrapGAppsHook, glib-networking, protobuf, vim_configurable
3+, gtkmm3, libpeas, gsettings-desktop-schemas
34, makeWrapper, python3, python3Packages
45, vim ? vim_configurable.override {
56 features = "normal";
@@ -21,10 +22,12 @@ stdenv.mkDerivation rec {
2122
2223 nativeBuildInputs = [ cmake ronn pkgconfig wrapGAppsHook ];
2324
24− buildInputs = [ gnome3.gtkmm gmime3 webkitgtk libsass gnome3.libpeas
25− python3 python3Packages.pygobject3
26− notmuch boost gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme
27− glib-networking protobuf ] ++ (if vim == null then [] else [ vim ]);
25+ buildInputs = [
26+ gtkmm3 gmime3 webkitgtk libsass libpeas
27+ python3 python3Packages.pygobject3
28+ notmuch boost gsettings-desktop-schemas gnome3.adwaita-icon-theme
29+ glib-networking protobuf
30+ ] ++ (if vim == null then [] else [ vim ]);
2831
2932 postPatch = ''
3033 sed -i "s~gvim ~${vim}/bin/vim -g ~g" src/config.cc
pkgs/applications/networking/mailreaders/mailnag/default.nix+3−2
@@ -18,13 +18,14 @@ in pythonPackages.buildPythonApplication rec {
1818 };
1919
2020 buildInputs = [
21− gettext gtk3 gdk_pixbuf libnotify gst_all_1.gstreamer
21+ gtk3 gdk_pixbuf libnotify gst_all_1.gstreamer
2222 gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
2323 gst_all_1.gst-plugins-bad
24− gnome3.defaultIconTheme
24+ gnome3.adwaita-icon-theme
2525 ] ++ stdenv.lib.optional withGnomeKeyring libgnome-keyring3;
2626
2727 nativeBuildInputs = [
28+ gettext
2829 wrapGAppsHook
2930 ];
3031
pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix+2−2
@@ -30,7 +30,7 @@
3030, libcanberra-gtk2
3131, libgnome
3232, libgnomeui
33−, defaultIconTheme
33+, gnome3
3434, libGLU_combined
3535, nspr
3636, nss
@@ -118,7 +118,7 @@ stdenv.mkDerivation {
118118 stdenv.cc.cc
119119 ];
120120
121− buildInputs = [ gtk3 defaultIconTheme ];
121+ buildInputs = [ gtk3 gnome3.adwaita-icon-theme ];
122122
123123 nativeBuildInputs = [ makeWrapper ];
124124
pkgs/applications/networking/mailreaders/thunderbird/default.nix+1−1
@@ -42,7 +42,7 @@ in stdenv.mkDerivation rec {
4242 hunspell libevent libstartup_notification /* cairo */
4343 icu libpng jemalloc
4444 ]
45− ++ lib.optionals enableGTK3 [ gtk3 gnome3.defaultIconTheme ];
45+ ++ lib.optionals enableGTK3 [ gtk3 gnome3.adwaita-icon-theme ];
4646
4747 # from firefox + m4 + wrapperTool
4848 nativeBuildInputs = [ m4 autoconf213 which gnused pkgconfig perl python wrapperTool cargo rustc ];
pkgs/applications/networking/remote/remmina/default.nix+2−2
@@ -6,7 +6,7 @@
66, libsecret, libsoup, spice-protocol, spice-gtk, epoxy, at-spi2-core
77, openssl, gsettings-desktop-schemas, json-glib
88# The themes here are soft dependencies; only icons are missing without them.
9−, hicolor-icon-theme, adwaita-icon-theme
9+, hicolor-icon-theme, gnome3
1010}:
1111
1212with stdenv.lib;
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
3030 pcre libdbusmenu-gtk3 libappindicator-gtk3
3131 libvncserver libpthreadstubs libXdmcp libxkbcommon
3232 libsecret libsoup spice-protocol spice-gtk epoxy at-spi2-core
33− openssl hicolor-icon-theme adwaita-icon-theme json-glib
33+ openssl hicolor-icon-theme gnome3.adwaita-icon-theme json-glib
3434 ];
3535
3636 cmakeFlags = [
pkgs/applications/networking/weather/meteo/default.nix+5−1
@@ -1,4 +1,6 @@
1−{ stdenv, fetchFromGitLab, vala, python3, pkgconfig, meson, ninja, gtk3, geocode-glib, json-glib, libsoup, webkitgtk, libappindicator, desktop-file-utils, hicolor-icon-theme, appstream, wrapGAppsHook }:
1+{ stdenv, fetchFromGitLab, vala, python3, pkgconfig, meson, ninja, gtk3
2+, json-glib, libsoup, clutter, clutter-gtk, libchamplain, webkitgtk, geocode-glib
3+, libappindicator, desktop-file-utils, appstream, gobject-introspection, wrapGAppsHook, hicolor-icon-theme }:
24
35stdenv.mkDerivation rec {
46 pname = "meteo";
@@ -23,6 +25,8 @@ stdenv.mkDerivation rec {
2325 ];
2426
2527 buildInputs = [
28+ clutter
29+ clutter-gtk
2630 geocode-glib
2731 gtk3
2832 hicolor-icon-theme
pkgs/applications/office/abiword/default.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv, fetchurl, pkgconfig, gtk3, fribidi
22, libpng, popt, libgsf, enchant, wv, librsvg, bzip2, libjpeg, perl
3−, boost, libxslt, goffice, wrapGAppsHook, iconTheme
3+, boost, libxslt, goffice, wrapGAppsHook, gnome3
44}:
55
66stdenv.mkDerivation rec {
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
2626
2727 buildInputs = [
2828 gtk3 librsvg bzip2 fribidi libpng popt
29− libgsf enchant wv libjpeg perl boost libxslt goffice iconTheme
29+ libgsf enchant wv libjpeg perl boost libxslt goffice gnome3.adwaita-icon-theme
3030 ];
3131
3232 meta = with stdenv.lib; {
pkgs/applications/office/gnumeric/default.nix+1−1
@@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
2020
2121 # ToDo: optional libgda, introspection?
2222 buildInputs = [
23− goffice gtk3 gnome3.defaultIconTheme
23+ goffice gtk3 gnome3.adwaita-icon-theme
2424 python pygobject3
2525 ] ++ (with perlPackages; [ perl XMLParser ]);
2626
pkgs/applications/office/grisbi/default.nix+1−1
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212
1313 nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
1414 buildInputs = [ gtk libofx intltool hicolor-icon-theme libsoup
15− gnome3.defaultIconTheme ];
15+ gnome3.adwaita-icon-theme ];
1616
1717 meta = with stdenv.lib; {
1818 description = "A personnal accounting application.";
pkgs/applications/office/homebank/default.nix+1−1
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010
1111 nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
1212 buildInputs = [ gtk libofx intltool hicolor-icon-theme libsoup
13− gnome3.defaultIconTheme ];
13+ gnome3.adwaita-icon-theme ];
1414
1515 meta = with stdenv.lib; {
1616 description = "Free, easy, personal accounting for everyone";
pkgs/applications/office/libreoffice/default.nix+2−2
@@ -12,7 +12,7 @@
1212, libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf
1313, librevenge, libe-book, libmwaw, glm, glew, gst_all_1
1414, gdb, commonsLogging, librdf_rasqal, wrapGAppsHook
15−, defaultIconTheme, glib, ncurses, epoxy, gpgme
15+, gnome3, glib, ncurses, epoxy, gpgme
1616, langs ? [ "ca" "cs" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "nl" "pl" "ru" "sl" "zh-CN" ]
1717, withHelp ? true
1818, kdeIntegration ? false
@@ -277,7 +277,7 @@ in stdenv.mkDerivation rec {
277277 mdds bluez5 libcmis libwps libabw libzmf libtool
278278 libxshmfence libatomic_ops graphite2 harfbuzz gpgme utillinux
279279 librevenge libe-book libmwaw glm glew ncurses epoxy
280− libodfgen CoinMP librdf_rasqal defaultIconTheme gettext
280+ libodfgen CoinMP librdf_rasqal gnome3.adwaita-icon-theme gettext
281281 ]
282282 ++ lib.optional kdeIntegration kdelibs4;
283283 nativeBuildInputs = [ wrapGAppsHook gdb ];
pkgs/applications/office/libreoffice/still.nix+2−2
@@ -12,7 +12,7 @@
1212, libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf
1313, librevenge, libe-book, libmwaw, glm, glew, gst_all_1
1414, gdb, commonsLogging, librdf_rasqal, wrapGAppsHook
15−, defaultIconTheme, glib, ncurses, epoxy, gpgme
15+, gnome3, glib, ncurses, epoxy, gpgme
1616, langs ? [ "ca" "cs" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "nl" "pl" "ru" "sl" "zh-CN" ]
1717, withHelp ? true
1818, kdeIntegration ? false
@@ -272,7 +272,7 @@ in stdenv.mkDerivation rec {
272272 mdds bluez5 libcmis libwps libabw libzmf libtool
273273 libxshmfence libatomic_ops graphite2 harfbuzz gpgme utillinux
274274 librevenge libe-book libmwaw glm glew ncurses epoxy
275− libodfgen CoinMP librdf_rasqal defaultIconTheme gettext
275+ libodfgen CoinMP librdf_rasqal gnome3.adwaita-icon-theme gettext
276276 ]
277277 ++ lib.optional kdeIntegration kdelibs4;
278278 nativeBuildInputs = [ wrapGAppsHook gdb ];
pkgs/applications/office/paperwork/default.nix+4−4
@@ -6,13 +6,13 @@
66
77python3Packages.buildPythonApplication rec {
88 inherit (python3Packages.paperwork-backend) version src;
9− name = "paperwork-${version}";
9+ pname = "paperwork";
1010
1111 sourceRoot = "source/paperwork-gtk";
1212
1313 # Patch out a few paths that assume that we're using the FHS:
1414 postPatch = ''
15− themeDir="$(echo "${gnome3.defaultIconTheme}/share/icons/"*)"
15+ themeDir="$(echo "${gnome3.adwaita-icon-theme}/share/icons/"*)"
1616 sed -i -e "s,/usr/share/icons/gnome,$themeDir," src/paperwork/deps.py
1717
1818 sed -i -e 's,sys\.prefix,"",g' \
@@ -46,9 +46,9 @@ python3Packages.buildPythonApplication rec {
4646 paths = lib.collect lib.isDerivation aspellDicts;
4747 }}/lib/aspell";
4848
49− checkInputs = [ xvfb_run dbus.daemon ];
49+ checkInputs = [ xvfb_run dbus.daemon ] ++ (with python3Packages; [ paperwork-backend ]);
5050 buildInputs = [
51− gnome3.defaultIconTheme hicolor-icon-theme libnotify librsvg
51+ gnome3.adwaita-icon-theme hicolor-icon-theme libnotify librsvg
5252 ];
5353
5454 # A few parts of chkdeps need to have a display and a dbus session, so we not
pkgs/applications/office/tryton/default.nix+1−1
@@ -32,7 +32,7 @@ python2Packages.buildPythonApplication rec {
3232 buildInputs = [
3333 atk
3434 gtk3
35− gnome3.defaultIconTheme
35+ gnome3.adwaita-icon-theme
3636 gtkspell3
3737 goocanvas2
3838 ];
pkgs/applications/science/math/nasc/default.nix+4−2
@@ -4,6 +4,8 @@
44, gtk3
55, pantheon
66, gnome3
7+, gtksourceview
8+, libgee
79, cmake
810, libqalculate
911, gobject-introspection
@@ -35,8 +37,8 @@ stdenv.mkDerivation rec {
3537
3638 buildInputs = [
3739 pantheon.elementary-icon-theme
38− gnome3.gtksourceview
39− gnome3.libgee
40+ gtksourceview
41+ libgee
4042 gnome3.libsoup
4143 pantheon.granite
4244 gtk3
pkgs/applications/science/math/wxmaxima/default.nix+1−1
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313 sha256 = "0s7bdykc77slqix28cyaa6x8wvxrn8461mkdgxflvi2apwsl56aa";
1414 };
1515
16− buildInputs = [ wxGTK maxima gnome3.defaultIconTheme ];
16+ buildInputs = [ wxGTK maxima gnome3.adwaita-icon-theme ];
1717
1818 nativeBuildInputs = [ wrapGAppsHook cmake gettext ];
1919
pkgs/applications/science/spyder/default.nix+32−10
@@ -1,22 +1,44 @@
11{ stdenv, python3, makeDesktopItem }:
22
3−python3.pkgs.buildPythonApplication rec {
3+let
4+
5+ spyder-kernels = with python3.pkgs; buildPythonPackage rec {
6+ pname = "spyder-kernels";
7+ version = "0.4.2";
8+
9+ src = fetchPypi {
10+ inherit pname version;
11+ sha256 = "a13cefb569ef9f63814cb5fcf3d0db66e09d2d7e6cc68c703d5118b2d7ba062b";
12+ };
13+
14+ propagatedBuildInputs = [
15+ cloudpickle
16+ ipykernel
17+ wurlitzer
18+ ];
19+
20+ # No tests
21+ doCheck = false;
22+
23+ meta = {
24+ description = "Jupyter kernels for Spyder's console";
25+ homepage = https://github.com/spyder-ide/spyder-kernels;
26+ license = stdenv.lib.licenses.mit;
27+ };
28+ };
29+
30+in python3.pkgs.buildPythonApplication rec {
431 pname = "spyder";
5− version = "3.2.8";
32+ version = "3.3.3";
633
734 src = python3.pkgs.fetchPypi {
835 inherit pname version;
9− sha256 = "0iwcby2bxvayz0kp282yh864br55w6gpd8rqcdj1cp3jbn3q6vg5";
36+ sha256 = "ef31de03cf6f149077e64ed5736b8797dbd278e3c925e43f0bfc31bb55f6e5ba";
1037 };
1138
12− # Somehow setuptools can't find pyqt5. Maybe because the dist-info folder is missing?
13− postPatch = ''
14− sed -i -e '/pyqt5/d' setup.py
15− '';
16−
1739 propagatedBuildInputs = with python3.pkgs; [
18− jedi pycodestyle psutil pyflakes rope numpy scipy matplotlib pylint
19− numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle
40+ jedi pycodestyle psutil pyflakes rope numpy scipy matplotlib pylint keyring
41+ numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle spyder-kernels
2042 ];
2143
2244 # There is no test for spyder
pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix+2
@@ -15,6 +15,8 @@ python2Packages.buildPythonApplication rec {
1515
1616 buildInputs = [ git graphviz ];
1717
18+ checkInputs = [ git ];
19+
1820 postFixup = ''
1921 wrapProgram $out/bin/git-big-picture \
2022 --prefix PATH ":" ${ stdenv.lib.makeBinPath buildInputs }
pkgs/applications/version-management/meld/default.nix+1−1
@@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec {
1616 intltool itstool libxml2 gobject-introspection wrapGAppsHook
1717 ];
1818 buildInputs = [
19− gtk3 gtksourceview gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme
19+ gtk3 gtksourceview gnome3.gsettings-desktop-schemas gnome3.adwaita-icon-theme
2020 ];
2121 propagatedBuildInputs = with python3.pkgs; [ pygobject3 pycairo ];
2222 checkInputs = [ xvfb_run python3.pkgs.pytest dbus ];
pkgs/applications/video/pitivi/default.nix+1−1
@@ -48,7 +48,7 @@ in python3Packages.buildPythonApplication rec {
4848
4949 buildInputs = [
5050 gobject-introspection gtk3 librsvg gnome3.gnome-desktop gsound
51− gnome3.defaultIconTheme
51+ gnome3.adwaita-icon-theme
5252 gnome3.gsettings-desktop-schemas libnotify
5353 gst-transcoder
5454 ] ++ (with gst_all_1; [
pkgs/applications/video/screenkey/default.nix+2−2
@@ -9,7 +9,7 @@
99, libX11
1010, libXtst
1111, wrapGAppsHook
12−, defaultIconTheme
12+, gnome3
1313, hicolor-icon-theme
1414}:
1515buildPythonApplication rec {
@@ -39,7 +39,7 @@ buildPythonApplication rec {
3939 ];
4040
4141 buildInputs = [
42− defaultIconTheme
42+ gnome3.adwaita-icon-theme
4343 hicolor-icon-theme
4444 ];
4545
pkgs/applications/virtualization/open-vm-tools/default.nix+2−2
@@ -1,7 +1,7 @@
11{ stdenv, lib, fetchFromGitHub, makeWrapper, autoreconfHook,
22 fuse, libmspack, openssl, pam, xercesc, icu, libdnet, procps,
33 libX11, libXext, libXinerama, libXi, libXrender, libXrandr, libXtst,
4− pkgconfig, glib, gtk, gtkmm, iproute, dbus, systemd, which,
4+ pkgconfig, glib, gtk3, gtkmm3, iproute, dbus, systemd, which,
55 withX ? true }:
66
77stdenv.mkDerivation rec {
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
2121
2222 nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig ];
2323 buildInputs = [ fuse glib icu libdnet libmspack openssl pam procps xercesc ]
24− ++ lib.optionals withX [ gtk gtkmm libX11 libXext libXinerama libXi libXrender libXrandr libXtst ];
24+ ++ lib.optionals withX [ gtk3 gtkmm3 libX11 libXext libXinerama libXi libXrender libXrandr libXtst ];
2525
2626 patches = [ ./recognize_nixos.patch ];
2727 postPatch = ''
pkgs/applications/virtualization/virt-manager/default.nix+1−1
@@ -24,7 +24,7 @@ python3Packages.buildPythonApplication rec {
2424 ];
2525
2626 buildInputs =
27− [ libvirt-glib vte dconf gtk-vnc gnome3.defaultIconTheme avahi
27+ [ libvirt-glib vte dconf gtk-vnc gnome3.adwaita-icon-theme avahi
2828 gsettings-desktop-schemas libosinfo gtk3
2929 ] ++ optional spiceSupport spice-gtk;
3030
pkgs/build-support/build-fhs-userenv/env.nix+1
@@ -196,4 +196,5 @@ in stdenv.mkDerivation {
196196 ${if isMultiBuild then extraBuildCommandsMulti else ""}
197197 '';
198198 preferLocalBuild = true;
199+ allowSubstitutes = false;
199200}
pkgs/build-support/buildenv/builder.pl+12
@@ -26,6 +26,13 @@ sub isInPathsToLink {
2626 return 0;
2727}
2828
29+# Similar to `lib.isStorePath`
30+sub isStorePath {
31+ my $path = shift;
32+ my $storePath = "@storeDir@";
33+
34+ return substr($path, 0, 1) eq "/" && dirname($path) eq $storePath;
35+}
2936
3037# For each activated package, determine what symlinks to create.
3138
@@ -84,6 +91,11 @@ sub checkCollision {
8491sub findFiles {
8592 my ($relName, $target, $baseName, $ignoreCollisions, $checkCollisionContents, $priority) = @_;
8693
94+ # The store path must not be a file
95+ if (-f $target && isStorePath $target) {
96+ die "The store path $target is a file and can't be merged into an environment using pkgs.buildEnv!";
97+ }
98+
8799 # Urgh, hacky...
88100 return if
89101 $relName eq "/propagated-build-inputs" ||
pkgs/build-support/buildenv/default.nix+10−2
@@ -2,7 +2,7 @@
22# a fork of the buildEnv in the Nix distribution. Most changes should
33# eventually be merged back into the Nix distribution.
44
5−{ buildPackages, runCommand, lib }:
5+{ buildPackages, runCommand, lib, substituteAll }:
66
77lib.makeOverridable
88({ name
@@ -43,6 +43,13 @@ lib.makeOverridable
4343, meta ? {}
4444}:
4545
46+let
47+ builder = substituteAll {
48+ src = ./builder.pl;
49+ inherit (builtins) storeDir;
50+ };
51+in
52+
4653runCommand name
4754 rec {
4855 inherit manifest ignoreCollisions checkCollisionContents passthru
@@ -63,10 +70,11 @@ runCommand name
6370 priority = drv.meta.priority or 5;
6471 }) paths);
6572 preferLocalBuild = true;
73+ allowSubstitutes = false;
6674 # XXX: The size is somewhat arbitrary
6775 passAsFile = if builtins.stringLength pkgs >= 128*1024 then [ "pkgs" ] else null;
6876 }
6977 ''
70− ${buildPackages.perl}/bin/perl -w ${./builder.pl}
78+ ${buildPackages.perl}/bin/perl -w ${builder}
7179 eval "$postBuild"
7280 '')
pkgs/build-support/substitute-files/substitute-all-files.nix+1
@@ -22,4 +22,5 @@ stdenv.mkDerivation ({
2222 eval "$postInstall"
2323 '';
2424 preferLocalBuild = true;
25+ allowSubstitutes = false;
2526} // args)
pkgs/build-support/substitute/substitute-all.nix+1
@@ -8,4 +8,5 @@ stdenvNoCC.mkDerivation ({
88 builder = ./substitute-all.sh;
99 inherit (args) src;
1010 preferLocalBuild = true;
11+ allowSubstitutes = false;
1112} // args)
pkgs/desktops/gnome-3/apps/accerciser/default.nix+1−1
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818 buildInputs = [
1919 gtk3 libxml2 python3Packages.python python3Packages.pyatspi
2020 python3Packages.pygobject3 python3Packages.ipython
21− at-spi2-core dbus libwnck3 gnome3.defaultIconTheme
21+ at-spi2-core dbus libwnck3 gnome3.adwaita-icon-theme
2222 ];
2323
2424 wrapPrefixVariables = [ "PYTHONPATH" ];
pkgs/desktops/gnome-3/apps/evolution/default.nix+11−9
@@ -1,5 +1,7 @@
11{ stdenv, cmake, ninja, intltool, fetchurl, libxml2, webkitgtk, highlight
2−, pkgconfig, gtk3, glib, libnotify, gtkspell3
2+, pkgconfig, gtk3, glib, libnotify, gtkspell3, evolution-data-server
3+, adwaita-icon-theme, gnome-desktop, libgdata
4+, libgweather, glib-networking, gsettings-desktop-schemas
35, wrapGAppsHook, itstool, shared-mime-info, libical, db, gcr, sqlite
46, gnome3, librsvg, gdk_pixbuf, libsecret, nss, nspr, icu
57, libcanberra-gtk3, bogofilter, gst_all_1, procps, p11-kit, openldap }:
@@ -14,17 +16,17 @@ in stdenv.mkDerivation rec {
1416 sha256 = "1hhxj3rh921pp3l3c5k33bdypcas1p66krzs65k1qn82c5fpgl2h";
1517 };
1618
17− propagatedUserEnvPkgs = [ gnome3.evolution-data-server ];
19+ propagatedUserEnvPkgs = [ evolution-data-server ];
1820
1921 buildInputs = [
20− gtk3 glib gdk_pixbuf gnome3.defaultIconTheme librsvg db icu
21− gnome3.evolution-data-server libsecret libical gcr
22− webkitgtk shared-mime-info gnome3.gnome-desktop gtkspell3
23− libcanberra-gtk3 bogofilter gnome3.libgdata sqlite
22+ gtk3 glib gdk_pixbuf adwaita-icon-theme librsvg db icu
23+ evolution-data-server libsecret libical gcr
24+ webkitgtk shared-mime-info gnome-desktop gtkspell3
25+ libcanberra-gtk3 bogofilter libgdata sqlite
2426 gst_all_1.gstreamer gst_all_1.gst-plugins-base p11-kit
25− nss nspr libnotify procps highlight gnome3.libgweather
26− gnome3.gsettings-desktop-schemas
27− gnome3.glib-networking openldap
27+ nss nspr libnotify procps highlight libgweather
28+ gsettings-desktop-schemas
29+ glib-networking openldap
2830 ];
2931
3032 nativeBuildInputs = [ cmake ninja intltool itstool libxml2 pkgconfig wrapGAppsHook ];
pkgs/desktops/gnome-3/apps/file-roller/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, glib, gtk, meson, ninja, pkgconfig, gnome3, gettext, itstool, libxml2, libarchive
1+{ stdenv, fetchurl, glib, gtk3, meson, ninja, pkgconfig, gnome3, gettext, itstool, libxml2, libarchive
22, file, json-glib, python3, wrapGAppsHook, desktop-file-utils, libnotify, nautilus, glibcLocales }:
33
44stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414
1515 nativeBuildInputs = [ meson ninja gettext itstool pkgconfig libxml2 python3 wrapGAppsHook glibcLocales desktop-file-utils ];
1616
17− buildInputs = [ glib gtk json-glib libarchive file gnome3.defaultIconTheme libnotify nautilus ];
17+ buildInputs = [ glib gtk3 json-glib libarchive file gnome3.adwaita-icon-theme libnotify nautilus ];
1818
1919 PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-3.0";
2020
pkgs/desktops/gnome-3/apps/gedit/default.nix+5−4
@@ -1,5 +1,6 @@
11{ stdenv, intltool, fetchurl
2−, pkgconfig, gtk3, glib
2+, pkgconfig, gtk3, glib, adwaita-icon-theme
3+, libpeas, gtksourceview, gsettings-desktop-schemas
34, wrapGAppsHook, itstool, libsoup, libxml2
45, gnome3, gspell }:
56
@@ -16,9 +17,9 @@ stdenv.mkDerivation rec {
1617
1718 buildInputs = [
1819 gtk3 glib
19− gnome3.defaultIconTheme libsoup
20− gnome3.libpeas gnome3.gtksourceview
21− gnome3.gsettings-desktop-schemas gspell
20+ adwaita-icon-theme libsoup
21+ libpeas gtksourceview
22+ gsettings-desktop-schemas gspell
2223 ];
2324
2425 enableParallelBuilding = true;
pkgs/desktops/gnome-3/apps/ghex/default.nix+9−6
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, gnome3, intltool, itstool, libxml2,
1+{ stdenv, fetchurl, pkgconfig, gnome3, intltool, itstool, libxml2, gtk3,
22 wrapGAppsHook }:
33
44stdenv.mkDerivation rec {
@@ -10,13 +10,16 @@ stdenv.mkDerivation rec {
1010 sha256 = "c67450f86f9c09c20768f1af36c11a66faf460ea00fbba628a9089a6804808d3";
1111 };
1212
13− passthru = {
14− updateScript = gnome3.updateScript { packageName = "ghex"; attrPath = "gnome3.ghex"; };
15− };
16−
1713 nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
1814
19− buildInputs = [ gnome3.gtk intltool itstool libxml2 ];
15+ buildInputs = [ gtk3 intltool itstool libxml2 ];
16+
17+ passthru = {
18+ updateScript = gnome3.updateScript {
19+ packageName = "ghex";
20+ attrPath = "gnome3.ghex";
21+ };
22+ };
2023
2124 meta = with stdenv.lib; {
2225 homepage = https://wiki.gnome.org/Apps/Ghex;
pkgs/desktops/gnome-3/apps/glade/default.nix+1−1
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
2222 buildInputs = [
2323 gtk3 glib libxml2 python3 python3.pkgs.pygobject3
2424 gnome3.gsettings-desktop-schemas
25− gdk_pixbuf gnome3.defaultIconTheme
25+ gdk_pixbuf gnome3.adwaita-icon-theme
2626 ];
2727
2828 enableParallelBuilding = true;
pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix+1−1
@@ -31,7 +31,7 @@ in stdenv.mkDerivation rec {
3131 libvirt-glib glib gtk3 gtk-vnc freerdp libxml2
3232 libvirt spice-gtk spice-protocol libsoup json-glib webkitgtk libosinfo systemd
3333 tracker tracker-miners libcap yajl gmp gdbm cyrus_sasl libusb libarchive
34− gnome3.defaultIconTheme librsvg acl libgudev libsecret
34+ gnome3.adwaita-icon-theme librsvg acl libgudev libsecret
3535 libcap_ng numactl xen libapparmor
3636 ];
3737
pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix+3−3
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, meson, ninja, pkgconfig, wrapGAppsHook, libdazzle, libgweather, geoclue2, geocode-glib, python3
2−, gettext, libxml2, gnome3, gtk, evolution-data-server, libsoup
2+, gettext, libxml2, gnome3, gtk3, evolution-data-server, libsoup
33, glib, gnome-online-accounts, gsettings-desktop-schemas }:
44
55let
@@ -22,8 +22,8 @@ in stdenv.mkDerivation rec {
2222
2323 nativeBuildInputs = [ meson ninja pkgconfig gettext libxml2 wrapGAppsHook python3 ];
2424 buildInputs = [
25− gtk evolution-data-server libsoup glib gnome-online-accounts libdazzle libgweather geoclue2 geocode-glib
26− gsettings-desktop-schemas gnome3.defaultIconTheme
25+ gtk3 evolution-data-server libsoup glib gnome-online-accounts libdazzle libgweather geoclue2 geocode-glib
26+ gsettings-desktop-schemas gnome3.adwaita-icon-theme
2727 ];
2828
2929 postPatch = ''
pkgs/desktops/gnome-3/apps/gnome-characters/default.nix+4−4
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gnome3, glib, gtk3, pango, wrapGAppsHook, python3
2−, gobject-introspection, gjs, libunistring }:
2+, gobject-introspection, gjs, libunistring, gsettings-desktop-schemas, adwaita-icon-theme, gnome-desktop }:
33
44stdenv.mkDerivation rec {
55 name = "gnome-characters-${version}";
@@ -24,10 +24,10 @@ stdenv.mkDerivation rec {
2424
2525 nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook python3 gobject-introspection ];
2626 buildInputs = [
27− glib gtk3 gjs pango gnome3.gsettings-desktop-schemas
28− gnome3.defaultIconTheme libunistring
27+ glib gtk3 gjs pango gsettings-desktop-schemas
28+ adwaita-icon-theme libunistring
2929 # typelib
30− gnome3.gnome-desktop
30+ gnome-desktop
3131 ];
3232
3333 mesonFlags = [
pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix+3−2
@@ -1,6 +1,7 @@
11{ stdenv, fetchurl
22, meson, ninja, gettext, pkgconfig, wrapGAppsHook, itstool, desktop-file-utils
33, vala, gobject-introspection, libxml2, gtk3, glib, gsound, sound-theme-freedesktop
4+, gsettings-desktop-schemas, adwaita-icon-theme, gnome-desktop, geocode-glib
45, gnome3, gdk_pixbuf, geoclue2, libgweather }:
56
67stdenv.mkDerivation rec {
@@ -26,8 +27,8 @@ stdenv.mkDerivation rec {
2627 gobject-introspection # for finding vapi files
2728 ];
2829 buildInputs = [
29− gtk3 glib gnome3.gsettings-desktop-schemas gdk_pixbuf gnome3.defaultIconTheme
30− gnome3.gnome-desktop gnome3.geocode-glib geoclue2 libgweather gsound
30+ gtk3 glib gsettings-desktop-schemas gdk_pixbuf adwaita-icon-theme
31+ gnome-desktop geocode-glib geoclue2 libgweather gsound
3132 ];
3233
3334 preFixup = ''
pkgs/desktops/gnome-3/apps/gnome-documents/default.nix+1−1
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
2525 ];
2626 buildInputs = [
2727 gtk3 glib gnome3.gsettings-desktop-schemas
28− gdk_pixbuf gnome3.defaultIconTheme evince
28+ gdk_pixbuf gnome3.adwaita-icon-theme evince
2929 libsoup webkitgtk gjs gobject-introspection
3030 tracker tracker-miners libgdata
3131 gnome-desktop libzapojit libgepub
pkgs/desktops/gnome-3/apps/gnome-logs/default.nix+1−1
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
2020 meson ninja pkgconfig wrapGAppsHook gettext itstool desktop-file-utils
2121 libxml2 libxslt docbook_xsl docbook_xml_dtd_43
2222 ];
23− buildInputs = [ glib gtk3 systemd gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme ];
23+ buildInputs = [ glib gtk3 systemd gnome3.gsettings-desktop-schemas gnome3.adwaita-icon-theme ];
2424
2525 postPatch = ''
2626 chmod +x meson_post_install.py
pkgs/desktops/gnome-3/apps/gnome-maps/default.nix+1−1
@@ -23,7 +23,7 @@ in stdenv.mkDerivation rec {
2323 geocode-glib libchamplain libsoup
2424 gdk_pixbuf librsvg libgweather
2525 gnome3.gsettings-desktop-schemas evolution-data-server
26− gnome-online-accounts gnome3.defaultIconTheme
26+ gnome-online-accounts gnome3.adwaita-icon-theme
2727 webkitgtk
2828 ];
2929
pkgs/desktops/gnome-3/apps/gnome-music/default.nix+2−2
@@ -17,8 +17,8 @@ python3.pkgs.buildPythonApplication rec {
1717
1818 nativeBuildInputs = [ meson ninja gettext itstool pkgconfig libxml2 wrapGAppsHook desktop-file-utils appstream-glib gobject-introspection ];
1919 buildInputs = with gst_all_1; [
20− gtk3 glib libmediaart gnome-online-accounts
21− gdk_pixbuf gnome3.defaultIconTheme python3
20+ gtk3 glib libmediaart gnome-online-accounts gobject-introspection
21+ gdk_pixbuf gnome3.adwaita-icon-theme python3
2222 grilo grilo-plugins libnotify libdazzle libsoup
2323 gnome3.gsettings-desktop-schemas tracker
2424 gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly
pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix+1−1
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 nativeBuildInputs = [ pkgconfig ];
1313 buildInputs = [
1414 gtk3 wrapGAppsHook libgtop intltool itstool libxml2
15− gnome3.defaultIconTheme
15+ gnome3.adwaita-icon-theme
1616 ];
1717
1818 propagatedUserEnvPkgs = [ nmap inetutils ];
pkgs/desktops/gnome-3/apps/gnome-notes/default.nix+1−1
@@ -30,7 +30,7 @@ in stdenv.mkDerivation rec {
3030 gnome3.gnome-online-accounts zeitgeist
3131 gnome3.gsettings-desktop-schemas
3232 evolution-data-server
33− gnome3.defaultIconTheme
33+ gnome3.adwaita-icon-theme
3434 ];
3535
3636 mesonFlags = [
pkgs/desktops/gnome-3/apps/gnome-photos/default.nix+1−1
@@ -23,7 +23,7 @@ in stdenv.mkDerivation rec {
2323 buildInputs = [
2424 gtk3 glib gegl babl libgdata libdazzle
2525 gnome3.gsettings-desktop-schemas
26− gdk_pixbuf gnome3.defaultIconTheme
26+ gdk_pixbuf gnome3.adwaita-icon-theme
2727 gfbgraph grilo-plugins grilo
2828 gnome-online-accounts tracker
2929 gexiv2 geocode-glib dleyna-renderer
pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix+1−1
@@ -47,7 +47,7 @@ in stdenv.mkDerivation rec {
4747 gtk3
4848 glib
4949 upower
50− gnome3.defaultIconTheme
50+ gnome3.adwaita-icon-theme
5151 ];
5252
5353 meta = with stdenv.lib; {
pkgs/desktops/gnome-3/apps/gnome-todo/default.nix+5−5
@@ -1,7 +1,7 @@
11{ stdenv, fetchurl, meson, ninja, pkgconfig, python3, wrapGAppsHook
2−, gettext, gnome3, glib, gtk, libpeas
2+, gettext, gnome3, glib, gtk3, libpeas
33, gnome-online-accounts, gsettings-desktop-schemas
4−, evolution-data-server, libxml2, libsoup, libical, rest, json-glib }:
4+, evolution-data-server, libxml2, libsoup, libical, librest, json-glib }:
55
66let
77 pname = "gnome-todo";
@@ -18,11 +18,11 @@ in stdenv.mkDerivation rec {
1818 meson ninja pkgconfig gettext python3 wrapGAppsHook
1919 ];
2020 buildInputs = [
21− glib gtk libpeas gnome-online-accounts
22− gsettings-desktop-schemas gnome3.defaultIconTheme
21+ glib gtk3 libpeas gnome-online-accounts
22+ gsettings-desktop-schemas gnome3.adwaita-icon-theme
2323 # Plug-ins
2424 evolution-data-server libxml2 libsoup libical
25− rest json-glib
25+ librest json-glib
2626 ];
2727
2828 postPatch = ''
pkgs/desktops/gnome-3/apps/gnome-weather/default.nix+1−1
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313 nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook ];
1414 buildInputs = [
1515 gtk3 gjs gobject-introspection gnome-desktop
16− libgweather gnome3.defaultIconTheme geoclue2 gnome3.gsettings-desktop-schemas
16+ libgweather gnome3.adwaita-icon-theme geoclue2 gnome3.gsettings-desktop-schemas
1717 ];
1818
1919 # The .service file isn't wrapped with the correct environment
pkgs/desktops/gnome-3/apps/seahorse/default.nix+1−1
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
2222 buildInputs = [
2323 gtk3 glib gcr
2424 gnome3.gsettings-desktop-schemas gnupg
25− gnome3.defaultIconTheme gpgme
25+ gnome3.adwaita-icon-theme gpgme
2626 libsecret avahi libsoup p11-kit
2727 openssh openldap
2828 ];
pkgs/desktops/gnome-3/apps/vinagre/default.nix+1−1
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212
1313 nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook ];
1414 buildInputs = [
15− gtk3 vte libxml2 gtk-vnc libsecret gnome3.defaultIconTheme librsvg
15+ gtk3 vte libxml2 gtk-vnc libsecret gnome3.adwaita-icon-theme librsvg
1616 ];
1717
1818 NIX_CFLAGS_COMPILE = "-Wno-format-nonliteral";
pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, pkgconfig, intltool, gnome3
2−, iconnamingutils, gtk, gdk_pixbuf, librsvg, hicolor-icon-theme }:
2+, iconnamingutils, gtk3, gdk_pixbuf, librsvg, hicolor-icon-theme }:
33
44stdenv.mkDerivation rec {
55 name = "adwaita-icon-theme-${version}";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515
1616 buildInputs = [ gdk_pixbuf librsvg ];
1717
18− nativeBuildInputs = [ pkgconfig intltool iconnamingutils gtk ];
18+ nativeBuildInputs = [ pkgconfig intltool iconnamingutils gtk3 ];
1919
2020 # remove a tree of dirs with no files within
2121 postInstall = '' rm -rf "$out/locale" '';
pkgs/desktops/gnome-3/core/baobab/default.nix+1−1
@@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
1414 };
1515
1616 nativeBuildInputs = [ meson ninja pkgconfig vala gettext itstool libxml2 desktop-file-utils wrapGAppsHook ];
17− buildInputs = [ gtk3 glib gnome3.defaultIconTheme ];
17+ buildInputs = [ gtk3 glib gnome3.adwaita-icon-theme ];
1818
1919 doCheck = true;
2020
pkgs/desktops/gnome-3/core/caribou/default.nix+2−2
@@ -1,6 +1,6 @@
11{ fetchurl, stdenv, pkgconfig, gnome3, glib, gtk3, clutter, dbus, python3, libxml2
22, libxklavier, libXtst, gtk2, intltool, libxslt, at-spi2-core, autoreconfHook
3−, wrapGAppsHook }:
3+, wrapGAppsHook, libgee }:
44
55let
66 pname = "caribou";
@@ -30,7 +30,7 @@ in stdenv.mkDerivation rec {
3030 libXtst gtk2
3131 ];
3232
33− propagatedBuildInputs = [ gnome3.libgee libxklavier ];
33+ propagatedBuildInputs = [ libgee libxklavier ];
3434
3535 postPatch = ''
3636 patchShebangs .
pkgs/desktops/gnome-3/core/dconf/default.nix+10−1
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, meson, ninja, python3, vala, libxslt, pkgconfig, glib, bash-completion, dbus, gnome3
2−, libxml2, gtk-doc, docbook_xsl, docbook_xml_dtd_42 }:
2+, libxml2, gtk-doc, docbook_xsl, docbook_xml_dtd_42, fetchpatch }:
33
44let
55 pname = "dconf";
@@ -13,6 +13,15 @@ stdenv.mkDerivation rec {
1313 sha256 = "1dq2dn7qmxr4fxzx9wnag89ck24gxq17p2n4gl81h4w8qdy3m6jl";
1414 };
1515
16+ patches = [
17+ # Fix the build on Darwin
18+ # Issue: https://gitlab.gnome.org/GNOME/dconf/issues/47
19+ (fetchpatch {
20+ url = "https://gitlab.gnome.org/GNOME/dconf/commit/49f4d916e1151af3975df52c522c69de98ed2fbb.patch";
21+ sha256 = "00klkr1jzli9ap0aj6399m1bj2bxxz48pmcj4r16dsy6dfdl6325";
22+ })
23+ ];
24+
1625 postPatch = ''
1726 chmod +x meson_post_install.py
1827 patchShebangs meson_post_install.py
pkgs/desktops/gnome-3/core/empathy/default.nix+1−1
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
3535 gcr libsecret libpulseaudio gdk_pixbuf
3636 libnotify clutter libsoup gnutls libgee p11-kit
3737 libcanberra-gtk3 telepathy-farstream farstream
38− gnome3.defaultIconTheme gnome3.gsettings-desktop-schemas
38+ gnome3.adwaita-icon-theme gnome3.gsettings-desktop-schemas
3939 librsvg
4040 # Spell-checking
4141 enchant isocodes
pkgs/desktops/gnome-3/core/epiphany/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, meson, ninja, gettext, fetchurl, pkgconfig, gtk, glib, icu
1+{ stdenv, meson, ninja, gettext, fetchurl, pkgconfig, gtk3, glib, icu
22, wrapGAppsHook, gnome3, libxml2, libxslt, itstool
33, webkitgtk, libsoup, glib-networking, libsecret, gnome-desktop, libnotify, p11-kit
44, sqlite, gcr, isocodes, desktop-file-utils, python3
@@ -21,9 +21,9 @@ stdenv.mkDerivation rec {
2121 ];
2222
2323 buildInputs = [
24− gtk glib webkitgtk libsoup libxml2 libsecret gnome-desktop libnotify
24+ gtk3 glib webkitgtk libsoup libxml2 libsecret gnome-desktop libnotify
2525 sqlite isocodes p11-kit icu
26− gdk_pixbuf gnome3.defaultIconTheme gcr
26+ gdk_pixbuf gnome3.adwaita-icon-theme gcr
2727 glib-networking gst_all_1.gstreamer gst_all_1.gst-plugins-base
2828 gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly
2929 gst_all_1.gst-libav json-glib libdazzle
pkgs/desktops/gnome-3/core/evince/default.nix+6−5
@@ -1,7 +1,8 @@
11{ fetchurl, stdenv, pkgconfig, intltool, libxml2
22, glib, gtk3, pango, atk, gdk_pixbuf, shared-mime-info, itstool, gnome3
33, poppler, ghostscriptX, djvulibre, libspectre, libarchive, libsecret, wrapGAppsHook
4−, librsvg, gobject-introspection, yelp-tools, gspell
4+, librsvg, gobject-introspection, yelp-tools, gspell, adwaita-icon-theme, gsettings-desktop-schemas
5+, libgxps
56, recentListSize ? null # 5 is not enough, allow passing a different number
67, supportXPS ? false # Open XML Paper Specification via libgxps
78, autoreconfHook, pruneLibtoolFiles
@@ -26,10 +27,10 @@ stdenv.mkDerivation rec {
2627
2728 buildInputs = [
2829 glib gtk3 pango atk gdk_pixbuf libxml2
29− gnome3.gsettings-desktop-schemas
30+ gsettings-desktop-schemas
3031 poppler ghostscriptX djvulibre libspectre libarchive
31− libsecret librsvg gnome3.adwaita-icon-theme gspell
32− ] ++ stdenv.lib.optional supportXPS gnome3.libgxps;
32+ libsecret librsvg adwaita-icon-theme gspell
33+ ] ++ stdenv.lib.optional supportXPS libgxps;
3334
3435 configureFlags = [
3536 "--disable-nautilus" # Do not build nautilus plugin
@@ -37,7 +38,7 @@ stdenv.mkDerivation rec {
3738 (if supportXPS then "--enable-xps" else "--disable-xps")
3839 ];
3940
40− NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
41+ NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
4142
4243 preConfigure = stdenv.lib.optionalString (recentListSize != null) ''
4344 sed -i 's/\(gtk_recent_chooser_set_limit .*\)5)/\1${builtins.toString recentListSize})/' shell/ev-open-recent-action.c
pkgs/desktops/gnome-3/core/evolution-data-server/default.nix+4−3
@@ -1,7 +1,8 @@
11{ fetchurl, stdenv, substituteAll, pkgconfig, gnome3, python3, gobject-introspection
22, intltool, libsoup, libxml2, libsecret, icu, sqlite, tzdata, libcanberra-gtk3, gcr
33, p11-kit, db, nspr, nss, libical, gperf, wrapGAppsHook, glib-networking, pcre
4−, vala, cmake, ninja, kerberos, openldap, webkitgtk, libaccounts-glib, json-glib }:
4+, vala, cmake, ninja, kerberos, openldap, webkitgtk, libaccounts-glib, json-glib
5+, glib, gtk3, gnome-online-accounts, libgweather, libgdata }:
56
67stdenv.mkDerivation rec {
78 name = "evolution-data-server-${version}";
@@ -25,8 +26,8 @@ stdenv.mkDerivation rec {
2526 nativeBuildInputs = [
2627 cmake ninja pkgconfig intltool python3 gperf wrapGAppsHook gobject-introspection vala
2728 ];
28− buildInputs = with gnome3; [
29− glib libsoup libxml2 gtk gnome-online-accounts
29+ buildInputs = [
30+ glib libsoup libxml2 gtk3 gnome-online-accounts
3031 gcr p11-kit libgweather libgdata libaccounts-glib json-glib
3132 icu sqlite kerberos openldap webkitgtk glib-networking
3233 libcanberra-gtk3 pcre
pkgs/desktops/gnome-3/core/gdm/default.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv, fetchurl, substituteAll, pkgconfig, glib, itstool, libxml2, xorg
22, accountsservice, libX11, gnome3, systemd, autoreconfHook
3−, gtk, libcanberra-gtk3, pam, libtool, gobject-introspection, plymouth
3+, gtk3, libcanberra-gtk3, pam, libtool, gobject-introspection, plymouth
44, librsvg, coreutils, xwayland, fetchpatch }:
55
66stdenv.mkDerivation rec {
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
3030 nativeBuildInputs = [ pkgconfig libxml2 itstool autoreconfHook libtool gnome3.dconf ];
3131 buildInputs = [
3232 glib accountsservice systemd
33− gobject-introspection libX11 gtk
33+ gobject-introspection libX11 gtk3
3434 libcanberra-gtk3 pam plymouth librsvg
3535 ];
3636
pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix+1−1
@@ -22,7 +22,7 @@ in stdenv.mkDerivation rec {
2222 ];
2323 buildInputs = [
2424 glib gtk3 udev libnotify libcanberra-gtk3
25− gnome3.defaultIconTheme gnome3.gsettings-desktop-schemas
25+ gnome3.adwaita-icon-theme gnome3.gsettings-desktop-schemas
2626 ];
2727
2828 mesonFlags = [
pkgs/desktops/gnome-3/core/gnome-calculator/default.nix+1−1
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818
1919 buildInputs = [
2020 gtk3 glib libxml2 gtksourceview3 mpfr gmp
21− gnome3.defaultIconTheme
21+ gnome3.adwaita-icon-theme
2222 gnome3.gsettings-desktop-schemas libsoup libmpc
2323 ];
2424
pkgs/desktops/gnome-3/core/gnome-contacts/default.nix+1−1
@@ -24,7 +24,7 @@ in stdenv.mkDerivation rec {
2424 gtk3 glib evolution-data-server gnome3.gsettings-desktop-schemas
2525 folks gnome-desktop telepathy-glib
2626 libxml2 gnome-online-accounts cheese
27− gnome3.defaultIconTheme libchamplain clutter-gtk geocode-glib
27+ gnome3.adwaita-icon-theme libchamplain clutter-gtk geocode-glib
2828 ];
2929
3030 postPatch = ''
pkgs/desktops/gnome-3/core/gnome-control-center/default.nix+7−4
@@ -5,7 +5,10 @@
55, cracklib, libkrb5, networkmanagerapplet, networkmanager, glibc
66, libwacom, samba, shared-mime-info, tzdata, libtool, libgnomekbd
77, docbook_xsl, modemmanager, clutter, clutter-gtk, cheese, gnome-session
8−, fontconfig, sound-theme-freedesktop, grilo, python3 }:
8+, fontconfig, sound-theme-freedesktop, grilo, python3
9+, gtk3, glib, glib-networking, gsettings-desktop-schemas
10+, gnome-desktop, gnome-settings-daemon, gnome-online-accounts
11+, vino, gnome-bluetooth, tracker, adwaita-icon-theme }:
912
1013let
1114 pname = "gnome-control-center";
@@ -23,13 +26,13 @@ in stdenv.mkDerivation rec {
2326 shared-mime-info python3
2427 ];
2528
26− buildInputs = with gnome3; [
27− ibus gtk glib glib-networking upower gsettings-desktop-schemas
29+ buildInputs = [
30+ ibus gtk3 glib glib-networking upower gsettings-desktop-schemas
2831 libxml2 gnome-desktop gnome-settings-daemon polkit libgtop
2932 gnome-online-accounts libsoup colord libpulseaudio fontconfig colord-gtk
3033 accountsservice libkrb5 networkmanagerapplet libwacom samba libnotify
3134 grilo libpwquality cracklib vino libcanberra-gtk3 libgudev libsecret
32− gdk_pixbuf defaultIconTheme librsvg clutter clutter-gtk cheese
35+ gdk_pixbuf adwaita-icon-theme librsvg clutter clutter-gtk cheese
3336 networkmanager modemmanager gnome-bluetooth tracker
3437 ];
3538
pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv, fetchurl, meson, ninja, pkgconfig, desktop-file-utils, appstream-glib, libxslt
22, libxml2, gettext, itstool, wrapGAppsHook, docbook_xsl, docbook_xml_dtd_43
3−, gnome3, gtk, glib }:
3+, gnome3, gtk3, glib }:
44
55stdenv.mkDerivation rec {
66 name = "gnome-dictionary-${version}";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717 meson ninja pkgconfig wrapGAppsHook libxml2 gettext itstool
1818 desktop-file-utils appstream-glib libxslt docbook_xsl docbook_xml_dtd_43
1919 ];
20− buildInputs = [ gtk glib gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme ];
20+ buildInputs = [ gtk3 glib gnome3.gsettings-desktop-schemas gnome3.adwaita-icon-theme ];
2121
2222 passthru = {
2323 updateScript = gnome3.updateScript {
pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix+11−7
@@ -1,5 +1,5 @@
11{ stdenv, gettext, fetchurl, pkgconfig, udisks2, libsecret, libdvdread
2−, meson, ninja, gtk, glib, wrapGAppsHook, python3, libnotify
2+, meson, ninja, gtk3, glib, wrapGAppsHook, python3, libnotify
33, itstool, gnome3, libxml2
44, libcanberra-gtk3, libxslt, docbook_xsl, libpwquality }:
55
@@ -12,17 +12,14 @@ stdenv.mkDerivation rec {
1212 sha256 = "1365fabz3q7n3bl775z82m1nzg18birxxyd7l2ssbbkqrx3h7wgi";
1313 };
1414
15− passthru = {
16− updateScript = gnome3.updateScript { packageName = "gnome-disk-utility"; attrPath = "gnome3.gnome-disk-utility"; };
17− };
18−
1915 nativeBuildInputs = [
2016 meson ninja pkgconfig gettext itstool libxslt docbook_xsl
2117 wrapGAppsHook python3 libxml2
2218 ];
19+
2320 buildInputs = [
24− gtk glib libsecret libpwquality libnotify libdvdread libcanberra-gtk3
25− udisks2 gnome3.defaultIconTheme
21+ gtk3 glib libsecret libpwquality libnotify libdvdread libcanberra-gtk3
22+ udisks2 gnome3.adwaita-icon-theme
2623 gnome3.gnome-settings-daemon gnome3.gsettings-desktop-schemas
2724 ];
2825
@@ -31,6 +28,13 @@ stdenv.mkDerivation rec {
3128 patchShebangs meson_post_install.py
3229 '';
3330
31+ passthru = {
32+ updateScript = gnome3.updateScript {
33+ packageName = "gnome-disk-utility";
34+ attrPath = "gnome3.gnome-disk-utility";
35+ };
36+ };
37+
3438 meta = with stdenv.lib; {
3539 homepage = https://en.wikipedia.org/wiki/GNOME_Disks;
3640 description = "A udisks graphical front-end";
pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix+9−6
@@ -1,5 +1,5 @@
11{ stdenv, meson, ninja, gettext, fetchurl
2−, pkgconfig, gtk3, glib, libxml2
2+, pkgconfig, gtk3, glib, libxml2, gnome-desktop, adwaita-icon-theme
33, wrapGAppsHook, gnome3 }:
44
55stdenv.mkDerivation rec {
@@ -11,18 +11,21 @@ stdenv.mkDerivation rec {
1111 sha256 = "1wwnx2zrlbd2d6np7m9s78alx6j6ranrnh1g2z6zrv9qcj8rpzz5";
1212 };
1313
14− passthru = {
15− updateScript = gnome3.updateScript { packageName = "gnome-font-viewer"; attrPath = "gnome3.gnome-font-viewer"; };
16− };
17−
1814 doCheck = true;
1915
2016 nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook libxml2 ];
21− buildInputs = [ gtk3 glib gnome3.gnome-desktop gnome3.defaultIconTheme ];
17+ buildInputs = [ gtk3 glib gnome-desktop adwaita-icon-theme ];
2218
2319 # Do not run meson-postinstall.sh
2420 preConfigure = "sed -i '2,$ d' meson-postinstall.sh";
2521
22+ passthru = {
23+ updateScript = gnome3.updateScript {
24+ packageName = "gnome-font-viewer";
25+ attrPath = "gnome3.gnome-font-viewer";
26+ };
27+ };
28+
2629 meta = with stdenv.lib; {
2730 description = "Program that can preview fonts and create thumbnails for fonts";
2831 maintainers = gnome3.maintainers;
pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix+3−3
@@ -1,5 +1,5 @@
1−{ stdenv, fetchurl, pkgconfig, vala, glib, libxslt, gtk, wrapGAppsHook
2−, webkitgtk, json-glib, rest, libsecret, gtk-doc, gobject-introspection
1+{ stdenv, fetchurl, pkgconfig, vala, glib, libxslt, gtk3, wrapGAppsHook
2+, webkitgtk, json-glib, librest, libsecret, gtk-doc, gobject-introspection
33, gettext, icu, glib-networking
44, libsoup, docbook_xsl, docbook_xml_dtd_412, gnome3, gcr, kerberos
55}:
@@ -33,7 +33,7 @@ in stdenv.mkDerivation rec {
3333 libxslt docbook_xsl docbook_xml_dtd_412 gtk-doc
3434 ];
3535 buildInputs = [
36− glib gtk webkitgtk json-glib rest libsecret glib-networking icu libsoup
36+ glib gtk3 webkitgtk json-glib librest libsecret glib-networking icu libsoup
3737 gcr kerberos
3838 ];
3939
pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix+16−10
@@ -1,5 +1,6 @@
11{ stdenv, fetchurl, pkgconfig, glib, gnome3, libxml2
2−, libsoup, json-glib, gmp, openssl, dleyna-server, wrapGAppsHook }:
2+, libgdata, grilo, libzapojit, grilo-plugins, gnome-online-accounts, libmediaart
3+, tracker, gfbgraph, librest, libsoup, json-glib, gmp, openssl, dleyna-server, wrapGAppsHook }:
34
45stdenv.mkDerivation rec {
56 name = "gnome-online-miners-${version}";
@@ -10,19 +11,24 @@ stdenv.mkDerivation rec {
1011 sha256 = "0pjamwwzn5wqgihyss357dyl2q70r0bngnqmwsqawchx5f9aja9c";
1112 };
1213
13− passthru = {
14− updateScript = gnome3.updateScript { packageName = "gnome-online-miners"; attrPath = "gnome3.gnome-online-miners"; };
15− };
16−
1714 nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
18− buildInputs = [ glib gnome3.libgdata libxml2 libsoup gmp openssl
19− gnome3.grilo gnome3.libzapojit gnome3.grilo-plugins
20− gnome3.gnome-online-accounts gnome3.libmediaart
21− gnome3.tracker gnome3.gfbgraph json-glib gnome3.rest
22− dleyna-server ];
15+ buildInputs = [
16+ glib libgdata libxml2 libsoup gmp openssl
17+ grilo libzapojit grilo-plugins
18+ gnome-online-accounts libmediaart
19+ tracker gfbgraph json-glib librest
20+ dleyna-server
21+ ];
2322
2423 enableParallelBuilding = true;
2524
25+ passthru = {
26+ updateScript = gnome3.updateScript {
27+ packageName = "gnome-online-miners";
28+ attrPath = "gnome3.gnome-online-miners";
29+ };
30+ };
31+
2632 meta = with stdenv.lib; {
2733 homepage = https://wiki.gnome.org/Projects/GnomeOnlineMiners;
2834 description = "A set of crawlers that go through your online content and index them locally in Tracker";
pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix+1−1
@@ -22,7 +22,7 @@ in stdenv.mkDerivation rec {
2222
2323 nativeBuildInputs = [ meson ninja pkgconfig gettext appstream-glib libxml2 desktop-file-utils python3 wrapGAppsHook ];
2424 buildInputs = [
25− gtk3 glib libcanberra-gtk3 gnome3.defaultIconTheme
25+ gtk3 glib libcanberra-gtk3 gnome3.adwaita-icon-theme
2626 gnome3.gsettings-desktop-schemas
2727 ];
2828
pkgs/desktops/gnome-3/core/gnome-session/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ fetchurl, stdenv, substituteAll, meson, ninja, pkgconfig, gnome3, glib, gtk, gsettings-desktop-schemas
1+{ fetchurl, stdenv, substituteAll, meson, ninja, pkgconfig, gnome3, glib, gtk3, gsettings-desktop-schemas
22, gnome-desktop, dbus, json-glib, libICE, xmlto, docbook_xsl, docbook_xml_dtd_412, python3
33, libxslt, gettext, makeWrapper, systemd, xorg, epoxy, gnugrep, bash }:
44
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
3030 ];
3131
3232 buildInputs = [
33− glib gtk libICE gnome-desktop json-glib xorg.xtrans gnome3.defaultIconTheme
33+ glib gtk3 libICE gnome-desktop json-glib xorg.xtrans gnome3.adwaita-icon-theme
3434 gnome3.gnome-settings-daemon gsettings-desktop-schemas systemd epoxy
3535 ];
3636
pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix+5−5
@@ -1,7 +1,7 @@
1−{ fetchurl, substituteAll, stdenv, meson, ninja, pkgconfig, gnome3, perl, gettext, glib, libnotify, lcms2, libXtst
2−, libxkbfile, libpulseaudio, alsaLib, libcanberra-gtk3, upower, colord, libgweather, polkit
1+{ fetchurl, substituteAll, stdenv, meson, ninja, pkgconfig, gnome3, perl, gettext, gtk3, glib, libnotify, lcms2, libXtst
2+, libxkbfile, libpulseaudio, alsaLib, libcanberra-gtk3, upower, colord, libgweather, polkit, gsettings-desktop-schemas
33, geoclue2, librsvg, xf86_input_wacom, udev, libgudev, libwacom, libxslt, libxml2, networkmanager
4−, docbook_xsl, wrapGAppsHook, python3, ibus, xkeyboard_config, tzdata, nss }:
4+, gnome-desktop, geocode-glib, docbook_xsl, wrapGAppsHook, python3, ibus, xkeyboard_config, tzdata, nss }:
55
66stdenv.mkDerivation rec {
77 name = "gnome-settings-daemon-${version}";
@@ -21,8 +21,8 @@ stdenv.mkDerivation rec {
2121
2222 nativeBuildInputs = [ meson ninja pkgconfig perl gettext libxml2 libxslt docbook_xsl wrapGAppsHook python3 ];
2323
24− buildInputs = with gnome3; [
25− ibus gtk glib gsettings-desktop-schemas networkmanager
24+ buildInputs = [
25+ ibus gtk3 glib gsettings-desktop-schemas networkmanager
2626 libnotify gnome-desktop lcms2 libXtst libxkbfile libpulseaudio alsaLib
2727 libcanberra-gtk3 upower colord libgweather xkeyboard_config nss
2828 polkit geocode-glib geoclue2 librsvg xf86_input_wacom udev libgudev libwacom
pkgs/desktops/gnome-3/core/gnome-shell/default.nix+10−9
@@ -2,9 +2,10 @@
22, python3Packages, libsoup, polkit, clutter, networkmanager, docbook_xsl , docbook_xsl_ns, at-spi2-core
33, libstartup_notification, telepathy-glib, telepathy-logger, libXtst, unzip, glibcLocales, shared-mime-info
44, libgweather, libcanberra-gtk3, librsvg, geoclue2, perl, docbook_xml_dtd_42, desktop-file-utils
5−, libpulseaudio, libical, gobject-introspection, gstreamer, wrapGAppsHook, libxslt, gcr
6−, accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet, libgnomekbd
7−, sassc, systemd, gst_all_1 }:
5+, libpulseaudio, libical, gobject-introspection, gstreamer, wrapGAppsHook, libxslt, gcr, caribou
6+, accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet, libgnomekbd, gnome-desktop
7+, gsettings-desktop-schemas, gnome-keyring, glib, gjs, mutter, evolution-data-server, gtk3
8+, sassc, systemd, gst_all_1, adwaita-icon-theme, gnome-bluetooth, gnome-clocks, gnome-settings-daemon }:
89
910# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup
1011
@@ -26,16 +27,16 @@ in stdenv.mkDerivation rec {
2627 meson ninja pkgconfig gettext docbook_xsl docbook_xsl_ns docbook_xml_dtd_42 perl wrapGAppsHook glibcLocales
2728 sassc desktop-file-utils libxslt.bin
2829 ];
29− buildInputs = with gnome3; [
30+ buildInputs = [
3031 systemd caribou
3132 gsettings-desktop-schemas gnome-keyring glib gcr json-glib accountsservice
3233 libcroco libsecret libsoup polkit gdk_pixbuf librsvg
3334 clutter networkmanager libstartup_notification telepathy-glib
3435 libXtst gjs mutter libpulseaudio evolution-data-server
35− libical gtk gstreamer gdm libcanberra-gtk3 geoclue2
36− defaultIconTheme gnome3.gnome-bluetooth
37− gnome3.gnome-clocks # schemas needed
38− at-spi2-core upower ibus gnome-desktop telepathy-logger gnome3.gnome-settings-daemon
36+ libical gtk3 gstreamer gdm libcanberra-gtk3 geoclue2
37+ adwaita-icon-theme gnome-bluetooth
38+ gnome-clocks # schemas needed
39+ at-spi2-core upower ibus gnome-desktop telepathy-logger gnome-settings-daemon
3940 gst_all_1.gst-plugins-good # recording
4041 gobject-introspection
4142
@@ -45,7 +46,7 @@ in stdenv.mkDerivation rec {
4546 propagatedUserEnvPkgs = [
4647 # Needed to support on-screen keyboard used with touch screen devices
4748 # see https://github.com/NixOS/nixpkgs/issues/25968
48− gnome3.caribou
49+ caribou
4950 ];
5051
5152 patches = [
pkgs/desktops/gnome-3/core/gnome-software/default.nix+3−2
@@ -1,5 +1,6 @@
11{ stdenv, fetchurl, substituteAll, pkgconfig, meson, ninja, gettext, gnome3, wrapGAppsHook, packagekit, ostree
22, glib, appstream-glib, libsoup, polkit, isocodes, gspell, libxslt, gobject-introspection, flatpak, fwupd
3+, gtk3, gsettings-desktop-schemas, gnome-desktop
34, json-glib, libsecret, valgrind-light, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_43, gtk-doc, desktop-file-utils }:
45
56stdenv.mkDerivation rec {
@@ -24,8 +25,8 @@ stdenv.mkDerivation rec {
2425 ];
2526
2627 buildInputs = [
27− gnome3.gtk glib packagekit appstream-glib libsoup
28− gnome3.gsettings-desktop-schemas gnome3.gnome-desktop
28+ gtk3 glib packagekit appstream-glib libsoup
29+ gsettings-desktop-schemas gnome-desktop
2930 gspell json-glib libsecret ostree
3031 polkit flatpak fwupd
3132 ];
pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix+1−1
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818 polkit # for ITS file
1919 ];
2020 buildInputs = [
21− bash gtk3 glib libxml2 gtkmm3 libgtop gdk_pixbuf gnome3.defaultIconTheme librsvg
21+ bash gtk3 glib libxml2 gtkmm3 libgtop gdk_pixbuf gnome3.adwaita-icon-theme librsvg
2222 gnome3.gsettings-desktop-schemas systemd
2323 ];
2424
pkgs/desktops/gnome-3/core/gnome-terminal/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, pkgconfig, libxml2, gnome3, dconf, nautilus
2−, gtk, gsettings-desktop-schemas, vte, intltool, which, libuuid, vala
2+, gtk3, gsettings-desktop-schemas, vte, intltool, which, libuuid, vala
33, desktop-file-utils, itstool, wrapGAppsHook }:
44
55stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 };
1313
1414 buildInputs = [
15− gtk gsettings-desktop-schemas vte libuuid dconf
15+ gtk3 gsettings-desktop-schemas vte libuuid dconf
1616 # For extension
1717 nautilus
1818 ];
pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix+1−1
@@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
1919 };
2020
2121 nativeBuildInputs = [ pkgconfig intltool ];
22− buildInputs = [ gtk3 librsvg pango atk gtk2 gdk_pixbuf gnome3.defaultIconTheme ];
22+ buildInputs = [ gtk3 librsvg pango atk gtk2 gdk_pixbuf gnome3.adwaita-icon-theme ];
2323
2424 postFixup = ''
2525 gtk-update-icon-cache "$out"/share/icons/HighContrast
pkgs/desktops/gnome-3/core/gnome-user-share/default.nix+13−9
@@ -1,5 +1,5 @@
11{ stdenv, intltool, fetchurl, apacheHttpd, nautilus
2−, pkgconfig, gtk3, glib, libxml2, systemd
2+, pkgconfig, gtk3, glib, libxml2, systemd, adwaita-icon-theme
33, wrapGAppsHook, itstool, libnotify, libtool, mod_dnssd
44, gnome3, librsvg, gdk_pixbuf, file, libcanberra-gtk3 }:
55
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818
1919 doCheck = true;
2020
21− NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
21+ NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
2222
2323 preConfigure = ''
2424 sed -e 's,^LoadModule dnssd_module.\+,LoadModule dnssd_module ${mod_dnssd}/modules/mod_dnssd.so,' \
@@ -26,15 +26,19 @@ stdenv.mkDerivation rec {
2626 -i data/dav_user_2.4.conf
2727 '';
2828
29− configureFlags = [ "--with-httpd=${apacheHttpd.out}/bin/httpd"
30− "--with-modules-path=${apacheHttpd.dev}/modules"
31− "--with-systemduserunitdir=$(out)/etc/systemd/user"
32− "--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0" ];
29+ configureFlags = [
30+ "--with-httpd=${apacheHttpd.out}/bin/httpd"
31+ "--with-modules-path=${apacheHttpd.dev}/modules"
32+ "--with-systemduserunitdir=$(out)/etc/systemd/user"
33+ "--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0"
34+ ];
3335
3436 nativeBuildInputs = [ pkgconfig ];
35− buildInputs = [ gtk3 glib intltool itstool libxml2 libtool
36− wrapGAppsHook file gdk_pixbuf gnome3.defaultIconTheme librsvg
37− nautilus libnotify libcanberra-gtk3 systemd ];
37+ buildInputs = [
38+ gtk3 glib intltool itstool libxml2 libtool
39+ wrapGAppsHook file gdk_pixbuf adwaita-icon-theme librsvg
40+ nautilus libnotify libcanberra-gtk3 systemd
41+ ];
3842
3943 postInstall = ''
4044 mkdir -p $out/share/gsettings-schemas/$name
pkgs/desktops/gnome-3/core/grilo-plugins/default.nix+5−5
@@ -1,5 +1,5 @@
1−{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, sqlite
2−, gnome3, libxml2, gupnp, gssdp, lua5, liboauth, gupnp-av
1+{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, sqlite, librest
2+, gnome3, libxml2, gupnp, gssdp, lua5, liboauth, gupnp-av, libgdata, libmediaart
33, gmime, json-glib, avahi, tracker, dleyna-server, itstool, totem-pl-parser }:
44
55let
@@ -15,10 +15,10 @@ in stdenv.mkDerivation rec {
1515
1616 nativeBuildInputs = [ meson ninja pkgconfig gettext itstool ];
1717 buildInputs = [
18− gnome3.grilo libxml2 gupnp gssdp gnome3.libgdata
18+ gnome3.grilo libxml2 gupnp gssdp libgdata
1919 lua5 liboauth gupnp-av sqlite gnome3.gnome-online-accounts
20− totem-pl-parser gnome3.rest gmime json-glib
21− avahi gnome3.libmediaart tracker dleyna-server
20+ totem-pl-parser librest gmime json-glib
21+ avahi libmediaart tracker dleyna-server
2222 ];
2323
2424 passthru = {
pkgs/desktops/gnome-3/core/gucharmap/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, intltool, fetchFromGitLab, fetchpatch, pkgconfig, gtk3, defaultIconTheme
1+{ stdenv, intltool, fetchFromGitLab, fetchpatch, pkgconfig, gtk3, adwaita-icon-theme
22, glib, desktop-file-utils, gtk-doc, autoconf, automake, libtool
33, wrapGAppsHook, gnome3, itstool, libxml2, yelp-tools
44, docbook_xsl, docbook_xml_dtd_412, gsettings-desktop-schemas
@@ -26,7 +26,7 @@ in stdenv.mkDerivation rec {
2626 yelp-tools libxml2 desktop-file-utils gobject-introspection
2727 ];
2828
29− buildInputs = [ gtk3 glib gsettings-desktop-schemas defaultIconTheme ];
29+ buildInputs = [ gtk3 glib gsettings-desktop-schemas adwaita-icon-theme ];
3030
3131 configureFlags = [
3232 "--with-unicode-data=${unicode-data}"
pkgs/desktops/gnome-3/core/mutter/3.28.nix+6−5
@@ -1,7 +1,8 @@
11{ fetchurl, stdenv, fetchpatch, pkgconfig, gnome3, intltool, gobject-introspection, upower, cairo
2−, pango, cogl, clutter, libstartup_notification, zenity, libcanberra-gtk3
2+, glib, gtk3, pango, cogl, clutter, libstartup_notification, zenity, libcanberra-gtk3
3+, gsettings-desktop-schemas, gnome-desktop
34, libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libinput
4−, pipewire, libgudev, libwacom, xwayland, autoreconfHook }:
5+, geocode-glib, pipewire, libgudev, libwacom, xwayland, autoreconfHook }:
56
67stdenv.mkDerivation rec {
78 name = "mutter-${version}";
@@ -32,10 +33,10 @@ stdenv.mkDerivation rec {
3233
3334 nativeBuildInputs = [ autoreconfHook pkgconfig intltool libtool makeWrapper ];
3435
35− buildInputs = with gnome3; [
36− glib gobject-introspection gtk gsettings-desktop-schemas upower
36+ buildInputs = [
37+ glib gobject-introspection gtk3 gsettings-desktop-schemas upower
3738 gnome-desktop cairo pango cogl clutter zenity libstartup_notification
38− gnome3.geocode-glib libinput libgudev libwacom
39+ geocode-glib libinput libgudev libwacom
3940 libcanberra-gtk3 zenity xkeyboard_config libxkbfile
4041 libxkbcommon pipewire
4142 ];
pkgs/desktops/gnome-3/core/mutter/default.nix+12−9
@@ -1,7 +1,8 @@
11{ fetchurl, fetchpatch, stdenv, pkgconfig, gnome3, intltool, gobject-introspection, upower, cairo
22, pango, cogl, clutter, libstartup_notification, zenity, libcanberra-gtk3
33, libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libinput
4−, pipewire, libgudev, libwacom, xwayland, autoreconfHook }:
4+, gsettings-desktop-schemas, glib, gtk3, gnome-desktop
5+, geocode-glib, pipewire, libgudev, libwacom, xwayland, autoreconfHook }:
56
67stdenv.mkDerivation rec {
78 name = "mutter-${version}";
@@ -12,10 +13,6 @@ stdenv.mkDerivation rec {
1213 sha256 = "0qr3w480p31nbiad49213rj9rk6p9fl82a68pzznpz36p30dq96z";
1314 };
1415
15− passthru = {
16− updateScript = gnome3.updateScript { packageName = "mutter"; attrPath = "gnome3.mutter"; };
17− };
18−
1916 patches = [
2017 # https://gitlab.gnome.org/GNOME/mutter/issues/270
2118 # Fixes direction of the desktop switching animation when using workspace
@@ -26,7 +23,6 @@ stdenv.mkDerivation rec {
2623 })
2724 ];
2825
29−
3026 configureFlags = [
3127 "--with-x"
3228 "--disable-static"
@@ -47,10 +43,10 @@ stdenv.mkDerivation rec {
4743
4844 nativeBuildInputs = [ autoreconfHook pkgconfig intltool libtool makeWrapper ];
4945
50− buildInputs = with gnome3; [
51− glib gobject-introspection gtk gsettings-desktop-schemas upower
46+ buildInputs = [
47+ glib gobject-introspection gtk3 gsettings-desktop-schemas upower
5248 gnome-desktop cairo pango cogl clutter zenity libstartup_notification
53− gnome3.geocode-glib libinput libgudev libwacom
49+ geocode-glib libinput libgudev libwacom
5450 libcanberra-gtk3 zenity xkeyboard_config libxkbfile
5551 libxkbcommon pipewire
5652 ];
@@ -62,6 +58,13 @@ stdenv.mkDerivation rec {
6258
6359 enableParallelBuilding = true;
6460
61+ passthru = {
62+ updateScript = gnome3.updateScript {
63+ packageName = "mutter";
64+ attrPath = "gnome3.mutter";
65+ };
66+ };
67+
6568 meta = with stdenv.lib; {
6669 platforms = platforms.linux;
6770 maintainers = gnome3.maintainers;
pkgs/desktops/gnome-3/core/nautilus/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, libxml2
2−, desktop-file-utils, python3, wrapGAppsHook , gtk, gnome3, gnome-autoar
2+, desktop-file-utils, python3, wrapGAppsHook , gtk3, gnome3, gnome-autoar
33, glib-networking, shared-mime-info, libnotify, libexif, libseccomp , exempi
44, librsvg, tracker, tracker-miners, gexiv2, libselinux, gdk_pixbuf
55, substituteAll, bubblewrap
@@ -22,7 +22,7 @@ in stdenv.mkDerivation rec {
2222 ];
2323
2424 buildInputs = [
25− glib-networking shared-mime-info libexif gtk exempi libnotify libselinux
25+ glib-networking shared-mime-info libexif gtk3 exempi libnotify libselinux
2626 tracker tracker-miners gexiv2 libseccomp bubblewrap
2727 gnome3.adwaita-icon-theme gnome3.gsettings-desktop-schemas
2828 ];
pkgs/desktops/gnome-3/core/simple-scan/default.nix+3−3
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, itstool, python3, wrapGAppsHook
2−, cairo, gdk_pixbuf, colord, glib, gtk, gusb, packagekit, libwebp
2+, cairo, gdk_pixbuf, colord, glib, gtk3, gusb, packagekit, libwebp
33, libxml2, sane-backends, vala, gnome3, gobject-introspection }:
44
55stdenv.mkDerivation rec {
@@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
1212 };
1313
1414 buildInputs = [
15− cairo gdk_pixbuf colord glib gnome3.defaultIconTheme gusb
16− gtk libwebp packagekit sane-backends vala
15+ cairo gdk_pixbuf colord glib gnome3.adwaita-icon-theme gusb
16+ gtk3 libwebp packagekit sane-backends vala
1717 ];
1818 nativeBuildInputs = [
1919 meson ninja gettext itstool pkgconfig python3 wrapGAppsHook libxml2
pkgs/desktops/gnome-3/core/totem/default.nix+7−6
@@ -1,7 +1,8 @@
11{ stdenv, fetchurl, meson, ninja, intltool, gst_all_1
22, clutter-gtk, clutter-gst, python3Packages, shared-mime-info
33, pkgconfig, gtk3, glib, gobject-introspection, totem-pl-parser
4−, wrapGAppsHook, itstool, libxml2, vala, gnome3
4+, wrapGAppsHook, itstool, libxml2, vala, gnome3, grilo, grilo-plugins
5+, libpeas, adwaita-icon-theme, gnome-desktop, gsettings-desktop-schemas
56, gdk_pixbuf, tracker, nautilus }:
67
78stdenv.mkDerivation rec {
@@ -15,15 +16,15 @@ stdenv.mkDerivation rec {
1516
1617 doCheck = true;
1718
18− NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
19+ NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
1920
2021 nativeBuildInputs = [ meson ninja vala pkgconfig intltool python3Packages.python itstool gobject-introspection wrapGAppsHook ];
2122 buildInputs = [
22− gtk3 glib gnome3.grilo clutter-gtk clutter-gst totem-pl-parser gnome3.grilo-plugins
23+ gtk3 glib grilo clutter-gtk clutter-gst totem-pl-parser grilo-plugins
2324 gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad
24− gst_all_1.gst-plugins-ugly gst_all_1.gst-libav gnome3.libpeas shared-mime-info
25− gdk_pixbuf libxml2 gnome3.defaultIconTheme gnome3.gnome-desktop
26− gnome3.gsettings-desktop-schemas tracker nautilus
25+ gst_all_1.gst-plugins-ugly gst_all_1.gst-libav libpeas shared-mime-info
26+ gdk_pixbuf libxml2 adwaita-icon-theme gnome-desktop
27+ gsettings-desktop-schemas tracker nautilus
2728 python3Packages.pygobject3 python3Packages.dbus-python # for plug-ins
2829 ];
2930
pkgs/desktops/gnome-3/core/tracker-miners/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, substituteAll, intltool, itstool, libxslt
1+{ stdenv, fetchurl, substituteAll, intltool, itstool, libxslt, gexiv2, tracker
22, meson, ninja, pkgconfig, vala, wrapGAppsHook, bzip2, dbus, evolution-data-server
33, exempi, flac, giflib, glib, gnome3, gst_all_1, icu, json-glib, libcue, libexif
44, libgrss, libgsf, libiptcdata, libjpeg, libpng, libseccomp, libsoup, libtiff, libuuid
@@ -35,9 +35,9 @@ in stdenv.mkDerivation rec {
3535 flac
3636 giflib
3737 glib
38− gnome3.gexiv2
38+ gexiv2
3939 totem-pl-parser
40− gnome3.tracker
40+ tracker
4141 gst_all_1.gst-plugins-base
4242 gst_all_1.gstreamer
4343 icu
pkgs/desktops/gnome-3/core/vino/default.nix+1−1
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
2020 nativeBuildInputs = [ intltool wrapGAppsHook pkgconfig ];
2121
2222 buildInputs = [
23− gnome3.defaultIconTheme gtk3 glib libXtst libnotify libsoup
23+ gnome3.adwaita-icon-theme gtk3 glib libXtst libnotify libsoup
2424 libsecret gnutls libgcrypt avahi zlib libjpeg
2525 libXdamage libXfixes libXext networkmanager
2626 ] ++ optionals telepathySupport [ dbus-glib telepathy-glib ];
pkgs/desktops/gnome-3/core/yelp/default.nix+1−1
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616 buildInputs = [
1717 gtk3 glib webkitgtk sqlite
1818 libxml2 libxslt gnome3.yelp-xsl
19− gnome3.defaultIconTheme
19+ gnome3.adwaita-icon-theme
2020 gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
2121 ];
2222
pkgs/desktops/gnome-3/core/zenity/default.nix+9−6
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, libxml2, libxslt, gnome3
1+{ stdenv, fetchurl, pkgconfig, libxml2, libxslt, gnome3, gtk3
22, gnome-doc-utils, intltool, libX11, which, itstool, wrapGAppsHook }:
33
44stdenv.mkDerivation rec {
@@ -10,18 +10,21 @@ stdenv.mkDerivation rec {
1010 sha256 = "1wipnp46pd238z9ck5rsckbaw7yla6c936fswq5w94k4c6bgcplr";
1111 };
1212
13− passthru = {
14− updateScript = gnome3.updateScript { packageName = "zenity"; attrPath = "gnome3.zenity"; };
15− };
16−
1713 preBuild = ''
1814 mkdir -p $out/include
1915 '';
2016
21− buildInputs = [ gnome3.gtk libxml2 libxslt libX11 itstool ];
17+ buildInputs = [ gtk3 libxml2 libxslt libX11 itstool ];
2218
2319 nativeBuildInputs = [ pkgconfig intltool gnome-doc-utils which wrapGAppsHook ];
2420
21+ passthru = {
22+ updateScript = gnome3.updateScript {
23+ packageName = "zenity";
24+ attrPath = "gnome3.zenity";
25+ };
26+ };
27+
2528 meta = with stdenv.lib; {
2629 platforms = platforms.linux;
2730 maintainers = gnome3.maintainers;
pkgs/desktops/gnome-3/default.nix+13−15
@@ -28,7 +28,7 @@ lib.makeScope pkgs.newScope (self: with self; {
2828 gtk3.out # for gtk-update-icon-cache
2929 glib-networking gvfs dconf gnome-backgrounds gnome-control-center
3030 gnome-menus gnome-settings-daemon gnome-shell
31− gnome-themes-extra defaultIconTheme gnome-shell-extensions
31+ gnome-themes-extra adwaita-icon-theme gnome-shell-extensions
3232 pkgs.hicolor-icon-theme
3333 ];
3434
@@ -51,22 +51,11 @@ lib.makeScope pkgs.newScope (self: with self; {
5151 hitori gnome-taquin
5252 ];
5353
54− inherit (pkgs) atk glib gobject-introspection gspell webkitgtk gtk3 gtkmm3
55− libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceviewmm gtksourceview4
56− easytag meld orca rhythmbox shotwell gnome-usage
57− clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libcroco libpeas libgee geocode-glib libgweather librest libzapojit libmediaart gfbgraph gexiv2 folks totem-pl-parser gcr gsound libgnomekbd vte vte_290 vte-ng gnome-menus gdl;
58−
5954 libsoup = pkgs.libsoup.override { gnomeSupport = true; };
6055 libchamplain = pkgs.libchamplain.override { libsoup = libsoup; };
6156 gnome3 = self // { recurseForDerivations = false; };
62− gtk = gtk3;
63− gtkmm = gtkmm3;
6457 vala = pkgs.vala_0_42;
65− gegl_0_4 = pkgs.gegl_0_4.override { inherit gtk; };
66− rest = librest;
67−
68−# Simplify the nixos module and gnome packages
69− defaultIconTheme = adwaita-icon-theme;
58+ gegl_0_4 = pkgs.gegl_0_4.override { gtk = pkgs.gtk3; };
7059
7160# ISO installer
7261# installerIso = callPackage ./installer.nix {};
@@ -372,8 +361,8 @@ lib.makeScope pkgs.newScope (self: with self; {
372361
373362 bijiben = gnome-notes; # added 2018-09-26
374363 evolution_data_server = evolution-data-server; # added 2018-02-25
375− geocode_glib = geocode-glib; # added 2018-02-25
376− glib_networking = glib-networking; # added 2018-02-25
364+ geocode_glib = pkgs.geocode-glib; # added 2018-02-25
365+ glib_networking = pkgs.glib-networking; # added 2018-02-25
377366 gnome_common = gnome-common; # added 2018-02-25
378367 gnome_control_center = gnome-control-center; # added 2018-02-25
379368 gnome_desktop = gnome-desktop; # added 2018-02-25
@@ -399,4 +388,13 @@ lib.makeScope pkgs.newScope (self: with self; {
399388 yelp_xsl = yelp-xsl; # added 2018-02-25
400389 yelp_tools = yelp-tools; # added 2018-02-25
401390
391+ # added 2019-02-08
392+ inherit (pkgs) atk glib gobject-introspection gspell webkitgtk gtk3 gtkmm3
393+ libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceviewmm gtksourceview4
394+ easytag meld orca rhythmbox shotwell gnome-usage
395+ clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libcroco libpeas libgee geocode-glib libgweather librest libzapojit libmediaart gfbgraph gexiv2 folks totem-pl-parser gcr gsound libgnomekbd vte vte_290 vte-ng gnome-menus gdl;
396+ defaultIconTheme = adwaita-icon-theme;
397+ gtk = gtk3;
398+ gtkmm = gtkmm3;
399+ rest = librest;
402400})
pkgs/desktops/gnome-3/devtools/devhelp/default.nix+1−1
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414 nativeBuildInputs = [ meson ninja pkgconfig gettext itstool wrapGAppsHook appstream-glib gobject-introspection python3 ];
1515 buildInputs = [
1616 glib gtk3 webkitgtk amtk
17− gnome3.defaultIconTheme gsettings-desktop-schemas
17+ gnome3.adwaita-icon-theme gsettings-desktop-schemas
1818 ];
1919
2020 doCheck = true;
pkgs/desktops/gnome-3/devtools/nemiver/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, fetchpatch, pkgconfig, gnome3, gtk3, libxml2, intltool, itstool, gdb,
2− boost, sqlite, libgtop, glibmm, gtkmm, vte, gtksourceview, gsettings-desktop-schemas,
2+ boost, sqlite, libgtop, glibmm, gtkmm3, vte, gtksourceview, gsettings-desktop-schemas,
33 gtksourceviewmm, wrapGAppsHook }:
44
55stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515
1616 buildInputs = [
1717 gtk3 gdb boost sqlite libgtop
18− glibmm gtkmm vte gtksourceview gtksourceviewmm
18+ glibmm gtkmm3 vte gtksourceview gtksourceviewmm
1919 gsettings-desktop-schemas
2020 ];
2121
pkgs/desktops/gnome-3/games/atomix/default.nix+1−1
@@ -13,7 +13,7 @@ in stdenv.mkDerivation rec {
1313 };
1414
1515 nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook python3 ];
16− buildInputs = [ glib gtk3 gdk_pixbuf libgnome-games-support gnome3.defaultIconTheme ];
16+ buildInputs = [ glib gtk3 gdk_pixbuf libgnome-games-support gnome3.adwaita-icon-theme ];
1717
1818 postPatch = ''
1919 chmod +x meson_post_install.py
pkgs/desktops/gnome-3/games/five-or-more/default.nix+1−1
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212
1313 nativeBuildInputs = [ meson ninja pkgconfig gettext itstool libxml2 python3 wrapGAppsHook ];
1414 buildInputs = [
15− gtk3 librsvg libgnome-games-support gnome3.defaultIconTheme
15+ gtk3 librsvg libgnome-games-support gnome3.adwaita-icon-theme
1616 ];
1717
1818 postPatch = ''
pkgs/desktops/gnome-3/games/four-in-a-row/default.nix+1−1
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 };
1212
1313 nativeBuildInputs = [ pkgconfig wrapGAppsHook gettext itstool libxml2 ];
14− buildInputs = [ gtk3 libcanberra-gtk3 librsvg gnome3.defaultIconTheme ];
14+ buildInputs = [ gtk3 libcanberra-gtk3 librsvg gnome3.adwaita-icon-theme ];
1515
1616 passthru = {
1717 updateScript = gnome3.updateScript {
pkgs/desktops/gnome-3/games/gnome-chess/default.nix+1−1
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 };
1212
1313 nativeBuildInputs = [ meson ninja vala pkgconfig gettext itstool libxml2 python3 wrapGAppsHook gobject-introspection ];
14− buildInputs = [ glib gtk3 librsvg gnome3.defaultIconTheme ];
14+ buildInputs = [ glib gtk3 librsvg gnome3.adwaita-icon-theme ];
1515
1616 postPatch = ''
1717 chmod +x meson_post_install.py
pkgs/desktops/gnome-3/games/gnome-klotski/default.nix+1−1
@@ -13,7 +13,7 @@ in stdenv.mkDerivation rec {
1313 };
1414
1515 nativeBuildInputs = [ pkgconfig vala wrapGAppsHook intltool itstool libxml2 appstream-glib desktop-file-utils ];
16− buildInputs = [ glib gtk3 librsvg libgee libgnome-games-support gnome3.defaultIconTheme ];
16+ buildInputs = [ glib gtk3 librsvg libgee libgnome-games-support gnome3.adwaita-icon-theme ];
1717
1818 passthru = {
1919 updateScript = gnome3.updateScript {
pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix+1−1
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717 nativeBuildInputs = [ pkgconfig ];
1818 buildInputs = [
1919 gtk3 wrapGAppsHook librsvg intltool itstool libxml2
20− gnome3.defaultIconTheme
20+ gnome3.adwaita-icon-theme
2121 ];
2222
2323 meta = with stdenv.lib; {
pkgs/desktops/gnome-3/games/gnome-mines/default.nix+1−1
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212
1313 # gobject-introspection for finding vapi files
1414 nativeBuildInputs = [ meson ninja vala gobject-introspection pkgconfig gettext itstool python3 libxml2 wrapGAppsHook ];
15− buildInputs = [ gtk3 librsvg gnome3.defaultIconTheme libgnome-games-support libgee ];
15+ buildInputs = [ gtk3 librsvg gnome3.adwaita-icon-theme libgnome-games-support libgee ];
1616
1717 postPatch = ''
1818 chmod +x data/meson_compile_gschema.py # patchShebangs requires executable file
pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix+1−1
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313
1414 nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool itstool libxml2 ];
1515 buildInputs = [
16− gtk3 librsvg libcanberra-gtk3 clutter-gtk gnome3.defaultIconTheme
16+ gtk3 librsvg libcanberra-gtk3 clutter-gtk gnome3.adwaita-icon-theme
1717 libgee libgnome-games-support
1818 ];
1919
pkgs/desktops/gnome-3/games/gnome-robots/default.nix+1−1
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818 nativeBuildInputs = [ pkgconfig ];
1919 buildInputs = [
2020 gtk3 wrapGAppsHook intltool itstool librsvg libcanberra-gtk3
21− libxml2 gnome3.defaultIconTheme libgnome-games-support libgee
21+ libxml2 gnome3.adwaita-icon-theme libgnome-games-support libgee
2222 ];
2323
2424 meta = with stdenv.lib; {
pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, meson, ninja, vala, pkgconfig, gobject-introspection, gettext, gtk3, gnome3, wrapGAppsHook
2−, json-glib, qqwing, itstool, libxml2, python3, desktop-file-utils }:
2+, libgee, json-glib, qqwing, itstool, libxml2, python3, desktop-file-utils }:
33
44stdenv.mkDerivation rec {
55 name = "gnome-sudoku-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 };
1212
1313 nativeBuildInputs = [ meson ninja vala pkgconfig gobject-introspection gettext itstool libxml2 python3 desktop-file-utils wrapGAppsHook ];
14− buildInputs = [ gtk3 gnome3.libgee json-glib qqwing ];
14+ buildInputs = [ gtk3 libgee json-glib qqwing ];
1515
1616 postPatch = ''
1717 chmod +x post_install.py # patchShebangs requires executable file
pkgs/desktops/gnome-3/games/gnome-taquin/default.nix+1−1
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717 nativeBuildInputs = [ pkgconfig ];
1818 buildInputs = [
1919 gtk3 wrapGAppsHook librsvg libcanberra-gtk3
20− intltool itstool libxml2 gnome3.defaultIconTheme
20+ intltool itstool libxml2 gnome3.adwaita-icon-theme
2121 ];
2222
2323 meta = with stdenv.lib; {
pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix+1−1
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616
1717 nativeBuildInputs = [ pkgconfig ];
1818 buildInputs = [
19− gtk3 wrapGAppsHook intltool itstool libxml2 gnome3.defaultIconTheme
19+ gtk3 wrapGAppsHook intltool itstool libxml2 gnome3.adwaita-icon-theme
2020 ];
2121
2222 meta = with stdenv.lib; {
pkgs/desktops/gnome-3/games/hitori/default.nix+1−1
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717 nativeBuildInputs = [ pkgconfig ];
1818 buildInputs = [
1919 gtk3 wrapGAppsHook intltool itstool libxml2
20− gnome3.defaultIconTheme
20+ gnome3.adwaita-icon-theme
2121 ];
2222
2323 meta = with stdenv.lib; {
pkgs/desktops/gnome-3/games/iagno/default.nix+1−1
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 };
1212
1313 nativeBuildInputs = [ pkgconfig wrapGAppsHook itstool libxml2 ];
14− buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg libcanberra-gtk3 ];
14+ buildInputs = [ gtk3 gnome3.adwaita-icon-theme gdk_pixbuf librsvg libcanberra-gtk3 ];
1515
1616 enableParallelBuilding = true;
1717
pkgs/desktops/gnome-3/games/lightsoff/default.nix+1−1
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
2121 vala pkgconfig wrapGAppsHook itstool gettext appstream-glib libxml2
2222 meson ninja python3
2323 ];
24− buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg clutter clutter-gtk ];
24+ buildInputs = [ gtk3 gnome3.adwaita-icon-theme gdk_pixbuf librsvg clutter clutter-gtk ];
2525
2626 passthru = {
2727 updateScript = gnome3.updateScript {
pkgs/desktops/gnome-3/games/quadrapassel/default.nix+1−1
@@ -15,7 +15,7 @@ in stdenv.mkDerivation rec {
1515
1616 nativeBuildInputs = [ pkgconfig itstool intltool wrapGAppsHook ];
1717 buildInputs = [
18− gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg
18+ gtk3 gnome3.adwaita-icon-theme gdk_pixbuf librsvg
1919 libcanberra-gtk3 clutter libxml2 clutter-gtk
2020 ];
2121
pkgs/desktops/gnome-3/games/swell-foop/default.nix+1−1
@@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
2020 };
2121
2222 nativeBuildInputs = [ meson ninja vala pkgconfig wrapGAppsHook python3 itstool gettext libxml2 desktop-file-utils ];
23− buildInputs = [ glib gtk3 gnome3.defaultIconTheme clutter clutter-gtk ];
23+ buildInputs = [ glib gtk3 gnome3.adwaita-icon-theme clutter clutter-gtk ];
2424
2525 postPatch = ''
2626 chmod +x meson_post_install.py # patchShebangs requires executable file
pkgs/desktops/gnome-3/games/tali/default.nix+1−1
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515 };
1616
1717 nativeBuildInputs = [ pkgconfig ];
18− buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg
18+ buildInputs = [ gtk3 gnome3.adwaita-icon-theme gdk_pixbuf librsvg
1919 libxml2 itstool intltool wrapGAppsHook ];
2020
2121 enableParallelBuilding = true;
pkgs/desktops/gnome-3/misc/gitg/default.nix+4−3
@@ -1,5 +1,6 @@
11{ stdenv, fetchurl, fetchpatch, vala, intltool, pkgconfig, gtk3, glib
22, json-glib, wrapGAppsHook, libpeas, bash, gobject-introspection
3+, libsoup, gtksourceview, gsettings-desktop-schemas, adwaita-icon-theme
34, gnome3, gtkspell3, shared-mime-info, libgee, libgit2-glib, libsecret
45, meson, ninja, python3
56 }:
@@ -35,9 +36,9 @@ in stdenv.mkDerivation rec {
3536 enableParallelBuilding = true;
3637
3738 buildInputs = [
38− gtk3 glib json-glib libgee libpeas gnome3.libsoup
39− libgit2-glib gtkspell3 gnome3.gtksourceview gnome3.gsettings-desktop-schemas
40− libsecret gobject-introspection gnome3.adwaita-icon-theme
39+ gtk3 glib json-glib libgee libpeas libsoup
40+ libgit2-glib gtkspell3 gtksourceview gsettings-desktop-schemas
41+ libsecret gobject-introspection adwaita-icon-theme
4142 ];
4243
4344 nativeBuildInputs = [ meson ninja python3 vala wrapGAppsHook intltool pkgconfig ];
pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix+2−2
@@ -10,7 +10,7 @@
1010, gnome-session
1111, gnome3
1212, gsettings-desktop-schemas
13−, gtk
13+, gtk3
1414, ibus
1515, intltool
1616, libcanberra-gtk3
@@ -85,7 +85,7 @@ let
8585 gnome-bluetooth
8686 gnome-desktop
8787 gsettings-desktop-schemas
88− gtk
88+ gtk3
8989 ibus
9090 libcanberra-gtk3
9191 libpulseaudio
pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, pkgconfig, meson, ninja, gettext, gnome3, packagekit, polkit
2−, systemd, wrapGAppsHook, desktop-file-utils }:
2+, gtk3, systemd, wrapGAppsHook, desktop-file-utils }:
33
44stdenv.mkDerivation rec {
55 name = "gnome-packagekit-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 };
1212
1313 nativeBuildInputs = [ pkgconfig meson ninja gettext wrapGAppsHook desktop-file-utils ];
14− buildInputs = [ gnome3.gtk packagekit systemd polkit ];
14+ buildInputs = [ gtk3 packagekit systemd polkit ];
1515
1616 postPatch = ''
1717 patchShebangs meson_post_install.sh
pkgs/desktops/gnome-3/misc/gnome-panel/default.nix+2−2
@@ -11,7 +11,7 @@
1111, gnome-flashback
1212, gnome-menus
1313, gnome3
14−, gtk
14+, gtk3
1515, itstool
1616, libgweather
1717, libsoup
@@ -77,7 +77,7 @@ in stdenv.mkDerivation rec {
7777 glib
7878 gnome-desktop
7979 gnome-menus
80− gtk
80+ gtk3
8181 libgweather
8282 libsoup
8383 libwnck3
pkgs/desktops/gnome-3/misc/gnome-screensaver/default.nix+2−2
@@ -7,7 +7,7 @@
77, gnome-common
88, gnome-desktop
99, gnome3
10−, gtk
10+, gtk3
1111, gsettings-desktop-schemas
1212, pkgconfig
1313, intltool
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
6666
6767 buildInputs = [
6868 glib
69− gtk
69+ gtk3
7070 gnome-desktop
7171 dbus-glib
7272 pam
pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix+1−1
@@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
1919 ];
2020 buildInputs = [
2121 gtk3 glib gnome3.gsettings-desktop-schemas
22− gdk_pixbuf gnome3.defaultIconTheme
22+ gdk_pixbuf gnome3.adwaita-icon-theme
2323 libnotify gnome3.gnome-shell python3Packages.pygobject3
2424 libsoup gnome3.gnome-settings-daemon gnome3.nautilus
2525 gnome3.mutter gnome3.gnome-desktop gobject-introspection
pkgs/desktops/gnome-3/misc/metacity/default.nix+2−2
@@ -4,7 +4,7 @@
44, glib
55, gnome3
66, gsettings-desktop-schemas
7−, gtk
7+, gtk3
88, libcanberra-gtk3
99, libgtop
1010, libstartup_notification
@@ -42,7 +42,7 @@ in stdenv.mkDerivation rec {
4242 buildInputs = [
4343 glib
4444 gsettings-desktop-schemas
45− gtk
45+ gtk3
4646 libcanberra-gtk3
4747 libgtop
4848 libstartup_notification
pkgs/desktops/gnome-3/misc/pomodoro/default.nix+1−1
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
3232 dbus-glib libcanberra gst_all_1.gstreamer
3333 gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
3434 gnome3.gsettings-desktop-schemas
35− gnome3.gnome-shell gtk3 gnome3.defaultIconTheme
35+ gnome3.gnome-shell gtk3 gnome3.adwaita-icon-theme
3636 ];
3737
3838 meta = with stdenv.lib; {
pkgs/desktops/mate/pluma/default.nix+1−1
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
2323 python
2424 gnome3.gtksourceview
2525 gnome3.libpeas
26− gnome3.defaultIconTheme
26+ gnome3.adwaita-icon-theme
2727 mate.mate-desktop
2828 ];
2929
pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix+5−4
@@ -1,5 +1,6 @@
11{ fetchurl, fetchgit, substituteAll, stdenv, meson, ninja, pkgconfig, gnome3, perl, gettext, glib, libnotify, lcms2, libXtst
22, libxkbfile, libpulseaudio, alsaLib, libcanberra-gtk3, upower, colord, libgweather, polkit
3+, geocode-glib, gtk3
34, geoclue2, librsvg, xf86_input_wacom, udev, libgudev, libwacom, libxslt, libxml2, networkmanager
45, docbook_xsl, wrapGAppsHook, python3, ibus, xkeyboard_config, tzdata, nss, pantheon, accountsservice }:
56
@@ -75,16 +76,16 @@ stdenv.mkDerivation rec {
7576 wrapGAppsHook
7677 ];
7778
78− buildInputs = with gnome3; [
79+ buildInputs = [
7980 accountsservice
8081 alsaLib
8182 colord
8283 geoclue2
8384 geocode-glib
8485 glib
85− gnome-desktop
86− gsettings-desktop-schemas
87− gtk
86+ gnome3.gnome-desktop
87+ gnome3.gsettings-desktop-schemas
88+ gtk3
8889 ibus
8990 lcms2
9091 libXtst
pkgs/development/compilers/llvm/4/libc++/default.nix−5
@@ -44,11 +44,6 @@ stdenv.mkDerivation rec {
4444
4545 linkCxxAbi = stdenv.isLinux;
4646
47− postInstall = ''
48− mv $out/lib/libc++.a $out/lib/libc++_static.a
49− cp ${./libc++.a} $out/lib/libc++.a
50− '';
51−
5247 setupHooks = [
5348 ../../../../../build-support/setup-hooks/role.bash
5449 ./setup-hook.sh
pkgs/development/compilers/llvm/4/libc++/libc++.adeleted−1
@@ -1 +0,0 @@
1−INPUT(-lc++_static -lc++abi)
pkgs/development/compilers/llvm/5/libc++/default.nix−5
@@ -38,11 +38,6 @@ stdenv.mkDerivation rec {
3838
3939 linkCxxAbi = stdenv.isLinux;
4040
41− postInstall = ''
42− mv $out/lib/libc++.a $out/lib/libc++_static.a
43− cp ${./libc++.a} $out/lib/libc++.a
44− '';
45−
4641 setupHooks = [
4742 ../../../../../build-support/setup-hooks/role.bash
4843 ./setup-hook.sh
pkgs/development/compilers/llvm/5/libc++/libc++.adeleted−1
@@ -1 +0,0 @@
1−INPUT(-lc++_static -lc++abi)
pkgs/development/compilers/llvm/6/libc++/default.nix−5
@@ -38,11 +38,6 @@ stdenv.mkDerivation rec {
3838
3939 linkCxxAbi = stdenv.isLinux;
4040
41− postInstall = ''
42− mv $out/lib/libc++.a $out/lib/libc++_static.a
43− cp ${./libc++.a} $out/lib/libc++.a
44− '';
45−
4641 setupHooks = [
4742 ../../../../../build-support/setup-hooks/role.bash
4843 ./setup-hook.sh
pkgs/development/compilers/llvm/6/libc++/libc++.adeleted−1
@@ -1 +0,0 @@
1−INPUT(-lc++_static -lc++abi)
pkgs/development/compilers/llvm/7/libc++/default.nix−5
@@ -36,11 +36,6 @@ stdenv.mkDerivation rec {
3636
3737 linkCxxAbi = stdenv.isLinux;
3838
39− postInstall = ''
40− mv $out/lib/libc++.a $out/lib/libc++_static.a
41− cp ${./libc++.a} $out/lib/libc++.a
42− '';
43−
4439 setupHooks = [
4540 ../../../../../build-support/setup-hooks/role.bash
4641 ./setup-hook.sh
pkgs/development/compilers/llvm/7/libc++/libc++.adeleted−1
@@ -1 +0,0 @@
1−INPUT(-lc++_static -lc++abi)
pkgs/development/compilers/nasm/default.nix+8−5
@@ -1,15 +1,18 @@
1−{ stdenv, fetchurl, perl }:
1+{ stdenv, fetchFromRepoOrCz, autoreconfHook, perl, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl }:
22
33stdenv.mkDerivation rec {
44 name = "nasm-${version}";
55 version = "2.14.02";
66
7− src = fetchurl {
8− url = "https://www.nasm.us/pub/nasm/releasebuilds/${version}/${name}.tar.bz2";
9− sha256 = "1g409sr1kj7v1089s9kv0i4azvddkcwcypnbakfryyi71b3jdz9l";
7+ src = fetchFromRepoOrCz {
8+ repo = "nasm";
9+ rev = name;
10+ sha256 = "15z6ybnzlsrqs2964h6czqhpmr7vc3ln4y4h0z9vrznk4mqcwbsa";
1011 };
1112
12− nativeBuildInputs = [ perl ];
13+ nativeBuildInputs = [ autoreconfHook perl asciidoc xmlto docbook_xml_dtd_45 docbook_xsl ];
14+
15+ postBuild = "make manpages";
1316
1417 doCheck = true;
1518
pkgs/development/haskell-modules/configuration-nix.nix+1−1
@@ -286,7 +286,7 @@ self: super: builtins.intersectAttrs super {
286286 # Tries to run GUI in tests
287287 leksah = dontCheck (overrideCabal super.leksah (drv: {
288288 executableSystemDepends = (drv.executableSystemDepends or []) ++ (with pkgs; [
289− gnome3.defaultIconTheme # Fix error: Icon 'window-close' not present in theme ...
289+ gnome3.adwaita-icon-theme # Fix error: Icon 'window-close' not present in theme ...
290290 wrapGAppsHook # Fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system
291291 gtk3 # Fix error: GLib-GIO-ERROR **: Settings schema 'org.gtk.Settings.FileChooser' is not installed
292292 ]);
pkgs/development/haskell-modules/hackage-packages.nix+22−23
@@ -34385,7 +34385,7 @@ self: {
3438534385 description = "BDCS API Server";
3438634386 license = stdenv.lib.licenses.gpl3;
3438734387 hydraPlatforms = stdenv.lib.platforms.none;
34388− }) {inherit (pkgs.gnome3) libgit2-glib;};
34388+ }) {inherit (pkgs) libgit2-glib;};
3438934389
3439034390 "bdd" = callPackage
3439134391 ({ mkDerivation, base, directory, HUnit, mtl, process
@@ -86444,7 +86444,7 @@ self: {
8644486444 doHaddock = false;
8644586445 description = "DbusmenuGtk bindings";
8644686446 license = stdenv.lib.licenses.lgpl21;
86447− }) {gtk3 = pkgs.gnome3.gtk; inherit (pkgs) libdbusmenu-gtk3;};
86447+ }) {gtk3 = pkgs.gtk3; inherit (pkgs) libdbusmenu-gtk3;};
8644886448
8644986449 "gi-gdk" = callPackage
8645086450 ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo
@@ -86465,7 +86465,7 @@ self: {
8646586465 libraryPkgconfigDepends = [ gtk3 ];
8646686466 description = "Gdk bindings";
8646786467 license = stdenv.lib.licenses.lgpl21;
86468− }) {gtk3 = pkgs.gnome3.gtk;};
86468+ }) {gtk3 = pkgs.gtk3;};
8646986469
8647086470 "gi-gdkpixbuf" = callPackage
8647186471 ({ mkDerivation, base, bytestring, Cabal, containers, gdk_pixbuf
@@ -86506,7 +86506,7 @@ self: {
8650686506 doHaddock = false;
8650786507 description = "GdkX11 bindings";
8650886508 license = stdenv.lib.licenses.lgpl21;
86509− }) {gtk3 = pkgs.gnome3.gtk;};
86509+ }) {gtk3 = pkgs.gtk3;};
8651086510
8651186511 "gi-ggit" = callPackage
8651286512 ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio
@@ -86526,7 +86526,7 @@ self: {
8652686526 doHaddock = false;
8652786527 description = "libgit2-glib bindings";
8652886528 license = stdenv.lib.licenses.lgpl21;
86529− }) {inherit (pkgs.gnome3) libgit2-glib;};
86529+ }) {inherit (pkgs) libgit2-glib;};
8653086530
8653186531 "gi-gio" = callPackage
8653286532 ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
@@ -86565,7 +86565,7 @@ self: {
8656586565 doHaddock = false;
8656686566 description = "GIRepository (gobject-introspection) bindings";
8656786567 license = stdenv.lib.licenses.lgpl21;
86568− }) {inherit (pkgs.gnome3) gobject-introspection;};
86568+ }) {inherit (pkgs) gobject-introspection;};
8656986569
8657086570 "gi-glib" = callPackage
8657186571 ({ mkDerivation, base, bytestring, Cabal, containers, glib
@@ -86749,7 +86749,7 @@ self: {
8674986749 libraryPkgconfigDepends = [ gtk3 ];
8675086750 description = "Gtk bindings";
8675186751 license = stdenv.lib.licenses.lgpl21;
86752− }) {gtk3 = pkgs.gnome3.gtk;};
86752+ }) {gtk3 = pkgs.gtk3;};
8675386753
8675486754 "gi-gtk-declarative" = callPackage
8675586755 ({ mkDerivation, base, criterion, gi-gdk, gi-glib, gi-gobject
@@ -86847,7 +86847,7 @@ self: {
8684786847 doHaddock = false;
8684886848 description = "GtkSource bindings";
8684986849 license = stdenv.lib.licenses.lgpl21;
86850− }) {gtksourceview3 = pkgs.gnome3.gtksourceview;};
86850+ }) {gtksourceview3 = pkgs.gtksourceview;};
8685186851
8685286852 "gi-javascriptcore" = callPackage
8685386853 ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
@@ -86868,7 +86868,7 @@ self: {
8686886868 description = "JavaScriptCore bindings";
8686986869 license = stdenv.lib.licenses.lgpl21;
8687086870 hydraPlatforms = stdenv.lib.platforms.none;
86871− }) {inherit (pkgs.gnome3) webkitgtk;};
86871+ }) {inherit (pkgs) webkitgtk;};
8687286872
8687386873 "gi-notify" = callPackage
8687486874 ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdkpixbuf
@@ -86999,7 +86999,7 @@ self: {
8699986999 doHaddock = false;
8700087000 description = "Libsecret bindings";
8700187001 license = stdenv.lib.licenses.lgpl21;
87002− }) {inherit (pkgs.gnome3) libsecret;};
87002+ }) {inherit (pkgs) libsecret;};
8700387003
8700487004 "gi-soup" = callPackage
8700587005 ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio
@@ -87040,7 +87040,7 @@ self: {
8704087040 libraryPkgconfigDepends = [ vte_291 ];
8704187041 description = "Vte bindings";
8704287042 license = stdenv.lib.licenses.lgpl21;
87043− }) {vte_291 = pkgs.gnome3.vte;};
87043+ }) {vte_291 = pkgs.vte;};
8704487044
8704587045 "gi-webkit" = callPackage
8704687046 ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
@@ -87086,7 +87086,7 @@ self: {
8708687086 description = "WebKit2 bindings";
8708787087 license = stdenv.lib.licenses.lgpl21;
8708887088 hydraPlatforms = stdenv.lib.platforms.none;
87089− }) {inherit (pkgs.gnome3) webkitgtk;};
87089+ }) {inherit (pkgs) webkitgtk;};
8709087090
8709187091 "gi-webkit2webextension" = callPackage
8709287092 ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio
@@ -94453,7 +94453,7 @@ self: {
9445394453 description = "A standalone StatusNotifierItem/AppIndicator tray";
9445494454 license = stdenv.lib.licenses.bsd3;
9445594455 hydraPlatforms = stdenv.lib.platforms.none;
94456− }) {gtk3 = pkgs.gnome3.gtk;};
94456+ }) {gtk3 = pkgs.gtk3;};
9445794457
9445894458 "gtk-strut" = callPackage
9445994459 ({ mkDerivation, base, gi-gdk, gi-gtk, text, transformers }:
@@ -94792,7 +94792,7 @@ self: {
9479294792 description = "Binding to the GtkSourceView library";
9479394793 license = stdenv.lib.licenses.lgpl21;
9479494794 hydraPlatforms = stdenv.lib.platforms.none;
94795− }) {gtksourceview3 = pkgs.gnome3.gtksourceview;};
94795+ }) {gtksourceview3 = pkgs.gtksourceview;};
9479694796
9479794797 "guarded-allocation" = callPackage
9479894798 ({ mkDerivation, base }:
@@ -100459,8 +100459,7 @@ self: {
100459100459 testHaskellDepends = [ base doctest process ];
100460100460 description = "Generate Haskell bindings for GObject Introspection capable libraries";
100461100461 license = stdenv.lib.licenses.lgpl21;
100462− }) {inherit (pkgs) glib;
100463− inherit (pkgs.gnome3) gobject-introspection;};
100462+ }) {inherit (pkgs) glib gobject-introspection;};
100464100463
100465100464 "haskell-gi-base" = callPackage
100466100465 ({ mkDerivation, base, bytestring, containers, glib, text }:
@@ -135268,7 +135267,7 @@ self: {
135268135267 description = "Haskell IDE written in Haskell";
135269135268 license = "GPL";
135270135269 hydraPlatforms = stdenv.lib.platforms.none;
135271− }) {gtk3 = pkgs.gnome3.gtk;};
135270+ }) {gtk3 = pkgs.gtk3;};
135272135271
135273135272 "leksah-server" = callPackage
135274135273 ({ mkDerivation, aeson, attoparsec, base, base-compat, binary
@@ -140884,7 +140883,7 @@ self: {
140884140883 description = "Leksah tool kit";
140885140884 license = "GPL";
140886140885 hydraPlatforms = stdenv.lib.platforms.none;
140887− }) {gtk3 = pkgs.gnome3.gtk;};
140886+ }) {gtk3 = pkgs.gtk3;};
140888140887
140889140888 "ltl" = callPackage
140890140889 ({ mkDerivation, base, vcd }:
@@ -207548,7 +207547,7 @@ self: {
207548207547 description = "Binding to the libsvg-cairo library";
207549207548 license = stdenv.lib.licenses.bsd3;
207550207549 hydraPlatforms = stdenv.lib.platforms.none;
207551− }) {inherit (pkgs.gnome3) librsvg;};
207550+ }) {inherit (pkgs) librsvg;};
207552207551
207553207552 "svgutils" = callPackage
207554207553 ({ mkDerivation, base, filepath, xml }:
@@ -209363,7 +209362,7 @@ self: {
209363209362 description = "A desktop bar similar to xmobar, but with more GUI";
209364209363 license = stdenv.lib.licenses.bsd3;
209365209364 hydraPlatforms = stdenv.lib.platforms.none;
209366− }) {gtk3 = pkgs.gnome3.gtk;};
209365+ }) {gtk3 = pkgs.gtk3;};
209367209366
209368209367 "tag-bits" = callPackage
209369209368 ({ mkDerivation, base, ghc-prim }:
@@ -212214,7 +212213,7 @@ self: {
212214212213 description = "Terminal emulator configurable in Haskell";
212215212214 license = stdenv.lib.licenses.bsd3;
212216212215 hydraPlatforms = stdenv.lib.platforms.none;
212217− }) {gtk3 = pkgs.gnome3.gtk; vte_291 = pkgs.gnome3.vte;};
212216+ }) {gtk3 = pkgs.gtk3; vte_291 = pkgs.vte;};
212218212217
212219212218 "termplot" = callPackage
212220212219 ({ mkDerivation, base, brick, data-default, optparse-applicative
@@ -215189,7 +215188,7 @@ self: {
215189215188 description = "A desktop bar based on WebKit";
215190215189 license = stdenv.lib.licenses.mit;
215191215190 hydraPlatforms = stdenv.lib.platforms.none;
215192− }) {gtk3 = pkgs.gnome3.gtk; inherit (pkgs.gnome3) webkitgtk;};
215191+ }) {gtk3 = pkgs.gtk3; inherit (pkgs) webkitgtk;};
215193215192
215194215193 "tibetan-utils" = callPackage
215195215194 ({ mkDerivation, base, composition-prelude, either, hspec
@@ -230756,7 +230755,7 @@ self: {
230756230755 description = "JavaScriptCore FFI from webkitgtk";
230757230756 license = stdenv.lib.licenses.bsd3;
230758230757 hydraPlatforms = stdenv.lib.platforms.none;
230759− }) {inherit (pkgs.gnome3) webkitgtk;};
230758+ }) {inherit (pkgs) webkitgtk;};
230760230759
230761230760 "webkitgtk3" = callPackage
230762230761 ({ mkDerivation, base, bytestring, Cabal, cairo, glib
pkgs/development/interpreters/python/build-python-package-pyproject.nixnew file+53
@@ -0,0 +1,53 @@
1+# This function provides specific bits for building a setuptools-based Python package.
2+
3+{ lib
4+, python
5+}:
6+
7+{
8+# passed to "python setup.py build_ext"
9+# https://github.com/pypa/pip/issues/881
10+# Rename to `buildOptions` because it is not setuptools specific?
11+ setupPyBuildFlags ? []
12+# Execute before shell hook
13+, preShellHook ? ""
14+# Execute after shell hook
15+, postShellHook ? ""
16+, ... } @ attrs:
17+
18+let
19+ options = lib.concatMapStringsSep " " (option: "--global-option ${option}") setupPyBuildFlags;
20+in attrs // {
21+ buildPhase = attrs.buildPhase or ''
22+ runHook preBuild
23+ mkdir -p dist
24+ echo "Creating a wheel..."
25+ ${python.pythonForBuild.interpreter} -m pip wheel --no-index --no-deps --no-clean --no-build-isolation --wheel-dir dist ${options} .
26+ echo "Finished creating a wheel..."
27+ runHook postBuild
28+ '';
29+
30+ installCheckPhase = ''
31+ runHook preCheck
32+ echo "No checkPhase defined. Either provide a checkPhase or disable tests in case tests are not available."; exit 1
33+ runHook postCheck
34+ '';
35+
36+ # With Python it's a common idiom to run the tests
37+ # after the software has been installed.
38+ doCheck = attrs.doCheck or true;
39+
40+ shellHook = attrs.shellHook or ''
41+ ${preShellHook}
42+ # Long-term setup.py should be dropped.
43+ if [ -e pyproject.toml ]; then
44+ tmp_path=$(mktemp -d)
45+ export PATH="$tmp_path/bin:$PATH"
46+ export PYTHONPATH="$tmp_path/${python.pythonForBuild.sitePackages}:$PYTHONPATH"
47+ mkdir -p $tmp_path/${python.pythonForBuild.sitePackages}
48+ ${python.pythonForBuild.pkgs.bootstrapped-pip}/bin/pip install -e . --prefix $tmp_path >&2
49+ fi
50+ ${postShellHook}
51+ '';
52+
53+}
pkgs/development/interpreters/python/build-python-package.nix+3−1
@@ -17,6 +17,7 @@
1717
1818let
1919 setuptools-specific = import ./build-python-package-setuptools.nix { inherit lib python; };
20+ pyproject-specific = import ./build-python-package-pyproject.nix { inherit lib python; };
2021 flit-specific = import ./build-python-package-flit.nix { inherit python flit; };
2122 wheel-specific = import ./build-python-package-wheel.nix { };
2223 common = import ./build-python-package-common.nix { inherit python; };
@@ -37,7 +38,8 @@ format ? "setuptools"
3738
3839let
3940 formatspecific =
40− if format == "setuptools" then common (setuptools-specific attrs)
41+ if format == "pyproject" then common (pyproject-specific attrs)
42+ else if format == "setuptools" then common (setuptools-specific attrs)
4143 else if format == "flit" then common (flit-specific attrs)
4244 else if format == "wheel" then common (wheel-specific attrs)
4345 else if format == "other" then {}
pkgs/development/interpreters/python/mk-python-derivation.nix+5
@@ -87,6 +87,11 @@ let self = toPythonModule (python.stdenv.mkDerivation (builtins.removeAttrs attr
8787 # Propagate python and setuptools. We should stop propagating setuptools.
8888 propagatedBuildInputs = propagatedBuildInputs ++ [ python setuptools ];
8989
90+ # Enabled to detect some (native)BuildInputs mistakes
91+ strictDeps = true;
92+
93+ LANG = "${if python.stdenv.isDarwin then "en_US" else "C"}.UTF-8";
94+
9095 # Python packages don't have a checkPhase, only an installCheckPhase
9196 doCheck = false;
9297 doInstallCheck = doCheck;
pkgs/development/libraries/amtk/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl
1+{ stdenv, fetchurl, gtk3
22, pkgconfig, gnome3, dbus, xvfb_run }:
33let
44 version = "5.0.0";
@@ -17,7 +17,7 @@ in stdenv.mkDerivation {
1717 ];
1818
1919 buildInputs = [
20− gnome3.gtk
20+ gtk3
2121 ];
2222
2323 doCheck = stdenv.isLinux;
pkgs/development/libraries/aravis/default.nix+1−1
@@ -55,7 +55,7 @@ in
5555 ++ stdenv.lib.optional enableUsb libusb
5656 ++ stdenv.lib.optional enablePacketSocket audit
5757 ++ stdenv.lib.optionals (enableViewer || enableGstPlugin) [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ]
58− ++ stdenv.lib.optionals (enableViewer) [ libnotify gnome3.gtk3 gnome3.defaultIconTheme ];
58+ ++ stdenv.lib.optionals (enableViewer) [ libnotify gnome3.gtk3 gnome3.adwaita-icon-theme ];
5959
6060 preAutoreconf = ''./autogen.sh'';
6161
pkgs/development/libraries/ffmpeg/4.nix+2−2
@@ -6,7 +6,7 @@
66
77callPackage ./generic.nix (args // rec {
88 version = "${branch}";
9− branch = "4.1";
10− sha256 = "19d16dhb4gx3akhbqd8844awx1axxli91bsjwsm4qp2a4i1zp15n";
9+ branch = "4.1.1";
10+ sha256 = "0n5hz98gcyznj8lnqma6c9004vhcdzv67a4angnd1k6ai8xhxd0c";
1111 darwinFrameworks = [ Cocoa CoreMedia ];
1212})
pkgs/development/libraries/fontconfig/make-fonts-cache.nix+1
@@ -4,6 +4,7 @@ runCommand "fc-cache"
44 rec {
55 buildInputs = [ fontconfig.bin ];
66 preferLocalBuild = true;
7+ allowSubstitutes = false;
78 passAsFile = [ "fontDirs" ];
89 fontDirs = ''
910 <!-- Font directories -->
pkgs/development/libraries/gegl/4.0.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv, fetchurl, pkgconfig, glib, babl, libpng, cairo, libjpeg, which
22, librsvg, pango, gtk, bzip2, json-glib, intltool, autoreconfHook, libraw
3−, libwebp, gnome3, libintl }:
3+, gexiv2, libwebp, gnome3, libintl }:
44
55let
66 version = "0.4.12";
@@ -21,7 +21,7 @@ in stdenv.mkDerivation rec {
2121
2222 buildInputs = [
2323 libpng cairo libjpeg librsvg pango gtk bzip2
24− libraw libwebp gnome3.gexiv2
24+ libraw libwebp gexiv2
2525 ];
2626
2727 propagatedBuildInputs = [ glib json-glib babl ]; # for gegl-4.0.pc
pkgs/development/libraries/geocode-glib/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ fetchurl, stdenv, meson, ninja, pkgconfig, gettext, gtk-doc, docbook_xsl, gobject-introspection, gnome3, libsoup, json-glib }:
1+{ fetchurl, stdenv, meson, ninja, pkgconfig, gettext, gtk-doc, docbook_xsl, gobject-introspection, gnome3, libsoup, json-glib, glib }:
22
33stdenv.mkDerivation rec {
44 pname = "geocode-glib";
@@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
1111 sha256 = "1vmydxs5xizcmaxpkfrq75xpj6pqrpdjizxyb30m00h54yqqch7a";
1212 };
1313
14− nativeBuildInputs = with gnome3; [ meson ninja pkgconfig gettext gtk-doc docbook_xsl gobject-introspection ];
15− buildInputs = with gnome3; [ glib libsoup json-glib ];
14+ nativeBuildInputs = [ meson ninja pkgconfig gettext gtk-doc docbook_xsl gobject-introspection ];
15+ buildInputs = [ glib libsoup json-glib ];
1616
1717 patches = [
1818 ./installed-tests-path.patch
pkgs/development/libraries/gtk+/3.x.nix+9−9
@@ -1,6 +1,6 @@
11{ stdenv, fetchurl, fetchpatch, pkgconfig, gettext, perl, makeWrapper, shared-mime-info, isocodes
2−, expat, glib, cairo, pango, gdk_pixbuf, atk, at-spi2-atk, gobject-introspection
3−, xorg, epoxy, json-glib, libxkbcommon, gmp, gnome3
2+, expat, glib, cairo, pango, gdk_pixbuf, atk, at-spi2-atk, gobject-introspection, fribidi
3+, xorg, epoxy, json-glib, libxkbcommon, gmp, gnome3, autoreconfHook
44, x11Support ? stdenv.isLinux
55, waylandSupport ? stdenv.isLinux, mesa_noglu, wayland, wayland-protocols
66, xineramaSupport ? stdenv.isLinux
@@ -13,20 +13,20 @@ assert cupsSupport -> cups != null;
1313with stdenv.lib;
1414
1515let
16− version = "3.24.4";
16+ version = "3.24.5";
1717in
1818stdenv.mkDerivation rec {
1919 name = "gtk+3-${version}";
2020
2121 src = fetchurl {
2222 url = "mirror://gnome/sources/gtk+/${stdenv.lib.versions.majorMinor version}/gtk+-${version}.tar.xz";
23− sha256 = "176bl1pm5d5xkhmiwldzw833akna7shp59glkl6cjz580bzmjkyq";
23+ sha256 = "0bxhvnixc1hjxbzx063lghmix0wmv282khsqmckdxhrb606zpr8b";
2424 };
2525
2626 outputs = [ "out" "dev" ];
2727 outputBin = "dev";
2828
29− nativeBuildInputs = [ pkgconfig gettext gobject-introspection perl makeWrapper ];
29+ nativeBuildInputs = [ pkgconfig gettext gobject-introspection perl makeWrapper autoreconfHook ];
3030
3131 patches = [
3232 ./3.0-immodules.cache.patch
@@ -35,10 +35,10 @@ stdenv.mkDerivation rec {
3535 url = "https://bug757142.bugzilla-attachments.gnome.org/attachment.cgi?id=344123";
3636 sha256 = "0g6fhqcv8spfy3mfmxpyji93k8d4p4q4fz1v9a1c1cgcwkz41d7p";
3737 })
38− # 3.24.3: https://gitlab.gnome.org/GNOME/gtk/merge_requests/505
3938 (fetchpatch {
40− url = https://gitlab.gnome.org/GNOME/gtk/commit/95c0f07295fd300ab7f3416a39290ae33585ea6c.patch;
41− sha256 = "0z9w7f39xcn1cbcd8jhx731vq64nvi5q6kyc86bq8r00daysjwnl";
39+ name = "fix-fribidi-linking.patch";
40+ url = https://github.com/gnome/gtk/compare/3.24.5..47e4a111c2666961ab47b6df48460d3c9075d92d.patch;
41+ sha256 = "0ky4kmgcywg0qlwndn9aw083bkwnkr49bnlsz0ii93fxzvbiqglr";
4242 })
4343 ] ++ optionals stdenv.isDarwin [
4444 # X11 module requires <gio/gdesktopappinfo.h> which is not installed on Darwin
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
5050 buildInputs = [ libxkbcommon epoxy json-glib isocodes ]
5151 ++ optional stdenv.isDarwin AppKit;
5252 propagatedBuildInputs = with xorg; with stdenv.lib;
53− [ expat glib cairo pango gdk_pixbuf atk at-spi2-atk gnome3.gsettings-desktop-schemas
53+ [ expat glib cairo pango gdk_pixbuf atk at-spi2-atk gnome3.gsettings-desktop-schemas fribidi
5454 libXrandr libXrender libXcomposite libXi libXcursor libSM libICE ]
5555 ++ optional stdenv.isDarwin Cocoa # explicitly propagated, always needed
5656 ++ optionals waylandSupport [ mesa_noglu wayland wayland-protocols ]
pkgs/development/libraries/libdrm/default.nix+2−2
@@ -1,11 +1,11 @@
11{ stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, valgrind-light }:
22
33stdenv.mkDerivation rec {
4− name = "libdrm-2.4.96";
4+ name = "libdrm-2.4.97";
55
66 src = fetchurl {
77 url = "https://dri.freedesktop.org/libdrm/${name}.tar.bz2";
8− sha256 = "14xkip83qgljjaahzq40qgl60j54q7k00la1hbf5kk5lgg7ilmhd";
8+ sha256 = "08yimlp6jir1rs5ajgdx74xa5qdzcqahpdzdk0rmkmhh7vdcrl3p";
99 };
1010
1111 outputs = [ "out" "dev" "bin" ];
pkgs/development/libraries/libev/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 name = "libev-${version}";
5− version="4.24";
5+ version="4.25";
66
77 src = fetchurl {
88 url = "http://dist.schmorp.de/libev/Attic/${name}.tar.gz";
9− sha256 = "08gqsza1czx0nf62nkk183jb0946yzjsymaacxbzdgcs8z9r6dcp";
9+ sha256 = "1295q0lkkbrlpd5dl5i48bh1rm8mjzh9y795jlvjz3bp4wf7wxbq";
1010 };
1111
1212 meta = {
pkgs/development/libraries/libgda/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3, openssl, gnome3, gobject-introspection, vala
1+{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3, openssl, gnome3, gobject-introspection, vala, libgee
22, overrideCC, gcc6
33, mysqlSupport ? false, mysql ? null
44, postgresSupport ? false, postgresql ? null
@@ -24,7 +24,7 @@ assert postgresSupport -> postgresql != null;
2424 hardeningDisable = [ "format" ];
2525
2626 nativeBuildInputs = [ pkgconfig intltool itstool libxml2 gobject-introspection vala ];
27− buildInputs = with stdenv.lib; [ gtk3 openssl gnome3.libgee ]
27+ buildInputs = with stdenv.lib; [ gtk3 openssl libgee ]
2828 ++ optional (mysqlSupport) mysql.connector-c
2929 ++ optional (postgresSupport) postgresql;
3030
pkgs/development/libraries/libgdata/default.nix+1−2
@@ -14,8 +14,7 @@ stdenv.mkDerivation rec {
1414
1515 nativeBuildInputs = [ pkgconfig intltool gobject-introspection ];
1616
17− buildInputs = with gnome3;
18− [ libsoup libxml2 glib liboauth gcr gnome-online-accounts p11-kit openssl uhttpmock ];
17+ buildInputs = [ gnome3.libsoup libxml2 glib liboauth gcr gnome3.gnome-online-accounts p11-kit openssl uhttpmock ];
1918
2019 propagatedBuildInputs = [ json-glib ];
2120
pkgs/development/libraries/libidn2/default.nix+2−2
@@ -4,11 +4,11 @@ with stdenv.lib;
44
55stdenv.mkDerivation rec {
66 name = "libidn2-${version}";
7− version = "2.1.0";
7+ version = "2.1.1";
88
99 src = fetchurl {
1010 url = "mirror://gnu/gnu/libidn/${name}.tar.gz";
11− sha256 = "0chxs75212qknd72l6vvai48hwg3czlr938sym1sydwmmbdrh8q3";
11+ sha256 = "1cbq439dzf14jjpayk5mk0yyq32k3c27acg1d4ra364j6a060hcm";
1212 };
1313
1414 outputs = [ "bin" "dev" "out" "info" "devdoc" ];
pkgs/development/libraries/libpng/default.nix+1−2
@@ -18,8 +18,7 @@ in stdenv.mkDerivation rec {
1818 url = "mirror://sourceforge/libpng/libpng-${version}.tar.xz";
1919 sha256 = "06d35a3xz2a0kph82r56hqm1fn8fbwrqs07xzmr93dx63x695szc";
2020 };
21− patches = if !stdenv.hostPlatform.isAarch64 then null # temporarily avoid rebuild
22− else [
21+ patches = [
2322 (fetchurl { # https://github.com/glennrp/libpng/issues/266
2423 url = "https://salsa.debian.org/debian/libpng1.6/raw/0e1348f3d/debian/patches/272.patch";
2524 sha256 = "1d36khgryq2p27bdx10xrr4kcjr7cdfdj2zhdcjzznpnpns97s6n";
pkgs/development/libraries/librsvg/default.nix+2−2
@@ -5,14 +5,14 @@
55
66let
77 pname = "librsvg";
8− version = "2.44.11";
8+ version = "2.44.12";
99in
1010stdenv.mkDerivation rec {
1111 name = "${pname}-${version}";
1212
1313 src = fetchurl {
1414 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
15− sha256 = "17mgl7is0k236i61fnjj9nw5h1ykl4ff6vk30qp49bsg2zp6wnp4";
15+ sha256 = "1h3qnqhr0l7pd2bxg69ki6ckl4srdwgr471dpp4jq9i4784hp0v6";
1616 };
1717
1818 outputs = [ "out" "dev" "installedTests" ];
pkgs/development/libraries/libuv/default.nix+5−5
@@ -1,14 +1,14 @@
11{ stdenv, lib, fetchpatch, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, ApplicationServices, CoreServices }:
22
33stdenv.mkDerivation rec {
4− version = "1.24.1";
5− name = "libuv-${version}";
4+ version = "1.26.0";
5+ pname = "libuv";
66
77 src = fetchFromGitHub {
8− owner = "libuv";
9− repo = "libuv";
8+ owner = pname;
9+ repo = pname;
1010 rev = "v${version}";
11− sha256 = "0lpq8anmy69pcmkhk8giyp78q8dadcy2562g4krqaq8a5xy825ab";
11+ sha256 = "08jvjyn5bp4xnzd5g4pi534mklm6hz5pw6wbzbaq3cnwb6a04iwj";
1212 };
1313
1414 postPatch = let
pkgs/development/libraries/mesa/default.nix+2−2
@@ -67,7 +67,7 @@ let
6767in
6868
6969let
70− version = "18.3.3";
70+ version = "18.3.4";
7171 branch = head (splitString "." version);
7272in
7373
@@ -81,7 +81,7 @@ let self = stdenv.mkDerivation {
8181 "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
8282 "https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
8383 ];
84− sha256 = "16b2jgrmlqajsyz0qkr4b2v68538bs941cn3pk635ib6d5m8idia";
84+ sha256 = "01xv03ah4l5lcfx015n3fg1620dh4nbbv6gmhh6zhdsx6sj4sc9j";
8585 };
8686
8787 prePatch = "patchShebangs .";
pkgs/development/libraries/mpfr/default.nix+6−3
@@ -1,12 +1,15 @@
11{ stdenv, fetchurl, gmp }:
22
33stdenv.mkDerivation rec {
4− version = "4.0.1";
4+ version = "4.0.2";
55 name = "mpfr-${version}";
66
77 src = fetchurl {
8− url = "mirror://gnu/mpfr/${name}.tar.xz";
9− sha256 = "0vp1lrc08gcmwdaqck6bpzllkrykvp06vz5gnqpyw0v3h9h4m1v7";
8+ urls = [
9+ #"https://www.mpfr.org/${name}/${name}.tar.xz"
10+ "mirror://gnu/mpfr/${name}.tar.xz"
11+ ];
12+ sha256 = "12m3amcavhpqygc499s3fzqlb8f2j2rr7fkqsm10xbjfc04fffqx";
1013 };
1114
1215 outputs = [ "out" "dev" "doc" "info" ];
pkgs/development/libraries/nghttp2/default.nix+2−2
@@ -18,11 +18,11 @@ let inherit (stdenv.lib) optional; in
1818
1919stdenv.mkDerivation rec {
2020 name = "nghttp2-${version}";
21− version = "1.35.1";
21+ version = "1.36.0";
2222
2323 src = fetchurl {
2424 url = "https://github.com/nghttp2/nghttp2/releases/download/v${version}/nghttp2-${version}.tar.bz2";
25− sha256 = "020k9xkca386yfs47zypb4x83f4l6vqpf8qw1xrhmrd29x4wxvam";
25+ sha256 = "1sqwwwhlrbp3wcikf9v07k5j4xvflwy297lq4cg92qj087bk99qn";
2626 };
2727
2828 outputs = [ "bin" "out" "dev" "lib" ];
pkgs/development/libraries/nss/default.nix+2−2
@@ -5,7 +5,7 @@ let
55 url = http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz;
66 sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw";
77 };
8− version = "3.42";
8+ version = "3.42.1";
99 underscoreVersion = builtins.replaceStrings ["."] ["_"] version;
1010
1111in stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
1414
1515 src = fetchurl {
1616 url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${name}.tar.gz";
17− sha256 = "04rg0yar0plbx1sajrzywprqyhlskczkqxxsgxmcc0qqy64y8g2x";
17+ sha256 = "1ihzqspvqjmysp1c15xxr7kqvj3zm9dqnanxhkaxyjgx71yv6z88";
1818 };
1919
2020 buildInputs = [ perl zlib sqlite ]
pkgs/development/libraries/openssl/default.nix+2−2
@@ -120,8 +120,8 @@ let
120120in {
121121
122122 openssl_1_0_2 = common {
123− version = "1.0.2q";
124− sha256 = "115nisqy7kazbg6br2wrcra9nphyph1l4dgp563b9cf2rv5wyi2p";
123+ version = "1.0.2r";
124+ sha256 = "1mnh27zf6r1bhm5d9fxqq9slv2gz0d9z2ij9i679b0wapa5x0ldf";
125125 patches = [
126126 ./1.0.2/nix-ssl-cert-file.patch
127127
pkgs/development/libraries/osm-gps-map/default.nix+3−4
@@ -1,4 +1,4 @@
1−{ cairo, fetchzip, glib, gnome3, gobject-introspection, pkgconfig, stdenv }:
1+{ cairo, fetchzip, glib, gnome3, gtk3, gobject-introspection, pkgconfig, stdenv }:
22
33stdenv.mkDerivation rec {
44 name = "osm-gps-map-${version}";
@@ -15,9 +15,8 @@ stdenv.mkDerivation rec {
1515
1616 buildInputs = [
1717 cairo glib gobject-introspection
18− ] ++ (with gnome3; [
19− gnome-common gtk libsoup
20− ]);
18+ gnome3.gnome-common gtk3 gnome3.libsoup
19+ ];
2120
2221 meta = with stdenv.lib; {
2322 description = "Gtk+ widget for displaying OpenStreetMap tiles";
pkgs/development/libraries/wayland/default.nix+2
@@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
1515 sha256 = "1xajhxad43izq9f7sbww1hlg42nayijy8xnp21kgpk09c6sw4wjf";
1616 };
1717
18+ separateDebugInfo = true;
19+
1820 configureFlags = [
1921 "--disable-documentation"
2022 ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
pkgs/development/python-modules/Cython/default.nix+2−2
@@ -26,11 +26,11 @@ let
2626
2727in buildPythonPackage rec {
2828 pname = "Cython";
29− version = "0.29.2";
29+ version = "0.29.5";
3030
3131 src = fetchPypi {
3232 inherit pname version;
33− sha256 = "2ac187ff998a95abb7fae452b5178f91e1a713698c9ced89836c94e6b1d3f41e";
33+ sha256 = "9d5290d749099a8e446422adfb0aa2142c711284800fb1eb70f595101e32cbf1";
3434 };
3535
3636 nativeBuildInputs = [
pkgs/development/python-modules/Mako/default.nix+3−3
@@ -4,7 +4,7 @@
44, markupsafe
55, nose
66, mock
7−, pytest
7+, pytest_3
88, isPyPy
99}:
1010
@@ -17,7 +17,7 @@ buildPythonPackage rec {
1717 sha256 = "4e02fde57bd4abb5ec400181e4c314f56ac3e49ba4fb8b0d50bba18cb27d25ae";
1818 };
1919
20− checkInputs = [ markupsafe nose mock pytest ];
20+ checkInputs = [ markupsafe nose mock pytest_3 ];
2121 propagatedBuildInputs = [ markupsafe ];
2222
2323 doCheck = !isPyPy; # https://bitbucket.org/zzzeek/mako/issue/238/2-tests-failed-on-pypy-24-25
@@ -29,4 +29,4 @@ buildPythonPackage rec {
2929 platforms = lib.platforms.unix;
3030 maintainers = with lib.maintainers; [ domenkozar ];
3131 };
32−}
32+}
pkgs/development/python-modules/Pygments/default.nix+2−2
@@ -6,11 +6,11 @@
66
77buildPythonPackage rec {
88 pname = "Pygments";
9− version = "2.2.0";
9+ version = "2.3.1";
1010
1111 src = fetchPypi {
1212 inherit pname version;
13− sha256 = "1k78qdvir1yb1c634nkv6rbga8wv4289xarghmsbbvzhvr311bnv";
13+ sha256 = "5ffada19f6203563680669ee7f53b64dabbeb100eb51b61996085e99c03b284a";
1414 };
1515
1616 propagatedBuildInputs = [ docutils ];
pkgs/development/python-modules/Wand/default.nix+2−2
@@ -6,11 +6,11 @@
66
77buildPythonPackage rec {
88 pname = "Wand";
9− version = "0.5.0";
9+ version = "0.5.1";
1010
1111 src = fetchPypi {
1212 inherit pname version;
13− sha256 = "0rp1zdp2p7qngva5amcw4jb5i8gf569v8469gf6zj36hcnzksxjj";
13+ sha256 = "7d6b8dc9d4eaccc430b9c86e6b749013220c994970a3f39e902b397e2fa732c3";
1414 };
1515
1616 postPatch = ''
pkgs/development/python-modules/WazeRouteCalculator/default.nix+2−2
@@ -3,11 +3,11 @@
33
44buildPythonPackage rec {
55 pname = "WazeRouteCalculator";
6− version = "0.6";
6+ version = "0.7.2";
77
88 src = fetchPypi {
99 inherit pname version;
10− sha256 = "0zmnw4198a2kvqvsz1i4a3aa20r4afp2lai6fxbpq1ppv120h857";
10+ sha256 = "09fe1bfb32291a658ba9baffe3fe176693f41362d74caba60fb04be01b447fa1";
1111 };
1212
1313 propagatedBuildInputs = [ requests ];
pkgs/development/python-modules/XlsxWriter/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "XlsxWriter";
5− version = "1.1.2";
5+ version = "1.1.5";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "0dmznx6q3b5xkvlqpw4vqinxh5ynzz8i7hlpz9syiff51y56a8mf";
9+ sha256 = "de9ef46088489915eaaee00c7088cff93cf613e9990b46b933c98eb46f21b47f";
1010 };
1111
1212 meta = {
pkgs/development/python-modules/absl-py/default.nix+2−2
@@ -8,11 +8,11 @@
88
99buildPythonPackage rec {
1010 pname = "absl-py";
11− version = "0.6.1";
11+ version = "0.7.0";
1212
1313 src = fetchPypi {
1414 inherit pname version;
15− sha256 = "87519e3b91a3d573664c6e2ee33df582bb68dca6642ae3cf3a4361b1c0a4e9d6";
15+ sha256 = "8718189e4bd6013bf79910b9d1cb0a76aecad8ce664f78e1144980fabdd2cd23";
1616 };
1717
1818 propagatedBuildInputs = [
pkgs/development/python-modules/adal/default.nix+2−2
@@ -3,11 +3,11 @@
33
44buildPythonPackage rec {
55 pname = "adal";
6− version = "1.2.0";
6+ version = "1.2.1";
77
88 src = fetchPypi {
99 inherit pname version;
10− sha256 = "1hgm62wil1avc3h0dwbks2v6l19xfsjl3azai16llsyp70y92lms";
10+ sha256 = "b6edd095be66561382bdaa59d40b04490e93149fb3b7fa44c1fa5504eed5b8b9";
1111 };
1212
1313 propagatedBuildInputs = [ requests pyjwt dateutil ];
pkgs/development/python-modules/aioconsole/default.nix+2−2
@@ -10,11 +10,11 @@
1010# wrapped to be able to find aioconsole and any other packages.
1111buildPythonPackage rec {
1212 pname = "aioconsole";
13− version = "0.1.11";
13+ version = "0.1.13";
1414
1515 src = fetchPypi {
1616 inherit pname version;
17− sha256 = "0xjfx7fnmc9c8s1agj5mva3api4dywrf1q81yccb1gk7ifrrn04c";
17+ sha256 = "8b9898f0f6539bdce3bc3720d75189e21813f1a7f8350228fc7fd54bf7327d0f";
1818 };
1919
2020 # hardcodes a test dependency on an old version of pytest-asyncio
pkgs/development/python-modules/aiodns/default.nix+4−5
@@ -1,17 +1,16 @@
11{ stdenv, buildPythonPackage, fetchPypi
2−, isPy33, isPy27, isPyPy, python, pycares, asyncio, trollius }:
2+, isPy33, isPy27, isPyPy, python, pycares, typing, asyncio, trollius }:
33
44buildPythonPackage rec {
55 pname = "aiodns";
6− version = "1.1.1";
6+ version = "1.2.0";
77
88 src = fetchPypi {
99 inherit pname version;
10− sha256 = "d8677adc679ce8d0ef706c14d9c3d2f27a0e0cc11d59730cdbaf218ad52dd9ea";
10+ sha256 = "d67e14b32176bcf3ff79b5d47c466011ce4adeadfa264f7949da1377332a0449";
1111 };
1212
13− propagatedBuildInputs = with stdenv.lib; [ pycares ]
14− ++ optional isPy33 asyncio
13+ propagatedBuildInputs = with stdenv.lib; [ pycares typing ]
1514 ++ optional (isPy27 || isPyPy) trollius;
1615
1716 checkPhase = ''
pkgs/development/python-modules/aiohue/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "aiohue";
5− version = "1.7.0";
5+ version = "1.9.1";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "26989babdc3f38575164b60b9536309271d58db005a03045b6e9cca4fc5201d8";
9+ sha256 = "3c23aed8e82f398b732279f5f7ee7ed00949ff2db7009f7a2dc705f7c2d16783";
1010 };
1111
1212 propagatedBuildInputs = [ aiohttp ];
pkgs/development/python-modules/alembic/default.nix+2−2
@@ -5,11 +5,11 @@
55
66buildPythonPackage rec {
77 pname = "alembic";
8− version = "1.0.6";
8+ version = "1.0.7";
99
1010 src = fetchPypi {
1111 inherit pname version;
12− sha256 = "35660f7e6159288e2be111126be148ef04cbf7306da73c8b8bd4400837bb08e3";
12+ sha256 = "16505782b229007ae905ef9e0ae6e880fddafa406f086ac7d442c1aaf712f8c2";
1313 };
1414
1515 buildInputs = [ pytest pytestcov mock coverage ];
pkgs/development/python-modules/alerta-server/default.nix+6−4
@@ -1,17 +1,17 @@
1−{ stdenv, buildPythonPackage, fetchPypi, makeWrapper
1+{ stdenv, buildPythonPackage, fetchPypi, makeWrapper, pythonOlder, pyyaml
22, python-dateutil, requests, pymongo, raven, bcrypt, flask, pyjwt, flask-cors, psycopg2, pytz, flask-compress, jinja2
33}:
44
55buildPythonPackage rec {
66 pname = "alerta-server";
7− version = "6.3.2";
7+ version = "6.7.5";
88
99 src = fetchPypi {
1010 inherit pname version;
11− sha256 = "0mp97scdz2scdzi9va99hghmjz25zssgwg07i6cldzkc8j71kax5";
11+ sha256 = "e8dc3428248a5b20c4fe8da76c2d353b715d515bd4879928c499671d4360a90f";
1212 };
1313
14− buildInputs = [ python-dateutil requests pymongo raven bcrypt flask pyjwt flask-cors psycopg2 pytz flask-compress jinja2 ];
14+ propagatedBuildInputs = [ python-dateutil requests pymongo raven bcrypt flask pyjwt flask-cors psycopg2 pytz flask-compress jinja2 pyyaml];
1515
1616 doCheck = false; # We can't run the tests from Nix, because they rely on the presence of a working MongoDB server
1717
@@ -19,6 +19,8 @@ buildPythonPackage rec {
1919 wrapProgram $out/bin/alertad --prefix PYTHONPATH : "$PYTHONPATH"
2020 '';
2121
22+ disabled = pythonOlder "3.5";
23+
2224 meta = with stdenv.lib; {
2325 homepage = https://alerta.io;
2426 description = "Alerta Monitoring System server";
pkgs/development/python-modules/alerta/default.nix+6−4
@@ -1,17 +1,17 @@
11{ stdenv, buildPythonPackage, fetchPypi, makeWrapper
2−, six, click, requests, pytz, tabulate
2+, six, click, requests, pytz, tabulate, pythonOlder
33}:
44
55buildPythonPackage rec {
66 pname = "alerta";
7− version = "6.3.1";
7+ version = "6.5.0";
88
99 src = fetchPypi {
1010 inherit pname version;
11− sha256 = "08l366g0arpd23bm7bzk0hpmfd3z6brb8p24rjwkb3gvafhk7cz9";
11+ sha256 = "f9f0f8f800798fae83c05dd52dc2f06bd77fb318c784c4b44e3acfba81338881";
1212 };
1313
14− buildInputs = [ six click requests pytz tabulate ];
14+ propagatedBuildInputs = [ six click requests pytz tabulate ];
1515
1616 doCheck = false;
1717
@@ -19,6 +19,8 @@ buildPythonPackage rec {
1919 wrapProgram $out/bin/alerta --prefix PYTHONPATH : "$PYTHONPATH"
2020 '';
2121
22+ disabled = pythonOlder "3.5";
23+
2224 meta = with stdenv.lib; {
2325 homepage = https://alerta.io;
2426 description = "Alerta Monitoring System command-line interface";
pkgs/development/python-modules/altair/default.nix+7−8
@@ -5,24 +5,23 @@
55
66buildPythonPackage rec {
77 pname = "altair";
8− version = "2.2.2";
8+ version = "2.3.0";
99
1010 src = fetchPypi {
1111 inherit pname version;
12− sha256 = "c158699026eb5a19f95c1ca742e2e82bc20c27013ef5785f10836283e2233f8a";
12+ sha256 = "9f4bc7cd132c0005deb6b36c7041ee213a69bbdfcd8c0b1a9f1ae8c1fba733f6";
1313 };
1414
15+ postPatch = ''
16+ # Tests require network
17+ rm altair/examples/boxplot_max_min.py altair/examples/line_percent.py
18+ '';
19+
1520 checkInputs = [ pytest jinja2 sphinx vega_datasets ipython glibcLocales recommonmark ];
1621
1722 propagatedBuildInputs = [ entrypoints jsonschema numpy pandas six toolz ]
1823 ++ stdenv.lib.optionals (pythonOlder "3.5") [ typing ];
1924
20− # hack to prevent typing from being required for python > 3.5
21− postPatch = ''
22− substituteInPlace requirements.txt \
23− --replace "typing" ""
24− '';
25−
2625 checkPhase = ''
2726 export LANG=en_US.UTF-8
2827 py.test altair --doctest-modules
pkgs/development/python-modules/amqp/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "amqp";
5− version = "2.3.2";
5+ version = "2.4.1";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "073dd02fdd73041bffc913b767866015147b61f2a9bc104daef172fc1a0066eb";
9+ sha256 = "6816eed27521293ee03aa9ace300a07215b11fee4e845588a9b863a7ba30addb";
1010 };
1111
1212 checkInputs = [ pytest case pytest-sugar ];
pkgs/development/python-modules/androguard/default.nix+2−2
@@ -2,12 +2,12 @@
22 asn1crypto, click, pydot, ipython, pyqt5, pyperclip }:
33
44buildPythonPackage rec {
5− version = "3.3.4";
5+ version = "3.3.5";
66 pname = "androguard";
77
88 src = fetchPypi {
99 inherit pname version;
10− sha256 = "1hinfbvha7f1py1jnvxih7lx0p4z2nyaiq9bvg8v3bykwrd9jff2";
10+ sha256 = "f0655ca3a5add74c550951e79bd0bebbd1c5b239178393d30d8db0bd3202cda2";
1111 };
1212
1313 propagatedBuildInputs = [
pkgs/development/python-modules/apipkg/default.nix+3−3
@@ -1,5 +1,5 @@
11{ stdenv, buildPythonPackage, fetchPypi
2−, pytest, setuptools_scm }:
2+, pytest_3, setuptools_scm }:
33
44buildPythonPackage rec {
55 pname = "apipkg";
@@ -10,8 +10,8 @@ buildPythonPackage rec {
1010 sha256 = "37228cda29411948b422fae072f57e31d3396d2ee1c9783775980ee9c9990af6";
1111 };
1212
13− buildInputs = [ setuptools_scm ];
14− checkInputs = [ pytest ];
13+ nativeBuildInputs = [ setuptools_scm ];
14+ checkInputs = [ pytest_3 ];
1515
1616 checkPhase = ''
1717 py.test
pkgs/development/python-modules/arelle/default.nix+7−4
@@ -23,9 +23,8 @@ buildPythonPackage rec {
2323 ./tests.patch
2424 ];
2525 postPatch = "rm testParser2.py";
26− buildInputs = [
26+ nativeBuildInputs = [
2727 sphinx
28− pytest
2928 py3to2
3029 ];
3130 propagatedBuildInputs = [
@@ -33,7 +32,7 @@ buildPythonPackage rec {
3332 isodate
3433 numpy
3534 openpyxl
36− ] ++ lib.optional gui [
35+ ] ++ lib.optionals gui [
3736 tkinter
3837 ];
3938
@@ -53,7 +52,11 @@ buildPythonPackage rec {
5352 (cd apidocs && make html && cp -r _build $doc)
5453 '';
5554
56− doCheck = if gui then true else false;
55+ doCheck = false;
56+
57+ checkPhase = ''
58+ py.test
59+ '';
5760
5861 meta = with lib; {
5962 description = ''
pkgs/development/python-modules/argon2_cffi/default.nix+2−2
@@ -9,12 +9,12 @@
99
1010buildPythonPackage rec {
1111 pname = "argon2_cffi";
12− version = "18.3.0";
12+ version = "19.1.0";
1313 name = "${pname}-${version}";
1414
1515 src = fetchPypi {
1616 inherit pname version;
17− sha256 = "003f588de43a817af6ecc1c06103fa0801de63849db3cb0f37576bb2da29043d";
17+ sha256 = "81548a27b919861040cb928a350733f4f9455dd67c7d1ba92eb5960a1d7f8b26";
1818 };
1919
2020 propagatedBuildInputs = [ cffi six ];
pkgs/development/python-modules/arrow/default.nix+5−4
@@ -1,21 +1,22 @@
11{ stdenv, buildPythonPackage, fetchPypi
22, nose, chai, simplejson, backports_functools_lru_cache
3−, dateutil }:
3+, dateutil, pytz
4+}:
45
56buildPythonPackage rec {
67 pname = "arrow";
7− version = "0.12.1";
8+ version = "0.13.1";
89
910 src = fetchPypi {
1011 inherit pname version;
11− sha256 = "a558d3b7b6ce7ffc74206a86c147052de23d3d4ef0e17c210dd478c53575c4cd";
12+ sha256 = "6f54d9f016c0b7811fac9fb8c2c7fa7421d80c54dbdd75ffb12913c55db60b8a";
1213 };
1314
1415 checkPhase = ''
1516 nosetests --cover-package=arrow
1617 '';
1718
18− checkInputs = [ nose chai simplejson ];
19+ checkInputs = [ nose chai simplejson pytz ];
1920 propagatedBuildInputs = [ dateutil backports_functools_lru_cache ];
2021
2122 postPatch = ''
pkgs/development/python-modules/aspy.yaml/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "aspy.yaml";
5− version = "1.1.1";
5+ version = "1.1.2";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "1ajb97kn044ximkzq2090h4yblrhw77540pwiw345cp7mwzy4xqa";
9+ sha256 = "5eaaacd0886e8b581f0e4ff383fb6504720bb2b3c7be17307724246261a41adf";
1010 };
1111
1212 propagatedBuildInputs = [ pyyaml ];
pkgs/development/python-modules/astral/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "astral";
5− version = "1.9.2";
5+ version = "1.10.1";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "179f72a086cee96487e60514bab81e821966953fc2e2f7091500d3d2c314e38b";
9+ sha256 = "d2a67243c4503131c856cafb1b1276de52a86e5b8a1d507b7e08bee51cb67bf1";
1010 };
1111
1212 propagatedBuildInputs = [ pytz requests ];
pkgs/development/python-modules/astunparse/default.nix+2−2
@@ -7,11 +7,11 @@
77
88buildPythonPackage rec {
99 pname = "astunparse";
10− version = "1.6.1";
10+ version = "1.6.2";
1111
1212 src = fetchPypi {
1313 inherit pname version;
14− sha256 = "d27b16fb33dea0778c5a2c01801554eae0d3f8a8d6f604f15627589c3d6f11ca";
14+ sha256 = "dab3e426715373fd76cd08bb1abe64b550f5aa494cf1e32384f26fd60961eb67";
1515 };
1616
1717 propagatedBuildInputs = [ six wheel ];
pkgs/development/python-modules/asyncssh/default.nix+2−2
@@ -5,12 +5,12 @@
55
66buildPythonPackage rec {
77 pname = "asyncssh";
8− version = "1.14.0";
8+ version = "1.15.1";
99 disabled = pythonOlder "3.4";
1010
1111 src = fetchPypi {
1212 inherit pname version;
13− sha256 = "0f1i5a760a3jylkj00bxkshnylzyhyqz50v8mb8s9ygllpzja058";
13+ sha256 = "f2065a8b3af0c514c8de264e7b01f08df5213b707bacb7e7c080bd46c3e3bc35";
1414 };
1515
1616 propagatedBuildInputs = [
pkgs/development/python-modules/atom/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "atom";
5− version = "0.4.1";
5+ version = "0.4.3";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "0awzja4k3f32y01gd068yyxvh35km62m4wka0vbg1yyy37ahgjmv";
9+ sha256 = "ce96fb50326a3bfa084463dbde1cf2e02c92735e5bc324d836355c25af87e0ae";
1010 };
1111
1212 propagatedBuildInputs = [ future ];
pkgs/development/python-modules/atomicwrites/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "atomicwrites";
5− version = "1.2.1";
5+ version = "1.3.0";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "ec9ae8adaae229e4f8446952d204a3e4b5fdd2d099f9be3aaf556120135fb3ee";
9+ sha256 = "75a9445bac02d8d058d5e1fe689654ba5a6556a1dfd8ce6ec55a0ed79866cfa6";
1010 };
1111
1212 meta = with stdenv.lib; {
pkgs/development/python-modules/atomman/default.nix+2−2
@@ -13,12 +13,12 @@
1313}:
1414
1515buildPythonPackage rec {
16− version = "1.2.3";
16+ version = "1.2.4";
1717 pname = "atomman";
1818
1919 src = fetchPypi {
2020 inherit pname version;
21− sha256 = "9eb6acc5497263cfa89be8d0f383a9a69f0726b4ac6798c1b1d96f26705ec09c";
21+ sha256 = "c204d52cdfb2a7cc4d7d2c4f7a89c215a9fd63b92495a83adf25ae4e820cea3e";
2222 };
2323
2424 checkInputs = [ pytest ];
pkgs/development/python-modules/attrdict/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "attrdict";
5− version = "2.0.0";
5+ version = "2.0.1";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "1lrailzxy40dx6sn1hbpnpqfbg7ar75dfj41kx0480wyh39vdbl6";
9+ sha256 = "35c90698b55c683946091177177a9e9c0713a0860f0e049febd72649ccd77b70";
1010 };
1111
1212 propagatedBuildInputs = [ coverage nose six ];
pkgs/development/python-modules/audio-metadata/default.nix+2−2
@@ -8,11 +8,11 @@
88
99buildPythonPackage rec {
1010 pname = "audio-metadata";
11− version = "0.3.0";
11+ version = "0.4.0";
1212
1313 src = fetchPypi {
1414 inherit pname version;
15− sha256 = "1jd0wzhh9as2qyiwggqmvsbsm5nlb73qnxix2mcar53cddvwrvj7";
15+ sha256 = "a881f0f3b82752d306ac0a7850ed0e31bad275a399f63097733b4890986084b2";
1616 };
1717
1818 propagatedBuildInputs = [
pkgs/development/python-modules/autobahn/default.nix+2−2
@@ -4,11 +4,11 @@
44}:
55buildPythonPackage rec {
66 pname = "autobahn";
7− version = "18.10.1";
7+ version = "19.1.1";
88
99 src = fetchPypi {
1010 inherit pname version;
11− sha256 = "b5767bebd94ba13fc286604f889f208e7babc77d72d9f372d331bc14c89c5a40";
11+ sha256 = "aebbadb700c13792a2967c79002855d1153b9ec8f2949d169e908388699596ff";
1212 };
1313
1414 propagatedBuildInputs = [ six txaio twisted zope_interface cffi ] ++
pkgs/development/python-modules/av/default.nix+6−5
@@ -2,24 +2,25 @@
22, buildPythonPackage
33, fetchPypi
44, nose
5−, pillow
65, numpy
76, ffmpeg_4
8−, git
97, libav
108, pkgconfig
119}:
1210
1311buildPythonPackage rec {
1412 pname = "av";
15− version = "6.1.0";
13+ version = "6.1.2";
1614
1715 src = fetchPypi {
1816 inherit pname version;
19− sha256 = "0h5d6yy6mjaflzh9z8fv3j1rjwijmzqfrpz88zxk0qfmbprdc91z";
17+ sha256 = "eebbb56eeae650b1fc551f94d51aee39b487bf4df73c39daea186c5d2950650f";
2018 };
2119
22− buildInputs = [ nose pillow numpy ffmpeg_4 git pkgconfig ];
20+ checkInputs = [ nose numpy ];
21+
22+ nativeBuildInputs = [ pkgconfig ];
23+ buildInputs = [ ffmpeg_4 ];
2324
2425 # Tests require downloading files from internet
2526 doCheck = false;
pkgs/development/python-modules/awkward/default.nix+2−2
@@ -9,11 +9,11 @@
99
1010buildPythonPackage rec {
1111 pname = "awkward";
12− version = "0.5.6";
12+ version = "0.8.4";
1313
1414 src = fetchPypi {
1515 inherit pname version;
16− sha256 = "c6b84d2356c8b1af955054bbef088c61bf87f68e062e866fa8d9ea5cb871389f";
16+ sha256 = "7016dc02d15b8797b59a461ccc8d218f37c335b97fa6b376638c0edd4ffc9de2";
1717 };
1818
1919 buildInputs = [ pytestrunner h5py ];
pkgs/development/python-modules/aws-adfs/default.nix+2−2
@@ -2,12 +2,12 @@
22, pytest, pytestrunner, pytestcov, mock, glibcLocales, lxml, boto3, requests, click, configparser }:
33
44buildPythonPackage rec {
5− version = "1.12.2";
5+ version = "1.12.3";
66 pname = "aws-adfs";
77
88 src = fetchPypi {
99 inherit pname version;
10− sha256 = "e35fbd33e1878310099346a95b7eb5244831c9f5f6554bca7193ac50dcd41aa3";
10+ sha256 = "b7df3fbe0572eb12294b2e072327ca97fd94d435b39cc10612e460cde914b831";
1111 };
1212
1313 # Relax version constraint
pkgs/development/python-modules/aws-sam-translator/default.nix+2−2
@@ -10,11 +10,11 @@
1010
1111buildPythonPackage rec {
1212 pname = "aws-sam-translator";
13− version = "1.9.0";
13+ version = "1.9.1";
1414
1515 src = fetchPypi {
1616 inherit pname version;
17− sha256 = "1334795a85077cd5741822149260f90104fb2a01699171c9e9567c0db76ed74d";
17+ sha256 = "1008d149599d5d629b0c7bdfaa249d59eaab6d194faf5f0f941fa7209e68e6f2";
1818 };
1919
2020 # Tests are not included in the PyPI package
pkgs/development/python-modules/aws-xray-sdk/default.nix+2−2
@@ -10,11 +10,11 @@
1010
1111buildPythonPackage rec {
1212 pname = "aws-xray-sdk";
13− version = "2.2.0";
13+ version = "2.3.0";
1414
1515 src = fetchPypi {
1616 inherit pname version;
17− sha256 = "fc5537268cc8041f74e14077c4b4b4cef0f3de25ecef793ace63cedf87fe4a2a";
17+ sha256 = "bb74e1cc2388bd29c45e2e3eb31d0416d0f53d83baafca7b72ca9c945a2e249a";
1818 };
1919
2020 propagatedBuildInputs = [
pkgs/development/python-modules/azure-common/default.nix+2−2
@@ -7,14 +7,14 @@
77}:
88
99buildPythonPackage rec {
10− version = "1.1.17";
10+ version = "1.1.18";
1111 pname = "azure-common";
1212 disabled = isPyPy;
1313
1414 src = fetchPypi {
1515 inherit pname version;
1616 extension = "zip";
17− sha256 = "e7cd5a8ee2ec0639454c1bd0f1ea5f609d83977376abfd304527ec7343fef1be";
17+ sha256 = "5fd62ae10b1add97d3c69af970328ec3bd869184396bcf6bfa9c7bc94d688424";
1818 };
1919
2020 propagatedBuildInputs = [ azure-nspkg ];
pkgs/development/python-modules/azure-mgmt-compute/default.nix+2−2
@@ -6,13 +6,13 @@
66}:
77
88buildPythonPackage rec {
9− version = "0.20.1";
9+ version = "4.4.0";
1010 pname = "azure-mgmt-compute";
1111
1212 src = fetchPypi {
1313 inherit pname version;
1414 extension = "zip";
15− sha256 = "97298fc7f133f1d50a974ed6299151eda494a574b0f7fdf8192a388015c2215a";
15+ sha256 = "356219a354140ea26e6b4f4be4f855f1ffaf63af60de24cd2ca335b4ece9db00";
1616 };
1717
1818 preConfigure = ''
pkgs/development/python-modules/azure-mgmt-network/default.nix+2−2
@@ -6,13 +6,13 @@
66}:
77
88buildPythonPackage rec {
9− version = "0.20.1";
9+ version = "2.5.1";
1010 pname = "azure-mgmt-network";
1111
1212 src = fetchPypi {
1313 inherit pname version;
1414 extension = "zip";
15− sha256 = "10vj22h6nxpw0qpvib5x2g6qs5j8z31142icvh4qk8k40fcrs9hx";
15+ sha256 = "cef9bf5d36700966e52f7cea86e29c622bc5bbb92d0ce7a75420e29fb0e75f45";
1616 };
1717
1818 preConfigure = ''
pkgs/development/python-modules/azure-mgmt-nspkg/default.nix+2−2
@@ -5,13 +5,13 @@
55}:
66
77buildPythonPackage rec {
8− version = "1.0.0";
8+ version = "3.0.2";
99 pname = "azure-mgmt-nspkg";
1010
1111 src = fetchPypi {
1212 inherit pname version;
1313 extension = "zip";
14− sha256 = "1rq92fj3kvnqkk18596dybw0kvhgscvc6cd8hp1dhy3wrkqnhwmq";
14+ sha256 = "8b2287f671529505b296005e6de9150b074344c2c7d1c805b3f053d081d58c52";
1515 };
1616
1717 propagatedBuildInputs = [ azure-nspkg ];
pkgs/development/python-modules/azure-mgmt-resource/default.nix+2−2
@@ -7,13 +7,13 @@
77
88
99buildPythonPackage rec {
10− version = "0.20.1";
10+ version = "2.1.0";
1111 pname = "azure-mgmt-resource";
1212
1313 src = fetchPypi {
1414 inherit pname version;
1515 extension = "zip";
16− sha256 = "0slh9qfm5nfacrdm3lid0sr8kwqzgxvrwf27laf9v38kylkfqvml";
16+ sha256 = "aef8573066026db04ed3e7c5e727904e42f6462b6421c2e8a3646e4c4f8128be";
1717 };
1818
1919 preConfigure = ''
pkgs/development/python-modules/azure-mgmt-storage/default.nix+2−2
@@ -6,13 +6,13 @@
66}:
77
88buildPythonPackage rec {
9− version = "0.20.0";
9+ version = "3.1.1";
1010 pname = "azure-mgmt-storage";
1111
1212 src = fetchPypi {
1313 inherit pname version;
1414 extension = "zip";
15− sha256 = "16iw7hqhq97vlzfwixarfnirc60l5mz951p57brpcwyylphl3yim";
15+ sha256 = "22a779cae5e09712b7d62ef9bc3d8907a5666893a8a113b6d9348e933170236f";
1616 };
1717
1818 preConfigure = ''
pkgs/development/python-modules/backports_ssl_match_hostname/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "backports.ssl_match_hostname";
5− version = "3.5.0.1";
5+ version = "3.7.0.1";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "1wndipik52cyqy0677zdgp90i435pmvwd89cz98lm7ri0y3xjajh";
9+ sha256 = "bb82e60f9fbf4c080eabd957c39f0641f0fc247d9a16e31e26d594d8f42b9fd2";
1010 };
1111
1212 meta = with lib; {
pkgs/development/python-modules/beautifulsoup4/default.nix+7−5
@@ -1,19 +1,21 @@
1−{ stdenv, buildPythonPackage, fetchPypi, nose }:
1+{ stdenv, buildPythonPackage, fetchPypi, soupsieve, pytest, python }:
22
33buildPythonPackage rec {
44 pname = "beautifulsoup4";
5− version = "4.6.3";
5+ version = "4.7.1";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "90f8e61121d6ae58362ce3bed8cd997efb00c914eae0ff3d363c32f9a9822d10";
9+ sha256 = "945065979fb8529dd2f37dbb58f00b661bdbcbebf954f93b32fdf5263ef35348";
1010 };
1111
12− checkInputs = [ nose ];
12+ checkInputs = [ pytest ];
1313 checkPhase = ''
14− nosetests build
14+ py.test $out/${python.sitePackages}/bs4/tests
1515 '';
1616
17+ propagatedBuildInputs = [ soupsieve ];
18+
1719 meta = with stdenv.lib; {
1820 homepage = http://crummy.com/software/BeautifulSoup/bs4/;
1921 description = "HTML and XML parser";
pkgs/development/python-modules/bidict/default.nix+2−2
@@ -11,11 +11,11 @@
1111
1212buildPythonPackage rec {
1313 pname = "bidict";
14− version = "0.17.5";
14+ version = "0.18.0";
1515
1616 src = fetchPypi {
1717 inherit pname version;
18− sha256 = "1icj0fnfx47n6i33pj5gfrmd1rzpvah1jihhdhqiqx2cy9rs6x4c";
18+ sha256 = "4d10630fd5d86b7c165387473c5180e7fca7635f12e24b1f426aac259c72c81a";
1919 };
2020
2121 nativeBuildInputs = [ setuptools_scm ];
pkgs/development/python-modules/billiard/default.nix+4−4
@@ -1,16 +1,16 @@
1−{ stdenv, buildPythonPackage, fetchPypi, isPyPy, pytest, case }:
1+{ stdenv, buildPythonPackage, fetchPypi, isPyPy, pytest, case, psutil }:
22
33buildPythonPackage rec {
44 pname = "billiard";
5− version = "3.5.0.5";
5+ version = "3.6.0.0";
66 disabled = isPyPy;
77
88 src = fetchPypi {
99 inherit pname version;
10− sha256 = "03msmapj3s5zgqk87d646mafz7a01h5bm2wijalgpi0s80ks5na2";
10+ sha256 = "756bf323f250db8bf88462cd042c992ba60d8f5e07fc5636c24ba7d6f4261d84";
1111 };
1212
13− buildInputs = [ pytest case ];
13+ checkInputs = [ pytest case psutil ];
1414
1515 meta = with stdenv.lib; {
1616 homepage = https://github.com/celery/billiard;
pkgs/development/python-modules/bleach/default.nix+2−2
@@ -9,11 +9,11 @@
99
1010buildPythonPackage rec {
1111 pname = "bleach";
12− version = "3.0.2";
12+ version = "3.1.0";
1313
1414 src = fetchPypi {
1515 inherit pname version;
16− sha256 = "48d39675b80a75f6d1c3bdbffec791cf0bbbab665cf01e20da701c77de278718";
16+ sha256 = "3fdf7f77adcf649c9911387df51254b813185e32b2c6619f690b593a617e19fa";
1717 };
1818
1919 checkInputs = [ pytest pytestrunner ];
pkgs/development/python-modules/boltztrap2/default.nix+2−2
@@ -14,13 +14,13 @@
1414}:
1515
1616buildPythonPackage rec {
17− version = "18.9.1";
17+ version = "19.1.1";
1818 pname = "BoltzTraP2";
1919 disabled = pythonOlder "3.5";
2020
2121 src = fetchPypi {
2222 inherit pname version;
23− sha256 = "b828ad2b3b3a40956ef866e462e4c82faf83be79348af3945d4e7cede8a53913";
23+ sha256 = "81e8a5ef8240c6a2205463fa7bc643b8033125237927f5492dab0b5d1aadb35a";
2424 };
2525
2626 buildInputs = [ cython cmake ];
pkgs/development/python-modules/bootstrapped-pip/default.nix+6−6
@@ -3,26 +3,26 @@
33let
44 wheel_source = fetchPypi {
55 pname = "wheel";
6− version = "0.32.2";
6+ version = "0.33.1";
77 format = "wheel";
8− sha256 = "1216licil12jjixfqvkb84xkync5zz0fdc2kgzhl362z3xqjsgn9";
8+ sha256 = "8eb4a788b3aec8abf5ff68d4165441bc57420c9f64ca5f471f58c3969fe08668";
99 };
1010 setuptools_source = fetchPypi {
1111 pname = "setuptools";
12− version = "40.6.3";
12+ version = "40.8.0";
1313 format = "wheel";
14− sha256 = "e2c1ce9a832f34cf7a31ed010aabcab5008eb65ce8f2aadc04622232c14bdd0b";
14+ sha256 = "e8496c0079f3ac30052ffe69b679bd876c5265686127a3159cfa415669b7f9ab";
1515 };
1616
1717in stdenv.mkDerivation rec {
1818 pname = "pip";
19− version = "18.1";
19+ version = "19.0.3";
2020 name = "${python.libPrefix}-bootstrapped-${pname}-${version}";
2121
2222 src = fetchPypi {
2323 inherit pname version;
2424 format = "wheel";
25− sha256 = "7909d0a0932e88ea53a7014dfd14522ffef91a464daaaf5c573343852ef98550";
25+ sha256 = "bd812612bbd8ba84159d9ddc0266b7fbce712fc9bc98c82dee5750546ec8ec64";
2626 };
2727
2828 unpackPhase = ''
pkgs/development/python-modules/boto3/default.nix+2−2
@@ -13,11 +13,11 @@
1313
1414buildPythonPackage rec {
1515 pname = "boto3";
16− version = "1.9.80"; # N.B: if you change this, change botocore too
16+ version = "1.9.101"; # N.B: if you change this, change botocore too
1717
1818 src = fetchPypi {
1919 inherit pname version;
20− sha256 = "99ec19dc4f0aa8a8354db7baebe1ff57bd18aeb6a539b28693b2e8ca8dc3d85b";
20+ sha256 = "bc25b83405cede6025fd7de0240fa8ade910f445da46f267c1dd13409d19ad64";
2121 };
2222
2323 propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];
pkgs/development/python-modules/botocore/default.nix+2−2
@@ -12,11 +12,11 @@
1212
1313buildPythonPackage rec {
1414 pname = "botocore";
15− version = "1.12.80"; # N.B: if you change this, change boto3 and awscli to a matching version
15+ version = "1.12.101"; # N.B: if you change this, change boto3 and awscli to a matching version
1616
1717 src = fetchPypi {
1818 inherit pname version;
19− sha256 = "76a2969278250e010253ddf514f4b54eaa7d2b1430f682874c3c2ab92f25a96d";
19+ sha256 = "46e4daaa7c8cb29237802b63699c16a116f96f301ad2fcfef800574333b58b98";
2020 };
2121
2222 propagatedBuildInputs = [
pkgs/development/python-modules/buildout-nix/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "zc.buildout";
5− version = "2.12.2";
5+ version = "2.13.1";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "ff5d7e8a1361da8dfe1025d35ef6ce55e929dd8518d2a811a1cf2c948950a043";
9+ sha256 = "3d14d07226963a517295dfad5879d2799e2e3b65b2c61c71b53cb80f5ab11484";
1010 };
1111
1212 patches = [ ./nix.patch ];
pkgs/development/python-modules/buildout/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "zc.buildout";
5− version = "2.12.2";
5+ version = "2.13.1";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "ff5d7e8a1361da8dfe1025d35ef6ce55e929dd8518d2a811a1cf2c948950a043";
9+ sha256 = "3d14d07226963a517295dfad5879d2799e2e3b65b2c61c71b53cb80f5ab11484";
1010 };
1111
1212 meta = with stdenv.lib; {
pkgs/development/python-modules/cachetools/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "cachetools";
5− version = "2.1.0";
5+ version = "3.1.0";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "90f1d559512fc073483fe573ef5ceb39bf6ad3d39edc98dc55178a2b2b176fa3";
9+ sha256 = "9efcc9fab3b49ab833475702b55edd5ae07af1af7a4c627678980b45e459c460";
1010 };
1111
1212 meta = with stdenv.lib; {
pkgs/development/python-modules/cairocffi/default.nix+2−2
@@ -17,11 +17,11 @@
1717
1818buildPythonPackage rec {
1919 pname = "cairocffi";
20− version = "0.9.0";
20+ version = "1.0.2";
2121
2222 src = fetchPypi {
2323 inherit pname version;
24− sha256 = "15386c3a9e08823d6826c4491eaccc7b7254b1dc587a3b9ce60c350c3f990337";
24+ sha256 = "01ac51ae12c4324ca5809ce270f9dd1b67f5166fe63bd3e497e9ea3ca91946ff";
2525 };
2626
2727 LC_ALL = "en_US.UTF-8";
pkgs/development/python-modules/cassandra-driver/default.nix+5−1
@@ -1,4 +1,5 @@
11{ stdenv
2+, libev
23, buildPythonPackage
34, fetchPypi
45, pkgs
@@ -28,7 +29,10 @@ buildPythonPackage rec {
2829 };
2930
3031 buildInputs = [
31− pkgs.libev
32+ libev
33+ ];
34+
35+ nativeBuildInputs = [
3236 # NOTE: next version will work with cython 0.29
3337 # Requires 'Cython!=0.25,<0.29,>=0.20'
3438 (cython.overridePythonAttrs(old: rec {
pkgs/development/python-modules/celery/default.nix+5−28
@@ -1,39 +1,16 @@
1−{ stdenv, buildPythonPackage, fetchPypi, isPy37, fetchpatch, iana-etc, libredirect,
2− pytest, case, kombu, billiard, pytz, anyjson, amqp, eventlet
1+{ stdenv, buildPythonPackage, fetchPypi, isPy37, fetchpatch, iana-etc, libredirect
2+, case, pytest, boto3, moto, kombu, billiard, pytz, anyjson, amqp, eventlet
33}:
44
55buildPythonPackage rec {
66 pname = "celery";
7− version = "4.2.1";
7+ version = "4.3.0rc1";
88
99 src = fetchPypi {
1010 inherit pname version;
11− sha256 = "0y66rz7z8dfcgs3s0qxmdddlaq57bzbgxgfz896nbp14grkv9nkp";
11+ sha256 = "1jmg47l0b3bnwmg44x48bwziwyk6xqs1y5plvr99a3ikz1l807yf";
1212 };
1313
14− # See https://github.com/celery/celery/issues/4500
15− # TODO: Remove once upgraded to 4.3
16− disabled = isPy37;
17−
18− patches = [
19− # Skip test_RedisBackend.test_timeouts_in_url_coerced
20− # See https://github.com/celery/celery/pull/4847
21− (fetchpatch {
22− url = https://github.com/celery/celery/commit/b2668607c909c61becd151905b4525190c19ff4a.patch;
23− sha256 = "11w0z2ycyh8kccj4y69zb7bxppiipcwwigg6jn1q9yrcsvz170jq";
24− })
25− # Allow usage of a newer pytest version
26− # See https://github.com/celery/celery/pull/4912
27− (fetchpatch {
28− url = https://github.com/celery/celery/commit/16f56fe6f84cac9f92affac3ad06a1f168a19798.patch;
29− sha256 = "0vz68rl32m34k51nhs898jcfdbj5m7cszzxx0w0j3j1fhn1wq594";
30− })
31− ];
32−
33− postPatch = ''
34− substituteInPlace requirements/test.txt --replace ",<3.9" ""
35− '';
36−
3714 # make /etc/protocols accessible to fix socket.getprotobyname('tcp') in sandbox
3815 preCheck = stdenv.lib.optionalString stdenv.isLinux ''
3916 export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols \
@@ -43,7 +20,7 @@ buildPythonPackage rec {
4320 unset NIX_REDIRECTS LD_PRELOAD
4421 '';
4522
46− checkInputs = [ pytest case ];
23+ checkInputs = [ case pytest boto3 moto ];
4724 propagatedBuildInputs = [ kombu billiard pytz anyjson amqp eventlet ];
4825
4926 meta = with stdenv.lib; {
pkgs/development/python-modules/cffi/default.nix+2−2
@@ -2,11 +2,11 @@
22
33if isPyPy then null else buildPythonPackage rec {
44 pname = "cffi";
5− version = "1.11.5";
5+ version = "1.12.1";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "e90f17980e6ab0f3c2f3730e56d1fe9bcba1891eeea58966e89d352492cc74f4";
9+ sha256 = "9b6f7ba4e78c52c1a291d0c0c0bd745d19adde1a9e1c03cb899f0c6efd6f8033";
1010 };
1111
1212 outputs = [ "out" "dev" ];
pkgs/development/python-modules/chainer/default.nix+2−2
@@ -6,11 +6,11 @@
66
77buildPythonPackage rec {
88 pname = "chainer";
9− version = "5.0.0";
9+ version = "5.2.0";
1010
1111 src = fetchPypi {
1212 inherit pname version;
13− sha256 = "74c11c3f20c33f85d3f42cc237a55efc384dc6f42035d6d2448318b182f236ee";
13+ sha256 = "cc8390a7f445a14a1bc71d54de348be247158fe2813a5ef11c5046265001c8c4";
1414 };
1515
1616 checkInputs = [
pkgs/development/python-modules/chalice/default.nix+2−2
@@ -20,11 +20,11 @@
2020
2121buildPythonPackage rec {
2222 pname = "chalice";
23− version = "1.6.2";
23+ version = "1.7.0";
2424
2525 src = fetchPypi {
2626 inherit pname version;
27− sha256 = "96c22f95ccc91ed3e79cc4a9a88bf27f95a13a2caf5a55137ab081d371258f0f";
27+ sha256 = "98a1237bf77f18761d8f964cb3c3b794e2d377a261b5e1640268608ec94336fa";
2828 };
2929
3030 checkInputs = [ watchdog pytest hypothesis mock ];
pkgs/development/python-modules/channels/default.nix+2−2
@@ -3,11 +3,11 @@
33}:
44buildPythonPackage rec {
55 pname = "channels";
6− version = "2.1.6";
6+ version = "2.1.7";
77
88 src = fetchPypi {
99 inherit pname version;
10− sha256 = "15qmwkpmia9y32amg7dqx3ph81b6m3fa0pawhq8gshvdfjdvhfjd";
10+ sha256 = "e13ba874d854ac493ece329dcd9947e82357c15437ac1a90ed1040d0e5b87aad";
1111 };
1212
1313 # Files are missing in the distribution
pkgs/development/python-modules/characteristic/default.nix+4
@@ -13,6 +13,10 @@ buildPythonPackage rec {
1313
1414 checkInputs = [ pytest ];
1515
16+ postPatch = ''
17+ substituteInPlace setup.cfg --replace "[pytest]" "[tool:pytest]"
18+ '';
19+
1620 meta = {
1721 description = "Python attributes without boilerplate";
1822 homepage = https://characteristic.readthedocs.org;
pkgs/development/python-modules/chardet/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, buildPythonPackage, fetchPypi
2−, pytest, pytestrunner, hypothesis }:
2+, pytest_3, pytestrunner, hypothesis }:
33
44buildPythonPackage rec {
55 pname = "chardet";
@@ -10,7 +10,7 @@ buildPythonPackage rec {
1010 sha256 = "1bpalpia6r5x1kknbk11p1fzph56fmmnp405ds8icksd3knr5aw4";
1111 };
1212
13− checkInputs = [ pytest pytestrunner hypothesis ];
13+ checkInputs = [ pytest_3 pytestrunner hypothesis ];
1414
1515 meta = with stdenv.lib; {
1616 homepage = https://github.com/chardet/chardet;
pkgs/development/python-modules/cherrypy/default.nix+22−7
@@ -1,14 +1,14 @@
11{ lib, buildPythonPackage, fetchPypi, isPy3k
22, cheroot, contextlib2, portend, routes, six
3−, setuptools_scm, zc_lockfile
3+, setuptools_scm, zc_lockfile, more-itertools
44, backports_unittest-mock, objgraph, pathpy, pytest, pytestcov
5−, backports_functools_lru_cache, requests_toolbelt
5+, backports_functools_lru_cache, requests_toolbelt, pytest-services
66}:
77
88let
99 srcInfo = if isPy3k then {
10− version = "18.0.1";
11− sha256 = "3002fc47b982c3df4d08dbe5996b093fd73f85b650ab8df19e8b9b95f5c00520";
10+ version = "18.1.0";
11+ sha256 = "4dd2f59b5af93bd9ca85f1ed0bb8295cd0f5a8ee2b84d476374d4e070aa5c615";
1212 } else {
1313 version = "17.4.1";
1414 sha256 = "1kl17anzz535jgkn9qcy0c2m0zlafph0iv7ph3bb9mfrs2bgvagv";
@@ -22,14 +22,29 @@ in buildPythonPackage rec {
2222 inherit (srcInfo) version sha256;
2323 };
2424
25− propagatedBuildInputs = [ cheroot contextlib2 portend routes six zc_lockfile ];
25+ propagatedBuildInputs = if isPy3k then [
26+ # required
27+ cheroot portend more-itertools zc_lockfile
28+ # optional
29+ routes
30+ ] else [
31+ cheroot contextlib2 portend routes six zc_lockfile
32+ ];
2633
2734 buildInputs = [ setuptools_scm ];
2835
29− checkInputs = [ backports_unittest-mock objgraph pathpy pytest pytestcov backports_functools_lru_cache requests_toolbelt ];
36+ checkInputs = if isPy3k then [
37+ objgraph pytest pytestcov pathpy requests_toolbelt pytest-services
38+ ] else [
39+ backports_unittest-mock objgraph pathpy pytest pytestcov backports_functools_lru_cache requests_toolbelt
40+ ];
3041
3142 checkPhase = ''
32− LANG=en_US.UTF-8 pytest
43+ # 3 out of 5 SignalHandlingTests need network access
44+ # test_2_File_Concurrency also fails upstream: https://github.com/cherrypy/cherrypy/issues/1306
45+ # ...and skipping it makes 2 other tests fail
46+ LANG=en_US.UTF-8 pytest -k "not SignalHandlingTests and not test_4_Autoreload \
47+ and not test_2_File_Concurrency and not test_3_Redirect and not test_4_File_deletion"
3348 '';
3449
3550 meta = with lib; {
pkgs/development/python-modules/cloudpickle/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "cloudpickle";
5− version = "0.6.1";
5+ version = "0.8.0";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "f169a8523a40eb0a3452e1878aac31da6759409fbafa51dd50d89d4a6b42bcf1";
9+ sha256 = "18d3a5dfc82f752b9f4c844cceb663213e26e130f4a2894a18ad1f11d57a30bc";
1010 };
1111
1212 buildInputs = [ pytest mock ];
pkgs/development/python-modules/cmd2/default.nix+2−2
@@ -6,11 +6,11 @@
66}:
77buildPythonPackage rec {
88 pname = "cmd2";
9− version = "0.9.7";
9+ version = "0.9.10";
1010
1111 src = fetchPypi {
1212 inherit pname version;
13− sha256 = "b04a3421be2ae35e7e8347e29c2f3960eed38d0163e312845147d5d828a09379";
13+ sha256 = "00d68374abe02363a417160e5836022be5c8f8bdac1da5dd101fadb6f8e96619";
1414 };
1515
1616 LC_ALL="en_US.UTF-8";
pkgs/development/python-modules/cmdline/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "cmdline";
5− version = "0.1.8";
5+ version = "0.2.0";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "324cc8fc6580f221824821c47232c297ed1f7cc737186a57305a8c08fc902dd7";
9+ sha256 = "7cf6af53549892b2218c2f56a199dff54a733be5c5515c0fd626812070b0a86a";
1010 };
1111
1212 # No tests, https://github.com/rca/cmdline/issues/1
pkgs/development/python-modules/colander/default.nix+2−2
@@ -3,11 +3,11 @@
33
44buildPythonPackage rec {
55 pname = "colander";
6− version = "1.5.1";
6+ version = "1.7.0";
77
88 src = fetchPypi {
99 inherit pname version;
10− sha256 = "18ah4cwwxnpm6qxi6x9ipy51dal4spd343h44s5wd01cnhgrwsyq";
10+ sha256 = "d758163a22d22c39b9eaae049749a5cd503f341231a02ed95af480b1145e81f2";
1111 };
1212
1313 propagatedBuildInputs = [ translationstring iso8601 enum34 ];
pkgs/development/python-modules/colorama/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "colorama";
5− version = "0.3.9";
5+ version = "0.4.1";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "1wd1szk0z3073ghx26ynw43gnc140ibln1safgsis6s6z3s25ss8";
9+ sha256 = "05eed71e2e327246ad6b38c540c4a3117230b19679b875190486ddd2d721422d";
1010 };
1111
1212 # No tests in archive
pkgs/development/python-modules/colorlover/default.nix+2−2
@@ -3,11 +3,11 @@
33
44buildPythonPackage rec {
55 pname = "colorlover";
6− version = "0.2.1";
6+ version = "0.3.0";
77
88 src = fetchPypi {
99 inherit pname version;
10− sha256 = "1clwvssrj007r07prfvkqnpjy3f77dlp584lj879x8mwl8f0japi";
10+ sha256 = "b8fb7246ab46e1f5e6715649453c1762e245a515de5ff2d2b4aab7a6e67fa4e2";
1111 };
1212
1313 # no tests included in distributed archive
pkgs/development/python-modules/configparser/default.nix+8−7
@@ -2,22 +2,23 @@
22
33buildPythonPackage rec {
44 pname = "configparser";
5− version = "3.5.0";
5+ version = "3.7.3";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "0fi7vf09vi1588jd8f16a021m5y6ih2hy7rpbjb408xw45qb822k";
9+ sha256 = "27594cf4fc279f321974061ac69164aaebd2749af962ac8686b20503ac0bcf2d";
1010 };
1111
1212 # No tests available
1313 doCheck = false;
1414
15− # Fix issue when used together with other namespace packages
16− # https://github.com/NixOS/nixpkgs/issues/23855
17− patches = [
18− ./0001-namespace-fix.patch
19− ];
15+ preConfigure = ''
16+ export LC_ALL=${if stdenv.isDarwin then "en_US" else "C"}.UTF-8
17+ '';
2018
2119 meta = with stdenv.lib; {
20+ description = "Updated configparser from Python 3.7 for Python 2.6+.";
21+ license = licenses.mit;
22+ homepage = https://github.com/jaraco/configparser;
2223 };
2324}
pkgs/development/python-modules/cornice/default.nix+2−2
@@ -9,11 +9,11 @@
99
1010buildPythonPackage rec {
1111 pname = "cornice";
12− version = "3.4.4";
12+ version = "3.5.1";
1313
1414 src = fetchPypi {
1515 inherit pname version;
16− sha256 = "1355f998ac6af53bda985e13ed0695cd206b0a3f14657b83979b31bbc72f1acb";
16+ sha256 = "e95dceaee9ce16a09564c1226977a0fe62f1399701581b59c4188f5c91a86687";
1717 };
1818
1919 propagatedBuildInputs = [ pyramid simplejson six venusian ];
pkgs/development/python-modules/cryptography/default.nix+2−4
@@ -4,7 +4,6 @@
44, openssl
55, cryptography_vectors
66, darwin
7−, idna
87, asn1crypto
98, packaging
109, six
@@ -23,11 +22,11 @@
2322buildPythonPackage rec {
2423 # also bump cryptography_vectors
2524 pname = "cryptography";
26− version = "2.4.2";
25+ version = "2.5";
2726
2827 src = fetchPypi {
2928 inherit pname version;
30− sha256 = "1pc60dksi9w9mshl6cvn7gdjazbp3pmydy3qp9wgy5wzd8n0b9h5";
29+ sha256 = "00c4d7gvsymlaw0r13zrm32dcnarmpayjyrh65yymlmr6mrbcij9";
3130 };
3231
3332 outputs = [ "out" "dev" ];
@@ -35,7 +34,6 @@ buildPythonPackage rec {
3534 buildInputs = [ openssl cryptography_vectors ]
3635 ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
3736 propagatedBuildInputs = [
38− idna
3937 asn1crypto
4038 packaging
4139 six
pkgs/development/python-modules/cryptography_vectors/default.nix+2−2
@@ -3,11 +3,11 @@
33buildPythonPackage rec {
44 # also bump cryptography
55 pname = "cryptography_vectors";
6− version = "2.4.2";
6+ version = "2.5";
77
88 src = fetchPypi {
99 inherit pname version;
10− sha256 = "013qx2hz0jv79yzfzpn0r2kk33i5qy3sdnzgwiv5779d18snblwi";
10+ sha256 = "15qfl3pnw2f11r0z0zhwl56f6pb60ysav8fxmpnz5p80cfwljdik";
1111 };
1212
1313 # No tests included
pkgs/development/python-modules/cupy/default.nix+2−2
@@ -6,11 +6,11 @@
66
77buildPythonPackage rec {
88 pname = "cupy";
9− version = "5.0.0";
9+ version = "5.2.0";
1010
1111 src = fetchPypi {
1212 inherit pname version;
13− sha256 = "557e665d6f2e74e21987b6736d580ec919f51205623fe3d79df06b9d22b3e09d";
13+ sha256 = "664acff0e1094f0135acca8899318d300258b704e049b1ef0c59154912da53b2";
1414 };
1515
1616 checkInputs = [
pkgs/development/python-modules/cvxopt/default.nix+2−2
@@ -16,13 +16,13 @@
1616
1717buildPythonPackage rec {
1818 pname = "cvxopt";
19− version = "1.2.2";
19+ version = "1.2.3";
2020
2121 disabled = isPyPy; # hangs at [translation:info]
2222
2323 src = fetchPypi {
2424 inherit pname version;
25− sha256 = "19ipi6ljj9qv87lhgcsky1gy9543gcmqdbgzpk6v5ccv90nrcf00";
25+ sha256 = "ea62a2a1b8e2db3a6ae44ac394f58e4620149af226c250c6f2b18739b48cfc21";
2626 };
2727
2828 # similar to Gsl, glpk, fftw there is also a dsdp interface
pkgs/development/python-modules/cx_oracle/default.nix+2−2
@@ -2,13 +2,13 @@
22
33buildPythonPackage rec {
44 pname = "cx_Oracle";
5− version = "7.0.0";
5+ version = "7.1.1";
66
77 buildInputs = [ odpic ];
88
99 src = fetchPypi {
1010 inherit pname version;
11− sha256 = "75ee5edccf385d8e8b1443058909fbf3477bb1db12ab7f367aafba8d993fc828";
11+ sha256 = "17d760bdf89e364fc7c964c5640c1b38cbb22ab49b53830883f21fda92c59131";
1212 };
1313
1414 preConfigure = ''
pkgs/development/python-modules/cypari2/default.nix+4−1
@@ -29,8 +29,11 @@ buildPythonPackage rec {
2929 ${python.pythonForBuild.pkgs.bootstrapped-pip}/bin/pip install --no-index --prefix=$out --no-cache --build=tmpdir .
3030 '';
3131
32− buildInputs = [
32+ nativeBuildInputs = [
3333 pari
34+ ];
35+
36+ buildInputs = [
3437 gmp
3538 ];
3639
pkgs/development/python-modules/dask/default.nix+2−2
@@ -12,11 +12,11 @@
1212
1313buildPythonPackage rec {
1414 pname = "dask";
15− version = "0.20.2";
15+ version = "1.1.1";
1616
1717 src = fetchPypi {
1818 inherit pname version;
19− sha256 = "d4139a03ab5eb6cedeb06cf1e39af90fb5226ca214d77408def7677d7e6b7af3";
19+ sha256 = "2e70135d6856805699b52774d8e0cec41beda92bdfc9f9c776962b4bfb34822c";
2020 };
2121
2222 checkInputs = [ pytest ];
pkgs/development/python-modules/datadog/default.nix+2−2
@@ -4,11 +4,11 @@
44
55buildPythonPackage rec {
66 pname = "datadog";
7− version = "0.25.0";
7+ version = "0.26.0";
88
99 src = fetchPypi {
1010 inherit pname version;
11− sha256 = "e71f9024fb0b968bd704178c7e48fa41ce728281cc6913994db5e065596cddf1";
11+ sha256 = "cbaa6b4b2b88fd552605e6730f60d5437017bb76d6b701432eaafbc983735b79";
1212 };
1313
1414 postPatch = ''
pkgs/development/python-modules/datashape/default.nix+2
@@ -42,5 +42,7 @@ in buildPythonPackage rec {
4242 description = "A data description language";
4343 license = lib.licenses.bsd2;
4444 maintainers = with lib.maintainers; [ fridh ];
45+ # Package is no longer maintained upstream, and more and more tests are failing.
46+ broken = true;
4547 };
4648}
pkgs/development/python-modules/dateutil/default.nix+11−3
@@ -1,15 +1,23 @@
1−{ stdenv, buildPythonPackage, fetchPypi, six, setuptools_scm }:
1+{ stdenv, buildPythonPackage, fetchPypi, six, setuptools_scm, pytest }:
22buildPythonPackage rec {
33 pname = "python-dateutil";
4− version = "2.7.5";
4+ version = "2.8.0";
55
66 src = fetchPypi {
77 inherit pname version;
8− sha256 = "88f9287c0174266bb0d8cedd395cfba9c58e87e5ad86b2ce58859bc11be3cf02";
8+ sha256 = "c89805f6f4d64db21ed966fda138f8a5ed7a4fdbc1a8ee329ce1b74e3c74da9e";
99 };
1010
11+ checkInputs = [ pytest ];
1112 propagatedBuildInputs = [ six setuptools_scm ];
1213
14+ checkPhase = ''
15+ py.test dateutil/test
16+ '';
17+
18+ # Requires fixing
19+ doCheck = false;
20+
1321 meta = with stdenv.lib; {
1422 description = "Powerful extensions to the standard datetime module";
1523 homepage = https://pypi.python.org/pypi/python-dateutil;
pkgs/development/python-modules/decorator/default.nix+2−2
@@ -5,11 +5,11 @@
55
66buildPythonPackage rec {
77 pname = "decorator";
8− version = "4.3.0";
8+ version = "4.3.2";
99
1010 src = fetchPypi {
1111 inherit pname version;
12− sha256 = "c39efa13fbdeb4506c476c9b3babf6a718da943dab7811c206005a4a956c080c";
12+ sha256 = "33cd704aea07b4c28b3eb2c97d288a06918275dac0ecebdaf1bc8a48d98adb9e";
1313 };
1414
1515 meta = {
pkgs/development/python-modules/deluge-client/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "deluge-client";
5− version = "1.6.0";
5+ version = "1.7.0";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "a95d5bc3cf12e842793cb90eecef5c91f4bd8a7fc4e1e8fdef36d62b643d87cb";
9+ sha256 = "7c2bb6baa3183f039125fc490f47f8c6699312c3e69fcada89e9e70f63c6e092";
1010 };
1111
1212 # it will try to connect to a running instance
pkgs/development/python-modules/derpconf/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "derpconf";
5− version = "0.8.2";
5+ version = "0.8.3";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "ce4f0cd55d367a3357538a18422c916dced0617a00056b4ebabe775059eace4f";
9+ sha256 = "1bb152d8a1cf5c2a6d629bf29acd4af0c00811339642fc0a56172b0a83b31a15";
1010 };
1111
1212 propagatedBuildInputs = [ six ];
pkgs/development/python-modules/detox/default.nix+2−2
@@ -3,11 +3,11 @@
33
44buildPythonPackage rec {
55 pname = "detox";
6− version = "0.18";
6+ version = "0.19";
77
88 src = fetchPypi {
99 inherit pname version;
10− sha256 = "1yvfhnkw6zpm11yrl2shl794yi68jcfqj8m5n596gqxxbiq6gp90";
10+ sha256 = "e650f95f0c7f5858578014b3b193e5dac76c89285c1bbe4bae598fd641bf9cd3";
1111 };
1212
1313 buildInputs = [ pytest ];
pkgs/development/python-modules/diff-match-patch/default.nix+2−2
@@ -2,7 +2,7 @@
22
33buildPythonPackage rec {
44 pname = "diff-match-patch";
5− version = "20121119";
5+ version = "20181111";
66
77 meta = {
88 homepage = https://code.google.com/p/google-diff-match-patch/;
@@ -12,6 +12,6 @@ buildPythonPackage rec {
1212
1313 src = fetchPypi {
1414 inherit pname version;
15− sha256 = "0k1f3v8nbidcmmrk65m7h8v41jqi37653za9fcs96y7jzc8mdflx";
15+ sha256 = "a809a996d0f09b9bbd59e9bbd0b71eed8c807922512910e05cbd3f9480712ddb";
1616 };
1717}
pkgs/development/python-modules/dill/default.nix+2−2
@@ -6,11 +6,11 @@
66
77buildPythonPackage rec {
88 pname = "dill";
9− version = "0.2.8.2";
9+ version = "0.2.9";
1010
1111 src = fetchPypi {
1212 inherit pname version;
13− sha256 = "624dc244b94371bb2d6e7f40084228a2edfff02373fe20e018bef1ee92fdd5b3";
13+ sha256 = "f6d6046f9f9195206063dd0415dff185ad593d6ee8b0e67f12597c0f4df4986f";
1414 };
1515
1616 # Messy test suite. Even when running the tests like tox does, it fails
pkgs/development/python-modules/distro/default.nix+6−5
@@ -2,18 +2,17 @@
22
33buildPythonPackage rec {
44 pname = "distro";
5− version = "1.3.0";
5+ version = "1.4.0";
66
7− checkInputs = [ pytest pytestcov tox];
7+ checkInputs = [ pytest pytestcov ];
88
99 checkPhase = ''
10− touch tox.ini
11− tox
10+ py.test
1211 '';
1312
1413 src = fetchPypi {
1514 inherit pname version;
16− sha256 = "224041cef9600e72d19ae41ba006e71c05c4dc802516da715d7fda55ba3d8742";
15+ sha256 = "362dde65d846d23baee4b5c058c8586f219b5a54be1cf5fc6ff55c4578392f57";
1716 };
1817
1918 meta = with stdenv.lib; {
@@ -21,5 +20,7 @@ buildPythonPackage rec {
2120 description = "Linux Distribution - a Linux OS platform information API.";
2221 license = licenses.asl20;
2322 maintainers = with maintainers; [ nand0p ];
23+ # Many failing tests
24+ broken = true;
2425 };
2526}
pkgs/development/python-modules/django-picklefield/default.nix+2−2
@@ -2,7 +2,7 @@
22
33buildPythonPackage rec {
44 pname = "django-picklefield";
5− version = "1.1.0";
5+ version = "2.0";
66
77 meta = {
88 description = "A pickled object field for Django";
@@ -12,6 +12,6 @@ buildPythonPackage rec {
1212
1313 src = fetchPypi {
1414 inherit pname version;
15− sha256 = "174zlsajpjflrf3jgn0wp5svnxfyrjadk4s9jb45vzjqcmffwzyf";
15+ sha256 = "f1733a8db1b6046c0d7d738e785f9875aa3c198215de11993463a9339aa4ea24";
1616 };
1717}
pkgs/development/python-modules/django/2_1.nix+2−2
@@ -6,13 +6,13 @@
66
77buildPythonPackage rec {
88 pname = "Django";
9− version = "2.1.5";
9+ version = "2.1.7";
1010
1111 disabled = !isPy3k;
1212
1313 src = fetchPypi {
1414 inherit pname version;
15− sha256 = "1hwqqsfg8jgnn039yxrq6xrksk11y7vwpfvba6lk01c3v8c3jffn";
15+ sha256 = "939652e9d34d7d53d74d5d8ef82a19e5f8bb2de75618f7e5360691b6e9667963";
1616 };
1717
1818 patches = stdenv.lib.optionals withGdal [
pkgs/development/python-modules/django_contrib_comments/default.nix+2−2
@@ -6,11 +6,11 @@
66
77buildPythonPackage rec {
88 pname = "django-contrib-comments";
9− version = "1.9.0";
9+ version = "1.9.1";
1010
1111 src = fetchPypi {
1212 inherit pname version;
13− sha256 = "689f3f80ff7ea8ab9f712ae5fe17ffa2ee8babbf8d75229ee8acc7bad461dfef";
13+ sha256 = "61b051d7bc3ff593e86b41a1ed5e969423cf55cc92768598af3315e2528e0890";
1414 };
1515
1616 propagatedBuildInputs = [ django ];
pkgs/development/python-modules/django_guardian/default.nix+2−2
@@ -4,11 +4,11 @@
44}:
55buildPythonPackage rec {
66 pname = "django-guardian";
7− version = "1.4.9";
7+ version = "1.5.0";
88
99 src = fetchPypi {
1010 inherit pname version;
11− sha256 = "c3c0ab257c9d94ce154b9ee32994e3cff8b350c384040705514e14a9fb7c8191";
11+ sha256 = "9e144bbdfa67f523dc6f70768653a19c0aac29394f947a80dcb8eb7900840637";
1212 };
1313
1414 checkInputs = [ pytest pytestrunner pytest-django django_environ mock ];
pkgs/development/python-modules/django_modelcluster/default.nix+2−2
@@ -7,11 +7,11 @@
77
88buildPythonPackage rec {
99 pname = "django-modelcluster";
10− version = "4.2";
10+ version = "4.3";
1111
1212 src = fetchPypi {
1313 inherit pname version;
14− sha256 = "42bd7fa91af9996d7dfd34e6b027445acbece188d371d63abd19dde4c7ac8fc8";
14+ sha256 = "407845f0c16b6f17547a65864657377446e0b3aa8a629b032bf5053f87f82fe9";
1515 };
1616
1717 doCheck = false;
pkgs/development/python-modules/dnspython/default.nix+2−2
@@ -2,12 +2,12 @@
22
33buildPythonPackage rec {
44 pname = "dnspython";
5− version = "1.15.0";
5+ version = "1.16.0";
66
77 src = fetchPypi {
88 inherit pname version;
99 extension = "zip";
10− sha256 = "0z5d9vwf211v54bybrhm3qpxclys4dfdfsp7lk2hvf57yzhn7xa0";
10+ sha256 = "36c5e8e38d4369a08b6780b7f27d790a292b2b08eea01607865bf0936c558e01";
1111 };
1212
1313 # needs networking for some tests
pkgs/development/python-modules/docker-pycreds/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "docker-pycreds";
5− version = "0.3.0";
5+ version = "0.4.0";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "8b0e956c8d206f832b06aa93a710ba2c3bcbacb5a314449c040b0b814355bbff";
9+ sha256 = "6ce3270bcaf404cc4c3e27e4b6c70d3521deae82fb508767870fdbf772d584d4";
1010 };
1111
1212 # require docker-credential-helpers binaries
pkgs/development/python-modules/docker/default.nix+2−2
@@ -3,12 +3,12 @@
33, ipaddress, backports_ssl_match_hostname, docker_pycreds
44}:
55buildPythonPackage rec {
6− version = "3.5.1";
6+ version = "3.7.0";
77 pname = "docker";
88
99 src = fetchPypi {
1010 inherit pname version;
11− sha256 = "fbe82af9b94ccced752527c8de07fa20267f9634b48674ba478a0bb4000a0b1e";
11+ sha256 = "2840ffb9dc3ef6d00876bde476690278ab13fa1f8ba9127ef855ac33d00c3152";
1212 };
1313
1414 propagatedBuildInputs = [
pkgs/development/python-modules/dogpile.cache/default.nix+6−5
@@ -1,14 +1,14 @@
11{ stdenv, buildPythonPackage, fetchPypi
2−, pytest, pytestcov, mock, Mako
2+, pytest, pytestcov, mock, Mako, decorator
33}:
44
55buildPythonPackage rec {
66 pname = "dogpile.cache";
7− version = "0.6.8";
7+ version = "0.7.1";
88
99 src = fetchPypi {
1010 inherit pname version;
11− sha256 = "e2fbe5d95e6df3fcfff2b666c69f3c06a4a3f77296142ae2bca523a176f88fa0";
11+ sha256 = "691b7f199561c4bd6e7e96f164a43cc3781b0c87bea29b7d59d859f873fd4a31";
1212 };
1313
1414 # Disable concurrency tests that often fail,
@@ -19,12 +19,13 @@ buildPythonPackage rec {
1919 rm tests/cache/test_memcached_backend.py
2020 '';
2121
22− buildInputs = [ pytest pytestcov mock Mako ];
22+ checkInputs = [ pytest pytestcov mock Mako ];
23+
24+ propagatedBuildInputs = [ decorator ];
2325
2426 meta = with stdenv.lib; {
2527 description = "A caching front-end based on the Dogpile lock";
2628 homepage = https://bitbucket.org/zzzeek/dogpile.cache;
27− platforms = platforms.unix;
2829 license = licenses.bsd3;
2930 };
3031}
pkgs/development/python-modules/dulwich/default.nix+2−2
@@ -4,12 +4,12 @@
44, git, glibcLocales }:
55
66buildPythonPackage rec {
7− version = "0.19.10";
7+ version = "0.19.11";
88 pname = "dulwich";
99
1010 src = fetchPypi {
1111 inherit pname version;
12− sha256 = "0330787f28c5252f12040b9a1c0f5990f19f806c12b3d510ee7ea1fa53a6f3b4";
12+ sha256 = "afbe070f6899357e33f63f3f3696e601731fef66c64a489dea1bc9f539f4a725";
1313 };
1414
1515 LC_ALL = "en_US.UTF-8";
pkgs/development/python-modules/easy-thumbnails/default.nix+2−2
@@ -4,7 +4,7 @@
44
55buildPythonPackage rec {
66 pname = "easy-thumbnails";
7− version = "2.5";
7+ version = "2.6";
88
99 meta = {
1010 description = "Easy thumbnails for Django";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
1414
1515 src = fetchPypi {
1616 inherit pname version;
17− sha256 = "e244d1f26027fc32c6ca60ffb0169a39099446f614b0433e907a2588ae7d9b95";
17+ sha256 = "23fbe3415c93b2369ece8ebdfb5faa05540943bef8b941b3118ce769ba95e275";
1818 };
1919
2020 propagatedBuildInputs = [ django pillow ];
pkgs/development/python-modules/editorconfig/default.nix+1−1
@@ -15,7 +15,7 @@ buildPythonPackage rec {
1515 sha256 = "0svk7id7ncygj2rnxhm7602xizljyidk4xgrl6i0xgq3829cz4bl";
1616 };
1717
18− buildInputs = [ cmake ];
18+ nativeBuildInputs = [ cmake ];
1919 checkPhase = ''
2020 cmake .
2121 # utf_8_char fails with python3
pkgs/development/python-modules/entrypoints/default.nix+4−12
@@ -4,31 +4,23 @@
44, configparser
55, pytest
66, isPy3k
7−, isPy27
87}:
98
109buildPythonPackage rec {
1110 pname = "entrypoints";
12− version = "0.2.3";
11+ version = "0.3";
1312
1413 src = fetchPypi {
1514 inherit pname version;
16− sha256 = "d2d587dde06f99545fb13a383d2cd336a8ff1f359c5839ce3a64c917d10c029f";
15+ sha256 = "c70dd71abe5a8c85e55e12c19bd91ccfeec11a6e99044204511f9ed547d48451";
1716 };
1817
1918 checkInputs = [ pytest ];
2019
2120 propagatedBuildInputs = lib.optional (!isPy3k) configparser;
2221
23− checkPhase = let
24− # On python2 with pytest 3.9.2 (not with pytest 3.7.4) the test_bad
25− # test fails. It tests that a warning (exectly one) is thrown on a "bad"
26− # path. The pytest upgrade added some warning, resulting in two warnings
27− # being thrown.
28− # upstream: https://github.com/takluyver/entrypoints/issues/23
29− pyTestArgs = if isPy27 then "-k 'not test_bad'" else "";
30− in ''
31− py.test ${pyTestArgs} tests
22+ checkPhase = ''
23+ py.test tests
3224 '';
3325
3426 meta = {
pkgs/development/python-modules/envs/default.nix+2−2
@@ -3,11 +3,11 @@
33
44buildPythonPackage rec {
55 pname = "envs";
6− version = "1.2.6";
6+ version = "1.3";
77
88 src = fetchPypi {
99 inherit pname version;
10− sha256 = "5fe059d6df1ae01c422d32b10ec7f539baad0e7d339f4c8b2de4ad8cbb07c8ba";
10+ sha256 = "ccf5cd85ddb8ed335e39ed8a22e0d23658f5a6d7da430f225e6f750c6f50ae42";
1111 };
1212
1313 checkInputs = [ click jinja2 terminaltables ];
pkgs/development/python-modules/execnet/default.nix+5−2
@@ -1,7 +1,7 @@
11{ stdenv
22, buildPythonPackage
33, fetchPypi
4−, pytest
4+, pytest_3
55, setuptools_scm
66, apipkg
77}:
@@ -15,7 +15,7 @@ buildPythonPackage rec {
1515 sha256 = "a7a84d5fa07a089186a329528f127c9d73b9de57f1a1131b82bb5320ee651f6a";
1616 };
1717
18− checkInputs = [ pytest ];
18+ checkInputs = [ pytest_3 ];
1919 nativeBuildInputs = [ setuptools_scm ];
2020 propagatedBuildInputs = [ apipkg ];
2121
@@ -31,6 +31,9 @@ buildPythonPackage rec {
3131 py.test testing
3232 '';
3333
34+ # not yet compatible with pytest 4
35+ doCheck = false;
36+
3437 __darwinAllowLocalNetworking = true;
3538
3639 meta = with stdenv.lib; {
pkgs/development/python-modules/fb-re2/default.nix+4−6
@@ -7,19 +7,17 @@
77
88buildPythonPackage rec {
99 pname = "fb-re2";
10− version = "1.0.6";
10+ version = "1.0.7";
1111
1212 src = fetchPypi {
1313 inherit pname version;
14− sha256 = "0wd97qdcafcca90s6692g2dmzl5n6cdvm20vn7pmag3l9gvx395c";
14+ sha256 = "83b2c2cd58d3874e6e3a784cf4cf2f1a57ce1969e50180f92b010eea24ef26cf";
1515 };
1616
1717 buildInputs = [ re2 ];
1818
19− checkInputs = [ pytest ];
20− checkPhase = ''
21− py.test
22− '';
19+ # no tests in PyPI tarball
20+ doCheck = false;
2321
2422 meta = {
2523 description = "Python wrapper for Google's RE2";
pkgs/development/python-modules/fints/default.nix+2−2
@@ -2,13 +2,13 @@
22 requests, mt-940, sepaxml, bleach, isPy3k }:
33
44buildPythonPackage rec {
5− version = "2.0.0";
5+ version = "2.0.1";
66 pname = "fints";
77 disabled = !isPy3k;
88
99 src = fetchPypi {
1010 inherit pname version;
11− sha256 = "1jja83h0ld55djiphcxdz64z5qp3w94204bfbgg65v5ybw0vpqq1";
11+ sha256 = "27427b5e6536b592f964c464a8f0c75c5725176604e9d0f208772a45918d9b78";
1212 };
1313
1414 propagatedBuildInputs = [ requests mt-940 sepaxml bleach ];
pkgs/development/python-modules/fiona/default.nix+21−9
@@ -1,6 +1,7 @@
1−{ stdenv, buildPythonPackage, fetchPypi,
2− six, cligj, munch, click-plugins, enum34, pytest, nose,
3− gdal
1+{ stdenv, buildPythonPackage, fetchPypi, isPy3k
2+, attrs, click, cligj, click-plugins, six, munch, enum34
3+, pytest, boto3
4+, gdal
45}:
56
67buildPythonPackage rec {
@@ -14,24 +15,35 @@ buildPythonPackage rec {
1415
1516 CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11";
1617
18+ nativeBuildInputs = [
19+ gdal # for gdal-config
20+ ];
21+
1722 buildInputs = [
1823 gdal
1924 ];
2025
2126 propagatedBuildInputs = [
22− six
27+ attrs
28+ click
2329 cligj
24− munch
2530 click-plugins
26− enum34
27− ];
31+ six
32+ munch
33+ ] ++ stdenv.lib.optional (!isPy3k) enum34;
2834
2935 checkInputs = [
3036 pytest
31− nose
37+ boto3
3238 ];
3339
34− doCheck = false;
40+ checkPhase = ''
41+ rm -r fiona # prevent importing local fiona
42+ # Some tests access network, others test packaging
43+ pytest -k "not test_*_http \
44+ and not test_*_https \
45+ and not test_*_wheel"
46+ '';
3547
3648 meta = with stdenv.lib; {
3749 description = "OGR's neat, nimble, no-nonsense API for Python";
pkgs/development/python-modules/flake8/default.nix+11−37
@@ -1,52 +1,26 @@
11{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, fetchpatch
22, mock, pytest, pytestrunner
3−, configparser, enum34, mccabe, pycodestyle, pyflakes
3+, configparser, enum34, mccabe, pycodestyle, pyflakes, entrypoints, functools32, typing
44}:
55
66buildPythonPackage rec {
77 pname = "flake8";
8− version = "3.5.0";
8+ version = "3.7.6";
99
1010 src = fetchPypi {
1111 inherit pname version;
12− sha256 = "7253265f7abd8b313e3892944044a365e3f4ac3fcdcfb4298f55ee9ddf188ba0";
12+ sha256 = "6d8c66a65635d46d54de59b027a1dda40abbe2275b3164b634835ac9c13fd048";
1313 };
1414
15− # Allow newer version of pycodestyle and pyflakes
16− patches = [
17− (fetchpatch {
18− url = https://gitlab.com/pycqa/flake8/commit/4fcbcccf381ce0987faa297173e4008b0490918f.patch;
19− sha256 = "0lfsg9n92fc8whj29paqsx7ifap2szv7pxj13hy739y87gsps676";
20− excludes = [ "setup.cfg" ];
21− })
22− (fetchpatch {
23− url = https://gitlab.com/pycqa/flake8/commit/0273ca561f0ad03adff41ce5d95a1ec31b10fe5a.patch;
24− sha256 = "1ziy54v1cm7gn7a551qvrl0rs16q8zpzh303xf5gn4rxxz13qnzb";
25− excludes = [ "setup.cfg" ];
26− })
27− (fetchpatch {
28− url = https://gitlab.com/pycqa/flake8/commit/85c503de32f81ed9859d902cbe20eb4d2e4e8d55.patch;
29− sha256 = "0170hjaxkq5ssva9rwkcgm4whb07fnxdb0z12gzmvw5w53hkqxj4";
30− })
31− (fetchpatch {
32− url = https://gitlab.com/pycqa/flake8/commit/68782675b7f00c5d24c24e424efd1fbcb0705224.patch;
33− sha256 = "183lcw7aqv5yzm8pfisrfngq3fchc7h3j7254c5hy2hqq653v98s";
34− })
35− (fetchpatch {
36− url = https://gitlab.com/pycqa/flake8/commit/ef1d5ceefcbfacf5dfe94534c4879ca814b130f0.patch;
37− sha256 = "1j5f0l4xryfhirixwjcl1lzayjhy6vhkizkpm7w87piylim8y26y";
38− })
39− (fetchpatch {
40− url = https://gitlab.com/pycqa/flake8/commit/527af5c214ef0eccfde3dd58d7ea15e09c483bd3.patch;
41− sha256 = "1y51r78770z27d43v64lrg8zvm39ycszzhh15cx8wq8wp3b7iz5x";
42− excludes = [ "setup.cfg" ];
43− })
44− ];
45−
46− buildInputs = [ pytest mock pytestrunner ];
47− propagatedBuildInputs = [ pyflakes pycodestyle mccabe ]
15+ checkInputs = [ pytest mock pytestrunner ];
16+ propagatedBuildInputs = [ entrypoints pyflakes pycodestyle mccabe ]
17+ ++ stdenv.lib.optionals (pythonOlder "3.2") [ configparser functools32 ]
4818 ++ stdenv.lib.optionals (pythonOlder "3.4") [ enum34 ]
49− ++ stdenv.lib.optionals (pythonOlder "3.2") [ configparser ];
19+ ++ stdenv.lib.optionals (pythonOlder "3.5") [ typing ];
20+
21+ checkPhase = ''
22+ py.test tests
23+ '';
5024
5125 meta = with stdenv.lib; {
5226 description = "Code checking using pep8 and pyflakes";
pkgs/development/python-modules/flaky/default.nix+2−2
@@ -7,11 +7,11 @@
77
88buildPythonPackage rec {
99 pname = "flaky";
10− version = "3.4.0";
10+ version = "3.5.3";
1111
1212 src = fetchPypi {
1313 inherit pname version;
14− sha256 = "4ad7880aef8c35a34ddb394d4fa33047765bca1e3d67d182bf6eba9c8eabf3a2";
14+ sha256 = "12bd5e41f372b2190e8d754b6e5829c2f11dbc764e10b30f57e59f829c9ca1da";
1515 };
1616
1717 buildInputs = [ mock pytest ];
pkgs/development/python-modules/flask-jwt-extended/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "Flask-JWT-Extended";
5− version = "3.14.0";
5+ version = "3.17.0";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "133s9js7j1b2m6vv56a2xd9in0rmx5zrdp4r005qwbvr5qxld39s";
9+ sha256 = "97c66f197b4b175173bf955b9a845d03d62e521e512e88f6abff707e6859e7c3";
1010 };
1111
1212 propagatedBuildInputs = [ flask pyjwt werkzeug ];
pkgs/development/python-modules/flask-paginate/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "flask-paginate";
5− version = "0.5.1";
5+ version = "0.5.2";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "0pgk6ngqzh7lgq2nr6hraqp3z76f3f0kjhai50vxb6j1civ8v3mn";
9+ sha256 = "ebc896bf6e8d7a414e3efba0bd0770a8f73dcd7023f99e849c64164287e36e9b";
1010 };
1111
1212 propagatedBuildInputs = [ flask ];
pkgs/development/python-modules/flask-socketio/default.nix+2−2
@@ -8,11 +8,11 @@
88
99buildPythonPackage rec {
1010 pname = "Flask-SocketIO";
11− version = "3.1.2";
11+ version = "3.2.2";
1212
1313 src = fetchPypi {
1414 inherit pname version;
15− sha256 = "1hcl0qnhfqc9x4y6fnvsrablim8yfqfg2i097b2v3srlz69vdyr6";
15+ sha256 = "ee8e2954ec3ae0abf19f50fce5ec8b7b9ff937c5353c0a72c7e1cfb86df1195d";
1616 };
1717
1818 propagatedBuildInputs = [
pkgs/development/python-modules/flit/default.nix+2−2
@@ -20,11 +20,11 @@
2020
2121buildPythonPackage rec {
2222 pname = "flit";
23− version = "1.2.1";
23+ version = "1.3";
2424
2525 src = fetchPypi {
2626 inherit pname version;
27− sha256 = "6aefa6ff89a993af7a7af40d3df3d0387d6663df99797981ec41b1431ec6d1e1";
27+ sha256 = "6f6f0fb83c51ffa3a150fa41b5ac118df9ea4a87c2c06dff4ebf9adbe7b52b36";
2828 };
2929
3030 disabled = !isPy3k;
pkgs/development/python-modules/fonttools/default.nix+2−2
@@ -8,11 +8,11 @@
88
99buildPythonPackage rec {
1010 pname = "fonttools";
11− version = "3.37.0";
11+ version = "3.37.3";
1212
1313 src = fetchPypi {
1414 inherit pname version;
15− sha256 = "1bf7k6qdvi2ycw87g8iqy0rwl3ms25k3zz6ix1fpsk8qx36gk9x1";
15+ sha256 = "c898a455a39afbe6707bc17a0e4f720ebe2087fec67683e7c86a13183078204d";
1616 extension = "zip";
1717 };
1818
pkgs/development/python-modules/freezegun/default.nix+1−1
@@ -17,7 +17,7 @@ buildPythonPackage rec {
1717 };
1818
1919 propagatedBuildInputs = [ dateutil six ];
20− buildInputs = [ mock nose ];
20+ checkInputs = [ mock nose ];
2121
2222 meta = with stdenv.lib; {
2323 description = "FreezeGun: Let your Python tests travel through time";
pkgs/development/python-modules/fs-s3fs/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "fs-s3fs";
5− version = "1.0.0";
5+ version = "1.1.0";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "1czv67zs4sl5l3rv9l3hzn22zzzqm372lq1wlhihigir4cfyslak";
9+ sha256 = "49bfa4572bb11e37324dd43be935ab99376259eff652365aef0e4a747bb11418";
1010 };
1111
1212 propagatedBuildInputs = [ fs six boto3 ];
pkgs/development/python-modules/fs/default.nix+2−2
@@ -19,11 +19,11 @@
1919
2020buildPythonPackage rec {
2121 pname = "fs";
22− version = "2.1.3";
22+ version = "2.3.1";
2323
2424 src = fetchPypi {
2525 inherit pname version;
26− sha256 = "87e8d4e93040779a407c92b7f2f27117038927b4b1da41bdce23ce226557327d";
26+ sha256 = "6c3f79a16dfcbf8a8f437f81dd8afaa3741285d9369574c48e1d27e40b0c980e";
2727 };
2828
2929 buildInputs = [ glibcLocales ];
pkgs/development/python-modules/gensim/default.nix+3−2
@@ -10,10 +10,11 @@
1010
1111buildPythonPackage rec {
1212 pname = "gensim";
13− version = "3.7.0";
13+ version = "3.7.1";
14+
1415 src = fetchPypi {
1516 inherit pname version;
16− sha256 = "03i437hg0911mg94kx3zl0czm004q0qakrssm6skx8zlpiqzxnry";
17+ sha256 = "ed845ac585f724ae1f40fdb517ed8ade822531f9bbcd1be4a599c2e86aff48a8";
1718 };
1819
1920 propagatedBuildInputs = [ smart_open numpy six scipy ];
pkgs/development/python-modules/geopy/default.nix+2−2
@@ -9,12 +9,12 @@
99
1010buildPythonPackage rec {
1111 pname = "geopy";
12− version = "1.17.0";
12+ version = "1.18.1";
1313 disabled = !isPy27;
1414
1515 src = fetchPypi {
1616 inherit pname version;
17− sha256 = "1bbea0efc5af91e0a7d4c2b31650f61667bcc1d0d717784d78c03f0ed13bb374";
17+ sha256 = "07a21f699b3daaef726de7278f5d65f944609306ab8a389e9f56e09abf86eac8";
1818 };
1919
2020 doCheck = false; # too much
pkgs/development/python-modules/gevent/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "gevent";
5− version = "1.3.7";
5+ version = "1.4.0";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "3f06f4802824c577272960df003a304ce95b3e82eea01dad2637cc8609c80e2c";
9+ sha256 = "1eb7fa3b9bd9174dfe9c3b59b7a09b768ecd496debfc4976a9530a3e15c990d1";
1010 };
1111
1212 buildInputs = [ libev ];
pkgs/development/python-modules/gidgethub/default.nix+10−6
@@ -1,4 +1,4 @@
1−{ stdenv
1+{ lib
22, buildPythonPackage
33, fetchPypi
44, pythonOlder
@@ -15,24 +15,28 @@
1515
1616buildPythonPackage rec {
1717 pname = "gidgethub";
18− version = "3.0.0";
19− format = "flit";
18+ version = "3.1.0";
2019
2120 disabled = pythonOlder "3.6";
2221
2322 src = fetchPypi {
2423 inherit pname version;
25− sha256 = "1ebe79cf80ad64cb78c880efc7f30ac664e18b80dfd18ee201bf8685cf029628";
24+ sha256 = "52119435ba73ddd5e697dae7bec8b93a048bc738720b81691ebd4b4d81d2d762";
2625 };
2726
28− buildInputs = [ setuptools pytestrunner ];
27+ nativeBuildInputs = [ setuptools pytestrunner ];
2928 checkInputs = [ pytest pytest-asyncio twisted treq tornado aiohttp ];
3029 propagatedBuildInputs = [ uritemplate ];
3130
31+ postPatch = ''
32+ substituteInPlace setup.py \
33+ --replace "extras_require=extras_require," "extras_require=None,"
34+ '';
35+
3236 # requires network (reqests github.com)
3337 doCheck = false;
3438
35− meta = with stdenv.lib; {
39+ meta = with lib; {
3640 description = "An async GitHub API library";
3741 homepage = https://github.com/brettcannon/gidgethub;
3842 license = licenses.asl20;
pkgs/development/python-modules/gin-config/default.nix+2−2
@@ -7,11 +7,11 @@
77
88buildPythonPackage rec {
99 pname = "gin-config";
10− version = "0.1.2";
10+ version = "0.1.3";
1111
1212 src = fetchPypi {
1313 inherit pname version;
14− sha256 = "a4e8a2537320240859157870ab58df60e979d936a3c9b17a8b2fa686fc31b287";
14+ sha256 = "07843fde2917f1a44f808fceb3c0227bb02ff7c4ebba8de6642206c03e7e8ba2";
1515
1616 };
1717
pkgs/development/python-modules/git-annex-adapter/default.nix+11−11
@@ -1,5 +1,5 @@
1−{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, fetchpatch
2−, utillinux, pygit2, gitMinimal, git-annex
1+{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, substituteAll
2+, python, utillinux, pygit2, gitMinimal, git-annex
33}:
44
55buildPythonPackage rec {
@@ -16,22 +16,22 @@ buildPythonPackage rec {
1616 sha256 = "146q1jhcfc7f96ajkhjffskkljk2xzivs5ih5clb8qx0sh7mj097";
1717 };
1818
19− prePatch = ''
20− substituteInPlace git_annex_adapter/process.py \
21− --replace "'git', 'annex'" "'${git-annex}/bin/git-annex'" \
22− --replace "'git-annex'" "'${git-annex}/bin/git-annex'"
23− '';
19+ patches = [
20+ (substituteAll {
21+ src = ./git-annex-path.patch;
22+ gitAnnex = "${git-annex}/bin/git-annex";
23+ })
24+ ];
2425
2526 checkInputs = [
27+ gitMinimal
2628 utillinux # `rev` is needed in tests/test_process.py
2729 ];
2830
29− propagatedBuildInputs = [ pygit2 gitMinimal ];
30−
31− buildInputs = [ git-annex ];
31+ propagatedBuildInputs = [ pygit2 ];
3232
3333 checkPhase = ''
34− python -m unittest
34+ ${python.interpreter} -m unittest
3535 '';
3636
3737 meta = with stdenv.lib; {
pkgs/development/python-modules/git-annex-adapter/git-annex-path.patchnew file+75
@@ -0,0 +1,75 @@
1+diff --git a/git_annex_adapter/process.py b/git_annex_adapter/process.py
2+index 6ddb985..bbd0ab8 100644
3+--- a/git_annex_adapter/process.py
4++++ b/git_annex_adapter/process.py
5+@@ -389,7 +389,7 @@ class GitAnnexBatchProcess:
6+ _procclass = Process
7+
8+ def __init__(self, args, workdir):
9+- self.args = ('git', 'annex', *args)
10++ self.args = ('@gitAnnex@', *args)
11+ self.workdir = workdir
12+ self._process = None
13+ self._dead_process = None
14+@@ -586,7 +586,7 @@ class ProcessRunner:
15+ class GitAnnexRunner(ProcessRunner):
16+ """Helper class to run git-annex commands."""
17+ def __init__(self, args_prefix, workdir):
18+- args_prefix = ('git-annex', *args_prefix)
19++ args_prefix = ('@gitAnnex@', *args_prefix)
20+ super().__init__(args_prefix, workdir)
21+
22+ def __call__(self, *args_suffix):
23+diff --git a/tests/test_process.py b/tests/test_process.py
24+index ed619bb..9335078 100644
25+--- a/tests/test_process.py
26++++ b/tests/test_process.py
27+@@ -181,7 +181,7 @@ class TestProcessOnEmptyAnnex(TempAnnexTestCase):
28+ def test_process_annex_metadata_batch(self):
29+ """Process should be able to read one line"""
30+ with Process(
31+- ['git', 'annex', 'metadata', '--batch', '--json'],
32++ ['@gitAnnex@', 'metadata', '--batch', '--json'],
33+ str(self.tempdir),
34+ ) as proc:
35+ proc.writeline(
36+@@ -202,7 +202,7 @@ class TestProcessOnEmptyAnnex(TempAnnexTestCase):
37+ def test_jsonprocess_annex_metadata_batch(self):
38+ """JsonProcess should encode and decode properly"""
39+ with JsonProcess(
40+- ['git', 'annex', 'metadata', '--batch', '--json'],
41++ ['@gitAnnex@', 'metadata', '--batch', '--json'],
42+ str(self.tempdir),
43+ ) as proc:
44+ obj = proc({'key':'SHA256E-s0--0'})
45+@@ -218,7 +218,7 @@ class TestProcessOnEmptyAnnex(TempAnnexTestCase):
46+ def test_process_annex_info_batch(self):
47+ """Process should be able to read multiple lines"""
48+ with Process(
49+- ['git', 'annex', 'info', '--batch'],
50++ ['@gitAnnex@', 'info', '--batch'],
51+ str(self.tempdir),
52+ ) as proc:
53+ proc.writeline('here')
54+diff --git a/tests/utils.py b/tests/utils.py
55+index 281ee3f..969aedc 100644
56+--- a/tests/utils.py
57++++ b/tests/utils.py
58+@@ -107,7 +107,7 @@ class TempAnnexTestCase(TempRepoTestCase):
59+ # Have to uninit before cleaning directory, since git-annex
60+ # marks its objects read-only so that they don't get deleted.
61+ subprocess.run(
62+- ['git', 'annex', 'uninit'],
63++ ['@gitAnnex@', 'uninit'],
64+ cwd=self.repo.workdir,
65+ stdout=subprocess.PIPE,
66+ stderr=subprocess.PIPE,
67+@@ -122,7 +122,7 @@ class TempAnnexTestCase(TempRepoTestCase):
68+ path.write_text(text)
69+
70+ subprocess.run(
71+- ['git', 'annex', 'add', '--quiet', relpath],
72++ ['@gitAnnex@', 'add', '--quiet', relpath],
73+ cwd=self.repo.workdir,
74+ check=True,
75+ )
pkgs/development/python-modules/github3_py/default.nix+2−2
@@ -18,11 +18,11 @@
1818
1919buildPythonPackage rec {
2020 pname = "github3.py";
21− version = "1.2.0";
21+ version = "1.3.0";
2222
2323 src = fetchPypi {
2424 inherit pname version;
25− sha256 = "35fea5bf3567a8e88d3660686d83f96ef164e698ce6fb30f9e2b0edded7357af";
25+ sha256 = "15a115c18f7bfcf934dfef7ab103844eb9f620c586bad65967708926da47cbda";
2626 };
2727
2828 checkInputs = [ betamax pytest betamax-matchers ]
pkgs/development/python-modules/globus-sdk/default.nix+2−2
@@ -10,11 +10,11 @@
1010
1111buildPythonPackage rec {
1212 pname = "globus-sdk";
13− version = "1.6.1";
13+ version = "1.7.1";
1414
1515 src = fetchPypi {
1616 inherit pname version;
17− sha256 = "aae6142ec8136d835f0f5c48824a65df5eb964863e155a5d90ce7ee8b84b0f8a";
17+ sha256 = "d96f7ed1887c8f55f2bc8d493cd8ec73ff9f3361f0a134203e34e2e57bedd964";
1818 };
1919
2020 checkPhase = ''
pkgs/development/python-modules/glom/default.nix+2−2
@@ -11,11 +11,11 @@
1111
1212buildPythonPackage rec {
1313 pname = "glom";
14− version = "18.4.0";
14+ version = "19.1.0";
1515
1616 src = fetchPypi {
1717 inherit pname version;
18− sha256 = "0rfikq27a9wwfkd4k3bk7x4fssw6r7z138g9i3wpzvjc7anlzk24";
18+ sha256 = "5c47dc6dc97bb1c20e5607f3d58eac81e13b16880a284b52d503eea92d7b5fc2";
1919 };
2020
2121 propagatedBuildInputs = [ boltons attrs face ];
pkgs/development/python-modules/gmusicapi/default.nix+2−2
@@ -20,11 +20,11 @@
2020
2121buildPythonPackage rec {
2222 pname = "gmusicapi";
23− version = "11.0.4";
23+ version = "12.0.0";
2424
2525 src = fetchPypi {
2626 inherit pname version;
27− sha256 = "b0345df8119c4721cabafff765fe9ded1a246886f5a67b1b306c656b685650b8";
27+ sha256 = "6e066f38bbfce068e0e89f34ccdbc7056fd5fdc446d3c33c70f53b26078eb78b";
2828 };
2929
3030 propagatedBuildInputs = [ validictory decorator mutagen protobuf setuptools requests dateutil proboscis mock appdirs oauth2client pyopenssl gpsoauth MechanicalSoup future ];
pkgs/development/python-modules/google-music-proto/default.nix+2−2
@@ -8,11 +8,11 @@
88
99buildPythonPackage rec {
1010 pname = "google-music-proto";
11− version = "2.2.0";
11+ version = "2.4.0";
1212
1313 src = fetchPypi {
1414 inherit pname version;
15− sha256 = "008nap32hcrlnkkqkf462vwnm6xzrn6fj71lbryfmrakad7rz7bc";
15+ sha256 = "798ac14408593525d1865f608b30f71cce291b1a239f4d63f14bb4dcf79d7528";
1616 };
1717
1818 propagatedBuildInputs = [
pkgs/development/python-modules/google_auth/default.nix+2−2
@@ -3,11 +3,11 @@
33
44buildPythonPackage rec {
55 pname = "google-auth";
6− version = "1.5.1";
6+ version = "1.6.3";
77
88 src = fetchPypi {
99 inherit pname version;
10− sha256 = "9ca363facbf2622d9ba828017536ccca2e0f58bd15e659b52f312172f8815530";
10+ sha256 = "0f7c6a64927d34c1a474da92cfc59e552a5d3b940d3266606c6a28b72888b9e4";
1111 };
1212
1313 checkInputs = [ pytest mock oauth2client flask requests urllib3 pytest-localserver ];
pkgs/development/python-modules/google_cloud_bigquery/default.nix+2−2
@@ -13,11 +13,11 @@
1313
1414buildPythonPackage rec {
1515 pname = "google-cloud-bigquery";
16− version = "1.8.1";
16+ version = "1.9.0";
1717
1818 src = fetchPypi {
1919 inherit pname version;
20− sha256 = "621e05321d7a26b87fa2d4f8dd24f963d3424d7566a6454d65c4427b9d8552e2";
20+ sha256 = "169ffdb1b677f69f1f9d032bd38f724aed73e0565153ac17199472c083a3852f";
2121 };
2222
2323 checkInputs = [ pytest mock ipython ];
pkgs/development/python-modules/google_cloud_dataproc/default.nix+2−2
@@ -8,11 +8,11 @@
88
99buildPythonPackage rec {
1010 pname = "google-cloud-dataproc";
11− version = "0.3.0";
11+ version = "0.3.1";
1212
1313 src = fetchPypi {
1414 inherit pname version;
15− sha256 = "3acbb1bd9e25fd233ae321c137a58306d5d0ef262e3cbe825c511c8ef55b33a2";
15+ sha256 = "e6a6c380757e22e9a45cf5b261be6d6a4262f87ee172a6c21f6f7ad6013827cd";
1616 };
1717
1818 checkInputs = [ pytest mock ];
pkgs/development/python-modules/google_cloud_kms/default.nix+2−2
@@ -10,11 +10,11 @@
1010
1111buildPythonPackage rec {
1212 pname = "google-cloud-kms";
13− version = "0.2.1";
13+ version = "1.0.0";
1414
1515 src = fetchPypi {
1616 inherit pname version;
17− sha256 = "3e9d9e07af8651826db5997ca0f11f02401cef42eb822d416a19df05b17c5a45";
17+ sha256 = "2167e1c599ea1d9fed96d317ad817d0b37497460c70f11aafa13a24ede7c9c35";
1818 };
1919
2020 checkInputs = [ pytest mock ];
pkgs/development/python-modules/google_cloud_storage/default.nix+2−2
@@ -10,11 +10,11 @@
1010
1111buildPythonPackage rec {
1212 pname = "google-cloud-storage";
13− version = "1.13.2";
13+ version = "1.14.0";
1414
1515 src = fetchPypi {
1616 inherit pname version;
17− sha256 = "f8884619fed4c77234c7293939be5a696869f61a5dc2ca47193cff630cee179f";
17+ sha256 = "aef243b533144c11c9ff750565c43dffe5445debb143697002edb6205f64a437";
1818 };
1919
2020 checkInputs = [ pytest mock ];
pkgs/development/python-modules/google_cloud_texttospeech/default.nix+2−2
@@ -8,11 +8,11 @@
88
99buildPythonPackage rec {
1010 pname = "google-cloud-texttospeech";
11− version = "0.3.0";
11+ version = "0.4.0";
1212
1313 src = fetchPypi {
1414 inherit pname version;
15− sha256 = "39d2c83ee198ec1995c03faf5d557089e7027a8356802302dee08b18380c8250";
15+ sha256 = "ec1d049cb54fc036887d946ce0391bde481a3da7263e55908eaf9694079ec46f";
1616 };
1717
1818 checkInputs = [ pytest mock ];
pkgs/development/python-modules/googleapis_common_protos/default.nix+2−2
@@ -3,11 +3,11 @@
33
44buildPythonPackage rec {
55 pname = "googleapis-common-protos";
6− version = "1.5.6";
6+ version = "1.5.8";
77
88 src = fetchPypi {
99 inherit pname version;
10− sha256 = "6de6de98e895f4266caefa768778533bdea98abbead6972d35c8a0f57409eea2";
10+ sha256 = "d56ca712f67fff216d3be9eeeb8360ca59066d0365ba70b137b9e1801813747e";
1111 };
1212
1313 propagatedBuildInputs = [ protobuf ];
pkgs/development/python-modules/gphoto2/default.nix+2−2
@@ -4,11 +4,11 @@
44
55buildPythonPackage rec {
66 pname = "gphoto2";
7− version = "1.8.5";
7+ version = "1.9.0";
88
99 src = fetchPypi {
1010 inherit pname version;
11− sha256 = "1jvwq7qjr2iazmwdzkmr82iza7snylpm6x0kr9p0z5mkicg1l38l";
11+ sha256 = "9c8e0c3ca22c0a2bfd0f27d24be6e4da5fe315d39d51f5af7bb5da416dbfa4b7";
1212 };
1313
1414 nativeBuildInputs = [ pkgconfig ];
pkgs/development/python-modules/green/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "green";
5− version = "2.13.0";
5+ version = "2.13.1";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "fe937dab641e7bb8b7b0a3678bc1372f1759282934767b035de681a40da7033b";
9+ sha256 = "ea6e2699a2e58df834d2c845fb2b076c12d4835daecfcb658c6bd5583ebf4b7d";
1010 };
1111
1212 propagatedBuildInputs = [
pkgs/development/python-modules/grpcio-tools/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "grpcio-tools";
5− version = "1.16.1";
5+ version = "1.18.0";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "0h0w7jlggm8nc250wwqai7lihw8mymx9jjpkl0cdmqmwbypj72vd";
9+ sha256 = "77ec4d3c92ccbbe3de37c457e3c72962e519c36cafb96abe5842bced8eb926fa";
1010 };
1111
1212 enableParallelBuilding = true;
pkgs/development/python-modules/grpcio/default.nix+2−2
@@ -4,11 +4,11 @@
44with stdenv.lib;
55buildPythonPackage rec {
66 pname = "grpcio";
7− version = "1.16.1";
7+ version = "1.18.0";
88
99 src = fetchPypi {
1010 inherit pname version;
11− sha256 = "0am76f8r4v5kcvbar593n2c1mp25cxi67cxigjhd0rnncmk4bgs1";
11+ sha256 = "abe825aa49e6239d5edf4e222c44170d2c7f6f4b1fd5286b4756a62d8067e112";
1212 };
1313
1414 nativeBuildInputs = [ pkgconfig ] ++ optional stdenv.isDarwin darwin.cctools;
pkgs/development/python-modules/gsd/default.nix+2−2
@@ -5,12 +5,12 @@
55}:
66
77buildPythonPackage rec {
8− version = "1.5.5";
8+ version = "1.6.0";
99 pname = "gsd";
1010
1111 src = fetchPypi {
1212 inherit pname version;
13− sha256 = "b80487a8269ba55201390353fd46d1904ec16f5488c8daaf7ff87154e09cca42";
13+ sha256 = "845a7fe4fd9776cda1bd66112dc2d788cb5ccf8333a205bd4a32807e57d3c875";
1414 };
1515
1616 propagatedBuildInputs = [ numpy ];
pkgs/development/python-modules/gspread/default.nix+2−2
@@ -4,12 +4,12 @@
44}:
55
66buildPythonPackage rec {
7− version = "3.0.1";
7+ version = "3.1.0";
88 pname = "gspread";
99
1010 src = fetchPypi {
1111 inherit pname version;
12− sha256 = "1cc06b22c6a1b6726925defcd41c19ce6cd5ab939252e72759bdf0353e36f552";
12+ sha256 = "f7ce6c06250f694976c3cd4944e3b607b0810b93383839e5b67c7199ce2f0d3d";
1313 };
1414
1515 meta = with stdenv.lib; {
pkgs/development/python-modules/gssapi/default.nix+6−4
@@ -1,5 +1,5 @@
1−{ stdenv, pkgs, lib, buildPythonPackage, fetchPypi, six, enum34, decorator,
2−nose, shouldbe, gss, krb5Full, which, darwin }:
1+{ stdenv, lib, buildPythonPackage, fetchPypi, six, enum34, decorator,
2+nose, gss, krb5Full, darwin }:
33
44buildPythonPackage rec {
55 pname = "gssapi";
@@ -16,13 +16,15 @@ buildPythonPackage rec {
1616 --replace "get_output('krb5-config gssapi --prefix')" "'${lib.getDev krb5Full}'"
1717 '';
1818
19− LD_LIBRARY_PATH = "${pkgs.krb5Full}/lib";
19+ LD_LIBRARY_PATH = "${krb5Full}/lib";
2020
21− buildInputs = [ krb5Full which nose shouldbe ]
21+ nativeBuildInputs = [ krb5Full ]
2222 ++ ( if stdenv.isDarwin then [ darwin.apple_sdk.frameworks.GSS ] else [ gss ] );
2323
2424 propagatedBuildInputs = [ decorator enum34 six ];
2525
26+ checkInputs = [ nose ];
27+
2628 doCheck = false; # No such file or directory: '/usr/sbin/kadmin.local'
2729
2830 meta = with stdenv.lib; {
pkgs/development/python-modules/gst-python/default.nix+1−1
@@ -46,7 +46,7 @@ in buildPythonPackage rec {
4646 substituteInPlace meson.build --replace python3 python${if isPy3k then "3" else "2"}
4747 '';
4848
49− nativeBuildInputs = [ meson ninja pkgconfig python gobject-introspection ];
49+ nativeBuildInputs = [ meson ninja pkgconfig python gobject-introspection gst-plugins-base ];
5050
5151 mesonFlags = [
5252 "-Dpython=python${if isPy3k then "3" else "2"}"
pkgs/development/python-modules/gym/default.nix+2−2
@@ -5,11 +5,11 @@
55
66buildPythonPackage rec {
77 pname = "gym";
8− version = "0.10.9";
8+ version = "0.11.0";
99
1010 src = fetchPypi {
1111 inherit pname version;
12− sha256 = "1id2xyyypks8bjdayb19av809w0838ghymyngmyhdbbsk588q7q0";
12+ sha256 = "f9c79fc295b8b20cfda5ab0a671e72c95615dc77517ae414f8f8b10e9375f155";
1313 };
1414
1515 propagatedBuildInputs = [
pkgs/development/python-modules/h2/default.nix+2−2
@@ -3,11 +3,11 @@
33
44buildPythonPackage rec {
55 pname = "h2";
6− version = "3.0.1";
6+ version = "3.1.0";
77
88 src = fetchPypi {
99 inherit pname version;
10− sha256 = "0r3f43r0v7sqgdjjg5ngw0dndk2v6cyd0jncpwya54m37y42z5mj";
10+ sha256 = "fd07e865a3272ac6ef195d8904de92dc7b38dc28297ec39cfa22716b6d62e6eb";
1111 };
1212
1313 propagatedBuildInputs = [ enum34 hpack hyperframe ];
pkgs/development/python-modules/ha-ffmpeg/default.nix+2−2
@@ -3,13 +3,13 @@
33
44buildPythonPackage rec {
55 pname = "ha-ffmpeg";
6− version = "1.9";
6+ version = "1.11";
77
88 disabled = !isPy3k;
99
1010 src = fetchPypi {
1111 inherit pname version;
12− sha256 = "0644j5fqw8p6li6nrnm1rw7nhvsixq1c7gik3f1yx50776yg05i8";
12+ sha256 = "386cc5bbec3a341d8bafec1c524bd8e64f41f9be8195808dec80f76661bf1cc3";
1313 };
1414
1515 buildInputs = [ ffmpeg ];
pkgs/development/python-modules/hdbscan/default.nix+2−2
@@ -10,11 +10,11 @@
1010
1111buildPythonPackage rec {
1212 pname = "hdbscan";
13− version = "0.8.18";
13+ version = "0.8.19";
1414
1515 src = fetchPypi {
1616 inherit pname version;
17− sha256 = "4d6782f08872f4c54983873a41759daae680d6247b0db363f3510cb001108f02";
17+ sha256 = "7bd74c7bd16540d7f437cf6cb61ceb4d23506f4d040c436d7570d104c1297e31";
1818 };
1919
2020 checkInputs = [ nose ];
pkgs/development/python-modules/hkdf/default.nix+4−1
@@ -13,12 +13,15 @@ buildPythonPackage rec {
1313 sha256 = "1jhxk5vhxmxxjp3zj526ry521v9inzzl8jqaaf0ma65w6k332ak2";
1414 };
1515
16− buildInputs = [ nose ];
16+ checkInputs = [ nose ];
1717
1818 checkPhase = ''
1919 nosetests
2020 '';
2121
22+ # no tests in PyPI tarball
23+ doCheck = false;
24+
2225 meta = with stdenv.lib; {
2326 description = "HMAC-based Extract-and-Expand Key Derivation Function (HKDF)";
2427 homepage = "https://github.com/casebeer/python-hkdf";
pkgs/development/python-modules/howdoi/default.nix+15−3
@@ -1,5 +1,12 @@
1−{ stdenv, buildPythonPackage, fetchPypi
2−, six, requests-cache, pygments, pyquery }:
1+{ lib
2+, buildPythonPackage
3+, fetchPypi
4+, six
5+, requests-cache
6+, pygments
7+, pyquery
8+, python
9+}:
310
411buildPythonPackage rec {
512 pname = "howdoi";
@@ -12,9 +19,14 @@ buildPythonPackage rec {
1219
1320 propagatedBuildInputs = [ six requests-cache pygments pyquery ];
1421
15− meta = with stdenv.lib; {
22+ preCheck = ''
23+ export HOME=$(mktemp -d)
24+ '';
25+
26+ meta = with lib; {
1627 description = "Instant coding answers via the command line";
1728 homepage = https://pypi.python.org/pypi/howdoi;
1829 license = licenses.mit;
30+ maintainers = [ maintainers.costrouc ];
1931 };
2032}
pkgs/development/python-modules/html5lib/default.nix+3
@@ -24,6 +24,9 @@ buildPythonPackage rec {
2424 ];
2525
2626 checkPhase = ''
27+ # remove test causing error
28+ # https://github.com/html5lib/html5lib-python/issues/411
29+ rm html5lib/tests/test_stream.py
2730 py.test
2831 '';
2932
pkgs/development/python-modules/httplib2/default.nix+5−2
@@ -2,13 +2,16 @@
22
33buildPythonPackage rec {
44 pname = "httplib2";
5− version = "0.11.3";
5+ version = "0.12.1";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "1pyb0hmc0j0kcy27yiw38gq9pk7f1fkny5k1vd13cdz6l3csw7g7";
9+ sha256 = "4ba6b8fd77d0038769bf3c33c9a96a6f752bc4cdf739701fdcaf210121f399d4";
1010 };
1111
12+ # Needs setting up
13+ doCheck = false;
14+
1215 meta = with lib; {
1316 homepage = http://code.google.com/p/httplib2;
1417 description = "A comprehensive HTTP client library";
pkgs/development/python-modules/hyperframe/default.nix+2−2
@@ -1,11 +1,11 @@
11{ stdenv, buildPythonPackage, fetchPypi }:
22buildPythonPackage rec {
33 pname = "hyperframe";
4− version = "5.1.0";
4+ version = "5.2.0";
55
66 src = fetchPypi {
77 inherit pname version;
8− sha256 = "017vjbb1xjak1pxcvihhilzjnmpfvhapk7k88wp6lvdkkm9l8nd2";
8+ sha256 = "a9f5c17f2cc3c719b917c4f33ed1c61bd1f8dfac4b1bd23b7c80b3400971b41f";
99 };
1010
1111 meta = with stdenv.lib; {
pkgs/development/python-modules/hypothesis/default.nix+2−2
@@ -9,7 +9,7 @@ buildPythonPackage rec {
99 # pytz fake_factory django numpy pytest
1010 # If you need these, you can just add them to your environment.
1111
12− version = "3.79.3";
12+ version = "3.88.3";
1313 pname = "hypothesis";
1414
1515 # Use github tarballs that includes tests
@@ -17,7 +17,7 @@ buildPythonPackage rec {
1717 owner = "HypothesisWorks";
1818 repo = "hypothesis-python";
1919 rev = "hypothesis-python-${version}";
20− sha256 = "1ay0kwh5315scv7yz9xxrr7shynyx6flgplc1qzbz3j21cyx3yn7";
20+ sha256 = "03l4hp0p7i2k04arnqkav0ygc23ml46dy3cfrlwviasrj7yzk5hc";
2121 };
2222
2323 postUnpack = "sourceRoot=$sourceRoot/hypothesis-python";
pkgs/development/python-modules/identify/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "identify";
5− version = "1.1.8";
5+ version = "1.2.2";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "08826e68e39e7de53cc2ddd8f6228a4e463b4bacb20565e5301c3ec690e68d27";
9+ sha256 = "d3ddec4436e043c3398392b4ba8936b4ab52fa262284e767eb6c351d9b3ab5b7";
1010 };
1111
1212 # Tests not included in PyPI tarball
pkgs/development/python-modules/idna/default.nix+2−2
@@ -5,11 +5,11 @@
55
66buildPythonPackage rec {
77 pname = "idna";
8− version = "2.7";
8+ version = "2.8";
99
1010 src = fetchPypi {
1111 inherit pname version;
12− sha256 = "684a38a6f903c1d71d6d5fac066b58d7768af4de2b832e426ec79c30daa94a16";
12+ sha256 = "c357b3f628cf53ae2c4c05627ecc484553142ca23264e593d327bcde5e9c3407";
1313 };
1414
1515 meta = {
pkgs/development/python-modules/imgaug/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "imgaug";
5− version = "0.2.7";
5+ version = "0.2.8";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "7ca6bce4dcfd3e40330b593fe8e55018bf475983cc6777f8ebf5422c722fffb8";
9+ sha256 = "03dcbb3d7485de372eacde4b890b676e0c7a992524ee4bc72bd05a9a1cc5f9a4";
1010 };
1111
1212 propagatedBuildInputs = [
pkgs/development/python-modules/inflect/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "inflect";
5− version = "1.0.2";
5+ version = "2.1.0";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "98cf5d82952ed8bf1cf9236c6058e9a21bc66172ecb907969d907741f91388b5";
9+ sha256 = "4ded1b2a6fcf0fc0397419c7727f131a93b67b80d899f2973be7758628e12b73";
1010 };
1111
1212 buildInputs = [ setuptools_scm ];
pkgs/development/python-modules/ipykernel/default.nix+2−1
@@ -32,8 +32,9 @@ buildPythonPackage rec {
3232 })
3333 ];
3434
35+ # For failing tests, see https://github.com/ipython/ipykernel/issues/387
3536 checkPhase = ''
36− HOME=$(mktemp -d) pytest ipykernel
37+ HOME=$(mktemp -d) pytest ipykernel -k "not (test_sys_path or test_sys_path_profile_dir or test_complete)"
3738 '';
3839
3940 meta = {
pkgs/development/python-modules/ipython/default.nix+2−2
@@ -21,12 +21,12 @@
2121
2222buildPythonPackage rec {
2323 pname = "ipython";
24− version = "7.1.1";
24+ version = "7.2.0";
2525 disabled = pythonOlder "3.5";
2626
2727 src = fetchPypi {
2828 inherit pname version;
29− sha256 = "b10a7ddd03657c761fc503495bc36471c8158e3fc948573fb9fe82a7029d8efd";
29+ sha256 = "6a9496209b76463f1dec126ab928919aaf1f55b38beb9219af3fe202f6bbdd12";
3030 };
3131
3232 prePatch = lib.optionalString stdenv.isDarwin ''
pkgs/development/python-modules/iso3166/default.nix+1−1
@@ -12,7 +12,7 @@ buildPythonPackage rec {
1212 sha256 = "0zs9za9dr2nl5srxir08yibmp6nffcapmzala0fgh8ny7y6rafrx";
1313 };
1414
15− buildInputs = [ pytest ];
15+ checkInputs = [ pytest ];
1616
1717 checkPhase = ''
1818 py.test
pkgs/development/python-modules/jaraco_collections/default.nix+2−2
@@ -3,10 +3,10 @@
33
44buildPythonPackage rec {
55 pname = "jaraco.collections";
6− version = "1.6.0";
6+ version = "2.0";
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "332fd500cf13dbaf7ef239741302329b947ba82ce40f5a5e47e790c8714ae0b3";
9+ sha256 = "eb43fb9a7b29cff20767caf838c14bdf80a89395aba67a97d61c8f16e0e22c97";
1010 };
1111
1212 doCheck = false;
pkgs/development/python-modules/jaraco_functools/default.nix+2−2
@@ -4,11 +4,11 @@
44
55buildPythonPackage rec {
66 pname = "jaraco.functools";
7− version = "1.20";
7+ version = "2.0";
88
99 src = fetchPypi {
1010 inherit pname version;
11− sha256 = "bad775f06e58bb8de5563bc2a8bf704168919e6779d6e849b1ca58b443e97f3b";
11+ sha256 = "35ba944f52b1a7beee8843a5aa6752d1d5b79893eeb7770ea98be6b637bf9345";
1212 };
1313
1414 propagatedBuildInputs = [ more-itertools backports_functools_lru_cache ];
pkgs/development/python-modules/jaraco_itertools/default.nix+2−2
@@ -3,11 +3,11 @@
33
44buildPythonPackage rec {
55 pname = "jaraco.itertools";
6− version = "4.0.0";
6+ version = "4.4.1";
77
88 src = fetchPypi {
99 inherit pname version;
10− sha256 = "1d09zpi593bhr56rwm41kzffr18wif98plgy6xdy0zrbdwfarrxl";
10+ sha256 = "d1380ed961c9a4724f0bcca85d2bffebaa2507adfde535d5ee717441c9105fae";
1111 };
1212
1313 buildInputs = [ setuptools_scm ];
pkgs/development/python-modules/jaraco_stream/default.nix+2−2
@@ -2,10 +2,10 @@
22
33buildPythonPackage rec {
44 pname = "jaraco.stream";
5− version = "1.2";
5+ version = "2.0";
66 src = fetchPypi {
77 inherit pname version;
8− sha256 = "06qsjyab56vi0ikr819ghb7f8ymf09n92vla7gcn8j12113m2mib";
8+ sha256 = "c2e9d507d8cf04a3ff916b57eaf46bacb8a9f8895b55ead853de9c47b8f5daa4";
99 };
1010 doCheck = false;
1111 buildInputs = [ setuptools_scm ];
pkgs/development/python-modules/jaraco_text/default.nix+2−2
@@ -3,10 +3,10 @@
33
44buildPythonPackage rec {
55 pname = "jaraco.text";
6− version = "1.10.1";
6+ version = "2.0";
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "07ccc0zc28sb1kyfyviw3n8f581qynrshqvqg1xsp4gkf1m2ibhh";
9+ sha256 = "3660678d395073626e72a455b24bacf07c064138a4cc6c1dae63e616f22478aa";
1010 };
1111 doCheck = false;
1212 buildInputs =[ setuptools_scm ];
pkgs/development/python-modules/jdatetime/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "jdatetime";
5− version = "3.0.2";
5+ version = "3.2.0";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "21824ab1e29e9ccbca85e77562a090067882976880603c41af8d9c4cffc1d4fc";
9+ sha256 = "42d0d08c0d36dcf1c4e1ddb1d10338d0dffb94105a02d74b6ea655ee8dd93cc2";
1010 };
1111
1212 propagatedBuildInputs = [ six ];
pkgs/development/python-modules/jenkins-job-builder/default.nix+9−5
@@ -9,24 +9,28 @@
99, six
1010, stevedore
1111, isPy27
12+, fasteners
13+, jinja2
1214}:
1315
1416buildPythonPackage rec {
1517 pname = "jenkins-job-builder";
16− version = "2.6.0";
18+ version = "2.9.1";
1719 disabled = !isPy27;
1820
1921 src = fetchPypi {
2022 inherit pname version;
21− sha256 = "1768b278efa8825d2549c03de6ef1d2458e741b9b7984d94db0ef3c22e608938";
23+ sha256 = "fba5f3efe8bd06d559f06a5d3bd68da5a7395541fcd370053a8174d08519e3d0";
2224 };
2325
24− patchPhase = ''
26+ postPatch = ''
2527 export HOME=$TMPDIR
2628 '';
2729
28− buildInputs = [ pip ];
29− propagatedBuildInputs = [ pbr mock python-jenkins pyyaml six stevedore ];
30+ propagatedBuildInputs = [ pbr mock python-jenkins pyyaml six stevedore fasteners jinja2 ];
31+
32+ # Need to fix test deps
33+ doCheck = false;
3034
3135 meta = with stdenv.lib; {
3236 description = "Jenkins Job Builder is a system for configuring Jenkins jobs using simple YAML files stored in Git";
pkgs/development/python-modules/jsonpickle/default.nix+2−2
@@ -5,11 +5,11 @@
55
66buildPythonPackage rec {
77 pname = "jsonpickle";
8− version = "1.0";
8+ version = "1.1";
99
1010 src = fetchPypi {
1111 inherit pname version;
12− sha256 = "d43ede55b3d9b5524a8e11566ea0b11c9c8109116ef6a509a1b619d2041e7397";
12+ sha256 = "625098cc8e5854b8c23b587aec33bc8e33e0e597636bfaca76152249c78fe5c1";
1313 };
1414
1515 doCheck = false;
pkgs/development/python-modules/jupyter-repo2docker/default.nix+2−2
@@ -16,13 +16,13 @@
1616}:
1717
1818buildPythonPackage rec {
19− version = "0.6.0";
19+ version = "0.7.0";
2020 pname = "jupyter-repo2docker";
2121 disabled = !(pythonAtLeast "3.4");
2222
2323 src = fetchPypi {
2424 inherit pname version;
25− sha256 = "32c6dc6fd2402d6f5a955f8ab59299097bb5f4972c7dcc6fe2a8fe4c96dcab27";
25+ sha256 = "cf93ddf283de8c6b8f4ad983f8bf9b7b2a2c37812e387c245f8ba229d4f180c4";
2626 };
2727
2828 checkInputs = [ pytest pyyaml wheel pytestcov ];
pkgs/development/python-modules/kazoo/default.nix+2−2
@@ -12,11 +12,11 @@
1212
1313buildPythonPackage rec {
1414 pname = "kazoo";
15− version = "2.5.0";
15+ version = "2.6.1";
1616
1717 src = fetchPypi {
1818 inherit pname version;
19− sha256 = "1963l6994vzzy7bjh77y5wnf8lh8zwwibcpcgpfd1rzcppvp9dwd";
19+ sha256 = "4a73c2c62a7163ca1c4aef82aa042d795560497cc81034f212ef13cc037cc783";
2020 };
2121
2222 propagatedBuildInputs = [ six ];
pkgs/development/python-modules/keras-preprocessing/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "Keras_Preprocessing";
5− version = "1.0.8";
5+ version = "1.0.9";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "6e669aa713727f0bc08f756616f64e0dfa75d822226cfc0dcf33297ab05cef7d";
9+ sha256 = "5e3700117981c2db762e512ed6586638124fac5842170701628088a11aeb51ac";
1010 };
1111
1212 propagatedBuildInputs = [
pkgs/development/python-modules/keyring/default.nix+2−2
@@ -4,11 +4,11 @@
44
55buildPythonPackage rec {
66 pname = "keyring";
7− version = "16.0.2";
7+ version = "18.0.0";
88
99 src = fetchPypi {
1010 inherit pname version;
11− sha256 = "95e4f1d0342d0bf5d137d1d2352d59f7abbebb1507bec1ac26831c411ac23150";
11+ sha256 = "12833d2b05d2055e0e25931184af9cd6a738f320a2264853cabbd8a3a0f0b65d";
1212 };
1313
1414 nativeBuildInputs = [ setuptools_scm ];
pkgs/development/python-modules/kombu/default.nix+5−5
@@ -1,19 +1,19 @@
1−{ lib, buildPythonPackage, fetchPypi, pytest, case, pytz, amqp }:
1+{ lib, buildPythonPackage, fetchPypi, pytest, case, pytz, Pyro4, amqp }:
22
33buildPythonPackage rec {
4− pname = "kombu";
5− version = "4.2.2.post1";
4+ pname = "kombu";
5+ version = "4.3.0";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "3c9dca2338c5d893f30c151f5d29bfb81196748ab426d33c362ab51f1e8dbf78";
9+ sha256 = "529df9e0ecc0bad9fc2b376c3ce4796c41b482cf697b78b71aea6ebe7ca353c8";
1010 };
1111
1212 postPatch = ''
1313 substituteInPlace requirements/test.txt --replace "pytest-sugar" ""
1414 '';
1515
16− checkInputs = [ pytest case pytz ];
16+ checkInputs = [ pytest case pytz Pyro4 ];
1717
1818 propagatedBuildInputs = [ amqp ];
1919
pkgs/development/python-modules/ldappool/default.nix+2−2
@@ -3,12 +3,12 @@
33
44buildPythonPackage rec {
55 name = "ldappool-${version}";
6− version = "2.3.1";
6+ version = "2.4.0";
77
88 src = fetchPypi {
99 pname = "ldappool";
1010 inherit version;
11− sha256 = "3ef502e65b396a917dbee9035db5d5a5aae6a94897dac2bc253c8257ca1c31a6";
11+ sha256 = "d9c9ec29be3f3e64164be84fe080a3087108836f307a12ec62f7d18988293df3";
1212 };
1313
1414 nativeBuildInputs = [ pbr ];
pkgs/development/python-modules/ledgerblue/default.nix+2−2
@@ -4,11 +4,11 @@
44
55buildPythonPackage rec {
66 pname = "ledgerblue";
7− version = "0.1.22";
7+ version = "0.1.23";
88
99 src = fetchPypi {
1010 inherit pname version;
11− sha256 = "15206e92220d96512b357a9a740bc91b8b33b42b9164fe3b56c4c3aedf882cdc";
11+ sha256 = "476a1d1f6d9e7f72befff0ea4e631461882c9c1c620b92878503bf46383c8d20";
1212 };
1313
1414 propagatedBuildInputs = [
pkgs/development/python-modules/libagent/default.nix+2−2
@@ -4,11 +4,11 @@
44
55buildPythonPackage rec {
66 pname = "libagent";
7− version = "0.12.1";
7+ version = "0.13.0";
88
99 src = fetchPypi{
1010 inherit pname version;
11− sha256 = "f21515a217125b7c8cbb1f53327d1d4363c1b980a7e246feabf91aed9b1c51e5";
11+ sha256 = "ecd6854ba8f04d04e39cb00ae3a179d6a1d5dc8e0b60ac5208c0a62e10e3106e";
1212 };
1313
1414 propagatedBuildInputs = [ unidecode backports-shutil-which ConfigArgParse
pkgs/development/python-modules/libnacl/default.nix+1−1
@@ -11,7 +11,7 @@ buildPythonPackage rec {
1111 sha256 = "05iamhbsqm8binqhc2zchfqdkajlx2icf8xl5vkd5fbrhw6yylad";
1212 };
1313
14− buildInputs = [ pytest ];
14+ checkInputs = [ pytest ];
1515 propagatedBuildInputs = [ libsodium ];
1616
1717 postPatch =
pkgs/development/python-modules/librosa/default.nix+2−2
@@ -12,11 +12,11 @@
1212
1313buildPythonPackage rec {
1414 pname = "librosa";
15− version = "0.6.2";
15+ version = "0.6.3";
1616
1717 src = fetchPypi {
1818 inherit pname version;
19− sha256 = "2aa868b8aade749b9904eeb7034fcf44115601c367969b6d01f5e1b4b9b6031d";
19+ sha256 = "b332225ac29bfae1ba386deca2b6566271576de3ab17617ad0a71892c799b118";
2020 };
2121
2222 propagatedBuildInputs = [ joblib matplotlib six scikitlearn decorator audioread resampy ];
pkgs/development/python-modules/libsexy/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, buildPythonPackage, libsexy, pkgconfig, libxml2, pygtk, pango, gtk2, glib }:
1+{ stdenv, fetchurl, buildPythonPackage, libsexy, pkgconfig, libxml2, pygtk, pango, gtk2, glib, python }:
22
33buildPythonPackage rec {
44 pname = "libsexy";
@@ -10,14 +10,14 @@ buildPythonPackage rec {
1010 sha256 = "05bgcsxwkp63rlr8wg6znd46cfbhrzc5wh70jabsi654pxxjb39d";
1111 };
1212
13− nativeBuildInputs = [ pkgconfig ];
13+ nativeBuildInputs = [ pkgconfig pygtk ];
1414
1515 propagatedBuildInputs = [
16− pygtk libsexy gtk2 glib pango libxml2
16+ pygtk libsexy glib pango libxml2
1717 ];
1818
1919 postInstall = ''
20− ln -s $out/lib/python*/site-packages/gtk-2.0/* $out/lib/python*/site-packages/
20+ ln -s $out/${python.sitePackages}/gtk-2.0/* $out/${python.sitePackages}
2121 '';
2222
2323 meta = {
pkgs/development/python-modules/limnoria/default.nix+2−2
@@ -6,11 +6,11 @@
66
77buildPythonPackage rec {
88 pname = "limnoria";
9− version = "2018.09.09";
9+ version = "2018.12.19";
1010
1111 src = fetchPypi {
1212 inherit pname version;
13− sha256 = "077v4gsl0fimsqxir1mpzn2kvw01fg6fa0nnf33nlfa0xzdn241y";
13+ sha256 = "6034e324b3a455f042975006a35dd33fa9175115c7302cb53ca9a646f6594bfc";
1414 };
1515
1616 patchPhase = ''
pkgs/development/python-modules/luftdaten/default.nix+2−2
@@ -2,13 +2,13 @@
22
33buildPythonPackage rec {
44 pname = "luftdaten";
5− version = "0.3.4";
5+ version = "0.5.0";
66
77 disabled = !isPy3k;
88
99 src = fetchPypi {
1010 inherit pname version;
11− sha256 = "c298ea749ff4eec6a95e04023f9068d017acb02133f1fdcc38eb98e5ebc69442";
11+ sha256 = "4672f807c0e22bde2606dd887b0358de1da77068d1a1afe6dd8e331d2391b02c";
1212 };
1313
1414 propagatedBuildInputs = [ aiohttp async-timeout ];
pkgs/development/python-modules/lxml/default.nix+2−2
@@ -7,11 +7,11 @@
77
88buildPythonPackage rec {
99 pname = "lxml";
10− version = "4.2.6";
10+ version = "4.3.1";
1111
1212 src = fetchPypi {
1313 inherit pname version;
14− sha256 = "7035d9361f3ceec9ccc1dd3482094d1174580e7e1bf6870b77ea758f7cad15d2";
14+ sha256 = "da5e7e941d6e71c9c9a717c93725cda0708c2474f532e3680ac5e39ec57d224d";
1515 };
1616
1717 nativeBuildInputs = [ libxml2.dev libxslt.dev ];
pkgs/development/python-modules/manhole/default.nix+2−2
@@ -8,11 +8,11 @@
88
99buildPythonPackage rec {
1010 pname = "manhole";
11− version = "1.5.0";
11+ version = "1.6.0";
1212
1313 src = fetchPypi {
1414 inherit pname version;
15− sha256 = "11ivy8qiv87jl2lc1ldhv9dc4jwf3hz7wysdfiagdcd9kkd48v8m";
15+ sha256 = "d4ab98198481ed54a5b95c0439f41131f56d7d3755eedaedce5a45ca7ff4aa42";
1616 };
1717
1818 # test_help expects architecture-dependent Linux signal numbers.
pkgs/development/python-modules/markupsafe/default.nix+2−2
@@ -5,11 +5,11 @@
55
66buildPythonPackage rec {
77 pname = "MarkupSafe";
8− version = "1.0";
8+ version = "1.1.0";
99
1010 src = fetchPypi {
1111 inherit pname version;
12− sha256 = "0rdn1s8x9ni7ss8rfiacj7x1085lx8mh2zdwqslnw8xc3l4nkgm6";
12+ sha256 = "4e97332c9ce444b0c2c38dd22ddc61c743eb208d916e4265a2a3b575bdccb1d3";
1313 };
1414
1515 meta = with stdenv.lib; {
pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix+2−2
@@ -4,7 +4,7 @@
44
55buildPythonPackage rec {
66 pname = "marshmallow-sqlalchemy";
7− version = "0.15.0";
7+ version = "0.16.0";
88
99 meta = {
1010 homepage = "https://github.com/marshmallow-code/marshmallow-sqlalchemy";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
1414
1515 src = fetchPypi {
1616 inherit pname version;
17− sha256 = "1phqbbrq1xjvc7cwasy5zws4bdb050qikfp1qg8f1hqhmipkpiaz";
17+ sha256 = "c99d51bb4dfca7e1b35ae12ed96746c0df0464b7eb95bba6835a1231e6ea286c";
1818 };
1919
2020 propagatedBuildInputs = [ marshmallow sqlalchemy ];
pkgs/development/python-modules/marshmallow/default.nix+2−2
@@ -4,7 +4,7 @@
44
55buildPythonPackage rec {
66 pname = "marshmallow";
7− version = "2.16.3";
7+ version = "2.18.1";
88
99 meta = {
1010 homepage = "https://github.com/marshmallow-code/marshmallow";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
1717
1818 src = fetchPypi {
1919 inherit pname version;
20− sha256 = "e1b79eb3b815b49918c64114dda691b8767b48a1f66dd1d8c0cd5842b74257c2";
20+ sha256 = "6eeaf1301a5f5942bfe8ab2c2eaf03feb793072b56d5fae563638bddd7bb62e6";
2121 };
2222
2323 propagatedBuildInputs = [ dateutil simplejson ];
pkgs/development/python-modules/matplotlib/2.nix+3−1
@@ -34,13 +34,15 @@ buildPythonPackage rec {
3434
3535 XDG_RUNTIME_DIR = "/tmp";
3636
37+ nativeBuildInputs = [ pkgconfig ];
38+
3739 buildInputs = [ python which sphinx stdenv ]
3840 ++ stdenv.lib.optional enableGhostscript ghostscript
3941 ++ stdenv.lib.optional stdenv.isDarwin [ Cocoa ];
4042
4143 propagatedBuildInputs =
4244 [ cycler dateutil nose numpy pyparsing tornado freetype kiwisolver
43− libpng pkgconfig mock pytz ]
45+ libpng mock pytz ]
4446 ++ stdenv.lib.optional (pythonOlder "3.3") backports_functools_lru_cache
4547 ++ stdenv.lib.optional enableGtk2 pygtk
4648 ++ stdenv.lib.optionals enableGtk3 [ cairo pycairo gtk3 gobject-introspection pygobject3 ]
pkgs/development/python-modules/mautrix-appservice/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "mautrix-appservice";
5− version = "0.3.7";
5+ version = "0.3.8";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "1615220f5bb75e2093ad1e30f4c2e1243499b0b20caef014fd73faadd3bfea6c";
9+ sha256 = "b5752c6d84bf952698aec500b16542f6d2aacea37efd5be59087b5d9ea38c98f";
1010 };
1111
1212 propagatedBuildInputs = [
pkgs/development/python-modules/mecab-python3/default.nix+2−2
@@ -6,11 +6,11 @@
66
77buildPythonPackage rec {
88 pname = "mecab-python3";
9− version = "0.7";
9+ version = "0.996.1";
1010
1111 src = fetchPypi {
1212 inherit pname version;
13− sha256 = "007dg4f5fby2yl7cc44x6xwvcrf2w2ifmn0rmk56ss33mhs8l6qy";
13+ sha256 = "5aca4d0d196161e41452b89921042c0e61a6b7e7e9373211c0c1c50d1809055d";
1414 };
1515
1616 propagatedBuildInputs = [ mecab ];
pkgs/development/python-modules/micawber/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "micawber";
5− version = "0.3.8";
5+ version = "0.4.0";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "2e128db870cf3a351f5c680b6d1ae7e097a7ff6c70c8ba78c7d3be8e3d3c20bd";
9+ sha256 = "2e19cd5e9ce5b8b57714389e4b709af7dedc4f8f44e9df5566a9d3ccefaac38e";
1010 };
1111
1212 propagatedBuildInputs = [ beautifulsoup4 ];
pkgs/development/python-modules/monty/default.nix+22−14
@@ -1,33 +1,42 @@
1−{ stdenv, buildPythonPackage, fetchFromGitHub, nose, numpy, six, ruamel_yaml, msgpack-python, coverage, coveralls, pymongo, lsof }:
1+{ lib
2+, buildPythonPackage
3+, fetchFromGitHub
4+, nose
5+, numpy
6+, six
7+, ruamel_yaml
8+, msgpack-python
9+, coverage
10+, coveralls
11+, pymongo
12+, lsof
13+}:
214
315buildPythonPackage rec {
416 pname = "monty";
5− version = "1.0.2";
17+ version = "1.0.4";
618
719 # No tests in Pypi
820 src = fetchFromGitHub {
921 owner = "materialsvirtuallab";
1022 repo = pname;
1123 rev = "v${version}";
12− sha256 = "0ss70fanavqdpj56yymj06lacgnknb4ap39m2q28v9lz32cs6xdg";
24+ sha256 = "0vqaaz0dw0ypl6sfwbycpb0qs3ap04c4ghbggklxih66spdlggh6";
1325 };
1426
15− propagatedBuildInputs = [ nose numpy six ruamel_yaml msgpack-python coverage coveralls pymongo lsof ];
16−
27+ checkInputs = [ lsof nose numpy msgpack-python coverage coveralls pymongo];
28+ propagatedBuildInputs = [ six ruamel_yaml ];
29+
1730 preCheck = ''
1831 substituteInPlace tests/test_os.py \
19− --replace 'def test_which(self):' '#' \
20− --replace 'py = which("python")' '#' \
21− --replace 'self.assertEqual(os.path.basename(py), "python")' '#' \
22− --replace 'self.assertEqual("/usr/bin/find", which("/usr/bin/find"))' '#' \
23− --replace 'self.assertIs(which("non_existent_exe"), None)' '#' \
32+ --replace 'self.assertEqual("/usr/bin/find", which("/usr/bin/find"))' '#'
2433 '';
2534
26− meta = with stdenv.lib; {
35+ meta = with lib; {
2736 description = "Serves as a complement to the Python standard library by providing a suite of tools to solve many common problems";
2837 longDescription = "
29− Monty implements supplementary useful functions for Python that are not part of the
30− standard library. Examples include useful utilities like transparent support for zipped files, useful design
38+ Monty implements supplementary useful functions for Python that are not part of the
39+ standard library. Examples include useful utilities like transparent support for zipped files, useful design
3140 patterns such as singleton and cached_class, and many more.
3241 ";
3342 homepage = https://github.com/materialsvirtuallab/monty;
@@ -35,4 +44,3 @@ buildPythonPackage rec {
3544 maintainers = with maintainers; [ psyanticy ];
3645 };
3746}
38−
pkgs/development/python-modules/more-itertools/2.7.nixnew file+31
@@ -0,0 +1,31 @@
1+{ lib
2+, buildPythonPackage
3+, fetchPypi
4+, nose
5+, six
6+, stdenv
7+}:
8+
9+
10+buildPythonPackage rec {
11+ pname = "more-itertools";
12+ version = "5.0.0";
13+
14+ src = fetchPypi {
15+ inherit pname version;
16+ sha256 = "38a936c0a6d98a38bcc2d03fdaaedaba9f412879461dd2ceff8d37564d6522e4";
17+ };
18+
19+ checkInputs = [ nose ];
20+ propagatedBuildInputs = [ six ];
21+
22+ # iterable = range(10 ** 10) # Is efficiently reversible
23+ # OverflowError: Python int too large to convert to C long
24+ doCheck = !stdenv.hostPlatform.is32bit;
25+
26+ meta = {
27+ homepage = https://more-itertools.readthedocs.org;
28+ description = "Expansion of the itertools module";
29+ license = lib.licenses.mit;
30+ };
31+}
pkgs/development/python-modules/more-itertools/default.nix+2−2
@@ -9,11 +9,11 @@
99
1010buildPythonPackage rec {
1111 pname = "more-itertools";
12− version = "4.3.0";
12+ version = "6.0.0";
1313
1414 src = fetchPypi {
1515 inherit pname version;
16− sha256 = "c476b5d3a34e12d40130bc2f935028b5f636df8f372dc2c1c01dc19681b2039e";
16+ sha256 = "590044e3942351a1bdb1de960b739ff4ce277960f2425ad4509446dbace8d9d1";
1717 };
1818
1919 checkInputs = [ nose ];
pkgs/development/python-modules/moviepy/default.nix+2−2
@@ -10,11 +10,11 @@
1010
1111buildPythonPackage rec {
1212 pname = "moviepy";
13− version = "0.2.3.5";
13+ version = "1.0.0";
1414
1515 src = fetchPypi {
1616 inherit pname version;
17− sha256 = "1jrdpnzyk373zlh8lvjdabyvljz3sahshbdgbpk6w9vx5hfacvjk";
17+ sha256 = "16c7ffca23d90c76dd7b163f648c8166dfd589b7c180b8ff75aa327ae0a2fc6d";
1818 };
1919
2020 # No tests
pkgs/development/python-modules/mpi4py/default.nix+1−1
@@ -55,7 +55,7 @@ buildPythonPackage rec {
5555
5656 setupPyBuildFlags = ["--mpicc=${mpi}/bin/mpicc"];
5757
58− buildInputs = [ mpi openssh ];
58+ nativeBuildInputs = [ mpi openssh ];
5959
6060 meta = {
6161 description =
pkgs/development/python-modules/mpmath/default.nix+2−2
@@ -5,11 +5,11 @@
55
66buildPythonPackage rec {
77 pname = "mpmath";
8− version = "1.0.0";
8+ version = "1.1.0";
99
1010 src = fetchPypi {
1111 inherit pname version;
12− sha256 = "04d14803b6875fe6d69e6dccea87d5ae5599802e4b1df7997bddd2024001050c";
12+ sha256 = "fc17abe05fbab3382b61a123c398508183406fa132e0223874578e20946499f6";
1313 };
1414
1515 # error: invalid command 'test'
pkgs/development/python-modules/msgpack/default.nix+2−2
@@ -6,11 +6,11 @@
66
77buildPythonPackage rec {
88 pname = "msgpack";
9− version = "0.5.6";
9+ version = "0.6.1";
1010
1111 src = fetchPypi {
1212 inherit pname version;
13− sha256 = "0ee8c8c85aa651be3aa0cd005b5931769eaa658c948ce79428766f1bd46ae2c3";
13+ sha256 = "4008c72f5ef2b7936447dcb83db41d97e9791c83221be13d5e19db0796df1972";
1414 };
1515
1616 checkPhase = ''
pkgs/development/python-modules/mt-940/default.nix+2−2
@@ -1,5 +1,5 @@
11{ buildPythonPackage, stdenv, pyyaml, pytest, enum34
2−, pytestpep8, pytestflakes, fetchFromGitHub, isPy3k, lib, glibcLocales
2+, pytestpep8, pytest-flakes, fetchFromGitHub, isPy3k, lib, glibcLocales
33}:
44
55buildPythonPackage rec {
@@ -23,7 +23,7 @@ buildPythonPackage rec {
2323
2424 LC_ALL="en_US.UTF-8";
2525
26− checkInputs = [ pyyaml pytestpep8 pytestflakes pytest glibcLocales ];
26+ checkInputs = [ pyyaml pytestpep8 pytest-flakes pytest glibcLocales ];
2727
2828 checkPhase = ''
2929 py.test
pkgs/development/python-modules/multiprocess/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "multiprocess";
5− version = "0.70.6.1";
5+ version = "0.70.7";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "1ip5caz67b3q0553mr8gm8xwsb8x500jn8ml0gihgyfy52m2ypcq";
9+ sha256 = "46479a327388df8e77ad268892f2e73eac06d6271189b868ce9d4f95474e58e3";
1010 };
1111
1212 propagatedBuildInputs = [ dill ];
pkgs/development/python-modules/murmurhash/default.nix+6−2
@@ -6,13 +6,17 @@
66
77buildPythonPackage rec {
88 pname = "murmurhash";
9− version = "1.0.1";
9+ version = "1.0.2";
1010
1111 src = fetchPypi {
1212 inherit pname version;
13− sha256 = "02wbyjixvzd6l1mljpm1ci7x835zhk3nqxgy7kvbi4jimvairs9q";
13+ sha256 = "c7a646f6b07b033642b4f52ae2e45efd8b80780b3b90e8092a0cec935fbf81e2";
1414 };
1515
16+ postPatch = ''
17+ substituteInPlace setup.py --replace "'wheel>=0.32.0,<0.33.0'" ""
18+ '';
19+
1620 buildInputs = [
1721 cython
1822 ];
pkgs/development/python-modules/mutagen/default.nix+9−2
@@ -1,6 +1,7 @@
11{ lib
22, buildPythonPackage
33, fetchPypi
4+, fetchpatch
45, hypothesis
56, pycodestyle
67, pyflakes
@@ -10,11 +11,17 @@
1011
1112buildPythonPackage rec {
1213 pname = "mutagen";
13− version = "1.41.1";
14+ version = "1.42.0";
1415
1516 src = fetchPypi {
1617 inherit pname version;
17− sha256 = "2ea9c900a05fa7f5f4c5bd9fc1475d7d576532e13b2f79b694452b997ff67200";
18+ sha256 = "bb61e2456f59a9a4a259fbc08def6d01ba45a42da8eeaa97d00633b0ec5de71c";
19+ };
20+
21+ # fix tests with updated pycodestyle
22+ patches = fetchpatch {
23+ url = https://github.com/quodlibet/mutagen/commit/0ee86ef9d7e06639a388d0638732810b79998608.patch;
24+ sha256 = "1bj3mpbv7krh5m1mvfl0z18s8wdxb1949zcnkcqxp2xl5fzsi288";
1825 };
1926
2027 checkInputs = [
pkgs/development/python-modules/mwclient/default.nix+6−5
@@ -1,10 +1,11 @@
1−{ stdenv, buildPythonPackage, fetchFromGitHub, requests, requests_oauthlib
2−, responses, mock, pytestcov, pytest, pytestcache, pytestpep8, coverage, six }:
1+{ stdenv, buildPythonPackage, fetchFromGitHub
2+, requests, requests_oauthlib, six
3+, pytest, pytestpep8, pytestcache, pytestcov, responses, mock
4+}:
35
46buildPythonPackage rec {
57 version = "0.9.3";
68 pname = "mwclient";
7− name = "${pname}-${version}";
89
910 src = fetchFromGitHub {
1011 owner = "mwclient";
@@ -13,9 +14,9 @@ buildPythonPackage rec {
1314 sha256 = "1kbrmq8zli2j93vmc2887bs7mqr4q1n908nbi1jjcci5v4cd4cqw";
1415 };
1516
16− buildInputs = [ mock responses pytestcov pytest pytestcache pytestpep8 coverage ];
17+ checkInputs = [ pytest pytestpep8 pytestcache pytestcov responses mock ];
1718
18− propagatedBuildInputs = [ six requests requests_oauthlib ];
19+ propagatedBuildInputs = [ requests requests_oauthlib six ];
1920
2021 checkPhase = ''
2122 py.test
pkgs/development/python-modules/mypy-protobuf/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonApplication rec {
44 pname = "mypy-protobuf";
5− version = "1.7";
5+ version = "1.9";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "00b030f9558454ec237576def2de9b7e50517ae039e03d84482b6ddf1bd1d54d";
9+ sha256 = "be1f14b0b841b49adb2f6018eaa1ce9529c8147eb561909baaa757e8cf9e821b";
1010 };
1111
1212 propagatedBuildInputs = [ protobuf ];
pkgs/development/python-modules/mypy/default.nix+2−2
@@ -3,14 +3,14 @@
33
44buildPythonPackage rec {
55 pname = "mypy";
6− version = "0.650";
6+ version = "0.670";
77
88 # Tests not included in pip package.
99 doCheck = false;
1010
1111 src = fetchPypi {
1212 inherit pname version;
13− sha256 = "1ypa7zl14rjd2pnk5zll6yhfz6jfrrdib3dgq3f1f6586pwbbm9q";
13+ sha256 = "e80fd6af34614a0e898a57f14296d0dacb584648f0339c2e000ddbf0f4cc2f8d";
1414 };
1515
1616 disabled = !isPy3k;
pkgs/development/python-modules/mysql_python/default.nix+3−2
@@ -17,8 +17,9 @@ buildPythonPackage rec {
1717 sha256 = "0x0c2jg0bb3pp84njaqiic050qkyd7ymwhfvhipnimg58yv40441";
1818 };
1919
20− buildInputs = [ nose ];
21− propagatedBuildInputs = [ pkgs.mysql.connector-c ];
20+ checkInputs = [ nose ];
21+ nativeBuildInputs = [ pkgs.mysql.connector-c ];
22+ buildInputs = [ pkgs.mysql.connector-c ];
2223
2324 # plenty of failing tests
2425 doCheck = false;
pkgs/development/python-modules/mysqlclient/default.nix+2−2
@@ -2,7 +2,7 @@
22
33buildPythonPackage rec {
44 pname = "mysqlclient";
5− version = "1.4.1";
5+ version = "1.4.2.post1";
66
77 buildInputs = [
88 mysql.connector-c
@@ -13,7 +13,7 @@ buildPythonPackage rec {
1313
1414 src = fetchPypi {
1515 inherit pname version;
16− sha256 = "003ylvq50swf9kxrljj66jv1vffg7s617l2dz4pjvki61r0j08m6";
16+ sha256 = "f257d250f2675d0ef99bd318906f3cfc05cef4a2f385ea695ff32a3f04b9f9a7";
1717 };
1818
1919 meta = with stdenv.lib; {
pkgs/development/python-modules/natsort/default.nix+2−2
@@ -12,7 +12,7 @@
1212
1313buildPythonPackage rec {
1414 pname = "natsort";
15− version = "5.5.0";
15+ version = "6.0.0";
1616
1717 checkInputs = [
1818 pytest
@@ -26,7 +26,7 @@ buildPythonPackage rec {
2626
2727 src = fetchPypi {
2828 inherit pname version;
29− sha256 = "e29031f37aa264145d6ad9acdab335479ce3636806fc7aa70b7675a2b2198d09";
29+ sha256 = "ff3effb5618232866de8d26e5af4081a4daa9bb0dfed49ac65170e28e45f2776";
3030 };
3131
3232 # testing based on project's tox.ini
pkgs/development/python-modules/nest-asyncio/default.nix+2−2
@@ -5,13 +5,13 @@
55}:
66
77buildPythonPackage rec {
8− version = "0.9.10";
8+ version = "1.0.0";
99 pname = "nest_asyncio";
1010 disabled = !(pythonAtLeast "3.5");
1111
1212 src = fetchPypi {
1313 inherit pname version;
14− sha256 = "d952e21f4333166d79423db2eda6d772be7b30134381ee055d5177be0db68a57";
14+ sha256 = "bd1cb7df2ea979e57d8ad02493ad85f9afbf1fcea3dfe34239da8c0dda98087e";
1515 };
1616
1717 meta = with stdenv.lib; {
pkgs/development/python-modules/nilearn/default.nix+2−2
@@ -3,12 +3,12 @@
33
44buildPythonPackage rec {
55 pname = "nilearn";
6− version = "0.4.2";
6+ version = "0.5.0";
77 name = pname + "-" + version;
88
99 src = fetchPypi {
1010 inherit pname version;
11− sha256 = "5049363eb6da2e7c35589477dfc79bf69929ca66de2d7ed2e9dc07acf78636f4";
11+ sha256 = "085cd4f7c19a47ed9d951c853223190b9fb0dbddeaeedf8f86dfa9c53d6492ca";
1212 };
1313
1414 # disable some failing tests
pkgs/development/python-modules/nipype/default.nix+2−4
@@ -44,15 +44,13 @@ in
4444
4545buildPythonPackage rec {
4646 pname = "nipype";
47− version = "1.1.7";
47+ version = "1.1.8";
4848
4949 src = fetchPypi {
5050 inherit pname version;
51− sha256 = "0iyi5w2h42bpssqj52ixm2kxp56yxfxdacb6xv5r24yv3hmwd4yn";
51+ sha256 = "d5eec6de7d8e7020106c42b37d17f99de92824440cc79dfa6080f7c2e6d9fecc";
5252 };
5353
54− patches = [ ./move-uneeded-requires.patch ];
55−
5654 postPatch = ''
5755 substituteInPlace nipype/interfaces/base/tests/test_core.py \
5856 --replace "/usr/bin/env bash" "${bash}/bin/bash"
pkgs/development/python-modules/nipype/move-uneeded-requires.patchdeleted−31
@@ -1,31 +0,0 @@
1−diff --git a/nipype/info.py b/nipype/info.py
2−index c6503ac..4379643 100644
3−--- a/nipype/info.py
4−+++ b/nipype/info.py
5−@@ -147,9 +147,6 @@ REQUIRES = [
6− 'neurdflib',
7− 'click>=%s' % CLICK_MIN_VERSION,
8− 'funcsigs',
9−- 'pytest>=%s' % PYTEST_MIN_VERSION,
10−- 'pytest-xdist',
11−- 'mock',
12− 'pydotplus',
13− 'pydot>=%s' % PYDOT_MIN_VERSION,
14− 'packaging',
15−@@ -159,7 +156,15 @@ REQUIRES = [
16− if sys.version_info <= (3, 4):
17− REQUIRES.append('configparser')
18−
19−-TESTS_REQUIRES = ['pytest-cov', 'codecov', 'pytest-env', 'coverage<5']
20−+TESTS_REQUIRES = [
21−+ 'pytest>=%s' % PYTEST_MIN_VERSION,
22−+ 'pytest-xdist',
23−+ 'mock',
24−+ 'pytest-cov',
25−+ 'codecov',
26−+ 'pytest-env',
27−+ 'coverage<5'
28−+]
29−
30− EXTRA_REQUIRES = {
31− 'doc': ['Sphinx>=1.4', 'numpydoc', 'matplotlib', 'pydotplus', 'pydot>=1.2.3'],
pkgs/development/python-modules/nose-randomly/default.nix+2−2
@@ -7,11 +7,11 @@
77
88buildPythonPackage rec {
99 pname = "nose-randomly";
10− version = "1.2.5";
10+ version = "1.2.6";
1111
1212 src = fetchPypi {
1313 inherit pname version;
14− sha256 = "361f4c2fbb090ec2bc8e5e4151e21409a09ac13f364e3448247cc01f326d89b3";
14+ sha256 = "7e483a3d79e13ae760d6ade57ae07ae45bb4b223b61a805e958b4c077116c67c";
1515 };
1616
1717 checkInputs = [ numpy nose ];
pkgs/development/python-modules/numpy/default.nix+2−2
@@ -16,12 +16,12 @@ let
1616 };
1717in buildPythonPackage rec {
1818 pname = "numpy";
19− version = "1.16.0";
19+ version = "1.16.1";
2020
2121 src = fetchPypi {
2222 inherit pname version;
2323 extension = "zip";
24− sha256 = "cb189bd98b2e7ac02df389b6212846ab20661f4bafe16b5a70a6f1728c1cc7cb";
24+ sha256 = "31d3fe5b673e99d33d70cfee2ea8fe8dccd60f265c3ed990873a88647e3dd288";
2525 };
2626
2727 disabled = isPyPy;
pkgs/development/python-modules/oauthlib/default.nix+12−10
@@ -1,31 +1,33 @@
11{ stdenv
22, buildPythonPackage
3−, fetchurl
3+, fetchPypi
44, mock
5−, nose
6−, unittest2
5+, pytest
76, cryptography
87, blinker
98, pyjwt
109}:
1110
1211buildPythonPackage rec {
13− version = "2.0.0";
12+ version = "3.0.1";
1413 pname = "oauthlib";
1514
16− src = fetchurl {
17− url = "https://github.com/idan/oauthlib/archive/v${version}.tar.gz";
18− sha256 = "02b645a8rqh4xfs1cmj8sss8wqppiadd1ndq3av1cdjz2frfqcjf";
15+ src = fetchPypi {
16+ inherit pname version;
17+ sha256 = "0ce32c5d989a1827e3f1148f98b9085ed2370fc939bf524c9c851d8714797298";
1918 };
2019
21− buildInputs = [ mock nose unittest2 ];
20+ checkInputs = [ mock pytest ];
2221 propagatedBuildInputs = [ cryptography blinker pyjwt ];
2322
23+ checkPhase = ''
24+ py.test tests/
25+ '';
26+
2427 meta = with stdenv.lib; {
2528 homepage = https://github.com/idan/oauthlib;
26− downloadPage = https://github.com/idan/oauthlib/releases;
2729 description = "A generic, spec-compliant, thorough implementation of the OAuth request-signing logic";
2830 maintainers = with maintainers; [ prikhi ];
31+ license = licenses.bsd3;
2932 };
30−
3133}
pkgs/development/python-modules/odfpy/default.nix+2−2
@@ -7,11 +7,11 @@
77
88buildPythonPackage rec {
99 pname = "odfpy";
10− version = "1.3.6";
10+ version = "1.4.0";
1111
1212 src = fetchPypi {
1313 inherit pname version;
14− sha256 = "6bcaf3b23aa9e49ed8c8c177266539b211add4e02402748a994451482a10cb1b";
14+ sha256 = "596021f0519623ca8717331951c95e3b8d7b21e86edc7efe8cb650a0d0f59a2b";
1515 };
1616
1717 # Python 2.7 uses a different ordering for xml namespaces.
pkgs/development/python-modules/openpyxl/default.nix+2−2
@@ -9,11 +9,11 @@
99
1010buildPythonPackage rec {
1111 pname = "openpyxl";
12− version = "2.5.12";
12+ version = "2.6.0";
1313
1414 src = fetchPypi {
1515 inherit pname version;
16− sha256 = "7bcf019a0be528673a8aec1e60b5c863342c3231962dbf7922fd4da42a49a91a";
16+ sha256 = "70da6b45a5925285b6a3d93570b45f4402eb2d335740163a58eef533b139565c";
1717 };
1818
1919 checkInputs = [ pytest ];
pkgs/development/python-modules/ovh/default.nix+2−2
@@ -5,14 +5,14 @@
55
66buildPythonPackage rec {
77 pname = "ovh";
8− version = "0.4.8";
8+ version = "0.5.0";
99
1010 # Needs yanc
1111 doCheck = false;
1212
1313 src = fetchPypi {
1414 inherit pname version;
15− sha256 = "79fa4bdc61b9953af867676a9558d9e792b9fde568c980efe848a40565a217cd";
15+ sha256 = "f74d190c4bff0953d76124cb8ed319a8a999138720e42957f0db481ef4746ae8";
1616 };
1717
1818 meta = {
pkgs/development/python-modules/packaging/default.nix+2−2
@@ -3,11 +3,11 @@
33
44buildPythonPackage rec {
55 pname = "packaging";
6− version = "18.0";
6+ version = "19.0";
77
88 src = fetchPypi {
99 inherit pname version;
10− sha256 = "0886227f54515e592aaa2e5a553332c73962917f2831f1b0f9b9f4380a4b9807";
10+ sha256 = "0c98a5d0be38ed775798ece1b9727178c4469d9c3b4ada66e8e6b7849f8732af";
1111 };
1212
1313 propagatedBuildInputs = [ pyparsing six ];
pkgs/development/python-modules/pamela/default.nix+2−2
@@ -6,11 +6,11 @@
66
77buildPythonPackage rec {
88 pname = "pamela";
9− version = "0.3.0";
9+ version = "1.0.0";
1010
1111 src = fetchPypi {
1212 inherit pname version;
13− sha256 = "0ssxbqsshrm8p642g3h6wsq20z1fsqhpdvqdm827gn6dlr38868y";
13+ sha256 = "65c9389bef7d1bb0b168813b6be21964df32016923aac7515bdf05366acbab6c";
1414 };
1515
1616 postUnpack = ''
pkgs/development/python-modules/pamqp/default.nix+2−2
@@ -9,12 +9,12 @@
99}:
1010
1111buildPythonPackage rec {
12− version = "2.0.0";
12+ version = "2.1.0";
1313 pname = "pamqp";
1414
1515 src = fetchPypi {
1616 inherit pname version;
17− sha256 = "701b0c41b68eb86bad6f111658917992780d56a3f094a6cad87ef217afa8296d";
17+ sha256 = "e1fa1107a195993fca6e04f1eb7286b60e223c958944d7808a501258ccc0ef8c";
1818 };
1919
2020 buildInputs = [ mock nose pep8 pylint mccabe ];
pkgs/development/python-modules/paperspace/default.nix+2−2
@@ -4,11 +4,11 @@
44
55buildPythonPackage rec {
66 pname = "paperspace";
7− version = "0.0.13";
7+ version = "0.0.15";
88
99 src = fetchPypi {
1010 inherit pname version;
11− sha256 = "824ec2aeccc6ddaba82a28b4ab74b1c81fb94206fd89c2b083eae3a61e63c2bf";
11+ sha256 = "af96dae7a1d84df8781aded392764953c9cbeb43d5cc314e405d3470f7c8006c";
1212 };
1313
1414 propagatedBuildInputs = [ boto3 requests ];
pkgs/development/python-modules/parameterized/default.nix+4−5
@@ -1,19 +1,18 @@
1−{ stdenv, fetchPypi, buildPythonPackage, nose, six, glibcLocales, isPy3k }:
1+{ stdenv, fetchPypi, buildPythonPackage, nose, mock, glibcLocales, isPy3k }:
22
33buildPythonPackage rec {
44 pname = "parameterized";
5− version = "0.6.1";
5+ version = "0.7.0";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "1qj1939shm48d9ql6fm1nrdy4p7sdyj8clz1szh5swwpf1qqxxfa";
9+ sha256 = "d8c8837fb677ed2d5a93b9e2308ce0da3aeb58cf513120d501e0b7af14da78d5";
1010 };
1111
1212 # Tests require some python3-isms but code works without.
1313 doCheck = isPy3k;
1414
15− checkInputs = [ nose glibcLocales ];
16− propagatedBuildInputs = [ six ];
15+ checkInputs = [ nose mock glibcLocales ];
1716
1817 checkPhase = ''
1918 LC_ALL="en_US.UTF-8" nosetests -v
pkgs/development/python-modules/parse/default.nix+2−2
@@ -3,11 +3,11 @@
33}:
44buildPythonPackage rec {
55 pname = "parse";
6− version = "1.9.0";
6+ version = "1.11.1";
77
88 src = fetchPypi {
99 inherit pname version;
10− sha256 = "9dd6048ea212cd032a342f9f6aa2b7bc222f7407c7e37bdc2777fecd36897437";
10+ sha256 = "870dd675c1ee8951db3e29b81ebe44fd131e3eb8c03a79483a58ea574f3145c2";
1111 };
1212
1313 checkPhase = ''
pkgs/development/python-modules/parso/default.nix+2−2
@@ -6,11 +6,11 @@
66
77buildPythonPackage rec {
88 pname = "parso";
9− version = "0.3.1";
9+ version = "0.3.4";
1010
1111 src = fetchPypi {
1212 inherit pname version;
13− sha256 = "35704a43a3c113cce4de228ddb39aab374b8004f4f2407d070b6a2ca784ce8a2";
13+ sha256 = "68406ebd7eafe17f8e40e15a84b56848eccbf27d7c1feb89e93d8fca395706db";
1414 };
1515
1616 checkInputs = [ pytest ];
pkgs/development/python-modules/partd/default.nix+1−1
@@ -24,7 +24,7 @@ buildPythonPackage rec {
2424
2525 checkPhase = ''
2626 rm partd/tests/test_zmq.py # requires network & fails
27− py.test
27+ py.test -k "not test_serialize"
2828 '';
2929
3030 meta = {
pkgs/development/python-modules/pastedeploy/default.nix+11−4
@@ -1,19 +1,26 @@
11{ stdenv
22, buildPythonPackage
33, fetchPypi
4−, nose
4+, pytestrunner
5+, pytest
56}:
67
78buildPythonPackage rec {
8− version = "1.5.2";
9+ version = "2.0.1";
910 pname = "PasteDeploy";
1011
1112 src = fetchPypi {
1213 inherit pname version;
13− sha256 = "d5858f89a255e6294e63ed46b73613c56e3b9a2d82a42f1df4d06c8421a9e3cb";
14+ sha256 = "d423fb9d51fdcf853aa4ff43ac7ec469b643ea19590f67488122d6d0d772350a";
1415 };
1516
16− buildInputs = [ nose ];
17+ buildInputs = [ pytestrunner ];
18+
19+ checkInputs = [ pytest ];
20+
21+ # no tests in PyPI tarball
22+ # should be included with versions > 2.0.1
23+ doCheck = false;
1724
1825 meta = with stdenv.lib; {
1926 description = "Load, configure, and compose WSGI applications and servers";
pkgs/development/python-modules/pastescript/default.nix+2−2
@@ -9,12 +9,12 @@
99}:
1010
1111buildPythonPackage rec {
12− version = "2.0.2";
12+ version = "3.0.0";
1313 pname = "PasteScript";
1414
1515 src = fetchPypi {
1616 inherit pname version;
17− sha256 = "c03f249805538cc2328741ae8d262a9200ae1c993119b3d9bac4cd422cb476c0";
17+ sha256 = "d9d4d98df8606ad3bfa77be4722207d1a53a0fbcc714ee75d0fcd8a5c3f775c3";
1818 };
1919
2020 buildInputs = [ nose ];
pkgs/development/python-modules/pathos/default.nix+2−2
@@ -9,11 +9,11 @@
99
1010buildPythonPackage rec {
1111 pname = "pathos";
12− version = "0.2.2.1";
12+ version = "0.2.3";
1313
1414 src = fetchPypi {
1515 inherit pname version;
16− sha256 = "69486cfe8c9fbd028395df445e4205ea3001d7ca5608d8d0b67b67ce98bb8892";
16+ sha256 = "954c5b0a8b257c375e35d311c65fa62a210a3d65269195557de38418ac9f61f9";
1717 };
1818
1919 propagatedBuildInputs = [ dill pox ppft multiprocess ];
pkgs/development/python-modules/pbr/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "pbr";
5− version = "5.1.1";
5+ version = "5.1.2";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "f59d71442f9ece3dffc17bc36575768e1ee9967756e6b6535f0ee1f0054c3d68";
9+ sha256 = "d717573351cfe09f49df61906cd272abaa759b3e91744396b804965ff7bff38b";
1010 };
1111
1212 # circular dependencies with fixtures
pkgs/development/python-modules/pdf2image/default.nix+2−2
@@ -2,13 +2,13 @@
22
33buildPythonPackage rec {
44 pname = "pdf2image";
5− version = "1.3.1";
5+ version = "1.4.1";
66
77 propagatedBuildInputs = [ pillow poppler_utils ];
88
99 src = fetchPypi {
1010 inherit pname version;
11− sha256 = "0igkzl12582iq6bh6dycw9bcz2459rs6gybq9mranj54yfgjl2ky";
11+ sha256 = "c417149cb5ca52021203943e0eeb95db53580afebe728086e69671add4daeb08";
1212 };
1313
1414 meta = with stdenv.lib; {
pkgs/development/python-modules/pex/default.nix+2−2
@@ -5,11 +5,11 @@
55
66buildPythonPackage rec {
77 pname = "pex";
8− version = "1.5.3";
8+ version = "1.6.2";
99
1010 src = fetchPypi {
1111 inherit pname version;
12− sha256 = "a0244c9e25172598fca73cb61e2a2f133503565c95d99210c3d5c0e85950c4bd";
12+ sha256 = "724588ce982222a3020ad3de50e0912915815175771b35e59fe06fdf1db35415";
1313 };
1414
1515 prePatch = ''
pkgs/development/python-modules/pg8000/default.nix+2−2
@@ -7,11 +7,11 @@
77
88buildPythonPackage rec {
99 pname = "pg8000";
10− version = "1.12.4";
10+ version = "1.13.1";
1111
1212 src = fetchPypi {
1313 inherit pname version;
14− sha256 = "903a19158e9efda326908bb4b70a71d31f640b4326576774433ab11fd4e46f39";
14+ sha256 = "2208c7aaffe8d61f5c4ccbefeb74ba033003899e64aee37c0eb98aadae8b9c6b";
1515 };
1616
1717 propagatedBuildInputs = [ pytz six ];
pkgs/development/python-modules/pgspecial/default.nix+1−1
@@ -9,7 +9,7 @@ buildPythonPackage rec {
99 sha256 = "0yvlxv9vy0hbfgf0xcwl7wh5hg6cl86arsv1ip3kvn9znn6x8kgl";
1010 };
1111
12− buildInputs = [ pytest psycopg2 ];
12+ checkInputs = [ pytest psycopg2 ];
1313 propagatedBuildInputs = [ click sqlparse ];
1414
1515 checkPhase = ''
pkgs/development/python-modules/phonenumbers/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "phonenumbers";
5− version = "8.10.3";
5+ version = "8.10.6";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "0d870906c6019b41bd4b3720f804aec85a21fd78a7676ac260dcbf218b4e7097";
9+ sha256 = "2fe47dbf947cc74643ef1a49411466483d1165ced2b62578a14b513dd09642a9";
1010 };
1111
1212 meta = {
pkgs/development/python-modules/phonopy/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "phonopy";
5− version = "1.13.2.107";
5+ version = "2.0.0";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "72f06728c98b9a7ab3db2d6fa2ae5d029029fbcff4e8fcfbc29f1e2620a0f905";
9+ sha256 = "46baf7c4571fe75374071674727c2beb0388cf57073e0623d8457f04b1c54495";
1010 };
1111
1212 propagatedBuildInputs = [ numpy pyyaml matplotlib h5py ];
pkgs/development/python-modules/pid/default.nix+2−2
@@ -6,11 +6,11 @@
66
77buildPythonPackage rec {
88 pname = "pid";
9− version = "2.2.1";
9+ version = "2.2.3";
1010
1111 src = fetchPypi {
1212 inherit pname version;
13− sha256 = "636cb4743a6e6fb1d89efcfd772e6deb5a058590f3531703595d776507098d7b";
13+ sha256 = "077da788630394adce075c88f4a087bcdb27d98cab67eb9046ebcfeedfc1194d";
1414 };
1515
1616 buildInputs = [ nose ];
pkgs/development/python-modules/pillow/default.nix+2−2
@@ -6,11 +6,11 @@
66}:
77buildPythonPackage rec {
88 pname = "Pillow";
9− version = "5.3.0";
9+ version = "5.4.1";
1010
1111 src = fetchPypi {
1212 inherit pname version;
13− sha256 = "2ea3517cd5779843de8a759c2349a3cd8d3893e03ab47053b66d5ec6f8bc4f93";
13+ sha256 = "5233664eadfa342c639b9b9977190d64ad7aca4edc51a966394d7e08e7f38a9f";
1414 };
1515
1616 doCheck = !stdenv.isDarwin && !isPyPy;
pkgs/development/python-modules/pint/default.nix+11−5
@@ -1,21 +1,27 @@
1−{ stdenv
1+{ lib
22, buildPythonPackage
33, fetchPypi
4+, isPy27
5+, funcsigs
46}:
57
68buildPythonPackage rec {
79 pname = "pint";
8− version = "0.8.1";
10+ version = "0.9";
911
1012 src = fetchPypi {
11− inherit pname version;
12− sha256 = "afcf31443a478c32bbac4b00337ee9026a13d0e2ac83d30c79151462513bb0d4";
13+ inherit version;
14+ pname = "Pint";
15+ sha256 = "32d8a9a9d63f4f81194c0014b3b742679dce81a26d45127d9810a68a561fe4e2";
1316 };
1417
15− meta = with stdenv.lib; {
18+ propagatedBuildInputs = lib.optional isPy27 funcsigs;
19+
20+ meta = with lib; {
1621 description = "Physical quantities module";
1722 license = licenses.bsd3;
1823 homepage = "https://github.com/hgrecco/pint/";
24+ maintainers = [ maintainers.costrouc ];
1925 };
2026
2127}
pkgs/development/python-modules/pip-tools/default.nix+2−2
@@ -3,12 +3,12 @@
33
44buildPythonPackage rec {
55 pname = "pip-tools";
6− version = "3.1.0";
6+ version = "3.3.2";
77 name = pname + "-" + version;
88
99 src = fetchurl {
1010 url = "mirror://pypi/p/pip-tools/${name}.tar.gz";
11− sha256 = "0w1qdkr5n612nb3b890mbdyjb3cxn2mna1c7ysr4d0x4nh1wmkmi";
11+ sha256 = "100496b15463155f4da3df04c2ca0068677e1ee74d346ebade2d85eef4de8cda";
1212 };
1313
1414 LC_ALL = "en_US.UTF-8";
pkgs/development/python-modules/pip/default.nix+2−2
@@ -10,11 +10,11 @@
1010
1111buildPythonPackage rec {
1212 pname = "pip";
13− version = "18.1";
13+ version = "19.0.3";
1414
1515 src = fetchPypi {
1616 inherit pname version;
17− sha256 = "c0a292bd977ef590379a3f05d7b7f65135487b67470f6281289a94e015650ea1";
17+ sha256 = "6e6f197a1abfb45118dbb878b5c859a0edbdd33fd250100bc015b67fded4b9f2";
1818 };
1919
2020 # pip detects that we already have bootstrapped_pip "installed", so we need
pkgs/development/python-modules/pkgconfig/default.nix+2
@@ -4,6 +4,8 @@ buildPythonPackage rec {
44 pname = "pkgconfig";
55 version = "1.4.0";
66
7+ setupHook = pkgconfig.setupHook;
8+
79 src = fetchPypi {
810 inherit pname version;
911 sha256 = "048c3b457da7b6f686b647ab10bf09e2250e4c50acfe6f215398a8b5e6fcdb52";
pkgs/development/python-modules/pkginfo/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "pkginfo";
5− version = "1.4.2";
5+ version = "1.5.0.1";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "5878d542a4b3f237e359926384f1dde4e099c9f5525d236b1840cf704fa8d474";
9+ sha256 = "7424f2c8511c186cd5424bbf31045b77435b37a8d604990b79d4e70d741148bb";
1010 };
1111
1212 doCheck = false; # I don't know why, but with doCheck = true it fails.
pkgs/development/python-modules/plaid-python/default.nix+2−2
@@ -1,12 +1,12 @@
11{ lib, buildPythonPackage, fetchPypi, requests, pytest }:
22
33buildPythonPackage rec {
4− version = "2.3.4";
4+ version = "2.4.1";
55 pname = "plaid-python";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "fefa30cbd1114844a07b6a37d95fd6657774ce8a551a2ac79641887cd63c72db";
9+ sha256 = "2b7832f9fe0c6cd23dfdb805bcfc52e2ff06fca6604e5782b7518904c1dad6bb";
1010 };
1111
1212 checkInputs = [ pytest ];
pkgs/development/python-modules/plaster-pastedeploy/default.nix+10−1
@@ -1,4 +1,4 @@
1−{ buildPythonPackage, fetchPypi
1+{ buildPythonPackage, fetchPypi, fetchpatch
22, plaster, PasteDeploy
33, pytest, pytestcov
44}:
@@ -12,6 +12,15 @@ buildPythonPackage rec {
1212 sha256 = "c231130cb86ae414084008fe1d1797db7e61dc5eaafb5e755de21387c27c6fae";
1313 };
1414
15+ patches = [
16+ # Fix tests compatibility with PasteDeploy 2+
17+ # https://github.com/Pylons/plaster_pastedeploy/pull/17
18+ (fetchpatch {
19+ url = https://github.com/Pylons/plaster_pastedeploy/commit/d77d81a57e917c67a20332beca8f418651172905.patch;
20+ sha256 = "0n5vnqn8kad41kn9grcwiic6c6rhvy1ji3w81s2v9xyk0bd9yryf";
21+ })
22+ ];
23+
1524 checkPhase = ''
1625 py.test
1726 '';
pkgs/development/python-modules/plotly/default.nix+2−2
@@ -11,11 +11,11 @@
1111
1212buildPythonPackage rec {
1313 pname = "plotly";
14− version = "3.4.2";
14+ version = "3.6.1";
1515
1616 src = fetchPypi {
1717 inherit pname version;
18− sha256 = "0bv4gq60mrkw0r5kmakxrnfawlim01bjf3khp62p0qmhw0ixk269";
18+ sha256 = "3cfc53346fa5c32432f13b0c20c272f9cf48f9af9c15f8f77745fb602c12bd91";
1919 };
2020
2121 propagatedBuildInputs = [
pkgs/development/python-modules/pluginbase/default.nix+2−2
@@ -1,14 +1,14 @@
11{ stdenv, fetchPypi, buildPythonPackage, pytest, tox }:
22
33buildPythonPackage rec {
4− version = "0.7";
4+ version = "1.0.0";
55 pname = "pluginbase";
66
77 buildInputs = [ pytest tox ];
88
99 src = fetchPypi {
1010 inherit pname version;
11− sha256 = "c0abe3218b86533cca287e7057a37481883c07acef7814b70583406938214cc8";
11+ sha256 = "497894df38d0db71e1a4fbbfaceb10c3ef49a3f95a0582e11b75f8adaa030005";
1212 };
1313
1414 meta = with stdenv.lib; {
pkgs/development/python-modules/plyfile/default.nix+2−2
@@ -3,11 +3,11 @@
33
44buildPythonPackage rec {
55 pname = "plyfile";
6− version = "0.6";
6+ version = "0.7";
77
88 src = fetchPypi {
99 inherit pname version;
10− sha256 = "067e384e3723f28dbbd8e8f976a9712dadf6761b2d62c4c1a90821e3c5310bce";
10+ sha256 = "84ba5ee8c70a4924f64aa7edff5764b929f3b7842d53a3197d0b753818ad7089";
1111 };
1212
1313 propagatedBuildInputs = [ numpy ];
pkgs/development/python-modules/portend/default.nix+6−2
@@ -1,5 +1,5 @@
11{ stdenv, buildPythonPackage, fetchPypi
2−, pytest, setuptools_scm, tempora, pytest-flake8 }:
2+, pytest, setuptools_scm, tempora }:
33
44buildPythonPackage rec {
55 pname = "portend";
@@ -10,11 +10,15 @@ buildPythonPackage rec {
1010 sha256 = "b7ce7d35ea262415297cbfea86226513e77b9ee5f631d3baa11992d663963719";
1111 };
1212
13+ postPatch = ''
14+ substituteInPlace pytest.ini --replace "--flake8" ""
15+ '';
16+
1317 nativeBuildInputs = [ setuptools_scm ];
1418
1519 propagatedBuildInputs = [ tempora ];
1620
17− checkInputs = [ pytest pytest-flake8 ];
21+ checkInputs = [ pytest ];
1822
1923 checkPhase = ''
2024 py.test
pkgs/development/python-modules/pox/default.nix+2−2
@@ -5,11 +5,11 @@
55
66buildPythonPackage rec {
77 pname = "pox";
8− version = "0.2.4";
8+ version = "0.2.5";
99
1010 src = fetchPypi {
1111 inherit pname version;
12− sha256 = "9c8955d9beed4f9fd509587d17820efe6bc9f9b4a1abe581642aeed9a41784ea";
12+ sha256 = "2b53fbdf02596240483dc2cb94f94cc21252ad1b1858c7b1c151afeec9022cc8";
1313 };
1414
1515 meta = with stdenv.lib; {
pkgs/development/python-modules/ppft/default.nix+2−2
@@ -6,11 +6,11 @@
66
77buildPythonPackage rec {
88 pname = "ppft";
9− version = "1.6.4.8";
9+ version = "1.6.4.9";
1010
1111 src = fetchPypi {
1212 inherit pname version;
13− sha256 = "7e1aa0d74f832f0528234890165f3e64d34b3103ec1db7c93c9e7f2ad8cc18d2";
13+ sha256 = "5537b00afb7b247da0f59cc57ee5680178be61c8b2e21b5a0672b70a3d247791";
1414 };
1515
1616 propagatedBuildInputs = [ six ];
pkgs/development/python-modules/praw/default.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv, buildPythonPackage, fetchFromGitHub
22, requests, decorator, flake8, mock, six, update_checker, pytestrunner, prawcore
3−, pytest, betamax, betamax-serializers, betamax-matchers, requests_toolbelt
3+, pytest_3, betamax, betamax-serializers, betamax-matchers, requests_toolbelt
44}:
55
66buildPythonPackage rec {
@@ -31,7 +31,7 @@ buildPythonPackage rec {
3131 ];
3232
3333 checkInputs = [
34− pytest
34+ pytest_3
3535 betamax
3636 betamax-serializers
3737 betamax-matchers
pkgs/development/python-modules/premailer/default.nix+2−2
@@ -4,7 +4,7 @@
44
55buildPythonPackage rec {
66 pname = "premailer";
7− version = "3.2.0";
7+ version = "3.3.0";
88
99 meta = {
1010 description = "Turns CSS blocks into style attributes ";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
1414
1515 src = fetchPypi {
1616 inherit pname version;
17− sha256 = "ca97cec6115fea6590b49558c55d891996f9eb4da6490c7b60c3a8af4c8c0735";
17+ sha256 = "93be4f197e9d2a87a8fe6b5b6a79b64070dbb523108dfaf2a415b4558fc78ec1";
1818 };
1919
2020 buildInputs = [ mock nose ];
pkgs/development/python-modules/process-tests/default.nix+2−2
@@ -5,11 +5,11 @@
55
66buildPythonPackage rec {
77 pname = "process-tests";
8− version = "2.0.1";
8+ version = "2.0.2";
99
1010 src = fetchPypi {
1111 inherit pname version;
12− sha256 = "f43f3540edd333bdc5d8741218e173b1dfdbce5b0a40066d75248911e5340a06";
12+ sha256 = "7ae24a680cc7c44e7687e3723e6e64597a28223ad664989999efe10dd38c2431";
1313 };
1414
1515 # No tests
pkgs/development/python-modules/progressbar2/default.nix+2−2
@@ -7,7 +7,7 @@
77, sphinx
88, flake8
99, pytestpep8
10−, pytestflakes
10+, pytest-flakes
1111, pytestcov
1212, pytestcache
1313, pytestrunner
@@ -31,7 +31,7 @@ buildPythonPackage rec {
3131 propagatedBuildInputs = [ python-utils ];
3232 nativeBuildInputs = [ pytestrunner ];
3333 checkInputs = [
34− pytest sphinx flake8 pytestpep8 pytestflakes pytestcov
34+ pytest sphinx flake8 pytestpep8 pytest-flakes pytestcov
3535 pytestcache freezegun
3636 ];
3737 # ignore tests on the nix wrapped setup.py and don't flake .eggs directory
pkgs/development/python-modules/prometheus_client/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "prometheus_client";
5− version = "0.4.2";
5+ version = "0.5.0";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "046cb4fffe75e55ff0e6dfd18e2ea16e54d86cc330f369bebcc683475c8b68a9";
9+ sha256 = "e8c11ff5ca53de6c3d91e1510500611cafd1d247a937ec6c588a0a7cc3bef93c";
1010 };
1111
1212 doCheck = false;
pkgs/development/python-modules/prompt_toolkit/default.nix+2−2
@@ -8,11 +8,11 @@
88
99buildPythonPackage rec {
1010 pname = "prompt_toolkit";
11− version = "2.0.7";
11+ version = "2.0.9";
1212
1313 src = fetchPypi {
1414 inherit pname version;
15− sha256 = "0fgacqk73w7s932vy46pan2yp8rvjmlkag20xvaydh9mhf6h85zx";
15+ sha256 = "2519ad1d8038fd5fc8e770362237ad0364d16a7650fb5724af6997ed5515e3c1";
1616 };
1717 checkPhase = ''
1818 py.test -k 'not test_pathcompleter_can_expanduser'
pkgs/development/python-modules/protobuf/default.nix+3−2
@@ -13,8 +13,9 @@ buildPythonPackage rec {
1313 optional stdenv.isDarwin "-I${libcxx}/include/c++/v1"
1414 ++ optional (versionOlder protobuf.version "2.7.0") "-std=c++98";
1515
16− propagatedBuildInputs = [ protobuf google_apputils ];
17− buildInputs = [ google_apputils pyext ];
16+ propagatedBuildInputs = [ google_apputils ];
17+ nativeBuildInputs = [ google_apputils pyext protobuf ];
18+ buildInputs = [ protobuf ];
1819
1920 patches = optional isPy37
2021 # Python 3.7 compatibility (remove when protobuf 3.7 is released)
pkgs/development/python-modules/psutil/default.nix+3−11
@@ -1,26 +1,18 @@
11{ stdenv
22, buildPythonPackage
3−, fetchPypi, fetchpatch
3+, fetchPypi
44, darwin
55}:
66
77buildPythonPackage rec {
88 pname = "psutil";
9− version = "5.4.8";
9+ version = "5.5.1";
1010
1111 src = fetchPypi {
1212 inherit pname version;
13− sha256 = "6e265c8f3da00b015d24b842bfeb111f856b13d24f2c57036582568dc650d6c3";
13+ sha256 = "045qaqvn6k90bj5bcy259yrwcd2afgznaav3sfhphy9b8ambzkkj";
1414 };
1515
16− patches = [
17− (fetchpatch {
18− name = "disk_io_counters_fails.patch";
19− url = "https://github.com/giampaolo/psutil/commit/8f99f3782663959062ee868bbfdbc336307a3a4d.diff";
20− sha256 = "0j7wdgq8y20k27wcpmbgc1chd0vmbkxy8j0zwni1s4i7hyk64hmk";
21− })
22− ];
23−
2416 # No tests in archive
2517 doCheck = false;
2618
pkgs/development/python-modules/psycopg2/default.nix+3−3
@@ -2,17 +2,17 @@
22
33buildPythonPackage rec {
44 pname = "psycopg2";
5− version = "2.7.6.1";
5+ version = "2.7.7";
66
77 disabled = isPyPy;
88
99 src = fetchPypi {
1010 inherit pname version;
11− sha256 = "27959abe64ca1fc6d8cd11a71a1f421d8287831a3262bd4cacd43bbf43cc3c82";
11+ sha256 = "f4526d078aedd5187d0508aa5f9a01eae6a48a470ed678406da94b4cd6524b7e";
1212 };
1313
1414 buildInputs = lib.optional stdenv.isDarwin openssl;
15− propagatedBuildInputs = [ postgresql ];
15+ nativeBuildInputs = [ postgresql ];
1616
1717 doCheck = false;
1818
pkgs/development/python-modules/pvlib/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "pvlib";
5− version = "0.6.0";
5+ version = "0.6.1";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "1j2p6w41hv7k604jbcpxvs5f04y8dsfdvd3d202l60ks0fc0agyj";
9+ sha256 = "56e70747add2e50846dd8bbef9a4735e82c1224ce630d1db7590b96bd59dd3f7";
1010 };
1111
1212 checkInputs = [ pytest ];
pkgs/development/python-modules/py_scrypt/default.nix+2−2
@@ -6,11 +6,11 @@
66
77buildPythonPackage rec {
88 pname = "scrypt";
9− version = "0.8.6";
9+ version = "0.8.13";
1010
1111 src = fetchPypi {
1212 inherit pname version;
13− sha256 = "f8239b2d47fa1d40bc27efd231dc7083695d10c1c2ac51a99380360741e0362d";
13+ sha256 = "1377b1adc98c4152694bf5d7e93b41a9d2e9060af69b747cfad8c93ac426f9ea";
1414 };
1515
1616 buildInputs = [ openssl ];
pkgs/development/python-modules/py_stringmatching/default.nix+2−2
@@ -8,11 +8,11 @@
88
99buildPythonPackage rec {
1010 pname = "py_stringmatching";
11− version = "0.4.0";
11+ version = "0.4.1";
1212
1313 src = fetchPypi {
1414 inherit pname version;
15− sha256 = "0rjsx7iipn6svki21lmsza7b0dz9vkgmix696zryiv7gkhblqyb4";
15+ sha256 = "c46db1e855cef596dfbbe1bd48fcabb30736479eff602c2bf88af10f998f1532";
1616 };
1717
1818 checkInputs = [ nose ];
pkgs/development/python-modules/pyaml/default.nix+2−2
@@ -7,11 +7,11 @@
77
88buildPythonPackage rec {
99 pname = "pyaml";
10− version = "17.12.1";
10+ version = "18.11.0";
1111
1212 src = fetchPypi {
1313 inherit pname version;
14− sha256 = "66623c52f34d83a2c0fc963e08e8b9d0c13d88404e3b43b1852ef71eda19afa3";
14+ sha256 = "b96292cc409e0f222b6fecff96afd2e19cfab5d1f2606344907751d42301263a";
1515 };
1616
1717 propagatedBuildInputs = [ pyyaml ];
pkgs/development/python-modules/pyasn1-modules/default.nix+2−2
@@ -2,12 +2,12 @@
22
33buildPythonPackage rec {
44 pname = "pyasn1-modules";
5− version = "0.2.3";
5+ version = "0.2.4";
66 disabled = isPyPy;
77
88 src = fetchPypi {
99 inherit pname version;
10− sha256 = "d14fcb29dabecba3d7b360bf72327c26c385248a5d603cf6be5f566ce999b261";
10+ sha256 = "a52090e8c5841ebbf08ae455146792d9ef3e8445b21055d3a3b7ed9c712b7c7c";
1111 };
1212
1313 propagatedBuildInputs = [ pyasn1 ];
pkgs/development/python-modules/pybase64/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "pybase64";
5− version = "0.4.0";
5+ version = "0.5.0";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "d415057b17bd8acf65e7a2f5d25e468b5b39df3290c7d9dbb75c0785afbdf3cf";
9+ sha256 = "b26263fb6aff11b1e62965c3bac205c4ebe147f37c213191384acafea7f8ab50";
1010 };
1111
1212 propagatedBuildInputs = [ six ];
pkgs/development/python-modules/pycapnp/default.nix+2−2
@@ -9,12 +9,12 @@
99
1010buildPythonPackage rec {
1111 pname = "pycapnp";
12− version = "0.6.3";
12+ version = "0.6.4";
1313 disabled = isPyPy || isPy3k;
1414
1515 src = fetchPypi {
1616 inherit pname version;
17− sha256 = "b3c5a1fcc93fd02fdc070aeccb89654b87f20bdc740f643cc6378925ed6d4c17";
17+ sha256 = "44e14a5ace399cf1753acb8bbce558b8c895c48fd2102d266c34eaff286824cf";
1818 };
1919
2020 buildInputs = [ capnproto cython ];
pkgs/development/python-modules/pychromecast/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "PyChromecast";
5− version = "2.4.0";
5+ version = "2.5.2";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "0q012ghssk2xhm17v28sc2lv62vk7wd5p7zzdbgxk6kywfx8yvm2";
9+ sha256 = "7ce4eeb398a73c26bd65870739c94845da60f4527ebe2f104826ee32d70d035c";
1010 };
1111
1212 disabled = !isPy3k;
pkgs/development/python-modules/pycodestyle/default.nix+3−11
@@ -1,22 +1,14 @@
1−{ lib, buildPythonPackage, fetchPypi, fetchpatch }:
1+{ lib, buildPythonPackage, fetchPypi }:
22
33buildPythonPackage rec {
44 pname = "pycodestyle";
5− version = "2.4.0";
5+ version = "2.5.0";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "cbfca99bd594a10f674d0cd97a3d802a1fdef635d4361e1a2658de47ed261e3a";
9+ sha256 = "e40a936c9a450ad81df37f549d676d127b1b66000a6c500caa2b085bc0ca976c";
1010 };
1111
12− patches = [
13− # https://github.com/PyCQA/pycodestyle/pull/801
14− (fetchpatch {
15− url = https://github.com/PyCQA/pycodestyle/commit/397463014fda3cdefe8d6c9d117ae16d878dc494.patch;
16− sha256 = "01zask2y2gim5il9lcmlhr2qaadv9v7kaw1y619l8xbjhpbq2zh8";
17− })
18− ];
19−
2012 meta = with lib; {
2113 description = "Python style guide checker (formerly called pep8)";
2214 homepage = https://pycodestyle.readthedocs.io;
pkgs/development/python-modules/pycontracts/default.nix+2−2
@@ -3,11 +3,11 @@
33
44buildPythonPackage rec {
55 pname = "PyContracts";
6− version = "1.8.8";
6+ version = "1.8.12";
77
88 src = fetchPypi {
99 inherit pname version;
10− sha256 = "0njcssvjj2aisb52xp9jmfps43iqg3fw4grj524i911p34yln2va";
10+ sha256 = "e76adbd832deec28b2045a6094c5bb779a0b2cb1105a23b3efafe723e2c9937a";
1111 };
1212
1313 buildInputs = [ nose ];
pkgs/development/python-modules/pycryptodome/default.nix+2−2
@@ -1,12 +1,12 @@
11{ stdenv, fetchPypi, buildPythonPackage }:
22
33buildPythonPackage rec {
4− version = "3.7.2";
4+ version = "3.7.3";
55 pname = "pycryptodome";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "f5fc7e3b2d29552f0383063408ce2bd295e9d3c7ef13377599aa300a3d2baef7";
9+ sha256 = "1a222250e43f3c659b4ebd5df3e11c2f112aab6aef58e38af55ef5678b9f0636";
1010 };
1111
1212 meta = {
pkgs/development/python-modules/pycryptodomex/default.nix+2−2
@@ -2,7 +2,7 @@
22
33buildPythonPackage rec {
44 pname = "pycryptodomex";
5− version = "3.7.2";
5+ version = "3.7.3";
66
77 meta = {
88 description = "A self-contained cryptographic library for Python";
@@ -12,6 +12,6 @@ buildPythonPackage rec {
1212
1313 src = fetchPypi {
1414 inherit pname version;
15− sha256 = "5d4e10ad9ff7940da534119ef92a500dcf7c28351d15e12d74ef0ce025e37d5b";
15+ sha256 = "b70fe991564e178af02ccf89435a8f9e8d052707a7c4b95bf6027cb785da3175";
1616 };
1717}
pkgs/development/python-modules/pycurl/default.nix+1
@@ -20,6 +20,7 @@ buildPythonPackage rec {
2020 };
2121
2222 buildInputs = [ curl openssl.out ];
23+ nativeBuildInputs = [ curl ];
2324
2425 checkInputs = [ bottle pytest nose flaky ];
2526
pkgs/development/python-modules/pyepsg/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "pyepsg";
5− version = "0.3.2";
5+ version = "0.4.0";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "0ng0k140kzq3xcffi4vy10py4cmwzfy8anccysw3vgn1x30ghzjr";
9+ sha256 = "2d08fad1e7a8b47a90a4e43da485ba95705923425aefc4e2a3efa540dbd470d7";
1010 };
1111
1212 propagatedBuildInputs = [ requests ];
pkgs/development/python-modules/pyfftw/default.nix+4−4
@@ -1,18 +1,18 @@
11{ stdenv, buildPythonPackage, fetchPypi
2−, fftw, fftwFloat, fftwLongDouble, numpy, scipy }:
2+, fftw, fftwFloat, fftwLongDouble, numpy, scipy, cython, dask }:
33
44buildPythonPackage rec {
5− version = "0.10.4";
5+ version = "0.11.1";
66 pname = "pyFFTW";
77
88 src = fetchPypi {
99 inherit pname version;
10− sha256 = "739b436b7c0aeddf99a48749380260364d2dc027cf1d5f63dafb5f50068ede1a";
10+ sha256 = "05ea28dede4c3aaaf5c66f56eb0f71849d0d50f5bc0f53ca0ffa69534af14926";
1111 };
1212
1313 buildInputs = [ fftw fftwFloat fftwLongDouble];
1414
15− propagatedBuildInputs = [ numpy scipy ];
15+ propagatedBuildInputs = [ numpy scipy cython dask ];
1616
1717 # Tests cannot import pyfftw. pyfftw works fine though.
1818 doCheck = false;
pkgs/development/python-modules/pyfiglet/default.nix+2−2
@@ -1,12 +1,12 @@
11{ stdenv, buildPythonPackage, fetchPypi }:
22
33buildPythonPackage rec {
4− version = "0.8.post0";
4+ version = "0.8.post1";
55 pname = "pyfiglet";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "1kjskfbkm28rajcj0aa0v5w1v4p6r9y0hlhzz2bwsxvwlqg4b519";
9+ sha256 = "c6c2321755d09267b438ec7b936825a4910fec696292139e664ca8670e103639";
1010 };
1111
1212 doCheck = false;
pkgs/development/python-modules/pyflakes/default.nix+3−6
@@ -2,17 +2,14 @@
22
33buildPythonPackage rec {
44 pname = "pyflakes";
5− version = "2.0.0";
5+ version = "2.1.0";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "9a7662ec724d0120012f6e29d6248ae3727d821bba522a0e6b356eff19126a49";
9+ sha256 = "5e8c00e30c464c99e0b501dc160b13a14af7f27d4dffb529c556e30a159e231d";
1010 };
1111
12− buildInputs = [ unittest2 ];
13−
14− # https://github.com/PyCQA/pyflakes/issues/386
15− doCheck = false;
12+ checkInputs = [ unittest2 ];
1613
1714 meta = with stdenv.lib; {
1815 homepage = https://launchpad.net/pyflakes;
pkgs/development/python-modules/pygame/default.nix+8−4
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchurl, buildPythonPackage, python, libX11
1+{ lib, fetchPypi, buildPythonPackage, python, pkg-config, libX11
22, SDL, SDL_image, SDL_mixer, SDL_ttf, libpng, libjpeg, portmidi, freetype
33}:
44
@@ -6,11 +6,15 @@ buildPythonPackage rec {
66 pname = "pygame";
77 version = "1.9.4";
88
9− src = fetchurl {
10− url = "mirror://pypi/p/pygame/pygame-${version}.tar.gz";
9+ src = fetchPypi {
10+ inherit pname version;
1111 sha256 = "700d1781c999af25d11bfd1f3e158ebb660f72ebccb2040ecafe5069d0b2c0b6";
1212 };
1313
14+ nativeBuildInputs = [
15+ pkg-config SDL
16+ ];
17+
1418 buildInputs = [
1519 SDL SDL_image SDL_mixer SDL_ttf libpng libjpeg
1620 portmidi libX11 freetype
@@ -35,7 +39,7 @@ buildPythonPackage rec {
3539 LOCALBASE=/ ${python.interpreter} config.py
3640 '';
3741
38− meta = with stdenv.lib; {
42+ meta = with lib; {
3943 description = "Python library for games";
4044 homepage = http://www.pygame.org/;
4145 license = licenses.lgpl21Plus;
pkgs/development/python-modules/pyjet/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "pyjet";
5− version = "1.3.0";
5+ version = "1.4.0";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "1glcwv9ni8i40smfw6m456xjadlkackim5nk33xmas1fa96lpagg";
9+ sha256 = "89ce11cd4541fb573d68fd60a219e5e1bdeb94cfcfffc917b472fde2aa9a5a31";
1010 };
1111
1212 # fix for python37
pkgs/development/python-modules/pyjwt/default.nix+2−12
@@ -4,27 +4,17 @@
44
55buildPythonPackage rec {
66 pname = "PyJWT";
7− version = "1.6.4";
7+ version = "1.7.1";
88
99 src = fetchPypi {
1010 inherit pname version;
11− sha256 = "4ee413b357d53fd3fb44704577afac88e72e878716116270d722723d65b42176";
11+ sha256 = "8d59a976fb773f3e6a39c85636357c4f0e242707394cadadd9814f5cbaa20e96";
1212 };
1313
1414 propagatedBuildInputs = [ cryptography ecdsa ];
1515
1616 checkInputs = [ pytestrunner pytestcov pytest ];
1717
18− # pytest 3.9.0 changed behavior of deprecated_call, see release notes
19− postPatch = ''
20− for x in tests/test_api_*py; do
21− substituteInPlace "$x" --replace AssertionError pytest.fail.Exception
22− done
23− '';
24−
25− # https://github.com/jpadilla/pyjwt/issues/382
26− doCheck = false;
27−
2818 meta = with lib; {
2919 description = "JSON Web Token implementation in Python";
3020 homepage = https://github.com/jpadilla/pyjwt;
pkgs/development/python-modules/pykeepass/default.nix+2−2
@@ -5,11 +5,11 @@
55
66buildPythonPackage rec {
77 pname = "pykeepass";
8− version = "3.0.2";
8+ version = "3.0.3";
99
1010 src = fetchPypi {
1111 inherit pname version;
12− sha256 = "1kfnh42nimsbdpwpny2c9df82b2n4fb5fagh54ck06f3x483vd90";
12+ sha256 = "2c9e2ddb03ee696ed8aa72c2cddfb81280614864e003226141d68b975aa56f6f";
1313 };
1414
1515 propagatedBuildInputs = [
pkgs/development/python-modules/pykerberos/default.nix+1−1
@@ -9,7 +9,7 @@ buildPythonPackage rec {
99 sha256 = "0v47p840myqgc7hr4lir72xshcfpa0w8j9n077h3njpqyn6wlbag";
1010 };
1111
12− buildInputs = [ krb5 ];
12+ nativeBuildInputs = [ krb5 ];
1313
1414 # there are no tests
1515 doCheck = false;
pkgs/development/python-modules/pylast/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "pylast";
5− version = "2.4.0";
5+ version = "3.0.0";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "8e883f13b70c3879fc821bbee1accf27ea4e68898f4462cbbe358f615adcbbfb";
9+ sha256 = "24051c52011ff18bdeaee9df084ecc90da6c627da86f3cdcfec4af2928e9bc56";
1010 };
1111
1212 propagatedBuildInputs = [ certifi six ];
pkgs/development/python-modules/pylibgen/default.nix+8−5
@@ -1,23 +1,26 @@
1−{ buildPythonPackage, python, lib, fetchPypi
1+{ buildPythonPackage, lib, fetchPypi
22, isPy3k
33, requests
4+, pytest
45}:
56
67buildPythonPackage rec {
78 pname = "pylibgen";
8− version = "1.3.1";
9+ version = "2.0.1";
910
1011 src = fetchPypi {
1112 inherit pname version;
12− sha256 = "1rviqi3rf62b43cabdy8c2cdznjv034mp0qrfrzvkih4jlkhyfrh";
13+ sha256 = "3c2a82b47cb7225dcf4ecea27081b0185ae4d195499140cdbb9597d914e1ae9e";
1314 };
1415
1516 disabled = !isPy3k;
1617
1718 propagatedBuildInputs = [ requests ];
1819
19− # It's not using unittest
20− checkPhase = "${python.interpreter} tests/test_pylibgen.py -c 'test_api_endpoints()'";
20+ checkInputs = [ pytest ];
21+
22+ # no tests in PyPI tarball
23+ doCheck = false;
2124
2225 meta = {
2326 description = "Python interface to Library Genesis";
pkgs/development/python-modules/pylti/default.nix+2−2
@@ -13,7 +13,7 @@
1313, pytestcache
1414, pytestcov
1515, covCore
16−, pytestflakes
16+, pytest-flakes
1717, pytestpep8
1818, sphinx
1919, mock
@@ -35,7 +35,7 @@ buildPythonPackage rec {
3535 propagatedBuildInputs = [ httplib2 oauth oauth2 semantic-version ];
3636 checkInputs = [
3737 flask httpretty oauthlib pyflakes pytest pytestcache pytestcov covCore
38− pytestflakes pytestpep8 sphinx mock chalice
38+ pytest-flakes pytestpep8 sphinx mock chalice
3939 ];
4040
4141 src = fetchPypi {
pkgs/development/python-modules/pymatgen/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "pymatgen";
5− version = "2018.10.18";
5+ version = "2019.2.4";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "cf9e030abafc4cd7c33847acf4bf0677bfc707f68fed48469c672d1980a8ceb9";
9+ sha256 = "0932024a8703236dce861bcadd9568455baa8c70c0f7a1fc52d8ca4b52342091";
1010 };
1111
1212 nativeBuildInputs = [ glibcLocales ];
pkgs/development/python-modules/pymc3/default.nix+2−2
@@ -16,12 +16,12 @@
1616
1717buildPythonPackage rec {
1818 pname = "pymc3";
19− version = "3.5";
19+ version = "3.6";
2020 disabled = pythonOlder "3.5";
2121
2222 src = fetchPypi {
2323 inherit pname version;
24− sha256 = "6088e683c6d730bb21350a0f54ee083fa5a28e4d5ef52d57878141c9c20f21ee";
24+ sha256 = "c00c0778d2451a348a9508f8b956fe280a0f9affd3f85140ac3948bc2902f5e9";
2525 };
2626
2727 # No need for coverage stats in Nix builds
pkgs/development/python-modules/pymediainfo/default.nix+2−2
@@ -5,11 +5,11 @@
55
66buildPythonPackage rec {
77 pname = "pymediainfo";
8− version = "2.3.0";
8+ version = "3.0";
99
1010 src = fetchPypi {
1111 inherit pname version;
12− sha256 = "1d0mxxycacimy46b08q44xyxkyji7rrs7viwc3wkpckhqs54q24x";
12+ sha256 = "e76cc5525c3fc5cba61073e12365dc06f303b261d8f923aaa6eac09bf8fab245";
1313 };
1414
1515 postPatch = ''
pkgs/development/python-modules/pynacl/default.nix+22−7
@@ -1,21 +1,36 @@
1−{ stdenv, buildPythonPackage, fetchFromGitHub, pytest, libsodium, cffi, six, hypothesis}:
1+{ stdenv
2+, buildPythonPackage
3+, fetchPypi
4+, pytest
5+, libsodium
6+, cffi
7+, six
8+, hypothesis
9+}:
210
311buildPythonPackage rec {
412 pname = "pynacl";
513 version = "1.3.0";
614
7− src = fetchFromGitHub {
8− owner = "pyca";
9− repo = pname;
10− rev = version;
11− sha256 = "0ac00d5bfdmz1x428h2scq5b34llp61yhxradl94qjwz7ikqv052";
15+ src = fetchPypi {
16+ inherit version;
17+ pname = "PyNaCl";
18+ sha256 = "0c6100edd16fefd1557da078c7a31e7b7d7a52ce39fdca2bec29d4f7b6e7600c";
1219 };
1320
1421 checkInputs = [ pytest hypothesis ];
15− propagatedBuildInputs = [ libsodium cffi six ];
22+ buildInputs = [ libsodium ];
23+ propagatedBuildInputs = [ cffi six ];
1624
1725 SODIUM_INSTALL = "system";
1826
27+ # fixed in next release 1.3.0+
28+ # https://github.com/pyca/pynacl/pull/480
29+ postPatch = ''
30+ substituteInPlace tests/test_bindings.py \
31+ --replace "average_size=128," ""
32+ '';
33+
1934 checkPhase = ''
2035 py.test
2136 '';
pkgs/development/python-modules/pynmea2/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "pynmea2";
5− version = "1.12.0";
5+ version = "1.15.0";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "185wxn8gag9whxmysspbh8s7wn3sh1glgf508w2zzwi4lklryl7i";
9+ sha256 = "8b83fa7e3e668af5e182ef1c2fd4a535433ecadf60d7b627280172d695a1646b";
1010 };
1111
1212 checkInputs = [ pytest ];
pkgs/development/python-modules/pyopencl/default.nix+2−2
@@ -15,7 +15,7 @@
1515
1616buildPythonPackage rec {
1717 pname = "pyopencl";
18− version = "2018.2.2";
18+ version = "2018.2.3";
1919
2020 checkInputs = [ pytest ];
2121 buildInputs = [ opencl-headers ocl-icd ];
@@ -24,7 +24,7 @@ buildPythonPackage rec {
2424
2525 src = fetchPypi {
2626 inherit pname version;
27− sha256 = "419375fb794d97f9bd46f0dc24ce83b5cc83d316771ba82fac80de8bf883dcdc";
27+ sha256 = "ebefe9505cad970dfb4c8024630ef5a546c68d22943dbb3e5677943a6d006ac6";
2828 };
2929
3030 # py.test is not needed during runtime, so remove it from `install_requires`
pkgs/development/python-modules/pyopenssl/default.nix+2−2
@@ -48,11 +48,11 @@ in
4848
4949buildPythonPackage rec {
5050 pname = "pyOpenSSL";
51− version = "18.0.0";
51+ version = "19.0.0";
5252
5353 src = fetchPypi {
5454 inherit pname version;
55− sha256 = "6488f1423b00f73b7ad5167885312bb0ce410d3312eb212393795b53c8caa580";
55+ sha256 = "aeca66338f6de19d1aa46ed634c3b9ae519a64b458f8468aec688e7e3c20f200";
5656 };
5757
5858 outputs = [ "out" "dev" ];
pkgs/development/python-modules/pyowm/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "pyowm";
5− version = "2.9.0";
5+ version = "2.10.0";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "ed175873823a2fedb48e453505c974ca39f3f75006ef1af54fdbcf72e6796849";
9+ sha256 = "8fd41a18536f4d6c432bc6d9ea69994efb1ea9b43688cf19523659b6f4d86cf7";
1010 };
1111
1212 propagatedBuildInputs = [ requests geojson ];
pkgs/development/python-modules/pyqt/5.x.nix+1−1
@@ -23,7 +23,7 @@ in buildPythonPackage rec {
2323
2424 outputs = [ "out" "dev" ];
2525
26− nativeBuildInputs = [ pkgconfig qmake lndir ];
26+ nativeBuildInputs = [ pkgconfig qmake lndir sip ];
2727
2828 buildInputs = [ dbus sip ];
2929
pkgs/development/python-modules/pyramid/default.nix+2−2
@@ -21,11 +21,11 @@
2121
2222buildPythonPackage rec {
2323 pname = "pyramid";
24− version = "1.10.1";
24+ version = "1.10.2";
2525
2626 src = fetchPypi {
2727 inherit pname version;
28− sha256 = "37c3e1c9eae72817e0365e2a38143543aee8b75240701fa5cb3a1be86c01a1c0";
28+ sha256 = "e70a9bac805284ebe7123fdd412e22a4c1d214603b3a074ac8f1185a0dd7c63e";
2929 };
3030
3131 checkInputs = [ docutils virtualenv webtest zope_component ];
pkgs/development/python-modules/pyramid_jinja2/default.nix+2−2
@@ -8,11 +8,11 @@
88
99buildPythonPackage rec {
1010 pname = "pyramid_jinja2";
11− version = "2.7";
11+ version = "2.8";
1212
1313 src = fetchPypi {
1414 inherit pname version;
15− sha256 = "5c21081f65a5bec0b76957990c2b89ed41f4fd11257121387110cb722fd0e5eb";
15+ sha256 = "81e0615cb3108f2a251ff3141ad0d698a5d03685819f3a836ea84787e8489502";
1616 };
1717
1818 buildInputs = [ webtest ];
pkgs/development/python-modules/pyro-ppl/default.nix+2−2
@@ -1,12 +1,12 @@
11{ buildPythonPackage, fetchPypi, lib, pytorch, contextlib2
22, graphviz, networkx, six, opt-einsum, tqdm }:
33buildPythonPackage rec {
4− version = "0.3.0";
4+ version = "0.3.1.post1";
55 pname = "pyro-ppl";
66
77 src = fetchPypi {
88 inherit version pname;
9− sha256 = "0shsnc5bia9k1fzmqnwwbm1x5qvac3zrq4lvyhg27rjgpcamvb9l";
9+ sha256 = "f5174bcd1b74fb455db948413dcbf5ac1a13dbddc6c54c6d215dd2e4b6b9548d";
1010 };
1111
1212 propagatedBuildInputs = [
pkgs/development/python-modules/pyrr/default.nix+2−2
@@ -2,12 +2,12 @@
22, setuptools, multipledispatch, numpy }:
33
44buildPythonPackage rec {
5− version = "0.7.2";
5+ version = "0.10.1";
66 pname = "pyrr";
77
88 src = fetchPypi {
99 inherit pname version;
10− sha256 = "04a65a9fb5c746b41209f55b21abf47a0ef80a4271159d670ca9579d9be3b4fa";
10+ sha256 = "06305b2f555f8b8091a6c29a05d5d33f131c9dd268e22d94985e43ab5df70c1d";
1111 };
1212
1313 buildInputs = [ setuptools ];
pkgs/development/python-modules/pyrsistent/default.nix+2−2
@@ -9,11 +9,11 @@
99
1010buildPythonPackage rec {
1111 pname = "pyrsistent";
12− version = "0.14.9";
12+ version = "0.14.11";
1313
1414 src = fetchPypi {
1515 inherit pname version;
16− sha256 = "0xwaqjjn665wd1rllqzndmlc8yzfw2wxakpfwlh6ir6kgbajff2s";
16+ sha256 = "3ca82748918eb65e2d89f222b702277099aca77e34843c5eb9d52451173970e2";
1717 };
1818
1919 propagatedBuildInputs = [ six ];
pkgs/development/python-modules/pyside/default.nix+2−3
@@ -13,7 +13,7 @@ buildPythonPackage rec {
1313
1414 enableParallelBuilding = true;
1515
16− buildInputs = [ cmake pysideGeneratorrunner pysideShiboken qt4 ];
16+ nativeBuildInputs = [ cmake pysideGeneratorrunner pysideShiboken qt4 ];
1717
1818 makeFlags = "QT_PLUGIN_PATH=" + pysideShiboken + "/lib/generatorrunner";
1919
@@ -21,7 +21,6 @@ buildPythonPackage rec {
2121 description = "LGPL-licensed Python bindings for the Qt cross-platform application and UI framework";
2222 license = lib.licenses.lgpl21;
2323 homepage = http://www.pyside.org;
24− maintainers = [ ];
25− platforms = lib.platforms.all;
24+ broken = true;
2625 };
2726}
pkgs/development/python-modules/pyside/shiboken.nix+1−1
@@ -16,7 +16,7 @@ buildPythonPackage rec {
1616
1717 enableParallelBuilding = true;
1818
19− buildInputs = [ cmake libxml2 libxslt pysideApiextractor pysideGeneratorrunner python sphinx qt4 ];
19+ nativeBuildInputs = [ cmake libxml2 libxslt pysideApiextractor pysideGeneratorrunner python sphinx qt4 ];
2020
2121 preConfigure = ''
2222 echo "preConfigure: Fixing shiboken_generator install target."
pkgs/development/python-modules/pyspread/default.nix+2−2
@@ -18,11 +18,11 @@
1818
1919buildPythonPackage rec {
2020 pname = "pyspread";
21− version = "1.1.2";
21+ version = "1.1.3";
2222
2323 src = fetchPypi {
2424 inherit pname version;
25− sha256 = "ffdfd219450f5f22ee51eb633c04941d1d608e1ceb4d3357d07683b7e5b84f83";
25+ sha256 = "6e5d0eb49750eed7734852e15727e190270880c75dcc5f6c8fb1bfdaa59c48fc";
2626 };
2727
2828 propagatedBuildInputs = [ numpy wxPython matplotlib pycairo python-gnupg xlrd xlwt jedi pyenchant basemap pygtk ];
pkgs/development/python-modules/pytest-asyncio/default.nix+2−2
@@ -1,13 +1,13 @@
11{ stdenv, buildPythonPackage, fetchPypi, pytest, isPy3k, isPy35, async_generator }:
22buildPythonPackage rec {
33 pname = "pytest-asyncio";
4− version = "0.9.0";
4+ version = "0.10.0";
55
66 disabled = !isPy3k;
77
88 src = fetchPypi {
99 inherit pname version;
10− sha256 = "fbd92c067c16111174a1286bfb253660f1e564e5146b39eeed1133315cf2c2cf";
10+ sha256 = "9fac5100fd716cbecf6ef89233e8590a4ad61d729d1732e0a96b84182df1daaf";
1111 };
1212
1313 buildInputs = [ pytest ]
pkgs/development/python-modules/pytest-cov/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, buildPythonPackage, fetchPypi
2−, pytest, pytest_xdist, virtualenv, process-tests, coverage }:
2+, pytest, coverage }:
33
44buildPythonPackage rec {
55 pname = "pytest-cov";
@@ -10,7 +10,7 @@ buildPythonPackage rec {
1010 sha256 = "0ab664b25c6aa9716cbf203b17ddb301932383046082c081b9848a0edf5add33";
1111 };
1212
13− buildInputs = [ pytest pytest_xdist virtualenv process-tests ];
13+ buildInputs = [ pytest ];
1414 propagatedBuildInputs = [ coverage ];
1515
1616 # xdist related tests fail with the following error
pkgs/development/python-modules/pytest-django/default.nix+2−2
@@ -10,11 +10,11 @@
1010}:
1111buildPythonPackage rec {
1212 pname = "pytest-django";
13− version = "3.4.6";
13+ version = "3.4.7";
1414
1515 src = fetchPypi {
1616 inherit pname version;
17− sha256 = "0r190xb707817la5kw5i3m646ijmg025zqy55gz16py94wsnav5y";
17+ sha256 = "3d489db7c9bd18d7c154347b1bdfb82cc6b1ec8539543508b199c77e5eb2caec";
1818 };
1919
2020 nativeBuildInputs = [ pytest setuptools_scm ];
pkgs/development/python-modules/pytest-fixture-config/default.nix+4−4
@@ -1,18 +1,18 @@
11{ stdenv, buildPythonPackage, fetchPypi
2−, setuptools-git, pytest }:
2+, setuptools-git, pytest_3 }:
33
44buildPythonPackage rec {
55 pname = "pytest-fixture-config";
6− version = "1.3.0";
6+ version = "1.4.0";
77
88 src = fetchPypi {
99 inherit pname version;
10− sha256 = "1717cd7d2233943cae9af419c6e31dca5e40d5de01ef0bcfd5cd06f37548db08";
10+ sha256 = "839d70343c87d6dda5bca88e3ab06e7b2027998dc1ec452c14d50be5725180a3";
1111 };
1212
1313 nativeBuildInputs = [ setuptools-git ];
1414
15− buildInputs = [ pytest ];
15+ buildInputs = [ pytest_3 ];
1616
1717 doCheck = false;
1818
pkgs/development/python-modules/pytest-flake8/default.nix+2−2
@@ -2,7 +2,7 @@
22
33buildPythonPackage rec {
44 pname = "pytest-flake8";
5− version = "1.0.3";
5+ version = "1.0.4";
66
77 # although pytest is a runtime dependency, do not add it as
88 # propagatedBuildInputs in order to allow packages depend on another version
@@ -12,7 +12,7 @@ buildPythonPackage rec {
1212
1313 src = fetchPypi {
1414 inherit pname version;
15− sha256 = "b2c71fb6d469bae076a01c43d4a83485d740db6a8a00bad77e0657ed035e98d4";
15+ sha256 = "4d225c13e787471502ff94409dcf6f7927049b2ec251c63b764a4b17447b60c0";
1616 };
1717
1818 checkPhase = ''
pkgs/development/python-modules/pytest-flakes/default.nix+2−1
@@ -10,7 +10,8 @@ buildPythonPackage rec {
1010 sha256 = "341964bf5760ebbdde9619f68a17d5632c674c3f6903ef66daa0a4f540b3d143";
1111 };
1212
13− buildInputs = [ pytestpep8 pytest ];
13+ checkInputs = [ pytestpep8 pytest ];
14+ nativeBuildInputs = [ pytest ];
1415 propagatedBuildInputs = [ pyflakes ];
1516
1617 # disable one test case that looks broken
pkgs/development/python-modules/pytest-forked/default.nix+2−2
@@ -7,11 +7,11 @@
77
88buildPythonPackage rec {
99 pname = "pytest-forked";
10− version = "0.2";
10+ version = "1.0.2";
1111
1212 src = fetchPypi {
1313 inherit pname version;
14− sha256 = "e4500cd0509ec4a26535f7d4112a8cc0f17d3a41c29ffd4eab479d2a55b30805";
14+ sha256 = "d352aaced2ebd54d42a65825722cb433004b4446ab5d2044851d9cc7a00c9e38";
1515 };
1616
1717 buildInputs = [ pytest setuptools_scm ];
pkgs/development/python-modules/pytest-localserver/default.nix+4−4
@@ -9,18 +9,18 @@
99
1010buildPythonPackage rec {
1111 pname = "pytest-localserver";
12− version = "0.4.2";
12+ version = "0.5.0";
1313
1414 src = fetchPypi {
1515 inherit pname version;
16− sha256 = "0615b1698bdd2a1e6e396caf2f496020f4f69bccc0518df5050aeb02800f7c07";
16+ sha256 = "3a5427909d1dfda10772c1bae4b9803679c0a8f04adb66c338ac607773bfefc2";
1717 };
1818
1919 propagatedBuildInputs = [ werkzeug ];
20− buildInputs = [ pytest six requests ];
20+ checkInputs = [ pytest six requests ];
2121
2222 checkPhase = ''
23− py.test
23+ pytest
2424 '';
2525
2626 meta = {
pkgs/development/python-modules/pytest-mock/default.nix+5−5
@@ -2,15 +2,15 @@
22
33buildPythonPackage rec {
44 pname = "pytest-mock";
5− version = "1.10.0";
6−
5+ version = "1.10.1";
6+
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "d89a8209d722b8307b5e351496830d5cc5e192336003a485443ae9adeb7dd4c0";
9+ sha256 = "4d0d06d173eecf172703219a71dbd4ade0e13904e6bbce1ce660e2e0dc78b5c4";
1010 };
1111
12− propagatedBuildInputs = [ pytest ] ++ lib.optional (!isPy3k) mock;
13− nativeBuildInputs = [ setuptools_scm ];
12+ propagatedBuildInputs = lib.optional (!isPy3k) mock;
13+ nativeBuildInputs = [ setuptools_scm pytest ];
1414
1515 checkPhase = ''
1616 py.test
pkgs/development/python-modules/pytest-quickcheck/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, buildPythonPackage, fetchPypi, pytest, pytestflakes, pytestpep8, tox }:
1+{ stdenv, buildPythonPackage, fetchPypi, pytest, pytest-flakes, pytestpep8, tox }:
22buildPythonPackage rec {
33 pname = "pytest-quickcheck";
44 version = "0.8.3";
@@ -9,7 +9,7 @@ buildPythonPackage rec {
99 };
1010
1111 buildInputs = [ pytest ];
12− propagatedBuildInputs = [ pytestflakes pytestpep8 tox ];
12+ propagatedBuildInputs = [ pytest-flakes pytestpep8 tox ];
1313
1414 meta = with stdenv.lib; {
1515 license = licenses.asl20;
pkgs/development/python-modules/pytest-server-fixtures/default.nix+2−2
@@ -4,11 +4,11 @@
44
55buildPythonPackage rec {
66 pname = "pytest-server-fixtures";
7− version = "1.3.1";
7+ version = "1.6.2";
88
99 src = fetchPypi {
1010 inherit pname version;
11− sha256 = "902607675ce2ee09bdc72381b4470f79504fc131afdc15174e49a84d031760df";
11+ sha256 = "c89f9532f62cf851489082ece1ec692b6ed5b0f88f20823bea25e2a963ebee8f";
1212 };
1313
1414 buildInputs = [ pytest ];
pkgs/development/python-modules/pytest-services/default.nixnew file+35
@@ -0,0 +1,35 @@
1+{ lib
2+, buildPythonPackage
3+, fetchPypi
4+, isPy3k
5+, requests
6+, psutil
7+, pytest
8+, subprocess32
9+}:
10+
11+buildPythonPackage rec {
12+ pname = "pytest-services";
13+ version = "1.3.1";
14+
15+ src = fetchPypi {
16+ inherit pname version;
17+ sha256 = "035bc9ce8addb33f7c2ec95a9c0c88926d213a6c2e12b2c57da31a4ec0765f2c";
18+ };
19+
20+ propagatedBuildInputs = [
21+ requests
22+ psutil
23+ pytest
24+ ] ++ lib.optional (!isPy3k) subprocess32;
25+
26+ # no tests in PyPI tarball
27+ doCheck = false;
28+
29+ meta = with lib; {
30+ description = "Services plugin for pytest testing framework";
31+ homepage = https://github.com/pytest-dev/pytest-services;
32+ license = licenses.mit;
33+ maintainers = with maintainers; [ dotlambda ];
34+ };
35+}
pkgs/development/python-modules/pytest-shutil/default.nix+5−4
@@ -1,18 +1,19 @@
11{ stdenv, buildPythonPackage, fetchPypi
2−, pytest, cmdline, pytestcov, coverage, setuptools-git, mock, pathpy, execnet
2+, pytest_3, cmdline, pytestcov, coverage, setuptools-git, mock, pathpy, execnet
33, contextlib2, termcolor }:
44
55buildPythonPackage rec {
66 pname = "pytest-shutil";
7− version = "1.3.0";
7+ version = "1.6.0";
88
99 src = fetchPypi {
1010 inherit pname version;
11− sha256 = "2cfe4d3f5f25ad2b19e64847d62563f5494b2e0450ca1cfc5940974029b2cbd1";
11+ sha256 = "efe615b7709637ec8828abebee7fc2ad033ae0f1fc54145f769a8b5e8cc3b4ca";
1212 };
1313
14− buildInputs = [ cmdline pytest ];
14+ checkInputs = [ cmdline pytest_3 ];
1515 propagatedBuildInputs = [ pytestcov coverage setuptools-git mock pathpy execnet contextlib2 termcolor ];
16+ nativeBuildInputs = [ pytest_3 ];
1617
1718 checkPhase = ''
1819 py.test
pkgs/development/python-modules/pytest-timeout/default.nix+5
@@ -15,6 +15,11 @@ buildPythonPackage rec {
1515 sha256 = "1cczcjhw4xx5sjkhxlhc5c1bkr7x6fcyx12wrnvwfckshdvblc2a";
1616 };
1717
18+ patches = fetchpatch {
19+ url = https://bitbucket.org/pytest-dev/pytest-timeout/commits/36998c891573d8ec1db1acd4f9438cb3cf2aee2e/raw;
20+ sha256 = "05zc2w7mjgv8rm8i1cbxp7k09vlscmay5iy78jlzgjqkrx3wkf46";
21+ };
22+
1823 checkInputs = [ pytest pexpect ];
1924 checkPhase = ''pytest -ra'';
2025
pkgs/development/python-modules/pytest-virtualenv/default.nix+6−4
@@ -1,19 +1,21 @@
11{ stdenv, buildPythonPackage, fetchPypi
2−, pytest, pytestcov, mock, cmdline, pytest-fixture-config, pytest-shutil }:
2+, pytest_3, pytestcov, mock, cmdline, pytest-fixture-config, pytest-shutil }:
33
44buildPythonPackage rec {
55 pname = "pytest-virtualenv";
6− version = "1.3.0";
6+ version = "1.6.0";
77
88 src = fetchPypi {
99 inherit pname version;
10− sha256 = "8d8a0b9b57f5efb7db6457c1f57347e35fe332979ecefe592d5324430ae3ed7f";
10+ sha256 = "d281725d10848773cb2b495d1255dd0a42fc9179e34a274c22e1c35837721f19";
1111 };
1212
13− buildInputs = [ pytest pytestcov mock cmdline ];
13+ checkInputs = [ pytest_3 pytestcov mock cmdline ];
1414 propagatedBuildInputs = [ pytest-fixture-config pytest-shutil ];
1515 checkPhase = '' py.test tests/unit '';
1616
17+ nativeBuildInputs = [ pytest_3 ];
18+
1719 meta = with stdenv.lib; {
1820 description = "Create a Python virtual environment in your test that cleans up on teardown. The fixture has utility methods to install packages and list what’s installed.";
1921 homepage = https://github.com/manahl/pytest-plugins;
pkgs/development/python-modules/pytest-xdist/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "pytest-xdist";
5− version = "1.24.1";
5+ version = "1.26.1";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "909bb938bdb21e68a28a8d58c16a112b30da088407b678633efb01067e3923de";
9+ sha256 = "d03d1ff1b008458ed04fa73e642d840ac69b4107c168e06b71037c62d7813dd4";
1010 };
1111
1212 nativeBuildInputs = [ setuptools_scm pytest ];
pkgs/development/python-modules/pytest/3.10.nixnew file+47
@@ -0,0 +1,47 @@
1+{ stdenv, buildPythonPackage, pythonOlder, fetchPypi, attrs, hypothesis, py
2+, setuptools_scm, setuptools, six, pluggy, funcsigs, isPy3k, more-itertools
3+, atomicwrites, mock, writeText, pathlib2
4+}:
5+buildPythonPackage rec {
6+ version = "3.10.1";
7+ pname = "pytest";
8+
9+ preCheck = ''
10+ # don't test bash builtins
11+ rm testing/test_argcomplete.py
12+ '';
13+
14+ src = fetchPypi {
15+ inherit pname version;
16+ sha256 = "e246cf173c01169b9617fc07264b7b1316e78d7a650055235d6d897bc80d9660";
17+ };
18+
19+ checkInputs = [ hypothesis mock ];
20+ buildInputs = [ setuptools_scm ];
21+ propagatedBuildInputs = [ attrs py setuptools six pluggy more-itertools atomicwrites]
22+ ++ stdenv.lib.optionals (!isPy3k) [ funcsigs ]
23+ ++ stdenv.lib.optionals (pythonOlder "3.6") [ pathlib2 ];
24+
25+ checkPhase = ''
26+ runHook preCheck
27+ $out/bin/py.test -x testing/ -k "not test_raises_exception_looks_iterable"
28+ runHook postCheck
29+ '';
30+
31+ # Remove .pytest_cache when using py.test in a Nix build
32+ setupHook = writeText "pytest-hook" ''
33+ pytestcachePhase() {
34+ find $out -name .pytest_cache -type d -exec rm -rf {} +
35+ }
36+
37+ preDistPhases+=" pytestcachePhase"
38+ '';
39+
40+ meta = with stdenv.lib; {
41+ homepage = https://docs.pytest.org;
42+ description = "Framework for writing tests";
43+ maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ];
44+ license = licenses.mit;
45+ platforms = platforms.unix;
46+ };
47+}
pkgs/development/python-modules/pytest/default.nix+3−3
@@ -3,7 +3,7 @@
33, atomicwrites, mock, writeText, pathlib2
44}:
55buildPythonPackage rec {
6− version = "3.9.3";
6+ version = "4.2.1";
77 pname = "pytest";
88
99 preCheck = ''
@@ -13,7 +13,7 @@ buildPythonPackage rec {
1313
1414 src = fetchPypi {
1515 inherit pname version;
16− sha256 = "a9e5e8d7ab9d5b0747f37740276eb362e6a76275d76cebbb52c6049d93b475db";
16+ sha256 = "c2396a15726218a2dfef480861c4ba37bd3952ebaaa5b0fede3fc23fddcd7f8c";
1717 };
1818
1919 checkInputs = [ hypothesis mock ];
@@ -24,7 +24,7 @@ buildPythonPackage rec {
2424
2525 checkPhase = ''
2626 runHook preCheck
27− $out/bin/py.test -x testing/
27+ $out/bin/py.test -x testing/ -k "not test_collect_pyargs_with_testpaths"
2828 runHook postCheck
2929 '';
3030
pkgs/development/python-modules/python-binance/default.nix+2−2
@@ -3,12 +3,12 @@
33, autobahn, certifi, chardet, cryptography, dateparser, pyopenssl, requests, service-identity, twisted }:
44
55buildPythonPackage rec {
6− version = "0.7.0";
6+ version = "0.7.1";
77 pname = "python-binance";
88
99 src = fetchPypi {
1010 inherit pname version;
11− sha256 = "0h8kd88j53w6yfc60fr8a45zi30p09l98vm8yzqym4lcgx76nvps";
11+ sha256 = "9ce406da68bfbc209ae6852d1b8a2812708d04502f82a61b0c9ca41356cc6ab7";
1212 };
1313
1414 doCheck = false; # Tries to test multiple interpreters with tox
pkgs/development/python-modules/python-daemon/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "python-daemon";
5− version = "2.2.0";
5+ version = "2.2.3";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "aca149ebf7e73f10cd554b2df5c95295d49add8666348eff6195053ec307728c";
9+ sha256 = "affeca9e5adfce2666a63890af9d6aff79f670f7511899edaddca7f96593cc25";
1010 };
1111
1212 # A test fail within chroot builds.
pkgs/development/python-modules/python-editor/default.nix+2−2
@@ -1,12 +1,12 @@
11{ stdenv, buildPythonPackage, fetchPypi }:
22
33buildPythonPackage rec {
4− version = "1.0.3";
4+ version = "1.0.4";
55 pname = "python-editor";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "a3c066acee22a1c94f63938341d4fb374e3fdd69366ed6603d7b24bed1efc565";
9+ sha256 = "51fda6bcc5ddbbb7063b2af7509e43bd84bfc32a4ff71349ec7847713882327b";
1010 };
1111
1212 # No proper tests
pkgs/development/python-modules/python-rapidjson/default.nix+2−2
@@ -8,13 +8,13 @@
88}:
99
1010buildPythonPackage rec {
11− version = "0.6.3";
11+ version = "0.7.0";
1212 pname = "python-rapidjson";
1313 disabled = pythonOlder "3.4";
1414
1515 src = fetchPypi {
1616 inherit pname version;
17− sha256 = "0a7729c711d9be2b6c0638ce4851d398e181f2329814668aa7fda6421a5da085";
17+ sha256 = "d9c1411b25600ea65bb534ad75bf4ab6efd9627abd86872f0e5453ff42220d06";
1818 };
1919
2020 LC_ALL="en_US.utf-8";
pkgs/development/python-modules/python-slugify/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "python-slugify";
5− version = "1.2.6";
5+ version = "2.0.1";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "7723daf30996db26573176bddcdf5fcb98f66dc70df05c9cb29f2c79b8193245";
9+ sha256 = "d3e034397236020498e677a35e5c05dcc6ba1624b608b9ef7e5fe3090ccbd5a8";
1010 };
1111 doCheck = !isPy3k;
1212 # (only) on python3 unittest loader (loadTestsFromModule) fails
pkgs/development/python-modules/python-socketio/default.nix+2−2
@@ -8,11 +8,11 @@
88
99buildPythonPackage rec {
1010 pname = "python-socketio";
11− version = "2.1.2";
11+ version = "3.1.2";
1212
1313 src = fetchPypi {
1414 inherit pname version;
15− sha256 = "9e9d87d5f3cd6d39c42dd665e1fe3e12361637e28f5ad9a7aa8f73358b7a3dd5";
15+ sha256 = "aa702157694d55a743fb6f1cc0bd1af58fbfda8a7d71d747d4b12d6dac29cab3";
1616 };
1717
1818 propagatedBuildInputs = [
pkgs/development/python-modules/python-utils/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, buildPythonPackage, fetchPypi, pytest, pytestrunner, pytestcov, pytestflakes, pytestpep8, sphinx, six }:
1+{ lib, buildPythonPackage, fetchPypi, pytest, pytestrunner, pytestcov, pytest-flakes, pytestpep8, sphinx, six }:
22
33buildPythonPackage rec {
44 pname = "python-utils";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
1414 rm tests/*.pyc
1515 '';
1616
17− checkInputs = [ pytest pytestrunner pytestcov pytestflakes pytestpep8 sphinx ];
17+ checkInputs = [ pytest pytestrunner pytestcov pytest-flakes pytestpep8 sphinx ];
1818
1919 checkPhase = ''
2020 py.test tests
pkgs/development/python-modules/pythonix/default.nix+1
@@ -24,5 +24,6 @@ buildPythonPackage rec {
2424 '';
2525 maintainers = [ maintainers.mic92 ];
2626 license = licenses.mit;
27+ broken = true;
2728 };
2829}
pkgs/development/python-modules/pytools/default.nix+2−2
@@ -10,11 +10,11 @@
1010
1111buildPythonPackage rec {
1212 pname = "pytools";
13− version = "2018.5.2";
13+ version = "2019.1";
1414
1515 src = fetchPypi {
1616 inherit pname version;
17− sha256 = "3b3f41e1235b579dc4f4a3d6f5f8ae187841968e72a4f73ac481c6bfe4c1668b";
17+ sha256 = "f6972030e6c97089e49b832fd1f4e7959aee89bb6db929aaa3bde2553d78872b";
1818 };
1919
2020 checkInputs = [ pytest ];
pkgs/development/python-modules/pytz/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "pytz";
5− version = "2018.7";
5+ version = "2018.9";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "31cb35c89bd7d333cd32c5f278fca91b523b0834369e757f4c5641ea252236ca";
9+ sha256 = "d5f05e487007e29e03409f9398d074e158d920d36eb82eaf66fb1136b0c5374c";
1010 };
1111
1212 checkPhase = ''
pkgs/development/python-modules/pytzdata/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "pytzdata";
5− version = "2018.7";
5+ version = "2018.9";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "10c74b0cfc51a9269031f86ecd11096c9c6a141f5bb15a3b8a88f9979f6361e2";
9+ sha256 = "dddaaf4f1717820a6fdcac94057e03c1a15b3829a44d9eaf19988917977db408";
1010 };
1111
1212 # No tests
pkgs/development/python-modules/pyunifi/default.nix+2−2
@@ -3,11 +3,11 @@
33
44buildPythonPackage rec {
55 pname = "pyunifi";
6− version = "2.15";
6+ version = "2.16";
77
88 src = fetchPypi {
99 inherit pname version;
10− sha256 = "cf2f9f538722447bded6b319a35c26ea088c51ccdbd3dec887210946c7992ebf";
10+ sha256 = "1d28ec8204fe3b0eb1043f5ba9b646a2c38e5fd89a0419d760cff8f0df507c83";
1111 };
1212
1313 propagatedBuildInputs = [ requests ];
pkgs/development/python-modules/pyupdate/default.nix+2−2
@@ -3,11 +3,11 @@
33
44buildPythonPackage rec {
55 pname = "pyupdate";
6− version = "0.2.16";
6+ version = "0.2.29";
77
88 src = fetchPypi {
99 inherit pname version;
10− sha256 = "1p4zpjvwy6h9kr0dp80z5k04s14r9f75jg9481gpx8ygxj0l29bi";
10+ sha256 = "0096bde03f43b67c068914ebcb756265641a6d2a5888d4bc81636347c22bf0aa";
1111 };
1212
1313 propagatedBuildInputs = [ requests ];
pkgs/development/python-modules/pyzmq/default.nix+2−2
@@ -9,11 +9,11 @@
99
1010buildPythonPackage rec {
1111 pname = "pyzmq";
12− version = "17.1.2";
12+ version = "17.1.3";
1313
1414 src = fetchPypi {
1515 inherit pname version;
16− sha256 = "a72b82ac1910f2cf61a49139f4974f994984475f771b0faa730839607eeedddf";
16+ sha256 = "83722236bd6ae6a07dec0cb728906785040e91826c7575709a258b4e21d0f812";
1717 };
1818
1919 checkInputs = [ pytest tornado ];
pkgs/development/python-modules/qiskit/default.nix+2−2
@@ -21,13 +21,13 @@
2121
2222buildPythonPackage rec {
2323 pname = "qiskit";
24− version = "0.6.1";
24+ version = "0.7.3";
2525
2626 disabled = !isPy3k;
2727
2828 src = fetchPypi {
2929 inherit pname version;
30− sha256 = "601e8db4db470593b94a32495c6e90e2db11a9382817a34584520573a7b8cc38";
30+ sha256 = "63e7a7c3033fe955d715cc825b3fb61d27c25ad66e1761493ca2243b5dbfb4f9";
3131 };
3232
3333 buildInputs = [ cmake ]
pkgs/development/python-modules/qtawesome/default.nix+11−2
@@ -1,4 +1,4 @@
1−{ stdenv, buildPythonPackage, fetchPypi, qtpy, six, pyside }:
1+{ stdenv, buildPythonPackage, fetchPypi, qtpy, six, pyqt5, pytest }:
22
33buildPythonPackage rec {
44 pname = "QtAwesome";
@@ -9,7 +9,16 @@ buildPythonPackage rec {
99 sha256 = "0f6dvqmalzi4q4rrpl1xlrxanibam1nifzsgqb5z4jr4ap7kiyp3";
1010 };
1111
12− propagatedBuildInputs = [ qtpy six pyside ];
12+ propagatedBuildInputs = [ qtpy six ];
13+
14+ checkInputs = [ pyqt5 pytest ];
15+
16+ checkPhase = ''
17+ py.test
18+ '';
19+
20+ # Requires https://github.com/boylea/qtbot
21+ doCheck = false;
1322
1423 meta = with stdenv.lib; {
1524 description = "Iconic fonts in PyQt and PySide applications";
pkgs/development/python-modules/qtconsole/default.nix+1−1
@@ -21,7 +21,7 @@ buildPythonPackage rec {
2121 sha256 = "1b03n1ixzscm0jw97l4dq5iy4fslnqxq5bb8287xb7n2a1gs26xw";
2222 };
2323
24− buildInputs = [ nose ] ++ lib.optionals isPy27 [mock];
24+ checkInputs = [ nose ] ++ lib.optionals isPy27 [mock];
2525 propagatedBuildInputs = [traitlets jupyter_core jupyter_client pygments ipykernel pyqt5];
2626
2727 # : cannot connect to X server
pkgs/development/python-modules/qtpy/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "QtPy";
5− version = "1.5.2";
5+ version = "1.6.0";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "1kdbr8kwryjskhs6mp11jj02h4jdxvlzbzdn1chw30kcb280ysac";
9+ sha256 = "fd5c09655e58bf3a013d2940e71f069732ed67f056d4dcb2b0609a3ecd9b320f";
1010 };
1111
1212 # no concrete propagatedBuildInputs as multiple backends are supposed
pkgs/development/python-modules/quantities/default.nix+2−2
@@ -7,11 +7,11 @@
77
88buildPythonPackage rec {
99 pname = "quantities";
10− version = "0.12.2";
10+ version = "0.12.3";
1111
1212 src = fetchPypi {
1313 inherit pname version;
14− sha256 = "92e8397938516483f4fd1855097ec11953ab10dd0bf3293954559226679f76f0";
14+ sha256 = "582f3c7aeba897846761e966615e01202a5e5d06add304492931b05085d19883";
1515 };
1616
1717 propagatedBuildInputs = [ numpy ];
pkgs/development/python-modules/readthedocs-sphinx-ext/default.nixnew file+32
@@ -0,0 +1,32 @@
1+{ lib
2+, buildPythonPackage
3+, fetchPypi
4+, requests
5+, pytest
6+, mock
7+, sphinx
8+}:
9+
10+buildPythonPackage rec {
11+ pname = "readthedocs-sphinx-ext";
12+ version = "0.5.17";
13+
14+ src = fetchPypi {
15+ inherit pname version;
16+ sha256 = "21097cbb37c9a0590e2cb444b55bd87302fc8f69640fa2d4f2d113e98e9558ff";
17+ };
18+
19+ propagatedBuildInputs = [ requests ];
20+
21+ checkInputs = [ pytest mock sphinx ];
22+
23+ checkPhase = ''
24+ py.test
25+ '';
26+
27+ meta = with lib; {
28+ description = "Sphinx extension for Read the Docs overrides";
29+ homepage = http://github.com/rtfd/readthedocs-sphinx-ext;
30+ license = licenses.mit;
31+ };
32+}
pkgs/development/python-modules/redis/default.nix+2−2
@@ -1,11 +1,11 @@
11{ fetchPypi, buildPythonPackage }:
22buildPythonPackage rec {
33 pname = "redis";
4− version = "3.0.1";
4+ version = "3.1.0";
55
66 src = fetchPypi {
77 inherit pname version;
8− sha256 = "1kw3a1618pl908abiaxd41jg5z0rwyl2w2i0d8xi9zxy5437a011";
8+ sha256 = "7ba8612bbfd966dea8c62322543fed0095da2834dbd5a7c124afbc617a156aa7";
99 };
1010
1111 # tests require a running redis
pkgs/development/python-modules/regex/default.nix+5−2
@@ -7,11 +7,11 @@
77
88buildPythonPackage rec {
99 pname = "regex";
10− version = "2018.11.22";
10+ version = "2019.02.21";
1111
1212 src = fetchPypi {
1313 inherit pname version;
14− sha256 = "79a6a60ed1ee3b12eb0e828c01d75e3b743af6616d69add6c2fde1d425a4ba3f";
14+ sha256 = "587bd4cad11c7294f89799c45778abca271d7c6668a0e85c41a6dbfa8096f9bb";
1515 };
1616
1717 postCheck = ''
@@ -19,6 +19,9 @@ buildPythonPackage rec {
1919 ${python.interpreter} -c 'import test_regex; test_regex.test_main();'
2020 '';
2121
22+ # No tests in archive
23+ doCheck = false;
24+
2225 meta = {
2326 description = "Alternative regular expression module, to replace re";
2427 homepage = https://bitbucket.org/mrabarnett/mrab-regex;
pkgs/development/python-modules/requests-oauthlib/default.nix+2−2
@@ -2,12 +2,12 @@
22, oauthlib, requests }:
33
44buildPythonPackage rec {
5− version = "1.0.0";
5+ version = "1.2.0";
66 pname = "requests-oauthlib";
77
88 src = fetchPypi {
99 inherit pname version;
10− sha256 = "8886bfec5ad7afb391ed5443b1f697c6f4ae98d0e5620839d8b4499c032ada3f";
10+ sha256 = "bd6533330e8748e94bf0b214775fed487d309b8b8fe823dc45641ebcd9a32f57";
1111 };
1212
1313 doCheck = false; # Internet tests fail when building in chroot
pkgs/development/python-modules/requests-toolbelt/default.nix+7−3
@@ -9,23 +9,27 @@
99
1010buildPythonPackage rec {
1111 pname = "requests-toolbelt";
12− version = "0.8.0";
12+ version = "0.9.1";
1313
1414 src = fetchPypi {
1515 inherit pname version;
16− sha256 = "f6a531936c6fa4c6cfce1b9c10d5c4f498d16528d2a54a22ca00011205a187b5";
16+ sha256 = "968089d4584ad4ad7c171454f0a5c6dac23971e9472521ea3b6d49d610aa6fc0";
1717 };
1818
1919 checkInputs = [ betamax mock pytest ];
2020 propagatedBuildInputs = [ requests ];
2121
2222 checkPhase = ''
23− py.test tests
23+ # disabled tests access the network
24+ py.test tests -k "not test_no_content_length_header \
25+ and not test_read_file \
26+ and not test_reads_file_from_url_wrapper"
2427 '';
2528
2629 meta = {
2730 description = "A toolbelt of useful classes and functions to be used with python-requests";
2831 homepage = http://toolbelt.rtfd.org;
32+ license = lib.licenses.asl20;
2933 maintainers = with lib.maintainers; [ matthiasbeyer jgeerds ];
3034 };
3135}
pkgs/development/python-modules/requests/default.nix+2−2
@@ -4,11 +4,11 @@
44
55buildPythonPackage rec {
66 pname = "requests";
7− version = "2.20.1";
7+ version = "2.21.0";
88
99 src = fetchPypi {
1010 inherit pname version;
11− sha256 = "ea881206e59f41dbd0bd445437d792e43906703fff75ca8ff43ccdb11f33f263";
11+ sha256 = "502a824f31acdacb3a35b6690b5fbf0bc41d63a24a45c4004352b0242707598e";
1212 };
1313
1414 nativeBuildInputs = [ pytest ];
pkgs/development/python-modules/restructuredtext_lint/default.nix+2−2
@@ -11,11 +11,11 @@
1111
1212buildPythonPackage rec {
1313 pname = "restructuredtext_lint";
14− version = "1.1.3";
14+ version = "1.2.2";
1515
1616 src = fetchPypi {
1717 inherit pname version;
18− sha256 = "c48ca9a84c312b262809f041fe47dcfaedc9ee4879b3e1f9532f745c182b4037";
18+ sha256 = "82880a8de8a41bfc84f533744091b1ead8e2ab9ad6c0a3f60f4750ef6c802350";
1919 };
2020
2121 checkInputs = [ nose flake8 pyyaml testtools ];
pkgs/development/python-modules/rhpl/default.nix+2−1
@@ -14,5 +14,6 @@ buildPythonPackage rec {
1414
1515 builder = ./builder.sh;
1616
17− buildInputs = [ rpmextract python wirelesstools gettext ];
17+ nativeBuildInputs = [ rpmextract gettext ];
18+ buildInputs = [ wirelesstools ];
1819}
pkgs/development/python-modules/root_numpy/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "root_numpy";
5− version = "4.7.3";
5+ version = "4.8.0";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "0vy6mqmkddfv46yc4hp43fvaisn3yw92ryaw031k841hhj73q0xg";
9+ sha256 = "5842bbcde92133f60a61f56e9f0a875a0dbc2a567cc65a9ac141ecd72e416878";
1010 };
1111
1212 disabled = isPy3k; # blocked by #27649
pkgs/development/python-modules/rope/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "rope";
5− version = "0.11.0";
5+ version = "0.12.0";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "a108c445e1cd897fe19272ab7877d172e7faf3d4148c80e7d20faba42ea8f7b2";
9+ sha256 = "031eb54b3eeec89f4304ede816995ed2b93a21e6fba16bd02aff10a0d6c257b7";
1010 };
1111
1212 checkInputs = [ nose ];
pkgs/development/python-modules/ruamel_yaml/default.nix+2−2
@@ -8,11 +8,11 @@
88
99buildPythonPackage rec {
1010 pname = "ruamel.yaml";
11− version = "0.15.86";
11+ version = "0.15.88";
1212
1313 src = fetchPypi {
1414 inherit pname version;
15− sha256 = "d98b3d421eebf7e10311ab12f41c5b0353e7cae1cc78f51312e24f569d593de0";
15+ sha256 = "ac56193c47a31c9efa151064a9e921865cdad0f7a991d229e7197e12fe8e0cd7";
1616 };
1717
1818 # Tests cannot load the module to test
pkgs/development/python-modules/s3transfer/default.nix+2−2
@@ -14,11 +14,11 @@
1414
1515buildPythonPackage rec {
1616 pname = "s3transfer";
17− version = "0.1.13";
17+ version = "0.2.0";
1818
1919 src = fetchPypi {
2020 inherit pname version;
21− sha256 = "90dc18e028989c609146e241ea153250be451e05ecc0c2832565231dacdf59c1";
21+ sha256 = "f23d5cb7d862b104401d9021fc82e5fa0e0cf57b7660a1331425aab0c691d021";
2222 };
2323
2424 foo = 1;
pkgs/development/python-modules/salmon-mail/default.nix+2−2
@@ -3,11 +3,11 @@
33
44buildPythonPackage rec {
55 pname = "salmon-mail";
6− version = "3.0.2";
6+ version = "3.1.0";
77
88 src = fetchPypi {
99 inherit pname version;
10− sha256 = "e2f5c9cfe95e178813755c2df2f9f7c792246356d7489caa72f06b2553da8cdc";
10+ sha256 = "cb2f9c3bf2b9f8509453ca8bc06f504350e19488eb9d3d6a4b9e4b8c160b527d";
1111 };
1212
1313 checkInputs = [ nose jinja2 mock ];
pkgs/development/python-modules/schedule/default.nix+2−2
@@ -6,11 +6,11 @@
66
77buildPythonPackage rec {
88 pname = "schedule";
9− version = "0.5.0";
9+ version = "0.6.0";
1010
1111 src = fetchPypi {
1212 inherit pname version;
13− sha256 = "0nrkbbmr9k1bqfmv9wg5aslxzkkifcd62fm04n6844nf5mya00qh";
13+ sha256 = "f9fb5181283de4db6e701d476dd01b6a3dd81c38462a54991ddbb9d26db857c9";
1414 };
1515
1616 buildInputs = [ mock ];
pkgs/development/python-modules/scikit-image/default.nix+2−2
@@ -16,11 +16,11 @@
1616
1717buildPythonPackage rec {
1818 pname = "scikit-image";
19− version = "0.14.1";
19+ version = "0.14.2";
2020
2121 src = fetchPypi {
2222 inherit pname version;
23− sha256 = "86a9b3b4f74f231e0a6bcfd3235dcf3f0118df25dac21201da5e064d681e2c50";
23+ sha256 = "1afd0b84eefd77afd1071c5c1c402553d67be2d7db8950b32d6f773f25850c1f";
2424 };
2525
2626 buildInputs = [ cython ];
pkgs/development/python-modules/scipy/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "scipy";
5− version = "1.2.0";
5+ version = "1.2.1";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "51a2424c8ed80e60bdb9a896806e7adaf24a58253b326fbad10f80a6d06f2214";
9+ sha256 = "e085d1babcb419bbe58e2e805ac61924dac4ca45a07c9fa081144739e500aa3c";
1010 };
1111
1212 checkInputs = [ nose pytest ];
pkgs/development/python-modules/setuptools/default.nix+2−2
@@ -8,13 +8,13 @@
88# Should use buildPythonPackage here somehow
99stdenv.mkDerivation rec {
1010 pname = "setuptools";
11− version = "40.6.3";
11+ version = "40.8.0";
1212 name = "${python.libPrefix}-${pname}-${version}";
1313
1414 src = fetchPypi {
1515 inherit pname version;
1616 extension = "zip";
17− sha256 = "3b474dad69c49f0d2d86696b68105f3a6f195f7ab655af12ef9a9c326d2b08f8";
17+ sha256 = "6e4eec90337e849ade7103723b9a99631c1f0d19990d6e8412dc42f5ae8b304d";
1818 };
1919
2020 nativeBuildInputs = [ unzip wrapPython python.pythonForBuild ];
pkgs/development/python-modules/setuptools_scm/default.nix+2−2
@@ -1,11 +1,11 @@
11{ stdenv, buildPythonPackage, fetchPypi, pip }:
22buildPythonPackage rec {
33 pname = "setuptools_scm";
4− version = "3.1.0";
4+ version = "3.2.0";
55
66 src = fetchPypi {
77 inherit pname version;
8− sha256 = "1191f2a136b5e86f7ca8ab00a97ef7aef997131f1f6d4971be69a1ef387d8b40";
8+ sha256 = "52ab47715fa0fc7d8e6cd15168d1a69ba995feb1505131c3e814eb7087b57358";
99 };
1010
1111 buildInputs = [ pip ];
pkgs/development/python-modules/shapely/default.nix+18−13
@@ -1,5 +1,5 @@
1−{ stdenv, buildPythonPackage, fetchPypi
2−, geos, glibcLocales, pytest, cython
1+{ stdenv, buildPythonPackage, fetchPypi, substituteAll
2+, geos, pytest, cython
33, numpy
44}:
55
@@ -12,26 +12,31 @@ buildPythonPackage rec {
1212 sha256 = "c4b87bb61fc3de59fc1f85e71a79b0c709dc68364d9584473697aad4aa13240f";
1313 };
1414
15− buildInputs = [ geos glibcLocales cython ];
15+ nativeBuildInputs = [
16+ geos # for geos-config
17+ cython
18+ ];
1619
1720 checkInputs = [ pytest ];
1821
1922 propagatedBuildInputs = [ numpy ];
2023
21− preConfigure = ''
22− export LANG="en_US.UTF-8";
23− '';
24+ # environment variable used in shapely/_buildcfg.py
25+ GEOS_LIBRARY_PATH = "${geos}/lib/libgeos_c${stdenv.hostPlatform.extensions.sharedLibrary}";
2426
25− patchPhase = let
26− libc = if stdenv.isDarwin then "libc.dylib" else "libc.so.6";
27− in ''
28− sed -i "s|_lgeos = load_dll('geos_c', fallbacks=.*)|_lgeos = load_dll('geos_c', fallbacks=['${geos}/lib/libgeos_c${stdenv.hostPlatform.extensions.sharedLibrary}'])|" shapely/geos.py
29− sed -i "s|free = load_dll('c').free|free = load_dll('c', fallbacks=['${stdenv.cc.libc}/lib/${libc}']).free|" shapely/geos.py
30− '';
27+ patches = [
28+ (substituteAll {
29+ src = ./library-paths.patch;
30+ libgeos_c = GEOS_LIBRARY_PATH;
31+ libc = "${stdenv.cc.libc}/lib/libc${stdenv.hostPlatform.extensions.sharedLibrary}"
32+ + stdenv.lib.optionalString (!stdenv.isDarwin) ".6";
33+ })
34+ ];
3135
3236 # Disable the tests that improperly try to use the built extensions
3337 checkPhase = ''
34− py.test -k 'not test_vectorized and not test_fallbacks' tests
38+ rm -r shapely # prevent import of local shapely
39+ py.test tests
3540 '';
3641
3742 meta = with stdenv.lib; {
pkgs/development/python-modules/shapely/library-paths.patchnew file+109
@@ -0,0 +1,109 @@
1+diff --git a/shapely/geos.py b/shapely/geos.py
2+index 09bf1ab..837aa98 100644
3+--- a/shapely/geos.py
4++++ b/shapely/geos.py
5+@@ -55,100 +55,10 @@ def load_dll(libname, fallbacks=None, mode=DEFAULT_MODE):
6+ "Could not find lib {0} or load any of its variants {1}.".format(
7+ libname, fallbacks or []))
8+
9+-_lgeos = None
10+-
11+-if sys.platform.startswith('linux'):
12+- # Test to see if we have a wheel repaired by 'auditwheel' containing its
13+- # own libgeos_c
14+- geos_whl_so = glob.glob(os.path.abspath(os.path.join(os.path.dirname(
15+- __file__), '.libs/libgeos_c-*.so.*')))
16+- if len(geos_whl_so) == 1:
17+- _lgeos = CDLL(geos_whl_so[0])
18+- LOG.debug("Found GEOS DLL: %r, using it.", _lgeos)
19+- else:
20+- alt_paths = [
21+- 'libgeos_c.so.1',
22+- 'libgeos_c.so',
23+- # anaconda
24+- os.path.join(sys.prefix, "lib", "libgeos_c.so"),
25+- ]
26+- _lgeos = load_dll('geos_c', fallbacks=alt_paths)
27+- free = load_dll('c').free
28+- free.argtypes = [c_void_p]
29+- free.restype = None
30+-
31+-elif sys.platform == 'darwin':
32+- # Test to see if we have a delocated wheel with a GEOS dylib.
33+- geos_whl_dylib = os.path.abspath(os.path.join(os.path.dirname(
34+- __file__), '.dylibs/libgeos_c.1.dylib'))
35+- if os.path.exists(geos_whl_dylib):
36+- _lgeos = CDLL(geos_whl_dylib)
37+- LOG.debug("Found GEOS DLL: %r, using it.", _lgeos)
38+-
39+- else:
40+- if hasattr(sys, 'frozen'):
41+- try:
42+- # .app file from py2app
43+- alt_paths = [os.path.join(
44+- os.environ['RESOURCEPATH'], '..', 'Frameworks',
45+- 'libgeos_c.dylib')]
46+- except KeyError:
47+- # binary from pyinstaller
48+- alt_paths = [
49+- os.path.join(sys.executable, 'libgeos_c.dylib')]
50+- if hasattr(sys, '_MEIPASS'):
51+- alt_paths.append(
52+- os.path.join(sys._MEIPASS, 'libgeos_c.1.dylib'))
53+- else:
54+- alt_paths = [
55+- # anaconda
56+- os.path.join(sys.prefix, "lib", "libgeos_c.dylib"),
57+- # The Framework build from Kyng Chaos
58+- "/Library/Frameworks/GEOS.framework/Versions/Current/GEOS",
59+- # macports
60+- '/opt/local/lib/libgeos_c.dylib',
61+- ]
62+- _lgeos = load_dll('geos_c', fallbacks=alt_paths)
63+-
64+- free = load_dll('c').free
65+- free.argtypes = [c_void_p]
66+- free.restype = None
67+-
68+-elif sys.platform == 'win32':
69+- try:
70+- egg_dlls = os.path.abspath(
71+- os.path.join(os.path.dirname(__file__), 'DLLs'))
72+- if hasattr(sys, "frozen"):
73+- wininst_dlls = os.path.normpath(
74+- os.path.abspath(sys.executable + '../../DLLS'))
75+- else:
76+- wininst_dlls = os.path.abspath(os.__file__ + "../../../DLLs")
77+- original_path = os.environ['PATH']
78+- os.environ['PATH'] = "%s;%s;%s" % \
79+- (egg_dlls, wininst_dlls, original_path)
80+- _lgeos = load_dll("geos_c.dll", fallbacks=[
81+- os.path.join(sys.prefix, "Library", "lib", "geos_c.dll"),
82+- ])
83+- except (ImportError, WindowsError, OSError):
84+- raise
85+-
86+- def free(m):
87+- try:
88+- cdll.msvcrt.free(m)
89+- except WindowsError:
90+- # XXX: See http://trac.gispython.org/projects/PCL/ticket/149
91+- pass
92+-
93+-elif sys.platform == 'sunos5':
94+- _lgeos = load_dll('geos_c', fallbacks=['libgeos_c.so.1', 'libgeos_c.so'])
95+- free = CDLL('libc.so.1').free
96+- free.argtypes = [c_void_p]
97+- free.restype = None
98+-else: # other *nix systems
99+- _lgeos = load_dll('geos_c', fallbacks=['libgeos_c.so.1', 'libgeos_c.so'])
100+- free = load_dll('c', fallbacks=['libc.so.6']).free
101+- free.argtypes = [c_void_p]
102+- free.restype = None
103++_lgeos = CDLL('@libgeos_c@')
104++free = CDLL('@libc@').free
105++free.argtypes = [c_void_p]
106++free.restype = None
107+
108+
109+ def _geos_version():
pkgs/development/python-modules/six/default.nix+2−2
@@ -6,11 +6,11 @@
66
77buildPythonPackage rec {
88 pname = "six";
9− version = "1.11.0";
9+ version = "1.12.0";
1010
1111 src = fetchPypi {
1212 inherit pname version;
13− sha256 = "70e8a77beed4562e7f14fe23a786b54f6296e34344c23bc42f07b15018ff98e9";
13+ sha256 = "d16a0141ec1a18405cd4ce8b4613101da75da0e9a7aec5bdd4fa804d0e0eba73";
1414 };
1515
1616 checkInputs = [ pytest ];
pkgs/development/python-modules/smart_open/default.nix+2−2
@@ -12,11 +12,11 @@
1212
1313buildPythonPackage rec {
1414 pname = "smart_open";
15− version = "1.7.1";
15+ version = "1.8.0";
1616
1717 src = fetchPypi {
1818 inherit pname version;
19− sha256 = "0lwlvvz7qndq89i8bhjv4zfkhg0lbd5yjhccb7svszf30k8niiap";
19+ sha256 = "a52206bb69c38c5f08709ec2ee5704b0f86fc0a770935b5dad9b5841bfd5f502";
2020 };
2121
2222 # nixpkgs version of moto is >=1.2.0, remove version pin to fix build
pkgs/development/python-modules/soco/default.nix+2−2
@@ -1,7 +1,7 @@
11{ lib, buildPythonPackage, fetchPypi, xmltodict, requests
22
33# Test dependencies
4−, pytest, pytestcov, coveralls, pylint, flake8, graphviz, mock, sphinx
4+, pytest_3, pytestcov, coveralls, pylint, flake8, graphviz, mock, sphinx
55, sphinx_rtd_theme
66}:
77
@@ -16,7 +16,7 @@ buildPythonPackage rec {
1616
1717 propagatedBuildInputs = [ xmltodict requests ];
1818 checkInputs = [
19− pytest pytestcov coveralls pylint flake8 graphviz mock sphinx
19+ pytest_3 pytestcov coveralls pylint flake8 graphviz mock sphinx
2020 sphinx_rtd_theme
2121 ];
2222
pkgs/development/python-modules/sopel/default.nix+2−2
@@ -14,11 +14,11 @@
1414
1515buildPythonPackage rec {
1616 pname = "sopel";
17− version = "6.5.3";
17+ version = "6.6.3";
1818
1919 src = fetchPypi {
2020 inherit pname version;
21− sha256 = "4d8c1dc7e9cad73afc40d849484bc0f626aad6557951b1a0cff437af442ccb99";
21+ sha256 = "aa9a52da9cf33c1d5f6b9b8513d31a339d8cbef9a288487b251538949a4faae1";
2222 };
2323
2424 buildInputs = [ pytest ];
pkgs/development/python-modules/sortedcontainers/default.nix+2−2
@@ -5,11 +5,11 @@
55
66buildPythonPackage rec {
77 pname = "sortedcontainers";
8− version = "2.0.5";
8+ version = "2.1.0";
99
1010 src = fetchPypi {
1111 inherit pname version;
12− sha256 = "b74f2756fb5e23512572cc76f0fe0832fd86310f77dfee54335a35fb33f6b950";
12+ sha256 = "974e9a32f56b17c1bac2aebd9dcf197f3eb9cd30553c5852a3187ad162e1a03a";
1313 };
1414
1515 # pypi tarball does not come with tests
pkgs/development/python-modules/soupsieve/default.nixnew file+36
@@ -0,0 +1,36 @@
1+{ lib
2+, buildPythonPackage
3+, fetchPypi
4+, pytest
5+, beautifulsoup4
6+, isPy3k
7+, backports_functools_lru_cache
8+}:
9+
10+buildPythonPackage rec {
11+ pname = "soupsieve";
12+ version = "1.7.3";
13+
14+ src = fetchPypi {
15+ inherit pname version;
16+ sha256 = "87db12ae79194f0ff9808d2b1641c4f031ae39ffa3cab6b907ea7c1e5e5ed445";
17+ };
18+
19+ checkPhase = ''
20+ py.test
21+ '';
22+
23+ checkInputs = [ pytest beautifulsoup4 ];
24+
25+ propagatedBuildInputs = lib.optional (!isPy3k) backports_functools_lru_cache;
26+
27+ # Circular test dependency on beautifulsoup4
28+ doCheck = false;
29+
30+ meta = {
31+ description = "A CSS4 selector implementation for Beautiful Soup";
32+ license = lib.licenses.mit;
33+ homepage = https://github.com/facelessuser/soupsieve;
34+ };
35+
36+}
pkgs/development/python-modules/spglib/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "spglib";
5− version = "1.10.4.11";
5+ version = "1.12.2.post0";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "13b0a227d2dc4079fe36d5bcce4e672400c7c5dfc5d3cd25ccb9521ef592d93e";
9+ sha256 = "15b02b74c0f06179bc3650c43a710a5200abbba387c6eda3105bfd9236041443";
1010 };
1111
1212 propagatedBuildInputs = [ numpy ];
pkgs/development/python-modules/sphinx-testing/default.nix+2−2
@@ -9,11 +9,11 @@
99
1010buildPythonPackage rec {
1111 pname = "sphinx-testing";
12− version = "0.8.1";
12+ version = "1.0.0";
1313
1414 src = fetchPypi {
1515 inherit pname version;
16− sha256 = "1cbgkp770d7k85nmqkz50wk09xjwcmqw7sb2z17086n7vc1hy2rf";
16+ sha256 = "2a421b42b2dae8ecad2b4c9d3953f9970e5a9c07bb2c66626338157435e5708c";
1717 };
1818
1919 checkInputs = [ mock ];
pkgs/development/python-modules/sphinx_rtd_theme/default.nix+10−2
@@ -2,19 +2,27 @@
22, buildPythonPackage
33, fetchPypi
44, sphinx
5+, readthedocs-sphinx-ext
6+, pytest
57}:
68
79buildPythonPackage rec {
810 pname = "sphinx_rtd_theme";
9− version = "0.4.2";
11+ version = "0.4.3";
1012
1113 src = fetchPypi {
1214 inherit pname version;
13− sha256 = "02f02a676d6baabb758a20c7a479d58648e0f64f13e07d1b388e9bb2afe86a09";
15+ sha256 = "728607e34d60456d736cc7991fd236afb828b21b82f956c5ea75f94c8414040a";
1416 };
1517
1618 propagatedBuildInputs = [ sphinx ];
1719
20+ checkInputs = [ readthedocs-sphinx-ext pytest ];
21+
22+ checkPhase = ''
23+ py.test
24+ '';
25+
1826 meta = with stdenv.lib; {
1927 description = "ReadTheDocs.org theme for Sphinx";
2028 homepage = https://github.com/snide/sphinx_rtd_theme/;
pkgs/development/python-modules/sphinxcontrib-openapi/default.nix+2−2
@@ -9,11 +9,11 @@
99
1010buildPythonPackage rec {
1111 pname = "sphinxcontrib-openapi";
12− version = "0.3.2";
12+ version = "0.4.0";
1313
1414 src = fetchPypi {
1515 inherit pname version;
16− sha256 = "411da1819fda0593976a157f1a14ec1cfaef9ee1b4b708e795d0bf3953f0142b";
16+ sha256 = "9d64c8a119bfc592e6316af3e5475ce2d4d8ed6e013dc016a3f2e7971e50d7f3";
1717 };
1818
1919 propagatedBuildInputs = [setuptools_scm pyyaml jsonschema sphinxcontrib_httpdomain];
pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix+2−2
@@ -7,11 +7,11 @@
77
88buildPythonPackage rec {
99 pname = "sphinxcontrib-plantuml";
10− version = "0.12";
10+ version = "0.14";
1111
1212 src = fetchPypi {
1313 inherit pname version;
14− sha256 = "95a453e1d912bfdd6a950f8df02f46608154676842d66f8a0d1db0b85a5ddfe5";
14+ sha256 = "504229e943e8ac821cd9d708124bde30041ae9d8341f9ea953866404527f4e82";
1515 };
1616
1717 # No tests included.
pkgs/development/python-modules/sqlmap/default.nix+2−2
@@ -5,11 +5,11 @@
55
66buildPythonPackage rec {
77 pname = "sqlmap";
8− version = "1.2.12";
8+ version = "1.3.2";
99
1010 src = fetchPypi {
1111 inherit pname version;
12− sha256 = "7a099f42358731589851c38e5a90d997490dd6275b39e09f21bdd4df91a24413";
12+ sha256 = "1010623c4c31413fdfdd8b3fe194ab95dfabde1081f3c707d1b2eb56b044a7da";
1313 };
1414
1515 # No tests in archive
pkgs/development/python-modules/sqlobject/default.nix+2−2
@@ -10,11 +10,11 @@
1010
1111buildPythonPackage rec {
1212 pname = "SQLObject";
13− version = "3.7.0";
13+ version = "3.7.1";
1414
1515 src = fetchPypi {
1616 inherit pname version;
17− sha256 = "c0d440b638c091027deea7330bb934188b86402cba552a0bbde0535ed8fdab93";
17+ sha256 = "0f0a5d9430c40b9fa5065e210a7fd3aaabb0713313e72b1b7b7dc4c7d62e43d2";
1818 };
1919
2020 checkInputs = [ pytest ];
pkgs/development/python-modules/srptools/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "srptools";
5− version = "0.2.0";
5+ version = "1.0.0";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "0g0jdkblnd3wv5xgb33g6sfgqnhdcs8a3gqzp5gshq2vawdh8p37";
9+ sha256 = "5754f639ed1888f47c1185d74e8907ff9af4c0ccc1c8be2ef19339d0a1327f4d";
1010 };
1111
1212 propagatedBuildInputs = [ six ];
pkgs/development/python-modules/stripe/default.nix+2−2
@@ -3,7 +3,7 @@
33
44buildPythonPackage rec {
55 pname = "stripe";
6− version = "2.18.0";
6+ version = "2.21.0";
77
88 # Tests require network connectivity and there's no easy way to disable
99 # them. ~ C.
@@ -11,7 +11,7 @@ buildPythonPackage rec {
1111
1212 src = fetchPypi {
1313 inherit pname version;
14− sha256 = "0riqzxvhlbxw62ax89r18qj9nnz7kpbfspyblc8jrbj2jx9xaabr";
14+ sha256 = "170f76f2502888debf02da580138c840497b9359876ca3838f4692f2f02c9110";
1515 };
1616
1717 checkInputs = [ unittest2 mock ];
pkgs/development/python-modules/structlog/default.nix+2−2
@@ -14,11 +14,11 @@
1414
1515buildPythonPackage rec {
1616 pname = "structlog";
17− version = "18.2.0";
17+ version = "19.1.0";
1818
1919 src = fetchPypi {
2020 inherit pname version;
21− sha256 = "e361edb3b9aeaa85cd38a1bc9ddbb60cda8a991fc29de9db26832f6300e81eb4";
21+ sha256 = "5feae03167620824d3ae3e8915ea8589fc28d1ad6f3edf3cc90ed7c7cb33fab5";
2222 };
2323
2424 checkInputs = [ pytest pretend freezegun simplejson twisted ]
pkgs/development/python-modules/tabulate/default.nix+2−2
@@ -5,12 +5,12 @@
55}:
66
77buildPythonPackage rec {
8− version = "0.8.2";
8+ version = "0.8.3";
99 pname = "tabulate";
1010
1111 src = fetchPypi {
1212 inherit pname version;
13− sha256 = "e4ca13f26d0a6be2a2915428dc21e732f1e44dad7f76d7030b2ef1ec251cf7f2";
13+ sha256 = "8af07a39377cee1103a5c8b3330a421c2d99b9141e9cc5ddd2e3263fea416943";
1414 };
1515
1616 checkInputs = [ nose ];
pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix+2−2
@@ -2,13 +2,13 @@
22
33buildPythonPackage rec {
44 pname = "telethon-session-sqlalchemy";
5− version = "0.2.5";
5+ version = "0.2.9.post1";
66
77 disabled = !isPy3k;
88
99 src = fetchPypi {
1010 inherit pname version;
11− sha256 = "b392096b14e5cdc4040d3900cc2be7847b160ed77e5c861a6bd07d75d8e17a85";
11+ sha256 = "bbe6a8ca32dd42aa1830b91f08f0458d728dc9eedca0ca27814a34c0b566100e";
1212 };
1313
1414 propagatedBuildInputs = [
pkgs/development/python-modules/texttable/default.nix+2−2
@@ -5,11 +5,11 @@
55
66buildPythonPackage rec {
77 pname = "texttable";
8− version = "1.6.0";
8+ version = "1.6.1";
99
1010 src = fetchPypi {
1111 inherit pname version;
12− sha256 = "1z3xbijvhh86adg0jk5iv1jvga7cg25q1w12icb3snr5jim9sjv2";
12+ sha256 = "2b60a5304ccfbeac80ffae7350d7c2f5d7a24e9aab5036d0f82489746419d9b2";
1313 };
1414
1515 meta = {
pkgs/development/python-modules/thespian/default.nix+2−2
@@ -1,13 +1,13 @@
11{ fetchPypi, buildPythonPackage, lib }:
22
33buildPythonPackage rec {
4− version = "3.9.5";
4+ version = "3.9.7";
55 pname = "thespian";
66
77 src = fetchPypi {
88 inherit pname version;
99 extension = "zip";
10− sha256 = "4de3d599d898bf22a311248e749bb21920a8b0f6139f80489352bcb950835db2";
10+ sha256 = "fc968325894f812098f4fde4341c1734050bb1b742d8decf62ae9704c761f577";
1111 };
1212
1313 # Do not run the test suite: it takes a long time and uses
pkgs/development/python-modules/tifffile/default.nix+2−2
@@ -6,11 +6,11 @@ buildPythonPackage rec {
66 # 2018.10.18 and 2018.11.6 are not releases...?
77 # https://github.com/blink1073/tifffile/issues/54
88 # anaconda uses 0.15.1
9− version = "0.15.1";
9+ version = "2019.2.10";
1010
1111 src = fetchPypi {
1212 inherit pname version;
13− sha256 = "1fbb2cfd57fd8e42e417bc29001a17f319701f1be00e0b8a0004a52da93f1b08";
13+ sha256 = "ead5f84c0b100f8100377b8ef2bcffaf21c249784ddc240346b715408b45f42c";
1414 };
1515
1616 checkInputs = [ nose ];
pkgs/development/python-modules/tox/default.nix+2−2
@@ -13,7 +13,7 @@
1313
1414buildPythonPackage rec {
1515 pname = "tox";
16− version = "3.5.3";
16+ version = "3.7.0";
1717
1818 buildInputs = [ setuptools_scm ];
1919 propagatedBuildInputs = [ packaging pluggy py six virtualenv toml filelock ];
@@ -22,7 +22,7 @@ buildPythonPackage rec {
2222
2323 src = fetchPypi {
2424 inherit pname version;
25− sha256 = "513e32fdf2f9e2d583c2f248f47ba9886428c949f068ac54a0469cac55df5862";
25+ sha256 = "25ef928babe88c71e3ed3af0c464d1160b01fca2dd1870a5bb26c2dea61a17fc";
2626 };
2727
2828 meta = with lib; {
pkgs/development/python-modules/tqdm/default.nix+5−3
@@ -10,11 +10,11 @@
1010
1111buildPythonPackage rec {
1212 pname = "tqdm";
13− version = "4.28.1";
13+ version = "4.31.1";
1414
1515 src = fetchPypi {
1616 inherit pname version;
17− sha256 = "5b4d5549984503050883bc126280b386f5f4ca87e6c023c5d015655ad75bdebb";
17+ sha256 = "e22977e3ebe961f72362f6ddfb9197cc531c9737aaf5f607ef09740c849ecd05";
1818 };
1919
2020 buildInputs = [ nose coverage glibcLocales flake8 ];
@@ -27,7 +27,9 @@ buildPythonPackage rec {
2727
2828 LC_ALL="en_US.UTF-8";
2929
30− doCheck = !stdenv.isDarwin;
30+# doCheck = !stdenv.isDarwin;
31+ # Test suite is too big and slow.
32+ doCheck = false;
3133
3234 meta = {
3335 description = "A Fast, Extensible Progress Meter";
pkgs/development/python-modules/traits/default.nix+2−2
@@ -9,11 +9,11 @@
99
1010buildPythonPackage rec {
1111 pname = "traits";
12− version = "4.6.0";
12+ version = "5.0.0";
1313
1414 src = fetchPypi {
1515 inherit pname version;
16− sha256 = "0w43qv36wnrimlh0nzzgg81315a18yza3vk494wqxf1l19g390jx";
16+ sha256 = "8369117036fbbe00dbd40e1a01c8775b52bdbfa11db5788168e7c8c56663bac0";
1717 };
1818
1919 # Use pytest because its easier to discover tests
pkgs/development/python-modules/trezor_agent/default.nix+2−2
@@ -12,11 +12,11 @@
1212
1313buildPythonPackage rec{
1414 pname = "trezor_agent";
15− version = "0.9.3";
15+ version = "0.10.0";
1616
1717 src = fetchPypi {
1818 inherit pname version;
19− sha256 = "0c1ef62903534d8b01260dbd6304780e278bc83e0bc21f6a83beee76e48e1580";
19+ sha256 = "e82bf000c1178b1a7612f2a90487eb34c6234d2edb15dc8e310ad875d8298690";
2020 };
2121
2222 propagatedBuildInputs = [ trezor libagent ecdsa ed25519 mnemonic keepkey semver ];
pkgs/development/python-modules/trio/default.nix+2−2
@@ -15,12 +15,12 @@
1515
1616buildPythonPackage rec {
1717 pname = "trio";
18− version = "0.10.0";
18+ version = "0.11.0";
1919 disabled = pythonOlder "3.5";
2020
2121 src = fetchPypi {
2222 inherit pname version;
23− sha256 = "1c1snnhjg8l87ygf5p9z2qjcq090mws5w7pr9aaiava0yqawq8yk";
23+ sha256 = "3796774aedbf5be581c68f98c79b565654876de6e9a01c6a95e3ec6cd4e4b4c3";
2424 };
2525
2626 checkInputs = [ pytest pyopenssl trustme jedi pylint ];
pkgs/development/python-modules/trollius/default.nix+2
@@ -17,6 +17,8 @@ buildPythonPackage rec {
1717 ./tests.patch
1818 ];
1919
20+ disabled = isPy3k;
21+
2022 postPatch = ''
2123 # Overrides PYTHONPATH causing dependencies not to be found
2224 sed -i -e "s|test_env_var_debug|skip_test_env_var_debug|g" tests/test_tasks.py
pkgs/development/python-modules/trustme/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "trustme";
5− version = "0.4.0";
5+ version = "0.5.0";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "1215vr6l6c0fzsv5gyay82fxd4fidvq2rd94wvjrljs6h2wajazk";
9+ sha256 = "89b8d689013afeaa34b63e77f6d60eebad63edc4b247e744c7d6d891ed13a564";
1010 };
1111
1212 checkInputs = [ pytest pyopenssl service-identity ];
pkgs/development/python-modules/twine/default.nix+2−2
@@ -11,11 +11,11 @@
1111
1212buildPythonPackage rec {
1313 pname = "twine";
14− version = "1.12.1";
14+ version = "1.13.0";
1515
1616 src = fetchPypi {
1717 inherit pname version;
18− sha256 = "7d89bc6acafb31d124e6e5b295ef26ac77030bf098960c2a4c4e058335827c5c";
18+ sha256 = "d6c29c933ecfc74e9b1d9fa13aa1f87c5d5770e119f5a4ce032092f0ff5b14dc";
1919 };
2020
2121 propagatedBuildInputs = [ pkginfo requests requests_toolbelt tqdm pyblake2 readme_renderer ];
pkgs/development/python-modules/twitter-common-collections/default.nix+2−2
@@ -6,11 +6,11 @@
66
77buildPythonPackage rec {
88 pname = "twitter.common.collections";
9− version = "0.3.9";
9+ version = "0.3.10";
1010
1111 src = fetchPypi {
1212 inherit pname version;
13− sha256 = "0wf8ks6y2kalx2inzayq0w4kh3kg25daik1ac7r6y79i03fslsc5";
13+ sha256 = "c27f11612572f614cadf181cc65bcd0275d8b08f182bcb4ea1b74cd662625f21";
1414 };
1515
1616 propagatedBuildInputs = [ twitter-common-lang ];
pkgs/development/python-modules/twitter-common-confluence/default.nix+2−2
@@ -6,11 +6,11 @@
66
77buildPythonPackage rec {
88 pname = "twitter.common.confluence";
9− version = "0.3.9";
9+ version = "0.3.10";
1010
1111 src = fetchPypi {
1212 inherit pname version;
13− sha256 = "1i2fjn23cmms81f1fhvvkg6hgzqpw07dlqg3ydz6cqv2glw7zq26";
13+ sha256 = "8285cab3d31e4065a13575c1920101db4df0f36a59babcc225775e4fae91c0a1";
1414 };
1515
1616 propagatedBuildInputs = [ twitter-common-log ];
pkgs/development/python-modules/twitter-common-dirutil/default.nix+2−2
@@ -6,11 +6,11 @@
66
77buildPythonPackage rec {
88 pname = "twitter.common.dirutil";
9− version = "0.3.9";
9+ version = "0.3.10";
1010
1111 src = fetchPypi {
1212 inherit pname version;
13− sha256 = "1wpjfmmxsdwnbx5dl13is4zkkpfcm94ksbzas9y2qhgswfa9jqha";
13+ sha256 = "748b471bb2dd78f14e39d796cb01407aa8b61dda95808543404d5da50385efaf";
1414 };
1515
1616 propagatedBuildInputs = [ twitter-common-lang ];
pkgs/development/python-modules/twitter-common-lang/default.nix+2−2
@@ -5,11 +5,11 @@
55
66buildPythonPackage rec {
77 pname = "twitter.common.lang";
8− version = "0.3.9";
8+ version = "0.3.10";
99
1010 src = fetchPypi {
1111 inherit pname version;
12− sha256 = "1l8fmnsrx7hgg3ivslg588rnl9n1gfjn2w6224fr8rs7zmkd5lan";
12+ sha256 = "9cd2d05a7f45c50c76c99024b3cad180bec42b0c65dfdc1f8ddc731bdd3b3af8";
1313 };
1414
1515 meta = with stdenv.lib; {
pkgs/development/python-modules/twitter-common-log/default.nix+2−2
@@ -7,11 +7,11 @@
77
88buildPythonPackage rec {
99 pname = "twitter.common.log";
10− version = "0.3.9";
10+ version = "0.3.10";
1111
1212 src = fetchPypi {
1313 inherit pname version;
14− sha256 = "1bdzbxx2bxwpf57xaxfz1nblzgfvhlidz8xqd7s84c62r3prh02v";
14+ sha256 = "81af4b0f51f3fb589f39b410d7031da6792e0ae650a45e9207a25a52a343a555";
1515 };
1616
1717 propagatedBuildInputs = [ twitter-common-options twitter-common-dirutil ];
pkgs/development/python-modules/twitter-common-options/default.nix+2−2
@@ -5,11 +5,11 @@
55
66buildPythonPackage rec {
77 pname = "twitter.common.options";
8− version = "0.3.9";
8+ version = "0.3.10";
99
1010 src = fetchPypi {
1111 inherit pname version;
12− sha256 = "0d1czag5mcxg0vcnlklspl2dvdab9kmznsycj04d3vggi158ljrd";
12+ sha256 = "9eeaf078462afdfa5ba237727c908a8b3b8b28d172838dbe58d3addf722da6c8";
1313 };
1414
1515 meta = with stdenv.lib; {
pkgs/development/python-modules/txaio/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, buildPythonPackage, fetchPypi, pytest, mock, six, twisted,isPy37 }:
1+{ stdenv, buildPythonPackage, fetchPypi, pytest_3, mock, six, twisted,isPy37 }:
22
33buildPythonPackage rec {
44 pname = "txaio";
@@ -9,7 +9,7 @@ buildPythonPackage rec {
99 sha256 = "67e360ac73b12c52058219bb5f8b3ed4105d2636707a36a7cdafb56fe06db7fe";
1010 };
1111
12− checkInputs = [ pytest mock ];
12+ checkInputs = [ pytest_3 mock ];
1313
1414 propagatedBuildInputs = [ six twisted ];
1515
pkgs/development/python-modules/typed-ast/default.nix+2−2
@@ -1,10 +1,10 @@
11{ buildPythonPackage, fetchPypi, lib, pythonOlder }:
22buildPythonPackage rec {
33 pname = "typed-ast";
4− version = "1.1.2";
4+ version = "1.3.1";
55 src = fetchPypi{
66 inherit pname version;
7− sha256 = "4304399ff89452871348f6fb7a7112454cd508fbe3eb49b5ed711cce9b99fe9e";
7+ sha256 = "606d8afa07eef77280c2bf84335e24390055b478392e1975f96286d99d0cb424";
88 };
99 # Only works with Python 3.3 and newer;
1010 disabled = pythonOlder "3.3";
pkgs/development/python-modules/uproot-methods/default.nix+2−2
@@ -6,12 +6,12 @@
66}:
77
88buildPythonPackage rec {
9− version = "0.2.11";
9+ version = "0.4.3";
1010 pname = "uproot-methods";
1111
1212 src = fetchPypi {
1313 inherit pname version;
14− sha256 = "289b9b4a58511f35ab4783bb37cdc922eba75d1886e0eb1be136cc861eff7b66";
14+ sha256 = "f90d91a613a875ebdf214f0f6f3fd0f8beea9125fc35e54f334d6104fe47c87d";
1515 };
1616
1717 propagatedBuildInputs = [ numpy awkward ];
pkgs/development/python-modules/uproot/default.nix+2−2
@@ -15,11 +15,11 @@
1515
1616buildPythonPackage rec {
1717 pname = "uproot";
18− version = "3.2.15";
18+ version = "3.4.6";
1919
2020 src = fetchPypi {
2121 inherit pname version;
22− sha256 = "a871f57529e3df170aa5556c1353a64077277644baecabb18d042954f2af9030";
22+ sha256 = "1fafe476c26252e4dbd399456323778e76d23dc2f43cf6581a707d1647978610";
2323 };
2424
2525 buildInputs = [ pytestrunner ];
pkgs/development/python-modules/vega_datasets/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "vega_datasets";
5− version = "0.5.0";
5+ version = "0.7.0";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "1fa672ba89ded093b30c6d59fce10aca3ac7c927df254e588da7b6d14f695181";
9+ sha256 = "20d490b417f84607eb5079400f608f2e9c135b7092bee10f6857f6d23136e459";
1010 };
1111
1212 propagatedBuildInputs = [ pandas ];
pkgs/development/python-modules/venusian/default.nix+2−2
@@ -6,11 +6,11 @@
66
77buildPythonPackage rec {
88 pname = "venusian";
9− version = "1.1.0";
9+ version = "1.2.0";
1010
1111 src = fetchPypi {
1212 inherit pname version;
13− sha256 = "9902e492c71a89a241a18b2f9950bea7e41d025cc8f3af1ea8d8201346f8577d";
13+ sha256 = "64ec8285b80b110d0ae5db4280e90e31848a59db98db1aba4d7d46f48ce91e3e";
1414 };
1515
1616 checkInputs = [ pytest ];
pkgs/development/python-modules/vidstab/default.nix+2−2
@@ -10,12 +10,12 @@
1010}:
1111
1212buildPythonPackage rec {
13− version = "1.0.1";
13+ version = "1.5.6";
1414 pname = "vidstab";
1515
1616 src = fetchPypi {
1717 inherit pname version;
18− sha256 = "31b45fa6c6c726ee05c4e106d95682f17258750d09e2e1c880bbccbf866f323e";
18+ sha256 = "6b488aed337855ac8b3730f7c6964c2ad41111a8f61ab0b457197696feefa593";
1919 };
2020
2121 checkInputs = [ pytest ];
pkgs/development/python-modules/virtualenv-clone/default.nix+2−2
@@ -7,11 +7,11 @@
77
88buildPythonPackage rec {
99 pname = "virtualenv-clone";
10− version = "0.2.6";
10+ version = "0.5.1";
1111
1212 src = fetchPypi {
1313 inherit pname version;
14− sha256 = "6b3be5cab59e455f08c9eda573d23006b7d6fb41fae974ddaa2b275c93cc4405";
14+ sha256 = "217bd3f0880c9f85672c0bcc9ad9e0354ab7dfa89c2f117e63aa878b4279f5bf";
1515 };
1616
1717 buildInputs = [ pytest ];
pkgs/development/python-modules/virtualenv/default.nix+2−2
@@ -6,11 +6,11 @@
66
77buildPythonPackage rec {
88 pname = "virtualenv";
9− version = "16.1.0";
9+ version = "16.4.1";
1010
1111 src = fetchPypi {
1212 inherit pname version;
13− sha256 = "f899fafcd92e1150f40c8215328be38ff24b519cd95357fa6e78e006c7638208";
13+ sha256 = "5a3ecdfbde67a4a3b3111301c4d64a5b71cf862c8c42958d30cf3253df1f29dd";
1414 };
1515
1616 # Doubt this is needed - FRidh 2017-07-07
pkgs/development/python-modules/virtualenv/virtualenv-change-prefix.patch+12−12
@@ -13,17 +13,17 @@ it will only add the path to the python used when building
1313available.
1414
1515
16−diff --git a/src/virtualenv.py b/src/virtualenv.py
17−index 4b57cde..afda73f 100755
18−--- a/src/virtualenv.py
19−+++ b/src/virtualenv.py
20−@@ -1071,20 +1071,7 @@ def path_locations(home_dir, dry_run=False):
16+diff --git a/virtualenv.py b/virtualenv.py
17+index bcf3225..3530997 100755
18+--- a/virtualenv.py
19++++ b/virtualenv.py
20+@@ -1163,20 +1163,7 @@ def path_locations(home_dir, dry_run=False):
2121
2222
2323 def change_prefix(filename, dst_prefix):
2424- prefixes = [sys.prefix]
2525-
26−- if is_darwin:
26+- if IS_DARWIN:
2727- prefixes.extend(
2828- (
2929- os.path.join("/Library/Python", sys.version[:3], "site-packages"),
@@ -39,16 +39,16 @@ index 4b57cde..afda73f 100755
3939
4040 if hasattr(sys, "real_prefix"):
4141 prefixes.append(sys.real_prefix)
42−@@ -1107,6 +1094,8 @@ def change_prefix(filename, dst_prefix):
42+@@ -1199,6 +1186,8 @@ def change_prefix(filename, dst_prefix):
4343 if src_prefix != os.sep: # sys.prefix == "/"
44− assert relpath[0] == os.sep
45− relpath = relpath[1:]
44+ assert relative_path[0] == os.sep
45+ relative_path = relative_path[1:]
4646+ if src_prefix == "/nix/store":
47−+ relpath = "/".join(relpath.split("/")[1:])
48− return join(dst_prefix, relpath)
47++ relative_path = "/".join(relative_path.split("/")[1:])
48+ return join(dst_prefix, relative_path)
4949 assert False, "Filename {} does not start with any of these prefixes: {}".format(filename, prefixes)
5050
51−@@ -1233,6 +1222,11 @@ def install_python(home_dir, lib_dir, inc_dir, bin_dir, site_packages, clear, sy
51+@@ -1375,6 +1364,11 @@ def install_python(home_dir, lib_dir, inc_dir, bin_dir, site_packages, clear, sy
5252 site_filename_dst = change_prefix(site_filename, home_dir)
5353 site_dir = os.path.dirname(site_filename_dst)
5454 writefile(site_filename_dst, SITE_PY)
pkgs/development/python-modules/virtualenvwrapper/default.nix+2−2
@@ -12,11 +12,11 @@
1212
1313buildPythonPackage rec {
1414 pname = "virtualenvwrapper";
15− version = "4.8.2";
15+ version = "4.8.4";
1616
1717 src = fetchPypi {
1818 inherit pname version;
19− sha256 = "18d8e4c500c4c4ee794f704e050cf2bbb492537532a4521d1047e7dd1ee4e374";
19+ sha256 = "51a1a934e7ed0ff221bdd91bf9d3b604d875afbb3aa2367133503fee168f5bfa";
2020 };
2121
2222 # pip depend on $HOME setting
pkgs/development/python-modules/voluptuous-serialize/default.nix+2−2
@@ -2,13 +2,13 @@
22
33buildPythonPackage rec {
44 pname = "voluptuous-serialize";
5− version = "2.0.0";
5+ version = "2.1.0";
66
77 disabled = !isPy3k;
88
99 src = fetchPypi {
1010 inherit pname version;
11− sha256 = "44be04d87aec34bd7d31ab539341fadc505205f2299031ed9be985112c21aa41";
11+ sha256 = "d30fef4f1aba251414ec0b315df81a06da7bf35201dcfb1f6db5253d738a154f";
1212 };
1313
1414 propagatedBuildInputs = [
pkgs/development/python-modules/waitress/default.nix+2−2
@@ -5,11 +5,11 @@
55
66buildPythonPackage rec {
77 pname = "waitress";
8− version = "1.1.0";
8+ version = "1.2.1";
99
1010 src = fetchPypi {
1111 inherit pname version;
12− sha256 = "d33cd3d62426c0f1b3cd84ee3d65779c7003aae3fc060dee60524d10a57f05a9";
12+ sha256 = "c369e238bd81ef7d61f04825f06f107c42094de60d13d8de8e71952c7c683dfe";
1313 };
1414
1515 doCheck = false;
pkgs/development/python-modules/wheel/default.nix+2−2
@@ -9,11 +9,11 @@
99
1010buildPythonPackage rec {
1111 pname = "wheel";
12− version = "0.32.3";
12+ version = "0.33.1";
1313
1414 src = fetchPypi {
1515 inherit pname version;
16− sha256 = "029703bf514e16c8271c3821806a1c171220cc5bdd325cbf4e7da1e056a01db6";
16+ sha256 = "66a8fd76f28977bb664b098372daef2b27f60dc4d1688cfab7b37a09448f0e9d";
1717 };
1818
1919 checkInputs = [ pytest pytestcov coverage ];
pkgs/development/python-modules/whoosh/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, buildPythonPackage, fetchPypi, pytest }:
1+{ stdenv, buildPythonPackage, fetchPypi, pytest_3 }:
22
33buildPythonPackage rec {
44 pname = "Whoosh";
@@ -8,7 +8,7 @@ buildPythonPackage rec {
88 sha256 = "10qsqdjpbc85fykc1vgcs8xwbgn4l2l52c8d83xf1q59pwyn79bw";
99 };
1010
11− checkInputs = [ pytest ];
11+ checkInputs = [ pytest_3 ];
1212
1313 # Wrong encoding
1414 postPatch = ''
pkgs/development/python-modules/wrapt/default.nix+2−2
@@ -5,14 +5,14 @@
55
66buildPythonPackage rec {
77 pname = "wrapt";
8− version = "1.10.11";
8+ version = "1.11.1";
99
1010 # No tests in archive
1111 doCheck = false;
1212
1313 src = fetchPypi {
1414 inherit pname version;
15− sha256 = "d4d560d479f2c21e1b5443bbd15fe7ec4b37fe7e53d335d3b9b0a7b1226fe3c6";
15+ sha256 = "4aea003270831cceb8a90ff27c4031da6ead7ec1886023b80ce0dfe0adf61533";
1616 };
1717
1818 meta = {
pkgs/development/python-modules/wsproto/default.nix+9−3
@@ -1,14 +1,20 @@
1−{ buildPythonPackage, fetchPypi, h11, enum34 }:
1+{ buildPythonPackage, fetchPypi, h11, enum34, pytest }:
22
33buildPythonPackage rec {
44 pname = "wsproto";
5− version = "0.12.0";
5+ version = "0.13.0";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "1fcb726d448f1b9bcbea884e26621af5ddd01d2d502941a024f4c727828b6009";
9+ sha256 = "fd6020d825022247053400306448e161d8740bdd52e328e5553cd9eee089f705";
1010 };
1111
1212 propagatedBuildInputs = [ h11 enum34 ];
1313
14+ checkInputs = [ pytest ];
15+
16+ checkPhase = ''
17+ py.test
18+ '';
19+
1420}
pkgs/development/python-modules/wurlitzer/default.nixnew file+28
@@ -0,0 +1,28 @@
1+{ lib
2+, buildPythonPackage
3+, fetchPypi
4+, mock
5+, pytest
6+}:
7+
8+buildPythonPackage rec {
9+ pname = "wurlitzer";
10+ version = "1.0.2";
11+
12+ src = fetchPypi {
13+ inherit pname version;
14+ sha256 = "23e85af0850b98add77bef0a1eb47b243baab29160131d349234c9dfc9e57add";
15+ };
16+
17+ checkInputs = [ mock pytest ];
18+
19+ checkPhase = ''
20+ py.test test.py
21+ '';
22+
23+ meta = {
24+ description = "Capture C-level output in context managers";
25+ homepage = https://github.com/minrk/wurlitzer;
26+ license = lib.licenses.mit;
27+ };
28+}
pkgs/development/python-modules/xkcdpass/default.nix+2−2
@@ -5,11 +5,11 @@
55
66buildPythonPackage rec {
77 pname = "xkcdpass";
8− version = "1.16.5";
8+ version = "1.17.2";
99
1010 src = fetchPypi {
1111 inherit pname version;
12− sha256 = "62961d24466964f4770bdbdbcca9ebdb148d0bdb48a8329c7bf41e9317dbb9d4";
12+ sha256 = "ae7ad57c0287cc41c8c9f164b59296463f2e009d4b7aed382160cb40dfb4d91b";
1313 };
1414
1515 # No tests included
pkgs/development/python-modules/xlrd/default.nix+5−5
@@ -1,22 +1,22 @@
11{ stdenv
22, buildPythonPackage
33, fetchPypi
4−, nose
4+, pytest
55}:
66
77buildPythonPackage rec {
88 pname = "xlrd";
9− version = "1.1.0";
9+ version = "1.2.0";
1010
1111 src = fetchPypi {
1212 inherit pname version;
13− sha256 = "8a21885513e6d915fe33a8ee5fdfa675433b61405ba13e2a69e62ee36828d7e2";
13+ sha256 = "546eb36cee8db40c3eaa46c351e67ffee6eeb5fa2650b71bc4c758a29a1b29b2";
1414 };
1515
16− checkInputs = [ nose ];
16+ checkInputs = [ pytest ];
1717
1818 checkPhase = ''
19− nosetests -v
19+ py.test -k "not test_tilde_path_expansion"
2020 '';
2121
2222 meta = with stdenv.lib; {
pkgs/development/python-modules/xml2rfc/default.nix+2−2
@@ -4,11 +4,11 @@
44
55buildPythonPackage rec {
66 pname = "xml2rfc";
7− version = "2.12.3";
7+ version = "2.18.0";
88
99 src = fetchPypi {
1010 inherit pname version;
11− sha256 = "64609a2194d18c03e2348f1ea2fb97208b3455dfb76a16900143813aa61b6d3c";
11+ sha256 = "e192236798615f34479a9bb9f30df72ce0e5f319df75ecc0473d896713a17451";
1212 };
1313
1414 propagatedBuildInputs = [
pkgs/development/python-modules/xmltodict/default.nix+2−2
@@ -7,11 +7,11 @@
77
88buildPythonPackage rec {
99 pname = "xmltodict";
10− version = "0.11.0";
10+ version = "0.12.0";
1111
1212 src = fetchPypi {
1313 inherit pname version;
14− sha256 = "8f8d7d40aa28d83f4109a7e8aa86e67a4df202d9538be40c0cb1d70da527b0df";
14+ sha256 = "50d8c638ed7ecb88d90561beedbf720c9b4e851a9fa6c47ebd64e99d166d8a21";
1515 };
1616
1717 checkInputs = [ coverage nose ];
pkgs/development/python-modules/xstatic-bootstrap/default.nix+2−2
@@ -5,11 +5,11 @@
55
66buildPythonPackage rec {
77 pname = "XStatic-Bootstrap";
8− version = "4.1.3.1";
8+ version = "3.3.7.1";
99
1010 src = fetchPypi {
1111 inherit version pname;
12− sha256 = "1800e6bb5fc687604d8a893eee8c7882d800a6f3d6721799016f99a47d1dac0f";
12+ sha256 = "0c949e78e8cd77983fd803a68a98df0124e0c3a872fddb9ac8e6e5b4a487f131";
1313 };
1414
1515 # no tests implemented
pkgs/development/python-modules/yamllint/default.nix+2−2
@@ -3,11 +3,11 @@
33
44buildPythonPackage rec {
55 pname = "yamllint";
6− version = "1.14.0";
6+ version = "1.15.0";
77
88 src = fetchPypi {
99 inherit pname version;
10− sha256 = "0x9ansmhqvc3rj0nbhpl0jdqr5pk6qdxf7i6r4gr0hzqr50vdaf0";
10+ sha256 = "8f25759997acb42e52b96bf3af0b4b942e6516b51198bebd3402640102006af7";
1111 };
1212
1313 checkInputs = [ nose ];
pkgs/development/python-modules/yapf/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "yapf";
5− version = "0.25.0";
5+ version = "0.26.0";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "0mbdyhqwlm4pcd0wr5haxypxm0kr8y46nc17696xmd4pvfmzk9wa";
9+ sha256 = "edb47be90a56ca6f3075fe24f119a22225fbd62c66777b5d3916a7e9e793891b";
1010 };
1111
1212 meta = with stdenv.lib; {
pkgs/development/python-modules/yattag/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "yattag";
5− version = "1.10.1";
5+ version = "1.11.1";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "0r3pwfygvpkgc0hzxc6z8dl56g6brlh52r0x8kcjhywr1biahqb2";
9+ sha256 = "94210945c868f696a31812a510c01724d61c9a4d279eb4adf340c0d2a4c0bfd7";
1010 };
1111
1212 meta = with lib; {
pkgs/development/python-modules/zconfig/default.nix+2−2
@@ -8,11 +8,11 @@
88
99buildPythonPackage rec {
1010 pname = "ZConfig";
11− version = "3.3.0";
11+ version = "3.4.0";
1212
1313 src = fetchPypi {
1414 inherit pname version;
15− sha256 = "22d7fd3b8b12405f4856898995fd69e40bbe239c4c689502ee6d766a7368f585";
15+ sha256 = "560f779c7dcca0593083cbdb3fac9bfc7974cd5061363e2254844192e5644998";
1616 };
1717
1818 patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ./remove-setlocale-test.patch;
pkgs/development/python-modules/zm-py/default.nix+2−2
@@ -3,11 +3,11 @@
33
44buildPythonPackage rec {
55 pname = "zm-py";
6− version = "0.3.0";
6+ version = "0.3.3";
77
88 src = fetchPypi {
99 inherit pname version;
10− sha256 = "1hq83svprd21r74palhs3xq15g34135349y4lrgr7c76i3f37j2q";
10+ sha256 = "7cac73bd4f5e729fd8b3cff6f456652c3fd76b1a11f5d539bc7e14ffc7a87e9a";
1111 };
1212
1313 disabled = !isPy3k;
pkgs/development/python-modules/zope_configuration/default.nix+2−2
@@ -10,11 +10,11 @@
1010
1111buildPythonPackage rec {
1212 pname = "zope.configuration";
13− version = "4.3.0";
13+ version = "4.3.1";
1414
1515 src = fetchPypi {
1616 inherit pname version;
17− sha256 = "ddd162b7b9379c0f5cc060cbf2af44133396b7d26eaee9c7cf6e196d87e9aeb3";
17+ sha256 = "6e16747f9fd6b9d8f09d78edf2a6f539cad0fa4ad49d8deb9cf63447cc4168e1";
1818 };
1919
2020 checkInputs = [ zope_testrunner manuel ];
pkgs/development/python-modules/zope_deprecation/default.nix+2−2
@@ -6,11 +6,11 @@
66
77buildPythonPackage rec {
88 pname = "zope.deprecation";
9− version = "4.3.0";
9+ version = "4.4.0";
1010
1111 src = fetchPypi {
1212 inherit pname version;
13− sha256 = "7d52e134bbaaa0d72e1e2bc90f0587f1adc116c4bdf15912afaf2f1e8856b224";
13+ sha256 = "0d453338f04bacf91bbfba545d8bcdf529aa829e67b705eac8c1a7fdce66e2df";
1414 };
1515
1616 buildInputs = [ zope_testing ];
pkgs/development/python-modules/zope_i18n/default.nix+2−2
@@ -7,11 +7,11 @@
77
88buildPythonPackage rec {
99 pname = "zope.i18n";
10− version = "4.6.1";
10+ version = "4.6.2";
1111
1212 src = fetchPypi {
1313 inherit pname version;
14− sha256 = "14f7339f6d4fed5e94882a7f1b2e40fd90ad00b3c28a7f4353762101395e3304";
14+ sha256 = "229de41f751dae36b1ef9fa284bc548ef40169234bf0d2199e41581e16304621";
1515 };
1616
1717 propagatedBuildInputs = [ pytz zope_component ];
pkgs/development/tools/build-managers/cmake/application-services.patch+37−3
@@ -1,6 +1,24 @@
1−diff -ur cmake-3.12.1/Source/cmGlobalXCodeGenerator.cxx cmake-3.12.1-patched/Source/cmGlobalXCodeGenerator.cxx
2−--- cmake-3.12.1/Source/cmGlobalXCodeGenerator.cxx 2018-08-09 21:14:08.000000000 +0900
3−+++ cmake-3.12.1-patched/Source/cmGlobalXCodeGenerator.cxx 2018-08-12 02:47:28.719691934 +0900
1+diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
2+index 8aff8f6..af1852d 100644
3+--- a/Source/CMakeLists.txt
4++++ b/Source/CMakeLists.txt
5+@@ -791,12 +791,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR MATCHES "sparc"
6+ endif()
7+ endif()
8+
9+-# On Apple we need CoreFoundation and CoreServices
10+-if(APPLE)
11+- target_link_libraries(CMakeLib "-framework CoreFoundation")
12+- target_link_libraries(CMakeLib "-framework CoreServices")
13+-endif()
14+-
15+ if(WIN32 AND NOT UNIX)
16+ # We need the rpcrt4 library on Windows.
17+ # We need the crypt32 library on Windows for crypto/cert APIs.
18+diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
19+index e353a37..b06f842 100644
20+--- a/Source/cmGlobalXCodeGenerator.cxx
21++++ b/Source/cmGlobalXCodeGenerator.cxx
422@@ -35,11 +35,6 @@
523
624 struct cmLinkImplementation;
@@ -13,3 +31,19 @@ diff -ur cmake-3.12.1/Source/cmGlobalXCodeGenerator.cxx cmake-3.12.1-patched/Sou
1331 #if defined(CMAKE_BUILD_WITH_CMAKE)
1432 # include "cmXMLParser.h"
1533
34+diff --git a/Utilities/cmlibarchive/CMakeLists.txt b/Utilities/cmlibarchive/CMakeLists.txt
35+index d7af6e2..d4808fc 100644
36+--- a/Utilities/cmlibarchive/CMakeLists.txt
37++++ b/Utilities/cmlibarchive/CMakeLists.txt
38+@@ -1662,11 +1662,6 @@ IF(MSVC)
39+ ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE)
40+ ENDIF(MSVC)
41+
42+-# We need CoreServices on Mac OS.
43+-IF(APPLE)
44+- LIST(APPEND ADDITIONAL_LIBS "-framework CoreServices")
45+-ENDIF(APPLE)
46+-
47+ add_subdirectory(libarchive)
48+
49+ install(FILES COPYING DESTINATION ${CMAKE_DOC_DIR}/cmlibarchive)
pkgs/development/tools/build-managers/cmake/default.nix+16−11
@@ -1,7 +1,8 @@
11{ stdenv, fetchurl, fetchpatch, pkgconfig
22, bzip2, curl, expat, libarchive, xz, zlib, libuv, rhash
3+, buildPackages
34# darwin attributes
4−, ps
5+, cf-private, ps
56, isBootstrap ? false
67, useSharedLibraries ? (!isBootstrap && !stdenv.isCygwin)
78, useNcurses ? false, ncurses
@@ -16,10 +17,10 @@ with stdenv.lib;
1617
1718let
1819 os = stdenv.lib.optionalString;
19− majorVersion = "3.12";
20− minorVersion = "1";
21− # from https://cmake.org/files/v3.12/cmake-3.12.1-SHA-256.txt
22− sha256 = "1ckswlaid3p2is1a80fmr4hgwpfsiif66giyx1z9ayhxx0n5qgf5";
20+ majorVersion = "3.13";
21+ minorVersion = "4";
22+ # from https://cmake.org/files/v3.13/cmake-3.13.4-SHA-256.txt for cmake-3.13.4.tar.gz
23+ sha256 = "fdd928fee35f472920071d1c7f1a6a2b72c9b25e04f7a37b409349aef3f20e9b";
2324 version = "${majorVersion}.${minorVersion}";
2425in
2526
@@ -33,11 +34,6 @@ stdenv.mkDerivation rec {
3334 inherit sha256;
3435 };
3536
36− prePatch = optionalString (!useSharedLibraries) ''
37− substituteInPlace Utilities/cmlibarchive/CMakeLists.txt \
38− --replace '"-framework CoreServices"' '""'
39− '';
40−
4137 patches = [
4238 # Don't search in non-Nix locations such as /usr, but do search in our libc.
4339 ./search-path.patch
@@ -56,11 +52,14 @@ stdenv.mkDerivation rec {
5652
5753 buildInputs =
5854 [ setupHook pkgconfig ]
55+ ++ optional stdenv.isDarwin cf-private # needed for CFBundleCopyExecutableURL
5956 ++ optionals useSharedLibraries [ bzip2 curl expat libarchive xz zlib libuv rhash ]
6057 ++ optional useNcurses ncurses
6158 ++ optional useQt4 qt4
6259 ++ optional withQt5 qtbase;
6360
61+ depsBuildBuild = [ buildPackages.stdenv.cc ];
62+
6463 propagatedBuildInputs = optional stdenv.isDarwin ps;
6564
6665 preConfigure = ''
@@ -71,7 +70,8 @@ stdenv.mkDerivation rec {
7170 --subst-var-by libc_lib ${getLib stdenv.cc.libc}
7271 substituteInPlace Modules/FindCxxTest.cmake \
7372 --replace "$""{PYTHON_EXECUTABLE}" ${stdenv.shell}
74− configureFlags="--parallel=''${NIX_BUILD_CORES:-1} $configureFlags"
73+ # BUILD_CC and BUILD_CXX are used to bootstrap cmake
74+ configureFlags="--parallel=''${NIX_BUILD_CORES:-1} CC=$BUILD_CC CXX=$BUILD_CXX $configureFlags"
7575 '';
7676
7777 configureFlags = [
@@ -95,6 +95,11 @@ stdenv.mkDerivation rec {
9595 # Avoid depending on frameworks.
9696 ++ optional (!useNcurses) "-DBUILD_CursesDialog=OFF";
9797
98+ # make install attempts to use the just-built cmake
99+ preInstall = optional (stdenv.hostPlatform != stdenv.buildPlatform) ''
100+ sed -i 's|bin/cmake|${buildPackages.cmake}/bin/cmake|g' Makefile
101+ '';
102+
98103 dontUseCmakeConfigure = true;
99104 enableParallelBuilding = true;
100105
pkgs/development/tools/build-managers/ninja/default.nix+7
@@ -20,6 +20,13 @@ stdenv.mkDerivation rec {
2020 url = "https://github.com/ninja-build/ninja/commit/9aa947471fcfc607bec6d92a1a6eed5c692edbaf.patch";
2121 sha256 = "0zsg46jflsh644jccrcgyfalr7fkzrv041kyi8644nyk923gcrl9";
2222 })
23+ # https://github.com/ninja-build/ninja/issues/1510 - fix w/musl, possibly BSDs?
24+ #
25+ (fetchpatch {
26+ name = "fix-issue-1510.patch";
27+ url = https://github.com/makepost/ninja/commit/567815df38a2ff54ad7478a90bd75c91e434236a.patch;
28+ sha256 = "0zd0xyi7h2066nw1dsk76c7yf71b0f7v4p5nljda7jxi01vpdh69";
29+ })
2330 ];
2431
2532 nativeBuildInputs = [ python re2c ] ++ optionals buildDocs [ asciidoc docbook_xml_dtd_45 docbook_xsl libxslt.bin ];
pkgs/development/tools/build-managers/pants/default.nix+7−7
@@ -3,21 +3,21 @@
33with stdenv.lib;
44with pythonPackages;
55
6−let
7− version = "1.7.0";
8−in buildPythonApplication rec {
9− inherit version;
6+buildPythonApplication rec {
107 pname = "pantsbuild.pants";
11− name = "${pname}-${version}";
8+ version = "1.7.0";
129
1310 src = fetchPypi {
1411 inherit pname version;
1512 sha256 = "1d7ff1383287c8e72f2c9855cfef982d362274a64e2707a93c070f988ba80a37";
1613 };
1714
15+ # No tests
16+ doCheck = false;
17+
1818 prePatch = ''
1919 sed -E -i "s/'([[:alnum:].-]+)[=><][[:digit:]=><.,]*'/'\\1'/g" setup.py
20− substituteInPlace setup.py --replace "requests[security]<2.19,>=2.5.0" "requests[security]<2.20,>=2.5.0"
20+ substituteInPlace setup.py --replace "requests[security]<2.19,>=2.5.0" "requests[security]<2.22,>=2.5.0"
2121 '';
2222
2323 # Unnecessary, and causes some really weird behavior around .class files, which
@@ -36,6 +36,6 @@ in buildPythonApplication rec {
3636 homepage = "https://www.pantsbuild.org/";
3737 license = licenses.asl20;
3838 maintainers = with maintainers; [ copumpkin ];
39− platforms = platforms.unix;
39+ broken = true;
4040 };
4141}
pkgs/development/tools/devpi-client/default.nix+1−1
@@ -17,7 +17,7 @@ pythonPackages.buildPythonApplication rec {
1717 };
1818
1919 checkInputs = with pythonPackages; [
20− pytest pytestflakes webtest mock
20+ pytest pytest-flakes webtest mock
2121 devpi-server tox
2222 sphinx wheel git mercurial detox
2323 setuptools
pkgs/development/tools/misc/d-feet/default.nix+1−1
@@ -14,7 +14,7 @@ in python3Packages.buildPythonApplication rec {
1414 };
1515
1616 nativeBuildInputs = [ pkgconfig itstool intltool wrapGAppsHook libxml2 ];
17− buildInputs = [ glib gtk3 gnome3.defaultIconTheme libwnck3 gobject-introspection ];
17+ buildInputs = [ glib gtk3 gnome3.adwaita-icon-theme libwnck3 gobject-introspection ];
1818
1919 propagatedBuildInputs = with python3Packages; [ pygobject3 pep8 ];
2020
pkgs/development/tools/parsing/bison/3.x.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "bison";
5− version = "3.3.1";
5+ version = "3.3.2";
66
77 src = fetchurl {
88 url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";
9− sha256 = "0sz6rzmfz5scian0a28lrvkrsd0108dmxrxpqh4nyi2ahlglbma1";
9+ sha256 = "1lfvns1f6xamz9905fakzkxh4zmk1wa9w33vxcq78fc5841ivnhg";
1010 };
1111
1212 nativeBuildInputs = [ m4 perl ] ++ stdenv.lib.optional stdenv.isSunOS help2man;
pkgs/development/tools/profiling/sysprof/default.nix+1−1
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
3737 pkgconfig
3838 shared-mime-info
3939 wrapGAppsHook
40− gnome3.defaultIconTheme
40+ gnome3.adwaita-icon-theme
4141 ];
4242 buildInputs = [ glib gtk3 pango polkit systemd.dev systemd.lib ];
4343
pkgs/misc/emulators/cdemu/analyzer.nix+1−1
@@ -6,7 +6,7 @@ let pkg = import ./base.nix {
66};
77in callPackage pkg {
88 buildInputs = [ glib gtk3 libxml2 gnuplot (callPackage ./libmirage.nix {}) makeWrapper
9− gnome3.defaultIconTheme gdk_pixbuf librsvg intltool ];
9+ gnome3.adwaita-icon-theme gdk_pixbuf librsvg intltool ];
1010 drvParams = {
1111 postFixup = ''
1212 wrapProgram $out/bin/image-analyzer \
pkgs/misc/emulators/cdemu/gui.nix+1−1
@@ -8,7 +8,7 @@ let
88 inherit (pythonPackages) python pygobject3;
99in callPackage pkg {
1010 buildInputs = [ python pygobject3 gtk3 glib libnotify intltool makeWrapper
11− gnome3.defaultIconTheme gdk_pixbuf librsvg ];
11+ gnome3.adwaita-icon-theme gdk_pixbuf librsvg ];
1212 drvParams = {
1313 postFixup = ''
1414 wrapProgram $out/bin/gcdemu \
pkgs/os-specific/darwin/cctools/ld-tbd-v2.patchnew file+98
@@ -0,0 +1,98 @@
1+diff --git a/cctools/ld64/src/ld/parsers/textstub_dylib_file.cpp b/cctools/ld64/src/ld/parsers/textstub_dylib_file.cpp
2+index 09c0e12..ac6b085 100644
3+--- a/cctools/ld64/src/ld/parsers/textstub_dylib_file.cpp
4++++ b/cctools/ld64/src/ld/parsers/textstub_dylib_file.cpp
5+@@ -187,6 +187,7 @@ struct DynamicLibrary {
6+ ld::File::ObjcConstraint _objcConstraint;
7+ Options::Platform _platform;
8+ std::vector<Token> _allowedClients;
9++ std::vector<Token> _allowableClients;
10+ std::vector<Token> _reexportedLibraries;
11+ std::vector<Token> _symbols;
12+ std::vector<Token> _classes;
13+@@ -246,6 +247,14 @@ class TBDFile {
14+ });
15+ }
16+
17++ void parseAllowableClients(DynamicLibrary& lib) {
18++ if ( !hasOptionalToken("allowable-clients") )
19++ return;
20++ parseFlowSequence([&](Token name) {
21++ lib._allowableClients.emplace_back(name);
22++ });
23++ }
24++
25+ void parseReexportedDylibs(DynamicLibrary& lib) {
26+ if ( !hasOptionalToken("re-exports") )
27+ return;
28+@@ -306,6 +315,21 @@ class TBDFile {
29+ return false;
30+ }
31+
32++ void skipUUIDs(DynamicLibrary& lib) {
33++ expectToken("uuids");
34++ while ( true ) {
35++ auto token = next();
36++ if ( token == "]" )
37++ break;
38++ }
39++ }
40++
41++ void skipParentUmbrella(DynamicLibrary& lib) {
42++ if (!hasOptionalToken("parent-umbrella"))
43++ return;
44++ next();
45++ }
46++
47+ void parsePlatform(DynamicLibrary& lib) {
48+ expectToken("platform");
49+
50+@@ -410,6 +434,7 @@ class TBDFile {
51+ }
52+
53+ parseAllowedClients(lib);
54++ parseAllowableClients(lib);
55+ parseReexportedDylibs(lib);
56+ parseSymbols(lib);
57+ if ( !hasOptionalToken("-") )
58+@@ -455,17 +480,21 @@ class TBDFile {
59+ return result.front();
60+ }
61+
62+- void parseDocument(DynamicLibrary& lib, std::string &requestedArchName) {
63++ void parseDocument(DynamicLibrary& lib, std::string &requestedArchName, bool isTbdV2) {
64+ auto selectedArchName = parseAndSelectArchitecture(requestedArchName);
65+ if (selectedArchName.empty())
66+ throwf("invalid arch");
67+
68++ if(isTbdV2)
69++ skipUUIDs(lib);
70+ parsePlatform(lib);
71+ parseInstallName(lib);
72+ parseCurrentVersion(lib);
73+ parseCompatibilityVersion(lib);
74+ parseSwiftVersion(lib);
75+ parseObjCConstraint(lib);
76++ if(isTbdV2)
77++ skipParentUmbrella(lib);
78+ parseExportsBlock(lib, selectedArchName);
79+ }
80+
81+@@ -476,7 +505,8 @@ public:
82+ _tokenizer.reset();
83+ DynamicLibrary lib;
84+ expectToken("---");
85+- parseDocument(lib, requestedArchName);
86++ auto isTbdV2 = hasOptionalToken("!tapi-tbd-v2");
87++ parseDocument(lib, requestedArchName, isTbdV2);
88+ expectToken("...");
89+ return lib;
90+ }
91+@@ -486,6 +516,7 @@ public:
92+ auto token = next();
93+ if ( token != "---" )
94+ return false;
95++ hasOptionalToken("!tapi-tbd-v2");
96+ return !parseAndSelectArchitecture(requestedArchName).empty();
97+ }
98+
pkgs/os-specific/darwin/cctools/port.nix+39−12
@@ -1,10 +1,18 @@
1−{ stdenv, fetchFromGitHub, autoconf, automake, libtool, autoreconfHook
1+{ stdenv, fetchFromGitHub, autoconf, automake, libtool_2, autoreconfHook
22, libcxxabi, libuuid, llvm
33, libobjc ? null, maloader ? null
4+, enableDumpNormalizedLibArgs ? false
45}:
56
67let
78
9+ # We need to use an old version of cctools-port to support linking TBD files
10+ # in the iOS SDK. Note that this only provides support for SDK versions up to
11+ # 10.x. For 11.0 and higher we will need to upgrade to a newer cctools than the
12+ # default version here, which can support the new TBD format via Apple's
13+ # libtapi.
14+ useOld = stdenv.targetPlatform.isiOS;
15+
816 # The targetPrefix prepended to binary names to allow multiple binuntils on the
917 # PATH to both be usable.
1018 targetPrefix = stdenv.lib.optionalString
@@ -15,27 +23,47 @@ in
1523# Non-Darwin alternatives
1624assert (!stdenv.hostPlatform.isDarwin) -> maloader != null;
1725
26+assert enableDumpNormalizedLibArgs -> (!useOld);
27+
1828let
1929 baseParams = rec {
2030 name = "${targetPrefix}cctools-port-${version}";
21− version = "895";
31+ version = if useOld then "886" else "895";
2232
23− src = fetchFromGitHub {
33+ src = fetchFromGitHub (if enableDumpNormalizedLibArgs then {
2434 owner = "tpoechtrager";
2535 repo = "cctools-port";
26− rev = "07619027f8311fa61b4a549c75994b88739a82d8";
27− sha256 = "12g94hhz5v5bmy2w0zb6fb4bjlmn992gygc60h9nai15kshj2spi";
28− };
36+ # master with https://github.com/tpoechtrager/cctools-port/pull/34
37+ rev = "8395d4b2c3350356e2fb02f5e04f4f463c7388df";
38+ sha256 = "10vbf1cfzx02q8chc77s84fp2kydjpx2y682mr6mrbb7sq5rwh8f";
39+ } else if useOld then {
40+ owner = "tpoechtrager";
41+ repo = "cctools-port";
42+ rev = "02f0b8ecd87a3951653d838a321ae744815e21a5";
43+ sha256 = "0bzyabzr5dvbxglr74d0kbrk2ij5x7s5qcamqi1v546q1had1wz1";
44+ } else {
45+ owner = "tpoechtrager";
46+ repo = "cctools-port";
47+ rev = "2e569d765440b8cd6414a695637617521aa2375b"; # From branch 895-ld64-274.2
48+ sha256 = "0l45mvyags56jfi24rawms8j2ihbc45mq7v13pkrrwppghqrdn52";
49+ });
2950
3051 outputs = [ "out" "dev" ];
3152
32− nativeBuildInputs = [ autoconf automake libtool autoreconfHook ];
53+ nativeBuildInputs = [ autoconf automake libtool_2 autoreconfHook ];
3354 buildInputs = [ libuuid ]
3455 ++ stdenv.lib.optionals stdenv.isDarwin [ libcxxabi libobjc ];
3556
36− patches = [ ./ld-rpath-nonfinal.patch ./ld-ignore-rpath-link.patch ];
57+ patches = [
58+ ./ld-rpath-nonfinal.patch ./ld-ignore-rpath-link.patch
59+ ] ++ stdenv.lib.optionals useOld [
60+ # See https://github.com/tpoechtrager/cctools-port/issues/24. Remove when that's fixed.
61+ ./undo-unknown-triple.patch
62+ ./ld-tbd-v2.patch
63+ ./support-ios.patch
64+ ];
3765
38− __propagatedImpureHostDeps = [
66+ __propagatedImpureHostDeps = stdenv.lib.optionals (!useOld) [
3967 # As far as I can tell, otool from cctools is the only thing that depends on these two, and we should fix them
4068 "/usr/lib/libobjc.A.dylib"
4169 "/usr/lib/libobjc.dylib"
@@ -48,9 +76,7 @@ let
4876 ++ stdenv.lib.optional (stdenv.targetPlatform != stdenv.hostPlatform) "target";
4977 configureFlags = [ "--disable-clang-as" ];
5078
51− postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin ''
52− substituteInPlace cctools/Makefile.am --replace libobjc2 ""
53− '' + ''
79+ postPatch = ''
5480 sed -i -e 's/addStandardLibraryDirectories = true/addStandardLibraryDirectories = false/' cctools/ld64/src/ld/Options.cpp
5581
5682 # FIXME: there are far more absolute path references that I don't want to fix right now
@@ -99,6 +125,7 @@ let
99125 homepage = http://www.opensource.apple.com/source/cctools/;
100126 description = "MacOS Compiler Tools (cross-platform port)";
101127 license = stdenv.lib.licenses.apsl20;
128+ maintainers = with stdenv.lib.maintainers; [ matthewbauer ];
102129 };
103130 };
104131in stdenv.mkDerivation baseParams
pkgs/os-specific/darwin/cctools/support-ios.patchnew file+13
@@ -0,0 +1,13 @@
1+diff --git a/cctools/configure.ac b/cctools/configure.ac
2+index 56e8f24..0b4b3ff 100644
3+--- a/cctools/configure.ac
4++++ b/cctools/configure.ac
5+@@ -39,7 +39,7 @@ EXTRACXXFLAGS=""
6+ WARNINGS=""
7+
8+ case $host_os in
9+- darwin* )
10++ darwin* | ios*)
11+ isdarwin=yes
12+ AM_CONDITIONAL([ISDARWIN], [true])
13+ ;;
pkgs/os-specific/darwin/cctools/undo-unknown-triple.patchnew file+17
@@ -0,0 +1,17 @@
1+diff --git a/cctools/as/driver.c b/cctools/as/driver.c
2+index b06d085..c03397a 100644
3+--- a/cctools/as/driver.c
4++++ b/cctools/as/driver.c
5+@@ -363,12 +363,6 @@ char **envp)
6+ /* Add -c or clang will run ld(1). */
7+ new_argv[j] = "-c";
8+ j++;
9+- /* cctools-port start */
10+- new_argv[j] = "-target";
11+- j++;
12+- new_argv[j] = "unknown-apple-darwin";
13+- j++;
14+- /* cctools-port end */
15+ new_argv[j] = NULL;
16+ if(execute(new_argv, verbose))
17+ exit(0);
pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix+8−2
@@ -8,7 +8,9 @@ let
88 url = "https://raw.githubusercontent.com/apple/swift-corelibs-foundation/9a5d8420f7793e63a8d5ec1ede516c4ebec939f0/CoreFoundation/Base.subproj/CFSystemDirectories.c";
99 sha256 = "0krfyghj4f096arvvpf884ra5czqlmbrgf8yyc0b3avqmb613pcc";
1010 };
11−in stdenv.mkDerivation {
11+in
12+
13+stdenv.mkDerivation {
1214 name = "swift-corefoundation";
1315
1416 src = fetchFromGitHub {
@@ -34,6 +36,10 @@ in stdenv.mkDerivation {
3436 --replace "cf.CFLAGS += '-DDEPLOYMENT" '#' \
3537 --replace "cf.LDFLAGS += '-ldispatch" '#'
3638
39+ # Fix sandbox impurities.
40+ substituteInPlace ../lib/script.py \
41+ --replace '/bin/cp' cp
42+
3743 # Includes xpc for some initialization routine that they don't define anyway, so no harm here
3844 substituteInPlace PlugIn.subproj/CFBundlePriv.h \
3945 --replace '#if (TARGET_OS_MAC' '#if (0'
@@ -53,7 +59,7 @@ in stdenv.mkDerivation {
5359
5460 BUILD_DIR = "./Build";
5561 CFLAGS = "-DINCLUDE_OBJC -I${libxml2.dev}/include/libxml2"; # They seem to assume we include objc in some places and not in others, make a PR; also not sure why but libxml2 include path isn't getting picked up from buildInputs
56−
62+
5763 # I'm guessing at the version here. https://github.com/apple/swift-corelibs-foundation/commit/df3ec55fe6c162d590a7653d89ad669c2b9716b1 imported "high sierra"
5864 # and this version is a version from there. No idea how accurate it is.
5965 LDFLAGS = "-current_version 1454.90.0 -compatibility_version 150.0.0 -init ___CFInitialize";
pkgs/os-specific/linux/iw/default.nix+5−4
@@ -1,17 +1,18 @@
11{stdenv, fetchurl, libnl, pkgconfig}:
22
33stdenv.mkDerivation rec {
4− name = "iw-4.14";
4+ pname = "iw";
5+ version = "5.0.1";
56
67 src = fetchurl {
7− url = "https://www.kernel.org/pub/software/network/iw/${name}.tar.xz";
8− sha256 = "12ddd6vh6vs97135bnlyr0szv7hvpbnmfh48584frzab0z0725ph";
8+ url = "https://www.kernel.org/pub/software/network/${pname}/${pname}-${version}.tar.xz";
9+ sha256 = "03awbfrr9i78vgwsa6z2c8g14mia9z8qzrvzxar2ad9299wylf0y";
910 };
1011
1112 nativeBuildInputs = [ pkgconfig ];
1213 buildInputs = [ libnl ];
1314
14− makeFlags = [ "PREFIX=\${out}" ];
15+ makeFlags = [ "PREFIX=${placeholder "out"}" ];
1516
1617 meta = {
1718 description = "Tool to use nl80211";
pkgs/os-specific/linux/piper/default.nix+1−1
@@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec {
1616 };
1717
1818 nativeBuildInputs = [ meson ninja gettext pkgconfig wrapGAppsHook desktop-file-utils appstream-glib gobject-introspection ];
19− buildInputs = [ gtk3 glib gnome3.defaultIconTheme python3 ];
19+ buildInputs = [ gtk3 glib gnome3.adwaita-icon-theme python3 ];
2020 propagatedBuildInputs = with python3.pkgs; [ lxml evdev pygobject3 ];
2121
2222 postPatch = ''
pkgs/servers/home-assistant/default.nix+21−4
@@ -28,10 +28,27 @@ let
2828 "10cbf6e27dbce8c30807caf056c8eb50917e0eaafe86347671b57254006c3e69")
2929 (mkOverride "bcrypt" "3.1.5"
3030 "136243dc44e5bab9b61206bd46fff3018bd80980b1a1dfbab64a22ff5745957f")
31− (mkOverride "pyjwt" "1.6.4"
32− "4ee413b357d53fd3fb44704577afac88e72e878716116270d722723d65b42176")
33− (mkOverride "cryptography" "2.3.1"
34− "8d10113ca826a4c29d5b85b2c4e045ffa8bad74fb525ee0eceb1d38d4c70dfd6")
31+ (self: super: {
32+ pyjwt = super.pyjwt.overridePythonAttrs (oldAttrs: rec {
33+ version = "1.6.4";
34+ src = oldAttrs.src.override {
35+ inherit version;
36+ sha256 = "4ee413b357d53fd3fb44704577afac88e72e878716116270d722723d65b42176";
37+ };
38+ doCheck = false; # https://github.com/jpadilla/pyjwt/issues/382
39+ });
40+ })
41+ (self: super: {
42+ cryptography = super.cryptography.overridePythonAttrs (oldAttrs: rec {
43+ version = "2.3.1";
44+ src = oldAttrs.src.override {
45+ inherit version;
46+ sha256 = "8d10113ca826a4c29d5b85b2c4e045ffa8bad74fb525ee0eceb1d38d4c70dfd6";
47+ };
48+ propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ [ self.idna ];
49+ checkInputs = with self; [ pytest_3 pretend iso8601 pytz hypothesis ];
50+ });
51+ })
3552 (mkOverride "cryptography_vectors" "2.3.1" # required by cryptography==2.3.1
3653 "bf4d9b61dce69c49e830950aa36fad194706463b0b6dfe81425b9e0bc6644d46")
3754 (mkOverride "python-slugify" "1.2.6"
pkgs/servers/matrix-synapse/default.nix+1−1
@@ -75,7 +75,7 @@ in buildPythonApplication rec {
7575 checkInputs = [ mock parameterized ];
7676
7777 checkPhase = ''
78− PYTHONPATH=".:$PYTHONPATH" trial tests
78+ PYTHONPATH=".:$PYTHONPATH" ${python3.interpreter} -m twisted.trial tests
7979 '';
8080
8181 meta = with stdenv.lib; {
pkgs/servers/x11/xorg/default.nix+47−21
@@ -32,11 +32,11 @@ lib.makeScope newScope (self: with self; {
3232 }) {};
3333
3434 bitmap = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, xbitmaps, libXmu, xorgproto, libXt }: stdenv.mkDerivation {
35− name = "bitmap-1.0.8";
35+ name = "bitmap-1.0.9";
3636 builder = ./builder.sh;
3737 src = fetchurl {
38− url = mirror://xorg/individual/app/bitmap-1.0.8.tar.gz;
39− sha256 = "1z06a1sn3iq72rmh73f11xgb7n46bdav1fvpgczxjp6al88bsbqs";
38+ url = mirror://xorg/individual/app/bitmap-1.0.9.tar.gz;
39+ sha256 = "0kzbv5wh02798l77y9y8d8sjkmzm9cvsn3rjh8a86v5waj50apsb";
4040 };
4141 hardeningDisable = [ "bindnow" "relro" ];
4242 nativeBuildInputs = [ pkgconfig ];
@@ -729,11 +729,11 @@ lib.makeScope newScope (self: with self; {
729729 }) {};
730730
731731 libXau = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto }: stdenv.mkDerivation {
732− name = "libXau-1.0.8";
732+ name = "libXau-1.0.9";
733733 builder = ./builder.sh;
734734 src = fetchurl {
735− url = mirror://xorg/individual/lib/libXau-1.0.8.tar.bz2;
736− sha256 = "1wm4pv12f36cwzhldpp7vy3lhm3xdcnp4f184xkxsp7b18r7gm7x";
735+ url = mirror://xorg/individual/lib/libXau-1.0.9.tar.bz2;
736+ sha256 = "1v3krc6x0zliaa66qq1bf9j60x5nqfy68v8axaiglxpnvgqcpy6c";
737737 };
738738 hardeningDisable = [ "bindnow" "relro" ];
739739 nativeBuildInputs = [ pkgconfig ];
@@ -1417,6 +1417,19 @@ lib.makeScope newScope (self: with self; {
14171417 meta.platforms = stdenv.lib.platforms.unix;
14181418 }) {};
14191419
1420+ xcalc = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, xorgproto, libXt }: stdenv.mkDerivation {
1421+ name = "xcalc-1.0.7";
1422+ builder = ./builder.sh;
1423+ src = fetchurl {
1424+ url = mirror://xorg/individual/app/xcalc-1.0.7.tar.bz2;
1425+ sha256 = "08bzaldi76vrj7350d7b04pq7qa1qhi81x8i806yv42zcp8p3lkh";
1426+ };
1427+ hardeningDisable = [ "bindnow" "relro" ];
1428+ nativeBuildInputs = [ pkgconfig ];
1429+ buildInputs = [ libX11 libXaw xorgproto libXt ];
1430+ meta.platforms = stdenv.lib.platforms.unix;
1431+ }) {};
1432+
14201433 xcbproto = callPackage ({ stdenv, pkgconfig, fetchurl, python }: stdenv.mkDerivation {
14211434 name = "xcb-proto-1.13";
14221435 builder = ./builder.sh;
@@ -1574,11 +1587,11 @@ lib.makeScope newScope (self: with self; {
15741587 }) {};
15751588
15761589 xcursorgen = callPackage ({ stdenv, pkgconfig, fetchurl, libpng, libX11, libXcursor }: stdenv.mkDerivation {
1577− name = "xcursorgen-1.0.6";
1590+ name = "xcursorgen-1.0.7";
15781591 builder = ./builder.sh;
15791592 src = fetchurl {
1580− url = mirror://xorg/individual/app/xcursorgen-1.0.6.tar.bz2;
1581− sha256 = "0v7nncj3kaa8c0524j7ricdf4rvld5i7c3m6fj55l5zbah7r3j1i";
1593+ url = mirror://xorg/individual/app/xcursorgen-1.0.7.tar.bz2;
1594+ sha256 = "0ggbv084cavp52hjgcz3vdj0g018axs0m23c03lpc5sgn92gidim";
15821595 };
15831596 hardeningDisable = [ "bindnow" "relro" ];
15841597 nativeBuildInputs = [ pkgconfig ];
@@ -1587,11 +1600,11 @@ lib.makeScope newScope (self: with self; {
15871600 }) {};
15881601
15891602 xcursorthemes = callPackage ({ stdenv, pkgconfig, fetchurl, libXcursor }: stdenv.mkDerivation {
1590− name = "xcursor-themes-1.0.5";
1603+ name = "xcursor-themes-1.0.6";
15911604 builder = ./builder.sh;
15921605 src = fetchurl {
1593− url = mirror://xorg/individual/data/xcursor-themes-1.0.5.tar.bz2;
1594− sha256 = "0whjiq6d5z4z75zh37pji6llfcyrg6q3mg9zx5zqyncnj39q30xf";
1606+ url = mirror://xorg/individual/data/xcursor-themes-1.0.6.tar.bz2;
1607+ sha256 = "16a96li0s0ggg60v7f6ywxmsrmxdfizcw55ccv7sp4qjfisca7pf";
15951608 };
15961609 hardeningDisable = [ "bindnow" "relro" ];
15971610 nativeBuildInputs = [ pkgconfig ];
@@ -1781,6 +1794,19 @@ lib.makeScope newScope (self: with self; {
17811794 meta.platforms = stdenv.lib.platforms.unix;
17821795 }) {};
17831796
1797+ xf86videoapm = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation {
1798+ name = "xf86-video-apm-1.3.0";
1799+ builder = ./builder.sh;
1800+ src = fetchurl {
1801+ url = mirror://xorg/individual/driver/xf86-video-apm-1.3.0.tar.bz2;
1802+ sha256 = "0znwqfc8abkiha98an8hxsngnz96z6cd976bc4bsvz1km6wqk0c0";
1803+ };
1804+ hardeningDisable = [ "bindnow" "relro" ];
1805+ nativeBuildInputs = [ pkgconfig ];
1806+ buildInputs = [ xorgproto libpciaccess xorgserver ];
1807+ meta.platforms = stdenv.lib.platforms.unix;
1808+ }) {};
1809+
17841810 xf86videoark = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation {
17851811 name = "xf86-video-ark-0.7.5";
17861812 builder = ./builder.sh;
@@ -1821,11 +1847,11 @@ lib.makeScope newScope (self: with self; {
18211847 }) {};
18221848
18231849 xf86videochips = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation {
1824− name = "xf86-video-chips-1.3.0";
1850+ name = "xf86-video-chips-1.4.0";
18251851 builder = ./builder.sh;
18261852 src = fetchurl {
1827− url = mirror://xorg/individual/driver/xf86-video-chips-1.3.0.tar.bz2;
1828− sha256 = "00nsyz0z8mkzinr5czkkajbw1fm6437q7f3dx027017jdhh4qb4p";
1853+ url = mirror://xorg/individual/driver/xf86-video-chips-1.4.0.tar.bz2;
1854+ sha256 = "1gqzy7q9v824m7hqkbbmncxg082zm0d4mafgc97c4skyiwgf9wq7";
18291855 };
18301856 hardeningDisable = [ "bindnow" "relro" ];
18311857 nativeBuildInputs = [ pkgconfig ];
@@ -2094,11 +2120,11 @@ lib.makeScope newScope (self: with self; {
20942120 }) {};
20952121
20962122 xf86videos3virge = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation {
2097− name = "xf86-video-s3virge-1.10.7";
2123+ name = "xf86-video-s3virge-1.11.0";
20982124 builder = ./builder.sh;
20992125 src = fetchurl {
2100− url = mirror://xorg/individual/driver/xf86-video-s3virge-1.10.7.tar.bz2;
2101− sha256 = "1nm4cngjbw226q63rdacw6nx5lgxv7l7rsa8vhpr0gs80pg6igjx";
2126+ url = mirror://xorg/individual/driver/xf86-video-s3virge-1.11.0.tar.bz2;
2127+ sha256 = "06d1v5s7xf00y18x12cz11sk00rgn0yq95w66kmgzy465pzxvj84";
21022128 };
21032129 hardeningDisable = [ "bindnow" "relro" ];
21042130 nativeBuildInputs = [ pkgconfig ];
@@ -2198,11 +2224,11 @@ lib.makeScope newScope (self: with self; {
21982224 }) {};
21992225
22002226 xf86videotdfx = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver }: stdenv.mkDerivation {
2201− name = "xf86-video-tdfx-1.4.7";
2227+ name = "xf86-video-tdfx-1.5.0";
22022228 builder = ./builder.sh;
22032229 src = fetchurl {
2204− url = mirror://xorg/individual/driver/xf86-video-tdfx-1.4.7.tar.bz2;
2205− sha256 = "0hia45z4jc472fxp00803nznizcn4h1ybp63jcsb4lmd9vhqxx2c";
2230+ url = mirror://xorg/individual/driver/xf86-video-tdfx-1.5.0.tar.bz2;
2231+ sha256 = "0qc5wzwf1n65si9rc37bh224pzahh7gp67vfimbxs0b9yvhq0i9g";
22062232 };
22072233 hardeningDisable = [ "bindnow" "relro" ];
22082234 nativeBuildInputs = [ pkgconfig ];
pkgs/servers/x11/xorg/tarballs.list+9−7
@@ -11,7 +11,7 @@ https://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.9.tar.bz2
1111https://xcb.freedesktop.org/dist/xcb-util-wm-0.4.1.tar.bz2
1212mirror://xorg/individual/app/appres-1.0.5.tar.bz2
1313mirror://xorg/individual/app/bdftopcf-1.1.tar.bz2
14−mirror://xorg/individual/app/bitmap-1.0.8.tar.gz
14+mirror://xorg/individual/app/bitmap-1.0.9.tar.gz
1515mirror://xorg/individual/app/editres-1.0.7.tar.bz2
1616mirror://xorg/individual/app/fonttosfnt-1.0.5.tar.bz2
1717mirror://xorg/individual/app/iceauth-1.0.8.tar.bz2
@@ -29,11 +29,12 @@ mirror://xorg/individual/app/viewres-1.0.5.tar.bz2
2929mirror://xorg/individual/app/x11perf-1.6.0.tar.bz2
3030mirror://xorg/individual/app/xauth-1.0.10.tar.bz2
3131mirror://xorg/individual/app/xbacklight-1.2.2.tar.bz2
32+mirror://xorg/individual/app/xcalc-1.0.7.tar.bz2
3233mirror://xorg/individual/app/xclock-1.0.7.tar.bz2
3334mirror://xorg/individual/app/xcmsdb-1.0.5.tar.bz2
3435mirror://xorg/individual/app/xcompmgr-1.1.7.tar.bz2
3536mirror://xorg/individual/app/xconsole-1.0.7.tar.bz2
36−mirror://xorg/individual/app/xcursorgen-1.0.6.tar.bz2
37+mirror://xorg/individual/app/xcursorgen-1.0.7.tar.bz2
3738mirror://xorg/individual/app/xdm-1.1.11.tar.bz2
3839mirror://xorg/individual/app/xdpyinfo-1.3.2.tar.bz2
3940mirror://xorg/individual/app/xdriinfo-1.0.6.tar.bz2
@@ -72,7 +73,7 @@ mirror://xorg/individual/app/xwd-1.0.7.tar.bz2
7273mirror://xorg/individual/app/xwininfo-1.1.4.tar.bz2
7374mirror://xorg/individual/app/xwud-1.0.5.tar.bz2
7475mirror://xorg/individual/data/xbitmaps-1.1.2.tar.bz2
75−mirror://xorg/individual/data/xcursor-themes-1.0.5.tar.bz2
76+mirror://xorg/individual/data/xcursor-themes-1.0.6.tar.bz2
7677mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.24.tar.bz2
7778mirror://xorg/individual/doc/xorg-docs-1.7.1.tar.bz2
7879mirror://xorg/individual/doc/xorg-sgml-doctools-1.11.tar.bz2
@@ -85,10 +86,11 @@ mirror://xorg/individual/driver/xf86-input-synaptics-1.9.1.tar.bz2
8586mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2
8687mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2
8788mirror://xorg/individual/driver/xf86-video-amdgpu-18.1.0.tar.bz2
89+mirror://xorg/individual/driver/xf86-video-apm-1.3.0.tar.bz2
8890mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2
8991mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2
9092mirror://xorg/individual/driver/xf86-video-ati-18.0.1.tar.bz2
91−mirror://xorg/individual/driver/xf86-video-chips-1.3.0.tar.bz2
93+mirror://xorg/individual/driver/xf86-video-chips-1.4.0.tar.bz2
9294mirror://xorg/individual/driver/xf86-video-cirrus-1.5.3.tar.bz2
9395mirror://xorg/individual/driver/xf86-video-dummy-0.3.8.tar.bz2
9496mirror://xorg/individual/driver/xf86-video-fbdev-0.5.0.tar.bz2
@@ -109,7 +111,7 @@ mirror://xorg/individual/driver/xf86-video-openchrome-0.6.0.tar.bz2
109111mirror://xorg/individual/driver/xf86-video-qxl-0.1.5.tar.bz2
110112mirror://xorg/individual/driver/xf86-video-r128-6.11.0.tar.bz2
111113mirror://xorg/individual/driver/xf86-video-rendition-4.2.7.tar.bz2
112−mirror://xorg/individual/driver/xf86-video-s3virge-1.10.7.tar.bz2
114+mirror://xorg/individual/driver/xf86-video-s3virge-1.11.0.tar.bz2
113115mirror://xorg/individual/driver/xf86-video-savage-2.3.9.tar.bz2
114116mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.9.tar.bz2
115117mirror://xorg/individual/driver/xf86-video-sis-0.10.9.tar.bz2
@@ -117,7 +119,7 @@ mirror://xorg/individual/driver/xf86-video-sisusb-0.9.7.tar.bz2
117119mirror://xorg/individual/driver/xf86-video-suncg6-1.1.2.tar.bz2
118120mirror://xorg/individual/driver/xf86-video-sunffb-1.2.2.tar.bz2
119121mirror://xorg/individual/driver/xf86-video-sunleo-1.2.2.tar.bz2
120−mirror://xorg/individual/driver/xf86-video-tdfx-1.4.7.tar.bz2
122+mirror://xorg/individual/driver/xf86-video-tdfx-1.5.0.tar.bz2
121123mirror://xorg/individual/driver/xf86-video-tga-1.2.2.tar.bz2
122124mirror://xorg/individual/driver/xf86-video-trident-1.3.8.tar.bz2
123125mirror://xorg/individual/driver/xf86-video-v4l-0.3.0.tar.bz2
@@ -173,7 +175,7 @@ mirror://xorg/individual/lib/libpciaccess-0.14.tar.bz2
173175mirror://xorg/individual/lib/libSM-1.2.3.tar.bz2
174176mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2
175177mirror://xorg/individual/lib/libX11-1.6.7.tar.bz2
176−mirror://xorg/individual/lib/libXau-1.0.8.tar.bz2
178+mirror://xorg/individual/lib/libXau-1.0.9.tar.bz2
177179mirror://xorg/individual/lib/libXaw-1.0.13.tar.bz2
178180mirror://xorg/individual/lib/libXaw3d-1.6.3.tar.bz2
179181mirror://xorg/individual/lib/libXcomposite-0.4.4.tar.bz2
pkgs/stdenv/generic/make-derivation.nix+3
@@ -70,6 +70,7 @@ rec {
7070 else builtins.unsafeGetAttrPos "name" attrs)
7171 , separateDebugInfo ? false
7272 , outputs ? [ "out" ]
73+ , __darwinAllowLocalNetworking ? false
7374 , __impureHostDeps ? []
7475 , __propagatedImpureHostDeps ? []
7576 , sandboxProfile ? ""
@@ -175,6 +176,7 @@ rec {
175176 (removeAttrs attrs
176177 ["meta" "passthru" "pos"
177178 "checkInputs" "installCheckInputs"
179+ "__darwinAllowLocalNetworking"
178180 "__impureHostDeps" "__propagatedImpureHostDeps"
179181 "sandboxProfile" "propagatedSandboxProfile"])
180182 // (lib.optionalAttrs (!(attrs ? name) && attrs ? pname && attrs ? version)) {
@@ -245,6 +247,7 @@ rec {
245247 } // lib.optionalAttrs (hardeningDisable != [] || hardeningEnable != []) {
246248 NIX_HARDENING_ENABLE = enabledHardeningOptions;
247249 } // lib.optionalAttrs (stdenv.buildPlatform.isDarwin) {
250+ inherit __darwinAllowLocalNetworking;
248251 # TODO: remove lib.unique once nix has a list canonicalization primitive
249252 __sandboxProfile =
250253 let profiles = [ stdenv.extraSandboxProfile ] ++ computedSandboxProfile ++ computedPropagatedSandboxProfile ++ [ propagatedSandboxProfile sandboxProfile ];
pkgs/tools/admin/awscli/default.nix+9−2
@@ -14,16 +14,23 @@ let
1414 sha256 = "25df4e10c263fb88b5ace923dd84bf9aa7f5019687b5e55382ffcdb8bede9db5";
1515 };
1616 });
17+ colorama = super.colorama.overridePythonAttrs (oldAttrs: rec {
18+ version = "0.3.9";
19+ src = oldAttrs.src.override {
20+ inherit version;
21+ sha256 = "48eb22f4f8461b1df5734a074b57042430fb06e1d61bd1e11b078c0fe6d7a1f1";
22+ };
23+ });
1724 };
1825 };
1926
2027in py.pkgs.buildPythonApplication rec {
2128 pname = "awscli";
22− version = "1.16.90"; # N.B: if you change this, change botocore to a matching version too
29+ version = "1.16.106"; # N.B: if you change this, change botocore to a matching version too
2330
2431 src = py.pkgs.fetchPypi {
2532 inherit pname version;
26− sha256 = "1e2c776ca47ca18ee5ad3d481c0410800b8155342fe73099bc702b17625d7a2d";
33+ sha256 = "169810cb895ac8608747e81480aebd2712f654ad2e49e1f1315f34d6052d5e2d";
2734 };
2835
2936 # No tests included
pkgs/tools/audio/beets/default.nix+10−9
@@ -141,19 +141,22 @@ in pythonPackages.buildPythonApplication rec {
141141 ++ optional enableAlternatives plugins.alternatives
142142 ++ optional enableCopyArtifacts plugins.copyartifacts;
143143
144− buildInputs = with pythonPackages; [
145− beautifulsoup4
144+ buildInputs = [
146145 imagemagick
147− mock
148− nose
149− rarfile
150− responses
151146 ] ++ (with gst_all_1; [
152147 gst-plugins-base
153148 gst-plugins-good
154149 gst-plugins-ugly
155150 ]);
156151
152+ checkInputs = with pythonPackages; [
153+ beautifulsoup4
154+ mock
155+ nose
156+ rarfile
157+ responses
158+ ];
159+
157160 patches = [
158161 ./replaygain-default-bs1770gain.patch
159162 ./keyfinder-default-bin.patch
@@ -213,9 +216,7 @@ in pythonPackages.buildPythonApplication rec {
213216 LOCALE_ARCHIVE=${assert stdenv.isLinux; glibcLocales}/lib/locale/locale-archive \
214217 BEETS_TEST_SHELL="${testShell}" \
215218 BASH_COMPLETION_SCRIPT="${completion}" \
216− HOME="$(mktemp -d)" \
217− # Exclude failing test https://github.com/beetbox/beets/issues/2652
218− nosetests -v --exclude=test_single_month_nonmatch_ --exclude=test_asciify_variable --exclude=test_asciify_character_expanding_to_slash
219+ HOME="$(mktemp -d)" nosetests -v
219220
220221 runHook postCheck
221222 '';
pkgs/tools/audio/gvolicon/default.nix+1−1
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
1010
1111 nativeBuildInputs = [ pkgconfig ];
1212 buildInputs = [
13− makeWrapper alsaLib gnome3.gtk gdk_pixbuf gnome3.defaultIconTheme
13+ makeWrapper alsaLib gnome3.gtk gdk_pixbuf gnome3.adwaita-icon-theme
1414 librsvg wrapGAppsHook
1515 ];
1616
pkgs/tools/audio/pasystray/default.nix+1−1
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616
1717 nativeBuildInputs = [ pkgconfig autoreconfHook wrapGAppsHook ];
1818 buildInputs = [
19− gnome3.defaultIconTheme
19+ gnome3.adwaita-icon-theme
2020 avahi gtk3 libappindicator-gtk3 libnotify libpulseaudio xlibsWrapper
2121 gnome3.gsettings-desktop-schemas
2222 ];
pkgs/tools/backup/borg/default.nix+21−7
@@ -1,22 +1,36 @@
1−{ stdenv, fetchpatch, python3Packages, acl, libb2, lz4, zstd, openssl, openssh }:
1+{ stdenv, fetchpatch, python3, acl, libb2, lz4, zstd, openssl, openssh }:
22
3−python3Packages.buildPythonApplication rec {
3+let
4+ python = python3.override {
5+ packageOverrides = self: super: {
6+ # https://github.com/borgbackup/borg/issues/3753#issuecomment-454011810
7+ msgpack-python = super.msgpack-python.overridePythonAttrs (oldAttrs: rec {
8+ version = "0.5.6";
9+ src = oldAttrs.src.override {
10+ inherit version;
11+ sha256 = "0ee8c8c85aa651be3aa0cd005b5931769eaa658c948ce79428766f1bd46ae2c3";
12+ };
13+ });
14+ };
15+ };
16+
17+in python.pkgs.buildPythonApplication rec {
418 pname = "borgbackup";
519 version = "1.1.9";
620
7− src = python3Packages.fetchPypi {
21+ src = python.pkgs.fetchPypi {
822 inherit pname version;
923 sha256 = "7d0ff84e64c4be35c43ae2c047bb521a94f15b278c2fe63b43950c4836b42575";
1024 };
1125
12− nativeBuildInputs = with python3Packages; [
26+ nativeBuildInputs = with python.pkgs; [
1327 # For building documentation:
1428 sphinx guzzle_sphinx_theme
1529 ];
1630 buildInputs = [
17− libb2 lz4 zstd openssl python3Packages.setuptools_scm
31+ libb2 lz4 zstd openssl python.pkgs.setuptools_scm
1832 ] ++ stdenv.lib.optionals stdenv.isLinux [ acl ];
19− propagatedBuildInputs = with python3Packages; [
33+ propagatedBuildInputs = with python.pkgs; [
2034 cython msgpack-python
2135 ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ llfuse ];
2236
@@ -50,7 +64,7 @@ python3Packages.buildPythonApplication rec {
5064 cp scripts/shell_completions/zsh/_borg $out/share/zsh/site-functions/
5165 '';
5266
53− checkInputs = with python3Packages; [
67+ checkInputs = with python.pkgs; [
5468 pytest
5569 ];
5670
pkgs/tools/backup/ddar/default.nix+1
@@ -23,6 +23,7 @@ python2.pkgs.buildPythonApplication rec {
2323 make -f Makefile.prep synctus/ddar_pb2.py
2424 '';
2525
26+ nativeBuildInputs = with python2.pkgs; [ protobuf.protobuf ];
2627 propagatedBuildInputs = with python2.pkgs; [ protobuf ];
2728
2829 checkInputs = [ roundup ];
pkgs/tools/compression/xar/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, libxml2, openssl, zlib, bzip2, fts }:
1+{ stdenv, fetchurl, libxml2, lzma, openssl, zlib, bzip2, fts }:
22
33stdenv.mkDerivation rec {
44 version = "1.6.1";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "0ghmsbs6xwg1092v7pjcibmk5wkyifwxw6ygp08gfz25d2chhipf";
1010 };
1111
12− buildInputs = [ libxml2 openssl zlib bzip2 fts ];
12+ buildInputs = [ libxml2 lzma openssl zlib bzip2 fts ];
1313
1414 meta = {
1515 homepage = https://mackyle.github.io/xar/;
pkgs/tools/graphics/luxcorerender/default.nix+2−2
@@ -33,7 +33,7 @@ in stdenv.mkDerivation rec {
3333 # needed for GSETTINGS_SCHEMAS_PATH
3434 gsettings-desktop-schemas glib gnome3.gtk
3535 # needed for XDG_ICON_DIRS
36− gnome3.defaultIconTheme
36+ gnome3.adwaita-icon-theme
3737 makeWrapper
3838 (stdenv.lib.getLib gnome3.dconf)
3939 ] ++ stdenv.lib.optionals withOpenCL [opencl-headers ocl-icd opencl-clhpp];
@@ -65,7 +65,7 @@ in stdenv.mkDerivation rec {
6565 preFixup = ''
6666 wrapProgram "$out/bin/luxcoreui" \
6767 --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
68− --suffix XDG_DATA_DIRS : '${gnome3.defaultIconTheme}/share' \
68+ --suffix XDG_DATA_DIRS : '${gnome3.adwaita-icon-theme}/share' \
6969 --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules"
7070 '';
7171
pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix+1−1
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717
1818 nativeBuildInputs = [ pkgconfig ];
1919 buildInputs = [ makeWrapper fcitx cmake isocodes gtk3
20− gnome3.defaultIconTheme ];
20+ gnome3.adwaita-icon-theme ];
2121
2222 preFixup = ''
2323 wrapProgram $out/bin/fcitx-config-gtk3 \
pkgs/tools/misc/papis/default.nix+13
@@ -14,6 +14,19 @@ python3.pkgs.buildPythonApplication rec {
1414 sha256 = "0sa4hpgjvqkjcmp9bjr27b5m5jg4pfspdc8nf1ny80sr0kzn72hb";
1515 };
1616
17+ patches = [
18+ # Update click version to 7.0.0
19+ (fetchpatch {
20+ url = https://github.com/papis/papis/commit/fddb80978a37a229300b604c26e992e2dc90913f.patch;
21+ sha256 = "0cmagfdaaml1pxhnxggifpb47z5g1p231qywnvnqpd3dm93382w1";
22+ })
23+ # Allow python-slugify >= 2.0.0
24+ (fetchpatch {
25+ url = https://github.com/papis/papis/commit/b023ca0e551a29c0c15f73fa071addd3e61fa36d.patch;
26+ sha256 = "0ybfzr5v1zg9m201jq4hyc6imqd8l4mx9azgjjxkgxcwd3ib1ymq";
27+ })
28+ ];
29+
1730 propagatedBuildInputs = with python3.pkgs; [
1831 requests filetype pyparsing configparser arxiv2bib
1932 pyyaml chardet beautifulsoup4 colorama bibtexparser
pkgs/tools/misc/vdirsyncer/default.nix+6
@@ -49,6 +49,12 @@ python3Packages.buildPythonApplication rec {
4949 ];
5050
5151 postPatch = ''
52+ # Invalid argument: 'perform_health_check' is not a valid setting
53+ substituteInPlace tests/conftest.py \
54+ --replace "perform_health_check=False" ""
55+ substituteInPlace tests/unit/test_repair.py \
56+ --replace $'@settings(perform_health_check=False) # Using the random module for UIDs\n' ""
57+
5258 # for setuptools_scm:
5359 echo 'Version: ${version}' >PKG-INFO
5460
pkgs/tools/networking/dhcpcd/default.nix+2−2
@@ -3,11 +3,11 @@
33stdenv.mkDerivation rec {
44 # when updating this to >=7, check, see previous reverts:
55 # nix-build -A nixos.tests.networking.scripted.macvlan.x86_64-linux nixos/release-combined.nix
6− name = "dhcpcd-7.0.8";
6+ name = "dhcpcd-7.1.1";
77
88 src = fetchurl {
99 url = "mirror://roy/dhcpcd/${name}.tar.xz";
10− sha256 = "1df95lv3cbs3dk718a2vyvzmv7qhpgcxzagb27ylmav96f48x5ln";
10+ sha256 = "0h94g5nl9bg3x3qaajqaz6izl6mlvyjgp93nifnlfb7r7n3j8yd2";
1111 };
1212
1313 nativeBuildInputs = [ pkgconfig ];
pkgs/tools/networking/gupnp-tools/default.nix+1−1
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717 ];
1818
1919 nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook ];
20− buildInputs = [ gupnp libuuid gssdp gtk3 gupnp-av gtksourceview4 gnome3.defaultIconTheme ];
20+ buildInputs = [ gupnp libuuid gssdp gtk3 gupnp-av gtksourceview4 gnome3.adwaita-icon-theme ];
2121
2222 passthru = {
2323 updateScript = gnome3.updateScript {
pkgs/tools/networking/linkchecker/default.nix+1
@@ -18,6 +18,7 @@ python2Packages.buildPythonApplication rec {
1818 pname = "LinkChecker";
1919 version = "9.3.1";
2020
21+ nativeBuildInputs = [ gettext ];
2122 propagatedBuildInputs = (with python2Packages; [
2223 requests
2324 ]) ++ [ gettext ];
pkgs/tools/networking/network-manager/applet.nix+3−3
@@ -1,7 +1,7 @@
11{ stdenv, fetchurl, meson, ninja, intltool, gtk-doc, pkgconfig, networkmanager, gnome3
22, libnotify, libsecret, polkit, isocodes, modemmanager, libxml2, docbook_xsl, docbook_xml_dtd_43
33, mobile-broadband-provider-info, glib-networking, gsettings-desktop-schemas
4−, libgudev, jansson, wrapGAppsHook, gobject-introspection, python3
4+, libgudev, jansson, wrapGAppsHook, gobject-introspection, python3, gtk3
55, libappindicator-gtk3, withGnome ? false, gcr }:
66
77let
@@ -25,10 +25,10 @@ in stdenv.mkDerivation rec {
2525 outputs = [ "out" "lib" "dev" "devdoc" "man" ];
2626
2727 buildInputs = [
28− gnome3.gtk networkmanager libnotify libsecret gsettings-desktop-schemas
28+ gtk3 networkmanager libnotify libsecret gsettings-desktop-schemas
2929 polkit isocodes mobile-broadband-provider-info libgudev
3030 modemmanager jansson glib-networking
31− libappindicator-gtk3 gnome3.defaultIconTheme
31+ libappindicator-gtk3 gnome3.adwaita-icon-theme
3232 ] ++ stdenv.lib.optionals withGnome [ gcr ]; # advanced certificate chooser
3333
3434 nativeBuildInputs = [ meson ninja intltool pkgconfig wrapGAppsHook gobject-introspection python3 gtk-doc docbook_xsl docbook_xml_dtd_43 libxml2 ];
pkgs/tools/networking/network-manager/fortisslvpn/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, substituteAll, openfortivpn, intltool, pkgconfig,
1+{ stdenv, fetchurl, substituteAll, openfortivpn, intltool, pkgconfig, gtk3,
22networkmanager, ppp, libsecret, withGnome ? true, gnome3 }:
33
44let
@@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
2020 ];
2121
2222 buildInputs = [ openfortivpn networkmanager ppp ]
23− ++ stdenv.lib.optionals withGnome [ gnome3.gtk libsecret gnome3.networkmanagerapplet ];
23+ ++ stdenv.lib.optionals withGnome [ gtk3 libsecret gnome3.networkmanagerapplet ];
2424
2525 nativeBuildInputs = [ intltool pkgconfig ];
2626
pkgs/tools/networking/network-manager/iodine/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, substituteAll, iodine, intltool, pkgconfig, networkmanager, libsecret
1+{ stdenv, fetchurl, substituteAll, iodine, intltool, pkgconfig, networkmanager, libsecret, gtk3
22, withGnome ? true, gnome3 }:
33
44let
@@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
2020 ];
2121
2222 buildInputs = [ iodine networkmanager ]
23− ++ stdenv.lib.optionals withGnome [ gnome3.gtk libsecret gnome3.networkmanagerapplet ];
23+ ++ stdenv.lib.optionals withGnome [ gtk3 libsecret gnome3.networkmanagerapplet ];
2424
2525 nativeBuildInputs = [ intltool pkgconfig ];
2626
pkgs/tools/networking/network-manager/l2tp/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, substituteAll, fetchFromGitHub, autoreconfHook, libtool, intltool, pkgconfig
2−, networkmanager, ppp, xl2tpd, strongswan, libsecret
2+, gtk3, networkmanager, ppp, xl2tpd, strongswan, libsecret
33, withGnome ? true, gnome3, networkmanagerapplet }:
44
55stdenv.mkDerivation rec {
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
2222 ];
2323
2424 buildInputs = [ networkmanager ppp ]
25− ++ stdenv.lib.optionals withGnome [ gnome3.gtk libsecret networkmanagerapplet ];
25+ ++ stdenv.lib.optionals withGnome [ gtk3 libsecret networkmanagerapplet ];
2626
2727 nativeBuildInputs = [ autoreconfHook libtool intltool pkgconfig ];
2828
pkgs/tools/networking/network-manager/openconnect/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, substituteAll, openconnect, intltool, pkgconfig, networkmanager, libsecret
2−, withGnome ? true, gnome3, kmod }:
2+, gtk3, withGnome ? true, gnome3, kmod }:
33
44let
55 pname = "NetworkManager-openconnect";
@@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
2020 ];
2121
2222 buildInputs = [ openconnect networkmanager ]
23− ++ stdenv.lib.optionals withGnome [ gnome3.gtk libsecret ];
23+ ++ stdenv.lib.optionals withGnome [ gtk3 libsecret ];
2424
2525 nativeBuildInputs = [ intltool pkgconfig ];
2626
pkgs/tools/networking/network-manager/openvpn/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, substituteAll, openvpn, intltool, libxml2, pkgconfig, file, networkmanager, libsecret
2−, withGnome ? true, gnome3, kmod }:
2+, gtk3, withGnome ? true, gnome3, kmod }:
33
44let
55 pname = "NetworkManager-openvpn";
@@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
2020 ];
2121
2222 buildInputs = [ openvpn networkmanager ]
23− ++ stdenv.lib.optionals withGnome [ gnome3.gtk libsecret gnome3.networkmanagerapplet ];
23+ ++ stdenv.lib.optionals withGnome [ gtk3 libsecret gnome3.networkmanagerapplet ];
2424
2525 nativeBuildInputs = [ intltool pkgconfig file libxml2 ];
2626
pkgs/tools/networking/network-manager/vpnc/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, substituteAll, vpnc, intltool, pkgconfig, networkmanager, libsecret
2−, withGnome ? true, gnome3, kmod, file }:
2+, gtk3, withGnome ? true, gnome3, kmod, file }:
33let
44 pname = "NetworkManager-vpnc";
55 version = "1.2.6";
@@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
1919 ];
2020
2121 buildInputs = [ vpnc networkmanager ]
22− ++ stdenv.lib.optionals withGnome [ gnome3.gtk libsecret gnome3.networkmanagerapplet ];
22+ ++ stdenv.lib.optionals withGnome [ gtk3 libsecret gnome3.networkmanagerapplet ];
2323
2424 nativeBuildInputs = [ intltool pkgconfig file ];
2525
pkgs/tools/networking/openconnect/default.nix+4−9
@@ -3,23 +3,18 @@
33assert (openssl != null) == (gnutls == null);
44
55stdenv.mkDerivation rec {
6− name = "openconnect-7.08";
6+ pname = "openconnect";
7+ version = "8.02";
78
89 src = fetchurl {
910 urls = [
10− "ftp://ftp.infradead.org/pub/openconnect/${name}.tar.gz"
11+ "ftp://ftp.infradead.org/pub/openconnect/${pname}-${version}.tar.gz"
1112 ];
12− sha256 = "00wacb79l2c45f94gxs63b9z25wlciarasvjrb8jb8566wgyqi0w";
13+ sha256 = "04p0vzc1791h68hd9803wsyb64zrwm8qpdqx0szhj9pig71g5a0w";
1314 };
1415
1516 outputs = [ "out" "dev" ];
1617
17− preConfigure = ''
18− export PKG_CONFIG=${pkgconfig}/bin/pkg-config
19− export LIBXML2_CFLAGS="-I ${libxml2.dev}/include/libxml2"
20− export LIBXML2_LIBS="-L${libxml2.out}/lib -lxml2"
21− '';
22−
2318 configureFlags = [
2419 "--with-vpnc-script=${vpnc}/etc/vpnc/vpnc-script"
2520 "--disable-nls"
pkgs/tools/networking/unbound/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 name = "unbound-${version}";
5− version = "1.8.3";
5+ version = "1.9.0";
66
77 src = fetchurl {
88 url = "https://unbound.net/downloads/${name}.tar.gz";
9− sha256 = "1k6fljr7k721vg2ivn5dfr0hs1kn8p1sm003glgd9ypd261jns9b";
9+ sha256 = "05xrb8havr2vgjsdy7n85kgnvk1mg7qwhjp4a8n6pg4jhd5zjnj1";
1010 };
1111
1212 outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB
pkgs/tools/security/gnupg/22.nix+2−2
@@ -15,11 +15,11 @@ assert guiSupport -> pinentry != null;
1515stdenv.mkDerivation rec {
1616 name = "gnupg-${version}";
1717
18− version = "2.2.12";
18+ version = "2.2.13";
1919
2020 src = fetchurl {
2121 url = "mirror://gnupg/gnupg/${name}.tar.bz2";
22− sha256 = "1jw282iy27j1qygym52aa44zxy7ly4bdadhd628hwr4q9j5hy0yv";
22+ sha256 = "1n0igfn9nwdajzkcgdx7apwm9m5rpw0fg6vwskmf1rpranlqgivn";
2323 };
2424
2525 nativeBuildInputs = [ pkgconfig ];
pkgs/tools/security/onioncircuits/default.nix+3−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchgit, pythonPackages, intltool, gtk3, gobject-introspection, defaultIconTheme }:
1+{ stdenv, fetchgit, pythonPackages, intltool, gtk3, gobject-introspection, gnome3 }:
22
33pythonPackages.buildPythonApplication rec {
44 name = "onioncircuits-${version}";
@@ -10,13 +10,14 @@ pythonPackages.buildPythonApplication rec {
1010 sha256 = "13mqif9b9iajpkrl9ijspdnvy82kxhprxd5mw3njk68rcn4z2pcm";
1111 };
1212
13+ nativeBuildInputs = [ intltool ];
1314 buildInputs = [ intltool gtk3 gobject-introspection ];
1415 propagatedBuildInputs = with pythonPackages; [ stem distutils_extra pygobject3 ];
1516
1617 postFixup = ''
1718 wrapProgram "$out/bin/onioncircuits" \
1819 --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
19− --prefix XDG_DATA_DIRS : "$out/share:${defaultIconTheme}/share"
20+ --prefix XDG_DATA_DIRS : "$out/share:${gnome3.adwaita-icon-theme}/share"
2021 '';
2122
2223 meta = with stdenv.lib; {
pkgs/tools/security/vulnix/default.nix+1−1
@@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication rec {
99 sha256 = "15c32976sgb5clixngi6z1fk5h02v1kn1a89h8rkbkvyhfnjgg8m";
1010 };
1111
12− buildInputs = [ ronn ];
12+ nativeBuildInputs = [ ronn ];
1313
1414 checkInputs = with pythonPackages; [
1515 freezegun
pkgs/tools/text/groff/default.nix+4−1
@@ -18,7 +18,10 @@ stdenv.mkDerivation rec {
1818
1919 enableParallelBuilding = false;
2020
21− patches = [ ./look-for-ar.patch ];
21+ patches = [
22+ ./look-for-ar.patch
23+ ./mdate-determinism.patch
24+ ];
2225
2326 postPatch = stdenv.lib.optionalString (psutils != null) ''
2427 substituteInPlace src/preproc/html/pre-html.cpp \
pkgs/tools/text/groff/mdate-determinism.patchnew file+13
@@ -0,0 +1,13 @@
1+diff --git a/Makefile.comm b/Makefile.comm
2+index 75efc22..b757000 100644
3+--- a/Makefile.comm
4++++ b/Makefile.comm
5+@@ -155,7 +155,7 @@ extraclean: distclean
6+ -e "s|@MAN1EXT@|$(man1ext)|g" \
7+ -e "s|@MAN5EXT@|$(man5ext)|g" \
8+ -e "s|@MAN7EXT@|$(man7ext)|g" \
9+- -e "s|@MDATE@|`$(SHELL) $(top_srcdir)/mdate.sh $<`|g" \
10++ -e "s|@MDATE@|`date +'%-d %B %Y' -r $(top_srcdir)/ChangeLog`|g" \
11+ -e "s|@OLDFONTDIR@|$(oldfontdir)|g" \
12+ -e "s|@PDFDOCDIR@|$(pdfdocdir)|g" \
13+ -e "s|@SYSTEMMACRODIR@|$(systemtmacdir)|g" \
pkgs/top-level/all-packages.nix+30−50
@@ -2027,7 +2027,7 @@ in
20272027
20282028 ibus = callPackage ../tools/inputmethods/ibus {
20292029 gconf = gnome2.GConf;
2030− inherit (gnome3) dconf glib;
2030+ inherit (gnome3) dconf;
20312031 };
20322032
20332033 ibus-qt = callPackage ../tools/inputmethods/ibus/ibus-qt.nix { };
@@ -4609,9 +4609,7 @@ in
46094609
46104610 omping = callPackage ../applications/networking/omping { };
46114611
4612− onioncircuits = callPackage ../tools/security/onioncircuits {
4613− inherit (gnome3) defaultIconTheme;
4614− };
4612+ onioncircuits = callPackage ../tools/security/onioncircuits { };
46154613
46164614 openapi-generator-cli = callPackage ../tools/networking/openapi-generator-cli { };
46174615
@@ -5204,7 +5202,6 @@ in
52045202 remind = callPackage ../tools/misc/remind { };
52055203
52065204 remmina = callPackage ../applications/networking/remote/remmina {
5207− adwaita-icon-theme = gnome3.adwaita-icon-theme;
52085205 gsettings-desktop-schemas = gnome3.gsettings-desktop-schemas;
52095206 };
52105207
@@ -5371,9 +5368,7 @@ in
53715368 quazip = quazip_qt4;
53725369 };
53735370
5374− screenkey = python2Packages.callPackage ../applications/video/screenkey {
5375− inherit (gnome3) defaultIconTheme;
5376− };
5371+ screenkey = python2Packages.callPackage ../applications/video/screenkey { };
53775372
53785373 quazip_qt4 = libsForQt5.quazip.override {
53795374 qtbase = qt4; qmake = qmake4Hook;
@@ -5848,9 +5843,7 @@ in
58485843
58495844 tor-arm = callPackage ../tools/security/tor/tor-arm.nix { };
58505845
5851− tor-browser-bundle-bin = callPackage ../applications/networking/browsers/tor-browser-bundle-bin {
5852− inherit (gnome3) defaultIconTheme;
5853− };
5846+ tor-browser-bundle-bin = callPackage ../applications/networking/browsers/tor-browser-bundle-bin { };
58545847
58555848 tor-browser-bundle = callPackage ../applications/networking/browsers/tor-browser-bundle {
58565849 stdenv = stdenvNoCC;
@@ -6688,6 +6681,11 @@ in
66886681 name = "clang-wrapper-with-reexport-hack";
66896682 bintools = darwin.binutils.override {
66906683 useMacosReexportHack = true;
6684+ bintools = darwin.binutils.bintools.override {
6685+ cctools = darwin.cctools.override {
6686+ enableDumpNormalizedLibArgs = true;
6687+ };
6688+ };
66916689 };
66926690 };
66936691 llvm-polly = llvmPackages_7.llvm-polly;
@@ -8533,7 +8531,9 @@ in
85338531
85348532 cmake_2_8 = callPackage ../development/tools/build-managers/cmake/2.8.nix { };
85358533
8536− cmake = libsForQt5.callPackage ../development/tools/build-managers/cmake { };
8534+ cmake = libsForQt5.callPackage ../development/tools/build-managers/cmake {
8535+ inherit (darwin) cf-private;
8536+ };
85378537
85388538 cmakeCurses = cmake.override { useNcurses = true; };
85398539
@@ -11689,7 +11689,7 @@ in
1168911689 libGLSupported = lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms;
1169011690
1169111691 mesa_noglu = callPackage ../development/libraries/mesa {
11692− llvmPackages = llvmPackages_6;
11692+ llvmPackages = llvmPackages_7;
1169311693 inherit (darwin.apple_sdk.frameworks) OpenGL;
1169411694 inherit (darwin.apple_sdk.libs) Xplugin;
1169511695 };
@@ -12190,7 +12190,8 @@ in
1219012190 inherit perl;
1219112191 inherit (darwin) cf-private;
1219212192 inherit (gst_all_1) gstreamer gst-plugins-base;
12193− inherit (gnome3) gtk3 dconf;
12193+ inherit gtk3;
12194+ inherit (gnome3) dconf;
1219412195 });
1219512196
1219612197 libsForQt59 = lib.makeScope qt59.newScope mkLibsForQt5;
@@ -12205,7 +12206,8 @@ in
1220512206 inherit libGL;
1220612207 inherit perl;
1220712208 inherit (darwin) cf-private;
12208− inherit (gnome3) gtk3 dconf;
12209+ inherit gtk3;
12210+ inherit (gnome3) dconf;
1220912211 inherit (gst_all_1) gstreamer gst-plugins-base;
1221012212 });
1221112213
@@ -12221,7 +12223,8 @@ in
1222112223 inherit libGL;
1222212224 inherit perl;
1222312225 inherit (darwin) cf-private;
12224− inherit (gnome3) gtk3 dconf;
12226+ inherit gtk3;
12227+ inherit (gnome3) dconf;
1222512228 inherit (gst_all_1) gstreamer gst-plugins-base;
1222612229 });
1222712230
@@ -15020,9 +15023,7 @@ in
1502015023
1502115024 nvme-cli = callPackage ../os-specific/linux/nvme-cli { };
1502215025
15023− open-vm-tools = callPackage ../applications/virtualization/open-vm-tools {
15024− inherit (gnome3) gtk gtkmm;
15025− };
15026+ open-vm-tools = callPackage ../applications/virtualization/open-vm-tools { };
1502615027 open-vm-tools-headless = open-vm-tools.override { withX = false; };
1502715028
1502815029 delve = callPackage ../development/tools/delve { };
@@ -16062,9 +16063,7 @@ in
1606216063 inherit (pythonPackages) eyeD3;
1606316064 };
1606416065
16065− abiword = callPackage ../applications/office/abiword {
16066− iconTheme = gnome3.defaultIconTheme;
16067− };
16066+ abiword = callPackage ../applications/office/abiword { };
1606816067
1606916068 abook = callPackage ../applications/misc/abook { };
1607016069
@@ -16141,7 +16140,7 @@ in
1614116140 inherit (vamp) vampSDK;
1614216141 };
1614316142
16144− inherit (python3Packages) arelle;
16143+ arelle = with python3Packages; toPythonApplication arelle;
1614516144
1614616145 argo = callPackage ../applications/networking/cluster/argo { };
1614716146
@@ -16679,9 +16678,7 @@ in
1667916678
1668016679 devede = callPackage ../applications/video/devede { };
1668116680
16682− denemo = callPackage ../applications/audio/denemo {
16683− inherit (gnome3) gtksourceview;
16684− };
16681+ denemo = callPackage ../applications/audio/denemo { };
1668516682
1668616683 dvb_apps = callPackage ../applications/video/dvb-apps { };
1668716684
@@ -17270,7 +17267,6 @@ in
1727017267 generated = import ../applications/networking/browsers/firefox-bin/release_sources.nix;
1727117268 gconf = pkgs.gnome2.GConf;
1727217269 inherit (pkgs.gnome2) libgnome libgnomeui;
17273− inherit (pkgs.gnome3) defaultIconTheme;
1727417270 };
1727517271
1727617272 firefox-bin = wrapFirefox firefox-bin-unwrapped {
@@ -17285,7 +17281,6 @@ in
1728517281 generated = import ../applications/networking/browsers/firefox-bin/beta_sources.nix;
1728617282 gconf = pkgs.gnome2.GConf;
1728717283 inherit (pkgs.gnome2) libgnome libgnomeui;
17288− inherit (pkgs.gnome3) defaultIconTheme;
1728917284 };
1729017285
1729117286 firefox-beta-bin = res.wrapFirefox firefox-beta-bin-unwrapped {
@@ -17300,7 +17295,6 @@ in
1730017295 generated = import ../applications/networking/browsers/firefox-bin/devedition_sources.nix;
1730117296 gconf = pkgs.gnome2.GConf;
1730217297 inherit (pkgs.gnome2) libgnome libgnomeui;
17303− inherit (pkgs.gnome3) defaultIconTheme;
1730417298 };
1730517299
1730617300 firefox-devedition-bin = res.wrapFirefox firefox-devedition-bin-unwrapped {
@@ -17529,7 +17523,7 @@ in
1752917523 gnome-mpv = callPackage ../applications/video/gnome-mpv { };
1753017524
1753117525 gnome-recipes = callPackage ../applications/misc/gnome-recipes {
17532− inherit (gnome3) gnome-online-accounts rest gnome-autoar gspell;
17526+ inherit (gnome3) gnome-online-accounts gnome-autoar;
1753317527 };
1753417528
1753517529 gollum = callPackage ../applications/misc/gollum { };
@@ -18060,7 +18054,6 @@ in
1806018054 libreoffice-args = {
1806118055 inherit (perlPackages) ArchiveZip IOCompress;
1806218056 inherit (gnome2) GConf ORBit2 gnome_vfs;
18063− inherit (gnome3) defaultIconTheme;
1806418057 zip = zip.override { enableNLS = false; };
1806518058 fontsConf = makeFontsConf {
1806618059 fontDirectories = [
@@ -18567,7 +18560,6 @@ in
1856718560 };
1856818561
1856918562 synfigstudio = callPackage ../applications/graphics/synfigstudio {
18570− inherit (gnome3) defaultIconTheme;
1857118563 mlt-qt5 = libsForQt5.mlt;
1857218564 };
1857318565
@@ -18898,9 +18890,7 @@ in
1889818890
1889918891 pinfo = callPackage ../applications/misc/pinfo { };
1890018892
18901− pinpoint = callPackage ../applications/office/pinpoint {
18902− inherit (gnome3) clutter clutter-gtk;
18903− };
18893+ pinpoint = callPackage ../applications/office/pinpoint { };
1890418894
1890518895 pinta = callPackage ../applications/graphics/pinta {
1890618896 gtksharp = gtk-sharp-2_0;
@@ -19090,7 +19080,7 @@ in
1909019080 quodlibet-xine = quodlibet.override { xineBackend = true; tag = "-xine"; };
1909119081
1909219082 quodlibet-full = quodlibet.override {
19093− inherit (gnome3) gtksourceview webkitgtk;
19083+ inherit gtksourceview webkitgtk;
1909419084 withDbusPython = true;
1909519085 withPyInotify = true;
1909619086 withMusicBrainzNgs = true;
@@ -19658,7 +19648,6 @@ in
1965819648 thunderbird-bin = callPackage ../applications/networking/mailreaders/thunderbird-bin {
1965919649 gconf = pkgs.gnome2.GConf;
1966019650 inherit (pkgs.gnome2) libgnome libgnomeui;
19661− inherit (pkgs.gnome3) defaultIconTheme;
1966219651 };
1966319652
1966419653 tig = gitAndTools.tig;
@@ -19817,9 +19806,7 @@ in
1981719806 inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
1981819807 };
1981919808
19820− vimiv = callPackage ../applications/graphics/vimiv {
19821− inherit (gnome3) defaultIconTheme;
19822− };
19809+ vimiv = callPackage ../applications/graphics/vimiv { };
1982319810
1982419811 macvim = callPackage ../applications/editors/vim/macvim.nix { stdenv = clangStdenv; };
1982519812
@@ -22080,9 +22067,7 @@ in
2208022067
2208122068 bcal = callPackage ../applications/science/math/bcal { };
2208222069
22083− pspp = callPackage ../applications/science/math/pspp {
22084− inherit (gnome3) gtksourceview;
22085− };
22070+ pspp = callPackage ../applications/science/math/pspp { };
2208622071
2208722072 pynac = callPackage ../applications/science/math/pynac { };
2208822073
@@ -22397,7 +22382,6 @@ in
2239722382
2239822383 gajim = callPackage ../applications/networking/instant-messengers/gajim {
2239922384 inherit (gst_all_1) gstreamer gst-plugins-base gst-libav gst-plugins-ugly;
22400− inherit (gnome3) gspell defaultIconTheme;
2240122385 };
2240222386
2240322387 gammu = callPackage ../applications/misc/gammu { };
@@ -23101,9 +23085,7 @@ in
2310123085
2310223086 xosview2 = callPackage ../tools/X11/xosview2 { };
2310323087
23104− xpad = callPackage ../applications/misc/xpad {
23105− inherit (gnome3) gtksourceview;
23106− };
23088+ xpad = callPackage ../applications/misc/xpad { };
2310723089
2310823090 xsane = callPackage ../applications/graphics/sane/xsane.nix {
2310923091 libpng = libpng12;
@@ -23214,9 +23196,7 @@ in
2321423196
2321523197 iterm2 = callPackage ../applications/misc/iterm2 {};
2321623198
23217− sequeler = callPackage ../applications/misc/sequeler {
23218− inherit (gnome3) gtksourceview libgda;
23219− };
23199+ sequeler = callPackage ../applications/misc/sequeler { };
2322023200
2322123201 sequelpro = callPackage ../applications/misc/sequelpro {};
2322223202
pkgs/top-level/python-packages.nix+23−5
@@ -1510,9 +1510,15 @@ in {
15101510
15111511 pyhepmc = callPackage ../development/python-modules/pyhepmc { };
15121512
1513− pytest = self.pytest_39;
1513+ pytest = self.pytest_42;
15141514
1515− pytest_39 = callPackage ../development/python-modules/pytest {
1515+ pytest_42 = callPackage ../development/python-modules/pytest {
1516+ # hypothesis tests require pytest that causes dependency cycle
1517+ hypothesis = self.hypothesis.override { doCheck = false; };
1518+ };
1519+
1520+ # Keep 3 because many test suites are not yet compatible with Pytest 4.
1521+ pytest_3 = callPackage ../development/python-modules/pytest/3.10.nix {
15161522 # hypothesis tests require pytest that causes dependency cycle
15171523 hypothesis = self.hypothesis.override { doCheck = false; };
15181524 };
@@ -1553,7 +1559,7 @@ in {
15531559
15541560 pytest-flake8 = callPackage ../development/python-modules/pytest-flake8 { };
15551561
1556− pytestflakes = callPackage ../development/python-modules/pytest-flakes { };
1562+ pytest-flakes = callPackage ../development/python-modules/pytest-flakes { };
15571563
15581564 pytest-isort = callPackage ../development/python-modules/pytest-isort { };
15591565
@@ -1577,6 +1583,8 @@ in {
15771583
15781584 pytest-server-fixtures = callPackage ../development/python-modules/pytest-server-fixtures { };
15791585
1586+ pytest-services = callPackage ../development/python-modules/pytest-services { };
1587+
15801588 pytest-shutil = callPackage ../development/python-modules/pytest-shutil { };
15811589
15821590 pytestcov = callPackage ../development/python-modules/pytest-cov { };
@@ -2149,7 +2157,9 @@ in {
21492157
21502158 python-axolotl-curve25519 = callPackage ../development/python-modules/python-axolotl-curve25519 { };
21512159
2152− pythonix = toPythonModule (callPackage ../development/python-modules/pythonix { });
2160+ pythonix = callPackage ../development/python-modules/pythonix {
2161+ inherit (pkgs) pkgconfig;
2162+ };
21532163
21542164 pyramid = callPackage ../development/python-modules/pyramid { };
21552165
@@ -4004,6 +4014,8 @@ in {
40044014
40054015 owslib = callPackage ../development/python-modules/owslib { };
40064016
4017+ readthedocs-sphinx-ext = callPackage ../development/python-modules/readthedocs-sphinx-ext { };
4018+
40074019 resampy = callPackage ../development/python-modules/resampy { };
40084020
40094021 restructuredtext_lint = callPackage ../development/python-modules/restructuredtext_lint { };
@@ -4483,6 +4495,8 @@ in {
44834495
44844496 sorl_thumbnail = callPackage ../development/python-modules/sorl_thumbnail { };
44854497
4498+ soupsieve = callPackage ../development/python-modules/soupsieve { };
4499+
44864500 sphinx_rtd_theme = callPackage ../development/python-modules/sphinx_rtd_theme { };
44874501
44884502 sphinxcontrib-blockdiag = callPackage ../development/python-modules/sphinxcontrib-blockdiag { };
@@ -4613,6 +4627,8 @@ in {
46134627
46144628 wsgiproxy2 = callPackage ../development/python-modules/wsgiproxy2 { };
46154629
4630+ wurlitzer = callPackage ../development/python-modules/wurlitzer { };
4631+
46164632 xcaplib = callPackage ../development/python-modules/xcaplib { };
46174633
46184634 xlib = callPackage ../development/python-modules/xlib { };
@@ -5066,7 +5082,9 @@ in {
50665082
50675083 inflect = callPackage ../development/python-modules/inflect { };
50685084
5069− more-itertools = callPackage ../development/python-modules/more-itertools { };
5085+ more-itertools = if isPy27 then
5086+ callPackage ../development/python-modules/more-itertools/2.7.nix { }
5087+ else callPackage ../development/python-modules/more-itertools { };
50705088
50715089 jaraco_functools = callPackage ../development/python-modules/jaraco_functools { };
50725090