diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md index d9306ae56bd..c17739825bc 100644 --- a/doc/languages-frameworks/python.md +++ b/doc/languages-frameworks/python.md @@ -710,7 +710,7 @@ nix-env -if build.nix ``` Now you can use the Python interpreter, as well as the extra packages that you added to the environment. -#### Environment defined in `~/.nixpkgs/config.nix` +#### Environment defined in `~/.config/nixpkgs/config.nix` If you prefer to, you could also add the environment as a package override to the Nixpkgs set. ```nix diff --git a/maintainers/scripts/update-python-libraries b/maintainers/scripts/update-python-libraries index bb94b25ee16..90f6c94233a 100755 --- a/maintainers/scripts/update-python-libraries +++ b/maintainers/scripts/update-python-libraries @@ -64,7 +64,7 @@ def _fetch_page(url): if r.status_code == requests.codes.ok: return r.json() else: - logging.warning("Request for {} failed".format(url)) + raise ValueError("Request for {} failed".format(url)) def _get_latest_version(package, extension): @@ -72,7 +72,7 @@ def _get_latest_version(package, extension): url = "{}/{}/json".format(INDEX, package) json = _fetch_page(url) - data = extract_relevant_nix_data(json)[1] + data = extract_relevant_nix_data(json, extension)[1] version = data['latest_version'] if version in data['versions']: @@ -83,7 +83,7 @@ def _get_latest_version(package, extension): return version, sha256 -def extract_relevant_nix_data(json): +def extract_relevant_nix_data(json, extension): """Extract relevant Nix data from the JSON of a package obtained from PyPI. :param json: JSON obtained from PyPI @@ -124,11 +124,11 @@ def extract_relevant_nix_data(json): releases = toolz.itemfilter(lambda x: x[1] is not None, releases) return releases - # Collect data + # Collect data) name = str(json['info']['name']) latest_version = str(_extract_latest_version(json)) #src = _get_src_and_hash(json, latest_version, EXTENSIONS) - sources = _get_sources(json, EXTENSIONS) + sources = _get_sources(json, [extension]) # Collect meta data license = str(_extract_license(json)) @@ -188,7 +188,7 @@ def _update_package(path): except ValueError as e: # No format mentioned, then we assume we have setuptools # and use a .tar.gz - logging.warning("Path {}: {}".format(path, str(e))) + logging.info("Path {}: {}".format(path, str(e))) extension = ".tar.gz" else: if format == 'wheel': @@ -197,33 +197,38 @@ def _update_package(path): try: url = _get_value('url', text) extension = os.path.splitext(url)[1] + if 'pypi' not in url: + logging.warning("Path {}: uses non-PyPI url, not updating.".format(path)) + return False except ValueError as e: - logging.warning("Path {}: {}".format(path, str(e))) + logging.info("Path {}: {}".format(path, str(e))) extension = ".tar.gz" - new_version, new_sha256 = _get_latest_version(pname, extension) - if not new_sha256: - logging.warning("Path has no valid file available: {}".format(path)) - return False - - if new_version != version: - - try: - text = _replace_value('version', new_version, text) - except ValueError as e: - logging.warning("Path {}: {}".format(path, str(e))) - try: - text = _replace_value('sha256', new_sha256, text) - except ValueError as e: - logging.warning("Path {}: {}".format(path, str(e))) - - with open(path, 'w') as f: - f.write(text) - - logging.info("Updated {} from {} to {}".format(pname, version, new_version)) - + try: + new_version, new_sha256 = _get_latest_version(pname, extension) + except ValueError as e: + logging.warning("Path {}: {}".format(path, str(e))) else: - logging.info("No update available for {} at {}".format(pname, version)) + if not new_sha256: + logging.warning("Path has no valid file available: {}".format(path)) + return False + if new_version != version: + try: + text = _replace_value('version', new_version, text) + except ValueError as e: + logging.warning("Path {}: {}".format(path, str(e))) + try: + text = _replace_value('sha256', new_sha256, text) + except ValueError as e: + logging.warning("Path {}: {}".format(path, str(e))) + + with open(path, 'w') as f: + f.write(text) + + logging.info("Updated {} from {} to {}".format(pname, version, new_version)) + + else: + logging.info("No update available for {} at {}".format(pname, version)) return True diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix index 05b4a9b4f2d..49cbb7a9817 100644 --- a/pkgs/build-support/docker/examples.nix +++ b/pkgs/build-support/docker/examples.nix @@ -83,16 +83,12 @@ rec { }; # 4. example of pulling an image. could be used as a base for other images - # - # ***** Currently broken, getting 404s. Perhaps the docker API has changed? - # - # - # debian = pullImage { - # imageName = "debian"; - # imageTag = "jessie"; - # # this hash will need change if the tag is updated at docker hub - # sha256 = "18kd495lc2k35h03bpcbdjnix17nlqbwf6nmq3sb161blf0dk14q"; - # }; + nix = pullImage { + imageName = "nixos/nix"; + imageTag = "1.11"; + # this hash will need change if the tag is updated at docker hub + sha256 = "1gk4bq05vl3rj3mh4mlbl4iicgndmimlv8jvkhdk4hrv0r44bwr3"; + }; # 5. example of multiple contents, emacs and vi happily coexisting editors = buildImage { diff --git a/pkgs/build-support/docker/pull.nix b/pkgs/build-support/docker/pull.nix index 0e1b147f6e1..5ccd0a41c5e 100644 --- a/pkgs/build-support/docker/pull.nix +++ b/pkgs/build-support/docker/pull.nix @@ -1,41 +1,32 @@ -{ stdenv, lib, curl, jshon, python, runCommand }: - -# Inspired and simplified version of fetchurl. +{ stdenv, lib, docker, vmTools, utillinux, curl, kmod, dhcp, cacert, e2fsprogs }: +let + nameReplace = name: builtins.replaceStrings ["/" ":"] ["-" "-"] name; +in # For simplicity we only support sha256. +{ imageName, imageTag ? "latest", imageId ? "${imageName}:${imageTag}" +, sha256, name ? (nameReplace "docker-image-${imageName}-${imageTag}.tar") }: +let + pullImage = vmTools.runInLinuxVM ( + stdenv.mkDerivation { + inherit name imageId; -# Currently only registry v1 is supported, compatible with Docker Hub. + certs = "${cacert}/etc/ssl/certs/ca-bundle.crt"; -{ imageName, imageTag ? "latest", imageId ? null -, sha256, name ? "${imageName}-${imageTag}" -, indexUrl ? "https://index.docker.io" -, registryVersion ? "v1" -, curlOpts ? "" }: + builder = ./pull.sh; -assert registryVersion == "v1"; + buildInputs = [ curl utillinux docker kmod dhcp cacert e2fsprogs ]; -let layer = stdenv.mkDerivation { - inherit name imageName imageTag imageId - indexUrl registryVersion curlOpts; + outputHashAlgo = "sha256"; + outputHash = sha256; - builder = ./pull.sh; - detjson = ./detjson.py; + impureEnvVars = lib.fetchers.proxyImpureEnvVars; - buildInputs = [ curl jshon python ]; + preVM = vmTools.createEmptyImage { + size = 2048; + fullName = "${name}-disk"; + }; - outputHashAlgo = "sha256"; - outputHash = sha256; - outputHashMode = "recursive"; - - impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [ - # This variable allows the user to pass additional options to curl - "NIX_CURL_FLAGS" - ]; - - # Doing the download on a remote machine just duplicates network - # traffic, so don't do that. - preferLocalBuild = true; -}; - -in runCommand "${name}.tar.gz" {} '' - tar -C ${layer} -czf $out . -'' + QEMU_OPTS = "-netdev user,id=net0 -device virtio-net-pci,netdev=net0"; + }); +in + pullImage diff --git a/pkgs/build-support/docker/pull.sh b/pkgs/build-support/docker/pull.sh index 7ba146e9de0..db643f5e88e 100644 --- a/pkgs/build-support/docker/pull.sh +++ b/pkgs/build-support/docker/pull.sh @@ -1,86 +1,36 @@ -# Reference: docker src contrib/download-frozen-image.sh - source $stdenv/setup -# Curl flags to handle redirects, not use EPSV, handle cookies for -# servers to need them during redirects, and work on SSL without a -# certificate (this isn't a security problem because we check the -# cryptographic hash of the output anyway). -curl=$(command -v curl) -curl() { - [[ -n ${token:-} ]] && set -- -H "Authorization: Token $token" "$@" - $curl \ - --location --max-redirs 20 \ - --retry 3 \ - --fail \ - --disable-epsv \ - --cookie-jar cookies \ - --insecure \ - $curlOpts \ - $NIX_CURL_FLAGS \ - "$@" -} +mkdir -p /var/lib/docker +mkfs.ext4 /dev/vda +mount -t ext4 /dev/vda /var/lib/docker -fetchLayer() { - local url="$1" - local dest="$2" - local curlexit=18; +modprobe virtio_net +dhclient eth0 - # if we get error code 18, resume partial download - while [ $curlexit -eq 18 ]; do - # keep this inside an if statement, since on failure it doesn't abort the script - if curl -C - "$url" --output "$dest"; then - return 0 - else - curlexit=$?; - fi - done +mkdir -p /etc/ssl/certs/ +cp "$certs" "/etc/ssl/certs/" - return $curlexit -} - -headers=$(curl -o /dev/null -D- -H 'X-Docker-Token: true' \ - "$indexUrl/$registryVersion/repositories/$imageName/images") - -header() { - grep $1 <<< "$headers" | tr -d '\r' | cut -d ' ' -f 2 -} - -# this only takes the first endpoint, more may be provided -# https://docs.docker.com/v1.6/reference/api/docker-io_api/ -if ! registryUrl=$(header X-Docker-Endpoints); then - echo "error: index returned no endpoint" - exit 1 -fi -baseUrl="https://$registryUrl/$registryVersion" - -token="$(header X-Docker-Token || true)"; - -if [ -z "$imageId" ]; then - imageId="$(curl "$baseUrl/repositories/$imageName/tags/$imageTag")" - imageId="${imageId//\"/}" - if [ -z "$imageId" ]; then - echo "error: no image ID found for ${imageName}:${imageTag}" - exit 1 +# from https://github.com/tianon/cgroupfs-mount/blob/master/cgroupfs-mount +mount -t tmpfs -o uid=0,gid=0,mode=0755 cgroup /sys/fs/cgroup +cd /sys/fs/cgroup +for sys in $(awk '!/^#/ { if ($4 == 1) print $1 }' /proc/cgroups); do + mkdir -p $sys + if ! mountpoint -q $sys; then + if ! mount -n -t cgroup -o $sys cgroup $sys; then + rmdir $sys || true fi - - echo "found image ${imageName}:${imageTag}@$imageId" -fi - -mkdir -p $out - -jshon -n object \ - -n object -s "$imageId" -i "$imageTag" \ - -i "$imageName" > $out/repositories - -curl "$baseUrl/images/$imageId/ancestry" -o ancestry.json - -layerIds=$(jshon -a -u < ancestry.json) -for layerId in $layerIds; do - echo "fetching layer $layerId" - - mkdir "$out/$layerId" - echo '1.0' > "$out/$layerId/VERSION" - curl "$baseUrl/images/$layerId/json" | python $detjson > "$out/$layerId/json" - fetchLayer "$baseUrl/images/$layerId/layer" "$out/$layerId/layer.tar" + fi done + +# run docker daemon +dockerd -H tcp://127.0.0.1:5555 -H unix:///var/run/docker.sock & + +until $(curl --output /dev/null --silent --connect-timeout 2 http://127.0.0.1:5555); do + printf '.' + sleep 1 +done + +rm -r $out + +docker pull ${imageId} +docker save ${imageId} > $out diff --git a/pkgs/development/compilers/go/1.8.nix b/pkgs/development/compilers/go/1.8.nix index 81b7f4bce1d..8e0b1c7360f 100644 --- a/pkgs/development/compilers/go/1.8.nix +++ b/pkgs/development/compilers/go/1.8.nix @@ -80,6 +80,9 @@ stdenv.mkDerivation rec { '' + optionalString stdenv.isLinux '' sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go + '' + optionalString stdenv.isArm '' + sed -i '/TestCurrent/areturn' src/os/user/user_test.go + echo '#!/usr/bin/env bash' > misc/cgo/testplugin/test.bash '' + optionalString stdenv.isDarwin '' substituteInPlace src/race.bash --replace \ "sysctl machdep.cpu.extfeatures | grep -qv EM64T" true diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index 1a388bfe4af..bc586e0b3ce 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -37,6 +37,9 @@ # generated binaries. , makeWrapperArgs ? [] +# Skip wrapping of python programs altogether +, dontWrapPythonPrograms ? false + , meta ? {} , passthru ? {} @@ -51,7 +54,7 @@ if disabled then throw "${name} not supported for interpreter ${python.executable}" else -python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled"] // { +python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled" "checkInputs"] // { name = namePrefix + name; @@ -69,7 +72,7 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled"] // { doCheck = false; doInstallCheck = doCheck; - postFixup = '' + postFixup = lib.optionalString (!dontWrapPythonPrograms) '' wrapPythonPrograms '' + lib.optionalString catchConflicts '' # Check if we have two packages with the same name in the closure and fail. diff --git a/pkgs/development/interpreters/python/wrap.sh b/pkgs/development/interpreters/python/wrap.sh index 55998bc5b41..1c74e612b55 100644 --- a/pkgs/development/interpreters/python/wrap.sh +++ b/pkgs/development/interpreters/python/wrap.sh @@ -1,7 +1,7 @@ # Wrapper around wrapPythonProgramsIn, below. The $pythonPath # variable is passed in from the buildPythonPackage function. wrapPythonPrograms() { - wrapPythonProgramsIn $out "$out $pythonPath" + wrapPythonProgramsIn "$out/bin" "$out $pythonPath" } # Builds environment variables like PYTHONPATH and PATH walking through closure @@ -47,34 +47,36 @@ wrapPythonProgramsIn() { buildPythonPath "$pythonPath" # Find all regular files in the output directory that are executable. - find "$dir" -type f -perm -0100 -print0 | while read -d "" f; do - # Rewrite "#! .../env python" to "#! /nix/store/.../python". - # Strip suffix, like "3" or "2.7m" -- we don't have any choice on which - # Python to use besides one with this hook anyway. - if head -n1 "$f" | grep -q '#!.*/env.*\(python\|pypy\)'; then - sed -i "$f" -e "1 s^.*/env[ ]*\(python\|pypy\)[^ ]*^#! @executable@^" - fi - - # catch /python and /.python-wrapped - if head -n1 "$f" | grep -q '/\.\?\(python\|pypy\)'; then - # dont wrap EGG-INFO scripts since they are called from python - if echo "$f" | grep -qv EGG-INFO/scripts; then - echo "wrapping \`$f'..." - patchPythonScript "$f" - # wrapProgram creates the executable shell script described - # above. The script will set PYTHONPATH and PATH variables.! - # (see pkgs/build-support/setup-hooks/make-wrapper.sh) - local -a wrap_args=("$f" - --prefix PATH ':' "$program_PATH") - - # Add any additional arguments provided by makeWrapperArgs - # argument to buildPythonPackage. - local -a user_args="($makeWrapperArgs)" - local -a wrapProgramArgs=("${wrap_args[@]}" "${user_args[@]}") - wrapProgram "${wrapProgramArgs[@]}" + if [ -d "$dir" ]; then + find "$dir" -type f -perm -0100 -print0 | while read -d "" f; do + # Rewrite "#! .../env python" to "#! /nix/store/.../python". + # Strip suffix, like "3" or "2.7m" -- we don't have any choice on which + # Python to use besides one with this hook anyway. + if head -n1 "$f" | grep -q '#!.*/env.*\(python\|pypy\)'; then + sed -i "$f" -e "1 s^.*/env[ ]*\(python\|pypy\)[^ ]*^#! @executable@^" fi - fi - done + + # catch /python and /.python-wrapped + if head -n1 "$f" | grep -q '/\.\?\(python\|pypy\)'; then + # dont wrap EGG-INFO scripts since they are called from python + if echo "$f" | grep -qv EGG-INFO/scripts; then + echo "wrapping \`$f'..." + patchPythonScript "$f" + # wrapProgram creates the executable shell script described + # above. The script will set PYTHONPATH and PATH variables.! + # (see pkgs/build-support/setup-hooks/make-wrapper.sh) + local -a wrap_args=("$f" + --prefix PATH ':' "$program_PATH") + + # Add any additional arguments provided by makeWrapperArgs + # argument to buildPythonPackage. + local -a user_args="($makeWrapperArgs)" + local -a wrapProgramArgs=("${wrap_args[@]}" "${user_args[@]}") + wrapProgram "${wrapProgramArgs[@]}" + fi + fi + done + fi } # Adds the lib and bin directories to the PYTHONPATH and PATH variables, diff --git a/pkgs/development/python-modules/Nikola/default.nix b/pkgs/development/python-modules/Nikola/default.nix new file mode 100644 index 00000000000..503e655e65a --- /dev/null +++ b/pkgs/development/python-modules/Nikola/default.nix @@ -0,0 +1,59 @@ +{ lib +, buildPythonPackage +, isPy3k +, fetchPypi +, doit +, glibcLocales +, pytest +, pytestcov +, pytest-mock +, pygments +, pillow +, dateutil +, docutils +, Mako +, unidecode +, lxml +, Yapsy +, PyRSS2Gen +, Logbook +, blinker +, setuptools +, natsort +, requests +, piexif +, markdown +, phpserialize +, jinja2 +}: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "Nikola"; + version = "7.8.4"; + + # 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 + # other hand doesn't support Python 3.3). So, just disable Python 2. + disabled = !isPy3k; + + buildInputs = [ pytest pytestcov pytest-mock glibcLocales ]; + + propagatedBuildInputs = [ + pygments pillow dateutil docutils Mako unidecode lxml Yapsy PyRSS2Gen + Logbook blinker setuptools natsort requests piexif markdown phpserialize + jinja2 doit + ]; + + src = fetchPypi { + inherit pname version; + sha256 = "14pd5zk6l6f58snq9n9zpxwhqcc3xz8b1gz31zsrqajggg1i8fn8"; + }; + + meta = { + homepage = "https://getnikola.com/"; + description = "A modular, fast, simple, static website and blog generator"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ jluttine ]; + }; +} diff --git a/pkgs/development/python-modules/aenum/default.nix b/pkgs/development/python-modules/aenum/default.nix index 9d6fe94a262..61edcca4804 100644 --- a/pkgs/development/python-modules/aenum/default.nix +++ b/pkgs/development/python-modules/aenum/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "aenum"; - version = "2.0.6"; + version = "2.0.7"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0rlhb5wzlyyz0l44r2jxn3m0nh51ifih97dk2y7zfs1m299gwcv6"; + sha256 = "2c5db863b5531cc059313018e57bc765b0ef1fc96ba799f105ea45d99b1c2d23"; }; doCheck = !isPy3k; diff --git a/pkgs/development/python-modules/asgi_ipc/default.nix b/pkgs/development/python-modules/asgi_ipc/default.nix index 9774433ddc5..e282294ef0c 100644 --- a/pkgs/development/python-modules/asgi_ipc/default.nix +++ b/pkgs/development/python-modules/asgi_ipc/default.nix @@ -2,12 +2,13 @@ asgiref, msgpack, posix_ipc }: buildPythonPackage rec { - name = "asgi_ipc-${version}"; - version = "1.3.1"; + version = "1.4.0"; + pname = "asgi_ipc"; + name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/a/asgi_ipc/${name}.tar.gz"; - sha256 = "1dm8xvm1z28f421ck1ympxsq2sjm9xb7dla6p8yd2bz6gn6p5h7v"; + sha256 = "1bae453d771eb92c0ec558b826fc0bce75a2a61bf21187784d4e4dc11710e588"; }; propagatedBuildInputs = [ asgiref msgpack posix_ipc ]; diff --git a/pkgs/development/python-modules/asgi_redis/default.nix b/pkgs/development/python-modules/asgi_redis/default.nix index 5576fc0e68b..1ca6f417bd8 100644 --- a/pkgs/development/python-modules/asgi_redis/default.nix +++ b/pkgs/development/python-modules/asgi_redis/default.nix @@ -2,12 +2,13 @@ asgiref, asgi_ipc, msgpack, six, redis, cryptography }: buildPythonPackage rec { - name = "asgi_redis-${version}"; - version = "1.3.0"; + version = "1.4.0"; + pname = "asgi_redis"; + name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/a/asgi_redis/${name}.tar.gz"; - sha256 = "0zhv51w0fx3i8m0032nk9v00l6mxaswyi95yzy7p7fjww4q74ncl"; + sha256 = "ec137829a9ebfb0de1c034bc699240c9747b97a3eb2dc4df6c812f82290a0f9f"; }; # Requires a redis server available diff --git a/pkgs/development/python-modules/asgiref/default.nix b/pkgs/development/python-modules/asgiref/default.nix index 1bd3ef19f7e..1b5112fb335 100644 --- a/pkgs/development/python-modules/asgiref/default.nix +++ b/pkgs/development/python-modules/asgiref/default.nix @@ -1,11 +1,12 @@ { stdenv, buildPythonPackage, fetchurl, six }: buildPythonPackage rec { - name = "asgiref-${version}"; - version = "1.1.1"; + version = "1.1.2"; + pname = "asgiref"; + name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/a/asgiref/${name}.tar.gz"; - sha256 = "0gayxnysknwg8hxb5kvmi2mmd5dnrhgza23daf8j25w3nj2drars"; + sha256 = "8b46c3d6e2ad354d9da3cfb9873f9bd46fe1b768fbc11065275ba5430a46700c"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix index a690399118d..52f7fdf039c 100644 --- a/pkgs/development/python-modules/astroid/default.nix +++ b/pkgs/development/python-modules/astroid/default.nix @@ -1,34 +1,39 @@ -{ stdenv, fetchurl, buildPythonPackage, python, logilab_common, six, - lazy-object-proxy, wrapt }: +{ lib, fetchurl, buildPythonPackage, python, logilab_common, six +, lazy-object-proxy, wrapt, singledispatch, enum34, pythonOlder +, backports_functools_lru_cache +}: - buildPythonPackage rec { - name = "${pname}-${version}"; - pname = "astroid"; - version = "1.4.9"; +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "astroid"; + version = "1.5.2"; - src = fetchurl { - url = "mirror://pypi/a/${pname}/${name}.tar.gz"; - sha256 = "1mw5q20b80j55vbpcdfl824sbb1q15dhkfbczjnnv8733j4yg0x4"; - }; + src = fetchurl { + url = "mirror://pypi/a/${pname}/${name}.tar.gz"; + sha256 = "271f1c9ad6519a5dde2a7f0c9b62c2923b55e16569bdd888f9f9055cc5be37ed"; + }; - propagatedBuildInputs = [ logilab_common six lazy-object-proxy wrapt ]; + propagatedBuildInputs = [ logilab_common six lazy-object-proxy wrapt ] + ++ lib.optionals (pythonOlder "3.4") [ enum34 singledispatch] + ++ lib.optionals (pythonOlder "3.3") [ backports_functools_lru_cache ]; - postPatch = '' - cd astroid/tests - for i in $(ls unittest*); do mv -v $i test_$i; done - cd ../.. - rm -vf astroid/tests/test_unittest_inference.py - ''; + postPatch = '' + cd astroid/tests + for i in $(ls unittest*); do mv -v $i test_$i; done + cd ../.. + rm -vf astroid/tests/test_unittest_inference.py + rm -vf astroid/tests/test_unittest_manager.py + ''; - checkPhase = '' - ${python.interpreter} -m unittest discover - ''; + checkPhase = '' + ${python.interpreter} -m unittest discover + ''; - meta = with stdenv.lib; { - description = "A abstract syntax tree for Python with inference support"; - homepage = http://bitbucket.org/logilab/astroid; - license = licenses.lgpl2; - platforms = platforms.all; - maintainers = with maintainers; [ nand0p ]; - }; - } + meta = with lib; { + description = "A abstract syntax tree for Python with inference support"; + homepage = http://bitbucket.org/logilab/astroid; + license = licenses.lgpl2; + platforms = platforms.all; + maintainers = with maintainers; [ nand0p ]; + }; +} diff --git a/pkgs/development/python-modules/async_timeout/default.nix b/pkgs/development/python-modules/async_timeout/default.nix index d5009e9bccb..aa548602d37 100644 --- a/pkgs/development/python-modules/async_timeout/default.nix +++ b/pkgs/development/python-modules/async_timeout/default.nix @@ -7,13 +7,13 @@ let pname = "async-timeout"; - version = "1.1.0"; + version = "1.2.1"; in buildPythonPackage rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "b88bd1fe001b800ec23c7bf27a81b32819e2a56668e9fba5646a7f3618143081"; + sha256 = "380e9bfd4c009a14931ffe487499b0906b00b3378bb743542cfd9fbb6d8e4657"; }; buildInputs = [ pytestrunner ]; diff --git a/pkgs/development/python-modules/automat/default.nix b/pkgs/development/python-modules/automat/default.nix index 146f47bd945..e4f3e061dd4 100644 --- a/pkgs/development/python-modules/automat/default.nix +++ b/pkgs/development/python-modules/automat/default.nix @@ -1,12 +1,13 @@ { stdenv, buildPythonPackage, fetchurl, m2r, setuptools_scm, six, attrs }: buildPythonPackage rec { - name = "Automat-${version}"; - version = "0.5.0"; + version = "0.6.0"; + pname = "Automat"; + name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/A/Automat/${name}.tar.gz"; - sha256 = "1hnpknkqnc2m900kkzrzx9l6g5dy5dassrdj9pn34x1pcdkyr2a8"; + sha256 = "3c1fd04ecf08ac87b4dd3feae409542e9bf7827257097b2b6ed5692f69d6f6a8"; }; buildInputs = [ m2r setuptools_scm ]; diff --git a/pkgs/development/python-modules/bap/default.nix b/pkgs/development/python-modules/bap/default.nix index 9362729af44..6a8e33dc2ee 100644 --- a/pkgs/development/python-modules/bap/default.nix +++ b/pkgs/development/python-modules/bap/default.nix @@ -1,8 +1,9 @@ {stdenv, buildPythonPackage, fetchFromGitHub, bap, requests}: buildPythonPackage rec { - name = "bap"; + pname = "bap"; version = "1.1.0"; + name = "${pname}-${version}"; src = fetchFromGitHub { owner = "BinaryAnalysisPlatform"; repo = "bap-python"; diff --git a/pkgs/development/python-modules/bcrypt.nix b/pkgs/development/python-modules/bcrypt.nix index 8a099983521..d159ff8fe90 100644 --- a/pkgs/development/python-modules/bcrypt.nix +++ b/pkgs/development/python-modules/bcrypt.nix @@ -4,12 +4,13 @@ with stdenv.lib; buildPythonPackage rec { - name = "bcrypt-${version}"; - version = "3.1.2"; + version = "3.1.3"; + pname = "bcrypt"; + name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/b/bcrypt/${name}.tar.gz"; - sha256 = "1al54xafv1aharpb22yv5rjjc63fm60z3pn2shbiq48ah9f1fvil"; + sha256 = "6645c8d0ad845308de3eb9be98b6fd22a46ec5412bfc664a423e411cdd8f5488"; }; buildInputs = [ pycparser mock pytest py ]; propagatedBuildInputs = [ six ] ++ optional (!isPyPy) cffi; diff --git a/pkgs/development/python-modules/blivet/default.nix b/pkgs/development/python-modules/blivet/default.nix index 42a7401b09d..19acf7b49ef 100644 --- a/pkgs/development/python-modules/blivet/default.nix +++ b/pkgs/development/python-modules/blivet/default.nix @@ -7,7 +7,8 @@ let selinuxWithPython = libselinux.override pyenable; cryptsetupWithPython = cryptsetup.override pyenable; in buildPythonPackage rec { - name = "blivet-${version}"; + pname = "blivet"; + name = "${pname}-${version}"; version = "0.67"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/breathe/default.nix b/pkgs/development/python-modules/breathe/default.nix index d27a6537556..08d66e539ad 100644 --- a/pkgs/development/python-modules/breathe/default.nix +++ b/pkgs/development/python-modules/breathe/default.nix @@ -1,12 +1,13 @@ { lib, fetchurl, buildPythonPackage, docutils, six, sphinx, isPy3k }: buildPythonPackage rec { - name = "breathe-${version}"; - version = "4.2.0"; + version = "4.6.0"; + pname = "breathe"; + name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/b/breathe/${name}.tar.gz"; - sha256 = "0m3w8yx24nm01xxx6aj08cklnifwlzzmczc5b0ni40l63lhvm3lp"; + sha256 = "9db2ba770f824da323b9ea3db0b98d613a4e0af094c82ccb0a82991da81b736a"; }; propagatedBuildInputs = [ docutils six sphinx ]; diff --git a/pkgs/development/python-modules/btrees/default.nix b/pkgs/development/python-modules/btrees/default.nix index 8e69a207628..7cb10d96f90 100644 --- a/pkgs/development/python-modules/btrees/default.nix +++ b/pkgs/development/python-modules/btrees/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "BTrees"; - version = "4.3.1"; + version = "4.4.1"; name = "${pname}-${version}"; propagatedBuildInputs = [ persistent zope_interface transaction ]; src = fetchPypi { inherit pname version; - sha256 = "15as34f9sa4nnd62nnjkik2jd4rg1byp0i4kwaqwdpv0ab9vfr95"; + sha256 = "a2738b71693971c1f7502888d649bef270c65f026db731e03d53f1ec4edfe8a3"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/certifi/default.nix b/pkgs/development/python-modules/certifi/default.nix index 8658c76df79..a2cf4633d30 100644 --- a/pkgs/development/python-modules/certifi/default.nix +++ b/pkgs/development/python-modules/certifi/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "certifi"; - version = "2017.1.23"; + version = "2017.4.17"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "1klrzl3hgvcf2mjk00g0k3kk1p2z27vzwnxivwar4vhjmjvpz1w1"; + sha256 = "f7527ebf7461582ce95f7a9e03dd141ce810d40590834f4ec20cddd54234c10a"; }; meta = { diff --git a/pkgs/development/python-modules/channels/default.nix b/pkgs/development/python-modules/channels/default.nix index a589369210d..e99fcdc4802 100644 --- a/pkgs/development/python-modules/channels/default.nix +++ b/pkgs/development/python-modules/channels/default.nix @@ -2,7 +2,8 @@ asgiref, django, daphne }: buildPythonPackage rec { - name = "channels-${version}"; + pname = "channels"; + name = "${pname}-${version}"; version = "1.1.3"; src = fetchurl { diff --git a/pkgs/development/python-modules/constantly/default.nix b/pkgs/development/python-modules/constantly/default.nix index 44fbeb6d39f..50216c7ae1f 100644 --- a/pkgs/development/python-modules/constantly/default.nix +++ b/pkgs/development/python-modules/constantly/default.nix @@ -1,7 +1,8 @@ { stdenv, buildPythonPackage, fetchurl }: buildPythonPackage rec { - name = "constantly-${version}"; + pname = "constantly"; + name = "${pname}-${version}"; version = "15.1.0"; src = fetchurl { diff --git a/pkgs/development/python-modules/daphne/default.nix b/pkgs/development/python-modules/daphne/default.nix index 34cc597ede9..562b29cf062 100644 --- a/pkgs/development/python-modules/daphne/default.nix +++ b/pkgs/development/python-modules/daphne/default.nix @@ -2,7 +2,8 @@ asgiref, autobahn, twisted, hypothesis }: buildPythonPackage rec { - name = "daphne-${version}"; + pname = "daphne"; + name = "${pname}-${version}"; version = "1.2.0"; src = fetchurl { diff --git a/pkgs/development/python-modules/dateutil/default.nix b/pkgs/development/python-modules/dateutil/default.nix index 8e05ee34357..c814b82dad0 100644 --- a/pkgs/development/python-modules/dateutil/default.nix +++ b/pkgs/development/python-modules/dateutil/default.nix @@ -1,6 +1,7 @@ { stdenv, buildPythonPackage, fetchurl, six }: buildPythonPackage rec { - name = "dateutil-${version}"; + pname = "dateutil"; + name = "${pname}-${version}"; version = "2.6.0"; src = fetchurl { diff --git a/pkgs/development/python-modules/dbfread/default.nix b/pkgs/development/python-modules/dbfread/default.nix index 6bbc4775605..facdd00edac 100644 --- a/pkgs/development/python-modules/dbfread/default.nix +++ b/pkgs/development/python-modules/dbfread/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "dbfread"; - version = "2.0.5"; + version = "2.0.7"; src = fetchPypi { inherit pname version; - sha256 = "0r5axq9ax0czyapm7b69krcv22r1nyb4vci7c5x8mx8pq1axim93"; + sha256 = "07c8a9af06ffad3f6f03e8fe91ad7d2733e31a26d2b72c4dd4cfbae07ee3b73d"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/dbus/default.nix b/pkgs/development/python-modules/dbus/default.nix index d2e1d2dc86f..ab6e70a9a64 100644 --- a/pkgs/development/python-modules/dbus/default.nix +++ b/pkgs/development/python-modules/dbus/default.nix @@ -2,7 +2,9 @@ , ncurses, pygobject3 }: if isPyPy then throw "dbus-python not supported for interpreter ${python.executable}" else buildPythonPackage rec { - name = "dbus-python-1.2.4"; + pname = "dbus-python"; + version = "1.2.4"; + name = "${pname}-${version}"; format = "other"; src = fetchurl { diff --git a/pkgs/development/python-modules/discordpy/default.nix b/pkgs/development/python-modules/discordpy/default.nix index c4f92caf8d5..53a4a51fcd8 100644 --- a/pkgs/development/python-modules/discordpy/default.nix +++ b/pkgs/development/python-modules/discordpy/default.nix @@ -11,13 +11,13 @@ let pname = "discord.py"; - version = "0.16.4"; + version = "0.16.8"; in buildPythonPackage rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "04q4gknv9lb8r2sdnsqs5nfcyyl850j4pcqcs0xjvmqhd7axa5ai"; + sha256 = "d775b701383e3a5762accf3816b819f357f299476701615ac30c7715a5ea79aa"; }; propagatedBuildInputs = [ asyncio aiohttp websockets pynacl ]; diff --git a/pkgs/development/python-modules/distro/default.nix b/pkgs/development/python-modules/distro/default.nix index 9b79d82328f..49349839331 100644 --- a/pkgs/development/python-modules/distro/default.nix +++ b/pkgs/development/python-modules/distro/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "distro"; - version = "1.0.3"; + version = "1.0.4"; buildInputs = [ pytest pytestcov tox]; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1kmjdz1kxspsmps73m2kzhxz86jj43ikx825hmgmwbx793ywv69d"; + sha256 = "9b000b0d637bb0cbd130a7a4835681e6993e309a85564dfea9d884825fe46954"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/django-compat/default.nix b/pkgs/development/python-modules/django-compat/default.nix index d8a314750ca..22f78533142 100644 --- a/pkgs/development/python-modules/django-compat/default.nix +++ b/pkgs/development/python-modules/django-compat/default.nix @@ -2,7 +2,8 @@ django, django_nose, six }: buildPythonPackage rec { - name = "django-compat-${version}"; + pname = "django-compat"; + name = "${pname}-${version}"; version = "1.0.14"; src = fetchurl { diff --git a/pkgs/development/python-modules/django-raster/default.nix b/pkgs/development/python-modules/django-raster/default.nix index e673d587e3e..2332229100c 100644 --- a/pkgs/development/python-modules/django-raster/default.nix +++ b/pkgs/development/python-modules/django-raster/default.nix @@ -3,12 +3,13 @@ pyparsing, django, celery }: buildPythonPackage rec { - name = "django-raster-${version}"; - version = "0.3.1"; + version = "0.4"; + pname = "django-raster"; + name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/d/django-raster/${name}.tar.gz"; - sha256 = "1hsrkvybak1adn9d9qdw7hx3rcxsbzas4ixwll6vrjkrizgfihk3"; + sha256 = "7fd6afa42b07ac51a3873e3d4840325dd3a8a631fdb5b853c76fbbfe59a2b17f"; }; # Tests require a postgresql + postgis server diff --git a/pkgs/development/python-modules/django/1_10.nix b/pkgs/development/python-modules/django/1_10.nix index 6cc3af8c270..52b62e8d8b8 100644 --- a/pkgs/development/python-modules/django/1_10.nix +++ b/pkgs/development/python-modules/django/1_10.nix @@ -3,7 +3,8 @@ geos, gdal }: buildPythonPackage rec { - name = "Django-${version}"; + pname = "Django"; + name = "${pname}-${version}"; version = "1.10.7"; disabled = pythonOlder "2.7"; diff --git a/pkgs/development/python-modules/django/1_11.nix b/pkgs/development/python-modules/django/1_11.nix index 01d9992220f..0845352fba1 100644 --- a/pkgs/development/python-modules/django/1_11.nix +++ b/pkgs/development/python-modules/django/1_11.nix @@ -3,8 +3,10 @@ geos, gdal, pytz }: buildPythonPackage rec { - name = "Django-${version}"; + pname = "Django"; + name = "${pname}-${version}"; version = "1.11.1"; + disabled = pythonOlder "2.7"; src = fetchurl { diff --git a/pkgs/development/python-modules/django_guardian.nix b/pkgs/development/python-modules/django_guardian.nix index aee9707a523..b6df932e658 100644 --- a/pkgs/development/python-modules/django_guardian.nix +++ b/pkgs/development/python-modules/django_guardian.nix @@ -3,7 +3,8 @@ , pytest, pytestrunner, pytest-django, setuptools_scm }: buildPythonPackage rec { - name = "django-guardian-${version}"; + pname = "django-guardian"; + name = "${pname}-${version}"; version = "1.4.8"; src = fetchurl { diff --git a/pkgs/development/python-modules/djangorestframework/default.nix b/pkgs/development/python-modules/djangorestframework/default.nix index 5ad026a8255..8bbce992c1b 100644 --- a/pkgs/development/python-modules/djangorestframework/default.nix +++ b/pkgs/development/python-modules/djangorestframework/default.nix @@ -1,11 +1,12 @@ { stdenv, buildPythonPackage, fetchurl, django }: buildPythonPackage rec { - name = "djangorestframework-${version}"; - version = "3.5.4"; + version = "3.6.3"; + pname = "djangorestframework"; + name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/d/djangorestframework/${name}.tar.gz"; - sha256 = "1rays9d8jxqng13fv18ldf11y44w0ln6vvj2k8m4sd9gw9da75gr"; + sha256 = "6aa6aafdfb7f6152a401873ecae93aff9eb54d7a74266065347cf4de68278ae4"; }; # Test settings are missing diff --git a/pkgs/development/python-modules/docker.nix b/pkgs/development/python-modules/docker.nix index 84c7b5ff38b..58c7da4cbe5 100644 --- a/pkgs/development/python-modules/docker.nix +++ b/pkgs/development/python-modules/docker.nix @@ -3,12 +3,13 @@ , ipaddress, backports_ssl_match_hostname, docker_pycreds }: buildPythonPackage rec { - name = "docker-${version}"; - version = "2.0.2"; + version = "2.3.0"; + pname = "docker"; + name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/d/docker/${name}.tar.gz"; - sha256 = "1m16n2r8is1gxwmyr6163na2jdyzsnhhk2qj12l7rzm1sr9nhx7z"; + sha256 = "b0e3f353a3df3eedfbbcaf48235117263479b893edfa0cf6d8d056cca5edde1c"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/docker_compose.nix b/pkgs/development/python-modules/docker_compose.nix index 9af95f72598..25435c396d7 100644 --- a/pkgs/development/python-modules/docker_compose.nix +++ b/pkgs/development/python-modules/docker_compose.nix @@ -6,12 +6,13 @@ , enum34, functools32 }: buildPythonApplication rec { - version = "1.10.0"; - name = "docker-compose-${version}"; + version = "1.13.0"; + pname = "docker-compose"; + name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/d/docker-compose/${name}.tar.gz"; - sha256 = "023y2yhkvglaq07d78i89g2p8h040d71il8nfbyg2f9fkffigx9z"; + sha256 = "3c7b62cd0ab5f33d21db197d8a74739d320a6fe32e4ef8282c35d4dee5a7c77c"; }; # lots of networking and other fails diff --git a/pkgs/development/python-modules/dogpile.cache/default.nix b/pkgs/development/python-modules/dogpile.cache/default.nix index de6efe40af7..25913f3a497 100644 --- a/pkgs/development/python-modules/dogpile.cache/default.nix +++ b/pkgs/development/python-modules/dogpile.cache/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "dogpile.cache"; - version = "0.6.2"; + version = "0.6.3"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "73793471af07af6dc5b3ee015abfaca4220caaa34c615537f5ab007ed150726d"; + sha256 = "e9747f5e31f8dea1b80d6204358885f943f69e53574d88005438ca3651c44553"; }; # Disable concurrency tests that often fail, diff --git a/pkgs/development/python-modules/ds4drv.nix b/pkgs/development/python-modules/ds4drv.nix index 8698a65ea11..ba40b0b3f85 100644 --- a/pkgs/development/python-modules/ds4drv.nix +++ b/pkgs/development/python-modules/ds4drv.nix @@ -4,7 +4,8 @@ }: buildPythonPackage rec { - name = "ds4drv-${version}"; + pname = "ds4drv"; + name = "${pname}-${version}"; version = "0.5.1"; # PyPi only carries py3 wheel diff --git a/pkgs/development/python-modules/dulwich.nix b/pkgs/development/python-modules/dulwich.nix index d482aa14627..804419d0fca 100644 --- a/pkgs/development/python-modules/dulwich.nix +++ b/pkgs/development/python-modules/dulwich.nix @@ -3,12 +3,13 @@ , git, glibcLocales }: buildPythonPackage rec { - name = "dulwich-${version}"; - version = "0.14.1"; + version = "0.17.3"; + pname = "dulwich"; + name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/d/dulwich/${name}.tar.gz"; - sha256 = "14xsyxha6qyxxyf0ma3zv1sy31iy22vzwayk519n7a1gwzk4j7vw"; + sha256 = "0c3eccac93823e172b05d57aaeab3d6f03c6c0f1867613606d1909a3ab4100ca"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/python-modules/edward/default.nix b/pkgs/development/python-modules/edward/default.nix index 0ae81aef096..ab7391595dc 100644 --- a/pkgs/development/python-modules/edward/default.nix +++ b/pkgs/development/python-modules/edward/default.nix @@ -3,14 +3,14 @@ buildPythonPackage rec { pname = "edward"; - version = "1.2.2"; + version = "1.3.1"; name = "${pname}-${version}"; disabled = !(isPy27 || pythonAtLeast "3.4"); src = fetchPypi { inherit pname version; - sha256 = "0h9i15l7mczwx8jvabjbvxjjidr13x81h6vylb1p8r308w01r2as"; + sha256 = "5f868604c4d13ccc054906fae6c0115edf295a81897cc9dc97026bb083d275ae"; }; # disabled for now due to Tensorflow trying to create files in $HOME: diff --git a/pkgs/development/python-modules/ezdxf/default.nix b/pkgs/development/python-modules/ezdxf/default.nix index c6c6137a2d4..1f457235b6a 100644 --- a/pkgs/development/python-modules/ezdxf/default.nix +++ b/pkgs/development/python-modules/ezdxf/default.nix @@ -2,7 +2,8 @@ buildPythonPackage rec { version = "0.8.1"; - name = "ezdxf-${version}"; + pname = "ezdxf"; + name = "${pname}-${version}"; src = fetchFromGitHub { owner = "mozman"; diff --git a/pkgs/development/python-modules/feedgenerator/default.nix b/pkgs/development/python-modules/feedgenerator/default.nix index 4a10b088d98..d5ce8f8afc2 100644 --- a/pkgs/development/python-modules/feedgenerator/default.nix +++ b/pkgs/development/python-modules/feedgenerator/default.nix @@ -1,7 +1,9 @@ { stdenv, buildPythonPackage, glibcLocales, fetchurl, six, pytz }: buildPythonPackage rec { - name = "feedgenerator-1.9"; + pname = "feedgenerator"; + version = "1.9"; + name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/f/feedgenerator/${name}.tar.gz"; diff --git a/pkgs/development/python-modules/flake8-blind-except/default.nix b/pkgs/development/python-modules/flake8-blind-except/default.nix index 88b4f811e94..a657c25eed7 100644 --- a/pkgs/development/python-modules/flake8-blind-except/default.nix +++ b/pkgs/development/python-modules/flake8-blind-except/default.nix @@ -1,7 +1,8 @@ { lib, fetchurl, buildPythonPackage }: buildPythonPackage rec { - name = "flake8-blind-except-${version}"; + pname = "flake8-blind-except"; + name = "${pname}-${version}"; version = "0.1.1"; src = fetchurl { url = "mirror://pypi/f/flake8-blind-except/${name}.tar.gz"; diff --git a/pkgs/development/python-modules/flake8-debugger/default.nix b/pkgs/development/python-modules/flake8-debugger/default.nix index b383c5db008..c00bf0c8551 100644 --- a/pkgs/development/python-modules/flake8-debugger/default.nix +++ b/pkgs/development/python-modules/flake8-debugger/default.nix @@ -1,7 +1,8 @@ { lib, fetchurl, buildPythonPackage, flake8, nose }: buildPythonPackage rec { - name = "flake8-debugger-${version}"; + pname = "flake8-debugger"; + name = "${pname}-${version}"; version = "1.4.0"; src = fetchurl { url = "mirror://pypi/f/flake8-debugger/${name}.tar.gz"; diff --git a/pkgs/development/python-modules/flask-elastic.nix b/pkgs/development/python-modules/flask-elastic.nix index 9ea9616fbda..4181d964787 100644 --- a/pkgs/development/python-modules/flask-elastic.nix +++ b/pkgs/development/python-modules/flask-elastic.nix @@ -2,7 +2,8 @@ , flask, elasticsearch }: buildPythonPackage rec { - name = "Flask-Elastic-${version}"; + pname = "Flask-Elastic"; + name = "${pname}-${version}"; version = "0.2"; src = fetchurl { diff --git a/pkgs/development/python-modules/flask-ldap-login.nix b/pkgs/development/python-modules/flask-ldap-login.nix index 37f9d72dd3f..cdc7cefff95 100644 --- a/pkgs/development/python-modules/flask-ldap-login.nix +++ b/pkgs/development/python-modules/flask-ldap-login.nix @@ -3,7 +3,9 @@ , mock, nose }: buildPythonPackage rec { - name = "flask-ldap-login-0.3.0"; + pname = "flask-ldap-login"; + version = "0.3.0"; + name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/f/flask-ldap-login/${name}.tar.gz"; diff --git a/pkgs/development/python-modules/flask-login.nix b/pkgs/development/python-modules/flask-login.nix index 0149e29bcf7..a463964b312 100644 --- a/pkgs/development/python-modules/flask-login.nix +++ b/pkgs/development/python-modules/flask-login.nix @@ -2,7 +2,8 @@ , flask, nose, mock, blinker}: buildPythonPackage rec { - name = "Flask-Login-${version}"; + pname = "Flask-Login"; + name = "${pname}-${version}"; version = "0.4.0"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/flask-oauthlib.nix b/pkgs/development/python-modules/flask-oauthlib.nix index 83413dadb7f..cacb16cb7bb 100644 --- a/pkgs/development/python-modules/flask-oauthlib.nix +++ b/pkgs/development/python-modules/flask-oauthlib.nix @@ -2,7 +2,8 @@ , flask, oauthlib, requests_oauthlib, flask_sqlalchemy , mock, nose}: buildPythonPackage rec { - name = "Flask-OAuthlib-${version}"; + pname = "Flask-OAuthlib"; + name = "${pname}-${version}"; version = "0.9.3"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/flask-wtf.nix b/pkgs/development/python-modules/flask-wtf.nix index 24e66ea4e98..a0b623c6b6a 100644 --- a/pkgs/development/python-modules/flask-wtf.nix +++ b/pkgs/development/python-modules/flask-wtf.nix @@ -1,7 +1,9 @@ { stdenv, fetchurl, buildPythonPackage, flask, wtforms, nose }: buildPythonPackage rec { - name = "Flask-WTF-0.14.2"; + pname = "Flask-WTF"; + version = "0.14.2"; + name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/F/Flask-WTF/${name}.tar.gz"; diff --git a/pkgs/development/python-modules/ghdiff.nix b/pkgs/development/python-modules/ghdiff.nix index 1f14b661d53..5dfd399ac7d 100644 --- a/pkgs/development/python-modules/ghdiff.nix +++ b/pkgs/development/python-modules/ghdiff.nix @@ -2,7 +2,9 @@ , zope_testrunner, six, chardet}: buildPythonPackage rec { - name = "ghdiff-0.4"; + pname = "ghdiff"; + version = "0.4"; + name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/g/ghdiff/${name}.tar.gz"; diff --git a/pkgs/development/python-modules/gunicorn.nix b/pkgs/development/python-modules/gunicorn.nix index 026e9df360c..cc8017f0cd8 100644 --- a/pkgs/development/python-modules/gunicorn.nix +++ b/pkgs/development/python-modules/gunicorn.nix @@ -2,11 +2,13 @@ , pytest, mock, pytestcov, coverage }: buildPythonPackage rec { - name = "gunicorn-19.3.0"; + pname = "gunicorn"; + version = "19.7.1"; + name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/g/gunicorn/${name}.tar.gz"; - sha256 = "12d0jd9y9fyssc28mn8j6nzrck8y05hc946p5h0rmbc25043bj4b"; + sha256 = "eee1169f0ca667be05db3351a0960765620dad53f53434262ff8901b68a1b622"; }; buildInputs = [ pytest mock pytestcov coverage ]; diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix index e2cb11cedb4..7b517df0922 100644 --- a/pkgs/development/python-modules/h5py/default.nix +++ b/pkgs/development/python-modules/h5py/default.nix @@ -11,12 +11,13 @@ let mpiSupport = hdf5.mpiSupport; in buildPythonPackage rec { - name = "h5py-${version}"; - version = "2.6.0"; + version = "2.7.0"; + pname = "h5py"; + name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/h/h5py/${name}.tar.gz"; - sha256 = "0df46dg7i7xfking9lp221bfm8dbl974yvlrbi1w7r6m61ac7bxj"; + sha256 = "79254312df2e6154c4928f5e3b22f7a2847b6e5ffb05ddc33e37b16e76d36310"; }; configure_flags = "--hdf5=${hdf5}" + optionalString mpiSupport " --mpi"; diff --git a/pkgs/development/python-modules/hieroglyph/default.nix b/pkgs/development/python-modules/hieroglyph/default.nix index e79cdede092..9e97e56c134 100644 --- a/pkgs/development/python-modules/hieroglyph/default.nix +++ b/pkgs/development/python-modules/hieroglyph/default.nix @@ -1,8 +1,9 @@ { stdenv , fetchurl , buildPythonPackage , sphinx }: buildPythonPackage rec { + pname = "hieroglyph"; version = "0.7.1"; - name = "hieroglyph-${version}"; + name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/h/hieroglyph/${name}.tar.gz"; diff --git a/pkgs/development/python-modules/hypothesis.nix b/pkgs/development/python-modules/hypothesis.nix index d5251f1fa55..0927c703fbf 100644 --- a/pkgs/development/python-modules/hypothesis.nix +++ b/pkgs/development/python-modules/hypothesis.nix @@ -9,25 +9,26 @@ buildPythonPackage rec { # pytz fake_factory django numpy pytest # If you need these, you can just add them to your environment. - name = "hypothesis-${version}"; - version = "3.7.0"; + version = "3.11.0"; + pname = "hypothesis"; + name = "${pname}-${version}"; # Upstream prefers github tarballs src = fetchFromGitHub { owner = "HypothesisWorks"; - repo = "hypothesis"; + repo = "hypothesis-python"; rev = "${version}"; - sha256 = "1zsv1ggf3g9rrigxl3zd1z8qc6fcj8lmszm8ib1ya4ar6r64x0yz"; + sha256 = "1s911pd3y9hvk0hq2fr6i68dqv1ciagryhgp13wgyfqh8hz8j6zv"; }; - buildInputs = stdenv.lib.optionals doCheck [ pytest flake8 flaky ]; + checkInputs = stdenv.lib.optionals doCheck [ pytest flake8 flaky ]; propagatedBuildInputs = stdenv.lib.optionals (pythonOlder "3.4") [ enum34 ]; inherit doCheck; # https://github.com/DRMacIver/hypothesis/issues/300 checkPhase = '' - ${python.interpreter} -m pytest tests/cover + py.test tests/cover ''; # Unsupport by upstream on certain versions diff --git a/pkgs/development/python-modules/incremental/default.nix b/pkgs/development/python-modules/incremental/default.nix index b8565a8b758..0c54c3ab8ae 100644 --- a/pkgs/development/python-modules/incremental/default.nix +++ b/pkgs/development/python-modules/incremental/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "incremental"; - version = "16.10.1"; + version = "17.5.0"; src = fetchurl { url = "mirror://pypi/i/${pname}/${name}.tar.gz"; - sha256 = "0hh382gsj5lfl3fsabblk2djngl4n5yy90xakinasyn41rr6pb8l"; + sha256 = "7b751696aaf36eebfab537e458929e194460051ccad279c72b755a167eebd4b3"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/jabberbot.nix b/pkgs/development/python-modules/jabberbot.nix index efbd4b981fa..9161f3f6f0b 100644 --- a/pkgs/development/python-modules/jabberbot.nix +++ b/pkgs/development/python-modules/jabberbot.nix @@ -1,7 +1,9 @@ { stdenv, buildPythonPackage, isPy3k, fetchurl, xmpppy }: buildPythonPackage rec { - name = "jabberbot-0.16"; + pname = "jabberbot"; + version = "0.16"; + name = "${pname}-${version}"; disabled = isPy3k; src = fetchurl { diff --git a/pkgs/development/python-modules/jsbeautifier/default.nix b/pkgs/development/python-modules/jsbeautifier/default.nix index fa4ba7bffb5..c199b2f50db 100644 --- a/pkgs/development/python-modules/jsbeautifier/default.nix +++ b/pkgs/development/python-modules/jsbeautifier/default.nix @@ -1,21 +1,23 @@ { stdenv, fetchurl, buildPythonApplication, EditorConfig, pytest, six }: buildPythonApplication rec { - name = "jsbeautifier-1.6.14"; + pname = "jsbeautifier"; + version = "1.6.14"; + name = "jsbeautifier-1.6.14"; - propagatedBuildInputs = [ six ]; + propagatedBuildInputs = [ six ]; - buildInputs = [ EditorConfig pytest ]; + buildInputs = [ EditorConfig pytest ]; - src = fetchurl { - url = "mirror://pypi/j/jsbeautifier/${name}.tar.gz"; - sha256 = "50b2af556aa1da7283a6a92eaa699668312cb91f2ba6b78a4422b1d42af964a2"; - }; + src = fetchurl { + url = "mirror://pypi/j/jsbeautifier/${name}.tar.gz"; + sha256 = "50b2af556aa1da7283a6a92eaa699668312cb91f2ba6b78a4422b1d42af964a2"; + }; - meta = with stdenv.lib; { - homepage = "http://jsbeautifier.org"; - description = "JavaScript unobfuscator and beautifier."; - license = licenses.mit; - maintainers = with maintainers; [ apeyroux ]; - }; - } + meta = with stdenv.lib; { + homepage = "http://jsbeautifier.org"; + description = "JavaScript unobfuscator and beautifier."; + license = licenses.mit; + maintainers = with maintainers; [ apeyroux ]; + }; +} diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index ab9d315e794..c397ff43074 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "Keras"; - version = "2.0.3"; + version = "2.0.4"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "1x4p179smmnki6mng9n3lsi9glv2jg0y1ls154msplz9jm5bv39r"; + sha256 = "1cbe62af6821963321b275d5598fd94e63c11feaa1d4deaa79c9eb9ee0e1d68a"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/koji/default.nix b/pkgs/development/python-modules/koji/default.nix index 28b5e11223f..d43e56781a7 100644 --- a/pkgs/development/python-modules/koji/default.nix +++ b/pkgs/development/python-modules/koji/default.nix @@ -1,7 +1,9 @@ { stdenv, fetchurl, buildPythonPackage, pycurl }: buildPythonPackage rec { - name = "koji-1.8"; + pname = "koji"; + version = "1.8"; + name = "${pname}-${version}"; format = "other"; src = fetchurl { diff --git a/pkgs/development/python-modules/ldap.nix b/pkgs/development/python-modules/ldap.nix index 95243f52a38..e2625e2bfbf 100644 --- a/pkgs/development/python-modules/ldap.nix +++ b/pkgs/development/python-modules/ldap.nix @@ -2,12 +2,14 @@ , openldap, cyrus_sasl, openssl }: buildPythonPackage rec { - name = "ldap-2.4.22"; + pname = "python-ldap"; + version = "2.4.38"; + name = "${pname}-${version}"; disabled = isPy3k; src = fetchurl { url = "mirror://pypi/p/python-ldap/python-${name}.tar.gz"; - sha256 = "1dshpq84kl4xpa0hmnjrh6q5h5bybn09r83sa3z3ybr9jlm8gxcy"; + sha256 = "88bab69e519dd8bd83becbe36bd141c174b0fe309e84936cf1bae685b31be779"; }; NIX_CFLAGS_COMPILE = "-I${cyrus_sasl.dev}/include/sasl"; diff --git a/pkgs/development/python-modules/libais/default.nix b/pkgs/development/python-modules/libais/default.nix index 85b5d92e79f..5d8c886e00b 100644 --- a/pkgs/development/python-modules/libais/default.nix +++ b/pkgs/development/python-modules/libais/default.nix @@ -2,7 +2,8 @@ six, pytest, pytestrunner, pytestcov, coverage }: buildPythonPackage rec { - name = "libais-${version}"; + pname = "libais"; + name = "${pname}-${version}"; version = "0.16"; src = fetchurl { diff --git a/pkgs/development/python-modules/libarcus/default.nix b/pkgs/development/python-modules/libarcus/default.nix index cae6ac62e1e..bfe3b7bbb66 100644 --- a/pkgs/development/python-modules/libarcus/default.nix +++ b/pkgs/development/python-modules/libarcus/default.nix @@ -5,7 +5,8 @@ then throw "libArcus not supported for interpreter ${python.executable}" else stdenv.mkDerivation rec { - name = "libarcus-${version}"; + pname = "libarcus"; + name = "${pname}-${version}"; version = "2.4.0"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/libasyncns/default.nix b/pkgs/development/python-modules/libasyncns/default.nix index 63bcad285c4..b27dbc2935a 100644 --- a/pkgs/development/python-modules/libasyncns/default.nix +++ b/pkgs/development/python-modules/libasyncns/default.nix @@ -2,7 +2,8 @@ , libasyncns, pkgconfig }: buildPythonPackage rec { - name = "libasyncns-python-${version}"; + pname = "libasyncns-python"; + name = "${pname}-${version}"; version = "0.7.1"; src = fetchurl { diff --git a/pkgs/development/python-modules/libsexy/default.nix b/pkgs/development/python-modules/libsexy/default.nix index 79eb8ab2f83..69d9dde6cba 100644 --- a/pkgs/development/python-modules/libsexy/default.nix +++ b/pkgs/development/python-modules/libsexy/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, buildPythonPackage, libsexy, pkgconfig, libxml2, pygtk, pango, gtk2, glib }: buildPythonPackage rec { - name = "libsexy-${version}"; + pname = "libsexy"; + name = "${pname}-${version}"; version = "0.1.9"; format = "other"; diff --git a/pkgs/development/python-modules/llvmlite/default.nix b/pkgs/development/python-modules/llvmlite/default.nix index 6b6be639851..c08d05c0341 100644 --- a/pkgs/development/python-modules/llvmlite/default.nix +++ b/pkgs/development/python-modules/llvmlite/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "llvmlite"; name = "${pname}-${version}"; - version = "0.16.0"; + version = "0.18.0"; disabled = isPyPy; src = fetchurl { url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "ef3bae32482f91742d91571b5225a6943804291eb9405b98090a7b50942ec5e9"; + sha256 = "25a38af925f0523b834b92216d7f7cc997624942d5958287350c254f5e730404"; }; propagatedBuildInputs = [ llvm ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34; diff --git a/pkgs/development/python-modules/m2r/default.nix b/pkgs/development/python-modules/m2r/default.nix index 49f1e2da5ba..5a67d6a719b 100644 --- a/pkgs/development/python-modules/m2r/default.nix +++ b/pkgs/development/python-modules/m2r/default.nix @@ -1,7 +1,8 @@ { stdenv, buildPythonPackage, fetchurl, mistune, docutils } : buildPythonPackage rec { - name = "m2r-${version}"; + pname = "m2r"; + name = "${pname}-${version}"; version = "0.1.5"; src = fetchurl { diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix index 99da5e83a87..62f40ce8337 100644 --- a/pkgs/development/python-modules/magic-wormhole/default.nix +++ b/pkgs/development/python-modules/magic-wormhole/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "magic-wormhole"; - version = "0.8.1"; + version = "0.9.2"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "1yh5nbhh9z1am2pqnb5qqyq1zjl1m7z6jnkmvry2q14qwspw9had"; + sha256 = "14aed4b453278651d92c3fd8955a105e2d33dcde279fa25d1d759e0e769f16b3"; }; checkInputs = [ mock ]; diff --git a/pkgs/development/python-modules/markdown2.nix b/pkgs/development/python-modules/markdown2.nix index af7511bc9aa..e5c22bc4dc6 100644 --- a/pkgs/development/python-modules/markdown2.nix +++ b/pkgs/development/python-modules/markdown2.nix @@ -1,8 +1,9 @@ { stdenv, buildPythonPackage, fetchurl }: buildPythonPackage rec { - name = "markdown2-${version}"; + pname = "markdown2"; version = "2.3.1"; + name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/m/markdown2/${name}.zip"; diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index b917575e239..03a03007cf9 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -20,12 +20,13 @@ assert enableTk -> (tcl != null) assert enableQt -> pyqt4 != null; buildPythonPackage rec { - name = "matplotlib-${version}"; - version = "2.0.0"; + version = "2.0.2"; + pname = "matplotlib"; + name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/m/matplotlib/${name}.tar.gz"; - sha256 = "04zqymd5dw6lxvfbxf1sycdnibjk5qky5rfsn6wb46lwha2hkkrn"; + sha256 = "0ffbc44faa34a8b1704bc108c451ecf87988f900ef7ce757b8e2e84383121ff1"; }; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; diff --git a/pkgs/development/python-modules/mpi4py/default.nix b/pkgs/development/python-modules/mpi4py/default.nix index c38d948dd6b..a9ffe37a463 100644 --- a/pkgs/development/python-modules/mpi4py/default.nix +++ b/pkgs/development/python-modules/mpi4py/default.nix @@ -1,11 +1,13 @@ { stdenv, fetchurl, python, buildPythonPackage, mpi, openssh, isPy3k, isPyPy }: buildPythonPackage rec { - name = "mpi4py-1.3.1"; + pname = "mpi4py"; + version = "2.0.0"; + name = "${pname}-${version}"; src = fetchurl { url = "https://bitbucket.org/mpi4py/mpi4py/downloads/${name}.tar.gz"; - sha256 = "e7bd2044aaac5a6ea87a87b2ecc73b310bb6efe5026031e33067ea3c2efc3507"; + sha256 = "6543a05851a7aa1e6d165e673d422ba24e45c41e4221f0993fe1e5924a00cb81"; }; passthru = { diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix index 9a2e13f0c59..1031e81c5e3 100644 --- a/pkgs/development/python-modules/multidict/default.nix +++ b/pkgs/development/python-modules/multidict/default.nix @@ -7,13 +7,13 @@ let pname = "multidict"; - version = "2.1.4"; + version = "2.1.5"; in buildPythonPackage rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "a77aa8c9f68846c3b5db43ff8ed2a7a884dbe845d01f55113a3fba78518c4cd7"; + sha256 = "20a30a474882ad174eb64873cfa7bae4604944105adf7f6847141bd7938c5ed1"; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/netcdf4.nix b/pkgs/development/python-modules/netcdf4.nix index 979a741e1ab..b50bcae033c 100644 --- a/pkgs/development/python-modules/netcdf4.nix +++ b/pkgs/development/python-modules/netcdf4.nix @@ -2,7 +2,8 @@ , numpy, zlib, netcdf, hdf5, curl, libjpeg }: buildPythonPackage rec { - name = "netCDF4-${version}"; + pname = "netCDF4"; + name = "${pname}-${version}"; version = "1.2.7"; disabled = isPyPy; diff --git a/pkgs/development/python-modules/nltk.nix b/pkgs/development/python-modules/nltk.nix index c436e40d238..302bd89be02 100644 --- a/pkgs/development/python-modules/nltk.nix +++ b/pkgs/development/python-modules/nltk.nix @@ -1,12 +1,13 @@ { fetchurl, buildPythonPackage, isPy33, lib, six, pythonAtLeast, pythonOlder }: buildPythonPackage rec { - name = "nltk-${version}"; - version = "3.2.2"; + version = "3.2.4"; + pname = "nltk"; + name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/n/nltk/nltk-${version}.tar.gz"; - sha256 = "13m8i393h5mhpyvh5rghxxpax3bscv8li3ynwfdiq0kh8wsdndqv"; + sha256 = "8682ae52f5de4f2ba7b77bd78222a38575ad01ef29946214b254dfdf93a3a0eb"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix index 3ce40f2618a..99c7ce00853 100644 --- a/pkgs/development/python-modules/numba/default.nix +++ b/pkgs/development/python-modules/numba/default.nix @@ -14,12 +14,13 @@ }: buildPythonPackage rec { - version = "0.31.0"; - name = "numba-${version}"; + version = "0.33.0"; + pname = "numba"; + name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/n/numba/${name}.tar.gz"; - sha256 = "69f8ecacca687e89625abbc9f9ff2b64b3cc8649c284a3bc92f2df6dc82a7c80"; + sha256 = "56c5fcf3175f72b67ba8998d02870e3ea598e10c41d93289cecb9d89be7669fd"; }; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; diff --git a/pkgs/development/python-modules/os-testr/default.nix b/pkgs/development/python-modules/os-testr/default.nix index 3dbf54102e9..d97c525b17a 100644 --- a/pkgs/development/python-modules/os-testr/default.nix +++ b/pkgs/development/python-modules/os-testr/default.nix @@ -3,12 +3,13 @@ coverage, oslosphinx, oslotest, testscenarios, six, ddt }: buildPythonPackage rec { - name = "os-testr-${version}"; - version = "0.8.1"; + version = "0.8.2"; + pname = "os-testr"; + name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/o/os-testr/${name}.tar.gz"; - sha256 = "10ws7l5p25psnp6rwymwdzh4zagmmnbf56xwg06cn2292m95l4i7"; + sha256 = "d8a60bd56c541714a5cab4d1996c8ddfdb5c7c35393d55be617803048c170837"; }; patchPhase = '' diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index eb5b5987a40..103907c26d1 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -70,7 +70,6 @@ in buildPythonPackage rec { --replace OSError ImportError ''; - # The flag `-A 'not network'` will disable tests that use internet. checkPhase = '' runHook preCheck py.test $out/${python.sitePackages}/pandas --skip-slow --skip-network diff --git a/pkgs/development/python-modules/pbr/default.nix b/pkgs/development/python-modules/pbr/default.nix index 15c0d921ef8..68a2ef484c5 100644 --- a/pkgs/development/python-modules/pbr/default.nix +++ b/pkgs/development/python-modules/pbr/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pbr"; - version = "2.0.0"; + version = "3.0.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0ccd2db529afd070df815b1521f01401d43de03941170f8a800e7531faba265d"; + sha256 = "d7e8917458094002b9a2e0030ba60ba4c834c456071f2d0c1ccb5265992ada91"; }; # circular dependencies with fixtures diff --git a/pkgs/development/python-modules/pelican/default.nix b/pkgs/development/python-modules/pelican/default.nix index 72901881b03..b54bcc0ed1d 100644 --- a/pkgs/development/python-modules/pelican/default.nix +++ b/pkgs/development/python-modules/pelican/default.nix @@ -5,7 +5,8 @@ , blinker, pillow, beautifulsoup4, markupsafe }: buildPythonPackage rec { - name = "pelican-${version}"; + pname = "pelican"; + name = "${pname}-${version}"; version = "3.7.1"; disabled = isPy26; diff --git a/pkgs/development/python-modules/pep257.nix b/pkgs/development/python-modules/pep257.nix index 1cd0e4afc0c..9f61619e12b 100644 --- a/pkgs/development/python-modules/pep257.nix +++ b/pkgs/development/python-modules/pep257.nix @@ -1,6 +1,7 @@ { stdenv, buildPythonPackage, fetchurl, pytest, mock }: buildPythonPackage rec { - name = "pep257-${version}"; + pname = "pep257"; + name = "${pname}-${version}"; version = "0.7.0"; src = fetchurl { diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index ead0e3d858d..5c1d69b00be 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -1,7 +1,9 @@ { stdenv, fetchurl, buildPythonPackage }: buildPythonPackage rec { - name = "phonenumbers-8.4.0"; + pname = "phonenumbers"; + version = "8.5.0"; + name = "${pname}-${version}"; meta = { description = "Python version of Google's common library for parsing, formatting, storing and validating international phone numbers"; @@ -12,6 +14,6 @@ buildPythonPackage rec { src = fetchurl { url = "mirror://pypi/p/phonenumbers/${name}.tar.gz"; - sha256 = "1c052gd7ra3v183jq2x5nwa428wxh1g3psfh0ay5jwwmcxy78vab"; + sha256 = "6d3d82a3dcb0418431099d1b1c24efb280cbec8f81c7ce3d1abf417c238b8859"; }; } diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix index fe307513de7..df2bcc03de4 100644 --- a/pkgs/development/python-modules/pip-tools/default.nix +++ b/pkgs/development/python-modules/pip-tools/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, buildPythonPackage, pip, pytest, click, six, first, glibcLocales }: buildPythonPackage rec { pname = "pip-tools"; - version = "1.8.1rc3"; + version = "1.9.0"; name = "pip-tools-${version}"; src = fetchFromGitHub { owner = "jazzband"; repo = "pip-tools"; rev = version; - sha256 = "09rbgzj71bfp1x1jfr1zx3vax4qjbw5l6vcd3fqvshsdvg9lcnpx"; + sha256 = "0706feb27263a2dade6d39cc508e718282bd08f455d0643f251659f905be4d56"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/python-modules/pyatspi/default.nix b/pkgs/development/python-modules/pyatspi/default.nix index 012c8c42d6a..d96a4c8cea3 100644 --- a/pkgs/development/python-modules/pyatspi/default.nix +++ b/pkgs/development/python-modules/pyatspi/default.nix @@ -1,8 +1,9 @@ { stdenv, fetchurl, pkgconfig, at_spi2_core, pythonPackages }: stdenv.mkDerivation rec { + pname = "pyatspi"; version = "2.18.0"; - name = "pyatspi-${version}"; + name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/pyatspi/2.18/${name}.tar.xz"; diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix index 2919506e931..c1ca9d4c02c 100644 --- a/pkgs/development/python-modules/pycairo/default.nix +++ b/pkgs/development/python-modules/pycairo/default.nix @@ -9,8 +9,9 @@ if (isPyPy) then throw "pycairo not supported for interpreter ${python.executabl patch_waf-py3_5 = ./waf-py3_5.patch; in buildPythonPackage rec { + pname = "pycairo"; version = "1.10.0"; - name = "pycairo-${version}"; + name = "${pname}-${version}"; format = "other"; src = if isPy3k diff --git a/pkgs/development/python-modules/pycryptodome/default.nix b/pkgs/development/python-modules/pycryptodome/default.nix index d465c0befe1..71b90d242f0 100644 --- a/pkgs/development/python-modules/pycryptodome/default.nix +++ b/pkgs/development/python-modules/pycryptodome/default.nix @@ -1,12 +1,13 @@ { stdenv, fetchurl, python, buildPythonPackage, gmp }: buildPythonPackage rec { - version = "3.4.3"; - name = "pycryptodome-${version}"; + version = "3.4.6"; + pname = "pycryptodome"; + name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/p/pycryptodome/${name}.tar.gz"; - sha256 = "1x2kk2va77lqys2dd7gwh35m4vrp052zz5hvv1zqxzksg2srf5jb"; + sha256 = "df1be662060cf3abdcf2086ebb401f750744106425ddebf74c57feab410e4923"; }; meta = { diff --git a/pkgs/development/python-modules/pycuda/default.nix b/pkgs/development/python-modules/pycuda/default.nix index 471ffbe6c35..71bf64b7733 100644 --- a/pkgs/development/python-modules/pycuda/default.nix +++ b/pkgs/development/python-modules/pycuda/default.nix @@ -22,12 +22,12 @@ let in buildPythonPackage rec { pname = "pycuda"; - version = "2016.1.2"; + version = "2017.1"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "0dvf1cnrlvmrc7i100n2ndrnd7fjm7aq3wpmk2nx5h7hwb3xmnx7"; + sha256 = "a92725ccd8515b4d7284b9127184b6fdb61f224daa086e7fc6b926e2094b055f"; }; preConfigure = '' diff --git a/pkgs/development/python-modules/pyexiv2/default.nix b/pkgs/development/python-modules/pyexiv2/default.nix index 1bdf61904eb..5d11b716a2f 100644 --- a/pkgs/development/python-modules/pyexiv2/default.nix +++ b/pkgs/development/python-modules/pyexiv2/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, python, exiv2, scons, boost }: -let version = "0.3.2"; in - stdenv.mkDerivation rec { - name = "pyexiv2-${version}"; + pname = "pyexiv2"; + version = "0.3.2"; + name = "${pname}-${version}"; src = fetchurl { url = "http://launchpad.net/pyexiv2/0.3.x/0.3.2/+download/${name}.tar.bz2"; diff --git a/pkgs/development/python-modules/pyext/default.nix b/pkgs/development/python-modules/pyext/default.nix index 6f03a2edf79..563a3217e8c 100644 --- a/pkgs/development/python-modules/pyext/default.nix +++ b/pkgs/development/python-modules/pyext/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { name = pname + "-" + version; pname = "pyext"; - version = "0.7"; + version = "0.6"; src = fetchPypi { inherit pname version; - sha256 = "1pvwjkrjqajzh4wiiw1mzqp0bb81cqc2gk23nj24m32fpqssc676"; + sha256 = "6c406cf71b991e1fc5a7f963d3a289525bce5e7ad1c43b697d9f5223185fcaef"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix index af7b7aca93c..a10c858c233 100644 --- a/pkgs/development/python-modules/pygame/default.nix +++ b/pkgs/development/python-modules/pygame/default.nix @@ -3,7 +3,8 @@ }: buildPythonPackage rec { - name = "pygame-${version}"; + pname = "pygame"; + name = "${pname}-${version}"; version = "1.9.3"; src = fetchurl { diff --git a/pkgs/development/python-modules/pylibmc/default.nix b/pkgs/development/python-modules/pylibmc/default.nix index c91930292c2..ff53e3d304f 100644 --- a/pkgs/development/python-modules/pylibmc/default.nix +++ b/pkgs/development/python-modules/pylibmc/default.nix @@ -1,11 +1,12 @@ { buildPythonPackage, fetchurl, stdenv, libmemcached, zlib }: buildPythonPackage rec { - name = "pylibmc-${version}"; - version = "1.5.1"; + version = "1.5.2"; + pname = "pylibmc"; + name = "${pname}-${version}"; src = fetchurl { url = "https://pypi.python.org/packages/source/p/pylibmc/${name}.tar.gz"; - sha256 = "1mnd8lng9wmcihl7mxd940hy1dzzvzsb971qclrvmqf3b4c2dfpc"; + sha256 = "fc54e28a9f1b5b2ec0c030da29c7ad8a15c2755bd98aaa4142eaf419d5fabb33"; }; buildInputs = [ libmemcached zlib ]; diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index 67604c3f253..2922faafa7f 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "pylint"; - version = "1.6.5"; + version = "1.7.1"; src = fetchurl { url = "mirror://pypi/p/${pname}/${name}.tar.gz"; - sha256 = "06b78nl996949a7h01c4ycy8779hl5cm7vpxij5lm3npim59hwx6"; + sha256 = "8b4a7ab6cf5062e40e2763c0b4a596020abada1d7304e369578b522e46a6264a"; }; buildInputs = [ pytest mccabe configparser backports_functools_lru_cache ]; diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix index 7be60b1e69b..6b07df0b110 100644 --- a/pkgs/development/python-modules/pyopencl/default.nix +++ b/pkgs/development/python-modules/pyopencl/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pyopencl"; - version = "2016.2"; + version = "2017.1"; name = "${pname}-${version}"; buildInputs = [ pytest opencl-headers ocl-icd ]; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchurl { url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "1b94540cf59ea71a3ef234a8f1d0eb2b4633c112f0f554fb69e52b4a0337d82b"; + sha256 = "b5085b6412e5a1037b893853e4e47ecb36dd04586b0f8e1809f50f7fe1437dae"; }; # gcc: error: pygpu_language_opencl.cpp: No such file or directory diff --git a/pkgs/development/python-modules/pyrax.nix b/pkgs/development/python-modules/pyrax.nix index 87c0c3db264..7857f46e242 100644 --- a/pkgs/development/python-modules/pyrax.nix +++ b/pkgs/development/python-modules/pyrax.nix @@ -1,7 +1,9 @@ { lib, buildPythonPackage, fetchurl, requests, novaclient, keyring, rackspace-novaclient, six, isPy3k, pytest, glibcLocales }: buildPythonPackage rec { - name = "pyrax-1.9.8"; + pname = "pyrax"; + version = "1.9.8"; + name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/p/pyrax/${name}.tar.gz"; diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix index 1b47b7f3f7d..5d2e1855f04 100644 --- a/pkgs/development/python-modules/pyroute2/default.nix +++ b/pkgs/development/python-modules/pyroute2/default.nix @@ -1,11 +1,13 @@ {stdenv, buildPythonPackage, fetchurl}: buildPythonPackage rec { - name = "pyroute2-0.4.13"; + pname = "pyroute2"; + version = "0.4.14"; + name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/p/pyroute2/${name}.tar.gz"; - sha256 = "0f8a1ihxc1r78m6dqwhks2vdp4vwwbw72mbv88v70qmkb0pxgwwk"; + sha256 = "eb41cdc5a9e7c017c65c8ff11013fd1b6d6699163bcf469e643cb1799a87d330"; }; # requires root priviledges diff --git a/pkgs/development/python-modules/pyscard/default.nix b/pkgs/development/python-modules/pyscard/default.nix index bb2291fb4ac..796bc88430a 100644 --- a/pkgs/development/python-modules/pyscard/default.nix +++ b/pkgs/development/python-modules/pyscard/default.nix @@ -1,12 +1,13 @@ { stdenv, fetchurl, buildPythonPackage, swig, pcsclite }: buildPythonPackage rec { - name = "pyscard-${version}"; - version = "1.9.4"; + version = "1.9.5"; + pname = "pyscard"; + name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/p/pyscard/${name}.tar.gz"; - sha256 = "0gn0p4p8dhk99g8vald0dcnh45jbf82bj72n4djyr8b4hawkck4v"; + sha256 = "7eef027e1939b7595fc13c03616f262f90d118594fdb6f7620af46b54fa06835"; }; patchPhase = '' diff --git a/pkgs/development/python-modules/pyside/default.nix b/pkgs/development/python-modules/pyside/default.nix index 009afdd3a03..9d7f11b939d 100644 --- a/pkgs/development/python-modules/pyside/default.nix +++ b/pkgs/development/python-modules/pyside/default.nix @@ -2,7 +2,8 @@ # This derivation provides a Python module and should therefore be called via `python-packages.nix`. buildPythonPackage rec { - name = "pyside-${version}"; + pname = "pyside"; + name = "${pname}-${version}"; version = "1.2.4"; format = "other"; diff --git a/pkgs/development/python-modules/pysrt/default.nix b/pkgs/development/python-modules/pysrt/default.nix index 076838425a4..147e9773fbf 100644 --- a/pkgs/development/python-modules/pysrt/default.nix +++ b/pkgs/development/python-modules/pysrt/default.nix @@ -6,7 +6,8 @@ }: buildPythonApplication rec { - name = "pysrt-${version}"; + pname = "pysrt"; + name = "${pname}-${version}"; version = "1.1.1"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/pytest-django/default.nix b/pkgs/development/python-modules/pytest-django/default.nix index 56fc72ebcce..0fd48568446 100644 --- a/pkgs/development/python-modules/pytest-django/default.nix +++ b/pkgs/development/python-modules/pytest-django/default.nix @@ -3,7 +3,8 @@ , fetchpatch }: buildPythonPackage rec { - name = "pytest-django-${version}"; + pname = "pytest-django"; + name = "${pname}-${version}"; version = "3.1.2"; src = fetchurl { diff --git a/pkgs/development/python-modules/pytest-httpbin/default.nix b/pkgs/development/python-modules/pytest-httpbin/default.nix index 34a2bf7e31c..6f6f79109d9 100644 --- a/pkgs/development/python-modules/pytest-httpbin/default.nix +++ b/pkgs/development/python-modules/pytest-httpbin/default.nix @@ -10,7 +10,8 @@ }: buildPythonPackage rec { - name = "pytest-httpbin-${version}"; + pname = "pytest-httpbin"; + name = "${pname}-${version}"; version = "0.2.3"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/pytest-pep257.nix b/pkgs/development/python-modules/pytest-pep257.nix index 7ce63ebc7a6..1509d80feb1 100644 --- a/pkgs/development/python-modules/pytest-pep257.nix +++ b/pkgs/development/python-modules/pytest-pep257.nix @@ -1,19 +1,21 @@ { stdenv, buildPythonPackage, fetchurl, pytest, pep257 }: + buildPythonPackage rec { - name = "pytest-pep257-${version}"; - version = "0.0.5"; + pname = "pytest-pep257"; + name = "${pname}-${version}"; + version = "0.0.5"; - src = fetchurl { - url = "mirror://pypi/p/pytest-pep257/${name}.tar.gz"; - sha256 = "082v3d5k4331x53za51kl8zxsndsw1pcyf1xdfpb2gjdjrhixb8w"; - }; + src = fetchurl { + url = "mirror://pypi/p/pytest-pep257/${name}.tar.gz"; + sha256 = "082v3d5k4331x53za51kl8zxsndsw1pcyf1xdfpb2gjdjrhixb8w"; + }; - buildInputs = [ pytest ]; - propagatedBuildInputs = [ pep257 ]; + buildInputs = [ pytest ]; + propagatedBuildInputs = [ pep257 ]; - meta = with stdenv.lib; { - homepage = https://github.com/anderslime/pytest-pep257; - description = "py.test plugin for PEP257"; - license = licenses.mit; - }; + meta = with stdenv.lib; { + homepage = https://github.com/anderslime/pytest-pep257; + description = "py.test plugin for PEP257"; + license = licenses.mit; + }; } diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 90b67022c5b..402c869c98c 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -1,7 +1,8 @@ { stdenv, buildPythonPackage, fetchurl, isPy26, argparse, hypothesis, py }: buildPythonPackage rec { - name = "pytest-${version}"; version = "3.0.7"; + pname = "pytest"; + name = "${pname}-${version}"; preCheck = '' # don't test bash builtins diff --git a/pkgs/development/python-modules/pytestdjango.nix b/pkgs/development/python-modules/pytestdjango.nix deleted file mode 100644 index 5a8dd85f4bd..00000000000 --- a/pkgs/development/python-modules/pytestdjango.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, buildPythonPackage, fetchurl -, pytest, django, setuptools_scm -}: -buildPythonPackage rec { - name = "pytest-django-${version}"; - version = "3.1.2"; - - src = fetchurl { - url = "mirror://pypi/p/pytest-django/${name}.tar.gz"; - sha256 = "02932m2sr8x22m4az8syr8g835g4ak77varrnw71n6xakmdcr303"; - }; - - buildInputs = [ pytest setuptools_scm ]; - propagatedBuildInputs = [ django ]; - - meta = with stdenv.lib; { - description = "py.test plugin for testing of Django applications"; - homepage = http://pytest-django.readthedocs.org/en/latest/; - license = licenses.bsd3; - }; -} diff --git a/pkgs/development/python-modules/python-jose/default.nix b/pkgs/development/python-modules/python-jose/default.nix index da4dd410746..c1472bc66a8 100644 --- a/pkgs/development/python-modules/python-jose/default.nix +++ b/pkgs/development/python-modules/python-jose/default.nix @@ -3,7 +3,8 @@ }: buildPythonPackage rec { - name = "python-jose-${version}"; + pname = "python-jose"; + name = "${pname}-${version}"; version = "1.3.2"; src = fetchFromGitHub { owner = "mpdavis"; diff --git a/pkgs/development/python-modules/python-sql/default.nix b/pkgs/development/python-modules/python-sql/default.nix index 30f734d5719..f5ce3a15626 100644 --- a/pkgs/development/python-modules/python-sql/default.nix +++ b/pkgs/development/python-modules/python-sql/default.nix @@ -1,11 +1,12 @@ { lib, fetchurl, buildPythonPackage }: buildPythonPackage rec { - name = "python-sql-${version}"; - version = "0.8"; + pname = "python-sql"; + name = "${pname}-${version}"; + version = "0.9"; src = fetchurl { url = "mirror://pypi/p/python-sql/${name}.tar.gz"; - sha256 = "0xik939sxqfqqbpgcsnfjnws692bjip32khgwhq1ycphfy7df3h2"; + sha256 = "07b51cc1c977ef5480fe671cae5075ad4b68a6fc67f4569782e06f012456d35c"; }; meta = { homepage = http://python-sql.tryton.org/; diff --git a/pkgs/development/python-modules/python-stdnum/default.nix b/pkgs/development/python-modules/python-stdnum/default.nix index fe85b7bb0d3..337577141c2 100644 --- a/pkgs/development/python-modules/python-stdnum/default.nix +++ b/pkgs/development/python-modules/python-stdnum/default.nix @@ -1,13 +1,14 @@ { lib, fetchurl, buildPythonPackage, isPy3k }: buildPythonPackage rec { - name = "python-stdnum-${version}"; - version = "1.5"; + version = "1.6"; + pname = "python-stdnum"; + name = "${pname}-${version}"; # Failing tests and dependency issue on Py3k disabled = isPy3k; src = fetchurl { url = "mirror://pypi/p/python-stdnum/${name}.tar.gz"; - sha256 = "0zkkpjy4gc161dkyxjmingjw48glljlqqrl4fh2k5idf0frkvzhh"; + sha256 = "157a0aef01b1e846ddd11252dc516637da6b3347e32f0130825b7fae1d8b4655"; }; meta = { homepage = "http://arthurdejong.org/python-stdnum/"; diff --git a/pkgs/development/python-modules/pyudev.nix b/pkgs/development/python-modules/pyudev.nix index e9a3ecaac5b..70950e4e927 100644 --- a/pkgs/development/python-modules/pyudev.nix +++ b/pkgs/development/python-modules/pyudev.nix @@ -3,7 +3,8 @@ }: buildPythonPackage rec { - name = "pyudev-${version}"; + pname = "pyudev"; + name = "${pname}-${version}"; version = "0.21.0"; src = fetchurl { diff --git a/pkgs/development/python-modules/pywebdav/default.nix b/pkgs/development/python-modules/pywebdav/default.nix index 27925a619f2..a69c8568aca 100644 --- a/pkgs/development/python-modules/pywebdav/default.nix +++ b/pkgs/development/python-modules/pywebdav/default.nix @@ -1,7 +1,8 @@ { lib, fetchurl, buildPythonPackage, isPy3k }: buildPythonPackage rec { - name = "PyWebDAV-${version}"; + pname = "pywebdav"; + name = "${pname}-${version}"; version = "0.9.8"; disabled = isPy3k; src = fetchurl { diff --git a/pkgs/development/python-modules/pyxml/default.nix b/pkgs/development/python-modules/pyxml/default.nix index b85b2042369..0ef91fda9e3 100644 --- a/pkgs/development/python-modules/pyxml/default.nix +++ b/pkgs/development/python-modules/pyxml/default.nix @@ -1,7 +1,9 @@ {lib, fetchurl, python, buildPythonPackage, makeWrapper}: buildPythonPackage rec { - name = "PyXML-0.8.4"; + pname = "PyXML"; + version = "0.8.4"; + name = "${pname}-${pname}"; format = "other"; src = fetchurl { url = "mirror://sourceforge/pyxml/${name}.tar.gz"; diff --git a/pkgs/development/python-modules/rarfile/default.nix b/pkgs/development/python-modules/rarfile/default.nix index 7231da9d3d0..183e5a2f1d9 100644 --- a/pkgs/development/python-modules/rarfile/default.nix +++ b/pkgs/development/python-modules/rarfile/default.nix @@ -1,7 +1,8 @@ { stdenv, buildPythonPackage, fetchFromGitHub, pytest, nose, unrar, glibcLocales }: buildPythonPackage rec { - name = "rarfile-${version}"; + pname = "rarfile"; + name = "${pname}-${version}"; version = "3.0"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/reikna/default.nix b/pkgs/development/python-modules/reikna/default.nix index 14ebe52eae9..d8b380896cc 100644 --- a/pkgs/development/python-modules/reikna/default.nix +++ b/pkgs/development/python-modules/reikna/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "reikna"; name = "${pname}-${version}"; - version = "0.6.7"; + version = "0.6.8"; src = fetchurl { url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "810b349eb9339aa0d13bca99a3d8a380972708474b8c0990d188ec6074358d62"; + sha256 = "34d92786237bef9ab5d37d78f01c155d0dcd1fc24df7782af9498a9f1786890c"; }; buildInputs = [ sphinx pytestcov pytest ]; diff --git a/pkgs/development/python-modules/relatorio/default.nix b/pkgs/development/python-modules/relatorio/default.nix index 4f2c3da8936..dc42449a339 100644 --- a/pkgs/development/python-modules/relatorio/default.nix +++ b/pkgs/development/python-modules/relatorio/default.nix @@ -1,7 +1,8 @@ { lib, fetchurl, buildPythonPackage, genshi, lxml }: buildPythonPackage rec { - name = "relatorio-${version}"; + pname = "relatorio"; + name = "${pname}-${version}"; version = "0.6.4"; src = fetchurl { url = "mirror://pypi/r/relatorio/${name}.tar.gz"; diff --git a/pkgs/development/python-modules/requests-oauthlib.nix b/pkgs/development/python-modules/requests-oauthlib.nix index 62ecf134b49..0162d6f6eb5 100644 --- a/pkgs/development/python-modules/requests-oauthlib.nix +++ b/pkgs/development/python-modules/requests-oauthlib.nix @@ -2,12 +2,13 @@ , oauthlib, requests }: buildPythonPackage rec { - version = "0.7.0"; - name = "requests-oauthlib-${version}"; + version = "0.8.0"; + pname = "requests-oauthlib"; + name = "${pname}-${version}"; src = fetchurl { url = "http://github.com/requests/requests-oauthlib/archive/v${version}.tar.gz"; - sha256 = "0cdn45k7qla0qwha0rm9pk9bcfhghvmqrdsphs73irs2rzk5cp2j"; + sha256 = "883ac416757eada6d3d07054ec7092ac21c7f35cb1d2cf82faf205637081f468"; }; doCheck = false; # Internet tests fail when building in chroot diff --git a/pkgs/development/python-modules/rfc3986/default.nix b/pkgs/development/python-modules/rfc3986/default.nix index dde36e7592e..a8848fcac33 100644 --- a/pkgs/development/python-modules/rfc3986/default.nix +++ b/pkgs/development/python-modules/rfc3986/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "rfc3986"; - version = "0.4.1"; + version = "1.0.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "5ac85eb132fae7bbd811fa48d11984ae3104be30d44d397a351d004c633a68d2"; + sha256 = "2faacfabcc13ed89b061b5f21cbbf330f82400654b317b5907d311c3478ec4c4"; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/rhpl/default.nix b/pkgs/development/python-modules/rhpl/default.nix index 7ba1c79cd05..d502ad75566 100644 --- a/pkgs/development/python-modules/rhpl/default.nix +++ b/pkgs/development/python-modules/rhpl/default.nix @@ -1,16 +1,18 @@ {stdenv, fetchurl, rpmextract, python, wirelesstools, gettext}: -stdenv.mkDerivation { - name = "rhpl-0.218"; - +stdenv.mkDerivation rec { + pname = "rhpl"; + version = "0.218"; + name = "${pname}-${version}"; + src = fetchurl { url = http://ftp-stud.hs-esslingen.de/pub/Mirrors/archive.fedoraproject.org/fedora/linux/releases/10/Everything/source/SRPMS//rhpl-0.218-1.src.rpm; sha256 = "0c3sc74cjzz5dmpr2gi5naxcc5p2qmzagz7k561xj07njn0ddg16"; }; - + inherit python; - + builder = ./builder.sh; - + buildInputs = [ rpmextract python wirelesstools gettext ]; } diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix index 8f3b2ef74b2..2fcc0659384 100644 --- a/pkgs/development/python-modules/scrapy/default.nix +++ b/pkgs/development/python-modules/scrapy/default.nix @@ -2,8 +2,9 @@ testfixtures, pillow, six, twisted, w3lib, lxml, queuelib, pyopenssl, service-identity, parsel, pydispatcher, cssselect, lib }: buildPythonPackage rec { - name = "Scrapy-${version}"; - version = "1.3.1"; + version = "1.4.0"; + pname = "Scrapy"; + name = "${pname}-${version}"; buildInputs = [ glibcLocales mock pytest botocore testfixtures pillow ]; propagatedBuildInputs = [ @@ -25,7 +26,7 @@ buildPythonPackage rec { src = fetchurl { url = "mirror://pypi/S/Scrapy/${name}.tar.gz"; - sha256 = "0s5qkxwfq842maxjd2j82ldp4dyb70kla3z5rr56z0p7ig53cbvk"; + sha256 = "04a08f027eef5d271342a016439533c81ba46f14bfcf230fecf602e99beaf233"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/simpleeval/default.nix b/pkgs/development/python-modules/simpleeval/default.nix index cd77f66b56e..78dc82bc770 100644 --- a/pkgs/development/python-modules/simpleeval/default.nix +++ b/pkgs/development/python-modules/simpleeval/default.nix @@ -1,7 +1,8 @@ { lib, fetchurl, buildPythonPackage }: buildPythonPackage rec { - name = "simpleeval-${version}"; + pname = "simpleeval"; + name = "${pname}-${version}"; version = "0.9.5"; src = fetchurl { url = "mirror://pypi/s/simpleeval/${name}.tar.gz"; diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix index 76652954cf0..b6094f37c3a 100644 --- a/pkgs/development/python-modules/sip/default.nix +++ b/pkgs/development/python-modules/sip/default.nix @@ -1,7 +1,9 @@ { lib, fetchurl, buildPythonPackage, python, isPyPy }: if isPyPy then throw "sip not supported for interpreter ${python.executable}" else buildPythonPackage rec { - name = "sip-4.19.1"; + pname = "sip"; + version = "4.19.1"; + name = "${pname}-${version}"; format = "other"; src = fetchurl { diff --git a/pkgs/development/python-modules/snakeviz/default.nix b/pkgs/development/python-modules/snakeviz/default.nix index be6f86dae54..6754089ffce 100644 --- a/pkgs/development/python-modules/snakeviz/default.nix +++ b/pkgs/development/python-modules/snakeviz/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, buildPythonPackage, tornado }: buildPythonPackage rec { - name = "snakeviz-${version}"; + pname = "snakeviz"; + name = "${pname}-${version}"; version = "0.4.1"; src = fetchurl { diff --git a/pkgs/development/python-modules/sqlalchemy-migrate/default.nix b/pkgs/development/python-modules/sqlalchemy-migrate/default.nix index 11ed3a8d673..9cf1ba1b3d8 100644 --- a/pkgs/development/python-modules/sqlalchemy-migrate/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-migrate/default.nix @@ -3,7 +3,8 @@ pbr, tempita, decorator, sqlalchemy, six, sqlparse }: buildPythonPackage rec { - name = "sqlalchemy-migrate-${version}"; + pname = "sqlalchemy-migrate"; + name = "${pname}-${version}"; version = "0.11.0"; src = fetchurl { diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix new file mode 100644 index 00000000000..3fdb7cf9a6e --- /dev/null +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -0,0 +1,37 @@ +{ lib +, fetchPypi +, buildPythonPackage +, pytest +, mock +, pytest_xdist +, isPy3k +, pysqlite +}: + +buildPythonPackage rec { + pname = "SQLAlchemy"; + name = "${pname}-${version}"; + version = "1.1.10"; + + src = fetchPypi { + inherit pname version; + sha256 = "dbd92b8af2306d600efa98ed36262d73aad227440a758c8dc3a067ca30096bd3"; + }; + + checkInputs = [ pytest mock pytest_xdist ] + ++ lib.optional (!isPy3k) pysqlite; + + # Test-only dependency pysqlite doesn't build on Python 3. This isn't an + # acceptable reason to make all dependents unavailable on Python 3 as well + #doCheck = !(isPyPy || isPy3k); + + checkPhase = '' + py.test + ''; + + meta = with lib; { + homepage = http://www.sqlalchemy.org/; + description = "A Python SQL toolkit and Object Relational Mapper"; + license = licenses.mit; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/stringtemplate/default.nix b/pkgs/development/python-modules/stringtemplate/default.nix index 50a425132a2..cd7bb2b9507 100644 --- a/pkgs/development/python-modules/stringtemplate/default.nix +++ b/pkgs/development/python-modules/stringtemplate/default.nix @@ -1,7 +1,8 @@ {stdenv, fetchurl, buildPythonPackage, antlr, isPy3k}: buildPythonPackage rec { - name = "PyStringTemplate-${version}"; + pname = "PyStringTemplate"; + name = "${pname}-${version}"; version = "3.2b1"; src = fetchurl { diff --git a/pkgs/development/python-modules/subliminal/default.nix b/pkgs/development/python-modules/subliminal/default.nix index 545916858d4..0788ddaeec6 100644 --- a/pkgs/development/python-modules/subliminal/default.nix +++ b/pkgs/development/python-modules/subliminal/default.nix @@ -19,7 +19,8 @@ }: buildPythonApplication rec { - name = "subliminal-${version}"; + pname = "subliminal"; + name = "${pname}-${version}"; version = "2.0.5"; src = fetchurl { diff --git a/pkgs/development/python-modules/tables/default.nix b/pkgs/development/python-modules/tables/default.nix index 7faad8ec4f4..f80dcdf74fd 100644 --- a/pkgs/development/python-modules/tables/default.nix +++ b/pkgs/development/python-modules/tables/default.nix @@ -2,12 +2,13 @@ , cython, bzip2, lzo, numpy, numexpr, hdf5, six, c-blosc }: buildPythonPackage rec { - version = "3.3.0"; - name = "tables-${version}"; + version = "3.4.2"; + pname = "tables"; + name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/t/tables/${name}.tar.gz"; - sha256 = "0b4211s0zzdmh74k49ss0m9lc2ql2iazq2aa95ams6h45vqcr0w3"; + sha256 = "fdbbea4edb6bad0ac0e53fc7bc6970e78e12eef4944aa4146bcdcb573201676c"; }; buildInputs = [ hdf5 cython bzip2 lzo c-blosc ]; diff --git a/pkgs/development/python-modules/treq/default.nix b/pkgs/development/python-modules/treq/default.nix index 14a2ac9cb92..ede5f2520c1 100644 --- a/pkgs/development/python-modules/treq/default.nix +++ b/pkgs/development/python-modules/treq/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "treq"; - version = "16.12.0"; + version = "17.3.1"; src = fetchurl { url = "mirror://pypi/t/${pname}/${name}.tar.gz"; - sha256 = "1aci3f3rmb5mdf4s6s4k4kghmnyy784cxgi3pz99m5jp274fs25h"; + sha256 = "313af6dedecfdde2750968dc17653b6147cf2340b3479d70031cf741f5be0cf6"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/trezor.nix b/pkgs/development/python-modules/trezor.nix index 36bf0c15de2..70160dcb0f9 100644 --- a/pkgs/development/python-modules/trezor.nix +++ b/pkgs/development/python-modules/trezor.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "trezor"; - version = "0.7.12"; + version = "0.7.13"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/t/${pname}/${name}.tar.gz"; - sha256 = "0ryqdk13x60qq5s68i9dfc1na4dka66kdxqycxignzg9k9ykaa8g"; + sha256 = "d05f388bb56b6f61cc727999cc725078575238a0b6172450322bc55c437fefe5"; }; propagatedBuildInputs = [ protobuf3_0 hidapi ]; diff --git a/pkgs/development/python-modules/twill/default.nix b/pkgs/development/python-modules/twill/default.nix index f3e7bb7025b..8f0fbbd6dfb 100644 --- a/pkgs/development/python-modules/twill/default.nix +++ b/pkgs/development/python-modules/twill/default.nix @@ -1,12 +1,14 @@ { stdenv, buildPythonPackage, fetchurl, isPy3k, pythonPackages }: buildPythonPackage rec { - name = "twill-0.9.1"; + pname = "twill"; + version = "1.8.0"; + name = "${pname}-${version}"; disabled = isPy3k; src = fetchurl { url = "mirror://pypi/t/twill/${name}.tar.gz"; - sha256 = "0zmssp41cgb5sz1jym7rxy6mamb64dxq3wra1bn6snna9v653pyj"; + sha256 = "d63e8b09aa4f6645571c70cd3ba47a911abbae4d7baa4b38fc7eb72f6cfda188"; }; propagatedBuildInputs = with pythonPackages; [ nose ]; diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix index 0cfb00c48b8..6898863e8af 100644 --- a/pkgs/development/python-modules/twisted/default.nix +++ b/pkgs/development/python-modules/twisted/default.nix @@ -2,8 +2,8 @@ zope_interface, incremental, automat, constantly }: buildPythonPackage rec { - - name = "Twisted-${version}"; + pname = "Twisted"; + name = "${pname}-${version}"; version = "17.1.0"; src = fetchurl { diff --git a/pkgs/development/python-modules/txaio/default.nix b/pkgs/development/python-modules/txaio/default.nix index 66b01d61094..36291518605 100644 --- a/pkgs/development/python-modules/txaio/default.nix +++ b/pkgs/development/python-modules/txaio/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "txaio"; - version = "2.7.0"; + version = "2.7.1"; buildInputs = [ pytest mock ]; propagatedBuildInputs = [ six twisted ]; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchurl { url = "mirror://pypi/t/${pname}/${name}.tar.gz"; - sha256 = "0hwd6jx6hb44p40id9r0m42y07rav5jvddf0f1bcm269i3dnwr47"; + sha256 = "9eea85c27ff8ac28049a29b55383f5c162351f855860e5081ff4632d65a5b4d2"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/typed-ast/default.nix b/pkgs/development/python-modules/typed-ast/default.nix index 02a60323420..213f2d33f3b 100644 --- a/pkgs/development/python-modules/typed-ast/default.nix +++ b/pkgs/development/python-modules/typed-ast/default.nix @@ -1,11 +1,11 @@ { buildPythonPackage, fetchPypi, isPy3k, lib, pythonOlder }: buildPythonPackage rec { pname = "typed-ast"; - version = "1.0.2"; + version = "1.0.3"; name = "${pname}-${version}"; src = fetchPypi{ inherit pname version; - sha256 = "13e02b10479ddff07eb546f9638743702ab9b175bfa3cdf2482688df91b5766d"; + sha256 = "67184179697ea9128fa8fec1d3b4e26b41d6a2eceab4674c6e3da4b024309862"; }; # Only works with Python 3.3 and newer; disabled = pythonOlder "3.3"; diff --git a/pkgs/development/python-modules/u-msgpack-python/default.nix b/pkgs/development/python-modules/u-msgpack-python/default.nix index 34d88d74c55..aca4e370e46 100644 --- a/pkgs/development/python-modules/u-msgpack-python/default.nix +++ b/pkgs/development/python-modules/u-msgpack-python/default.nix @@ -7,13 +7,13 @@ let pname = "u-msgpack-python"; - version = "2.3.0"; + version = "2.4.1"; in buildPythonPackage rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "d8df6bb0e2a838aa227c39cfd14aa147ab32b3df6871001874e9b9da9ce1760c"; + sha256 = "2f31fc1b6dd8632c230ea7012470e40f77119f20999274dda6f1afa9c305e590"; }; LC_ALL="en_US.UTF-8"; diff --git a/pkgs/development/python-modules/uranium/default.nix b/pkgs/development/python-modules/uranium/default.nix index bce88635d3c..066230d0a1f 100644 --- a/pkgs/development/python-modules/uranium/default.nix +++ b/pkgs/development/python-modules/uranium/default.nix @@ -5,8 +5,9 @@ then throw "Uranium not supported for interpreter ${python.executable}" else stdenv.mkDerivation rec { - name = "uranium-${version}"; version = "2.4.0"; + pname = "uranium"; + name = "${pname}-${version}"; src = fetchFromGitHub { owner = "Ultimaker"; diff --git a/pkgs/development/python-modules/vcrpy/default.nix b/pkgs/development/python-modules/vcrpy/default.nix index c82a02cb4a4..953c77fb492 100644 --- a/pkgs/development/python-modules/vcrpy/default.nix +++ b/pkgs/development/python-modules/vcrpy/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "vcrpy"; - version = "1.10.5"; + version = "1.11.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "12kncg6jyvj15mi8ca74514f2x1ih753nhyz769nwvh39r468167"; + sha256 = "beb30de89c3618482ea76662b4135d48fef7417589df49c303b2e85db40c9705"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/vowpalwabbit/default.nix b/pkgs/development/python-modules/vowpalwabbit/default.nix index 4c343985c59..8c980cf2b2c 100644 --- a/pkgs/development/python-modules/vowpalwabbit/default.nix +++ b/pkgs/development/python-modules/vowpalwabbit/default.nix @@ -1,32 +1,33 @@ { fetchurl, boost, zlib, clang, ncurses, pythonPackages, lib }: + pythonPackages.buildPythonPackage rec { - name = "vowpalwabbit-${version}"; - version = "8.3.2"; + pname = "vowpalwabbit"; + name = "${pname}-${version}"; + version = "8.3.2"; - src = fetchurl{ - url = "mirror://pypi/v/vowpalwabbit/${name}.tar.gz"; - sha256 = "0qm8rlrs2gfgamqnpx4lapxakpzgh0yh3kp1lbd7lhb0r748m3k7"; - }; - # vw tries to write some explicit things to home - # python installed: The directory '/homeless-shelter/.cache/pip/http' - preInstall = '' - export HOME=$PWD - ''; + src = fetchurl{ + url = "mirror://pypi/v/vowpalwabbit/${name}.tar.gz"; + sha256 = "0qm8rlrs2gfgamqnpx4lapxakpzgh0yh3kp1lbd7lhb0r748m3k7"; + }; + # vw tries to write some explicit things to home + # python installed: The directory '/homeless-shelter/.cache/pip/http' + preInstall = '' + export HOME=$PWD + ''; - buildInputs = with pythonPackages; [ boost.dev zlib.dev clang ncurses pytest docutils pygments ]; - propagatedBuildInputs = with pythonPackages; [ numpy scipy scikitlearn ]; + buildInputs = with pythonPackages; [ boost.dev zlib.dev clang ncurses pytest docutils pygments ]; + propagatedBuildInputs = with pythonPackages; [ numpy scipy scikitlearn ]; - checkPhase = '' - # check-manifest requires a git clone, not a tarball - # check-manifest --ignore "Makefile,PACKAGE.rst,*.cc,tox.ini,tests*,examples*,src*" - python setup.py check -mrs - ''; - - meta = with lib; { - description = "Vowpal Wabbit is a fast machine learning library for online learning, and this is the python wrapper for the project."; - homepage = https://github.com/JohnLangford/vowpal_wabbit; - license = licenses.bsd3; - maintainers = with maintainers; [ teh ]; - }; + checkPhase = '' + # check-manifest requires a git clone, not a tarball + # check-manifest --ignore "Makefile,PACKAGE.rst,*.cc,tox.ini,tests*,examples*,src*" + python setup.py check -mrs + ''; + meta = with lib; { + description = "Vowpal Wabbit is a fast machine learning library for online learning, and this is the python wrapper for the project."; + homepage = https://github.com/JohnLangford/vowpal_wabbit; + license = licenses.bsd3; + maintainers = with maintainers; [ teh ]; + }; } diff --git a/pkgs/development/python-modules/webencodings/default.nix b/pkgs/development/python-modules/webencodings/default.nix index 54f3517ca00..834a0ab07fb 100644 --- a/pkgs/development/python-modules/webencodings/default.nix +++ b/pkgs/development/python-modules/webencodings/default.nix @@ -6,13 +6,13 @@ let pname = "webencodings"; - version = "0.5"; + version = "0.5.1"; in buildPythonPackage rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "a5c55ee93b24e740fe951c37b5c228dccc1f171450e188555a775261cce1b904"; + sha256 = "b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923"; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/websockets/default.nix b/pkgs/development/python-modules/websockets/default.nix index 8c66dc60407..7e29b2b6190 100644 --- a/pkgs/development/python-modules/websockets/default.nix +++ b/pkgs/development/python-modules/websockets/default.nix @@ -6,13 +6,13 @@ let pname = "websockets"; - version = "3.2"; + version = "3.3"; in buildPythonPackage rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "1dah1faywsnrlqyzagb1qc1cxrq9145srkdy118yhy9s8dyq4dmm"; + sha256 = "305ab7fdd86afd08c2723461c949e153f7b01233f95a108619a15e41b7a74c93"; }; disabled = pythonOlder "3.3"; diff --git a/pkgs/development/python-modules/xlwt/default.nix b/pkgs/development/python-modules/xlwt/default.nix index 01f920a387a..f25646fffdb 100644 --- a/pkgs/development/python-modules/xlwt/default.nix +++ b/pkgs/development/python-modules/xlwt/default.nix @@ -8,21 +8,13 @@ buildPythonPackage rec { pname = "xlwt"; name = "${pname}-${version}"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "aed648c17731f40f84550dd2a1aaa53569f0cbcaf5610ba895cd2632587b723c"; + sha256 = "505669c1eb6a60823fd3e2e723b60eea95f2c56254113bf163091ed2bedb4ac9"; }; - # re.LOCALE was removed in Python 3.6 - patches = [ - (fetchpatch { - url = "https://github.com/python-excel/xlwt/commit/86564ef26341020316cd8a27c704ef1dc5a6129b.patch"; - sha256 = "0ifavfld3rrqjb0iyriy4c0drw31gszvlg3nmnn9dmfsh91vxhs6"; - }) - ]; - buildInputs = [ nose ]; checkPhase = '' nosetests -v diff --git a/pkgs/development/python-modules/xmpppy/default.nix b/pkgs/development/python-modules/xmpppy/default.nix index 332feef9e49..33adac52c90 100644 --- a/pkgs/development/python-modules/xmpppy/default.nix +++ b/pkgs/development/python-modules/xmpppy/default.nix @@ -1,6 +1,7 @@ { stdenv, buildPythonPackage, fetchurl, isPy3k }: buildPythonPackage rec { - name = "xmpp.py-${version}"; + pname = "xmpp.py"; + name = "${pname}-${version}"; version = "0.5.0rc1"; patches = [ ./ssl.patch ]; diff --git a/pkgs/development/python-modules/yarl/default.nix b/pkgs/development/python-modules/yarl/default.nix index 246b761fa53..03732c5343b 100644 --- a/pkgs/development/python-modules/yarl/default.nix +++ b/pkgs/development/python-modules/yarl/default.nix @@ -8,12 +8,12 @@ let pname = "yarl"; - version = "0.8.1"; + version = "0.10.2"; in buildPythonPackage rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "9f0397ae540124bf16a8a5b89bc3ea1c07f8ae70c3e44231a40a9edd254d5712"; + sha256 = "a042c5b3584531cd09cd5ca647f71553df7caaa3359b9b3f7eb34c3b1045b38d"; }; buildInputs = [ pytest pytestrunner ]; diff --git a/pkgs/development/python-modules/yolk/default.nix b/pkgs/development/python-modules/yolk/default.nix index 33e9cfeab3a..f6bbb8f4b86 100644 --- a/pkgs/development/python-modules/yolk/default.nix +++ b/pkgs/development/python-modules/yolk/default.nix @@ -3,7 +3,8 @@ with lib; buildPythonApplication rec { - name = "yolk-${version}"; + pname = "yolk"; + name = "${pname}-${version}"; version = "0.4.3"; src = fetchurl { diff --git a/pkgs/development/python-modules/zeep/default.nix b/pkgs/development/python-modules/zeep/default.nix index c6ae3881f1f..41418a99c8d 100644 --- a/pkgs/development/python-modules/zeep/default.nix +++ b/pkgs/development/python-modules/zeep/default.nix @@ -24,13 +24,13 @@ let pname = "zeep"; - version = "1.1.0"; + version = "2.0.0"; in buildPythonPackage { name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "83e82b6cb59e84bf4725add3771ed442bb099fad5959c887efe7c49a8a940ea5"; + sha256 = "5b9bd6b8772d6b505118c11d6924eb7df0decf12bbbeb43b1c27d781817361ad"; }; propagatedBuildInputs = [ diff --git a/pkgs/misc/my-env/default.nix b/pkgs/misc/my-env/default.nix index ffdaf3949ae..13102877d7e 100644 --- a/pkgs/misc/my-env/default.nix +++ b/pkgs/misc/my-env/default.nix @@ -1,7 +1,7 @@ # idea: provide a build environments for your developement of preference /* #### examples of use: #### - # Add this to your ~/.nixpkgs/config.nix: + # Add this to your ~/.config/nixpkgs/config.nix: { packageOverrides = pkgs : with pkgs; { sdlEnv = pkgs.myEnvFun { @@ -22,7 +22,7 @@ ##### Another example, more complicated but achieving more: ####### # Make an environment to build nix from source and create ctags (tagfiles can # be extracted from TAG_FILES) from every source package. Here would be a - # full ~/.nixpkgs/config.nix + # full ~/.config/nixpkgs/config.nix { packageOverrides = pkgs : with pkgs; with sourceAndTags; let complicatedMyEnv = { name, buildInputs ? [], cTags ? [], extraCmds ? ""}: diff --git a/pkgs/os-specific/linux/cifs-utils/default.nix b/pkgs/os-specific/linux/cifs-utils/default.nix index f69319b5256..08c6d997795 100644 --- a/pkgs/os-specific/linux/cifs-utils/default.nix +++ b/pkgs/os-specific/linux/cifs-utils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "cifs-utils-${version}"; - version = "6.5"; + version = "6.6"; src = fetchurl { url = "mirror://samba/pub/linux-cifs/cifs-utils/${name}.tar.bz2"; - sha256 = "1xs9rwqfpx8qj5mcmagw6y1hzwc71zhzb5r8hv06sz16p1w6axz2"; + sha256 = "09biws1jm23l3mjb9kh99v57z8bgzybrmimwddb40s6y0yl54wfh"; }; buildInputs = [ kerberos keyutils pam talloc ]; diff --git a/pkgs/tools/misc/fsql/default.nix b/pkgs/tools/misc/fsql/default.nix new file mode 100644 index 00000000000..117574c3daa --- /dev/null +++ b/pkgs/tools/misc/fsql/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildGoPackage, fetchgit }: + +buildGoPackage rec { + name = "fsql-${version}"; + version = "0.1.0"; + + goPackagePath = "github.com/kshvmdn/fsql"; + + src = fetchgit { + rev = "v${version}"; + url = "https://github.com/kshvmdn/fsql"; + sha256 = "1wkf9rr6x4b5bvxj9zwfw9hd870c831j7mc6fvd448id653wh122"; + }; + + meta = with stdenv.lib; { + description = "Search through your filesystem with SQL-esque queries"; + homepage = https://github.com/kshvmdn/fsql; + license = licenses.mit; + maintainers = with maintainers; [ pSub ]; + platforms = platforms.linux; + inherit version; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3b5d54775ee..1b30910c743 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -969,6 +969,8 @@ with pkgs; fsmon = callPackage ../tools/misc/fsmon { }; + fsql = callPackage ../tools/misc/fsql { }; + fop = callPackage ../tools/typesetting/fop { }; fondu = callPackage ../tools/misc/fondu { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b7d381d865a..3d4a38ff47f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8200,6 +8200,8 @@ in { netcdf4 = callPackage ../development/python-modules/netcdf4.nix { }; + Nikola = callPackage ../development/python-modules/Nikola { }; + nxt-python = buildPythonPackage rec { version = "unstable-20160819"; pname = "nxt-python"; @@ -13448,7 +13450,7 @@ in { }; }; - llvmlite = callPackage ../development/python-modules/llvmlite {llvm=pkgs.llvm_39;}; + llvmlite = callPackage ../development/python-modules/llvmlite {llvm=pkgs.llvm_4;}; lockfile = buildPythonPackage rec { pname = "lockfile"; @@ -18081,7 +18083,7 @@ in { # to force it a little. installFlags = [ "--ignore-installed" ]; - buildInputs = with self; [ mock scripttest virtualenv pretend pytest ]; + checkInputs = with self; [ mock scripttest virtualenv pretend pytest ]; # Pip wants pytest, but tests are not distributed doCheck = false; @@ -22605,7 +22607,8 @@ in { sha256 = "0bwyc5markib0i7i2qlyhdzxhiywzxbkfiapldma8m91m82jvwfs"; }; - buildInputs = with self; [ pip pytest ]; + buildInputs = with self; [ pip ]; + checkInputs = with self; [ pytest ]; # Seems to fail due to chroot doCheck = false; @@ -24072,32 +24075,7 @@ in { - sqlalchemy = buildPythonPackage rec { - name = "SQLAlchemy-${version}"; - version = "1.0.15"; - - src = pkgs.fetchurl { - url = "mirror://pypi/S/SQLAlchemy/${name}.tar.gz"; - sha256 = "586f5ccf068211795a89ed22d196c5cc3006b6be00261bcac6f584c0b8e0845a"; - }; - - buildInputs = with self; [ pytest mock pytest_xdist ] - ++ stdenv.lib.optional (!isPy3k) pysqlite; - - # Test-only dependency pysqlite doesn't build on Python 3. This isn't an - # acceptable reason to make all dependents unavailable on Python 3 as well - #doCheck = !(isPyPy || isPy3k); - - checkPhase = '' - py.test - ''; - - meta = { - homepage = http://www.sqlalchemy.org/; - description = "A Python SQL toolkit and Object Relational Mapper"; - license = licenses.mit; - }; - }; + sqlalchemy = callPackage ../development/python-modules/sqlalchemy { }; SQLAlchemy-ImageAttach = buildPythonPackage rec { pname = "SQLAlchemy-ImageAttach"; @@ -27899,23 +27877,21 @@ EOF }; ws4py = buildPythonPackage rec { - name = "ws4py-${version}"; + name = "${pname}-${version}"; + pname = "ws4py"; + version = "0.4.2"; - version = "git-20130303"; - - src = pkgs.fetchgit { - url = "https://github.com/Lawouach/WebSocket-for-Python.git"; - rev = "ace276500ca7e4c357595e3773be151d37bcd6e2"; - sha256 = "1g7nmhjjxjf6vx75dyzns8bpid3b5i02kakk2lh1i297b5rw2rjq"; + src = fetchPypi { + inherit pname version; + sha256 = "0zr3254ky6r7q15l3dhdczfa8i723055zdkqssjifsgcwvirriks"; }; - # python zip complains about old timestamps - preConfigure = '' - find -print0 | xargs -0 touch - ''; + buildInputs = with self; [ pytest mock ]; + propagatedBuildInputs = with self; [ asyncio cherrypy gevent tornado ]; - # Tests depend on other packages - doCheck = false; + checkPhase = '' + pytest test + ''; meta = { homepage = https://ws4py.readthedocs.org;