aboutsummaryrefslogtreecommitdiff
path: root/infra/libkookie/nixpkgs/pkgs/development/python-modules
diff options
context:
space:
mode:
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/development/python-modules')
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/3to2/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/FormEncode/default.nix24
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/GitPython/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/HAP-python/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/HTSeq/default.nix20
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/IPy/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/JPype1/default.nix10
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/Nikola/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/PyRMVtransport/default.nix15
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/Pygments/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/Theano/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/Wand/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/absl-py/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/accuweather/default.nix28
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/actdiag/default.nix22
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/adal/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/aioconsole/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/aioextensions/default.nix35
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/aiofiles/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/aiohttp-jinja2/default.nix8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/aiohttp/default.nix19
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/aiokafka/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/aiomysql/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/aioresponses/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/aiounifi/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/alembic/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/alerta-server/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/amazon_kclpy/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/amply/default.nix11
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/amqp/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/annexremote/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/annoy/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/ansi2html/default.nix12
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/ansible-lint/default.nix21
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/anyio/default.nix62
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/apispec/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/apprise/default.nix8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/arabic-reshaper/default.nix26
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/argcomplete/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/arpeggio/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/arrow/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/asana/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/asciimatics/default.nix11
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/asgi-csrf/default.nix27
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/astroid/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/astropy/default.nix8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/async-upnp-client/default.nix8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/async_stagger/default.nix35
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/asyncio-throttle/default.nix34
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix13
-rwxr-xr-xinfra/libkookie/nixpkgs/pkgs/development/python-modules/atlassian-python-api/default.nix7
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/atom/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/atpublic/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/atsim_potentials/default.nix24
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/attrs/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/aubio/default.nix35
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/audioread/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/authlib/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/awkward/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/awkward1/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/aws-adfs/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/aws-lambda-builders/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/aws-sam-translator/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-appconfiguration/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-applicationinsights/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-batch/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-common/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-core/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-cosmosdb-nspkg/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-cosmosdb-table/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-datalake-store/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-eventgrid/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-graphrbac/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-identity/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-loganalytics/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-advisor/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-authorization/default.nix8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-batch/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-batchai/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-billing/default.nix8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-cdn/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-commerce/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-common/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-compute/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-consumption/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-core/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-datalake-analytics/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-datalake-nspkg/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-datalake-store/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-devspaces/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-dns/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-iothub/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-kusto/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-logic/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-machinelearningcompute/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-managementgroups/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-managementpartner/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-maps/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-marketplaceordering/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-media/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-monitor/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-msi/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-netapp/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-network/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-notificationhubs/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-policyinsights/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-powerbiembedded/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-redis/default.nix8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-relay/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-reservations/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-resource/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-scheduler/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-search/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-security/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-servicebus/default.nix8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-signalr/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-sql/default.nix8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-storage/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-subscription/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-synapse/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-trafficmanager/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-web/default.nix8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-nspkg/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-servicebus/default.nix8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-servicefabric/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-storage-blob/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-storage-file-share/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-synapse-artifacts/default.nix31
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/b2sdk/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/baron/default.nix24
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/batchspawner/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/bayesian-optimization/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/bayespy/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/beancount/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/beautifulsoup4/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/bellows/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/betacode/default.nix19
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/bids-validator/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/binwalk/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/bip_utils/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/bitarray/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/bitstring/default.nix5
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/bitstruct/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/black/default.nix63
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/bleach/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/bleak/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/blessed/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/blis/default.nix5
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/blivet/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/block-io/default.nix5
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/blockdiag/default.nix24
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/blockdiagcontrib-cisco/default.nix25
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/bme680/default.nix38
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/bokeh/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/bootstrapped-pip/default.nix7
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/boto/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/boto3/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/botocore/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/bottle/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/bpython/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/braintree/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/bravia-tv/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/breathe/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/breezy/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/broadlink/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/brother/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/browser-cookie3/default.nix9
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/browsermob-proxy/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/bsddb3/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/btchip/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/buildbot/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/bumps/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/bx-python/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/cairosvg/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/caldav/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/canopen/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/casbin/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/cassandra-driver/default.nix1
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/cbor2/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/cchardet/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/celery/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/certbot/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/certifi/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/cffi/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/cftime/default.nix29
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/chalice/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/channels/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/check-manifest/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/cheroot/default.nix7
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/class-registry/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/cliapp/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/click-help-colors/default.nix29
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/clickhouse-cityhash/default.nix27
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/clickhouse-driver/default.nix48
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/cliff/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/clintermission/default.nix29
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/clldutils/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/cloudflare/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/cloudpickle/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/cmarkgfm/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/cmd2/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/cmdtest/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/cnvkit/default.nix33
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/coapthon3/default.nix27
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/coconut/default.nix52
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/codecov/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/codespell/default.nix9
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/colander/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/colanderalchemy/default.nix20
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/colorama/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/coloredlogs/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/colorlog/default.nix8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/configparser/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/coordinates/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/cornice/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/coverage/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/coveralls/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/cpyparsing/default.nix24
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/crate/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/crayons/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/credstash/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/croniter/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/cryptography/2.9.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/cryptography/CVE-2020-25659.patch76
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/cryptography/default.nix15
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/cryptography/vectors.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/crytic-compile/default.nix26
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/css-parser/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/cssselect2/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/csvw/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/cupy/default.nix5
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/curio/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/cvxpy/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/cx_freeze/default.nix11
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/cypari2/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/cysignals/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/daemonocle/default.nix42
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/dash-core-components/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/dash-renderer/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/dash-table/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/dash/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/dask-gateway-server/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/dask-gateway/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/dask-image/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/dask-ml/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/dask/default.nix16
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/databricks-cli/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix11
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/dataclasses/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/datasets/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/dateparser/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/dbus-next/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/dbus/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/debugpy/default.nix9
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/debugpy/hardcode-version.patch51
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/deepmerge/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/deform/default.nix8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/dependency-injector/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/devpi-common/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/dipy/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/discordpy/default.nix13
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/distributed/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/distro/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/django-cors-headers/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/django-haystack/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/django-ipware/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/django-jinja2/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/django-oauth-toolkit/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/django-postgresql-netfields/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/django-q/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/django-simple-captcha/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/django-storages/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/django/2.nix (renamed from infra/libkookie/nixpkgs/pkgs/development/python-modules/django/2_2.nix)4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/django/3.nix48
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/django/django_3_set_geos_gdal_lib.patch24
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/django_evolution/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/django_modelcluster/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/django_reversion/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/djangoql/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/djangorestframework/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/docker/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/dockerfile-parse/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/dockerspawner/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/docplex/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/docrep/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/docutils/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/dogpile.cache/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/dominate/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/dotnetcore2/default.nix59
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/dotnetcore2/runtime.patch22
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/drf-yasg/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/drms/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/dropbox/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/dulwich/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/easy-thumbnails/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/ecdsa/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/ecpy/default.nix10
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/elasticsearch-dsl/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/elasticsearch/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/elementpath/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/email-validator/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/emv/default.nix39
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/enamlx/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/enamlx/replace-unicode-with-str.patch274
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/eradicate/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/eve/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/eventlet/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/events/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/executor/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/exifread/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/fabulous/default.nix39
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/fabulous/relative_import.patch27
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/factory_boy/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/faker/default.nix35
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/fastecdsa/default.nix40
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/fastjsonschema/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/fastprogress/default.nix32
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/feedparser/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/fiona/default.nix7
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/flake8-debugger/default.nix19
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/flake8/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/flask-autoindex/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/flask-babel/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/flask-compress/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/flask-cors/default.nix8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/flask-httpauth/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/flask-jwt-extended/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/flask-limiter/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/flask-marshmallow/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/flask-paginate/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/flask-silk/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/flask-swagger-ui/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/flaskbabel/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/flatbuffers/default.nix17
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/flit-core/default.nix16
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/flit/default.nix29
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/flowlogs_reader/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/fpylll/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/freezegun/0.3.nix32
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/freezegun/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/ftputil/default.nix13
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/genanki/default.nix8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/genshi/default.nix9
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/getkey/default.nix34
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/gevent/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/gidgethub/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/gin-config/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/gipc/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/git-annex-adapter/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/glom/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/gntp/default.nix23
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/goobook/default.nix8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/google-auth-oauthlib/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/google-cloud-iam/default.nix22
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/google_api_core/default.nix36
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/google_auth/default.nix35
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_asset/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_automl/default.nix38
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_bigquery/default.nix52
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_bigquery_datatransfer/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_bigtable/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_container/default.nix23
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_core/default.nix24
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_dataproc/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_datastore/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_dlp/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_error_reporting/default.nix28
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_firestore/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_iot/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_kms/default.nix28
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_language/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_logging/default.nix36
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_monitoring/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_pubsub/default.nix34
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_redis/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_resource_manager/default.nix27
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix26
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_secret_manager/default.nix8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_securitycenter/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_spanner/default.nix33
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_speech/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_storage/default.nix41
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_tasks/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_testutils/default.nix32
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_texttospeech/default.nix22
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_trace/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_translate/default.nix35
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_videointelligence/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_vision/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_websecurityscanner/default.nix19
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/googlemaps/default.nix34
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/gphoto2/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/gradient_sdk/default.nix25
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/gradient_statsd/default.nix29
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/graspologic/default.nix (renamed from infra/libkookie/nixpkgs/pkgs/development/python-modules/graspy/default.nix)8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/green/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/greenlet/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/grpcio-tools/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/grpcio/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/gssapi/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/gst-python/default.nix30
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/gtts-token/default.nix22
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/gtts/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/gym/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/h2/default.nix8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/h3/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/h5py/default.nix32
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/ha-ffmpeg/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/hass-nabucasa/default.nix16
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/hawkauthlib/default.nix7
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/hbmqtt/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/hcloud/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/hg-evolve/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/hidapi/default.nix10
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/hjson/default.nix24
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/hmmlearn/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/holoviews/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/hpack/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/httpbin/default.nix17
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/httpcore/default.nix42
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/httpretty/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/httpx/default.nix42
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/humanize/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/hvplot/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/hwi/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/hyperframe/default.nix9
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/hyperopt/default.nix29
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/identify/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/ifcopenshell/default.nix67
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/ifcopenshell/site-packages.patch32
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/ignite/default.nix38
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/ijson/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/imagecorruptions/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/imantics/default.nix46
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/imdbpy/default.nix25
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/imdbpy/sql_error.patch39
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/impacket/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/importlib-resources/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/inflect/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/influxdb-client/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/inform/default.nix41
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/iniconfig/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/internetarchive/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/invoke/default.nix3
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/ipdb/default.nix9
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/ipython/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/ipyvue/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/ircrobots/default.nix53
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/ircstates/default.nix40
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/irctokens/default.nix34
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/isbnlib/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/iso8601/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/isort/4.nix43
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/isort/default.nix70
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/itemadapter/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/iterm2/default.nix5
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/janus/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/jaraco_classes/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/jaraco_collections/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/jaraco_functools/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/jaraco_itertools/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/jaraco_logging/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/jaraco_stream/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/jaraco_text/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/jeepney/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/jenkins-job-builder/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/joblib/default.nix26
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/josepy/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/jq/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/jsonpatch/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/jsonrpc-base/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/jsonrpc-websocket/default.nix12
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/jsonrpclib-pelix/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/junos-eznc/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/jupyter_core/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/jupyterlab-git/default.nix11
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/jupyterlab-pygments/default.nix27
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/jupytext/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/kaggle/default.nix10
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/kaitaistruct/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/keep/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/keyring/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/keyrings-alt/default.nix8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/kiwisolver/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/kmapper/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/kombu/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/kubernetes/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/labelbox/default.nix14
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/larch/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/lazy-object-proxy/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/ldaptor/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/ledgerblue/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/lexid/default.nix22
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/libarcus/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/libsass/default.nix37
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/libsavitar/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/libtmux/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/libusb1/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/lightgbm/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/line_profiler/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/linecache2/default.nix8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/linuxfd/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/littleutils/default.nix25
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/lmdb/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/lml/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/locustio/default.nix35
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/logilab/common.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/logzero/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/lyricwikia/default.nix23
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/mac_alias/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/markdown/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/markdownsuperscript/default.nix1
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/marshmallow/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/mathlibtools/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/matrix-nio/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/mautrix/default.nix9
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/maxminddb/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/mecab-python3/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/memcached/default.nix5
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/mesa/default.nix7
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/milc/default.nix38
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/minio/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/mitmproxy/default.nix19
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/mlflow/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/mlxtend/default.nix49
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/mocket/default.nix9
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/mongoengine/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/more-itertools/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/msal-extensions/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/msal/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/msgpack-numpy/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/msrest/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/mss/default.nix8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/multidict/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/munkres/default.nix18
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/murmurhash/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/myfitnesspal/default.nix17
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/mypy/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/mysql-connector/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/natsort/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/nbclient/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/nbconflux/default.nix3
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/nbconvert/default.nix33
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/nbdime/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/nbformat/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/nbsmoke/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/nbsphinx/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/ndjson/default.nix21
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/neo/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/nest-asyncio/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/nestedtext/default.nix43
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/networkx/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/nibabel/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/nilearn/default.nix26
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/nipype/default.nix25
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/nix-kernel/default.nix3
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/nix-prefetch-github/default.nix7
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/nocasedict/default.nix28
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/nocaselist/default.nix28
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/notebook/default.nix5
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/notify-py/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/notmuch/2.nix22
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/ntc-templates/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/ntplib/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/nuitka/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/numba/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/numericalunits/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/numexpr/default.nix10
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/numpy-stl/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/numpy/1.16.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/numpy/default.nix27
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/nunavut/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/nvchecker/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/oauthenticator/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/objgraph/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/onnx/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/openrazer/common.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/openrouteservice/default.nix29
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/opentracing/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/openwrt-luci-rpc/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/outcome/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/ovito/default.nix39
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pa-ringbuffer/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/packaging/2.nix40
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/packaging/default.nix25
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/packet-python/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pamqp/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pandas-datareader/default.nix34
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pandas/default.nix83
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pandocfilters/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/panel/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/papermill/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/paperspace/default.nix10
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/papis/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/param/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/parfive/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/parver/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/passlib/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pastedeploy/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pathspec/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/patool/default.nix57
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pbr/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pc-ble-driver-py/default.nix5
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pdfminer_six/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pdoc3/default.nix28
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/periodictable/default.nix8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pex/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pexpect/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pg8000/default.nix7
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pglast/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/phonemizer/backend-paths.patch29
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/phonemizer/default.nix73
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/phonemizer/drop-readme-festival-test.patch12
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/phonemizer/remove-intertwined-festival-test.patch22
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/phx-class-registry/default.nix28
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix10
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pillow/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pinboard/default.nix23
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pip-tools/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pip/default.nix8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pip/reproducible.patch13
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pkginfo/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/plaid-python/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/plotly/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/plyvel/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/poetry-core/default.nix1
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/poetry/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pony/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pooch/default.nix8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/portend/default.nix5
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/powerline/default.nix5
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pplpy/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pproxy/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/ppscore/default.nix35
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/premailer/default.nix3
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/preshed/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/prettytable/default.nix13
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/prometheus_client/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/prompt_toolkit/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/proto-plus/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/protobuf/default.nix12
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/prov/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/psautohint/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/psd-tools/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/psutil/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/psycopg2/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/psycopg2cffi/default.nix39
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pulp/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pure-eval/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pure-pcapy3/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pushbullet/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pushover-complete/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pwntools/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/py-air-control-exporter/default.nix24
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/py-air-control/default.nix27
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/py-multibase/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/py-multihash/default.nix15
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/py3status/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/py4j/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pyTelegramBotAPI/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/py_stringmatching/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pyaftership/default.nix26
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pyairvisual/default.nix49
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pyatmo/default.nix18
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pyatspi/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pyatv/default.nix7
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pybase64/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pybids/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pybind11/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pybotvac/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pybtex/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pybullet/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pycairo/default.nix24
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pycapnp/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pychromecast/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pycmarkgfm/default.nix32
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pycognito/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pycoin/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pycryptodome/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pycryptodomex/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pyct/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pycurl/default.nix7
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pycxx/default.nix27
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pydicom/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pyee/default.nix37
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pyelftools/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pyexcel-io/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pyexcel-xls/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pyexcel/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pyface/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pyfakefs/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pyfcm/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pyflakes/default.nix5
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pygame/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pygit2/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pygmt/default.nix45
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pygobject/3.36.nix40
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pygobject/3.nix10
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pygtrie/default.nix15
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pyhaversion/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pyhomematic/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pyhs100/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pykdl/default.nix12
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pykdtree/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pykka/default.nix7
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pylatexenc/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pylibacl/0.5.nix26
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pylibacl/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pymatgen/default.nix27
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pymavlink/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pymc3/default.nix5
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pymediainfo/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pymongo/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pymupdf/default.nix9
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pynacl/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pynest2d/default.nix31
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pynisher/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pynput/default.nix11
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pyobjc/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pyopencl/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pyosf/default.nix34
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pyosmium/default.nix10
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pyotp/default.nix9
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pypandoc/default.nix10
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pypass/default.nix84
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pypass/mark-executables.patch255
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pypblib/default.nix20
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pyperclip/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pyphen/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pyppeteer/default.nix29
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pyproj/default.nix33
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pyqtgraph/default.nix11
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pyramid/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pyramid_hawkauth/default.nix9
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pyro-api/default.nix23
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pyro-ppl/default.nix25
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pyro4/default.nix18
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pyrsistent/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pysam/default.nix69
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pysaml2/default.nix3
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pysbd/default.nix31
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pyscard/default.nix21
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pyserial-asyncio/default.nix8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pyserial/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pyside/apiextractor.nix13
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pyside/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pyside/generatorrunner.nix13
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pyside/shiboken.nix42
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pyside/tools.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pyside2/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pysmb/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pysonos/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pyspark/default.nix3
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pyspread/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pysqueezebox/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pystray/default.nix1
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pysvn/default.nix63
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-black/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-django/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-flakes/default.nix12
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-flask/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-html/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-isort/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-metadata/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-mock/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-mpl/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-mypy/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-pylint/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-quickcheck/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-randomly/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-repeat/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-sanic/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-services/default.nix13
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-testmon/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-timeout/default.nix36
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-xdist/1.nix36
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-xdist/2.nix33
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-xdist/default.nix25
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-xprocess/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/python-bidi/default.nix20
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/python-crontab/default.nix27
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/python-didl-lite/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/python-dotenv/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/python-frontmatter/default.nix30
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/python-hosts/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/python-jose/default.nix11
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/python-jsonrpc-server/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/python-markdown-math/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/python-miio/default.nix21
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/python-periphery/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/python-prctl/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/python-rapidjson/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/python-redis-lock/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/python-rtmidi/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/python-sat/default.nix24
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/python-socketio/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/python-sql/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/python-telegram-bot/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/python_fedora/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pytools/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pytorch-metric-learning/default.nix23
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pytorch/bin.nix18
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pytorch/binary-hashes.nix10
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pytorch/default.nix59
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pytz/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pyusb/default.nix12
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pyvips/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pyvmomi/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pywbem/default.nix31
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pyxnat/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/pyzmq/default.nix41
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/qiskit-aer/default.nix52
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/qiskit-aqua/default.nix49
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix49
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/qiskit-ignis/default.nix25
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/qiskit-terra/default.nix76
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/qiskit/default.nix10
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/qtconsole/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/r2pipe/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/re-assert/default.nix28
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/readme_renderer/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/redbaron/default.nix27
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/reedsolo/default.nix27
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/regex/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/reportlab/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/requests-aws4auth/default.nix8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/requests-unixsocket/default.nix1
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/requests/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/responses/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/restrictedpython/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/restructuredtext_lint/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/retworkx/default.nix23
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/rich/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/ripser/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/rlp/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/robotframework-requests/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/robotframework-sshlibrary/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/robotframework/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/rope/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/routes/default.nix13
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/rpy2/default.nix15
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/rpy2/rpy2-3.x-r-libs-site.patch8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/rq/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/rtmixer/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/rtslib/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/ruamel_ordereddict/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/ruamel_yaml/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/rubymarshal/default.nix5
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/s3fs/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/sacn/default.nix28
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/sacremoses/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/scikit-fuzzy/default.nix34
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/scipy/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/scour/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/scp/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/scramp/default.nix24
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/scrapy-fake-useragent/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/scrapy/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/screeninfo/default.nix7
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/seccomp/default.nix29
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/secretstorage/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/setproctitle/default.nix10
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/setuptools-rust/default.nix32
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/setuptools/44.0.nix11
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/setuptools/default.nix15
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/setuptools/tag-date.patch12
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/sh/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/shap/default.nix70
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/shapely/default.nix7
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/shapely/library-paths.patch10
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/signedjson/default.nix7
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/skorch/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/slicer/default.nix29
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/slither-analyzer/default.nix10
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/smart_open/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/smbus-cffi/default.nix46
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/smugline/default.nix40
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/smugpy/default.nix21
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/sniffio/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/sockjs/default.nix22
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/soco/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/sopel/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/sorl_thumbnail/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/sortedcontainers/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/sounddevice/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/spacy/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/sphinx/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix43
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/sphinxcontrib-katex/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix10
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/spotipy/default.nix28
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/spyder-kernels/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/spyder/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix42
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/sqlparse/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/srptools/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/srsly/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/sshtunnel/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/stack-data/default.nix54
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/staticjinja/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/statsmodels/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/streamz/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/strictyaml/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/stripe/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/sumtypes/default.nix23
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/supervise_api/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/sybil/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/symengine/default.nix9
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/sympy/1_5.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/sympy/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/tag-expressions/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/tasklib/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/telethon/default.nix5
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/tempora/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/tensorboardx/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/tensorflow-probability/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/tensorflow/1/bin.nix5
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/tensorflow/1/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/tensorflow/2/bin.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/tensorflow/2/default.nix16
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/terminado/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/testfixtures/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/textacy/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/tflearn/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/thinc/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/tifffile/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/timeout-decorator/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/timezonefinder/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/tinyobjloader-py/default.nix21
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/tld/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/tldextract/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/tmdb3/default.nix5
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/tokenizers/default.nix84
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/tokenizers/update-parking-lot.diff63
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/tokenlib/default.nix7
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/toml/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/toolz/2.nix28
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/toolz/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/tornado/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/tox/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/tqdm/default.nix24
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/tracing/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/traitlets/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/traitsui/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/transformers/default.nix22
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/transitions/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/trezor/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/trimesh/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/trytond/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/ttystatus/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/tubeup/default.nix8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/tvnamer/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/txdbus/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/typeguard/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/u-msgpack-python/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/uamqp/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/ueberzug/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/ufonormalizer/default.nix10
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/ujson/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/uncertainties/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/uncompyle6/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/unicorn/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/unpaddedbase64/default.nix7
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/update_checker/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/uproot-methods/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/uproot/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/urllib3/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/urwid-readline/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/urwid/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/urwidtrees/default.nix12
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/user-agents/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/uvicorn/default.nix10
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/uvloop/default.nix1
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/validators/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/vcrpy/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/vdirsyncer/default.nix72
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/vdirsyncer/stable.nix64
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/vega_datasets/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/versioneer/default.nix8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/vine/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/virtualenv/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/vispy/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/vowpalwabbit/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/watchdog/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/web/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/west/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/wheel/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/wled/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/wsproto/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/wxPython/4.1.nix75
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/xcffib/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/xdis/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/xdot/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/xhtml2pdf/default.nix12
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/xlib/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/xml2rfc/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/xmljson/default.nix26
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/xmlschema/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/xstatic-bootbox/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/xstatic-bootstrap/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/xstatic-jquery-file-upload/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/xstatic-jquery/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/xstatic-pygments/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/yamale/default.nix38
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/yamlloader/default.nix33
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/yappi/default.nix18
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/yappi/tests.patch14
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/yarl/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/youtube-dlc/default.nix23
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/yq/default.nix9
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/yt/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/zarr/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/zfec/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix16
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/zigpy-cc/default.nix46
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/zigpy-deconz/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/zigpy-xbee/default.nix46
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/zigpy-zigate/default.nix48
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/zigpy-znp/default.nix55
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/zigpy/default.nix46
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/zipp/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/zm-py/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/zope_copy/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/zope_event/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/zope_interface/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/zopfli/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/python-modules/zstd/default.nix3
1066 files changed, 8550 insertions, 3373 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/3to2/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/3to2/default.nix
index 8870388c2846..ff64a6d1a473 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/3to2/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/3to2/default.nix
@@ -24,8 +24,6 @@ buildPythonPackage rec {
# Test failing due to upstream issue (https://bitbucket.org/amentajo/lib3to2/issues/50/testsuite-fails-with-new-python-35)
doCheck = false;
- dontUsePythonRecompileBytecode = true;
-
meta = {
homepage = "https://bitbucket.org/amentajo/lib3to2";
description = "Refactors valid 3.x syntax into valid 2.x syntax, if a syntactical conversion is possible";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/FormEncode/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/FormEncode/default.nix
index f79e76b52c41..d91bef07d2ae 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/FormEncode/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/FormEncode/default.nix
@@ -1,24 +1,28 @@
-{ stdenv, buildPythonPackage, fetchPypi, dnspython, pycountry, nose }:
+{ stdenv, buildPythonPackage, fetchPypi, dnspython, pycountry, nose, setuptools_scm, six, isPy27 }:
buildPythonPackage rec {
pname = "FormEncode";
- version = "1.3.1";
+ version = "2.0.0";
+
+ disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "1xm77h2mds2prlaz0z4nzkx13g61rx5c2v3vpgjq9d5ij8bzb8md";
+ sha256 = "049pm276140h30xgzwylhpii24xcln1qfdlfmbj69sqpfhlr5szj";
};
- buildInputs = [ dnspython pycountry nose ];
-
- patchPhase = ''
- # dnspython3 has been superseded, see its PyPI page
- substituteInPlace setup.py --replace dnspython3 dnspython
+ postPatch = ''
+ sed -i 's/setuptools_scm_git_archive//' setup.py
+ sed -i 's/use_scm_version=.*,/version="${version}",/' setup.py
'';
+ nativeBuildInputs = [ setuptools_scm ];
+ propagatedBuildInputs = [ six ];
+
+ checkInputs = [ dnspython pycountry nose ];
+
preCheck = ''
- # two tests require dns resolving
- sed -i 's/test_cyrillic_email/noop/' formencode/tests/test_email.py
+ # requires dns resolving
sed -i 's/test_unicode_ascii_subgroup/noop/' formencode/tests/test_email.py
'';
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/GitPython/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/GitPython/default.nix
index 67ec5c2e4d1f..2edb8c51e3a0 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/GitPython/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/GitPython/default.nix
@@ -1,13 +1,13 @@
{ lib, buildPythonPackage, fetchPypi, isPy27, substituteAll, git, gitdb, mock, nose, ddt }:
buildPythonPackage rec {
- version = "3.1.7";
+ version = "3.1.11";
pname = "GitPython";
disabled = isPy27; # no longer supported
src = fetchPypi {
inherit pname version;
- sha256 = "2db287d71a284e22e5c2846042d0602465c7434d910406990d5b74df4afb0858";
+ sha256 = "befa4d101f91bad1b632df4308ec64555db684c360bd7d2130b4807d49ce86b8";
};
patches = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/HAP-python/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/HAP-python/default.nix
index 7d273345b58a..267fcccd8d4b 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/HAP-python/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/HAP-python/default.nix
@@ -3,14 +3,14 @@
buildPythonPackage rec {
pname = "HAP-python";
- version = "2.9.2";
+ version = "3.0.0";
# pypi package does not include tests
src = fetchFromGitHub {
owner = "ikalchev";
repo = pname;
rev = "v${version}";
- sha256 = "1d2ji2psla7jq3f9grb0l665nf8qsy2rlbkr2qg1d1a7mvf80x7k";
+ sha256 = "07s1kjm9cz4m4ksj506la1ks3dq2b5mk412rjj9rpj98b0mxrr84";
};
disabled = !isPy3k;
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/HTSeq/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/HTSeq/default.nix
index abb0c8520dd0..83263f734bd4 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/HTSeq/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/HTSeq/default.nix
@@ -1,18 +1,26 @@
-{ stdenv, buildPythonPackage, fetchPypi, cython, numpy, pysam, matplotlib
-}:
+{ stdenv, buildPythonPackage, fetchFromGitHub, cython, numpy, pysam, matplotlib, python, isPy27, isPy3k }:
buildPythonPackage rec {
version = "0.12.4";
pname = "HTSeq";
- src = fetchPypi {
- inherit pname version;
- sha256 = "e3980bb4f12899442b4fa6f24f0ba149090f71cedb1eaf7128249afe4eb921ff";
+ src = fetchFromGitHub {
+ owner = "htseq";
+ repo = "htseq";
+ rev = "release_${version}";
+ sha256 = "0y7vh249sljqjnv81060w4xkdx6f1y5zdqkh38yk926x6v9riijm";
};
- buildInputs = [ cython numpy pysam ];
+ nativeBuildInputs = [ cython ];
propagatedBuildInputs = [ numpy pysam matplotlib ];
+ checkPhase = stdenv.lib.optionalString isPy27 ''
+ ${python.interpreter} python2/test/test_general.py
+ '' + stdenv.lib.optionalString isPy3k ''
+ ${python.interpreter} python3/test/test_general.py
+ '';
+
meta = with stdenv.lib; {
+ homepage = "https://htseq.readthedocs.io/";
description = "A framework to work with high-throughput sequencing data";
maintainers = with maintainers; [ unode ];
platforms = platforms.unix;
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/IPy/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/IPy/default.nix
index 7f258780d1c6..332ee0fc0c13 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/IPy/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/IPy/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "IPy";
- version = "1.00";
+ version = "1.01";
src = fetchPypi {
inherit pname version;
- sha256 = "08d6kcacj67mvh0b6y765ipccy6gi4w2ndd4v1l3im2qm1cgcarg";
+ sha256 = "edeca741dea2d54aca568fa23740288c3fe86c0f3ea700344571e9ef14a7cc1a";
};
checkInputs = [ nose ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/JPype1/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/JPype1/default.nix
index 68afbb525c95..11ac2b7599b2 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/JPype1/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/JPype1/default.nix
@@ -2,19 +2,25 @@
, buildPythonPackage
, fetchPypi
, isPy27
+, pythonOlder
+, typing-extensions
, pytest
}:
buildPythonPackage rec {
pname = "JPype1";
- version = "1.0.2";
+ version = "1.1.2";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "c751436350c105f403e382574d34a6ad73e4a677cb0ff5bc9a87581cc07094e1";
+ sha256 = "c6e36de9f7ef826ff27f6d5260acc710ebc585a534c12cbac905db088ab1d992";
};
+ propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [
+ typing-extensions
+ ];
+
checkInputs = [
pytest
];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/Nikola/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/Nikola/default.nix
index 06a85a22033d..eeab02fcb75e 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/Nikola/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/Nikola/default.nix
@@ -35,7 +35,7 @@
buildPythonPackage rec {
pname = "Nikola";
- version = "8.1.1";
+ version = "8.1.2";
# Nix contains only Python 3 supported version of doit, which is a dependency
# of Nikola. Python 2 support would require older doit 0.29.0 (which on the
@@ -54,7 +54,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "cee35b011667a965eca01b7d36b54649c9434ab004d8556d6563b7d899df61ed";
+ sha256 = "26f4fb1a2b0105cf0f71187c6c1eb54283767a883d1c8f4ca8c8039033217d27";
};
patchPhase = ''
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/PyRMVtransport/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/PyRMVtransport/default.nix
index 1624a5fda2a6..86fb75f14548 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/PyRMVtransport/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/PyRMVtransport/default.nix
@@ -1,13 +1,13 @@
{ lib, buildPythonPackage, fetchFromGitHub
, flit
-, lxml, aiohttp
-, pytest, pytestcov, pytest-asyncio, pytest-mock, pytest-aiohttp, aresponses
+, lxml, httpx
+, pytest, pytestcov, pytest-asyncio, pytest-mock, aresponses
, pythonOlder
}:
buildPythonPackage rec {
pname = "PyRMVtransport";
- version = "0.2.9";
+ version = "0.2.10";
format = "pyproject";
disabled = pythonOlder "3.6";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
owner = "cgtobi";
repo = pname;
rev = "v${version}";
- sha256 = "1h3d0yxzrfi47zil5gr086v0780q768z8v5psvcikqw852f93vxb";
+ sha256 = "03qrylidb1d6zw6a22d1drdf73cvfxqcqaa8qi8x4pli1axcfh5w";
};
nativeBuildInputs = [
@@ -23,16 +23,19 @@ buildPythonPackage rec {
];
propagatedBuildInputs = [
- aiohttp
+ httpx
lxml
];
+ # requires pytest-httpx
+ doCheck = false;
+
checkInputs = [
pytest
pytestcov
pytest-asyncio
pytest-mock
- pytest-aiohttp
+ # pytest-httpx is missing
aresponses
];
checkPhase = ''
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/Pygments/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/Pygments/default.nix
index e0c5539299dd..02f39b3014d4 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/Pygments/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/Pygments/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "Pygments";
- version = "2.6.1";
+ version = "2.7.2";
src = fetchPypi {
inherit pname version;
- sha256 = "647344a061c249a3b74e230c739f434d7ea4d8b1d5f3721bc0f3558049b38f44";
+ sha256 = "381985fcc551eb9d37c52088a32914e00517e57f4a21609f48141ba08e193fa0";
};
propagatedBuildInputs = [ docutils ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/Theano/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/Theano/default.nix
index cc2b681e415d..ce32e42e4716 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/Theano/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/Theano/default.nix
@@ -68,7 +68,9 @@ in buildPythonPackage rec {
--replace 'StrParam(default_dnn_base_path)' 'StrParam('\'''${cudnn}'\''')'
'';
- preCheck = ''
+ # needs to be postFixup so it runs before pythonImportsCheck even when
+ # doCheck = false (meaning preCheck would be disabled)
+ postFixup = ''
mkdir -p check-phase
export HOME=$(pwd)/check-phase
'';
@@ -81,6 +83,8 @@ in buildPythonPackage rec {
checkInputs = [ nose ];
propagatedBuildInputs = [ numpy numpy.blas scipy six libgpuarray_ ];
+ pythonImportsCheck = [ "theano" ];
+
meta = with stdenv.lib; {
homepage = "http://deeplearning.net/software/theano/";
description = "A Python library for large-scale array computation";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/Wand/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/Wand/default.nix
index 4f4dbbc2fd19..c897b04e880c 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/Wand/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/Wand/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "Wand";
- version = "0.6.3";
+ version = "0.6.5";
src = fetchPypi {
inherit pname version;
- sha256 = "d21429288fe0de63d829dbbfb26736ebaed9fd0792c2a0dc5943c5cab803a708";
+ sha256 = "ec981b4f07f7582fc564aba8b57763a549392e9ef8b6a338e9da54cdd229cf95";
};
postPatch = ''
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/absl-py/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/absl-py/default.nix
index e7a2f120c1b3..e70d830b7be0 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/absl-py/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/absl-py/default.nix
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "absl-py";
- version = "0.9.0";
+ version = "0.11.0";
src = fetchPypi {
inherit pname version;
- sha256 = "75e737d6ce7723d9ff9b7aa1ba3233c34be62ef18d5859e706b8fdc828989830";
+ sha256 = "673cccb88d810e5627d0c1c818158485d106f65a583880e2f730c997399bcfa7";
};
propagatedBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/accuweather/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/accuweather/default.nix
new file mode 100644
index 000000000000..ed6dcb54377e
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/accuweather/default.nix
@@ -0,0 +1,28 @@
+{ aiohttp, buildPythonPackage, fetchFromGitHub, lib, pytest, pytestCheckHook
+, pytestcov, pytestrunner, pytest-asyncio, python, pythonOlder }:
+
+buildPythonPackage rec {
+ pname = "accuweather";
+ version = "0.0.11";
+
+ disabled = pythonOlder "3.8";
+
+ src = fetchFromGitHub {
+ owner = "bieniu";
+ repo = pname;
+ rev = version;
+ sha256 = "1sgbw9yldf81phwx6pbvqg9sp767whxymyj0ca9pwx1r6ipr080h";
+ };
+
+ nativeBuildInputs = [ pytestrunner ];
+ propagatedBuildInputs = [ aiohttp ];
+ checkInputs = [ pytestCheckHook pytestcov pytest-asyncio ];
+
+ meta = with lib; {
+ description =
+ "Python wrapper for getting weather data from AccuWeather servers.";
+ homepage = "https://github.com/bieniu/accuweather";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ jamiemagee ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/actdiag/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/actdiag/default.nix
index 00a08b3e7a82..84aef2dfb03d 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/actdiag/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/actdiag/default.nix
@@ -1,32 +1,24 @@
-{ stdenv, buildPythonPackage, fetchPypi, fetchpatch
-, pep8, nose, unittest2, docutils, blockdiag, reportlab }:
+{ stdenv, buildPythonPackage, fetchPypi
+, nose, docutils, blockdiag, reportlab }:
buildPythonPackage rec {
pname = "actdiag";
- version = "0.5.4";
+ version = "2.0.0";
src = fetchPypi {
inherit pname version;
- sha256 = "983071777d9941093aaef3be1f67c198a8ac8d2bba264cdd1f337ca415ab46af";
+ sha256 = "0g51v9dmdq18z33v332f1f0cmb3hqgaga5minj0mc2sglark1s7h";
};
- patches = fetchpatch {
- name = "drop_test_pep8.py.patch";
- url = "https://bitbucket.org/blockdiag/actdiag/commits/c1f2ed5947a1e93291f5860e4e30cee098bd635d/raw";
- sha256 = "1zxzwb0fvwlc8xgs45fx65341sjhb3h6l2p6rdj6i127vg1hsxb4";
- };
-
- buildInputs = [ pep8 nose unittest2 docutils ];
-
- propagatedBuildInputs = [ blockdiag ];
+ propagatedBuildInputs = [ blockdiag docutils ];
- checkInputs = [ reportlab ];
+ checkInputs = [ nose reportlab ];
meta = with stdenv.lib; {
description = "Generate activity-diagram image from spec-text file (similar to Graphviz)";
homepage = "http://blockdiag.com/";
license = licenses.asl20;
platforms = platforms.unix;
- maintainers = with maintainers; [ bjornfor ];
+ maintainers = with maintainers; [ bjornfor SuperSandro2000 ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/adal/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/adal/default.nix
index 58a8ce72cb98..0df7247986d0 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/adal/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/adal/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "adal";
- version = "1.2.4";
+ version = "1.2.5";
src = fetchPypi {
inherit pname version;
- sha256 = "7a15d22b1ee7ce1be92441199958748982feba6b7dec35fbf60f9b607bad1bc0";
+ sha256 = "8003ba03ef04170195b3eddda8a5ab43649ef2c5f0287023d515affb1ccfcfc3";
};
propagatedBuildInputs = [ requests pyjwt dateutil ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/aioconsole/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/aioconsole/default.nix
index 3090c3cb1f6e..c198676e3eb0 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/aioconsole/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/aioconsole/default.nix
@@ -10,12 +10,12 @@
# wrapped to be able to find aioconsole and any other packages.
buildPythonPackage rec {
pname = "aioconsole";
- version = "0.3.0";
+ version = "0.3.1";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "b84724e6b93d1306a909974864df377236cf4bab8e0594096fed7936207205c5";
+ sha256 = "7c038bb40b7690bf5be6b17154830b7bff25e7be1c02d8420a346c3efbd5d8e5";
};
# hardcodes a test dependency on an old version of pytest-asyncio
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/aioextensions/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/aioextensions/default.nix
new file mode 100644
index 000000000000..3fee1af2f176
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/aioextensions/default.nix
@@ -0,0 +1,35 @@
+{ buildPythonPackage
+, fetchPypi
+, lib
+, pythonOlder
+
+# Python dependencies
+, uvloop
+, pytest
+}:
+
+buildPythonPackage rec {
+ pname = "aioextensions";
+ version = "20.11.1621472";
+ disabled = pythonOlder "3.6";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "abfb2a27590f20b04808192e6c9c5f93298656c013546850c4505b5070a8cc82";
+ };
+
+ propagatedBuildInputs = [ uvloop ];
+
+ checkInputs = [ pytest ];
+ checkPhase = ''
+ cd test/
+ pytest
+ '';
+
+ meta = with lib; {
+ description = "High performance functions to work with the async IO";
+ homepage = "https://kamadorueda.github.io/aioextensions";
+ license = licenses.mit;
+ maintainers = with maintainers; [ kamadorueda ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/aiofiles/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/aiofiles/default.nix
index 7db56622759f..fd77a5587885 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/aiofiles/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/aiofiles/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "aiofiles";
- version = "0.5.0";
+ version = "0.6.0";
src = fetchPypi {
inherit pname version;
- sha256 = "98e6bcfd1b50f97db4980e182ddd509b7cc35909e903a8fe50d8849e02d815af";
+ sha256 = "e0281b157d3d5d59d803e3f4557dcc9a3dff28a4dd4829a9ff478adae50ca092";
};
disabled = pythonOlder "3.3";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/aiohttp-jinja2/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/aiohttp-jinja2/default.nix
index 84195d5545e0..0a939dfb0097 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/aiohttp-jinja2/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/aiohttp-jinja2/default.nix
@@ -1,17 +1,17 @@
-{ lib, buildPythonPackage, fetchPypi, aiohttp, jinja2, pytest, pytest-aiohttp }:
+{ lib, buildPythonPackage, fetchPypi, aiohttp, jinja2, pytest, pytest-aiohttp, pytestcov }:
buildPythonPackage rec {
pname = "aiohttp-jinja2";
- version = "1.2.0";
+ version = "1.4.2";
src = fetchPypi {
inherit pname version;
- sha256 = "2dfe29cfd278d07cd0a851afb98471bc8ce2a830968443e40d67636f3c035d79";
+ sha256 = "9c22a0e48e3b277fc145c67dd8c3b8f609dab36bce9eb337f70dfe716663c9a0";
};
propagatedBuildInputs = [ aiohttp jinja2 ];
- checkInputs = [ pytest pytest-aiohttp ];
+ checkInputs = [ pytest pytest-aiohttp pytestcov ];
checkPhase = ''
pytest -W ignore::DeprecationWarning
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/aiohttp/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/aiohttp/default.nix
index 2e5191909bb3..514d1d308e12 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/aiohttp/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/aiohttp/default.nix
@@ -21,26 +21,36 @@
, brotlipy
, freezegun
, isPy38
+, re-assert
}:
buildPythonPackage rec {
pname = "aiohttp";
- version = "3.6.2";
+ version = "3.7.3";
# https://github.com/aio-libs/aiohttp/issues/4525 python3.8 failures
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
- sha256 = "09pkw6f1790prnrq0k8cqgnf1qy57ll8lpmc6kld09q7zw4vi6i5";
+ sha256 = "9c1a81af067e72261c9cbe33ea792893e83bc6aa987bfbd6fdc1e5e7b22777c4";
};
checkInputs = [
pytestrunner pytestCheckHook gunicorn async_generator pytest_xdist
pytest-mock pytestcov trustme brotlipy freezegun
+ re-assert
];
- propagatedBuildInputs = [ attrs chardet multidict async-timeout yarl ]
- ++ lib.optionals (pythonOlder "3.7") [ idna-ssl typing-extensions ];
+ propagatedBuildInputs = [
+ attrs
+ chardet
+ multidict
+ async-timeout
+ typing-extensions
+ yarl
+ ] ++ lib.optionals (pythonOlder "3.7") [
+ idna-ssl
+ ];
disabledTests = [
# disable tests which attempt to do loopback connections
@@ -54,6 +64,7 @@ buildPythonPackage rec {
"proxy_https_bad_response"
"partially_applied_handler"
"middleware"
+ "test_mark_formdata_as_processed"
# no longer compatible with pytest>=6
"aiohttp_plugin_async_fixture"
] ++ lib.optionals stdenv.is32bit [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/aiokafka/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/aiokafka/default.nix
index c6cfe99297b0..ba32976b96b1 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/aiokafka/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/aiokafka/default.nix
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "aiokafka";
- version = "0.6.0";
+ version = "0.7.0";
disabled = isPy27;
@@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "aio-libs";
repo = "aiokafka";
rev = "v${version}";
- sha256 = "1l5nkz9blmfrbsj7m76vm8vcfdgvab33anzpq62384scp9yf8dln";
+ sha256 = "16pcgv38syqy6sj3w7zx95zgynpd642n3i95dpiw0ivhpqrxxhrf";
};
nativeBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/aiomysql/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/aiomysql/default.nix
index acaeb0ba783e..4de8eaba3d8f 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/aiomysql/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/aiomysql/default.nix
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "aiomysql";
- version = "0.0.20";
+ version = "0.0.21";
disabled = isPy27;
src = fetchFromGitHub {
owner = "aio-libs";
repo = pname;
rev = "v${version}";
- sha256 = "1mxih81zc2k64briirpp5wz4f72l8v05avfyfibaq9fr6lcbih9b";
+ sha256 = "1qvy3phbsxp55161dnppjfx2m1kn82v0irc3xzqw0adfd81vaiad";
};
propagatedBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/aioresponses/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/aioresponses/default.nix
index 7b12cefc8c78..6a0d69371a8e 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/aioresponses/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/aioresponses/default.nix
@@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "aioresponses";
- version = "0.6.4";
+ version = "0.7.1";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
- sha256 = "4397ca736238a1ada8c7f47e557dda05e9ecfdd467b9f6b83871efd365af7e9f";
+ sha256 = "f65bba2be1e9a4997ee166bc0161a50be0fef7350ad09e6afdb2adccf74dfefe";
};
nativeBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/aiounifi/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/aiounifi/default.nix
index 3b05d2c3811e..a39b4566419c 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/aiounifi/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/aiounifi/default.nix
@@ -3,13 +3,13 @@
buildPythonPackage rec {
pname = "aiounifi";
- version = "23";
+ version = "25";
disabled = ! isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "0628058b644776132f2f893f1a2201a0142a38b6acf089c6b11a63ad5a752ba7";
+ sha256 = "1777effcc4ec8683e53603437887c43fa650f09ef4d148904ce06e2aa11044b7";
};
propagatedBuildInputs = [ aiohttp ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/alembic/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/alembic/default.nix
index 18a56936d9db..4061dca8aa28 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/alembic/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/alembic/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "alembic";
- version = "1.4.2";
+ version = "1.4.3";
src = fetchPypi {
inherit pname version;
- sha256 = "035ab00497217628bf5d0be82d664d8713ab13d37b630084da8e1f98facf4dbf";
+ sha256 = "5334f32314fb2a56d86b4c4dd1ae34b08c03cae4cb888bc699942104d66bc245";
};
buildInputs = [ pytest pytestcov mock coverage ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/alerta-server/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/alerta-server/default.nix
index dd3e4ab1b116..f8a3b9684805 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/alerta-server/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/alerta-server/default.nix
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "alerta-server";
- version = "8.0.3";
+ version = "8.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "894d240c51428225264867a80094b9743d71272635a18ddfefa5832b61fed2c6";
+ sha256 = "32a97eee95aea5527f6efa844c18b727fe4a6d61356ea3c0769a29a163ddcb7e";
};
propagatedBuildInputs = [
@@ -23,7 +23,7 @@ buildPythonPackage rec {
pymongo
python-dateutil
pytz
- pyyaml
+ pyyaml
requests
requests-hawk
sentry-sdk
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/amazon_kclpy/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/amazon_kclpy/default.nix
index f18b5e59e34f..bfce45ae206c 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/amazon_kclpy/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/amazon_kclpy/default.nix
@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "amazon_kclpy";
- version = "1.5.0";
+ version = "2.0.1";
src = fetchFromGitHub {
owner = "awslabs";
repo = "amazon-kinesis-client-python";
rev = "v${version}";
- sha256 = "1qg86y9172gm5592ja7lr6w7kfnx668j99bf3ijklpk5yshxwr9m";
+ sha256 = "13iq217fg0bxafp2rl684pg1rz4jbwid8cc8ip4rim07kzn65lbg";
};
# argparse is just required for python2.6
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/amply/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/amply/default.nix
index e0e9100f7924..1962d004f41b 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/amply/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/amply/default.nix
@@ -4,26 +4,25 @@
, setuptools_scm
, docutils
, pyparsing
+, pytestCheckHook
}:
buildPythonPackage rec {
pname = "amply";
- version = "0.1.2";
+ version = "0.1.4";
src = fetchPypi {
inherit pname version;
- sha256 = "1j2dqdz1y1nbyw33qq89v0f5rkmqfbga72d9hax909vpcapm6pbf";
+ sha256 = "cb12dcb49d16b168c02be128a1527ecde50211e4bd94af76ff4e67707f5a2d38";
};
- buildInputs = [ setuptools_scm ];
+ nativeBuildInputs = [ setuptools_scm ];
propagatedBuildInputs = [
docutils
pyparsing
];
+ checkInputs = [ pytestCheckHook ];
- checkPhase = ''
- python tests/test_amply.py
- '';
pythonImportsCheck = [ "amply" ];
meta = with stdenv.lib; {
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/amqp/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/amqp/default.nix
index 5fa41412a7ca..12dc1eca2a31 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/amqp/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/amqp/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "amqp";
- version = "2.6.1";
+ version = "5.0.2";
src = fetchPypi {
inherit pname version;
- sha256 = "70cdb10628468ff14e57ec2f751c7aa9e48e7e3651cfd62d431213c0c4e58f21";
+ sha256 = "fcd5b3baeeb7fc19b3486ff6d10543099d40ae1f5c9196eae695d1cde1b2f784";
};
propagatedBuildInputs = [ vine ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/annexremote/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/annexremote/default.nix
index bddae5155d7b..a508e7b27111 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/annexremote/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/annexremote/default.nix
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "annexremote";
- version = "1.3.1";
+ version = "1.4.5";
# use fetchFromGitHub instead of fetchPypi because the test suite of
# the package is not included into the PyPI tarball
@@ -17,7 +17,7 @@ buildPythonPackage rec {
rev = "v${version}";
owner = "Lykos153";
repo = "AnnexRemote";
- sha256 = "13ny7h41430pi9393dw3qgwxvzcxacapjsw0d3vjm7lc4h566alq";
+ sha256 = "0r5chdk2aiqcz7z8r8m1j657cz79f6bbv96xdmhj4m5fiqn672if";
};
propagatedBuildInputs = [ future ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/annoy/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/annoy/default.nix
index 51fd57582f2f..138c70a38483 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/annoy/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/annoy/default.nix
@@ -6,12 +6,12 @@
}:
buildPythonPackage rec {
- version = "1.16.3";
+ version = "1.17.0";
pname = "annoy";
src = fetchPypi {
inherit pname version;
- sha256 = "fe2779664bd8846f2d67191a7e6010b8df890ac4586336748fd0697f31654379";
+ sha256 = "9891e264041d1dcf3af42f67fbb16cb273c5404bc8c869d0915a3087f71d58dd";
};
nativeBuildInputs = [ h5py ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/ansi2html/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/ansi2html/default.nix
index eda67e260454..76775acb1632 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/ansi2html/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/ansi2html/default.nix
@@ -1,17 +1,21 @@
-{ lib, buildPythonPackage, fetchPypi, isPy3k, six, mock, nose, setuptools }:
+{ lib, buildPythonPackage, fetchPypi, isPy3k, six, mock, pytestCheckHook, setuptools, setuptools_scm, toml }:
buildPythonPackage rec {
pname = "ansi2html";
- version = "1.5.2";
+ version = "1.6.0";
src = fetchPypi {
inherit pname version;
- sha256 = "1a9vihsvd03hb0a4dbiklyy686adp9q2ipl79mkxmdr6gfp8bbln";
+ sha256 = "0f124ea7efcf3f24f1f9398e527e688c9ae6eab26b0b84e1299ef7f94d92c596";
};
+ nativeBuildInputs = [ setuptools_scm toml ];
propagatedBuildInputs = [ six setuptools ];
- checkInputs = [ mock nose ];
+ preCheck = "export PATH=$PATH:$out/bin";
+ checkInputs = [ mock pytestCheckHook ];
+
+ pythonImportsCheck = [ "ansi2html" ];
meta = with lib; {
description = "Convert text with ANSI color codes to HTML";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/ansible-lint/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/ansible-lint/default.nix
index b704fd7453fe..2718ba7670b5 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/ansible-lint/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/ansible-lint/default.nix
@@ -4,30 +4,31 @@
, isPy27
, ansible
, pyyaml
-, six
-, nose
, setuptools_scm
, ruamel_yaml
-, pathlib2
+, rich
+, pytestCheckHook
+, pytestcov
+, pytest_xdist
+, git
}:
buildPythonPackage rec {
pname = "ansible-lint";
- version = "4.2.0";
+ version = "4.3.7";
# pip is not able to import version info on raumel.yaml
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "eb925d8682d70563ccb80e2aca7b3edf84fb0b768cea3edc6846aac7abdc414a";
+ sha256 = "0kwwv9dv9rgsqvp15r2vma7hii9lkkqn0n2irvp5h32cbhzzq4hh";
};
format = "pyproject";
nativeBuildInputs = [ setuptools_scm ];
- propagatedBuildInputs = [ pyyaml six ansible ruamel_yaml ]
- ++ lib.optionals isPy27 [ pathlib2 ];
- checkInputs = [ nose ];
+ propagatedBuildInputs = [ pyyaml ansible ruamel_yaml rich ];
+ checkInputs = [ pytestCheckHook pytestcov pytest_xdist git ];
postPatch = ''
patchShebangs bin/ansible-lint
@@ -42,11 +43,11 @@ buildPythonPackage rec {
'';
checkPhase = ''
- PATH=$out/bin:$PATH nosetests test
+ pytest -k 'not test_run_playbook_github and not test_run_single_role_path_no_trailing_slash_script'
'';
meta = with lib; {
- homepage = "https://github.com/willthames/ansible-lint";
+ homepage = "https://github.com/ansible/ansible-lint";
description = "Best practices checker for Ansible";
license = licenses.mit;
maintainers = [ maintainers.sengaya ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/anyio/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/anyio/default.nix
new file mode 100644
index 000000000000..f79bf23896fd
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/anyio/default.nix
@@ -0,0 +1,62 @@
+{ stdenv
+, lib
+, buildPythonPackage
+, fetchFromGitHub
+, pythonOlder
+, idna
+, sniffio
+, typing-extensions
+, curio
+, hypothesis
+, pytestCheckHook
+, trio
+, trustme
+, uvloop
+}:
+
+buildPythonPackage rec {
+ pname = "anyio";
+ version = "2.0.2";
+ format = "pyproject";
+ disabled = pythonOlder "3.7";
+
+ src = fetchFromGitHub {
+ owner = "agronholm";
+ repo = pname;
+ rev = version;
+ sha256 = "06nazfrm2sclp3lpgsn9wl8vmqxvx36s3gr2gnqz3zhjpf3glkxv";
+ };
+
+ propagatedBuildInputs = [
+ idna
+ sniffio
+ ] ++ lib.optionals (pythonOlder "3.8") [
+ typing-extensions
+ ];
+
+ checkInputs = [
+ curio
+ hypothesis
+ pytestCheckHook
+ trio
+ trustme
+ uvloop
+ ];
+
+ pytestFlagsArray = [
+ # lots of DNS lookups
+ "--ignore=tests/test_sockets.py"
+ ] ++ lib.optionals stdenv.isDarwin [
+ # darwin sandboxing limitations
+ "--ignore=tests/streams/test_tls.py"
+ ];
+
+ pythonImportsCheck = [ "anyio" ];
+
+ meta = with lib; {
+ description = "High level compatibility layer for multiple asynchronous event loop implementations on Python";
+ homepage = "https://github.com/agronholm/anyio";
+ license = licenses.mit;
+ maintainers = with maintainers; [ hexa ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/apispec/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/apispec/default.nix
index 222f2efdd626..0dea059f76af 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/apispec/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/apispec/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "apispec";
- version = "3.3.1";
+ version = "4.0.0";
src = fetchPypi {
inherit pname version;
- sha256 = "f5244ccca33f7a81309f6b3c9d458e33e869050c2d861b9f8cee24b3ad739d2b";
+ sha256 = "360e28e5e84a4d7023b16de2b897327fe3da63ddc8e01f9165b9113b7fe1c48a";
};
checkInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/apprise/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/apprise/default.nix
index 1c140266b9eb..5c260692887a 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/apprise/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/apprise/default.nix
@@ -1,15 +1,15 @@
{ lib, buildPythonPackage, fetchPypi
, Babel, requests, requests_oauthlib, six, click, markdown, pyyaml
-, pytestrunner, coverage, flake8, mock, pytest, pytestcov, tox
+, pytestrunner, coverage, flake8, mock, pytest, pytestcov, tox, gntp, sleekxmpp
}:
buildPythonPackage rec {
pname = "apprise";
- version = "0.8.7";
+ version = "0.8.9";
src = fetchPypi {
inherit pname version;
- sha256 = "18a65c5917bf7f2d48bb557bf0879e49c5293b4c0e9809328387ae09338ae37b";
+ sha256 = "024db00c6a80dbc8c9038b2de211c9fd32963046612882f3f54ad78930f3e0f7";
};
nativeBuildInputs = [ Babel ];
@@ -19,7 +19,7 @@ buildPythonPackage rec {
];
checkInputs = [
- pytestrunner coverage flake8 mock pytest pytestcov tox
+ pytestrunner coverage flake8 mock pytest pytestcov tox gntp sleekxmpp
];
meta = with lib; {
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/arabic-reshaper/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/arabic-reshaper/default.nix
new file mode 100644
index 000000000000..ad5f64146a69
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/arabic-reshaper/default.nix
@@ -0,0 +1,26 @@
+{ lib, buildPythonPackage, fetchPypi, future, configparser, isPy27 }:
+
+buildPythonPackage rec {
+ pname = "arabic_reshaper";
+ version = "2.1.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "zzGPpdUdLSJPpJv2vbu0aE9r0sBot1z84OYH+JrBmdw=";
+ };
+
+ propagatedBuildInputs = [ future ]
+ ++ lib.optionals isPy27 [ configparser ];
+
+ # Tests are not published on pypi
+ doCheck = false;
+
+ pythonImportsCheck = [ "arabic_reshaper" ];
+
+ meta = with lib; {
+ homepage = "https://github.com/mpcabd/python-arabic-reshaper";
+ description = "Reconstruct Arabic sentences to be used in applications that don't support Arabic";
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ freezeboy ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/argcomplete/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/argcomplete/default.nix
index 3ab390d822b5..f2a9db40f60f 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/argcomplete/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/argcomplete/default.nix
@@ -7,11 +7,11 @@
}:
buildPythonPackage rec {
pname = "argcomplete";
- version = "1.12.1";
+ version = "1.12.2";
src = fetchPypi {
inherit pname version;
- sha256 = "849c2444c35bb2175aea74100ca5f644c29bf716429399c0f2203bb5d9a8e4e6";
+ sha256 = "de0e1282330940d52ea92a80fea2e4b9e0da1932aaa570f84d268939d1897b04";
};
doCheck = false; # meant to be ran with interactive interpreter
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/arpeggio/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/arpeggio/default.nix
index 42d1ce0a219a..29c5e4381036 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/arpeggio/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/arpeggio/default.nix
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "Arpeggio";
- version = "1.9.2";
+ version = "1.10.1";
src = fetchPypi {
inherit pname version;
- sha256 = "948ce06163a48a72c97f4fe79ad3d1c1330b6fec4f22ece182fb60ef60bd022b";
+ sha256 = "920d12cc762edb2eb56daae64a14c93e43dc181b481c88fc79314c0df6ee639e";
};
# Shall not be needed for next release
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/arrow/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/arrow/default.nix
index bc3de37526a1..7dbe3b98fca3 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/arrow/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/arrow/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "arrow";
- version = "0.15.8";
+ version = "0.17.0";
src = fetchPypi {
inherit pname version;
- sha256 = "edc31dc051db12c95da9bac0271cd1027b8e36912daf6d4580af53b23e62721a";
+ sha256 = "ff08d10cda1d36c68657d6ad20d74fbea493d980f8b2d45344e00d6ed2bf6ed4";
};
propagatedBuildInputs = [ python-dateutil ]
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/asana/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/asana/default.nix
index 7c08cf1acbbc..71c003ef9b0a 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/asana/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/asana/default.nix
@@ -4,7 +4,7 @@
buildPythonPackage rec {
pname = "asana";
- version = "0.8.2";
+ version = "0.10.3";
# upstream reportedly doesn't support 3.7 yet, blocked on
# https://bugs.python.org/issue34226
@@ -14,7 +14,7 @@ buildPythonPackage rec {
owner = "asana";
repo = "python-asana";
rev = "v${version}";
- sha256 = "113zwnrpim1pdw8dzid2wpp5gzr2zk26jjl4wrwhgj0xk1cw94yi";
+ sha256 = "11nsfygcfpc2qb2gy4npi9w00cqfh88g7k3rsfq7xambz1zjdz1n";
};
checkInputs = [ pytest responses ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/asciimatics/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/asciimatics/default.nix
index 09bf4e6a3da2..aafbaa15ffe7 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/asciimatics/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/asciimatics/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "asciimatics";
- version = "1.11.0";
+ version = "1.12.0";
src = fetchPypi {
inherit pname version;
- sha256 = "132y3gc0dj9vmgajmzz2fyc3icrrgsvynwfl0g31bylm7h9p220x";
+ sha256 = "4120461a3fb345638dee4fe0f8a3d3f9b6d2d2e003f95c5f914523f94463158d";
};
nativeBuildInputs = [
@@ -39,6 +39,13 @@ buildPythonPackage rec {
# which is too complicated to setup here
doCheck = false;
+ pythonImportsCheck = [
+ "asciimatics.effects"
+ "asciimatics.renderers"
+ "asciimatics.scene"
+ "asciimatics.screen"
+ ];
+
meta = with lib; {
description = "Helps to create full-screen text UIs (from interactive forms to ASCII animations) on any platform";
homepage = "https://github.com/peterbrittain/asciimatics";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/asgi-csrf/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/asgi-csrf/default.nix
index 12c94aee1573..e838ec787c31 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/asgi-csrf/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/asgi-csrf/default.nix
@@ -1,8 +1,8 @@
{ stdenv, buildPythonPackage, isPy27, fetchFromGitHub, itsdangerous, python-multipart
-, pytest, starlette, httpx, pytest-asyncio }:
+, pytestCheckHook, starlette, httpx, pytest-asyncio }:
buildPythonPackage rec {
- version = "0.7";
+ version = "0.7.1";
pname = "asgi-csrf";
disabled = isPy27;
@@ -11,15 +11,26 @@ buildPythonPackage rec {
owner = "simonw";
repo = pname;
rev = version;
- sha256 = "1vf4lh007790836cp3hd6wf8wsgj045dcg0w1cm335p08zz6j4k7";
+ sha256 = "1hhqrb9r46y6i3d3w6hc9zm6yyikdyd2k5pcbyw0r9fl959yi4hf";
};
- propagatedBuildInputs = [ itsdangerous python-multipart ];
+ propagatedBuildInputs = [
+ itsdangerous
+ python-multipart
+ ];
+
+ checkInputs = [
+ httpx
+ pytest-asyncio
+ pytestCheckHook
+ starlette
+ ];
+
+ # tests fail while importing a private module from httpx
+ # E ModuleNotFoundError: No module named 'httpx._content_streams'
+ # https://github.com/simonw/asgi-csrf/issues/18
+ doCheck = false;
- checkInputs = [ pytest starlette httpx pytest-asyncio ];
- checkPhase = ''
- pytest test_asgi_csrf.py
- '';
pythonImportsCheck = [ "asgi_csrf" ];
meta = with stdenv.lib; {
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/astroid/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/astroid/default.nix
index 927e6a6d5a64..49f04bcb9116 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/astroid/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/astroid/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchPypi, buildPythonPackage, pythonOlder, isPyPy
+{ lib, fetchPypi, buildPythonPackage, pythonOlder, isPyPy, pythonAtLeast
, lazy-object-proxy, six, wrapt, typing, typed-ast
, pytestrunner, pytest
}:
@@ -7,7 +7,7 @@ buildPythonPackage rec {
pname = "astroid";
version = "2.4.2";
- disabled = pythonOlder "3.4";
+ disabled = pythonOlder "3.4" || pythonAtLeast "3.9";
src = fetchPypi {
inherit pname version;
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/astropy/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/astropy/default.nix
index 147a4d65de5e..2fe59e53d9c1 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/astropy/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/astropy/default.nix
@@ -2,6 +2,8 @@
, fetchPypi
, buildPythonPackage
, isPy3k
+, cython
+, jinja2
, numpy
, pytest
, pytest-astropy
@@ -10,16 +12,16 @@
buildPythonPackage rec {
pname = "astropy";
- version = "4.0.1.post1";
+ version = "4.2";
disabled = !isPy3k; # according to setup.py
src = fetchPypi {
inherit pname version;
- sha256 = "1da4xj793ldck29aajyb514wpz330cml26f3gdp45jj531n4lc2w";
+ sha256 = "2c194f8a429b8399de64a413a06881ea49f0525cabaa2d78fc132b9e970adc6a";
};
- nativeBuildInputs = [ astropy-helpers ];
+ nativeBuildInputs = [ astropy-helpers cython jinja2 ];
propagatedBuildInputs = [ numpy pytest ]; # yes it really has pytest in install_requires
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/async-upnp-client/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/async-upnp-client/default.nix
index b1ed1c45f85a..6697cb5d13e8 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/async-upnp-client/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/async-upnp-client/default.nix
@@ -1,17 +1,17 @@
{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder
, voluptuous, aiohttp, async-timeout, python-didl-lite, defusedxml
-, pytest, pytest-asyncio }:
+, pytest_6, pytest-asyncio }:
buildPythonPackage rec {
pname = "async-upnp-client";
- version = "0.14.14";
+ version = "0.14.15";
disabled = pythonOlder "3.5";
src = fetchFromGitHub {
owner = "StevenLooman";
repo = "async_upnp_client";
rev = version;
- sha256 = "1ysj72l4z78h427ar95x7af0jw0xq1cbca0k8b34vqyyhgs8wc6y";
+ sha256 = "1mr65msdc51wq7326z3q41x79yi9dsmcjrmyzkgj9h9vgpxdk2nw";
};
propagatedBuildInputs = [
@@ -23,7 +23,7 @@ buildPythonPackage rec {
];
checkInputs = [
- pytest
+ pytest_6
pytest-asyncio
];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/async_stagger/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/async_stagger/default.nix
new file mode 100644
index 000000000000..bb57a7f1ecf3
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/async_stagger/default.nix
@@ -0,0 +1,35 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, fetchpatch
+, pythonOlder
+, pytestCheckHook
+, pytest-asyncio
+, pytest-mock
+}:
+
+buildPythonPackage rec {
+ pname = "async_stagger";
+ version = "0.3.1";
+ disabled = pythonOlder "3.6";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1mj3daaqxjdavbxcjrdwx5ky9maa2blbv53aa6d7w9zxkrz3b7xa";
+ };
+
+ checkInputs = [
+ pytestCheckHook
+ pytest-asyncio
+ pytest-mock
+ ];
+
+ pythonImportsCheck = [ "async_stagger" ];
+
+ meta = with lib; {
+ description = "Happy Eyeballs connection algorithm and underlying scheduling logic in asyncio";
+ homepage = "https://github.com/twisteroidambassador/async_stagger";
+ license = licenses.mit;
+ maintainers = with maintainers; [ hexa ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/asyncio-throttle/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/asyncio-throttle/default.nix
new file mode 100644
index 000000000000..bf08aec41a5b
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/asyncio-throttle/default.nix
@@ -0,0 +1,34 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pythonOlder
+, pytestCheckHook
+, pytest-asyncio
+}:
+
+buildPythonPackage rec {
+ pname = "asyncio-throttle";
+ version = "1.0.1";
+ disabled = pythonOlder "3.6";
+
+ src = fetchFromGitHub {
+ owner = "hallazzang";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0raqnrnp42cn1c7whbm7ajbgaczx33k6hbxsj30nh998pqxhh4sj";
+ };
+
+ checkInputs = [
+ pytest-asyncio
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [ "asyncio_throttle" ];
+
+ meta = with lib; {
+ description = "Simple, easy-to-use throttler for asyncio";
+ homepage = "https://github.com/hallazzang/asyncio-throttle";
+ license = licenses.mit;
+ maintainers = with maintainers; [ hexa ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix
index bc540b45de47..44b769636ca5 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildPythonPackage, fetchPypi, pythonOlder
, cryptography
, bcrypt, gssapi, libnacl, libsodium, nettle, pyopenssl
-, openssl, openssh }:
+, openssl, openssh, pytestCheckHook }:
buildPythonPackage rec {
pname = "asyncssh";
@@ -23,6 +23,11 @@ buildPythonPackage rec {
./fix-sftp-chmod-test-nixos.patch
];
+ # Disables windows specific test (specifically the GSSAPI wrapper for Windows)
+ postPatch = ''
+ rm tests/sspi_stub.py
+ '';
+
propagatedBuildInputs = [
bcrypt
cryptography
@@ -36,12 +41,10 @@ buildPythonPackage rec {
checkInputs = [
openssh
openssl
+ pytestCheckHook
];
- # Disables windows specific test (specifically the GSSAPI wrapper for Windows)
- postPatch = ''
- rm tests/sspi_stub.py
- '';
+ disabledTests = [ "test_expired_root" "test_confirm" ];
meta = with stdenv.lib; {
description = "Provides an asynchronous client and server implementation of the SSHv2 protocol on top of the Python asyncio framework";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/atlassian-python-api/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/atlassian-python-api/default.nix
index 5161f85a4c10..b1f0df0b3bc0 100755
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/atlassian-python-api/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/atlassian-python-api/default.nix
@@ -4,6 +4,7 @@
, isPy3k
, certifi
, chardet
+, deprecated
, idna
, oauthlib
, requests
@@ -16,16 +17,16 @@
buildPythonPackage rec {
pname = "atlassian-python-api";
- version = "1.17.5";
+ version = "2.1.2";
src = fetchPypi {
inherit pname version;
- sha256 = "cbd7941fa7e1eb6f63e12724277894350298745480297658da912e07234314cc";
+ sha256 = "f852bfd293fdcb0ab2d7a9ea907f8303cf14fe6f55e90c103d4de00393ea9555";
};
checkInputs = [ pytestrunner pytest ];
- propagatedBuildInputs = [ oauthlib requests requests_oauthlib six ];
+ propagatedBuildInputs = [ deprecated oauthlib requests requests_oauthlib six ];
meta = with lib; {
description = "Python Atlassian REST API Wrapper";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/atom/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/atom/default.nix
index 60fa12d4a661..cb9503fe6e9c 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/atom/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/atom/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "atom";
- version = "0.5.2";
+ version = "0.6.0";
src = fetchPypi {
inherit pname version;
- sha256 = "99b4c94b833aafffc0b34ab8f98b697f575be3230bff38ebf863d065403333e0";
+ sha256 = "df65a654744ccdc4843ce09c38612fd8f702c84be501b1d955c3ac0b9ad28dc5";
};
buildInputs = [ cppy ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/atpublic/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/atpublic/default.nix
index 021d8e8b3077..41353598f895 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/atpublic/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/atpublic/default.nix
@@ -7,12 +7,12 @@
buildPythonPackage rec {
pname = "atpublic";
- version = "2.0";
+ version = "2.1.1";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "ebeb62b71a5c683a84c1b16bbf415708af5a46841b142b85ac3a22ec2d7613b0";
+ sha256 = "fa1d48bcb85bbed90f6ffee6936578f65ff0e93aa607397bd88eaeb408bd96d8";
};
propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [
@@ -24,7 +24,7 @@ buildPythonPackage rec {
];
checkPhase = ''
- pytest --pyargs public
+ pytest
'';
meta = with lib; {
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/atsim_potentials/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/atsim_potentials/default.nix
index 3bc221d7adc9..8369a49b7db8 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/atsim_potentials/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/atsim_potentials/default.nix
@@ -1,21 +1,36 @@
{ stdenv
, buildPythonPackage
, fetchPypi
+, configparser
+, pyparsing
, pytest
, future
+, openpyxl
+, wrapt
}:
buildPythonPackage rec {
- version = "0.2.1";
+ version = "0.3.0";
pname = "atsim.potentials";
src = fetchPypi {
inherit pname version;
- sha256 = "2abdec2fb4e8198f4e0e41634ad86625d5356a4a3f1ba1f41568d0697df8f36f";
+ sha256 = "70082fc40b0ab7565a671c2d764fe3db08bc6ce45da44e1c1e8b77a65d1f7a23";
};
checkInputs = [ pytest ];
- propagatedBuildInputs = [ future ];
+ propagatedBuildInputs = [
+ configparser
+ future
+ openpyxl
+ pyparsing
+ wrapt
+ ];
+
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace "wrapt==1.11.2" "wrapt~=1.11"
+ '';
# tests are not included with release
doCheck = false;
@@ -25,9 +40,10 @@ buildPythonPackage rec {
'';
meta = with stdenv.lib; {
- homepage = "https://bitbucket.org/mjdr/atsim_potentials";
+ homepage = "https://github.com/mjdrushton/atsim-potentials";
description = "Provides tools for working with pair and embedded atom method potential models including tabulation routines for DL_POLY and LAMMPS";
license = licenses.mit;
maintainers = [ maintainers.costrouc ];
+ broken = true; # missing cexprtk package
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/attrs/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/attrs/default.nix
index 0e0606a3ead5..7513aa04f300 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/attrs/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/attrs/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "attrs";
- version = "19.3.0";
+ version = "20.3.0";
src = fetchPypi {
inherit pname version;
- sha256 = "f7b7ce16570fe9965acd6d30101a28f62fb4a7f9e926b3bbc9b61f8b04247e72";
+ sha256 = "832aa3cde19744e49938b91fea06d69ecb9e649c93ba974535d08ad92164f700";
};
# macOS needs clang for testing
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/aubio/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/aubio/default.nix
new file mode 100644
index 000000000000..4616e1b6ed3f
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/aubio/default.nix
@@ -0,0 +1,35 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, numpy
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+ pname = "aubio";
+ version = "0.4.9";
+
+ src = fetchFromGitHub {
+ owner = pname;
+ repo = pname;
+ rev = version;
+ sha256 = "0fhxikvlr010nbh02g455d5y8bq6j5yw180cdh4gsd0hb43y3z26";
+ };
+
+ propagatedBuildInputs = [
+ numpy
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [ "aubio" ];
+
+ meta = with lib; {
+ description = "a library for audio and music analysis";
+ homepage = "https://aubio.org";
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ hexa ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/audioread/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/audioread/default.nix
index addd187abeb6..a4f6d9057654 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/audioread/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/audioread/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "audioread";
- version = "2.1.8";
+ version = "2.1.9";
src = fetchPypi {
inherit pname version;
- sha256 = "073904fabc842881e07bd3e4a5776623535562f70b1655b635d22886168dd168";
+ sha256 = "a3480e42056c8e80a8192a54f6729a280ef66d27782ee11cbd63e9d4d1523089";
};
nativeBuildInputs = [ pytestrunner ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/authlib/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/authlib/default.nix
index 94fc7215c340..e3d8c99e0ea1 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/authlib/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/authlib/default.nix
@@ -8,14 +8,14 @@
}:
buildPythonPackage rec {
- version = "0.15.1";
+ version = "0.15.2";
pname = "authlib";
src = fetchFromGitHub {
owner = "lepture";
repo = "authlib";
rev = "v${version}";
- sha256 = "0jh4kdi5spzhmgvq3ffz2q467hjycz3wg97f7n53rffiwd86jrh5";
+ sha256 = "0jsqh2nirx3xifsakqdpd3wpdig6czavv3yj4lyqz3wh9xjpvswg";
};
propagatedBuildInputs = [ cryptography requests ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/awkward/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/awkward/default.nix
index 65dfd4628571..6a919c768c70 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/awkward/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/awkward/default.nix
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "awkward";
- version = "0.13.0";
+ version = "0.14.0";
src = fetchPypi {
inherit pname version;
- sha256 = "1a461ee084ea5e98333dacf2506e9b2619ee89cece14b9b99830b546b35c5922";
+ sha256 = "6a3878f46e8bc2acf28a0b9feb69d354ad2fee2a2a0f65c48c115aa74f245204";
};
nativeBuildInputs = [ pytestrunner ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/awkward1/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/awkward1/default.nix
index 927d620948ca..dae8a235d80f 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/awkward1/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/awkward1/default.nix
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "awkward1";
- version = "0.2.35";
+ version = "0.4.5";
src = fetchPypi {
inherit pname version;
- sha256 = "563868f0f2d0cb398ce3616ee3f9734cc68cee9a612d35cab830ec5c728f1474";
+ sha256 = "8c786d1641343e9887c21794f9a3bf51716b00ed3b182491f1acbc9e389b31bb";
};
nativeBuildInputs = [ cmake ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/aws-adfs/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/aws-adfs/default.nix
index cb014896d294..ce4c6f789263 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/aws-adfs/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/aws-adfs/default.nix
@@ -4,12 +4,12 @@
buildPythonPackage rec {
pname = "aws-adfs";
- version = "1.24.4";
+ version = "1.24.5";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "601b056fa8ba4b615289def3b1aa49aa58f1f4aa6b89f3cf7cf1e0aee9f2291c";
+ sha256 = "6a78bd31477ea9988166215ae86abcbfe1413bee20373ecdf0dd170b7290db55";
};
# Relax version constraint
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/aws-lambda-builders/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/aws-lambda-builders/default.nix
index fdce47b25946..804ad078acb7 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/aws-lambda-builders/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/aws-lambda-builders/default.nix
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "aws-lambda-builders";
- version = "0.9.0";
+ version = "1.1.0";
# No tests available in PyPI tarball
src = fetchFromGitHub {
owner = "awslabs";
repo = "aws-lambda-builders";
rev = "v${version}";
- sha256 = "0cgb0hwf4xg5dmm32wwlxqy7a77jw6gpnj7v8rq5948hsy2sfrcp";
+ sha256 = "1r4939m5k1nj6l9bv972z4fkmkl0z5f5r29bq7588yk113kkqr0c";
};
# Package is not compatible with Python 3.5
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/aws-sam-translator/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/aws-sam-translator/default.nix
index 5245801bb096..52298faa0cc8 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/aws-sam-translator/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/aws-sam-translator/default.nix
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "aws-sam-translator";
- version = "1.26.0";
+ version = "1.31.0";
src = fetchPypi {
inherit pname version;
- sha256 = "1a3fd8e48a745967e8457b9cefdc3ad0f139ac4a25af4db9c13a9e1c19ea6910";
+ sha256 = "3a1d73d098161e60966b0d53bb310c98e4f66101688cce3d1697903643782d79";
};
# Tests are not included in the PyPI package
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-appconfiguration/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-appconfiguration/default.nix
index bea5fc4adcf6..5626b33462b5 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-appconfiguration/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-appconfiguration/default.nix
@@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "azure-appconfiguration";
- version = "1.1.0";
+ version = "1.1.1";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "0mv053vl88nzpv701gnjdmbylc8qm0kkq87264rfhvrx3ydymf97";
+ sha256 = "b83cd2cb63d93225de84e27abbfc059212f8de27766f4c58dd3abb839dff0be4";
};
propagatedBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-applicationinsights/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-applicationinsights/default.nix
index f0e70b8d86c0..e43e37720217 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-applicationinsights/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-applicationinsights/default.nix
@@ -27,6 +27,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Application Insights Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-batch/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-batch/default.nix
index 05021c73edb0..906461252dc7 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-batch/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-batch/default.nix
@@ -29,6 +29,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Batch Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-common/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-common/default.nix
index abf27b5d7ef2..f77c938b1d7f 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-common/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-common/default.nix
@@ -9,14 +9,14 @@
}:
buildPythonPackage rec {
- version = "1.1.25";
+ version = "1.1.26";
pname = "azure-common";
disabled = isPyPy;
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "ce0f1013e6d0e9faebaf3188cc069f4892fc60a6ec552e3f817c1a2f92835054";
+ sha256 = "b2866238aea5d7492cfb0282fc8b8d5f6d06fb433872345864d45753c10b6e4f";
};
propagatedBuildInputs = [
@@ -33,6 +33,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure common code";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ olcai mwilsoninsight ];
+ maintainers = with maintainers; [ olcai maxwilson ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-core/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-core/default.nix
index dfe346859421..0ad45dceb2bb 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-core/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-core/default.nix
@@ -14,14 +14,14 @@
}:
buildPythonPackage rec {
- version = "1.8.1";
+ version = "1.9.0";
pname = "azure-core";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "7efbeac3a6dfb634cb5323bc04e18ab609aeab6b03610808091aa0517373d626";
+ sha256 = "ef8ae93a2ce8b595f231395579be11aadc1838168cbc2582e2d0bbd8b15c461f";
};
propagatedBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-cosmosdb-nspkg/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-cosmosdb-nspkg/default.nix
index 7a7c0e7215d5..a2b686af6887 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-cosmosdb-nspkg/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-cosmosdb-nspkg/default.nix
@@ -24,6 +24,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure CosmosDB namespace package";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-cosmosdb-table/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-cosmosdb-table/default.nix
index c11ffae1e3dd..5c580ccd3e2f 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-cosmosdb-table/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-cosmosdb-table/default.nix
@@ -34,6 +34,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Log Analytics Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-datalake-store/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-datalake-store/default.nix
index fc9b98eae012..0e97752ae578 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-datalake-store/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-datalake-store/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "azure-datalake-store";
- version = "0.0.50";
+ version = "0.0.51";
src = fetchPypi {
inherit pname version;
- sha256 = "9b9b58dcf1d0d0e5aa499d5cb49dcf8f5432ca467a747b39167bb70ef901dbc2";
+ sha256 = "b871ebb3bcfd292e8a062dbbaacbc132793d98f1b60f549a8c3b672619603fc1";
};
propagatedBuildInputs = [
@@ -34,6 +34,6 @@ buildPythonPackage rec {
description = "This project is the Python filesystem library for Azure Data Lake Store";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-eventgrid/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-eventgrid/default.nix
index 19a0210cc5eb..29392699ce2b 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-eventgrid/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-eventgrid/default.nix
@@ -29,6 +29,6 @@ buildPythonPackage rec {
description = "A fully-managed intelligent event routing service that allows for uniform event consumption using a publish-subscribe model";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-graphrbac/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-graphrbac/default.nix
index 57fec6ff5251..2b05d9ac83d8 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-graphrbac/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-graphrbac/default.nix
@@ -29,6 +29,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Graph RBAC Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-identity/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-identity/default.nix
index f607ab7a094f..e7d2d5c83ac0 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-identity/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-identity/default.nix
@@ -17,13 +17,13 @@
buildPythonPackage rec {
pname = "azure-identity";
- version = "1.4.0";
+ version = "1.5.0";
disabled = isPy38;
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "820e1f3e21f90d36063239c6cb7ca9a6bb644cb120a6b1ead3081cafdf6ceaf8";
+ sha256 = "872adfa760b2efdd62595659b283deba92d47b7a67557eb9ff48f0b5d04ee396";
};
propagatedBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-loganalytics/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-loganalytics/default.nix
index beca4018baba..1eed45d72f5a 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-loganalytics/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-loganalytics/default.nix
@@ -31,6 +31,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Log Analytics Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight jonringer ];
+ maintainers = with maintainers; [ maxwilson jonringer ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-advisor/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-advisor/default.nix
index f801d2a05932..a04f28f2a513 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-advisor/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-advisor/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Advisor Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix
index 0208d082284d..7330ef5fb3e1 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix
@@ -36,6 +36,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Application Insights Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ jonringer mwilsoninsight ];
+ maintainers = with maintainers; [ jonringer maxwilson ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-authorization/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-authorization/default.nix
index 3a9d2e5de2e8..a622c6a94c90 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-authorization/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-authorization/default.nix
@@ -4,24 +4,26 @@
, msrest
, msrestazure
, azure-common
+, azure-mgmt-core
, azure-mgmt-nspkg
, isPy3k
}:
buildPythonPackage rec {
pname = "azure-mgmt-authorization";
- version = "0.61.0";
+ version = "1.0.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "f5cceea3add04e9445ea88492f15eecf6c126f0406d967c95f6e48b79be8db75";
+ sha256 = "9a9fc16866b46387853381ab4fa0f84c1765e0afea5b0124709ea9fae10ee752";
};
propagatedBuildInputs = [
msrest
msrestazure
azure-common
+ azure-mgmt-core
] ++ lib.optionals (!isPy3k) [
azure-mgmt-nspkg
];
@@ -33,6 +35,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Authorization Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-batch/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-batch/default.nix
index 5a1b7600ecfc..aa188e87efa1 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-batch/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-batch/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Batch Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-batchai/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-batchai/default.nix
index 8186f87fd727..6f7aedacfae2 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-batchai/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-batchai/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Batch AI Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-billing/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-billing/default.nix
index 6e9656950d5b..d1cb009355de 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-billing/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-billing/default.nix
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "azure-mgmt-billing";
- version = "0.2.0"; #pypi's 0.2.0 doesn't build ootb
+ version = "1.0.0"; #pypi's 0.2.0 doesn't build ootb
src = fetchPypi {
inherit pname version;
- sha256 = "1li2bcdwdapwwx7xbvgfsq51f2mrwm0qyzih8cjhszcah2rkpxw5";
+ sha256 = "8b55064546c8e94839d9f8c98e9ea4b021004b3804e192bf39fa65b603536ad0";
extension = "zip";
};
@@ -25,7 +25,7 @@ buildPythonPackage rec {
];
preBuild = ''
- rm azure_bdist_wheel.py
+ rm -rf azure_bdist_wheel.py
substituteInPlace setup.cfg \
--replace "azure-namespace-package = azure-mgmt-nspkg" ""
'';
@@ -39,6 +39,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Billing Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-cdn/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-cdn/default.nix
index d6aa79c6915d..172e33d08cd2 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-cdn/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-cdn/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure CDN Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix
index 98ca58e43407..c138dde95d01 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix
@@ -8,12 +8,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-cognitiveservices";
- version = "6.2.0";
+ version = "6.3.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "93503507ba87c18fe24cd3dfcd54e6e69a4daf7636f38b7537e09cee9a4c13ce";
+ sha256 = "1d029d5140152a36cc32f340e09f2b185ede2f54e577a44f3821878efb823415";
};
propagatedBuildInputs = [
@@ -29,6 +29,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Cognitive Services Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-commerce/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-commerce/default.nix
index 43829dcb59e3..1460cdb9ca37 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-commerce/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-commerce/default.nix
@@ -41,6 +41,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Commerce Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight jonringer ];
+ maintainers = with maintainers; [ maxwilson jonringer ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-common/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-common/default.nix
index da8dc95dad00..28043046d8aa 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-common/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-common/default.nix
@@ -37,6 +37,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Resource Management common code";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ olcai mwilsoninsight ];
+ maintainers = with maintainers; [ olcai maxwilson ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-compute/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-compute/default.nix
index 9acf4ddadc40..2aca8fdbd7d0 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-compute/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-compute/default.nix
@@ -8,13 +8,13 @@
}:
buildPythonPackage rec {
- version = "17.0.0";
+ version = "18.0.0";
pname = "azure-mgmt-compute";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "c7350b404e5d10a548ceddb034394c8fad6c852ce33a3d3b211065813c1da404";
+ sha256 = "34815c91193640ad8ff0c4dad7f2d997548c853d2e8b10250329ed516e55879e";
};
propagatedBuildInputs = [
@@ -31,6 +31,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Compute Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ olcai mwilsoninsight ];
+ maintainers = with maintainers; [ olcai maxwilson ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-consumption/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-consumption/default.nix
index 7e5771645115..175dd9de6e87 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-consumption/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-consumption/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Consumption Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix
index 2dfff00dfa61..7a4d8005c9e1 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix
@@ -4,24 +4,26 @@
, msrest
, msrestazure
, azure-common
+, azure-mgmt-core
, azure-mgmt-nspkg
, isPy3k
}:
buildPythonPackage rec {
pname = "azure-mgmt-containerinstance";
- version = "2.0.0";
+ version = "7.0.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "5ad247d186c3c040da7a1d40ad39c9881e99afc58271f673abb602abb0b6b85b";
+ sha256 = "9f624df0664ba80ba886bc96ffe5e468c620eb5b681bc3bc2a28ce26042fd465";
};
propagatedBuildInputs = [
msrest
msrestazure
azure-common
+ azure-mgmt-core
] ++ lib.optionals (!isPy3k) [
azure-mgmt-nspkg
];
@@ -33,6 +35,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Container Instance Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix
index d500ba0df8f1..8e93026b6021 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix
@@ -4,24 +4,26 @@
, msrest
, msrestazure
, azure-common
+, azure-mgmt-core
, azure-mgmt-nspkg
, isPy3k
}:
buildPythonPackage rec {
pname = "azure-mgmt-containerservice";
- version = "9.4.0";
+ version = "14.0.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "d90684106c70779450b82067be4d3e449c799ca1f47d941e45f6d2b5c016dac9";
+ sha256 = "fbb13448fb52a4090ee91940ae8676403dbe8ae81044b7a5cd3c9e58b47d66de";
};
propagatedBuildInputs = [
msrest
msrestazure
azure-common
+ azure-mgmt-core
] ++ lib.optionals (!isPy3k) [
azure-mgmt-nspkg
];
@@ -33,6 +35,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Container Service Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-core/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-core/default.nix
index 17e7796b98ed..c824f3725a7e 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-core/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-core/default.nix
@@ -7,13 +7,13 @@
}:
buildPythonPackage rec {
- version = "1.2.0";
+ version = "1.2.2";
pname = "azure-mgmt-core";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "8fe3b59446438f27e34f7b24ea692a982034d9e734617ca1320eedeee1939998";
+ sha256 = "4246810996107f72482a9351cf918d380c257e90942144ec9c0c2abda1d0a312";
};
propagatedBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix
index 38b580df2522..3814770b2e57 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix
@@ -4,24 +4,26 @@
, msrest
, msrestazure
, azure-common
+, azure-mgmt-core
, azure-mgmt-nspkg
, isPy3k
}:
buildPythonPackage rec {
pname = "azure-mgmt-cosmosdb";
- version = "1.0.0";
+ version = "6.0.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "e08b37aea8e6b62596f55f9beb924e1759b2dc424c180ab2e752153a2b01b723";
+ sha256 = "15e4140870f2756fbd43965ccceca55361a634a0504bbdb033a1909eff14dfb1";
};
propagatedBuildInputs = [
msrest
msrestazure
azure-common
+ azure-mgmt-core
] ++ lib.optionals (!isPy3k) [
azure-mgmt-nspkg
];
@@ -33,6 +35,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Cosmos DB Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix
index e164dbd8f964..92597b3b910c 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix
@@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-datafactory";
- version = "0.13.0";
+ version = "0.14.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "3eabe34f49587840617747511a0aa25d08b0c1619677a1fdda24ce9e6b0f2c74";
+ sha256 = "47bb23fa6cc28f3f15dd7a404b7f9d7af469adf78f79a11eb01ff75ca10a75ba";
};
propagatedBuildInputs = [
@@ -33,6 +33,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Data Factory Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-datalake-analytics/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-datalake-analytics/default.nix
index 1e4cdd88c957..8fc8b44f3e6a 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-datalake-analytics/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-datalake-analytics/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Data Lake Analytics Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-datalake-nspkg/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-datalake-nspkg/default.nix
index ce4f623657eb..8af5fbd0c2e0 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-datalake-nspkg/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-datalake-nspkg/default.nix
@@ -25,6 +25,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Data Lake Management namespace package";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-datalake-store/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-datalake-store/default.nix
index 4f985e37e6fa..b149584b6a99 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-datalake-store/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-datalake-store/default.nix
@@ -34,6 +34,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Data Lake Store Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ jonringer mwilsoninsight ];
+ maintainers = with maintainers; [ jonringer maxwilson ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix
index c82bfeab2ed4..f8f0818598d3 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix
@@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-datamigration";
- version = "4.0.0";
+ version = "4.1.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "1efda568d67af911156591eb308432b5f9a56075b57ac0a5dd9f7aee17d79217";
+ sha256 = "c33d1deb0ee173a15c8ec21a1e714ba544fe5f4895d3b1d8b0581f3c1b2e8ce4";
};
propagatedBuildInputs = [
@@ -36,6 +36,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Data Migration Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ jonringer mwilsoninsight ];
+ maintainers = with maintainers; [ jonringer maxwilson ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-devspaces/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-devspaces/default.nix
index 08cdcd721827..5ca30f45de29 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-devspaces/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-devspaces/default.nix
@@ -29,6 +29,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Dev Spaces Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix
index 78f149e2f7da..7c5e6a1d7bab 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix
@@ -36,6 +36,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure DevTestLabs Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ jonringer mwilsoninsight ];
+ maintainers = with maintainers; [ jonringer maxwilson ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-dns/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-dns/default.nix
index ce467dba31da..37511456fe6f 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-dns/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-dns/default.nix
@@ -36,6 +36,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure DNS Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ jonringer mwilsoninsight ];
+ maintainers = with maintainers; [ jonringer maxwilson ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix
index f5ddbf0fcc7c..df48be1281ce 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-eventgrid/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure EventGrid Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix
index 3aa02dd8831e..6b86973bccd9 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix
@@ -35,6 +35,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure EventHub Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix
index fd0c527344c0..9a23d31309b2 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure SAP Hana on Azure Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix
index b6f0dadf225c..08b9e73e66d2 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix
@@ -5,13 +5,13 @@
}:
buildPythonPackage rec {
- version = "1.7.0";
+ version = "2.0.0";
pname = "azure-mgmt-hdinsight";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "9d1120bd9760687d87594ec5ce9257b7335504afbe55b3cda79462c1e07a095b";
+ sha256 = "fd47029f2423e45ec4d311f651dc972043b98e960f186f5c6508c6fdf6eb2fe8";
extension = "zip";
};
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix
index 963d794d5505..b514488ff4a4 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure IoTCentral Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-iothub/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-iothub/default.nix
index 1e13919f340a..e36e30fc16e1 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-iothub/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-iothub/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure IoTHub Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix
index c668e5ed4d66..3401ed898c8f 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix
@@ -35,6 +35,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure IoTHub Provisioning Services Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ jonringer mwilsoninsight ];
+ maintainers = with maintainers; [ jonringer maxwilson ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix
index 6ad96d60bc9c..10c4604ec186 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix
@@ -37,6 +37,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Key Vault Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ jonringer mwilsoninsight ];
+ maintainers = with maintainers; [ jonringer maxwilson ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-kusto/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-kusto/default.nix
index 0cb180064eed..93c78c401f0c 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-kusto/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-kusto/default.nix
@@ -5,13 +5,13 @@
}:
buildPythonPackage rec {
- version = "0.9.0";
+ version = "0.10.0";
pname = "azure-mgmt-kusto";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "9210db89fa18ee8ed53339cd63bbe6fe1d9624cd793b54b7451ddbda8ae92ef3";
+ sha256 = "09e8d4928e19d12feb374adb47651b474f3ee3bc6a12704e4b70c9b38e3bcd9e";
extension = "zip";
};
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix
index 95c1831f720e..525a72a7009d 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix
@@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-loganalytics";
- version = "1.0.0";
+ version = "2.0.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "7eb052a1c4bb037c06a0aff740378bd54a6ae256bf5cb71faa14b4eb61281488";
+ sha256 = "947cada6e52fea6ecae7011d7532cf8edbe90250753a58749c473b863331fcc6";
};
propagatedBuildInputs = [
@@ -35,6 +35,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Log Analytics Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-logic/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-logic/default.nix
index 345f11f86269..8c2b3c8fd8db 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-logic/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-logic/default.nix
@@ -31,6 +31,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Logic Apps Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-machinelearningcompute/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-machinelearningcompute/default.nix
index 47e91ecf49f3..543589b7aecb 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-machinelearningcompute/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-machinelearningcompute/default.nix
@@ -31,6 +31,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Machine Learning Compute Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-managementgroups/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-managementgroups/default.nix
index 080647bae96b..e09646373b6e 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-managementgroups/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-managementgroups/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Management Groups Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-managementpartner/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-managementpartner/default.nix
index c546a7eeba38..d42fb5b05c39 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-managementpartner/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-managementpartner/default.nix
@@ -29,6 +29,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure ManagementPartner Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-maps/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-maps/default.nix
index db87b81c8380..c0f418ed725c 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-maps/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-maps/default.nix
@@ -35,6 +35,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Maps Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-marketplaceordering/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-marketplaceordering/default.nix
index db30d30d7554..a8a138d27bde 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-marketplaceordering/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-marketplaceordering/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Market Place Ordering Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-media/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-media/default.nix
index 018d7140a3d9..90effb44c69c 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-media/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-media/default.nix
@@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-media";
- version = "2.2.0";
+ version = "3.0.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "0adeee9e654a9011f5107def06fea6838864a3514a1e5a9ed495f3a56a687cc7";
+ sha256 = "8944775725c5253614d257576d841ee68afa34f570b05c0924a7f73f1db28a24";
};
propagatedBuildInputs = [
@@ -33,6 +33,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Media Services Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-monitor/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-monitor/default.nix
index 3b85c9e9e834..742556ef34f6 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-monitor/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-monitor/default.nix
@@ -38,6 +38,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Monitor Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-msi/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-msi/default.nix
index 2b1b65d60aec..4bd0a493ddae 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-msi/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-msi/default.nix
@@ -35,6 +35,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure MSI Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-netapp/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-netapp/default.nix
index ad74d2cf77c5..a57bbe07f563 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-netapp/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-netapp/default.nix
@@ -5,13 +5,13 @@
}:
buildPythonPackage rec {
- version = "0.13.0";
+ version = "0.14.0";
pname = "azure-mgmt-netapp";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "e86034d073144bd5dbafe17e20fef3f48b5bf98a31b27cc0de462dc8f98303bb";
+ sha256 = "6fd915e68d314bec8b56c6ece194005d2c4fc97478fc1f797639d4a6913c1539";
extension = "zip";
};
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-network/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-network/default.nix
index b08a729d5f46..da1ec78a8c9a 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-network/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-network/default.nix
@@ -38,6 +38,6 @@ buildPythonPackage rec {
description = "Microsoft Azure SDK for Python";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ olcai mwilsoninsight jonringer ];
+ maintainers = with maintainers; [ olcai maxwilson jonringer ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-notificationhubs/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-notificationhubs/default.nix
index a8ebba576485..7b4985c53331 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-notificationhubs/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-notificationhubs/default.nix
@@ -31,6 +31,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Notification Hubs Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix
index fd2664b0ec0e..b3503e23d613 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix
@@ -24,6 +24,6 @@ buildPythonPackage rec {
description = "Microsoft Azure SDK for Python";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ olcai mwilsoninsight ];
+ maintainers = with maintainers; [ olcai maxwilson ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-policyinsights/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-policyinsights/default.nix
index ad8a2a0fbe23..6522b3c8c435 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-policyinsights/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-policyinsights/default.nix
@@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-policyinsights";
- version = "0.5.0";
+ version = "0.6.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "ed229e3845c477e88dde413825d4fba0d38b3a5ffab4e694c7d0da995f3db0f3";
+ sha256 = "2c64533f6eab08dc16450fc5d7c7651557fc0edc8ef1278dda336333d648a7c4";
};
propagatedBuildInputs = [
@@ -33,6 +33,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Policy Insights Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-powerbiembedded/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-powerbiembedded/default.nix
index 537e576b2b5a..24b446146856 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-powerbiembedded/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-powerbiembedded/default.nix
@@ -31,6 +31,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Power BI Embedded Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix
index 7bee1f5856a7..0e96647f4925 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure RDBMS Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix
index 224f7971b352..7f4de1a463b7 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Recovery Services Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix
index 75781dab8ed3..ed40cb69c721 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix
@@ -31,6 +31,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Recovery Services Backup Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-redis/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-redis/default.nix
index 9274bd53cf69..fb43f130ba3a 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-redis/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-redis/default.nix
@@ -4,24 +4,26 @@
, msrest
, msrestazure
, azure-common
+, azure-mgmt-core
, azure-mgmt-nspkg
, isPy3k
}:
buildPythonPackage rec {
pname = "azure-mgmt-redis";
- version = "6.0.0";
+ version = "12.0.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "db999e104edeee3a13a8ceb1881e15196fe03a02635e0e20855eb52c1e2ecca1";
+ sha256 = "8ae563e3df82a2f206d0483ae6f05d93d0d1835111c0bbca7236932521eed356";
};
propagatedBuildInputs = [
msrest
msrestazure
azure-common
+ azure-mgmt-core
] ++ lib.optionals (!isPy3k) [
azure-mgmt-nspkg
];
@@ -33,6 +35,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Redis Cache Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-relay/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-relay/default.nix
index d3bf3f31fc20..46db2d3528cf 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-relay/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-relay/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Relay Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-reservations/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-reservations/default.nix
index d5e4226b5ccc..61ef82d74acc 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-reservations/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-reservations/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Reservations Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-resource/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-resource/default.nix
index 5467537f08b8..bdba89498877 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-resource/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-resource/default.nix
@@ -34,6 +34,6 @@ buildPythonPackage rec {
description = "Microsoft Azure SDK for Python";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ olcai mwilsoninsight jonringer ];
+ maintainers = with maintainers; [ olcai maxwilson jonringer ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-scheduler/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-scheduler/default.nix
index 366e8df9a751..7fc7a152cb41 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-scheduler/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-scheduler/default.nix
@@ -31,6 +31,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Scheduler Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-search/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-search/default.nix
index 936a1b4269c4..c6c525176c77 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-search/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-search/default.nix
@@ -9,12 +9,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-search";
- version = "2.1.0";
+ version = "3.0.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "0085c7qi9z1ayxd8683ck79nfnldkrwl481hzav84flyg8d0m94j";
+ sha256 = "d4c78b14b48edd2e27e2068c9a448acfc84a18595be77fe483afe7bb447e1eb6";
};
propagatedBuildInputs = [
@@ -31,6 +31,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Search Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-security/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-security/default.nix
index 90a64ff098ae..9de17636b234 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-security/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-security/default.nix
@@ -5,13 +5,13 @@
}:
buildPythonPackage rec {
- version = "0.4.1";
+ version = "0.6.0";
pname = "azure-mgmt-security";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "08gf401d40bd1kn9wmpxcjxqdh84cd9hxm8rdjd0918483sqs71r";
+ sha256 = "9f37d0151d730801222af111f0830905634795dbfd59ad1b89c35197421e74d3";
extension = "zip";
};
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-servicebus/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-servicebus/default.nix
index 72c363b3e669..2deaf2b91dd7 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-servicebus/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-servicebus/default.nix
@@ -4,24 +4,26 @@
, msrest
, msrestazure
, azure-common
+, azure-mgmt-core
, azure-mgmt-nspkg
, isPy3k
}:
buildPythonPackage rec {
pname = "azure-mgmt-servicebus";
- version = "0.6.0";
+ version = "6.0.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "f20920b8fb119ef4abeda4d2dac765a4fc48cd0bcf30c27f8c4cc6d890bc08b1";
+ sha256 = "f6c64ed97d22d0c03c4ca5fc7594bd0f3d4147659c10110160009b93f541298e";
};
propagatedBuildInputs = [
msrest
msrestazure
azure-common
+ azure-mgmt-core
] ++ lib.optionals (!isPy3k) [
azure-mgmt-nspkg
];
@@ -33,6 +35,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Service Bus Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix
index 60ffeae2b518..abb117d00466 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix
@@ -35,6 +35,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Service Fabric Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-signalr/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-signalr/default.nix
index 8192064626ea..4a452cb919cb 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-signalr/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-signalr/default.nix
@@ -31,6 +31,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure SignalR Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-sql/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-sql/default.nix
index dd80641a48aa..60c1022e6037 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-sql/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-sql/default.nix
@@ -4,24 +4,26 @@
, msrest
, msrestazure
, azure-common
+, azure-mgmt-core
, azure-mgmt-nspkg
, isPy3k
}:
buildPythonPackage rec {
pname = "azure-mgmt-sql";
- version = "0.22.0";
+ version = "1.0.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "01c82a1559f49e5f51021b8fbd35e738e08cbede1f39cf00da8085c853575f39";
+ sha256 = "c7904f8798fbb285a2160c41c8bd7a416c6bd987f5d36a9b98c16f41e24e9f47";
};
propagatedBuildInputs = [
msrest
msrestazure
azure-common
+ azure-mgmt-core
] ++ lib.optionals (!isPy3k) [
azure-mgmt-nspkg
];
@@ -33,6 +35,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure SQL Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-storage/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-storage/default.nix
index 71302be53d79..2f1032c2bb9b 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-storage/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-storage/default.nix
@@ -34,6 +34,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Storage Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ jonringer olcai mwilsoninsight ];
+ maintainers = with maintainers; [ jonringer olcai maxwilson ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-subscription/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-subscription/default.nix
index ee6616272225..d0a5845d9055 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-subscription/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-subscription/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Subscription Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-synapse/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-synapse/default.nix
index 13369eb014b1..2135853ff9de 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-synapse/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-synapse/default.nix
@@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-synapse";
- version = "0.4.0";
+ version = "0.5.0";
disabled = pythonOlder "3";
src = fetchPypi {
inherit pname version;
- sha256 = "ebd4dcb980a6425f4db7dd94225332b6bd74e1089b0c6e57af868d96ceab1d3c";
+ sha256 = "4eb76230c38525b71eb1addefebd265bc3d9b68ba7ff60ce5356d39f68ed2837";
extension = "zip";
};
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-trafficmanager/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-trafficmanager/default.nix
index 946be6f34cad..dd7ed3b19b21 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-trafficmanager/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-trafficmanager/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Traffic Manager Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-web/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-web/default.nix
index a99dd764c1a6..f02bee6befe6 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-web/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-mgmt-web/default.nix
@@ -4,24 +4,26 @@
, msrest
, msrestazure
, azure-common
+, azure-mgmt-core
, azure-mgmt-nspkg
, isPy3k
}:
buildPythonPackage rec {
pname = "azure-mgmt-web";
- version = "0.48.0";
+ version = "1.0.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "da0f9e3b57528c72a7bc92e3515413a4a4fdbc9626c26ac04b7551a7739a81ec";
+ sha256 = "c4b218a5d1353cd7c55b39c9b2bd1b13bfbe3b8a71bc735122b171eab81670d1";
};
propagatedBuildInputs = [
msrest
msrestazure
azure-common
+ azure-mgmt-core
] ++ lib.optionals (!isPy3k) [
azure-mgmt-nspkg
];
@@ -33,6 +35,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Web Apps Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-nspkg/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-nspkg/default.nix
index 5be901941947..25636053a6b3 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-nspkg/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-nspkg/default.nix
@@ -21,6 +21,6 @@ buildPythonPackage rec {
description = "Microsoft Azure SDK for Python";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ olcai mwilsoninsight ];
+ maintainers = with maintainers; [ olcai maxwilson ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-servicebus/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-servicebus/default.nix
index 2a3552d1fb5f..2f61a2d9bad9 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-servicebus/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-servicebus/default.nix
@@ -3,6 +3,7 @@
, fetchPypi
, uamqp
, azure-common
+, azure-core
, msrestazure
, futures
, isPy3k
@@ -10,17 +11,18 @@
buildPythonPackage rec {
pname = "azure-servicebus";
- version = "0.50.3";
+ version = "7.0.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "2b1e60c81fcf5b6a5bb3ceddb27f24543f479912e39a4706a390a16d8c0a71f4";
+ sha256 = "875527251c1fed99fcb90597c6abb7daa4bc0ed88e080b4c36f897b704668450";
};
buildInputs = [
uamqp
azure-common
+ azure-core
msrestazure
] ++ lib.optionals (!isPy3k) [
futures
@@ -36,6 +38,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Service Bus Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-servicefabric/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-servicefabric/default.nix
index ad89f23c3c29..743f0abd9256 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-servicefabric/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-servicefabric/default.nix
@@ -7,12 +7,12 @@
buildPythonPackage rec {
pname = "azure-servicefabric";
- version = "7.1.0.45";
+ version = "7.2.0.46";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "8dd0eb419ca62f2436c31982f6d236868f15f65bb062c4e5a98e50b16298dcda";
+ sha256 = "c15fd5e8fe33a12295435f16e007edcfd8f660547795742f9b74ef8fb3a431ba";
};
propagatedBuildInputs = [
@@ -27,6 +27,6 @@ buildPythonPackage rec {
description = "This project provides a client library in Python that makes it easy to consume Microsoft Azure Storage services";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix
index 13d577362a36..b54e17db283e 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix
@@ -29,6 +29,6 @@ buildPythonPackage rec {
description = "This is the Microsoft Azure Service Management Legacy Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ olcai mwilsoninsight ];
+ maintainers = with maintainers; [ olcai maxwilson ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-storage-blob/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-storage-blob/default.nix
index 20d0248cc416..9ded3d5c7613 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-storage-blob/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-storage-blob/default.nix
@@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "azure-storage-blob";
- version = "12.5.0";
+ version = "12.6.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "1469a5a0410296fb5ff96c326618d939c9cb0c0ea45eb931c89c98fa742d8daa";
+ sha256 = "dc7832d48ae3f5b31a0b24191084ce6ef7d8dfbf73e553dfe34eaddcb6813be3";
};
propagatedBuildInputs = [
@@ -33,6 +33,6 @@ buildPythonPackage rec {
description = "Client library for Microsoft Azure Storage services containing the blob service APIs";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ cmcdragonkai mwilsoninsight ];
+ maintainers = with maintainers; [ cmcdragonkai maxwilson ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-storage-file-share/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-storage-file-share/default.nix
index b8a642f665cd..ad2280464497 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-storage-file-share/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-storage-file-share/default.nix
@@ -12,13 +12,13 @@
buildPythonPackage rec {
pname = "azure-storage-file-share";
- version = "12.2.0";
+ version = "12.3.0";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "b649ed8afd67c10c9833f349a7c579d771a6425ad6b88027130a6b8cfa433ffb";
+ sha256 = "9f24a0ab51fd7ad294353594660b21081233f68ed8ee7483cdca26a70ce0ccbc";
};
propagatedBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-synapse-artifacts/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-synapse-artifacts/default.nix
new file mode 100644
index 000000000000..85ec70f704c7
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/azure-synapse-artifacts/default.nix
@@ -0,0 +1,31 @@
+{ lib, buildPythonPackage, fetchPypi
+, azure-common
+, azure-core
+, msrest
+}:
+
+buildPythonPackage rec {
+ pname = "azure-synapse-artifacts";
+ version = "0.3.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ extension = "zip";
+ sha256 = "0p43zmw96fh3wp75phf3fcqdfb36adqvxfc945yfda6fi555nw1a";
+ };
+
+ propagatedBuildInputs = [
+ azure-common
+ azure-core
+ msrest
+ ];
+
+ pythonImportsCheck = [ "azure.synapse.artifacts" ];
+
+ meta = with lib; {
+ description = "CHANGE";
+ homepage = "https://github.com/CHANGE/azure-synapse-artifacts/";
+ license = licenses.mit;
+ maintainers = with maintainers; [ jonringer ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/b2sdk/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/b2sdk/default.nix
index 7dfce0d75c52..f807c0353990 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/b2sdk/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/b2sdk/default.nix
@@ -3,13 +3,13 @@
buildPythonPackage rec {
pname = "b2sdk";
- version = "1.1.4";
+ version = "1.2.0";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "0g527qdda105r5g9yjh4lxzlmz34m2bdz8dydqqy09igdsmiyi9j";
+ sha256 = "8e46ff9d47a9b90d8b9beab1969fcf4920300b02e20e6bf0745be04e09e8a6ff";
};
pythonImportsCheck = [ "b2sdk" ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix
index 34a7ddefa47f..7fd9bca3a796 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix
@@ -30,6 +30,6 @@ if !(pythonOlder "3.3") then null else buildPythonPackage {
description = "A backport of the get_terminal_size function from Python 3.3’s shutil.";
homepage = "https://github.com/chrippa/backports.shutil_get_terminal_size";
license = with licenses; [ mit ];
- maintainers = with maintainers; [ timokau ];
+ maintainers = teams.sage.members;
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/baron/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/baron/default.nix
new file mode 100644
index 000000000000..8a04befc6d16
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/baron/default.nix
@@ -0,0 +1,24 @@
+{ lib, fetchPypi, buildPythonPackage, rply, pytestCheckHook, isPy3k }:
+
+buildPythonPackage rec {
+ pname = "baron";
+ version = "0.9";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0fib74nkqnl1i2zzlhbbfpw3whwc4951p9x61r2xrxhwp4r9yn5h";
+ };
+
+ propagatedBuildInputs = [ rply ];
+
+ checkInputs = [ pytestCheckHook ];
+
+ doCheck = isPy3k;
+
+ meta = with lib; {
+ homepage = "https://github.com/gristlabs/asttokens";
+ description = "Abstraction on top of baron, a FST for python to make writing refactoring code a realistic task";
+ license = licenses.lgpl3Plus;
+ maintainers = with maintainers; [ marius851000 ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/batchspawner/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/batchspawner/default.nix
index ebf24fb9d7ba..2acfa5ecd171 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/batchspawner/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/batchspawner/default.nix
@@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "batchspawner";
- version = "1.0.0";
+ version = "1.0.1";
disabled = isPy27;
src = fetchFromGitHub {
owner = "jupyterhub";
repo = "batchspawner";
rev = "v${version}";
- sha256 = "0yn312sjfjpjjfciagbczfmqprk2fj4lbb3vsbzj17p948acq5w2";
+ sha256 = "0vqf3qc2yp52441s6xwgixgl37976qqgpd9sshbgh924j314v1yv";
};
propagatedBuildInputs = [
@@ -24,7 +24,7 @@ buildPythonPackage rec {
# tests require a job scheduler e.g. slurm, pbs, etc.
doCheck = false;
- pythonImportCheck = [ "batchspawner" ];
+ pythonImportsCheck = [ "batchspawner" ];
meta = with lib; {
description = "A spawner for Jupyterhub to spawn notebooks using batch resource managers";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/bayesian-optimization/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/bayesian-optimization/default.nix
index a1739bf4773e..c41181ca7b04 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/bayesian-optimization/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/bayesian-optimization/default.nix
@@ -5,11 +5,13 @@
, scikitlearn
, scipy
, pytest
+, isPy27
}:
buildPythonPackage rec {
pname = "bayesian-optimization";
version = "1.2.0";
+ disabled = isPy27;
src = fetchFromGitHub {
owner = "fmfn";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/bayespy/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/bayespy/default.nix
index 0532e0e022ef..ef3dfa095184 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/bayespy/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/bayespy/default.nix
@@ -4,7 +4,7 @@
buildPythonPackage rec {
pname = "bayespy";
- version = "0.5.19";
+ version = "0.5.20";
# Python 2 not supported and not some old Python 3 because MPL doesn't support
# them properly.
@@ -12,7 +12,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "24e1327ce241a0113abf217fbaf41ac25e04f5a01f9ed606610f2f1f2d82d34f";
+ sha256 = "8c16cdc73bbcd9a1124a0495056065b7ce938dbe6c2c780dc330c83fb4d2640a";
};
checkInputs = [ pytest nose glibcLocales ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/beancount/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/beancount/default.nix
index b3232f8eca54..f1dc7a5349d9 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/beancount/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/beancount/default.nix
@@ -4,14 +4,14 @@
, ply, python_magic, pytest, requests }:
buildPythonPackage rec {
- version = "2.3.2";
+ version = "2.3.3";
pname = "beancount";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "1wfpf2b0sha84rz0qgkanc82wharjqr2nr7xxg1rngrci2h0aqhd";
+ sha256 = "0767ap2n9vk9dz40njndfhaprajr75fvzx7igbd1szc6x8wri8nr";
};
# Tests require files not included in the PyPI archive.
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/beautifulsoup4/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/beautifulsoup4/default.nix
index f804ea9b282d..a0afd0c4f4c4 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/beautifulsoup4/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/beautifulsoup4/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "beautifulsoup4";
- version = "4.9.1";
+ version = "4.9.3";
src = fetchPypi {
inherit pname version;
- sha256 = "73cc4d115b96f79c7d77c1c7f7a0a8d4c57860d1041df407dd1aae7f07a77fd7";
+ sha256 = "84729e322ad1d5b4d25f805bfa05b902dd96450f43842c4e99067d5e1369eb25";
};
checkInputs = [ pytest ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/bellows/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/bellows/default.nix
index b0c899cdd3b8..ab50a1acd8ef 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/bellows/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/bellows/default.nix
@@ -5,14 +5,14 @@
let
pname = "bellows";
- version = "0.20.3";
+ version = "0.21.0";
in buildPythonPackage rec {
inherit pname version;
src = fetchPypi {
inherit pname version;
- sha256 = "9342b6b9423c818f99f7c6d9086fbb5e27d5c2efbb1f2a08f6f5a917c4991f86";
+ sha256 = "fd2ac40c1f3550580dc561ae58d7d15cfa12e6a7cc5d35ee80e7a1cb6a4cda4f";
};
propagatedBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/betacode/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/betacode/default.nix
new file mode 100644
index 000000000000..8bd78fb49d2b
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/betacode/default.nix
@@ -0,0 +1,19 @@
+{ fetchPypi, buildPythonPackage, pygtrie, isPy3k, lib, }:
+buildPythonPackage rec {
+ pname = "betacode";
+ version = "1.0";
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0s84kd9vblbjz61q7zchx64a6hmdqb4lillna5ryh0g9ij76g6r5";
+ };
+ preBuild = ''echo > README.rst'';
+ # setup.py uses a python3 os.path.join
+ disabled = !isPy3k;
+ propagatedBuildInputs = [ pygtrie ];
+ meta = {
+ homepage = "https://github.com/matgrioni/betacode";
+ description = "A small python package to flexibly convert from betacode to unicode and back.";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ kmein ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/bids-validator/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/bids-validator/default.nix
index f97fffe93f05..b139a88820e6 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/bids-validator/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/bids-validator/default.nix
@@ -4,12 +4,12 @@
}:
buildPythonPackage rec {
- version = "1.5.6";
+ version = "1.5.7";
pname = "bids-validator";
src = fetchPypi {
inherit pname version;
- sha256 = "ef9476ded8226c86fe1d6e6b9f380666ada7a0f4ae39bd5afd7eabbbc6979ab7";
+ sha256 = "624fade609636c64e7829ff072bdf12f93512948a803059b059e5c90df894be2";
};
# needs packages which are not available in nixpkgs
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/binwalk/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/binwalk/default.nix
index 0970cc18249e..c6fbbc13c43d 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/binwalk/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/binwalk/default.nix
@@ -11,6 +11,8 @@
, cabextract
, cramfsprogs
, cramfsswap
+, sasquatch
+, squashfsTools
, lzma
, matplotlib
, nose
@@ -32,7 +34,7 @@ buildPythonPackage {
sha256 = "1bxgj569fzwv6jhcbl864nmlsi9x1k1r20aywjxc8b9b1zgqrlvc";
};
- propagatedBuildInputs = [ zlib xz ncompress gzip bzip2 gnutar p7zip cabextract cramfsswap cramfsprogs lzma pycrypto ]
+ propagatedBuildInputs = [ zlib xz ncompress gzip bzip2 gnutar p7zip cabextract cramfsswap cramfsprogs sasquatch squashfsTools lzma pycrypto ]
++ stdenv.lib.optionals visualizationSupport [ matplotlib pyqtgraph ];
# setup.py only installs version.py during install, not test
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/bip_utils/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/bip_utils/default.nix
index 2b9e16b6a639..17f996bfd709 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/bip_utils/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/bip_utils/default.nix
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "bip_utils";
- version = "1.5.0";
+ version = "1.6.0";
disabled = pythonOlder "3.6";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "ebellocchia";
repo = pname;
rev = "v${version}";
- sha256 = "06ls1lara7sklqw6wrw5d3wpxwgyv6paxwjp37x7b3kfskm14cmd";
+ sha256 = "0zbjrgl4dd65r3liyp8syxr106z1wn7ngfcm5dlfcxqwj8zkf56m";
};
propagatedBuildInputs = [ ecdsa pysha3 ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/bitarray/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/bitarray/default.nix
index 1e995af39207..08e81476ba6f 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/bitarray/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/bitarray/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "bitarray";
- version = "1.5.3";
+ version = "1.6.1";
src = fetchPypi {
inherit pname version;
- sha256 = "567631fc922b1c2c528c376795f18dcc0604d18702e0b8b50e8e35f0474214a5";
+ sha256 = "ab85b38365dd9956264226b30dababa02161ed49bb36c7ee82cc6545e07b1599";
};
meta = with lib; {
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/bitstring/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/bitstring/default.nix
index 23f4257a3574..a2ba5b10268c 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/bitstring/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/bitstring/default.nix
@@ -2,12 +2,11 @@
buildPythonPackage rec {
pname = "bitstring";
- version = "3.1.5";
+ version = "3.1.7";
src = fetchPypi {
inherit pname version;
- sha256 = "1algq30j6rz12b1902bpw7iijx5lhrfqhl80d4ac6xzkrrpshqy1";
- extension = "zip";
+ sha256 = "0jl6192dwrlm5ybkbh7ywmyaymrc3cmz9y07nm7qdli9n9rfpwzx";
};
meta = with stdenv.lib; {
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/bitstruct/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/bitstruct/default.nix
index 6134d9262262..43edd16f66aa 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/bitstruct/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/bitstruct/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "bitstruct";
- version = "8.11.0";
+ version = "8.11.1";
src = fetchPypi {
inherit pname version;
- sha256 = "0p9d5242pkzag7ac5b5zdjyfqwxvj2jisyjghp6yhjbbwz1z44rb";
+ sha256 = "4e7b8769c0f09fee403d0a5f637f8b575b191a79a92e140811aa109ce7461f0c";
};
meta = with lib; {
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/black/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/black/default.nix
index 997f20e137db..f0a25dfb0b12 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/black/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/black/default.nix
@@ -1,42 +1,71 @@
-{ stdenv, buildPythonPackage, fetchPypi, pythonOlder
-, attrs, click, toml, appdirs, aiohttp, aiohttp-cors
-, glibcLocales, typed-ast, pathspec, regex
-, setuptools_scm, pytest }:
+{ stdenv, lib
+, buildPythonPackage, fetchPypi, pythonOlder, setuptools_scm, pytestCheckHook
+, aiohttp
+, aiohttp-cors
+, appdirs
+, attrs
+, click
+, mypy-extensions
+, pathspec
+, regex
+, toml
+, typed-ast
+, typing-extensions }:
buildPythonPackage rec {
pname = "black";
- version = "19.10b0";
+ version = "20.8b1";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "0f8mr0yzj78q1dx7v6ggbgfir2wv0n5z2shfbbvfdq7910xbgvf2";
+ sha256 = "1spv6sldp3mcxr740dh3ywp25lly9s8qlvs946fin44rl1x5a0hw";
};
nativeBuildInputs = [ setuptools_scm ];
- checkInputs = [ pytest glibcLocales ];
# Necessary for the tests to pass on Darwin with sandbox enabled.
# Black starts a local server and needs to bind a local address.
__darwinAllowLocalNetworking = true;
- # Don't know why these tests fails
- # Disable test_expression_diff, because it fails on darwin
- checkPhase = ''
- LC_ALL="en_US.UTF-8" pytest \
- --deselect tests/test_black.py::BlackTestCase::test_expression_diff \
- --deselect tests/test_black.py::BlackTestCase::test_cache_multiple_files \
- --deselect tests/test_black.py::BlackTestCase::test_failed_formatting_does_not_get_cached
+ checkInputs = [ pytestCheckHook ];
+
+ preCheck = ''
+ export PATH="$PATH:$out/bin"
'';
- propagatedBuildInputs = [ attrs appdirs click toml aiohttp aiohttp-cors pathspec regex typed-ast ];
+ disabledTests = [
+ # Don't know why these tests fails
+ "test_cache_multiple_files"
+ "test_failed_formatting_does_not_get_cached"
+ # requires network access
+ "test_gen_check_output"
+ "test_process_queue"
+ ] ++ lib.optionals stdenv.isDarwin [
+ # fails on darwin
+ "test_expression_diff"
+ ];
+
+ propagatedBuildInputs = [
+ aiohttp
+ aiohttp-cors
+ appdirs
+ attrs
+ click
+ mypy-extensions
+ pathspec
+ regex
+ toml
+ typed-ast
+ typing-extensions
+ ];
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "The uncompromising Python code formatter";
homepage = "https://github.com/psf/black";
+ changelog = "https://github.com/psf/black/blob/${version}/CHANGES.md";
license = licenses.mit;
maintainers = with maintainers; [ sveitser ];
};
-
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/bleach/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/bleach/default.nix
index 9b27ae254903..1bdedde1cb4e 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/bleach/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/bleach/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "bleach";
- version = "3.1.5";
+ version = "3.2.1";
src = fetchPypi {
inherit pname version;
- sha256 = "3c4c520fdb9db59ef139915a5db79f8b51bc2a7257ea0389f30c846883430a4b";
+ sha256 = "52b5919b81842b1854196eaae5ca29679a2f2e378905c346d3ca8227c2c66080";
};
checkInputs = [ pytest pytestrunner ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/bleak/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/bleak/default.nix
index 63371fc6eecf..09ba8f7b5f52 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/bleak/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/bleak/default.nix
@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "bleak";
- version = "0.7.1";
+ version = "0.9.1";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "25f630cf558efda5cbf620d921b85a80ae963c537feaa18cc934f7fa38dc482d";
+ sha256 = "f81b0069e5c1570883144c1910b884e5cefe16d3c2ed09e579b6d8f853f08588";
};
postPatch = ''
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/blessed/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/blessed/default.nix
index b55e29399828..7f1a24b48508 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/blessed/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/blessed/default.nix
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "blessed";
- version = "1.17.11";
+ version = "1.17.12";
src = fetchPypi {
inherit pname version;
- sha256 = "7d4914079a6e8e14fbe080dcaf14dee596a088057cdc598561080e3266123b48";
+ sha256 = "580429e7e0c6f6a42ea81b0ae5a4993b6205c6ccbb635d034b4277af8175753e";
};
checkInputs = [ pytest mock glibcLocales ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/blis/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/blis/default.nix
index 5d4b9bcb5e21..8174ef240d01 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/blis/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/blis/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "blis";
- version = "0.7.1";
+ version = "0.7.3";
src = fetchPypi {
inherit pname version;
- sha256 = "014771a0f753a64ef5610c5b3d4a090b263073bdd59b8ad0d872ce1e06e7315a";
+ sha256 = "19557b14763253ca3d4f6cfc9c9fe2eed3d65db14fa273ced8b0c17ce2bfda4a";
};
nativeBuildInputs = [
@@ -34,6 +34,7 @@ buildPythonPackage rec {
description = "BLAS-like linear algebra library";
homepage = "https://github.com/explosion/cython-blis";
license = licenses.bsd3;
+ platforms = platforms.x86_64;
maintainers = with maintainers; [ danieldk ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/blivet/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/blivet/default.nix
index b8d1b4670aea..d224f2bc22e1 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/blivet/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/blivet/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, buildPythonPackage, pykickstart, pyparted, pyblock
-, pyudev, six, libselinux, multipath-tools, lsof, utillinux
+, pyudev, six, libselinux, multipath-tools, lsof, util-linux
}:
buildPythonPackage rec {
@@ -19,11 +19,11 @@ buildPythonPackage rec {
-e '/^def set_friendly_names/a \ return False' \
blivet/devicelibs/mpath.py
sed -i -e '/"wipefs"/ {
- s|wipefs|${utillinux}/sbin/wipefs|
+ s|wipefs|${util-linux}/sbin/wipefs|
s/-f/--force/
}' blivet/formats/__init__.py
sed -i -e 's|"lsof"|"${lsof}/bin/lsof"|' blivet/formats/fs.py
- sed -i -r -e 's|"(u?mount)"|"${utillinux}/bin/\1"|' blivet/util.py
+ sed -i -r -e 's|"(u?mount)"|"${util-linux}/bin/\1"|' blivet/util.py
'';
propagatedBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/block-io/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/block-io/default.nix
index ec1229965e05..24ddd429cd93 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/block-io/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/block-io/default.nix
@@ -20,13 +20,16 @@ buildPythonPackage rec {
preConfigure = ''
substituteInPlace setup.py \
- --replace "ecdsa==0.13" "ecdsa>=0.13"
+ --replace "ecdsa==0.15" "ecdsa>=0.15" \
+ --replace "base58==1.0.3" "base58>=1.0.3"
'';
# Tests needs a BlockIO API key to run properly
# https://github.com/BlockIo/block_io-python/blob/79006bc8974544b70a2d8e9f19c759941d32648e/test.py#L18
doCheck = false;
+ pythonImportsCheck = [ "block_io" ];
+
meta = with stdenv.lib; {
description = "Integrate Bitcoin, Dogecoin and Litecoin in your Python applications using block.io";
homepage = "https://github.com/BlockIo/block_io-python";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/blockdiag/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/blockdiag/default.nix
index ceaa31874ecb..ff53884ef376 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/blockdiag/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/blockdiag/default.nix
@@ -1,23 +1,21 @@
-{ stdenv, fetchurl, buildPythonPackage, pep8, nose, unittest2, docutils
-, pillow, webcolors, funcparserlib
+{ stdenv, buildPythonPackage, fetchFromGitHub
+, setuptools, funcparserlib, pillow, webcolors, reportlab, docutils
}:
buildPythonPackage rec {
pname = "blockdiag";
- version = "1.5.3";
+ version = "2.0.1";
- src = fetchurl {
- url = "https://bitbucket.org/blockdiag/blockdiag/get/${version}.tar.bz2";
- sha256 = "0r0qbmv0ijnqidsgm2rqs162y9aixmnkmzgnzgk52hiy7ydm4k8f";
+ src = fetchFromGitHub {
+ owner = "blockdiag";
+ repo = "blockdiag";
+ rev = version;
+ sha256 = "1cvcl66kf4wdh2n4fdk37zk59lp58wd2fhf84n7pbn0lilyksk5x";
};
- buildInputs = [ pep8 nose unittest2 docutils ];
+ propagatedBuildInputs = [ setuptools funcparserlib pillow webcolors reportlab docutils ];
- propagatedBuildInputs = [ pillow webcolors funcparserlib ];
-
- # One test fails:
- # ...
- # FAIL: test_auto_font_detection (blockdiag.tests.test_boot_params.TestBootParams)
+ # require network and fail
doCheck = false;
meta = with stdenv.lib; {
@@ -25,6 +23,6 @@ buildPythonPackage rec {
homepage = "http://blockdiag.com/";
license = licenses.asl20;
platforms = platforms.unix;
- maintainers = with maintainers; [ bjornfor ];
+ maintainers = with maintainers; [ bjornfor SuperSandro2000 ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/blockdiagcontrib-cisco/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/blockdiagcontrib-cisco/default.nix
deleted file mode 100644
index 6190adcba5f0..000000000000
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/blockdiagcontrib-cisco/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-, blockdiag
-}:
-
-buildPythonPackage rec {
- pname = "blockdiagcontrib-cisco";
- version = "0.1.8";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "06iw3q1w4g3lbgcmyz8m93rv0pfnk2gp8k83rs9ir671ym99gwr2";
- };
-
- buildInputs = [ blockdiag ];
-
- meta = with stdenv.lib; {
- description = "Noderenderer plugin for blockdiag containing Cisco networking symbols";
- homepage = "https://bitbucket.org/blockdiag/blockdiag-contrib/";
- maintainers = [ maintainers.bjornfor ];
- license = licenses.psfl;
- };
-
-}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/bme680/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/bme680/default.nix
new file mode 100644
index 000000000000..cdae502e7e59
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/bme680/default.nix
@@ -0,0 +1,38 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, smbus-cffi
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+ pname = "bme680";
+ version = "1.0.5";
+
+ src = fetchFromGitHub {
+ owner = "pimoroni";
+ repo = "bme680-python";
+ rev = "v${version}";
+ sha256 = "sha256-oIXh1JnGTI/Cj4MQFpWq+sWR2X+ioCsK0Q+T7wPITCQ=";
+ };
+
+ propagatedBuildInputs = [ smbus-cffi ];
+
+ preBuild = ''
+ cd library
+ '';
+ checkInputs = [ pytestCheckHook ];
+
+ # next release will have tests, but not the current one
+ doCheck = false;
+
+ pythonImportsCheck = [ "bme680" ];
+
+ meta = with lib; {
+ description = "Python library for driving the Pimoroni BME680 Breakout";
+ homepage = "https://github.com/pimoroni/bme680-python";
+ license = licenses.mit;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ mic92 ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/bokeh/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/bokeh/default.nix
index 55a01c65f1c2..091b020efc25 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/bokeh/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/bokeh/default.nix
@@ -33,11 +33,11 @@
buildPythonPackage rec {
pname = "bokeh";
- version = "2.2.1";
+ version = "2.2.3";
src = fetchPypi {
inherit pname version;
- sha256 = "qC6e69eh4uu3+PwerYAv79EKhNrvjsS/yYYSEyOUhVU=";
+ sha256 = "c4a3f97afe5f525019dd58ee8c4e3d43f53fe1b1ac264ccaae9b02c07b2abc17";
};
patches = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/bootstrapped-pip/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/bootstrapped-pip/default.nix
index 8bb713b76416..9679edd95127 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/bootstrapped-pip/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/bootstrapped-pip/default.nix
@@ -2,6 +2,7 @@
, pipInstallHook
, setuptoolsBuildHook
, wheel, pip, setuptools
+, isPy27
}:
stdenv.mkDerivation rec {
@@ -44,17 +45,17 @@ stdenv.mkDerivation rec {
echo "Building setuptools wheel..."
pushd setuptools
- ${python.pythonForBuild.interpreter} -m pip install --no-build-isolation --no-index --prefix=$out --ignore-installed --no-dependencies --no-cache --build tmpbuild .
+ ${python.pythonForBuild.interpreter} -m pip install --no-build-isolation --no-index --prefix=$out --ignore-installed --no-dependencies --no-cache .
popd
echo "Building wheel wheel..."
pushd wheel
- ${python.pythonForBuild.interpreter} -m pip install --no-build-isolation --no-index --prefix=$out --ignore-installed --no-dependencies --no-cache --build tmpbuild .
+ ${python.pythonForBuild.interpreter} -m pip install --no-build-isolation --no-index --prefix=$out --ignore-installed --no-dependencies --no-cache .
popd
echo "Building pip wheel..."
pushd pip
- ${python.pythonForBuild.interpreter} -m pip install --no-build-isolation --no-index --prefix=$out --ignore-installed --no-dependencies --no-cache --build tmpbuild .
+ ${python.pythonForBuild.interpreter} -m pip install --no-build-isolation --no-index --prefix=$out --ignore-installed --no-dependencies --no-cache .
popd
'';
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/boto/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/boto/default.nix
index 85ebae5b612f..042a9a296ff7 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/boto/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/boto/default.nix
@@ -1,6 +1,7 @@
{ pkgs
, buildPythonPackage
, fetchPypi
+, pythonAtLeast
, isPy38
, python
, nose
@@ -12,6 +13,7 @@
buildPythonPackage rec {
pname = "boto";
version = "2.49.0";
+ disabled = pythonAtLeast "3.9"; # no longer compatible with hmac std lib package
src = fetchPypi {
inherit pname version;
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/boto3/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/boto3/default.nix
index c1f1b180b707..889d829bee99 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/boto3/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/boto3/default.nix
@@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "boto3";
- version = "1.15.9"; # N.B: if you change this, change botocore too
+ version = "1.16.25"; # N.B: if you change this, change botocore too
src = fetchPypi {
inherit pname version;
- sha256 = "0zrsrz7c8aqj3n06piybwf7vy026rflr0ky362q615rln6iggx82";
+ sha256 = "05qxcfis4rnkjxh8wyks3gcpg14cshpd2rrhb1adxd0hpq5aprhk";
};
propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/botocore/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/botocore/default.nix
index daa5897fefd0..35d8113e831c 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/botocore/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/botocore/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "botocore";
- version = "1.18.9"; # N.B: if you change this, change boto3 and awscli to a matching version
+ version = "1.19.25"; # N.B: if you change this, change boto3 and awscli to a matching version
src = fetchPypi {
inherit pname version;
- sha256 = "0rb3in7n9hdhp3sklkw78l378103khgmhdfy13kxfbgb0646pc1m";
+ sha256 = "15hd5f2ars1hd3y2gh846fd0ydcgyjmkvncr6rdn4whbb5wkkbyc";
};
propagatedBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/bottle/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/bottle/default.nix
index 5fda85dc972b..52d97582ef31 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/bottle/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/bottle/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "bottle";
- version = "0.12.18";
+ version = "0.12.19";
src = fetchPypi {
inherit pname version;
- sha256 = "0819b74b145a7def225c0e83b16a4d5711fde751cd92bae467a69efce720f69e";
+ sha256 = "a9d73ffcbc6a1345ca2d7949638db46349f5b2b77dac65d6494d45c23628da2c";
};
propagatedBuildInputs = [ setuptools ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/bpython/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/bpython/default.nix
index bbdca0a00974..7dfe8053ca24 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/bpython/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/bpython/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "bpython";
- version = "0.20";
+ version = "0.20.1";
src = fetchPypi {
inherit pname version;
- sha256 = "fec7d97be9912a50d8f5b34ca10d70715c99a33f0cd0b9e4977c1b0f617fa913";
+ sha256 = "6e7738806013b469be57b0117082b9c4557ed7c92c70ceb79f96d674d89c7503";
};
patches = [ (substituteAll {
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/braintree/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/braintree/default.nix
index 2c05d646827c..7eba4743f0ff 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/braintree/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/braintree/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "braintree";
- version = "4.4.0";
+ version = "4.5.0";
src = fetchPypi {
inherit pname version;
- sha256 = "79ddadaa9db60b81762a10af0c0d994fd60d21616c7d9229d6f7ce1930f8d343";
+ sha256 = "98b9775e3d5f793c0a47df6b3649cd175705ee2d9163f7853e8c73acec7b923f";
};
propagatedBuildInputs = [ requests ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/bravia-tv/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/bravia-tv/default.nix
index cfb30a926d58..15f292953b67 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/bravia-tv/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/bravia-tv/default.nix
@@ -2,14 +2,14 @@
buildPythonPackage rec {
pname = "bravia-tv";
- version = "1.0.7";
+ version = "1.0.8";
disabled = isPy27;
src = fetchFromGitHub {
owner = "dcnielsen90";
repo = "python-bravia-tv";
rev = "v${version}";
- sha256 = "0bg33nilybh46s6yz3x7a7x8biwbvy5scqdrl4didhn7vjd4w5fn";
+ sha256 = "0djwy4z1y173q3mnbngp754yrwzmm6h3x0rshvrvd64b78x1bsmp";
};
propagatedBuildInputs = [ requests ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/breathe/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/breathe/default.nix
index fe7a2a713cfb..1ebc230f61ce 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/breathe/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/breathe/default.nix
@@ -1,13 +1,13 @@
{ lib, fetchPypi, buildPythonPackage, docutils, six, sphinx, isPy3k, isPy27 }:
buildPythonPackage rec {
- version = "4.22.1";
+ version = "4.24.0";
pname = "breathe";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "6e4b66e61876dac90e78b335788a38eaa3625ed9c70d0add261f98ddd128d36a";
+ sha256 = "cd959f259361473896857d5720386963800f8401d29b696705ebb01711d96e35";
};
propagatedBuildInputs = [ docutils six sphinx ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/breezy/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/breezy/default.nix
index 79a80451d028..55fb8deb5fc3 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/breezy/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/breezy/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "breezy";
- version = "3.0.2";
+ version = "3.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "50f16bc7faf299f98fe58573da55b0664078f94b1a0e7f0ce9e1e6a0d47e68e0";
+ sha256 = "1eff207403f48898fa3b3ffa7a4275197c6c58fec105ef267caf1f5fd5a6c7be";
};
propagatedBuildInputs = [ configobj six fastimport dulwich launchpadlib ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/broadlink/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/broadlink/default.nix
index 685ca57b7efd..dcb1368f4116 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/broadlink/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/broadlink/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "broadlink";
- version = "0.14.1";
+ version = "0.16.0";
src = fetchPypi {
inherit pname version;
- sha256 = "5c443d4639b737069e5e27df451b6e89c5ed50be81899e4ea02adb355bf3d724";
+ sha256 = "637dabc6f47b283b72bc521322554462da7a247f04614e458d65df8574d03a41";
};
postPatch = ''
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/brother/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/brother/default.nix
index e79ee03241dc..394021ff2b21 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/brother/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/brother/default.nix
@@ -4,14 +4,14 @@
buildPythonPackage rec {
pname = "brother";
- version = "0.1.17";
+ version = "0.1.18";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "bieniu";
repo = pname;
rev = version;
- sha256 = "03gjcpbq8rwnjzplgwhwr8wb7a1zh940dr6iwnq9srklqzzj691m";
+ sha256 = "14fiwhgcgymgqsl9kcfb0597rcjxvdknhwbakpdf0xp2ph6cj266";
};
propagatedBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/browser-cookie3/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/browser-cookie3/default.nix
index 61e50246a139..ad8fe1c8a077 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/browser-cookie3/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/browser-cookie3/default.nix
@@ -1,16 +1,17 @@
-{ lib, fetchPypi, buildPythonPackage, isPy3k, keyring, pbkdf2, pyaes}:
+{ lib, fetchPypi, buildPythonPackage, isPy3k, lz4, keyring, pbkdf2, pycryptodome, pyaes}:
+
buildPythonPackage rec {
pname = "browser-cookie3";
- version = "0.11.1";
+ version = "0.11.4";
src = fetchPypi {
inherit pname version;
- sha256 = "5d1f825fc9cc6f98fe0ee3f97cdb4947c22d59ac8a11643da5837ebd8c873f05";
+ sha256 = "3d140c6b651dbd8b8555aca6472557fcfda4dd93afc26ea3a200be922a843e2c";
};
disabled = !isPy3k;
- propagatedBuildInputs = [ keyring pbkdf2 pyaes ];
+ propagatedBuildInputs = [ lz4 keyring pbkdf2 pyaes pycryptodome ];
# No tests implemented
doCheck = false;
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/browsermob-proxy/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/browsermob-proxy/default.nix
index 68668fce0794..1c69d70a134a 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/browsermob-proxy/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/browsermob-proxy/default.nix
@@ -2,6 +2,7 @@
, buildPythonPackage
, fetchPypi
, requests
+, urllib3
}:
buildPythonPackage rec {
@@ -13,7 +14,10 @@ buildPythonPackage rec {
sha256 = "1bxvmghm834gsfz3pm69772wzhh15p8ci526b25dpk3z4315nd7v";
};
- propagatedBuildInputs = [ requests ];
+ propagatedBuildInputs = [ (requests.override { urllib3 = urllib3.override {
+ pyopenssl = null;
+ cryptography = null;
+ };}) ];
meta = {
description = "A library for interacting with Browsermob Proxy";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/bsddb3/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/bsddb3/default.nix
index 39ffaae65384..0989b61b6cfa 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/bsddb3/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/bsddb3/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "bsddb3";
- version = "6.2.7";
+ version = "6.2.9";
src = fetchPypi {
inherit pname version;
- sha256 = "17yw0by4lycwpvnx06cnzbbchz4zvzbx3j89b20xa314xdizmxxh";
+ sha256 = "70d05ec8dc568f42e70fc919a442e0daadc2a905a1cfb7ca77f549d49d6e7801";
};
buildInputs = [ pkgs.db ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/btchip/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/btchip/default.nix
index 7370d3db7dbf..c84ee0f0be7f 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/btchip/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/btchip/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "btchip-python";
- version = "0.1.30";
+ version = "0.1.31";
src = fetchPypi {
inherit pname version;
- sha256 = "1mraf2lmh70b038k934adxi7d40431j7yq93my3aws99f5xccsb8";
+ sha256 = "4167f3c6ea832dd189d447d0d7a8c2a968027671ae6f43c680192f2b72c39b2c";
};
propagatedBuildInputs = [ hidapi pyscard ecdsa ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/buildbot/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/buildbot/default.nix
index 595f97bcb8fa..55ff34b25208 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/buildbot/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/buildbot/default.nix
@@ -103,7 +103,7 @@ let
meta = with lib; {
homepage = "https://buildbot.net/";
- description = "Buildbot is an open-source continuous integration framework for automating software build, test, and release processes";
+ description = "An open-source continuous integration framework for automating software build, test, and release processes";
maintainers = with maintainers; [ nand0p ryansydnor lopsided98 ];
license = licenses.gpl2;
};
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/bumps/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/bumps/default.nix
index 2551aebcea22..37ddae150363 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/bumps/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/bumps/default.nix
@@ -2,7 +2,7 @@
buildPythonPackage rec {
pname = "bumps";
- version = "0.7.16";
+ version = "0.7.18";
propagatedBuildInputs = [six];
@@ -12,7 +12,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "3594452487b8404f1efaace9b70aefaeb345fa44dd74349f7829a61161d2f69a";
+ sha256 = "3217d4fd3ec767448d742f3b6ff527cc3817f2421b9a9a8456e1d8ee4a9b1087";
};
meta = with stdenv.lib; {
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/bx-python/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/bx-python/default.nix
index 57a3609bad0a..57ace67d3f26 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/bx-python/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/bx-python/default.nix
@@ -3,14 +3,14 @@
buildPythonPackage rec {
pname = "bx-python";
- version = "0.8.6";
+ version = "0.8.9";
disabled = isPy27;
src = fetchFromGitHub {
owner = "bxlab";
repo = "bx-python";
rev = "v${version}";
- sha256 = "1i40vmn8n83vqcpqj843riv9vp16s753jc4wc90p0cmrnhmzcv13";
+ sha256 = "0bsqnw8rv08586wksvx2a8dawvhyzvz5pzsh9y3217b6wxq98dnq";
};
nativeBuildInputs = [ cython ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/cairosvg/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/cairosvg/default.nix
index 31f7d7bc5d67..da3e84b725dd 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/cairosvg/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/cairosvg/default.nix
@@ -4,13 +4,13 @@
buildPythonPackage rec {
pname = "CairoSVG";
- version = "2.4.2";
+ version = "2.5.0";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "1bb7irxbaxxb9ahm3z5wsx1q96mm5gzskc7b6q07h9ikcnb8yrjf";
+ sha256 = "3fc50d10f0cbef53b3ee376a97a88d81bbd9e2f190f7e63de08431a1a08e9afa";
};
propagatedBuildInputs = [ cairocffi cssselect2 defusedxml pillow tinycss2 ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/caldav/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/caldav/default.nix
index 57dffe89fc32..3888bb7ec65a 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/caldav/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/caldav/default.nix
@@ -15,13 +15,13 @@
buildPythonPackage rec {
pname = "caldav";
- version = "0.7.0";
+ version = "0.7.1";
src = fetchFromGitHub {
owner = "python-caldav";
repo = pname;
rev = "v${version}";
- sha256 = "0m64maiqp3k8fsgkkvdx1dlfhkc70pqig4dclq6w8ajz82czrq83";
+ sha256 = "1shfj67kq6qzd0ngyfk09hpzfggybcfxv5s7hqs87nq9l51bssv8";
};
nativeBuildInputs = lib.optionals (pythonOlder "3.5") [ mock ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/canopen/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/canopen/default.nix
index c064fd62fd93..e6f09645379c 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/canopen/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/canopen/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "canopen";
- version = "1.1.0";
+ version = "1.2.0";
src = fetchPypi {
inherit pname version;
- sha256 = "0fqa4p3qg7800fykib1x264gizhhmb6dz2hajgwr0hxf5xa19wdl";
+ sha256 = "15d49f1f71e9989dde6e3b75fb8445c76bd223064dfc0ac629fe9ecb0e21fba9";
};
propagatedBuildInputs =
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/casbin/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/casbin/default.nix
index 117b6374f918..bb111bfbbd69 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/casbin/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/casbin/default.nix
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "casbin";
- version = "0.9.0";
+ version = "0.10.0";
disabled = isPy27;
@@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = pname;
repo = "pycasbin";
rev = "v${version}";
- sha256 = "16bqa2f5l2cns2izc4siy8jw23q9vrqm9wnyp696fj83y77nkp75";
+ sha256 = "13r8alja25yd5gk5124y1v6frwphmz6wl5z5gz1fafb5nv2zgqw9";
};
propagatedBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/cassandra-driver/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/cassandra-driver/default.nix
index ecb1edf5958a..32cf844cf00c 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/cassandra-driver/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/cassandra-driver/default.nix
@@ -42,5 +42,6 @@ buildPythonPackage rec {
description = "A Python client driver for Apache Cassandra";
homepage = "http://datastax.github.io/python-driver";
license = licenses.asl20;
+ broken = true; # geomet doesn't exist
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/cbor2/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/cbor2/default.nix
index 4ee4b8ecb60e..08503297d1f7 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/cbor2/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/cbor2/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "cbor2";
- version = "5.1.2";
+ version = "5.2.0";
src = fetchPypi {
inherit pname version;
- sha256 = "91759bd0ee5ef0d4fa24144dfa551670730baeca8cf2fff1cc59f734ecd21de6";
+ sha256 = "a33aa2e5534fd74401ac95686886e655e3b2ce6383b3f958199b6e70a87c94bf";
};
nativeBuildInputs = [ setuptools_scm ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/cchardet/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/cchardet/default.nix
index 5256d6050490..b93ea9c3bd78 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/cchardet/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/cchardet/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "cchardet";
- version = "2.1.6";
+ version = "2.1.7";
src = fetchPypi {
inherit pname version;
- sha256 = "1cs6y59qhbal8fgbyjk2lpjykh8kfjhq16clfssylsddb4hgnsmp";
+ sha256 = "c428b6336545053c2589f6caf24ea32276c6664cb86db817e03a94c60afa0eaf";
};
checkInputs = [ nose ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/celery/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/celery/default.nix
index 3fd1b51a4660..11dfd294f542 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/celery/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/celery/default.nix
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "celery";
- version = "4.4.7";
+ version = "5.0.2";
src = fetchPypi {
inherit pname version;
- sha256 = "d220b13a8ed57c78149acf82c006785356071844afe0b27012a4991d44026f9f";
+ sha256 = "012c814967fe89e3f5d2cf49df2dba3de5f29253a7f4f2270e8fce6b901b4ebf";
};
postPatch = ''
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/certbot/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/certbot/default.nix
index fc1fcfad4002..d7e74f5eff82 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/certbot/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/certbot/default.nix
@@ -9,13 +9,13 @@
buildPythonPackage rec {
pname = "certbot";
- version = "1.9.0";
+ version = "1.10.1";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
- sha256 = "1y04mchxybmy197lgj2rz53fx29s248hirsmb3zk2vdzlbbbs1b6";
+ sha256 = "035cdw2h3f511drc0q1j65j911m1pj6c5ghywavkhib0chim044c";
};
sourceRoot = "source/${pname}";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/certifi/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/certifi/default.nix
index e5733e2e51a3..e86ad90caeb0 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/certifi/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/certifi/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "certifi";
- version = "2020.6.20";
+ version = "2020.11.8";
src = fetchPypi {
inherit pname version;
- sha256 = "5930595817496dd21bb8dc35dad090f1c2cd0adfaf21204bf6732ca5d8ee34d3";
+ sha256 = "f05def092c44fbf25834a51509ef6e631dc19765ab8a57b4e7ab85531f0a9cf4";
};
pythonImportsCheck = [ "certifi" ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/cffi/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/cffi/default.nix
index c4e14c0e7fba..07492240ffe9 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/cffi/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/cffi/default.nix
@@ -2,11 +2,11 @@
if isPyPy then null else buildPythonPackage rec {
pname = "cffi";
- version = "1.14.2";
+ version = "1.14.4";
src = fetchPypi {
inherit pname version;
- sha256 = "ae8f34d50af2c2154035984b8b5fc5d9ed63f32fe615646ab435b05b132ca91b";
+ sha256 = "1a465cbe98a7fd391d47dce4b8f7e5b921e6cd805ef421d04f5f66ba8f06086c";
};
outputs = [ "out" "dev" ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/cftime/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/cftime/default.nix
index 1a29e51b35f5..0235c611c610 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/cftime/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/cftime/default.nix
@@ -1,28 +1,39 @@
{ buildPythonPackage
, fetchPypi
-, pytest
+, pytestCheckHook
, coveralls
, pytestcov
, cython
, numpy
+, python
}:
buildPythonPackage rec {
pname = "cftime";
- version = "1.2.1";
+ version = "1.3.0";
src = fetchPypi {
inherit pname version;
- sha256 = "ab5d5076f7d3e699758a244ada7c66da96bae36e22b9e351ce0ececc36f0a57f";
+ sha256 = "8d6a1144f43b9d7a180d7ceb3aa8015b7133c615fbac231bed184a91129f0207";
};
- checkInputs = [ pytest coveralls pytestcov ];
- buildInputs = [ cython ];
- propagatedBuildInputs = [ numpy ];
+ checkInputs = [
+ pytestCheckHook
+ coveralls
+ pytestcov
+ ];
- checkPhase = ''
- py.test
- '';
+ nativeBuildInputs = [
+ cython
+ numpy
+ ];
+
+ propagatedBuildInputs = [
+ numpy
+ ];
+
+ # ERROR test/test_cftime.py - ModuleNotFoundError: No module named 'cftime._cft...
+ doCheck = false;
meta = {
description = "Time-handling functionality from netcdf4-python";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/chalice/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/chalice/default.nix
index f586e92f9516..7eb06e26450c 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/chalice/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/chalice/default.nix
@@ -22,11 +22,11 @@
buildPythonPackage rec {
pname = "chalice";
- version = "1.21.1";
+ version = "1.21.4";
src = fetchPypi {
inherit pname version;
- sha256 = "562218c5d257607fba3440e0a1d09bdac81a11536c432ad2af1e2d46f1735df4";
+ sha256 = "fb3580272cc66ba0fd59914b7ac395d2da6b9b32b11dc7557aa80a0ae7cccf3c";
};
checkInputs = [ watchdog pytest hypothesis mock ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/channels/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/channels/default.nix
index 94d1705637d2..63b1699101d4 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/channels/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/channels/default.nix
@@ -3,11 +3,11 @@
}:
buildPythonPackage rec {
pname = "channels";
- version = "2.4.0";
+ version = "3.0.2";
src = fetchPypi {
inherit pname version;
- sha256 = "08e756406d7165cb32f6fc3090c0643f41ca9f7e0f7fada0b31194662f20f414";
+ sha256 = "f50a6e79757a64c1e45e95e144a2ac5f1e99ee44a0718ab182c501f5e5abd268";
};
# Files are missing in the distribution
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/check-manifest/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/check-manifest/default.nix
index 5a3296d71c83..6368ebf4b737 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/check-manifest/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/check-manifest/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "check-manifest";
- version = "0.42";
+ version = "0.45";
src = fetchPypi {
inherit pname version;
- sha256 = "0d8e1b0944a667dd4a75274f6763e558f0d268fde2c725e894dfd152aae23300";
+ sha256 = "636b65a3b685374ad429ff22fe213966765b145f08bc560c8d033b604c7bee4c";
};
# Test requires filesystem access
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/cheroot/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/cheroot/default.nix
index 5795b55d91b7..6c99b7bbf662 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/cheroot/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/cheroot/default.nix
@@ -6,7 +6,6 @@
, pytestCheckHook
, pytestcov
, pytest-mock
-, pytest-testmon
, requests
, requests-toolbelt
, requests-unixsocket
@@ -18,13 +17,13 @@
buildPythonPackage rec {
pname = "cheroot";
- version = "8.4.5";
+ version = "8.4.8";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "b6c18caf5f79cdae668c35fc8309fc88ea4a964cce9e2ca8504fab13bcf57301";
+ sha256 = "1089c28a9c320d19fdf9a4b0ed6ace23a0948db1c171a36ac985f3741bc62865";
};
nativeBuildInputs = [ setuptools_scm setuptools-scm-git-archive ];
@@ -38,7 +37,6 @@ buildPythonPackage rec {
pytestCheckHook
pytestcov
pytest-mock
- pytest-testmon
requests
requests-toolbelt
requests-unixsocket
@@ -54,6 +52,7 @@ buildPythonPackage rec {
# Deselect test_bind_addr_unix on darwin because times out
# Deselect test_http_over_https_error on darwin because builtin cert fails
# Disable warnings-as-errors because of deprecation warnings from socks on python 3.7
+ # Disable pytest-testmon because it doesn't work
# adds many other pytest utilities which aren't necessary like linting
preCheck = ''
rm pytest.ini
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/class-registry/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/class-registry/default.nix
index 9a3650bceb8b..93c41cadea6e 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/class-registry/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/class-registry/default.nix
@@ -4,6 +4,8 @@
lib,
nose,
six,
+ typing,
+ isPy27,
}:
buildPythonPackage rec {
@@ -15,7 +17,7 @@ buildPythonPackage rec {
sha256 = "0zjf9nczl1ifzj07bgs6mwxsfd5xck9l0lchv2j0fv2n481xp2v7";
};
- propagatedBuildInputs = [ six ];
+ propagatedBuildInputs = [ six ] ++ lib.optional isPy27 typing;
checkInputs = [ nose ];
# Tests currently failing.
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/cliapp/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/cliapp/default.nix
index 233028235b19..497306c293a4 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/cliapp/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/cliapp/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage {
doCheck = false;
meta = with stdenv.lib; {
- homepage = "http://liw.fi/cliapp/";
+ homepage = "https://liw.fi/cliapp/";
description = "Python framework for Unix command line programs";
license = licenses.gpl2;
maintainers = [];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/click-help-colors/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/click-help-colors/default.nix
new file mode 100644
index 000000000000..ac1cab90d0ad
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/click-help-colors/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchPypi, buildPythonPackage
+, click, pytest
+}:
+
+buildPythonPackage rec {
+ pname = "click-help-colors";
+ version = "0.8";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "EZ5fr2nPyRnJlcWWIyasj9h/EeVqNxr1lOPf2EWPTG4=";
+ };
+
+ propagatedBuildInputs = [ click ];
+
+ # tries to use /homeless-shelter to mimic container usage, etc
+ #doCheck = false;
+ checkInputs = [ pytest ];
+
+ pythonImportsCheck = [ "click_help_colors" ];
+
+ meta = with stdenv.lib; {
+ description = "Colorization of help messages in Click";
+ homepage = "https://github.com/r-m-n/click-help-colors";
+ license = licenses.mit;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ freezeboy ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/clickhouse-cityhash/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/clickhouse-cityhash/default.nix
new file mode 100644
index 000000000000..4e632cb34038
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/clickhouse-cityhash/default.nix
@@ -0,0 +1,27 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, setuptools
+}:
+
+buildPythonPackage rec {
+ pname = "clickhouse-cityhash";
+ version = "1.0.2.3";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0z8nl0ly2p1h6nygwxs6y40q8y424w40fkjv3jyf8vvcg4h7sdrg";
+ };
+
+ propagatedBuildInputs = [ setuptools ];
+
+ doCheck = false;
+ pythonImportsCheck = [ "clickhouse_cityhash" ];
+
+ meta = with lib; {
+ description = "Python-bindings for CityHash, a fast non-cryptographic hash algorithm";
+ homepage = "https://github.com/xzkostyan/python-cityhash";
+ license = licenses.upl;
+ maintainers = with maintainers; [ breakds ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/clickhouse-driver/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/clickhouse-driver/default.nix
new file mode 100644
index 000000000000..9cb88b5cbc9b
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/clickhouse-driver/default.nix
@@ -0,0 +1,48 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, setuptools
+, pytz
+, tzlocal
+, clickhouse-cityhash
+, zstd
+, lz4
+, freezegun
+, mock
+, nose
+}:
+
+buildPythonPackage rec {
+ pname = "clickhouse-driver";
+ version = "0.1.5";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1827cm5z2zd6mxn9alq54bbzw6vhz4a30a54vacqn7nz691qs1gd";
+ };
+
+ propagatedBuildInputs = [
+ setuptools
+ pytz
+ tzlocal
+ clickhouse-cityhash
+ zstd
+ lz4
+ ];
+
+ checkInputs = [
+ freezegun
+ mock
+ nose
+ ];
+
+ doCheck = true;
+ pythonImportsCheck = [ "clickhouse_driver" ];
+
+ meta = with lib; {
+ description = "Python driver with native interface for ClickHouse";
+ homepage = "https://github.com/mymarilyn/clickhouse-driver";
+ license = licenses.mit;
+ maintainers = with maintainers; [ breakds ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/cliff/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/cliff/default.nix
index 220ff790e7cc..f25170cc6ae7 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/cliff/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/cliff/default.nix
@@ -17,11 +17,11 @@
buildPythonPackage rec {
pname = "cliff";
- version = "3.4.0";
+ version = "3.5.0";
src = fetchPypi {
inherit pname version;
- sha256 = "49be854582ec4a74240cb72f287846f823cd8cbd2e25f924541d12f27104bda3";
+ sha256 = "5bfb684b5fcdff0afaaccd1298a376c0e62e644c46b7e9abc034595b41fe1759";
};
propagatedBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/clintermission/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/clintermission/default.nix
new file mode 100644
index 000000000000..04e97f4c6693
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/clintermission/default.nix
@@ -0,0 +1,29 @@
+{ lib, buildPythonApplication, fetchFromGitHub, isPy3k, prompt_toolkit }:
+
+buildPythonApplication rec {
+ pname = "clintermission";
+ version = "0.2.0";
+
+ src = fetchFromGitHub {
+ owner = "sebageek";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "09wl0rpw6c9hab51rs957z64b0v9j4fcbqbn726wnapf4z5w6yxv";
+ };
+
+ propagatedBuildInputs = [ prompt_toolkit ];
+
+ disabled = !isPy3k;
+
+ # repo contains no tests
+ doCheck = false;
+
+ pythonImportsCheck = [ "clintermission" ];
+
+ meta = with lib; {
+ description = "Non-fullscreen command-line selection menu";
+ homepage = "https://github.com/sebageek/clintermission";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ SuperSandro2000 ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/clldutils/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/clldutils/default.nix
index 69813e6a2eb7..19daa2de573d 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/clldutils/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/clldutils/default.nix
@@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "clldutils";
- version = "3.5.2";
+ version = "3.5.4";
disabled = isPy27;
src = fetchFromGitHub {
owner = "clld";
repo = pname;
rev = "v${version}";
- sha256 = "0qlqp9yq4lbi9ik2psgw0svxlb7raadqaxdh2dgkn85d7h20y4nd";
+ sha256 = "0yirww9abp6hffxz57ms7ljyjw0pamw2bhfrf7cshpwwb6sx5ycf";
};
patchPhase = ''
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/cloudflare/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/cloudflare/default.nix
index 7692bd1c9d6c..a7b6d204f199 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/cloudflare/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/cloudflare/default.nix
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "cloudflare";
- version = "2.8.13";
+ version = "2.8.14";
src = fetchPypi {
inherit pname version;
- sha256 = "a662990737d86984156a48f769e6528d947e90fd1561bb5e19d0036b59b9fd6f";
+ sha256 = "5787892fdee3a6408b4290de0371426ab778a7ebf44decad9d843cab1ef0a1ac";
};
propagatedBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/cloudpickle/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/cloudpickle/default.nix
index 092a0f7c0b11..cd21e125ccef 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/cloudpickle/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/cloudpickle/default.nix
@@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "cloudpickle";
- version = "1.5.0";
+ version = "1.6.0";
disabled = isPy27; # abandoned upstream
src = fetchPypi {
inherit pname version;
- sha256 = "820c9245cebdec7257211cbe88745101d5d6a042bca11336d78ebd4897ddbc82";
+ sha256 = "9bc994f9e9447593bd0a45371f0e7ac7333710fcf64a4eb9834bf149f4ef2f32";
};
buildInputs = [ pytest mock ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/cmarkgfm/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/cmarkgfm/default.nix
index 2337964017a2..3c6342f6596f 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/cmarkgfm/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/cmarkgfm/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "cmarkgfm";
- version = "0.4.2";
+ version = "0.5.0";
src = fetchPypi {
inherit pname version;
- sha256 = "f20900f16377f2109783ae9348d34bc80530808439591c3d3df73d5c7ef1a00c";
+ sha256 = "7a5131a78836e55dcdb1f2c5f17bbaa40e5f83c86a205de1b71a298928e1391f";
};
propagatedBuildInputs = [ cffi ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/cmd2/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/cmd2/default.nix
index 335649c6be92..889ef3fba15c 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/cmd2/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/cmd2/default.nix
@@ -6,11 +6,11 @@
}:
buildPythonPackage rec {
pname = "cmd2";
- version = "1.3.11";
+ version = "1.4.0";
src = fetchPypi {
inherit pname version;
- sha256 = "826a288ee6d9c4ec1184e64e9566c09d3b73be8f4283c1898fa4332f1daf8dbf";
+ sha256 = "e59fa932418603af4e046a96c8985812b05af8a73bfd9d7a386cd1b02c6ab687";
};
LC_ALL="en_US.UTF-8";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/cmdtest/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/cmdtest/default.nix
index ca2402cff6cd..5c53cafdb4e1 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/cmdtest/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/cmdtest/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
doCheck = false;
meta = with stdenv.lib; {
- homepage = "http://liw.fi/cmdtest/";
+ homepage = "https://liw.fi/cmdtest/";
description = "Black box tests Unix command line tools";
license = licenses.gpl3;
};
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/cnvkit/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/cnvkit/default.nix
index 6677ab06334f..92af67fa183a 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/cnvkit/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/cnvkit/default.nix
@@ -1,5 +1,6 @@
{ lib
-, fetchPypi
+, fetchFromGitHub
+, fetchpatch
, rPackages
, rWrapper
, buildPythonPackage
@@ -15,17 +16,29 @@
, pillow
, pomegranate
, pyfaidx
+, python
+, R
}:
buildPythonPackage rec {
pname = "CNVkit";
version = "0.9.7";
- src = fetchPypi {
- inherit pname version;
- sha256 = "d68adc0121e17c61a3aa28c0a9ba6526510a5a0df0f0a6eb1818bab71b7e927a";
+ src = fetchFromGitHub {
+ owner = "etal";
+ repo = "cnvkit";
+ rev = "v${version}";
+ sha256 = "022zplgqil5l76vri647cyjx427vnbg5r2gw6lw712d2janvdjm7";
};
+ patches = [
+ # Fix: AttributeError: module 'pandas.io.common' has no attribute 'EmptyDataError'
+ (fetchpatch {
+ url = "https://github.com/etal/cnvkit/commit/392adfffedfa0415e635b72c5027835b0a8d7ab5.patch";
+ sha256 = "0s0gwyy0hybmhc3jij2v9l44b6lkcmclii8bkwsazzj2kc24m2rh";
+ })
+ ];
+
propagatedBuildInputs = [
biopython
numpy
@@ -39,6 +52,7 @@ buildPythonPackage rec {
future
pillow
pomegranate
+ rPackages.DNAcopy
];
postPatch = ''
@@ -46,7 +60,16 @@ buildPythonPackage rec {
--replace "pandas >= 0.20.1, < 0.25.0" "pandas"
'';
- pythonImportsCheck = [ "cnvlib" ];
+ checkInputs = [ R ];
+
+ checkPhase = ''
+ pushd test/
+ ${python.interpreter} test_io.py
+ ${python.interpreter} test_genome.py
+ ${python.interpreter} test_cnvlib.py
+ ${python.interpreter} test_commands.py
+ ${python.interpreter} test_r.py
+ '';
meta = with lib; {
homepage = "https://cnvkit.readthedocs.io";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/coapthon3/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/coapthon3/default.nix
new file mode 100644
index 000000000000..6f22e8e9f296
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/coapthon3/default.nix
@@ -0,0 +1,27 @@
+{ buildPythonPackage, cachetools, fetchFromGitHub, isPy27, lib }:
+
+buildPythonPackage rec {
+ pname = "CoAPthon3";
+ version = "1.0.1";
+ disabled = isPy27;
+
+ src = fetchFromGitHub {
+ owner = "Tanganelli";
+ repo = pname;
+ rev = version;
+ sha256 = "1im35i5i72y1p9qj8ixkwq7q6ksbrmi42giqiyfgjp1ym38snl69";
+ };
+
+ propagatedBuildInputs = [ cachetools ];
+
+ # tests take in the order of 10 minutes to execute and sometimes hang forever on tear-down
+ doCheck = false;
+ pythonImportsCheck = [ "coapthon" ];
+
+ meta = with lib; {
+ inherit (src.meta) homepage;
+ description = "Python3 library to the CoAP protocol compliant with the RFC.";
+ license = licenses.mit;
+ maintainers = with maintainers; [ urbas ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/coconut/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/coconut/default.nix
new file mode 100644
index 000000000000..b75a82b6c2b2
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/coconut/default.nix
@@ -0,0 +1,52 @@
+{
+ lib,
+ buildPythonApplication,
+ fetchFromGitHub,
+ fetchpatch,
+
+ cpyparsing,
+ ipykernel,
+ mypy,
+ pygments,
+ pytest,
+ prompt_toolkit,
+ tkinter,
+ watchdog
+}:
+
+buildPythonApplication rec {
+ pname = "coconut";
+ version = "1.4.3";
+
+ src = fetchFromGitHub {
+ owner = "evhub";
+ repo = "coconut";
+ rev = "v${version}";
+ sha256 = "1pz13vza3yy95dbylnq89fzc3mwgcqr7ds096wy25k6vxd9dp9c3";
+ };
+
+ propagatedBuildInputs = [ cpyparsing pygments prompt_toolkit ipykernel mypy watchdog ];
+
+ patches = [
+ (fetchpatch {
+ name = "fix-setuptools-version-check.patch";
+ url = "https://github.com/LibreCybernetics/coconut/commit/2916a087da1e063cc4438b68d4077347fd1ea4a2.patch";
+ sha256 = "136jbd2rvnifw30y73vv667002nf7sbkm5qyihshj4db7ngysr6q";
+ })
+ ];
+
+ checkInputs = [ pytest tkinter ];
+ # Currently most tests do not work on Hydra due to external fetches.
+ checkPhase = ''
+ pytest tests/constants_test.py
+ pytest tests/main_test.py::TestShell::test_compile_to_file
+ pytest tests/main_test.py::TestShell::test_convenience
+ '';
+
+ meta = with lib; {
+ homepage = "http://coconut-lang.org/";
+ description = "Simple, elegant, Pythonic functional programming";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ fabianhjr ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/codecov/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/codecov/default.nix
index 8424a560d260..455888c447da 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/codecov/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/codecov/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "codecov";
- version = "2.1.9";
+ version = "2.1.10";
src = fetchPypi {
inherit pname version;
- sha256 = "355fc7e0c0b8a133045f0d6089bde351c845e7b52b99fec5903b4ea3ab5f6aab";
+ sha256 = "d30ad6084501224b1ba699cbf018a340bb9553eb2701301c14133995fdd84f33";
};
checkInputs = [ unittest2 ]; # Tests only
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/codespell/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/codespell/default.nix
index 70c634737635..7efb08c2c67b 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/codespell/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/codespell/default.nix
@@ -1,13 +1,16 @@
{ lib, buildPythonApplication, fetchPypi, pytest, chardet }:
+
buildPythonApplication rec {
pname = "codespell";
- version = "1.17.1";
+ version = "2.0.0";
src = fetchPypi {
inherit pname version;
- sha256 = "08ydpw8pim7rhg1x2n711hxf2y6553nx0c0aqhfi3p4wdgcfr8i5";
+ sha256 = "dd9983e096b9f7ba89dd2d2466d1fc37231d060f19066331b9571341363c77b8";
};
+ # no tests in pypi tarball
+ doCheck = false;
checkInputs = [ pytest chardet ];
checkPhase = ''
# We don't want to be affected by the presence of these
@@ -16,6 +19,8 @@ buildPythonApplication rec {
pytest --pyargs codespell_lib.tests -k "not test_command"
'';
+ pythonImportsCheck = [ "codespell_lib" ];
+
meta = {
description = "Fix common misspellings in source code";
homepage = "https://github.com/codespell-project/codespell";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/colander/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/colander/default.nix
index 0492e2717465..8a4933d19541 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/colander/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/colander/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "colander";
- version = "1.8.2";
+ version = "1.8.3";
src = fetchPypi {
inherit pname version;
- sha256 = "54878d2ffd1afb020daca6cd5c6cfe6c0e44d0069fc825d57fe59aa6e4f6a499";
+ sha256 = "259592a0d6a89cbe63c0c5771f9c0c2522387415af8d715f599583eac659f7d4";
};
propagatedBuildInputs = [ translationstring iso8601 enum34 ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/colanderalchemy/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/colanderalchemy/default.nix
index 34e58e0927cd..aba5ebf609b8 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/colanderalchemy/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/colanderalchemy/default.nix
@@ -1,6 +1,5 @@
{ stdenv
, buildPythonPackage
-, fetchpatch
, fetchPypi
, unittest2
, colander
@@ -9,30 +8,21 @@
buildPythonPackage rec {
pname = "ColanderAlchemy";
- version = "0.3.3";
+ version = "0.3.4";
src = fetchPypi {
inherit pname version;
- sha256 = "11wcni2xmfmy001rj62q2pwf305vvngkrfm5c4zlwvgbvlsrvnnw";
+ sha256 = "006wcfch2skwvma9bq3l06dyjnz309pa75h1rviq7i4pd9g463bl";
};
- patches = [
- (fetchpatch {
- url = "https://github.com/stefanofontanelli/ColanderAlchemy/commit/b45fe35f2936a5ccb705e9344075191e550af6c9.patch";
- sha256 = "1kf278wjq49zd6fhpp55vdcawzdd107767shzfck522sv8gr6qvx";
- })
- ];
-
- buildInputs = [ unittest2 ];
propagatedBuildInputs = [ colander sqlalchemy ];
+ # Tests are not included in Pypi
+ doCheck = false;
+
meta = with stdenv.lib; {
description = "Autogenerate Colander schemas based on SQLAlchemy models";
homepage = "https://github.com/stefanofontanelli/ColanderAlchemy";
license = licenses.mit;
- # ColanderAlchemy's tests currently fail with colander >1.6.0
- # (see https://github.com/stefanofontanelli/ColanderAlchemy/issues/107)
- broken = versionOlder "1.6.0" colander.version;
};
-
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/colorama/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/colorama/default.nix
index d22f93d47f17..063491845827 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/colorama/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/colorama/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "colorama";
- version = "0.4.3";
+ version = "0.4.4";
src = fetchPypi {
inherit pname version;
- sha256 = "e96da0d330793e2cb9485e9ddfd918d456036c7149416295932478192f4436a1";
+ sha256 = "5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b";
};
# No tests in archive
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/coloredlogs/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/coloredlogs/default.nix
index c2a329e08f34..3005429658b9 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/coloredlogs/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/coloredlogs/default.nix
@@ -6,7 +6,7 @@
, capturer
, pytest
, mock
-, utillinux
+, util-linux
}:
buildPythonPackage rec {
@@ -24,7 +24,7 @@ buildPythonPackage rec {
PATH=$PATH:$out/bin pytest . -k "not test_plain_text_output_format \
and not test_auto_install"
'';
- checkInputs = [ pytest mock utillinux ];
+ checkInputs = [ pytest mock util-linux ];
propagatedBuildInputs = [ humanfriendly verboselogs capturer ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/colorlog/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/colorlog/default.nix
index a7a04c1f605d..0b40284fd5eb 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/colorlog/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/colorlog/default.nix
@@ -2,19 +2,23 @@
buildPythonPackage rec {
pname = "colorlog";
- version = "4.2.1";
+ version = "4.6.2";
src = fetchPypi {
inherit pname version;
- sha256 = "066i7904vc7814gqnlprksf0ikz2dmviw93r2mr7sf53qci5irbm";
+ sha256 = "54e5f153419c22afc283c130c4201db19a3dbd83221a0f4657d5ee66234a2ea4";
};
checkInputs = [ pytest ];
+ # tests are no longer packaged in pypi
+ doCheck = false;
checkPhase = ''
py.test -p no:logging
'';
+ pythonImportsCheck = [ "colorlog" ];
+
meta = with stdenv.lib; {
description = "Log formatting with colors";
homepage = "https://github.com/borntyping/python-colorlog";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/configparser/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/configparser/default.nix
index 7322a6891cd8..ad9a13c28bf0 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/configparser/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/configparser/default.nix
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "configparser";
- version = "5.0.0";
+ version = "5.0.1";
src = fetchPypi {
inherit pname version;
- sha256 = "2ca44140ee259b5e3d8aaf47c79c36a7ab0d5e94d70bd4105c03ede7a20ea5a1";
+ sha256 = "005c3b102c96f4be9b8f40dafbd4997db003d07d1caa19f37808be8031475f2a";
};
# No tests available
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/coordinates/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/coordinates/default.nix
index 44a41b92c4e5..c7a24a0c3e90 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/coordinates/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/coordinates/default.nix
@@ -27,6 +27,6 @@ buildPythonPackage rec {
description = "Convenience class for doing maths with explicit coordinates";
homepage = "https://github.com/clbarnes/coordinates";
license = licenses.mit;
- maintainers = [ maintainers.mildlyincompetent ];
+ maintainers = [ ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/cornice/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/cornice/default.nix
index 9897115353f3..d09cffb31d64 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/cornice/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/cornice/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "cornice";
- version = "5.0.2";
+ version = "5.0.3";
src = fetchPypi {
inherit pname version;
- sha256 = "4fcf3be295514e7e20fdd602fea8d204127bb02da2ff6bdbc8b6fba859ac9fd0";
+ sha256 = "f971831e90343374b21c0c97d523e23eb09cec41a2a8fc2e85bb5c2585348576";
};
propagatedBuildInputs = [ pyramid simplejson six venusian ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/coverage/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/coverage/default.nix
index fa5f4bca8cd0..8823435e2f8b 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/coverage/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/coverage/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "coverage";
- version = "5.2.1";
+ version = "5.3";
src = fetchPypi {
inherit pname version;
- sha256 = "a34cb28e0747ea15e82d13e14de606747e9e484fb28d63c999483f5d5188e89b";
+ sha256 = "280baa8ec489c4f542f8940f9c4c2181f0306a8ee1a54eceba071a449fb870a0";
};
# No tests in archive
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/coveralls/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/coveralls/default.nix
index 64078693ac19..68cf993a5a81 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/coveralls/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/coveralls/default.nix
@@ -16,13 +16,13 @@
buildPythonPackage rec {
pname = "coveralls";
- version = "2.1.2";
+ version = "2.2.0";
disabled = isPy27;
# wanted by tests
src = fetchPypi {
inherit pname version;
- sha256 = "4430b862baabb3cf090d36d84d331966615e4288d8a8c5957e0fd456d0dd8bd6";
+ sha256 = "b990ba1f7bc4288e63340be0433698c1efe8217f78c689d254c2540af3d38617";
};
checkInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/cpyparsing/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/cpyparsing/default.nix
new file mode 100644
index 000000000000..66f173106e49
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/cpyparsing/default.nix
@@ -0,0 +1,24 @@
+{ lib, buildPythonPackage, fetchFromGitHub, cython, python }:
+
+buildPythonPackage rec {
+ pname = "cpyparsing";
+ version = "2.4.5.0.1.1";
+
+ src = fetchFromGitHub {
+ owner = "evhub";
+ repo = pname;
+ rev = "aa8ee45daec5c55328446bad7202ab8f799ab0ce"; # No tags on repo
+ sha256 = "1mxa5q41cb0k4lkibs0d4lzh1w6kmhhdrsm0w0r1m3s80m05ffmw";
+ };
+
+ nativeBuildInputs = [ cython ];
+
+ checkPhase = "${python.interpreter} tests/cPyparsing_test.py";
+
+ meta = with lib; {
+ homepage = "https://github.com/evhub/cpyparsing";
+ description = "Cython PyParsing implementation";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ fabianhjr ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/crate/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/crate/default.nix
index 42236b4d7c22..84e1b9048e2c 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/crate/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/crate/default.nix
@@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "crate";
- version = "0.24.0";
+ version = "0.26.0";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "028q9r1qyqkq185awkazhplfy7y1081963fnjzi3kf3lxvz6yhay";
+ sha256 = "6f650c2efe250b89bf35f8fe3211eb37ebc8d76f7a9c09bd73db3076708fa2fc";
};
propagatedBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/crayons/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/crayons/default.nix
index 4cd9e90606b6..f262d289af71 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/crayons/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/crayons/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "crayons";
- version = "0.3.1";
+ version = "0.4.0";
src = fetchPypi {
inherit pname version;
- sha256 = "dcb85b87aa03bb65bd3a073d012796b024cabeb086033e616759e2abb769440b";
+ sha256 = "bd33b7547800f2cfbd26b38431f9e64b487a7de74a947b0fafc89b45a601813f";
};
propagatedBuildInputs = [ colorama ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/credstash/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/credstash/default.nix
index 1abd3f4ed203..1f9b4b28f294 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/credstash/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/credstash/default.nix
@@ -1,6 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, cryptography, boto3, pyyaml, docutils, nose
-, fetchpatch
-}:
+{ stdenv, buildPythonPackage, fetchPypi, cryptography, boto3, pyyaml, docutils, pytest, fetchpatch }:
buildPythonPackage rec {
pname = "credstash";
@@ -25,7 +23,7 @@ buildPythonPackage rec {
# file ensures that Python imports the module from site-packages library.
postInstall = "rm $out/bin/credstash.py";
- nativeBuildInputs = [ nose ];
+ nativeBuildInputs = [ pytest ];
propagatedBuildInputs = [ cryptography boto3 pyyaml docutils ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/croniter/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/croniter/default.nix
index 05e855b12dc1..a8ae75746880 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/croniter/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/croniter/default.nix
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "croniter";
- version = "0.3.34";
+ version = "0.3.36";
src = fetchPypi {
inherit pname version;
- sha256 = "7186b9b464f45cf3d3c83a18bc2344cc101d7b9fd35a05f2878437b14967e964";
+ sha256 = "9d3098e50f7edc7480470455d42f09c501fa1bb7e2fc113526ec6e90b068f32c";
};
propagatedBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/cryptography/2.9.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/cryptography/2.9.nix
index 6a6187e5693d..3cde50542873 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/cryptography/2.9.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/cryptography/2.9.nix
@@ -29,6 +29,8 @@ buildPythonPackage rec {
sha256 = "0af25w5mkd6vwns3r6ai1w5ip9xp0ms9s261zzssbpadzdr05hx0";
};
+ patches = [ ./CVE-2020-25659.patch ];
+
outputs = [ "out" "dev" ];
buildInputs = [ openssl ]
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/cryptography/CVE-2020-25659.patch b/infra/libkookie/nixpkgs/pkgs/development/python-modules/cryptography/CVE-2020-25659.patch
new file mode 100644
index 000000000000..a353757be11f
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/cryptography/CVE-2020-25659.patch
@@ -0,0 +1,76 @@
+Backported of:
+
+From 58494b41d6ecb0f56b7c5f05d5f5e3ca0320d494 Mon Sep 17 00:00:00 2001
+From: Alex Gaynor <alex.gaynor@gmail.com>
+Date: Sun, 25 Oct 2020 21:16:42 -0400
+Subject: [PATCH] Attempt to mitigate Bleichenbacher attacks on RSA decryption
+ (#5507)
+
+diff --git a/docs/spelling_wordlist.txt b/docs/spelling_wordlist.txt
+index 6e4675d..ce66c28 100644
+--- a/docs/spelling_wordlist.txt
++++ b/docs/spelling_wordlist.txt
+@@ -6,6 +6,7 @@ backend
+ Backends
+ backends
+ bcrypt
++Bleichenbacher
+ Blowfish
+ boolean
+ Botan
+diff --git a/src/cryptography/hazmat/backends/openssl/rsa.py b/src/cryptography/hazmat/backends/openssl/rsa.py
+index 3e4c2fd..6303f95 100644
+--- a/src/cryptography/hazmat/backends/openssl/rsa.py
++++ b/src/cryptography/hazmat/backends/openssl/rsa.py
+@@ -117,40 +117,19 @@ def _enc_dec_rsa_pkey_ctx(backend, key, data, padding_enum, padding):
+
+ outlen = backend._ffi.new("size_t *", buf_size)
+ buf = backend._ffi.new("unsigned char[]", buf_size)
++ # Everything from this line onwards is written with the goal of being as
++ # constant-time as is practical given the constraints of Python and our
++ # API. See Bleichenbacher's '98 attack on RSA, and its many many variants.
++ # As such, you should not attempt to change this (particularly to "clean it
++ # up") without understanding why it was written this way (see
++ # Chesterton's Fence), and without measuring to verify you have not
++ # introduced observable time differences.
+ res = crypt(pkey_ctx, buf, outlen, data, len(data))
++ resbuf = backend._ffi.buffer(buf)[: outlen[0]]
++ backend._lib.ERR_clear_error()
+ if res <= 0:
+- _handle_rsa_enc_dec_error(backend, key)
+-
+- return backend._ffi.buffer(buf)[:outlen[0]]
+-
+-
+-def _handle_rsa_enc_dec_error(backend, key):
+- errors = backend._consume_errors()
+- backend.openssl_assert(errors)
+- backend.openssl_assert(errors[0].lib == backend._lib.ERR_LIB_RSA)
+- if isinstance(key, _RSAPublicKey):
+- backend.openssl_assert(
+- errors[0].reason == backend._lib.RSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE
+- )
+- raise ValueError(
+- "Data too long for key size. Encrypt less data or use a "
+- "larger key size."
+- )
+- else:
+- decoding_errors = [
+- backend._lib.RSA_R_BLOCK_TYPE_IS_NOT_01,
+- backend._lib.RSA_R_BLOCK_TYPE_IS_NOT_02,
+- backend._lib.RSA_R_OAEP_DECODING_ERROR,
+- # Though this error looks similar to the
+- # RSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE, this occurs on decrypts,
+- # rather than on encrypts
+- backend._lib.RSA_R_DATA_TOO_LARGE_FOR_MODULUS,
+- ]
+- if backend._lib.Cryptography_HAS_RSA_R_PKCS_DECODING_ERROR:
+- decoding_errors.append(backend._lib.RSA_R_PKCS_DECODING_ERROR)
+-
+- backend.openssl_assert(errors[0].reason in decoding_errors)
+- raise ValueError("Decryption failed.")
++ raise ValueError("Encryption/decryption failed.")
++ return resbuf
+
+
+ def _rsa_sig_determine_padding(backend, key, padding, algorithm):
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/cryptography/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/cryptography/default.nix
index 426f6af7aa61..41802f0d0651 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/cryptography/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/cryptography/default.nix
@@ -22,22 +22,29 @@
buildPythonPackage rec {
pname = "cryptography";
- version = "3.1.1"; # Also update the hash in vectors.nix
+ version = "3.2.1"; # Also update the hash in vectors.nix
src = fetchPypi {
inherit pname version;
- sha256 = "0z81q4d1nangw3r0v5f41mfl4d9r04qnbayl5ll5v5jpcfhwd7wx";
+ sha256 = "1qxz02kfsrihq1h4afyqwcsv9nh3s9mmrr6y9lhi4angw05y3mfk";
};
outputs = [ "out" "dev" ];
+ nativeBuildInputs = stdenv.lib.optionals (!isPyPy) [
+ cffi
+ ];
+
buildInputs = [ openssl ]
++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
propagatedBuildInputs = [
packaging
six
- ] ++ stdenv.lib.optional (!isPyPy) cffi
- ++ stdenv.lib.optionals isPy27 [ ipaddress enum34 ];
+ ] ++ stdenv.lib.optionals (!isPyPy) [
+ cffi
+ ] ++ stdenv.lib.optionals isPy27 [
+ ipaddress enum34
+ ];
checkInputs = [
cryptography_vectors
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/cryptography/vectors.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/cryptography/vectors.nix
index c7b244ff0417..567ce23783ea 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/cryptography/vectors.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/cryptography/vectors.nix
@@ -7,7 +7,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "1xp2j79c1y8qj4b97ygx451gzp8l4cp830hnvg3zw8j134bcaaam";
+ sha256 = "12dq1grn0bjj7c6sj6apd6328525n7xq4kbbmww63sn3x7081vls";
};
# No tests included
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/crytic-compile/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/crytic-compile/default.nix
new file mode 100644
index 000000000000..b9345e78eab0
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/crytic-compile/default.nix
@@ -0,0 +1,26 @@
+{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, pysha3, setuptools }:
+
+buildPythonPackage rec {
+ pname = "crytic-compile";
+ version = "0.1.9";
+
+ disabled = pythonOlder "3.6";
+
+ src = fetchFromGitHub {
+ owner = "crytic";
+ repo = "crytic-compile";
+ rev = version;
+ sha256 = "01mis7bqsh0l5vjl6jwibzy99djza35fxmywy56q8k4jbxwmdcna";
+ };
+
+ propagatedBuildInputs = [ pysha3 setuptools ];
+
+ doCheck = false;
+
+ meta = with lib; {
+ description = "Abstraction layer for smart contract build systems";
+ homepage = "https://github.com/crytic/crytic-compile";
+ license = licenses.agpl3;
+ maintainers = with maintainers; [ SuperSandro2000 ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/css-parser/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/css-parser/default.nix
index cba0c8787010..7791c2b9a237 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/css-parser/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/css-parser/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "css-parser";
- version = "1.0.4";
+ version = "1.0.6";
src = fetchPypi {
inherit pname version;
- sha256 = "c7ab355512ae51334ba6791a7e4d553f87bef17ba2026f1cc9bf3b17a7779d44";
+ sha256 = "4ed448a8a5622edb1d30d616bbc4bd3d30f11be922343d7a92d7e418e324af2e";
};
# Test suite not included in tarball yet
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/cssselect2/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/cssselect2/default.nix
index 5eb65ce2fca4..eadc3eb32b1f 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/cssselect2/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/cssselect2/default.nix
@@ -12,12 +12,12 @@
buildPythonPackage rec {
pname = "cssselect2";
- version = "0.3.0";
+ version = "0.4.1";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
- sha256 = "5c2716f06b5de93f701d5755a9666f2ee22cbcd8b4da8adddfc30095ffea3abc";
+ sha256 = "93fbb9af860e95dd40bf18c3b2b6ed99189a07c0f29ba76f9c5be71344664ec8";
};
propagatedBuildInputs = [ tinycss2 ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/csvw/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/csvw/default.nix
index 76f7cb73b4c4..70e817dc2991 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/csvw/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/csvw/default.nix
@@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "csvw";
- version = "1.8.0";
+ version = "1.8.1";
disabled = isPy27;
src = fetchFromGitHub {
owner = "cldf";
repo = "csvw";
rev = "v${version}";
- sha256 = "0maxrsiv9i9hkg627hwqyq8g6jg3g8iv8gdqaxz4aysjd9xddydd";
+ sha256 = "1cafwgkspkc299shsa5x8wfzkx1d63p9rvslj9jwr68fipd1830w";
};
patchPhase = ''
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/cupy/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/cupy/default.nix
index 2bbd20a16d72..91fd7ba11d4f 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/cupy/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/cupy/default.nix
@@ -6,11 +6,12 @@
buildPythonPackage rec {
pname = "cupy";
- version = "7.7.0";
+ version = "8.2.0";
+ disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "b4032adf839f63bab7fc9f3e7066ef86abe0928e834aa5d132e4e7ce907951ed";
+ sha256 = "8e4bc8428fb14309d73194e19bc4b47e1d6a330678a200e36d9d4b932f1be2e8";
};
checkInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/curio/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/curio/default.nix
index 0ffd66d6d012..31875abd1e83 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/curio/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/curio/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "curio";
- version = "1.2";
+ version = "1.4";
src = fetchPypi {
inherit pname version;
- sha256 = "90f320fafb3f5b791f25ffafa7b561cc980376de173afd575a2114380de7939b";
+ sha256 = "57edce81c837f3c2cf42fbb346dee26e537d1659e6605269fb13bd179e068744";
};
disabled = !isPy3k;
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/cvxpy/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/cvxpy/default.nix
index 1050591f641e..58d06e60d39c 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/cvxpy/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/cvxpy/default.nix
@@ -17,13 +17,13 @@
buildPythonPackage rec {
pname = "cvxpy";
- version = "1.1.6";
+ version = "1.1.7";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
- sha256 = "36527573c937cedd270f46c77b50bb5e16b96ca7b05a7a480bdc8c9052595723";
+ sha256 = "330eb76e8369c360b68d9231c6eb350848e373b5952134f9bfebaed1a4c4211f";
};
propagatedBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/cx_freeze/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/cx_freeze/default.nix
index dd8b1dccc1c3..e4350bada331 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/cx_freeze/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/cx_freeze/default.nix
@@ -1,17 +1,20 @@
-{ stdenv, buildPythonPackage, pythonOlder, fetchPypi, ncurses }:
+{ stdenv, buildPythonPackage, pythonOlder, fetchPypi, ncurses, importlib-metadata }:
buildPythonPackage rec {
pname = "cx_Freeze";
- version = "6.2";
+ version = "6.4.1";
src = fetchPypi {
inherit pname version;
- sha256 = "44bbbcea3196b79da77cc22637cb28a825b51182d32209e8a3f6cd4042edc247";
+ sha256 = "043513b85e33038e38cc0571cea1f3ee8044ec083891c9a5dad1d436894424ea";
};
disabled = pythonOlder "3.5";
- propagatedBuildInputs = [ ncurses ];
+ propagatedBuildInputs = [
+ importlib-metadata # upstream has this for 3.8 as well
+ ncurses
+ ];
# timestamp need to come after 1980 for zipfiles and nix store is set to epoch
prePatch = ''
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/cypari2/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/cypari2/default.nix
index 9308a13fb503..4b0d46918097 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/cypari2/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/cypari2/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "cypari2";
# upgrade may break sage, please test the sage build or ping @timokau on upgrade
- version = "2.1.1";
+ version = "2.1.2";
src = fetchPypi {
inherit pname version;
- sha256 = "df1ef62e771ec36e5a456f5fc8b51bc6745b70f0efdd0c7a30c3f0b5f1fb93db";
+ sha256 = "03cd45edab8716ebbfdb754e65fea72e873c73dc91aec098fe4a01e35324ac7a";
};
# This differs slightly from the default python installPhase in that it pip-installs
@@ -49,7 +49,7 @@ buildPythonPackage rec {
meta = with stdenv.lib; {
description = "Cython bindings for PARI";
license = licenses.gpl2;
- maintainers = with maintainers; [ timokau ];
+ maintainers = teams.sage.members;
homepage = "https://github.com/defeo/cypari2";
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/cysignals/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/cysignals/default.nix
index 137451b6b5cf..736afab4257c 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/cysignals/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/cysignals/default.nix
@@ -42,10 +42,10 @@ buildPythonPackage rec {
enableParallelBuilding = true;
- meta = {
+ meta = with lib; {
description = "Interrupt and signal handling for Cython";
homepage = "https://github.com/sagemath/cysignals/";
- maintainers = with lib.maintainers; [ timokau ];
- license = lib.licenses.lgpl3Plus;
+ maintainers = teams.sage.members;
+ license = licenses.lgpl3Plus;
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/daemonocle/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/daemonocle/default.nix
new file mode 100644
index 000000000000..ac470b83f7b2
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/daemonocle/default.nix
@@ -0,0 +1,42 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, click
+, psutil
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+ pname = "daemonocle";
+ version = "1.0.2";
+
+ src = fetchFromGitHub {
+ owner = "jnrbsn";
+ repo = "daemonocle";
+ rev = "v${version}";
+ hash = "sha256-kDCbosXTIffuCzHcReXhiW4YPbxDW3OPnTbMC/EGJrM=";
+ };
+
+ propagatedBuildInputs = [ click psutil ];
+ checkInputs = [ pytestCheckHook ];
+
+ # One third of the tests fail on the sandbox with
+ # "psutil.NoSuchProcess: no process found with pid 0".
+ doCheck = false;
+ disabledTests = [ "sudo" ];
+ pythonImportsCheck = [ "daemonocle" ];
+
+ meta = with lib; {
+ description = "A Python library for creating super fancy Unix daemons";
+ longDescription = ''
+ daemonocle is a library for creating your own Unix-style daemons
+ written in Python. It solves many problems that other daemon
+ libraries have and provides some really useful features you don't
+ often see in other daemons.
+ '';
+ homepage = "https://github.com/jnrbsn/daemonocle";
+ license = licenses.mit;
+ maintainers = [ maintainers.AluisioASG ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/dash-core-components/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/dash-core-components/default.nix
index 30f747d7fa37..9d5e650207bc 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/dash-core-components/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/dash-core-components/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "dash_core_components";
- version = "1.12.1";
+ version = "1.13.0";
src = fetchPypi {
inherit pname version;
- sha256 = "27f2ac612f5574dcd0d645f9302ceca5975bbdac6791865692e3ac51d0aec7f4";
+ sha256 = "f92025b12931539cdda2173f2b4cd077119cbabbf3ddf62333f6302fd0d8a3ac";
};
# No tests in archive
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/dash-renderer/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/dash-renderer/default.nix
index c61bf129abb0..8977d49489cb 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/dash-renderer/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/dash-renderer/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "dash_renderer";
- version = "1.8.2";
+ version = "1.8.3";
src = fetchPypi {
inherit pname version;
- sha256 = "84cbb22019299a5a3c268ec1143c6f241c3f136e95753edac83a81673b7fa04e";
+ sha256 = "f7ab2b922f4f0850bae0e9793cec99f8a1a241e5f7f5786e367ddd9e41d2b170";
};
# No tests in archive
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/dash-table/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/dash-table/default.nix
index fdcadf3f00a4..c313aea6c062 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/dash-table/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/dash-table/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "dash_table";
- version = "4.10.1";
+ version = "4.11.0";
src = fetchPypi {
inherit pname version;
- sha256 = "1aa02180faef13434364286b60404d26164d1ce2779c765c9c52e6935991a4e9";
+ sha256 = "3170504a8626a9676b016c5ab456ab8c1fb1ea0206dcc2eddb8c4c6589216304";
};
# No tests in archive
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/dash/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/dash/default.nix
index b07836a098a4..f6f00553d930 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/dash/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/dash/default.nix
@@ -16,13 +16,13 @@
buildPythonPackage rec {
pname = "dash";
- version = "1.16.2";
+ version = "1.17.0";
src = fetchFromGitHub {
owner = "plotly";
repo = pname;
rev = "v${version}";
- sha256 = "1krhwxlz8kpaklf5ii3h339id6c3139xzxxkq7mvvag330j6nbgg";
+ sha256 = "1fbnhpmkxavv6yirmhx7659q1y9bqynwjd1g6cscv1mfv9m59l60";
};
propagatedBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/dask-gateway-server/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/dask-gateway-server/default.nix
index 9d28d2671917..d2f040609d32 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/dask-gateway-server/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/dask-gateway-server/default.nix
@@ -12,12 +12,12 @@
buildPythonPackage rec {
pname = "dask-gateway-server";
# update dask-gateway-server lock step with dask-gateway
- version = "0.8.0";
+ version = "0.9.0";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "272134933b7e2068cd89a17a5012c76a29fbd9e40a78164345a2b15353d4b40a";
+ sha256 = "82bca8a98fc1dbda9f67c8eceac59cb92abe07db6227c120a1eb1d040ea40fda";
};
nativeBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/dask-gateway/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/dask-gateway/default.nix
index 8a4fe9e263a5..81aa8de8bcfc 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/dask-gateway/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/dask-gateway/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "dask-gateway";
# update dask-gateway lock step with dask-gateway-server
- version = "0.8.0";
+ version = "0.9.0";
src = fetchPypi {
inherit pname version;
- sha256 = "519818f3598ddd726882c5a6bf7053941613d8517b80e8a2c28467e30d57da9b";
+ sha256 = "743f3b88dabe7d1503ac08aadf399eb9205df786b12c5175ea2e10c6ded7df22";
};
propagatedBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/dask-image/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/dask-image/default.nix
index f119cf2b0b8b..453cb715b12b 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/dask-image/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/dask-image/default.nix
@@ -12,12 +12,12 @@
}:
buildPythonPackage rec {
- version = "0.3.0";
+ version = "0.4.0";
pname = "dask-image";
src = fetchPypi {
inherit pname version;
- sha256 = "15svy8y57i30878pijyd0pxn10bnk7ffmmgwva5rpip4b7grsgv0";
+ sha256 = "a6873a39af21b856a4eb7efee6838e6897b1399f21ab9e65403e69eb62f96c2d";
};
nativeBuildInputs = [ pytest-flake8 ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/dask-ml/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/dask-ml/default.nix
index d4a6663e7a50..441c698c2ad0 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/dask-ml/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/dask-ml/default.nix
@@ -20,13 +20,13 @@
}:
buildPythonPackage rec {
- version = "1.6.0";
+ version = "1.7.0";
pname = "dask-ml";
disabled = pythonOlder "3.6"; # >= 3.6
src = fetchPypi {
inherit pname version;
- sha256 = "ce686b7fd49b3f876d651c87e8468ad71bcd2707399140d6baf198184c45d970";
+ sha256 = "5f93e8560217ebbc5a2254eaf705e9cad8e1c82012567c658e26464a74fbab76";
};
propagatedBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/dask/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/dask/default.nix
index 2a088706f6c8..19c6962c5759 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/dask/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/dask/default.nix
@@ -11,12 +11,11 @@
, dill
, pandas
, partd
-, pytest_xdist
}:
buildPythonPackage rec {
pname = "dask";
- version = "2.22.0";
+ version = "2.25.0";
disabled = pythonOlder "3.5";
@@ -24,12 +23,11 @@ buildPythonPackage rec {
owner = "dask";
repo = pname;
rev = version;
- sha256 = "08nvxj81cz9x92dh2gbmm4imkr8cfljfi2hxkballv2ygwcbzg8g";
+ sha256 = "1irp6s577yyjvrvkg00hh1wnl8vrv7pbnbr09mk67z9y7s6xhiw3";
};
checkInputs = [
pytestCheckHook
- pytest_xdist # takes >10mins to run single-threaded
];
dontUseSetuptoolsCheck = true;
@@ -54,12 +52,7 @@ buildPythonPackage rec {
--replace "cmdclass=versioneer.get_cmdclass()," ""
'';
- # dask test suite with consistently fail when using high core counts
- preCheck = ''
- NIX_BUILD_CORES=$((NIX_BUILD_CORES > 8 ? 8 : NIX_BUILD_CORES))
- '';
-
- pytestFlagsArray = [ "-n $NIX_BUILD_CORES" ];
+ #pytestFlagsArray = [ "-n $NIX_BUILD_CORES" ];
disabledTests = [
"test_argwhere_str"
@@ -70,7 +63,8 @@ buildPythonPackage rec {
meta = {
description = "Minimal task scheduling abstraction";
- homepage = "https://github.com/ContinuumIO/dask/";
+ homepage = "https://dask.org/";
+ changelog = "https://docs.dask.org/en/latest/changelog.html";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ fridh ];
};
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/databricks-cli/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/databricks-cli/default.nix
index 952f0723c7c2..2184a7e41940 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/databricks-cli/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/databricks-cli/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "databricks-cli";
- version = "0.11.0";
+ version = "0.14.1";
src = fetchPypi {
inherit pname version;
- sha256 = "b3c7205dd8cb9935c475794ebd41b53aba79a53e028d3cf6b5871eec83c89ec0";
+ sha256 = "bf94dc5187fa3500a31d52d7225fbc1a4699aa6e3c321223e7088eb5b5c94b62";
};
checkInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix
index df3d08c3fab4..74eca940fb78 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "databricks-connect";
- version = "7.1.1";
+ version = "7.1.10";
src = fetchPypi {
inherit pname version;
- sha256 = "c7f508c84edc7f80a131650b892889624e4457c10f44318465dd3f7b8cf5be6d";
+ sha256 = "bae28fab1e08b709553c8efbeefc5b0ee4f5540a13a04e61fb3d348814823e16";
};
sourceRoot = ".";
@@ -16,8 +16,13 @@ buildPythonPackage rec {
# requires network access
doCheck = false;
+ prePatch = ''
+ substituteInPlace setup.py \
+ --replace "py4j==0.10.9" "py4j"
+ '';
+
preFixup = ''
- substituteInPlace "$out/bin/find-spark-home" \
+ substituteInPlace "$out/bin/find-spark-home" \
--replace find_spark_home.py .find_spark_home.py-wrapped
'';
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/dataclasses/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/dataclasses/default.nix
index a1159d49b812..5cfaf237059d 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/dataclasses/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/dataclasses/default.nix
@@ -2,14 +2,14 @@
buildPythonPackage rec {
pname = "dataclasses";
- version = "0.7";
+ version = "0.8";
# backport only works on Python 3.6, and is in the standard library in Python 3.7
disabled = !isPy36;
src = fetchPypi {
inherit pname version;
- sha256 = "494a6dcae3b8bcf80848eea2ef64c0cc5cd307ffc263e17cdf42f3e5420808e6";
+ sha256 = "8479067f342acf957dc82ec415d355ab5edb7e7646b90dc6e2fd1d96ad084c97";
};
meta = with stdenv.lib; {
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/datasets/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/datasets/default.nix
index b953ed1dd1af..4214304a9c93 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/datasets/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/datasets/default.nix
@@ -3,6 +3,7 @@
, fetchFromGitHub
, dill
, filelock
+, multiprocess
, numpy
, pandas
, pyarrow
@@ -13,18 +14,19 @@
buildPythonPackage rec {
pname = "datasets";
- version = "1.0.1";
+ version = "1.1.2";
src = fetchFromGitHub {
owner = "huggingface";
repo = pname;
rev = version;
- sha256 = "14f7847b8md5kf631zl8x2f53wy8zbzxypq4wdgzvwsjz4k7v4jn";
+ hash = "sha256-upXZ2rOfmjnJbDo6RMGeHv/fe10RQAf/zwDWWKdt6SA=";
};
propagatedBuildInputs = [
dill
filelock
+ multiprocess
numpy
pandas
pyarrow
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/dateparser/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/dateparser/default.nix
index 729827317c18..2a80523a6560 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/dateparser/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/dateparser/default.nix
@@ -18,11 +18,11 @@
buildPythonPackage rec {
pname = "dateparser";
- version = "0.7.6";
+ version = "1.0.0";
src = fetchPypi {
inherit pname version;
- sha256 = "e875efd8c57c85c2d02b238239878db59ff1971f5a823457fcc69e493bf6ebfa";
+ sha256 = "159cc4e01a593706a15cd4e269a0b3345edf3aef8bf9278a57dac8adf5bf1e4a";
};
checkInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/dbus-next/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/dbus-next/default.nix
index 163a7adcb10d..216e63638501 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/dbus-next/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/dbus-next/default.nix
@@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "dbus-next";
- version = "0.1.4";
+ version = "0.2.1";
src = fetchFromGitHub {
owner = "altdesktop";
repo = "python-dbus-next";
rev = "v${version}";
- sha256 = "sha256-C/aFDHmt6Qws6ek+++wM5GRN6TEvMGMiFktKIXRdGL0=";
+ sha256 = "0c14mmysx014n1m4pi4ymi6pzxf8dkjr6fm2cmp96x05z9v90vlr";
};
checkInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/dbus/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/dbus/default.nix
index 5d1fd9ef0be4..aadf53e99255 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/dbus/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/dbus/default.nix
@@ -1,5 +1,5 @@
{ lib, fetchPypi, buildPythonPackage, python, pkgconfig, dbus, dbus-glib, isPyPy
-, ncurses, pygobject3 }:
+, ncurses, pygobject3, isPy3k }:
buildPythonPackage rec {
pname = "dbus-python";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
# It seems not to retain the dependency anyway.
++ lib.optional (! python ? modules) ncurses;
- doCheck = true;
+ doCheck = isPy3k;
checkInputs = [ dbus.out pygobject3 ];
meta = {
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/debugpy/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/debugpy/default.nix
index 52f23f437a60..75a11d8cf263 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/debugpy/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/debugpy/default.nix
@@ -18,13 +18,13 @@
buildPythonPackage rec {
pname = "debugpy";
- version = "1.0.0";
+ version = "1.2.0";
src = fetchFromGitHub {
owner = "Microsoft";
repo = pname;
rev = "v${version}";
- sha256 = "1cxwbq97n5pfmq0hji1ybbc6i1jg5bjy830dq23zqxbwxxwjx98m";
+ sha256 = "1r5w5ngipj5fgjylrmlw3jrh5y2n67n68l91sj9329549x4ww8dh";
};
patches = [
@@ -34,6 +34,11 @@ buildPythonPackage rec {
inherit gdb;
})
+ (substituteAll {
+ src = ./hardcode-version.patch;
+ inherit version;
+ })
+
# Fix importing debugpy in:
# - test_nodebug[module-launch(externalTerminal)]
# - test_nodebug[module-launch(integratedTerminal)]
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/debugpy/hardcode-version.patch b/infra/libkookie/nixpkgs/pkgs/development/python-modules/debugpy/hardcode-version.patch
new file mode 100644
index 000000000000..2879716f704d
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/debugpy/hardcode-version.patch
@@ -0,0 +1,51 @@
+diff --git a/setup.py b/setup.py
+index cfec60d..32ca206 100644
+--- a/setup.py
++++ b/setup.py
+@@ -24,7 +24,6 @@ elif "--abi" in sys.argv:
+ from setuptools import setup # noqa
+
+ sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
+-import versioneer # noqa
+
+ del sys.path[0]
+
+@@ -86,7 +85,7 @@ if __name__ == "__main__":
+ if not os.getenv("SKIP_CYTHON_BUILD"):
+ cython_build()
+
+- cmds = versioneer.get_cmdclass()
++ cmds = {}
+ cmds["bdist_wheel"] = bdist_wheel
+
+ extras = {}
+@@ -96,7 +95,7 @@ if __name__ == "__main__":
+
+ setup(
+ name="debugpy",
+- version=versioneer.get_version(),
++ version="@version@",
+ description="An implementation of the Debug Adapter Protocol for Python", # noqa
+ long_description=long_description,
+ long_description_content_type="text/markdown",
+diff --git a/src/debugpy/__init__.py b/src/debugpy/__init__.py
+index baa5a7c..5355327 100644
+--- a/src/debugpy/__init__.py
++++ b/src/debugpy/__init__.py
+@@ -27,7 +27,6 @@ __all__ = [
+ import codecs
+ import os
+
+-from debugpy import _version
+ from debugpy.common import compat
+
+
+@@ -204,7 +203,7 @@ def trace_this_thread(should_trace):
+ return api.trace_this_thread(should_trace)
+
+
+-__version__ = _version.get_versions()["version"]
++__version__ = "@version@"
+
+ # Force absolute path on Python 2.
+ __file__ = os.path.abspath(__file__)
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/deepmerge/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/deepmerge/default.nix
index 1cdf0449c68c..0d81110dee82 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/deepmerge/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/deepmerge/default.nix
@@ -3,12 +3,12 @@
buildPythonPackage rec {
pname = "deepmerge";
- version = "0.1.0";
+ version = "0.1.1";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "0d1ab9lxwymqxxd58j50id1wib48xym3ss5xw172i2jfwwwzfdrx";
+ sha256 = "fa1d44269786bcc12d30a7471b0b39478aa37a43703b134d7f12649792f92c1f";
};
propagatedBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/deform/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/deform/default.nix
index a3fd0f2b8f53..5b3a6e7281ec 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/deform/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/deform/default.nix
@@ -1,14 +1,14 @@
{ lib, buildPythonPackage, fetchPypi
, chameleon, colander, iso8601, peppercorn, translationstring, zope_deprecation
-, nose, coverage, beautifulsoup4, flaky }:
+, nose, coverage, beautifulsoup4, flaky, pyramid, pytestCheckHook }:
buildPythonPackage rec {
pname = "deform";
- version = "2.0.10";
+ version = "2.0.14";
src = fetchPypi {
inherit pname version;
- sha256 = "2f4e98a5b5bdcdfff9a62f88bd17c7ee378b7c8be61738797442eed5b961d3d2";
+ sha256 = "35d9acf144245772a70d05bd24b8263e8cd284f0d564011e8bf331d6150acfc7";
};
postPatch = ''
@@ -30,6 +30,8 @@ buildPythonPackage rec {
coverage
beautifulsoup4
flaky
+ pyramid
+ pytestCheckHook
];
meta = with lib; {
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/dependency-injector/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/dependency-injector/default.nix
index 1a90462a245f..31616f015fec 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/dependency-injector/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/dependency-injector/default.nix
@@ -9,11 +9,11 @@ in
buildPythonPackage rec {
pname = "dependency-injector";
- version = "3.30.4";
+ version = "4.5.1";
src = fetchPypi {
inherit pname version;
- sha256 = "717388a9346883eb5def3e96def7275763f2a607cac48c272f352e3834e0bd0d";
+ sha256 = "1d5d42a3547a8a8d3b7aa8f4325e5042231bbc86718c89e123c0c62c103cd9d5";
};
propagatedBuildInputs = [ six ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/devpi-common/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/devpi-common/default.nix
index ac83c0dd938d..7e2a315b413e 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/devpi-common/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/devpi-common/default.nix
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "devpi-common";
- version = "3.5.0";
+ version = "3.6.0";
src = fetchPypi {
inherit pname version;
- sha256 = "4f1eb1bf85a5dabd4f4ecc11ad99588e01cc204989a9f424c2dbe5809c6c3745";
+ sha256 = "fc14aa6b74d4d9e27dc2e9cbff000ed9be5cd723d3ac9672e66e4e8fce797227";
};
propagatedBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/dipy/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/dipy/default.nix
index a1360ada2257..51d689f98596 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/dipy/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/dipy/default.nix
@@ -9,11 +9,12 @@
, scipy
, h5py
, nibabel
+, tqdm
}:
buildPythonPackage rec {
pname = "dipy";
- version = "1.2.0";
+ version = "1.3.0";
disabled = isPy27;
@@ -21,7 +22,7 @@ buildPythonPackage rec {
owner = "dipy";
repo = pname;
rev = version;
- sha256 = "0x49lph400ndlvk419nd2g9ss4jg75xr7xh88ggv5d2ama19v7py";
+ sha256 = "0555abx0fwqmk6dc3im7r45d9j7r9xh6gm9mbwfwvlf7laf8h098";
};
nativeBuildInputs = [ cython packaging ];
@@ -30,6 +31,7 @@ buildPythonPackage rec {
scipy
h5py
nibabel
+ tqdm
];
checkInputs = [ pytest ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/discordpy/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/discordpy/default.nix
index fd31bb40a92c..e2a4625c60e4 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/discordpy/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/discordpy/default.nix
@@ -5,12 +5,11 @@
, withVoice ? true, libopus
, aiohttp
, websockets
-, pynacl
}:
buildPythonPackage rec {
pname = "discord.py";
- version = "1.3.4";
+ version = "1.5.1";
disabled = pythonOlder "3.5.3";
# only distributes wheels on pypi now
@@ -18,7 +17,7 @@ buildPythonPackage rec {
owner = "Rapptz";
repo = pname;
rev = "v${version}";
- sha256 = "1i4h6vq681x8s05wi0n3ykavsxjh9hxdxn6banwjcqzhxzkyhsxi";
+ sha256 = "1bidyclwv20p1kfphj21r5gm3kr2vxx0zd151wg7fcngbbx7gmza";
};
propagatedBuildInputs = [ aiohttp websockets ];
@@ -31,7 +30,6 @@ buildPythonPackage rec {
--replace "ctypes.util.find_library('opus')" "'${libopus}/lib/libopus.so.0'"
'';
-
# only have integration tests with discord
doCheck = false;
@@ -46,9 +44,10 @@ buildPythonPackage rec {
"discord.ext.commands.bot"
];
- meta = {
+ meta = with lib; {
description = "A python wrapper for the Discord API";
- homepage = "https://discordpy.rtfd.org/";
- license = lib.licenses.mit;
+ homepage = "https://discordpy.rtfd.org/";
+ maintainers = [ maintainers.ivar ];
+ license = licenses.mit;
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/distributed/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/distributed/default.nix
index 0267e959e5ba..f4be407fade2 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/distributed/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/distributed/default.nix
@@ -28,12 +28,12 @@
buildPythonPackage rec {
pname = "distributed";
- version = "2.30.0";
+ version = "2.30.1";
# get full repository need conftest.py to run tests
src = fetchPypi {
inherit pname version;
- sha256 = "3eb8e4173625cea6ebda2f0a079b813eeabbffd1b24584855cf063ed1cca60b3";
+ sha256 = "1421d3b84a0885aeb2c4bdc9e8896729c0f053a9375596c9de8864e055e2ac8e";
};
disabled = pythonOlder "3.6";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/distro/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/distro/default.nix
index cee4e6deb38a..baaf54dd061d 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/distro/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/distro/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
# tests are very targeted at individual linux distributions
doCheck = false;
- pythonImportcheck = [ "distro" ];
+ pythonImportsCheck = [ "distro" ];
meta = with stdenv.lib; {
homepage = "https://github.com/nir0s/distro";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/django-cors-headers/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/django-cors-headers/default.nix
index 3614114a3d4b..6dc4ad3402bc 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/django-cors-headers/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/django-cors-headers/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "django-cors-headers";
- version = "3.4.0";
+ version = "3.5.0";
src = fetchPypi {
inherit pname version;
- sha256 = "f5218f2f0bb1210563ff87687afbf10786e080d8494a248e705507ebd92d7153";
+ sha256 = "db82b2840f667d47872ae3e4a4e0a0d72fbecb42779b8aa233fa8bb965f7836a";
};
propagatedBuildInputs = [ django ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/django-haystack/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/django-haystack/default.nix
index 381624e5719e..7342aa3300c4 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/django-haystack/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/django-haystack/default.nix
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "django-haystack";
- version = "2.8.1";
+ version = "3.0";
src = fetchPypi {
inherit pname version;
- sha256 = "8b54bcc926596765d0a3383d693bcdd76109c7abb6b2323b3984a39e3576028c";
+ sha256 = "d490f920afa85471dd1fa5000bc8eff4b704daacbe09aee1a64e75cbc426f3be";
};
checkInputs = [ pysolr whoosh dateutil geopy coverage nose mock coverage requests ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/django-ipware/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/django-ipware/default.nix
index 940bd1f1cb83..6145b1266291 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/django-ipware/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/django-ipware/default.nix
@@ -2,7 +2,7 @@
buildPythonPackage rec {
pname = "django-ipware";
- version = "3.0.1";
+ version = "3.0.2";
meta = {
description = "A Django application to retrieve user's IP address";
@@ -12,7 +12,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "73a640a5bff00aa7503a35e92e462001cfabb07d73d649c262f117423beee953";
+ sha256 = "c7df8e1410a8e5d6b1fbae58728402ea59950f043c3582e033e866f0f0cf5e94";
};
propagatedBuildInputs = [ django ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/django-jinja2/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/django-jinja2/default.nix
index 97a9608cff73..13b5354e17ee 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/django-jinja2/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/django-jinja2/default.nix
@@ -4,7 +4,7 @@
buildPythonPackage rec {
pname = "django-jinja";
- version = "2.6.0";
+ version = "2.7.0";
meta = {
description = "Simple and nonobstructive jinja2 integration with Django";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "7459985c25ddb6584c6bab345761c8c5557713448e6fbb322af1b6dd7f5512bd";
+ sha256 = "d56ecddaa6d3caf508509aae5a979ebd8a3427477c34fcbcac14bf8389a21a12";
};
buildInputs = [ django pytz tox ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/django-oauth-toolkit/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/django-oauth-toolkit/default.nix
index 700fc3ae4e87..83f1049a2e56 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/django-oauth-toolkit/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/django-oauth-toolkit/default.nix
@@ -1,5 +1,5 @@
{ stdenv, buildPythonPackage, fetchFromGitHub
-, django_2_2, requests, oauthlib
+, django, requests, oauthlib
}:
buildPythonPackage rec {
@@ -13,7 +13,7 @@ buildPythonPackage rec {
sha256 = "1zbksxrcxlqnapmlvx4rgvpqc4plgnq0xnf45cjwzwi1626zs8g6";
};
- propagatedBuildInputs = [ django_2_2 requests oauthlib ];
+ propagatedBuildInputs = [ django requests oauthlib ];
# django.core.exceptions.ImproperlyConfigured: Requested setting OAUTH2_PROVIDER, but settings are not configured. You must either define the environment variable DJANGO_SETTINGS_MODULE or call settings.configure() before accessing settings
doCheck = false;
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/django-postgresql-netfields/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/django-postgresql-netfields/default.nix
index 993647c3f232..73c15850d33c 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/django-postgresql-netfields/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/django-postgresql-netfields/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "jimfunk";
- repo = "${pname}";
+ repo = pname;
rev = "v${version}";
sha256 = "1rrh38f3zl3jk5ijs6g75dxxvxygf4lczbgc7ahrgzf58g4a48lm";
};
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/django-q/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/django-q/default.nix
index a81aa2a63cd3..0755c5055a1e 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/django-q/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/django-q/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "django-q";
- version = "1.3.3";
+ version = "1.3.4";
src = fetchPypi {
inherit pname version;
- sha256 = "de7077660ede36bfdd89ab9405d6393b598bb3e0bfed61f59a0a9074cc4942bb";
+ sha256 = "523d54dcf1b66152c1b658f914f00ed3b518a3432a9decd4898738ca8dbbe10f";
};
propagatedBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/django-simple-captcha/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/django-simple-captcha/default.nix
index 51c5b26bdf27..0724bf27b317 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/django-simple-captcha/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/django-simple-captcha/default.nix
@@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "django-simple-captcha";
- version = "0.5.12";
+ version = "0.5.13";
src = fetchPypi {
inherit pname version;
- sha256 = "1g92sdgcb81r3il34pg0z210cz6wm14k00b558nshai8br1g09gw";
+ sha256 = "5e43ba3b61daf690ac0319157837bb57e31df8bddbdc9a59ef42ef1a99e21fa2";
extension = "zip";
};
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/django-storages/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/django-storages/default.nix
index cae83135a6fa..c0467bbba705 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/django-storages/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/django-storages/default.nix
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "django-storages";
- version = "1.9.1";
+ version = "1.10.1";
src = fetchPypi {
inherit pname version;
- sha256 = "148y2hyx1l4pfbqpq8hgq95fw8bhfbblwd3m5xwnhw6frcirk7m5";
+ sha256 = "652275ab7844538c462b62810276c0244866f345878256a9e0e86f5b1283ae18";
};
propagatedBuildInputs = [ django ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/django/2_2.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/django/2.nix
index 3a88f0703d06..64897890759e 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/django/2_2.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/django/2.nix
@@ -6,13 +6,13 @@
buildPythonPackage rec {
pname = "Django";
- version = "2.2.16";
+ version = "2.2.17";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "1535g2r322cl4x52fb0dmzlbg23539j2wx6027j54p22xvjlbkv2";
+ sha256 = "cf5370a4d7765a9dd6d42a7b96b53c74f9446cd38209211304b210fe0404b861";
};
patches = stdenv.lib.optional withGdal
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/django/3.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/django/3.nix
new file mode 100644
index 000000000000..c3644d6946fd
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/django/3.nix
@@ -0,0 +1,48 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, substituteAll
+, geos
+, gdal
+, asgiref
+, pytz
+, sqlparse
+, pythonOlder
+, withGdal ? false
+}:
+
+buildPythonPackage rec {
+ pname = "Django";
+ version = "3.1.4";
+
+ disabled = pythonOlder "3.7";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "edb10b5c45e7e9c0fb1dc00b76ec7449aca258a39ffd613dbd078c51d19c9f03";
+ };
+
+ patches = stdenv.lib.optional withGdal
+ (substituteAll {
+ src = ./django_3_set_geos_gdal_lib.patch;
+ geos = geos;
+ gdal = gdal;
+ extension = stdenv.hostPlatform.extensions.sharedLibrary;
+ });
+
+ propagatedBuildInputs = [
+ asgiref
+ pytz
+ sqlparse
+ ];
+
+ # too complicated to setup
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ description = "A high-level Python Web framework";
+ homepage = "https://www.djangoproject.com/";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ georgewhewell lsix ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/django/django_3_set_geos_gdal_lib.patch b/infra/libkookie/nixpkgs/pkgs/development/python-modules/django/django_3_set_geos_gdal_lib.patch
new file mode 100644
index 000000000000..6b853f8d85f0
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/django/django_3_set_geos_gdal_lib.patch
@@ -0,0 +1,24 @@
+diff -Nur a/django/contrib/gis/gdal/libgdal.py b/django/contrib/gis/gdal/libgdal.py
+--- a/django/contrib/gis/gdal/libgdal.py 2020-07-09 22:34:05.330568948 +0100
++++ b/django/contrib/gis/gdal/libgdal.py 2020-07-09 22:35:08.679095615 +0100
+@@ -14,7 +14,7 @@
+ from django.conf import settings
+ lib_path = settings.GDAL_LIBRARY_PATH
+ except (AttributeError, ImportError, ImproperlyConfigured, OSError):
+- lib_path = None
++ lib_path = "@gdal@/lib/libgdal@extension@"
+
+ if lib_path:
+ lib_names = None
+diff -Nur a/django/contrib/gis/geos/libgeos.py b/django/contrib/gis/geos/libgeos.py
+--- a/django/contrib/gis/geos/libgeos.py 2020-07-09 22:34:05.331568941 +0100
++++ b/django/contrib/gis/geos/libgeos.py 2020-07-09 22:36:24.863526276 +0100
+@@ -24,7 +24,7 @@
+ from django.conf import settings
+ lib_path = settings.GEOS_LIBRARY_PATH
+ except (AttributeError, ImportError, ImproperlyConfigured, OSError):
+- lib_path = None
++ lib_path = "@geos@/lib/libgeos_c@extension@"
+
+ # Setting the appropriate names for the GEOS-C library.
+ if lib_path:
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/django_evolution/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/django_evolution/default.nix
index eac119ef01ea..e3b7be798775 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/django_evolution/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/django_evolution/default.nix
@@ -7,12 +7,12 @@
buildPythonPackage rec {
pname = "django_evolution";
- version = "2.0";
+ version = "2.1";
disabled = isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "a0bc983657de1b0bc5c8d29ddcbf7b6fb113685bf306ccc266cf22b8a77bd862";
+ sha256 = "997efdc7f27248fd3c5e9eeccae1cfee046dfead037b171d30cbe6e91c9ca3d7";
};
propagatedBuildInputs = [ django ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/django_modelcluster/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/django_modelcluster/default.nix
index 4ded69bc3256..e41b455cd4b5 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/django_modelcluster/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/django_modelcluster/default.nix
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "django-modelcluster";
- version = "5.0.2";
+ version = "5.1";
src = fetchPypi {
inherit pname version;
- sha256 = "c7a42cf9b93d1161a10bf59919f7ee52d996a523a4134b2a136f6fe1eba7a2fa";
+ sha256 = "783d177f7bf5c8f30fe365c347b9a032920de371fe1c63d955d7b283684d4c08";
};
disabled = pythonOlder "3.5";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/django_reversion/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/django_reversion/default.nix
index 9c61cfdfe86a..9d307734367c 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/django_reversion/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/django_reversion/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "django-reversion";
- version = "3.0.7";
+ version = "3.0.8";
src = fetchPypi {
inherit pname version;
- sha256 = "72fc53580a6b538f0cfff10f27f42333f67d79c406399289c94ec5a193cfb3e1";
+ sha256 = "49e9930f90322dc6a2754dd26144285cfcc1c5bd0c1c39ca95d5602c5054ae32";
};
# tests assume the availability of a mysql/postgresql database
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/djangoql/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/djangoql/default.nix
index 0d5190aba77c..ec39f0739aeb 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/djangoql/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/djangoql/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "djangoql";
- version = "0.14.0";
+ version = "0.14.2";
src = fetchPypi {
inherit pname version;
- sha256 = "1b1f80940bb15982e06208b97d7b3d08e1d5f8fb62aa07e5e33599c7ce4c0334";
+ sha256 = "91fd65d9ee4b09092602ff05aca8a21c5a18062faf56f269a011b8e8e41483c6";
};
propagatedBuildInputs = [ ply ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix
index f4c50a711494..9fb7f882567a 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "djangorestframework_simplejwt";
- version = "4.4.0";
+ version = "4.6.0";
src = fetchPypi {
inherit pname version;
- sha256 = "c315be70aa12a5f5790c0ab9acd426c3a58eebea65a77d0893248c5144a5080c";
+ sha256 = "7adc913ba0d2ed7f46e0b9bf6e86f9bd9248f1c4201722b732b8213e0ea66f9f";
};
propagatedBuildInputs = [ django djangorestframework pyjwt ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/djangorestframework/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/djangorestframework/default.nix
index 5a2d155644a4..8d1055029b7a 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/djangorestframework/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/djangorestframework/default.nix
@@ -1,13 +1,13 @@
{ stdenv, buildPythonPackage, fetchPypi, django, isPy27 }:
buildPythonPackage rec {
- version = "3.11.1";
+ version = "3.11.2";
pname = "djangorestframework";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "6dd02d5a4bd2516fb93f80360673bf540c3b6641fec8766b1da2870a5aa00b32";
+ sha256 = "a5967b68a04e0d97d10f4df228e30f5a2d82ba63b9d03e1759f84993b7bf1b53";
};
# Test settings are missing
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/docker/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/docker/default.nix
index d46fbe991aea..7a23d17aca2a 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/docker/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/docker/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "docker";
- version = "4.3.1";
+ version = "4.4.0";
src = fetchPypi {
inherit pname version;
- sha256 = "bad94b8dd001a8a4af19ce4becc17f41b09f228173ffe6a4e0355389eef142f2";
+ sha256 = "cffc771d4ea1389fc66bc95cb72d304aa41d1a1563482a9a000fba3a84ed5071";
};
nativeBuildInputs = lib.optional isPy27 mock;
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/dockerfile-parse/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/dockerfile-parse/default.nix
index c0b14bf88ca5..e3a998126e9c 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/dockerfile-parse/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/dockerfile-parse/default.nix
@@ -1,12 +1,12 @@
{ stdenv, buildPythonPackage, fetchPypi, six, pytestcov, pytest }:
buildPythonPackage rec {
- version = "1.0.0";
+ version = "1.1.0";
pname = "dockerfile-parse";
src = fetchPypi {
inherit pname version;
- sha256 = "9ed92ede29a646094b52b8b302e477f08e63465b6ee524f5750810280143712e";
+ sha256 = "f37bfa327fada7fad6833aebfaac4a3aaf705e4cf813b737175feded306109e8";
};
postPatch = ''
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/dockerspawner/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/dockerspawner/default.nix
index 6dba529ef997..192fb94bd45a 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/dockerspawner/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/dockerspawner/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
# tests require docker
doCheck = false;
- pythonImportCheck = [ "dockerspawner" ];
+ pythonImportsCheck = [ "dockerspawner" ];
meta = with lib; {
description = "Dockerspawner: A custom spawner for Jupyterhub";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/docplex/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/docplex/default.nix
index 74ac3bbfdf39..9b32bab7d6be 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/docplex/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/docplex/default.nix
@@ -9,12 +9,12 @@
buildPythonPackage rec {
pname = "docplex";
- version = "2.15.194";
+ version = "2.18.200";
# No source available from official repo
src = fetchPypi {
inherit pname version;
- sha256 = "976e9b4e18bccbabae04149c33247a795edb1f00110f1b511c5517ac6ac353bb";
+ sha256 = "340848e67e1389b32b44d16a100aed1ebb0a6f0519b0f3cbce7cd0de6478fd6c";
};
propagatedBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/docrep/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/docrep/default.nix
index b467802b62f7..cd1971234a3b 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/docrep/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/docrep/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "docrep";
- version = "0.2.7";
+ version = "0.3.1";
src = fetchPypi {
inherit pname version;
- sha256 = "c48939ae14d79172839a5bbaf5a570add47f6cc44d2c18f6b1fac8f1c38dec4d";
+ sha256 = "ef6e7433716c0d2c59889aae8bff800b48e82d7e759dfd934b93100dc7bccaa1";
};
checkInputs = [ pytest ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/docutils/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/docutils/default.nix
index 8c1fb3720ca1..e24a00564be8 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/docutils/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/docutils/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
'';
meta = {
- description = "Docutils -- Python Documentation Utilities";
+ description = "Python Documentation Utilities";
homepage = "http://docutils.sourceforge.net/";
maintainers = with lib.maintainers; [ AndersonTorres ];
};
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/dogpile.cache/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/dogpile.cache/default.nix
index 32cb213af4f3..f36e1347be9f 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/dogpile.cache/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/dogpile.cache/default.nix
@@ -12,12 +12,12 @@
buildPythonPackage rec {
pname = "dogpile.cache";
- version = "1.0.2";
+ version = "1.1.1";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "64fda39d25b46486a4876417ca03a4af06f35bfadba9f59613f9b3d748aa21ef";
+ sha256 = "40147b19696f387415a7efaaa4cf8ea0b5d31bdd1b53e5187e75d48ddfee9f0e";
};
# Disable concurrency tests that often fail,
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/dominate/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/dominate/default.nix
index 7418eb4f9522..3f0cca295dcb 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/dominate/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/dominate/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "dominate";
- version = "2.5.2";
+ version = "2.6.0";
src = fetchPypi {
inherit pname version;
- sha256 = "456facce7a7ccfd9363948109cf1e978d48c58e46a46b01c71b4c0adc73b1928";
+ sha256 = "76ec2cde23700a6fc4fee098168b9dee43b99c2f1dd0ca6a711f683e8eb7e1e4";
};
doCheck = !isPy3k;
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/dotnetcore2/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/dotnetcore2/default.nix
deleted file mode 100644
index 7cc069707aad..000000000000
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/dotnetcore2/default.nix
+++ /dev/null
@@ -1,59 +0,0 @@
-{ stdenv, lib, buildPythonPackage, fetchPypi, python, isPy27
-, dotnet-sdk
-, substituteAll
-, distro
-, unzip
-}:
-
-buildPythonPackage rec {
- pname = "dotnetcore2";
- version = "2.1.14";
- format = "wheel";
- disabled = isPy27;
-
- src = fetchPypi {
- inherit pname version format;
- python = "py3";
- platform = "manylinux1_x86_64";
- sha256 = "0dxp9a73ncjylc09bjwq81fgj5ysk1yi27l8ka5f98121k1kmn6q";
- };
-
- nativeBuildInputs = [ unzip ];
-
- propagatedBuildInputs = [ distro ];
-
- # needed to apply patches
- prePatch = ''
- unzip dist/dotnet*
- '';
-
- patches = [
- ( substituteAll {
- src = ./runtime.patch;
- dotnet = dotnet-sdk;
- }
- )
- ];
-
- # remove bin, which has a broken dotnetcore installation
- installPhase = ''
- rm -rf dotnetcore2/bin
- mkdir -p $out/${python.sitePackages}/
- cp -r dotnetcore2 $out/${python.sitePackages}/
- '';
-
- # no tests, ensure it's one useful function works
- checkPhase = ''
- rm -r dotnetcore2 # avoid importing local directory
- export PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH
- ${python.interpreter} -c 'from dotnetcore2 import runtime; print(runtime.get_runtime_path()); runtime.ensure_dependencies()'
- '';
-
- meta = with lib; {
- description = "DotNet Core runtime";
- homepage = "https://github.com/dotnet/core";
- license = licenses.mit;
- platforms = [ "x86_64-linux" ];
- maintainers = with maintainers; [ jonringer ];
- };
-}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/dotnetcore2/runtime.patch b/infra/libkookie/nixpkgs/pkgs/development/python-modules/dotnetcore2/runtime.patch
deleted file mode 100644
index 28cf10e21d15..000000000000
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/dotnetcore2/runtime.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/dotnetcore2/runtime.py b/dotnetcore2/runtime.py
-index 475e2b4..5b578ec 100644
---- a/dotnetcore2/runtime.py
-+++ b/dotnetcore2/runtime.py
-@@ -41,6 +41,7 @@ def _get_bin_folder() -> str:
-
-
- def get_runtime_path():
-+ return "@dotnet@/dotnet"
- search_string = os.path.join(_get_bin_folder(), 'dotnet*')
- matches = [f for f in glob.glob(search_string, recursive=True)]
- return matches[0]
-@@ -96,8 +97,7 @@ class _FileLock():
-
-
- def ensure_dependencies() -> Optional[str]:
-- if dist is None:
-- return None
-+ return None
-
- bin_folder = _get_bin_folder()
- deps_path = os.path.join(bin_folder, 'deps')
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/drf-yasg/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/drf-yasg/default.nix
index 0f5f0bc56e05..1488d9382289 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/drf-yasg/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/drf-yasg/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "drf-yasg";
- version = "1.17.1";
+ version = "1.20.0";
src = fetchPypi {
inherit pname version;
- sha256 = "5572e9d5baab9f6b49318169df9789f7399d0e3c7bdac8fdb8dfccf1d5d2b1ca";
+ sha256 = "d50f197c7f02545d0b736df88c6d5cf874f8fea2507ad85ad7de6ae5bf2d9e5a";
};
nativeBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/drms/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/drms/default.nix
index bc01b46eadaf..561ec9a7a98e 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/drms/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/drms/default.nix
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "drms";
- version = "0.5.7";
+ version = "0.6.0";
src = fetchPypi {
inherit pname version;
- sha256 = "ab3ec6d072b1980f77dadf3b2cb0fe56c648eaf927ea381f606b4db66d4cbff2";
+ sha256 = "74efb903f42647ea536de0c5aea4f9a81efe027c95055ec4e72ef62479a04c89";
};
propagatedBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/dropbox/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/dropbox/default.nix
index 1898be45f822..b58d24e3fecf 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/dropbox/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/dropbox/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "dropbox";
- version = "10.6.0";
+ version = "10.10.0";
src = fetchPypi {
inherit pname version;
- sha256 = "8a7c80eb70ec677a149173154a98cf1fa461c6b0e1a1d833c90e40a735eda2cd";
+ sha256 = "df43e9e0bdcae6d610dd754a5ec72f2f91a311bbc2c8a28d076df69695b18398";
};
# Set DROPBOX_TOKEN environment variable to a valid token.
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/dulwich/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/dulwich/default.nix
index de0d6f4c3e29..fb29133da0ef 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/dulwich/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/dulwich/default.nix
@@ -4,12 +4,12 @@
, git, glibcLocales }:
buildPythonPackage rec {
- version = "0.20.5";
+ version = "0.20.14";
pname = "dulwich";
src = fetchPypi {
inherit pname version;
- sha256 = "98484ede022da663c96b54bc8dcdb4407072cb50efd5d20d58ca4e7779931305";
+ sha256 = "21d6ee82708f7c67ce3fdcaf1f1407e524f7f4f7411a410a972faa2176baec0d";
};
LC_ALL = "en_US.UTF-8";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/easy-thumbnails/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/easy-thumbnails/default.nix
index cd2001493206..f2be7b1903da 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/easy-thumbnails/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/easy-thumbnails/default.nix
@@ -4,7 +4,7 @@
buildPythonPackage rec {
pname = "easy-thumbnails";
- version = "2.7";
+ version = "2.7.1";
meta = {
description = "Easy thumbnails for Django";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "e4e7a0dd4001f56bfd4058428f2c91eafe27d33ef3b8b33ac4e013b159b9ff91";
+ sha256 = "f862949208d9066cd3d84ffcf9c2dbe9c7344ea6152b741e440f861eca46855c";
};
propagatedBuildInputs = [ django pillow ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/ecdsa/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/ecdsa/default.nix
index 0f224bd8ab0b..1d2a780bbbbd 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/ecdsa/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/ecdsa/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "ecdsa";
- version = "0.15";
+ version = "0.16.1";
src = fetchPypi {
inherit pname version;
- sha256 = "8f12ac317f8a1318efa75757ef0a651abe12e51fc1af8838fb91079445227277";
+ sha256 = "cfc046a2ddd425adbd1a78b3c46f0d1325c657811c0f45ecc3a0a6236c1e50ff";
};
propagatedBuildInputs = [ six ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/ecpy/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/ecpy/default.nix
index 153fcd08d25a..37bbb183ff40 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/ecpy/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/ecpy/default.nix
@@ -2,18 +2,24 @@
buildPythonPackage rec {
pname = "ECPy";
- version = "1.2.3";
+ version = "1.2.5";
src = fetchPypi {
inherit pname version;
- sha256 = "6dd09f8cda5a1d673228ff9ef41aea8f036ee5ef3183198de83c14957d68c3e0";
+ sha256 = "9635cffb9b6ecf7fd7f72aea1665829ac74a1d272006d0057d45a621aae20228";
};
+ prePatch = ''
+ sed -i "s|reqs.append('future')|pass|" setup.py
+ '';
+
propagatedBuildInputs = lib.optional (!isPy3k) future;
# No tests implemented
doCheck = false;
+ pythonImportsCheck = [ "ecpy" ];
+
meta = with lib; {
description = "Pure Pyhton Elliptic Curve Library";
homepage = "https://github.com/ubinity/ECPy";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/elasticsearch-dsl/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/elasticsearch-dsl/default.nix
index 68d658f4989e..06c4e4045ce1 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/elasticsearch-dsl/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/elasticsearch-dsl/default.nix
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "elasticsearch-dsl";
- version = "7.2.1";
+ version = "7.3.0";
src = fetchPypi {
inherit pname version;
- sha256 = "1e345535164cb684de4b825e1d0daf81b75554b30d3905446584a9e4af0cc3e7";
+ sha256 = "0ed75f6ff037e36b2397a8e92cae0ddde79b83adc70a154b8946064cb62f7301";
};
propagatedBuildInputs = [ elasticsearch python-dateutil six ]
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/elasticsearch/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/elasticsearch/default.nix
index 38522b233d4c..573b01d23954 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/elasticsearch/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/elasticsearch/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage (rec {
pname = "elasticsearch";
- version = "7.9.1";
+ version = "7.10.0";
src = fetchPypi {
inherit pname version;
- sha256 = "5e08776fbb30c6e92408c7fa8c37d939210d291475ae2f364f0497975918b6fe";
+ sha256 = "9053ca99bc9db84f5d80e124a79a32dfa0f7079b2112b546a03241c0dbeda36d";
};
# Check is disabled because running them destroy the content of the local cluster!
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/elementpath/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/elementpath/default.nix
index 53324f94c89d..9b9597c98bef 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/elementpath/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/elementpath/default.nix
@@ -1,7 +1,7 @@
{ lib, buildPythonPackage, fetchFromGitHub, isPy27 }:
buildPythonPackage rec {
- version = "2.0.3";
+ version = "2.0.4";
pname = "elementpath";
disabled = isPy27; # uses incompatible class syntax
@@ -9,7 +9,7 @@ buildPythonPackage rec {
owner = "sissaschool";
repo = "elementpath";
rev = "v${version}";
- sha256 = "16gs5glnlr4i41xbmd30x62zj85apmf69m9akvfnka0gkjlzv8in";
+ sha256 = "0812il5xn7cq0qa0vmkszrvprakfpyxmilk7s918l9kavdy4al8x";
};
# avoid circular dependency with xmlschema which directly depends on this
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/email-validator/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/email-validator/default.nix
index 215584aa8cdb..5d9f0ca88fa6 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/email-validator/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/email-validator/default.nix
@@ -1,12 +1,12 @@
{ lib, buildPythonPackage, fetchPypi, isPy3k, dnspython, idna, ipaddress }:
buildPythonPackage rec {
- pname = "email_validator";
- version = "1.1.1";
+ pname = "email-validator";
+ version = "1.1.2";
src = fetchPypi {
inherit pname version;
- sha256 = "63094045c3e802c3d3d575b18b004a531c36243ca8d1cec785ff6bfcb04185bb";
+ sha256 = "1a13bd6050d1db4475f13e444e169b6fe872434922d38968c67cea9568cce2f0";
};
doCheck = false;
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/emv/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/emv/default.nix
new file mode 100644
index 000000000000..6dfe39f8b6b1
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/emv/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub
+, click, enum-compat, pyscard, pycountry, terminaltables
+, pytestCheckHook, pythonOlder
+}:
+
+buildPythonPackage rec {
+ pname = "emv";
+ version = "1.0.11";
+ disabled = pythonOlder "3.4";
+
+ src = fetchFromGitHub {
+ owner = "russss";
+ repo = "python-emv";
+ rev = "v${version}";
+ hash = "sha256:1715hcba3fdi0i5awnrjdjnk74p66sxm9349pd8bb717zrh4gpj7";
+ };
+
+ checkInputs = [ pytestCheckHook ];
+ propagatedBuildInputs = [
+ enum-compat
+ click
+ pyscard
+ pycountry
+ terminaltables
+ ];
+
+ # argparse is part of the standardlib
+ prePatch = ''
+ substituteInPlace setup.py \
+ --replace '"argparse==1.4.0",' ""
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/russss/python-emv";
+ description = "Implementation of the EMV chip-and-pin smartcard protocol";
+ license = licenses.mit;
+ maintainers = with maintainers; [ lukegb ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/enamlx/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/enamlx/default.nix
index a9cfafa020e2..344000fa118e 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/enamlx/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/enamlx/default.nix
@@ -17,6 +17,12 @@ buildPythonPackage rec {
sha256 = "1rlrx3cw6h1zl9svnqbzwdfy8469qa1y7w6576lbhdwpfhpipscy";
};
+ patches = [
+ # Minimally modified version of https://github.com/frmdstryr/enamlx/commit/16df11227b8cee724624541d274e481802ea67e3
+ # (without the change to setup.py), already on master and expected in the first post-0.4.3 release
+ ./replace-unicode-with-str.patch
+ ];
+
propagatedBuildInputs = [
enaml
# Until https://github.com/inkcut/inkcut/issues/105 perhaps
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/enamlx/replace-unicode-with-str.patch b/infra/libkookie/nixpkgs/pkgs/development/python-modules/enamlx/replace-unicode-with-str.patch
new file mode 100644
index 000000000000..52df6e9a50e6
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/enamlx/replace-unicode-with-str.patch
@@ -0,0 +1,274 @@
+From 16df11227b8cee724624541d274e481802ea67e3 Mon Sep 17 00:00:00 2001
+From: frmdstryr <frmdstryr@protonmail.com>
+Date: Tue, 3 Nov 2020 21:41:52 -0500
+Subject: [PATCH] Replace Unicode with Str
+
+---
+ enamlx/widgets/abstract_item.py | 4 ++--
+ enamlx/widgets/console.py | 4 ++--
+ enamlx/widgets/graphics_view.py | 8 ++++----
+ enamlx/widgets/plot_area.py | 14 +++++++-------
+ examples/occ_viewer/advanced.enaml | 12 ++++++------
+ examples/occ_viewer/occ/part.py | 6 +++---
+ examples/plot_area/plot_area.enaml | 2 +-
+ examples/table_view/table_view.enaml | 6 +++---
+ examples/tree_view/tree_view.enaml | 6 +++---
+ setup.py | 2 +-
+ 10 files changed, 32 insertions(+), 32 deletions(-)
+
+diff --git a/enamlx/widgets/abstract_item.py b/enamlx/widgets/abstract_item.py
+index 29a3d87..67a5c6e 100644
+--- a/enamlx/widgets/abstract_item.py
++++ b/enamlx/widgets/abstract_item.py
+@@ -6,7 +6,7 @@
+ Created on Aug 24, 2015
+ """
+ from atom.api import (
+- Int, Enum, Bool, Unicode, Typed,
++ Int, Enum, Bool, Str, Typed,
+ Coerced, Event, Property, ForwardInstance, observe
+ )
+ from enaml.icon import Icon
+@@ -96,7 +96,7 @@ class AbstractWidgetItem(AbstractWidgetItemGroup):
+ column = d_(Int(), writable=False)
+
+ #: Text to display within the cell
+- text = d_(Unicode())
++ text = d_(Str())
+
+ #: Text alignment within the cell
+ text_alignment = d_(Enum(*[(h, v)
+diff --git a/enamlx/widgets/console.py b/enamlx/widgets/console.py
+index bc61e90..2f1e981 100644
+--- a/enamlx/widgets/console.py
++++ b/enamlx/widgets/console.py
+@@ -7,7 +7,7 @@
+ """
+
+ from atom.api import (
+- Instance, Coerced, Int, Enum, Unicode, Dict, Bool,
++ Instance, Coerced, Int, Enum, Str, Dict, Bool,
+ Typed, ForwardTyped, observe
+ )
+ from enaml.core.api import d_
+@@ -47,7 +47,7 @@ class Console(Container):
+ proxy = Typed(ProxyConsole)
+
+ #: Font family, leave blank for default
+- font_family = d_(Unicode())
++ font_family = d_(Str())
+
+ #: Font size, leave 0 for default
+ font_size = d_(Int(0))
+diff --git a/enamlx/widgets/graphics_view.py b/enamlx/widgets/graphics_view.py
+index f7e3e47..e672c63 100644
+--- a/enamlx/widgets/graphics_view.py
++++ b/enamlx/widgets/graphics_view.py
+@@ -7,7 +7,7 @@
+ import sys
+ from atom.api import (
+ Atom, Float, Int, Typed, Bool, Coerced, ForwardTyped, Enum, List, IntEnum,
+- Instance, Unicode, Value, Event, Property, observe, set_default
++ Instance, Str, Value, Event, Property, observe, set_default
+ )
+ from enaml.colors import ColorMember
+ from enaml.core.declarative import d_, d_func
+@@ -419,10 +419,10 @@ class GraphicsItem(ToolkitObject, ConstrainableMixin):
+ visible = d_(Bool(True))
+
+ #: Tool tip
+- tool_tip = d_(Unicode())
++ tool_tip = d_(Str())
+
+ #: Status tip
+- status_tip = d_(Unicode())
++ status_tip = d_(Str())
+
+ # --------------------------------------------------------------------------
+ # Item interaction
+@@ -919,7 +919,7 @@ class GraphicsTextItem(AbstractGraphicsShapeItem):
+ proxy = Typed(ProxyGraphicsTextItem)
+
+ #: Text
+- text = d_(Unicode())
++ text = d_(Str())
+
+ #: Font
+ font = d_(FontMember())
+diff --git a/enamlx/widgets/plot_area.py b/enamlx/widgets/plot_area.py
+index 5136693..383957b 100644
+--- a/enamlx/widgets/plot_area.py
++++ b/enamlx/widgets/plot_area.py
+@@ -8,7 +8,7 @@
+ import sys
+ from atom.atom import set_default
+ from atom.api import (Callable, Int, Tuple, Instance, Enum, Float,
+- ContainerList, Bool, FloatRange, Unicode, Dict, Typed,
++ ContainerList, Bool, FloatRange, Str, Dict, Typed,
+ ForwardTyped, observe)
+ from enaml.core.declarative import d_
+ from enaml.widgets.api import Container
+@@ -41,10 +41,10 @@ class PlotArea(Container):
+
+ class PlotItem(Control):
+ #: Title of data series
+- title = d_(Unicode())
++ title = d_(Str())
+
+ #: Name
+- name = d_(Unicode())
++ name = d_(Str())
+
+ #: Row in plot area
+ row = d_(Int(0))
+@@ -89,10 +89,10 @@ class PlotItem(Control):
+ #: Show legend
+ show_legend = d_(Bool(False))
+
+- label_left = d_(Unicode())
+- label_right = d_(Unicode())
+- label_top = d_(Unicode())
+- label_bottom = d_(Unicode())
++ label_left = d_(Str())
++ label_right = d_(Str())
++ label_top = d_(Str())
++ label_bottom = d_(Str())
+
+ # H, V
+ grid = d_(Tuple(bool, default=(False, False)))
+diff --git a/examples/occ_viewer/advanced.enaml b/examples/occ_viewer/advanced.enaml
+index 872d44d..f1c48d5 100644
+--- a/examples/occ_viewer/advanced.enaml
++++ b/examples/occ_viewer/advanced.enaml
+@@ -15,7 +15,7 @@ is then used to unroll a list of these controls into the body of a form.
+
+ << autodoc-me >>
+ """
+-from atom.api import Atom, Bool, Enum, Event, Float, Int, Str, Unicode
++from atom.api import Atom, Bool, Enum, Event, Float, Int, Str, Str
+
+ from enaml.core.api import DynamicTemplate
+ from enaml.stdlib.fields import FloatField
+@@ -73,8 +73,8 @@ template FormControl(Attr, MemberType: Str):
+ text :: setattr(model, Attr, str(text))
+
+
+-template FormControl(Attr, MemberType: Unicode):
+- """ A form control template specialization for Unicode members.
++template FormControl(Attr, MemberType: Str):
++ """ A form control template specialization for Str members.
+
+ This control uses a Field to represent the value.
+
+@@ -174,7 +174,7 @@ def form_spec(obtype, model):
+
+ typemap = {int:Int,
+ float:Float,
+- unicode:Unicode,
++ unicode:Str,
+ str:Str}
+ for name, member in obtype.members().iteritems():
+ if (not name.startswith('_')
+@@ -263,14 +263,14 @@ class FooModel(Atom):
+ ham = Int(42)
+ first = Str('first')
+ last = Str('last')
+- owner = Unicode('owner')
++ owner = Str('owner')
+ time = Float(42.56)
+ click = Bool()
+ clack = Bool()
+
+
+ class BarModel(Atom):
+- name = Unicode('name')
++ name = Str('name')
+ trigger = Event()
+ choices = Enum('first', 'second', 'third')
+ def _observe_trigger(self, change):
+diff --git a/examples/occ_viewer/occ/part.py b/examples/occ_viewer/occ/part.py
+index 1fe2b85..144354f 100644
+--- a/examples/occ_viewer/occ/part.py
++++ b/examples/occ_viewer/occ/part.py
+@@ -5,7 +5,7 @@
+ '''
+
+ from atom.api import (
+- Typed, ForwardTyped, Unicode
++ Typed, ForwardTyped, Str
+ )
+ from enaml.core.declarative import d_
+
+@@ -26,10 +26,10 @@ class Part(ToolkitObject):
+ proxy = Typed(ProxyPart)
+
+ #: Optional name of the part
+- name = d_(Unicode())
++ name = d_(Str())
+
+ #: Optional description of the part
+- description = d_(Unicode())
++ description = d_(Str())
+
+ @property
+ def shapes(self):
+diff --git a/examples/plot_area/plot_area.enaml b/examples/plot_area/plot_area.enaml
+index 2085c8f..b5cd3c4 100644
+--- a/examples/plot_area/plot_area.enaml
++++ b/examples/plot_area/plot_area.enaml
+@@ -2,7 +2,7 @@
+ Demonstrating the examples from pyqtgraph
+ """
+
+-from atom.api import (Atom, Unicode, Range, List, Bool)
++from atom.api import (Atom, Str, Range, List, Bool)
+
+ from enaml.widgets.api import (
+ Window, Container, DockArea,DockItem,PushButton, CheckBox, RadioButton
+diff --git a/examples/table_view/table_view.enaml b/examples/table_view/table_view.enaml
+index 6d7a35e..6fef544 100644
+--- a/examples/table_view/table_view.enaml
++++ b/examples/table_view/table_view.enaml
+@@ -2,7 +2,7 @@ import os
+ import time
+ import random
+ from threading import Thread
+-from atom.api import (Atom, Unicode, Range, ContainerList, Bool)
++from atom.api import (Atom, Str, Range, ContainerList, Bool)
+
+ from enamlx.widgets.table_view import (
+ TableView, TableViewRow, TableViewItem
+@@ -38,9 +38,9 @@ class Person(Atom):
+ """ A simple class representing a person object.
+
+ """
+- last_name = Unicode()
++ last_name = Str()
+
+- first_name = Unicode()
++ first_name = Str()
+
+ age = Range(low=0)
+
+diff --git a/examples/tree_view/tree_view.enaml b/examples/tree_view/tree_view.enaml
+index 37f991f..e88e1fd 100644
+--- a/examples/tree_view/tree_view.enaml
++++ b/examples/tree_view/tree_view.enaml
+@@ -1,5 +1,5 @@
+ import os
+-from atom.api import (Atom, Unicode, Range, List, Bool, ForwardInstance)
++from atom.api import (Atom, Str, Range, List, Bool, ForwardInstance)
+
+ from enamlx.widgets.api import (
+ TreeView, TreeViewItem, TreeViewColumn,
+@@ -33,9 +33,9 @@ class Person(Atom):
+ """ A simple class representing a person object.
+
+ """
+- last_name = Unicode()
++ last_name = Str()
+
+- first_name = Unicode()
++ first_name = Str()
+
+ children = List(ForwardInstance(lambda:Person))
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/eradicate/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/eradicate/default.nix
index 18a7a9ab27f1..45f0599ea2d7 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/eradicate/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/eradicate/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "eradicate";
- version = "1.0";
+ version = "2.0.0";
src = fetchPypi {
inherit pname version;
- sha256 = "06nhs8wml5f5k96gbq7jl417bmsqnxy8aykpzbzrvm3gmqmaizag";
+ sha256 = "27434596f2c5314cc9b31410c93d8f7e8885747399773cd088d3adea647a60c8";
};
meta = with lib; {
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/eve/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/eve/default.nix
index aca872975060..c50cc2aeb827 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/eve/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/eve/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "Eve";
- version = "1.1.3";
+ version = "1.1.4";
src = fetchPypi {
inherit pname version;
- sha256 = "ef335d13b798bc901636643f11455bab8b8698ddfe3a0b67bc251af1fd809b21";
+ sha256 = "3a057277bba7144a0c15ab8c737dc8a1002e87e7284847aa011ce122e353418e";
};
propagatedBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/eventlet/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/eventlet/default.nix
index abd279d6c33c..5eb3efe6009a 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/eventlet/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/eventlet/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "eventlet";
- version = "0.28.0";
+ version = "0.29.1";
src = fetchPypi {
inherit pname version;
- sha256 = "9c7c63e8a80c7d02d692b2cf308312402fa4777335fd3de5da45097383301ff3";
+ sha256 = "9faff63631b01277c463ae91cd4ab3f25a2f0f5abe3219d43a386ef1daa6159a";
};
propagatedBuildInputs = [ dnspython greenlet monotonic six ]
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/events/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/events/default.nix
index 21c459d62b95..6fe355d9c4d8 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/events/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/events/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "Events";
- version = "0.3";
+ version = "0.4";
src = fetchPypi {
inherit pname version;
- sha256 = "f4d9c41a5c160ce504278f219fe56f44242ca63794a0ad638b52d1e087ac2a41";
+ sha256 = "01d9dd2a061f908d74a89fa5c8f07baa694f02a2a5974983663faaf7a97180f5";
};
meta = with lib; {
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/executor/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/executor/default.nix
index 3e14074f186c..610d9b0b096c 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/executor/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/executor/default.nix
@@ -2,14 +2,14 @@
buildPythonPackage rec {
pname = "executor";
- version = "23.1";
+ version = "23.2";
disabled = isPy27;
src = fetchFromGitHub {
owner = "xolox";
repo = "python-executor";
rev = version;
- sha256 = "1jfmagw126di0qd82bydwvryqcxc54pqja3rbx3ny3fv1ahi5s7k";
+ sha256 = "1mr0662c5l5zx0wjapcprp8p2xawfd0im3616df5sgv79fqzwfqs";
};
propagatedBuildInputs = [ coloredlogs property-manager fasteners ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/exifread/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/exifread/default.nix
index f62655055842..3c7b814a3c83 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/exifread/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/exifread/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "ExifRead";
- version = "2.3.1";
+ version = "2.3.2";
src = fetchPypi {
inherit pname version;
- sha256 = "269ff3a8eab8e082734a076182cce6fb126116619c0b7c2009bea34502cca213";
+ sha256 = "a0f74af5040168d3883bbc980efe26d06c89f026dc86ba28eb34107662d51766";
};
meta = with stdenv.lib; {
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/fabulous/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/fabulous/default.nix
new file mode 100644
index 000000000000..6079f22020a2
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/fabulous/default.nix
@@ -0,0 +1,39 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pillow
+, python
+}:
+
+buildPythonPackage rec {
+ pname = "fabulous";
+ version = "0.3.0";
+
+ src = fetchFromGitHub {
+ owner = "jart";
+ repo = pname;
+ rev = version;
+ sha256 = "0yxdaz6yayp1a57kdb2i8q7kwwdlwy4a3d0lr012h2ji9m89c8q7";
+ };
+
+ patches = [
+ ./relative_import.patch
+ ];
+
+ propagatedBuildInputs = [
+ pillow
+ ];
+
+ checkPhase = ''
+ for i in tests/*.py; do
+ ${python.interpreter} $i
+ done
+ '';
+
+ meta = with lib; {
+ description = "Make the output of terminal applications look fabulous";
+ homepage = "https://jart.github.io/fabulous";
+ license = licenses.asl20;
+ maintainers = [ maintainers.symphorien ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/fabulous/relative_import.patch b/infra/libkookie/nixpkgs/pkgs/development/python-modules/fabulous/relative_import.patch
new file mode 100644
index 000000000000..b12e3d9a7863
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/fabulous/relative_import.patch
@@ -0,0 +1,27 @@
+diff --git a/fabulous/prompt.py b/fabulous/prompt.py
+index 531176f..e395ab4 100644
+--- a/fabulous/prompt.py
++++ b/fabulous/prompt.py
+@@ -18,8 +18,7 @@
+ import sys
+ import os
+ import os.path
+-import term
+-from term import stdout, stderr, display
++from .term import stdout, stderr, display
+
+ __all__ = ["input_object","query","file_chooser"]
+
+diff --git a/fabulous/widget.py b/fabulous/widget.py
+index 31a2547..7ad889a 100644
+--- a/fabulous/widget.py
++++ b/fabulous/widget.py
+@@ -24,7 +24,7 @@ import os
+ import math
+ from datetime import datetime
+ # import textwrap
+-from term import stdout, display
++from .term import stdout, display
+
+ class ProgressBar(object):
+ """A 3-line progress bar, which looks like::
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/factory_boy/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/factory_boy/default.nix
index 052551a4727c..a953632f9fd7 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/factory_boy/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/factory_boy/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "factory_boy";
- version = "3.0.1";
+ version = "3.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "2ce2f665045d9f15145a6310565fcb8255d52fc6fd867f3b783b3ac3de6cf10e";
+ sha256 = "ded73e49135c24bd4d3f45bf1eb168f8d290090f5cf4566b8df3698317dc9c08";
};
propagatedBuildInputs = [ faker ] ++ lib.optionals isPy27 [ ipaddress ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/faker/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/faker/default.nix
index 102f506b6a69..abdb0f583941 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/faker/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/faker/default.nix
@@ -1,41 +1,44 @@
{ lib, buildPythonPackage, fetchPypi, pythonOlder,
- # Build inputs
- dateutil, six, text-unidecode, ipaddress ? null
- # Test inputs
- , email_validator
- , freezegun
- , mock
- , more-itertools
- , pytest
- , pytestrunner
- , random2
- , ukpostcodeparser
- , validators
+# Build inputs
+dateutil, six, text-unidecode, ipaddress ? null
+# Test inputs
+, email_validator
+, freezegun
+, mock
+, more-itertools
+, pytestCheckHook
+, pytestrunner
+, ukpostcodeparser
+, validators
}:
assert pythonOlder "3.3" -> ipaddress != null;
buildPythonPackage rec {
pname = "Faker";
- version = "4.1.2";
+ version = "4.18.0";
src = fetchPypi {
inherit pname version;
- sha256 = "ff188c416864e3f7d8becd8f9ee683a4b4101a2a2d2bcdcb3e84bb1bdd06eaae";
+ sha256 = "0raxw6mgvf9523v7917zqw76vqnpp0d6v3i310qnjnhpxmm78yb2";
};
nativeBuildInputs = [ pytestrunner ];
checkInputs = [
email_validator
freezegun
- pytest
- random2
+ pytestCheckHook
ukpostcodeparser
validators
]
++ lib.optionals (pythonOlder "3.3") [ mock ]
++ lib.optionals (pythonOlder "3.0") [ more-itertools ];
+ # avoid tests which import random2, an abandoned library
+ pytestFlagsArray = [
+ "--ignore=tests/providers/test_ssn.py"
+ ];
+
propagatedBuildInputs = [
dateutil
six
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/fastecdsa/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/fastecdsa/default.nix
new file mode 100644
index 000000000000..04d9da87c5c1
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/fastecdsa/default.nix
@@ -0,0 +1,40 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, gmp
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+ pname = "fastecdsa";
+ version = "2.1.5";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "d0772f7fe243e8a82d33e95c542ea6cc0ef7f3cfcced7440d6defa71a35addfa";
+ };
+
+ buildInputs = [ gmp ];
+
+ checkInputs = [ pytestCheckHook ];
+
+ # skip tests which require being online to download test vectors
+ pytestFlags = [
+ "--ignore=fastecdsa/tests/test_wycheproof_vectors.py"
+ "--ignore=fastecdsa/tests/test_rfc6979_ecdsa.py"
+ ];
+
+ # skip tests for now, they fail with
+ # ImportError: cannot import name '_ecdsa' from 'fastecdsa'
+ # but the installed package works just fine
+ doCheck = false;
+
+ pythonImportsCheck = [ "fastecdsa" ];
+
+ meta = with lib; {
+ description = "Fast elliptic curve digital signatures";
+ homepage = "https://github.com/AntonKueltz/fastecdsa";
+ license = licenses.unlicense;
+ maintainers = with maintainers; [ prusnak ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/fastjsonschema/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/fastjsonschema/default.nix
index b49f31e40221..34eb0a158d97 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/fastjsonschema/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/fastjsonschema/default.nix
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "fastjsonschema";
- version = "2.14.4";
+ version = "2.14.5";
disabled = pythonOlder "3.3";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
repo = "python-fastjsonschema";
rev = "v${version}";
fetchSubmodules = true;
- sha256 = "0c3q31lqzrc52gacnqc271k5952qbyl0z4kagsqvl7fiwk84hqlz";
+ sha256 = "1hgzafswdw5zqrd8qhdxa43crzfy7lrlifdn90133a0h3psr7qs1";
};
checkInputs = [ pytestCheckHook ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/fastprogress/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/fastprogress/default.nix
new file mode 100644
index 000000000000..a542b5805653
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/fastprogress/default.nix
@@ -0,0 +1,32 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, numpy
+, pytest
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+ pname = "fastprogress";
+ version = "1.0.0";
+ disabled = pythonOlder "3.6";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1zhv37q6jkqd1pfhlkd4yzrc3dg83vyksgzf32mjlhd5sb0qmql9";
+ };
+
+ propagatedBuildInputs = [ numpy ];
+
+ # no real tests
+ doCheck = false;
+ pythonImportsCheck = [ "fastprogress" ];
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/fastai/fastprogress";
+ description = "Simple and flexible progress bar for Jupyter Notebook and console";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ ris ];
+ };
+
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/feedparser/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/feedparser/default.nix
index c36fd2b19437..55ed8d7f6e7c 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/feedparser/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/feedparser/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "feedparser";
- version = "5.2.1";
+ version = "6.0.2";
src = fetchPypi {
inherit pname version;
- sha256 = "1ycva69bqssalhqg45rbrfipz3l6hmycszy26k0351fhq990c0xx";
+ sha256 = "1b00a105425f492f3954fd346e5b524ca9cef3a4bbf95b8809470e9857aa1074";
};
# lots of networking failures
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/fiona/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/fiona/default.nix
index cd4ed57d792c..0e90bb10f956 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/fiona/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/fiona/default.nix
@@ -1,16 +1,16 @@
{ stdenv, lib, buildPythonPackage, fetchPypi, isPy3k, pythonOlder
, attrs, click, cligj, click-plugins, six, munch, enum34
-, pytest, boto3, mock, giflib
+, pytest, boto3, mock, giflib, pytz
, gdal_2 # can't bump to 3 yet, https://github.com/Toblerity/Fiona/issues/745
}:
buildPythonPackage rec {
pname = "Fiona";
- version = "1.8.13.post1";
+ version = "1.8.18";
src = fetchPypi {
inherit pname version;
- sha256 = "00366f2j21b5r4r8310sadf7jjhdr44s0381dhjqkw2nzpwjnhqs";
+ sha256 = "b732ece0ff8886a29c439723a3e1fc382718804bb057519d537a81308854967a";
};
CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11";
@@ -30,6 +30,7 @@ buildPythonPackage rec {
click-plugins
six
munch
+ pytz
] ++ lib.optional (!isPy3k) enum34;
checkInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/flake8-debugger/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/flake8-debugger/default.nix
index 81b903621b52..46c63ec00085 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/flake8-debugger/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/flake8-debugger/default.nix
@@ -1,26 +1,23 @@
-{ lib, fetchPypi, buildPythonPackage, pythonOlder
+{ lib, fetchPypi, buildPythonPackage, pythonOlder, pythonAtLeast, isPy27
, flake8
-, importlib-metadata
, pycodestyle
-, pytestrunner
-, pytest
+, six
+, pytestCheckHook
}:
buildPythonPackage rec {
pname = "flake8-debugger";
- version = "3.2.1";
+ version = "4.0.0";
+ disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "712d7c1ff69ddf3f0130e94cc88c2519e720760bce45e8c330bfdcb61ab4090d";
+ sha256 = "e43dc777f7db1481db473210101ec2df2bd39a45b149d7218a618e954177eda6";
};
- nativeBuildInputs = [ pytestrunner ];
+ propagatedBuildInputs = [ flake8 pycodestyle six ];
- propagatedBuildInputs = [ flake8 pycodestyle ]
- ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
-
- checkInputs = [ pytest ];
+ checkInputs = [ pytestCheckHook ];
# Tests not included in PyPI tarball
# FIXME: Remove when https://github.com/JBKahn/flake8-debugger/pull/15 is merged
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/flake8/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/flake8/default.nix
index e44aac202cf4..a369919b98fb 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/flake8/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/flake8/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "flake8";
- version = "3.8.3";
+ version = "3.8.4";
src = fetchPypi {
inherit pname version;
- sha256 = "f04b9fcbac03b0a3e58c0ab3a0ecc462e023a9faf046d57794184028123aa208";
+ sha256 = "aadae8761ec651813c24be05c6f7b4680857ef6afaae4651a4eccaef97ce6c3b";
};
checkInputs = [ pytest mock pytestrunner ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/flask-autoindex/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/flask-autoindex/default.nix
index 26b6977116fd..fff8859e86e0 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/flask-autoindex/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/flask-autoindex/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
The result is just like mod_autoindex, but the look is more awesome!
'';
license = licenses.bsd2;
- maintainers = with maintainers; [ timokau ];
+ maintainers = teams.sage.members;
homepage = "https://pythonhosted.org/Flask-AutoIndex/";
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/flask-babel/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/flask-babel/default.nix
index 2d542411fa23..0eb9f61d697f 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/flask-babel/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/flask-babel/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "Flask-Babel";
- version = "1.0.0";
+ version = "2.0.0";
src = fetchPypi {
inherit pname version;
- sha256 = "0gmb165vkwv5v7dxsxa2i3zhafns0fh938m2zdcrv4d8z5l099yn";
+ sha256 = "f9faf45cdb2e1a32ea2ec14403587d4295108f35017a7821a2b1acb8cfd9257d";
};
propagatedBuildInputs = [
@@ -38,7 +38,7 @@ buildPythonPackage rec {
installed automatically for you if you install this library.
'';
license = licenses.bsd2;
- maintainers = with maintainers; [ timokau ];
+ maintainers = teams.sage.members;
homepage = "https://github.com/python-babel/flask-babel";
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/flask-compress/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/flask-compress/default.nix
index cf9abdc596ab..fe55705bb521 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/flask-compress/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/flask-compress/default.nix
@@ -3,12 +3,12 @@
}:
buildPythonPackage rec {
- version = "1.5.0";
+ version = "1.8.0";
pname = "Flask-Compress";
src = fetchPypi {
inherit pname version;
- sha256 = "f367b2b46003dd62be34f7fb1379938032656dca56377a9bc90e7188e4289a7c";
+ sha256 = "c132590e7c948877a96d675c13cbfa64edec0faafa2381678dea6f36aa49a552";
};
propagatedBuildInputs = [ flask brotli ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/flask-cors/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/flask-cors/default.nix
index e20d213029c0..da61365e3ae8 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/flask-cors/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/flask-cors/default.nix
@@ -1,16 +1,16 @@
{ stdenv, fetchPypi, buildPythonPackage
-, nose, flask, six }:
+, nose, flask, six, packaging }:
buildPythonPackage rec {
pname = "Flask-Cors";
- version = "3.0.8";
+ version = "3.0.9";
src = fetchPypi {
inherit pname version;
- sha256 = "05id72xwvhni23yasdvpdd8vsf3v4j6gzbqqff2g04j6xcih85vj";
+ sha256 = "6bcfc100288c5d1bcb1dbb854babd59beee622ffd321e444b05f24d6d58466b8";
};
- checkInputs = [ nose ];
+ checkInputs = [ nose packaging ];
propagatedBuildInputs = [ flask six ];
# Exclude test_acl_uncaught_exception_500 test case because is not compatible
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/flask-httpauth/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/flask-httpauth/default.nix
index ad3e42876d0f..e5d55a2b9b5f 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/flask-httpauth/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/flask-httpauth/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "Flask-HTTPAuth";
- version = "4.1.0";
+ version = "4.2.0";
src = fetchPypi {
inherit pname version;
- sha256 = "9e028e4375039a49031eb9ecc40be4761f0540476040f6eff329a31dabd4d000";
+ sha256 = "8c7e49e53ce7dc14e66fe39b9334e4b7ceb8d0b99a6ba1c3562bb528ef9da84a";
};
propagatedBuildInputs = [ flask ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/flask-jwt-extended/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/flask-jwt-extended/default.nix
index bc1e2778e193..4d45343c2658 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/flask-jwt-extended/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/flask-jwt-extended/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "Flask-JWT-Extended";
- version = "3.24.1";
+ version = "3.25.0";
src = fetchPypi {
inherit pname version;
- sha256 = "1p8rwcsscyjw2m7dbybiaflqk4z1r2d1kp9r9qqyjfzblxpyxa0a";
+ sha256 = "b2e4dba91661e4697b30269106386c2b29e416a00d9ff66b26c462edddc10078";
};
propagatedBuildInputs = [ dateutil flask pyjwt werkzeug ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/flask-limiter/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/flask-limiter/default.nix
index c3db5094aef9..1f24919b73c0 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/flask-limiter/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/flask-limiter/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "Flask-Limiter";
- version = "1.3.1";
+ version = "1.4";
src = fetchPypi {
inherit pname version;
- sha256 = "08d6d7534a847c532fd36d0df978f93908d8616813085941c862bbcfcf6811aa";
+ sha256 = "021279c905a1e24f181377ab3be711be7541734b494f4e6db2b8edeba7601e48";
};
propagatedBuildInputs = [ flask limits ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/flask-marshmallow/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/flask-marshmallow/default.nix
index 5d783f6c7c45..710c35bc8b4e 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/flask-marshmallow/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/flask-marshmallow/default.nix
@@ -4,7 +4,7 @@
buildPythonPackage rec {
pname = "flask-marshmallow";
- version = "0.13.0";
+ version = "0.14.0";
meta = {
homepage = "https://github.com/marshmallow-code/flask-marshmallow";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "aefc1f1d96256c430a409f08241bab75ffe97e5d14ac5d1f000764e39bf4873a";
+ sha256 = "bd01a6372cbe50e36f205cfff0fc5dab0b7b662c4c8b2c4fc06a3151b2950950";
};
propagatedBuildInputs = [ flask marshmallow ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/flask-paginate/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/flask-paginate/default.nix
index f0cf96d13679..0d618e2b55df 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/flask-paginate/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/flask-paginate/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "flask-paginate";
- version = "0.5.4";
+ version = "0.7.1";
src = fetchPypi {
inherit pname version;
- sha256 = "60079a1c4c600cb4d4a9f7c386ea357b5ee02355ae6d6e8b41f769ae3f7af3ad";
+ sha256 = "949b93d0535d1223b91ac0048586bd878aaebf4044c54c1dc3068acc9bdf441f";
};
propagatedBuildInputs = [ flask ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/flask-silk/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/flask-silk/default.nix
index 831eb03a09b0..fc8c57be99a4 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/flask-silk/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/flask-silk/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage {
meta = with stdenv.lib; {
description = "Adds silk icons to your Flask application or module, or extension";
license = licenses.bsd3;
- maintainers = with maintainers; [ timokau ];
+ maintainers = teams.sage.members;
homepage = "https://github.com/sublee/flask-silk";
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/flask-swagger-ui/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/flask-swagger-ui/default.nix
index f2908f43b00a..cc4b4e06bfcc 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/flask-swagger-ui/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/flask-swagger-ui/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "flask-swagger-ui";
- version = "3.25.0";
+ version = "3.36.0";
src = fetchPypi {
inherit pname version;
- sha256 = "42d098997e06b04f992609c4945cc990738b269c153d8388fc59a91a5dfcee9e";
+ sha256 = "f329752a65b2940ada8eeb57bce613f7c0a12856a9c31063bb9e33798554c9ed";
};
doCheck = false; # there are no tests
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/flaskbabel/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/flaskbabel/default.nix
index db0a4377947e..2956e2036c9d 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/flaskbabel/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/flaskbabel/default.nix
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "Flask-Babel";
- version = "1.0.0";
+ version = "2.0.0";
src = fetchPypi {
inherit pname version;
- sha256 = "0gmb165vkwv5v7dxsxa2i3zhafns0fh938m2zdcrv4d8z5l099yn";
+ sha256 = "f9faf45cdb2e1a32ea2ec14403587d4295108f35017a7821a2b1acb8cfd9257d";
};
propagatedBuildInputs = [ flask jinja2 speaklater Babel pytz ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/flatbuffers/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/flatbuffers/default.nix
new file mode 100644
index 000000000000..065808dfe6ef
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/flatbuffers/default.nix
@@ -0,0 +1,17 @@
+{ stdenv
+, buildPythonPackage
+, flatbuffers
+}:
+
+buildPythonPackage rec {
+ inherit (flatbuffers) pname version src;
+
+ sourceRoot = "source/python";
+
+ pythonImportsCheck = [ "flatbuffers" ];
+
+ meta = flatbuffers.meta // {
+ description = "Python runtime library for use with the Flatbuffers serialization format";
+ maintainers = with stdenv.lib.maintainers; [ wulfsta ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/flit-core/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/flit-core/default.nix
index 441084da97fa..53a1e0651f36 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/flit-core/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/flit-core/default.nix
@@ -1,26 +1,24 @@
{ lib
, buildPythonPackage
-, fetchPypi
, flit
, isPy3k
-, pytoml
+, toml
}:
buildPythonPackage rec {
pname = "flit-core";
version = "2.3.0";
disabled = !isPy3k;
-
format = "pyproject";
- src = fetchPypi {
- inherit version;
- pname = "flit_core";
- sha256 = "a50bcd8bf5785e3a7d95434244f30ba693e794c5204ac1ee908fc07c4acdbf80";
- };
+ inherit (flit) src patches;
+
+ preConfigure = ''
+ cd flit_core
+ '';
propagatedBuildInputs = [
- pytoml
+ toml
];
passthru.tests = {
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/flit/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/flit/default.nix
index c0944f4ff17b..c63fd1edeaf9 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/flit/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/flit/default.nix
@@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
+, fetchpatch
, isPy3k
, docutils
, requests
@@ -10,7 +11,6 @@
, pytest
, testpath
, responses
-, pytoml
, flit-core
}:
@@ -21,19 +21,34 @@
buildPythonPackage rec {
pname = "flit";
- version = "2.3.0";
+ version = "3.0.0";
disabled = !isPy3k;
+ format = "pyproject";
- src = fetchPypi {
- inherit pname version;
- sha256 = "017012b809ec489918afd68af7a70bd7c8c770c87b60159d875c126866e97a4b";
+ src = fetchFromGitHub {
+ owner = "takluyver";
+ repo = "flit";
+ rev = version;
+ sha256 = "zk6mozS3Q9U43PQe/DxgwwsBRJ6Qwb+rSUVGXHijD+g=";
};
+ nativeBuildInputs = [
+ flit-core
+ ];
+
+ # Use toml instead of pytoml
+ # Resolves infinite recursion since packaging started using flit.
+ patches = [
+ (fetchpatch {
+ url = "https://github.com/takluyver/flit/commit/b81b1da55ef0f2768413669725d2874fcb0c29fb.patch";
+ sha256 = "11oNaYsm00/j2046V9C0idpSeG7TpY3JtLuxX3ZL/OI=";
+ })
+ ];
+
propagatedBuildInputs = [
docutils
requests
requests_download
- pytoml
flit-core
] ++ lib.optionals (pythonOlder "3.6") [
zipfile36
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/flowlogs_reader/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/flowlogs_reader/default.nix
index 44f347edb8ee..717e3a3291b6 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/flowlogs_reader/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/flowlogs_reader/default.nix
@@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "flowlogs_reader";
- version = "2.2.1";
+ version = "2.3.0";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "7c24156a3d6887b641ceb37b57d91805bee6c3352e8a3ca97a3274217ead9294";
+ sha256 = "19118ff77925c66a6782152066d86bc8d5c6ed60189b642263fb0c6eb7cb22ef";
};
propagatedBuildInputs = [ botocore boto3 docutils ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/fpylll/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/fpylll/default.nix
index 558765797237..da246966c932 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/fpylll/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/fpylll/default.nix
@@ -67,11 +67,11 @@ buildPythonPackage rec {
PY_IGNORE_IMPORTMISMATCH=1 pytest
'';
- meta = {
+ meta = with lib; {
description = "A Python interface for fplll";
changelog = "https://github.com/fplll/fpylll/releases/tag/${version}";
homepage = "https://github.com/fplll/fpylll";
- maintainers = with lib.maintainers; [ timokau ];
- license = lib.licenses.gpl2Plus;
+ maintainers = teams.sage.members;
+ license = licenses.gpl2Plus;
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/freezegun/0.3.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/freezegun/0.3.nix
new file mode 100644
index 000000000000..219fc180b225
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/freezegun/0.3.nix
@@ -0,0 +1,32 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, isPy27
+, dateutil
+, six
+, mock
+, nose
+, pytest
+}:
+
+buildPythonPackage rec {
+ pname = "freezegun";
+ version = "0.3.5";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "02ly89wwn0plcw8clkkzvxaw6zlpm8qyqpm9x2mfw4a0vppb4ngf";
+ };
+
+ propagatedBuildInputs = [ dateutil six ];
+ checkInputs = [ mock nose pytest ];
+ # contains python3 specific code
+ doCheck = !isPy27;
+
+ meta = with stdenv.lib; {
+ description = "FreezeGun: Let your Python tests travel through time";
+ homepage = "https://github.com/spulec/freezegun";
+ license = licenses.asl20;
+ };
+
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/freezegun/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/freezegun/default.nix
index 92254b94dee9..743b041775f0 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/freezegun/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/freezegun/default.nix
@@ -1,5 +1,6 @@
{ stdenv
, buildPythonPackage
+, pythonOlder
, fetchPypi
, isPy27
, dateutil
@@ -11,11 +12,12 @@
buildPythonPackage rec {
pname = "freezegun";
- version = "0.3.15";
+ version = "1.0.0";
+ disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
- sha256 = "e2062f2c7f95cc276a834c22f1a17179467176b624cc6f936e8bc3be5535ad1b";
+ sha256 = "1cf08e441f913ff5e59b19cc065a8faa9dd1ddc442eaf0375294f344581a0643";
};
propagatedBuildInputs = [ dateutil six ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/ftputil/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/ftputil/default.nix
index fb1bf7549fcc..f38f5d740971 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/ftputil/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/ftputil/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, pythonOlder, pytest, freezegun }:
+{ stdenv, lib, buildPythonPackage, fetchPypi, pythonOlder, pytest, freezegun }:
buildPythonPackage rec {
version = "4.0.0";
@@ -18,12 +18,15 @@ buildPythonPackage rec {
py.test test \
-k "not test_public_servers and not test_real_ftp \
and not test_set_parser and not test_repr \
- and not test_conditional_upload and not test_conditional_download_with_older_target"
- '';
+ and not test_conditional_upload and not test_conditional_download_with_older_target \
+ ''
+ # need until https://ftputil.sschwarzer.net/trac/ticket/140#ticket is fixed
+ + lib.optionalString stdenv.isDarwin ''and not test_error_message_reuse''
+ + ''"'';
meta = with lib; {
description = "High-level FTP client library (virtual file system and more)";
- homepage = "http://ftputil.sschwarzer.net/";
- license = licenses.bsd2; # "Modified BSD license, says pypi"
+ homepage = "http://ftputil.sschwarzer.net/";
+ license = licenses.bsd2; # "Modified BSD license, says pypi"
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/genanki/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/genanki/default.nix
index 658ea3baee73..17944b452828 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/genanki/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/genanki/default.nix
@@ -4,15 +4,15 @@
buildPythonPackage rec {
pname = "genanki";
- version = "0.8.1";
+ version = "0.10.0";
src = fetchPypi {
inherit pname version;
- sha256 = "08eddb4a203e36e4fc3b66f85e00252070379867dbbc04fd8902ddc14fb352c6";
+ sha256 = "b4049621469be115bb13b6ff90994c4c68ef9e7e72e6a98d4a3ada629f163a11";
};
propagatedBuildInputs = [
- pytestrunner
+ pytestrunner
cached-property
frozendict
pystache
@@ -24,7 +24,7 @@ buildPythonPackage rec {
disabled = !isPy3k;
# relies on upstream anki
- doCheck = false;
+ doCheck = false;
checkPhase = ''
py.test
'';
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/genshi/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/genshi/default.nix
index 5554e4b330e2..9e6bab6e1690 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/genshi/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/genshi/default.nix
@@ -2,22 +2,25 @@
, buildPythonPackage
, fetchPypi
, setuptools
+, six
}:
buildPythonPackage rec {
pname = "Genshi";
- version = "0.7.3";
+ version = "0.7.5";
src = fetchPypi {
inherit pname version;
- sha256 = "7933c95151d7dd2124a2b4c8dd85bb6aec881ca17c0556da0b40e56434b313a0";
+ sha256 = "c12d6c2abf7df0ec661d9ff2e197522eae846e43dc58abd5a36443d05bc41135";
};
# FAIL: test_sanitize_remove_script_elem (genshi.filters.tests.html.HTMLSanitizerTestCase)
# FAIL: test_sanitize_remove_src_javascript (genshi.filters.tests.html.HTMLSanitizerTestCase)
doCheck = false;
- buildInputs = [ setuptools ];
+ propagatedBuildInputs = [
+ setuptools six
+ ];
meta = with stdenv.lib; {
description = "Python components for parsing HTML, XML and other textual content";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/getkey/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/getkey/default.nix
new file mode 100644
index 000000000000..c0cbec29145a
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/getkey/default.nix
@@ -0,0 +1,34 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytestCheckHook
+, flake8
+}:
+
+buildPythonPackage rec {
+ pname = "getkey";
+ version = "0.6.5";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0ng0ihfagh9g8hral0bq5nhjlp3csqghyv3z8b7ylkdkqc1cgiv8";
+ };
+
+ # disable coverage, because we don't care and python-coveralls is not in nixpkgs
+ postPatch = ''
+ sed -e '/python-coveralls/d' -e '/pytest-cov/d' -i setup.py
+ rm setup.cfg
+ '';
+
+ checkInputs = [
+ flake8
+ pytestCheckHook
+ ];
+
+ meta = with lib; {
+ description = "Read single characters and key-strokes";
+ homepage = "https://github.com/kcsaff/getkey";
+ license = licenses.mit;
+ maintainers = [ maintainers.symphorien ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/gevent/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/gevent/default.nix
index 4eb5c7cdbb9f..bf066f519065 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/gevent/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/gevent/default.nix
@@ -4,12 +4,12 @@
buildPythonPackage rec {
pname = "gevent";
- version = "20.5.2";
+ version = "20.9.0";
format = "pyproject";
src = fetchPypi {
inherit pname version;
- sha256 = "2756de36f56b33c46f6cc7146a74ba65afcd1471922c95b6771ce87b279d689c";
+ sha256 = "13aw9x6imsy3b369kfjblqiwfni69pp32m4r13n62r9k3l2lhvaz";
};
buildInputs = [ libev ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/gidgethub/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/gidgethub/default.nix
index f3b3c8d5df3d..a28bcfb0ec1b 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/gidgethub/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/gidgethub/default.nix
@@ -16,13 +16,13 @@
buildPythonPackage rec {
pname = "gidgethub";
- version = "4.1.1";
+ version = "4.2.0";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "cfabfa696d422ee91eaf1e3f01ea75e576721233cc3ea8badc7d86c30061df8e";
+ sha256 = "5526cc2a06bfad707d10ec118393e0d33c2aa524605255d96958c22c93e8e7aa";
};
nativeBuildInputs = [ setuptools pytestrunner ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/gin-config/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/gin-config/default.nix
index 412b0c159498..14842541d6ce 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/gin-config/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/gin-config/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "gin-config";
- version = "0.3.0";
+ version = "0.4.0";
src = fetchPypi {
inherit pname version;
- sha256 = "6a83b7639ae76c276c0380d71d583f151b327a7c37978add314180ec1280a6cc";
+ sha256 = "9499c060e1faa340959fc4ada7fe53f643d6f8996a80262b28a082c1ef6849de";
};
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/gipc/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/gipc/default.nix
index 3fe26f4a934b..04dc8b0c068d 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/gipc/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/gipc/default.nix
@@ -27,6 +27,8 @@ buildPythonPackage rec {
'';
homepage = "http://gehrcke.de/gipc";
license = licenses.mit;
+ # gipc only has support for older versions of gevent
+ broken = versionOlder "1.6" gevent.version;
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/git-annex-adapter/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/git-annex-adapter/default.nix
index 318bafb98efa..e5d9910024a5 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/git-annex-adapter/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/git-annex-adapter/default.nix
@@ -1,5 +1,5 @@
{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, substituteAll
-, python, utillinux, pygit2, gitMinimal, git-annex, cacert
+, python, util-linux, pygit2, gitMinimal, git-annex, cacert
}:
buildPythonPackage rec {
@@ -25,7 +25,7 @@ buildPythonPackage rec {
checkInputs = [
gitMinimal
- utillinux # `rev` is needed in tests/test_process.py
+ util-linux # `rev` is needed in tests/test_process.py
];
propagatedBuildInputs = [ pygit2 cacert ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/glom/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/glom/default.nix
index 916812f15354..cae43e59c288 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/glom/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/glom/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "glom";
- version = "20.8.0";
+ version = "20.11.0";
src = fetchPypi {
inherit pname version;
- sha256 = "5fa3a9d99c7f3e5410a810fa8a158c0f71e39036c47b77745c7f2e4630372f82";
+ sha256 = "54051072bccc9cdb3ebbd8af0559195137a61d308f04bff19678e4b61350eb12";
};
propagatedBuildInputs = [ boltons attrs face ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/gntp/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/gntp/default.nix
new file mode 100644
index 000000000000..cde1f9bb8ca6
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/gntp/default.nix
@@ -0,0 +1,23 @@
+{ lib, buildPythonPackage, fetchPypi, nose }:
+
+buildPythonPackage rec {
+ pname = "gntp";
+ version = "1.0.3";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1q6scs8lp84v0aph6b5c9jhv51rhq2vmzpdd38db92ybkq0g597l";
+ };
+
+ pythonImportsCheck = [ "gntp" "gntp.notifier" ];
+
+ # requires a growler service to be running
+ doCheck = false;
+
+ meta = with lib; {
+ homepage = "https://github.com/kfdm/gntp/";
+ description = "Python library for working with the Growl Notification Transport Protocol";
+ license = licenses.mit;
+ maintainers = [ maintainers.jfroche ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/goobook/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/goobook/default.nix
index e183e79f5703..a3d327275157 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/goobook/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/goobook/default.nix
@@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "goobook";
- version = "3.5";
+ version = "3.5.1";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "1rmfyma3gwdf5mrw4l3j66y86fy8hgdbd0z4a5kck0kcm3hy34j9";
+ sha256 = "6e69aeaf69112d116302f0c42ca1904f3b6efd17f15cefc12c866206160293be";
};
nativeBuildInputs = [ docutils installShellFiles ];
@@ -23,6 +23,10 @@ buildPythonPackage rec {
installManPage goobook.1
'';
+ doCheck = false;
+
+ pythonImportsCheck = [ "goobook" ];
+
meta = with stdenv.lib; {
description = "Access your Google contacts from the command line";
longDescription = ''
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix
index 3ff530831b37..b14276b0a1a2 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "google-api-python-client";
- version = "1.12.3";
+ version = "1.12.8";
src = fetchPypi {
inherit pname version;
- sha256 = "844ef76bda585ea0ea2d5e7f8f9a0eb10d6e2eba66c4fea0210ec7843941cb1a";
+ sha256 = "f3b9684442eec2cfe9f9bb48e796ef919456b82142c7528c5fd527e5224f08bb";
};
# No tests included in archive
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google-auth-oauthlib/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google-auth-oauthlib/default.nix
index ed7e57963ba6..bdea58de8999 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google-auth-oauthlib/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google-auth-oauthlib/default.nix
@@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchPypi
+, pythonOlder
, isPy3k
, click
, mock
@@ -12,11 +13,12 @@
buildPythonPackage rec {
pname = "google-auth-oauthlib";
- version = "0.4.1";
+ version = "0.4.2";
+ disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "88d2cd115e3391eb85e1243ac6902e76e77c5fe438b7276b297fbe68015458dd";
+ sha256 = "65b65bc39ad8cab15039b35e5898455d3d66296d0584d96fe0e79d67d04c51d9";
};
checkInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google-cloud-iam/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google-cloud-iam/default.nix
new file mode 100644
index 000000000000..9d6120629380
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google-cloud-iam/default.nix
@@ -0,0 +1,22 @@
+{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder
+, google_api_core, libcst, mock, proto-plus, pytest-asyncio }:
+
+buildPythonPackage rec {
+ pname = "google-cloud-iam";
+ version = "2.0.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1zxsx5avs8njiyw32zvsx2yblmmiwxy771x334hbgmy0aqms4lak";
+ };
+
+ propagatedBuildInputs = [ google_api_core libcst proto-plus ];
+ checkInputs = [ mock pytestCheckHook pytest-asyncio ];
+
+ meta = with lib; {
+ description = "Google Cloud IAM API client library";
+ homepage = "https://github.com/googleapis/python-iam";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ austinbutler ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_api_core/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_api_core/default.nix
index a72f68c19ff9..efe74d478848 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_api_core/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_api_core/default.nix
@@ -1,32 +1,27 @@
-{ lib, buildPythonPackage, fetchPypi, pythonOlder, isPy27
-, google_auth, protobuf, googleapis_common_protos, requests, setuptools, grpcio
-, mock
-}:
+{ lib, buildPythonPackage, fetchPypi, pythonOlder, google_auth, protobuf
+, googleapis_common_protos, requests, grpcio, mock, pytest, pytest-asyncio, pytestCheckHook }:
buildPythonPackage rec {
pname = "google-api-core";
- version = "1.22.1";
- disabled = isPy27; # google namespace no longer works on python2
+ version = "1.23.0";
+ disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
- sha256 = "35cba563034d668ae90ffe1f03193a84e745b38f09592f60258358b5e5ee6238";
+ sha256 = "1bb3c485c38eacded8d685b1759968f6cf47dd9432922d34edb90359eaa391e2";
};
- propagatedBuildInputs = [
- googleapis_common_protos protobuf
- google_auth requests setuptools grpcio
- ];
+ propagatedBuildInputs =
+ [ googleapis_common_protos protobuf google_auth requests grpcio ];
- # requires nox
- doCheck = false;
- checkInputs = [ mock ];
+ checkInputs = [ google_auth mock protobuf pytest-asyncio pytestCheckHook ];
- pythonImportsCheck = [
- "google.auth"
- "google.protobuf"
- "google.api"
- ];
+ # prevent google directory from shadowing google imports
+ preCheck = ''
+ rm -r google
+ '';
+
+ pythonImportsCheck = [ "google.auth" "google.protobuf" "google.api" ];
meta = with lib; {
description = "Core Library for Google Client Libraries";
@@ -35,7 +30,8 @@ buildPythonPackage rec {
helpers used by all Google API clients.
'';
homepage = "https://github.com/googleapis/python-api-core";
- changelog = "https://github.com/googleapis/python-api-core/blob/v${version}/CHANGELOG.md";
+ changelog =
+ "https://github.com/googleapis/python-api-core/blob/v${version}/CHANGELOG.md";
license = licenses.asl20;
maintainers = with maintainers; [ ];
};
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_auth/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_auth/default.nix
index 59ed94d34865..3f47a366fba8 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_auth/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_auth/default.nix
@@ -1,29 +1,19 @@
-{ stdenv, buildPythonPackage, fetchpatch, fetchPypi
-, cachetools
-, flask
-, freezegun
-, mock
-, oauth2client
-, pyasn1-modules
-, pytest
-, pytest-localserver
-, requests
-, responses
-, rsa
-, setuptools
-, six
-, urllib3
-}:
+{ stdenv, buildPythonPackage, fetchpatch, fetchPypi, pythonOlder
+, pytestCheckHook, cachetools, flask, freezegun, mock, oauth2client
+, pyasn1-modules, pytest, pytest-localserver, requests, responses, rsa
+, setuptools, six, urllib3 }:
buildPythonPackage rec {
pname = "google-auth";
- version = "1.20.1";
+ version = "1.23.0";
src = fetchPypi {
inherit pname version;
- sha256 = "2f34dd810090d0d4c9d5787c4ad7b4413d1fbfb941e13682c7a2298d3b6cdcc8";
+ sha256 = "5176db85f1e7e837a646cd9cede72c3c404ccf2e3373d9ee14b2db88febad440";
};
+ disabled = pythonOlder "3.5";
+
propagatedBuildInputs = [ six pyasn1-modules cachetools rsa setuptools ];
checkInputs = [
@@ -31,17 +21,13 @@ buildPythonPackage rec {
freezegun
mock
oauth2client
- pytest
+ pytestCheckHook
pytest-localserver
requests
responses
urllib3
];
- checkPhase = ''
- py.test
- '';
-
meta = with stdenv.lib; {
description = "Google Auth Python Library";
longDescription = ''
@@ -49,7 +35,8 @@ buildPythonPackage rec {
authentication mechanisms to access Google APIs.
'';
homepage = "https://github.com/googleapis/google-auth-library-python";
- changelog = "https://github.com/googleapis/google-auth-library-python/blob/v${version}/CHANGELOG.md";
+ changelog =
+ "https://github.com/googleapis/google-auth-library-python/blob/v${version}/CHANGELOG.md";
# Documentation: https://googleapis.dev/python/google-auth/latest/index.html
license = licenses.asl20;
maintainers = with maintainers; [ ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_asset/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_asset/default.nix
index b1366c0d35cf..87b1fdf8fc9d 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_asset/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_asset/default.nix
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "google-cloud-asset";
- version = "2.1.0";
+ version = "2.2.0";
src = fetchPypi {
inherit pname version;
- sha256 = "14r77bcxy7bmqhmz2hzcf3km2y4vivf5sfzgqjwlyynaydhn4f6j";
+ sha256 = "1cf1b8a102eea8cec65eb07bef51dc15c1136cfc8564ea7fc5a39465b8f20017";
};
disabled = pythonOlder "3.6";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_automl/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_automl/default.nix
index 43ffdc7a70db..3ad8dcb12fb3 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_automl/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_automl/default.nix
@@ -1,34 +1,38 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-, enum34
-, google_api_core
-, google_cloud_storage
-, pandas
-, pytest
-, mock
-}:
+{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, pytestCheckHook, libcst
+, google_api_core, google_cloud_storage, google_cloud_testutils, pandas
+, proto-plus, pytest-asyncio, mock }:
buildPythonPackage rec {
pname = "google-cloud-automl";
- version = "1.0.1";
+ version = "2.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "f08abe78d37fb94a3748aa43e66dae2bad52f991cc7740501a341bc6f6387fd5";
+ sha256 = "520dfe2ee04d28f3088c9c582fa2a534fc272647d5e2e59acc903c0152e61696";
};
- checkInputs = [ pandas pytest mock google_cloud_storage ];
- propagatedBuildInputs = [ enum34 google_api_core ];
+ disabled = pythonOlder "3.6";
+
+ checkInputs = [
+ google_cloud_storage
+ google_cloud_testutils
+ mock
+ pandas
+ pytest-asyncio
+ pytestCheckHook
+ ];
+ propagatedBuildInputs = [ google_api_core libcst proto-plus ];
# ignore tests which need credentials
- checkPhase = ''
- pytest tests/unit -k 'not upload and not prediction_client_client_info'
+ disabledTests = [ "test_prediction_client_client_info" ];
+ preCheck = ''
+ rm -r google
+ rm tests/system/gapic/v1beta1/test_system_tables_client_v1.py
'';
meta = with stdenv.lib; {
description = "Cloud AutoML API client library";
- homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python";
+ homepage = "https://github.com/googleapis/python-automl";
license = licenses.asl20;
maintainers = [ maintainers.costrouc ];
};
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_bigquery/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_bigquery/default.nix
index b8120285917f..cea0608c3f77 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_bigquery/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_bigquery/default.nix
@@ -1,42 +1,46 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-, freezegun
-, google_resumable_media
-, google_api_core
-, google_cloud_core
-, pandas
-, pyarrow
-, pytest
-, mock
-, ipython
-}:
+{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder, freezegun
+, google_api_core, google_cloud_core, google_cloud_testutils
+, google_resumable_media, grpcio, ipython, mock, pandas, proto-plus, pyarrow }:
buildPythonPackage rec {
pname = "google-cloud-bigquery";
- version = "1.26.1";
+ version = "2.4.0";
src = fetchPypi {
inherit pname version;
- sha256 = "51c29b95d460486d9e0210f63e8193691cd08480b69775270e84dd3db87c1bf2";
+ sha256 = "2d53d6fed1c25c9c0ce361dad1c64203c96b2344f7156357a501630d1cb08445";
};
- checkInputs = [ pytest mock ipython freezegun ];
- propagatedBuildInputs = [ google_resumable_media google_api_core google_cloud_core pandas pyarrow ];
+ disabled = pythonOlder "3.6";
- # prevent local directory from shadowing google imports
- # call_api_applying_custom_retry_on_timeout requires credentials
+ checkInputs =
+ [ freezegun google_cloud_testutils ipython mock pytestCheckHook ];
+ propagatedBuildInputs = [
+ google_resumable_media
+ google_api_core
+ google_cloud_core
+ pandas
+ proto-plus
+ pyarrow
+ ];
+
+ # prevent google directory from shadowing google imports
# test_magics requires modifying sys.path
- checkPhase = ''
+ preCheck = ''
rm -r google
- pytest tests/unit \
- -k 'not call_api_applying_custom_retry_on_timeout' \
- --ignore=tests/unit/test_magics.py
+ rm tests/unit/test_magics.py
'';
+ # call_api_applying_custom_retry_on_timeout requires credentials
+ # to_dataframe_timestamp_out_of_pyarrow_bounds has inconsistent results
+ disabledTests = [
+ "call_api_applying_custom_retry_on_timeout"
+ "to_dataframe_timestamp_out_of_pyarrow_bounds"
+ ];
+
meta = with stdenv.lib; {
description = "Google BigQuery API client library";
- homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python";
+ homepage = "https://pypi.org/project/google-cloud-bigquery";
license = licenses.asl20;
maintainers = [ maintainers.costrouc ];
};
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_bigquery_datatransfer/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_bigquery_datatransfer/default.nix
index 97ad04334fc0..8c71ac92c994 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_bigquery_datatransfer/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_bigquery_datatransfer/default.nix
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "google-cloud-bigquery-datatransfer";
- version = "1.1.0";
+ version = "2.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "71791a38a0ec535fdd4970d3403aa4cb2d9ca5c2729f80730858be2776b3c518";
+ sha256 = "0cca79f6ee312159ec3f3b7fea218c3dd51408d39c429ecbea037982e91cc827";
};
checkInputs = [ pytest mock ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_bigtable/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_bigtable/default.nix
index 310663df3505..bd12aa592d50 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_bigtable/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_bigtable/default.nix
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "google-cloud-bigtable";
- version = "1.5.1";
+ version = "1.6.1";
src = fetchPypi {
inherit pname version;
- sha256 = "25b869bb20ad6ee9f6e7fc3c95d973011ade8176af9197468686335e216c088e";
+ sha256 = "ace4ff7c6e00fb7d86963503615db85336b6484339f5774bd8c589df224772a8";
};
checkInputs = [ pytest mock ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_container/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_container/default.nix
index ec41592b48b6..4d170d1c8b59 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_container/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_container/default.nix
@@ -1,23 +1,20 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-, google_api_core
-, grpc_google_iam_v1
-, pytest
-, mock
-}:
+{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, google_api_core
+, grpc_google_iam_v1, libcst, mock, proto-plus, pytest, pytest-asyncio }:
buildPythonPackage rec {
pname = "google-cloud-container";
- version = "2.0.1";
+ version = "2.2.0";
src = fetchPypi {
inherit pname version;
- sha256 = "6f714e3d427e2b36d1365fc400f4d379972529fb40f798d9c0e06c7c3418fc89";
+ sha256 = "ce641b3ffaef407d5fe9b798955c6c6f2d1bfb58d6e11b4f87eb6fbb745a2711";
};
- checkInputs = [ pytest mock ];
- propagatedBuildInputs = [ google_api_core grpc_google_iam_v1 ];
+ disabled = pythonOlder "3.6";
+
+ checkInputs = [ mock pytest pytest-asyncio ];
+ propagatedBuildInputs =
+ [ google_api_core grpc_google_iam_v1 libcst proto-plus ];
checkPhase = ''
pytest tests/unit
@@ -25,7 +22,7 @@ buildPythonPackage rec {
meta = with stdenv.lib; {
description = "Google Container Engine API client library";
- homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python";
+ homepage = "https://github.com/googleapis/python-container";
license = licenses.asl20;
maintainers = [ maintainers.costrouc ];
};
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_core/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_core/default.nix
index f277711e8f16..1ad08ea05af4 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_core/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_core/default.nix
@@ -1,26 +1,30 @@
-{ stdenv, buildPythonPackage, fetchPypi, python
-, google_api_core, grpcio, pytest, mock, setuptools }:
+{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, pytestCheckHook, python
+, google_api_core, grpcio, mock }:
buildPythonPackage rec {
pname = "google-cloud-core";
- version = "1.4.1";
+ version = "1.4.3";
src = fetchPypi {
inherit pname version;
- sha256 = "613e56f164b6bee487dd34f606083a0130f66f42f7b10f99730afdf1630df507";
+ sha256 = "21afb70c1b0bce8eeb8abb5dca63c5fd37fc8aea18f4b6d60e803bd3d27e6b80";
};
- propagatedBuildInputs = [ google_api_core grpcio setuptools ];
- checkInputs = [ pytest mock ];
+ disabled = pythonOlder "3.5";
- checkPhase = ''
- cd tests
- ${python.interpreter} -m unittest discover
+ propagatedBuildInputs = [ google_api_core grpcio ];
+ checkInputs = [ google_api_core mock pytestCheckHook ];
+
+ pythonImportsCheck = [ "google.cloud" ];
+
+ # prevent google directory from shadowing google imports
+ preCheck = ''
+ rm -r google
'';
meta = with stdenv.lib; {
description = "API Client library for Google Cloud: Core Helpers";
- homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python";
+ homepage = "https://github.com/googleapis/python-cloud-core";
license = licenses.asl20;
maintainers = with maintainers; [ ];
};
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_dataproc/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_dataproc/default.nix
index c7d0bf1b730b..b0067d4316da 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_dataproc/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_dataproc/default.nix
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "google-cloud-dataproc";
- version = "2.0.0";
+ version = "2.2.0";
src = fetchPypi {
inherit pname version;
- sha256 = "d6d94af6c0d5aee0bb88d058a180f4d3341209e112f85a1c7ce0df7887cbf867";
+ sha256 = "81c44ac114c94df8f5b21245e5e7fc4eabce66b25fc432c3696b62b5de143b1f";
};
checkInputs = [ pytest mock ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_datastore/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_datastore/default.nix
index ff2d0b3baa91..07c6cd87237f 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_datastore/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_datastore/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "google-cloud-datastore";
- version = "1.15.0";
+ version = "2.0.1";
src = fetchPypi {
inherit pname version;
- sha256 = "c94bc357e975ce7bd5e5636497316c1bf4d015891e0ed96df9e7ce901415b94a";
+ sha256 = "0ebf3b0bcb483e066dfe73679e019e2d7b8c1652e26984702cf5e3f020592f6a";
};
checkInputs = [ pytest mock ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_dlp/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_dlp/default.nix
index 8273f40565fe..a5a602dbeadb 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_dlp/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_dlp/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "google-cloud-dlp";
- version = "1.0.0";
+ version = "2.0.0";
src = fetchPypi {
inherit pname version;
- sha256 = "2ccf04209f96b4759d8ed76da2c916a456386836caacd47ce01b6344f5b8f212";
+ sha256 = "112c8a46979eebd60c3651037e62572fed413977ff2811901aa925c7b7ab9a5a";
};
checkInputs = [ pytest mock ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_error_reporting/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_error_reporting/default.nix
index 72502a4f4ad1..19f90275ae99 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_error_reporting/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_error_reporting/default.nix
@@ -1,31 +1,31 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-, google_cloud_logging
-, pytest
-, mock
-}:
+{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder
+, google_cloud_logging, google_cloud_testutils, libcst, mock, proto-plus
+, pytest-asyncio }:
buildPythonPackage rec {
pname = "google-cloud-error-reporting";
- version = "0.34.0";
+ version = "1.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "34edd11601b17c87a89c2e1cefdc27d975e1e9243a88ba3c0c48bfe6a05c404f";
+ sha256 = "2fd6fe25343f7017c22e2733a0358c64b3171edc1669d0c8a1e1f07f86a048c4";
};
- checkInputs = [ pytest mock ];
- propagatedBuildInputs = [ google_cloud_logging ];
+ disabled = pythonOlder "3.6";
- checkPhase = ''
+ checkInputs = [ google_cloud_testutils mock pytestCheckHook pytest-asyncio ];
+ propagatedBuildInputs = [ google_cloud_logging libcst proto-plus ];
+
+ # Disable tests that require credentials
+ disabledTests = [ "test_report_error_event" "test_report_exception" ];
+ # prevent google directory from shadowing google imports
+ preCheck = ''
rm -r google
- pytest tests/unit
'';
meta = with stdenv.lib; {
description = "Stackdriver Error Reporting API client library";
- homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python";
+ homepage = "https://github.com/googleapis/python-error-reporting";
license = licenses.asl20;
maintainers = [ maintainers.costrouc ];
};
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_firestore/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_firestore/default.nix
index a5d349456fd6..4f819bbf9bfa 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_firestore/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_firestore/default.nix
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "google-cloud-firestore";
- version = "1.9.0";
+ version = "2.0.1";
src = fetchPypi {
inherit pname version;
- sha256 = "d8a56919a3a32c7271d1253542ec24cb13f384a726fed354fdeb2a2269f25d1c";
+ sha256 = "ae1f58d9174a6fb2c9fd2758c6d4fd237fb4f0decc632b80c217bfbceda38eb6";
};
checkInputs = [ pytest ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_iot/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_iot/default.nix
index 8f14f7eeb87f..96364cfd7029 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_iot/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_iot/default.nix
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "google-cloud-iot";
- version = "1.0.0";
+ version = "2.0.1";
src = fetchPypi {
inherit pname version;
- sha256 = "bfd1511a7bcc7d23c2ea30253dd86b2b2247576d1345d895d7153dc0b262f06e";
+ sha256 = "8af2be9c74697a350d5cc8ead00ae6cb4e85943564f1d782e8060d0d5eb15723";
};
checkInputs = [ pytest mock ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_kms/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_kms/default.nix
index 79fe4bcc80f2..a4d2439fb49c 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_kms/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_kms/default.nix
@@ -1,32 +1,28 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-, enum34
-, grpc_google_iam_v1
-, google_api_core
-, pytest
-, mock
+{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder
+, grpc_google_iam_v1, google_api_core, libcst, mock, proto-plus, pytest-asyncio
}:
buildPythonPackage rec {
pname = "google-cloud-kms";
- version = "2.0.1";
+ version = "2.2.0";
src = fetchPypi {
inherit pname version;
- sha256 = "c590a8ab12a3f776ab35e570d21c0881f9d73c444bd509e54321a4c715233372";
+ sha256 = "0f3k2ixp1zsgydpvkj75bs2mb805389snyw30hn41c38qq5ksdga";
};
- checkInputs = [ pytest mock ];
- propagatedBuildInputs = [ enum34 grpc_google_iam_v1 google_api_core ];
+ disabled = pythonOlder "3.6";
- checkPhase = ''
- pytest tests/unit
- '';
+ checkInputs = [ mock pytestCheckHook pytest-asyncio ];
+ propagatedBuildInputs =
+ [ grpc_google_iam_v1 google_api_core libcst proto-plus ];
+
+ # Disable tests that need credentials
+ disabledTests = [ "test_list_global_key_rings" ];
meta = with stdenv.lib; {
description = "Cloud Key Management Service (KMS) API API client library";
- homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python";
+ homepage = "https://github.com/googleapis/python-kms";
license = licenses.asl20;
maintainers = [ maintainers.costrouc ];
};
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_language/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_language/default.nix
index 4479231aba4d..4f3defb4e4b9 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_language/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_language/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "google-cloud-language";
- version = "1.3.0";
+ version = "2.0.0";
src = fetchPypi {
inherit pname version;
- sha256 = "2772badf8fe8ac57cd7e7840a60764603b3e19e6dbd843460a5ae8915798b32f";
+ sha256 = "abe7abcd64d25ffdf6d063385869ef8f34a7de421d5676541cd6df63b3c37b88";
};
checkInputs = [ pytest mock ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_logging/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_logging/default.nix
index 6aeef14b6921..96473edd583b 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_logging/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_logging/default.nix
@@ -1,35 +1,37 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-, google_api_core
-, google_cloud_core
-, pytest
-, mock
-, webapp2
-, django
-, flask
-}:
+{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder, django
+, flask, google_api_core, google_cloud_core, google_cloud_testutils, mock
+, webapp2 }:
buildPythonPackage rec {
pname = "google-cloud-logging";
- version = "1.15.1";
+ version = "2.0.0";
src = fetchPypi {
inherit pname version;
- sha256 = "cb0d4af9d684eb8a416f14c39d9fa6314be3adf41db2dd8ee8e30db9e8853d90";
+ sha256 = "c8e4869ec22aa7958ff937c1acbd34d7a2a8a446af9a09ce442f24128eee063c";
};
- checkInputs = [ pytest mock webapp2 django flask ];
+ disabled = pythonOlder "3.5";
+
+ checkInputs =
+ [ django flask google_cloud_testutils mock pytestCheckHook webapp2 ];
propagatedBuildInputs = [ google_api_core google_cloud_core ];
- checkPhase = ''
+ # api_url test broken, fix not yet released
+ # https://github.com/googleapis/python-logging/pull/66
+ disabledTests =
+ [ "test_build_api_url_w_custom_endpoint" "test_write_log_entries" ];
+
+ # prevent google directory from shadowing google imports
+ # remove system integration tests
+ preCheck = ''
rm -r google
- pytest tests/unit
+ rm tests/system/test_system.py
'';
meta = with stdenv.lib; {
description = "Stackdriver Logging API client library";
- homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python";
+ homepage = "https://github.com/googleapis/python-logging";
license = licenses.asl20;
maintainers = [ maintainers.costrouc ];
};
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_monitoring/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_monitoring/default.nix
index 8815d8246d16..99557565e63a 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_monitoring/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_monitoring/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "google-cloud-monitoring";
- version = "1.0.0";
+ version = "2.0.0";
src = fetchPypi {
inherit pname version;
- sha256 = "2feee2cc56b60ed1316175af0974668041c6480803542d3711e4365882dc79cd";
+ sha256 = "1debfa046ab9518d46b68712c03d86d0ddb11d1aad428aed62c6465752f2201f";
};
checkInputs = [ pytest mock ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_pubsub/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_pubsub/default.nix
index b1e4eae52ad2..4af622dc66ec 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_pubsub/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_pubsub/default.nix
@@ -1,32 +1,34 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-, enum34
-, grpc_google_iam_v1
-, google_api_core
-, pytest
-, mock
-}:
+{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, pytestCheckHook
+, google_api_core, google_cloud_testutils, grpc_google_iam_v1, libcst, mock
+, proto-plus, pytest-asyncio }:
buildPythonPackage rec {
pname = "google-cloud-pubsub";
- version = "1.7.0";
+ version = "2.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "c8d098ebd208d00c8f3bb55eefecd8553e7391d59700426a97d35125f0dcb248";
+ sha256 = "0358g5q4igq1pgy8dznbbkc6y7zf36y4m81hhh8hvzzhaa37vc22";
};
- checkInputs = [ pytest mock ];
- propagatedBuildInputs = [ enum34 grpc_google_iam_v1 google_api_core ];
+ disabled = pythonOlder "3.6";
- checkPhase = ''
- pytest tests/unit
+ checkInputs = [ google_cloud_testutils mock pytestCheckHook pytest-asyncio ];
+ propagatedBuildInputs =
+ [ grpc_google_iam_v1 google_api_core libcst proto-plus ];
+
+ # prevent google directory from shadowing google imports
+ # Tests in pubsub_v1 attempt to contact pubsub.googleapis.com
+ preCheck = ''
+ rm -r google
+ rm -r tests/unit/pubsub_v1
'';
+ pythonImportsCheck = [ "google.cloud.pubsub" ];
+
meta = with stdenv.lib; {
description = "Google Cloud Pub/Sub API client library";
- homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python";
+ homepage = "https://pypi.org/project/google-cloud-pubsub";
license = licenses.asl20;
maintainers = [ maintainers.costrouc ];
};
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_redis/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_redis/default.nix
index 92f2027bf4e9..3337d9f3c55b 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_redis/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_redis/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "google-cloud-redis";
- version = "1.0.0";
+ version = "2.0.0";
src = fetchPypi {
inherit pname version;
- sha256 = "73057750d6afcfc90c224ee4ffa3262b5e85e866b4db676f74a07b49713f2c3a";
+ sha256 = "c783118462d9272fb9f519ef43b6ce383e99ad631e922a1f06fbef7148aec7b8";
};
checkInputs = [ pytest mock ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_resource_manager/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_resource_manager/default.nix
index 84fac88bcfa9..a4b310797a7f 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_resource_manager/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_resource_manager/default.nix
@@ -1,11 +1,5 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-, google_cloud_core
-, google_api_core
-, pytest
-, mock
-}:
+{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder
+, google_cloud_core, google_api_core, mock, pytest }:
buildPythonPackage rec {
pname = "google-cloud-resource-manager";
@@ -16,17 +10,24 @@ buildPythonPackage rec {
sha256 = "de7eba5235df61deee2291a2fe70b904154df613a334109488afdea7a4c0011f";
};
- checkInputs = [ pytest mock ];
- propagatedBuildInputs = [ google_cloud_core google_api_core ];
+ disabled = pythonOlder "3.5";
- checkPhase = ''
+ checkInputs = [ mock pytestCheckHook ];
+ propagatedBuildInputs = [ google_api_core google_cloud_core ];
+
+ # api_url test broken, fix not yet released
+ # https://github.com/googleapis/python-resource-manager/pull/31
+ disabledTests =
+ [ "api_url_no_extra_query_param" "api_url_w_custom_endpoint" ];
+
+ # prevent google directory from shadowing google imports
+ preCheck = ''
rm -r google
- pytest tests/unit
'';
meta = with stdenv.lib; {
description = "Google Cloud Resource Manager API client library";
- homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python";
+ homepage = "https://github.com/googleapis/python-resource-manager";
license = licenses.asl20;
maintainers = [ maintainers.costrouc ];
};
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix
index 08e2c38ea1b1..80bdcd1b83cc 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix
@@ -1,11 +1,5 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-, google_api_core
-, google_cloud_core
-, pytest
-, mock
-}:
+{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder
+, google_api_core, google_cloud_core, mock }:
buildPythonPackage rec {
pname = "google-cloud-runtimeconfig";
@@ -16,18 +10,24 @@ buildPythonPackage rec {
sha256 = "3d125c01817d5bef2b644095b044d22b03b9d8d4591088cadd8e97851f7a150a";
};
- checkInputs = [ pytest mock ];
+ disabled = pythonOlder "3.5";
+
+ checkInputs = [ mock pytestCheckHook ];
propagatedBuildInputs = [ google_api_core google_cloud_core ];
- # ignore tests which require credentials or network
- checkPhase = ''
+ # api_url test broken, fix not yet released
+ # https://github.com/googleapis/python-resource-manager/pull/31
+ # Client tests require credentials
+ disabledTests = [ "build_api_url_w_custom_endpoint" "client_options" ];
+
+ # prevent google directory from shadowing google imports
+ preCheck = ''
rm -r google
- pytest tests/unit -k 'not client and not extra_headers'
'';
meta = with stdenv.lib; {
description = "Google Cloud RuntimeConfig API client library";
- homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python";
+ homepage = "https://pypi.org/project/google-cloud-runtimeconfig";
license = licenses.asl20;
maintainers = [ maintainers.costrouc ];
};
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_secret_manager/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_secret_manager/default.nix
index 513b76bafa4a..df3ec14c4dce 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_secret_manager/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_secret_manager/default.nix
@@ -1,20 +1,22 @@
{ lib, buildPythonPackage, fetchPypi
-, grpc_google_iam_v1, google_api_core
+, grpc_google_iam_v1, google_api_core, libcst, proto-plus
, pytest, mock
}:
buildPythonPackage rec {
pname = "google-cloud-secret-manager";
- version = "1.0.0";
+ version = "2.0.0";
src = fetchPypi {
inherit pname version;
- sha256 = "1cm3xqacxnbpv2706bd2jl86mvcsphpjlvhzngz2k2p48a0jjx8r";
+ sha256 = "c2b0c93b559c3b6eb2dc75f7ab33d49fad8fe954f6094ac2b14323ce053058f0";
};
propagatedBuildInputs = [
google_api_core
grpc_google_iam_v1
+ libcst
+ proto-plus
];
checkInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_securitycenter/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_securitycenter/default.nix
index a3992825d2e9..cad4b0799c28 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_securitycenter/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_securitycenter/default.nix
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "google-cloud-securitycenter";
- version = "0.6.0";
+ version = "1.0.0";
src = fetchPypi {
inherit pname version;
- sha256 = "14ebad262cd01c9a3998561684617be2e97ad5d27dab1918c14b964f97e1f8f7";
+ sha256 = "45d47a4389f2f19958a9db8e5c2f169c9b9385e74338fef0a4e49160153df7f7";
};
checkInputs = [ pytest mock ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_spanner/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_spanner/default.nix
index ce03add44e4f..38bd65aa091d 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_spanner/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_spanner/default.nix
@@ -1,35 +1,32 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-, grpc_google_iam_v1
-, grpcio-gcp
-, google_api_core
-, google_cloud_core
-, pytest
-, mock
-}:
+{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder
+, grpc_google_iam_v1, grpcio-gcp, google_api_core, google_cloud_core
+, google_cloud_testutils, mock, pytest }:
buildPythonPackage rec {
pname = "google-cloud-spanner";
- version = "1.17.1";
+ version = "2.0.0";
src = fetchPypi {
inherit pname version;
- sha256 = "3240a04eaa6496e9d8bf4929f4ff04de1652621fd49555eb83b743c48ed9ca04";
+ sha256 = "edac9d86ea2d8e87c048423f610cd3e5dbb6f9db7f1f9353ff133014689e97c6";
};
- checkInputs = [ pytest mock ];
- propagatedBuildInputs = [ grpcio-gcp grpc_google_iam_v1 google_api_core google_cloud_core ];
+ disabled = pythonOlder "3.5";
- # avoid importing local package
- checkPhase = ''
+ checkInputs = [ google_cloud_testutils mock pytestCheckHook ];
+ propagatedBuildInputs =
+ [ grpcio-gcp grpc_google_iam_v1 google_api_core google_cloud_core ];
+
+ # prevent google directory from shadowing google imports
+ # remove tests that require credentials
+ preCheck = ''
rm -r google
- pytest tests/unit
+ rm tests/system/test_system.py
'';
meta = with stdenv.lib; {
description = "Cloud Spanner API client library";
- homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python";
+ homepage = "https://pypi.org/project/google-cloud-spanner";
license = licenses.asl20;
maintainers = [ maintainers.costrouc ];
};
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_speech/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_speech/default.nix
index 5ffaafdbd6f7..57b2efb9ebbc 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_speech/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_speech/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "google-cloud-speech";
- version = "1.3.2";
+ version = "2.0.1";
src = fetchPypi {
inherit pname version;
- sha256 = "2e5adbc0e88f296b1bc8667f1dcf26ca4ea2db6596f07cb0a39e7b1b8ef14656";
+ sha256 = "a7428190f4c10440148a273eb4c91480470b34180eec422b7325acdc0b2c0832";
};
propagatedBuildInputs = [ google_api_core ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_storage/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_storage/default.nix
index 91e7beeb127b..a1b572db11e5 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_storage/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_storage/default.nix
@@ -1,44 +1,47 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, google_resumable_media
-, google_api_core
-, google_cloud_core
-, pytest
-, mock
-, setuptools
-}:
+{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder
+, google_api_core, google_auth, google-cloud-iam, google_cloud_core
+, google_cloud_kms, google_cloud_testutils, google_resumable_media, mock
+, requests }:
buildPythonPackage rec {
pname = "google-cloud-storage";
- version = "1.31.2";
+ version = "1.33.0";
src = fetchPypi {
inherit pname version;
- sha256 = "74bbb5b2d0b249de4a52f561435d0c3570ddc19b249653ae588ec0abcc3c81e6";
+ sha256 = "900ba027bdee6b97f21cd22d1db3d1a6233ede5de2db4754db860438bdad72d2";
};
+ disabled = pythonOlder "3.5";
+
propagatedBuildInputs = [
google_api_core
+ google_auth
google_cloud_core
google_resumable_media
- setuptools
+ requests
];
checkInputs = [
+ google-cloud-iam
+ google_cloud_kms
+ google_cloud_testutils
mock
- pytest
+ pytestCheckHook
];
- # remove directory from interferring with importing modules
- # ignore tests which require credentials
- checkPhase = ''
+ # disable tests which require credentials
+ disabledTests = [ "create" "get" "post" "test_build_api_url" ];
+
+ # prevent google directory from shadowing google imports
+ # remove tests which require credentials
+ preCheck = ''
rm -r google
- pytest tests/unit -k 'not (create or get or post)'
+ rm tests/system/test_system.py tests/unit/test_client.py
'';
meta = with lib; {
description = "Google Cloud Storage API client library";
- homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python";
+ homepage = "https://github.com/googleapis/python-storage";
license = licenses.asl20;
maintainers = with maintainers; [ costrouc ];
};
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_tasks/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_tasks/default.nix
index b7f827dd4802..ca252b2c5edb 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_tasks/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_tasks/default.nix
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "google-cloud-tasks";
- version = "1.5.0";
+ version = "2.0.0";
src = fetchPypi {
inherit pname version;
- sha256 = "d751b97c1e84980a1646702d3fc1b45bab3284bc3388181f1dc9ba3d204b5a39";
+ sha256 = "a9dd004057fc441eee8c18bb2dc3bb20ba7b85f353d66894c61e42aeb8764e76";
};
checkInputs = [ pytest mock ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_testutils/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_testutils/default.nix
index 90e4683f7b06..dfd6354dcc4b 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_testutils/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_testutils/default.nix
@@ -1,34 +1,22 @@
-{ stdenv
-, buildPythonPackage
-, fetchFromGitHub
-, six
-, google_auth
-}:
+{ stdenv, buildPythonPackage, fetchPypi, google_auth, pytest, six }:
-buildPythonPackage {
+buildPythonPackage rec {
pname = "google-cloud-testutils";
- version = "unstable-36ffa923c7037e8b4fdcaa76272cb6267e908a9d";
+ version = "0.1.0";
- # google-cloud-testutils is not "really"
- # released as a python package
- # but it is required for google-cloud-* tests
- # so why not package it as a module
- src = fetchFromGitHub {
- owner = "googleapis";
- repo = "google-cloud-python";
- rev = "36ffa923c7037e8b4fdcaa76272cb6267e908a9d";
- sha256 = "1fvcnssmpgf4lfr7l9h7cz984rbc5mfr1j1br12japcib5biwzjy";
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1bn1pz00lxym3vkl6l45b3nydpmfdvmylwggh2lspldrxwx39a0k";
};
- propagatedBuildInputs = [ six google_auth ];
+ propagatedBuildInputs = [ google_auth six ];
- postPatch = ''
- cd test_utils
- '';
+ # There are no tests
+ doCheck = false;
meta = with stdenv.lib; {
description = "System test utilities for google-cloud-python";
- homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python";
+ homepage = "https://github.com/googleapis/python-test-utils";
license = licenses.asl20;
maintainers = [ maintainers.costrouc ];
};
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_texttospeech/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_texttospeech/default.nix
index 3a052c73cdae..32e8fa223a88 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_texttospeech/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_texttospeech/default.nix
@@ -1,10 +1,5 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-, google_api_core
-, pytest
-, mock
-}:
+{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder
+, google_api_core, libcst, mock, proto-plus, pytest-asyncio, }:
buildPythonPackage rec {
pname = "google-cloud-texttospeech";
@@ -15,16 +10,17 @@ buildPythonPackage rec {
sha256 = "cbbd397e72b6189668134f3c8e8c303198188334a4e6a5f77cc90c3220772f9e";
};
- checkInputs = [ pytest mock ];
- propagatedBuildInputs = [ google_api_core ];
+ disabled = pythonOlder "3.5";
- checkPhase = ''
- pytest tests/unit
- '';
+ checkInputs = [ mock pytest-asyncio pytestCheckHook ];
+ propagatedBuildInputs = [ google_api_core libcst proto-plus ];
+
+ # Disable tests that require credentials
+ disabledTests = ["test_synthesize_speech" "test_list_voices"];
meta = with stdenv.lib; {
description = "Google Cloud Text-to-Speech API client library";
- homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python";
+ homepage = "https://github.com/googleapis/python-texttospeech";
license = licenses.asl20;
maintainers = [ maintainers.costrouc ];
};
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_trace/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_trace/default.nix
index 5b19243709f0..b0efb65d0d2f 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_trace/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_trace/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "google-cloud-trace";
- version = "0.24.0";
+ version = "1.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "0c342dbd9daf5375b3f8bb94302b7ea9a9946f76684e457a38ff0d420b3b6556";
+ sha256 = "1bd1ee5c274a584929913d9118134e01afe106644cb749ccc3111e1a38a96cd3";
};
checkInputs = [ pytest mock ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_translate/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_translate/default.nix
index f25f4badc815..60f9e3e11ae9 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_translate/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_translate/default.nix
@@ -1,12 +1,6 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-, google_api_core
-, google_cloud_core
-, grpcio
-, pytest
-, mock
-}:
+{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder
+, google_api_core, google_cloud_core, google_cloud_testutils, grpcio, libcst
+, mock, proto-plus, pytest-asyncio }:
buildPythonPackage rec {
pname = "google-cloud-translate";
@@ -17,18 +11,29 @@ buildPythonPackage rec {
sha256 = "ecdea3e176e80f606d08c4c7fd5acea6b3dd960f4b2e9a65951aaf800350a759";
};
+ disabled = pythonOlder "3.6";
+
# google_cloud_core[grpc] -> grpcio
- propagatedBuildInputs = [ google_api_core google_cloud_core grpcio ];
+ propagatedBuildInputs =
+ [ google_api_core google_cloud_core grpcio libcst proto-plus ];
+
+ checkInputs = [ google_cloud_testutils mock pytest-asyncio pytestCheckHook ];
+
+ # test_http.py broken, fix not yet released
+ # https://github.com/googleapis/python-translate/pull/69
+ disabledTests = [
+ "test_build_api_url_w_extra_query_params"
+ "test_build_api_url_no_extra_query_params"
+ "test_build_api_url_w_custom_endpoint"
+ ];
- checkInputs = [ pytest mock ];
- checkPhase = ''
- cd tests # prevent local google/__init__.py from getting loaded
- pytest unit -k 'not extra_headers'
+ preCheck = ''
+ rm -r google
'';
meta = with stdenv.lib; {
description = "Google Cloud Translation API client library";
- homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python";
+ homepage = "https://github.com/googleapis/python-translate";
license = licenses.asl20;
maintainers = [ maintainers.costrouc ];
};
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_videointelligence/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_videointelligence/default.nix
index d097132a347a..b823e105b843 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_videointelligence/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_videointelligence/default.nix
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "google-cloud-videointelligence";
- version = "1.16.0";
+ version = "2.0.0";
src = fetchPypi {
inherit pname version;
- sha256 = "de6fe53bdaf66aa8e2c1f34b26af24c479a876619b5c667d009fbd9700dd89f7";
+ sha256 = "02a91a25b3890a743bde21e03abddf11dcaf7966cc44f09bc8d507f2e28f15fa";
};
checkInputs = [ pytest mock ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_vision/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_vision/default.nix
index 585abc8cc48e..fd738a522661 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_vision/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_vision/default.nix
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "google-cloud-vision";
- version = "1.0.0";
+ version = "2.0.0";
src = fetchPypi {
inherit pname version;
- sha256 = "18e78b190c81d200ae4f6a46d4af57422d68b3b05b0540d5cd1806e3874142bf";
+ sha256 = "6a067d9a661df2e9b356b2772051decfea1971f8d659c246412a165baf827c61";
};
checkInputs = [ mock ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_websecurityscanner/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_websecurityscanner/default.nix
index a43f7fd5f9c2..356759f9bcb5 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_websecurityscanner/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/google_cloud_websecurityscanner/default.nix
@@ -1,10 +1,5 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-, google_api_core
-, pytest
-, mock
-}:
+{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder
+, google_api_core, libcst, mock, proto-plus, pytest-asyncio }:
buildPythonPackage rec {
pname = "google-cloud-websecurityscanner";
@@ -15,16 +10,14 @@ buildPythonPackage rec {
sha256 = "1de60f880487b898b499345f46f7acf38651f5356ebca8673116003a57f25393";
};
- checkInputs = [ pytest mock ];
- propagatedBuildInputs = [ google_api_core ];
+ disabled = pythonOlder "3.6";
- checkPhase = ''
- pytest tests/unit
- '';
+ checkInputs = [ mock pytest-asyncio pytestCheckHook ];
+ propagatedBuildInputs = [ google_api_core libcst proto-plus ];
meta = with stdenv.lib; {
description = "Google Cloud Web Security Scanner API client library";
- homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python";
+ homepage = "https://github.com/googleapis/python-websecurityscanner";
license = licenses.asl20;
maintainers = [ maintainers.costrouc ];
};
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/googlemaps/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/googlemaps/default.nix
new file mode 100644
index 000000000000..7e13aedec475
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/googlemaps/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub
+, requests
+, responses, pytestCheckHook, pytest, pytestcov, isPy27
+}:
+
+buildPythonPackage rec {
+ pname = "googlemaps";
+ version = "4.4.2";
+ disabled = isPy27;
+
+ src = fetchFromGitHub {
+ owner = "googlemaps";
+ repo = "google-maps-services-python";
+ rev = "v${version}";
+ sha256 = "DYhW1OGce/0gY7Jmwq6iM45PxLyXIYo4Cfg2u6Xuyg4=";
+ };
+
+ propagatedBuildInputs = [ requests ];
+
+ checkInputs = [ pytestCheckHook responses pytestcov ];
+
+ disabledTests = [
+ # touches network
+ "test_elevation_along_path_single"
+ "test_transit_without_time"
+ ];
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/googlemaps/google-maps-services-python";
+ description = "Python client library for Google Maps API Web Services";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ Scriptkiddi ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/gphoto2/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/gphoto2/default.nix
index d5ad49f349b1..2834fc5a735d 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/gphoto2/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/gphoto2/default.nix
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "gphoto2";
- version = "2.2.3";
+ version = "2.2.4";
src = fetchPypi {
inherit pname version;
- sha256 = "35d3ae97a9f13526746fb506de627a73328328528b436a51567fcb7e640883e9";
+ sha256 = "48b4c4ab70826d3ddaaf7440564d513c02d78680fa690994b0640d383ffb8a7d";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/gradient_sdk/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/gradient_sdk/default.nix
new file mode 100644
index 000000000000..3ee66a1c5242
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/gradient_sdk/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchPypi, buildPythonPackage
+, hyperopt
+}:
+
+buildPythonPackage rec {
+ pname = "gradient_sdk";
+ version = "0.0.4";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "Q9oeYjjgJf2lhxW1ypsweQAPpMglmW9PxgzMsgTqJkY=";
+ };
+
+ propagatedBuildInputs = [ hyperopt ];
+
+ pythonImportsCheck = [ "gradient_sdk" ];
+
+ meta = with stdenv.lib; {
+ description = "Gradient ML SDK";
+ homepage = "https://github.com/Paperspace/gradient-sdk";
+ license = licenses.mit;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ freezeboy ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/gradient_statsd/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/gradient_statsd/default.nix
new file mode 100644
index 000000000000..14623ff625f5
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/gradient_statsd/default.nix
@@ -0,0 +1,29 @@
+{ lib, stdenv, fetchPypi, buildPythonPackage
+, boto3, requests, datadog, configparser, python
+}:
+
+buildPythonPackage rec {
+ pname = "gradient_statsd";
+ version = "1.0.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "iWlNX43ZtvU73wz4+8DgDulQNOnssJGxTBkvAaLj530=";
+ };
+
+ propagatedBuildInputs = [ requests datadog ]
+ ++ lib.optional python.isPy2 configparser;
+
+ pythonImportsCheck = [ "gradient_statsd" ];
+
+ # Pypi does not contain tests
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ description = "Wrapper around the DogStatsd client";
+ homepage = "https://paperspace.com";
+ license = licenses.mit;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ freezeboy ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/graspy/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/graspologic/default.nix
index 0281e6a97341..4fd6ccf19c57 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/graspy/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/graspologic/default.nix
@@ -14,14 +14,14 @@
}:
buildPythonPackage rec {
- pname = "graspy";
+ pname = "graspologic";
version = "0.3";
disabled = isPy27;
src = fetchFromGitHub {
- owner = "neurodata";
- repo = pname;
+ owner = "microsoft";
+ repo = "graspologic";
rev = "v${version}";
sha256 = "0lab76qiryxvwl6zrcikhnxil1xywl0wkkm2vzi4v9mdzpa7w29r";
};
@@ -43,7 +43,7 @@ buildPythonPackage rec {
meta = with lib; {
homepage = "https://graspy.neurodata.io";
description = "A package for graph statistical algorithms";
- license = licenses.asl20;
+ license = licenses.asl20; # changing to `licenses.mit` in next release
maintainers = with maintainers; [ bcdarwin ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/green/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/green/default.nix
index 5ecf9a18ad50..8123f188d6e1 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/green/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/green/default.nix
@@ -8,13 +8,13 @@
buildPythonPackage rec {
pname = "green";
- version = "3.2.1";
+ version = "3.2.5";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "c5a90e247237ac7e320120961608cf65191134fa400d327cbd4d09864c880935";
+ sha256 = "11d595d98afc3363d79e237141ad862c0574a62f92325d9e541ed1b1a54a72ae";
};
propagatedBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/greenlet/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/greenlet/default.nix
index c325c9652491..9d00e93739c3 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/greenlet/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/greenlet/default.nix
@@ -8,12 +8,12 @@
buildPythonPackage rec {
pname = "greenlet";
- version = "0.4.16";
+ version = "0.4.17";
disabled = isPyPy; # builtin for pypy
src = fetchPypi {
inherit pname version;
- sha256 = "6e06eac722676797e8fce4adb8ad3dc57a1bb3adfb0dd3fdf8306c055a38456c";
+ sha256 = "0swdhrcq13bdszv3yz5645gi4ijbzmmhxpb6whcfg3d7d5f87n21";
};
propagatedBuildInputs = [ six ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/grpcio-tools/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/grpcio-tools/default.nix
index c60acb2d1f16..417b9d82e2e2 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/grpcio-tools/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/grpcio-tools/default.nix
@@ -2,13 +2,15 @@
buildPythonPackage rec {
pname = "grpcio-tools";
- version = "1.32.0";
+ version = "1.34.0";
src = fetchPypi {
inherit pname version;
- sha256 = "28547272c51e1d2d343685b9f531e85bb90ad7bd93e726ba646b5627173cbc47";
+ sha256 = "db5a6f0130256d534cbe35eab37d37a448d96f4fd736e5051c6be1aee49cea1d";
};
+ outputs = [ "out" "dev" ];
+
enableParallelBuilding = true;
propagatedBuildInputs = [ protobuf grpcio setuptools ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/grpcio/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/grpcio/default.nix
index 9311838627a1..55d569c90547 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/grpcio/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/grpcio/default.nix
@@ -6,6 +6,8 @@ buildPythonPackage rec {
inherit (grpc) src version;
pname = "grpcio";
+ outputs = [ "out" "dev" ];
+
nativeBuildInputs = [ cython pkgconfig ]
++ stdenv.lib.optional stdenv.isDarwin darwin.cctools;
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/gssapi/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/gssapi/default.nix
index 9013c7d978fd..e5149f6025ad 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/gssapi/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/gssapi/default.nix
@@ -17,14 +17,14 @@
buildPythonPackage rec {
pname = "gssapi";
- version = "1.6.9";
+ version = "1.6.10";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "pythongssapi";
repo = "python-${pname}";
rev = "v${version}";
- sha256 = "1shm3pc0l2r91qadkpq4bx45my0165nw3kdcp0gw4lk50z215hag";
+ sha256 = "11w8z9ik6zzv3pw3319mz91cgbfkgx0mffxbapqnhilzij2jad4q";
};
# It's used to locate headers
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/gst-python/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/gst-python/default.nix
index 00d05e189126..c66ceedc3cee 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/gst-python/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/gst-python/default.nix
@@ -4,17 +4,16 @@
, ninja
, stdenv
, pkgconfig
-, python
+, python3
, pygobject3
, gobject-introspection
, gst-plugins-base
, isPy3k
-, fetchpatch
}:
buildPythonPackage rec {
pname = "gst-python";
- version = "1.16.2";
+ version = "1.18.0";
format = "other";
@@ -22,14 +21,17 @@ buildPythonPackage rec {
src = fetchurl {
url = "${meta.homepage}/src/gst-python/${pname}-${version}.tar.xz";
- sha256 = "1a48ca66izmm8hnp608jv5isg3jxb0vlfmhns0bg9nbkilag7390";
+ sha256 = "0ifx2s2j24sj2w5jm7cxyg1kinnhbxiz4x0qp3gnsjlwbawfigvn";
};
+ # Python 2.x is not supported.
+ disabled = !isPy3k;
+
nativeBuildInputs = [
meson
ninja
pkgconfig
- python
+ python3
gobject-introspection
gst-plugins-base
];
@@ -39,24 +41,8 @@ buildPythonPackage rec {
pygobject3
];
- patches = stdenv.lib.optionals stdenv.isDarwin [
- # Fix configure python lib detection in macOS. Remove with the next release
- (fetchpatch {
- url = "https://github.com/GStreamer/gst-python/commit/f98c206bdf01529f8ea395a719b10baf2bdf717f.patch";
- sha256 = "04n4zrnfivgr7iaqw4sjlbd882s8halc2bbbhfxqf0sg2lqwmrxg";
- })
- ] ++ [
- # Fix linking against Python 3.8
- # https://gitlab.freedesktop.org/gstreamer/gst-python/merge_requests/30
- (fetchpatch {
- url = "https://gitlab.freedesktop.org/gstreamer/gst-python/commit/22f28155d86e27c4134de4ed2861264003fcfd23.patch";
- sha256 = "Y70qVguHUBmmRVMFBKAP0d6anBQw5W0TKyu2bAwxbQg=";
- })
- ];
-
mesonFlags = [
- "-Dpython=python${if isPy3k then "3" else "2"}"
- "-Dpygi-overrides-dir=${placeholder "out"}/${python.sitePackages}/gi/overrides"
+ "-Dpygi-overrides-dir=${placeholder "out"}/${python3.sitePackages}/gi/overrides"
];
doCheck = true;
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/gtts-token/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/gtts-token/default.nix
index d3443ef0c97e..f3325aab8e6e 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/gtts-token/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/gtts-token/default.nix
@@ -1,31 +1,35 @@
{ lib
, buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
, requests
+, pytestCheckHook
}:
buildPythonPackage rec {
pname = "gtts-token";
- version = "1.1.3";
+ version = "1.1.4";
- src = fetchPypi {
- pname = "gTTS-token";
- inherit version;
- sha256 = "9d6819a85b813f235397ef931ad4b680f03d843c9b2a9e74dd95175a4bc012c5";
+ src = fetchFromGitHub {
+ owner = "boudewijn26";
+ repo = "gTTS-token";
+ rev = "v${version}";
+ sha256 = "0vr52zc0jqyfvsccl67j1baims3cdx2is1y2lpx2kav9gadkn8hp";
};
propagatedBuildInputs = [
requests
];
- # Tests only in github repo, require working internet connection
- doCheck = false;
+ checkInputs = [ pytestCheckHook ];
+
+ # requires internet access
+ disabledTests = [ "test_real" ];
meta = with lib; {
description = "Calculates a token to run the Google Translate text to speech";
homepage = "https://github.com/boudewijn26/gTTS-token";
license = licenses.mit;
- maintainers = [ maintainers.makefu ];
+ maintainers = with maintainers; [ makefu ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/gtts/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/gtts/default.nix
index 934f3bd58202..0fc9d43dc2ce 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/gtts/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/gtts/default.nix
@@ -15,13 +15,13 @@
buildPythonPackage rec {
pname = "gtts";
- version = "2.1.1";
+ version = "2.2.1";
src = fetchFromGitHub {
owner = "pndurette";
repo = "gTTS";
rev = "v${version}";
- sha256 = "1d0r6dnb8xvgyvxz7nfj4q4xqmpmvcwcsjghxrh76m6p364lh1hj";
+ sha256 = "1a984691kfin1n896p5l7y8ggjzx19ynih2cw040smfms0azhp4w";
};
propagatedBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/gym/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/gym/default.nix
index 482b2c64aae2..d826fc33324f 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/gym/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/gym/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "gym";
- version = "0.17.2";
+ version = "0.17.3";
src = fetchPypi {
inherit pname version;
- sha256 = "bb495aa56995b01274a2213423bf5ba05b8f4fd51c6dc61e9d4abddd1189718e";
+ sha256 = "96a7dd4e9cdb39e30c7a79e5773570fd9408f7fdb58c714c293cfbb314818eb6";
};
postPatch = ''
@@ -26,7 +26,7 @@ buildPythonPackage rec {
# The test needs MuJoCo that is not free library.
doCheck = false;
- pythonImportCheck = [ "gym" ];
+ pythonImportsCheck = [ "gym" ];
meta = with lib; {
description = "A toolkit by OpenAI for developing and comparing your reinforcement learning agents";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/h2/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/h2/default.nix
index 6d432fed0e4e..7597abbe0f9e 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/h2/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/h2/default.nix
@@ -1,17 +1,19 @@
{ stdenv, buildPythonPackage, fetchPypi
-, enum34, hpack, hyperframe }:
+, enum34, hpack, hyperframe, pytestCheckHook, hypothesis }:
buildPythonPackage rec {
pname = "h2";
- version = "3.2.0";
+ version = "4.0.0";
src = fetchPypi {
inherit pname version;
- sha256 = "051gg30aca26rdxsmr9svwqm06pdz9bv21ch4n0lgi7jsvml2pw7";
+ sha256 = "bb7ac7099dd67a857ed52c815a6192b6b1f5ba6b516237fc24a085341340593d";
};
propagatedBuildInputs = [ enum34 hpack hyperframe ];
+ checkInputs = [ pytestCheckHook hypothesis ];
+
meta = with stdenv.lib; {
description = "HTTP/2 State-Machine based protocol implementation";
homepage = "http://hyper.rtfd.org/";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/h3/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/h3/default.nix
index a9a0944459a1..e0d6ffce6531 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/h3/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/h3/default.nix
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "h3";
- version = "3.6.4";
+ version = "3.7.0";
src = fetchPypi {
inherit pname version;
- sha256 = "416e35d736ef6ec9c1f73b9d4a9d5c696cc2a7561811f8bcfa08c8c4912f2289";
+ sha256 = "cd27fc8ecd9183f93934079b7c986401f499030ff2e2171eace9de462fab561d";
};
patches = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/h5py/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/h5py/default.nix
index 8cb6b8c22f53..a9ebdc5dfe88 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/h5py/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/h5py/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchPypi, isPy27, python, buildPythonPackage
+{ stdenv, fetchPypi, isPy27, python, buildPythonPackage, pythonOlder
, numpy, hdf5, cython, six, pkgconfig, unittest2, fetchpatch
-, mpi4py ? null, openssh, pytest }:
+, mpi4py ? null, openssh, pytestCheckHook, cached-property }:
assert hdf5.mpiSupport -> mpi4py != null && hdf5.mpi == mpi4py.mpi;
@@ -10,20 +10,25 @@ let
mpi = hdf5.mpi;
mpiSupport = hdf5.mpiSupport;
in buildPythonPackage rec {
- version = "2.10.0";
+ version = "3.1.0";
pname = "h5py";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "84412798925dc870ffd7107f045d7659e60f5d46d1c70c700375248bf6bf512d";
+ sha256 = "1e2516f190652beedcb8c7acfa1c6fa92d99b42331cbef5e5c7ec2d65b0fc3c2";
};
- configure_flags = "--hdf5=${hdf5}" + optionalString mpiSupport " --mpi";
+ # avoid strict pinning of numpy
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace "numpy ==" "numpy >="
+ '';
- postConfigure = ''
- ${python.executable} setup.py configure ${configure_flags}
+ HDF5_DIR = "${hdf5}";
+ HDF5_MPI = if mpiSupport then "ON" else "OFF";
+ postConfigure = ''
# Needed to run the tests reliably. See:
# https://bitbucket.org/mpi4py/mpi4py/issues/87/multiple-test-errors-with-openmpi-30
${optionalString mpiSupport "export OMPI_MCA_rmaps_base_oversubscribe=yes"}
@@ -31,12 +36,17 @@ in buildPythonPackage rec {
preBuild = if mpiSupport then "export CC=${mpi}/bin/mpicc" else "";
- checkInputs = optional isPy27 unittest2 ++ [ pytest openssh ];
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ hdf5 cython ]
+ # tests now require pytest-mpi, which isn't available and difficult to package
+ doCheck = false;
+ checkInputs = optional isPy27 unittest2 ++ [ pytestCheckHook openssh ];
+ nativeBuildInputs = [ pkgconfig cython ];
+ buildInputs = [ hdf5 ]
++ optional mpiSupport mpi;
propagatedBuildInputs = [ numpy six]
- ++ optionals mpiSupport [ mpi4py openssh ];
+ ++ optionals mpiSupport [ mpi4py openssh ]
+ ++ optionals (pythonOlder "3.8") [ cached-property ];
+
+ pythonImportsCheck = [ "h5py" ];
meta = {
description =
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/ha-ffmpeg/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/ha-ffmpeg/default.nix
index cf119c1dec56..01d0343b171f 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/ha-ffmpeg/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/ha-ffmpeg/default.nix
@@ -3,13 +3,13 @@
buildPythonPackage rec {
pname = "ha-ffmpeg";
- version = "2.0";
+ version = "3.0.2";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "230f2fa990c9caaff1c67c2227b64756062248083849651a9bec7d599e519a42";
+ sha256 = "8d92f2f5790da038d828ac862673e0bb43e8e972e4c70b1714dd9a0fb776c8d1";
};
buildInputs = [ ffmpeg_3 ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/hass-nabucasa/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/hass-nabucasa/default.nix
index 61c63b28ab60..1739183c3a81 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/hass-nabucasa/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/hass-nabucasa/default.nix
@@ -4,13 +4,13 @@
buildPythonPackage rec {
pname = "hass-nabucasa";
- version = "0.34.6";
+ version = "0.37.2";
src = fetchFromGitHub {
owner = "nabucasa";
repo = pname;
rev = version;
- sha256 = "1lkqwj58qr0vn7zf5mhrhaz973ahj9wjp4mgzvyja1gcdh6amv34";
+ sha256 = "0gv8p9nba7269qhc05ds0i79wz4419qjfhn7k9kcngfj1yngb6dm";
};
postPatch = ''
@@ -18,24 +18,12 @@ buildPythonPackage rec {
sed -i 's/"cryptography.*"/"cryptography"/' setup.py
'';
- patches = [
- # relax pytz dependency
- (fetchpatch {
- url = "https://github.com/NabuCasa/hass-nabucasa/commit/419e80feddc36c68384c032feda0057515b53eaa.patch";
- sha256 = "14dgwci8615cwcf27hg7b42s7da50xhyjys3yx446q7ipk8zw4x6";
- })
- ];
-
propagatedBuildInputs = [
acme aiohttp atomicwrites snitun attrs warrant pycognito
];
checkInputs = [ pytest pytest-aiohttp asynctest ];
- # Asynctest's mocking is broken with python3.8
- # https://github.com/Martiusweb/asynctest/issues/132
- doCheck = pythonOlder "3.8";
-
checkPhase = ''
pytest tests/
'';
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/hawkauthlib/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/hawkauthlib/default.nix
index a819bca362db..1a8ddacdd690 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/hawkauthlib/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/hawkauthlib/default.nix
@@ -1,6 +1,6 @@
{ stdenv
, buildPythonPackage
-, fetchgit
+, fetchFromGitHub
, requests
, webob
}:
@@ -9,8 +9,9 @@ buildPythonPackage rec {
pname = "hawkauthlib";
version = "0.1.1";
- src = fetchgit {
- url = "https://github.com/mozilla-services/hawkauthlib.git";
+ src = fetchFromGitHub {
+ owner = "mozilla-services";
+ repo = pname;
rev = "refs/tags/v${version}";
sha256 = "0mr1mpx4j9q7sch9arwfvpysnpf2p7ijy7072wilxm8pnj0bwvsi";
};
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/hbmqtt/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/hbmqtt/default.nix
index b00e3a88d3e9..76ae5718024a 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/hbmqtt/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/hbmqtt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy3k
+{ stdenv, buildPythonPackage, fetchPypi, isPy3k, setuptools
, transitions, websockets, passlib, docopt, pyyaml, nose }:
buildPythonPackage rec {
@@ -12,7 +12,9 @@ buildPythonPackage rec {
sha256 = "1n9c8yj11npiq9qxivwmfhib1qkjpcyw42a7q0w641bdrz3x6r37";
};
- propagatedBuildInputs = [ transitions websockets passlib docopt pyyaml ];
+ propagatedBuildInputs = [
+ transitions websockets passlib docopt pyyaml setuptools
+ ];
postPatch = ''
# test tries to bind same port multiple times and fails
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/hcloud/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/hcloud/default.nix
index 9a99fb0953a2..8f9d69a8941d 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/hcloud/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/hcloud/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "hcloud";
- version = "1.9.1";
+ version = "1.10.0";
src = fetchPypi {
inherit pname version;
- sha256 = "069bf78a3c6cd642aae0b1a562b443d2670e6d73d507ce77cbf8a2c16974ca29";
+ sha256 = "11sdyays90lmkbdxhllc8ccx0xhrafb7dknqgjlrfpzq04v67vyy";
};
propagatedBuildInputs = [ future requests python-dateutil ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/hg-evolve/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/hg-evolve/default.nix
index 14cace859e92..434c6ffba2b9 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/hg-evolve/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/hg-evolve/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "hg-evolve";
- version = "10.0.2";
+ version = "10.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "75892623258339613528df45dcd1004786bf73e8d95407886d79bc4567fbde4d";
+ sha256 = "a386e6ee2d9a0e332a49f1cb210c4c11ba9844bcd52808270f48e688314783d8";
};
doCheck = false;
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/hidapi/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/hidapi/default.nix
index 9e9e965d3368..856a36f77916 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/hidapi/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/hidapi/default.nix
@@ -2,16 +2,16 @@
buildPythonPackage rec {
pname = "hidapi";
- version = "0.9.0.post3";
+ version = "0.10.1";
src = fetchPypi {
inherit pname version;
- sha256 = "5a2442928f17ba742d9c53073f48b152051c5747d758d2fefd937543da5ab2e5";
+ sha256 = "a1170b18050bc57fae3840a51084e8252fd319c0fc6043d68c8501deb0e25846";
};
propagatedBuildInputs =
stdenv.lib.optionals stdenv.isLinux [ libusb1 udev ] ++
- stdenv.lib.optionals stdenv.isDarwin [ darwin.IOKit darwin.apple_sdk.frameworks.CoreFoundation ] ++
+ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit CoreFoundation IOKit ]) ++
[ cython ];
# Fix the USB backend library lookup
@@ -26,11 +26,11 @@ buildPythonPackage rec {
pythonImportsCheck = [ "hid" ];
meta = with stdenv.lib; {
- description = "A Cython interface to the hidapi from https://github.com/signal11/hidapi";
+ description = "A Cython interface to the hidapi from https://github.com/libusb/hidapi";
homepage = "https://github.com/trezor/cython-hidapi";
# license can actually be either bsd3 or gpl3
# see https://github.com/trezor/cython-hidapi/blob/master/LICENSE-orig.txt
license = licenses.bsd3;
- maintainers = with maintainers; [ np ];
+ maintainers = with maintainers; [ np prusnak ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/hjson/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/hjson/default.nix
new file mode 100644
index 000000000000..6a86a2000d2c
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/hjson/default.nix
@@ -0,0 +1,24 @@
+{ stdenv
+, buildPythonPackage
+, fetchFromGitHub
+}:
+
+buildPythonPackage rec {
+ pname = "hjson";
+ version = "3.0.2";
+
+ # N.B. pypi src tarball does not have tests
+ src = fetchFromGitHub {
+ owner = "hjson";
+ repo = "hjson-py";
+ rev = "v${version}";
+ sha256 = "1jc7j790rcqnhbrfj4lhnz3f6768dc55aij840wmx16jylfqpc2n";
+ };
+
+ meta = with stdenv.lib; {
+ description = "A user interface for JSON";
+ homepage = "https://github.com/hjson/hjson-py";
+ license = licenses.mit;
+ maintainers = with maintainers; [ bhipple ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/hmmlearn/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/hmmlearn/default.nix
index c92c707d9072..909606c25ebf 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/hmmlearn/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/hmmlearn/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "hmmlearn";
- version = "0.2.3";
+ version = "0.2.4";
src = fetchurl {
url = "mirror://pypi/h/hmmlearn/${pname}-${version}.tar.gz";
- sha256 = "8003d5dc55612de8016156abdc7aa1dd995abc2431adb1ef33dd84a6d29e56bf";
+ sha256 = "0f5cb598a7494b9703c6188246dc89e529d46cbb6700eca70cc895085f0b3cc3";
};
buildInputs = [ setuptools_scm cython ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/holoviews/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/holoviews/default.nix
index 287216cc949a..4d9da17bd3a9 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/holoviews/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/holoviews/default.nix
@@ -15,11 +15,11 @@
buildPythonPackage rec {
pname = "holoviews";
- version = "1.13.4";
+ version = "1.13.5";
src = fetchPypi {
inherit pname version;
- sha256 = "34dc09dfb557f79515a011a72b343daf31b5e5d67403a008dded59bab658267c";
+ sha256 = "3f8a00ce1cc67a388a3a949441accd7e7e9ca9960ba16b49ee96a50305105a01";
};
propagatedBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/hpack/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/hpack/default.nix
index a10882417fc0..36578856286f 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/hpack/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/hpack/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "hpack";
- version = "3.0.0";
+ version = "4.0.0";
src = fetchPypi {
inherit pname version;
- sha256 = "8eec9c1f4bfae3408a3f30500261f7e6a65912dc138526ea054f9ad98892e9d2";
+ sha256 = "fc41de0c63e687ebffde81187a948221294896f6bdc0ae2312708df339430095";
};
meta = with stdenv.lib; {
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/httpbin/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/httpbin/default.nix
index cf937b6bae3f..cf5891ed0ee2 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/httpbin/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/httpbin/default.nix
@@ -3,7 +3,6 @@
, fetchPypi
, fetchpatch
, flask
-, flask-common
, flask-limiter
, markupsafe
, decorator
@@ -15,24 +14,14 @@
buildPythonPackage rec {
pname = "httpbin";
- version = "0.6.2";
+ version = "0.7.0";
src = fetchPypi {
inherit pname version;
- sha256 = "0afa0486a76305cac441b5cc80d5d4ccd82b20875da7c5119ecfe616cefef45f";
+ sha256 = "1yldvf3585zcwj4vxvfm4yr9wwlz3pa2mx2pazqz8x8mr687gcyb";
};
- patches = [
- # https://github.com/kennethreitz/httpbin/issues/403
- # https://github.com/kennethreitz/flask-common/issues/7
- # https://github.com/evansd/whitenoise/issues/166
- (fetchpatch {
- url = "https://github.com/javabrett/httpbin/commit/5735c888e1e51b369fcec41b91670a90535e661e.patch";
- sha256 = "167h8mscdjagml33dyqk8nziiz3dqbggnkl6agsirk5270nl5f7q";
- })
- ];
-
- propagatedBuildInputs = [ brotlipy flask flask-common flask-limiter markupsafe decorator itsdangerous raven six ];
+ propagatedBuildInputs = [ brotlipy flask flask-limiter markupsafe decorator itsdangerous raven six ];
# No tests
doCheck = false;
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/httpcore/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/httpcore/default.nix
index 9ac9b76d2e36..aa15c2555e67 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/httpcore/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/httpcore/default.nix
@@ -1,34 +1,52 @@
-{ stdenv
+{ lib
, buildPythonPackage
+, pythonOlder
, fetchFromGitHub
-, isPy27
, h11
+, h2
+, pproxy
+, pytestCheckHook
+, pytestcov
, sniffio
+, uvicorn
}:
buildPythonPackage rec {
pname = "httpcore";
- version = "0.10.2";
- disabled = isPy27;
+ version = "0.12.0";
+ disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "encode";
repo = pname;
rev = version;
- sha256 = "00gn8nfv814rg6fj7xv97mrra3fvx6fzjcgx9y051ihm6hxljdsi";
+ sha256 = "0bwxn7m7r7h6k41swxj0jqj3nzi76wqxwbnry6y7d4qfh4m26g2j";
};
- propagatedBuildInputs = [ h11 sniffio ];
+ propagatedBuildInputs = [
+ h11
+ h2
+ sniffio
+ ];
+
+ checkInputs = [
+ pproxy
+ pytestCheckHook
+ pytestcov
+ uvicorn
+ ];
+
+ pytestFlagsArray = [
+ # these tests fail during dns lookups: httpcore.ConnectError: [Errno -2] Name or service not known
+ "--ignore=tests/sync_tests/test_interfaces.py"
+ ];
- # tests require pythonic access to mitmproxy, which isn't (yet?) packaged as
- # a pythonPackage.
- doCheck = false;
pythonImportsCheck = [ "httpcore" ];
- meta = with stdenv.lib; {
- description = "A minimal HTTP client";
+ meta = with lib; {
+ description = "A minimal low-level HTTP client";
homepage = "https://github.com/encode/httpcore";
license = licenses.bsd3;
- maintainers = [ maintainers.ris ];
+ maintainers = with maintainers; [ ris ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/httpretty/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/httpretty/default.nix
index 895a28356ee5..0d061df86bf7 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/httpretty/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/httpretty/default.nix
@@ -19,7 +19,7 @@
buildPythonPackage rec {
pname = "httpretty";
- version = "1.0.2";
+ version = "1.0.3";
# drop this for version > 0.9.7
# Flaky tests: https://github.com/gabrielfalcao/HTTPretty/pull/394
@@ -27,7 +27,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "24a6fd2fe1c76e94801b74db8f52c0fb42718dc4a199a861b305b1a492b9d868";
+ sha256 = "9335cbd8f38745e0e2dc4755d8932a77d378d93e15804969504b1e6b568d613c";
};
propagatedBuildInputs = [ six ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/httpx/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/httpx/default.nix
index 5361e047207a..1f527b47ec08 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/httpx/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/httpx/default.nix
@@ -1,71 +1,61 @@
{ lib
, buildPythonPackage
+, pythonOlder
, fetchFromGitHub
-, fetchpatch
+, brotli
, certifi
-, chardet
-, h11
, h2
, httpcore
-, idna
, rfc3986
, sniffio
-, isPy27
-, pytest
+, pytestCheckHook
, pytest-asyncio
, pytest-trio
, pytestcov
, trustme
, uvicorn
-, brotli
}:
buildPythonPackage rec {
pname = "httpx";
- version = "0.14.2";
- disabled = isPy27;
+ version = "0.16.1";
+ disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "encode";
repo = pname;
rev = version;
- sha256 = "08b6k5g8car3bic90aw4ysb2zvsa5nm8qk3hk4dgamllnnxzl5br";
+ sha256 = "00gmq45fckcqkj910bvd7pyqz1mvgsdvz4s0k7dzbnc5czzq1f4a";
};
- patches = [
- (fetchpatch {
- name = "fix-cookie-test-timestamp.patch";
- url = "https://github.com/encode/httpx/pull/1270.patch";
- sha256 = "1hgrynac6226sgnyzmsr1nr15rn49gbfmk4c2kx3dwkbh6vr7jpd";
- })
- ];
-
propagatedBuildInputs = [
+ brotli
certifi
- chardet
- h11
h2
httpcore
- idna
rfc3986
sniffio
];
checkInputs = [
- pytest
+ pytestCheckHook
pytest-asyncio
pytest-trio
pytestcov
trustme
uvicorn
- brotli
];
- checkPhase = ''
- PYTHONPATH=.:$PYTHONPATH pytest -k 'not (test_connect_timeout or test_elapsed_timer)'
- '';
pythonImportsCheck = [ "httpx" ];
+ disabledTests = [
+ # httpcore.ConnectError: [Errno 101] Network is unreachable
+ "test_connect_timeout"
+ # httpcore.ConnectError: [Errno -2] Name or service not known
+ "test_async_proxy_close"
+ "test_sync_proxy_close"
+ ];
+
meta = with lib; {
description = "The next generation HTTP client";
homepage = "https://github.com/encode/httpx";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/humanize/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/humanize/default.nix
index 4676c300471d..70ac0297b739 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/humanize/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/humanize/default.nix
@@ -7,13 +7,13 @@
}:
buildPythonPackage rec {
- version = "2.6.0";
+ version = "3.1.0";
pname = "humanize";
disabled = isPy27; # setup.py no longer compatible
src = fetchPypi {
inherit pname version;
- sha256 = "8ee358ea6c23de896b9d1925ebe6a8504bb2ba7e98d5ccf4d07ab7f3b28f3819";
+ sha256 = "fd3eb915310335c63a54d4507289ecc7b3a7454cd2c22ac5086d061a3cbfd592";
};
nativeBuildInputs = [ setuptools_scm ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/hvplot/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/hvplot/default.nix
index d787b6113355..aaad8f2b1dec 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/hvplot/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/hvplot/default.nix
@@ -18,11 +18,11 @@
buildPythonPackage rec {
pname = "hvplot";
- version = "0.6.0";
+ version = "0.7.0";
src = fetchPypi {
inherit pname version;
- sha256 = "8fcf2f251bd9d4b0390d9c272c992aa75e11174829e416a22de8fba38acc1ce9";
+ sha256 = "1c709bebb737ebd71a0433f2333ed15f03dd3c431d4646c41c2b9fcbae4a29b7";
};
nativeBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/hwi/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/hwi/default.nix
index de9c7995bde9..6431791d65e6 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/hwi/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/hwi/default.nix
@@ -14,11 +14,11 @@
buildPythonPackage rec {
pname = "hwi";
- version = "1.1.2";
+ version = "1.2.1";
src = fetchPypi {
inherit pname version;
- sha256 = "eec460a51eb556500c1eca92015be246d5714cd53171407a76da71e4346048ae";
+ sha256 = "d0d220a4967d7f106b828b12a98b78c220d609d7cc6c811898e24fcf1a6f04f3";
};
propagatedBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/hyperframe/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/hyperframe/default.nix
index a8f847c53bb1..2c6796ca6d0c 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/hyperframe/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/hyperframe/default.nix
@@ -1,13 +1,16 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook }:
+
buildPythonPackage rec {
pname = "hyperframe";
- version = "5.2.0";
+ version = "6.0.0";
src = fetchPypi {
inherit pname version;
- sha256 = "a9f5c17f2cc3c719b917c4f33ed1c61bd1f8dfac4b1bd23b7c80b3400971b41f";
+ sha256 = "742d2a4bc3152a340a49d59f32e33ec420aa8e7054c1444ef5c7efff255842f1";
};
+ checkInputs = [ pytestCheckHook ];
+
meta = with stdenv.lib; {
description = "HTTP/2 framing layer for Python";
homepage = "http://hyper.rtfd.org/";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/hyperopt/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/hyperopt/default.nix
new file mode 100644
index 000000000000..16599214ede7
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/hyperopt/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchPypi, buildPythonPackage
+, cloudpickle, numpy, future, networkx
+, six, tqdm, scipy, pymongo
+}:
+
+buildPythonPackage rec {
+ pname = "hyperopt";
+ version = "0.2.5";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "bc6047d50f956ae64eebcb34b1fd40f186a93e214957f20e87af2f10195295cc";
+ };
+
+ propagatedBuildInputs = [ future cloudpickle numpy networkx six tqdm scipy pymongo ];
+
+ # tries to use /homeless-shelter to mimic container usage, etc
+ doCheck = false;
+
+ pythonImportsCheck = [ "hyperopt" ];
+
+ meta = with stdenv.lib; {
+ description = "Distributed Asynchronous Hyperparameter Optimization";
+ homepage = "http://hyperopt.github.com/hyperopt/";
+ license = licenses.bsd2;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ freezeboy ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/identify/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/identify/default.nix
index 3385e5bfc9ec..833e1e3dd29e 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/identify/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/identify/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "identify";
- version = "1.5.6";
+ version = "1.5.10";
src = fetchPypi {
inherit pname version;
- sha256 = "969d844b7a85d32a5f9ac4e163df6e846d73c87c8b75847494ee8f4bd2186421";
+ sha256 = "943cd299ac7f5715fcb3f684e2fc1594c1e0f22a90d15398e5888143bd4144b5";
};
# Tests not included in PyPI tarball
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/ifcopenshell/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/ifcopenshell/default.nix
new file mode 100644
index 000000000000..16ee8dcbace8
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/ifcopenshell/default.nix
@@ -0,0 +1,67 @@
+{ stdenv
+, buildPythonPackage
+, fetchFromGitHub
+, substituteAll
+, python
+, gcc10
+, cmake
+, boost172
+, icu
+, swig
+, pcre
+, opencascade-occt
+, opencollada
+, libxml2
+}:
+
+buildPythonPackage rec {
+ pname = "ifcopenshell";
+ version = "0.6.0b0";
+ format = "other";
+
+ src = fetchFromGitHub {
+ owner = "IfcOpenShell";
+ repo = "IfcOpenShell";
+ rev = "v${version}";
+ fetchSubmodules = true;
+ sha256 = "1ad1s9az41z2f46rbi1jnr46mgc0q4h5kz1jm9xdlwifqv9y04g1";
+ };
+
+ patches = [
+ (substituteAll {
+ name = "site-packages.patch";
+ src = ./site-packages.patch;
+ site_packages = "lib/${python.libPrefix}/site-packages";
+ })
+ ];
+
+ nativeBuildInputs = [ gcc10 cmake ];
+
+ buildInputs = [
+ boost172
+ icu
+ pcre
+ libxml2
+ ];
+
+ preConfigure = ''
+ cd cmake
+ '';
+
+ cmakeFlags = [
+ "-DOCC_INCLUDE_DIR=${opencascade-occt}/include/opencascade"
+ "-DOCC_LIBRARY_DIR=${opencascade-occt}/lib"
+ "-DOPENCOLLADA_INCLUDE_DIR=${opencollada}/include/opencollada"
+ "-DOPENCOLLADA_LIBRARY_DIR=${opencollada}/lib/opencollada"
+ "-DSWIG_EXECUTABLE=${swig}/bin/swig"
+ "-DLIBXML2_INCLUDE_DIR=${libxml2.dev}/include/libxml2"
+ "-DLIBXML2_LIBRARIES=${libxml2.out}/lib/${if stdenv.isDarwin then "libxml2.dylib" else "libxml2.so"}"
+ ];
+
+ meta = with stdenv.lib; {
+ description = "Open source IFC library and geometry engine";
+ homepage = http://ifcopenshell.org/;
+ license = licenses.lgpl3;
+ maintainers = with maintainers; [ fehnomenal ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/ifcopenshell/site-packages.patch b/infra/libkookie/nixpkgs/pkgs/development/python-modules/ifcopenshell/site-packages.patch
new file mode 100644
index 000000000000..e61fe2056f7b
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/ifcopenshell/site-packages.patch
@@ -0,0 +1,32 @@
+--- a/src/ifcwrap/CMakeLists.txt
++++ b/src/ifcwrap/CMakeLists.txt
+@@ -68,26 +68,17 @@ endif()
+ # directory in which the wrapper can be installed.
+ FIND_PACKAGE(PythonInterp)
+ IF(PYTHONINTERP_FOUND AND NOT "${PYTHON_EXECUTABLE}" STREQUAL "")
+- EXECUTE_PROCESS(
+- COMMAND ${PYTHON_EXECUTABLE} -c "import sys; from distutils.sysconfig import get_python_lib; sys.stdout.write(get_python_lib(1))"
+- OUTPUT_VARIABLE python_package_dir
+- )
+-
+- IF("${python_package_dir}" STREQUAL "")
+- MESSAGE(WARNING "Unable to locate Python site-package directory, unable to install the Python wrapper")
+- ELSE()
+ FILE(GLOB_RECURSE sourcefiles "${CMAKE_CURRENT_SOURCE_DIR}/../ifcopenshell-python/ifcopenshell/*.py")
+ FOREACH(file ${sourcefiles})
+ FILE(RELATIVE_PATH relative "${CMAKE_CURRENT_SOURCE_DIR}/../ifcopenshell-python/ifcopenshell/" "${file}")
+ GET_FILENAME_COMPONENT(dir "${relative}" DIRECTORY)
+ INSTALL(FILES "${file}"
+- DESTINATION "${python_package_dir}/ifcopenshell/${dir}")
++ DESTINATION "@site_packages@/ifcopenshell/${dir}")
+ ENDFOREACH()
+ INSTALL(FILES "${CMAKE_BINARY_DIR}/ifcwrap/ifcopenshell_wrapper.py"
+- DESTINATION "${python_package_dir}/ifcopenshell")
++ DESTINATION "@site_packages@/ifcopenshell")
+ INSTALL(TARGETS _ifcopenshell_wrapper
+- DESTINATION "${python_package_dir}/ifcopenshell")
+- ENDIF()
++ DESTINATION "@site_packages@/ifcopenshell")
+ ELSE()
+ MESSAGE(WARNING "No Python interpreter found, unable to install the Python wrapper")
+ ENDIF()
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/ignite/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/ignite/default.nix
index 785ec5814918..307c25e724ee 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/ignite/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/ignite/default.nix
@@ -1,7 +1,9 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
-, pytest
+, pytestCheckHook
+, pytest_xdist
+, pythonOlder
, matplotlib
, mock
, pytorch
@@ -12,23 +14,45 @@
buildPythonPackage rec {
pname = "ignite";
- version = "0.3.0";
+ version = "0.4.2";
src = fetchFromGitHub {
owner = "pytorch";
repo = pname;
rev = "v${version}";
- sha256 = "0i863kxi1r1hspj19lhn6r8256vdazjcyvis0s33fgzrf7kxi08x";
+ sha256 = "00vcmhnp14s54g386izgaxzrdr2nqv3pz9nvpyiwrn33zawr308z";
};
- checkInputs = [ pytest matplotlib mock ];
+ checkInputs = [ pytestCheckHook matplotlib mock pytest_xdist ];
propagatedBuildInputs = [ pytorch scikitlearn tqdm pynvml ];
+ # runs succesfully in 3.9, however, async isn't correctly closed so it will fail after test suite.
+ doCheck = pythonOlder "3.9";
+
# Some packages are not in NixPkgs; other tests try to build distributed
# models, which doesn't work in the sandbox.
- checkPhase = ''
- pytest -k 'not visdom and not tensorboard and not mlflow and not polyaxon and not conftest and not engines and not distrib_' tests/
- '';
+ # avoid tests which need special packages
+ pytestFlagsArray = [
+ "--ignore=tests/ignite/contrib/handlers/test_trains_logger.py"
+ "--ignore=tests/ignite/metrics/test_dill.py"
+ "--ignore=tests/ignite/metrics/test_ssim.py"
+ "tests/"
+ ];
+
+ # disable tests which need specific packages
+ disabledTests = [
+ "idist"
+ "tensorboard"
+ "mlflow"
+ "trains"
+ "visdom"
+ "test_setup_neptune"
+ "test_output_handler" # needs mlflow
+ "test_integration"
+ "test_pbar" # slight output differences
+ "test_write_results"
+ "test_setup_plx"
+ ];
meta = with lib; {
description = "High-level training library for PyTorch";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/ijson/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/ijson/default.nix
index d877c0983540..8dc22d20e69a 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/ijson/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/ijson/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "ijson";
- version = "3.1.1";
+ version = "3.1.3";
src = fetchPypi {
inherit pname version;
- sha256 = "815e9ce9d2de7ddd58ba01834d8f55790b7daddbac6c844cba0fc459b7d5005a";
+ sha256 = "d29977f7235b5bf83c372825c6abd8640ba0e3a8e031d3ffc3b63deaf6ae1487";
};
doCheck = false; # something about yajl
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/imagecorruptions/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/imagecorruptions/default.nix
index 3ebd22ffeb25..f652ac60ce1b 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/imagecorruptions/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/imagecorruptions/default.nix
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "imagecorruptions";
- version = "1.1.0";
+ version = "1.1.1";
src = fetchPypi {
inherit pname version;
- sha256 = "14j8x6axnyrn6y7bsjyh4yqm7af68mqpxy7gg2xh3d577d852zgm";
+ sha256 = "011e7c84a01f3e41465e5ad1ee48291cd6fd8032f45c836c5ddaad6e09fe0ae2";
};
postPatch = ''
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/imantics/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/imantics/default.nix
new file mode 100644
index 000000000000..59eb3afaa0ec
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/imantics/default.nix
@@ -0,0 +1,46 @@
+{ buildPythonPackage
+, fetchFromGitHub
+, lib
+, numpy
+, opencv3
+, sphinx_rtd_theme
+, lxml
+, xmljson
+}:
+
+buildPythonPackage rec {
+ pname = "imantics";
+ version = "0.1.12";
+
+ src = fetchFromGitHub {
+ owner = "jsbroks";
+ repo = "imantics";
+ rev = "76d81036d8f92854d63ad9938dd76c718f8b482e";
+ sha256 = "1zv2gj8cbakhh2fyr2611cbqhfk37a56x973ny9n43y70n26pzm8";
+ };
+
+ propagatedBuildInputs = [
+ numpy
+ opencv3
+ sphinx_rtd_theme
+ lxml
+ xmljson
+ ];
+
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace "'opencv-python>=3'," ""
+ '';
+
+ # failing on NixOS
+ doCheck = false;
+
+ pythonImportsCheck = [ "imantics" ];
+
+ meta = with lib; {
+ description = "Convert and visualize many annotation formats for object dectection and localization";
+ homepage = "https://github.com/jsbroks/imantics";
+ license = with licenses; [ mit ];
+ maintainers = [ maintainers.rakesh4g ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/imdbpy/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/imdbpy/default.nix
new file mode 100644
index 000000000000..dea62f080093
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/imdbpy/default.nix
@@ -0,0 +1,25 @@
+{ lib, buildPythonPackage, fetchPypi, lxml, sqlalchemy }:
+
+buildPythonPackage rec {
+ pname = "IMDbPY";
+ version = "2020.9.25";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1p3j9j1jcgbw4626cvgpryhvczy9gzlg0laz6lflgq17m129gin2";
+ };
+
+ patches = [ ./sql_error.patch ]; # Already fixed in master, but not yet in the current release. This can be removed upon the next version update
+
+ propagatedBuildInputs = [ lxml sqlalchemy ];
+
+ doCheck = false; # Tests require networking, and https://github.com/alberanid/imdbpy/issues/240
+ pythonImportsCheck = [ "imdb" ];
+
+ meta = with lib; {
+ homepage = "https://imdbpy.github.io/";
+ description = "A Python package for retrieving and managing the data of the IMDb database";
+ maintainers = [ maintainers.ivar ];
+ license = licenses.gpl2Only;
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/imdbpy/sql_error.patch b/infra/libkookie/nixpkgs/pkgs/development/python-modules/imdbpy/sql_error.patch
new file mode 100644
index 000000000000..10770f4f1135
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/imdbpy/sql_error.patch
@@ -0,0 +1,39 @@
+diff --git a/imdb/parser/sql/__init__.py b/imdb/parser/sql/__init__.py
+index cd4a3e3..3fcfdd4 100644
+--- a/imdb/parser/sql/__init__.py
++++ b/imdb/parser/sql/__init__.py
+@@ -557,7 +557,6 @@ class IMDbSqlAccessSystem(IMDbBase):
+ """The class used to access IMDb's data through a SQL database."""
+
+ accessSystem = 'sql'
+- _sql_logger = logging.getLogger('imdbpy.parser.sql')
+
+ def __init__(self, uri, adultSearch=True, *arguments, **keywords):
+ """Initialize the access system."""
+@@ -582,7 +581,7 @@ class IMDbSqlAccessSystem(IMDbBase):
+ except ImportError as e:
+ raise IMDbError('unable to import SQLAlchemy')
+ # Set the connection to the database.
+- self._sql_logger.debug('connecting to %s', uri)
++ logger.debug('connecting to %s', uri)
+ try:
+ self._connection = setConnection(uri, DB_TABLES)
+ except AssertionError as e:
+@@ -593,7 +592,7 @@ class IMDbSqlAccessSystem(IMDbBase):
+ # Maps some IDs to the corresponding strings.
+ self._kind = {}
+ self._kindRev = {}
+- self._sql_logger.debug('reading constants from the database')
++ logger.debug('reading constants from the database')
+ try:
+ for kt in KindType.select():
+ self._kind[kt.id] = kt.kind
+@@ -1616,7 +1615,7 @@ class IMDbSqlAccessSystem(IMDbBase):
+ return
+ if not hasattr(self, '_connection'):
+ return
+- self._sql_logger.debug('closing connection to the database')
++ logger.debug('closing connection to the database')
+ try:
+ self._connection.close()
+ except:
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/impacket/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/impacket/default.nix
index e973175b26a0..dee40a6dbba2 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/impacket/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/impacket/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "impacket";
- version = "0.9.21";
+ version = "0.9.22";
src = fetchPypi {
inherit pname version;
- sha256 = "912f812564e87c31a162cfe0626f3a6cbc5b6864deedbfefc31f6d321859ade3";
+ sha256 = "4bf7e7b595356585599b4b2773b8a463d7b9765c97012dcd5a44eb6d547f6a1d";
};
disabled = isPy3k;
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/importlib-resources/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/importlib-resources/default.nix
index 0e1d4654c590..22c05e3319c6 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/importlib-resources/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/importlib-resources/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "importlib_resources";
- version = "3.0.0";
+ version = "3.3.0";
src = fetchPypi {
inherit pname version;
- sha256 = "19f745a6eca188b490b1428c8d1d4a0d2368759f32370ea8fb89cad2ab1106c3";
+ sha256 = "7b51f0106c8ec564b1bef3d9c588bc694ce2b92125bbb6278f4f2f5b54ec3592";
};
nativeBuildInputs = [ setuptools_scm toml ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/inflect/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/inflect/default.nix
index b7fbe41f691f..c0f6fe920505 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/inflect/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/inflect/default.nix
@@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "inflect";
- version = "4.1.0";
+ version = "5.0.2";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "def6f3791be9181f0c01e0bf5949304007ec6e04c6674fbef7cc49c657b8a9a5";
+ sha256 = "d284c905414fe37c050734c8600fe170adfb98ba40f72fc66fed393f5b8d5ea0";
};
nativeBuildInputs = [ setuptools_scm toml ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/influxdb-client/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/influxdb-client/default.nix
index 007ab25eb69b..141412d5bd33 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/influxdb-client/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/influxdb-client/default.nix
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "influxdb-client";
- version = "1.8.0";
+ version = "1.12.0";
disabled = pythonOlder "3.6"; # requires python version >=3.6
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "influxdata";
repo = "influxdb-client-python";
rev = "v${version}";
- sha256 = "0gf0fjkd10yn1bb86rfapnd5diraivshn9mhzqxaxwlfah45q187";
+ sha256 = "0b4xr8nwrnikj2rnyrrcl6pym2il8iirr9f9cyg6vzfgx8l8brk9";
};
# makes test not reproducible
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/inform/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/inform/default.nix
new file mode 100644
index 000000000000..7646d25ee425
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/inform/default.nix
@@ -0,0 +1,41 @@
+{ lib, buildPythonPackage, fetchFromGitHub
+, arrow
+, six
+, hypothesis
+, pytest
+, pytestrunner
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+ pname = "inform";
+ version = "1.23";
+
+ src = fetchFromGitHub {
+ owner = "KenKundert";
+ repo = "inform";
+ rev = "v${version}";
+ sha256 = "02zlprvidkz51aypss4knhv7dbr0sbpz3caqjzf9am2n1jx2viyy";
+ };
+
+ nativeBuildInputs = [ pytestrunner ];
+ propagatedBuildInputs = [ arrow six ];
+
+ checkInputs = [ pytest hypothesis ];
+ checkPhase = ''
+ patchShebangs test.doctests.py test.inform.py
+ ./test.doctests.py && ./test.inform.py && pytest
+ '';
+
+ meta = with lib; {
+ description = "Print and logging utilities";
+ longDescription = ''
+ Inform is designed to display messages from programs that are typically
+ run from a console. It provides a collection of ‘print’ functions that
+ allow you to simply and cleanly print different types of messages.
+ '';
+ homepage = "https://inform.readthedocs.io";
+ license = licenses.gpl3Only;
+ maintainers = with maintainers; [ jeremyschlatter ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/iniconfig/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/iniconfig/default.nix
index f6383e46d234..90761f76f9d5 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/iniconfig/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/iniconfig/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "iniconfig";
- version = "1.0.1";
+ version = "1.1.1";
src = fetchPypi {
inherit pname version;
- sha256 = "0s9z9n4603fdpv2vzh6ddzfgsjmb09n6qalkjl2xwrss6n4jzyg5";
+ sha256 = "bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32";
};
doCheck = false; # avoid circular import with pytest
@@ -14,7 +14,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "brain-dead simple parsing of ini files";
- homepage = "https://github.com/CHANGE/iniconfig/";
+ homepage = "https://github.com/RonnyPfannschmidt/iniconfig";
license = licenses.mit;
maintainers = with maintainers; [ jonringer ];
};
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/internetarchive/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/internetarchive/default.nix
index 2683f0f1afcf..879c90c40a42 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/internetarchive/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/internetarchive/default.nix
@@ -19,11 +19,11 @@
buildPythonPackage rec {
pname = "internetarchive";
- version = "1.9.5";
+ version = "1.9.6";
src = fetchPypi {
inherit pname version;
- sha256 = "759053685c75e6e969d690043b82643c4016500abcbbc44e4daf52ec097a9a15";
+ sha256 = "0e9b24577086283280a5089b3e65086640b4e42d61ca4af913639f45b02b9e4c";
};
propagatedBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/invoke/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/invoke/default.nix
index 7189727cf3a8..45f3ee7a04db 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/invoke/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/invoke/default.nix
@@ -20,9 +20,6 @@ buildPythonPackage rec {
# errors with vendored libs
doCheck = false;
- # has vendored python2 code
- dontUsePythonRecompileBytecode = true;
-
meta = {
description = "Pythonic task execution";
license = lib.licenses.bsd2;
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/ipdb/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/ipdb/default.nix
index c32726be7e47..df2ae6b46616 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/ipdb/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/ipdb/default.nix
@@ -3,19 +3,22 @@
, fetchPypi
, ipython
, isPyPy
+, isPy27
+, mock
}:
buildPythonPackage rec {
pname = "ipdb";
- version = "0.13.3";
- disabled = isPyPy; # setupterm: could not find terminfo database
+ version = "0.13.4";
+ disabled = isPyPy || isPy27; # setupterm: could not find terminfo database
src = fetchPypi {
inherit pname version;
- sha256 = "0y3yk5k2yszcwxsjinvf40b1wl8wi8l6kv7pl9jmx9j53hk6vx6n";
+ sha256 = "c85398b5fb82f82399fc38c44fe3532c0dde1754abee727d8f5cfcc74547b334";
};
propagatedBuildInputs = [ ipython ];
+ checkInputs = [ mock ];
preCheck = ''
export HOME=$(mktemp -d)
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/ipython/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/ipython/default.nix
index 1f1a50363f9d..dd9004aa0cb3 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/ipython/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/ipython/default.nix
@@ -22,12 +22,12 @@
buildPythonPackage rec {
pname = "ipython";
- version = "7.17.0";
+ version = "7.19.0";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "b70974aaa2674b05eb86a910c02ed09956a33f2dd6c71afc60f0b128a77e7f28";
+ sha256 = "cbb2ef3d5961d44e6a963b9817d4ea4e1fa2eb589c371a470fed14d8d40cbd6a";
};
prePatch = lib.optionalString stdenv.isDarwin ''
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/ipyvue/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/ipyvue/default.nix
index c9426473ba6d..3941f08348a5 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/ipyvue/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/ipyvue/default.nix
@@ -8,13 +8,13 @@
buildPythonPackage rec {
pname = "ipyvue";
- version = "1.4.0";
+ version = "1.4.1";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "3253727e8e12e3c157550e3e8d6986edf61ad0d68299992fbf3fa6acec41a12e";
+ sha256 = "5b59cf92a1eb7fbef4f2d02be49ac562a721a6cf34f991ac963222cf4c8885a1";
};
propagatedBuildInputs = [ ipywidgets ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/ircrobots/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/ircrobots/default.nix
new file mode 100644
index 000000000000..41973e805846
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/ircrobots/default.nix
@@ -0,0 +1,53 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pythonOlder
+, anyio
+, asyncio-throttle
+, dataclasses
+, ircstates
+, async_stagger
+, async-timeout
+, python
+}:
+
+buildPythonPackage rec {
+ pname = "ircrobots";
+ version = "0.3.6";
+ disabled = pythonOlder "3.6";
+
+ src = fetchFromGitHub {
+ owner = "jesopo";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1c8h8b78gmnfipppr9dxp7sl6wd9lx4l3pdwykaib1f49dqwavys";
+ };
+
+ postPatch = ''
+ # too specific pins https://github.com/jesopo/ircrobots/issues/3
+ sed -iE 's/anyio.*/anyio/' requirements.txt
+ '';
+
+ propagatedBuildInputs = [
+ anyio
+ asyncio-throttle
+ ircstates
+ async_stagger
+ async-timeout
+ ] ++ lib.optionals (pythonOlder "3.7") [
+ dataclasses
+ ];
+
+ checkPhase = ''
+ ${python.interpreter} -m unittest test
+ '';
+
+ pythonImportsCheck = [ "ircrobots" ];
+
+ meta = with lib; {
+ description = "Asynchronous bare-bones IRC bot framework for python3";
+ license = licenses.mit;
+ homepage = "https://github.com/jesopo/ircrobots";
+ maintainers = with maintainers; [ hexa ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/ircstates/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/ircstates/default.nix
new file mode 100644
index 000000000000..3e54451eb362
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/ircstates/default.nix
@@ -0,0 +1,40 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, fetchpatch
+, pythonOlder
+, irctokens
+, pendulum
+, python
+}:
+
+buildPythonPackage rec {
+ pname = "ircstates";
+ version = "0.11.6";
+ disabled = pythonOlder "3.6"; # f-strings
+
+ src = fetchFromGitHub {
+ owner = "jesopo";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0yhrd1nmf9fjwknbga8wspy3bab40lgp4qqnr7w75x9wq5ivmqhg";
+ };
+
+ propagatedBuildInputs = [
+ irctokens
+ pendulum
+ ];
+
+ checkPhase = ''
+ ${python.interpreter} -m unittest test
+ '';
+
+ pythonImportsCheck = [ "ircstates" ];
+
+ meta = with lib; {
+ description = "sans-I/O IRC session state parsing library";
+ license = licenses.mit;
+ homepage = "https://github.com/jesopo/ircstates";
+ maintainers = with maintainers; [ hexa ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/irctokens/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/irctokens/default.nix
new file mode 100644
index 000000000000..037a5f0520fd
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/irctokens/default.nix
@@ -0,0 +1,34 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pythonOlder
+, pyyaml
+, python
+}:
+
+buildPythonPackage rec {
+ pname = "irctokens";
+ version = "2.0.0";
+ disabled = pythonOlder "3.6"; # f-strings
+
+ src = fetchFromGitHub {
+ owner = "jesopo";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0kpxn5paailm4xpdlnzxrhjrfgvvg5pp327wd8kl41a0wbqkj4zb";
+ };
+
+ checkInputs = [ pyyaml ];
+ checkPhase = ''
+ ${python.interpreter} -m unittest test
+ '';
+
+ pythonImportsCheck = [ "irctokens" ];
+
+ meta = with lib; {
+ description = "RFC1459 and IRCv3 protocol tokeniser library for python3";
+ license = licenses.mit;
+ homepage = "https://github.com/jesopo/irctokens";
+ maintainers = with maintainers; [ hexa ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/isbnlib/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/isbnlib/default.nix
index 2c454fd9ce0c..8398117041be 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/isbnlib/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/isbnlib/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "isbnlib";
- version = "3.10.3";
+ version = "3.10.4";
src = fetchPypi {
inherit pname version;
- sha256 = "2295c01465fe19776b1f9432fd99fd24e61230d146ded2752e0d980ef6f4101f";
+ sha256 = "f5bfbc362e2a73dfc82449ac459b59a7f6b20bcebf82f6bd87d773dc45073646";
};
checkInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/iso8601/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/iso8601/default.nix
index 28f8db12895a..b83374fff3e1 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/iso8601/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/iso8601/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "iso8601";
- version = "0.1.12";
+ version = "0.1.13";
src = fetchPypi {
inherit pname version;
- sha256 = "49c4b20e1f38aa5cf109ddcd39647ac419f928512c869dc01d5c7098eddede82";
+ sha256 = "f7dec22af52025d4526be94cc1303c7d8f5379b746a3f54a8c8446384392eeb1";
};
checkInputs = [ pytest ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/isort/4.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/isort/4.nix
new file mode 100644
index 000000000000..b2ef4e66f361
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/isort/4.nix
@@ -0,0 +1,43 @@
+{ lib, buildPythonPackage, fetchPypi, setuptools, isPy27, futures
+, backports_functools_lru_cache, mock, pytest
+}:
+
+let
+ skipTests = [ "test_requirements_finder" "test_pipfile_finder" ] ++ lib.optional isPy27 "test_standard_library_deprecates_user_issue_778";
+ testOpts = lib.concatMapStringsSep " " (t: "--deselect test_isort.py::${t}") skipTests;
+in buildPythonPackage rec {
+ pname = "isort";
+ version = "4.3.21"; # Note 4.x is the last version that supports Python2
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "54da7e92468955c4fceacd0c86bd0ec997b0e1ee80d97f67c35a78b719dccab1";
+ };
+
+ propagatedBuildInputs = [
+ setuptools
+ ] ++ lib.optionals isPy27 [ futures backports_functools_lru_cache ];
+
+ checkInputs = [ mock pytest ];
+
+ checkPhase = ''
+ # isort excludes paths that contain /build/, so test fixtures don't work
+ # with TMPDIR=/build/
+ PATH=$out/bin:$PATH TMPDIR=/tmp/ pytest ${testOpts}
+
+ # Confirm that the produced executable script is wrapped correctly and runs
+ # OK, by launching it in a subshell without PYTHONPATH
+ (
+ unset PYTHONPATH
+ echo "Testing that `isort --version-number` returns OK..."
+ $out/bin/isort --version-number
+ )
+ '';
+
+ meta = with lib; {
+ description = "A Python utility / library to sort Python imports";
+ homepage = "https://github.com/timothycrosley/isort";
+ license = licenses.mit;
+ maintainers = with maintainers; [ couchemar nand0p ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/isort/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/isort/default.nix
index b2ef4e66f361..bc11697339e8 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/isort/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/isort/default.nix
@@ -1,30 +1,36 @@
-{ lib, buildPythonPackage, fetchPypi, setuptools, isPy27, futures
-, backports_functools_lru_cache, mock, pytest
+{ lib, buildPythonPackage, fetchFromGitHub
+, colorama
+, hypothesis
+, poetry-core
+, pylama
+, pytestCheckHook
}:
let
- skipTests = [ "test_requirements_finder" "test_pipfile_finder" ] ++ lib.optional isPy27 "test_standard_library_deprecates_user_issue_778";
- testOpts = lib.concatMapStringsSep " " (t: "--deselect test_isort.py::${t}") skipTests;
in buildPythonPackage rec {
pname = "isort";
- version = "4.3.21"; # Note 4.x is the last version that supports Python2
+ version = "5.6.4";
+ format = "pyproject";
- src = fetchPypi {
- inherit pname version;
- sha256 = "54da7e92468955c4fceacd0c86bd0ec997b0e1ee80d97f67c35a78b719dccab1";
+ src = fetchFromGitHub {
+ owner = "PyCQA";
+ repo = "isort";
+ rev = version;
+ sha256 = "1m7jpqssnbsn1ydrw1dn7nrcrggqcvj9v6mk5ampxmvk94xd2r2q";
};
- propagatedBuildInputs = [
- setuptools
- ] ++ lib.optionals isPy27 [ futures backports_functools_lru_cache ];
+ nativeBuildInputs = [
+ poetry-core
+ ];
- checkInputs = [ mock pytest ];
-
- checkPhase = ''
- # isort excludes paths that contain /build/, so test fixtures don't work
- # with TMPDIR=/build/
- PATH=$out/bin:$PATH TMPDIR=/tmp/ pytest ${testOpts}
+ checkInputs = [
+ colorama
+ hypothesis
+ pylama
+ pytestCheckHook
+ ];
+ postCheck = ''
# Confirm that the produced executable script is wrapped correctly and runs
# OK, by launching it in a subshell without PYTHONPATH
(
@@ -34,9 +40,37 @@ in buildPythonPackage rec {
)
'';
+ preCheck = ''
+ HOME=$TMPDIR
+ export PATH=$PATH:$out/bin
+ '';
+
+ pytestFlagsArray = [
+ "--ignore=tests/integration/" # pulls in 10 other packages
+ "--ignore=tests/unit/profiles/test_black.py" # causes infinite recursion to include black
+ ];
+
+ disabledTests = [
+ "test_run" # doesn't like paths in /build
+ "test_pyi_formatting_issue_942"
+ "test_requirements_finder"
+ "test_pipfile_finder"
+ "test_main" # relies on git
+ "test_command_line" # not thread safe
+ "test_encoding_not_in_comment" # not python 3.9 compatible
+ "test_encoding_not_in_first_two_lines" # not python 3.9 compatible
+ "test_requirements_dir" # requires network
+ # plugin not available
+ "test_isort_literals_issue_1358"
+ "test_isort_supports_formatting_plugins_issue_1353"
+ "test_value_assignment_list"
+ # profiles not available
+ "test_isort_supports_shared_profiles_issue_970"
+ ];
+
meta = with lib; {
description = "A Python utility / library to sort Python imports";
- homepage = "https://github.com/timothycrosley/isort";
+ homepage = "https://github.com/PyCQA/isort";
license = licenses.mit;
maintainers = with maintainers; [ couchemar nand0p ];
};
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/itemadapter/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/itemadapter/default.nix
index 297d7fcef0b4..e1efb9aa673f 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/itemadapter/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/itemadapter/default.nix
@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "itemadapter";
- version = "0.1.1";
+ version = "0.2.0";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "b5e75d48c769ee5c89de12aeba537b2d62d7b575cd549d5d430ed8a67faa63f2";
+ sha256 = "cb7aaa577fefe2aa6f229ccf4d058e05f44e0178a98c8fb70ee4d95acfabb423";
};
doCheck = false; # infinite recursion with Scrapy
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/iterm2/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/iterm2/default.nix
index 66227fcb6680..a62d5068f776 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/iterm2/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/iterm2/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "iterm2";
- version = "1.16";
+ version = "1.18";
src = fetchPypi {
inherit pname version;
- sha256 = "8dead057b09ed4ac03c6caae7890489da1d823215ec5166789739ece941bdcbc";
+ sha256 = "88ca7dd76242205dc82761bf98932a42e6c1ba338cb065f1cc775413ef4e0dc2";
};
propagatedBuildInputs = [ protobuf websockets ];
@@ -26,6 +26,7 @@ buildPythonPackage rec {
description = "Python interface to iTerm2's scripting API";
homepage = "https://github.com/gnachman/iTerm2";
license = licenses.gpl2;
+ platforms = platforms.darwin;
maintainers = with maintainers; [ jeremyschlatter ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/janus/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/janus/default.nix
index 1999a625e4b8..14d54ef5a422 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/janus/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/janus/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "janus";
- version = "0.5.0";
+ version = "0.6.1";
src = fetchPypi {
inherit pname version;
- sha256 = "0700f5537d076521851d19b7625545c5e76f6d5792ab17984f28230adcc3b34c";
+ sha256 = "4712e0ef75711fe5947c2db855bc96221a9a03641b52e5ae8e25c2b705dd1d0c";
};
disabled = pythonOlder "3.6";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/jaraco_classes/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/jaraco_classes/default.nix
index c9ce6915d2ec..a3d19df76537 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/jaraco_classes/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/jaraco_classes/default.nix
@@ -10,6 +10,8 @@ buildPythonPackage rec {
sha256 = "1avsxzm5mwylmy2zbxq3xvn48z5djb0qy3hwv4ryncprivzri1n3";
};
+ pythonNamespaces = [ "jaraco" ];
+
nativeBuildInputs = [ setuptools_scm ];
propagatedBuildInputs = [ six more-itertools ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/jaraco_collections/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/jaraco_collections/default.nix
index 9f6e6e2aa7e9..3c37755366d0 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/jaraco_collections/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/jaraco_collections/default.nix
@@ -10,6 +10,8 @@ buildPythonPackage rec {
sha256 = "be570ef4f2e7290b757449395238fa63d70a9255574624e73c5ff9f1ee554721";
};
+ pythonNamespaces = [ "jaraco" ];
+
doCheck = false;
buildInputs = [ setuptools_scm ];
propagatedBuildInputs = [ six jaraco_classes jaraco_text ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/jaraco_functools/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/jaraco_functools/default.nix
index 6ee4c2417109..eb176d0d8575 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/jaraco_functools/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/jaraco_functools/default.nix
@@ -17,6 +17,8 @@ buildPythonPackage rec {
doCheck = false;
+ pythonNamespaces = [ "jaraco" ];
+
meta = with lib; {
description = "Additional functools in the spirit of stdlib's functools";
homepage = "https://github.com/jaraco/jaraco.functools";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/jaraco_itertools/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/jaraco_itertools/default.nix
index 5df70b6da97b..f5d0b0538b66 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/jaraco_itertools/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/jaraco_itertools/default.nix
@@ -11,6 +11,8 @@ buildPythonPackage rec {
sha256 = "6447d567f57efe5efea386265c7864652e9530830a1b80f43e60b4f222b9ab84";
};
+ pythonNamespaces = [ "jaraco" ];
+
nativeBuildInputs = [ setuptools_scm ];
patches = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/jaraco_logging/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/jaraco_logging/default.nix
index 3f9fa4d67caf..4a6391fbc489 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/jaraco_logging/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/jaraco_logging/default.nix
@@ -11,6 +11,8 @@ buildPythonPackage rec {
sha256 = "31716fe84d3d5df39d95572942513bd4bf8ae0a478f64031eff4c2ea9e83434e";
};
+ pythonNamespaces = [ "jaraco" ];
+
nativeBuildInputs = [ setuptools_scm ];
propagatedBuildInputs = [ tempora six ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/jaraco_stream/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/jaraco_stream/default.nix
index 324eb625014a..9a4f6d972450 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/jaraco_stream/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/jaraco_stream/default.nix
@@ -3,10 +3,14 @@
buildPythonPackage rec {
pname = "jaraco.stream";
version = "3.0.0";
+
src = fetchPypi {
inherit pname version;
sha256 = "287e1cba9f278e0146fdded6bc40518930813a5584579769aeaa1d0bfd178a73";
};
+
+ pythonNamespaces = [ "jaraco" ];
+
doCheck = false;
buildInputs = [ setuptools_scm ];
propagatedBuildInputs = [ six ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/jaraco_text/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/jaraco_text/default.nix
index 9b3821edd7a0..c61c8f689ddc 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/jaraco_text/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/jaraco_text/default.nix
@@ -13,6 +13,8 @@ buildPythonPackage rec {
sha256 = "1v0hz3h74m31jlbc5bxwkvrx1h2n7887bajrg1n1c3yc4q8qn1z5";
};
+ pythonNamespaces = [ "jaraco" ];
+
nativeBuildInputs =[ setuptools_scm ];
propagatedBuildInputs = [
jaraco_functools
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/jeepney/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/jeepney/default.nix
index 1813ce8cac17..84096c6db4f9 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/jeepney/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/jeepney/default.nix
@@ -5,17 +5,18 @@
, pytest
, testpath
, tornado
+, trio
}:
buildPythonPackage rec {
pname = "jeepney";
- version = "0.4.3";
+ version = "0.6.0";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
- sha256 = "3479b861cc2b6407de5188695fa1a8d57e5072d7059322469b62628869b8e36e";
+ sha256 = "7d59b6622675ca9e993a6bd38de845051d315f8b0c72cca3aef733a20b648657";
};
propagatedBuildInputs = [
@@ -25,6 +26,7 @@ buildPythonPackage rec {
checkInputs = [
pytest
testpath
+ trio
];
checkPhase = ''
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/jenkins-job-builder/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/jenkins-job-builder/default.nix
index e185cf8b6bdd..3cc2bb69e0e9 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/jenkins-job-builder/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/jenkins-job-builder/default.nix
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "jenkins-job-builder";
- version = "3.5.0";
+ version = "3.7.0";
src = fetchPypi {
inherit pname version;
- sha256 = "20efe98718e61ea7bd69b2178d93c5435bbf2e1ba78a47366632c84970e026c9";
+ sha256 = "bca1f458206fc8be82d790685b603d4158e2034a651f2e148e31526984b9d551";
};
postPatch = ''
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/joblib/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/joblib/default.nix
index fa4fc450f1a8..16edf3c04e14 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/joblib/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/joblib/default.nix
@@ -4,7 +4,7 @@
, fetchPypi
, stdenv
, numpydoc
-, pytest
+, pytestCheckHook
, python-lz4
, setuptools
, sphinx
@@ -13,27 +13,29 @@
buildPythonPackage rec {
pname = "joblib";
- version = "0.16.0";
+ version = "0.17.0";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "8f52bf24c64b608bf0b2563e0e47d6fcf516abc8cfafe10cfd98ad66d94f92d6";
+ sha256 = "9e284edd6be6b71883a63c9b7f124738a3c16195513ad940eae7e3438de885d5";
};
- checkInputs = [ sphinx numpydoc pytest ];
+ checkInputs = [ sphinx numpydoc pytestCheckHook ];
propagatedBuildInputs = [ python-lz4 setuptools ];
- # test_disk_used is broken: https://github.com/joblib/joblib/issues/57
- # test_dispatch_multiprocessing is broken only on Darwin.
- checkPhase = ''
- py.test -k 'not test_disk_used${lib.optionalString (stdenv.isDarwin) " and not test_dispatch_multiprocessing"}' joblib/test
- '';
+ pytestFlagsArray = [ "joblib/test" ];
+ disabledTests = [
+ "test_disk_used" # test_disk_used is broken: https://github.com/joblib/joblib/issues/57
+ "test_parallel_call_cached_function_defined_in_jupyter" # jupyter not available during tests
+ ] ++ lib.optionals stdenv.isDarwin [
+ "test_dispatch_multiprocessing" # test_dispatch_multiprocessing is broken only on Darwin.
+ ];
- meta = {
+ meta = with lib; {
description = "Lightweight pipelining: using Python functions as pipeline jobs";
homepage = "https://joblib.readthedocs.io/";
- license = lib.licenses.bsd3;
- maintainers = with lib.maintainers; [ costrouc ];
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ costrouc ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/josepy/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/josepy/default.nix
index 73bdb31da9d8..8c1fe0a7d366 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/josepy/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/josepy/default.nix
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "josepy";
- version = "1.4.0";
+ version = "1.5.0";
src = fetchPypi {
inherit pname version;
- sha256 = "c37ff4b93606e6a452b72cdb992da5e0544be12912fac01b31ddbdd61f6d5bd0";
+ sha256 = "502a36f86efe2a6d09bf7018bca9fd8f8f24d8090a966aa037dbc844459ff9c8";
};
propagatedBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/jq/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/jq/default.nix
index 72776a037192..3d4097b07186 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/jq/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/jq/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "jq";
- version = "1.0.2";
+ version = "1.1.1";
src = fetchPypi {
inherit pname version;
- sha256 = "9fe6ce07bc8d209c385d8ba132a2971c69aef015103c46bea87a73a16c5ec147";
+ sha256 = "62d649c4f6f26ed91810c8db075f5fe05319c3dc99dbebcd2d31b0b697a4592e";
};
patches = [ ./jq-py-setup.patch ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/jsonpatch/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/jsonpatch/default.nix
index a4a66aab44ce..8971bac4b497 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/jsonpatch/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/jsonpatch/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "jsonpatch";
- version = "1.26";
+ version = "1.27";
src = fetchPypi {
inherit pname version;
- sha256 = "e45df18b0ab7df1925f20671bbc3f6bd0b4b556fb4b9c5d97684b0a7eac01744";
+ sha256 = "4d08af10d71723b5b2924da6ba90f273a4d1a5c6accfb605eb970cb2f9b29cf9";
};
# test files are missing
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/jsonrpc-base/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/jsonrpc-base/default.nix
index 3505a13bbd1f..9318fc09373c 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/jsonrpc-base/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/jsonrpc-base/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "jsonrpc-base";
- version = "1.0.3";
+ version = "1.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "7bda99589b4566f5027c2aeae122f409d8ccf4c811b278b8cfb616903871efb2";
+ sha256 = "7f374c57bfa1cb16d1f340d270bc0d9f1f5608fb1ac6c9ea15768c0e6ece48b7";
};
propagatedBuildInputs = [ ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/jsonrpc-websocket/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/jsonrpc-websocket/default.nix
index df5216bdd1a6..4fe136f69b7b 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/jsonrpc-websocket/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/jsonrpc-websocket/default.nix
@@ -1,19 +1,25 @@
{ stdenv, buildPythonPackage, fetchPypi
-, aiohttp, jsonrpc-base, pep8 }:
+, aiohttp, jsonrpc-base, pep8
+, pytestCheckHook
+, pytest-asyncio
+}:
buildPythonPackage rec {
pname = "jsonrpc-websocket";
- version = "1.1.0";
+ version = "1.2.1";
src = fetchPypi {
inherit pname version;
- sha256 = "029gxp6f06gmba7glxfdz5xfhs5kkqph7x78k38qqvdrmca4z450";
+ sha256 = "c343d057b572791ed3107b771c17358bc710772a9a6156047a3cfafb409ed895";
};
nativeBuildInputs = [ pep8 ];
propagatedBuildInputs = [ aiohttp jsonrpc-base ];
+ checkInputs = [ pytestCheckHook pytest-asyncio ];
+ pytestFlagsArray = [ "tests.py" ];
+
meta = with stdenv.lib; {
description = "A JSON-RPC websocket client library for asyncio";
homepage = "https://github.com/armills/jsonrpc-websocket";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/jsonrpclib-pelix/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/jsonrpclib-pelix/default.nix
index a53c7abee72f..570fb0a1d1a1 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/jsonrpclib-pelix/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/jsonrpclib-pelix/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "jsonrpclib-pelix";
- version = "0.4.1";
+ version = "0.4.2";
src = fetchPypi {
inherit pname version;
- sha256 = "006yvxw6xv6qzcqpxm8jcf21gmdn0z4vp8njdbvk023mmq05k3h4";
+ sha256 = "340915c17ebef7451948341542bf4789fc8d8c9fe604e86f00b722b6074a89f0";
};
doCheck = false; # test_suite="tests" in setup.py but no tests in pypi.
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/junos-eznc/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/junos-eznc/default.nix
index 22ff5caad80e..d47130c5f3fb 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/junos-eznc/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/junos-eznc/default.nix
@@ -18,11 +18,11 @@
buildPythonPackage rec {
pname = "junos-eznc";
- version = "2.5.3";
+ version = "2.5.4";
src = fetchPypi {
inherit pname version;
- sha256 = "521659fe94da796897abc16773c3d84fa44d3e1f5386c71fbaef44cb80159855";
+ sha256 = "bf036d0af9ee5c5e4f517cb5fc902fe891fa120e18f459805862c53d4a97193a";
};
checkInputs = [ nose ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/jupyter_core/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/jupyter_core/default.nix
index fe40a3f09c48..54ea49c34004 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/jupyter_core/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/jupyter_core/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "jupyter_core";
- version = "4.6.3";
+ version = "4.7.0";
src = fetchPypi {
inherit pname version;
- sha256 = "394fd5dd787e7c8861741880bdf8a00ce39f95de5d18e579c74b882522219e7e";
+ sha256 = "aa1f9496ab3abe72da4efe0daab0cb2233997914581f9a071e07498c6add8ed3";
};
checkInputs = [ pytest mock glibcLocales nose ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/jupyterlab-git/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/jupyterlab-git/default.nix
index aeeb75b4c52d..d8ab5093ec28 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/jupyterlab-git/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/jupyterlab-git/default.nix
@@ -1,4 +1,4 @@
-{ lib
+{ stdenv
, buildPythonPackage
, fetchPypi
, pythonOlder
@@ -10,16 +10,19 @@
buildPythonPackage rec {
pname = "jupyterlab_git";
- version = "0.22.1";
+ version = "0.23.2";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
- sha256 = "e0fe2503d08dc00cda781b1ff89eb10c0decb45b5f8983b4970525b8f108dc02";
+ sha256 = "2c4c55c5bc651a670b13e89064f7aba7422b72ad6b3f2b3890ac72cc9a2d4089";
};
propagatedBuildInputs = [ notebook nbdime git ];
+ # all Tests on darwin fail or are skipped due to sandbox
+ doCheck = !stdenv.isDarwin;
+
checkInputs = [ pytest ];
checkPhase = ''
@@ -28,7 +31,7 @@ buildPythonPackage rec {
pythonImportsCheck = [ "jupyterlab_git" ];
- meta = with lib; {
+ meta = with stdenv.lib; {
description = "Jupyter lab extension for version control with Git.";
license = with licenses; [ bsd3 ];
homepage = "https://github.com/jupyterlab/jupyterlab-git";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/jupyterlab-pygments/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/jupyterlab-pygments/default.nix
new file mode 100644
index 000000000000..f3ea20842aa5
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/jupyterlab-pygments/default.nix
@@ -0,0 +1,27 @@
+{ lib, buildPythonPackage, fetchFromGitHub, pygments }:
+
+buildPythonPackage rec {
+ pname = "jupyterlab_pygments";
+ version = "0.1.2";
+
+ src = fetchFromGitHub {
+ owner = "jupyterlab";
+ repo = pname;
+ rev = version;
+ sha256 = "02lv63qalw4x6xs70n2w2p3c2cnhk91sr961wlbi77xs0g8fcman";
+ };
+
+ # no tests exist on upstream repo
+ doCheck = false;
+
+ propagatedBuildInputs = [ pygments ];
+
+ pythonImportsCheck = [ "jupyterlab_pygments" ];
+
+ meta = with lib; {
+ description = "Jupyterlab syntax coloring theme for pygments";
+ homepage = "https://github.com/jupyterlab/jupyterlab-pygments/";
+ license = licenses.mit;
+ maintainers = with maintainers; [ jonringer ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix
index f05536741f29..ff725ce18297 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix
@@ -8,12 +8,12 @@
buildPythonPackage rec {
pname = "jupyterlab";
- version = "2.2.8";
+ version = "2.2.9";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
- sha256 = "c8377bee30504919c1e79949f9fe35443ab7f5c4be622c95307e8108410c8b8c";
+ sha256 = "3be8f8edea173753dd838c1b6d3bbcb6f5c801121f824a477025c1b6a1d33dc6";
};
propagatedBuildInputs = [ jupyterlab_server notebook ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/jupytext/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/jupytext/default.nix
index e4b285d4ea73..6f4c188c2f75 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/jupytext/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/jupytext/default.nix
@@ -3,20 +3,22 @@
, nbformat
, pytest
, pyyaml
+, toml
}:
buildPythonPackage rec {
pname = "jupytext";
- version = "1.5.2";
+ version = "1.7.1";
src = fetchPypi {
inherit pname version;
- sha256 = "1cebc9f5975b4c08db3de6d7d61b35f8c33a24cf2c8c04eee7b8a7aab8ddc39b";
+ sha256 = "23123b90c267c67716fe6a022dfae49b84fd3809370d83211f2920eb3106bf40";
};
propagatedBuildInputs = [
pyyaml
nbformat
+ toml
] ++ lib.optionals isPy27 [ mock ]; # why they put it in install_requires, who knows
checkInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/kaggle/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/kaggle/default.nix
index cccd553a31f3..15fecba25890 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/kaggle/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/kaggle/default.nix
@@ -12,18 +12,20 @@
buildPythonPackage rec {
pname = "kaggle";
- version = "1.5.6";
+ version = "1.5.9";
src = fetchPypi {
inherit pname version;
- sha256 = "0f5qrkgklcpgbwncrif7aw4f86dychqplh7k3f4rljwnr9yhjb1w";
+ sha256 = "444aeecfb646dbb889c767ee2ab071f63fe3a2b85f72f08f2bd772353d3e3b93";
};
# The version bounds in the setup.py file are unnecessarily restrictive.
+ # They have both python-slugify and slugify, don't know why
patchPhase = ''
substituteInPlace setup.py \
- --replace 'urllib3 >= 1.21.1, < 1.25' 'urllib3'
- '';
+ --replace 'urllib3 >= 1.21.1, < 1.25' 'urllib3' \
+ --replace " 'slugify'," " "
+ '';
propagatedBuildInputs = [
certifi
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/kaitaistruct/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/kaitaistruct/default.nix
index a1e795421b07..61892063278b 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/kaitaistruct/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/kaitaistruct/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "kaitaistruct";
- version = "0.8";
+ version = "0.9";
src = fetchPypi {
inherit pname version;
- sha256 = "d1d17c7f6839b3d28fc22b21295f787974786c2201e8788975e72e2a1d109ff5";
+ sha256 = "3d5845817ec8a4d5504379cc11bd570b038850ee49c4580bc0998c8fb1d327ad";
};
meta = with stdenv.lib; {
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/keep/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/keep/default.nix
index 6108ea506892..4e7003aef9f9 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/keep/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/keep/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "keep";
- version = "2.9";
+ version = "2.10";
src = fetchPypi {
inherit pname version;
- sha256 = "0902kcvhbmy5q5n0ai1df29ybf87qaljz306c5ssl8j9xdjipcq2";
+ sha256 = "ce71d14110df197ab5afdbd26a14c0bd266b79671118ae1351835fa192e61d9b";
};
propagatedBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/keyring/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/keyring/default.nix
index 560986f9c3d2..3e26079f1235 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/keyring/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/keyring/default.nix
@@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "keyring";
- version = "21.3.1";
+ version = "21.5.0";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "182f94fc0381546489e3e4d90384a8c1d43cc09ffe2eb4a826e7312df6e1be7c";
+ sha256 = "207bd66f2a9881c835dad653da04e196c678bf104f8252141d2d3c4f31051579";
};
nativeBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/keyrings-alt/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/keyrings-alt/default.nix
index dcc16ded122d..506081659f65 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/keyrings-alt/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/keyrings-alt/default.nix
@@ -1,15 +1,15 @@
{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, isPy27, six
-, pytest, backports_unittest-mock, keyring, setuptools_scm
+, pytest, backports_unittest-mock, keyring, setuptools_scm, toml
}:
buildPythonPackage rec {
pname = "keyrings.alt";
- version = "3.4.0";
+ version = "4.0.1";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "91328ac4229e70b1d0061d21bf61d36b031a6b4828f2682e38c741812f6eb23d";
+ sha256 = "cd23d4c6930b5271134ac815d868164cb6d0d2252ee6dcb07fadfca26caaa230";
};
postPatch = ''
@@ -17,7 +17,7 @@ buildPythonPackage rec {
--replace "--flake8" ""
'';
- nativeBuildInputs = [ setuptools_scm ];
+ nativeBuildInputs = [ setuptools_scm toml ];
propagatedBuildInputs = [ six ];
checkInputs = [ pytest keyring ] ++ stdenv.lib.optional (pythonOlder "3.3") backports_unittest-mock;
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/kiwisolver/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/kiwisolver/default.nix
index 393e2d134cc6..a24e7300538a 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/kiwisolver/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/kiwisolver/default.nix
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "kiwisolver";
- version = "1.2.0";
+ version = "1.3.1";
src = fetchPypi {
inherit pname version;
- sha256 = "247800260cd38160c362d211dcaf4ed0f7816afb5efe56544748b21d6ad6d17f";
+ sha256 = "950a199911a8d94683a6b10321f9345d5a3a8433ec58b217ace979e18f16e248";
};
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/kmapper/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/kmapper/default.nix
index f985a7e69652..548896b47286 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/kmapper/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/kmapper/default.nix
@@ -15,11 +15,11 @@
buildPythonPackage rec {
pname = "kmapper";
- version = "1.2.0";
+ version = "1.4.1";
src = fetchPypi {
inherit pname version;
- sha256 = "0879294680c5d01a928847b818a3c4e07eded3f602f96e510858e68e74fa3783";
+ sha256 = "3bb09d016ae0dc3308c2901f0775139a26e7f689afacea564a74e5627de35cd7";
};
propagatedBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/kombu/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/kombu/default.nix
index 560cd4383b1e..1aa22a62e19f 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/kombu/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/kombu/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "kombu";
- version = "4.6.11";
+ version = "5.0.2";
src = fetchPypi {
inherit pname version;
- sha256 = "ca1b45faac8c0b18493d02a8571792f3c40291cf2bcf1f55afed3d8f3aa7ba74";
+ sha256 = "f4965fba0a4718d47d470beeb5d6446e3357a62402b16c510b6a2f251e05ac3c";
};
postPatch = ''
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/kubernetes/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/kubernetes/default.nix
index d5ed1b4cc7c8..2679c81de0f0 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/kubernetes/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/kubernetes/default.nix
@@ -4,7 +4,7 @@
buildPythonPackage rec {
pname = "kubernetes";
- version = "11.0.0";
+ version = "12.0.1";
prePatch = ''
sed -e 's/sphinx>=1.2.1,!=1.3b1,<1.4 # BSD/sphinx/' -i test-requirements.txt
@@ -24,7 +24,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "1a2472f8b01bc6aa87e3a34781f859bded5a5c8ff791a53d889a8bd6cc550430";
+ sha256 = "ec52ea01d52e2ec3da255992f7e859f3a76f2bdb51cf65ba8cd71dfc309d8daa";
};
checkInputs = [ isort coverage pytest mock sphinx autopep8 pep8 codecov recommonmark nose ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/labelbox/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/labelbox/default.nix
index ad8d2853b1d8..0556411ee47e 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/labelbox/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/labelbox/default.nix
@@ -6,22 +6,30 @@
, pillow
, rasterio
, shapely
+, ndjson
+, backoff
+, google_api_core
}:
buildPythonPackage rec {
pname = "labelbox";
- version = "2.4.4";
+ version = "2.4.9";
src = fetchPypi {
inherit pname version;
- sha256 = "a455ae30ccb9328731fca7f7f4cefaa7da69a2fe3e43d1b742bae5ff4693c695";
+ sha256 = "488fb0b2233738c3bba3d3bf67b941f105553b7286cca3099ac0120dd247bd84";
};
- propagatedBuildInputs = [ jinja2 requests pillow rasterio shapely ];
+ propagatedBuildInputs = [
+ jinja2 requests pillow rasterio shapely ndjson backoff
+ google_api_core
+ ];
# Test cases are not running on pypi or GitHub
doCheck = false;
+ pythonImportsCheck = [ "labelbox" ];
+
meta = with lib; {
homepage = "https://github.com/Labelbox/Labelbox";
description = "Platform API for LabelBox";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/larch/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/larch/default.nix
index a94b076ded3d..3be8b2404192 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/larch/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/larch/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
doCheck = false;
meta = with stdenv.lib; {
- homepage = "http://liw.fi/larch/";
+ homepage = "https://liw.fi/larch/";
description = "Python B-tree library";
license = licenses.gpl3;
maintainers = [];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/lazy-object-proxy/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/lazy-object-proxy/default.nix
index fe6a02c3cd7d..dc2eecb002d4 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/lazy-object-proxy/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/lazy-object-proxy/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "lazy-object-proxy";
- version = "1.5.1";
+ version = "1.5.2";
src = fetchPypi {
inherit pname version;
- sha256 = "9723364577b79ad9958a68851fe2acb94da6fd25170c595516a8289e6a129043";
+ sha256 = "5944a9b95e97de1980c65f03b79b356f30a43de48682b8bdd90aa5089f0ec1f4";
};
nativeBuildInputs = [ setuptools_scm ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/ldaptor/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/ldaptor/default.nix
index 817fe79c3c97..2a4550d6b423 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/ldaptor/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/ldaptor/default.nix
@@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "ldaptor";
- version = "19.1.0";
+ version = "20.1.1";
src = fetchPypi {
inherit pname version;
- sha256 = "64c7b870c77e34e4f5f9cfdf330b9702e89b4dd0f64275704f86c1468312c755";
+ sha256 = "778f45d68a0b5d63a892c804c05e57b464413a41d8ae52f92ae569321473ab67";
};
propagatedBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/ledgerblue/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/ledgerblue/default.nix
index 87fece0f026b..c84d5fa471bd 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/ledgerblue/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/ledgerblue/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "ledgerblue";
- version = "0.1.31";
+ version = "0.1.34";
src = fetchPypi {
inherit pname version;
- sha256 = "f1fc7ab685780309a7220c6ee517d88072cc594a9615bcc18e68ed5f149fa432";
+ sha256 = "f9553d496fbc6b612d98cc9db2f1648c1bcb63939c988ee1520e8fcb9bd77b24";
};
propagatedBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/lexid/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/lexid/default.nix
new file mode 100644
index 000000000000..4307d52d8913
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/lexid/default.nix
@@ -0,0 +1,22 @@
+{ lib, python, pythonOlder, buildPythonPackage, fetchPypi, pytestCheckHook, click }:
+
+buildPythonPackage rec {
+ pname = "lexid";
+ version = "2020.1005";
+ disabled = pythonOlder "3.6";
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "52333a2b9ebd14aa0dfeb33de72bd159c2dc31adb9c59cddfc486e2b69bfdcd1";
+ };
+
+ propagatedBuildInputs = [ click ];
+
+ checkInputs = [ pytestCheckHook ];
+
+ meta = with lib; {
+ description = "micro library to increment lexically ordered numerical ids";
+ homepage = "https://pypi.org/project/lexid/";
+ license = licenses.mit;
+ maintainers = with maintainers; [ kfollesdal ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/libarcus/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/libarcus/default.nix
index 5b68695f832e..e69e51ccf555 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/libarcus/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/libarcus/default.nix
@@ -3,14 +3,14 @@
buildPythonPackage rec {
pname = "libarcus";
- version = "4.7.1";
+ version = "4.8.0";
format = "other";
src = fetchFromGitHub {
owner = "Ultimaker";
repo = "libArcus";
rev = version;
- sha256 = "0wmrcvw7k34ib93shhmjzh6kpndgqr37kyr377sril5clmac0z1f";
+ sha256 = "1dvz1rkvm4309yzvj7vy49v1vskr5yfq4nzqdiydp1jb7zpvhqqm";
};
disabled = pythonOlder "3.4.0";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/libsass/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/libsass/default.nix
new file mode 100644
index 000000000000..9feb5b1d2425
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/libsass/default.nix
@@ -0,0 +1,37 @@
+{ lib, buildPythonPackage, fetchFromGitHub, libsass, six, pytest, werkzeug }:
+
+buildPythonPackage rec {
+ pname = "libsass";
+ version = "0.20.1";
+
+ src = fetchFromGitHub {
+ owner = "sass";
+ repo = "libsass-python";
+ rev = version;
+ sha256 = "1r0kgl7i6nnhgjl44sjw57k08gh2qr7l8slqih550dyxbf1akbxh";
+ };
+
+ buildInputs = [ libsass ];
+
+ propagatedBuildInputs = [ six ];
+
+ preBuild = ''
+ export SYSTEM_SASS=true;
+ '';
+
+ checkInputs = [
+ pytest
+ werkzeug
+ ];
+
+ checkPhase = ''
+ pytest sasstests.py
+ '';
+
+ meta = with lib; {
+ description = "A straightforward binding of libsass for Python. Compile Sass/SCSS in Python with no Ruby stack at all!";
+ homepage = "https://sass.github.io/libsass-python/";
+ license = licenses.mit;
+ maintainers = with maintainers; [ SuperSandro2000 ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/libsavitar/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/libsavitar/default.nix
index 27144ccf1ad3..9b6aa7bc3a8d 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/libsavitar/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/libsavitar/default.nix
@@ -2,14 +2,14 @@
buildPythonPackage rec {
pname = "libsavitar";
- version = "4.7.1";
+ version = "4.8.0";
format = "other";
src = fetchFromGitHub {
owner = "Ultimaker";
repo = "libSavitar";
rev = version;
- sha256 = "0mzr3ynfap51bcn6kshyi2h6iny2gpavn6g3b1xcsgzzlxqgfixf";
+ sha256 = "1mxkvnhn8k1a86jlnjnlpf0b8dvrcg3n7pslf60s13cgb7w3sfzh";
};
postPatch = ''
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/libtmux/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/libtmux/default.nix
index 605cbe040269..9df5cffec97b 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/libtmux/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/libtmux/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "libtmux";
- version = "0.8.3";
+ version = "0.8.5";
src = fetchPypi {
inherit pname version;
- sha256 = "a4c7379604ccdc684aa865723211184709f9a2b45511772989b5f26ad156650e";
+ sha256 = "1d35b9f8451944d31c5ed22ed9e6c8e18034adcc75718fcc5b27fbd9621543e1";
};
checkInputs = [ pytest ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/libusb1/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/libusb1/default.nix
index 396f8c5b5c53..c12888b3a8cf 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/libusb1/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/libusb1/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "libusb1";
- version = "1.8";
+ version = "1.9";
src = fetchPypi {
inherit pname version;
- sha256 = "240f65ac70ba3fab77749ec84a412e4e89624804cb80d6c9d394eef5af8878d6";
+ sha256 = "sha256:0l7vj04xm0i5ikxjdqrr5939q7amh0hfp0fqifkcvyjv9fvhyz65";
};
postPatch = ''
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/lightgbm/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/lightgbm/default.nix
index 27b2e9487764..e9bcd0ed895e 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/lightgbm/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/lightgbm/default.nix
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "lightgbm";
- version = "3.0.0";
+ version = "3.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "05f5b358469a679dbf27521d926750ca53ff1e61a6c0293d49af30094ebd9d4a";
+ sha256 = "0d0abcb1035a7f50226412a78993d61830621e16fd6fa685bbf178c97b0d6e82";
};
nativeBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/line_profiler/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/line_profiler/default.nix
index 4275732881cd..b99e60b8199e 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/line_profiler/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/line_profiler/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "line_profiler";
- version = "3.0.2";
+ version = "3.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "7218ad6bd81f8649b211974bf108933910f016d66b49651effe7bbf63667d141";
+ sha256 = "e73ff429236d59d48ce7028484becfa01449b3d52abdcf7337e0ff2acdc5093c";
};
nativeBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/linecache2/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/linecache2/default.nix
index a2c7080e2701..ba2525155d30 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/linecache2/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/linecache2/default.nix
@@ -5,7 +5,7 @@
, isPy3k
}:
-buildPythonPackage (rec {
+buildPythonPackage rec {
pname = "linecache2";
version = "1.0.0";
@@ -23,8 +23,4 @@ buildPythonPackage (rec {
homepage = "https://github.com/testing-cabal/linecache2";
license = licenses.psfl;
};
-# TODO: move into main set, this was to avoid a rebuild
-} // stdenv.lib.optionalAttrs (!isPy3k ) {
- # syntax error in tests. Tests are likely Python 3 only.
- dontUsePythonRecompileBytecode = !isPy3k;
-})
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/linuxfd/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/linuxfd/default.nix
index ecccba3938a0..e6202441da64 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/linuxfd/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/linuxfd/default.nix
@@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "linuxfd";
- version = "1.4.4";
+ version = "1.5";
src = fetchPypi {
inherit pname version;
- sha256 = "b8bf6847b5c8e50e0842024d2911bfc1048db9abf37582a310cd57070971d692";
+ sha256 = "b8c00109724b68e093f9b556edd78e41ed65fb8d969fd0e83186a97b5d3139b4";
};
# no tests
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/littleutils/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/littleutils/default.nix
new file mode 100644
index 000000000000..ea490f19fe5d
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/littleutils/default.nix
@@ -0,0 +1,25 @@
+{ buildPythonPackage
+, fetchPypi
+, lib
+}:
+
+buildPythonPackage rec {
+ pname = "littleutils";
+ version = "0.2.2";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0vwijrylppmk0nbddqvn527r9cg3zw8d6zk6r58hslry42jf7jp6";
+ };
+
+ # This tiny package has no unit tests at all
+ doCheck = false;
+ pythonImportsCheck = [ "littleutils" ];
+
+ meta = with lib; {
+ description = "Small collection of Python utility functions";
+ homepage = "https://github.com/alexmojaki/littleutils";
+ license = licenses.mit;
+ maintainers = with maintainers; [ jluttine ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/lmdb/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/lmdb/default.nix
index 328e5a428fca..76cd2acd7435 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/lmdb/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/lmdb/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "lmdb";
- version = "0.99";
+ version = "1.0.0";
src = fetchPypi {
inherit pname version;
- sha256 = "f9eb844aaaacc8a4bc175e1c1f8a8fb538c330e378fd9eb40e8708d4dca7dc89";
+ sha256 = "4136ffdf0aad61da86d1402808029d002a771b2a9ccc9b39c6bcafa7847c21b6";
};
checkInputs = [ pytest cffi ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/lml/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/lml/default.nix
index c1320eef04ce..cdf1d46af73e 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/lml/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/lml/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "lml";
- version = "0.0.9";
+ version = "0.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "6luoF7Styen1whclzSR1+RKTO34t/fB5Ku2AB3FU9j8=";
+ sha256 = "57a085a29bb7991d70d41c6c3144c560a8e35b4c1030ffb36d85fa058773bcc5";
};
checkInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/locustio/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/locustio/default.nix
deleted file mode 100644
index 0b64fc39feb7..000000000000
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/locustio/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ buildPythonPackage, fetchFromGitHub, isPy38
-, flask
-, gevent
-, mock
-, msgpack
-, pyzmq
-, requests
-, unittest2
-}:
-
-buildPythonPackage rec {
- pname = "locustio";
- version = "0.14.4";
- # tests hang on python38
- disabled = isPy38;
-
- src = fetchFromGitHub {
- owner = "locustio";
- repo = "locust";
- rev = version;
- sha256 = "1645d63ig4ymw716b6h53bhmjqqc13p9r95k1xfx66ck6vdqnisd";
- };
-
- propagatedBuildInputs = [ msgpack requests flask gevent pyzmq ];
- checkInputs = [ mock unittest2 ];
- # remove file which attempts to do GET request
- preCheck = ''
- rm locust/test/test_stats.py
- '';
-
- meta = {
- homepage = "https://locust.io/";
- description = "A load testing tool";
- };
-}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/logilab/common.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/logilab/common.nix
index 9c4b6dbd7919..3da263757cc6 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/logilab/common.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/logilab/common.nix
@@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "logilab-common";
- version = "1.5.2";
+ version = "1.6.1";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "1n20znamai7jksimbdshy03rgw235qwa9vbx3lyajzwysblq4s4d";
+ sha256 = "0h0b2vg2xpfbnynrkg2yki4zjpscm6wgm6nhaahb088v98zxqbrk";
};
propagatedBuildInputs = [ unittest2 six ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/logzero/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/logzero/default.nix
index d5c7685832cf..015d387f27d8 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/logzero/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/logzero/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "logzero";
- version = "1.5.0";
+ version = "1.6.3";
src = fetchPypi {
inherit pname version;
- sha256 = "0hli2wgwxxackrk1ybmlpdd0rzms6blm11zzwlvrzykd8cp1xyil";
+ sha256 = "1435284574e409b8ec8b680f276bca04cab41f93d6eff4dc8348b7630cddf560";
};
checkInputs = [ pytest ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/lyricwikia/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/lyricwikia/default.nix
new file mode 100644
index 000000000000..4e58c6a7d676
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/lyricwikia/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchPypi, buildPythonPackage, pytestrunner, six, beautifulsoup4, requests, }:
+buildPythonPackage rec {
+ pname = "lyricwikia";
+ version = "0.1.11";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0l5lkvr3299x79i7skdiggp67rzgax3s00psd1zqkxfysq27jvc8";
+ };
+
+ buildInputs = [ pytestrunner ];
+ propagatedBuildInputs = [ six beautifulsoup4 requests ];
+ # upstream has no code tests
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/enricobacis/lyricwikia";
+ maintainers = [ maintainers.kmein ];
+ description = "LyricWikia API for song lyrics";
+ license = licenses.mit;
+ platforms = platforms.all;
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/mac_alias/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/mac_alias/default.nix
index 79fd0796c248..cb9a10337908 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/mac_alias/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/mac_alias/default.nix
@@ -2,12 +2,12 @@
}:
buildPythonPackage rec {
- version = "2.1.0";
+ version = "2.1.1";
pname = "mac_alias";
src = fetchPypi {
inherit pname version;
- sha256 = "9f07926e9befcc4ab35212d19541fe0e4e4abd67a7641aa75252a3ffd8deae94";
+ sha256 = "55468c84a87c8b3929a3dc98f753194f7fe93fd8621abbfea1a4019448058a14";
};
# pypi package does not include tests;
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/markdown/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/markdown/default.nix
index c97f74a2f2ae..22b0d5c27f89 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/markdown/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/markdown/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "Markdown";
- version = "3.2.2";
+ version = "3.3.3";
src = fetchPypi {
inherit pname version;
- sha256 = "1fafe3f1ecabfb514a5285fca634a53c1b32a81cb0feb154264d55bf2ff22c17";
+ sha256 = "5d9f2b5ca24bc4c7a390d22323ca4bad200368612b5aaa7796babf971d2b2f18";
};
propagatedBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/markdownsuperscript/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/markdownsuperscript/default.nix
index 5bbf47278ce7..6c2e6ab1b634 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/markdownsuperscript/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/markdownsuperscript/default.nix
@@ -26,5 +26,6 @@ buildPythonPackage rec {
description = "An extension to the Python Markdown package enabling superscript text";
homepage = "https://github.com/jambonrose/markdown_superscript_extension";
license = stdenv.lib.licenses.bsd2;
+ broken = true; # unmaintained in nixpkgs, barely maintained in pypi, added 2020-11-29
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix
index 60a2704894b9..4bf670082b61 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix
@@ -4,7 +4,7 @@
buildPythonPackage rec {
pname = "marshmallow-sqlalchemy";
- version = "0.23.1";
+ version = "0.24.1";
meta = {
homepage = "https://github.com/marshmallow-code/marshmallow-sqlalchemy";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "0ef59c8da8da2e18e808e3880158049e9d72f3031c84cc804b6c533a0eb668a9";
+ sha256 = "d051cf013c075c43e1ee5c4b01f8fab6dd6b140dab6825be45875f674a0d289c";
};
propagatedBuildInputs = [ marshmallow sqlalchemy ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/marshmallow/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/marshmallow/default.nix
index cf54e38385df..afc378d4aaa8 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/marshmallow/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/marshmallow/default.nix
@@ -4,7 +4,7 @@
buildPythonPackage rec {
pname = "marshmallow";
- version = "3.7.1";
+ version = "3.9.1";
disabled = isPy27;
meta = {
@@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "a2a5eefb4b75a3b43f05be1cca0b6686adf56af7465c3ca629e5ad8d1e1fe13d";
+ sha256 = "73facc37462dfc0b27f571bdaffbef7709e19f7a616beb3802ea425b07843f4e";
};
propagatedBuildInputs = [ dateutil simplejson ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/mathlibtools/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/mathlibtools/default.nix
index f9c1cf6839f0..969a91870b0f 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/mathlibtools/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/mathlibtools/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "mathlibtools";
- version = "0.0.10";
+ version = "1.0.0";
src = fetchPypi {
inherit pname version;
- sha256 = "0d708bgsxjhhchqc56afi1h7k87vbfn7v40f4y1zlv7hsjc69s36";
+ sha256 = "da41c65e206f55b1faea303581fc11215e52d6e6990b827336b2e1eb82aad96c";
};
propagatedBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix
index 732a6c89f439..5ad3c92393d8 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix
@@ -20,14 +20,14 @@ assert enableTk -> (tcl != null)
assert enableQt -> pyqt5 != null;
buildPythonPackage rec {
- version = "3.3.1";
+ version = "3.3.3";
pname = "matplotlib";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "87f53bcce90772f942c2db56736788b39332d552461a5cb13f05ff45c1680f0e";
+ sha256 = "b1b60c6476c4cfe9e5cf8ab0d3127476fd3d5f05de0f343a452badaad0e4bdec";
};
XDG_RUNTIME_DIR = "/tmp";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/matrix-nio/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/matrix-nio/default.nix
index 59c3f47d2ca7..69774b58eb69 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/matrix-nio/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/matrix-nio/default.nix
@@ -20,13 +20,13 @@
buildPythonPackage rec {
pname = "matrix-nio";
- version = "0.15.1";
+ version = "0.15.2";
src = fetchFromGitHub {
owner = "poljar";
repo = "matrix-nio";
rev = version;
- sha256 = "127n4sqdcip1ld42w9wz49pxkpvi765qzvivvwl26720n11zq5cd";
+ sha256 = "190xw3cvk4amr9pl8ip2i7k3xdjd0231kn2zl6chny5axx22p1dv";
};
nativeBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/mautrix/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/mautrix/default.nix
index 50b81cef945d..66cb8ea774f9 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/mautrix/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/mautrix/default.nix
@@ -1,19 +1,18 @@
-{ lib, buildPythonPackage, fetchPypi, aiohttp, future-fstrings, pythonOlder
+{ lib, buildPythonPackage, fetchPypi, aiohttp, pythonOlder
, sqlalchemy, ruamel_yaml, CommonMark, lxml, fetchpatch
}:
buildPythonPackage rec {
pname = "mautrix";
- version = "0.5.8";
+ version = "0.8.3";
src = fetchPypi {
inherit pname version;
- sha256 = "1hqg32n7pmjhap0ybfcf05zgfcyyirb4fm1m7gf44dwh40da6qz0";
+ sha256 = "0bnflaz0nkjvps3b87ig02d3pymnrgrwcd0p0s6qyzx9s08lcz5x";
};
propagatedBuildInputs = [
aiohttp
- future-fstrings
# defined in optional-requirements.txt
sqlalchemy
@@ -22,7 +21,7 @@ buildPythonPackage rec {
lxml
];
- disabled = pythonOlder "3.5";
+ disabled = pythonOlder "3.7";
# no tests available
doCheck = false;
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/maxminddb/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/maxminddb/default.nix
index 0afdeef2228a..d101cdfd0c2e 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/maxminddb/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/maxminddb/default.nix
@@ -7,13 +7,13 @@
}:
buildPythonPackage rec {
- version = "2.0.2";
+ version = "2.0.3";
pname = "maxminddb";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "b95d8ed21799e6604683669c7ed3c6a184fcd92434d5762dccdb139b4f29e597";
+ sha256 = "47e86a084dd814fac88c99ea34ba3278a74bc9de5a25f4b815b608798747c7dc";
};
buildInputs = [ libmaxminddb ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/mecab-python3/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/mecab-python3/default.nix
index dc7123405549..e3abdaa70916 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/mecab-python3/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/mecab-python3/default.nix
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "mecab-python3";
- version = "1.0.1";
+ version = "1.0.3";
src = fetchPypi {
inherit pname version;
- sha256 = "0246wxfk8v1js75nv8jl15cwpf4rvv4xndi4gbzjrrqbsgj2fvfm";
+ sha256 = "62abe28a1155398325372291483608427bc82681fef80e7d132904415f9fd42e";
};
nativeBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/memcached/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/memcached/default.nix
index 654731604807..0e1ec2a2765c 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/memcached/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/memcached/default.nix
@@ -6,11 +6,12 @@
}:
buildPythonPackage rec {
- pname = "memcached-1.51";
+ pname = "memcached";
version = "1.51";
src = if isPy3k then fetchPypi {
- inherit pname version;
+ inherit version;
+ pname = "python3-${pname}";
sha256 = "0na8b369q8fivh3y0nvzbvhh3lgvxiyyv9xp93cnkvwfsr8mkgkw";
} else fetchurl {
url = "http://ftp.tummy.com/pub/python-memcached/old-releases/python-${pname}-${version}.tar.gz";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/mesa/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/mesa/default.nix
index f8fc43808fb3..78c0f1656a3c 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/mesa/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/mesa/default.nix
@@ -4,8 +4,7 @@
buildPythonPackage rec {
pname = "mesa";
- # contains several fixes for networkx 2.4 bump
- version = "unstable-2019-12-09";
+ version = "0.8.7";
# According to their docs, this library is for Python 3+.
disabled = isPy27;
@@ -13,8 +12,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "projectmesa";
repo = "mesa";
- rev = "86b343b42630e94d939029ff2cc609ff04ed40e9";
- sha256 = "1y41s1vd89vcsm4aia18ayfff4w2af98lwn5l9fcwp157li985vw";
+ rev = "v${version}";
+ sha256 = "0i1bpdqjrx4avgrzyqxpwxx86j11yhrq1j4kca854xahvhmwis19";
};
checkInputs = [ pytest ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/milc/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/milc/default.nix
new file mode 100644
index 000000000000..adee40650bce
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/milc/default.nix
@@ -0,0 +1,38 @@
+{ stdenv
+, buildPythonPackage
+, fetchFromGitHub
+, appdirs
+, argcomplete
+, colorama
+, gnugrep
+}:
+
+buildPythonPackage rec {
+ pname = "milc";
+ version = "1.0.10";
+
+ src = fetchFromGitHub {
+ owner = "clueboard";
+ repo = "milc";
+ rev = version;
+ sha256 = "04mk057b6jh0k4maqkg80kpilxak9r7vlr9xqwzczh2gs3g2x573";
+ };
+
+ checkInputs = [ gnugrep ];
+ propagatedBuildInputs = [ appdirs argcomplete colorama ];
+
+ # Upstream has a nose2 test suite that runs this hello script in a handful of
+ # ways, but it's not in setup.py and makes assumptions about relative paths in
+ # the src repo, so just sanity-check basic functionality.
+ checkPhase = ''
+ patchShebangs ./hello
+ ./hello | grep "Hello, World"
+ '';
+
+ meta = with stdenv.lib; {
+ description = "An Opinionated Batteries-Included Python 3 CLI Framework";
+ homepage = "https://milc.clueboard.co";
+ license = licenses.mit;
+ maintainers = with maintainers; [ bhipple ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/minio/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/minio/default.nix
index 7799a7a9ef6d..00ea5b06c646 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/minio/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/minio/default.nix
@@ -12,12 +12,12 @@
buildPythonPackage rec {
pname = "minio";
- version = "6.0.0";
+ version = "6.0.2";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "97d275ff01ddae45101eced0d9d5258f2869308c949b17d86a77b77a2a50b7b3";
+ sha256 = "acae9bfae0aec1b92025bd63e18135ebb4994c84600716c5323e14cb0c9a0b03";
};
propagatedBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/mitmproxy/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/mitmproxy/default.nix
index cb5b5cc80f5b..d22ce7df128a 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/mitmproxy/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/mitmproxy/default.nix
@@ -37,32 +37,25 @@
, parver
, pytest-asyncio
, hypothesis
+, asgiref
+, msgpack
}:
buildPythonPackage rec {
pname = "mitmproxy";
- version = "5.2";
+ version = "5.3.0";
disabled = isPy27;
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
- sha256 = "0ja0aqnfmkvns5qmd51hmrvbw8dnccaks30gxgzgcjgy30rj4brq";
+ sha256 = "04y7fxxssrs14i7zl7fwlwrpnms39i7a6m18481sg8vlrkbagxjr";
};
- patches = [
- # Apply patch from upstream to make mitmproxy v5.2 compatible with urwid >v2.1.0
- (fetchpatch {
- name = "urwid-lt-2.1.0.patch";
- url = "https://github.com/mitmproxy/mitmproxy/commit/ea9177217208fdf642ffc54f6b1f6507a199350c.patch";
- sha256 = "1z5r8izg5nvay01ywl3xc6in1vjfi9f144j057p3k5rzfliv49gg";
- })
- ];
-
postPatch = ''
# remove dependency constraints
- sed 's/>=\([0-9]\.\?\)\+\( \?, \?<\([0-9]\.\?\)\+\)\?//' -i setup.py
+ sed 's/>=\([0-9]\.\?\)\+\( \?, \?<\([0-9]\.\?\)\+\)\?\( \?, \?!=\([0-9]\.\?\)\+\)\?//' -i setup.py
'';
doCheck = (!stdenv.isDarwin);
@@ -75,6 +68,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
setuptools
# setup.py
+ asgiref
blinker
brotli
certifi
@@ -85,6 +79,7 @@ buildPythonPackage rec {
hyperframe
kaitaistruct
ldap3
+ msgpack
passlib
protobuf
publicsuffix2
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/mlflow/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/mlflow/default.nix
index 1acd8bf56907..e86a27e1657f 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/mlflow/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/mlflow/default.nix
@@ -25,12 +25,12 @@
buildPythonPackage rec {
pname = "mlflow";
- version = "1.10.0";
+ version = "1.12.1";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "11fe050373f3dbd422aa476c42cb0ed15467268bc1ad07e221e550bc54f94b75";
+ sha256 = "9b8af18d6e779fbbb094edfeb963691e485bba62eeec39fd62dfbe34bc12afeb";
};
# run into https://stackoverflow.com/questions/51203641/attributeerror-module-alembic-context-has-no-attribute-config
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/mlxtend/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/mlxtend/default.nix
new file mode 100644
index 000000000000..2bfd12249101
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/mlxtend/default.nix
@@ -0,0 +1,49 @@
+{ stdenv
+, buildPythonPackage
+, fetchFromGitHub
+, isPy27
+, pytestCheckHook
+, scipy
+, numpy
+, scikitlearn
+, pandas
+, matplotlib
+, joblib
+}:
+
+buildPythonPackage rec {
+ pname = "mlxtend";
+ version = "0.17.3";
+ disabled = isPy27;
+
+ src = fetchFromGitHub {
+ owner = "rasbt";
+ repo = pname;
+ rev = version;
+ sha256 = "1515wgmj5rhwpmky7apmmvys1630sfg534fai6559s13hp11pdcl";
+ };
+
+ checkInputs = [ pytestCheckHook ];
+ # image tests download files over the network
+ pytestFlagsArray = [ "-sv" "--ignore=mlxtend/image" ];
+ # Fixed in master, but failing in release version
+ # see: https://github.com/rasbt/mlxtend/pull/721
+ disabledTests = [ "test_variance_explained_ratio" ];
+
+ propagatedBuildInputs = [
+ scipy
+ numpy
+ scikitlearn
+ pandas
+ matplotlib
+ joblib
+ ];
+
+ meta = with stdenv.lib; {
+ description = "A library of Python tools and extensions for data science";
+ homepage = "https://github.com/rasbt/mlxtend";
+ license= licenses.bsd3;
+ maintainers = with maintainers; [ evax ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/mocket/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/mocket/default.nix
index ab9be69e58eb..60b32665ca84 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/mocket/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/mocket/default.nix
@@ -9,17 +9,16 @@
buildPythonPackage rec {
pname = "mocket";
- version = "3.9.2";
+ version = "3.9.4";
src = fetchPypi {
inherit pname version;
- sha256 = "25aba0b343784b27b1d77e731ed868a728d5209911f9f4728f33088582e491c9";
+ sha256 = "0b3nx8qa66isfl7rm3ljgxflr087qwabnf0a2xa1l5s28rikfj04";
};
patchPhase = ''
- substituteInPlace requirements.txt \
- --replace "python-magic==0.4.18" "python-magic" \
- --replace "urllib3==1.25.10" "urllib3"
+ sed -iE "s,python-magic==.*,python-magic," requirements.txt
+ sed -iE "s,urllib3==.*,urllib3," requirements.txt
substituteInPlace setup.py --replace 'setup_requires=["pipenv"]' "setup_requires=[]"
'';
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/mongoengine/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/mongoengine/default.nix
index a47438d5a700..3ac24f7430d9 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/mongoengine/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/mongoengine/default.nix
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "mongoengine";
- version = "0.20.0";
+ version = "0.21.0";
disabled = isPy27;
src = fetchFromGitHub {
owner = "MongoEngine";
repo = pname;
rev = "v${version}";
- sha256 = "0wc0cvjanlszn09n61jj38pq9wdlphkjgrp3c8hvd16754is3n7f";
+ sha256 = "02amfdirdw3nc0kgiyax7yndk5b65g83kbjvwwxbgnlcrb9vjzcd";
};
propagatedBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/more-itertools/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/more-itertools/default.nix
index ec6ce4ed3b26..74c214d9231d 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/more-itertools/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/more-itertools/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "more-itertools";
- version = "8.4.0";
+ version = "8.6.0";
src = fetchPypi {
inherit pname version;
- sha256 = "68c70cc7167bdf5c7c9d8f6954a7837089c6a36bf565383919bb595efb8a17e5";
+ sha256 = "b3a9005928e5bed54076e6e549c792b306fddfe72b2d1d22dd63d42d5d3899cf";
};
checkInputs = [ nose ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/msal-extensions/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/msal-extensions/default.nix
index 91f7ecf96676..82ef6fc77f03 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/msal-extensions/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/msal-extensions/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "msal-extensions";
- version = "0.2.2";
+ version = "0.3.0";
src = fetchPypi {
inherit pname version;
- sha256 = "31414753c484679bb3b6c6401623eb4c3ccab630af215f2f78c1d5c4f8e1d1a9";
+ sha256 = "0qbq5qn46053aclpwyzac5zs2xgqirn4hwrf1plrg0m8bnhxy8sm";
};
propagatedBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/msal/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/msal/default.nix
index eae7eadb7f91..6bbdc6f5e5f9 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/msal/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/msal/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "msal";
- version = "1.5.0";
+ version = "1.6.0";
src = fetchPypi {
inherit pname version;
- sha256 = "cc67d3a14850ba7e533ec5d05a4c23a34dd74a7fa5e0210daebef397b2009b0e";
+ sha256 = "15mx1fakz9c5qrrspsckd3yr3l5lac0pbjq8v65r26n3203xx5f9";
};
propagatedBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/msgpack-numpy/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/msgpack-numpy/default.nix
index d380f18f7729..ad612550d7e8 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/msgpack-numpy/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/msgpack-numpy/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "msgpack-numpy";
- version = "0.4.6.1";
+ version = "0.4.7.1";
src = fetchPypi {
inherit pname version;
- sha256 = "9f9b57abb2b155c2d3e411c2dd5b98f14998bd053a20c6ed0ab64a6ceb8ad51d";
+ sha256 = "7eaf51acf82d7c467d21aa71df94e1c051b2055e54b755442051b474fa7cf5e1";
};
buildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/msrest/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/msrest/default.nix
index 14ed57457b29..1f21778f7db8 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/msrest/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/msrest/default.nix
@@ -48,6 +48,6 @@ buildPythonPackage rec {
description = "The runtime library 'msrest' for AutoRest generated Python clients.";
homepage = "https://github.com/Azure/msrest-for-python";
license = licenses.mit;
- maintainers = with maintainers; [ bendlas jonringer mwilsoninsight ];
+ maintainers = with maintainers; [ bendlas jonringer maxwilson ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/mss/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/mss/default.nix
index 1604a006567e..a0d74719e794 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/mss/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/mss/default.nix
@@ -2,16 +2,14 @@
buildPythonPackage rec {
pname = "mss";
- version = "6.0.0";
+ version = "6.1.0";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "0dicp55adbqxb7hqlck95hngb1klv5s26lszw3xim30k18bwqaxl";
+ sha256 = "aebd069f3e05667fe9c7b9fa4b1771fe42a4710ce1058ce0236936ce06fa5394";
};
- propagatedBuildInputs = [ ];
-
# By default it attempts to build Windows-only functionality
prePatch = ''
rm mss/windows.py
@@ -22,7 +20,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Cross-platform multiple screenshots module in pure Python";
- homepage = "https://github.com/BoboTiG/mss/";
+ homepage = "https://github.com/BoboTiG/python-mss";
license = licenses.mit;
maintainers = with maintainers; [ austinbutler ];
};
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/multidict/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/multidict/default.nix
index d818a63cd5d0..43cbbbc6b777 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/multidict/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/multidict/default.nix
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "multidict";
- version = "4.7.6";
+ version = "5.0.2";
src = fetchPypi {
inherit pname version;
- sha256 = "fbb77a75e529021e7c4a8d4e823d88ef4d23674a202be4f5addffc72cbb91430";
+ sha256 = "e5bf89fe57f702a046c7ec718fe330ed50efd4bcf74722940db2eb0919cddb1c";
};
checkInputs = [ pytest pytestrunner pytestcov ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/munkres/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/munkres/default.nix
index 93e0c27fcca1..3df0e2b01f3b 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/munkres/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/munkres/default.nix
@@ -1,24 +1,32 @@
{ stdenv
, buildPythonPackage
, fetchPypi
+, fetchpatch
, isPy3k
-, nose
+, pytestCheckHook
}:
buildPythonPackage rec {
pname = "munkres";
- version = "1.1.2";
+ version = "1.1.4";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "81e9ced40c3d0ffc48be4b6da5cfdfaa49041faaaba8075b159974ec47926aea";
+ sha256 = "fc44bf3c3979dada4b6b633ddeeb8ffbe8388ee9409e4d4e8310c2da1792db03";
};
- checkInputs = [ nose ];
+ patches = [
+ # Fixes test on 32-bit systems.
+ # Remove if https://github.com/bmc/munkres/pull/41 is merged.
+ (fetchpatch {
+ url = "https://github.com/bmc/munkres/commit/380a0d593a0569a761c4a035edaa4414c3b4b31d.patch";
+ sha256 = "0ga63k68r2080blzi04ajdl1m6xd87mmlqa8hxn9hyixrg1682vb";
+ })
+ ];
- checkPhase = "nosetests";
+ checkInputs = [ pytestCheckHook ];
meta = with stdenv.lib; {
homepage = "http://bmc.github.com/munkres/";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/murmurhash/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/murmurhash/default.nix
index 82b33b6b4020..2bd156bd63fd 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/murmurhash/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/murmurhash/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "murmurhash";
- version = "1.0.2";
+ version = "1.0.4";
src = fetchPypi {
inherit pname version;
- sha256 = "c7a646f6b07b033642b4f52ae2e45efd8b80780b3b90e8092a0cec935fbf81e2";
+ sha256 = "422084ac1fe994cb7c893689c600923dee4e2c3fc74e832f7d9a8d6fdcc362d5";
};
postPatch = ''
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/myfitnesspal/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/myfitnesspal/default.nix
index 53e5f8253449..0638ce5d1ee5 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/myfitnesspal/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/myfitnesspal/default.nix
@@ -1,6 +1,9 @@
{ lib, fetchPypi, buildPythonPackage
-, blessed, keyring, keyrings-alt, lxml, measurement, python-dateutil, requests, six
-, mock, nose }:
+, blessed, keyring, keyrings-alt, lxml, measurement, python-dateutil, requests, six, rich
+, pytestCheckHook, mock, nose }:
+
+# TODO: Define this package in "all-packages.nix" using "toPythonApplication".
+# This currently errors out, complaining about not being able to find "etree" from "lxml" even though "lxml" is defined in "propagatedBuildInputs".
buildPythonPackage rec {
pname = "myfitnesspal";
@@ -11,14 +14,18 @@ buildPythonPackage rec {
sha256 = "c2275e91c794a3569a76c47c78cf2ff04d7f569a98558227e899ead7b30af0d6";
};
- # Remove overly restrictive version constraints on keyring and keyrings.alt
+ # Remove overly restrictive version constraints
postPatch = ''
sed -i 's/keyring>=.*/keyring/' requirements.txt
sed -i 's/keyrings.alt>=.*/keyrings.alt/' requirements.txt
+ sed -i 's/rich>=.*/rich/' requirements.txt
'';
- checkInputs = [ mock nose ];
- propagatedBuildInputs = [ blessed keyring keyrings-alt lxml measurement python-dateutil requests six ];
+ propagatedBuildInputs = [ blessed keyring keyrings-alt lxml measurement python-dateutil requests six rich ];
+
+ # Integration tests require an account to be set
+ disabledTests = [ "test_integration" ];
+ checkInputs = [ pytestCheckHook mock nose ];
meta = with lib; {
description = "Access your meal tracking data stored in MyFitnessPal programatically";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/mypy/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/mypy/default.nix
index 0bcf216fa46f..2e751c6f48dc 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/mypy/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/mypy/default.nix
@@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "mypy";
- version = "0.782";
+ version = "0.790";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "030kn709515452n6gy2i1d9fg6fyrkmdz228lfpmbslybsld9xzg";
+ sha256 = "sha256-KyG6Ra2e8uLriM5K6t0BEtD1AmQYMkF2/UlKaCS3SXU=";
};
propagatedBuildInputs = [ typed-ast psutil mypy-extensions typing-extensions ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/mysql-connector/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/mysql-connector/default.nix
index 11777dbf9e67..d3465110194e 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/mysql-connector/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/mysql-connector/default.nix
@@ -4,13 +4,13 @@ let
py = python;
in buildPythonPackage rec {
pname = "mysql-connector";
- version = "8.0.21";
+ version = "8.0.22";
src = fetchFromGitHub {
owner = "mysql";
repo = "mysql-connector-python";
rev = version;
- sha256 = "0ky7rn9259807gji3fhvkmdmrgyaps431l9l9y6gh66i84kw1b3l";
+ sha256 = "084q8x86ywgxgpsgdid8y9rjjys06146dqinfpmlggjswbq9kl0d";
};
propagatedBuildInputs = with py.pkgs; [ protobuf dnspython ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/natsort/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/natsort/default.nix
index bfe486e1a54a..e4c42496597e 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/natsort/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/natsort/default.nix
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "natsort";
- version = "7.0.1";
+ version = "7.1.0";
checkInputs = [
pytest
@@ -27,7 +27,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "a633464dc3a22b305df0f27abcb3e83515898aa1fd0ed2f9726c3571a27258cf";
+ sha256 = "33f3f1003e2af4b4df20908fe62aa029999d136b966463746942efbfc821add3";
};
# Does not support Python 2
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/nbclient/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/nbclient/default.nix
index aa7a1ce39085..f37cb3bc58f9 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/nbclient/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/nbclient/default.nix
@@ -1,18 +1,20 @@
{ stdenv, buildPythonPackage, fetchPypi, pythonOlder,
async_generator, traitlets, nbformat, nest-asyncio, jupyter_client,
pytest, xmltodict, nbconvert, ipywidgets
+, doCheck ? true
}:
buildPythonPackage rec {
pname = "nbclient";
- version = "0.5.0";
+ version = "0.5.1";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "8ad52d27ba144fca1402db014857e53c5a864a2f407be66ca9d74c3a56d6591d";
+ sha256 = "01e2d726d16eaf2cde6db74a87e2451453547e8832d142f73f72fddcd4fe0250";
};
+ inherit doCheck;
checkInputs = [ pytest xmltodict nbconvert ipywidgets ];
propagatedBuildInputs = [ async_generator traitlets nbformat nest-asyncio jupyter_client ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/nbconflux/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/nbconflux/default.nix
index e86119036b5c..4e443a377eda 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/nbconflux/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/nbconflux/default.nix
@@ -1,8 +1,9 @@
-{ lib, buildPythonPackage, fetchFromGitHub, nbconvert, pytest, requests, responses }:
+{ lib, buildPythonPackage, fetchFromGitHub, isPy27, nbconvert, pytest, requests, responses }:
buildPythonPackage rec {
pname = "nbconflux";
version = "0.7.0";
+ disabled = isPy27; # no longer compatible with python 2 urllib
src = fetchFromGitHub {
owner = "Valassis-Digital-Media";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/nbconvert/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/nbconvert/default.nix
index 49e4862999c7..582a6132c259 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/nbconvert/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/nbconvert/default.nix
@@ -1,17 +1,18 @@
{ lib
, buildPythonPackage
, fetchPypi
-, pytest
-, nose
+, pytestCheckHook
, glibcLocales
, entrypoints
, bleach
, mistune
+, nbclient
, jinja2
, pygments
, traitlets
, testpath
, jupyter_core
+, jupyterlab-pygments
, nbformat
, ipykernel
, pandocfilters
@@ -22,28 +23,46 @@
buildPythonPackage rec {
pname = "nbconvert";
- version = "5.6.1";
+ version = "6.0.7";
src = fetchPypi {
inherit pname version;
- sha256 = "21fb48e700b43e82ba0e3142421a659d7739b65568cc832a13976a77be16b523";
+ sha256 = "cbbc13a86dfbd4d1b5dee106539de0795b4db156c894c2c5dc382062bbc29002";
};
- checkInputs = [ nose pytest glibcLocales ];
+ checkInputs = [ pytestCheckHook glibcLocales ];
propagatedBuildInputs = [
entrypoints bleach mistune jinja2 pygments traitlets testpath
jupyter_core nbformat ipykernel pandocfilters tornado jupyter_client
defusedxml
+ (nbclient.override { doCheck = false; }) # avoid infinite recursion
+ jupyterlab-pygments
];
# disable preprocessor tests for ipython 7
# see issue https://github.com/jupyter/nbconvert/issues/898
- checkPhase = ''
+ preCheck = ''
export LC_ALL=en_US.UTF-8
- HOME=$(mktemp -d) py.test -v --ignore="nbconvert/preprocessors/tests/test_execute.py"
+ HOME=$(mktemp -d)
'';
+ pytestFlagsArray = [
+ "--ignore=nbconvert/preprocessors/tests/test_execute.py"
+ # can't resolve template paths within sandbox
+ "--ignore=nbconvert/tests/base.py"
+ "--ignore=nbconvert/tests/test_nbconvertapp.py"
+ ];
+
+
+ disabledTests = [
+ "test_export"
+ "test_webpdf_without_chromium"
+ #"test_cell_tag_output"
+ #"test_convert_from_stdin"
+ #"test_convert_full_qualified_name"
+ ];
+
# Some of the tests use localhost networking.
__darwinAllowLocalNetworking = true;
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/nbdime/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/nbdime/default.nix
index 7e774eed2962..1de21f3511a4 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/nbdime/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/nbdime/default.nix
@@ -24,12 +24,12 @@
buildPythonPackage rec {
pname = "nbdime";
- version = "2.0.0";
+ version = "2.1.0";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "0pbi22mc5al29pvsw7bhai2d58i8n77gv09r7avr1wap6ni7jvw9";
+ sha256 = "4e3efdcfda31c3074cb565cd8e76e2e5421b1c4560c3a00c56f8679dd15590e5";
};
checkInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/nbformat/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/nbformat/default.nix
index 0c75fc4ac5ac..3bd119179a45 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/nbformat/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/nbformat/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "nbformat";
- version = "5.0.7";
+ version = "5.0.8";
src = fetchPypi {
inherit pname version;
- sha256 = "54d4d6354835a936bad7e8182dcd003ca3dc0cedfee5a306090e04854343b340";
+ sha256 = "f545b22138865bfbcc6b1ffe89ed5a2b8e2dc5d4fe876f2ca60d8e6f702a30f8";
};
LC_ALL="en_US.utf8";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/nbsmoke/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/nbsmoke/default.nix
index 8f263246893b..b7ddf35caec6 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/nbsmoke/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/nbsmoke/default.nix
@@ -14,11 +14,11 @@
buildPythonPackage rec {
pname = "nbsmoke";
- version = "0.4.1";
+ version = "0.5.0";
src = fetchPypi {
inherit pname version;
- sha256 = "06as8vh17m0nkp3fpkp42m990a5zjfl2iaa17da99ksh7886mjpc";
+ sha256 = "2400d7878e97714e822ab200a71fc71ede487e671f42b4b411745dba95f9cb32";
};
propagatedBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/nbsphinx/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/nbsphinx/default.nix
index f46322954f36..fb5eb6cbf7c9 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/nbsphinx/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/nbsphinx/default.nix
@@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "nbsphinx";
- version = "0.7.1";
+ version = "0.8.0";
src = fetchPypi {
inherit pname version;
- sha256 = "0j56bxdj08vn3q1804qwb1ywhga1mdg1awgm7i64wfpfwi8df2zm";
+ sha256 = "369c16fe93af14c878d61fb3e81d838196fb35b27deade2cd7b95efe1fe56ea0";
};
propagatedBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/ndjson/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/ndjson/default.nix
new file mode 100644
index 000000000000..175b04d31074
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/ndjson/default.nix
@@ -0,0 +1,21 @@
+{ lib, buildPythonPackage, fetchPypi, wheel, watchdog, flake8
+, pytest, pytestrunner, coverage, sphinx, twine }:
+
+buildPythonPackage rec {
+ pname = "ndjson";
+ version = "0.3.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "v5dGy2uxy1PRcs2n8VTAfHhtZl/yg0Hk5om3lrIp5dY=";
+ };
+
+ checkInputs = [ pytest pytestrunner flake8 twine sphinx coverage watchdog ];
+
+ meta = with lib; {
+ homepage = "https://github.com/rhgrant10/ndjson";
+ description = "JsonDecoder";
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ freezeboy ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/neo/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/neo/default.nix
index 631beabea8a2..e5db8450e788 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/neo/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/neo/default.nix
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "neo";
- version = "0.8.0";
+ version = "0.9.0";
src = fetchPypi {
inherit pname version;
- sha256 = "0n74miad4dadavnzi1hqlyzyk795x7qq2adp71i011534ixs70ik";
+ sha256 = "6e31c88d7c52174fa2512df589b2b5003e9471fde27fca9f315f4770ba3bd3cb";
};
propagatedBuildInputs = [ numpy quantities ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/nest-asyncio/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/nest-asyncio/default.nix
index 993e5e413e4c..56c6044ba746 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/nest-asyncio/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/nest-asyncio/default.nix
@@ -5,13 +5,13 @@
}:
buildPythonPackage rec {
- version = "1.4.0";
+ version = "1.4.3";
pname = "nest_asyncio";
disabled = !(pythonAtLeast "3.5");
src = fetchPypi {
inherit pname version;
- sha256 = "1j2rbb31wdq9k15cmj2y0kypzvfc3v05py1n0809nmqlpi5hawsp";
+ sha256 = "eaa09ef1353ebefae19162ad423eef7a12166bcc63866f8bff8f3635353cd9fa";
};
# tests not packaged with source dist as of 1.3.2/1.3.2, and
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/nestedtext/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/nestedtext/default.nix
new file mode 100644
index 000000000000..1fbfde7b26a6
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/nestedtext/default.nix
@@ -0,0 +1,43 @@
+{ lib, buildPythonPackage, fetchFromGitHub
+, inform
+, pytestCheckHook
+, docopt
+, natsort
+, voluptuous
+}:
+
+buildPythonPackage rec {
+ pname = "nestedtext";
+ version = "1.2";
+
+ src = fetchFromGitHub {
+ owner = "KenKundert";
+ repo = "nestedtext";
+ rev = "v${version}";
+ fetchSubmodules = true;
+ sha256 = "1dwks5apghg29aj90nc4qm0chk195jh881297zr1wk7mqd2n159y";
+ };
+
+ propagatedBuildInputs = [ inform ];
+
+ checkInputs = [ pytestCheckHook docopt natsort voluptuous ];
+ pytestFlagsArray = [ "--ignore=build" ]; # Avoids an ImportMismatchError.
+
+ meta = with lib; {
+ description = "A human friendly data format";
+ longDescription = ''
+ NestedText is a file format for holding data that is to be entered,
+ edited, or viewed by people. It allows data to be organized into a nested
+ collection of dictionaries, lists, and strings. In this way it is similar
+ to JSON, YAML and TOML, but without the complexity and risk of YAML and
+ without the syntactic clutter of JSON and TOML. NestedText is both simple
+ and natural. Only a small number of concepts and rules must be kept in
+ mind when creating it. It is easily created, modified, or viewed with a
+ text editor and easily understood and used by both programmers and
+ non-programmers.
+ '';
+ homepage = "https://nestedtext.org";
+ license = licenses.mit;
+ maintainers = with maintainers; [ jeremyschlatter ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/networkx/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/networkx/default.nix
index 6075daf58467..27f6082ac568 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/networkx/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/networkx/default.nix
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "networkx";
# upgrade may break sage, please test the sage build or ping @timokau on upgrade
- version = "2.4";
+ version = "2.5";
src = fetchPypi {
inherit pname version;
- sha256 = "0r2wr7aqay9fwjrgk35fkjzk8lvvb4i4df7ndaqzkr4ndw5zzx7q";
+ sha256 = "7978955423fbc9639c10498878be59caf99b44dc304c2286162fd24b458c1602";
};
propagatedBuildInputs = [ decorator setuptools ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/nibabel/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/nibabel/default.nix
index b1e8a23ef8ef..e67bdcc31946 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/nibabel/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/nibabel/default.nix
@@ -13,12 +13,12 @@
buildPythonPackage rec {
pname = "nibabel";
- version = "3.1.1";
+ version = "3.2.1";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "1kir9g7kmy2qygyzczx8nj4b0sc6jjvqy0ssm39bxzqsr1vzzvxm";
+ sha256 = "4d2ff9426b740011a1c916b54fc25da9348282e727eaa2ea163f42e00f1fc29e";
};
propagatedBuildInputs = [ numpy scipy h5py packaging pydicom ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/nilearn/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/nilearn/default.nix
index c01715470f60..e1efdf26de80 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/nilearn/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/nilearn/default.nix
@@ -1,26 +1,17 @@
-{ stdenv, buildPythonPackage, fetchPypi, pytest, nose
-, nibabel, numpy, pandas, scikitlearn, scipy, matplotlib, joblib }:
+{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, matplotlib
+, nibabel, numpy, pandas, scikitlearn, scipy, joblib, requests }:
buildPythonPackage rec {
pname = "nilearn";
- version = "0.6.2";
+ version = "0.7.0";
src = fetchPypi {
inherit pname version;
- sha256 = "cfc6cfda59a6f4247189f8ccf92e364de450460a15c0ec21bdb857c420dd198c";
+ sha256 = "1rhpy6na7hkhc211ri14zghvmb2fxkh995wi09pkc68klf1dzjg7";
};
- postPatch = ''
- substituteInPlace setup.py --replace "required_packages.append('sklearn')" ""
- '';
- # https://github.com/nilearn/nilearn/issues/2288
-
- # disable some failing tests
- checkPhase = ''
- pytest nilearn/tests -k 'not test_cache_mixin_with_expand_user' # accesses ~/
- '';
-
- checkInputs = [ pytest nose ];
+ checkInputs = [ pytestCheckHook ];
+ disabledTests = [ "test_clean_confounds" ]; # https://github.com/nilearn/nilearn/issues/2608
propagatedBuildInputs = [
joblib
@@ -28,12 +19,13 @@ buildPythonPackage rec {
nibabel
numpy
pandas
+ requests
scikitlearn
scipy
];
- meta = with stdenv.lib; {
- homepage = "http://nilearn.github.io";
+ meta = with lib; {
+ homepage = "https://nilearn.github.io";
description = "A module for statistical learning on neuroimaging data";
license = licenses.bsd3;
};
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/nipype/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/nipype/default.nix
index 80ee7691a1a5..f152287d25dc 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/nipype/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/nipype/default.nix
@@ -1,23 +1,19 @@
{ stdenv
, buildPythonPackage
, fetchPypi
-, isPy3k
-, isPy38
+, isPy27
# python dependencies
, click
-, configparser ? null
, dateutil
, etelemetry
, filelock
, funcsigs
, future
-, futures
, mock
, networkx
, nibabel
, numpy
, packaging
-, pathlib2
, prov
, psutil
, pybids
@@ -25,6 +21,7 @@
, pytest
, pytest_xdist
, pytest-forked
+, rdflib
, scipy
, simplejson
, traits
@@ -37,10 +34,12 @@
, bash
, glibcLocales
, callPackage
+# causes Python packaging conflict with any package requiring rdflib,
+# so use the unpatched rdflib by default (disables Nipype provenance tracking);
+# see https://github.com/nipy/nipype/issues/2888:
+, useNeurdflib ? false
}:
-assert !isPy3k -> configparser != null;
-
let
# This is a temporary convenience package for changes waiting to be merged into the primary rdflib repo.
@@ -50,11 +49,12 @@ in
buildPythonPackage rec {
pname = "nipype";
- version = "1.5.1";
+ version = "1.6.0";
+ disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "3d6aa37186e1d2f90917dfdf1faf5aeff469912554990e5d182ffe8435f250d5";
+ sha256 = "bc56ce63f74c9a9a23c6edeaf77631377e8ad2bea928c898cc89527a47f101cf";
};
postPatch = ''
@@ -74,7 +74,6 @@ buildPythonPackage rec {
funcsigs
future
networkx
- neurdflib
nibabel
numpy
packaging
@@ -85,11 +84,7 @@ buildPythonPackage rec {
simplejson
traits
xvfbwrapper
- ] ++ stdenv.lib.optionals (!isPy3k) [
- configparser
- futures
- pathlib2 # darwin doesn't receive this transitively, but it is in install_requires
- ];
+ ] ++ [ (if useNeurdflib then neurdflib else rdflib) ];
checkInputs = [
pybids
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/nix-kernel/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/nix-kernel/default.nix
index 81057308e6b5..5758e60fa3fc 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/nix-kernel/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/nix-kernel/default.nix
@@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
+, isPy3k
, pexpect
, notebook
, nix
@@ -10,6 +11,8 @@ buildPythonPackage rec {
pname = "nix-kernel";
version = "unstable-2020-04-26";
+ disabled = !isPy3k;
+
src = fetchFromGitHub {
owner = "GTrunSec";
repo = "nix-kernel";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/nix-prefetch-github/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/nix-prefetch-github/default.nix
index 67873f929ad4..d7f203aa4d8d 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/nix-prefetch-github/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/nix-prefetch-github/default.nix
@@ -8,18 +8,17 @@
, jinja2
, git
, pytestCheckHook
-, pytest-black
, pytestcov
, pytest-isort
}:
buildPythonPackage rec {
pname = "nix-prefetch-github";
- version = "3.0";
+ version = "4.0.2";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-EN+EbVXUaf+id5UsK4EBm/9k9FYaH79g08kblvW60XA=";
+ sha256 = "ZdaWIkpJk8AvTZmA76VMTXeOUTrWLe+W3vh/e0zwWB4=";
};
propagatedBuildInputs = [
@@ -29,7 +28,7 @@ buildPythonPackage rec {
jinja2
];
- checkInputs = [ pytestCheckHook pytest-black pytestcov pytest-isort git ];
+ checkInputs = [ pytestCheckHook pytestcov pytest-isort git ];
checkPhase = ''
pytest -m 'not network'
'';
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/nocasedict/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/nocasedict/default.nix
new file mode 100644
index 000000000000..ffa761f206e3
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/nocasedict/default.nix
@@ -0,0 +1,28 @@
+{ lib, buildPythonPackage, fetchPypi
+, pytest
+}:
+
+buildPythonPackage rec {
+ pname = "nocasedict";
+ version = "1.0.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "bl1b0R3jP5PSJUXZ7SOguY+EDyzawNdJ0vqkYXrcd3I=";
+ };
+
+ checkInputs = [
+ pytest
+ ];
+
+ pythonImportsCheck = [
+ "nocasedict"
+ ];
+
+ meta = with lib; {
+ description = "A case-insensitive ordered dictionary for Python";
+ homepage = "https://github.com/pywbem/nocasedict";
+ license = licenses.lgpl21Plus;
+ maintainers = with maintainers; [ freezeboy ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/nocaselist/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/nocaselist/default.nix
new file mode 100644
index 000000000000..055b55da45d3
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/nocaselist/default.nix
@@ -0,0 +1,28 @@
+{ lib, buildPythonPackage, fetchPypi
+, pytest
+}:
+
+buildPythonPackage rec {
+ pname = "nocaselist";
+ version = "1.0.3";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "fm3st9hVY7kESRPJCH70tpG8PaTXrR2IlozepAlVMyY=";
+ };
+
+ checkInputs = [
+ pytest
+ ];
+
+ pythonImportsCheck = [
+ "nocaselist"
+ ];
+
+ meta = with lib; {
+ description = "A case-insensitive list for Python";
+ homepage = "https://github.com/pywbem/nocaselist";
+ license = licenses.lgpl21Plus;
+ maintainers = with maintainers; [ freezeboy ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/notebook/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/notebook/default.nix
index 04fe19377f8e..116fa153cdad 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/notebook/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/notebook/default.nix
@@ -28,12 +28,12 @@
buildPythonPackage rec {
pname = "notebook";
- version = "6.1.4";
+ version = "6.1.5";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "0cnyi4zd3byh7zixdj2q71axm31xgjiyfklh1c63c87acgwh2zb8";
+ sha256 = "3db37ae834c5f3b6378381229d0e5dfcbfb558d08c8ce646b1ad355147f5e91d";
};
LC_ALL = "en_US.utf8";
@@ -67,6 +67,7 @@ buildPythonPackage rec {
"TestInstallServerExtension"
"launch_socket"
"sock_server"
+ "test_list_formats" # tries to find python MIME type
] ++ lib.optional stdenv.isDarwin [
"test_delete"
"test_checkpoints_follow_file"
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/notify-py/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/notify-py/default.nix
index fc2eda47beba..46c72fb69794 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/notify-py/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/notify-py/default.nix
@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "notify_py";
- version = "0.2.3";
+ version = "0.3.1";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "1i209xsff54hipdk9cg6va60fl33swg126yfgkg3wsgjmi6s07ca";
+ sha256 = "5ba696d18ffe1d7070f3d0a5b4923fee4d6c863de6843af105bec0ce9915ebad";
};
postPatch = ''
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/notmuch/2.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/notmuch/2.nix
new file mode 100644
index 000000000000..593eed6c2514
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/notmuch/2.nix
@@ -0,0 +1,22 @@
+{ stdenv
+, buildPythonPackage
+, notmuch
+, python
+, cffi
+}:
+
+buildPythonPackage {
+ pname = "notmuch2";
+ inherit (notmuch) version src;
+
+ sourceRoot = "${notmuch.src.name}/bindings/python-cffi";
+
+ buildInputs = [ python notmuch cffi ];
+
+ meta = with stdenv.lib; {
+ description = "Pythonic bindings for the notmuch mail database using CFFI";
+ homepage = "https://notmuchmail.org/";
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ teto ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/ntc-templates/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/ntc-templates/default.nix
index 923f8c196986..a85bd0f8fc37 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/ntc-templates/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/ntc-templates/default.nix
@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "ntc-templates";
- version = "1.5.0";
+ version = "1.6.0";
disabled = isPy27;
src = fetchFromGitHub {
owner = "networktocode";
repo = pname;
- rev = "v${version}";
- sha256 = "0pvd9n7hcmxl9cr8m1xlqcjmy3k2hga0qmn2k3x9hripjis7pbbi";
+ rev = "dc27599b0c5f3bb6ff23049e781b5dab2849c2c3"; # not tagged
+ sha256 = "1vg5y5c51vc9dj3b8qcffh6dz85ri11zb1azxmyvgbq86pcvbx9f";
};
propagatedBuildInputs = [ textfsm ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/ntplib/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/ntplib/default.nix
index 71397fd84cd1..e87fc6292e74 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/ntplib/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/ntplib/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "ntplib";
- version = "0.3.3";
+ version = "0.3.4";
src = fetchPypi {
inherit pname version;
- sha256 = "c4621b64d50be9461d9bd9a71ba0b4af06fbbf818bbd483752d95c1a4e273ede";
+ sha256 = "9fc99f71b14641b31698e4ced3d5f974eec225bfbae089ebe44b5808ba890f71";
};
# Require networking
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/nuitka/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/nuitka/default.nix
index f5726b91b9c1..890180d0dec9 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/nuitka/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/nuitka/default.nix
@@ -27,7 +27,7 @@ in buildPythonPackage rec {
postPatch = ''
patchShebangs tests/run-tests
'' + stdenv.lib.optionalString stdenv.isLinux ''
- substituteInPlace nuitka/plugins/standard/ImplicitImports.py --replace 'locateDLL("uuid")' '"${pkgs.utillinux.out}/lib/libuuid.so"'
+ substituteInPlace nuitka/plugins/standard/ImplicitImports.py --replace 'locateDLL("uuid")' '"${pkgs.util-linux.out}/lib/libuuid.so"'
'';
# We do not want any wrappers here.
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/numba/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/numba/default.nix
index c3a6484adbc6..ad31b8e960c8 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/numba/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/numba/default.nix
@@ -13,14 +13,14 @@
}:
buildPythonPackage rec {
- version = "0.51.1";
+ version = "0.51.2";
pname = "numba";
# uses f-strings
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "1e765b1a41535684bf3b0465c1d0a24dcbbff6af325270c8f4dad924c0940160";
+ sha256 = "16bd59572114adbf5f600ea383880d7b2071ae45477e84a24994e089ea390768";
};
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/numericalunits/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/numericalunits/default.nix
index 208178f5e11b..f628daf833b4 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/numericalunits/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/numericalunits/default.nix
@@ -5,12 +5,12 @@
}:
buildPythonPackage rec {
- version = "1.24";
+ version = "1.25";
pname = "numericalunits";
src = fetchPypi {
inherit pname version;
- sha256 = "0wn7kqp0rxqr6gnqhdn8pc0wy359krzan0kbika6hfvb0c1rw1hs";
+ sha256 = "c32a482adae818a1a8d6c799bf9fb153326461d490c0de9deab9c694a6537eec";
};
disabled = !isPy3k;
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/numexpr/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/numexpr/default.nix
index 3e3316788ed1..046f0a5bd5d1 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/numexpr/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/numexpr/default.nix
@@ -19,12 +19,18 @@ buildPythonPackage rec {
ln -s ${numpy.cfg} site.cfg
'';
- propagatedBuildInputs = [ numpy ];
+ nativeBuildInputs = [
+ numpy
+ ];
+
+ propagatedBuildInputs = [
+ numpy
+ ];
checkPhase = ''
runtest="$(pwd)/numexpr/tests/test_numexpr.py"
pushd "$out"
- ${python}/bin/${python.executable} "$runtest"
+ ${python.interpreter} "$runtest"
popd
'';
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/numpy-stl/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/numpy-stl/default.nix
index b862319d9477..cb43084556e8 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/numpy-stl/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/numpy-stl/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "numpy-stl";
- version = "2.11.2";
+ version = "2.13.0";
src = fetchPypi {
inherit pname version;
- sha256 = "1dil1rklb41m3v6a0i93ymimv453whsg1m9z6g0z17jbg7gmc98r";
+ sha256 = "648386e6cdad3218adc4e3e6a349bee41c55a61980dace616c05d6a31e8c652d";
};
checkInputs = [ pytest pytestrunner ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/numpy/1.16.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/numpy/1.16.nix
index 6fa77d8fa907..1ab958a15f07 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/numpy/1.16.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/numpy/1.16.nix
@@ -60,6 +60,7 @@ in buildPythonPackage rec {
preConfigure = ''
sed -i 's/-faltivec//' numpy/distutils/system_info.py
export NPY_NUM_BUILD_JOBS=$NIX_BUILD_CORES
+ export OMP_NUM_THREADS=$((NIX_BUILD_CORES > 64 ? 64 : NIX_BUILD_CORES))
'';
preBuild = ''
@@ -92,6 +93,7 @@ in buildPythonPackage rec {
meta = {
description = "Scientific tools for Python";
homepage = "https://numpy.org/";
+ license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ fridh ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/numpy/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/numpy/default.nix
index 9502cdc5b0a0..51eeab3177e2 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/numpy/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/numpy/default.nix
@@ -4,13 +4,14 @@
, buildPythonPackage
, gfortran
, hypothesis
-, pytest
+, pytest_5
, blas
, lapack
, writeTextFile
, isPyPy
, cython
, setuptoolsBuildHook
+, fetchpatch
}:
assert (!blas.isILP64) && (!lapack.isILP64);
@@ -39,28 +40,38 @@ let
};
in buildPythonPackage rec {
pname = "numpy";
- version = "1.19.1";
+ version = "1.19.4";
format = "pyproject.toml";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "b8456987b637232602ceb4d663cb34106f7eb780e247d51a260b84760fd8f491";
+ sha256 = "141ec3a3300ab89c7f2b0775289954d193cc8edb621ea05f99db9cb181530512";
};
- nativeBuildInputs = [ gfortran pytest cython setuptoolsBuildHook ];
+ nativeBuildInputs = [ gfortran cython setuptoolsBuildHook ];
buildInputs = [ blas lapack ];
- patches = lib.optionals python.hasDistutilsCxxPatch [
+ patches = [
+ # For compatibility with newer pytest
+ (fetchpatch {
+ url = "https://github.com/numpy/numpy/commit/ba315034759fbf91c61bb55390edc86e7b2627f3.patch";
+ sha256 = "F2P5q61CyhqsZfwkLmxb7A9YdE+43FXLbQkSjop2rVY=";
+ })
+ ] ++ lib.optionals python.hasDistutilsCxxPatch [
# We patch cpython/distutils to fix https://bugs.python.org/issue1222585
# Patching of numpy.distutils is needed to prevent it from undoing the
# patch to distutils.
./numpy-distutils-C++.patch
];
+ # we default openblas to build with 64 threads
+ # if a machine has more than 64 threads, it will segfault
+ # see https://github.com/xianyi/OpenBLAS/issues/2993
preConfigure = ''
sed -i 's/-faltivec//' numpy/distutils/system_info.py
export NPY_NUM_BUILD_JOBS=$NIX_BUILD_CORES
+ export OMP_NUM_THREADS=$((NIX_BUILD_CORES > 64 ? 64 : NIX_BUILD_CORES))
'';
preBuild = ''
@@ -71,7 +82,10 @@ in buildPythonPackage rec {
doCheck = !isPyPy; # numpy 1.16+ hits a bug in pypy's ctypes, using either numpy or pypy HEAD fixes this (https://github.com/numpy/numpy/issues/13807)
- checkInputs = [ hypothesis ];
+ checkInputs = [
+ pytest_5 # pytest 6 will error: "module is already imported: hypothesis"
+ hypothesis
+ ];
checkPhase = ''
runHook preCheck
@@ -95,6 +109,7 @@ in buildPythonPackage rec {
meta = {
description = "Scientific tools for Python";
homepage = "https://numpy.org/";
+ license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ fridh ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/nunavut/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/nunavut/default.nix
index 4905a8da7a38..8b2943ba363a 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/nunavut/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/nunavut/default.nix
@@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "nunavut";
- version = "0.3.6";
+ version = "0.6.2";
disabled = pythonOlder "3.5"; # only python>=3.5 is supported
src = fetchPypi {
inherit pname version;
- sha256 = "434edabdc431b9af719896e0de4bd0deead657777d1d8aa4e3cd0dcdff6298bc";
+ sha256 = "48b6802722d78542ca5d7bbc0d6aa9b0a31e1be0070c47b41527f227eb6a1443";
};
propagatedBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/nvchecker/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/nvchecker/default.nix
index c85e45a239cd..b675fa6f06be 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/nvchecker/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/nvchecker/default.nix
@@ -19,14 +19,14 @@
buildPythonPackage rec {
pname = "nvchecker";
- version = "2.1";
+ version = "2.2";
# Tests not included in PyPI tarball
src = fetchFromGitHub {
owner = "lilydjwg";
repo = pname;
rev = "v${version}";
- sha256 = "0zf9vhf8ka0v1mf1xhbvkc2nr54m0rkiw1i68ps4sgx2mdj6qrfk";
+ sha256 = "0b17pikqyxcsid69lwnjl44n8z46ydjmxxdnbzasfdl7r83l7ijr";
};
nativeBuildInputs = [ installShellFiles docutils ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/oauthenticator/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/oauthenticator/default.nix
index bf2ad31ec3d7..e7b61b70fa33 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/oauthenticator/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/oauthenticator/default.nix
@@ -16,11 +16,11 @@
buildPythonPackage rec {
pname = "oauthenticator";
- version = "0.11.0";
+ version = "0.12.2";
src = fetchPypi {
inherit pname version;
- sha256 = "ff1b4ba2458a6ee460c3c4161d780a12e94811b2daaa5d13acdb354fa21a9916";
+ sha256 = "a4e8d8c528b0386340fc59ba98118a2aeb668a3741288b7ac15fd35124a91813";
};
checkPhase = ''
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/objgraph/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/objgraph/default.nix
index 860f8c0051e7..79c448b5cced 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/objgraph/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/objgraph/default.nix
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "objgraph";
- version = "3.4.1";
+ version = "3.5.0";
src = fetchPypi {
inherit pname version;
- sha256 = "bf29512d7f8b457b53fa0722ea59f516abb8abc59b78f97f0ef81394a0c615a7";
+ sha256 = "4752ca5bcc0e0512e41b8cc4d2780ac2fd3b3eabd03b7e950a5594c06203dfc4";
};
# Tests fail with PyPy.
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/onnx/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/onnx/default.nix
index 6c0560bbaffc..278d7c1df046 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/onnx/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/onnx/default.nix
@@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "onnx";
- version = "1.7.0";
+ version = "1.8.0";
# Due to Protobuf packaging issues this build of Onnx with Python 2 gives
# errors on import.
@@ -27,7 +27,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "0j6rgfbhsw3a8id8pyg18y93k68lbjbj1kq6qia36h69f6pvlyjy";
+ sha256 = "5f787fd3ce1290e12da335237b3b921152157e51aa09080b65631b3ce3fcc50c";
};
nativeBuildInputs = [ cmake ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/openrazer/common.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/openrazer/common.nix
index 8dddf105d1c0..67896c362f56 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/openrazer/common.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/openrazer/common.nix
@@ -1,12 +1,12 @@
{ stdenv
, fetchFromGitHub
}: rec {
- version = "2.8.0";
+ version = "2.9.0";
src = fetchFromGitHub {
owner = "openrazer";
repo = "openrazer";
rev = "v${version}";
- sha256 = "0mwg6b2y3wfpvgxb9lznwblb3bnrayn858nc4fbbg76zdp5bk5ky";
+ sha256 = "1js7hq7zx5kj99brffrfaaah283ydkffmmrzsxv4mkd3nnd6rykk";
};
meta = with stdenv.lib; {
homepage = "https://openrazer.github.io/";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/openrouteservice/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/openrouteservice/default.nix
new file mode 100644
index 000000000000..c35405f417b2
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/openrouteservice/default.nix
@@ -0,0 +1,29 @@
+{ lib, buildPythonPackage, fetchFromGitHub, requests, responses, pytestCheckHook }:
+
+buildPythonPackage rec {
+ pname = "openrouteservice";
+ version = "2.3.0";
+
+ src = fetchFromGitHub {
+ owner = "GIScience";
+ repo = "${pname}-py";
+ rev = "v${version}";
+ sha256 = "ySXzOQI9NcF1W/otbL7i3AY628/74ZkJjDMQ9ywVEPc=";
+ };
+
+ checkInputs = [ pytestCheckHook responses ];
+
+ disabledTests = [
+ # touches network
+ "test_optimized_waypoints"
+ "test_invalid_api_key"
+ "test_raise_timeout_retriable_requests"
+ ];
+
+ meta = with lib; {
+ homepage = "https://github.com/GIScience/openrouteservice-py";
+ description = "The Python API to consume openrouteservice(s) painlessly";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ Scriptkiddi ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/opentracing/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/opentracing/default.nix
index f499470e25c7..8e4ece43fd7b 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/opentracing/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/opentracing/default.nix
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "opentracing";
- version = "2.3.0";
+ version = "2.4.0";
src = fetchPypi {
inherit pname version;
- sha256 = "0rcpmhy7hm6ljlm1w455il53s1amq2vii2x1wfkrcx3sj4s0dc9k";
+ sha256 = "a173117e6ef580d55874734d1fa7ecb6f3655160b8b8974a2a1e98e5ec9c840d";
};
propagatedBuildInputs = lib.optional isPy27 futures;
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/openwrt-luci-rpc/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/openwrt-luci-rpc/default.nix
index 718dc48d005b..935a64b4186e 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/openwrt-luci-rpc/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/openwrt-luci-rpc/default.nix
@@ -10,11 +10,11 @@ with lib;
buildPythonPackage rec {
pname = "openwrt-luci-rpc";
- version = "1.1.3";
+ version = "1.1.6";
src = fetchPypi {
inherit pname version;
- sha256 = "c8c27c98c0a1deac2d32d417c4ca536b08be2655a9a6de8a7897e8bc6431858c";
+ sha256 = "841c7fc956ad42825a2f2cd0cb2aa02005c3482b200ff7aaccd390345c9f3e18";
};
postPatch = ''
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/outcome/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/outcome/default.nix
index 6e7593cec1c3..f03307ead147 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/outcome/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/outcome/default.nix
@@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "outcome";
- version = "1.0.1";
+ version = "1.1.0";
disabled = pythonOlder "3.4";
src = fetchPypi {
inherit pname version;
- sha256 = "fc7822068ba7dd0fc2532743611e8a73246708d3564e29a39f93d6ab3701b66f";
+ sha256 = "e862f01d4e626e63e8f92c38d1f8d5546d3f9cce989263c521b2e7990d186967";
};
checkInputs = [ pytest ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/ovito/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/ovito/default.nix
index c5dddd68fcf1..5e5847dce033 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/ovito/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/ovito/default.nix
@@ -1,23 +1,33 @@
-{ stdenv, fetchgit
+{ stdenv
+, fetchFromGitLab
, cmake
-, libav, netcdf, qscintilla, zlib, boost, git, fftw, hdf5, libssh
-, pythonPackages
+, ffmpeg
+, netcdf
+, qscintilla
+, zlib
+, boost
+, git
+, fftw
+, hdf5
+, libssh
+, qt5
+, python
}:
-stdenv.mkDerivation {
- # compilation error in 2.9.0 https://gitlab.com/stuko/ovito/issues/40
- # This is not the "released" 3.0.0 just a commit
- version = "3.0.0";
+stdenv.mkDerivation rec {
+ version = "3.3.1";
pname = "ovito";
- src = fetchgit {
- url = "https://gitlab.com/stuko/ovito";
- rev = "a28c28182a879d2a1b511ec56f9845306dd8a4db";
- sha256 = "1vqzv3gzwf8r0g05a7fj8hdyvnzq2h3wdfck7j6n1av6rvp7hi5r";
+ src = fetchFromGitLab {
+ owner = "stuko";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0rm1qxa0fanaaqg0idr6rf2s2xlbyn1dzjzwh3rddy9mgl60lj2h";
};
- buildInputs = [ cmake libav netcdf qscintilla zlib boost zlib git fftw hdf5 libssh ];
- propagatedBuildInputs = with pythonPackages; [ sphinx numpy sip pyqt5 matplotlib ase ];
+ buildInputs = [ cmake ffmpeg netcdf qscintilla zlib boost zlib git fftw hdf5 libssh qt5.qtbase qt5.qtsvg ];
+
+ propagatedBuildInputs = with python.pkgs; [ sphinx numpy sip pyqt5 matplotlib ase ];
enableParallelBuilding = true;
@@ -25,10 +35,9 @@ stdenv.mkDerivation {
description = "Scientific visualization and analysis software for atomistic simulation data";
homepage = "https://www.ovito.org";
license = licenses.gpl3;
- maintainers = [ maintainers.costrouc ];
+ maintainers = with maintainers; [ costrouc ];
# ensures not built on hydra
# https://github.com/NixOS/nixpkgs/pull/46846#issuecomment-436388048
hydraPlatforms = [ ];
- broken = true; # cmake unable to find Qt5Core and other dependencies
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pa-ringbuffer/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pa-ringbuffer/default.nix
index fd05e7e8052e..466d3937a1fb 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pa-ringbuffer/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pa-ringbuffer/default.nix
@@ -7,7 +7,7 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "spatialaudio";
repo = "python-pa-ringbuffer";
- rev = "${version}";
+ rev = version;
sha256 = "0afpydy1l20hd1xncjppjhqa2c8dj5h9nlv4z8m55cs9hc9h1mxv";
};
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/packaging/2.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/packaging/2.nix
new file mode 100644
index 000000000000..36764e64b860
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/packaging/2.nix
@@ -0,0 +1,40 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pyparsing
+, six
+, pytestCheckHook
+, pretend
+, flit-core
+}:
+
+# We keep 20.4 because it uses setuptools instead of flit-core
+# which requires Python 3 to build a universal wheel.
+
+buildPythonPackage rec {
+ pname = "packaging";
+ version = "20.4";
+ format = "setuptools";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "4357f74f47b9c12db93624a82154e9b120fa8293699949152b22065d556079f8";
+ };
+
+ propagatedBuildInputs = [ pyparsing six ];
+
+ checkInputs = [
+ pytestCheckHook
+ pretend
+ ];
+
+ # Prevent circular dependency
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ description = "Core utilities for Python packages";
+ homepage = "https://github.com/pypa/packaging";
+ license = [ licenses.bsd2 licenses.asl20 ];
+ maintainers = with maintainers; [ bennofs ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/packaging/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/packaging/default.nix
index abe58d03ef37..061e8edaac6f 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/packaging/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/packaging/default.nix
@@ -1,18 +1,33 @@
-{ stdenv, buildPythonPackage, fetchPypi
-, pyparsing, six, pytest, pretend }:
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pyparsing
+, six
+, pytestCheckHook
+, pretend
+, flit-core
+}:
buildPythonPackage rec {
pname = "packaging";
- version = "20.4";
+ version = "20.7";
+ format = "pyproject";
src = fetchPypi {
inherit pname version;
- sha256 = "4357f74f47b9c12db93624a82154e9b120fa8293699949152b22065d556079f8";
+ sha256 = "Ba87uF0yA3fbKBzyVKsFDhp+vL9UEGhamkB+GKH4EjY=";
};
+ nativeBuildInputs = [
+ flit-core
+ ];
+
propagatedBuildInputs = [ pyparsing six ];
- checkInputs = [ pytest pretend ];
+ checkInputs = [
+ pytestCheckHook
+ pretend
+ ];
checkPhase = ''
py.test tests
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/packet-python/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/packet-python/default.nix
index 02255f4bfd70..1552148ae37b 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/packet-python/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/packet-python/default.nix
@@ -12,10 +12,10 @@
buildPythonPackage rec {
pname = "packet-python";
- version = "1.43.0";
+ version = "1.43.1";
src = fetchPypi {
inherit pname version;
- sha256 = "48fcc5ca6e7f3d84ef91016585d1894bb9deb3dae6591ffab90fdf05006c3e48";
+ sha256 = "e333fb5ce45a3f283ddeb6261d061b39328b82eb440a89233fa08ce3fec2fcf0";
};
nativeBuildInputs = [ pytestrunner ];
propagatedBuildInputs = [ requests ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pamqp/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pamqp/default.nix
index 09cda2797300..8353e8d7895f 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pamqp/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pamqp/default.nix
@@ -9,12 +9,12 @@
}:
buildPythonPackage rec {
- version = "2.3.0";
+ version = "3.0.1";
pname = "pamqp";
src = fetchPypi {
inherit pname version;
- sha256 = "1s4lwbsiikz3czqad7jarb7k303q0wamla0rirghvwl9bslgbl2w";
+ sha256 = "0a9b49bde3f554ec49b47ebdb789133979985f24d5f4698935ed589a2d4392a4";
};
buildInputs = [ mock nose pep8 pylint mccabe ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pandas-datareader/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pandas-datareader/default.nix
new file mode 100644
index 000000000000..92adfb9d3f16
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pandas-datareader/default.nix
@@ -0,0 +1,34 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pytestCheckHook
+, isPy27
+, pandas
+, lxml
+, requests
+}:
+
+buildPythonPackage rec {
+ pname = "pandas-datareader";
+ version = "0.9.0";
+ disabled = isPy27;
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "b2cbc1e16a6ab9ff1ed167ae2ea92839beab9a20823bd00bdfb78155fa04f891";
+ };
+
+ # Tests are trying to load data over the network
+ doCheck = false;
+ pythonImportsCheck = [ "pandas_datareader" ];
+
+ propagatedBuildInputs = [ pandas lxml requests ];
+
+ meta = with stdenv.lib; {
+ description = "Up to date remote data access for pandas, works for multiple versions of pandas";
+ homepage = "https://github.com/pydata/pandas-datareader";
+ license= licenses.bsd3;
+ maintainers = with maintainers; [ evax ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pandas/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pandas/default.nix
index d4c9706fe654..9d2d32d428af 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pandas/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pandas/default.nix
@@ -1,27 +1,29 @@
-{ buildPythonPackage
+{ stdenv
+, buildPythonPackage
, fetchPypi
, python
-, stdenv
-, pytest
-, glibcLocales
+, isPy38
+, beautifulsoup4
+, bottleneck
, cython
, dateutil
-, scipy
-, moto
+, html5lib
+, lxml
, numexpr
+, openpyxl
, pytz
-, xlrd
-, bottleneck
, sqlalchemy
-, lxml
-, html5lib
-, beautifulsoup4
-, hypothesis
-, openpyxl
+, scipy
, tables
+, xlrd
, xlwt
+# Test Inputs
+, glibcLocales
+, hypothesis
+, moto
+, pytestCheckHook
+# Darwin inputs
, runtimeShell
-, isPy38
, libcxx ? null
}:
@@ -31,33 +33,33 @@ let
in buildPythonPackage rec {
pname = "pandas";
- version = "1.1.1";
+ version = "1.1.4";
src = fetchPypi {
inherit pname version;
- sha256 = "53328284a7bb046e2e885fd1b8c078bd896d7fc4575b915d4936f54984a2ba67";
+ sha256 = "a979d0404b135c63954dea79e6246c45dd45371a88631cdbb4877d844e6de3b6";
};
- checkInputs = [ pytest glibcLocales moto hypothesis ];
-
nativeBuildInputs = [ cython ];
buildInputs = optional isDarwin libcxx;
propagatedBuildInputs = [
+ beautifulsoup4
+ bottleneck
dateutil
- scipy
+ html5lib
numexpr
- pytz
- xlrd
- bottleneck
- sqlalchemy
lxml
- html5lib
- beautifulsoup4
openpyxl
+ pytz
+ scipy
+ sqlalchemy
tables
+ xlrd
xlwt
];
+ checkInputs = [ pytestCheckHook glibcLocales moto hypothesis ];
+
# doesn't work with -Werror,-Wunused-command-line-argument
# https://github.com/NixOS/nixpkgs/issues/39687
hardeningDisable = optional stdenv.cc.isClang "strictoverflow";
@@ -80,8 +82,14 @@ in buildPythonPackage rec {
"--parallel=$NIX_BUILD_CORES"
];
+ doCheck = !stdenv.isAarch64; # upstream doesn't test this architecture
- disabledTests = stdenv.lib.concatMapStringsSep " and " (s: "not " + s) ([
+ pytestFlagsArray = [
+ "$out/${python.sitePackages}/pandas"
+ "--skip-slow"
+ "--skip-network"
+ ];
+ disabledTests = [
# since dateutil 0.6.0 the following fails: test_fallback_plural, test_ambiguous_flags, test_ambiguous_compat
# was supposed to be solved by https://github.com/dateutil/dateutil/issues/321, but is not the case
"test_fallback_plural"
@@ -105,15 +113,16 @@ in buildPythonPackage rec {
# Fails with 1.0.5
"test_constructor_list_frames"
"test_constructor_with_embedded_frames"
+ # tries to import compiled C extension locally
+ "test_missing_required_dependency"
] ++ optionals isDarwin [
"test_locale"
"test_clipboard"
- ]);
-
- doCheck = !stdenv.isAarch64; # upstream doesn't test this architecture
+ ];
- checkPhase = ''
- runHook preCheck
+ preCheck = ''
+ export LC_ALL="en_US.UTF-8"
+ PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH
''
# TODO: Get locale and clipboard support working on darwin.
# Until then we disable the tests.
@@ -123,19 +132,17 @@ in buildPythonPackage rec {
echo "#!${runtimeShell}" > pbpaste
chmod a+x pbcopy pbpaste
export PATH=$(pwd):$PATH
- '' + ''
- LC_ALL="en_US.UTF-8" py.test $out/${python.sitePackages}/pandas --skip-slow --skip-network -k "$disabledTests"
- runHook postCheck
'';
- meta = {
+ meta = with stdenv.lib; {
# https://github.com/pandas-dev/pandas/issues/14866
# pandas devs are no longer testing i686 so safer to assume it's broken
broken = stdenv.isi686;
homepage = "https://pandas.pydata.org/";
+ changelog = "https://pandas.pydata.org/docs/whatsnew/index.html";
description = "Python Data Analysis Library";
- license = stdenv.lib.licenses.bsd3;
- maintainers = with stdenv.lib.maintainers; [ raskin fridh knedlsepp ];
- platforms = stdenv.lib.platforms.unix;
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ raskin fridh knedlsepp ];
+ platforms = platforms.unix;
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pandocfilters/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pandocfilters/default.nix
index f688d97c91d1..848e59313af9 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pandocfilters/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pandocfilters/default.nix
@@ -4,12 +4,12 @@
}:
buildPythonPackage rec {
- version = "1.4.2";
+ version = "1.4.3";
pname = "pandocfilters";
src = fetchPypi {
inherit pname version;
- sha256 = "b3dd70e169bb5449e6bc6ff96aea89c5eea8c5f6ab5e207fc2f521a2cf4a0da9";
+ sha256 = "bc63fbb50534b4b1f8ebe1860889289e8af94a23bff7445259592df25a3906eb";
};
# No tests available
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/panel/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/panel/default.nix
index 0fc7bf7ee291..10dafc0072a3 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/panel/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/panel/default.nix
@@ -13,6 +13,8 @@
buildPythonPackage rec {
pname = "panel";
version = "0.9.7";
+ # Version 10 attempts to download models from the web during build-time
+ # https://github.com/holoviz/panel/issues/1819
src = fetchPypi {
inherit pname version;
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/papermill/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/papermill/default.nix
index 0e5c62277af2..56536de8446b 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/papermill/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/papermill/default.nix
@@ -25,11 +25,11 @@
buildPythonPackage rec {
pname = "papermill";
- version = "2.1.3";
+ version = "2.2.2";
src = fetchPypi {
inherit pname version;
- sha256 = "ecd4cafa9179693b0eedc3b6f4560f9ee47826a6e366e42bfa3cc20f7931b3f8";
+ sha256 = "1c452b1c5a9ab52b94c99d8b7705ae7173f6aa88a3d28a5d30cffba48a46f5b6";
};
propagatedBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/paperspace/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/paperspace/default.nix
index c439b4099a00..fad394a5339b 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/paperspace/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/paperspace/default.nix
@@ -1,5 +1,7 @@
{ stdenv, fetchPypi, buildPythonPackage
-, boto3, requests
+, boto3, requests, gradient_statsd, terminaltables
+, click-completion , click-didyoumean, click-help-colors
+, colorama, requests_toolbelt, gradient_sdk, progressbar2
}:
buildPythonPackage rec {
@@ -11,7 +13,10 @@ buildPythonPackage rec {
sha256 = "7959305128fea6da8ca0cdc528783a89859dacb9b54bf8eb89fd04a518872191";
};
- propagatedBuildInputs = [ boto3 requests ];
+ propagatedBuildInputs = [ boto3 requests gradient_statsd terminaltables
+ click-completion click-didyoumean click-help-colors requests_toolbelt
+ colorama gradient_sdk progressbar2
+ ];
# tries to use /homeless-shelter to mimic container usage, etc
doCheck = false;
@@ -22,6 +27,5 @@ buildPythonPackage rec {
license = licenses.isc;
platforms = platforms.unix;
maintainers = with maintainers; [ thoughtpolice ];
- broken = true;
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/papis/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/papis/default.nix
index a97c075d30f6..93eafff6c93b 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/papis/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/papis/default.nix
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "papis";
- version = "0.10";
+ version = "0.11.1";
disabled = !isPy3k;
# Missing tests on Pypi
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "papis";
repo = pname;
rev = "v${version}";
- sha256 = "0fmrvxs6ixfwjlp96b69db7fpvyqfy2n3c23kdz8yr0vhnp82l93";
+ sha256 = "0bbkjyw1fsvvp0380l404h2lys8ib4xqga5s6401k1y1hld28nl6";
};
propagatedBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/param/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/param/default.nix
index 096bb2cfb910..9f6d78a8ecbe 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/param/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/param/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "param";
- version = "1.9.3";
+ version = "1.10.0";
src = fetchPypi {
inherit pname version;
- sha256 = "10crjlsn5vx03xwlnhga9faqq2rlw0qwabi45vnvhmz22qbd8w43";
+ sha256 = "a284c1b42aff6367e8eea2f649d4f3f70a9f16c6f17d8ad672a31ff36089f995";
};
checkInputs = [ flake8 nose ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/parfive/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/parfive/default.nix
index a6dacf0402ee..45f4a66f2605 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/parfive/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/parfive/default.nix
@@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "parfive";
- version = "1.1.1";
+ version = "1.2.0";
src = fetchPypi {
inherit pname version;
- sha256 = "5793fdf9859a9a9fc93f033db9dc067a89626910355a14bbe425feb3956df6db";
+ sha256 = "118a0994bbb9536fd4574995a8485b6c4b97db247c55bc86ae4f4ae8fd9b0add";
};
buildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/parver/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/parver/default.nix
index a51f1c003274..268e90020100 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/parver/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/parver/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "parver";
- version = "0.3.0";
+ version = "0.3.1";
src = fetchPypi {
inherit pname version;
- sha256 = "0a6jp17c1ag6b9yp5xgy9wvznk3g0v2f8gpwkcwxpyc9ygk98zdm";
+ sha256 = "c902e0653bcce927cc156a7fd9b3a51924cbce3bf3d0bfd49fc282bfd0c5dfd3";
};
propagatedBuildInputs = [ six attrs arpeggio ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/passlib/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/passlib/default.nix
index 84ace0bdb822..316abb2ac32c 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/passlib/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/passlib/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "passlib";
- version = "1.7.2";
+ version = "1.7.4";
src = fetchPypi {
inherit pname version;
- sha256 = "8d666cef936198bc2ab47ee9b0410c94adf2ba798e5a84bf220be079ae7ab6a8";
+ sha256 = "defd50f72b65c5402ab2c573830a6978e5f202ad0d984793c8dde2c4152ebe04";
};
checkInputs = [ nose ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pastedeploy/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pastedeploy/default.nix
index b82192267d02..21149da917f1 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pastedeploy/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pastedeploy/default.nix
@@ -6,12 +6,12 @@
}:
buildPythonPackage rec {
- version = "2.1.0";
+ version = "2.1.1";
pname = "PasteDeploy";
src = fetchPypi {
inherit pname version;
- sha256 = "e7559878b6e92023041484be9bcb6d767cf4492fc3de7257a5dae76a7cc11a9b";
+ sha256 = "6dead6ab9823a85d585ef27f878bc647f787edb9ca8da0716aa9f1261b464817";
};
buildInputs = [ pytestrunner ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pathspec/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pathspec/default.nix
index bb52cd51a141..cd51747d5678 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pathspec/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pathspec/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "pathspec";
- version = "0.8.0";
+ version = "0.8.1";
src = fetchPypi {
inherit pname version;
- sha256 = "da45173eb3a6f2a5a487efba21f050af2b41948be6ab52b6a1e3ff22bb8b7061";
+ sha256 = "86379d6b86d75816baba717e64b1a3a3469deb93bb76d613c9ce79edc5cb68fd";
};
meta = {
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/patool/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/patool/default.nix
new file mode 100644
index 000000000000..1420597a1f32
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/patool/default.nix
@@ -0,0 +1,57 @@
+{ stdenv, lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook, p7zip,
+ unzip, cabextract, zip, zopfli, lzip, zpaq, gnutar, gnugrep, diffutils, file,
+ gzip, bzip2, xz}:
+
+# unrar is unfree, as well as 7z with unrar support, not including it (patool doesn't support unar)
+
+let
+ compression-utilities = [
+ p7zip
+ unzip
+ gnutar
+ cabextract
+ zip
+ zopfli
+ lzip
+ zpaq
+ gzip
+ gnugrep
+ diffutils
+ bzip2
+ file
+ xz
+ ];
+in
+buildPythonPackage rec {
+ pname = "patool";
+ version = "1.12";
+
+ #pypi doesn't have test data
+ src = fetchFromGitHub {
+ owner = "wummel";
+ repo = pname;
+ rev = "upstream/${version}";
+ sha256 = "0v4r77sm3yzh7y1whfwxmp01cchd82jbhvbg9zsyd2yb944imzjy";
+ };
+
+ prePatch = ''
+ substituteInPlace patoolib/util.py \
+ --replace "path = None" 'path = append_to_path(os.environ["PATH"], "${lib.makeBinPath compression-utilities}")'
+ '';
+
+ checkInputs = [ pytestCheckHook ] ++ compression-utilities;
+
+ disabledTests = [
+ "test_unzip"
+ "test_unzip_file"
+ "test_zip"
+ "test_zip_file"
+ ];
+
+ meta = with lib; {
+ description = "portable archive file manager";
+ homepage = "https://wummel.github.io/patool/";
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ marius851000 ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pbr/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pbr/default.nix
index 5e0be5fb62b0..bc7c6399473b 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pbr/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pbr/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pbr";
- version = "5.4.5";
+ version = "5.5.1";
src = fetchPypi {
inherit pname version;
- sha256 = "07f558fece33b05caf857474a366dfcc00562bca13dd8b47b2b3e22d9f9bf55c";
+ sha256 = "5fad80b613c402d5b7df7bd84812548b2a61e9977387a80a5fc5c396492b13c9";
};
# circular dependencies with fixtures
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pc-ble-driver-py/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pc-ble-driver-py/default.nix
index 6250b5a2202d..e85df06b5002 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pc-ble-driver-py/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pc-ble-driver-py/default.nix
@@ -1,9 +1,10 @@
-{ stdenv, fetchFromGitHub, cmake, git, swig, boost, udev, pc-ble-driver
-, buildPythonPackage, enum34, wrapt, future, setuptools, scikit-build }:
+{ stdenv, fetchFromGitHub, cmake, git, swig, boost, udev, pc-ble-driver, pythonOlder
+, buildPythonPackage, enum34, wrapt, future, setuptools, scikit-build, pythonAtLeast }:
buildPythonPackage rec {
pname = "pc-ble-driver-py";
version = "0.14.2";
+ disabled = pythonOlder "3.6" || pythonAtLeast "3.9";
src = fetchFromGitHub {
owner = "NordicSemiconductor";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pdfminer_six/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pdfminer_six/default.nix
index 08f482e6221f..9bc8f8915701 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pdfminer_six/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pdfminer_six/default.nix
@@ -2,7 +2,7 @@
buildPythonPackage rec {
pname = "pdfminer_six";
- version = "20200726";
+ version = "20201018";
disabled = !isPy3k;
@@ -11,7 +11,7 @@ buildPythonPackage rec {
owner = "pdfminer";
repo = "pdfminer.six";
rev = version;
- sha256 = "1hlaz7ax1czb028x3nhk3l2jy07f26q5hbhmdirljaaga24vd96z";
+ sha256 = "1a2fxxnnjqbx344znpvx7cnv1881dk6585ibw01inhfq3w6yj2lr";
};
propagatedBuildInputs = [ chardet cryptography sortedcontainers ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pdoc3/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pdoc3/default.nix
new file mode 100644
index 000000000000..d544f27b988b
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pdoc3/default.nix
@@ -0,0 +1,28 @@
+{ lib, buildPythonPackage, fetchPypi
+, pythonOlder
+, Mako
+, markdown
+, setuptools-git
+, setuptools_scm
+}:
+
+buildPythonPackage rec {
+ pname = "pdoc3";
+ version = "0.9.2";
+ disabled = pythonOlder "3.7";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "9df5d931f25f353c69c46819a3bd03ef96dd286f2a70bb1b93a23a781f91faa1";
+ };
+
+ nativeBuildInputs = [ setuptools-git setuptools_scm ];
+ propagatedBuildInputs = [ Mako markdown ];
+
+ meta = with lib; {
+ description = "Auto-generate API documentation for Python projects.";
+ homepage = "https://pdoc3.github.io/pdoc/";
+ license = with licenses; [ agpl3Plus ];
+ maintainers = with maintainers; [ catern ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/periodictable/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/periodictable/default.nix
index a0949385bd3a..ea42f7ea7fef 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/periodictable/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/periodictable/default.nix
@@ -1,16 +1,18 @@
-{lib, fetchPypi, buildPythonPackage, numpy, pyparsing}:
+{lib, fetchPypi, buildPythonPackage, numpy, pyparsing, pytestcov, pytestCheckHook }:
buildPythonPackage rec {
pname = "periodictable";
- version = "1.5.2";
+ version = "1.5.3";
propagatedBuildInputs = [numpy pyparsing];
src = fetchPypi {
inherit pname version;
- sha256 = "1lx03xirh3hcrzkwrz91dmdzcj01bykq59hccd83ai901jzqmshz";
+ sha256 = "1d09c359468e2de74b43fc3a7dcb0d3d71e0ff53adb85995215d8d7796451af6";
};
+ checkInputs = [ pytestcov pytestCheckHook ];
+
meta = {
homepage = "https://www.reflectometry.org/danse/software.html";
description = "an extensible periodic table of the elements prepopulated with data important to neutron and x-ray scattering experiments";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pex/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pex/default.nix
index 9eb722633025..0bbbf551f280 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pex/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pex/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "pex";
- version = "2.1.15";
+ version = "2.1.21";
src = fetchPypi {
inherit pname version;
- sha256 = "e1092ae52cfdef41c22d98fa98f9225ac21936a7d096131777ca3a7940fe1b2d";
+ sha256 = "d580a26da1b342ab2ebbf675ba2bab04e98c4d1aaf2a6fea09f41d68dfc466ba";
};
nativeBuildInputs = [ setuptools ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pexpect/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pexpect/default.nix
index aead62913c7b..60655708beae 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pexpect/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pexpect/default.nix
@@ -41,8 +41,4 @@ buildPythonPackage (rec {
any platform that supports the standard Python pty module.
'';
};
-# TODO: move into main set, this was to avoid a rebuild
-} // lib.optionalAttrs (!isPy3k ) {
- # syntax error in _async module, likely intended only for Python 3.
- dontUsePythonRecompileBytecode = !isPy3k;
})
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pg8000/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pg8000/default.nix
index e4a158a7183b..0c9459772186 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pg8000/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pg8000/default.nix
@@ -1,22 +1,23 @@
{ stdenv
, buildPythonPackage
, fetchPypi
+, scramp
, isPy3k
, passlib
}:
buildPythonPackage rec {
pname = "pg8000";
- version = "1.16.5";
+ version = "1.16.6";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "8af70cdfcc1fadafa32468a6af563e1c0b5271c4dcc99a4490030a128cb295a3";
+ sha256 = "8fc1e6a62ccb7c9830f1e7e9288e2d20eaf373cc8875b5c55b7d5d9b7717be91";
};
- propagatedBuildInputs = [ passlib ];
+ propagatedBuildInputs = [ passlib scramp ];
meta = with stdenv.lib; {
homepage = "https://github.com/tlocke/pg8000";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pglast/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pglast/default.nix
index 032524fc5df3..767140e6bf8f 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pglast/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pglast/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "pglast";
- version = "1.12";
+ version = "1.14";
src = fetchPypi {
inherit pname version;
- sha256 = "b5d6a105928d2285e43afb87d638ada844ed8933cc306c23a3c095684f3d3af4";
+ sha256 = "72652b9edc7bdbfc9c3192235fb2fa1b2fb73a681613368fcaec747d7f5e479f";
};
disabled = !isPy3k;
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/phonemizer/backend-paths.patch b/infra/libkookie/nixpkgs/pkgs/development/python-modules/phonemizer/backend-paths.patch
new file mode 100644
index 000000000000..1734addb0ef1
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/phonemizer/backend-paths.patch
@@ -0,0 +1,29 @@
+diff --git a/phonemizer/backend/espeak.py b/phonemizer/backend/espeak.py
+index 387c11c..ceb5e7e 100644
+--- a/phonemizer/backend/espeak.py
++++ b/phonemizer/backend/espeak.py
+@@ -81,10 +81,7 @@ class BaseEspeakBackend(BaseBackend):
+ if _ESPEAK_DEFAULT_PATH:
+ return _ESPEAK_DEFAULT_PATH
+
+- espeak = distutils.spawn.find_executable('espeak-ng')
+- if not espeak: # pragma: nocover
+- espeak = distutils.spawn.find_executable('espeak')
+- return espeak
++ return "@espeak@"
+
+ @classmethod
+ def is_available(cls):
+diff --git a/phonemizer/backend/festival.py b/phonemizer/backend/festival.py
+index b5bc56d..0833160 100644
+--- a/phonemizer/backend/festival.py
++++ b/phonemizer/backend/festival.py
+@@ -78,7 +78,7 @@ class FestivalBackend(BaseBackend):
+ if _FESTIVAL_DEFAULT_PATH:
+ return _FESTIVAL_DEFAULT_PATH
+
+- return distutils.spawn.find_executable('festival')
++ return "@festival@"
+
+ @classmethod
+ def is_available(cls):
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/phonemizer/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/phonemizer/default.nix
new file mode 100644
index 000000000000..2d6531794313
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/phonemizer/default.nix
@@ -0,0 +1,73 @@
+{ lib
+, substituteAll
+, buildPythonApplication
+, fetchPypi
+, python3Packages
+, pkgs
+, joblib
+, segments
+, attrs
+, espeak-ng
+, pytestCheckHook
+, pytestrunner
+, pytestcov
+}:
+
+buildPythonApplication rec {
+ pname = "phonemizer";
+ version = "2.2.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "127n4f10zxq60qd8xvlc1amji4wbghqb90rfp25rzdk716kvgwab";
+ };
+
+ postPatch = ''
+ sed -i -e '/\'pytest-runner\'/d setup.py
+ '';
+
+ patches = [
+ (substituteAll {
+ src = ./backend-paths.patch;
+ espeak = "${lib.getBin espeak-ng}/bin/espeak";
+ # override festival path should you try to integrate it
+ festival = "";
+ })
+ ./remove-intertwined-festival-test.patch
+ ];
+
+ propagatedBuildInputs = [
+ joblib
+ segments
+ attrs
+ ];
+
+ preCheck = ''
+ export HOME=$TMPDIR
+ '';
+
+ checkInputs = [
+ pytestCheckHook
+ pytestcov
+ ];
+
+ # We tried to package festvial, but were unable to get the backend running,
+ # so let's disable related tests.
+ pytestFlagsArray = [
+ "--ignore=test/test_festival.py"
+ ];
+
+ disabledTests = [
+ "test_festival"
+ "test_relative"
+ "test_absolute"
+ "test_readme_festival_syll"
+ ];
+
+ meta = with lib; {
+ homepage = "https://github.com/bootphon/phonemizer";
+ description = "Simple text to phones converter for multiple languages";
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ hexa ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/phonemizer/drop-readme-festival-test.patch b/infra/libkookie/nixpkgs/pkgs/development/python-modules/phonemizer/drop-readme-festival-test.patch
new file mode 100644
index 000000000000..a60cdf2645a5
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/phonemizer/drop-readme-festival-test.patch
@@ -0,0 +1,12 @@
+diff --git a/test/test_main.py b/test/test_main.py
+index 71d605a..d137cd7 100644
+--- a/test/test_main.py
++++ b/test/test_main.py
+@@ -63,7 +63,6 @@ def test_readme():
+ _test(u'hello world', u'həloʊ wɜːld ')
+ _test(u'hello world', u'həloʊ wɜːld ', '--verbose')
+ _test(u'hello world', u'həloʊ wɜːld ', '--quiet')
+- _test(u'hello world', u'hhaxlow werld', '-b festival --strip')
+ _test(u'hello world', u'həloʊ wɜːld ', '-l en-us')
+ _test(u'bonjour le monde', u'bɔ̃ʒuʁ lə mɔ̃d ', '-l fr-fr')
+ _test(u'bonjour le monde', u'b ɔ̃ ʒ u ʁ ;eword l ə ;eword m ɔ̃ d ;eword ',
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/phonemizer/remove-intertwined-festival-test.patch b/infra/libkookie/nixpkgs/pkgs/development/python-modules/phonemizer/remove-intertwined-festival-test.patch
new file mode 100644
index 000000000000..d7d605df7f98
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/phonemizer/remove-intertwined-festival-test.patch
@@ -0,0 +1,22 @@
+diff --git a/test/test_main.py b/test/test_main.py
+index 71d605a..0ea3c74 100644
+--- a/test/test_main.py
++++ b/test/test_main.py
+@@ -63,17 +63,12 @@ def test_readme():
+ _test(u'hello world', u'həloʊ wɜːld ')
+ _test(u'hello world', u'həloʊ wɜːld ', '--verbose')
+ _test(u'hello world', u'həloʊ wɜːld ', '--quiet')
+- _test(u'hello world', u'hhaxlow werld', '-b festival --strip')
+ _test(u'hello world', u'həloʊ wɜːld ', '-l en-us')
+ _test(u'bonjour le monde', u'bɔ̃ʒuʁ lə mɔ̃d ', '-l fr-fr')
+ _test(u'bonjour le monde', u'b ɔ̃ ʒ u ʁ ;eword l ə ;eword m ɔ̃ d ;eword ',
+ '-l fr-fr -p " " -w ";eword "')
+
+
+-@pytest.mark.skipif(
+- '2.1' in backend.FestivalBackend.version(),
+- reason='festival-2.1 gives different results than further versions '
+- 'for syllable boundaries')
+ def test_readme_festival_syll():
+ _test(u'hello world',
+ u'hh ax ;esyll l ow ;esyll ;eword w er l d ;esyll ;eword ',
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix
index e4cb59f5b930..62149a788665 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "phonenumbers";
- version = "8.12.11";
+ version = "8.12.13";
src = fetchPypi {
inherit pname version;
- sha256 = "17f39f06c1e0e20eabe69ff735b1c08e4547d12a12595da3d835fd3256a9ee0c";
+ sha256 = "96d02120a3481e22d8a8eb5e4595ceec1930855749f6e4a06ef931881f59f562";
};
meta = {
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/phx-class-registry/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/phx-class-registry/default.nix
new file mode 100644
index 000000000000..db0359a1d4fc
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/phx-class-registry/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, buildPythonPackage, fetchPypi, isPy27, pytestCheckHook }:
+
+buildPythonPackage rec {
+ pname = "phx-class-registry";
+ version = "3.0.5";
+
+ disabled = isPy27;
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "14iap8db2ldmnlf5kvxs52aps31rl98kpa5nq8wdm30a86n6457i";
+ };
+
+ checkInputs = [ pytestCheckHook ];
+
+ disabledTests = [
+ "test_branding"
+ "test_happy_path"
+ "test_len"
+ ];
+
+ meta = with stdenv.lib; {
+ description = "Registry pattern for Python classes, with setuptools entry points integration";
+ homepage = "https://github.com/todofixthis/class-registry";
+ license = licenses.mit;
+ maintainers = with maintainers; [ SuperSandro2000 ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix
index 3db9a2642c7c..a5f512fae97f 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix
@@ -7,11 +7,12 @@
, lxml
, pillow
, pybind11
-, pytest
+, pytestCheckHook
, pytest-helpers-namespace
, pytest-timeout
, pytest_xdist
, pytestrunner
+, python-dateutil
, python-xmp-toolkit
, python3
, qpdf
@@ -22,12 +23,12 @@
buildPythonPackage rec {
pname = "pikepdf";
- version = "1.18.0";
+ version = "2.2.0";
disabled = ! isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "4d0840a5c16b535f9b6e56fb4421a43f88760e6cabcf7fd44bdd0436107b61dc";
+ sha256 = "74300a32c41b3d578772f6933f23a88b19f74484185e71e5225ce2f7ea5aea78";
};
buildInputs = [
@@ -44,11 +45,12 @@ buildPythonPackage rec {
attrs
hypothesis
pillow
- pytest
+ pytestCheckHook
pytest-helpers-namespace
pytest-timeout
pytest_xdist
pytestrunner
+ python-dateutil
python-xmp-toolkit
];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pillow/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pillow/default.nix
index ab971e4201b5..199bdae8fc25 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pillow/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pillow/default.nix
@@ -8,13 +8,13 @@
buildPythonPackage rec {
pname = "Pillow";
- version = "7.2.0";
+ version = "8.0.1";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "97f9e7953a77d5a70f49b9a48da7776dc51e9b738151b22dacf101641594a626";
+ sha256 = "11c5c6e9b02c9dac08af04f093eb5a2f84857df70a7d4a6a6ad461aca803fb9e";
};
# Disable imagefont tests, because they don't work well with infinality:
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pinboard/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pinboard/default.nix
new file mode 100644
index 000000000000..8f177dab8bc3
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pinboard/default.nix
@@ -0,0 +1,23 @@
+{ lib, buildPythonPackage, fetchFromGitHub }:
+
+buildPythonPackage rec {
+ pname = "pinboard";
+ version = "2.1.8";
+
+ src = fetchFromGitHub {
+ owner = "lionheart";
+ repo = pname;
+ rev = version;
+ sha256 = "0ppc3vwv48ahqx6n5c7d7066zhi31cjdik0ma9chq6fscq2idgdf";
+ };
+
+ # tests require an API key
+ doCheck = false;
+
+ meta = with lib; {
+ description = "A Python wrapper for Pinboard.in";
+ maintainers = with maintainers; [ djanatyn ];
+ license = licenses.asl20;
+ homepage = "https://github.com/lionheart/pinboard.py";
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pip-tools/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pip-tools/default.nix
index 104619711a72..0952c7056c31 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pip-tools/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pip-tools/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "pip-tools";
- version = "5.3.1";
+ version = "5.4.0";
src = fetchPypi {
inherit pname version;
- sha256 = "5672c2b6ca0f1fd803f3b45568c2cf7fadf135b4971e7d665232b2075544c0ef";
+ sha256 = "a4d3990df2d65961af8b41dacc242e600fdc8a65a2e155ed3d2fc18a5c209f20";
};
LC_ALL = "en_US.UTF-8";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pip/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pip/default.nix
index fa566c8951ab..f35ed6b3d116 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pip/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pip/default.nix
@@ -14,21 +14,17 @@
buildPythonPackage rec {
pname = "pip";
- version = "20.1.1";
+ version = "20.3";
format = "other";
src = fetchFromGitHub {
owner = "pypa";
repo = pname;
rev = version;
- sha256 = "01wq01ysv0ijcrg8a4mj72zb8al15b8vw8g3ywhxq53kbsyhfxn4";
+ sha256 = "e/2/0MrGY3myELmvuTAbNfXCBuT8kmvz9qTwITdDtQU=";
name = "${pname}-${version}-source";
};
- # Remove when solved https://github.com/NixOS/nixpkgs/issues/81441
- # Also update pkgs/development/interpreters/python/hooks/pip-install-hook.sh accordingly
- patches = [ ./reproducible.patch ];
-
nativeBuildInputs = [ bootstrapped-pip ];
# pip detects that we already have bootstrapped_pip "installed", so we need
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pip/reproducible.patch b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pip/reproducible.patch
deleted file mode 100644
index 528ac2b49b03..000000000000
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pip/reproducible.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/pip/_internal/operations/install/wheel.py b/src/pip/_internal/operations/install/wheel.py
-index e7315ee4..4e36b03d 100644
---- a/src/pip/_internal/operations/install/wheel.py
-+++ b/src/pip/_internal/operations/install/wheel.py
-@@ -615,6 +615,8 @@ def install_wheel(
- direct_url=None, # type: Optional[DirectUrl]
- ):
- # type: (...) -> None
-+ _temp_dir_for_testing = (
-+ _temp_dir_for_testing or os.environ.get("NIX_PIP_INSTALL_TMPDIR"))
- with TempDirectory(
- path=_temp_dir_for_testing, kind="unpacked-wheel"
- ) as unpacked_dir, ZipFile(wheel_path, allowZip64=True) as z:
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pkginfo/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pkginfo/default.nix
index 55c954c20f94..7a0fc2080702 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pkginfo/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pkginfo/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pkginfo";
- version = "1.5.0.1";
+ version = "1.6.1";
src = fetchPypi {
inherit pname version;
- sha256 = "7424f2c8511c186cd5424bbf31045b77435b37a8d604990b79d4e70d741148bb";
+ sha256 = "a6a4ac943b496745cec21f14f021bbd869d5e9b4f6ec06918cffea5a2f4b9193";
};
doCheck = false; # I don't know why, but with doCheck = true it fails.
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/plaid-python/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/plaid-python/default.nix
index 96e733560472..aa329953a391 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/plaid-python/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/plaid-python/default.nix
@@ -1,12 +1,12 @@
{ lib, buildPythonPackage, fetchPypi, requests, pytest }:
buildPythonPackage rec {
- version = "6.0.0";
+ version = "7.2.0";
pname = "plaid-python";
src = fetchPypi {
inherit pname version;
- sha256 = "0a0ay39k50hbxxaxz09m2azz5c08yqki2gincziv6g381yrlj68s";
+ sha256 = "bd599b384f94d8883344925f0ef223e1ab50f218872434aa40ba8c645937699c";
};
checkInputs = [ pytest ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/plotly/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/plotly/default.nix
index cc33babd64ba..f11cf1c0984c 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/plotly/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/plotly/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "plotly";
- version = "4.9.0";
+ version = "4.13.0";
src = fetchPypi {
inherit pname version;
- sha256 = "257f530ffd73754bd008454826905657b329053364597479bb9774437a396837";
+ sha256 = "20df14f7883807f57d96ac245841e086a1799f2c2778462a7f3bca704e369c66";
};
propagatedBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/plyvel/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/plyvel/default.nix
index 9b9b453e56a1..c768c606ca8a 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/plyvel/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/plyvel/default.nix
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "plyvel";
- version = "1.2.0";
+ version = "1.3.0";
src = fetchPypi {
inherit pname version;
- sha256 = "1xkgj58i66w4h6gwp6fn6xj5nkrad6kxz3byhy9q1j94jml1ns1x";
+ sha256 = "a7a09033a0fd33ca47094e8bbe01714abfcf644f4b7a337d3970e91a2599e2c4";
};
buildInputs = [ pkgs.leveldb ] ++ stdenv.lib.optional isPy3k pytest;
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/poetry-core/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/poetry-core/default.nix
index 6f96a611168c..d5d4e36d3a37 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/poetry-core/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/poetry-core/default.nix
@@ -35,7 +35,6 @@ buildPythonPackage rec {
];
checkInputs = [
- isort
pep517
pytest-mock
pytestCheckHook
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/poetry/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/poetry/default.nix
index 8000c667e6db..bad38ea582fb 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/poetry/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/poetry/default.nix
@@ -24,7 +24,7 @@
buildPythonPackage rec {
pname = "poetry";
- version = "1.1.1";
+ version = "1.1.4";
format = "pyproject";
disabled = isPy27;
@@ -32,7 +32,7 @@ buildPythonPackage rec {
owner = "python-poetry";
repo = pname;
rev = version;
- sha256 = "1j3ij8qsd709p7ww5r4759f2xnk2s7g40kzm9vx99l98zw890g05";
+ sha256 = "0lx3qpz5dad0is7ki5a4vxphvc8cm8fnv4bmrx226a6nvvaj6ahs";
};
postPatch = ''
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pony/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pony/default.nix
index c69e4fc4867c..1ed0a7cafffb 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pony/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pony/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pony";
- version = "0.7.13";
+ version = "0.7.14";
src = fetchPypi {
inherit pname version;
- sha256 = "1fqc45m106xfy4hhzzwb8p7s2fh5x2x7s143dib84lbszqwp77la";
+ sha256 = "2f01e84e79ea7a14040225cb6c079bb266e7ba147346356c266490b18c77ce82";
};
doCheck = true;
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pooch/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pooch/default.nix
index 378035bb7a51..6530cbd4a5d1 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pooch/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pooch/default.nix
@@ -10,17 +10,19 @@
buildPythonPackage rec {
pname = "pooch";
- version = "1.0.0";
+ version = "1.3.0";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "1k2vinlhkzl7lzhvbz20x3a2r2zqqila0yxg3a3fax2r6qxbxxzi";
+ sha256 = "30d448e825904e2d763bbbe418831a788813c32f636b21c8d60ee5f474532898";
};
propagatedBuildInputs = [ packaging appdirs requests ];
+ preCheck = "HOME=$TMPDIR";
checkInputs = [ pytestCheckHook ];
+ # tries to touch network
disabledTests = [
"pooch_custom_url"
"pooch_download"
@@ -29,6 +31,8 @@ buildPythonPackage rec {
"pooch_corrupted"
"check_availability"
"downloader"
+ "test_retrieve"
+ "test_stream_download"
"test_fetch"
"decompress"
"extractprocessor_fails"
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/portend/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/portend/default.nix
index b5650f7dda01..280cadf4db4e 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/portend/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/portend/default.nix
@@ -3,14 +3,13 @@
buildPythonPackage rec {
pname = "portend";
- version = "2.6";
+ version = "2.7.0";
src = fetchPypi {
inherit pname version;
- sha256 = "600dd54175e17e9347e5f3d4217aa8bcf4bf4fa5ffbc4df034e5ec1ba7cdaff5";
+ sha256 = "ac0e57ae557f75dc47467579980af152e8f60bc2139547eff8469777d9110379";
};
- patches = [ ./black-19.10b0.patch ];
postPatch = ''
substituteInPlace pytest.ini --replace "--flake8" ""
'';
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/powerline/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/powerline/default.nix
index 65325f70b450..5834dd760369 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/powerline/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/powerline/default.nix
@@ -41,7 +41,10 @@ buildPythonPackage rec {
install -m644 "font/PowerlineSymbols.otf" "$out/share/fonts/OTF/PowerlineSymbols.otf"
install -m644 "font/10-powerline-symbols.conf" "$out/etc/fonts/conf.d/10-powerline-symbols.conf"
- cp -ra powerline/bindings/{bash,fish,shell,tcsh,tmux,vim,zsh} $out/share/
+ install -dm755 "$out/share/fish/vendor_functions.d"
+ install -m644 "powerline/bindings/fish/powerline-setup.fish" "$out/share/fish/vendor_functions.d/powerline-setup.fish"
+
+ cp -ra powerline/bindings/{bash,shell,tcsh,tmux,vim,zsh} $out/share/
rm $out/share/*/*.py
'';
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pplpy/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pplpy/default.nix
index 706c6251d3ac..de37c338bfa2 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pplpy/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pplpy/default.nix
@@ -56,7 +56,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "A Python wrapper for ppl";
homepage = "https://gitlab.com/videlec/pplpy";
- maintainers = with maintainers; [ timokau ];
+ maintainers = teams.sage.members;
license = licenses.gpl3;
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pproxy/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pproxy/default.nix
index 9f97d7df1356..0673a3f8dba3 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pproxy/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pproxy/default.nix
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "pproxy";
- version = "2.3.2";
+ version = "2.3.7";
disabled = isPy27;
@@ -16,8 +16,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "qwj";
repo = "python-proxy";
- rev = "818ab9cc10565789fe429a7be50ddefb9c583781";
- sha256 = "0g3cyi5lzakhs5p3fpwywbl8jpapnr8890zw9w45dqg8k0svc1fi";
+ rev = "7fccf8dd62204f34b0aa3a70fc568fd6ddff7728";
+ sha256 = "1sl2i0kymnbsk49ina81yjnkxjy09541f7pmic8r6rwsv1s87skc";
};
propagatedBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/ppscore/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/ppscore/default.nix
new file mode 100644
index 000000000000..3fd047402ee7
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/ppscore/default.nix
@@ -0,0 +1,35 @@
+{ stdenv
+, buildPythonPackage
+, fetchFromGitHub
+, isPy27
+, pandas
+, scikitlearn
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+ pname = "ppscore";
+ version = "1.1.1";
+ disabled = isPy27;
+
+ src = fetchFromGitHub {
+ owner = "8080labs";
+ repo = pname;
+ rev = version;
+ sha256 = "11y6axhj0nlagf7ax6gas1g06krrmddb1jlmf0mmrmyi7z0vldk2";
+ };
+
+ checkInputs = [ pytestCheckHook ];
+
+ propagatedBuildInputs = [
+ pandas
+ scikitlearn
+ ];
+
+ meta = with stdenv.lib; {
+ description = "A Python implementation of the Predictive Power Score (PPS)";
+ homepage = "https://github.com/8080labs/ppscore/";
+ license = licenses.mit;
+ maintainers = with maintainers; [ evax ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/premailer/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/premailer/default.nix
index ec0e959c7a5c..c69ec9a05a1f 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/premailer/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/premailer/default.nix
@@ -1,10 +1,11 @@
-{ lib, buildPythonPackage, fetchPypi,
+{ lib, buildPythonPackage, fetchPypi, isPy27,
cssselect, cssutils, lxml, mock, nose, requests, cachetools
}:
buildPythonPackage rec {
pname = "premailer";
version = "3.7.0";
+ disabled = isPy27; # no longer compatible with urllib
src = fetchPypi {
inherit pname version;
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/preshed/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/preshed/default.nix
index 96a015076df3..a544d6fab910 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/preshed/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/preshed/default.nix
@@ -9,11 +9,11 @@
}:
buildPythonPackage rec {
pname = "preshed";
- version = "3.0.2";
+ version = "3.0.4";
src = fetchPypi {
inherit pname version;
- sha256 = "1jrnci1pw9yv7j1a9b2q6c955l3gb8fv1q4d0id6s7bwr5l39mv1";
+ sha256 = "13a779205d55ce323976ac06df597f9ec2d6f0563ebcf5652176cf4520c7d540";
};
propagatedBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/prettytable/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/prettytable/default.nix
index bf1035316a69..bc8bd3f835d6 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/prettytable/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/prettytable/default.nix
@@ -2,23 +2,32 @@
, buildPythonPackage
, fetchPypi
, glibcLocales
+, setuptools_scm
+, wcwidth
}:
buildPythonPackage rec {
pname = "prettytable";
- version = "0.7.2";
+ version = "2.0.0";
src = fetchPypi {
inherit pname version;
- sha256 = "1ndckiniasacfqcdafzs04plskrcigk7vxprr2y34jmpkpf60m1d";
+ sha256 = "e37acd91976fe6119172771520e58d1742c8479703489321dc1d9c85e7259922";
};
+ nativeBuildInputs = [ setuptools_scm ];
buildInputs = [ glibcLocales ];
+ propagatedBuildInputs = [ wcwidth ];
+
preCheck = ''
export LANG="en_US.UTF-8"
'';
+ # no test no longer available in pypi package
+ doCheck = false;
+ pythonImportsCheck = [ "prettytable" ];
+
meta = with stdenv.lib; {
description = "Simple Python library for easily displaying tabular data in a visually appealing ASCII table format";
homepage = "http://code.google.com/p/prettytable/";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/prometheus_client/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/prometheus_client/default.nix
index 8f608666d720..e4cf4e85af0f 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/prometheus_client/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/prometheus_client/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "prometheus_client";
- version = "0.8.0";
+ version = "0.9.0";
src = fetchPypi {
inherit pname version;
- sha256 = "c6e6b706833a6bd1fd51711299edee907857be10ece535126a158f911ee80915";
+ sha256 = "9da7b32f02439d8c04f7777021c304ed51d9ec180604700c1ba72a4d44dceb03";
};
doCheck = false;
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/prompt_toolkit/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/prompt_toolkit/default.nix
index 47fbace69df0..2fa885a69f71 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/prompt_toolkit/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/prompt_toolkit/default.nix
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "prompt_toolkit";
- version = "3.0.6";
+ version = "3.0.8";
src = fetchPypi {
inherit pname version;
- sha256 = "7630ab85a23302839a0f26b31cc24f518e6155dea1ed395ea61b42c45941b6a6";
+ sha256 = "25c95d2ac813909f813c93fde734b6e44406d1477a9faef7c915ff37d39c0a8c";
};
checkPhase = ''
py.test -k 'not test_pathcompleter_can_expanduser'
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/proto-plus/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/proto-plus/default.nix
index d542d6f64778..4a36b625298d 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/proto-plus/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/proto-plus/default.nix
@@ -9,12 +9,12 @@
buildPythonPackage rec {
pname = "proto-plus";
- version = "1.10.1";
+ version = "1.11.0";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "0n8ia51jg2dkab2sf0qnh39bssqhz65ybcqr78f3zzf7ja923lkr";
+ sha256 = "416a0f13987789333cd8760a0ee998f8eccd6d7165ee9f283d64ca2de3e8774d";
};
propagatedBuildInputs = [ protobuf ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/protobuf/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/protobuf/default.nix
index 7f66549893bd..ab95eeb51f91 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/protobuf/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/protobuf/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchpatch, python, buildPythonPackage, isPy37
+{ buildPackages, stdenv, fetchpatch, python, buildPythonPackage, isPy37
, protobuf, google_apputils, pyext, libcxx, isPy27
, disabled, doCheck ? true }:
with stdenv.lib;
buildPythonPackage {
- inherit (protobuf) name src version;
+ inherit (protobuf) pname src version;
inherit disabled;
doCheck = doCheck && !isPy27; # setuptools>=41.4 no longer collects correctly on python2
@@ -15,8 +15,10 @@ buildPythonPackage {
++ optional (versionOlder protobuf.version "2.7.0") "-std=c++98"
);
+ outputs = [ "out" "dev" ];
+
propagatedBuildInputs = [ google_apputils ];
- propagatedNativeBuildInputs = [ protobuf ]; # For protoc.
+ propagatedNativeBuildInputs = [ buildPackages.protobuf ]; # For protoc.
nativeBuildInputs = [ google_apputils pyext ];
buildInputs = [ protobuf ];
@@ -43,9 +45,9 @@ buildPythonPackage {
preBuild = ''
# Workaround for https://github.com/google/protobuf/issues/2895
- ${python.interpreter} setup.py build
+ ${python.pythonForBuild.interpreter} setup.py build
'' + optionalString (versionAtLeast protobuf.version "2.6.0") ''
- ${python.interpreter} setup.py build_ext --cpp_implementation
+ ${python.pythonForBuild.interpreter} setup.py build_ext --cpp_implementation
'';
installFlags = optional (versionAtLeast protobuf.version "2.6.0")
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/prov/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/prov/default.nix
index 1dfc671c532b..3844a0fade9e 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/prov/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/prov/default.nix
@@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "prov";
- version = "1.5.3";
+ version = "2.0.0";
src = fetchPypi {
inherit pname version;
- sha256 = "1a9h406laclxalmdny37m0yyw7y17n359akclbahimdggq853jd0";
+ sha256 = "b6438f2195ecb9f6e8279b58971e02bc51814599b5d5383366eef91d867422ee";
};
prePatch = ''
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/psautohint/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/psautohint/default.nix
index b439c05f0b87..fb9237c89344 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/psautohint/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/psautohint/default.nix
@@ -6,14 +6,14 @@
buildPythonPackage rec {
pname = "psautohint";
- version = "2.1.1";
+ version = "2.1.2";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "adobe-type-tools";
repo = pname;
- sha256 = "00n9bycjmvx1fb4332bdj53f01q86ajndrvid9idpiyzybmd5vp4";
+ sha256 = "1s2l54gzn11y07zaggprwif7r3ia244qijjhkbvjdx4jsgc5df8n";
rev = "v${version}";
fetchSubmodules = true; # data dir for tests
};
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/psd-tools/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/psd-tools/default.nix
index a4eb552bb7d2..783905c70241 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/psd-tools/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/psd-tools/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "psd-tools";
- version = "1.9.15";
+ version = "1.9.16";
src = fetchPypi {
inherit pname version;
- sha256 = "23b545d91c784fcaf27fbf4c69abe21ac1ea10d25b5b8c61dcd8f0e03ccff786";
+ sha256 = "dece6327b5aa03b53163c63e2bf90b4a7b0ff6872ef743adab140a59cb2318ff";
};
propagatedBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/psutil/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/psutil/default.nix
index ab3a3c1665e4..2d9f0a9440d5 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/psutil/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/psutil/default.nix
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "psutil";
- version = "5.7.2";
+ version = "5.7.3";
src = fetchPypi {
inherit pname version;
- sha256 = "90990af1c3c67195c44c9a889184f84f5b2320dce3ee3acbd054e3ba0b4a7beb";
+ sha256 = "af73f7bcebdc538eda9cc81d19db1db7bf26f103f91081d780bbacfcb620dee2";
};
# arch doesn't report frequency is the same way
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/psycopg2/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/psycopg2/default.nix
index 5e1f578d901b..4e0a2771e9a8 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/psycopg2/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/psycopg2/default.nix
@@ -2,13 +2,15 @@
buildPythonPackage rec {
pname = "psycopg2";
- version = "2.8.5";
+ version = "2.8.6";
+ # Extension modules don't work well with PyPy. Use psycopg2cffi instead.
+ # c.f. https://github.com/NixOS/nixpkgs/pull/104151#issuecomment-729750892
disabled = isPyPy;
src = fetchPypi {
inherit pname version;
- sha256 = "f7d46240f7a1ae1dd95aab38bd74f7428d46531f69219954266d669da60c0818";
+ sha256 = "fb23f6c71107c37fd667cb4ea363ddeb936b348bbd6449278eb92c189699f543";
};
buildInputs = lib.optional stdenv.isDarwin openssl;
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/psycopg2cffi/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/psycopg2cffi/default.nix
new file mode 100644
index 000000000000..71c9017380ad
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/psycopg2cffi/default.nix
@@ -0,0 +1,39 @@
+{ buildPythonPackage, cffi, fetchFromGitHub, lib, postgresql, pytestCheckHook, six }:
+
+buildPythonPackage rec {
+ pname = "psycopg2cffi";
+ version = "2.8.1";
+
+ # NB: This is a fork.
+ # The original repo exists at https://github.com/chtd/psycopg2cffi, however
+ # this is mostly unmaintained and does not build for PyPy. Given that the
+ # whole point of this cffi alternative to psycopg2 is to use it with PyPy, I
+ # chose to use a working fork instead, which was linked in the relevant issue:
+ # https://github.com/chtd/psycopg2cffi/issues/113#issuecomment-730548574
+ #
+ # If/when these changes get merged back upstream we should revert to using the
+ # original source as opposed to the fork.
+ src = fetchFromGitHub {
+ owner = "Omegapol";
+ repo = pname;
+ rev = "c202b25cd861d5e8f0f55c329764ff1da9f020c0";
+ sha256 = "09hsnjkix1c0vlhmfvrp8pchpnz2ya4xrchyq15czj527nx2dmy2";
+ };
+
+ nativeBuildInputs = [ postgresql ];
+ propagatedBuildInputs = [ six cffi ];
+ checkInputs = [ pytestCheckHook ];
+
+ # NB: The tests need a postgres instance running to test against, and so we
+ # disable them.
+ doCheck = false;
+
+ pythonImportsCheck = [ "psycopg2cffi" ];
+
+ meta = with lib; {
+ description = "An implementation of the psycopg2 module using cffi";
+ homepage = "https://pypi.org/project/psycopg2cffi/";
+ license = with licenses; [ lgpl3Plus ];
+ maintainers = with maintainers; [ lovesegfault ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pulp/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pulp/default.nix
index a98c7a518d20..73d367f5eb11 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pulp/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pulp/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "PuLP";
- version = "2.3";
+ version = "2.3.1";
src = fetchPypi {
inherit pname version;
- sha256 = "9d8ecf532868cc31fa9ff59ee5d5b2049600c5c902c18c794a2bad677c1f92e5";
+ sha256 = "5bbe53f854fb3b689e4faacac5bdb5fa576cb270fc12c78edef827dd46a4fb50";
};
propagatedBuildInputs = [ pyparsing amply ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pure-eval/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pure-eval/default.nix
index 2807611f4933..6e504951cdbe 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pure-eval/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pure-eval/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Safely evaluate AST nodes without side effects";
- homepage = "http://github.com/alexmojaki/pure_eval";
+ homepage = "https://github.com/alexmojaki/pure_eval";
license = licenses.mit;
maintainers = with maintainers; [ gebner ];
};
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pure-pcapy3/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pure-pcapy3/default.nix
index 71673da7abe0..43d6244ebf0c 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pure-pcapy3/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pure-pcapy3/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
meta = with stdenv.lib; {
description = "Pure Python reimplementation of pcapy. This package is API compatible and a drop-in replacement.";
- homepage = "http://bitbucket.org/viraptor/pure-pcapy";
+ homepage = "https://bitbucket.org/viraptor/pure-pcapy";
license = licenses.bsd2;
maintainers = with maintainers; [ etu ];
};
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pushbullet/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pushbullet/default.nix
index b9c2a84728fa..68c9d9180dc8 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pushbullet/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pushbullet/default.nix
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "pushbullet.py";
- version = "0.11.0";
+ version = "0.12.0";
src = fetchPypi {
inherit pname version;
- sha256 = "aa9dc7bb46e083e3497d46241154f12944a8f540e29d150330ca94db0b453b8d";
+ sha256 = "917883e1af4a0c979ce46076b391e0243eb8fe0a81c086544bcfa10f53e5ae64";
};
propagatedBuildInputs = [ requests websocket_client python_magic ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pushover-complete/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pushover-complete/default.nix
index e588ae9f796e..33769af319d6 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pushover-complete/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pushover-complete/default.nix
@@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchPypi
+, isPy27
, requests
, six
, tox
@@ -11,6 +12,7 @@
buildPythonPackage rec {
pname = "pushover-complete";
version = "1.1.1";
+ disabled = isPy27;
src = fetchPypi {
pname = "pushover_complete";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pwntools/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pwntools/default.nix
index 623140546e1d..a6f43ae5b1f8 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pwntools/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pwntools/default.nix
@@ -24,12 +24,12 @@
}:
buildPythonPackage rec {
- version = "4.2.1";
+ version = "4.3.1";
pname = "pwntools";
src = fetchPypi {
inherit pname version;
- sha256 = "1fh7sq9wrcfvn44qryln9cyg99pilvyq9bp80758lgdd6ss6hdqd";
+ sha256 = "12ja913kz8wl4afrmpzxh9fx6j7rcwc2vqzkvfr1fxn42gkqhqf4";
};
# Upstream has set an upper bound on unicorn because of https://github.com/Gallopsled/pwntools/issues/1538,
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/py-air-control-exporter/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/py-air-control-exporter/default.nix
new file mode 100644
index 000000000000..99a0df654fca
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/py-air-control-exporter/default.nix
@@ -0,0 +1,24 @@
+{ buildPythonPackage, fetchPypi, flask, isPy27, lib, prometheus_client
+, py-air-control, pytestCheckHook, pytestcov, pytestrunner, setuptools_scm }:
+
+buildPythonPackage rec {
+ pname = "py-air-control-exporter";
+ version = "0.1.4";
+ disabled = isPy27;
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1f13d3mlj6c3xvkclimahx7gpqqn8z56lh4kwy1d3gkjm7zs9zw9";
+ };
+
+ nativeBuildInputs = [ setuptools_scm ];
+ checkInputs = [ pytestCheckHook pytestcov pytestrunner ];
+ propagatedBuildInputs = [ flask prometheus_client py-air-control ];
+
+ meta = with lib; {
+ description = "Exports Air Quality Metrics to Prometheus.";
+ homepage = "https://github.com/urbas/py-air-control-exporter";
+ license = licenses.mit;
+ maintainers = with maintainers; [ urbas ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/py-air-control/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/py-air-control/default.nix
new file mode 100644
index 000000000000..77b61123d9e0
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/py-air-control/default.nix
@@ -0,0 +1,27 @@
+{ buildPythonPackage, coapthon3, fetchFromGitHub, isPy27, lib, pycryptodomex }:
+
+buildPythonPackage rec {
+ pname = "py-air-control";
+ version = "2.1.0";
+ disabled = isPy27;
+
+ src = fetchFromGitHub {
+ owner = "rgerganov";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0mkggl5hwmj90djxbbz4svim6iv7xl8k324cb4rlc75p5rgcdwmh";
+ };
+
+ propagatedBuildInputs = [ pycryptodomex coapthon3 ];
+
+ # tests sometimes hang forever on tear-down
+ doCheck = false;
+ pythonImportsCheck = [ "pyairctrl" ];
+
+ meta = with lib; {
+ inherit (src.meta) homepage;
+ description = "Command Line App for Controlling Philips Air Purifiers.";
+ license = licenses.mit;
+ maintainers = with maintainers; [ urbas ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/py-multibase/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/py-multibase/default.nix
index c304e68fd8dd..b229361917f6 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/py-multibase/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/py-multibase/default.nix
@@ -10,12 +10,12 @@
}:
buildPythonPackage rec {
pname = "py-multibase";
- version = "1.0.1";
+ version = "1.0.3";
disabled = isPy27;
src = fetchPypi {
inherit pname version ;
- sha256 = "6ed706ea321b487ba82e4172a9c82d61dacd675c865f576a937a94bca1a23443";
+ sha256 = "d28a20efcbb61eec28f55827a0bf329c7cea80fffd933aecaea6ae8431267fe4";
};
postPatch = ''
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/py-multihash/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/py-multihash/default.nix
index 5034f6df4699..1f8ecad00135 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/py-multihash/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/py-multihash/default.nix
@@ -1,6 +1,6 @@
{ base58
, buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
, isPy27
, lib
, morphys
@@ -14,11 +14,13 @@
buildPythonPackage rec {
pname = "py-multihash";
- version = "0.2.3";
+ version = "1.0.0";
- src = fetchPypi {
- inherit pname version ;
- sha256 = "f0ade4de820afdc4b4aaa40464ec86c9da5cae3a4578cda2daab4b0eb7e5b18d";
+ src = fetchFromGitHub {
+ owner = "multiformats";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "07qglrbgcb8sr9msqw2v7dqj9s4rs6nyvhdnx02i5w6xx5ibzi3z";
};
nativeBuildInputs = [
@@ -38,6 +40,8 @@ buildPythonPackage rec {
pytestcov
];
+ pythonImportsCheck = [ "multihash" ];
+
disabled = isPy27;
meta = with lib; {
@@ -45,5 +49,6 @@ buildPythonPackage rec {
homepage = "https://github.com/multiformats/py-multihash";
license = licenses.mit;
maintainers = with maintainers; [ rakesh4g ];
+ broken = true; # no longer compatible with base58, no updates in 5 years. Added 2020-11-05
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/py3status/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/py3status/default.nix
index a99dacf6204b..03f142a8aba6 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/py3status/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/py3status/default.nix
@@ -24,11 +24,11 @@
buildPythonPackage rec {
pname = "py3status";
- version = "3.28";
+ version = "3.31";
src = fetchPypi {
inherit pname version;
- sha256 = "103c63f43ddfd86e5a3f0bebb34b0f2eaaf6dbd58281d25c8a16937eb8e7f194";
+ sha256 = "426cff33c1d3a5ee6ae388089fd41dc47c4221800f43bd51779f823c781fb83b";
};
doCheck = false;
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/py4j/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/py4j/default.nix
index db117e04d128..e8faee8d817d 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/py4j/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/py4j/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "py4j";
- version = "0.10.9";
+ version = "0.10.9.1";
src = fetchPypi {
inherit pname version;
- sha256 = "36ec57f43ff8ced260a18aa9a4e46c3500a730cac8860e259cbaa546c2b9db2f";
+ sha256 = "7605e512bf9b002245f5a9121a8c2df9bfd1a6004fe6dd3ff29d46f901719d53";
};
# No tests in archive
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyTelegramBotAPI/default.nix
index 2ecdfb17aa2d..ea5c93dbeaa1 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyTelegramBotAPI/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyTelegramBotAPI/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pyTelegramBotAPI";
- version = "3.7.3";
+ version = "3.7.4";
src = fetchPypi {
inherit pname version;
- sha256 = "ce42d84442ff2ce4918de6550cf377253f61e28e4fac2634495683d12df66d00";
+ sha256 = "9b95f441c390fd30a4452a984406310f60a7f4803df57860ccb6a79881506c46";
};
propagatedBuildInputs = [ requests ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/py_stringmatching/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/py_stringmatching/default.nix
index fda497b7962b..79d09daba9cc 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/py_stringmatching/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/py_stringmatching/default.nix
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "py_stringmatching";
- version = "0.4.1";
+ version = "0.4.2";
src = fetchPypi {
inherit pname version;
- sha256 = "c46db1e855cef596dfbbe1bd48fcabb30736479eff602c2bf88af10f998f1532";
+ sha256 = "c87f62698fba1612a18f8f44bd57f0c4e70aac2d7ca6dfb6ed46dabd2194453c";
};
checkInputs = [ nose ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyaftership/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyaftership/default.nix
new file mode 100644
index 000000000000..4deee467f84e
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyaftership/default.nix
@@ -0,0 +1,26 @@
+{ aiohttp, async-timeout, buildPythonPackage, fetchPypi, isPy3k, lib }:
+
+buildPythonPackage rec {
+ pname = "pyaftership";
+ version = "0.1.2";
+
+ disabled = !isPy3k;
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "057dwzacc0lmsq00ipfbnxkq4rc2by8glmza6s8i6dzi1cc68v98";
+ };
+
+ propagatedBuildInputs = [ aiohttp async-timeout ];
+
+ # No tests
+ doCheck = false;
+ pythonImportsCheck = [ "pyaftership.tracker" ];
+
+ meta = with lib; {
+ description = "Python wrapper package for the AfterShip API";
+ homepage = "https://github.com/ludeeus/pyaftership";
+ license = licenses.mit;
+ maintainers = with maintainers; [ jamiemagee ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyairvisual/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyairvisual/default.nix
index 58eb5f7028ac..084852fa5371 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyairvisual/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyairvisual/default.nix
@@ -1,29 +1,54 @@
-{ lib, buildPythonPackage, isPy3k, fetchFromGitHub, requests
-, requests-mock, pytest
+{ lib
+, buildPythonPackage
+, pythonOlder
+, fetchFromGitHub
+, poetry
+, aiohttp
+, numpy
+, pysmb
+, aresponses
+, asynctest
+, pytest-aiohttp
+, pytest-asyncio
+, pytestCheckHook
}:
buildPythonPackage rec {
pname = "pyairvisual";
- version = "1.0.0";
+ version = "5.0.4";
+ format = "pyproject";
+
+ disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "bachya";
repo = pname;
- rev = "v${version}";
- sha256 = "0ng6k07n91k5l68zk3hl4fywb33admp84wqdm20qmmw9yc9c64fd";
+ rev = version;
+ sha256 = "0z769xrb6w6bhqcq02sjryl1qyvk9dc1xfn06fc3mdqnrbr0xxj3";
};
- checkInputs = [ pytest requests-mock ];
- propagatedBuildInputs = [ requests ];
+ nativeBuildInputs = [ poetry ];
+
+ propagatedBuildInputs = [
+ aiohttp
+ numpy
+ pysmb
+ ];
- checkPhase = ''
- py.test tests
- '';
+ checkInputs = [
+ aresponses
+ asynctest
+ pytest-aiohttp
+ pytest-asyncio
+ pytestCheckHook
+ ];
- disabled = !isPy3k;
+ pytestFlagsArray = [
+ "tests"
+ ];
meta = with lib; {
- description = "A thin Python wrapper for the AirVisual API";
+ description = "A simple, clean, well-tested Python library for interacting with AirVisual©";
license = licenses.mit;
homepage = "https://github.com/bachya/pyairvisual";
};
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyatmo/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyatmo/default.nix
index b0e8ac5d250f..22acf8725260 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyatmo/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyatmo/default.nix
@@ -12,17 +12,27 @@
buildPythonPackage rec {
pname = "pyatmo";
- version = "4.1.0";
- disabled = pythonOlder "3.5"; # uses type hints
+ version = "4.2.1";
+ disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "jabesq";
repo = "netatmo-api-python";
rev = "v${version}";
- sha256 = "0x3xq6ni9rl5k3vi0ydqafdzvza785ycnlgyikgqbkppbh3j33ig";
+ sha256 = "12lmjhqjn71a358nkpzl3dwgiwmmz4lcv9f0qf69ngznpiirk28m";
};
- propagatedBuildInputs = [ oauthlib requests requests_oauthlib ];
+ postPatch = ''
+ substituteInPlace setup.cfg \
+ --replace "oauthlib~=3.1.0" "oauthlib" \
+ --replace "requests~=2.23.0" "requests"
+ '';
+
+ propagatedBuildInputs = [
+ oauthlib
+ requests
+ requests_oauthlib
+ ];
checkInputs = [
freezegun
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyatspi/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyatspi/default.nix
index 74b9f7dfdebe..232e44d0999e 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyatspi/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyatspi/default.nix
@@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "pyatspi";
- version = "2.36.0";
+ version = "2.38.0";
format = "other";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1pg1zzjl167iavin6xzzm20mh3m6dvl7d8h1r571s44yj6zw2dji";
+ sha256 = "/4CTEv0ML2HhkcGBoaY4owtXm5G2gs+1oFU1pVJltD0=";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyatv/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyatv/default.nix
index 68549e5cabd1..adec3bd07b31 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyatv/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyatv/default.nix
@@ -18,12 +18,11 @@
buildPythonPackage rec {
pname = "pyatv";
- version = "v0.7.4";
-
+ version = "0.7.4";
src = fetchFromGitHub {
owner = "postlund";
repo = pname;
- rev = version;
+ rev = "v${version}";
sha256 = "17gsamn4aibsx4w50r9dwr5kr9anc7dd0f0dvmdl717rkgh13zyi";
};
@@ -37,7 +36,6 @@ buildPythonPackage rec {
cryptography
netifaces
zeroconf
- pytestCheckHook
];
checkInputs = [
@@ -45,6 +43,7 @@ buildPythonPackage rec {
pytest
pytest-aiohttp
pytest-asyncio
+ pytestCheckHook
];
meta = with stdenv.lib; {
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pybase64/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pybase64/default.nix
index d52a1f67d214..d48fed13543b 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pybase64/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pybase64/default.nix
@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "pybase64";
- version = "1.0.1";
+ version = "1.0.2";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "6ced40531bffc81bafc790d5c0d2f752e281b3b00fd6ff4e79385c625e5dbab1";
+ sha256 = "c430b36751dd89820c867aadd0130bbe8ce007ee570cbe91bb23012fb6f52e87";
};
propagatedBuildInputs = [ six ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pybids/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pybids/default.nix
index 7f930c04105c..9cca6cf57efc 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pybids/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pybids/default.nix
@@ -16,12 +16,12 @@
}:
buildPythonPackage rec {
- version = "0.12.1";
+ version = "0.12.4";
pname = "pybids";
src = fetchPypi {
inherit pname version;
- sha256 = "08smd4frl8hf0n6bi20ayd5wcf51g3g488bpakjciz7ghdvky1h6";
+ sha256 = "830f3f518ab0d2e058e9ba6d6ff9a942792909c874433b3ad58a3339a23f46bf";
};
propagatedBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pybind11/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pybind11/default.nix
index 079c93db4501..3fd934938601 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pybind11/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pybind11/default.nix
@@ -14,13 +14,13 @@
buildPythonPackage rec {
pname = "pybind11";
- version = "2.5.0";
+ version = "2.6.1";
src = fetchFromGitHub {
owner = "pybind";
repo = pname;
rev = "v${version}";
- sha256 = "13hcj6g7k7yvj7nry2ar6f5mg58ln7frrvq1cg5f8mczxh1ch6zl";
+ sha256 = "TXljeRFonQwEmlIGMnTHwdfPsd9cMOVn5/1zb3tYBfI=";
};
nativeBuildInputs = [ cmake ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pybotvac/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pybotvac/default.nix
index f915c4983508..c5e239ab8973 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pybotvac/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pybotvac/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pybotvac";
- version = "0.0.17";
+ version = "0.0.18";
src = fetchPypi {
inherit pname version;
- sha256 = "f212f0df8a946c0fa25f0c20c3c9decd9ddc4dbd9b48592a3283e7481112923e";
+ sha256 = "e983c9ffc0734c2e5a7c2adf5d0d0dfe399d94157c590ef70fad765f882c341f";
};
propagatedBuildInputs = [ requests ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pybtex/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pybtex/default.nix
index dd258f427188..a62e7e27f9cf 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pybtex/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pybtex/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildPythonPackage, fetchPypi, latexcodec, pyyaml }:
buildPythonPackage rec {
- version = "0.22.2";
+ version = "0.23.0";
pname = "pybtex";
doCheck = false;
@@ -9,7 +9,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit version pname;
- sha256 = "00816e5f8570609d8ce3360cd23916bd3e50428a3508127578fdb4dc2b731c1c";
+ sha256 = "b92be18ccd5e9a37895949dcf359a1f6890246b73646dddf1129178ee12e4bef";
};
meta = {
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pybullet/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pybullet/default.nix
index 8cc9d173e0f5..aaf703f53949 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pybullet/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pybullet/default.nix
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "pybullet";
- version = "3.0.6";
+ version = "3.0.7";
src = fetchPypi {
inherit pname version;
- sha256 = "db4eea782c4d4808ef73b305a729d94f89035f7ad1b84032432e9dd101f689e4";
+ sha256 = "47e55d2b0c565a968406f314faad7c002be6d8b0afc8ad2c437d07b7b7d2f590";
};
buildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pycairo/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pycairo/default.nix
index d61279e38d5d..24e0f9792d7a 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pycairo/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pycairo/default.nix
@@ -1,4 +1,13 @@
-{ lib, fetchFromGitHub, meson, ninja, buildPythonPackage, pytest, pkgconfig, cairo, xlibsWrapper, isPy3k }:
+{ lib
+, fetchFromGitHub
+, meson
+, ninja
+, buildPythonPackage
+, pytestCheckHook
+, pkg-config
+, cairo
+, isPy3k
+}:
buildPythonPackage rec {
pname = "pycairo";
@@ -16,22 +25,25 @@ buildPythonPackage rec {
nativeBuildInputs = [
meson
ninja
- pkgconfig
+ pkg-config
];
buildInputs = [
cairo
- xlibsWrapper
];
- checkInputs = [ pytest ];
+ checkInputs = [
+ pytestCheckHook
+ ];
- mesonFlags = [ "-Dpython=${if isPy3k then "python3" else "python"}" ];
+ mesonFlags = [
+ "-Dpython=${if isPy3k then "python3" else "python"}"
+ ];
meta = with lib; {
description = "Python 2/3 bindings for cairo";
homepage = "https://pycairo.readthedocs.io/";
- license = with licenses; [ lgpl2 mpl11 ];
+ license = with licenses; [ lgpl21Only mpl11 ];
platforms = lib.platforms.linux ++ lib.platforms.darwin;
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pycapnp/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pycapnp/default.nix
index 629fdd0114d8..1997021ce010 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pycapnp/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pycapnp/default.nix
@@ -9,12 +9,12 @@
buildPythonPackage rec {
pname = "pycapnp";
- version = "0.6.4";
+ version = "1.0.0";
disabled = isPyPy || isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "44e14a5ace399cf1753acb8bbce558b8c895c48fd2102d266c34eaff286824cf";
+ sha256 = "9f6fcca349ebf2ec04ca7eacb076aea3e4fcdc010ac33c98b54f0a19d4e5d3e0";
};
buildInputs = [ capnproto cython ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pychromecast/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pychromecast/default.nix
index e9f70df58901..ce72850fffd7 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pychromecast/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pychromecast/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "PyChromecast";
- version = "7.5.0";
+ version = "7.5.1";
src = fetchPypi {
inherit pname version;
- sha256 = "2f346a88ddc27a19cc68bc2d3e8929d89276298cb1c11871b82a87fbdafb95a8";
+ sha256 = "cf2e9fa795ea1e9d0d180adfbdccefd6b4f532eae56f41f15d1a75b323096f51";
};
disabled = !isPy3k;
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pycmarkgfm/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pycmarkgfm/default.nix
new file mode 100644
index 000000000000..f1d92a63d401
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pycmarkgfm/default.nix
@@ -0,0 +1,32 @@
+{ lib, buildPythonPackage, fetchPypi, isPy27, cffi, pytest }:
+
+buildPythonPackage rec {
+ pname = "pycmarkgfm";
+ version = "1.0.1";
+ disabled = isPy27;
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0wkbbma214f927ikn3cijxsrzkmm5cqz1x4fimrwx9s2wfphj250";
+ };
+
+ propagatedBuildInputs = [ cffi ];
+
+ # I would gladly use pytestCheckHook, but pycmarkgfm relies on a native
+ # extension (cmark.so, built through setup.py), and pytestCheckHook runs
+ # pytest in an environment that does not contain this extension, which fails.
+ # cmarkgfm has virtually the same build setup as this package, and uses the
+ # same trick: pkgs/development/python-modules/cmarkgfm/default.nix
+ checkInputs = [ pytest ];
+ checkPhase = ''
+ pytest
+ '';
+
+ meta = with lib; {
+ homepage = "https://github.com/zopieux/pycmarkgfm";
+ description = "Bindings to GitHub's Flavored Markdown (cmark-gfm), with enhanced support for task lists";
+ platforms = platforms.linux ++ platforms.darwin;
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ zopieux ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pycognito/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pycognito/default.nix
index 8101b76b62cf..a30c1cd344b4 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pycognito/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pycognito/default.nix
@@ -12,13 +12,13 @@
buildPythonPackage rec {
pname = "pycognito";
- version = "0.1.3";
+ version = "0.1.4";
src = fetchFromGitHub {
owner = "pvizeli";
repo = "pycognito";
rev = version;
- sha256 = "0wy6d274xda7v6dazv10h2vwig2avfyz8mh2lpd1a5k7i06r335r";
+ sha256 = "HLzPrRon+ipcUZlD1l4nYSwSbdDLwOALy4ejGunjK0w=";
};
postPatch = ''
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pycoin/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pycoin/default.nix
index da09cfdd64e2..cb0431be61f8 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pycoin/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pycoin/default.nix
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "pycoin";
- version = "0.90.20200809";
+ version = "0.90.20201031";
src = fetchPypi {
inherit pname version;
- sha256 = "301dd6df9d9d580701d7325c4d1c341233ba1a94cb805305ea3a43c31bdaaa4c";
+ sha256 = "65c19204cb7aece4aae30c44b5e08beecb9c118370a9f9994d6cddaee17c351d";
};
propagatedBuildInputs = [ setuptools ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pycryptodome/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pycryptodome/default.nix
index 15e93e59542b..40084c2885e8 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pycryptodome/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pycryptodome/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchPypi, buildPythonPackage }:
buildPythonPackage rec {
- version = "3.9.8";
+ version = "3.9.9";
pname = "pycryptodome";
src = fetchPypi {
inherit pname version;
- sha256 = "0e24171cf01021bc5dc17d6a9d4f33a048f09d62cc3f62541e95ef104588bda4";
+ sha256 = "910e202a557e1131b1c1b3f17a63914d57aac55cf9fb9b51644962841c3995c4";
};
meta = {
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pycryptodomex/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pycryptodomex/default.nix
index 0bef1364617e..d58821569e62 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pycryptodomex/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pycryptodomex/default.nix
@@ -2,7 +2,7 @@
buildPythonPackage rec {
pname = "pycryptodomex";
- version = "3.9.8";
+ version = "3.9.9";
meta = {
description = "A self-contained cryptographic library for Python";
@@ -12,6 +12,6 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "48cc2cfc251f04a6142badeb666d1ff49ca6fdfc303fd72579f62b768aaa52b9";
+ sha256 = "7b5b7c5896f8172ea0beb283f7f9428e0ab88ec248ce0a5b8c98d73e26267d51";
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyct/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyct/default.nix
index c187c6a55761..b2314e6edfeb 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyct/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyct/default.nix
@@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchPypi
+, isPy27
, param
, pyyaml
, requests
@@ -9,13 +10,14 @@
buildPythonPackage rec {
pname = "pyct";
- version = "0.4.6";
+ version = "0.4.8";
src = fetchPypi {
inherit pname version;
- sha256 = "df7b2d29f874cabdbc22e4f8cba2ceb895c48aa33da4e0fe679e89873e0a4c6e";
+ sha256 = "23d7525b5a1567535c093aea4b9c33809415aa5f018dd77f6eb738b1226df6f7";
};
+ doCheck = !isPy27;
checkInputs = [ pytest ];
propagatedBuildInputs = [
param
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pycurl/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pycurl/default.nix
index 7531bb8f7bbc..fe62d1be1ea1 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pycurl/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pycurl/default.nix
@@ -1,6 +1,7 @@
{ buildPythonPackage
, isPyPy
, fetchPypi
+, pythonOlder
, curl
, openssl
, bottle
@@ -11,12 +12,12 @@
buildPythonPackage rec {
pname = "pycurl";
- version = "7.43.0.5";
- disabled = isPyPy; # https://github.com/pycurl/pycurl/issues/208
+ version = "7.43.0.6";
+ disabled = isPyPy || (pythonOlder "3.5"); # https://github.com/pycurl/pycurl/issues/208
src = fetchPypi {
inherit pname version;
- sha256 = "ec7dd291545842295b7b56c12c90ffad2976cc7070c98d7b1517b7b6cd5994b3";
+ sha256 = "8301518689daefa53726b59ded6b48f33751c383cf987b0ccfbbc4ed40281325";
};
buildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pycxx/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pycxx/default.nix
new file mode 100644
index 000000000000..c0cf0ac0dc13
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pycxx/default.nix
@@ -0,0 +1,27 @@
+{ lib, buildPythonPackage, fetchurl, python }:
+
+buildPythonPackage rec {
+ pname = "pycxx";
+ version = "7.1.4";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/cxx/CXX/PyCXX%20V${version}/pycxx-${version}.tar.gz";
+ sha256 = "MUMU+/qsm92WENYFxfjQsSuR8/nE/asYG8HgIbaAaz0=";
+ };
+
+ outputs = [ "out" "dev" ];
+
+ postInstall = ''
+ mkdir -p $dev/include
+ mv $out/include/${python.libPrefix}*/CXX/ $dev/include/CXX/
+ mv $out/CXX $dev/src
+ sed -i "s|Src|$dev/src|" $dev/src/cxxextensions.c $dev/src/cxxsupport.cxx
+ '';
+
+ meta = with lib; {
+ description = "set of classes to help create extensions of Python in the C++ language";
+ homepage = "https://sourceforge.net/projects/cxx/";
+ maintainers = with maintainers; [ freezeboy ];
+ platforms = platforms.all;
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pydicom/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pydicom/default.nix
index e6602ba9da2c..24186c09dcd5 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pydicom/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pydicom/default.nix
@@ -10,13 +10,13 @@
}:
buildPythonPackage rec {
- version = "2.0.0";
+ version = "2.1.1";
pname = "pydicom";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "594c91f715c415ef439f498351ae68fb770c776fc5aa72f3c87eb500dc2a7470";
+ sha256 = "72a11086f6a277c1529a552583fde73e03256a912173f15e9bc256e5b28f28f1";
};
propagatedBuildInputs = [ numpy pillow ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyee/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyee/default.nix
new file mode 100644
index 000000000000..3c92dee783ad
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyee/default.nix
@@ -0,0 +1,37 @@
+{ buildPythonPackage, fetchPypi, lib, vcversioner, pytestrunner, mock, pytest, pytest-asyncio, pytest-trio, twisted, zipp, pyparsing, pyhamcrest, futures, attrs, stdenv, isPy27 }:
+
+buildPythonPackage rec {
+ pname = "pyee";
+ version = "8.1.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "92dacc5bd2bdb8f95aa8dd2585d47ca1c4840e2adb95ccf90034d64f725bfd31";
+ };
+
+ buildInputs = [
+ vcversioner
+ ];
+
+ checkInputs = [
+ mock
+ pyhamcrest
+ pytest
+ pytest-asyncio
+ pytest-trio
+ pytestrunner
+ twisted
+ ] ++ stdenv.lib.optional isPy27 [
+ attrs
+ futures
+ pyparsing
+ zipp
+ ];
+
+ meta = {
+ description = "A port of Node.js's EventEmitter to python";
+ homepage = "https://github.com/jfhbrook/pyee";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ kmein ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyelftools/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyelftools/default.nix
index 08fba705aa85..51e1886f1d0d 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyelftools/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyelftools/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
sha256 = "sha256-O7l1kj0k8bOSOtZJVzS674oVnM+X3oP00Ybs0qjb64Q=";
};
- doCheck = stdenv.is64bit;
+ doCheck = stdenv.is64bit && !stdenv.isDarwin;
checkPhase = ''
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" test/external_tools/readelf
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyexcel-io/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyexcel-io/default.nix
index 6fe2245385a0..15014cdafd28 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyexcel-io/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyexcel-io/default.nix
@@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "pyexcel-io";
- version = "0.6.3";
+ version = "0.6.4";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "8fb7a201eb3e5763bb8f9d6e096ceed9e5f1baecd784c9fadbe0fb3d59174c0e";
+ sha256 = "00f15f4bae2947de49b3206f2600f78780008e044380f7aafe0ce52969cda4ca";
};
propagatedBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyexcel-xls/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyexcel-xls/default.nix
index 418dfbf42f84..34d11830e570 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyexcel-xls/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyexcel-xls/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "pyexcel-xls";
- version = "0.6.0";
+ version = "0.6.1";
src = fetchPypi {
inherit pname version;
- sha256 = "64bac180274c52efe970c664d3e8bb12402c9d10e0734d9fe87655646a876c45";
+ sha256 = "c4cc1fb4ac5d1682a44d9a368a43ec2e089ad6fc46884648ccfad46863e3da0a";
};
propagatedBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyexcel/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyexcel/default.nix
index d62302c9c234..ca562ca5586b 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyexcel/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyexcel/default.nix
@@ -10,13 +10,13 @@
buildPythonPackage rec {
pname = "pyexcel";
- version = "0.6.5";
+ version = "0.6.6";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "36588573ccb1c86e1a8869e1e9f6b31975a38c13803f015a197c18efd2e685ad";
+ sha256 = "39b0bb8f033d9b5523b126cf5a5259d1990ea82b8a23c8eab7aa5e23116803df";
};
propagatedBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyface/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyface/default.nix
index 284b8f0837ab..68afbafef308 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyface/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyface/default.nix
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "pyface";
- version = "7.0.1";
+ version = "7.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "43943cc15889153b90191d9e1bd85e7a3709a6d57b6379220cb14017217fb999";
+ sha256 = "a3e22a4d31429f0d5b9ff50aaac3fb47e4f7da678b6b0439a7b91ef40675f88d";
};
propagatedBuildInputs = [ setuptools six traits ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyfakefs/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyfakefs/default.nix
index 7c1dc4fbb0d9..6f44b7fb2796 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyfakefs/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyfakefs/default.nix
@@ -1,13 +1,13 @@
{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, python, pytest, glibcLocales }:
buildPythonPackage rec {
- version = "4.1.0";
+ version = "4.3.2";
pname = "pyfakefs";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
- sha256 = "bbbaa8b622fa50751a5839350fff3c1f8b1bbd364cd40fd0c7442e18fe5edc8e";
+ sha256 = "dfeed4715e2056e3e56b9c5f51a679ce2934897eef926f3d14e5364e43f19070";
};
postPatch = ''
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyfcm/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyfcm/default.nix
index 22afc793cde9..8fdb051a4846 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyfcm/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyfcm/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "olucurious";
repo = "pyfcm";
- rev = "${version}";
+ rev = version;
sha256 = "0aj10yvjsc04j15zbn403i83j7ra5yg35pi3ywkyakk8n1s0s3qg";
};
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyflakes/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyflakes/default.nix
index d8cc45119482..04bc56df12d2 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyflakes/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyflakes/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, unittest2 }:
+{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, unittest2 }:
buildPythonPackage rec {
pname = "pyflakes";
@@ -11,6 +11,9 @@ buildPythonPackage rec {
checkInputs = [ unittest2 ];
+ # some tests are output dependent, which have changed slightly
+ doCheck = pythonOlder "3.9";
+
meta = with stdenv.lib; {
homepage = "https://launchpad.net/pyflakes";
description = "A simple program which checks Python source files for errors";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pygame/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pygame/default.nix
index 8f9a9e5e59c3..81c4d4a4b9c1 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pygame/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pygame/default.nix
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "pygame";
- version = "1.9.6";
+ version = "2.0.0";
src = fetchPypi {
inherit pname version;
- sha256 = "301c6428c0880ecd4a9e3951b80e539c33863b6ff356a443db1758de4f297957";
+ sha256 = "63b038da116a643046181b02173fd894d87d2f85ecfd6aa7d5ece73c6ef501e9";
};
nativeBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pygit2/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pygit2/default.nix
index c2c5ca826bcf..5326a1963aa8 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pygit2/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pygit2/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pygit2";
- version = "1.3.0";
+ version = "1.4.0";
src = fetchPypi {
inherit pname version;
- sha256 = "0be93f6a8d7cbf0cc79ae2f0afb1993fc055fc0018c27e2bd01ba143e51d4452";
+ sha256 = "cbeb38ab1df9b5d8896548a11e63aae8a064763ab5f1eabe4475e6b8a78ee1c8";
};
preConfigure = lib.optionalString stdenv.isDarwin ''
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pygmt/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pygmt/default.nix
new file mode 100644
index 000000000000..378419cc835b
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pygmt/default.nix
@@ -0,0 +1,45 @@
+{ lib
+, pythonOlder
+, buildPythonPackage
+, fetchFromGitHub
+, gmt
+, numpy
+, netcdf4
+, pandas
+, packaging
+, xarray
+}:
+
+buildPythonPackage rec {
+ pname = "pygmt";
+ version = "0.2.0";
+
+ disabled = pythonOlder "3.6";
+
+ src = fetchFromGitHub {
+ owner = "GenericMappingTools";
+ repo = "pygmt";
+ rev = "v${version}";
+ sha256 = "1yx1n6mxfmwg69ls5560nm6d3jxyghv27981iplz7m7990bbp468";
+ };
+
+ postPatch = ''
+ substituteInPlace pygmt/clib/loading.py \
+ --replace "env.get(\"GMT_LIBRARY_PATH\", \"\")" "env.get(\"GMT_LIBRARY_PATH\", \"${gmt}/lib\")"
+ '';
+
+ propagatedBuildInputs = [ numpy netcdf4 pandas packaging xarray ];
+
+ doCheck = false; # requires network access
+
+ postBuild = "export HOME=$TMP";
+
+ pythonImportsCheck = [ "pygmt" ];
+
+ meta = with lib; {
+ description = "A Python interface for the Generic Mapping Tools";
+ homepage = "https://github.com/GenericMappingTools/pygmt";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ sikmir ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pygobject/3.36.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pygobject/3.36.nix
new file mode 100644
index 000000000000..7e31e788f31e
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pygobject/3.36.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchurl, buildPythonPackage, pkgconfig, glib, gobject-introspection,
+pycairo, cairo, which, ncurses, meson, ninja, isPy3k, gnome3 }:
+
+buildPythonPackage rec {
+ pname = "pygobject";
+ version = "3.36.1";
+
+ format = "other";
+
+ src = fetchurl {
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ sha256 = "0b9CgC0c7BE7Wtqg579/N0W0RSHcIWNYjSdtXNYdcY8=";
+ };
+
+ outputs = [ "out" "dev" ];
+
+ mesonFlags = [
+ "-Dpython=python${if isPy3k then "3" else "2" }"
+ ];
+
+ nativeBuildInputs = [ pkgconfig meson ninja gobject-introspection ];
+ buildInputs = [ glib gobject-introspection ]
+ ++ stdenv.lib.optionals stdenv.isDarwin [ which ncurses ];
+ propagatedBuildInputs = [ pycairo cairo ];
+
+ passthru = {
+ updateScript = gnome3.updateScript {
+ packageName = pname;
+ attrPath = "python3.pkgs.${pname}3";
+ };
+ };
+
+ meta = with stdenv.lib; {
+ homepage = "https://pygobject.readthedocs.io/";
+ description = "Python bindings for Glib";
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ orivej ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pygobject/3.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pygobject/3.nix
index 9e38d6403970..6e34e7f91007 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pygobject/3.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pygobject/3.nix
@@ -3,21 +3,19 @@ pycairo, cairo, which, ncurses, meson, ninja, isPy3k, gnome3 }:
buildPythonPackage rec {
pname = "pygobject";
- version = "3.36.1";
+ version = "3.38.0";
+
+ disabled = ! isPy3k;
format = "other";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0b9CgC0c7BE7Wtqg579/N0W0RSHcIWNYjSdtXNYdcY8=";
+ sha256 = "A3LRu5Ei/Bn1AKJJsfOMK7Z0hQAPWIdJe0sgWz5whNU=";
};
outputs = [ "out" "dev" ];
- mesonFlags = [
- "-Dpython=python${if isPy3k then "3" else "2" }"
- ];
-
nativeBuildInputs = [ pkgconfig meson ninja gobject-introspection ];
buildInputs = [ glib gobject-introspection ]
++ stdenv.lib.optionals stdenv.isDarwin [ which ncurses ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pygtrie/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pygtrie/default.nix
new file mode 100644
index 000000000000..e22af4b52068
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pygtrie/default.nix
@@ -0,0 +1,15 @@
+{ lib, fetchPypi, buildPythonPackage, ... }:
+buildPythonPackage rec {
+ pname = "pygtrie";
+ version = "2.4.1";
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "4367b87d92eaf475107421dce0295a9d4d72156702908c96c430a426b654aee7";
+ };
+ meta = {
+ homepage = "https://github.com/mina86/pygtrie";
+ description = "Trie data structure implementation";
+ license = lib.licenses.asl20;
+ maintainers = with lib.maintainers; [ kmein ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyhaversion/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyhaversion/default.nix
index b6ef4bc4a8ba..1a32851e6f38 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyhaversion/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyhaversion/default.nix
@@ -15,14 +15,14 @@
}:
buildPythonPackage rec {
pname = "pyhaversion";
- version = "3.3.0";
+ version = "3.4.2";
# needs aiohttp which is py3k-only
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "376a1b232a26035bc82d64affa1c4f312d782234fe5453e8d0f9e1350a97be5b";
+ sha256 = "b4e49dfa0f9dae10edd072e630d902e5497daa312baad58b7df7618efe863377";
};
propagatedBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyhomematic/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyhomematic/default.nix
index 3f12888d5319..0dab202a79a7 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyhomematic/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyhomematic/default.nix
@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "pyhomematic";
- version = "0.1.68";
+ version = "0.1.70";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "7f8ec68238a441cfe593fa9028509fd0c3dc67400b4dd520c8c02088f177302e";
+ sha256 = "1c9ae61c870e37348483966f6aa46f650f339f5f1169e5beb19d681c6434c247";
};
# PyPI tarball does not include tests/ directory
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyhs100/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyhs100/default.nix
index 2e6d7164b8bf..429f3a8ebb9f 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyhs100/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyhs100/default.nix
@@ -4,14 +4,14 @@
buildPythonPackage rec {
pname = "pyHS100";
- version = "0.3.5.1";
+ version = "0.3.5.2";
disabled = pythonOlder "3.5";
src = fetchFromGitHub {
owner = "GadgetReactor";
repo = pname;
rev = version;
- sha256 = "1vddr9sjn6337i1vx0mm7pb3qibvl2gx6nx18vm4fajgv9vcjxny";
+ sha256 = "0z98hzvkp6jmllyd4x4y0f5n6nnxrizw6g5l2clxdn93mifjavp0";
};
propagatedBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pykdl/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pykdl/default.nix
index 5fc38cd5dd4d..674a43f5f3e0 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pykdl/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pykdl/default.nix
@@ -1,9 +1,19 @@
-{ lib, stdenv, toPythonModule, cmake, orocos-kdl, python, sip }:
+{ lib, stdenv, toPythonModule, fetchpatch, cmake, orocos-kdl, python, sip }:
toPythonModule (stdenv.mkDerivation {
pname = "pykdl";
inherit (orocos-kdl) version src;
+ patches = [
+ # Fix build with SIP 4.19.23+. Can be removed with version 1.5.
+ # https://github.com/orocos/orocos_kinematics_dynamics/pull/270
+ (fetchpatch {
+ url = "https://github.com/orocos/orocos_kinematics_dynamics/commit/d8d087ad0e1c41f3489d1a255ebfa27b5695196b.patch";
+ sha256 = "0qyskqxv4a982kidzzyh34xj2iiw791ipbbl29jg4qb4l21xwqlg";
+ stripLen = 1;
+ })
+ ];
+
sourceRoot = "source/python_orocos_kdl";
nativeBuildInputs = [ cmake ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pykdtree/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pykdtree/default.nix
index f266d17bb460..9f355743ead2 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pykdtree/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pykdtree/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pykdtree";
- version = "1.3.1";
+ version = "1.3.4";
src = fetchPypi {
inherit pname version;
- sha256 = "0d49d3bbfa0366dbe29176754ec86df75114a25525b530dcbbb75d3ac4c263e9";
+ sha256 = "bebe5c608129f2997e88510c00010b9a78581b394924c0e3ecd131d52415165d";
};
buildInputs = [ openmp ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pykka/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pykka/default.nix
index a787b8695275..6f76ca9850fe 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pykka/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pykka/default.nix
@@ -1,14 +1,15 @@
{ stdenv
, buildPythonPackage
-, fetchgit
+, fetchFromGitHub
}:
buildPythonPackage rec {
pname = "pykka";
version = "2.0.1";
- src = fetchgit {
- url = "https://github.com/jodal/pykka.git";
+ src = fetchFromGitHub {
+ owner = "jodal";
+ repo = pname;
rev = "refs/tags/v${version}";
sha256 = "011rvv3vzj9rpwaq6vfpz9hfwm6gx1jmad4iri6z12g8nnlpydhs";
};
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pylatexenc/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pylatexenc/default.nix
index 6b56a42246f1..e53472c6ead3 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pylatexenc/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pylatexenc/default.nix
@@ -6,23 +6,23 @@
buildPythonPackage rec {
pname = "pylatexenc";
- version = "2.7";
+ version = "2.8";
src = fetchFromGitHub {
owner = "phfaist";
repo = "pylatexenc";
rev = "v${version}";
- sha256 = "1hpcwbknfah3mky2m4asw15b9qdvv4k5ni0js764n1jpi83m1zgk";
+ sha256 = "0m9vrbh1gmbgq6dqm7xzklar3accadw0pn896rqsdi5jbgd3w0mh";
};
pythonImportsCheck = [ "pylatexenc" ];
- dontUseSetuptoolsCheck = true;
checkInputs = [ pytestCheckHook ];
meta = with lib; {
description = "Simple LaTeX parser providing latex-to-unicode and unicode-to-latex conversion";
homepage = "https://pylatexenc.readthedocs.io";
downloadPage = "https://www.github.com/phfaist/pylatexenc/releases";
+ changelog = "https://pylatexenc.readthedocs.io/en/latest/changes/";
license = licenses.mit;
maintainers = with maintainers; [ drewrisinger ];
};
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pylibacl/0.5.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pylibacl/0.5.nix
new file mode 100644
index 000000000000..284a795b4c22
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pylibacl/0.5.nix
@@ -0,0 +1,26 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pkgs
+}:
+
+buildPythonPackage rec {
+ pname = "pylibacl";
+ version = "0.5.4";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0drvxb21y7p0aikcv3jx90vdcjk96kibf9x8qgxic2prxxd3f3q6";
+ };
+
+ # ERROR: testExtended (tests.test_acls.AclExtensions)
+ # IOError: [Errno 0] Error
+ doCheck = false;
+
+ buildInputs = with pkgs; [ acl ];
+
+ meta = {
+ description = "A Python extension module for POSIX ACLs, it can be used to query, list, add, and remove ACLs from files and directories under operating systems that support them";
+ license = lib.licenses.lgpl21Plus;
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pylibacl/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pylibacl/default.nix
index 08d598c72db6..6bc0d74b5bae 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pylibacl/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pylibacl/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "pylibacl";
- version = "0.5.4";
+ version = "0.6.0";
src = fetchPypi {
inherit pname version;
- sha256 = "060f375aeff90a16fbc3a827b7e234694ad636485d8ecd6654e01e1fc4ea3b37";
+ sha256 = "88a0a4322e3a62d797d61f96ec7f38d1c471c48a3cc3cedb32ab5c20aa98d9ff";
};
# ERROR: testExtended (tests.test_acls.AclExtensions)
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pymatgen/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pymatgen/default.nix
index 635d951f56eb..6a059eae5bf6 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pymatgen/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pymatgen/default.nix
@@ -1,17 +1,35 @@
-{ stdenv, buildPythonPackage, fetchPypi, glibcLocales, numpy, pydispatcher, sympy, requests, monty, ruamel_yaml, six, scipy, tabulate, enum34, matplotlib, palettable, spglib, pandas, plotly, networkx }:
+{ stdenv, buildPythonPackage, fetchPypi
+, enum34
+, glibcLocales
+, matplotlib
+, monty
+, networkx
+, numpy
+, palettable
+, pandas
+, plotly
+, pydispatcher
+, requests
+, ruamel_yaml
+, scipy
+, six
+, spglib
+, sympy
+, tabulate
+, uncertainties
+}:
buildPythonPackage rec {
pname = "pymatgen";
- version = "2020.8.13";
+ version = "2020.11.11";
src = fetchPypi {
inherit pname version;
- sha256 = "23e5885e15195b37ce4c16ef93f474f741cb98451fa8dd4c319ec121f4887256";
+ sha256 = "2c51c2c8862ea0d59346114f43be9e65ea134ed5b2bbd8dae766c4f6b02f5e3c";
};
nativeBuildInputs = [ glibcLocales ];
-
propagatedBuildInputs = [
enum34
matplotlib
@@ -29,6 +47,7 @@ buildPythonPackage rec {
spglib
sympy
tabulate
+ uncertainties
];
# No tests in pypi tarball.
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pymavlink/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pymavlink/default.nix
index b401f1f90b1a..cf8c95130026 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pymavlink/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pymavlink/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pymavlink";
- version = "2.4.11";
+ version = "2.4.14";
src = fetchPypi {
inherit pname version;
- sha256 = "0b1265b169f809c6ca94911ad2d7649b8e087a7cc573a0a6ea62ade9bea7ca5c";
+ sha256 = "3bc3709c735ebb3f98f19e96c8887868f4671077d4808076cfc5445912633881";
};
propagatedBuildInputs = [ future lxml ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pymc3/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pymc3/default.nix
index bda74c5063a6..dfbfe90d2421 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pymc3/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pymc3/default.nix
@@ -14,6 +14,8 @@
, pytest
, nose
, parameterized
+, fastprogress
+, typing-extensions
}:
buildPythonPackage rec {
@@ -41,6 +43,8 @@ buildPythonPackage rec {
h5py
arviz
packaging
+ fastprogress
+ typing-extensions
];
checkInputs = [
@@ -52,6 +56,7 @@ buildPythonPackage rec {
# The test suite is computationally intensive and test failures are not
# indicative for package usability hence tests are disabled by default.
doCheck = false;
+ pythonImportsCheck = [ "pymc3" ];
# For some reason tests are run as a part of the *install* phase if enabled.
# Theano writes compiled code to ~/.theano hence we set $HOME.
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pymediainfo/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pymediainfo/default.nix
index a0575bbfede7..8438df73c1c4 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pymediainfo/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pymediainfo/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "pymediainfo";
- version = "4.2.1";
+ version = "5.0.3";
src = fetchPypi {
inherit pname version;
- sha256 = "0vg2icmsc44k1ra898rjfp912xijsn96s0zplax6w13lpzb9jb9r";
+ sha256 = "ea61a3b0e0ed6de42ebb2233cf1a9312c57dce95101c025f9f081c10ecec48fb";
};
postPatch = ''
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pymongo/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pymongo/default.nix
index 2838362f1dba..18c697fec445 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pymongo/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pymongo/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pymongo";
- version = "3.11.0";
+ version = "3.11.1";
src = fetchPypi {
inherit pname version;
- sha256 = "076a7f2f7c251635cf6116ac8e45eefac77758ee5a77ab7bd2f63999e957613b";
+ sha256 = "a9c1a2538cd120283e7137ac97ce27ebdfcb675730c5055d6332b0043f4e5a55";
};
# Tests call a running mongodb instance
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pymupdf/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pymupdf/default.nix
index bc2f2c6e95ff..30df7589c9ee 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pymupdf/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pymupdf/default.nix
@@ -1,11 +1,12 @@
{ stdenv, buildPythonPackage, fetchPypi, mupdf, swig }:
buildPythonPackage rec {
- pname = "PyMuPDF";
- version = "1.17.6";
+ pname = "pymupdf";
+ version = "1.18.0";
src = fetchPypi {
- inherit pname version;
- sha256 = "5eef4ff61698016a296932858625a5a0039b923ba692043e2c98ca02966f1da2";
+ pname = "PyMuPDF";
+ inherit version;
+ sha256 = "64ce58f92d9edd2631e447175fa13b4024ac3b6dce6e718e0b003c41de6f7952";
};
patchPhase = ''
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pynacl/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pynacl/default.nix
index 5ce85acc194e..dfce6652d03a 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pynacl/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pynacl/default.nix
@@ -5,7 +5,7 @@
, libsodium
, cffi
, six
-, hypothesis_4
+, hypothesis
}:
buildPythonPackage rec {
@@ -18,7 +18,7 @@ buildPythonPackage rec {
sha256 = "01b56hxrbif3hx8l6rwz5kljrgvlbj7shmmd2rjh0hn7974a5sal";
};
- checkInputs = [ pytest hypothesis_4 ];
+ checkInputs = [ pytest hypothesis ];
buildInputs = [ libsodium ];
propagatedBuildInputs = [ cffi six ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pynest2d/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pynest2d/default.nix
new file mode 100644
index 000000000000..3a7c6b43392b
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pynest2d/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub, python3, cmake
+, pythonOlder, libnest2d, sip, clipper }:
+
+buildPythonPackage rec {
+ version = "4.8.0";
+ pname = "pynest2d";
+ format = "other";
+
+ src = fetchFromGitHub {
+ owner = "Ultimaker";
+ repo = "pynest2d";
+ rev = version;
+ sha256 = "18dn92vgr4gvf9scfh93yg9bwrhdjvq62di08rpi7pqjrrvq2nvp";
+ };
+
+ propagatedBuildInputs = [ libnest2d sip clipper ];
+ nativeBuildInputs = [ cmake ];
+
+ CLIPPER_PATH = "${clipper.out}";
+
+ postPatch = ''
+ sed -i 's#''${Python3_SITEARCH}#${placeholder "out"}/${python3.sitePackages}#' cmake/SIPMacros.cmake
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Python bindings for libnest2d";
+ homepage = "https://github.com/Ultimaker/pynest2d";
+ license = licenses.lgpl3;
+ platforms = platforms.linux;
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pynisher/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pynisher/default.nix
index 27e41f300c72..e2ead68d11b9 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pynisher/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pynisher/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pynisher";
- version = "0.5.0";
+ version = "0.6.3";
src = fetchPypi {
inherit pname version;
- sha256 = "1b1079315ad1009de108c9ad701f6ae5274264e64503fc22c2de366d99953f34";
+ sha256 = "e4e1d9366fc4ca60b4b2354b6d12e65600600a8c7bf4392c84f2f4ff4abc85ff";
};
propagatedBuildInputs = [ psutil docutils ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pynput/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pynput/default.nix
index 2b83f4c1223b..b525f22b2d34 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pynput/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pynput/default.nix
@@ -1,17 +1,20 @@
-{ stdenv, buildPythonPackage, fetchPypi, sphinx, setuptools-lint, xlib }:
+{ stdenv, buildPythonPackage, fetchPypi, sphinx, setuptools-lint, xlib, evdev }:
buildPythonPackage rec {
pname = "pynput";
- version = "1.6.8";
+ version = "1.7.1";
src = fetchPypi {
inherit pname version;
- sha256 = "16h4wn7f54rw30jrya7rmqkx3f51pxn8cplid95v880md8yqdhb8";
+ sha256 = "5a5598bfb14322eff980ac6ca820635fce9028faa4f64a8e1581243aaf6785ee";
};
nativeBuildInputs = [ sphinx ];
- propagatedBuildInputs = [ setuptools-lint xlib ];
+ propagatedBuildInputs = [ setuptools-lint xlib ]
+ ++ stdenv.lib.optionals stdenv.isLinux [
+ evdev
+ ];
doCheck = false;
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyobjc/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyobjc/default.nix
index d66425fa369e..9799cbaf0e8f 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyobjc/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyobjc/default.nix
@@ -2,7 +2,7 @@
buildPythonPackage rec {
pname = "pyobjc";
- version = "6.2.2";
+ version = "7.0";
# Gives "No matching distribution found for
# pyobjc-framework-Collaboration==4.0b1 (from pyobjc==4.0b1)"
@@ -10,13 +10,13 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "d5b87e9fa4cc9b51bf37f9a461887e2d8b9ae7e6bb45675f8edbe35ea6770455";
+ sha256 = "2b6c3e98f1408564ace1df36927154d7827c8e2f382386ab5d2db95c891e35a0";
};
meta = {
description = "A bridge between the Python and Objective-C programming languages";
license = stdenv.lib.licenses.mit;
- maintainers = with stdenv.lib.maintainers; [ sauyon ];
+ maintainers = with stdenv.lib.maintainers; [ ];
homepage = "https://pythonhosted.org/pyobjc/";
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyopencl/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyopencl/default.nix
index e5eddd81d99c..297757687688 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyopencl/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyopencl/default.nix
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "pyopencl";
- version = "2020.2.1";
+ version = "2020.3.1";
checkInputs = [ pytest ];
buildInputs = [ opencl-headers ocl-icd pybind11 ];
@@ -25,7 +25,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "deb6c50f37f8f88960a943b379eca8c0a9a80634cf60e09aee691a7453ae202e";
+ sha256 = "abc689307cf34d3dcc94d43815f64e2265469b50ecce6c903a3180589666fb36";
};
# py.test is not needed during runtime, so remove it from `install_requires`
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyosf/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyosf/default.nix
new file mode 100644
index 000000000000..c25b1b114355
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyosf/default.nix
@@ -0,0 +1,34 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, isPy27
+, pytestrunner
+, requests
+}:
+
+buildPythonPackage rec {
+ pname = "pyosf";
+ version = "1.0.5";
+ disabled = isPy27;
+
+ src = fetchFromGitHub {
+ owner = "psychopy";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1fkpmylpcbqa9ky111mz4qr1n8pik49gs7pblbb5qx6b54fzl5k2";
+ };
+
+ preBuild = "export HOME=$TMP";
+ buildInputs = [ pytestrunner ]; # required via `setup_requires`
+ propagatedBuildInputs = [ requests ];
+
+ doCheck = false; # requires network access
+ pythonImportsCheck = [ "pyosf" ];
+
+ meta = with lib; {
+ homepage = "https://github.com/psychopy/pyosf";
+ description = "Pure Python library for simple sync with Open Science Framework";
+ license = licenses.mit;
+ maintainers = with maintainers; [ bcdarwin ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyosmium/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyosmium/default.nix
index e63fd00bb57f..ffcd3569e0a3 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyosmium/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyosmium/default.nix
@@ -1,16 +1,18 @@
{ lib, buildPythonPackage, fetchFromGitHub, cmake, python
, libosmium, protozero, boost, expat, bzip2, zlib, pybind11
-, nose, shapely, mock, isPy3k }:
+, nose, shapely, pythonOlder, isPyPy }:
buildPythonPackage rec {
pname = "pyosmium";
- version = "2.15.3";
+ version = "3.0.1";
+
+ disabled = pythonOlder "3.4" || isPyPy;
src = fetchFromGitHub {
owner = "osmcode";
repo = pname;
rev = "v${version}";
- sha256 = "1523ym9i4rnwi5kcp7n2lm67kxlhar8xlv91s394ixzwax9bgg7w";
+ sha256 = "06jngbmmmswhyi5q5bjph6gwss28d2azn5414zf0arik5bcvz128";
};
nativeBuildInputs = [ cmake ];
@@ -18,7 +20,7 @@ buildPythonPackage rec {
preBuild = "cd ..";
- checkInputs = [ nose shapely ] ++ lib.optionals (!isPy3k) [ mock ];
+ checkInputs = [ nose shapely ];
checkPhase = "(cd test && ${python.interpreter} run_tests.py)";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyotp/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyotp/default.nix
index 1a3d674779be..7ad07b3a6e8c 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyotp/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyotp/default.nix
@@ -1,14 +1,17 @@
-{ lib, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi, isPy27 }:
buildPythonPackage rec {
pname = "pyotp";
- version = "2.4.0";
+ version = "2.4.1";
+ disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "01eceab573181188fe038d001e42777884a7f5367203080ef5bda0e30fe82d28";
+ sha256 = "038a3f70b34eaad3f72459e8b411662ef8dfcdd95f7d9203fa489e987a75584b";
};
+ pythonImportsCheck = [ "pyotp" ];
+
meta = with lib; {
description = "Python One Time Password Library";
homepage = "https://github.com/pyotp/pyotp";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pypandoc/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pypandoc/default.nix
index b4788999a353..3da9c3ae0a7c 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pypandoc/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pypandoc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub
+{ stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch
, pandoc, haskellPackages, texlive }:
buildPythonPackage rec {
@@ -12,6 +12,14 @@ buildPythonPackage rec {
sha256 = "1lpslfns6zxx7b0xr13bzg921lwrj5am8za0b2dviywk6iiib0ld";
};
+ # https://github.com/bebraw/pypandoc/pull/204
+ patches = [
+ (fetchpatch {
+ url = "https://github.com/sternenseemann/pypandoc/commit/e422e277dd667c77dae11fad931dbb6015e9a784.patch";
+ sha256 = "11l11kh2a4k0h1g4yvijb60076kzxlkrvda3x6dc1s8fz352bpg3";
+ })
+ ];
+
postPatch = ''
# set pandoc path statically
sed -i '/^__pandoc_path = None$/c__pandoc_path = "${pandoc}/bin/pandoc"' pypandoc/__init__.py
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pypass/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pypass/default.nix
new file mode 100644
index 000000000000..2458a29ac31d
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pypass/default.nix
@@ -0,0 +1,84 @@
+{ buildPythonPackage
+, click
+, colorama
+, enum34
+, fetchPypi
+, git
+, gnugrep
+, gnupg
+, nose
+, pbr
+, pexpect
+, pythonAtLeast
+, pythonOlder
+, stdenv
+, substituteAll
+, tree
+, xclip
+}:
+
+# NOTE: pypass can also be used as an application, but probably the most
+# important usecase is as a library. So, let's use buildPythonPackage and
+# support any Python version instead of defining it as an application with
+# buildPythonApplication.
+buildPythonPackage rec {
+ pname = "pypass";
+ version = "0.2.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1nm4mj7pd7gz4ghic6b3wrnd1b59hd1f0axavdabfl79wy511l7r";
+ };
+
+ # Set absolute nix store paths to the executables that pypass uses
+ patches = [
+ (substituteAll {
+ src = ./mark-executables.patch;
+ git_exec = "${git}/bin/git";
+ grep_exec = "${gnugrep}/bin/grep";
+ gpg_exec = "${gnupg}/bin/gpg2";
+ tree_exec = "${tree}/bin/tree";
+ xclip_exec = "${xclip}/bin/xclip";
+ })
+ ];
+
+ # Remove enum34 requirement if Python >= 3.4
+ postPatch = stdenv.lib.optionalString (pythonAtLeast "3.4") ''
+ substituteInPlace requirements.txt --replace "enum34" ""
+ '';
+
+ nativeBuildInputs = [ pbr ];
+
+ propagatedBuildInputs = [
+ click
+ colorama
+ pexpect
+ ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34;
+
+ checkInputs = [ nose ];
+
+ # Configuration so that the tests work
+ preCheck = ''
+ HOME=$TEMP ${git}/bin/git config --global user.email "nix-builder@nixos.org"
+ HOME=$TEMP ${git}/bin/git config --global user.name "Nix Builder"
+ HOME=$TEMP ${git}/bin/git config --global pull.ff only
+ HOME=$TEMP make setup_gpg
+ '';
+
+ # Run tests but exclude the test that uses clipboard as I wasn't able to make
+ # it work - probably the X clipboard just doesn't work in the build
+ # environment..
+ checkPhase = ''
+ runHook preCheck
+ HOME=$TEMP GNUPGHOME=pypass/tests/gnupg nosetests -v --exclude=test_show_clip .
+ runHook postCheck
+ '';
+
+ meta = {
+ description = "Password manager pass in Python";
+ homepage = "https://github.com/aviau/python-pass";
+ license = stdenv.lib.licenses.gpl3Plus;
+ platforms = stdenv.lib.platforms.all;
+ maintainers = with stdenv.lib.maintainers; [ jluttine ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pypass/mark-executables.patch b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pypass/mark-executables.patch
new file mode 100644
index 000000000000..9bde97c5110c
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pypass/mark-executables.patch
@@ -0,0 +1,255 @@
+diff --git a/Makefile b/Makefile
+index 1ef67c8..d49031a 100644
+--- a/Makefile
++++ b/Makefile
+@@ -16,5 +16,5 @@ test: kill build
+ setup_gpg: pypass/tests/gnupg
+ pypass/tests/gnupg: pypass/tests/test_key_sec.asc pypass/tests/test_ownertrust.txt
+ mkdir -m 700 -p pypass/tests/gnupg
+- GNUPGHOME=pypass/tests/gnupg gpg --allow-secret-key-import --import pypass/tests/test_key_sec.asc
+- GNUPGHOME=pypass/tests/gnupg gpg --import-ownertrust pypass/tests/test_ownertrust.txt
++ GNUPGHOME=pypass/tests/gnupg @gpg_exec@ --allow-secret-key-import --import pypass/tests/test_key_sec.asc
++ GNUPGHOME=pypass/tests/gnupg @gpg_exec@ --import-ownertrust pypass/tests/test_ownertrust.txt
+diff --git a/pypass/command.py b/pypass/command.py
+index 4616a5f..a72cf5d 100644
+--- a/pypass/command.py
++++ b/pypass/command.py
+@@ -173,7 +173,7 @@ def show(config, path, clip):
+ if clip:
+ xclip = subprocess.Popen(
+ [
+- 'xclip',
++ '@xclip_exec@',
+ '-selection', 'clipboard'
+ ],
+ stdin=subprocess.PIPE
+@@ -206,7 +206,7 @@ def connect(config, path):
+ def ls(config, subfolder):
+ tree = subprocess.Popen(
+ [
+- 'tree',
++ '@tree_exec@',
+ '-C',
+ '-l',
+ '--noreport',
+@@ -239,7 +239,7 @@ def find(config, search_terms):
+
+ tree = subprocess.Popen(
+ [
+- 'tree',
++ '@tree_exec@',
+ '-C',
+ '-l',
+ '--noreport',
+@@ -273,7 +273,7 @@ def grep(config, search_string):
+ config['password_store'].get_decrypted_password(password)
+
+ grep = subprocess.Popen(
+- ['grep', '-e', search_string],
++ ['@grep_exec@', '-e', search_string],
+ stdout=subprocess.PIPE,
+ stdin=subprocess.PIPE
+ )
+@@ -397,7 +397,7 @@ def git(config, commands):
+ else:
+ subprocess.call(
+ [
+- 'git',
++ '@git_exec@',
+ '--git-dir=%s' % config['password_store'].git_dir,
+ '--work-tree=%s' % config['password_store'].path,
+ ] + command_list,
+diff --git a/pypass/passwordstore.py b/pypass/passwordstore.py
+index 9de0376..8cf20a4 100644
+--- a/pypass/passwordstore.py
++++ b/pypass/passwordstore.py
+@@ -26,18 +26,7 @@ import re
+ from .entry_type import EntryType
+
+ # Find the right gpg binary
+-if subprocess.call(
+- ['which', 'gpg2'],
+- stdout=subprocess.PIPE,
+- stderr=subprocess.PIPE) == 0:
+- GPG_BIN = 'gpg2'
+-elif subprocess.call(
+- ['which', 'gpg'],
+- stdout=subprocess.PIPE,
+- stderr=subprocess.PIPE) == 0:
+- GPG_BIN = 'gpg'
+-else:
+- raise Exception("Could not find GPG")
++GPG_BIN = '@gpg_exec@'
+
+
+ class PasswordStore(object):
+@@ -215,7 +204,7 @@ class PasswordStore(object):
+ # Init git repo
+ subprocess.call(
+ [
+- "git",
++ "@git_exec@",
+ "--git-dir=%s" % git_dir,
+ "--work-tree=%s" % git_work_tree,
+ "init", path
+@@ -226,7 +215,7 @@ class PasswordStore(object):
+ # Add remote repo
+ subprocess.call(
+ [
+- "git",
++ "@git_exec@",
+ "--git-dir=%s" % git_dir,
+ "--work-tree=%s" % git_work_tree,
+ "remote",
+@@ -241,7 +230,7 @@ class PasswordStore(object):
+ # TODO: add parameters for remote and branch ?
+ subprocess.call(
+ [
+- "git",
++ "@git_exec@",
+ "--git-dir=%s" % git_dir,
+ "--work-tree=%s" % git_work_tree,
+ "pull",
+@@ -272,7 +261,7 @@ class PasswordStore(object):
+
+ subprocess.call(
+ [
+- 'git',
++ '@git_exec@',
+ "--git-dir=%s" % self.git_dir,
+ "--work-tree=%s" % self.path,
+ 'init',
+@@ -298,7 +287,7 @@ class PasswordStore(object):
+
+ subprocess.call(
+ [
+- 'git',
++ '@git_exec@',
+ "--git-dir=%s" % self.git_dir,
+ "--work-tree=%s" % self.path,
+ 'config',
+@@ -311,7 +300,7 @@ class PasswordStore(object):
+
+ subprocess.call(
+ [
+- 'git',
++ '@git_exec@',
+ "--git-dir=%s" % self.git_dir,
+ "--work-tree=%s" % self.path,
+ 'config',
+@@ -326,7 +315,7 @@ class PasswordStore(object):
+
+ subprocess.call(
+ [
+- 'git',
++ '@git_exec@',
+ "--git-dir=%s" % self.git_dir,
+ "--work-tree=%s" % self.path,
+ 'add',
+@@ -338,7 +327,7 @@ class PasswordStore(object):
+ if message:
+ subprocess.call(
+ [
+- 'git',
++ '@git_exec@',
+ "--git-dir=%s" % self.git_dir,
+ "--work-tree=%s" % self.path,
+ 'commit',
+@@ -350,7 +339,7 @@ class PasswordStore(object):
+ else:
+ subprocess.call(
+ [
+- 'git',
++ '@git_exec@',
+ "--git-dir=%s" % self.git_dir,
+ "--work-tree=%s" % self.path,
+ 'commit'
+diff --git a/pypass/tests/test_command.py b/pypass/tests/test_command.py
+index 4966b34..960a8ed 100644
+--- a/pypass/tests/test_command.py
++++ b/pypass/tests/test_command.py
+@@ -127,7 +127,7 @@ class TestCommand(unittest.TestCase):
+
+ # Check if the password is in the clipoard
+ xclip = subprocess.Popen(
+- ['xclip', '-o', '-selection', 'clipboard'],
++ ['@xclip_exec@', '-o', '-selection', 'clipboard'],
+ stdout=subprocess.PIPE)
+ xclip.wait()
+ self.assertEqual(xclip.stdout.read().decode('utf8'), 'clipme999')
+@@ -301,7 +301,7 @@ class TestCommand(unittest.TestCase):
+ # git init should set diff.gpg.binary to True
+ diff_gpg_binary = subprocess.Popen(
+ [
+- 'git',
++ '@git_exec@',
+ '--git-dir=%s' % os.path.join(self.dir, '.git'),
+ '--work-tree=%s' % self.dir,
+ 'config',
+@@ -317,7 +317,7 @@ class TestCommand(unittest.TestCase):
+ # git init should set diff.gpg.textconv to 'gpg -d'
+ gpg = subprocess.Popen(
+ [
+- 'git',
++ '@git_exec@',
+ '--git-dir=%s' % os.path.join(self.dir, '.git'),
+ '--work-tree=%s' % self.dir,
+ 'config',
+@@ -337,7 +337,7 @@ class TestCommand(unittest.TestCase):
+
+ subprocess.Popen(
+ [
+- 'git',
++ '@git_exec@',
+ '--git-dir=%s' % origin_git_dir,
+ '--work-tree=%s' % origin_dir,
+ 'init',
+@@ -350,7 +350,7 @@ class TestCommand(unittest.TestCase):
+
+ subprocess.call(
+ [
+- 'git',
++ '@git_exec@',
+ '--git-dir=%s' % origin_git_dir,
+ '--work-tree=%s' % origin_dir,
+ 'add', 'test_git_init_clone.gpg',
+@@ -359,7 +359,7 @@ class TestCommand(unittest.TestCase):
+
+ subprocess.call(
+ [
+- 'git',
++ '@git_exec@',
+ '--git-dir=%s' % origin_git_dir,
+ '--work-tree=%s' % origin_dir,
+ 'commit',
+diff --git a/pypass/tests/test_passwordstore.py b/pypass/tests/test_passwordstore.py
+index 6decc5f..ceb5181 100644
+--- a/pypass/tests/test_passwordstore.py
++++ b/pypass/tests/test_passwordstore.py
+@@ -171,7 +171,7 @@ class TestPasswordStore(unittest.TestCase):
+
+ subprocess.Popen(
+ [
+- 'git',
++ '@git_exec@',
+ '--git-dir=%s' % os.path.join(origin_dir, '.git'),
+ '--work-tree=%s' % origin_dir,
+ 'init',
+@@ -184,7 +184,7 @@ class TestPasswordStore(unittest.TestCase):
+
+ subprocess.Popen(
+ [
+- 'git',
++ '@git_exec@',
+ '--git-dir=%s' % os.path.join(origin_dir, '.git'),
+ '--work-tree=%s' % origin_dir,
+ 'add', 'test_git_init_clone.gpg',
+@@ -193,7 +193,7 @@ class TestPasswordStore(unittest.TestCase):
+
+ subprocess.Popen(
+ [
+- 'git',
++ '@git_exec@',
+ '--git-dir=%s' % os.path.join(origin_dir, '.git'),
+ '--work-tree=%s' % origin_dir,
+ 'commit',
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pypblib/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pypblib/default.nix
new file mode 100644
index 000000000000..4cf8d5fc7b65
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pypblib/default.nix
@@ -0,0 +1,20 @@
+{ lib, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+ pname = "pypblib";
+ version = "0.0.4";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0qlhykm9flj6cv3v0b9q40gy21yz0lnp0wxlxvb3ijkpy45r7pbi";
+ };
+
+ pythonImportsCheck = [ "pypblib" ];
+
+ meta = with lib; {
+ homepage = "https://pypi.org/project/pypblib/";
+ description = "PBLib Python3 Bindings";
+ license = licenses.mit;
+ maintainers = [ maintainers.marius851000 ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyperclip/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyperclip/default.nix
index 2c3b3e56a93f..0df0da0cc5ed 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyperclip/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyperclip/default.nix
@@ -1,12 +1,12 @@
{ lib, buildPythonPackage, fetchPypi }:
buildPythonPackage rec {
- version = "1.8.0";
+ version = "1.8.1";
pname = "pyperclip";
src = fetchPypi {
inherit pname version;
- sha256 = "b75b975160428d84608c26edba2dec146e7799566aea42c1fe1b32e72b6028f2";
+ sha256 = "9abef1e79ce635eb62309ecae02dfb5a3eb952fa7d6dce09c1aef063f81424d3";
};
doCheck = false;
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyphen/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyphen/default.nix
index 7a182b6be4a9..b5018e40d7eb 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyphen/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyphen/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "Pyphen";
- version = "0.9.5";
+ version = "0.10.0";
src = fetchPypi {
inherit pname version;
- sha256 = "3b633a50873156d777e1f1075ba4d8e96a6ad0a3ca42aa3ea9a6259f93f18921";
+ sha256 = "719b21dfb4b04fbc11cc0f6112418535fe35474021120cccfffc43a25fe63128";
};
meta = with stdenv.lib; {
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyppeteer/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyppeteer/default.nix
new file mode 100644
index 000000000000..09d2415f8e0a
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyppeteer/default.nix
@@ -0,0 +1,29 @@
+{ buildPythonPackage, fetchPypi, lib, urllib3, pyee, tqdm, websockets, appdirs }:
+
+buildPythonPackage rec {
+ pname = "pyppeteer";
+ version = "0.2.2";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1s92izan7s3iffc85wpwi1qv9brcq0rlfqyi84wmpmg1dxk64g0m";
+ };
+
+ # tests want to write to /homeless-shelter
+ doCheck = false;
+
+ propagatedBuildInputs = [
+ appdirs
+ websockets
+ tqdm
+ pyee
+ urllib3
+ ];
+
+ meta = {
+ description = "Headless chrome/chromium automation library (unofficial port of puppeteer)";
+ homepage = "https://github.com/pyppeteer/pyppeteer";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ kmein ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyproj/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyproj/default.nix
index b23cb010f017..c000283e6de8 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyproj/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyproj/default.nix
@@ -1,7 +1,7 @@
{ lib, buildPythonPackage, fetchFromGitHub, python, pkgs, pythonOlder, isPy27, substituteAll
, aenum
, cython
-, pytest
+, pytestCheckHook
, mock
, numpy
, shapely
@@ -34,20 +34,23 @@ buildPythonPackage rec {
numpy shapely
] ++ lib.optional (pythonOlder "3.6") aenum;
- checkInputs = [ pytest mock ];
-
- # ignore rounding errors, and impure docgen
- # datadir is ignored because it does the proj look up logic, which isn't relevant
- checkPhase = ''
- pytest . -k 'not alternative_grid_name \
- and not transform_wgs84_to_alaska \
- and not transformer_group__unavailable \
- and not transform_group__missing_best \
- and not datum \
- and not repr' \
- --ignore=test/test_doctest_wrapper.py \
- --ignore=test/test_datadir.py
- '';
+ checkInputs = [ pytestCheckHook mock ];
+
+ # prevent importing local directory
+ preCheck = "cd test";
+ pytestFlagsArray = [
+ "--ignore=test_doctest_wrapper.py"
+ "--ignore=test_datadir.py"
+ ];
+
+ disabledTests = [
+ "alternative_grid_name"
+ "transform_wgs84_to_alaska"
+ "transformer_group__unavailable"
+ "transform_group__missing_best"
+ "datum"
+ "repr"
+ ];
meta = {
description = "Python interface to PROJ.4 library";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyqtgraph/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyqtgraph/default.nix
index d1850c1288d6..80f914294848 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyqtgraph/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyqtgraph/default.nix
@@ -1,10 +1,10 @@
{ stdenv
, buildPythonPackage
, fetchPypi
-, scipy
, numpy
-, pyqt4
, pyopengl
+, pyqt5
+, scipy
}:
buildPythonPackage rec {
@@ -16,13 +16,16 @@ buildPythonPackage rec {
sha256 = "0p5k73wjfh0zzjvby8b5107cx7x0c2rdj66zh1nc8y95i0anf2na";
};
- propagatedBuildInputs = [ scipy numpy pyqt4 pyopengl ];
+ propagatedBuildInputs = [ numpy pyopengl pyqt5 scipy ];
+
+ doCheck = false; # tries to create windows (QApps) on collection, which fails (probably due to no display)
- doCheck = false; # "PyQtGraph requires either PyQt4 or PySide; neither package could be imported."
+ pythonImportsCheck = [ "pyqtgraph" ];
meta = with stdenv.lib; {
description = "Scientific Graphics and GUI Library for Python";
homepage = "http://www.pyqtgraph.org/";
+ changelog = "https://github.com/pyqtgraph/pyqtgraph/blob/master/CHANGELOG";
license = licenses.mit;
platforms = platforms.unix;
maintainers = with maintainers; [ koral ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyramid/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyramid/default.nix
index 3de55f628c44..a7ba7728a355 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyramid/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyramid/default.nix
@@ -18,11 +18,11 @@
buildPythonPackage rec {
pname = "pyramid";
- version = "1.10.4";
+ version = "1.10.5";
src = fetchPypi {
inherit pname version;
- sha256 = "d80ccb8cfa550139b50801591d4ca8a5575334adb493c402fce2312f55d07d66";
+ sha256 = "fe1bd1140e6b79fe07f0053981d49be2dc66656cc8b481dd7ffcaa872fc25467";
};
checkInputs = [ webtest zope_component ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyramid_hawkauth/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyramid_hawkauth/default.nix
index ff966d906c88..fc76d9af68d9 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyramid_hawkauth/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyramid_hawkauth/default.nix
@@ -1,6 +1,6 @@
{ stdenv
, buildPythonPackage
-, fetchgit
+, fetchFromGitHub
, pyramid
, hawkauthlib
, tokenlib
@@ -8,11 +8,12 @@
}:
buildPythonPackage rec {
- pname = "pyramidhawkauth";
+ pname = "pyramid_hawkauth";
version = "0.1.0";
- src = fetchgit {
- url = "https://github.com/mozilla-services/pyramid_hawkauth.git";
+ src = fetchFromGitHub {
+ owner = "mozilla-services";
+ repo = pname;
rev = "refs/tags/v${version}";
sha256 = "038ign7qlavlmvrhb2y8bygbxvy4j7bx2k1zg0i3wblg2ja50w7h";
};
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyro-api/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyro-api/default.nix
new file mode 100644
index 000000000000..aaf4571900b7
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyro-api/default.nix
@@ -0,0 +1,23 @@
+{ buildPythonPackage, fetchPypi, lib }:
+
+buildPythonPackage rec {
+ version = "0.1.2";
+ pname = "pyro-api";
+
+ src = fetchPypi {
+ inherit version pname;
+ sha256 = "a1b900d9580aa1c2fab3b123ab7ff33413744da7c5f440bd4aadc4d40d14d920";
+ };
+
+ pythonImportsCheck = [ "pyroapi" ];
+
+ # tests require pyro-ppl which depends on this package
+ doCheck = false;
+
+ meta = {
+ description = "Generic API for dispatch to Pyro backends.";
+ homepage = "http://pyro.ai";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ georgewhewell ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyro-ppl/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyro-ppl/default.nix
index c3157c3d301c..54c2155a51b5 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyro-ppl/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyro-ppl/default.nix
@@ -1,15 +1,17 @@
{ buildPythonPackage, fetchPypi, lib, pytorch, contextlib2
-, graphviz, networkx, six, opt-einsum, tqdm }:
+, graphviz, networkx, six, opt-einsum, tqdm, pyro-api }:
+
buildPythonPackage rec {
- version = "1.4.0";
+ version = "1.5.1";
pname = "pyro-ppl";
src = fetchPypi {
inherit version pname;
- sha256 = "e863321bee141fb8d20d621aedc5925c472e06c08988447490115f54a31487ad";
+ sha256 = "00mprgf8pf9jq3kanxjldj00cg3nbfkb5yg0mdfbdi0b1rx3vnsa";
};
propagatedBuildInputs = [
+ pyro-api
pytorch
contextlib2
# TODO(tom): graphviz pulls in a lot of dependencies - make
@@ -22,18 +24,19 @@ buildPythonPackage rec {
];
# pyro not shipping tests do simple smoke test instead
- checkPhase = ''
- python -c "import pyro"
- python -c "import pyro.distributions"
- python -c "import pyro.infer"
- python -c "import pyro.optim"
- '';
+ pythonImportsCheck = [
+ "pyro"
+ "pyro.distributions"
+ "pyro.infer"
+ "pyro.optim"
+ ];
+
+ doCheck = false;
meta = {
description = "A Python library for probabilistic modeling and inference";
homepage = "http://pyro.ai";
license = lib.licenses.mit;
- maintainers = with lib.maintainers; [ teh ];
- broken = true;
+ maintainers = with lib.maintainers; [ teh georgewhewell ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyro4/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyro4/default.nix
index 3cf9d3f31437..713b257a195b 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyro4/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyro4/default.nix
@@ -9,7 +9,7 @@
, msgpack
, isPy27
, selectors34
-, pytest
+, pytestCheckHook
}:
buildPythonPackage rec {
@@ -31,16 +31,16 @@ buildPythonPackage rec {
msgpack
];
- checkInputs = [ pytest ];
+ checkInputs = [ pytestCheckHook ];
# add testsupport.py to PATH
+ preCheck = "PYTHONPATH=tests/PyroTests:$PYTHONPATH";
# ignore network related tests, which fail in sandbox
- checkPhase = ''
- PYTHONPATH=tests/PyroTests:$PYTHONPATH
- pytest -k 'not StartNSfunc \
- and not Broadcast \
- and not GetIP' \
- --ignore=tests/PyroTests/test_naming.py
- '';
+ pytestFlagsArray = [ "--ignore=tests/PyroTests/test_naming.py" ];
+ disabledTests = [
+ "StartNSfunc"
+ "Broadcast"
+ "GetIP"
+ ];
meta = with stdenv.lib; {
description = "Distributed object middleware for Python (RPC)";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyrsistent/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyrsistent/default.nix
index edc1bb73f5a9..a343db4f5540 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyrsistent/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyrsistent/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "pyrsistent";
- version = "0.16.0";
+ version = "0.17.3";
src = fetchPypi {
inherit pname version;
- sha256 = "28669905fe725965daa16184933676547c5bb40a5153055a8dee2a4bd7933ad3";
+ sha256 = "2e636185d9eb976a18a8a8e96efce62f2905fea90041958d8cc2a189756ebf3e";
};
propagatedBuildInputs = [ six ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pysam/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pysam/default.nix
index 6c7a44f26490..2f40a2973332 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pysam/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pysam/default.nix
@@ -6,6 +6,7 @@
, curl
, cython
, htslib
+, libdeflate
, lzma
, pytest
, samtools
@@ -27,22 +28,78 @@ buildPythonPackage rec {
};
nativeBuildInputs = [ samtools ];
- buildInputs = [ bzip2 curl cython lzma zlib ];
+ buildInputs = [
+ bzip2
+ curl
+ cython
+ libdeflate
+ lzma
+ zlib
+ ];
+
+ # Use nixpkgs' htslib instead of the bundled one
+ # See https://pysam.readthedocs.io/en/latest/installation.html#external
+ # NOTE that htslib should be version compatible with pysam
+ preBuild = ''
+ export HTSLIB_MODE=shared
+ export HTSLIB_LIBRARY_DIR=${htslib}/lib
+ export HTSLIB_INCLUDE_DIR=${htslib}/include
+ '';
- checkInputs = [ pytest bcftools htslib ];
- checkPhase = "py.test";
+ checkInputs = [
+ pytest
+ bcftools
+ htslib
+ ];
- # tests require samtools<=1.9
- doCheck = false;
- preCheck = ''
+ # See https://github.com/NixOS/nixpkgs/pull/100823 for why we aren't using
+ # disabledTests and pytestFlagsArray through pytestCheckHook
+ checkPhase = ''
+ # Needed to avoid /homeless-shelter error
export HOME=$(mktemp -d)
+
+ # To avoid API incompatibilities, these should ideally show the same version
+ echo "> samtools --version"
+ samtools --version
+ echo "> htsfile --version"
+ htsfile --version
+ echo "> bcftools --version"
+ bcftools --version
+
+ # Create auxiliary test data
make -C tests/pysam_data
make -C tests/cbcf_data
+
+ # Delete pysam folder in current directory to avoid importing it during testing
+ rm -rf pysam
+
+ # Deselect tests that are known to fail due to upstream issues
+ # See https://github.com/pysam-developers/pysam/issues/961
+ py.test \
+ --deselect tests/AlignmentFileHeader_test.py::TestHeaderBAM::test_dictionary_access_works \
+ --deselect tests/AlignmentFileHeader_test.py::TestHeaderBAM::test_header_content_is_as_expected \
+ --deselect tests/AlignmentFileHeader_test.py::TestHeaderCRAM::test_dictionary_access_works \
+ --deselect tests/AlignmentFileHeader_test.py::TestHeaderCRAM::test_header_content_is_as_expected \
+ --deselect tests/AlignmentFile_test.py::TestDeNovoConstruction::testBAMWholeFile \
+ --deselect tests/AlignmentFile_test.py::TestEmptyHeader::testEmptyHeader \
+ --deselect tests/AlignmentFile_test.py::TestHeaderWithProgramOptions::testHeader \
+ --deselect tests/AlignmentFile_test.py::TestIO::testBAM2BAM \
+ --deselect tests/AlignmentFile_test.py::TestIO::testBAM2CRAM \
+ --deselect tests/AlignmentFile_test.py::TestIO::testBAM2SAM \
+ --deselect tests/AlignmentFile_test.py::TestIO::testFetchFromClosedFileObject \
+ --deselect tests/AlignmentFile_test.py::TestIO::testOpenFromFilename \
+ --deselect tests/AlignmentFile_test.py::TestIO::testSAM2BAM \
+ --deselect tests/AlignmentFile_test.py::TestIO::testWriteUncompressedBAMFile \
+ --deselect tests/AlignmentFile_test.py::TestIteratorRowAllBAM::testIterate \
+ --deselect tests/StreamFiledescriptors_test.py::StreamTest::test_text_processing \
+ --deselect tests/compile_test.py::BAMTest::testCount \
+ tests/
'';
pythonImportsCheck = [
"pysam"
"pysam.bcftools"
+ "pysam.libchtslib"
"pysam.libcutils"
"pysam.libcvcf"
];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pysaml2/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pysaml2/default.nix
index 593911c064ec..f30fddc1efd8 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pysaml2/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pysaml2/default.nix
@@ -49,7 +49,8 @@ buildPythonPackage rec {
checkPhase = ''
py.test -k "not test_load_extern_incommon \
and not test_load_remote_encoding \
- and not test_load_external"
+ and not test_load_external \
+ and not test_conf_syslog"
'';
meta = with stdenv.lib; {
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pysbd/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pysbd/default.nix
new file mode 100644
index 000000000000..e1e0578c83b8
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pysbd/default.nix
@@ -0,0 +1,31 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
+, tqdm
+, spacy
+}:
+
+buildPythonPackage rec {
+ pname = "pysbd";
+ version = "0.3.3";
+ disabled = pythonOlder "3.5";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "56ab48a28a8470f0042a4cb7c9da8a6dde8621ecf87a86d75f201cbf1837e77f";
+ };
+
+ checkInputs = [ tqdm spacy ];
+
+ doCheck = false; # requires pyconll and blingfire
+
+ pythonImportsCheck = [ "pysbd" ];
+
+ meta = with lib; {
+ description = "Pysbd (Python Sentence Boundary Disambiguation) is a rule-based sentence boundary detection that works out-of-the-box across many languages";
+ homepage = "https://github.com/nipunsadvilkar/pySBD";
+ license = licenses.mit;
+ maintainers = [ maintainers.mic92 ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyscard/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyscard/default.nix
index d563a62a46b3..9798d94900b0 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyscard/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyscard/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, fetchpatch, buildPythonPackage, swig, pcsclite, PCSC }:
+{ stdenv, fetchPypi, buildPythonPackage, swig, pcsclite, PCSC }:
let
# Package does not support configuring the pcsc library.
@@ -9,12 +9,12 @@ let
in
buildPythonPackage rec {
- version = "1.9.9";
+ version = "2.0.0";
pname = "pyscard";
src = fetchPypi {
inherit pname version;
- sha256 = "082cjkbxadaz2jb4rbhr0mkrirzlqyqhcf3r823qb0q1k50ybgg6";
+ sha256 = "0yap0p8mp6dx58n3nina6ryhc2cysaj75sq98wf3qybf33cxjr5k";
};
postPatch = if withApplePCSC then ''
@@ -30,21 +30,6 @@ buildPythonPackage rec {
NIX_CFLAGS_COMPILE = optionalString (! withApplePCSC)
"-I ${getDev pcsclite}/include/PCSC";
- # The error message differs depending on the macOS host version.
- # Since Nix reports a constant host version, but proxies to the
- # underlying library, it's not possible to determine the correct
- # expected error message. This patch allows both errors to be
- # accepted.
- # See: https://github.com/LudovicRousseau/pyscard/issues/77
- # Building with python from nix on macOS version 10.13 or
- # greater still causes this issue to occur.
- patches = optionals withApplePCSC [
- (fetchpatch {
- url = "https://github.com/LudovicRousseau/pyscard/commit/945e9c4cd4036155691f6ce9706a84283206f2ef.patch";
- sha256 = "19n8w1wzn85zywr6xf04d8nfg7sgzjyvxp1ccp3rgfr4mcc36plc";
- })
- ];
-
propagatedBuildInputs = if withApplePCSC then [ PCSC ] else [ pcsclite ];
nativeBuildInputs = [ swig ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyserial-asyncio/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyserial-asyncio/default.nix
index c299ad8acae5..5e721504eda5 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyserial-asyncio/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyserial-asyncio/default.nix
@@ -3,17 +3,17 @@
buildPythonPackage rec {
pname = "pyserial-asyncio";
- version = "0.4";
+ version = "0.5";
disabled = !isPy3k; # Doesn't support python older than 3.4
- buildInputs = [ pyserial ];
-
src = fetchPypi {
inherit pname version;
- sha256 = "1vlsb0d03krxlj7vpvyhpinnyxyy8s3lk5rs8ba2932dhyl7f1n4";
+ sha256 = "1641e5433a866eeaf6464b3ab88b741e7a89dd8cd0f851b3343b15f425138d33";
};
+ propagatedBuildInputs = [ pyserial ];
+
meta = with stdenv.lib; {
description = "asyncio extension package for pyserial";
homepage = "https://github.com/pyserial/pyserial-asyncio";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyserial/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyserial/default.nix
index 98ffbe5ad9ec..239568f64b76 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyserial/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyserial/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pyserial";
- version="3.4";
+ version="3.5";
src = fetchPypi {
inherit pname version;
- sha256 = "09y68bczw324a4jb9a1cfwrbjhq179vnfkkkrybbksp0vqgl0bbf";
+ sha256 = "1nyd4m4mnrz8scbfqn4zpq8gnbl4x42w5zz62vcgpzqd2waf0xrw";
};
checkPhase = "python -m unittest discover -s test";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyside/apiextractor.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyside/apiextractor.nix
index 452320e1d71c..07ddfb69fa0f 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyside/apiextractor.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyside/apiextractor.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, cmake, libxml2, libxslt, python2, qt4 }:
+{ stdenv, fetchurl, cmake, libxml2, libxslt, python3, qt4 }:
# This derivation does not provide any Python module and should therefore be called via `all-packages.nix`.
let
- pythonEnv = python2.withPackages(ps: with ps; [ sphinx ]);
+ pythonEnv = python3.withPackages(ps: with ps; [ sphinx ]);
in stdenv.mkDerivation {
name = "pyside-apiextractor-0.10.10";
@@ -13,7 +13,14 @@ in stdenv.mkDerivation {
enableParallelBuilding = true;
- buildInputs = [ cmake qt4 pythonEnv libxml2 libxslt ];
+ outputs = [ "out" "dev" ];
+
+ preConfigure = ''
+ cmakeFlagsArray=("-DCMAKE_INSTALL_PREFIX=$dev")
+ '';
+
+ nativeBuildInputs = [ cmake pythonEnv ];
+ buildInputs = [ qt4 libxml2 libxslt ];
meta = {
description = "Eases the development of bindings of Qt-based libraries for high level languages by automating most of the process";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyside/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyside/default.nix
index 8eae5034a4f8..2bbeb7a1233f 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyside/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyside/default.nix
@@ -13,6 +13,12 @@ buildPythonPackage rec {
enableParallelBuilding = true;
+ outputs = [ "out" "dev" ];
+
+ preConfigure = ''
+ cmakeFlagsArray=("-DCMAKE_INSTALL_PREFIX=$dev")
+ '';
+
nativeBuildInputs = [ cmake pysideGeneratorrunner pysideShiboken qt4 ];
buildInputs = [ mesa libGL ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyside/generatorrunner.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyside/generatorrunner.nix
index 7cb132c1ad70..8fc505a89fc4 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyside/generatorrunner.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyside/generatorrunner.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, cmake, pysideApiextractor, python2, qt4 }:
+{ stdenv, fetchurl, cmake, pysideApiextractor, python3, qt4 }:
# This derivation does not provide any Python module and should therefore be called via `all-packages.nix`.
let
- pythonEnv = python2.withPackages(ps: with ps; [ sphinx ]);
+ pythonEnv = python3.withPackages(ps: with ps; [ sphinx ]);
pname = "pyside-generatorrunner";
version = "0.6.16";
in stdenv.mkDerivation {
@@ -15,7 +15,14 @@ in stdenv.mkDerivation {
enableParallelBuilding = true;
- buildInputs = [ cmake pysideApiextractor qt4 pythonEnv ];
+ outputs = [ "out" "dev" ];
+
+ preConfigure = ''
+ cmakeFlagsArray=("-DCMAKE_INSTALL_PREFIX=$dev")
+ '';
+
+ nativeBuildInputs = [ cmake pythonEnv ];
+ buildInputs = [ pysideApiextractor qt4 ];
meta = {
description = "Eases the development of binding generators for C++ and Qt-based libraries by providing a framework to help automating most of the process";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyside/shiboken.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyside/shiboken.nix
index c5561525db50..cf7192f92ffb 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyside/shiboken.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyside/shiboken.nix
@@ -1,24 +1,42 @@
-{ lib, fetchurl, cmake, buildPythonPackage, libxml2, libxslt, pysideApiextractor, pysideGeneratorrunner, python, sphinx, qt4, isPy3k, isPy35, isPy36, isPy37 }:
+{ lib, fetchFromGitHub, buildPythonPackage
+, cmake
+, isPy35
+, isPy36
+, isPy37
+, isPy3k
+, libxml2
+, libxslt
+, pkg-config
+, pysideApiextractor
+, pysideGeneratorrunner
+, python
+, qt4
+, sphinx
+}:
-# This derivation provides a Python module and should therefore be called via `python-packages.nix`.
-# Python 3.5 is not supported: https://github.com/PySide/Shiboken/issues/77
buildPythonPackage rec {
pname = "pyside-shiboken";
version = "1.2.4";
-
format = "other";
+ disabled = !isPy3k;
- src = fetchurl {
- url = "https://github.com/PySide/Shiboken/archive/${version}.tar.gz";
- sha256 = "1536f73a3353296d97a25e24f9554edf3e6a48126886f8d21282c3645ecb96a4";
+ src = fetchFromGitHub {
+ owner = "PySide";
+ repo = "Shiboken";
+ rev = version;
+ sha256 = "0x2lyg52m6a0vn0665pgd1z1qrydglyfxxcggw6xzngpnngb6v5v";
};
-
enableParallelBuilding = true;
- nativeBuildInputs = [ cmake libxml2 libxslt pysideApiextractor pysideGeneratorrunner python sphinx qt4 ];
+ nativeBuildInputs = [ cmake pkg-config pysideApiextractor pysideGeneratorrunner sphinx qt4 ];
+
+ buildInputs = [ python libxml2 libxslt ];
+
+ outputs = [ "out" "dev" ];
preConfigure = ''
+ cmakeFlagsArray=("-DCMAKE_INSTALL_PREFIX=$dev")
echo "preConfigure: Fixing shiboken_generator install target."
substituteInPlace generator/CMakeLists.txt --replace \
\"$\{GENERATORRUNNER_PLUGIN_DIR}\" lib/generatorrunner/
@@ -27,7 +45,11 @@ buildPythonPackage rec {
# gcc6 patch was also sent upstream: https://github.com/pyside/Shiboken/pull/86
patches = [ ./gcc6.patch ] ++ (lib.optional (isPy35 || isPy36 || isPy37) ./shiboken_py35.patch);
- cmakeFlags = lib.optional isPy3k "-DUSE_PYTHON3=TRUE";
+ cmakeFlags = lib.optionals isPy3k [
+ "-DUSE_PYTHON3=TRUE"
+ "-DPYTHON3_INCLUDE_DIR=${lib.getDev python}/include/${python.libPrefix}"
+ "-DPYTHON3_LIBRARY=${lib.getLib python}/lib"
+ ];
meta = {
description = "Plugin (front-end) for pyside-generatorrunner, that generates bindings for C++ libraries using CPython source code";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyside/tools.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyside/tools.nix
index 9698c09f3478..cc52a0502f28 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyside/tools.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyside/tools.nix
@@ -12,6 +12,12 @@ buildPythonPackage rec {
sha256 = "017i2yxgjrisaifxqnl3ym8ijl63l2yl6a3474dsqhlyqz2nx2ll";
};
+ outputs = [ "out" "dev" ];
+
+ preConfigure = ''
+ cmakeFlagsArray=("-DCMAKE_INSTALL_PREFIX=$dev")
+ '';
+
nativeBuildInputs = [ cmake ];
buildInputs = [ qt4 ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyside2/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyside2/default.nix
index ed0ab2d533aa..8133b677db28 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyside2/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyside2/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "pyside2";
- version = "5.15.1";
+ version = "5.15.2";
src = fetchurl {
url = "https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/pyside-setup-opensource-src-${version}.tar.xz";
- sha256 = "1yn3f414ql8rrvwxlfpp2sckpmb89zj5iszgy1690mrjh7cc2xgi";
+ sha256 = "060ljj1nzyp4zfz2vasbv2i7gs5rfkkjwxxbisd0fdw01d5m01mk";
};
patches = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pysmb/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pysmb/default.nix
index ad59da259e5f..8a5c3ae348a3 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pysmb/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pysmb/default.nix
@@ -8,13 +8,13 @@
buildPythonPackage rec {
pname = "pysmb";
- version = "1.2.4";
+ version = "1.2.5";
src = fetchPypi {
inherit pname version;
format = "setuptools";
extension = "zip";
- sha256 = "0937cb44936805d403e8e678d7042feb6d85da950a7019e8ae6842a0720fb00c";
+ sha256 = "7aedd5e003992c6c78b41a0da4bf165359a46ea25ab2a9a1594d13f471ad7287";
};
propagatedBuildInputs = [
@@ -25,6 +25,8 @@ buildPythonPackage rec {
# https://github.com/miketeo/pysmb/blob/master/python3/tests/README_1st.txt
doCheck = false;
+ pythonImportsCheck = [ "nmb" "smb" ];
+
meta = {
description = "Experimental SMB/CIFS library written in Python to support file sharing between Windows and Linux machines";
homepage = "https://miketeo.net/wp/index.php/projects/pysmb";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pysonos/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pysonos/default.nix
index c51849d171c1..4a0fb1413bbe 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pysonos/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pysonos/default.nix
@@ -13,13 +13,13 @@
buildPythonPackage rec {
pname = "pysonos";
- version = "0.0.35";
+ version = "0.0.37";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "3a0f8f6eb6ba0623b93a6995c1978cf72c4eedc5fbedac194e6d89e1b6b985e4";
+ sha256 = "43a046c1c6086500fb0f4be1094ca963f5b0f555a04b692832b2b88ab741824e";
};
propagatedBuildInputs = [ xmltodict requests ifaddr ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyspark/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyspark/default.nix
index d71cf2a0f437..d181d6a29d90 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyspark/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyspark/default.nix
@@ -13,8 +13,7 @@ buildPythonPackage rec {
postPatch = ''
sed -i "s/'pypandoc'//" setup.py
- # Current release works fine with py4j 0.10.8.1
- substituteInPlace setup.py --replace py4j==0.10.7 'py4j>=0.10.7,<0.11'
+ substituteInPlace setup.py --replace py4j==0.10.9 'py4j>=0.10.9,<0.11'
'';
propagatedBuildInputs = [ py4j ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyspread/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyspread/default.nix
index 16f1e2c215e1..2e7f458253ea 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyspread/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyspread/default.nix
@@ -18,11 +18,11 @@
buildPythonPackage rec {
pname = "pyspread";
- version = "1.99.2";
+ version = "1.99.5";
src = fetchPypi {
inherit pname version;
- sha256 = "117268cbeb225e0aca4c59381b7bdf5333bf95ca85c1db410a326a887a74f3da";
+ sha256 = "d396c2f94bf1ef6140877ab19205e6f2375bfe01d1bf50ff33bb63384744dd78";
};
propagatedBuildInputs = [ numpy wxPython matplotlib pycairo python-gnupg xlrd xlwt jedi pyenchant basemap pygtk ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pysqueezebox/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pysqueezebox/default.nix
index 33149e99e92f..11c9d9c40d06 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pysqueezebox/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pysqueezebox/default.nix
@@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "pysqueezebox";
- version = "0.4.0";
+ version = "0.5.5";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "02d73e98314a63a38c314d40942a0b098fb59d2f08ac39b2627cfa73f785cf0d";
+ sha256 = "93e6a3824b560d4ea2b2e5f0a67fdf3b309b6194fbf9927e44fc0d12c7fdc6c0";
};
propagatedBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pystray/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pystray/default.nix
index cd9259e33c2b..6b4bdb59f1ef 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pystray/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pystray/default.nix
@@ -26,6 +26,7 @@ buildPythonPackage rec {
homepage = "https://github.com/moses-palmer/pystray";
description = "This library allows you to create a system tray icon";
license = licenses.lgpl3;
+ platforms = platforms.linux;
maintainers = with maintainers; [ jojosch ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pysvn/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pysvn/default.nix
index d46d3cfc5006..d56c10a9591e 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pysvn/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pysvn/default.nix
@@ -1,43 +1,69 @@
{ stdenv
+, lib
, buildPythonPackage
, fetchurl
-, pkgs
, isPy3k
, python
+, apr
+, aprutil
+, bash
+, e2fsprogs
+, expat
+, gcc
+, glibcLocales
+, neon
+, openssl
+, pycxx
+, subversion
}:
buildPythonPackage rec {
pname = "pysvn";
- version = "1.8.0";
- disabled = isPy3k;
+ version = "1.9.12";
format = "other";
src = fetchurl {
url = "http://pysvn.barrys-emacs.org/source_kits/${pname}-${version}.tar.gz";
- sha256 = "0srjr2qgxfs69p65d9vvdib2lc142x10w8afbbdrqs7dhi46yn9r";
+ sha256 = "sRPa4wNyjDmGdF1gTOgLS0pnrdyZwkkH4/9UCdh/R9Q=";
};
- buildInputs = [ pkgs.subversion pkgs.apr pkgs.aprutil pkgs.expat pkgs.neon pkgs.openssl ]
- ++ (if stdenv.isLinux then [pkgs.e2fsprogs] else []);
+ buildInputs = [ bash subversion apr aprutil expat neon openssl ]
+ ++ lib.optionals stdenv.isLinux [ e2fsprogs ]
+ ++ lib.optionals stdenv.isDarwin [ gcc ];
- # There seems to be no way to pass that path to configure.
- NIX_CFLAGS_COMPILE="-I${pkgs.aprutil.dev}/include/apr-1";
+ postPatch = ''
+ sed -i "117s|append(|insert(0, |" Tests/benchmark_diff.py
+ '';
preConfigure = ''
cd Source
${python.interpreter} setup.py backport
${python.interpreter} setup.py configure \
- --apr-inc-dir=${pkgs.apr.dev}/include \
- --apu-inc-dir=${pkgs.aprutil.dev}/include \
- --apr-lib-dir=${pkgs.apr.out}/lib \
- --svn-lib-dir=${pkgs.subversion.out}/lib \
- --svn-bin-dir=${pkgs.subversion.out}/bin \
- --svn-root-dir=${pkgs.subversion.dev}
- '' + (if !stdenv.isDarwin then "" else ''
+ --apr-inc-dir=${apr.dev}/include \
+ --apu-inc-dir=${aprutil.dev}/include \
+ --pycxx-dir=${pycxx.dev}/include \
+ --svn-inc-dir=${subversion.dev}/include/subversion-1 \
+ --pycxx-src-dir=${pycxx.dev}/src \
+ --apr-lib-dir=${apr.out}/lib \
+ --svn-lib-dir=${subversion.out}/lib \
+ --svn-bin-dir=${subversion.out}/bin
+ '' + (lib.optionalString (stdenv.isDarwin && !isPy3k) ''
sed -i -e 's|libpython2.7.dylib|lib/libpython2.7.dylib|' Makefile
'');
- checkPhase = "make -C ../Tests";
+ checkInputs = [ glibcLocales ];
+ checkPhase = ''
+ runHook preCheck
+
+ # It is not only shebangs, some tests also write scripts dynamically
+ # so it is easier to simply search and replace
+ sed -i "s|/bin/bash|${bash}/bin/bash|" ../Tests/test-*.sh
+ make -C ../Tests
+
+ runHook postCheck
+ '';
+
+ pythonImportCheck = [ "pysvn" ];
installPhase = ''
dest=$(toPythonPath $out)/pysvn
@@ -45,15 +71,14 @@ buildPythonPackage rec {
cp pysvn/__init__.py $dest/
cp pysvn/_pysvn*.so $dest/
mkdir -p $out/share/doc
- mv -v ../Docs $out/share/doc/pysvn-1.7.2
- rm -v $out/share/doc/pysvn-1.7.2/generate_cpp_docs_from_html_docs.py
+ mv -v ../Docs $out/share/doc/pysvn-${version}
+ rm -v $out/share/doc/pysvn-${version}/generate_cpp_docs_from_html_docs.py
'';
meta = with stdenv.lib; {
description = "Python bindings for Subversion";
homepage = "http://pysvn.tigris.org/";
license = licenses.asl20;
- broken = true;
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-black/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-black/default.nix
index e2a469c1ed85..20b2483c9d16 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-black/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-black/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "pytest-black";
- version = "0.3.11";
+ version = "0.3.12";
src = fetchPypi {
inherit pname version;
- sha256 = "1mjxqvzadpyfvypv5isfda9c6lz8xbqci9b4hn58b2lbj3kv0pjr";
+ sha256 = "1d339b004f764d6cd0f06e690f6dd748df3d62e6fe1a692d6a5500ac2c5b75a5";
};
nativeBuildInputs = [ setuptools_scm ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-django/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-django/default.nix
index 9763e074cee9..4b257b0a3d13 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-django/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-django/default.nix
@@ -10,11 +10,11 @@
}:
buildPythonPackage rec {
pname = "pytest-django";
- version = "3.9.0";
+ version = "4.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "664e5f42242e5e182519388f01b9f25d824a9feb7cd17d8f863c8d776f38baf9";
+ sha256 = "26f02c16d36fd4c8672390deebe3413678d89f30720c16efb8b2a6bf63b9041f";
};
nativeBuildInputs = [ pytest setuptools_scm ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-flakes/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-flakes/default.nix
index 39eb56ce76e9..38156cc0ccf5 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-flakes/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-flakes/default.nix
@@ -1,15 +1,19 @@
-{ stdenv, buildPythonPackage, fetchPypi
-, pytestpep8, pytest, pyflakes }:
+{ stdenv, buildPythonPackage, fetchPypi, pythonOlder
+, pytestpep8
+, pytest
+, pyflakes
+}:
buildPythonPackage rec {
# upstream has abandoned project in favor of pytest-flake8
# retaining package to not break other packages
pname = "pytest-flakes";
- version = "4.0.1";
+ version = "4.0.3";
+ disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
- sha256 = "37113ac6c7ea5e0b648abf73937955a45f8b9214fe49413297c2ce6ce1808500";
+ sha256 = "bf070c5485dad82d5b5f5d0eb08d269737e378492d9a68f5223b0a90924c7754";
};
checkInputs = [ pytestpep8 pytest ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-flask/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-flask/default.nix
index 61c9d37267ef..1e6c34aee3c0 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-flask/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-flask/default.nix
@@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "pytest-flask";
- version = "1.0.0";
+ version = "1.1.0";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "4d5678a045c07317618d80223ea124e21e8acc89dae109542dd1fdf6783d96c2";
+ sha256 = "9c136afd6d0fb045b0b8fd2363421b6670bfebd21d9141f79669d9051c9d2d05";
};
doCheck = false;
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-html/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-html/default.nix
index 2c0c23ebdca1..3ad238f553d1 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-html/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-html/default.nix
@@ -3,12 +3,12 @@
buildPythonPackage rec {
pname = "pytest-html";
- version = "2.1.1";
+ version = "3.0.0";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "1iap9rzxx9pkvz6im3px8xj37pb098lvvf9yiqh93qq5w68w6jka";
+ sha256 = "407adfe8c748a6bb7e68a430ebe3766ffe51e43fc5442f78b261229c03078be4";
};
nativeBuildInputs = [ setuptools_scm ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-isort/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-isort/default.nix
index 869466c65001..fb65f8aceadb 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-isort/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-isort/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pytest-isort";
- version = "1.1.0";
+ version = "1.2.0";
src = fetchPypi {
inherit pname version;
- sha256 = "01j0sx8yxd7sbmvwky68mvnwrxxs5bjkvi61043jzff1ga92kg9h";
+ sha256 = "f0fcf9674f3a627b36e07466d335e82b0f7c4f9e0f7ec39f2a1750b0189d5371";
};
propagatedBuildInputs = [ isort ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-metadata/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-metadata/default.nix
index 53ab515e6f06..f2191ab617d2 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-metadata/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-metadata/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "pytest-metadata";
- version = "1.10.0";
+ version = "1.11.0";
src = fetchPypi {
inherit pname version;
- sha256 = "0593jf8l30ayrqr9gkmwfbhz9h8cyqp7mgwp7ah1gjysbajf1rmp";
+ sha256 = "71b506d49d34e539cc3cfdb7ce2c5f072bea5c953320002c95968e0238f8ecf1";
};
nativeBuildInputs = [ setuptools_scm ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-mock/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-mock/default.nix
index c21175bf3381..ad82b389bee8 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-mock/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-mock/default.nix
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "pytest-mock";
- version = "3.2.0";
+ version = "3.3.1";
src = fetchPypi {
inherit pname version;
- sha256 = "7122d55505d5ed5a6f3df940ad174b3f606ecae5e9bc379569cdcbd4cd9d2b83";
+ sha256 = "a4d6d37329e4a893e77d9ffa89e838dd2b45d5dc099984cf03c703ac8411bb82";
};
propagatedBuildInputs = lib.optional (!isPy3k) mock;
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-mpl/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-mpl/default.nix
index a239c1dbe634..d238d7565f20 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-mpl/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-mpl/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "pytest-mpl";
- version = "0.11";
+ version = "0.12";
src = fetchPypi {
inherit pname version;
- sha256 = "26c5a47a8fdbc04652f18b65c587da642c6cc0354680ee44b16c161d9800a2ce";
+ sha256 = "4a223909e5148c99bd18891848c7871457729322c752c9c470bd8dd6bdf9f940";
};
buildInputs = [ pytest ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-mypy/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-mypy/default.nix
index 368d13a91394..2d2a3264e741 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-mypy/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-mypy/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "pytest-mypy";
- version = "0.6.2";
+ version = "0.8.0";
src = fetchPypi {
inherit pname version;
- sha256 = "2560a9b27d59bb17810d12ec3402dfc7c8e100e40539a70d2814bcbb27240f27";
+ sha256 = "63d418a4fea7d598ac40b659723c00804d16a251d90a5cfbca213eeba5aaf01c";
};
nativeBuildInputs = [ setuptools_scm ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-pylint/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-pylint/default.nix
index f7a9a3143065..e35d2ebc73e9 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-pylint/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-pylint/default.nix
@@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "pytest-pylint";
- version = "0.17.0";
+ version = "0.18.0";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "b0c177d63f6e3f5b82fa2720a6570dd2ecff1616c26ed6d02d0cbf75fd98ddf9";
+ sha256 = "790c7a8019fab08e59bd3812db1657a01995a975af8b1c6ce95b9aa39d61da27";
};
nativeBuildInputs = [ pytestrunner ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-quickcheck/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-quickcheck/default.nix
index ec78329ff8d9..8db28159d9dc 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-quickcheck/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-quickcheck/default.nix
@@ -1,11 +1,11 @@
{ stdenv, buildPythonPackage, fetchPypi, pytest, pytest-flakes, pytestpep8, tox }:
buildPythonPackage rec {
pname = "pytest-quickcheck";
- version = "0.8.4";
+ version = "0.8.6";
src = fetchPypi {
inherit pname version;
- sha256 = "e368390c9e3fd48eb3edec0c4eef08d7332f1143ad7b7190d32376b2fd2e62ff";
+ sha256 = "3ef9bde7ba1fe6470c5b61631440186d1254e276c67a527242d91451ab7994e5";
};
buildInputs = [ pytest ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-randomly/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-randomly/default.nix
index c4523ac728c6..be8d675fc1ea 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-randomly/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-randomly/default.nix
@@ -5,13 +5,13 @@
buildPythonPackage rec {
pname = "pytest-randomly";
- version = "3.4.1";
+ version = "3.5.0";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "0s9cx692cdchfrjqx7fgf9wnm3fdac211a4hjq1cx9qqnbpdpl2z";
+ sha256 = "440cec143fd9b0adeb072006c71e0294402a2bc2ccd08079c2341087ba4cf2d1";
};
propagatedBuildInputs = [ numpy factory_boy faker ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-repeat/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-repeat/default.nix
index 768ad5967342..b90e8ebef385 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-repeat/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-repeat/default.nix
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "pytest-repeat";
- version = "0.8.0";
+ version = "0.9.1";
src = fetchPypi {
inherit pname version;
- sha256 = "1nbdmklpi0ra1jnfm032wz96y9nxdlcr4m9sjlnffwm7n4x43g2j";
+ sha256 = "5cd3289745ab3156d43eb9c8e7f7d00a926f3ae5c9cf425bec649b2fe15bad5b";
};
nativeBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-sanic/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-sanic/default.nix
index 147ce6a19597..0044a13d2c9a 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-sanic/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-sanic/default.nix
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "pytest-sanic";
- version = "1.6.1";
+ version = "1.6.2";
src = fetchPypi {
inherit pname version;
- sha256 = "99e02c28cfa18a0a9af0cd151dddf0eca373279b9bac808733746f7ed7030ecc";
+ sha256 = "6428ed8cc2e6cfa05b92689a8589149aacdc1f0640fcf9673211aa733e6a5209";
};
propagatedBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-services/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-services/default.nix
index 93b60ecbe415..761fe1d5d54e 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-services/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-services/default.nix
@@ -5,19 +5,26 @@
, requests
, psutil
, pytest
+, setuptools_scm
, subprocess32
+, toml
, zc_lockfile
}:
buildPythonPackage rec {
pname = "pytest-services";
- version = "2.1.0";
+ version = "2.2.1";
src = fetchPypi {
inherit pname version;
- sha256 = "0037101eaa17e050542808ecb2e799e9b2b148f1867f62b2296329fdd2034cf5";
+ sha256 = "2da740487d08ea63dfdf718f5d4ba11e590c99ddf5481549edebf7a3a42ca536";
};
+ nativeBuildInputs = [
+ setuptools_scm
+ toml
+ ];
+
propagatedBuildInputs = [
requests
psutil
@@ -28,6 +35,8 @@ buildPythonPackage rec {
# no tests in PyPI tarball
doCheck = false;
+ pythonImportsCheck = [ "pytest_services" ];
+
meta = with lib; {
description = "Services plugin for pytest testing framework";
homepage = "https://github.com/pytest-dev/pytest-services";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-testmon/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-testmon/default.nix
index 9d9add167829..b86947f5f758 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-testmon/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-testmon/default.nix
@@ -8,12 +8,12 @@
buildPythonPackage rec {
pname = "pytest-testmon";
- version = "1.0.2";
+ version = "1.0.3";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "fdb016d953036051d1ef0e36569b7168cefa4914014789a65a4ffefc87f85ac5";
+ sha256 = "927a73dd510b90a2e4a48ea4d37e82c4490b56caa745663262024ea0cd278169";
};
propagatedBuildInputs = [ coverage ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-timeout/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-timeout/default.nix
index 30bd93e433dc..6bf3483d40f9 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-timeout/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-timeout/default.nix
@@ -1,34 +1,36 @@
-{ buildPythonPackage
+{ lib
+, buildPythonPackage
, fetchPypi
-, fetchpatch
-, lib
-, pexpect
, pytest
+, pytestCheckHook
+, pexpect
+, pytestcov
}:
buildPythonPackage rec {
pname = "pytest-timeout";
- version = "1.3.3";
+ version = "1.4.2";
src = fetchPypi {
inherit pname version;
- sha256 = "1cczcjhw4xx5sjkhxlhc5c1bkr7x6fcyx12wrnvwfckshdvblc2a";
+ sha256 = "0xnsigs0kmpq1za0d4i522sp3f71x5bgpdh3ski0rs74yqy13cr0";
};
- patches = fetchpatch {
- url = "https://bitbucket.org/pytest-dev/pytest-timeout/commits/36998c891573d8ec1db1acd4f9438cb3cf2aee2e/raw";
- sha256 = "05zc2w7mjgv8rm8i1cbxp7k09vlscmay5iy78jlzgjqkrx3wkf46";
- };
+ propagatedBuildInputs = [ pytest ];
+
+ checkInputs = [ pytestCheckHook pexpect pytestcov ];
- checkInputs = [ pytest pexpect ];
- checkPhase = ''
- # test_suppresses_timeout_when_pdb_is_entered fails under heavy load
- pytest -ra -k 'not test_suppresses_timeout_when_pdb_is_entered'
- '';
+ disabledTests = [
+ "test_suppresses_timeout_when_pdb_is_entered"
+ ];
+ pytestFlagsArray = [
+ "-ra"
+ ];
- meta = with lib;{
+ meta = with lib; {
description = "py.test plugin to abort hanging tests";
- homepage = "https://bitbucket.org/pytest-dev/pytest-timeout/";
+ homepage = "https://github.com/pytest-dev/pytest-timeout/";
+ changelog = "https://github.com/pytest-dev/pytest-timeout/#changelog";
license = licenses.mit;
maintainers = with maintainers; [ makefu costrouc ];
};
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-xdist/1.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-xdist/1.nix
new file mode 100644
index 000000000000..6dc4b666db54
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-xdist/1.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchPypi, buildPythonPackage, execnet, pytest
+, setuptools_scm, pytest-forked, filelock, psutil, six, isPy3k }:
+
+buildPythonPackage rec {
+ pname = "pytest-xdist";
+ version = "1.34.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1vh4ps32lp5ignch5adbl3pgchvigdfmrl6qpmhxih54wa1qw3il";
+ };
+
+ nativeBuildInputs = [ setuptools_scm pytest ];
+ checkInputs = [ pytest filelock ];
+ propagatedBuildInputs = [ execnet pytest-forked psutil six ];
+
+ # Encountered a memory leak
+ # https://github.com/pytest-dev/pytest-xdist/issues/462
+ doCheck = !isPy3k;
+
+ checkPhase = ''
+ # Excluded tests access file system
+ py.test testing -k "not test_distribution_rsyncdirs_example \
+ and not test_rsync_popen_with_path \
+ and not test_popen_rsync_subdir \
+ and not test_init_rsync_roots \
+ and not test_rsyncignore"
+ '';
+
+ meta = with stdenv.lib; {
+ description = "py.test xdist plugin for distributed testing and loop-on-failing modes";
+ homepage = "https://github.com/pytest-dev/pytest-xdist";
+ license = licenses.mit;
+ maintainers = with maintainers; [ dotlambda ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-xdist/2.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-xdist/2.nix
deleted file mode 100644
index cc58c5ab6bde..000000000000
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-xdist/2.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ stdenv, fetchPypi, buildPythonPackage, execnet, pytest_6
-, setuptools_scm, pytest-forked, filelock, psutil, six, isPy3k }:
-
-buildPythonPackage rec {
- pname = "pytest-xdist";
- version = "2.1.0";
- disabled = !isPy3k;
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "0wh6pn66nncfs6ay0n863bgyriwsgppn8flx5l7551j1lbqkinc2";
- };
-
- nativeBuildInputs = [ setuptools_scm pytest_6 ];
- checkInputs = [ pytest_6 filelock ];
- propagatedBuildInputs = [ execnet pytest-forked psutil six ];
-
- # pytest6 doesn't allow for new lines
- # capture_deprecated not compatible with latest pytest6
- checkPhase = ''
- # Excluded tests access file system
- export HOME=$TMPDIR
- pytest -n $NIX_BUILD_CORES \
- -k "not (distribution_rsyncdirs_example or rsync or warning_captured_deprecated_in_pytest_6)"
- '';
-
- meta = with stdenv.lib; {
- description = "py.test xdist plugin for distributed testing and loop-on-failing modes";
- homepage = "https://github.com/pytest-dev/pytest-xdist";
- license = licenses.mit;
- maintainers = with maintainers; [ dotlambda ];
- };
-}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-xdist/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-xdist/default.nix
index 6dc4b666db54..cc58c5ab6bde 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-xdist/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-xdist/default.nix
@@ -1,30 +1,27 @@
-{ stdenv, fetchPypi, buildPythonPackage, execnet, pytest
+{ stdenv, fetchPypi, buildPythonPackage, execnet, pytest_6
, setuptools_scm, pytest-forked, filelock, psutil, six, isPy3k }:
buildPythonPackage rec {
pname = "pytest-xdist";
- version = "1.34.0";
+ version = "2.1.0";
+ disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "1vh4ps32lp5ignch5adbl3pgchvigdfmrl6qpmhxih54wa1qw3il";
+ sha256 = "0wh6pn66nncfs6ay0n863bgyriwsgppn8flx5l7551j1lbqkinc2";
};
- nativeBuildInputs = [ setuptools_scm pytest ];
- checkInputs = [ pytest filelock ];
+ nativeBuildInputs = [ setuptools_scm pytest_6 ];
+ checkInputs = [ pytest_6 filelock ];
propagatedBuildInputs = [ execnet pytest-forked psutil six ];
- # Encountered a memory leak
- # https://github.com/pytest-dev/pytest-xdist/issues/462
- doCheck = !isPy3k;
-
+ # pytest6 doesn't allow for new lines
+ # capture_deprecated not compatible with latest pytest6
checkPhase = ''
# Excluded tests access file system
- py.test testing -k "not test_distribution_rsyncdirs_example \
- and not test_rsync_popen_with_path \
- and not test_popen_rsync_subdir \
- and not test_init_rsync_roots \
- and not test_rsyncignore"
+ export HOME=$TMPDIR
+ pytest -n $NIX_BUILD_CORES \
+ -k "not (distribution_rsyncdirs_example or rsync or warning_captured_deprecated_in_pytest_6)"
'';
meta = with stdenv.lib; {
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-xprocess/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-xprocess/default.nix
index 1dd11133a629..124adb8b2a53 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-xprocess/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest-xprocess/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "pytest-xprocess";
- version = "0.14.0";
+ version = "0.17.0";
src = fetchPypi {
inherit pname version;
- sha256 = "06g1j5079ddl2sd3pxh2jg6g83b2z3l5hzbadiry2xg673dcncmb";
+ sha256 = "2506d637c4f54c65dd195c1d094abdeedacc9bf0689131d847a324ad0fc951c0";
};
nativeBuildInputs = [ setuptools_scm ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest/default.nix
index 29def3082a4f..93282218871a 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytest/default.nix
@@ -21,14 +21,14 @@
}:
buildPythonPackage rec {
- version = "6.1.1";
+ version = "6.1.2";
pname = "pytest";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "8f593023c1a0f916110285b6efd7f99db07d59546e3d8c36fc60e2ab05d3be92";
+ sha256 = "c0a7e94a8cdbc5422a51ccdad8e6f1024795939cc89159a0ae7f0b316ad3823e";
};
checkInputs = [ hypothesis pygments ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-bidi/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-bidi/default.nix
new file mode 100644
index 000000000000..1a4a5d5b77cc
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-bidi/default.nix
@@ -0,0 +1,20 @@
+{ lib, buildPythonPackage, fetchPypi, six }:
+
+buildPythonPackage rec {
+ pname = "python-bidi";
+ version = "0.4.2";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "U0f3HoKz6Zdtxlfwne0r/jm6jWd3yoGlssVsMBIcSW4=";
+ };
+
+ propagatedBuildInputs = [ six ];
+
+ meta = with lib; {
+ homepage = "https://github.com/MeirKriheli/python-bidi";
+ description = "Pure python implementation of the BiDi layout algorithm";
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ freezeboy ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-crontab/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-crontab/default.nix
new file mode 100644
index 000000000000..f5e368de0372
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-crontab/default.nix
@@ -0,0 +1,27 @@
+{ lib, buildPythonPackage, fetchPypi, python-dateutil, pytestCheckHook }:
+
+buildPythonPackage rec {
+ pname = "python-crontab";
+ version = "2.5.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "4bbe7e720753a132ca4ca9d4094915f40e9d9dc8a807a4564007651018ce8c31";
+ };
+
+ checkInputs = [ pytestCheckHook ];
+ disabledTests = [ "test_07_non_posix_shell"];
+
+ propagatedBuildInputs = [ python-dateutil ];
+
+ meta = with lib; {
+ description = "Python API for crontab";
+ longDescription = ''
+ Crontab module for reading and writing crontab files
+ and accessing the system cron automatically and simply using a direct API.
+ '';
+ homepage = "https://pypi.org/project/python-crontab/";
+ license = licenses.lgpl3Plus;
+ maintainers = with maintainers; [ kfollesdal ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-didl-lite/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-didl-lite/default.nix
index e160c1aa623f..edde064a3335 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-didl-lite/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-didl-lite/default.nix
@@ -4,14 +4,14 @@
buildPythonPackage rec {
pname = "python-didl-lite";
- version = "1.2.4";
+ version = "1.2.5";
disabled = pythonOlder "3.5.3";
src = fetchFromGitHub {
owner = "StevenLooman";
repo = pname;
rev = version;
- sha256 = "0jf1d5m4r8qd3pn0hh1xqbkblkx9wzrrcmk7qa7q8lzfysp4z217";
+ sha256 = "0wm831g8k9xahw20y0461cvy6lp45sxppicxah1rg9isdc3vy3nh";
};
propagatedBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-dotenv/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-dotenv/default.nix
index dd9191835a44..e654826e0bc2 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-dotenv/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-dotenv/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "python-dotenv";
- version = "0.14.0";
+ version = "0.15.0";
src = fetchPypi {
inherit pname version;
- sha256 = "0gf3r4xvqk9ai1k3ka8c4dlblqhs7286zbd1b20adn953fdcj44c";
+ sha256 = "587825ed60b1711daea4832cf37524dfd404325b7db5e25ebe88c495c9f807a0";
};
propagatedBuildInputs = [ click ] ++ lib.optionals isPy27 [ typing ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-frontmatter/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-frontmatter/default.nix
new file mode 100644
index 000000000000..8edd87556675
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-frontmatter/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, lib, fetchFromGitHub, python3Packages }:
+
+python3Packages.buildPythonPackage rec {
+ pname = "python-frontmatter";
+ version = "0.5.0";
+
+ src = fetchFromGitHub {
+ owner = "eyeseast";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1iki3rcbg7zs93m3mgqzncybqgdcch25qpwy84iz96qq8pipfs6g";
+ };
+
+ propagatedBuildInputs = with python3Packages; [
+ pyyaml
+ six
+ ];
+
+ checkInputs = with python3Packages; [
+ pytest
+ ];
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/eyeseast/python-frontmatter";
+ description = "Parse and manage posts with YAML (or other) frontmatter";
+ license = licenses.mit;
+ maintainers = with maintainers; [ siraben ];
+ platforms = lib.platforms.unix;
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-hosts/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-hosts/default.nix
index cf1314e0d4c2..e76dbc3e3b24 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-hosts/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-hosts/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "python-hosts";
- version = "1.0.0";
+ version = "1.0.1";
src = fetchPypi {
inherit pname version;
- sha256 = "850998704ba9025ce4c8ffd45dc4fbea2b5e30247bf3b574872ac5df90426b4d";
+ sha256 = "5b9749ce807170fb340d044d3f971e1da4dac0ae6af8ce8db00b6758a920a2bc";
};
# win_inet_pton is required for windows support
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-jose/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-jose/default.nix
index 09a424583110..6b8104516ea9 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-jose/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-jose/default.nix
@@ -6,13 +6,13 @@
buildPythonPackage rec {
pname = "python-jose";
- version = "3.1.0";
+ version = "3.2.0";
src = fetchFromGitHub {
owner = "mpdavis";
repo = "python-jose";
rev = version;
- sha256 = "1gnn0zy03pywj65ammy3sd07knzhjv8n5jhx1ir9bikgra9v0iqh";
+ sha256 = "cSPIZrps0xFd4pPcQ4w/jFWOk2XYgd3mtE/sDzlytvY=";
};
checkInputs = [
@@ -23,6 +23,13 @@ buildPythonPackage rec {
cryptography # optional dependency, but needed in tests
];
+ # relax ecdsa deps
+ patchPhase = ''
+ substituteInPlace setup.py \
+ --replace 'ecdsa<0.15' 'ecdsa' \
+ --replace 'ecdsa <0.15' 'ecdsa'
+ '';
+
disabledTests = [
# https://github.com/mpdavis/python-jose/issues/176
"test_key_too_short"
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-jsonrpc-server/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-jsonrpc-server/default.nix
index 12ad5170a7c5..fa6ba97b406d 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-jsonrpc-server/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-jsonrpc-server/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
};
postPatch = ''
- sed -i 's/version=versioneer.get_version(),/version="${version}",/g' setup.py
+ sed -i "s/version=versioneer.get_version(),/version=\"$version\",/g" setup.py
# https://github.com/palantir/python-jsonrpc-server/issues/36
sed -iEe "s!'ujson.*\$!'ujson',!" setup.py
'';
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-markdown-math/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-markdown-math/default.nix
index ea08d7f902c4..0b6d01746b97 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-markdown-math/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-markdown-math/default.nix
@@ -2,15 +2,17 @@
, buildPythonPackage
, fetchPypi
, markdown
+, isPy27
}:
buildPythonPackage rec {
pname = "python-markdown-math";
- version = "0.7";
+ version = "0.8";
+ disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "17a12175e8b2052a1c3402fca410841c551c678046293b1f7c280ccfe7b302a0";
+ sha256 = "8564212af679fc18d53f38681f16080fcd3d186073f23825c7ce86fadd3e3635";
};
checkInputs = [ markdown ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-miio/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-miio/default.nix
index abce18c8841a..136483761cf8 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-miio/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-miio/default.nix
@@ -4,8 +4,11 @@
, appdirs
, click
, construct
+, croniter
, cryptography
+, importlib-metadata
, pytest
+, pytest-mock
, zeroconf
, attrs
, pytz
@@ -13,17 +16,27 @@
, netifaces
}:
+
buildPythonPackage rec {
pname = "python-miio";
- version = "0.5.3";
+ version = "0.5.4";
src = fetchPypi {
inherit pname version;
- sha256 = "3be5275b569844dfa267c80a1e23dc0957411dd501cae0ed3cccf43467031ceb";
+ sha256 = "5a6fd3bb2cc2f75cdfe5673f36a5a418144d08add6e53b384cb146e99f27bd39";
};
- checkInputs = [ pytest ];
- propagatedBuildInputs = [ appdirs click construct cryptography zeroconf attrs pytz tqdm netifaces ];
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace "zeroconf>=0.25.1,<0.26.0" "zeroconf"
+ substituteInPlace setup.py \
+ --replace "pytz>=2019.3,<2020.0" "pytz"
+ substituteInPlace setup.py \
+ --replace "cryptography>=2.9,<3.0" "cryptography"
+ '';
+
+ checkInputs = [ pytest pytest-mock];
+ propagatedBuildInputs = [ appdirs click construct croniter cryptography importlib-metadata zeroconf attrs pytz tqdm netifaces ];
checkPhase = ''
pytest
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-periphery/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-periphery/default.nix
index 298fbaed0f86..e0461dd1efe6 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-periphery/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-periphery/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "python-periphery";
- version = "2.1.0";
+ version = "2.1.1";
src = fetchPypi {
inherit pname version;
- sha256 = "57baa82e6bc59b67747317d16ad0cf9626826e8d43233af13bce924660500bd6";
+ sha256 = "ed07adc27c8b4df9cd40b2d935f86400a7b495b311df5bfaf9ecaeafc5413fd5";
};
# Some tests require physical probing and additional physical setup
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-prctl/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-prctl/default.nix
index 4da75195025d..2fd88858de75 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-prctl/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-prctl/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "python-prctl";
- version = "1.7";
+ version = "1.8.1";
src = fetchPypi {
inherit pname version;
- sha256 = "1njgixnavmwq45r3gpkhn1y760sax204clagg4gzwvvdc5bdbssp";
+ sha256 = "b4ca9a25a7d4f1ace4fffd1f3a2e64ef5208fe05f929f3edd5e27081ca7e67ce";
};
patches = [ ./skip_bad_tests.patch ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-rapidjson/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-rapidjson/default.nix
index b9e7c136b380..b128e767d872 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-rapidjson/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-rapidjson/default.nix
@@ -8,13 +8,13 @@
}:
buildPythonPackage rec {
- version = "0.9.1";
+ version = "0.9.4";
pname = "python-rapidjson";
disabled = pythonOlder "3.4";
src = fetchPypi {
inherit pname version;
- sha256 = "ad80bd7e4bb15d9705227630037a433e2e2a7982b54b51de2ebabdd1611394a1";
+ sha256 = "d79a412d7df30f01d3cb12e0e8863a48cfecd2fd7612719e16bc76eb1b65b332";
};
LC_ALL="en_US.utf-8";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-redis-lock/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-redis-lock/default.nix
index 2ee21137141a..32189495cdd4 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-redis-lock/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-redis-lock/default.nix
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "python-redis-lock";
- version = "3.6.0";
+ version = "3.7.0";
src = fetchPypi {
inherit pname version;
- sha256 = "6c79b87f2fefcf47bbcebea56056d324e9d7971c9b98123b79590e08cbb0a8f7";
+ sha256 = "4265a476e39d476a8acf5c2766485c44c75f3a1bd6cf73bb195f3079153b8374";
};
checkInputs = [ pytest process-tests pkgs.redis ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-rtmidi/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-rtmidi/default.nix
index c2cced83509e..2b65a658f982 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-rtmidi/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-rtmidi/default.nix
@@ -4,12 +4,12 @@
buildPythonPackage rec {
pname = "python-rtmidi";
- version = "1.4.5";
+ version = "1.4.6";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "3dd1909d0f44f03a4191131f1829cac2ee6a94f5a4be2a9606354748e594e704";
+ sha256 = "1aqhsl9w3h0rwf3mhr8parjbxm2sb6sn5mac6725cvm535pqqyhz";
};
nativeBuildInputs = [ pkg-config ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-sat/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-sat/default.nix
new file mode 100644
index 000000000000..ea3d1bfb444a
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-sat/default.nix
@@ -0,0 +1,24 @@
+{ buildPythonPackage, fetchFromGitHub, lib, six, pypblib, pytestCheckHook }:
+
+buildPythonPackage rec {
+ pname = "python-sat";
+ version = "0.1.6.dev6";
+
+ src = fetchFromGitHub {
+ owner = "pysathq";
+ repo = "pysat";
+ rev = version;
+ sha256 = "1gckxhqkvzyw7pmwg8xzxq146jysqy0s23l5mjc3awm6swdij66y";
+ };
+
+ propagatedBuildInputs = [ six pypblib ];
+
+ checkInputs = [ pytestCheckHook ];
+
+ meta = with lib; {
+ description = "Toolkit to provide interface for various SAT (without optional dependancy py-aiger-cnf)";
+ homepage = "https://github.com/pysathq/pysat";
+ license = licenses.mit;
+ maintainers = [ maintainers.marius851000 ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-socketio/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-socketio/default.nix
index cbddc023a152..cfa260205715 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-socketio/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-socketio/default.nix
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "python-socketio";
- version = "4.6.0";
+ version = "4.6.1";
src = fetchPypi {
inherit pname version;
- sha256 = "358d8fbbc029c4538ea25bcaa283e47f375be0017fcba829de8a3a731c9df25a";
+ sha256 = "cd1f5aa492c1eb2be77838e837a495f117e17f686029ebc03d62c09e33f4fa10";
};
propagatedBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-sql/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-sql/default.nix
index b6a489343721..90dc5835e458 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-sql/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-sql/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "python-sql";
- version = "1.1.0";
+ version = "1.2.1";
src = fetchPypi {
inherit pname version;
- sha256 = "0f0g10y0whvax8yv0rfs7b4yd68lbxbss1za0mvbvr65b8r3pdxz";
+ sha256 = "306999bd311fbf50804d76f346655af0a6ff18881ce46c1329256fee40f492c0";
};
meta = {
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-telegram-bot/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-telegram-bot/default.nix
index 0552b18f8002..f16f581ade3d 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-telegram-bot/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/python-telegram-bot/default.nix
@@ -12,12 +12,12 @@
buildPythonPackage rec {
pname = "python-telegram-bot";
- version = "12.8";
+ version = "13.0";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "1hzdnjxqgqv868agaipga4padq2q5s4hd1yzvh3n48b9ck2qcw9j";
+ sha256 = "ca78a41626d728a8f51affa792270e210fa503ed298d395bed2bd1281842dca3";
};
checkInputs = [ pytest ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/python_fedora/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/python_fedora/default.nix
index 8c9cac757615..2224c94ac6f7 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/python_fedora/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/python_fedora/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "python-fedora";
- version = "1.0.0";
+ version = "1.1.1";
src = fetchPypi {
inherit pname version;
- sha256 = "efb675929ebf588c2deffa2058ff407e65d1889bca1b545a58f525135367c9e4";
+ sha256 = "56b9d841a39b4030e388e90c7b77dacd479f1ce5e2ff9b18c3954d97d5709a19";
};
propagatedBuildInputs = [ kitchen requests bunch paver lockfile
six munch urllib3 beautifulsoup4 openidc-client ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytools/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytools/default.nix
index f8f9ef27ff9c..4add5ac5e857 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytools/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytools/default.nix
@@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "pytools";
- version = "2020.4";
+ version = "2020.4.3";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "37db39ff11a1b5fc8aec875ae4ddb3d6c21aa0e95bddc9c841aa98e1631ae460";
+ sha256 = "21aa1fd942bc3bc54c8ae3b5e60c1f771e6db0817b7402fd802aa5964f20e629";
};
checkInputs = [ pytest ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytorch-metric-learning/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytorch-metric-learning/default.nix
index daf6accb8935..64564a4dca55 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytorch-metric-learning/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytorch-metric-learning/default.nix
@@ -4,6 +4,7 @@
, isPy27
, numpy
, scikitlearn
+, pytestCheckHook
, pytorch
, torchvision
, tqdm
@@ -11,15 +12,15 @@
buildPythonPackage rec {
pname = "pytorch-metric-learning";
- version = "0.9.81";
+ version = "0.9.94";
disabled = isPy27;
src = fetchFromGitHub {
owner = "KevinMusgrave";
repo = pname;
- rev = "cb23328aba64f7f4658374cc2920ef5d56cda5c8"; # no version tag
- sha256 = "0c2dyi4qi7clln43481xq66f6r4fadrz84jphjc5phz97bp33ds8";
+ rev = "v${version}";
+ sha256 = "1i2m651isa6xk3zj8dhzdbmd1bdzl51bh6rxifx6gg22hfa5dj9a";
};
propagatedBuildInputs = [
@@ -30,6 +31,22 @@ buildPythonPackage rec {
tqdm
];
+ preCheck = ''
+ export HOME=$TMP
+ export TEST_DEVICE=cpu
+ export TEST_DTYPES=float32,float64 # half-precision tests fail on CPU
+ '';
+ # package only requires `unittest`, but use `pytest` to exclude tests
+ checkInputs = [ pytestCheckHook ];
+ disabledTests = [
+ # requires FAISS (not in Nixpkgs)
+ "test_accuracy_calculator_and_faiss"
+ # require network access:
+ "test_get_nearest_neighbors"
+ "test_tuplestoweights_sampler"
+ "test_untrained_indexer"
+ ];
+
meta = {
description = "Metric learning library for PyTorch";
homepage = "https://github.com/KevinMusgrave/pytorch-metric-learning";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytorch/bin.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytorch/bin.nix
index b1b662e95b3e..f073c408f709 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytorch/bin.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytorch/bin.nix
@@ -11,17 +11,20 @@
, patchelf
, pyyaml
, requests
+, typing-extensions
}:
let
pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion;
platform = if stdenv.isDarwin then "darwin" else "linux";
- srcs = import ./binary-hashes.nix;
+ srcs = import ./binary-hashes.nix version;
unsupported = throw "Unsupported system";
+ version = "1.7.0";
in buildPythonPackage {
+ inherit version;
+
pname = "pytorch";
# Don't forget to update pytorch to the same version.
- version = "1.6.0";
format = "wheel";
@@ -39,6 +42,17 @@ in buildPythonPackage {
numpy
pyyaml
requests
+ typing-extensions
+ ];
+
+ # PyTorch are broken: the dataclasses wheel is required, but ships with
+ # Python >= 3.7. Our dataclasses derivation is incompatible with >= 3.7.
+ #
+ # https://github.com/pytorch/pytorch/issues/46930
+ #
+ # Should be removed with the next PyTorch version.
+ pipInstallFlags = [
+ "--no-deps"
];
postInstall = ''
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytorch/binary-hashes.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytorch/binary-hashes.nix
index 481dc6825c7d..afdde5057dbd 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytorch/binary-hashes.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytorch/binary-hashes.nix
@@ -1,10 +1,10 @@
-{
+version: {
x86_64-linux-37 = {
- url = "https://download.pytorch.org/whl/cu102/torch-1.6.0-cp37-cp37m-linux_x86_64.whl";
- sha256 = "0xhwv68j8gvahfzcp43bqp2x71iwv6zjhkw2f1hb82xps40mrml7";
+ url = "https://download.pytorch.org/whl/cu102/torch-${version}-cp37-cp37m-linux_x86_64.whl";
+ sha256 = "0cvafwzd44d7i2d0y01lyk75lhxffcf6c94cx0wla0cnhcg9mqlf";
};
x86_64-linux-38 = {
- url = "https://download.pytorch.org/whl/cu102/torch-1.6.0-cp38-cp38-linux_x86_64.whl";
- sha256 = "05m2l04wqzw5xvjam6zwvlmc3979cksl3hrdqc2aikrv4hz8fmsk";
+ url = "https://download.pytorch.org/whl/cu102/torch-${version}-cp38-cp38-linux_x86_64.whl";
+ sha256 = "1vxswkb2gzp87sbb5ycvyvs8aw1szp3v2mwdn4mp47yarlnbx8r6";
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytorch/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytorch/default.nix
index 4635f813c3a6..ff7a0e5107f3 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytorch/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytorch/default.nix
@@ -4,8 +4,18 @@
openMPISupport ? false, openmpi ? null,
buildDocs ? false,
cudaArchList ? null,
- numpy, pyyaml, cffi, click, typing, cmake, hypothesis, numactl, psutil,
- linkFarm, symlinkJoin,
+
+ # Native build inputs
+ cmake, util-linux, linkFarm, symlinkJoin, which,
+
+ # Build inputs
+ numactl,
+
+ # Propagated build inputs
+ dataclasses, numpy, pyyaml, cffi, click, typing-extensions,
+
+ # Unit tests
+ hypothesis, psutil,
# virtual pkg that consistently instantiates blas across nixpkgs
# See https://github.com/NixOS/nixpkgs/pull/83888
@@ -17,7 +27,7 @@
# dependencies for torch.utils.tensorboard
pillow, six, future, tensorflow-tensorboard, protobuf,
- utillinux, which, isPy3k }:
+ isPy3k, pythonOlder }:
assert !openMPISupport || openmpi != null;
@@ -102,7 +112,7 @@ let
in buildPythonPackage rec {
pname = "pytorch";
# Don't forget to update pytorch-bin to the same version.
- version = "1.6.0";
+ version = "1.7.0";
disabled = !isPy3k;
@@ -117,23 +127,10 @@ in buildPythonPackage rec {
repo = "pytorch";
rev = "v${version}";
fetchSubmodules = true;
- sha256 = "14hhjsi6fnpaw9m1a3bhvdinsks6fhss6bbcrfk6jgns64abqdaz";
+ sha256 = "0hb11m5kvs4nsi5bc9ijnv6k07593p9dw40rcn33s9vspinrcjd4";
};
- patches = lib.optionals stdenv.isAarch64 [
- # GNU aarch64 assembler does not support 4s on neon mov:
- # https://github.com/pytorch/pytorch/issues/33124
- #
- # Fix from:
- # https://github.com/pytorch/pytorch/pull/40584
- #
- # This patch can be removed with the next major version (1.7.0).
- (fetchpatch {
- name = "qnnpack-neon-fix.patch";
- url = "https://github.com/pytorch/pytorch/commit/7676682584d0caf9243bce74ea0a88711ec4a807.diff";
- sha256 = "13spncaqlpsp8qk2850yly7xqwmhhfwznhmzkk8jgpslkbx75vgq";
- })
- ] ++ lib.optionals stdenv.isDarwin [
+ patches = lib.optionals stdenv.isDarwin [
# pthreadpool added support for Grand Central Dispatch in April
# 2020. However, this relies on functionality (DISPATCH_APPLY_AUTO)
# that is available starting with macOS 10.13. However, our current
@@ -142,6 +139,13 @@ in buildPythonPackage rec {
./pthreadpool-disable-gcd.diff
];
+ # The dataclasses module is included with Python >= 3.7. This should
+ # be fixed with the next PyTorch release.
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace "'dataclasses'" "'dataclasses; python_version < \"3.7\"'"
+ '';
+
preConfigure = lib.optionalString cudaSupport ''
export TORCH_CUDA_ARCH_LIST="${lib.strings.concatStringsSep ";" final_cudaArchList}"
export CC=${cudatoolkit.cc}/bin/gcc CXX=${cudatoolkit.cc}/bin/g++
@@ -203,7 +207,7 @@ in buildPythonPackage rec {
nativeBuildInputs = [
cmake
- utillinux
+ util-linux
which
ninja
] ++ lib.optionals cudaSupport [ cudatoolkit_joined ];
@@ -217,9 +221,11 @@ in buildPythonPackage rec {
click
numpy
pyyaml
+ typing-extensions
# the following are required for tensorboard support
pillow six future tensorflow-tensorboard protobuf
- ] ++ lib.optionals openMPISupport [ openmpi ];
+ ] ++ lib.optionals openMPISupport [ openmpi ]
+ ++ lib.optionals (pythonOlder "3.7") [ dataclasses ];
checkInputs = [ hypothesis ninja psutil ];
@@ -248,6 +254,15 @@ in buildPythonPackage rec {
cp -r $out/${python.sitePackages}/torch/include $dev/include
cp -r $out/${python.sitePackages}/torch/share $dev/share
+ # Fix up library paths for split outputs
+ substituteInPlace \
+ $dev/share/cmake/Torch/TorchConfig.cmake \
+ --replace \''${TORCH_INSTALL_PREFIX}/lib "$lib/lib"
+
+ substituteInPlace \
+ $dev/share/cmake/Caffe2/Caffe2Targets-release.cmake \
+ --replace \''${_IMPORT_PREFIX}/lib "$lib/lib"
+
mkdir $lib
cp -r $out/${python.sitePackages}/torch/lib $lib/lib
'';
@@ -282,6 +297,6 @@ in buildPythonPackage rec {
homepage = "https://pytorch.org/";
license = lib.licenses.bsd3;
platforms = with lib.platforms; linux ++ lib.optionals (!cudaSupport) darwin;
- maintainers = with lib.maintainers; [ teh thoughtpolice tscholak ]; # tscholak esp. for darwin-related builds
+ maintainers = with lib.maintainers; [ danieldk teh thoughtpolice tscholak ]; # tscholak esp. for darwin-related builds
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytz/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytz/default.nix
index 8680a4f8e1d4..0351840b3e0b 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytz/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pytz/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pytz";
- version = "2020.1";
+ version = "2020.4";
src = fetchPypi {
inherit pname version;
- sha256 = "c35965d010ce31b23eeb663ed3cc8c906275d6be1a34393a1d73a41febf4a048";
+ sha256 = "3e6b7dd2d1e0a59084bcee14a17af60c5c562cdc16d828e8eba2e683d3a7e268";
};
checkPhase = ''
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyusb/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyusb/default.nix
index 624090e98aa0..7e5fc90453ff 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyusb/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyusb/default.nix
@@ -1,14 +1,18 @@
-{ stdenv, fetchPypi, buildPythonPackage, libusb1 }:
+{ stdenv, fetchPypi, buildPythonPackage, libusb1, setuptools_scm }:
buildPythonPackage rec {
pname = "pyusb";
- version = "1.0.2";
+ version = "1.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "0qkk2jn270jwwl1x26hmdhb14m9kkbrzzwzizdjcl1a29b6756sf";
+ sha256 = "d69ed64bff0e2102da11b3f49567256867853b861178689671a163d30865c298";
};
+ nativeBuildInputs = [
+ setuptools_scm
+ ];
+
# Fix the USB backend library lookup
postPatch =
''
@@ -20,6 +24,8 @@ buildPythonPackage rec {
# No tests included
doCheck = false;
+ pythonImportsCheck = [ "usb" ];
+
meta = with stdenv.lib; {
description = "Python USB access module (wraps libusb 1.0)"; # can use other backends
homepage = "https://pyusb.github.io/pyusb/";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyvips/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyvips/default.nix
index 0f5f9a4b43ad..5853538610a1 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyvips/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyvips/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "pyvips";
- version = "2.1.12";
+ version = "2.1.13";
src = fetchPypi {
inherit pname version;
- sha256 = "0pg0dxhxgi2m7bb5bi5wpx9hgnbi8ws1bz6w2dldbhi52pizghl4";
+ sha256 = "4f1f6fa19893048bf6b950eb7eb2d4cdfeb8b940a9defaca5d4f79e5acd5085f";
};
nativeBuildInputs = [ pytestrunner pkgconfig pkg-config ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyvmomi/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyvmomi/default.nix
index 25845c9847a3..8f8ca6f1d7ac 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyvmomi/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyvmomi/default.nix
@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "pyvmomi";
- version = "7.0";
+ version = "7.0.1";
src = fetchFromGitHub {
owner = "vmware";
repo = pname;
rev = "v${version}";
- sha256 = "1qqljrlc9h7kddx3xxc6479gk75fvaxspfikzjn6zj5mznsvfwj5";
+ sha256 = "1i7zni4ygdikc22wfrbnzwqh6qy402s3di6sdlfcvky2y7fzx52x";
};
# requires old version of vcrpy
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pywbem/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pywbem/default.nix
index 345908031ccf..698e4ef94ca3 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pywbem/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pywbem/default.nix
@@ -1,53 +1,44 @@
{ lib, buildPythonPackage, fetchPypi, libxml2
, m2crypto, ply, pyyaml, six, pbr, pythonOlder, isPy37
+, nocasedict, nocaselist, yamlloader, requests-mock
, httpretty, lxml, mock, pytest, requests, decorator, unittest2
+, FormEncode, testfixtures, pytz
}:
buildPythonPackage rec {
pname = "pywbem";
- version = "1.0.2";
-
- # Support added in master https://github.com/pywbem/pywbem/commit/b2f2f1a151a30355bbc6652dca69a7b30bfe941e awaiting release
- disabled = isPy37;
+ version = "1.1.2";
src = fetchPypi {
inherit pname version;
- sha256 = "66d8ec82d30f2b95d8b4bd51659429066c2879d3f46292561f5fdbc7fed10f3d";
+ sha256 = "9GpxbgNsXZJj2M5MvosNnEe+9pY+Qz64RD/7ZIDqmII=";
};
propagatedBuildInputs = [
mock
+ nocasedict
+ nocaselist
pbr
ply
pyyaml
six
+ yamlloader
] ++ lib.optionals (pythonOlder "3.0") [ m2crypto ];
checkInputs = [
decorator
+ FormEncode
httpretty
libxml2
lxml
pytest
+ pytz
requests
+ requests-mock
+ testfixtures
unittest2
];
- postPatch = ''
- # Uses deprecated library yamlordereddictloader
- rm testsuite/test_client.py
-
- # Wants `wbemcli` in PATH
- rm testsuite/test_wbemcli.py
-
- # Disables tests that use testfixtures which is currently broken by nonbuilding zope_component
- rm testsuite/{test_logging,test_recorder,test_wbemconnection_mock}.*
- '';
-
- checkPhase = ''
- pytest testsuite/
- '';
-
meta = with lib; {
description = "Support for the WBEM standard for systems management";
homepage = "https://pywbem.github.io";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyxnat/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyxnat/default.nix
index 2c2557537228..700188f15dd1 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyxnat/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyxnat/default.nix
@@ -9,12 +9,12 @@
buildPythonPackage rec {
pname = "pyxnat";
- version = "1.3";
+ version = "1.4";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "113d13cs5ab7wy4vmyqyh8isjhlgfvan7y2g8n25vcpn3j4j00h0";
+ sha256 = "22524120d744b50d25ef6bfc7052637e4ead9e2afac92563231ec89848f5adf5";
};
propagatedBuildInputs = [ lxml requests ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyzmq/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyzmq/default.nix
index f23d86eb4b73..c80dfe93aee0 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyzmq/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/pyzmq/default.nix
@@ -1,6 +1,6 @@
{ buildPythonPackage
, fetchPypi
-, pytest
+, pytestCheckHook
, tornado
, zeromq
, py
@@ -9,30 +9,37 @@
buildPythonPackage rec {
pname = "pyzmq";
- version = "19.0.2";
+ version = "20.0.0";
src = fetchPypi {
inherit pname version;
- sha256 = "296540a065c8c21b26d63e3cea2d1d57902373b16e4256afe46422691903a438";
+ sha256 = "824ad5888331aadeac772bce27e1c2fbcab82fade92edbd234542c4e12f0dca9";
};
- checkInputs = [ pytest tornado ];
+ checkInputs = [
+ pytestCheckHook
+ tornado
+ ];
buildInputs = [ zeromq ];
propagatedBuildInputs = [ py ];
- # test_socket.py seems to be hanging
- # others fail
- # for test_monitor: https://github.com/zeromq/pyzmq/issues/1272
- checkPhase = ''
- py.test $out/${python.sitePackages}/zmq/ -k "not test_socket \
- and not test_current \
- and not test_instance \
- and not test_callable_check \
- and not test_on_recv_basic \
- and not test_on_recv_wake \
- and not test_monitor \
- and not test_cython"
- '';
+ # failing tests
+ disabledTests = [
+ "test_socket" # hangs
+ "test_current"
+ "test_instance"
+ "test_callable_check"
+ "test_on_recv_basic"
+ "test_on_recv_wake"
+ "test_monitor" # https://github.com/zeromq/pyzmq/issues/1272
+ "test_cython"
+ "test_asyncio" # hangs
+ "test_mockable" # fails
+ ];
+
+ pytestFlagsArray = [
+ "$out/${python.sitePackages}/zmq/tests/" # Folder with tests
+ ];
# Some of the tests use localhost networking.
__darwinAllowLocalNetworking = true;
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/qiskit-aer/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/qiskit-aer/default.nix
index 8e73e942be92..57d89b557111 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/qiskit-aer/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/qiskit-aer/default.nix
@@ -3,34 +3,39 @@
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
+ # C Inputs
+, blas
+, catch2
, cmake
-, cvxpy
, cython
, muparserx
, ninja
, nlohmann_json
+, spdlog
+ # Python Inputs
+, cvxpy
, numpy
-, openblas
, pybind11
, scikit-build
-, spdlog
# Check Inputs
-, qiskit-terra
, pytestCheckHook
-, python
+, ddt
+, fixtures
+, pytest-timeout
+, qiskit-terra
}:
buildPythonPackage rec {
pname = "qiskit-aer";
- version = "0.6.1";
+ version = "0.7.1";
- disabled = pythonOlder "3.5";
+ disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "Qiskit";
repo = "qiskit-aer";
rev = version;
- sha256 = "1fnv11diis0as8zcc57mamz0gbjd6vj7nw3arxzvwa77ja803sr4";
+ sha256 = "07l0wavdknx0y4vy0hwgw24365sg4nb6ygl3lpa098np85qgyn4y";
};
nativeBuildInputs = [
@@ -40,10 +45,11 @@ buildPythonPackage rec {
];
buildInputs = [
- openblas
- spdlog
- nlohmann_json
+ blas
+ catch2
muparserx
+ nlohmann_json
+ spdlog
];
propagatedBuildInputs = [
@@ -60,11 +66,6 @@ buildPythonPackage rec {
dontUseCmakeConfigure = true;
- cmakeFlags = [
- "-DBUILD_TESTS=True"
- "-DAER_THRUST_BACKEND=OMP"
- ];
-
# *** Testing ***
pythonImportsCheck = [
@@ -72,11 +73,22 @@ buildPythonPackage rec {
"qiskit.providers.aer.backends.qasm_simulator"
"qiskit.providers.aer.backends.controller_wrappers" # Checks C++ files built correctly. Only exists if built & moved to output
];
+ # Slow tests
+ disabledTests = [
+ "test_paulis_1_and_2_qubits"
+ "test_3d_oscillator"
+ ];
checkInputs = [
- qiskit-terra
pytestCheckHook
+ ddt
+ fixtures
+ pytest-timeout
+ qiskit-terra
+ ];
+ pytestFlagsArray = [
+ "--timeout=30"
+ "--durations=10"
];
- dontUseSetuptoolsCheck = true; # Otherwise runs tests twice
preCheck = ''
# Tests include a compiled "circuit" which is auto-built in $HOME
@@ -87,9 +99,7 @@ buildPythonPackage rec {
# Add qiskit-aer compiled files to cython include search
pushd $HOME
'';
- postCheck = ''
- popd
- '';
+ postCheck = "popd";
meta = with lib; {
description = "High performance simulators for Qiskit";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/qiskit-aqua/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/qiskit-aqua/default.nix
index c90f9ddf2e2c..11274c525f09 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/qiskit-aqua/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/qiskit-aqua/default.nix
@@ -2,8 +2,6 @@
, pythonOlder
, buildPythonPackage
, fetchFromGitHub
-, fetchpatch
-# , cplex
, cvxpy
, dlx
, docplex
@@ -18,38 +16,38 @@
, quandl
, scikitlearn
, yfinance
+ # Optional inputs
+, withTorch ? false
+, pytorch
+, withPyscf ? false
+, pyscf ? null
+, withScikitQuant ? false
+, scikit-quant ? null
+, withCplex ? false
+, cplex ? null
# Check Inputs
, ddt
, pytestCheckHook
+, pytest-timeout
, qiskit-aer
}:
buildPythonPackage rec {
pname = "qiskit-aqua";
- version = "0.7.5";
+ version = "0.8.1";
- disabled = pythonOlder "3.5";
+ disabled = pythonOlder "3.6";
# Pypi's tarball doesn't contain tests
src = fetchFromGitHub {
owner = "Qiskit";
repo = "qiskit-aqua";
rev = version;
- sha256 = "19sdv7lnc4b1c86rd1dv7pjpi8cmrpzbv7nav0fb899ki8ldqdwq";
+ sha256 = "11qyya3vyq50wpzrzzl8v46yx5p72rhpqhybwn47qgazxgg82r1b";
};
- # TODO: remove in next release
- patches = [
- (fetchpatch {
- name = "qiskit-aqua-fix-test-issue-1214.patch";
- url = "https://github.com/Qiskit/qiskit-aqua/commit/284a4323192ac85787b22cbe5f344996fae16f7d.patch";
- sha256 = "0zl8hqa2fq9ng793x4dhh0ny67nnbjcd8l1cdsaaab4ca1y0xcfr";
- })
- ];
-
# Optional packages: pyscf (see below NOTE) & pytorch. Can install via pip/nix if needed.
propagatedBuildInputs = [
- # cplex
cvxpy
docplex
dlx # Python Dancing Links package
@@ -63,7 +61,10 @@ buildPythonPackage rec {
quandl
scikitlearn
yfinance
- ];
+ ] ++ lib.optionals (withTorch) [ pytorch ]
+ ++ lib.optionals (withPyscf) [ pyscf ]
+ ++ lib.optionals (withScikitQuant) [ scikit-quant ]
+ ++ lib.optionals (withCplex) [ cplex ];
# *** NOTE ***
# We make pyscf optional in this package, due to difficulties packaging it in Nix (test failures, complicated flags, etc).
@@ -97,8 +98,12 @@ buildPythonPackage rec {
postInstall = "rm -rf $out/${python.sitePackages}/docs"; # Remove docs dir b/c it can cause conflicts.
- checkInputs = [ ddt qiskit-aer pytestCheckHook ];
- dontUseSetuptoolsCheck = true;
+ checkInputs = [
+ pytestCheckHook
+ ddt
+ pytest-timeout
+ qiskit-aer
+ ];
pythonImportsCheck = [
"qiskit.aqua"
"qiskit.aqua.algorithms"
@@ -108,10 +113,13 @@ buildPythonPackage rec {
"qiskit.optimization"
];
pytestFlagsArray = [
- # Disabled b/c missing pyscf
+ "--timeout=30"
+ "--durations=10"
+ ] ++ lib.optionals (!withPyscf) [
"--ignore=test/chemistry/test_qeom_ee.py"
"--ignore=test/chemistry/test_qeom_vqe.py"
"--ignore=test/chemistry/test_vqe_uccsd_adapt.py"
+ "--ignore=test/chemistry/test_bopes_sampler.py"
];
disabledTests = [
# Disabled due to missing pyscf
@@ -123,8 +131,10 @@ buildPythonPackage rec {
# Disabling slow tests > 10 seconds
"TestVQE"
+ "TestOOVQE"
"TestVQC"
"TestQSVM"
+ "TestOptimizerAQGD"
"test_graph_partition_vqe"
"TestLookupRotation"
"_vqe"
@@ -151,6 +161,7 @@ buildPythonPackage rec {
"test_confidence_intervals_00001"
"test_eoh"
"test_qasm_5"
+ "test_uccsd_hf"
];
meta = with lib; {
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix
index eaf10fd60829..7374d7ce017d 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix
@@ -9,24 +9,36 @@
, requests_ntlm
, websockets
# Visualization inputs
-, ipykernel
+, withVisualization ? false
+, ipython
, ipyvuetify
, ipywidgets
, matplotlib
-, nbconvert
-, nbformat
, plotly
, pyperclip
, seaborn
# check inputs
, pytestCheckHook
+, nbconvert
+, nbformat
, pproxy
, vcrpy
}:
+let
+ visualizationPackages = [
+ ipython
+ ipyvuetify
+ ipywidgets
+ matplotlib
+ plotly
+ pyperclip
+ seaborn
+ ];
+in
buildPythonPackage rec {
pname = "qiskit-ibmq-provider";
- version = "0.8.0";
+ version = "0.11.1";
disabled = pythonOlder "3.6";
@@ -34,7 +46,7 @@ buildPythonPackage rec {
owner = "Qiskit";
repo = pname;
rev = version;
- sha256 = "0rrpwr4a82j69j5ibl2g0nw8wbpg201cfz6f234k2v6pj500x9nl";
+ sha256 = "0b5mnq8f5844idnsmp84lpkvlpszfwwi998yvggcgaayw1dbk53h";
};
propagatedBuildInputs = [
@@ -44,31 +56,16 @@ buildPythonPackage rec {
requests
requests_ntlm
websockets
- # Visualization/Jupyter inputs
- ipykernel
- ipyvuetify
- ipywidgets
- matplotlib
- nbconvert
- nbformat
- plotly
- pyperclip
- seaborn
- ];
-
- # websockets seems to be pinned b/c in v8+ it drops py3.5 support. Not an issue here (usually py3.7+, and disabled for older py3.6)
- postPatch = ''
- substituteInPlace requirements.txt --replace "websockets>=7,<8" "websockets"
- substituteInPlace setup.py --replace "websockets>=7,<8" "websockets"
- '';
+ ] ++ lib.optionals withVisualization visualizationPackages;
# Most tests require credentials to run on IBMQ
checkInputs = [
pytestCheckHook
+ nbconvert
+ nbformat
pproxy
vcrpy
- ];
- dontUseSetuptoolsCheck = true;
+ ] ++ lib.optionals (!withVisualization) visualizationPackages;
pythonImportsCheck = [ "qiskit.providers.ibmq" ];
# These disabled tests require internet connection, aren't skipped elsewhere
@@ -76,6 +73,10 @@ buildPythonPackage rec {
"test_old_api_url"
"test_non_auth_url"
"test_non_auth_url_with_hub"
+
+ # slow tests
+ "test_websocket_retry_failure"
+ "test_invalid_url"
];
# Skip tests that rely on internet access (mostly to IBM Quantum Experience cloud).
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/qiskit-ignis/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/qiskit-ignis/default.nix
index d40afe43f9e7..b5295dbd0411 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/qiskit-ignis/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/qiskit-ignis/default.nix
@@ -8,6 +8,13 @@
, qiskit-terra
, scikitlearn
, scipy
+ # Optional package inputs
+, withVisualization ? false
+, matplotlib
+, withCvx ? false
+, cvxpy
+, withJit ? false
+, numba
# Check Inputs
, pytestCheckHook
, ddt
@@ -17,7 +24,7 @@
buildPythonPackage rec {
pname = "qiskit-ignis";
- version = "0.4.0";
+ version = "0.5.1";
disabled = pythonOlder "3.6";
@@ -26,16 +33,24 @@ buildPythonPackage rec {
owner = "Qiskit";
repo = "qiskit-ignis";
rev = version;
- sha256 = "07mxhaknkp121xm6mgrpcrbj9qw6j924ra3k0s6vr8qgvfcxvh0y";
+ sha256 = "17kplmi17axcbbgw35dzfr3d5bzfymxfni9sf6v14223c5674p4y";
};
+ # hacky, fix https://github.com/Qiskit/qiskit-ignis/issues/532.
+ # TODO: remove on qiskit-ignis v0.5.1
+ postPatch = ''
+ substituteInPlace qiskit/ignis/mitigation/expval/base_meas_mitigator.py --replace "plt.axes" "'plt.axes'"
+ '';
+
propagatedBuildInputs = [
numpy
qiskit-terra
scikitlearn
scipy
- ];
- postInstall = "rm -rf $out/${python.sitePackages}/docs"; # this dir can create conflicts
+ ] ++ lib.optionals (withCvx) [ cvxpy ]
+ ++ lib.optionals (withVisualization) [ matplotlib ]
+ ++ lib.optionals (withJit) [ numba ];
+ postInstall = "rm -rf $out/${python.sitePackages}/docs"; # this dir can create conflicts
# Tests
pythonImportsCheck = [ "qiskit.ignis" ];
@@ -49,7 +64,7 @@ buildPythonPackage rec {
];
disabledTests = [
"test_tensored_meas_cal_on_circuit" # Flaky test, occasionally returns result outside bounds
- "test_qv_fitter" # execution hangs, ran for several minutes
+ "test_qv_fitter" # execution hangs, ran for several minutes
];
meta = with lib; {
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/qiskit-terra/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/qiskit-terra/default.nix
index aad0370c3d7c..89d39b718cdf 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/qiskit-terra/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/qiskit-terra/default.nix
@@ -16,7 +16,8 @@
, retworkx
, scipy
, sympy
- # Python visualization requirements, semi-optional
+, withVisualization ? false
+ # Python visualization requirements, optional
, ipywidgets
, matplotlib
, pillow
@@ -24,6 +25,12 @@
, pygments
, pylatexenc
, seaborn
+ # Crosstalk-adaptive layout pass
+, withCrosstalkPass ? false
+, z3
+ # Classical function -> Quantum Circuit compiler
+, withClassicalFunctionCompiler ? false
+, tweedledum ? null
# test requirements
, ddt
, hypothesis
@@ -33,17 +40,31 @@
, python
}:
+let
+ visualizationPackages = [
+ ipywidgets
+ matplotlib
+ pillow
+ pydot
+ pygments
+ pylatexenc
+ seaborn
+ ];
+ crosstalkPackages = [ z3 ];
+ classicalCompilerPackages = [ tweedledum ];
+in
+
buildPythonPackage rec {
pname = "qiskit-terra";
- version = "0.15.1";
+ version = "0.16.1";
- disabled = pythonOlder "3.5";
+ disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "Qiskit";
repo = pname;
rev = version;
- sha256 = "1p7y36gj3675dmp05nwi0m9nc7h0bwyimir3ncf9wbkx3crrh99c";
+ sha256 = "0007glsbrvq9swamvz8r76z9nzh46b388y0ds1dypczxpwlp9xcq";
};
nativeBuildInputs = [ cython ];
@@ -53,7 +74,6 @@ buildPythonPackage rec {
fastjsonschema
jsonschema
numpy
- matplotlib
networkx
ply
psutil
@@ -62,26 +82,18 @@ buildPythonPackage rec {
retworkx
scipy
sympy
- # Optional/visualization inputs
- ipywidgets
- matplotlib
- pillow
- pydot
- pygments
- pylatexenc
- seaborn
- ];
-
+ ] ++ lib.optionals withVisualization visualizationPackages
+ ++ lib.optionals withCrosstalkPass crosstalkPackages
+ ++ lib.optionals withClassicalFunctionCompiler classicalCompilerPackages;
# *** Tests ***
checkInputs = [
+ pytestCheckHook
ddt
hypothesis
nbformat
nbconvert
- pytestCheckHook
- ];
- dontUseSetuptoolsCheck = true; # can't find setup.py, so fails. tested by pytest
+ ] ++ lib.optionals (!withVisualization) visualizationPackages;
pythonImportsCheck = [
"qiskit"
@@ -90,6 +102,34 @@ buildPythonPackage rec {
pytestFlagsArray = [
"--ignore=test/randomized/test_transpiler_equivalence.py" # collection requires qiskit-aer, which would cause circular dependency
+ ] ++ lib.optionals (!withClassicalFunctionCompiler ) [
+ "--ignore=test/python/classical_function_compiler/"
+ ];
+ disabledTests = [
+ # Flaky tests
+ "test_cx_equivalence"
+ "test_pulse_limits"
+ ]
+ # Disabling slow tests for build constraints
+ ++ [
+ "test_all_examples"
+ "test_controlled_random_unitary"
+ "test_controlled_standard_gates_1"
+ "test_jupyter_jobs_pbars"
+ "test_lookahead_swap_higher_depth_width_is_better"
+ "test_move_measurements"
+ "test_job_monitor"
+ "test_wait_for_final_state"
+ "test_multi_controlled_y_rotation_matrix_basic_mode"
+ "test_two_qubit_weyl_decomposition_abc"
+ "test_isometry"
+ "test_parallel"
+ "test_random_state"
+ "test_random_clifford_valid"
+ "test_to_matrix"
+ "test_block_collection_reduces_1q_gate"
+ "test_multi_controlled_rotation_gate_matrices"
+ "test_block_collection_runs_for_non_cx_bases"
];
# Moves tests to $PACKAGEDIR/test. They can't be run from /build because of finding
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/qiskit/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/qiskit/default.nix
index 46fcf4985974..7c79d517ce5d 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/qiskit/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/qiskit/default.nix
@@ -15,15 +15,15 @@
buildPythonPackage rec {
pname = "qiskit";
# NOTE: This version denotes a specific set of subpackages. See https://qiskit.org/documentation/release_notes.html#version-history
- version = "0.20.0";
+ version = "0.23.1";
- disabled = pythonOlder "3.5";
+ disabled = pythonOlder "3.6";
src = fetchFromGitHub {
- owner = "Qiskit";
+ owner = "qiskit";
repo = "qiskit";
rev = version;
- sha256 = "1r23pjnql49gczf4k4m6ir5rr95gqdxjrks60p8a93d243mxx3c9";
+ sha256 = "0x4cqx1wqqj7h5g3vdag694qjzsmvhpw25yrlcs70mh5ywdp28x1";
};
propagatedBuildInputs = [
@@ -35,7 +35,6 @@ buildPythonPackage rec {
];
checkInputs = [ pytestCheckHook ];
- dontUseSetuptoolsCheck = true;
pythonImportsCheck = [
"qiskit"
@@ -43,6 +42,7 @@ buildPythonPackage rec {
"qiskit.circuit"
"qiskit.ignis"
"qiskit.providers.aer"
+ "qiskit.providers.ibmq"
];
meta = with lib; {
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/qtconsole/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/qtconsole/default.nix
index 4d1123aaa78a..f29d33d25ae3 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/qtconsole/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/qtconsole/default.nix
@@ -15,11 +15,11 @@
buildPythonPackage rec {
pname = "qtconsole";
- version = "4.7.7";
+ version = "5.0.1";
src = fetchPypi {
inherit pname version;
- sha256 = "f236ead8711dba0702507dd8fad473c7216a86eefa6098eff8ec4b54f57d7804";
+ sha256 = "4d7dd4eae8a90d0b2b19b31794b30f137238463998989734a3acb8a53b506bab";
};
checkInputs = [ nose ] ++ lib.optionals isPy27 [mock];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/r2pipe/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/r2pipe/default.nix
index 998fa9296982..341d3f9660c5 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/r2pipe/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/r2pipe/default.nix
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "r2pipe";
- version = "1.4.2";
+ version = "1.5.3";
postPatch = let
r2lib = "${lib.getOutput "lib" radare2}/lib";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "4020754e3263ef28d3e74288537847bd8ae5fc1ddd74f34fb262ef1282c4d23c";
+ sha256 = "8f3708195c8a6e91c5753940fd348cd821df1389d23b889b01b3e88acf407485";
};
# Tiny sanity check to make sure r2pipe finds radare2 (since r2pipe doesn't
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/re-assert/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/re-assert/default.nix
new file mode 100644
index 000000000000..9cf32d79802e
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/re-assert/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, regex
+}:
+
+buildPythonPackage rec {
+ pname = "re_assert";
+ version = "1.1.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "5172dfbd2047a15dff2347735dea7e495479cc7e58841199a4a4973256b20464";
+ };
+
+ # No tests in archive
+ doCheck = false;
+
+ propagatedBuildInputs = [
+ regex
+ ];
+
+ meta = {
+ description = "Show where your regex match assertion failed";
+ license = lib.licenses.mit;
+ homepage = "https://github.com/asottile/re-assert";
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/readme_renderer/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/readme_renderer/default.nix
index 9ffb986b9f5a..57a84e69d205 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/readme_renderer/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/readme_renderer/default.nix
@@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "readme_renderer";
- version = "26.0";
+ version = "28.0";
src = fetchPypi {
inherit pname version;
- sha256 = "cbe9db71defedd2428a1589cdc545f9bd98e59297449f69d721ef8f1cfced68d";
+ sha256 = "6b7e5aa59210a40de72eb79931491eaf46fefca2952b9181268bd7c7c65c260a";
};
checkInputs = [ pytest mock ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/redbaron/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/redbaron/default.nix
new file mode 100644
index 000000000000..841d6a31fb2c
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/redbaron/default.nix
@@ -0,0 +1,27 @@
+{ lib, fetchPypi, buildPythonPackage, baron, pytestCheckHook }:
+
+buildPythonPackage rec {
+ pname = "redbaron";
+ version = "0.9.2";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0bqkq0wn20cc3qrcd1ifq74p4m570j345bkq4axl08kbr8whfba7";
+ };
+
+ propagatedBuildInputs = [ baron ];
+
+ preCheck = ''
+ rm -rf tests/__pycache__
+ rm tests/test_bounding_box.py
+ ''; #error about fixtures
+
+ checkInputs = [ pytestCheckHook ];
+
+ meta = with lib; {
+ homepage = "https://github.com/gristlabs/asttokens";
+ description = "Abstraction on top of baron, a FST for python to make writing refactoring code a realistic task";
+ license = licenses.lgpl3Plus;
+ maintainers = with maintainers; [ marius851000 ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/reedsolo/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/reedsolo/default.nix
new file mode 100644
index 000000000000..2a22907ebe6c
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/reedsolo/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub, cython, nose }:
+
+buildPythonPackage rec {
+ pname = "reedsolo";
+ version = "1.5.4";
+
+ # Pypi does not have the tests
+ src = fetchFromGitHub {
+ owner = "tomerfiliba";
+ repo = "reedsolomon";
+ # https://github.com/tomerfiliba/reedsolomon/issues/28
+ rev = "73926cdf81b39009bd6e46c8d49f3bbc0eaad4e4";
+ sha256 = "03wrr0c32dsl7h9k794b8fwnyzklvmxgriy49mjvvd3val829cc1";
+ };
+
+ nativeBuildInputs = [ cython ];
+
+ checkInputs = [ nose ];
+ checkPhase = "nosetests";
+
+ meta = with stdenv.lib; {
+ description = "Pure-python universal errors-and-erasures Reed-Solomon Codec";
+ homepage = "https://github.com/tomerfiliba/reedsolomon";
+ license = licenses.publicDomain;
+ maintainers = with maintainers; [ yorickvp ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/regex/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/regex/default.nix
index 19cb7bd232bf..e4d6baeb425b 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/regex/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/regex/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "regex";
- version = "2020.7.14";
+ version = "2020.11.13";
src = fetchPypi {
inherit pname version;
- sha256 = "3a3af27a8d23143c49a3420efe5b3f8cf1a48c6fc8bc6856b03f638abc1833bb";
+ sha256 = "83d6b356e116ca119db8e7c6fc2983289d87b27b3fac238cfe5dca529d884562";
};
postCheck = ''
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/reportlab/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/reportlab/default.nix
index cbd3f54c547b..3a668077a383 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/reportlab/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/reportlab/default.nix
@@ -11,11 +11,11 @@ let
ft = freetype.overrideAttrs (oldArgs: { dontDisableStatic = true; });
in buildPythonPackage rec {
pname = "reportlab";
- version = "3.5.48";
+ version = "3.5.55";
src = fetchPypi {
inherit pname version;
- sha256 = "0bfe3fe6e1bd1d922f83683eae2ba1d2d29de94e25fb115eacca9530b4b02f76";
+ sha256 = "4f307accda32c9f17015ed77c7424f904514e349dff063f78d2462d715963e53";
};
checkInputs = [ glibcLocales ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/requests-aws4auth/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/requests-aws4auth/default.nix
index f954a340b7fa..a2e92283dc72 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/requests-aws4auth/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/requests-aws4auth/default.nix
@@ -2,20 +2,24 @@
with lib;
buildPythonPackage rec {
pname = "requests-aws4auth";
- version = "1.0";
+ version = "1.0.1";
src = fetchPypi {
inherit pname version;
- sha256 = "2950f6ff686b5a452a269076d990e4821d959b61cfac319c3d3c6daaa5db55ce";
+ sha256 = "9a4a5f4a61c49f098f5f669410308ac5b0ea2682fd511ee3a4f9ff73b5bb275a";
};
propagatedBuildInputs = [ requests ];
+ # pypi package no longer contains tests
+ doCheck = false;
checkPhase = ''
cd requests_aws4auth
${python.interpreter} test/requests_aws4auth_test.py
'';
+ pythonImportsCheck = [ "requests_aws4auth" ];
+
meta = {
description = "Amazon Web Services version 4 authentication for the Python Requests library.";
homepage = "https://github.com/sam-washington/requests-aws4auth";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/requests-unixsocket/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/requests-unixsocket/default.nix
index a244b9ba30c4..5229dd96b75a 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/requests-unixsocket/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/requests-unixsocket/default.nix
@@ -16,6 +16,7 @@ buildPythonPackage rec {
checkInputs = [ pytest pytestpep8 waitress ];
checkPhase = ''
+ rm pytest.ini
py.test
'';
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/requests/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/requests/default.nix
index 9ed590ba19ba..47431274b2c6 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/requests/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/requests/default.nix
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "requests";
- version = "2.24.0";
+ version = "2.25.0";
src = fetchPypi {
inherit pname version;
- sha256 = "b3559a131db72c33ee969480840fff4bb6dd111de7dd27c8ee1f820f4f00231b";
+ sha256 = "1y6mb8c0ipd64d5axq2p368yxndp3f966hmabjka2q2a5y9hn6kz";
};
nativeBuildInputs = [ pytest ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/responses/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/responses/default.nix
index 78daa0e24f31..624094e581e9 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/responses/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/responses/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "responses";
- version = "0.10.16";
+ version = "0.12.1";
src = fetchPypi {
inherit pname version;
- sha256 = "fa125311607ab3e57d8fcc4da20587f041b4485bdfb06dd6bdf19d8b66f870c1";
+ sha256 = "2e5764325c6b624e42b428688f2111fea166af46623cb0127c05f6afb14d3457";
};
propagatedBuildInputs = [ cookies mock requests six ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/restrictedpython/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/restrictedpython/default.nix
index 09b713dc87cb..d7005e154504 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/restrictedpython/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/restrictedpython/default.nix
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "RestrictedPython";
- version = "5.0";
+ version = "5.1";
src = fetchPypi {
inherit pname version;
- sha256 = "1g0sffn6ifkl1w8gq15rpaqm8c7l68bsnm77wcd3flyzzydmd050";
+ sha256 = "9ae16e500782b41bd1abefd8554ccb26330817bba9ce090d385aa226f1ca83e8";
};
#propagatedBuildInputs = [ xmltodict requests ifaddr ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/restructuredtext_lint/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/restructuredtext_lint/default.nix
index 17bf5fbf2974..01c7a5e78c62 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/restructuredtext_lint/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/restructuredtext_lint/default.nix
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "restructuredtext_lint";
- version = "1.3.1";
+ version = "1.3.2";
src = fetchPypi {
inherit pname version;
- sha256 = "470e53b64817211a42805c3a104d2216f6f5834b22fe7adb637d1de4d6501fb8";
+ sha256 = "d3b10a1fe2ecac537e51ae6d151b223b78de9fafdd50e5eb6b08c243df173c80";
};
checkInputs = [ nose testtools ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/retworkx/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/retworkx/default.nix
index 49e4b1c2fc34..02a3ef64c573 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/retworkx/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/retworkx/default.nix
@@ -1,7 +1,6 @@
{ lib
, rustPlatform
, python
-, fetchpatch
, fetchFromGitHub
, pipInstallHook
, maturin
@@ -13,35 +12,30 @@
rustPlatform.buildRustPackage rec {
pname = "retworkx";
- version = "0.4.0";
+ version = "0.6.0";
src = fetchFromGitHub {
owner = "Qiskit";
repo = "retworkx";
rev = version;
- sha256 = "1xqp6d39apkjvd0ad9vw81cp2iqzhpagfa4p171xqm3bwfn2imdc";
+ sha256 = "11n30ldg3y3y6qxg3hbj837pnbwjkqw3nxq6frds647mmmprrd20";
};
- cargoSha256 = "0bma0l14jv5qhcsxck7vw3ak1w3c8v84cq4hii86i4iqk523zns5";
- cargoPatches = [
- ( fetchpatch {
- name = "retworkx-cargo-lock.patch";
- url = "https://github.com/Qiskit/retworkx/commit/a02fd33d357a92dbe9530696a6d85aa59fe8a5b9.patch";
- sha256 = "0gvxr1nqp9ll4skfks4p4d964pshal25kb1nbfzhpyipnzddizr5";
- } )
- ];
+ cargoSha256 = "1vg4yf0k6yypqf9z46zz818mz7fdrgxj7zl6zjf7pnm2r8mq3qw5";
propagatedBuildInputs = [ python ];
nativeBuildInputs = [ pipInstallHook maturin pip ];
- # Need to check AFTER python wheel is installed (b/c using Rust Build, not buildPythonPackage)
+ # Needed b/c need to check AFTER python wheel is installed (using Rust Build, not buildPythonPackage)
doCheck = false;
doInstallCheck = true;
+ installCheckInputs = [ pytestCheckHook numpy ];
+
buildPhase = ''
runHook preBuild
- maturin build --release --manylinux off --strip --interpreter ${python.interpreter}
+ maturin build --release --manylinux off --strip
runHook postBuild
'';
@@ -50,10 +44,9 @@ rustPlatform.buildRustPackage rec {
pipInstallPhase
'';
- installCheckInputs = [ pytestCheckHook numpy ];
preCheck = ''
export TESTDIR=$(mktemp -d)
- cp -r $TMP/$sourceRoot/tests $TESTDIR
+ cp -r tests/ $TESTDIR
pushd $TESTDIR
'';
postCheck = "popd";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/rich/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/rich/default.nix
index 71166b86f18e..6284ed7b649a 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/rich/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/rich/default.nix
@@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "rich";
- version = "8.0.0";
+ version = "9.1.0";
# tests not included in pypi tarball
src = fetchFromGitHub {
owner = "willmcgugan";
repo = pname;
rev = "v${version}";
- sha256 = "0hv27b22x7dbx1i7nzsd8y8fymmvdak2hcx9242jwk4c1a7jr151";
+ sha256 = "18iha0fs8vm0j11k39yxj26h8qxrp27ijhx6h1yyizbygmr5b5nk";
};
format = "pyproject";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/ripser/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/ripser/default.nix
index 9e2e76464d80..acd017a7a2e8 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/ripser/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/ripser/default.nix
@@ -12,12 +12,12 @@
buildPythonPackage rec {
pname = "ripser";
- version = "0.5.4";
+ version = "0.6.0";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "7a54750427e3f1bbb26c625075c831314760a9e5b5bcd3b797df668f020c9eb6";
+ sha256 = "5c47deffbf9e163186b0997f2d59486d96a7c65766e76500f754fadfbc89f5d9";
};
checkInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/rlp/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/rlp/default.nix
index 303a8bc6d7fd..eca38c08f014 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/rlp/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/rlp/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "rlp";
- version = "1.2.0";
+ version = "2.0.1";
src = fetchPypi {
inherit pname version;
- sha256 = "27273fc2dbc3513c1e05ea6b8af28aac8745fb09c164e39e2ed2807bf7e1b342";
+ sha256 = "665e8312750b3fc5f7002e656d05b9dcb6e93b6063df40d95c49ad90c19d1f0e";
};
checkInputs = [ pytest hypothesis ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/robotframework-requests/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/robotframework-requests/default.nix
index 72f7aabb70ce..0a22dc1eec6c 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/robotframework-requests/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/robotframework-requests/default.nix
@@ -8,12 +8,12 @@
}:
buildPythonPackage rec {
- version = "0.7.1";
+ version = "0.7.2";
pname = "robotframework-requests";
src = fetchPypi {
inherit pname version;
- sha256 = "501a1c7415f839d6837eedd57f2b6ed20576aab318bf14e3878a77c9b106aa45";
+ sha256 = "662e0ce5036a55bcb4cb46ff9741f40c78c670f4fb64cd37714cf83d5fd31774";
};
buildInputs = [ unittest2 ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/robotframework-sshlibrary/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/robotframework-sshlibrary/default.nix
index e9565cff1593..e5e2d022dc8a 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/robotframework-sshlibrary/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/robotframework-sshlibrary/default.nix
@@ -7,12 +7,12 @@
}:
buildPythonPackage rec {
- version = "3.4.0";
+ version = "3.5.1";
pname = "robotframework-sshlibrary";
src = fetchPypi {
inherit pname version;
- sha256 = "21fa0183776e6061366f517765db479aaa634b707f3dd9d90ef6972adae6a755";
+ sha256 = "843af44722d1d4e39f616e5441d6f49e82202cd1a8cc9d16637a6475a8ecb023";
};
# unit tests are impure
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/robotframework/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/robotframework/default.nix
index cf9f4ea86f92..1a3b55451537 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/robotframework/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/robotframework/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "robotframework";
- version = "3.2.1";
+ version = "3.2.2";
src = fetchPypi {
inherit pname version;
- sha256 = "d693e6d06b17f48669e2a8c4cb6c1f0d56e5f1a74835d18b8ea2118da7bf2d79";
+ sha256 = "a0786a916d0572bd9d6afe26e95c6021e3df5dcafa0ece6b302e36366e58c24e";
extension = "zip";
};
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/rope/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/rope/default.nix
index fd7bf55ad52c..81e306f81db2 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/rope/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/rope/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "rope";
- version = "0.17.0";
+ version = "0.18.0";
src = fetchPypi {
inherit pname version;
- sha256 = "658ad6705f43dcf3d6df379da9486529cf30e02d9ea14c5682aa80eb33b649e1";
+ sha256 = "786b5c38c530d4846aa68a42604f61b4e69a493390e3ca11b88df0fbfdc3ed04";
};
checkInputs = [ nose ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/routes/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/routes/default.nix
index 985f6244cc65..95eebe8ab69d 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/routes/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/routes/default.nix
@@ -3,6 +3,7 @@
, fetchPypi
, repoze_lru
, six
+, soupsieve
, webob
, coverage
, webtest
@@ -10,15 +11,19 @@
buildPythonPackage rec {
pname = "Routes";
- version = "2.4.1";
+ version = "2.5.1";
src = fetchPypi {
inherit pname version;
- sha256 = "1zamff3m0kc4vyfniyhxpkkcqv1rrgnmh37ykxv34nna1ws47vi6";
+ sha256 = "b6346459a15f0cbab01a45a90c3d25caf980d4733d628b4cc1952b865125d053";
};
- propagatedBuildInputs = [ repoze_lru six webob ];
- checkInputs = [ coverage webtest ];
+ propagatedBuildInputs = [ repoze_lru six soupsieve webob ];
+ # incompatible with latest soupsieve
+ doCheck = false;
+ checkInputs = [ coverage soupsieve webtest ];
+
+ pythonImportsCheck = [ "routes" ];
meta = with stdenv.lib; {
description = "A Python re-implementation of the Rails routes system for mapping URLs to application actions";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/rpy2/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/rpy2/default.nix
index c0c0420e925a..055341dfd1d3 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/rpy2/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/rpy2/default.nix
@@ -25,13 +25,13 @@
}:
buildPythonPackage rec {
- version = "3.2.6";
+ version = "3.3.6";
pname = "rpy2";
disabled = isPyPy;
src = fetchPypi {
inherit version pname;
- sha256 = "1p990cqx3p2pd1rc9wn66m56wahaq8dlr88frz49vb7nv4zw4a8q";
+ sha256 = "0xvfkxvh01r5ibd5mpisp8bz385hgpn27b988y8v65z7hqr3y1nf";
};
buildInputs = [
@@ -53,6 +53,7 @@ buildPythonPackage rec {
DBI
dbplyr
hexbin
+ lazyeval
lme4
tidyr
]) ++ extraRPackages ++ rWrapper.recommendedPackages;
@@ -69,14 +70,6 @@ buildPythonPackage rec {
# R_LIBS_SITE is used by the nix r package to point to the installed R libraries.
# This patch sets R_LIBS_SITE when rpy2 is imported.
./rpy2-3.x-r-libs-site.patch
-
- # pandas 1.x compatibility, already merged upstream
- # https://github.com/rpy2/rpy2/issues/636
- (fetchpatch {
- name = "pandas-1.x.patch";
- url = "https://github.com/rpy2/rpy2/commit/fbd060e364b70012e8d26cc74df04ee53f769379.patch";
- sha256 = "19rdqydwjmqg25ibmsbx7lggrr9fsyjn283zgvz1wj4iyfjwp1za";
- })
];
postPatch = ''
substituteInPlace 'rpy2/rinterface_lib/embedded.py' --replace '@NIX_R_LIBS_SITE@' "$R_LIBS_SITE"
@@ -98,7 +91,7 @@ buildPythonPackage rec {
];
meta = {
- homepage = "http://rpy.sourceforge.net/rpy2";
+ homepage = "https://rpy2.github.io/";
description = "Python interface to R";
license = lib.licenses.gpl2Plus;
platforms = lib.platforms.unix;
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/rpy2/rpy2-3.x-r-libs-site.patch b/infra/libkookie/nixpkgs/pkgs/development/python-modules/rpy2/rpy2-3.x-r-libs-site.patch
index 177e4f9a83d1..a9e10f02b0bb 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/rpy2/rpy2-3.x-r-libs-site.patch
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/rpy2/rpy2-3.x-r-libs-site.patch
@@ -1,10 +1,10 @@
diff --git a/rpy2/rinterface_lib/embedded.py b/rpy2/rinterface_lib/embedded.py
-index cc32b6d..3969ad0 100644
+index 1f4babbf..322363c5 100644
--- a/rpy2/rinterface_lib/embedded.py
+++ b/rpy2/rinterface_lib/embedded.py
-@@ -113,6 +113,16 @@ def _initr(interactive: bool = True,
- if isinitialized():
- return None
+@@ -118,6 +118,16 @@ def _initr(
+ if openrlib.R_HOME is None:
+ raise ValueError('openrlib.R_HOME cannot be None.')
os.environ['R_HOME'] = openrlib.R_HOME
+
+ # path to libraries
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/rq/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/rq/default.nix
index 66ca024b2bb5..c788d4164102 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/rq/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/rq/default.nix
@@ -2,14 +2,14 @@
buildPythonPackage rec {
pname = "rq";
- version = "1.5.1";
+ version = "1.5.2";
disabled = isPy27;
src = fetchFromGitHub {
owner = "rq";
repo = "rq";
rev = "v${version}";
- sha256 = "0i7yyw828wdvl7ap4gb7jhm4p94502is3xxrgrdgwwp0l1rac004";
+ sha256 = "0ikqmpq0g1qiqwd7ar1286l4hqjb6aj2wr844gihhb8ijzwhp8va";
};
# test require a running redis rerver, which is something we can't do yet
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/rtmixer/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/rtmixer/default.nix
index e1115bd81800..1d9b8114df7b 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/rtmixer/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/rtmixer/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "spatialaudio";
repo = "python-rtmixer";
- rev = "${version}";
+ rev = version;
sha256 = "1bvgzzxiypvvb3qacbcry6761x9sk3dnx7jga7pli63f69vakg4y";
fetchSubmodules = true;
};
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/rtslib/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/rtslib/default.nix
index 28b66ec5a521..aaf879d2a3f4 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/rtslib/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/rtslib/default.nix
@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "rtslib";
- version = "2.1.72";
+ version = "2.1.74";
src = fetchFromGitHub {
owner = "open-iscsi";
repo = "${pname}-fb";
rev = "v${version}";
- sha256 = "13kycf9xkyxm1ik8yh3qpd96vird8y65daigyiyb4jvx0lmrd0kv";
+ sha256 = "1in10z6ckmkfhykar435k1fmswbfajysv4g9nsav893ij8g694fy";
};
propagatedBuildInputs = [ six pyudev pygobject3 ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/ruamel_ordereddict/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/ruamel_ordereddict/default.nix
index da4e891b2b38..7f05229a4f54 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/ruamel_ordereddict/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/ruamel_ordereddict/default.nix
@@ -7,12 +7,12 @@
buildPythonPackage rec {
pname = "ruamel.ordereddict";
- version = "0.4.14";
+ version = "0.4.15";
disabled = isPy3k || isPyPy;
src = fetchPypi {
inherit pname version;
- sha256 = "281051d26eb2b18ef3d920e1e260716a52bd058a6b1a2f324102fc6a15cb8d4a";
+ sha256 = "d7d9cf8b11e7662deb460260cf062980cd84b87a1d0457132060ab9d44e0a5f4";
};
meta = with stdenv.lib; {
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/ruamel_yaml/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/ruamel_yaml/default.nix
index 9e32f9212cfc..6bda50d24ad5 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/ruamel_yaml/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/ruamel_yaml/default.nix
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "ruamel.yaml";
- version = "0.16.10";
+ version = "0.16.12";
src = fetchPypi {
inherit pname version;
- sha256 = "099c644a778bf72ffa00524f78dd0b6476bca94a1da344130f4bf3381ce5b954";
+ sha256 = "076cc0bc34f1966d920a49f18b52b6ad559fbe656a0748e3535cf7b3f29ebf9e";
};
# Tests use relative paths
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/rubymarshal/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/rubymarshal/default.nix
index 9668a26e0944..6115702009ac 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/rubymarshal/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/rubymarshal/default.nix
@@ -12,6 +12,11 @@ buildPythonPackage rec {
propagatedBuildInputs = [ hypothesis ];
+ # pypi doesn't distribute tests
+ doCheck = false;
+
+ pythonImportsCheck = [ "rubymarshal" ];
+
meta = with stdenv.lib; {
homepage = "https://github.com/d9pouces/RubyMarshal/";
description = "Read and write Ruby-marshalled data";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/s3fs/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/s3fs/default.nix
index 535f8efec916..9c900610e031 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/s3fs/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/s3fs/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "s3fs";
- version = "0.4.2";
+ version = "0.5.1";
src = fetchPypi {
inherit pname version;
- sha256 = "2ca5de8dc18ad7ad350c0bd01aef0406aa5d0fff78a561f0f710f9d9858abdd0";
+ sha256 = "7396943cbc1cf92eb6f7aa93be5f64a3bfa59d76908262e89bae06e3c87fa59d";
};
buildInputs = [ docutils ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/sacn/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/sacn/default.nix
new file mode 100644
index 000000000000..35c7a7443299
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/sacn/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, isPy27
+}:
+
+buildPythonPackage rec {
+ pname = "sacn";
+ version = "1.4.6";
+ disabled = isPy27;
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "015wa9nhqgd0kb60bw19g86ga25s9mpvsbqkahi3kw6df6j0wzss";
+ };
+
+ # no tests
+ doCheck = false;
+
+ pythonImportsCheck = [ "sacn" ];
+
+ meta = with lib; {
+ description = "A simple ANSI E1.31 (aka sACN) module for python";
+ homepage = "https://github.com/Hundemeier/sacn";
+ license = licenses.mit;
+ maintainers = with maintainers; [ hexa ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/sacremoses/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/sacremoses/default.nix
index 3785ebcf86cf..f5c0ee715c3a 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/sacremoses/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/sacremoses/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "alvations";
repo = pname;
- rev = "${version}";
+ rev = version;
sha256 = "1gzr56w8yx82mn08wax5m0xyg15ym4ri5l80gmagp8r53443j770";
};
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/scikit-fuzzy/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/scikit-fuzzy/default.nix
new file mode 100644
index 000000000000..7923565c3f4f
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/scikit-fuzzy/default.nix
@@ -0,0 +1,34 @@
+{ lib
+, buildPythonPackage
+, isPy27
+, fetchFromGitHub
+, matplotlib
+, networkx
+, nose
+, numpy
+, scipy
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+ pname = "scikit-fuzzy";
+ version = "unstable-2020-10-03";
+ disabled = isPy27;
+
+ src = fetchFromGitHub {
+ owner = pname;
+ repo = pname;
+ rev = "eecf303b701e3efacdc9b9066207ef605d4facaa";
+ sha256 = "18dl0017iqwc7446hqgabhibgjwdakhmycpis6zpvvkkv4ip5062";
+ };
+
+ propagatedBuildInputs = [ networkx numpy scipy ];
+ checkInputs = [ matplotlib nose pytestCheckHook ];
+
+ meta = with lib; {
+ homepage = "https://github.com/scikit-fuzzy/scikit-fuzzy";
+ description = "Fuzzy logic toolkit for scientific Python";
+ license = licenses.bsd3;
+ maintainers = [ maintainers.bcdarwin ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/scipy/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/scipy/default.nix
index 8ebb436e2880..218415354db7 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/scipy/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/scipy/default.nix
@@ -9,11 +9,11 @@ let
});
in buildPythonPackage rec {
pname = "scipy";
- version = "1.5.2";
+ version = "1.5.4";
src = fetchPypi {
inherit pname version;
- sha256 = "066c513d90eb3fd7567a9e150828d39111ebd88d3e924cdfc9f8ce19ab6f90c9";
+ sha256 = "4a453d5e5689de62e5d38edf40af3f17560bfd63c9c5bd228c18c1f99afa155b";
};
checkInputs = [ nose pytest ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/scour/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/scour/default.nix
index 4f1f39293869..b38d095a845f 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/scour/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/scour/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "scour";
- version = "0.38";
+ version = "0.38.2";
src = fetchPypi {
inherit pname version;
- sha256 = "cf50a13dcdf8cfe1861f0ce334f413604e376a7681c5b181e15322f43c3befcd";
+ sha256 = "6881ec26660c130c5ecd996ac6f6b03939dd574198f50773f2508b81a68e0daf";
};
propagatedBuildInputs = [ six ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/scp/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/scp/default.nix
index b17be3c77d88..a37927b9a641 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/scp/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/scp/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "scp";
- version = "0.13.2";
+ version = "0.13.3";
src = fetchPypi {
inherit pname version;
- sha256 = "1crlpw9lnn58fs1c1rmh7s7s9y5gkgpgjsqlvg9qa51kq1knx7gg";
+ sha256 = "8bd748293d7362073169b96ce4b8c4f93bcc62cfc5f7e1d949e01e406a025bd4";
};
propagatedBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/scramp/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/scramp/default.nix
new file mode 100644
index 000000000000..7beefa4e8999
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/scramp/default.nix
@@ -0,0 +1,24 @@
+{ lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook }:
+
+buildPythonPackage rec {
+ pname = "scramp";
+ version = "1.2.0";
+
+ src = fetchFromGitHub {
+ owner = "tlocke";
+ repo = "scramp";
+ rev = version;
+ sha256 = "15jb7z5l2lijxr60fb9v55i3f81h6d83c0b7fv5q0fv5q259nv0a";
+ };
+
+ checkInputs = [ pytestCheckHook ];
+
+ pythonImportsCheck = [ "scramp" ];
+
+ meta = with lib; {
+ description = "Implementation of the SCRAM authentication protocol";
+ homepage = "https://github.com/tlocke/scramp";
+ license = licenses.mit;
+ maintainers = with maintainers; [ jonringer ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/scrapy-fake-useragent/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/scrapy-fake-useragent/default.nix
index a9199614f46d..b2de4e9a993b 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/scrapy-fake-useragent/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/scrapy-fake-useragent/default.nix
@@ -19,6 +19,6 @@ buildPythonPackage rec {
meta = with stdenv.lib; {
description = "Random User-Agent middleware based on fake-useragent";
homepage = "https://github.com/alecxe/scrapy-fake-useragent";
- license = licenses.bsd3;
+ license = licenses.mit;
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/scrapy/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/scrapy/default.nix
index a2db6b9cb3b2..c377ace69685 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/scrapy/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/scrapy/default.nix
@@ -27,7 +27,7 @@
}:
buildPythonPackage rec {
- version = "2.4.0";
+ version = "2.4.1";
pname = "Scrapy";
disabled = isPy27;
@@ -83,7 +83,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "4ea7fbc902ee0b0a79b154d07a5f4e747e2146f272a748557941946000728479";
+ sha256 = "68c48f01a58636bdf0f6fcd5035a19ecf277b58af24bd70c36dc6e556df3e005";
};
postInstall = ''
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/screeninfo/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/screeninfo/default.nix
index 9ee04cb50a82..1b79a43af9c9 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/screeninfo/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/screeninfo/default.nix
@@ -1,12 +1,13 @@
-{ stdenv, buildPythonApplication, fetchPypi, isPy36, dataclasses, libX11, libXinerama, libXrandr }:
+{ stdenv, buildPythonApplication, fetchPypi, isPy27, isPy36, dataclasses, libX11, libXinerama, libXrandr }:
buildPythonApplication rec {
pname = "screeninfo";
- version = "0.6.5";
+ version = "0.6.6";
+ disabled = isPy27; # dataclasses isn't available for python2
src = fetchPypi {
inherit pname version;
- sha256 = "0vcw54crdgmbzwlrfg80kd1a8p9i10yks8k0szzi0k5q80zhp8xz";
+ sha256 = "c93fcc3c9421cc2046e57468241c4c08c0c6cffd0e05a85cb0b18de8fe8b026f";
};
# dataclasses is a compatibility shim for python 3.6 ONLY
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/seccomp/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/seccomp/default.nix
new file mode 100644
index 000000000000..3257722b1782
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/seccomp/default.nix
@@ -0,0 +1,29 @@
+{ buildPythonPackage, lib
+, cython, libseccomp
+}:
+
+buildPythonPackage rec {
+ pname = "libseccomp";
+ version = libseccomp.version;
+ src = libseccomp.pythonsrc;
+
+ VERSION_RELEASE = version; # used by build system
+
+ nativeBuildInputs = [ cython ];
+ buildInputs = [ libseccomp ];
+
+ unpackCmd = "tar xf $curSrc";
+ doInstallCheck = true;
+
+ postPatch = ''
+ substituteInPlace ./setup.py \
+ --replace 'extra_objects=["../.libs/libseccomp.a"]' \
+ 'libraries=["seccomp"]'
+ '';
+
+ meta = with lib; {
+ description = "Python bindings for libseccomp";
+ license = with licenses; [ lgpl21 ];
+ maintainers = with maintainers; [ thoughtpolice ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/secretstorage/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/secretstorage/default.nix
index d10ea9c8be2b..157876476761 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/secretstorage/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/secretstorage/default.nix
@@ -2,14 +2,14 @@
buildPythonPackage rec {
pname = "secretstorage";
- version = "3.1.1";
+ version = "3.3.0";
disabled = pythonOlder "3.5";
src = fetchPypi {
pname = "SecretStorage";
inherit version;
- sha256 = "14lznnn916ddn6yrd3w2nr2zq49zc8hw53yjz1k9yhd492p9gir0";
+ sha256 = "1aj669d5s8pmr6y2d286fxd13apnxzw0ivd1dr6xdni9i3rdxkrh";
};
propagatedBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix
index 8aa61748af86..9db28aef2e92 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix
@@ -26,11 +26,11 @@
buildPythonPackage rec {
pname = "sentry-sdk";
- version = "0.16.5";
+ version = "0.19.4";
src = fetchPypi {
inherit pname version;
- sha256 = "e12eb1c2c01cd9e9cfe70608dbda4ef451f37ef0b7cbb92e5d43f87c341d6334";
+ sha256 = "1052f0ed084e532f66cb3e4ba617960d820152aee8b93fc6c05bd53861768c1c";
};
checkInputs = [ django flask tornado bottle rq falcon sqlalchemy werkzeug trytond
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/setproctitle/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/setproctitle/default.nix
index 5b678ee1d508..473ef25e162e 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/setproctitle/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/setproctitle/default.nix
@@ -1,17 +1,23 @@
{ stdenv
, buildPythonPackage
, fetchPypi
+, pytestCheckHook
}:
buildPythonPackage rec {
pname = "setproctitle";
- version = "1.1.10";
+ version = "1.2";
src = fetchPypi {
inherit pname version;
- sha256 = "6283b7a58477dd8478fbb9e76defb37968ee4ba47b05ec1c053cb39638bd7398";
+ sha256 = "9b4e48722dd96cbd66d5bf2eab930fff8546cd551dd8d774c8a319448bd381a6";
};
+ checkInputs = [ pytestCheckHook ];
+
+ # tries to compile programs with dependencies that aren't available
+ pytestFlagsArray = [ "--ignore=tests/setproctitle_test.py" ];
+
meta = with stdenv.lib; {
description = "Allows a process to change its title (as displayed by system tools such as ps and top)";
homepage = "https://github.com/dvarrazzo/py-setproctitle";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/setuptools-rust/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/setuptools-rust/default.nix
new file mode 100644
index 000000000000..84465cd475d0
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/setuptools-rust/default.nix
@@ -0,0 +1,32 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, isPy27
+, semantic-version
+, setuptools
+, setuptools_scm
+, toml
+}:
+
+buildPythonPackage rec {
+ pname = "setuptools-rust";
+ version = "0.11.5";
+
+ disabled = isPy27;
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "04ea21f1bd029046fb87d098be4d7dc74663a58dd1f9fc6edcf8f3e4123ec4a8";
+ };
+
+ nativeBuildInputs = [ setuptools_scm ];
+
+ propagatedBuildInputs = [ semantic-version setuptools toml ];
+
+ meta = with stdenv.lib; {
+ description = "Setuptools plugin for Rust support";
+ homepage = "https://github.com/PyO3/setuptools-rust";
+ license = licenses.mit;
+ maintainers = with maintainers; [ danieldk ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/setuptools/44.0.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/setuptools/44.0.nix
index 66330ca250f8..c2f6eb230b47 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/setuptools/44.0.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/setuptools/44.0.nix
@@ -27,14 +27,23 @@ let
name = "${pname}-${version}-source";
};
+ patches = [
+ ./tag-date.patch
+ ];
+
buildPhase = ''
${python.pythonForBuild.interpreter} bootstrap.py
${python.pythonForBuild.interpreter} setup.py sdist --formats=gztar
+
+ # Here we untar the sdist and retar it in order to control the timestamps
+ # of all the files included
+ tar -xzf dist/${pname}-${version}.post0.tar.gz -C dist/
+ tar -czf dist/${name} -C dist/ --mtime="@$SOURCE_DATE_EPOCH" ${pname}-${version}.post0
'';
installPhase = ''
echo "Moving sdist..."
- mv dist/*.tar.gz $out
+ mv dist/${name} $out
'';
};
in buildPythonPackage rec {
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/setuptools/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/setuptools/default.nix
index b618ec6f634b..f30e8dd5cdb3 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/setuptools/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/setuptools/default.nix
@@ -13,7 +13,7 @@
let
pname = "setuptools";
- version = "47.3.1";
+ version = "50.3.1";
# Create an sdist of setuptools
sdist = stdenv.mkDerivation rec {
@@ -23,18 +23,27 @@ let
owner = "pypa";
repo = pname;
rev = "v${version}";
- sha256 = "0sy3p4ibgqx67hzn1f254jh8070a8kl9g2la62p3c74k2x7p0r7f";
+ sha256 = "Z4KHB3Pv4wZPou/Vbp1DFDgDp47OTDfVChGP55GtIJE=";
name = "${pname}-${version}-source";
};
+ patches = [
+ ./tag-date.patch
+ ];
+
buildPhase = ''
${python.pythonForBuild.interpreter} bootstrap.py
${python.pythonForBuild.interpreter} setup.py sdist --formats=gztar
+
+ # Here we untar the sdist and retar it in order to control the timestamps
+ # of all the files included
+ tar -xzf dist/${pname}-${version}.post0.tar.gz -C dist/
+ tar -czf dist/${name} -C dist/ --mtime="@$SOURCE_DATE_EPOCH" ${pname}-${version}.post0
'';
installPhase = ''
echo "Moving sdist..."
- mv dist/*.tar.gz $out
+ mv dist/${name} $out
'';
};
in buildPythonPackage rec {
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/setuptools/tag-date.patch b/infra/libkookie/nixpkgs/pkgs/development/python-modules/setuptools/tag-date.patch
new file mode 100644
index 000000000000..441177a5d17e
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/setuptools/tag-date.patch
@@ -0,0 +1,12 @@
+diff --git a/setup.cfg b/setup.cfg
+index f23714b6..8aaeb330 100644
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -1,6 +1,6 @@
+ [egg_info]
+ tag_build = .post
+-tag_date = 1
++tag_date = 0
+
+ [aliases]
+ clean_egg_info = egg_info -Db ''
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/sh/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/sh/default.nix
index 3ef3393363ac..964512460bf1 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/sh/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/sh/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "sh";
- version = "1.14.0";
+ version = "1.14.1";
src = fetchPypi {
inherit pname version;
- sha256 = "05c7e520cdf70f70a7228a03b589da9f96c6e0d06fc487ab21fc62b26a592e59";
+ sha256 = "39aa9af22f6558a0c5d132881cf43e34828ca03e4ae11114852ca6a55c7c1d8e";
};
patches = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/shap/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/shap/default.nix
new file mode 100644
index 000000000000..deb6dcf2a21a
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/shap/default.nix
@@ -0,0 +1,70 @@
+{ stdenv
+, buildPythonPackage
+, fetchFromGitHub
+, isPy27
+, pytestCheckHook
+, numpy
+, scipy
+, scikitlearn
+, pandas
+, tqdm
+, slicer
+, numba
+, matplotlib
+, nose
+, ipython
+}:
+
+buildPythonPackage rec {
+ pname = "shap";
+ version = "0.36.0";
+ disabled = isPy27;
+
+ src = fetchFromGitHub {
+ owner = "slundberg";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1wxnxvbz6avzzfqjfbcqd4v879hvpq4021v31fhdpccr2q317rr9";
+ };
+
+ propagatedBuildInputs = [
+ numpy
+ scipy
+ scikitlearn
+ pandas
+ tqdm
+ slicer
+ numba
+ ];
+
+ preCheck = ''
+ export HOME=$TMPDIR
+ # when importing the local copy the extension is not found
+ rm -r shap
+ '';
+ checkInputs = [ pytestCheckHook matplotlib nose ipython ];
+ # Those tests access the network
+ disabledTests = [
+ "test_kernel_shap_with_a1a_sparse_zero_background"
+ "test_kernel_shap_with_a1a_sparse_nonzero_background"
+ "test_kernel_shap_with_high_dim_sparse"
+ "test_sklearn_random_forest_newsgroups"
+ "test_sum_match_random_forest"
+ "test_sum_match_extra_trees"
+ "test_single_row_random_forest"
+ "test_sum_match_gradient_boosting_classifier"
+ "test_single_row_gradient_boosting_classifier"
+ "test_HistGradientBoostingClassifier_proba"
+ "test_HistGradientBoostingClassifier_multidim"
+ "test_sum_match_gradient_boosting_regressor"
+ "test_single_row_gradient_boosting_regressor"
+ ];
+
+ meta = with stdenv.lib; {
+ description = "A unified approach to explain the output of any machine learning model";
+ homepage = "https://github.com/slundberg/shap";
+ license = licenses.mit;
+ maintainers = with maintainers; [ evax ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/shapely/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/shapely/default.nix
index d895f00285d4..eb3b5b9e44d1 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/shapely/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/shapely/default.nix
@@ -1,16 +1,17 @@
-{ stdenv, buildPythonPackage, fetchPypi, substituteAll
+{ stdenv, buildPythonPackage, fetchPypi, substituteAll, pythonOlder
, geos, pytest, cython
, numpy
}:
buildPythonPackage rec {
pname = "Shapely";
- version = "1.7.0";
+ version = "1.7.1";
src = fetchPypi {
inherit pname version;
- sha256 = "07lmrihj6pa7f99m97hbf2anqlhhwippcdz03bqkyihnlkhry6p2";
+ sha256 = "0adiz4jwmwxk7k1awqifb1a9bj5x4nx4gglb5dz9liam21674h8n";
};
+ disabled = pythonOlder "3.5";
nativeBuildInputs = [
geos # for geos-config
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/shapely/library-paths.patch b/infra/libkookie/nixpkgs/pkgs/development/python-modules/shapely/library-paths.patch
index 4081936abe36..319eb8a72db5 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/shapely/library-paths.patch
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/shapely/library-paths.patch
@@ -2,7 +2,7 @@ diff --git a/shapely/geos.py b/shapely/geos.py
index d5a67d2..19b7ffc 100644
--- a/shapely/geos.py
+++ b/shapely/geos.py
-@@ -61,123 +61,11 @@ def load_dll(libname, fallbacks=None, mode=DEFAULT_MODE):
+@@ -61,127 +61,10 @@ def load_dll(libname, fallbacks=None, mode=DEFAULT_MODE):
"Could not find lib {} or load any of its variants {}.".format(
libname, fallbacks or []))
@@ -80,7 +80,11 @@ index d5a67d2..19b7ffc 100644
- ]
- _lgeos = load_dll('geos_c', fallbacks=alt_paths)
-
-- free = load_dll('c').free
+- # ctypes.CDLL(None) internally calls dlopen(NULL), and as the dlopen
+- # manpage says, "If filename is NULL, then the returned handle is for the
+- # main program". This way we can let the linker do the work to figure out
+- # which libc Python is actually using.
+- free = CDLL(None).free
- free.argtypes = [c_void_p]
- free.restype = None
-
@@ -112,7 +116,7 @@ index d5a67d2..19b7ffc 100644
- except WindowsError:
- # XXX: See http://trac.gispython.org/projects/PCL/ticket/149
- pass
-
+-
-elif sys.platform == 'sunos5':
- _lgeos = load_dll('geos_c', fallbacks=['libgeos_c.so.1', 'libgeos_c.so'])
- free = CDLL('libc.so.1').free
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/signedjson/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/signedjson/default.nix
index 6916b704fcd4..69f7a93f509d 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/signedjson/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/signedjson/default.nix
@@ -1,6 +1,6 @@
{ stdenv
, buildPythonPackage
-, fetchgit
+, fetchFromGitHub
, canonicaljson
, unpaddedbase64
, pynacl
@@ -11,8 +11,9 @@ buildPythonPackage rec {
pname = "signedjson";
version = "1.1.0";
- src = fetchgit {
- url = "https://github.com/matrix-org/python-signedjson.git";
+ src = fetchFromGitHub {
+ owner = "matrix-org";
+ repo = "python-${pname}";
rev = "refs/tags/v${version}";
sha256 = "18s388hm3babnvakbbgfqk0jzq25nnznvhygywd3azp9b4yzmd5c";
};
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/skorch/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/skorch/default.nix
index 8e3fcc12f552..bb41f61517fc 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/skorch/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/skorch/default.nix
@@ -16,11 +16,11 @@
buildPythonPackage rec {
pname = "skorch";
- version = "0.8.0";
+ version = "0.9.0";
src = fetchPypi {
inherit pname version;
- sha256 = "1l576dws9drjakfsn0pfpbr48b21vpxv3vd3dz8lkbn8q71zs22r";
+ sha256 = "bdce9370153fd80c5c4ec499a639f55eef0620e45d4b15fbf7d7ff2a225a3d40";
};
propagatedBuildInputs = [ numpy pytorch scikitlearn scipy tabulate tqdm ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/slicer/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/slicer/default.nix
new file mode 100644
index 000000000000..8711055766c6
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/slicer/default.nix
@@ -0,0 +1,29 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, isPy27
+, pytestCheckHook
+, pandas
+, pytorch
+}:
+
+buildPythonPackage rec {
+ pname = "slicer";
+ version = "0.0.5";
+ disabled = isPy27;
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "8c0fe9845056207d7344d5850e93551f9be20656178d443332aa02da9c71ba44";
+ };
+
+ checkInputs = [ pytestCheckHook pandas pytorch ];
+
+ meta = with stdenv.lib; {
+ description = "Wraps tensor-like objects and provides a uniform slicing interface via __getitem__";
+ homepage = "https://github.com/interpretml/slicer";
+ license = licenses.mit;
+ maintainers = with maintainers; [ evax ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/slither-analyzer/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/slither-analyzer/default.nix
index d4f332b44750..19677a71eca3 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/slither-analyzer/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/slither-analyzer/default.nix
@@ -1,12 +1,10 @@
{ lib, buildPythonPackage, fetchPypi, makeWrapper, pythonOlder
-, prettytable
-, setuptools
-, solc
+, crytic-compile, prettytable, setuptools, solc
}:
buildPythonPackage rec {
pname = "slither-analyzer";
- version = "0.6.12";
+ version = "0.6.14";
disabled = pythonOlder "3.6";
@@ -15,11 +13,11 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "9773cf48754341d03bb2e65c07897fc9c00a8727487ab2820ed89eb85f546506";
+ sha256 = "79f5098d27c149ca9cce2b8008ed29e2e0c8cee8fa3414c7e5455cb73c90a9a8";
};
nativeBuildInputs = [ makeWrapper ];
- propagatedBuildInputs = [ prettytable setuptools ];
+ propagatedBuildInputs = [ crytic-compile prettytable setuptools ];
postFixup = ''
wrapProgram $out/bin/slither \
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/smart_open/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/smart_open/default.nix
index d5177dfd2e97..ba57d081658a 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/smart_open/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/smart_open/default.nix
@@ -13,12 +13,12 @@
buildPythonPackage rec {
pname = "smart_open";
- version = "3.0.0";
+ version = "4.0.1";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
- sha256 = "7f4e85b71df5a3618f5447d0b417b7a3576308c839690a24a70338b8993684c3";
+ sha256 = "49396d86de8e0d609ec40422c59f837dd944dcdf727feed6f2ff8cbdc0e3bc8e";
};
# nixpkgs version of moto is >=1.2.0, remove version pin to fix build
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/smbus-cffi/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/smbus-cffi/default.nix
new file mode 100644
index 000000000000..b762730914b5
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/smbus-cffi/default.nix
@@ -0,0 +1,46 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, cffi
+, pytestCheckHook
+, pyserial
+, fetchpatch
+}:
+
+buildPythonPackage rec {
+ pname = "smbus-cffi";
+ version = "0.5.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "fb4195aaabfc01586863f60d3190b5cb1bf8f12622fd597e23e48768dad6bde8";
+ };
+
+ patches = [
+ # https://github.com/bivab/smbus-cffi/pull/24
+ (fetchpatch {
+ url = "https://github.com/bivab/smbus-cffi/commit/ba79ae174a9d84e767d95f165c43ee212b1bbb92.patch";
+ sha256 = "sha256-WtRuK5y6fWDEhm0Xy5XqS5yCkn7vXXYtjlOjS90gla4=";
+ })
+ ];
+
+ propagatedBuildInputs = [ cffi ];
+
+ installCheckPhase = ''
+ # we want to import the installed module that also contains the compiled library
+ rm -rf smbus
+ runHook pytestCheckPhase
+ '';
+
+ # requires hardware access
+ pytestFlagsArray = [ "--ignore=test/test_smbus_integration.py" ];
+
+ checkInputs = [ pytestCheckHook pyserial ];
+
+ meta = with lib; {
+ description = "Python module for SMBus access through Linux I2C /dev interface";
+ homepage = "https://github.com/bivab/smbus-cffi";
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ mic92 ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/smugline/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/smugline/default.nix
deleted file mode 100644
index d779a79ed21a..000000000000
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/smugline/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ stdenv
-, fetchFromGitHub
-, docopt
-, requests
-, smugpy
-, python
-, pkgs
-}:
-
-stdenv.mkDerivation rec {
- pname = "smugline";
- version = "20160106";
-
- src = fetchFromGitHub {
- owner = "gingerlime";
- repo = pname;
- rev = "134554c574c2d282112ba60165a8c5ffe0f16fd4";
- sha256 = "00n012ijkdrx8wsl8x3ghdcxcdp29s4kwr3yxvlyj79g5yhfvaj6";
- };
-
- phases = [ "unpackPhase" "installPhase" ];
-
- buildInputs = [ python pkgs.makeWrapper ];
- propagatedBuildInputs = [ docopt requests smugpy ];
-
- installPhase = ''
- mkdir -p $out/bin $out/libexec
- cp smugline.py $out/libexec
- makeWrapper ${python.interpreter} $out/bin/smugline \
- --add-flags "$out/libexec/smugline.py" \
- --prefix PYTHONPATH : "$PYTHONPATH"
- '';
-
- meta = with stdenv.lib; {
- homepage = "https://github.com/gingerlime/smugline";
- description = "A simple command line tool for smugmug ";
- license = licenses.mit;
- };
-
-}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/smugpy/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/smugpy/default.nix
deleted file mode 100644
index 43ac45b1235e..000000000000
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/smugpy/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub }:
-
-buildPythonPackage rec {
- pname = "smugpy";
- version = "20131218";
-
- src = fetchFromGitHub {
- owner = "chrishoffman";
- repo = pname;
- rev = "f698d6749ce446e3d6c7d925b2cd1cd5b3d695ea";
- sha256 = "029x6hm1744iznv4sw8sfyl974wmx1sqnr1k5dvzzwpk3ja49a1y";
- };
-
- meta = with stdenv.lib; {
- description = "Python library for the SmugMug API";
- license = with licenses; [ mit ];
- homepage = "https://github.com/chrishoffman/smugpy";
- };
-
- doCheck = false; # Tries to login to Smugmug…
-}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/sniffio/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/sniffio/default.nix
index 82275762ce3d..5b91bade0098 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/sniffio/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/sniffio/default.nix
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "sniffio";
- version = "1.1.0";
+ version = "1.2.0";
src = fetchPypi {
inherit pname version;
- sha256 = "8e3810100f69fe0edd463d02ad407112542a11ffdc29f67db2bf3771afb87a21";
+ sha256 = "c4666eecec1d3f50960c6bdf61ab7bc350648da6c126e3cf6898d8cd4ddcd3de";
};
disabled = !isPy3k;
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix
index f33d2639db56..3e958a3076c3 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix
@@ -25,12 +25,12 @@
buildPythonPackage rec {
pname = "snowflake-connector-python";
- version = "2.3.3";
+ version = "2.3.6";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "18w6ibpibqj3v136jjfklbax1l4y80v8mfk19apxlaprf6wvwpwy";
+ sha256 = "1a4ebf25989fc13d6f70dc3e2064721c54834e493a7964a1d67be61d40e75f50";
};
propagatedBuildInputs = [
@@ -57,7 +57,7 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace setup.py \
- --replace "'boto3>=1.4.4,<1.15'," "'boto3~=1.15'," \
+ --replace "'boto3>=1.4.4,<1.16'," "'boto3~=1.16'," \
--replace "'cryptography>=2.5.0,<3.0.0'," "'cryptography'," \
--replace "'idna<2.10'," "'idna'," \
--replace "'requests<2.24.0'," "'requests',"
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix
index 99c5822f3504..bccca3ee6b67 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix
@@ -19,6 +19,8 @@ buildPythonPackage rec {
snowflake-connector-python
];
+ # Pypi does not include tests
+ doCheck = false;
pythonImportsCheck = [ "snowflake.sqlalchemy" ];
meta = with lib; {
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/sockjs/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/sockjs/default.nix
new file mode 100644
index 000000000000..d589179338fd
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/sockjs/default.nix
@@ -0,0 +1,22 @@
+{ lib, buildPythonPackage, fetchPypi, aiohttp }:
+
+buildPythonPackage rec {
+ pname = "sockjs";
+ version = "0.11.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "A0fUBO2e8xllBnh+2AGPh+5OLQuupJ1CDN1TqWm+wik=";
+ };
+
+ propagatedBuildInputs = [ aiohttp ];
+
+ pythonImportsCheck = [ "sockjs" ];
+
+ meta = with lib; {
+ description = "Sockjs server";
+ homepage = "https://github.com/aio-libs/sockjs";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ freezeboy ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/soco/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/soco/default.nix
index b56e43e13219..e5fe491939fb 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/soco/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/soco/default.nix
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "soco";
- version = "0.19";
+ version = "0.20";
src = fetchPypi {
inherit pname version;
- sha256 = "0dgca286vhrabm4r4jj545k895z6w2c70ars06vrjhf9cpgg7qck";
+ sha256 = "929d4fae20b32efc08bb9985798c592aa7268162885541513eddbff0a757418f";
};
propagatedBuildInputs = [ xmltodict requests toml ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/sopel/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/sopel/default.nix
index 0c4c3f9b7b22..706175dfaad3 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/sopel/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/sopel/default.nix
@@ -14,12 +14,12 @@
buildPythonPackage rec {
pname = "sopel";
- version = "7.0.6";
+ version = "7.0.7";
disabled = isPyPy;
src = fetchPypi {
inherit pname version;
- sha256 = "5e394d9797e221f90a95e5eb9987e8c1faf4f2488964f521e8ca1628798f0a38";
+ sha256 = "84d42708d176aecfb7b95299af0e484896f5f80df61f43c92d8e7a53de0b2099";
};
propagatedBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/sorl_thumbnail/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/sorl_thumbnail/default.nix
index f62af59c4edc..03fbc638f160 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/sorl_thumbnail/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/sorl_thumbnail/default.nix
@@ -7,12 +7,12 @@
buildPythonPackage rec {
pname = "sorl-thumbnail";
- version = "12.6.3";
+ version = "12.7.0";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "66771521f3c0ed771e1ce8e1aaf1639ebff18f7f5a40cfd3083da8f0fe6c7c99";
+ sha256 = "fbe6dfd66a1aceb7e0203895ff5622775e50266f8d8cfd841fe1500bd3e19018";
};
nativeBuildInputs = [ setuptools_scm ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/sortedcontainers/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/sortedcontainers/default.nix
index 9df3d809f2cb..3f4a68406726 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/sortedcontainers/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/sortedcontainers/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "sortedcontainers";
- version = "2.2.2";
+ version = "2.3.0";
src = fetchPypi {
inherit pname version;
- sha256 = "4e73a757831fc3ca4de2859c422564239a31d8213d09a2a666e375807034d2ba";
+ sha256 = "59cc937650cf60d677c16775597c89a960658a09cf7c1a668f86e1e4464b10a1";
};
# pypi tarball does not come with tests
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/sounddevice/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/sounddevice/default.nix
index eb46580a7b30..7787e8b16b85 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/sounddevice/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/sounddevice/default.nix
@@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "sounddevice";
- version = "0.4.0";
+ version = "0.4.1";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "007cfef077c447eebbdbca3d510ca4365c211c2c6c4d2912d6eec43c8cbcbc02";
+ sha256 = "f21978921186c0c7183af032fab77b735d824f3e926d76adb3fd0912e289ce0b";
};
propagatedBuildInputs = [ cffi numpy portaudio ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/spacy/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/spacy/default.nix
index 077aea4dc9a3..9b4f7cc92716 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/spacy/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/spacy/default.nix
@@ -22,11 +22,11 @@
buildPythonPackage rec {
pname = "spacy";
- version = "2.3.2";
+ version = "2.3.4";
src = fetchPypi {
inherit pname version;
- sha256 = "07zf7kivj4r1n6xwisld7n90bpi095bqbc9xpv668grq1rpf53c1";
+ sha256 = "a5c8805759114aac3a1db1b20f42af1124da5315be903ccb4c472cc8452393fb";
};
propagatedBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/sphinx/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/sphinx/default.nix
index b4cbd3bff9a1..e4a3c94711fa 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/sphinx/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/sphinx/default.nix
@@ -32,11 +32,11 @@
buildPythonPackage rec {
pname = "sphinx";
- version = "3.0.3";
+ version = "3.3.1";
src = fetchPypi {
pname = "Sphinx";
inherit version;
- sha256 = "0wpmqfx4mxv5kv9xxd6wyfsm8vcnp8p99h14q7b6if2mv69gvvb2";
+ sha256 = "1e8d592225447104d1172be415bc2972bd1357e3e12fdc76edf2261105db4300";
};
LC_ALL = "en_US.UTF-8";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix
new file mode 100644
index 000000000000..03ac746137f7
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix
@@ -0,0 +1,43 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
+, astroid
+, jinja2
+, sphinx
+, pyyaml
+, unidecode
+, mock
+, pytest
+}:
+
+buildPythonPackage rec {
+ pname = "sphinx-autoapi";
+ version = "1.5.1";
+ disabled = pythonOlder "3.6";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "19m9yvlqwaw3b05lbb1vcla38irn4riw2ij0vjmnc2xq4f1qfl2d";
+ };
+
+ propagatedBuildInputs = [ astroid jinja2 pyyaml sphinx unidecode ];
+
+ checkInputs = [
+ mock
+ pytest
+ ];
+
+ checkPhase = ''
+ pytest
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/readthedocs/sphinx-autoapi";
+ description = "Provides 'autodoc' style documentation";
+ longDescription = "Sphinx AutoAPI provides 'autodoc' style documentation for multiple programming languages without needing to load, run, or import the project being documented.";
+ license = licenses.mit;
+ maintainers = with maintainers; [ karolchmist ];
+ };
+
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/sphinxcontrib-katex/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/sphinxcontrib-katex/default.nix
index 95bd4b592010..6fcafd438ba0 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/sphinxcontrib-katex/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/sphinxcontrib-katex/default.nix
@@ -2,7 +2,7 @@
buildPythonPackage rec {
pname = "sphinxcontrib-katex";
- version = "0.6.1";
+ version = "0.7.1";
# pkgutil namespaces are broken in nixpkgs (because they can't scan multiple
# directories). But python2 is EOL, so not supporting it should be ok.
@@ -10,7 +10,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "88320b2780f350d67f84a5424973ce24aee65701e8e163a7f5856c5df3353188";
+ sha256 = "fa80aba8af9d78f70a0a255815d44e33e8aca8e806ca6101e0eb18b2b7243246";
};
propagatedBuildInputs = [ sphinx ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix
index d3e9f30f50a8..bd62d2ef4f8f 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix
@@ -1,6 +1,7 @@
{ stdenv
, buildPythonPackage
, fetchPypi
+, isPy27
, setuptools_scm
, m2r
, pyyaml
@@ -11,6 +12,7 @@
buildPythonPackage rec {
pname = "sphinxcontrib-openapi";
version = "0.7.0";
+ disabled = isPy27;
src = fetchPypi {
inherit pname version;
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix
index 0dc7297be69c..44e19997569c 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix
@@ -1,6 +1,9 @@
{ stdenv
+, lib
, buildPythonPackage
, fetchPypi
+, pythonOlder
+, importlib-metadata
, sphinx
, pyenchant
, pbr
@@ -8,14 +11,15 @@
buildPythonPackage rec {
pname = "sphinxcontrib-spelling";
- version = "5.2.2";
+ version = "7.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "c8250ff02e6033c3aeabc41e91dc185168fecefb0c5722aaa3e2055a829e1e4c";
+ sha256 = "5b4240808a6d21eab9c49e69ad5ac0cb3efb03fe2e94763d23c860f85ec6a799";
};
- propagatedBuildInputs = [ sphinx pyenchant pbr ];
+ propagatedBuildInputs = [ sphinx pyenchant pbr ]
+ ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
# No tests included
doCheck = false;
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix
index 579b2f173eee..ce65822e3b1f 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "sphinxcontrib-plantuml";
- version = "0.18";
+ version = "0.19";
src = fetchPypi {
inherit pname version;
- sha256 = "08555dndvp12g261wag3qklybdbfnjcmagh4gpl79k2kz5bqrk5c";
+ sha256 = "98b9f02282907b0c5b7a93a446c4649909aaf5785d2da0dd263c8ad68e00e288";
};
# No tests included.
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/spotipy/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/spotipy/default.nix
index 1e003be1f5e7..63ec4abcac42 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/spotipy/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/spotipy/default.nix
@@ -1,28 +1,32 @@
-{ stdenv, buildPythonPackage, fetchPypi, requests, six, mock }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, requests
+, six }:
buildPythonPackage rec {
pname = "spotipy";
- version = "2.16.0";
+ version = "2.16.1";
src = fetchPypi {
inherit pname version;
- sha256 = "315eadd1248053ed336b4d3adbf2e3c32895fdbb0cfcd170542c848c8fd45649";
+ sha256 = "1f50xczv8kgly6wz6zrvqzwdj6nvhdlgx8wnrhmbipjrb6qacr25";
};
propagatedBuildInputs = [ requests six ];
- checkInputs = [ mock ];
- preConfigure = ''
- substituteInPlace setup.py \
- --replace "mock==2.0.0" "mock"
- '';
+ # tests want to access the spotify API
+ doCheck = false;
+ pythonImportsCheck = [
+ "spotipy"
+ "spotipy.oauth2"
+ ];
- pythonImportsCheck = [ "spotipy" ];
-
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = "https://spotipy.readthedocs.org/";
+ changelog = "https://github.com/plamere/spotipy/blob/${version}/CHANGELOG.md";
description = "A light weight Python library for the Spotify Web API";
license = licenses.mit;
- maintainers = [ maintainers.rvolosatovs ];
+ maintainers = with maintainers; [ rvolosatovs ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/spyder-kernels/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/spyder-kernels/default.nix
index 868ce80558a6..8655d9cbbd5d 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/spyder-kernels/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/spyder-kernels/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "spyder-kernels";
- version = "1.9.4";
+ version = "1.10.0";
src = fetchPypi {
inherit pname version;
- sha256 = "ca9d997c475b714b54d2fd67aa140837ec3630e91cbbc2e0cd190f1b0bd9fe9d";
+ sha256 = "588602b9f44961f4011a9ec83fe85f5d621126eee64835e407a7d41c54dccc74";
};
propagatedBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/spyder/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/spyder/default.nix
index 2b0276afc9d8..f0c4ea50e72e 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/spyder/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/spyder/default.nix
@@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "spyder";
- version = "4.1.5";
+ version = "4.2.0";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "d467f020b694193873a237ce6744ae36bd5a59f4d2b7ffbeb15dda68b03f5aa1";
+ sha256 = "44f51473b81c1bfde76097bfb957ec14f580a262b229ae8e90d18f5b82104c95";
};
nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix
index a4cb3bd6d734..83fd3e7b10b3 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "SQLAlchemy";
- version = "1.3.19";
+ version = "1.3.20";
src = fetchPypi {
inherit pname version;
- sha256 = "3bba2e9fbedb0511769780fe1d63007081008c5c2d7d715e91858c94dbaa260e";
+ sha256 = "d2f25c7f410338d31666d7ddedfa67570900e248b940d186b48461bd4e5569a1";
};
checkInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix
new file mode 100644
index 000000000000..6e17fc4f38e2
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix
@@ -0,0 +1,42 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, isPy3k
+, click
+, click-default-group
+, tabulate
+, pytestCheckHook
+, pytestrunner
+, black
+}:
+
+buildPythonPackage rec {
+ pname = "sqlite-utils";
+ version = "3.0";
+ disabled = !isPy3k;
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "a158265fde85a6757b7f09b568b1f7d6eaf75eaae208be27336f09dc048e5bcf";
+ };
+
+ propagatedBuildInputs = [
+ click
+ click-default-group
+ tabulate
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ pytestrunner
+ black
+ ];
+
+ meta = with lib; {
+ description = "Python CLI utility and library for manipulating SQLite databases";
+ homepage = "https://github.com/simonw/sqlite-utils";
+ license = licenses.asl20;
+ maintainers = [ maintainers.meatcar ];
+ };
+
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix
index ddcaa061c6b9..fe17c909efac 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "sqlmap";
- version = "1.4.9";
+ version = "1.4.11";
src = fetchPypi {
inherit pname version;
- sha256 = "8f1f84799184a2d3b0433ece09fa0e2ff90a8286c562957667fe0f40dad28287";
+ sha256 = "5c91d13f090c8e891201c7b924cc2b2feccf12042b42075a5623b4986b9c9ee7";
};
postPatch = ''
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/sqlparse/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/sqlparse/default.nix
index b6aee633e0ea..635111b95d9e 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/sqlparse/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/sqlparse/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "sqlparse";
- version = "0.3.1";
+ version = "0.4.1";
src = fetchPypi {
inherit pname version;
- sha256 = "e162203737712307dfe78860cc56c8da8a852ab2ee33750e33aeadf38d12c548";
+ sha256 = "0f91fd2e829c44362cbcfab3e9ae12e22badaa8a29ad5ff599f9ec109f0454e8";
};
checkInputs = [ pytest ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/srptools/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/srptools/default.nix
index 3b1844fb138e..9fca318db0b9 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/srptools/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/srptools/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "srptools";
- version = "1.0.0";
+ version = "1.0.1";
src = fetchPypi {
inherit pname version;
- sha256 = "5754f639ed1888f47c1185d74e8907ff9af4c0ccc1c8be2ef19339d0a1327f4d";
+ sha256 = "7fa4337256a1542e8f5bb4bed19e1d9aea98fe5ff9baf76693342a1dd6ac7c96";
};
propagatedBuildInputs = [ six ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/srsly/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/srsly/default.nix
index 0565973da40d..ee53af641a05 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/srsly/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/srsly/default.nix
@@ -13,13 +13,13 @@
buildPythonPackage rec {
pname = "srsly";
- version = "2.3.0";
+ version = "2.3.2";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "f994a266f6e547c8ffe803cb90baed7ca566831f924e0491402564ba0d185e66";
+ sha256 = "f78eaef8d982e98921ce026d4205e652a9333137259f0b621f5c7b579e746e9d";
};
nativeBuildInputs = [ cython ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/sshtunnel/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/sshtunnel/default.nix
index ff9d77bc7820..5254b5c4dcca 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/sshtunnel/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/sshtunnel/default.nix
@@ -5,12 +5,12 @@
}:
buildPythonPackage rec {
- version = "0.1.5";
+ version = "0.3.1";
pname = "sshtunnel";
src = fetchPypi {
inherit pname version;
- sha256 = "0jcjppp6mdfsqrbfc3ddfxg1ybgvkjv7ri7azwv3j778m36zs4y8";
+ sha256 = "e0cac8a6a154c7a9651b42038e3f6cf35bb88c8ee4b94822b28a5b2fe7140f95";
};
propagatedBuildInputs = [ paramiko ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/stack-data/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/stack-data/default.nix
new file mode 100644
index 000000000000..71f114e3528b
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/stack-data/default.nix
@@ -0,0 +1,54 @@
+{ asttokens
+, buildPythonPackage
+, executing
+, fetchFromGitHub
+, git
+, lib
+, littleutils
+, pure-eval
+, pygments
+, pytestCheckHook
+, setuptools_scm
+, toml
+, typeguard
+}:
+
+buildPythonPackage rec {
+ pname = "stack_data";
+ version = "0.0.7";
+
+ src = fetchFromGitHub {
+ owner = "alexmojaki";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "148lhxihak8jm5dvryhsiykmn3s4mrlba8ki4dy1nbd8jnz06a4w";
+ };
+
+ SETUPTOOLS_SCM_PRETEND_VERSION = version;
+
+ nativeBuildInputs = [
+ git
+ setuptools_scm
+ toml
+ ];
+
+ propagatedBuildInputs = [
+ asttokens
+ executing
+ pure-eval
+ ];
+
+ checkInputs = [
+ littleutils
+ pygments
+ pytestCheckHook
+ typeguard
+ ];
+
+ meta = with lib; {
+ description = "Extract data from stack frames and tracebacks";
+ homepage = "https://github.com/alexmojaki/stack_data/";
+ license = licenses.mit;
+ maintainers = with maintainers; [ jluttine ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/staticjinja/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/staticjinja/default.nix
index 29fd116c0d59..cba55e5aca28 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/staticjinja/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/staticjinja/default.nix
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "staticjinja";
- version = "0.3.5";
+ version = "0.4.0";
src = fetchPypi {
inherit pname version;
- sha256 = "fbd61cca1dad44b6891d1a1d72b11ae100e21b3909802e3ff1861ab55bf16603";
+ sha256 = "597837899008409359680ee9cd04779639b9c0eb3380b6545025d26a702ba36c";
};
propagatedBuildInputs = [ jinja2 docopt easywatch ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/statsmodels/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/statsmodels/default.nix
index 3ced08d78587..f538cdf0c04b 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/statsmodels/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/statsmodels/default.nix
@@ -13,12 +13,12 @@
buildPythonPackage rec {
pname = "statsmodels";
- version = "0.12.0";
+ version = "0.12.1";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "5c7d6707ad3112b67f564abaf1845d3c02ecc7174c2d990d539f45c37e98ad35";
+ sha256 = "a271b4ccec190148dccda25f0cbdcbf871f408fc1394a10a7dc1af4a62b91c8e";
};
nativeBuildInputs = [ cython ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/streamz/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/streamz/default.nix
index d34a826a0604..d17aed6ae43a 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/streamz/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/streamz/default.nix
@@ -15,11 +15,11 @@
buildPythonPackage rec {
pname = "streamz";
- version = "0.5.5";
+ version = "0.6.1";
src = fetchPypi {
inherit pname version;
- sha256 = "787ade4796c5b2e79af2aac678841ba3748a65a3adce150697dcdd31c4f80365";
+ sha256 = "215703456479d24f524cdcd0365006250d4502d242f57e2f5db18e8638bc8694";
};
propagatedBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/strictyaml/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/strictyaml/default.nix
index 44345a9aa505..ee18a6ca6b22 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/strictyaml/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/strictyaml/default.nix
@@ -7,13 +7,13 @@
}:
buildPythonPackage rec {
- version = "1.1.0";
+ version = "1.1.1";
pname = "strictyaml";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "6b07dbd4f77ab023ed4167c43ffc1b9f9354fb6075cc6ff3b91fefcbb80342ca";
+ sha256 = "ea2bb97aacc12fff7df11bd4cb4ae64b1418a0311fbd1611445cc59dc650bdd3";
};
propagatedBuildInputs = [ ruamel_yaml python-dateutil ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/stripe/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/stripe/default.nix
index 5070d7d1947e..b205f48cb6f9 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/stripe/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/stripe/default.nix
@@ -2,7 +2,7 @@
buildPythonPackage rec {
pname = "stripe";
- version = "2.54.0";
+ version = "2.55.0";
# Tests require network connectivity and there's no easy way to disable
# them. ~ C.
@@ -10,7 +10,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "a622bce0d6d0ac99a53b6e6a6475c39250207d644f28ad0ed276af7b96d12617";
+ sha256 = "2eebf023595e8aa9d65d8b46ccc3c716185bb9625d0e39d3956282fd7525848d";
};
propagatedBuildInputs = [ requests ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/sumtypes/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/sumtypes/default.nix
new file mode 100644
index 000000000000..4a3a22f2780c
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/sumtypes/default.nix
@@ -0,0 +1,23 @@
+{ lib, buildPythonPackage, fetchFromGitHub, attrs, pytestCheckHook }:
+
+buildPythonPackage rec {
+ pname = "sumtypes";
+ version = "0.1a5";
+
+ src = fetchFromGitHub {
+ owner = "radix";
+ repo = "sumtypes";
+ rev = version;
+ sha256 = "0wcw1624xxx2h6lliv13b59blg60j8sgf5v2ni3cwx3j4wld4csr";
+ };
+
+ propagatedBuildInputs = [ attrs ];
+ checkInputs = [ pytestCheckHook ];
+
+ meta = with lib; {
+ description = "Algebraic data types for Python";
+ homepage = "https://github.com/radix/sumtypes";
+ license = licenses.mit;
+ maintainers = with maintainers; [ NieDzejkob ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/supervise_api/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/supervise_api/default.nix
index 687aec08a017..6b10e838e5fb 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/supervise_api/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/supervise_api/default.nix
@@ -5,7 +5,7 @@
, supervise
, isPy3k
, whichcraft
-, utillinux
+, util-linux
}:
buildPythonPackage rec {
@@ -29,7 +29,7 @@ buildPythonPackage rec {
propagatedBuildInputs = lib.optional (!isPy3k) whichcraft;
- checkInputs = [ utillinux ];
+ checkInputs = [ util-linux ];
meta = {
description = "An API for running processes safely and securely";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/sybil/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/sybil/default.nix
index a6f604dea037..3bf6ed95ced1 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/sybil/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/sybil/default.nix
@@ -7,11 +7,11 @@
buildPythonApplication rec {
pname = "sybil";
- version = "1.4.0";
+ version = "2.0.0";
src = fetchPypi {
inherit pname version;
- sha256 = "fc46117619f2f704d1d1b02634fa3285f40479a3008172763b9998fe964f4d11";
+ sha256 = "3e098ae96c4d3668cd5fb04c160334a4bc3ade9d29177e0206846b75f5ff3e91";
};
checkInputs = [ pytest nose ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/symengine/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/symengine/default.nix
index 9b1117a94a17..f225dd431e58 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/symengine/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/symengine/default.nix
@@ -11,13 +11,13 @@
buildPythonPackage rec {
pname = "symengine";
- version = "0.4.0";
+ version = "0.6.1";
src = fetchFromGitHub {
owner = "symengine";
repo = "symengine.py";
rev = "v${version}";
- sha256 = "07i9rwxphi4zgwc7y6f6qvq73iym2cx4k1bpd7rmd3wkpgrrfxqx";
+ sha256 = "13fy25qxn4xwzlr2w35v6jhlpd70lv9r6srv4dizc4brj63hnw50";
};
postConfigure = ''
@@ -28,7 +28,9 @@ buildPythonPackage rec {
--replace "SET(CYTHON_BIN cython" "SET(CYTHON_BIN ${cython}/bin/cython"
'';
- buildInputs = [ cython cmake ];
+ nativeBuildUnputs = [ cmake ];
+
+ buildInputs = [ cython ];
checkInputs = [ pytest sympy ];
@@ -48,6 +50,5 @@ buildPythonPackage rec {
homepage = "https://github.com/symengine/symengine.py";
license = licenses.mit;
maintainers = [ maintainers.costrouc ];
- broken = true;
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/sympy/1_5.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/sympy/1_5.nix
index 3a03fae154d7..00125f43bfc3 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/sympy/1_5.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/sympy/1_5.nix
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "sympy";
- version = "1.5.1"; # Upgrades may break sage. Please test or ping @timokau.
+ version = "1.5.1";
src = fetchPypi {
inherit pname version;
@@ -31,6 +31,6 @@ buildPythonPackage rec {
description = "A Python library for symbolic mathematics";
homepage = "https://www.sympy.org/";
license = licenses.bsd3;
- maintainers = with maintainers; [ lovek323 timokau ];
+ maintainers = with maintainers; [ lovek323 ] ++ teams.sage.members;
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/sympy/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/sympy/default.nix
index 52e2bb5af127..9c3353aa2e74 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/sympy/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/sympy/default.nix
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "sympy";
- version = "1.6.2"; # Upgrades may break sage. Please test or ping @timokau.
+ version = "1.6.2";
src = fetchPypi {
inherit pname version;
@@ -31,6 +31,6 @@ buildPythonPackage rec {
description = "A Python library for symbolic mathematics";
homepage = "https://www.sympy.org/";
license = licenses.bsd3;
- maintainers = with maintainers; [ lovek323 timokau ];
+ maintainers = with maintainers; [ lovek323 ] ++ teams.sage.members;
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/tag-expressions/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/tag-expressions/default.nix
index 7082ca54154b..137759f5a54b 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/tag-expressions/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/tag-expressions/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Package to parse logical tag expressions";
- homepage = "http://github.com/timofurrer/tag-expressions";
+ homepage = "https://github.com/timofurrer/tag-expressions";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ kalbasit ];
};
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/tasklib/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/tasklib/default.nix
index 1f204aecf141..319dd98234d2 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/tasklib/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/tasklib/default.nix
@@ -8,11 +8,11 @@ wsl_stub = writeShellScriptBin "wsl" "true";
in buildPythonPackage rec {
pname = "tasklib";
- version = "2.2.0";
+ version = "2.2.1";
src = fetchPypi {
inherit pname version;
- sha256 = "da66e84614b09443aa67c4dc2922213417329c39511dc5b384d8a5671e29115e";
+ sha256 = "21525a34469928876b64edf8abf79cf788bb3fa796d4554ba22a68bc1f0693f5";
};
propagatedBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix
index ccacb9157e21..20fa793a8a63 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix
@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "telethon-session-sqlalchemy";
- version = "0.2.15";
+ version = "0.2.16";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "2ba603d95d5be6ddecd8ecaeaffba00b75b49dd80eb77f6228dd7b793ca67fd2";
+ sha256 = "f847c57302a102eb88e29ed95b8f4efa69582db2966fd806c21376b9a66ad4a8";
};
propagatedBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/telethon/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/telethon/default.nix
index f8c0661f0cd8..4772c13d9c31 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/telethon/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/telethon/default.nix
@@ -2,16 +2,15 @@
buildPythonPackage rec {
pname = "telethon";
- version = "1.14.0";
+ version = "1.17.5";
src = fetchPypi {
inherit version;
pname = "Telethon";
- sha256 = "1fg12gcg6ca7rjh7m3g48m30cx4aaw5g09855nlyz2sa1kw3gfyq";
+ sha256 = "1v1rgr030z8s1ldv5lm1811znyd568c22pmlrzzf3ls972xk514m";
};
propagatedBuildInputs = [
- async_generator
rsa
pyaes
];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/tempora/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/tempora/default.nix
index 238b250136cb..0536b0f2ccd4 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/tempora/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/tempora/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "tempora";
- version = "4.0.0";
+ version = "4.0.1";
src = fetchPypi {
inherit pname version;
- sha256 = "599a3a910b377f2b544c7b221582ecf4cb049b017c994b37f2b1a9ed1099716e";
+ sha256 = "9af06854fafb26d3d40d3dd6402e8baefaf57f90e48fdc9a94f6b22827a60fb3";
};
disabled = pythonOlder "3.2";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/tensorboardx/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/tensorboardx/default.nix
index d2532777d006..a95f8e029285 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/tensorboardx/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/tensorboardx/default.nix
@@ -19,6 +19,12 @@ buildPythonPackage rec {
propagatedBuildInputs = [ numpy protobuf six ];
+ # apparently torch API changed a bit at 1.6
+ postPatch = ''
+ substituteInPlace tensorboardX/pytorch_graph.py --replace "torch.onnx.set_training(model, False)" "torch.onnx.select_model_mode_for_export(model, torch.onnx.TrainingMode.EVAL)"
+ '';
+
+
disabledTests = [ "test_TorchVis" "test_onnx_graph" ];
meta = with lib; {
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/tensorflow-probability/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/tensorflow-probability/default.nix
index 763679190592..a89c6fa307ea 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/tensorflow-probability/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/tensorflow-probability/default.nix
@@ -31,7 +31,7 @@ let
src = fetchFromGitHub {
owner = "tensorflow";
repo = "probability";
- rev = "${version}";
+ rev = version;
sha256 = "07cm8zba8n0ihzdm3k4a4rsg5v62xxsfvcw4h0niz91c0parqjqy";
};
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/tensorflow/1/bin.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/tensorflow/1/bin.nix
index 9bd2bc78437a..5c93e957f7c1 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/tensorflow/1/bin.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/tensorflow/1/bin.nix
@@ -2,7 +2,7 @@
, lib
, fetchurl
, buildPythonPackage
-, isPy3k, pythonOlder, isPy38
+, isPy3k, pythonOlder, pythonAtLeast
, astor
, gast
, google-pasta
@@ -50,8 +50,7 @@ in buildPythonPackage {
inherit pname;
inherit (packages) version;
format = "wheel";
-
- disabled = isPy38;
+ disabled = pythonAtLeast "3.8";
src = let
pyVerNoDot = lib.strings.stringAsChars (x: if x == "." then "" else x) python.pythonVersion;
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/tensorflow/1/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/tensorflow/1/default.nix
index 5df3ad32afb4..599f809f8646 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/tensorflow/1/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/tensorflow/1/default.nix
@@ -445,5 +445,7 @@ in buildPythonPackage {
libtensorflow = bazel-build.out;
};
- inherit (bazel-build) meta;
+ meta = bazel-build.meta // {
+ broken = gast.version != "0.3.2";
+ };
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/tensorflow/2/bin.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/tensorflow/2/bin.nix
index acb5f473ec9d..8dd282666a75 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/tensorflow/2/bin.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/tensorflow/2/bin.nix
@@ -2,7 +2,7 @@
, lib
, fetchurl
, buildPythonPackage
-, isPy3k, pythonOlder, isPy38
+, isPy3k, pythonOlder, pythonAtLeast, isPy38
, astor
, gast
, google-pasta
@@ -54,7 +54,7 @@ in buildPythonPackage {
inherit (packages) version;
format = "wheel";
- disabled = isPy38;
+ disabled = pythonAtLeast "3.8";
src = let
pyVerNoDot = lib.strings.stringAsChars (x: if x == "." then "" else x) python.pythonVersion;
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/tensorflow/2/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/tensorflow/2/default.nix
index bd049a9a2ca6..bcf693691785 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/tensorflow/2/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/tensorflow/2/default.nix
@@ -22,7 +22,7 @@
# XLA without CUDA is broken
, xlaSupport ? cudaSupport
# Default from ./configure script
-, cudaCapabilities ? [ "3.5" "5.2" ]
+, cudaCapabilities ? [ "sm_35" "sm_50" "sm_60" "sm_70" "sm_75" "compute_80" ]
, sse42Support ? stdenv.hostPlatform.sse4_2Support
, avx2Support ? stdenv.hostPlatform.avx2Support
, fmaSupport ? stdenv.hostPlatform.fmaSupport
@@ -72,7 +72,7 @@ let
tfFeature = x: if x then "1" else "0";
- version = "2.3.0";
+ version = "2.3.1";
variant = if cudaSupport then "-gpu" else "";
pname = "tensorflow${variant}";
@@ -103,7 +103,7 @@ let
owner = "tensorflow";
repo = "tensorflow";
rev = "v${version}";
- sha256 = "1dd5fgyiazyfy7y2iv4v42qnap51fr6dzwb26inrsj7aaas06j71";
+ sha256 = "1lvmrqfnwzh24fl5rdkksiqfv2bn0ld5gvzq1z57rphfkf0zg996";
};
patches = [
@@ -117,12 +117,6 @@ let
url = "https://github.com/tensorflow/tensorflow/commit/75ea0b31477d6ba9e990e296bbbd8ca4e7eebadf.patch";
sha256 = "1xp1icacig0xm0nmb05sbrf4nw4xbln9fhc308birrv8286zx7wv";
})
-
- # see https://github.com/tensorflow/tensorflow/issues/40884
- (fetchpatch {
- url = "https://github.com/tensorflow/tensorflow/pull/41867/commits/65341f73d110bf173325768947343e1bb8f699fc.patch";
- sha256 = "18ykkycaag1pcarz53bz6ydxjlah92j4178qn58gcayx1fy7hvh3";
- })
];
# On update, it can be useful to steal the changes from gentoo
@@ -287,9 +281,9 @@ let
# cudaSupport causes fetch of ncclArchive, resulting in different hashes
sha256 = if cudaSupport then
- "0pf8128chkm6fxnhd4956n6gvijlj00mjmvry33gq3xx3bayhs9g"
+ "11blnw3ghp1kdi9hh9pdqa4qni9ysc3nk9iqqk9bg4dlr9zl1yld"
else
- "0mkgss2nyk21zlj8hp24cs3dmpdnxk8qi6qq4hyc18lp82p09xwa";
+ "1kkghhwhl8frs68kv28r408lps7mpgq1xvq6hc3k0j35asv1g2kc";
};
buildAttrs = {
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/terminado/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/terminado/default.nix
index 51e9b98db5bb..400751529ab6 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/terminado/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/terminado/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "terminado";
- version = "0.8.3";
+ version = "0.9.1";
src = fetchPypi {
inherit pname version;
- sha256 = "4804a774f802306a7d9af7322193c5390f1da0abb429e082a10ef1d46e6fb2c2";
+ sha256 = "3da72a155b807b01c9e8a5babd214e052a0a45a975751da3521a1c3381ce6d76";
};
propagatedBuildInputs = [ ptyprocess tornado ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/testfixtures/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/testfixtures/default.nix
index 7c875ec05918..b9803b115083 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/testfixtures/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/testfixtures/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "testfixtures";
- version = "6.14.1";
+ version = "6.15.0";
src = fetchPypi {
inherit pname version;
- sha256 = "0rh38zj8wywgqlsi5j75c7drpqhkrg50qknj1kdmvg4kdlab7ljq";
+ sha256 = "409f77cfbdad822d12a8ce5c4aa8fb4d0bb38073f4a5444fede3702716a2cec2";
};
checkInputs = [ pytest mock sybil zope_component twisted ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/textacy/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/textacy/default.nix
index 2079dc1b9434..616db71a94f4 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/textacy/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/textacy/default.nix
@@ -17,12 +17,12 @@
buildPythonPackage rec {
pname = "textacy";
- version = "0.10.0";
+ version = "0.10.1";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "0a824333f53d19d24ca864c92da52f3fecd412f4ef3e1448864c45f06189fd6d";
+ sha256 = "ff72adc6dbb85db6981324e226fff77830da57d7fe7e4adb2cafd9dc2a8bfa7d";
};
propagatedBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/tflearn/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/tflearn/default.nix
index 03185ae4d9fe..91a92d6b8de4 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/tflearn/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/tflearn/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "tflearn";
- version = "0.3.2";
+ version = "0.5.0";
src = fetchPypi {
inherit pname version;
- sha256 = "034lvbslcivyj64r4w6xmr90ckmyxmrnkka9kal50x4175h02n1z";
+ sha256 = "818aa57667693810415dc203ba3f75f1541e931a8dc30b6e8b21563541a70388";
};
buildInputs = [ pytest ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/thinc/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/thinc/default.nix
index 9272e25a1ba3..6e0fbcce37a6 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/thinc/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/thinc/default.nix
@@ -23,11 +23,11 @@
buildPythonPackage rec {
pname = "thinc";
- version = "7.4.1";
+ version = "7.4.3";
src = fetchPypi {
inherit pname version;
- sha256 = "17lampllwq50yjl2djs9bs5rp29xw55gqj762npqi3cvvj2glf81";
+ sha256 = "c98491b083165f48bda95f5533f7d9dbd3980d32ad621bfe579ff08ef625a4d3";
};
buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/tifffile/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/tifffile/default.nix
index 77187f42b5e4..9383cf947c20 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/tifffile/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/tifffile/default.nix
@@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "tifffile";
- version = "2020.8.25";
+ version = "2020.11.26";
src = fetchPypi {
inherit pname version;
- sha256 = "b51e496bd9ee9c6875170a018bdb7b6f67e3946c4ab57afdb95b18b2c6937783";
+ sha256 = "c712df6f201385fbd3500e26e45dc20fabcbb0c6c1fbfb4c1e44538a9d0269a8";
};
patches = lib.optional isPy27 ./python2-regex-compat.patch;
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/timeout-decorator/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/timeout-decorator/default.nix
index bf37e671cd13..d3b4a58c17e3 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/timeout-decorator/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/timeout-decorator/default.nix
@@ -1,11 +1,11 @@
{ stdenv, buildPythonPackage, fetchPypi }:
buildPythonPackage rec {
pname = "timeout-decorator";
- version = "0.4.1";
+ version = "0.5.0";
src = fetchPypi {
inherit pname version;
- sha256 = "1inkf68i2s2x27arpqwkdxigiqbpbpjbbnfv7jzsrif1fmp2fphs";
+ sha256 = "6a2f2f58db1c5b24a2cc79de6345760377ad8bdc13813f5265f6c3e63d16b3d7";
};
meta = with stdenv.lib; {
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/timezonefinder/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/timezonefinder/default.nix
index ca07b50ceff8..0ba9c4c53d8f 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/timezonefinder/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/timezonefinder/default.nix
@@ -10,13 +10,13 @@
buildPythonPackage rec {
pname = "timezonefinder";
- version = "4.4.1";
+ version = "4.5.0";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "c84e0f4b501419349e67972d25c535d9b5fd6c100c319747049b67812a4c6b97";
+ sha256 = "99b0cea5abf304e8738ecf5cceae0c0e5182534843f19638a26a220fa212fbad";
};
propagatedBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/tinyobjloader-py/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/tinyobjloader-py/default.nix
new file mode 100644
index 000000000000..3c36dded5ee7
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/tinyobjloader-py/default.nix
@@ -0,0 +1,21 @@
+{ lib, buildPythonPackage, pybind11, tinyobjloader }:
+
+buildPythonPackage rec {
+ pname = "tinyobjloader-py";
+ inherit (tinyobjloader) version src;
+
+ # Build needs headers from ${src}, setting sourceRoot or fetching from pypi won't work.
+ preConfigure = ''
+ cd python
+ '';
+
+ buildInputs = [ pybind11 ];
+
+ # No tests are included upstream
+ doCheck = false;
+ pythonImportsCheck = [ "tinyobjloader" ];
+
+ meta = with lib; tinyobjloader.meta // {
+ description = "Python wrapper for the C++ wavefront .obj loader tinyobjloader";
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/tld/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/tld/default.nix
index a8d00d075142..43a2e46dcfb9 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/tld/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/tld/default.nix
@@ -2,11 +2,11 @@
python.pkgs.buildPythonPackage rec {
pname = "tld";
- version = "0.12.2";
+ version = "0.12.3";
src = fetchPypi {
inherit pname version;
- sha256 = "cf8410a7ed7b9477f563fa158dabef5117d8374cba55f65142ba0af6dcd15d4d";
+ sha256 = "1959d0db03b7644f5528748f348d5eecdcd27120a8bb4ef00d932b1b1acdf13d";
};
propagatedBuildInputs = with python.pkgs; [ six ];
@@ -33,7 +33,7 @@ python.pkgs.buildPythonPackage rec {
homepage = "https://github.com/barseghyanartur/tld";
description = "Extracts the top level domain (TLD) from the URL given";
license = licenses.lgpl21;
- maintainers = with maintainers; [ genesis ];
+ maintainers = with maintainers; [ ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/tldextract/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/tldextract/default.nix
index b7df857533a0..02359ce67a59 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/tldextract/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/tldextract/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "tldextract";
- version = "2.2.3";
+ version = "3.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "ab0e38977a129c72729476d5f8c85a8e1f8e49e9202e1db8dca76e95da7be9a8";
+ sha256 = "cfae9bc8bda37c3e8c7c8639711ad20e95dc85b207a256b60b0b23d7ff5540ea";
};
propagatedBuildInputs = [ requests requests-file idna ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/tmdb3/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/tmdb3/default.nix
index 47247c6911d6..36a88ea22e49 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/tmdb3/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/tmdb3/default.nix
@@ -1,8 +1,9 @@
-{ lib, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi, isPy3k }:
buildPythonPackage rec {
pname = "tmdb3";
version = "0.7.2";
+ disabled = isPy3k; # Upstream has not received any updates since 2015, and importing from python3 does not work.
src = fetchPypi {
inherit pname version;
@@ -12,6 +13,8 @@ buildPythonPackage rec {
# no tests implemented
doCheck = false;
+ pythonImportsCheck = [ "tmdb3" ];
+
meta = with lib; {
description = "Python implementation of the v3 API for TheMovieDB.org, allowing access to movie and cast information";
homepage = "https://pypi.python.org/pypi/tmdb3";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/tokenizers/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/tokenizers/default.nix
index d650f350bd28..4e5aacd6c7ac 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/tokenizers/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/tokenizers/default.nix
@@ -2,10 +2,12 @@
, rustPlatform
, fetchFromGitHub
, fetchurl
-, maturin
, pipInstallHook
-, pytest
+, setuptools-rust
+, wheel
+, numpy
, python
+, pytestCheckHook
, requests
}:
@@ -18,10 +20,26 @@ let
url = "https://s3.amazonaws.com/models.huggingface.co/bert/roberta-base-merges.txt";
sha256 = "1idd4rvkpqqbks51i2vjbd928inw7slij9l4r063w3y5fd3ndq8w";
};
+ albertVocab = fetchurl {
+ url = "https://s3.amazonaws.com/models.huggingface.co/bert/albert-base-v1-tokenizer.json";
+ sha256 = "1hra9pn8rczx7378z88zjclw2qsdrdwq20m56sy42s2crbas6akf";
+ };
bertVocab = fetchurl {
url = "https://s3.amazonaws.com/models.huggingface.co/bert/bert-base-uncased-vocab.txt";
sha256 = "18rq42cmqa8zanydsbzrb34xwy4l6cz1y900r4kls57cbhvyvv07";
};
+ norvigBig = fetchurl {
+ url = "https://norvig.com/big.txt";
+ sha256 = "0yz80icdly7na03cfpl0nfk5h3j3cam55rj486n03wph81ynq1ps";
+ };
+ docPipelineTokenizer = fetchurl {
+ url = "https://s3.amazonaws.com/models.huggingface.co/bert/anthony/doc-pipeline/tokenizer.json";
+ hash = "sha256-i533xC8J5CDMNxBjo+p6avIM8UOcui8RmGAmK0GmfBc=";
+ };
+ docQuicktourTokenizer = fetchurl {
+ url = "https://s3.amazonaws.com/models.huggingface.co/bert/anthony/doc-quicktour/tokenizer.json";
+ hash = "sha256-ipY9d5DR5nxoO6kj7rItueZ9AO5wq9+Nzr6GuEIfIBI=";
+ };
openaiVocab = fetchurl {
url = "https://s3.amazonaws.com/models.huggingface.co/bert/openai-gpt-vocab.json";
sha256 = "0y40gc9bixj5rxv674br1rxmxkd3ly29p80x1596h8yywwcrpx7x";
@@ -32,38 +50,34 @@ let
};
in rustPlatform.buildRustPackage rec {
pname = "tokenizers";
- version = "0.8.1";
+ version = "0.9.4";
src = fetchFromGitHub {
owner = "huggingface";
repo = pname;
rev = "python-v${version}";
- sha256 = "0sxdwx05hr87j2z32rk4rgwn6a26w9r7m5fgj6ah1sgagiiyxbjw";
+ hash = "sha256-JXoH9yfhMIFg5qDY5zrF6iWb7XKugjMfk1NxSizfaWg=";
};
- # Update parking_lot to be compatible with recent Rust versions, that
- # replace asm! by llvm_asm!:
- #
- # https://github.com/Amanieu/parking_lot/pull/223
- #
- # Remove once upstream updates this dependency.
- cargoPatches = [ ./update-parking-lot.diff ];
-
- cargoSha256 = "0cdkxmj8z2wdspn6r62lqlpvd0sj1z0cmb1zpqaajxvr0b2kjlj8";
+ cargoSha256 = "sha256-u9qitrOxJSABs0VjwHUZgmw7VTQXNbp6l8fKKE/RQ7M=";
sourceRoot = "source/bindings/python";
nativeBuildInputs = [
- maturin
pipInstallHook
+ setuptools-rust
+ wheel
];
propagatedBuildInputs = [
+ numpy
python
];
- # tokenizers uses pyo3, which requires Rust nightly.
- RUSTC_BOOTSTRAP = 1;
+ installCheckInputs = [
+ pytestCheckHook
+ requests
+ ];
doCheck = false;
doInstallCheck = true;
@@ -74,51 +88,23 @@ in rustPlatform.buildRustPackage rec {
( cd $sourceRoot/tests/data
ln -s ${robertaVocab} roberta-base-vocab.json
ln -s ${robertaMerges} roberta-base-merges.txt
+ ln -s ${albertVocab} albert-base-v1-tokenizer.json
ln -s ${bertVocab} bert-base-uncased-vocab.txt
+ ln -s ${docPipelineTokenizer} bert-wiki.json
+ ln -s ${docQuicktourTokenizer} tokenizer-wiki.json
+ ln -s ${norvigBig} big.txt
ln -s ${openaiVocab} openai-gpt-vocab.json
ln -s ${openaiMerges} openai-gpt-merges.txt )
'';
- postPatch = ''
- # pyo3's build check verifies that Rust is a nightly
- # version. Disable this check.
- substituteInPlace $NIX_BUILD_TOP/$cargoDepsCopy/pyo3/build.rs \
- --replace "check_rustc_version()?;" ""
-
- # Patching the vendored dependency invalidates the file
- # checksums, so remove them. This should be safe, since
- # this is just a copy of the vendored dependencies and
- # the integrity of the vendored dependencies is validated
- # by cargoSha256.
- sed -r -i 's|"files":\{[^}]+\}|"files":{}|' \
- $NIX_BUILD_TOP/$cargoDepsCopy/pyo3/.cargo-checksum.json
-
- # Maturin uses the crate name as the wheel name.
- substituteInPlace Cargo.toml \
- --replace "tokenizers-python" "tokenizers"
- '';
-
buildPhase = ''
- maturin build --release --manylinux off
+ ${python.interpreter} setup.py bdist_wheel
'';
installPhase = ''
- # Put the wheels where the pip install hook can find them.
- install -Dm644 -t dist target/wheels/*.whl
pipInstallPhase
'';
- installCheckInputs = [
- pytest
- requests
- ];
-
- installCheckPhase = ''
- # Append paths, or the binding's tokenizer module will be
- # used, since the test directories have __init__.py
- pytest --import-mode=append
- '';
-
meta = with stdenv.lib; {
homepage = "https://github.com/huggingface/tokenizers";
description = "Fast State-of-the-Art Tokenizers optimized for Research and Production";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/tokenizers/update-parking-lot.diff b/infra/libkookie/nixpkgs/pkgs/development/python-modules/tokenizers/update-parking-lot.diff
deleted file mode 100644
index d8f144465ac9..000000000000
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/tokenizers/update-parking-lot.diff
+++ /dev/null
@@ -1,63 +0,0 @@
-diff --git a/bindings/python/Cargo.lock b/bindings/python/Cargo.lock
-index f50db71..ea71817 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -269,7 +269,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
-
- [[package]]
- name = "lock_api"
--version = "0.3.3"
-+version = "0.3.4"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- dependencies = [
- "scopeguard 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-@@ -337,16 +337,16 @@ dependencies = [
-
- [[package]]
- name = "parking_lot"
--version = "0.10.0"
-+version = "0.10.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- dependencies = [
-- "lock_api 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
-- "parking_lot_core 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "lock_api 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "parking_lot_core 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
- ]
-
- [[package]]
- name = "parking_lot_core"
--version = "0.7.0"
-+version = "0.7.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- dependencies = [
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-@@ -409,7 +409,7 @@ dependencies = [
- "inventory 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
-- "parking_lot 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "parking_lot 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "paste 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "pyo3cls 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 1.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
-@@ -768,7 +768,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- "checksum itoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "b8b7a7c0c47db5545ed3fef7468ee7bb5b74691498139e4b3f6a20685dc6dd8e"
- "checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
- "checksum libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)" = "dea0c0405123bba743ee3f91f49b1c7cfb684eef0da0a50110f758ccf24cdff0"
--"checksum lock_api 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "79b2de95ecb4691949fea4716ca53cdbcfccb2c612e19644a8bad05edcf9f47b"
-+"checksum lock_api 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "c4da24a77a3d8a6d4862d95f72e6fdb9c09a643ecdb402d754004a557f2bec75"
- "checksum maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
- "checksum memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400"
- "checksum memoffset 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b4fc2c02a7e374099d4ee95a193111f72d2110197fe200272371758f6c3643d8"
-@@ -777,8 +777,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- "checksum number_prefix 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "17b02fc0ff9a9e4b35b3342880f48e896ebf69f2967921fe8646bf5b7125956a"
- "checksum onig 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bd91ccd8a02fce2f7e8a86655aec67bc6c171e6f8e704118a0e8c4b866a05a8a"
- "checksum onig_sys 69.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3814583fad89f3c60ae0701d80e87e1fd3028741723deda72d0d4a0ecf0cb0db"
--"checksum parking_lot 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "92e98c49ab0b7ce5b222f2cc9193fc4efe11c6d0bd4f648e374684a6857b1cfc"
--"checksum parking_lot_core 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7582838484df45743c8434fbff785e8edf260c28748353d44bc0da32e0ceabf1"
-+"checksum parking_lot 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d3a704eb390aafdc107b0e392f56a82b668e3a71366993b5340f5833fd62505e"
-+"checksum parking_lot_core 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d58c7c768d4ba344e3e8d72518ac13e259d7c7ade24167003b8488e10b6740a3"
- "checksum paste 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ab4fb1930692d1b6a9cfabdde3d06ea0a7d186518e2f4d67660d8970e2fa647a"
- "checksum paste-impl 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "a62486e111e571b1e93b710b61e8f493c0013be39629b714cb166bdb06aa5a8a"
- "checksum pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677"
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/tokenlib/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/tokenlib/default.nix
index 0ffb5ce0cb73..7c8e99cc399a 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/tokenlib/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/tokenlib/default.nix
@@ -1,6 +1,6 @@
{ stdenv
, buildPythonPackage
-, fetchgit
+, fetchFromGitHub
, requests
, webob
}:
@@ -9,8 +9,9 @@ buildPythonPackage rec {
pname = "tokenlib";
version = "0.3.1";
- src = fetchgit {
- url = "https://github.com/mozilla-services/tokenlib.git";
+ src = fetchFromGitHub {
+ owner = "mozilla-services";
+ repo = pname;
rev = "refs/tags/${version}";
sha256 = "0bq6dqyfwh29pg8ngmrm4mx4q27an9lsj0p9l79p9snn4g2rxzc8";
};
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/toml/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/toml/default.nix
index 8e96efcdf444..96c6635771c7 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/toml/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/toml/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "toml";
- version = "0.10.1";
+ version = "0.10.2";
src = fetchPypi {
inherit pname version;
- sha256 = "926b612be1e5ce0634a2ca03470f95169cf16f939018233a670519cb4ac58b0f";
+ sha256 = "b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f";
};
# This package has a test script (built for Travis) that involves a)
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/toolz/2.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/toolz/2.nix
new file mode 100644
index 000000000000..8c8a64db3a5e
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/toolz/2.nix
@@ -0,0 +1,28 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, nose
+}:
+
+buildPythonPackage rec {
+ pname = "toolz";
+ version = "0.10.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "08fdd5ef7c96480ad11c12d472de21acd32359996f69a5259299b540feba4560";
+ };
+
+ checkInputs = [ nose ];
+
+ checkPhase = ''
+ nosetests toolz/tests
+ '';
+
+ meta = with lib; {
+ homepage = "https://github.com/pytoolz/toolz";
+ description = "List processing tools and functional utilities";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ fridh ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/toolz/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/toolz/default.nix
index e0039057d828..6100d2a7c53d 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/toolz/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/toolz/default.nix
@@ -6,18 +6,16 @@
buildPythonPackage rec {
pname = "toolz";
- version = "0.10.0";
+ version = "0.11.1";
src = fetchPypi {
inherit pname version;
- sha256 = "08fdd5ef7c96480ad11c12d472de21acd32359996f69a5259299b540feba4560";
+ sha256 = "1grz3zvw5ixwqqlbv0n7j11mlcxb66cirh5i9x9zw8kqy0hpk967";
};
checkInputs = [ nose ];
checkPhase = ''
- # https://github.com/pytoolz/toolz/issues/357
- rm toolz/tests/test_serialization.py
nosetests toolz/tests
'';
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/tornado/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/tornado/default.nix
index 8d9cadeb3e54..893943cbc720 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/tornado/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/tornado/default.nix
@@ -6,7 +6,7 @@
buildPythonPackage rec {
pname = "tornado";
- version = "6.0.4";
+ version = "6.1";
# We specify the name of the test files to prevent
# https://github.com/NixOS/nixpkgs/issues/14634
@@ -16,7 +16,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "0fe2d45ba43b00a41cd73f8be321a44936dc1aba233dee979f17a042b83eb6dc";
+ sha256 = "33c6e81d7bd55b468d2e793517c909b139960b6c790a60b7991b9b6b76fb9791";
};
__darwinAllowLocalNetworking = true;
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/tox/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/tox/default.nix
index 40883928f565..9dad7d77ff90 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/tox/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/tox/default.nix
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "tox";
- version = "3.19.0";
+ version = "3.20.1";
buildInputs = [ setuptools_scm ];
propagatedBuildInputs = [ packaging pluggy py six virtualenv toml filelock ];
@@ -22,7 +22,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "17e61a93afe5c49281fb969ab71f7a3f22d7586d1c56f9a74219910f356fe7d3";
+ sha256 = "4321052bfe28f9d85082341ca8e233e3ea901fdd14dab8a5d3fbd810269fbaf6";
};
meta = with lib; {
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/tqdm/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/tqdm/default.nix
index c83f6159fde8..5df20826dc76 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/tqdm/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/tqdm/default.nix
@@ -5,30 +5,30 @@
, coverage
, glibcLocales
, flake8
+, setuptools_scm
+, pytestCheckHook
}:
buildPythonPackage rec {
pname = "tqdm";
- version = "4.48.2";
+ version = "4.54.0";
src = fetchPypi {
inherit pname version;
- sha256 = "564d632ea2b9cb52979f7956e093e831c28d441c11751682f84c86fc46e4fd21";
+ sha256 = "5c0d04e06ccc0da1bd3fa5ae4550effcce42fcad947b4a6cafa77bdc9b09ff22";
};
- checkInputs = [ nose coverage glibcLocales flake8 ];
+ nativeBuildInputs = [
+ setuptools_scm
+ ];
- postPatch = ''
- # Remove performance testing.
- # Too sensitive for on Hydra.
- rm tqdm/tests/tests_perf.py
- '';
+ checkInputs = [ nose coverage glibcLocales flake8 pytestCheckHook ];
- LC_ALL="en_US.UTF-8";
+ # Remove performance testing.
+ # Too sensitive for on Hydra.
+ PYTEST_ADDOPTS = "-k \"not perf\"";
-# doCheck = !stdenv.isDarwin;
- # Test suite is too big and slow.
- doCheck = false;
+ LC_ALL="en_US.UTF-8";
meta = {
description = "A Fast, Extensible Progress Meter";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/tracing/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/tracing/default.nix
index 2d91ae6a1378..6f9091d8517f 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/tracing/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/tracing/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
doCheck = false;
meta = with stdenv.lib; {
- homepage = "http://liw.fi/tracing/";
+ homepage = "https://liw.fi/tracing/";
description = "Python debug logging helper";
license = licenses.gpl3;
maintainers = [];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/traitlets/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/traitlets/default.nix
index 001106328085..bfbb297cdc08 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/traitlets/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/traitlets/default.nix
@@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "traitlets";
- version = "4.3.3";
+ version = "5.0.5";
src = fetchPypi {
inherit pname version;
- sha256 = "d023ee369ddd2763310e4c3eae1ff649689440d4ae59d7485eb4cfbbe3e359f7";
+ sha256 = "178f4ce988f69189f7e523337a3e11d91c786ded9360174a3d9ca83e79bc5396";
};
checkInputs = [ glibcLocales pytest mock ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/traitsui/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/traitsui/default.nix
index 01788f63d4f4..e76a36bcf4f9 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/traitsui/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/traitsui/default.nix
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "traitsui";
- version = "7.0.1";
+ version = "7.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "74fb4db848ac1343241fa4dc5d9bf3fab561f309826c602e8a3568309df91fe3";
+ sha256 = "b699aeea588b55723860ddc6b2bd9b5013c4a72e18d1bbf51c6689cc7c6a562a";
};
propagatedBuildInputs = [ traits pyface six ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/transformers/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/transformers/default.nix
index fdb807bd0a1e..39fd7a11d0df 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/transformers/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/transformers/default.nix
@@ -2,13 +2,14 @@
, stdenv
, fetchFromGitHub
, boto3
+, cookiecutter
, filelock
, regex
, requests
, numpy
, parameterized
+, protobuf
, sacremoses
-, sentencepiece
, timeout-decorator
, tokenizers
, tqdm
@@ -17,23 +18,23 @@
buildPythonPackage rec {
pname = "transformers";
- version = "3.3.1";
+ version = "4.0.0";
src = fetchFromGitHub {
owner = "huggingface";
repo = pname;
rev = "v${version}";
- sha256 = "1j9nzhl0zw5z9rnvzfih7v6bax353rxp05b3f0cvkii3b5dbkc2j";
+ sha256 = "17djq32pq8d6vqip7i9pda0ldigmzckbbcd278llmpxdriqd4llg";
};
propagatedBuildInputs = [
- boto3
+ cookiecutter
filelock
numpy
+ protobuf
regex
requests
sacremoses
- sentencepiece
tokenizers
tqdm
];
@@ -46,7 +47,7 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace setup.py \
- --replace "tokenizers == 0.8.1.rc2" "tokenizers>=0.8"
+ --replace "tokenizers == 0.9.4" "tokenizers"
'';
preCheck = ''
@@ -67,11 +68,15 @@ buildPythonPackage rec {
# Disable tests that require network access.
disabledTests = [
- "PegasusTokenizationTest"
- "T5TokenizationTest"
+ "BlenderbotSmallTokenizerTest"
+ "Blenderbot3BTokenizerTests"
+ "GetFromCacheTests"
+ "TokenizationTest"
+ "TestTokenizationBart"
"test_all_tokenizers"
"test_batch_encoding_is_fast"
"test_batch_encoding_pickle"
+ "test_batch_encoding_word_to_tokens"
"test_config_from_model_shortcut"
"test_config_model_type_from_model_identifier"
"test_from_pretrained_use_fast_toggle"
@@ -86,6 +91,7 @@ buildPythonPackage rec {
"test_tokenizer_from_pretrained"
"test_tokenizer_from_tokenizer_class"
"test_tokenizer_identifier_with_correct_config"
+ "test_tokenizer_identifier_non_existent"
];
meta = with stdenv.lib; {
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/transitions/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/transitions/default.nix
index a8e84acc2dfd..2691890a5ee1 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/transitions/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/transitions/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "transitions";
- version = "0.8.2";
+ version = "0.8.5";
src = fetchPypi {
inherit pname version;
- sha256 = "0j3pswbckrhd6plblb0bwzsbvk50nqmxq6dvjclvcr5cljzs7xvg";
+ sha256 = "e441c66a0c753d56c01c3e5e547f21dbe4a5569c939f12477475c5e81d79769b";
};
postPatch = ''
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/trezor/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/trezor/default.nix
index 0e0c6da021fb..bb85ca6b6f3c 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/trezor/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/trezor/default.nix
@@ -1,4 +1,5 @@
-{ lib
+{ stdenv
+, lib
, buildPythonPackage
, fetchPypi
, isPy3k
@@ -49,6 +50,7 @@ buildPythonPackage rec {
rlp
shamir-mnemonic
typing-extensions
+ ] ++ lib.optionals stdenv.isLinux [
trezor-udev-rules
];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/trimesh/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/trimesh/default.nix
index ed9e1e06e3f4..91c1ec38e9a6 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/trimesh/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/trimesh/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "trimesh";
- version = "3.8.11";
+ version = "3.8.15";
src = fetchPypi {
inherit pname version;
- sha256 = "790b4804227825a985189e0788cf57dbfcf1ee39f30f767176722ad572da27de";
+ sha256 = "3ab9c15e53916fd68d0c0ca9b46d95693d3238f164ffcf528a974c6e15cd353e";
};
propagatedBuildInputs = [ numpy ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/trytond/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/trytond/default.nix
index 38b7346896c0..781604fb9b0f 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/trytond/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/trytond/default.nix
@@ -25,12 +25,12 @@ with stdenv.lib;
buildPythonApplication rec {
pname = "trytond";
- version = "5.6.7";
+ version = "5.8.1";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
- sha256 = "aca005639931835f4f0eaa92ae48ffebb94551af91649a96018694ea448ca0ae";
+ sha256 = "9c1afca73b13ede07680015d69f611c7dec33b8c22565de70f0cbbf0464b8db7";
};
# Tells the tests which database to use
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/ttystatus/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/ttystatus/default.nix
index 8cf8c426b3b9..a76a5f8df383 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/ttystatus/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/ttystatus/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
doCheck = false;
meta = with stdenv.lib; {
- homepage = "http://liw.fi/ttystatus/";
+ homepage = "https://liw.fi/ttystatus/";
description = "Progress and status updates on terminals for Python";
license = licenses.gpl3;
maintainers = [];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/tubeup/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/tubeup/default.nix
index d25180948a32..297642599107 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/tubeup/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/tubeup/default.nix
@@ -2,27 +2,27 @@
, buildPythonPackage
, internetarchive
, fetchPypi
-, youtube-dl
+, youtube-dlc
, docopt
, isPy27
}:
buildPythonPackage rec {
pname = "tubeup";
- version = "0.0.19";
+ version = "0.0.20";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "6e3ebbf677a43018bfd71070919187bd57120010b0d708c0494c0f17bb72e84e";
+ sha256 = "8bf4004629b8427173c8259e1a09065db99135d6cc390b70a8a67b52a34a3f67";
};
postPatch = ''
substituteInPlace setup.py --replace "docopt==0.6.2" "docopt"
'';
- propagatedBuildInputs = [ internetarchive docopt youtube-dl ];
+ propagatedBuildInputs = [ internetarchive docopt youtube-dlc ];
pythonImportsCheck = [ "tubeup" ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/tvnamer/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/tvnamer/default.nix
index 2dc819ac63e0..81fa2e61b02a 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/tvnamer/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/tvnamer/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "tvnamer";
- version = "3.0.1";
+ version = "3.0.2";
src = fetchPypi {
inherit pname version;
- sha256 = "5512cebb1e49103a1e4ea9629398092b4bbabef35a91007ae0dbed961ebe17dd";
+ sha256 = "a5ff916e104b2c0b567c2c7f2d8ae15a66a7ac57d67390e7c67207a33b79022f";
};
checkInputs = [ pytest ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/txdbus/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/txdbus/default.nix
index 636e19b39bab..f6bc44981fb1 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/txdbus/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/txdbus/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "txdbus";
- version = "1.1.1";
+ version = "1.1.2";
src = fetchPypi {
inherit pname version;
- sha256 = "eefcffa4efbf82ba11222f17f5989fe1b2b6ef57226ef896c4a7084c990ba217";
+ sha256 = "8375a5fb68a12054f0def91af800c821fb2232949337756ed975f88d8ea2bc97";
};
propagatedBuildInputs = [ six twisted ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/typeguard/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/typeguard/default.nix
index 2f0617731e10..ee36a6dab810 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/typeguard/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/typeguard/default.nix
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "typeguard";
- version = "2.9.1";
+ version = "2.10.0";
src = fetchPypi {
inherit pname version;
- sha256 = "123jnq7igm26a5347jf2j60bww9g84l80f208dzlbk49h7cg77jj";
+ sha256 = "d830132dcd544d3f8a2a842ea739eaa0d7c099fcebb9dcdf3802f4c9929d8191";
};
buildInputs = [ setuptools_scm ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/u-msgpack-python/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/u-msgpack-python/default.nix
index ef4fe47b7a27..f44b7db455b1 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/u-msgpack-python/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/u-msgpack-python/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "u-msgpack-python";
- version = "2.7.0";
+ version = "2.7.1";
src = fetchPypi {
inherit pname version;
- sha256 = "996e4c4454771f0ff0fd2a7566b1a159d305d3611cd755addf444e3533e2bc54";
+ sha256 = "b7e7d433cab77171a4c752875d91836f3040306bab5063fb6dbe11f64ea69551";
};
LC_ALL="en_US.UTF-8";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/uamqp/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/uamqp/default.nix
index 47a0d6cc2699..a0d24785eb69 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/uamqp/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/uamqp/default.nix
@@ -41,6 +41,6 @@ buildPythonPackage rec {
description = "An AMQP 1.0 client library for Python";
homepage = "https://github.com/Azure/azure-uamqp-python";
license = licenses.mit;
- maintainers = with maintainers; [ mwilsoninsight ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/ueberzug/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/ueberzug/default.nix
index d80009e64788..c1672849c965 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/ueberzug/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/ueberzug/default.nix
@@ -20,6 +20,6 @@ buildPythonPackage rec {
homepage = "https://github.com/seebye/ueberzug";
description = "An alternative for w3mimgdisplay";
license = licenses.gpl3;
- maintainers = with maintainers; [ filalex77 ];
+ maintainers = with maintainers; [ Br1ght0ne ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/ufonormalizer/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/ufonormalizer/default.nix
index 1fbed4ad1aa5..770407736a06 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/ufonormalizer/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/ufonormalizer/default.nix
@@ -1,15 +1,19 @@
-{ lib, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi, pythonOlder, setuptools_scm }:
buildPythonPackage rec {
pname = "ufonormalizer";
- version = "0.4.2";
+ version = "0.5.0";
+
+ disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
- sha256 = "1rn64a0i151qk6h5f9pijcmja195i2d6f8jbi5h4xkgkinm9wwzj";
+ sha256 = "1qc3389i2y16n1hjg4dzk821klzjipbh9c9yci70z51pp21mwwh5";
extension = "zip";
};
+ nativeBuildInputs = [ setuptools_scm ];
+
meta = with lib; {
description = "Script to normalize the XML and other data inside of a UFO";
homepage = "https://github.com/unified-font-object/ufoNormalizer";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/ujson/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/ujson/default.nix
index 9df71ee49c3e..e7a9ee8f35a7 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/ujson/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/ujson/default.nix
@@ -8,12 +8,12 @@
buildPythonPackage rec {
pname = "ujson";
- version = "3.1.0";
+ version = "4.0.1";
disabled = isPyPy || (!isPy3k);
src = fetchPypi {
inherit pname version;
- sha256 = "00bda1de275ed6fe81817902189c75dfd156b4fa29b44dc1f4620775d2f50cf7";
+ sha256 = "26cf6241b36ff5ce4539ae687b6b02673109c5e3efc96148806a7873eaa229d3";
};
nativeBuildInputs = [ setuptools_scm ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/uncertainties/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/uncertainties/default.nix
index 8cf066245593..84705be59bc1 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/uncertainties/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/uncertainties/default.nix
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "uncertainties";
- version = "3.1.4";
+ version = "3.1.5";
src = fetchPypi {
inherit pname version;
- sha256 = "0s69kdhl8vhqazhxqdvb06l83x0iqdm0yr4vp3p52alzi6a8lm33";
+ sha256 = "00z9xl40czmqk0vmxjvmjvwb41r893l4dad7nj1nh6blw3kw28li";
};
propagatedBuildInputs = [ future ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/uncompyle6/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/uncompyle6/default.nix
index 5d1a32a29655..425b2e31ca61 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/uncompyle6/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/uncompyle6/default.nix
@@ -1,6 +1,7 @@
{ stdenv
, buildPythonPackage
, fetchPypi
+, pythonAtLeast
, spark_parser
, xdis
, nose
@@ -12,6 +13,7 @@
buildPythonPackage rec {
pname = "uncompyle6";
version = "3.7.4";
+ disabled = pythonAtLeast "3.9"; # See: https://github.com/rocky/python-uncompyle6/issues/331
src = fetchPypi {
inherit pname version;
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/unicorn/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/unicorn/default.nix
index e8f4b05916ec..8bd6507bb5ba 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/unicorn/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/unicorn/default.nix
@@ -5,7 +5,7 @@ buildPythonPackage rec {
version = stdenv.lib.getVersion unicorn-emu;
src = unicorn-emu.src;
- sourceRoot = "unicorn-${version}/bindings/python";
+ sourceRoot = "source/bindings/python";
prePatch = ''
ln -s ${unicorn-emu}/lib/libunicorn${stdenv.targetPlatform.extensions.sharedLibrary} prebuilt/
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/unpaddedbase64/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/unpaddedbase64/default.nix
index bcb902e5bfdb..386478cbb752 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/unpaddedbase64/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/unpaddedbase64/default.nix
@@ -1,14 +1,15 @@
{ stdenv
, buildPythonPackage
-, fetchgit
+, fetchFromGitHub
}:
buildPythonPackage rec {
pname = "unpaddedbase64";
version = "1.1.0";
- src = fetchgit {
- url = "https://github.com/matrix-org/python-unpaddedbase64.git";
+ src = fetchFromGitHub {
+ owner = "matrix-org";
+ repo = "python-${pname}";
rev = "refs/tags/v${version}";
sha256 = "0if3fjfxga0bwdq47v77fs9hrcqpmwdxry2i2a7pdqsp95258nxd";
};
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/update_checker/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/update_checker/default.nix
index fd3d0b02b630..6779a50e2c47 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/update_checker/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/update_checker/default.nix
@@ -1,8 +1,10 @@
-{ stdenv, buildPythonPackage, fetchPypi, requests}:
+{ stdenv, buildPythonPackage, fetchPypi, requests, isPy27
+}:
buildPythonPackage rec {
pname = "update_checker";
version = "0.18.0";
+ disabled = isPy27;
src = fetchPypi {
inherit pname version;
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/uproot-methods/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/uproot-methods/default.nix
index 298f6c96d58d..3c268ed7ed4f 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/uproot-methods/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/uproot-methods/default.nix
@@ -6,12 +6,12 @@
}:
buildPythonPackage rec {
- version = "0.7.4";
+ version = "0.9.1";
pname = "uproot-methods";
src = fetchPypi {
inherit pname version;
- sha256 = "7f110208a3a2aa9b4d6da11233fd0f206ea039b52bca4bfe312f1b9dcf788476";
+ sha256 = "accb4392c59a1485ce3ee6d78a6fd163731ade8b9b5208e7bde8fa1767aef097";
};
propagatedBuildInputs = [ numpy awkward ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/uproot/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/uproot/default.nix
index 81b6f276289c..eadd6c36de1a 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/uproot/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/uproot/default.nix
@@ -16,11 +16,11 @@
buildPythonPackage rec {
pname = "uproot";
- version = "3.12.0";
+ version = "3.13.1";
src = fetchPypi {
inherit pname version;
- sha256 = "1603140896b9d3495cedeee2b872e97759085777c1299317072ad3f415211abc";
+ sha256 = "099b0b274dc000faf724df835579c76306e60200a5ba7b600a0c4b76dabbf344";
};
nativeBuildInputs = [ pytestrunner ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/urllib3/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/urllib3/default.nix
index 2715388e8f20..aafa11720a22 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/urllib3/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/urllib3/default.nix
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "urllib3";
- version = "1.25.10";
+ version = "1.26.2";
src = fetchPypi {
inherit pname version;
- sha256 = "91056c15fa70756691db97756772bb1eb9678fa585d9184f24534b100dc60f4a";
+ sha256 = "19188f96923873c92ccb987120ec4acaa12f0461fa9ce5d3d0772bc965a39e08";
};
NOSE_EXCLUDE = stdenv.lib.concatStringsSep "," [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/urwid-readline/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/urwid-readline/default.nix
index 1ded152cba91..1c5f1c8307ef 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/urwid-readline/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/urwid-readline/default.nix
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "urwid_readline";
- version = "0.11";
+ version = "0.12";
src = fetchPypi {
inherit pname version;
- sha256 = "24e376d4b75940d19e8bc81c264be5d383f8d4da560f68f648dd16c85f6afdb5";
+ sha256 = "f7384e03017c3fb07bfba0d829d70287793326d9f6dac145dd09e0d693d7bf9c";
};
propagatedBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/urwid/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/urwid/default.nix
index 36fe4b51495d..0846d801059a 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/urwid/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/urwid/default.nix
@@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "urwid";
- version = "2.1.1";
+ version = "2.1.2";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "09nmi2nmvpcmbh3w3fb0dn0c7yp7r20i5pfcr6q722xh6mp8cw3q";
+ sha256 = "588bee9c1cb208d0906a9f73c613d2bd32c3ed3702012f51efe318a3f2127eae";
};
# tests need to be able to set locale
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/urwidtrees/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/urwidtrees/default.nix
index 1b5c58b9ca50..c441d93f6f76 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/urwidtrees/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/urwidtrees/default.nix
@@ -3,21 +3,29 @@
, fetchFromGitHub
, glibcLocales
, urwid
+, fetchpatch
}:
buildPythonPackage rec {
pname = "urwidtrees";
- version = "1.0.2";
+ version = "1.0.3";
src = fetchFromGitHub {
owner = "pazz";
repo = "urwidtrees";
rev = version;
- sha256 = "1n1kpidvkdnsqyb82vlvk78gmly96kh8351lqxn2pzgwwns6fml2";
+ sha256 = "sha256-yGSjwagCd5TiwEFtF6ZhDuVqj4PTa5pVXhs8ebr2O/g=";
};
propagatedBuildInputs = [ urwid ];
+ patches = [
+ (fetchpatch {
+ url = "https://github.com/pazz/urwidtrees/commit/ed39dbc4fc67b0e0249bf108116a88cd18543aa9.patch";
+ sha256 = "sha256-fA+30d2uVaoNCg4rtoWLNPvrZtq41Co4vcmM80hkURs=";
+ })
+ ];
+
checkInputs = [ glibcLocales ];
LC_ALL="en_US.UTF-8";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/user-agents/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/user-agents/default.nix
index 80985eed4812..5fb926607bae 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/user-agents/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/user-agents/default.nix
@@ -2,14 +2,14 @@
buildPythonPackage rec {
pname = "user-agents";
- version = "2.1.0";
+ version = "2.2.0";
# PyPI is missing devices.json
src = fetchFromGitHub {
owner = "selwin";
repo = "python-user-agents";
rev = "v${version}";
- sha256 = "04bndajsfnpymxfiggnj7g38cmlvca3ry5k2611x8ibp38x53yhc";
+ sha256 = "0pcbjqj21c2ixhl414bh2h8khi8y1igzfpkyqwan1pakix0lq45a";
};
propagatedBuildInputs = [ ua-parser ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/uvicorn/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/uvicorn/default.nix
index ddf98d2d4921..55511be4926c 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/uvicorn/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/uvicorn/default.nix
@@ -1,4 +1,4 @@
-{ lib
+{ stdenv
, buildPythonPackage
, fetchFromGitHub
, click
@@ -40,12 +40,16 @@ buildPythonPackage rec {
'';
checkInputs = [ pytest requests ];
+
+ doCheck = !stdenv.isDarwin;
+
# watchgod required the watchgod package, which isn't available in nixpkgs
checkPhase = ''
- pytest --ignore=tests/supervisors/test_watchgodreload.py
+ pytest --ignore=tests/supervisors/test_watchgodreload.py \
+ -k 'not test_supported_upgrade_request and not test_invalid_upgrade[WSProtocol]'
'';
- meta = with lib; {
+ meta = with stdenv.lib; {
homepage = "https://www.uvicorn.org/";
description = "The lightning-fast ASGI server";
license = licenses.bsd3;
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/uvloop/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/uvloop/default.nix
index b06f41ce5a31..a37e6a3675ba 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/uvloop/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/uvloop/default.nix
@@ -72,5 +72,6 @@ buildPythonPackage rec {
homepage = "https://github.com/MagicStack/uvloop";
license = licenses.mit;
maintainers = with maintainers; [ costrouc ];
+ broken = pythonAtLeast "3.9"; # see: https://github.com/MagicStack/uvloop/issues/365
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/validators/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/validators/default.nix
index 6ec8db340681..1bc9b1777ff6 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/validators/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/validators/default.nix
@@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "validators";
- version = "0.17.1";
+ version = "0.18.1";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "401cb441dd61bb1a03b10c8a3a884642409e22a2a19e03bbfc4891e0ddbc7268";
+ sha256 = "1a653b33c0ab091790f65f42b61aa191e354ed5fdedfeb17d24a86d0789966d7";
};
propagatedBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/vcrpy/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/vcrpy/default.nix
index 633c4f266cdc..e67bbc59e932 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/vcrpy/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/vcrpy/default.nix
@@ -15,11 +15,11 @@
buildPythonPackage rec {
pname = "vcrpy";
- version = "4.1.0";
+ version = "4.1.1";
src = fetchPypi {
inherit pname version;
- sha256 = "4138e79eb35981ad391406cbb7227bce7eba8bad788dcf1a89c2e4a8b740debe";
+ sha256 = "57095bf22fc0a2d99ee9674cdafebed0f3ba763018582450706f7d3a74fff599";
};
checkInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/vdirsyncer/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/vdirsyncer/default.nix
index 1a5494634bb0..b93050144eb6 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/vdirsyncer/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/vdirsyncer/default.nix
@@ -1,13 +1,7 @@
{ stdenv
, buildPythonPackage
-, fetchFromGitHub
+, fetchPypi
, isPy27
-, fetchpatch
-, rustPlatform
-, pkg-config
-, openssl
-, CoreServices
-, Security
, click
, click-log
, click-threading
@@ -15,38 +9,21 @@
, requests
, requests_oauthlib # required for google oauth sync
, atomicwrites
-, milksnake
-, shippai
, hypothesis
-, pytest
+, pytestCheckHook
, pytest-localserver
, pytest-subtesthack
, setuptools_scm
}:
-# Packaging documentation at:
-# https://github.com/untitaker/vdirsyncer/blob/master/docs/packaging.rst
buildPythonPackage rec {
- version = "unstable-2018-08-05";
+ version = "0.16.8";
pname = "vdirsyncer";
- name = "${pname}-${version}";
disabled = isPy27;
- src = fetchFromGitHub {
- owner = "spk";
- repo = pname;
- # fix-build-style branch, see https://github.com/pimutils/vdirsyncer/pull/798
- rev = "2c62d03bd73f8b44a47c2e769ade046697896ae9";
- sha256 = "1q6xvzz5rf5sqdaj3mdvhpgwy5b16isavgg7vardgjwqwv1yal28";
- };
-
- native = rustPlatform.buildRustPackage {
- name = "${name}-native";
- inherit src;
- sourceRoot = "source/rust";
- cargoSha256 = "0cqy0s55pkg6hww86h7qip4xaidh6g8lcypdj84n2x374jq38c5d";
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ];
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "bfdb422f52e1d4d60bd0635d203fb59fa7f613397d079661eb48e79464ba13c5";
};
propagatedBuildInputs = [
@@ -55,8 +32,6 @@ buildPythonPackage rec {
requests
requests_oauthlib # required for google oauth sync
atomicwrites
- milksnake
- shippai
];
nativeBuildInputs = [
@@ -65,45 +40,28 @@ buildPythonPackage rec {
checkInputs = [
hypothesis
- pytest
+ pytestCheckHook
pytest-localserver
pytest-subtesthack
];
- patches = [
- (fetchpatch {
- url = "https://github.com/pimutils/vdirsyncer/commit/7b636e8e40d69c495901f965b9c0686513659e44.patch";
- sha256 = "0vl942ii5iad47y63v0ngmhfp37n30nxyk4j7h64b95fk38vfwx9";
- })
- ];
-
postPatch = ''
- # see https://github.com/pimutils/vdirsyncer/pull/805
- substituteInPlace setup.cfg --replace --duration --durations
-
- # for setuptools_scm:
- echo 'Version: ${version}' >PKG-INFO
-
- sed -i 's/spec.add_external_build(cmd=cmd/spec.add_external_build(cmd="true"/g' setup.py
-
- # fixing test
- sed -i "s/invalid value for \"--verbosity\"/invalid value for \\\'--verbosity\\\'/" tests/system/cli/test_sync.py
+ substituteInPlace setup.py --replace "click>=5.0,<6.0" "click"
'';
- preBuild = ''
- mkdir -p rust/target/release
- ln -s ${native}/lib/libvdirsyncer_rustext* rust/target/release/
+ preCheck = ''
+ export DETERMINISTIC_TESTS=true
'';
- checkPhase = ''
- rm -rf vdirsyncer
- make DETERMINISTIC_TESTS=true PYTEST_ARGS="--deselect=tests/unit/utils/test_vobject.py::test_replace_uid --deselect=tests/unit/sync/test_sync.py::TestSyncMachine" test
- '';
+ disabledTests = [
+ "test_verbosity"
+ "test_create_collections" # Flaky test exceeds deadline on hydra: https://github.com/pimutils/vdirsyncer/issues/837
+ ];
meta = with stdenv.lib; {
homepage = "https://github.com/pimutils/vdirsyncer";
description = "Synchronize calendars and contacts";
- maintainers = with maintainers; [ matthiasbeyer gebner ];
license = licenses.mit;
+ maintainers = with maintainers; [ loewenheim ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/vdirsyncer/stable.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/vdirsyncer/stable.nix
deleted file mode 100644
index 6e1dc9825670..000000000000
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/vdirsyncer/stable.nix
+++ /dev/null
@@ -1,64 +0,0 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-, isPy27
-, click
-, click-log
-, click-threading
-, requests_toolbelt
-, requests
-, requests_oauthlib # required for google oauth sync
-, atomicwrites
-, hypothesis
-, pytestCheckHook
-, pytest-localserver
-, pytest-subtesthack
-, setuptools_scm
-}:
-
-buildPythonPackage rec {
- version = "0.16.8";
- pname = "vdirsyncer";
- disabled = isPy27;
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "bfdb422f52e1d4d60bd0635d203fb59fa7f613397d079661eb48e79464ba13c5";
- };
-
- propagatedBuildInputs = [
- click click-log click-threading
- requests_toolbelt
- requests
- requests_oauthlib # required for google oauth sync
- atomicwrites
- ];
-
- nativeBuildInputs = [
- setuptools_scm
- ];
-
- checkInputs = [
- hypothesis
- pytestCheckHook
- pytest-localserver
- pytest-subtesthack
- ];
-
- postPatch = ''
- substituteInPlace setup.py --replace "click>=5.0,<6.0" "click"
- '';
-
- preCheck = ''
- export DETERMINISTIC_TESTS=true
- '';
-
- disabledTests = [ "test_verbosity" ];
-
- meta = with stdenv.lib; {
- homepage = "https://github.com/pimutils/vdirsyncer";
- description = "Synchronize calendars and contacts";
- license = licenses.mit;
- maintainers = with maintainers; [ loewenheim ];
- };
-}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/vega_datasets/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/vega_datasets/default.nix
index 5845557c54c1..70235aa95bd7 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/vega_datasets/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/vega_datasets/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "vega_datasets";
- version = "0.8.0";
+ version = "0.9.0";
src = fetchPypi {
inherit pname version;
- sha256 = "db8883dab72b6f414e1fafdbf1e8db7543bba6ed77912a4e0c197d74fcfa1c20";
+ sha256 = "9dbe9834208e8ec32ab44970df315de9102861e4cda13d8e143aab7a80d93fc0";
};
propagatedBuildInputs = [ pandas ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/versioneer/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/versioneer/default.nix
index 8094a15a32e7..31042c8cc1c4 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/versioneer/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/versioneer/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ stdenv, buildPythonPackage, fetchPypi, isPy27 }:
buildPythonPackage rec {
-
pname = "versioneer";
- version = "0.18";
+ version = "0.19";
+ disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "0dgkzg1r7mjg91xp81sv9z4mabyxl39pkd11jlc1200md20zglga";
+ sha256 = "a4fed39bbebcbd2d07f8a86084773f303cb442709491955a0e6754858e47afae";
};
# Couldn't get tests to work because, for instance, they used virtualenv and
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/vine/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/vine/default.nix
index ce5756656bcb..1f4933d7dd8a 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/vine/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/vine/default.nix
@@ -3,13 +3,13 @@
buildPythonPackage rec {
pname = "vine";
- version = "1.3.0";
+ version = "5.0.0";
disable = pythonOlder "2.7";
src = fetchPypi {
inherit pname version;
- sha256 = "133ee6d7a9016f177ddeaf191c1f58421a1dcc6ee9a42c58b34bed40e1d2cd87";
+ sha256 = "7d3b1624a953da82ef63462013bbd271d3eb75751489f9807598e8f340bd637e";
};
buildInputs = [ case pytest ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/virtualenv/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/virtualenv/default.nix
index 6a9d91d79c89..233101728f85 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/virtualenv/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/virtualenv/default.nix
@@ -17,11 +17,11 @@
buildPythonPackage rec {
pname = "virtualenv";
- version = "20.0.31";
+ version = "20.2.1";
src = fetchPypi {
inherit pname version;
- sha256 = "43add625c53c596d38f971a465553f6318decc39d98512bc100fa1b1e839c8dc";
+ sha256 = "e0aac7525e880a429764cefd3aaaff54afb5d9f25c82627563603f5d7de5a6e5";
};
nativeBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/vispy/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/vispy/default.nix
index efe444fa8d70..6dd32508befa 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/vispy/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/vispy/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "vispy";
- version = "0.6.5";
+ version = "0.6.6";
src = fetchPypi {
inherit pname version;
- sha256 = "90cc76e79ee16c839bca05753e0c5f9f1c1c57963f2d3b248e4afac0fd75df75";
+ sha256 = "6f3c4d00be9e6761c046d520a86693d78a0925d47eeb2fc095e95dac776f74ee";
};
patches = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/vowpalwabbit/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/vowpalwabbit/default.nix
index ddd36a98cb6d..da13ad21026d 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/vowpalwabbit/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/vowpalwabbit/default.nix
@@ -15,11 +15,11 @@
buildPythonPackage rec {
pname = "vowpalwabbit";
- version = "8.8.1";
+ version = "8.9.0";
src = fetchPypi{
inherit pname version;
- sha256 = "17fw1g4ka9jppd41srw39zbp2b8h81izc71bbggxgf2r0xbdpga6";
+ sha256 = "37fb7a400f3a7923a04df9921b3eef1bbe96117424ef083dcfed0e4eea77fa08";
};
nativeBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/watchdog/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/watchdog/default.nix
index 17f7b540c605..ffec68785260 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/watchdog/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/watchdog/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "watchdog";
- version = "0.10.3";
+ version = "0.10.4";
src = fetchPypi {
inherit pname version;
- sha256 = "4214e1379d128b0588021880ccaf40317ee156d4603ac388b9adcf29165e0c04";
+ sha256 = "e38bffc89b15bafe2a131f0e1c74924cf07dcec020c2e0a26cccd208831fcd43";
};
buildInputs = stdenv.lib.optionals stdenv.isDarwin
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/web/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/web/default.nix
index bf21d7ed5c36..769ac6d2e5fa 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/web/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/web/default.nix
@@ -5,13 +5,13 @@
}:
buildPythonPackage rec {
- version = "0.61";
+ version = "0.62";
pname = "web.py";
disabled = isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "c7a9081aeb086cd3e703c7553a47ee75188d1d325f25eec7654d9bb00b5eccbb";
+ sha256 = "5ce684caa240654cae5950da8b4b7bc178812031e08f990518d072bd44ab525e";
};
meta = with stdenv.lib; {
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/west/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/west/default.nix
index 686ba1196b1f..8958f37b0f85 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/west/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/west/default.nix
@@ -3,14 +3,14 @@
}:
buildPythonPackage rec {
- version = "0.7.3";
+ version = "0.8.0";
pname = "west";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "86a36049ae3c8b1ce12d3183911b3082b38b2998e858285309581e37dc22d8fa";
+ sha256 = "672053c3392248846694e5619a7fe6ab4c40f010a8f5be6350821b39f6132a26";
};
propagatedBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/wheel/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/wheel/default.nix
index fd93cbdcea37..4f51fb486ebc 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/wheel/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/wheel/default.nix
@@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "wheel";
- version = "0.34.2";
+ version = "0.35.1";
format = "other";
src = fetchFromGitHub {
owner = "pypa";
repo = pname;
rev = version;
- sha256 = "1mwh35ycv07ajnpcjc4rjdmndh6nyg03gdgag5m8c2af7z1xlcmj";
+ sha256 = "uS+9a47ZopI0yGlEnJi421WyzS//8BxUvH25hX4BBL8=";
name = "${pname}-${version}-source";
};
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/wled/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/wled/default.nix
index 329cdd5b610e..92dbc210c6de 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/wled/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/wled/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage rec {
pytestCheckHook
];
- pythonImportCheck = [ "wled" ];
+ pythonImportsCheck = [ "wled" ];
meta = with lib; {
description = "Asynchronous Python client for WLED";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/wsproto/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/wsproto/default.nix
index 95ed95cb860b..d4dd7d089997 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/wsproto/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/wsproto/default.nix
@@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "wsproto";
- version = "0.15.0";
+ version = "1.0.0";
disabled = pythonOlder "3.6"; # python versions <3.6
src = fetchPypi {
inherit pname version;
- sha256 = "17gsxlli4w8am1wwwl3k90hpdfa213ax40ycbbvb7hjx1v1rhiv1";
+ sha256 = "868776f8456997ad0d9720f7322b746bbe9193751b5b290b7f924659377c8c38";
};
propagatedBuildInputs = [ h11 ] ++ lib.optional isPy36 dataclasses;
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/wxPython/4.1.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/wxPython/4.1.nix
new file mode 100644
index 000000000000..6d07f8b5e281
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/wxPython/4.1.nix
@@ -0,0 +1,75 @@
+{ lib
+, stdenv
+, fetchPypi
+, buildPythonPackage
+, which
+, pkgconfig
+, python
+, isPy27
+, pyopengl
+, doxygen
+, cairo
+, ncurses
+, pango
+, wxGTK
+}:
+let
+ dynamic-linker = stdenv.cc.bintools.dynamicLinker;
+in
+buildPythonPackage rec {
+ pname = "wxPython";
+ version = "4.1.0";
+ disabled = isPy27;
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "12x4ci5q7qni4rkfiq6lnpn1fk8b0sfc6dck5wyxkj2sfp5pa91f";
+ };
+
+ # https://github.com/NixOS/nixpkgs/issues/75759
+ # https://github.com/wxWidgets/Phoenix/issues/1316
+ doCheck = false;
+
+ nativeBuildInputs = [ which doxygen wxGTK pkgconfig ];
+
+ buildInputs = [
+ wxGTK.gtk
+ ncurses
+ ];
+
+ DOXYGEN = "${doxygen}/bin/doxygen";
+
+ preConfigure = lib.optionalString (!stdenv.isDarwin) ''
+ substituteInPlace wx/lib/wxcairo/wx_pycairo.py \
+ --replace 'cairoLib = None' 'cairoLib = ctypes.CDLL("${cairo}/lib/libcairo.so")'
+ substituteInPlace wx/lib/wxcairo/wx_pycairo.py \
+ --replace '_dlls = dict()' '_dlls = {k: ctypes.CDLL(v) for k, v in [
+ ("gdk", "${wxGTK.gtk}/lib/libgtk-x11-3.0.so"),
+ ("pangocairo", "${pango.out}/lib/libpangocairo-1.0.so"),
+ ("appsvc", None)
+ ]}'
+
+ # https://github.com/wxWidgets/Phoenix/pull/1584
+ # It'll be not needed in next version because https://github.com/wxWidgets/Phoenix/pull/1699
+ substituteInPlace build.py --replace "os.environ['PYTHONPATH'] = phoenixDir()" \
+ "os.environ['PYTHONPATH'] = os.environ['PYTHONPATH'] + os.pathsep + phoenixDir()"
+ '';
+
+ buildPhase = ''
+ ${python.interpreter} build.py -v --use_syswx dox etg --nodoc build_py
+ '';
+
+ installPhase = ''
+ ${python.interpreter} setup.py install --skip-build --prefix=$out
+ wrapPythonPrograms
+ '';
+
+ passthru = { inherit wxGTK; };
+
+ meta = with lib; {
+ description = "Cross platform GUI toolkit for Python, Phoenix version";
+ homepage = "http://wxpython.org/";
+ license = licenses.wxWindows;
+ maintainers = with maintainers; [ tfmoraes ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/xcffib/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/xcffib/default.nix
index 8f949f20e92a..b75179bdc2a4 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/xcffib/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/xcffib/default.nix
@@ -8,12 +8,12 @@
}:
buildPythonPackage rec {
- version = "0.10.1";
+ version = "0.11.0";
pname = "xcffib";
src = fetchPypi {
inherit pname version;
- sha256 = "cab1630a51076b11819c97e6da461ddd4cb21bdf65c071d1c57a846c9b129c12";
+ sha256 = "a751081d816a63d02a4c63f91fd9c0112c1e0061af7ccf79c4e7c18517a75406";
};
patchPhase = ''
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/xdis/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/xdis/default.nix
index 27f3c1af202d..280470957dc7 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/xdis/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/xdis/default.nix
@@ -6,14 +6,14 @@
buildPythonPackage rec {
pname = "xdis";
- version = "5.0.4";
+ version = "5.0.5";
disabled = isPy27;
src = fetchFromGitHub {
owner = "rocky";
repo = "python-xdis";
rev = version;
- sha256 = "0hh5pam8dabvh0w1bks0rqfq85gjy3h6ljrzmjg0nqsaapp1g4dd";
+ sha256 = "01248nh8y5szin6ymd3hrl8qnsg4xijsk3lxyks8zk9cjh008lmq";
};
checkInputs = [ pytest ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/xdot/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/xdot/default.nix
index 990e74d25498..e8b95e5d09cc 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/xdot/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/xdot/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "xdot";
- version = "1.1";
+ version = "1.2";
src = fetchPypi {
inherit pname version;
- sha256 = "0cr4rh7dz4dfzyxrk5pzhm0d15gkrgkfp3i5lw178xy81pc56p71";
+ sha256 = "3df91e6c671869bd2a6b2a8883fa3476dbe2ba763bd2a7646cf848a9eba71b70";
};
disabled = !isPy3k;
@@ -16,7 +16,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ gobject-introspection pygobject3 graphviz gtk3 ];
meta = with lib; {
- description = "xdot.py is an interactive viewer for graphs written in Graphviz's dot";
+ description = "An interactive viewer for graphs written in Graphviz's dot";
homepage = "https://github.com/jrfonseca/xdot.py";
license = licenses.lgpl3Plus;
};
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/xhtml2pdf/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/xhtml2pdf/default.nix
index e10c8e93ab5c..88143b2193f4 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/xhtml2pdf/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/xhtml2pdf/default.nix
@@ -6,17 +6,23 @@
, pypdf2
, reportlab
, six
+, python-bidi
+, arabic-reshaper
+, setuptools
}:
buildPythonPackage rec {
pname = "xhtml2pdf";
- version = "0.2.4";
+ version = "0.2.5";
- propagatedBuildInputs = [pillow html5lib pypdf2 reportlab six];
+ propagatedBuildInputs = [
+ pillow html5lib pypdf2 reportlab six
+ setuptools python-bidi arabic-reshaper
+ ];
src = fetchPypi {
inherit pname version;
- sha256 = "6793fbbdcb6bb8a4a70132966d8d95e95ea3498cdf0e82252d2b8e9aae34fcb5";
+ sha256 = "6797e974fac66f0efbe927c1539a2756ca4fe8777eaa5882bac132fc76b39421";
};
meta = with stdenv.lib; {
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/xlib/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/xlib/default.nix
index 3d82b599dc06..599abf1974cd 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/xlib/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/xlib/default.nix
@@ -7,7 +7,7 @@
, python
, mock
, nose
-, utillinux
+, util-linux
}:
buildPythonPackage rec {
@@ -25,7 +25,7 @@ buildPythonPackage rec {
${python.interpreter} runtests.py
'';
- checkInputs = [ mock nose utillinux /* mcookie */ xorg.xauth xorg.xorgserver /* xvfb */ ];
+ checkInputs = [ mock nose util-linux /* mcookie */ xorg.xauth xorg.xorgserver /* xvfb */ ];
nativeBuildInputs = [ setuptools_scm ];
buildInputs = [ xorg.libX11 ];
propagatedBuildInputs = [ six ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/xml2rfc/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/xml2rfc/default.nix
index d02b7e2e066a..9f32a6de2d89 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/xml2rfc/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/xml2rfc/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "xml2rfc";
- version = "2.47.0";
+ version = "3.5.0";
src = fetchPypi {
inherit pname version;
- sha256 = "7f621ed0e5a30c2b67c0e50778627b7a35e1ccfea9db19ea89b4c72a8faf42c0";
+ sha256 = "3ec836a9545f549707a8c8176038160185b9d08c1dd80304a906527da21bff68";
};
propagatedBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/xmljson/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/xmljson/default.nix
new file mode 100644
index 000000000000..dd5d84afacb4
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/xmljson/default.nix
@@ -0,0 +1,26 @@
+{ buildPythonPackage
+, fetchPypi
+, lib
+, lxml
+}:
+
+buildPythonPackage rec {
+ pname = "xmljson";
+ version = "0.2.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "b4158e66aa1e62ee39f7f80eb2fe4f767670ba3c0d5de9804420dc53427fdec8";
+ };
+
+ checkInputs = [
+ lxml
+ ];
+
+ meta = with lib; {
+ description = "Converts XML into dictionary structures and vice-versa";
+ homepage = "https://github.com/sanand0/xmljson";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ rakesh4g ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/xmlschema/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/xmlschema/default.nix
index d06bbd409b5c..55b45fb51714 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/xmlschema/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/xmlschema/default.nix
@@ -5,14 +5,14 @@
}:
buildPythonPackage rec {
- version = "1.2.5";
+ version = "1.3.1";
pname = "xmlschema";
src = fetchFromGitHub {
owner = "sissaschool";
repo = "xmlschema";
rev = "v${version}";
- sha256 = "0rsa75x86gdjalvy4riq7613szb616hff80crx006chyppzdkxmq";
+ sha256 = "08p6fm15600h40r5h7f3gfv34cys481f89pf57dv3y8gf6y2if56";
};
propagatedBuildInputs = [ elementpath ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/xstatic-bootbox/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/xstatic-bootbox/default.nix
index ba75ed0b8824..6e5200d2a887 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/xstatic-bootbox/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/xstatic-bootbox/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "XStatic-Bootbox";
- version = "4.4.0.1";
+ version = "5.5.1.1";
src = fetchPypi {
inherit version pname;
- sha256 = "1g00q38g1k576lxjlwglv4w3fj4z0z8lxlwpc66wyhjglj4r4bwd";
+ sha256 = "4b2120bb33a1d8ada8f9e0532ad99987aa03879b17b08bfdc6b8326d6eb7c205";
};
# no tests implemented
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/xstatic-bootstrap/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/xstatic-bootstrap/default.nix
index 83b33dc3edf4..0d9962e5faf5 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/xstatic-bootstrap/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/xstatic-bootstrap/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "XStatic-Bootstrap";
- version = "4.1.3.1";
+ version = "4.5.3.1";
src = fetchPypi {
inherit version pname;
- sha256 = "1800e6bb5fc687604d8a893eee8c7882d800a6f3d6721799016f99a47d1dac0f";
+ sha256 = "cf67d205437b32508a88b69a7e7c5bbe2ca5a8ae71097391a6a6f510ebfd2820";
};
# no tests implemented
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/xstatic-jquery-file-upload/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/xstatic-jquery-file-upload/default.nix
index 3eac03299109..0316a8493762 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/xstatic-jquery-file-upload/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/xstatic-jquery-file-upload/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "XStatic-jQuery-File-Upload";
- version = "9.23.0.1";
+ version = "10.31.0.1";
src = fetchPypi {
inherit version pname;
- sha256 = "649a500870b5f5d9cc71d1c1dc4c4d2242f459b02d811a771336217e4e91bfda";
+ sha256 = "7d716f26aca14732c35c54f0ba6d38187600ab472fc98a91d972d12c5a70db27";
};
# no tests implemented
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/xstatic-jquery/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/xstatic-jquery/default.nix
index 3cfbf3eb9326..e2a8f8266111 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/xstatic-jquery/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/xstatic-jquery/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "XStatic-jQuery";
- version = "3.4.1.0";
+ version = "3.5.1.1";
src = fetchPypi {
inherit version pname;
- sha256 = "0y2rhbasr7vdjbgi6x67cx97hwdnmv6m5difqqq59yb5n9zark1z";
+ sha256 = "e0ae8f8ec5bbd28045ba4bca06767a38bd5fc27cf9b71f434589f59370dcd323";
};
# no tests implemented
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/xstatic-pygments/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/xstatic-pygments/default.nix
index c71fce169d9d..8542747d2dd6 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/xstatic-pygments/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/xstatic-pygments/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "XStatic-Pygments";
- version = "2.2.0.1";
+ version = "2.7.2.1";
src = fetchPypi {
inherit version pname;
- sha256 = "1rm073ag1hgwlazl52mng62wvnayz7ckr5ki341shvp9db1x2n51";
+ sha256 = "b22b0a59ce17bf06e26508fdd264fff74409ebd9968af87a0a63402fce838dc2";
};
# no tests implemented
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/yamale/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/yamale/default.nix
new file mode 100644
index 000000000000..9b2c7b116c6d
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/yamale/default.nix
@@ -0,0 +1,38 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, isPy3k
+, pytest
+, pyyaml
+, ruamel_yaml
+}:
+
+buildPythonPackage rec {
+ pname = "yamale";
+ version = "3.0.4";
+
+ disabled = !isPy3k;
+
+ src = fetchFromGitHub {
+ owner = "23andMe";
+ repo = pname;
+ rev = version;
+ sha256 = "1xjvah4r3gpwk4zxql3c9jpllb34k175fm6iq1zvsd2vv2fwf8s2";
+ };
+
+ propagatedBuildInputs = [
+ pyyaml
+ ruamel_yaml
+ ];
+
+ checkInputs = [
+ pytest
+ ];
+
+ meta = with lib; {
+ description = "A schema and validator for YAML";
+ homepage = "https://github.com/23andMe/Yamale";
+ license = licenses.mit;
+ maintainers = with maintainers; [ rtburns-jpl ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/yamlloader/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/yamlloader/default.nix
new file mode 100644
index 000000000000..c8b2d5949cbf
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/yamlloader/default.nix
@@ -0,0 +1,33 @@
+{ lib, buildPythonPackage, fetchPypi
+, pytest, pyyaml
+}:
+
+buildPythonPackage rec {
+ pname = "yamlloader";
+ version = "0.5.5";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "3KtfFrObsD0Q3aTNTzDJQ2dexMd3GAf8Z+fxuzGb9Mg=";
+ };
+
+ propagatedBuildInputs = [
+ pyyaml
+ ];
+
+ checkInputs = [
+ pytest
+ ];
+
+ pythonImportsCheck = [
+ "yaml"
+ "yamlloader"
+ ];
+
+ meta = with lib; {
+ description = "A case-insensitive list for Python";
+ homepage = "https://github.com/Phynix/yamlloader";
+ license = licenses.mit;
+ maintainers = with maintainers; [ freezeboy ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/yappi/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/yappi/default.nix
index e0be34a2d318..b96d4efd44b8 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/yappi/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/yappi/default.nix
@@ -1,18 +1,22 @@
-{ lib, buildPythonPackage, fetchPypi, isPy27, nose }:
+{ lib, buildPythonPackage, fetchFromGitHub, gevent, isPy27, python }:
buildPythonPackage rec {
pname = "yappi";
- version = "1.2.5";
+ version = "1.3.0";
disabled = isPy27; # invalid syntax
- src = fetchPypi {
- inherit pname version;
- sha256 = "ad5fa4caf2859e480ffc4ec3e85615a6f7dea852c8f035f2db723f824ed4ba11";
+ src = fetchFromGitHub {
+ owner = "sumerc";
+ repo = pname;
+ rev = "30f94024a0e2e4fa21c220de6a0dc97b4cb2c319";
+ sha256 = "1kvwl3y3c2hivf9y2x1q1s8a2y724iwqd1krq6ryvsbg3inyh8qw";
};
patches = [ ./tests.patch ];
-
- checkInputs = [ nose ];
+ checkInputs = [ gevent ];
+ checkPhase = ''
+ ${python.interpreter} run_tests.py
+ '';
meta = with lib; {
homepage = "https://github.com/sumerc/yappi";
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/yappi/tests.patch b/infra/libkookie/nixpkgs/pkgs/development/python-modules/yappi/tests.patch
index bff4b28295b4..96419e01a26e 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/yappi/tests.patch
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/yappi/tests.patch
@@ -1,12 +1,14 @@
--- a/tests/test_functionality.py
+++ b/tests/test_functionality.py
-@@ -74,2 +74,3 @@ class BasicUsage(utils.YappiUnitTestCase):
-
-+ @_unittest.skip('wall-clock-time-sensitive')
- def test_get_clock(self):
+@@ -262,1 +262,2 @@ class BasicUsage(utils.YappiUnitTestCase):
++ @unittest.skip('wall-clock-time-sensitive')
+ def test_get_clock(self):
+@@ -363,2 +363,3 @@ class BasicUsage(utils.YappiUnitTestCase):
+ @unittest.skipIf(os.name == "nt", "do not run on Windows")
++ @unittest.skip('broken-path')
+ def test_run_as_script(self):
--- a/tests/test_hooks.py
+++ b/tests/test_hooks.py
-@@ -124,2 +124,3 @@ class ContextIdCallbackTest(utils.YappiUnitTestCase):
-
+@@ -127,1 +127,2 @@ class ContextIdCallbackTest(utils.YappiUnitTestCase):
+ @unittest.skip('wall-clock-time-sensitive')
def test_pause_resume(self):
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/yarl/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/yarl/default.nix
index 3ab7fb49c43a..7a15907e59be 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/yarl/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/yarl/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "yarl";
- version = "1.5.1";
+ version = "1.6.3";
src = fetchPypi {
inherit pname version;
- sha256 = "c22c75b5f394f3d47105045ea551e08a3e804dc7e01b37800ca35b58f856c3d6";
+ sha256 = "8a9066529240171b68893d60dca86a763eae2139dd42f42106b03cf4b426bf10";
};
checkInputs = [ pytest pytestrunner ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/youtube-dlc/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/youtube-dlc/default.nix
new file mode 100644
index 000000000000..9599828e65ee
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/youtube-dlc/default.nix
@@ -0,0 +1,23 @@
+{ lib, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+ pname = "youtube_dlc";
+ version = "2020.11.11.post3";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "WqoKpfvVPZrN+pW6s8JoApJusn5CXyPcg9VcsY8R0FM=";
+ };
+
+ # They are broken
+ doCheck = false;
+
+ pythonImportsCheck = [ "youtube_dlc" ];
+
+ meta = with lib; {
+ homepage = "Media downloader supporting various sites such as youtube";
+ description = "https://github.com/blackjack4494/yt-dlc";
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ freezeboy ];
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/yq/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/yq/default.nix
index 610876392651..b3e651fd2b0e 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/yq/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/yq/default.nix
@@ -10,7 +10,6 @@
, flake8
, jq
, pytest
-, unixtools
, toml
}:
@@ -23,6 +22,10 @@ buildPythonPackage rec {
sha256 = "1q4rky0a6n4izmq7slb91a54g8swry1xrbfqxwc8lkd3hhvlxxkl";
};
+ postPatch = ''
+ substituteInPlace test/test.py --replace "expect_exit_codes={0} if sys.stdin.isatty() else {2}" "expect_exit_codes={0}"
+ '';
+
propagatedBuildInputs = [
pyyaml
xmltodict
@@ -32,7 +35,6 @@ buildPythonPackage rec {
doCheck = true;
checkInputs = [
- unixtools.script
pytest
coverage
flake8
@@ -40,8 +42,7 @@ buildPythonPackage rec {
toml
];
- # tests fails if stdin is not a tty
- checkPhase = "echo | script -c 'pytest ./test/test.py'";
+ checkPhase = "pytest ./test/test.py";
pythonImportsCheck = [ "yq" ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/yt/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/yt/default.nix
index 353400120f3c..42bde9909b8c 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/yt/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/yt/default.nix
@@ -15,12 +15,12 @@
buildPythonPackage rec {
pname = "yt";
- version = "3.6.0";
+ version = "3.6.1";
disabled = isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "effb00536f19fd2bdc18f67dacd5550b82066a6adce5b928f27a01d7505109ec";
+ sha256 = "be454f9d05dcbe0623328b4df43a1bfd1f0925e516be97399710452931a19bb0";
};
buildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/zarr/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/zarr/default.nix
index e12ce5860917..3d21bbb3fe39 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/zarr/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/zarr/default.nix
@@ -12,12 +12,12 @@
buildPythonPackage rec {
pname = "zarr";
- version = "2.5.0";
+ version = "2.6.1";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "d54f060739208392494c3dbcbfdf41c8df9fa23d9a32b91aea0549b4c5e2b77f";
+ sha256 = "fa7eac1e4ff47ff82d09c42bb4679e18e8a05a73ee81ce59cee6a441a210b2fd";
};
nativeBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix
index 6777378c2df3..a8715a2133c3 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix
@@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "zeroconf";
- version = "0.28.5";
+ version = "0.28.6";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "c08dbb90c116626cb6c5f19ebd14cd4846cffe7151f338c19215e6938d334980";
+ sha256 = "70f10f0f16e3a8c4eb5e1a106b812b8d052253041cf1ee1195933df706f5261c";
};
propagatedBuildInputs = [ ifaddr ]
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/zfec/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/zfec/default.nix
index e848511d9ca8..b365438a1c97 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/zfec/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/zfec/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "zfec";
- version = "1.5.3";
+ version = "1.5.5";
src = fetchPypi {
inherit pname version;
- sha256 = "b41bd4b0af9c6b3a78bd6734e1e4511475944164375e6241b53df518a366922b";
+ sha256 = "6033b2f3cc3edacf3f7eeed5f258c1ebf8a1d7e5e35b623db352512ce564e5ca";
};
buildInputs = [ setuptoolsDarcs ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix
index 1e1a55d689de..0c6ac7dbf499 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix
@@ -1,20 +1,20 @@
-{ stdenv, buildPythonPackage, fetchPypi
-, aiohttp, zigpy
-, pytest }:
+{ lib, buildPythonPackage, fetchPypi
+, aiohttp, zigpy, conftest, asynctest
+, pytestCheckHook }:
buildPythonPackage rec {
pname = "zha-quirks";
- version = "0.0.43";
+ version = "0.0.47";
- nativeBuildInputs = [ pytest ];
- buildInputs = [ aiohttp zigpy ];
+ propagatedBuildInputs = [ aiohttp zigpy ];
+ checkInputs = [ pytestCheckHook conftest asynctest ];
src = fetchPypi {
inherit pname version;
- sha256 = "16f62dddce73bb27408b13a0d6526a250b588ca020405b2369e72d5dc9fa7607";
+ sha256 = "bf7dbd5d1c1a3849b059e62afcef248b6955f5ceef78f87201ae2fc8420738de";
};
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "ZHA Device Handlers are custom quirks implementations for Zigpy";
homepage = "https://github.com/dmulcahey/zha-device-handlers";
license = licenses.asl20;
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/zigpy-cc/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/zigpy-cc/default.nix
index 76887e399207..79b9d910053a 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/zigpy-cc/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/zigpy-cc/default.nix
@@ -1,22 +1,44 @@
-{ stdenv, buildPythonPackage, fetchPypi
-, pyserial, pyserial-asyncio, zigpy
-, asynctest, pytest, pytest-asyncio }:
+{ lib
+, asynctest
+, buildPythonPackage
+, fetchFromGitHub
+, pyserial
+, pyserial-asyncio
+, pytest-asyncio
+, pytestCheckHook
+, pythonOlder
+, zigpy }:
buildPythonPackage rec {
pname = "zigpy-cc";
- version = "0.5.1";
+ version = "0.5.2";
+ # https://github.com/Martiusweb/asynctest/issues/152
+ # broken by upstream python bug with asynctest and
+ # is used exclusively by home-assistant with python 3.8
+ disabled = pythonOlder "3.8";
- propagatedBuildInputs = [ pyserial pyserial-asyncio zigpy ];
- checkInputs = [ asynctest pytest pytest-asyncio ];
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "06759615b28c45beaa5f03e594769a373d41674b96aeafefccd5c4e1c67e25ca";
+ src = fetchFromGitHub {
+ owner = "zigpy";
+ repo = "zigpy-cc";
+ rev = version;
+ sha256 = "U3S8tQ3zPlexZDt5GvCd+rOv7CBVeXJJM1NGe7nRl2o=";
};
- meta = with stdenv.lib; {
+ propagatedBuildInputs = [
+ pyserial
+ pyserial-asyncio
+ zigpy
+ ];
+
+ checkInputs = [
+ asynctest
+ pytest-asyncio
+ pytestCheckHook
+ ];
+
+ meta = with lib; {
description = "A library which communicates with Texas Instruments CC2531 radios for zigpy";
- homepage = "http://github.com/sanyatuning/zigpy-cc";
+ homepage = "https://github.com/zigpy/zigpy-cc";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ etu mvnetbiz ];
platforms = platforms.linux;
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/zigpy-deconz/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/zigpy-deconz/default.nix
index af52e9425307..12964652752f 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/zigpy-deconz/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/zigpy-deconz/default.nix
@@ -4,14 +4,14 @@
buildPythonPackage rec {
pname = "zigpy-deconz";
- version = "0.9.2";
+ version = "0.11.0";
propagatedBuildInputs = [ pyserial pyserial-asyncio zigpy ];
checkInputs = [ pytest pytest-asyncio asynctest ];
src = fetchPypi {
inherit pname version;
- sha256 = "f4256136d714c00d22f6d2abf975438e2bc080cc43b8afef0decb80ed8066ef6";
+ sha256 = "a2263f8bc5807ebac55bb665eca553b514384ce270b66f83df02c39184193020";
};
meta = with stdenv.lib; {
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/zigpy-xbee/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/zigpy-xbee/default.nix
index 702666448018..1279bb804de6 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/zigpy-xbee/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/zigpy-xbee/default.nix
@@ -1,22 +1,44 @@
-{ stdenv, buildPythonPackage, fetchPypi
-, pyserial, pyserial-asyncio, zigpy
-, pytest }:
+{ lib
+, asynctest
+, buildPythonPackage
+, fetchFromGitHub
+, pyserial
+, pyserial-asyncio
+, pytest-asyncio
+, pytestCheckHook
+, pythonOlder
+, zigpy }:
buildPythonPackage rec {
pname = "zigpy-xbee";
- version = "0.12.1";
+ version = "0.13.0";
+ # https://github.com/Martiusweb/asynctest/issues/152
+ # broken by upstream python bug with asynctest and
+ # is used exclusively by home-assistant with python 3.8
+ disabled = pythonOlder "3.8";
- buildInputs = [ pyserial pyserial-asyncio zigpy ];
- checkInputs = [ pytest ];
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "09488hl27qjv8shw38iiyzvzwcjkc0k4n00l2bfn1ac443xzw0vh";
+ src = fetchFromGitHub {
+ owner = "zigpy";
+ repo = "zigpy-xbee";
+ rev = version;
+ sha256 = "Krdqb9bYKwUC2cdNppB2+tLwWjzmzIHhXnQ1KRduofU=";
};
- meta = with stdenv.lib; {
+ buildInputs = [
+ pyserial
+ pyserial-asyncio
+ zigpy
+ ];
+
+ checkInputs = [
+ asynctest
+ pytest-asyncio
+ pytestCheckHook
+ ];
+
+ meta = with lib; {
description = "A library which communicates with XBee radios for zigpy";
- homepage = "http://github.com/zigpy/zigpy-xbee";
+ homepage = "https://github.com/zigpy/zigpy-xbee";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ etu mvnetbiz ];
platforms = platforms.linux;
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/zigpy-zigate/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/zigpy-zigate/default.nix
index 43f291841ffc..018017c89a4c 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/zigpy-zigate/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/zigpy-zigate/default.nix
@@ -1,22 +1,46 @@
-{ stdenv, buildPythonPackage, fetchPypi
-, pyserial, pyserial-asyncio, zigpy
-, pytest }:
+{ lib
+, asynctest
+, buildPythonPackage
+, fetchFromGitHub
+, pyserial
+, pyserial-asyncio
+, pyusb
+, pytest-asyncio
+, pytestCheckHook
+, pythonOlder
+, zigpy }:
buildPythonPackage rec {
pname = "zigpy-zigate";
- version = "0.6.1";
+ version = "0.7.3";
+ # https://github.com/Martiusweb/asynctest/issues/152
+ # broken by upstream python bug with asynctest and
+ # is used exclusively by home-assistant with python 3.8
+ disabled = pythonOlder "3.8";
- buildInputs = [ pyserial pyserial-asyncio zigpy ];
- checkInputs = [ pytest ];
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "0xxqv65drrr96b9ncwsx9ayd369lpwimj1jjb0d7j6l9lil0wmf5";
+ src = fetchFromGitHub {
+ owner = "zigpy";
+ repo = "zigpy-zigate";
+ rev = version;
+ sha256 = "068v8n8yimmpnwqcdz5m9g35z1x0dir478cbc1s1nyhw1xn50vg1";
};
- meta = with stdenv.lib; {
+ propagatedBuildInputs = [
+ pyserial
+ pyserial-asyncio
+ pyusb
+ zigpy
+ ];
+
+ checkInputs = [
+ asynctest
+ pytest-asyncio
+ pytestCheckHook
+ ];
+
+ meta = with lib; {
description = "A library which communicates with ZiGate radios for zigpy";
- homepage = "http://github.com/doudz/zigpy-zigate";
+ homepage = "https://github.com/zigpy/zigpy-zigate";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ etu mvnetbiz ];
platforms = platforms.linux;
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/zigpy-znp/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/zigpy-znp/default.nix
new file mode 100644
index 000000000000..7a942a213720
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/zigpy-znp/default.nix
@@ -0,0 +1,55 @@
+{ stdenv
+, async-timeout
+, asynctest
+, buildPythonPackage
+, coloredlogs
+, coveralls
+, fetchFromGitHub
+, pyserial
+, pyserial-asyncio
+, pytest-asyncio
+, pytest-mock
+, pytest-timeout
+, pytestcov
+, pytestCheckHook
+, voluptuous
+, zigpy }:
+
+buildPythonPackage rec {
+ pname = "zigpy-znp";
+ version = "0.2.2";
+
+ src = fetchFromGitHub {
+ owner = "zha-ng";
+ repo = "zigpy-znp";
+ rev = "v${version}";
+ sha256 = "a98RYPvcYE1NPERmPo1jPwMf86N+0297u4pOKuaB6u4=";
+ };
+
+ propagatedBuildInputs = [
+ async-timeout
+ coloredlogs
+ pyserial
+ pyserial-asyncio
+ voluptuous
+ zigpy
+ ];
+
+ checkInputs = [
+ asynctest
+ coveralls
+ pytest-asyncio
+ pytest-mock
+ pytest-timeout
+ pytestcov
+ pytestCheckHook
+ ];
+
+ meta = with stdenv.lib; {
+ description = "A library for zigpy which communicates with TI ZNP radios";
+ homepage = "https://github.com/zha-ng/zigpy-znp";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ mvnetbiz ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/zigpy/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/zigpy/default.nix
index e85784e51ad4..54f0df340169 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/zigpy/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/zigpy/default.nix
@@ -1,20 +1,44 @@
-{ stdenv, buildPythonPackage, fetchPypi
-, aiohttp, crccheck, pycryptodome, pycrypto, voluptuous
-, pytest, pytest-asyncio, asynctest }:
+{ lib
+, aiohttp
+, asynctest
+, buildPythonPackage
+, crccheck
+, fetchFromGitHub
+, pycrypto
+, pycryptodome
+, pytest-aiohttp
+, pytest-asyncio
+, pytestCheckHook
+, tox
+, voluptuous }:
buildPythonPackage rec {
pname = "zigpy";
- version = "0.22.2";
+ version = "0.26.0";
- propagatedBuildInputs = [ aiohttp crccheck pycrypto pycryptodome voluptuous ];
- checkInputs = [ pytest pytest-asyncio asynctest ];
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "a43129932c6e4af0d2d57542218faf7695e2424ce18a5a8915d016e1303f5e44";
+ src = fetchFromGitHub {
+ owner = "zigpy";
+ repo = "zigpy";
+ rev = version;
+ sha256 = "ba8Ru6RCbFOHhctFtklnrxVD3uEpxF4XDvO5RMgXPBs=";
};
- meta = with stdenv.lib; {
+ propagatedBuildInputs = [
+ aiohttp
+ crccheck
+ pycrypto
+ pycryptodome
+ voluptuous
+ ];
+
+ checkInputs = [
+ asynctest
+ pytest-aiohttp
+ pytest-asyncio
+ pytestCheckHook
+ ];
+
+ meta = with lib; {
description = "Library implementing a ZigBee stack";
homepage = "https://github.com/zigpy/zigpy";
license = licenses.gpl3Plus;
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/zipp/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/zipp/default.nix
index 5d4bc589d361..1dafe8cbb0c5 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/zipp/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/zipp/default.nix
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "zipp";
- version = "3.1.0";
+ version = "3.4.0";
src = fetchPypi {
inherit pname version;
- sha256 = "c599e4d75c98f6798c509911d08a22e6c021d074469042177c8c86fb92eefd96";
+ sha256 = "ed5eee1974372595f9e416cc7bbeeb12335201d8081ca8a0743c954d4446e5cb";
};
nativeBuildInputs = [ setuptools_scm toml ];
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/zm-py/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/zm-py/default.nix
index 3ce071156936..65f5ec1fa7af 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/zm-py/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/zm-py/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "zm-py";
- version = "0.4.0";
+ version = "0.5.2";
src = fetchPypi {
inherit pname version;
- sha256 = "f9693ca046de4ea12c1afb5c67709ec0c2a48744566c0a1a9327348e1a1617b0";
+ sha256 = "b391cca0e52f2a887aa7a46c314b73335b7e3341c428b425fcf314983e5ebb36";
};
disabled = !isPy3k;
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/zope_copy/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/zope_copy/default.nix
index 4d6e740278e8..0d1ae412262d 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/zope_copy/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/zope_copy/default.nix
@@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchPypi
+, isPy27
, zope_interface
, zope_location
, zope_schema
@@ -18,6 +19,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ zope_interface ];
+ doCheck = !isPy27; # namespace conflicts
checkInputs = [ zope_location zope_schema ];
checkPhase = ''
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/zope_event/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/zope_event/default.nix
index 4f9e14ba20d3..b5481ae2e2b7 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/zope_event/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/zope_event/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "zope.event";
- version = "4.4";
+ version = "4.5.0";
src = fetchPypi {
inherit pname version;
- sha256 = "69c27debad9bdacd9ce9b735dad382142281ac770c4a432b533d6d65c4614bcf";
+ sha256 = "5e76517f5b9b119acf37ca8819781db6c16ea433f7e2062c4afc2b6fbedb1330";
};
meta = with stdenv.lib; {
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/zope_interface/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/zope_interface/default.nix
index 5e7086191cce..919c3ade3c28 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/zope_interface/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/zope_interface/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "zope.interface";
- version = "5.1.0";
+ version = "5.2.0";
src = fetchPypi {
inherit pname version;
- sha256 = "03nrl6b8cb600dnnh46y149awvrm0gxyqgwq5hdw3lvys8mw9r20";
+ sha256 = "8251f06a77985a2729a8bdbefbae79ee78567dddc3acbd499b87e705ca59fe24";
};
propagatedBuildInputs = [ zope_event ];
@@ -19,7 +19,7 @@ buildPythonPackage rec {
meta = with stdenv.lib; {
description = "Zope.Interface";
- homepage = "http://zope.org/Products/ZopeInterface";
+ homepage = "https://zope.org/Products/ZopeInterface";
license = licenses.zpl20;
maintainers = [ maintainers.goibhniu ];
};
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/zopfli/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/zopfli/default.nix
index 58b7d43f3d22..a80b3155b8ce 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/zopfli/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/zopfli/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "zopfli";
- version = "0.1.6";
+ version = "0.1.7";
src = fetchPypi {
inherit pname version;
- sha256 = "0smaxh7iihjr9mwxw1ifc9vnlh3ra8l060dd1gbvp1963k0r68pd";
+ sha256 = "512892714f0e3dcc9a77222cb509ed519f41ce2b92467e47a4b406a23b48561a";
extension = "zip";
};
diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/zstd/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/zstd/default.nix
index 8f61f2ffc66e..d57416ac18a4 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/zstd/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/zstd/default.nix
@@ -1,4 +1,5 @@
{ stdenv, pkgconfig, fetchPypi, buildPythonPackage
+, buildPackages
, zstd, pytest }:
buildPythonPackage rec {
@@ -12,7 +13,7 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace setup.py \
- --replace "/usr/bin/pkg-config" "${pkgconfig}/bin/${pkgconfig.targetPrefix}pkg-config"
+ --replace "/usr/bin/pkg-config" "${buildPackages.pkgconfig}/bin/${buildPackages.pkgconfig.targetPrefix}pkg-config"
'';
nativeBuildInputs = [ pkgconfig ];