Merge remote-tracking branch 'upstream/master' into HEAD

This commit is contained in:
Frederik Rietdijk 2017-05-27 14:28:05 +02:00
commit 77b7fca588
146 changed files with 699 additions and 563 deletions

View file

@ -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. 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. If you prefer to, you could also add the environment as a package override to the Nixpkgs set.
```nix ```nix

View file

@ -64,7 +64,7 @@ def _fetch_page(url):
if r.status_code == requests.codes.ok: if r.status_code == requests.codes.ok:
return r.json() return r.json()
else: else:
logging.warning("Request for {} failed".format(url)) raise ValueError("Request for {} failed".format(url))
def _get_latest_version(package, extension): def _get_latest_version(package, extension):
@ -72,7 +72,7 @@ def _get_latest_version(package, extension):
url = "{}/{}/json".format(INDEX, package) url = "{}/{}/json".format(INDEX, package)
json = _fetch_page(url) json = _fetch_page(url)
data = extract_relevant_nix_data(json)[1] data = extract_relevant_nix_data(json, extension)[1]
version = data['latest_version'] version = data['latest_version']
if version in data['versions']: if version in data['versions']:
@ -83,7 +83,7 @@ def _get_latest_version(package, extension):
return version, sha256 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. """Extract relevant Nix data from the JSON of a package obtained from PyPI.
:param json: JSON 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) releases = toolz.itemfilter(lambda x: x[1] is not None, releases)
return releases return releases
# Collect data # Collect data)
name = str(json['info']['name']) name = str(json['info']['name'])
latest_version = str(_extract_latest_version(json)) latest_version = str(_extract_latest_version(json))
#src = _get_src_and_hash(json, latest_version, EXTENSIONS) #src = _get_src_and_hash(json, latest_version, EXTENSIONS)
sources = _get_sources(json, EXTENSIONS) sources = _get_sources(json, [extension])
# Collect meta data # Collect meta data
license = str(_extract_license(json)) license = str(_extract_license(json))
@ -188,7 +188,7 @@ def _update_package(path):
except ValueError as e: except ValueError as e:
# No format mentioned, then we assume we have setuptools # No format mentioned, then we assume we have setuptools
# and use a .tar.gz # and use a .tar.gz
logging.warning("Path {}: {}".format(path, str(e))) logging.info("Path {}: {}".format(path, str(e)))
extension = ".tar.gz" extension = ".tar.gz"
else: else:
if format == 'wheel': if format == 'wheel':
@ -197,33 +197,38 @@ def _update_package(path):
try: try:
url = _get_value('url', text) url = _get_value('url', text)
extension = os.path.splitext(url)[1] 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: except ValueError as e:
logging.warning("Path {}: {}".format(path, str(e))) logging.info("Path {}: {}".format(path, str(e)))
extension = ".tar.gz" extension = ".tar.gz"
new_version, new_sha256 = _get_latest_version(pname, extension) try:
if not new_sha256: new_version, new_sha256 = _get_latest_version(pname, extension)
logging.warning("Path has no valid file available: {}".format(path)) except ValueError as e:
return False logging.warning("Path {}: {}".format(path, str(e)))
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: 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 return True

View file

@ -83,16 +83,12 @@ rec {
}; };
# 4. example of pulling an image. could be used as a base for other images # 4. example of pulling an image. could be used as a base for other images
# nix = pullImage {
# ***** Currently broken, getting 404s. Perhaps the docker API has changed? imageName = "nixos/nix";
# imageTag = "1.11";
# # this hash will need change if the tag is updated at docker hub
# debian = pullImage { sha256 = "1gk4bq05vl3rj3mh4mlbl4iicgndmimlv8jvkhdk4hrv0r44bwr3";
# imageName = "debian"; };
# imageTag = "jessie";
# # this hash will need change if the tag is updated at docker hub
# sha256 = "18kd495lc2k35h03bpcbdjnix17nlqbwf6nmq3sb161blf0dk14q";
# };
# 5. example of multiple contents, emacs and vi happily coexisting # 5. example of multiple contents, emacs and vi happily coexisting
editors = buildImage { editors = buildImage {

View file

@ -1,41 +1,32 @@
{ stdenv, lib, curl, jshon, python, runCommand }: { stdenv, lib, docker, vmTools, utillinux, curl, kmod, dhcp, cacert, e2fsprogs }:
let
# Inspired and simplified version of fetchurl. nameReplace = name: builtins.replaceStrings ["/" ":"] ["-" "-"] name;
in
# For simplicity we only support sha256. # 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 builder = ./pull.sh;
, sha256, name ? "${imageName}-${imageTag}"
, indexUrl ? "https://index.docker.io"
, registryVersion ? "v1"
, curlOpts ? "" }:
assert registryVersion == "v1"; buildInputs = [ curl utillinux docker kmod dhcp cacert e2fsprogs ];
let layer = stdenv.mkDerivation { outputHashAlgo = "sha256";
inherit name imageName imageTag imageId outputHash = sha256;
indexUrl registryVersion curlOpts;
builder = ./pull.sh; impureEnvVars = lib.fetchers.proxyImpureEnvVars;
detjson = ./detjson.py;
buildInputs = [ curl jshon python ]; preVM = vmTools.createEmptyImage {
size = 2048;
fullName = "${name}-disk";
};
outputHashAlgo = "sha256"; QEMU_OPTS = "-netdev user,id=net0 -device virtio-net-pci,netdev=net0";
outputHash = sha256; });
outputHashMode = "recursive"; in
pullImage
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 .
''

View file

@ -1,86 +1,36 @@
# Reference: docker src contrib/download-frozen-image.sh
source $stdenv/setup source $stdenv/setup
# Curl flags to handle redirects, not use EPSV, handle cookies for mkdir -p /var/lib/docker
# servers to need them during redirects, and work on SSL without a mkfs.ext4 /dev/vda
# certificate (this isn't a security problem because we check the mount -t ext4 /dev/vda /var/lib/docker
# 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 \
"$@"
}
fetchLayer() { modprobe virtio_net
local url="$1" dhclient eth0
local dest="$2"
local curlexit=18;
# if we get error code 18, resume partial download mkdir -p /etc/ssl/certs/
while [ $curlexit -eq 18 ]; do cp "$certs" "/etc/ssl/certs/"
# 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
return $curlexit # 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
headers=$(curl -o /dev/null -D- -H 'X-Docker-Token: true' \ for sys in $(awk '!/^#/ { if ($4 == 1) print $1 }' /proc/cgroups); do
"$indexUrl/$registryVersion/repositories/$imageName/images") mkdir -p $sys
if ! mountpoint -q $sys; then
header() { if ! mount -n -t cgroup -o $sys cgroup $sys; then
grep $1 <<< "$headers" | tr -d '\r' | cut -d ' ' -f 2 rmdir $sys || true
}
# 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
fi fi
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"
done 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

View file

@ -80,6 +80,9 @@ stdenv.mkDerivation rec {
'' + optionalString stdenv.isLinux '' '' + optionalString stdenv.isLinux ''
sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go 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 '' '' + optionalString stdenv.isDarwin ''
substituteInPlace src/race.bash --replace \ substituteInPlace src/race.bash --replace \
"sysctl machdep.cpu.extfeatures | grep -qv EM64T" true "sysctl machdep.cpu.extfeatures | grep -qv EM64T" true

View file

@ -37,6 +37,9 @@
# generated binaries. # generated binaries.
, makeWrapperArgs ? [] , makeWrapperArgs ? []
# Skip wrapping of python programs altogether
, dontWrapPythonPrograms ? false
, meta ? {} , meta ? {}
, passthru ? {} , passthru ? {}
@ -51,7 +54,7 @@ if disabled
then throw "${name} not supported for interpreter ${python.executable}" then throw "${name} not supported for interpreter ${python.executable}"
else else
python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled"] // { python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled" "checkInputs"] // {
name = namePrefix + name; name = namePrefix + name;
@ -69,7 +72,7 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled"] // {
doCheck = false; doCheck = false;
doInstallCheck = doCheck; doInstallCheck = doCheck;
postFixup = '' postFixup = lib.optionalString (!dontWrapPythonPrograms) ''
wrapPythonPrograms wrapPythonPrograms
'' + lib.optionalString catchConflicts '' '' + lib.optionalString catchConflicts ''
# Check if we have two packages with the same name in the closure and fail. # Check if we have two packages with the same name in the closure and fail.

View file

@ -1,7 +1,7 @@
# Wrapper around wrapPythonProgramsIn, below. The $pythonPath # Wrapper around wrapPythonProgramsIn, below. The $pythonPath
# variable is passed in from the buildPythonPackage function. # variable is passed in from the buildPythonPackage function.
wrapPythonPrograms() { wrapPythonPrograms() {
wrapPythonProgramsIn $out "$out $pythonPath" wrapPythonProgramsIn "$out/bin" "$out $pythonPath"
} }
# Builds environment variables like PYTHONPATH and PATH walking through closure # Builds environment variables like PYTHONPATH and PATH walking through closure
@ -47,34 +47,36 @@ wrapPythonProgramsIn() {
buildPythonPath "$pythonPath" buildPythonPath "$pythonPath"
# Find all regular files in the output directory that are executable. # Find all regular files in the output directory that are executable.
find "$dir" -type f -perm -0100 -print0 | while read -d "" f; do if [ -d "$dir" ]; then
# Rewrite "#! .../env python" to "#! /nix/store/.../python". find "$dir" -type f -perm -0100 -print0 | while read -d "" f; do
# Strip suffix, like "3" or "2.7m" -- we don't have any choice on which # Rewrite "#! .../env python" to "#! /nix/store/.../python".
# Python to use besides one with this hook anyway. # Strip suffix, like "3" or "2.7m" -- we don't have any choice on which
if head -n1 "$f" | grep -q '#!.*/env.*\(python\|pypy\)'; then # Python to use besides one with this hook anyway.
sed -i "$f" -e "1 s^.*/env[ ]*\(python\|pypy\)[^ ]*^#! @executable@^" if head -n1 "$f" | grep -q '#!.*/env.*\(python\|pypy\)'; then
fi sed -i "$f" -e "1 s^.*/env[ ]*\(python\|pypy\)[^ ]*^#! @executable@^"
# 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
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, # Adds the lib and bin directories to the PYTHONPATH and PATH variables,

View file

@ -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 ];
};
}

View file

@ -2,12 +2,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "aenum"; pname = "aenum";
version = "2.0.6"; version = "2.0.7";
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "0rlhb5wzlyyz0l44r2jxn3m0nh51ifih97dk2y7zfs1m299gwcv6"; sha256 = "2c5db863b5531cc059313018e57bc765b0ef1fc96ba799f105ea45d99b1c2d23";
}; };
doCheck = !isPy3k; doCheck = !isPy3k;

View file

@ -2,12 +2,13 @@
asgiref, msgpack, posix_ipc asgiref, msgpack, posix_ipc
}: }:
buildPythonPackage rec { buildPythonPackage rec {
name = "asgi_ipc-${version}"; version = "1.4.0";
version = "1.3.1"; pname = "asgi_ipc";
name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://pypi/a/asgi_ipc/${name}.tar.gz"; url = "mirror://pypi/a/asgi_ipc/${name}.tar.gz";
sha256 = "1dm8xvm1z28f421ck1ympxsq2sjm9xb7dla6p8yd2bz6gn6p5h7v"; sha256 = "1bae453d771eb92c0ec558b826fc0bce75a2a61bf21187784d4e4dc11710e588";
}; };
propagatedBuildInputs = [ asgiref msgpack posix_ipc ]; propagatedBuildInputs = [ asgiref msgpack posix_ipc ];

View file

@ -2,12 +2,13 @@
asgiref, asgi_ipc, msgpack, six, redis, cryptography asgiref, asgi_ipc, msgpack, six, redis, cryptography
}: }:
buildPythonPackage rec { buildPythonPackage rec {
name = "asgi_redis-${version}"; version = "1.4.0";
version = "1.3.0"; pname = "asgi_redis";
name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://pypi/a/asgi_redis/${name}.tar.gz"; url = "mirror://pypi/a/asgi_redis/${name}.tar.gz";
sha256 = "0zhv51w0fx3i8m0032nk9v00l6mxaswyi95yzy7p7fjww4q74ncl"; sha256 = "ec137829a9ebfb0de1c034bc699240c9747b97a3eb2dc4df6c812f82290a0f9f";
}; };
# Requires a redis server available # Requires a redis server available

View file

@ -1,11 +1,12 @@
{ stdenv, buildPythonPackage, fetchurl, six }: { stdenv, buildPythonPackage, fetchurl, six }:
buildPythonPackage rec { buildPythonPackage rec {
name = "asgiref-${version}"; version = "1.1.2";
version = "1.1.1"; pname = "asgiref";
name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://pypi/a/asgiref/${name}.tar.gz"; url = "mirror://pypi/a/asgiref/${name}.tar.gz";
sha256 = "0gayxnysknwg8hxb5kvmi2mmd5dnrhgza23daf8j25w3nj2drars"; sha256 = "8b46c3d6e2ad354d9da3cfb9873f9bd46fe1b768fbc11065275ba5430a46700c";
}; };
propagatedBuildInputs = [ six ]; propagatedBuildInputs = [ six ];

View file

@ -1,34 +1,39 @@
{ stdenv, fetchurl, buildPythonPackage, python, logilab_common, six, { lib, fetchurl, buildPythonPackage, python, logilab_common, six
lazy-object-proxy, wrapt }: , lazy-object-proxy, wrapt, singledispatch, enum34, pythonOlder
, backports_functools_lru_cache
}:
buildPythonPackage rec { buildPythonPackage rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "astroid"; pname = "astroid";
version = "1.4.9"; version = "1.5.2";
src = fetchurl { src = fetchurl {
url = "mirror://pypi/a/${pname}/${name}.tar.gz"; url = "mirror://pypi/a/${pname}/${name}.tar.gz";
sha256 = "1mw5q20b80j55vbpcdfl824sbb1q15dhkfbczjnnv8733j4yg0x4"; 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 = '' postPatch = ''
cd astroid/tests cd astroid/tests
for i in $(ls unittest*); do mv -v $i test_$i; done for i in $(ls unittest*); do mv -v $i test_$i; done
cd ../.. cd ../..
rm -vf astroid/tests/test_unittest_inference.py rm -vf astroid/tests/test_unittest_inference.py
''; rm -vf astroid/tests/test_unittest_manager.py
'';
checkPhase = '' checkPhase = ''
${python.interpreter} -m unittest discover ${python.interpreter} -m unittest discover
''; '';
meta = with stdenv.lib; { meta = with lib; {
description = "A abstract syntax tree for Python with inference support"; description = "A abstract syntax tree for Python with inference support";
homepage = http://bitbucket.org/logilab/astroid; homepage = http://bitbucket.org/logilab/astroid;
license = licenses.lgpl2; license = licenses.lgpl2;
platforms = platforms.all; platforms = platforms.all;
maintainers = with maintainers; [ nand0p ]; maintainers = with maintainers; [ nand0p ];
}; };
} }

View file

@ -7,13 +7,13 @@
let let
pname = "async-timeout"; pname = "async-timeout";
version = "1.1.0"; version = "1.2.1";
in buildPythonPackage rec { in buildPythonPackage rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
sha256 = "b88bd1fe001b800ec23c7bf27a81b32819e2a56668e9fba5646a7f3618143081"; sha256 = "380e9bfd4c009a14931ffe487499b0906b00b3378bb743542cfd9fbb6d8e4657";
}; };
buildInputs = [ pytestrunner ]; buildInputs = [ pytestrunner ];

View file

@ -1,12 +1,13 @@
{ stdenv, buildPythonPackage, fetchurl, { stdenv, buildPythonPackage, fetchurl,
m2r, setuptools_scm, six, attrs }: m2r, setuptools_scm, six, attrs }:
buildPythonPackage rec { buildPythonPackage rec {
name = "Automat-${version}"; version = "0.6.0";
version = "0.5.0"; pname = "Automat";
name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://pypi/A/Automat/${name}.tar.gz"; url = "mirror://pypi/A/Automat/${name}.tar.gz";
sha256 = "1hnpknkqnc2m900kkzrzx9l6g5dy5dassrdj9pn34x1pcdkyr2a8"; sha256 = "3c1fd04ecf08ac87b4dd3feae409542e9bf7827257097b2b6ed5692f69d6f6a8";
}; };
buildInputs = [ m2r setuptools_scm ]; buildInputs = [ m2r setuptools_scm ];

View file

@ -1,8 +1,9 @@
{stdenv, buildPythonPackage, fetchFromGitHub, bap, requests}: {stdenv, buildPythonPackage, fetchFromGitHub, bap, requests}:
buildPythonPackage rec { buildPythonPackage rec {
name = "bap"; pname = "bap";
version = "1.1.0"; version = "1.1.0";
name = "${pname}-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "BinaryAnalysisPlatform"; owner = "BinaryAnalysisPlatform";
repo = "bap-python"; repo = "bap-python";

View file

@ -4,12 +4,13 @@
with stdenv.lib; with stdenv.lib;
buildPythonPackage rec { buildPythonPackage rec {
name = "bcrypt-${version}"; version = "3.1.3";
version = "3.1.2"; pname = "bcrypt";
name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://pypi/b/bcrypt/${name}.tar.gz"; url = "mirror://pypi/b/bcrypt/${name}.tar.gz";
sha256 = "1al54xafv1aharpb22yv5rjjc63fm60z3pn2shbiq48ah9f1fvil"; sha256 = "6645c8d0ad845308de3eb9be98b6fd22a46ec5412bfc664a423e411cdd8f5488";
}; };
buildInputs = [ pycparser mock pytest py ]; buildInputs = [ pycparser mock pytest py ];
propagatedBuildInputs = [ six ] ++ optional (!isPyPy) cffi; propagatedBuildInputs = [ six ] ++ optional (!isPyPy) cffi;

View file

@ -7,7 +7,8 @@ let
selinuxWithPython = libselinux.override pyenable; selinuxWithPython = libselinux.override pyenable;
cryptsetupWithPython = cryptsetup.override pyenable; cryptsetupWithPython = cryptsetup.override pyenable;
in buildPythonPackage rec { in buildPythonPackage rec {
name = "blivet-${version}"; pname = "blivet";
name = "${pname}-${version}";
version = "0.67"; version = "0.67";
src = fetchFromGitHub { src = fetchFromGitHub {

View file

@ -1,12 +1,13 @@
{ lib, fetchurl, buildPythonPackage, docutils, six, sphinx, isPy3k }: { lib, fetchurl, buildPythonPackage, docutils, six, sphinx, isPy3k }:
buildPythonPackage rec { buildPythonPackage rec {
name = "breathe-${version}"; version = "4.6.0";
version = "4.2.0"; pname = "breathe";
name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://pypi/b/breathe/${name}.tar.gz"; url = "mirror://pypi/b/breathe/${name}.tar.gz";
sha256 = "0m3w8yx24nm01xxx6aj08cklnifwlzzmczc5b0ni40l63lhvm3lp"; sha256 = "9db2ba770f824da323b9ea3db0b98d613a4e0af094c82ccb0a82991da81b736a";
}; };
propagatedBuildInputs = [ docutils six sphinx ]; propagatedBuildInputs = [ docutils six sphinx ];

View file

@ -2,14 +2,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "BTrees"; pname = "BTrees";
version = "4.3.1"; version = "4.4.1";
name = "${pname}-${version}"; name = "${pname}-${version}";
propagatedBuildInputs = [ persistent zope_interface transaction ]; propagatedBuildInputs = [ persistent zope_interface transaction ];
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "15as34f9sa4nnd62nnjkik2jd4rg1byp0i4kwaqwdpv0ab9vfr95"; sha256 = "a2738b71693971c1f7502888d649bef270c65f026db731e03d53f1ec4edfe8a3";
}; };
meta = with stdenv.lib; { meta = with stdenv.lib; {

View file

@ -5,12 +5,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "certifi"; pname = "certifi";
version = "2017.1.23"; version = "2017.4.17";
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1klrzl3hgvcf2mjk00g0k3kk1p2z27vzwnxivwar4vhjmjvpz1w1"; sha256 = "f7527ebf7461582ce95f7a9e03dd141ce810d40590834f4ec20cddd54234c10a";
}; };
meta = { meta = {

View file

@ -2,7 +2,8 @@
asgiref, django, daphne asgiref, django, daphne
}: }:
buildPythonPackage rec { buildPythonPackage rec {
name = "channels-${version}"; pname = "channels";
name = "${pname}-${version}";
version = "1.1.3"; version = "1.1.3";
src = fetchurl { src = fetchurl {

View file

@ -1,7 +1,8 @@
{ stdenv, buildPythonPackage, fetchurl { stdenv, buildPythonPackage, fetchurl
}: }:
buildPythonPackage rec { buildPythonPackage rec {
name = "constantly-${version}"; pname = "constantly";
name = "${pname}-${version}";
version = "15.1.0"; version = "15.1.0";
src = fetchurl { src = fetchurl {

View file

@ -2,7 +2,8 @@
asgiref, autobahn, twisted, hypothesis asgiref, autobahn, twisted, hypothesis
}: }:
buildPythonPackage rec { buildPythonPackage rec {
name = "daphne-${version}"; pname = "daphne";
name = "${pname}-${version}";
version = "1.2.0"; version = "1.2.0";
src = fetchurl { src = fetchurl {

View file

@ -1,6 +1,7 @@
{ stdenv, buildPythonPackage, fetchurl, six }: { stdenv, buildPythonPackage, fetchurl, six }:
buildPythonPackage rec { buildPythonPackage rec {
name = "dateutil-${version}"; pname = "dateutil";
name = "${pname}-${version}";
version = "2.6.0"; version = "2.6.0";
src = fetchurl { src = fetchurl {

View file

@ -3,11 +3,11 @@
buildPythonPackage rec { buildPythonPackage rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "dbfread"; pname = "dbfread";
version = "2.0.5"; version = "2.0.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "0r5axq9ax0czyapm7b69krcv22r1nyb4vci7c5x8mx8pq1axim93"; sha256 = "07c8a9af06ffad3f6f03e8fe91ad7d2733e31a26d2b72c4dd4cfbae07ee3b73d";
}; };
meta = with stdenv.lib; { meta = with stdenv.lib; {

View file

@ -2,7 +2,9 @@
, ncurses, pygobject3 }: , ncurses, pygobject3 }:
if isPyPy then throw "dbus-python not supported for interpreter ${python.executable}" else buildPythonPackage rec { 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"; format = "other";
src = fetchurl { src = fetchurl {

View file

@ -11,13 +11,13 @@
let let
pname = "discord.py"; pname = "discord.py";
version = "0.16.4"; version = "0.16.8";
in buildPythonPackage rec { in buildPythonPackage rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
sha256 = "04q4gknv9lb8r2sdnsqs5nfcyyl850j4pcqcs0xjvmqhd7axa5ai"; sha256 = "d775b701383e3a5762accf3816b819f357f299476701615ac30c7715a5ea79aa";
}; };
propagatedBuildInputs = [ asyncio aiohttp websockets pynacl ]; propagatedBuildInputs = [ asyncio aiohttp websockets pynacl ];

View file

@ -3,7 +3,7 @@
buildPythonPackage rec { buildPythonPackage rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "distro"; pname = "distro";
version = "1.0.3"; version = "1.0.4";
buildInputs = [ pytest pytestcov tox]; buildInputs = [ pytest pytestcov tox];
@ -14,7 +14,7 @@ buildPythonPackage rec {
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1kmjdz1kxspsmps73m2kzhxz86jj43ikx825hmgmwbx793ywv69d"; sha256 = "9b000b0d637bb0cbd130a7a4835681e6993e309a85564dfea9d884825fe46954";
}; };
meta = with stdenv.lib; { meta = with stdenv.lib; {

View file

@ -2,7 +2,8 @@
django, django_nose, six django, django_nose, six
}: }:
buildPythonPackage rec { buildPythonPackage rec {
name = "django-compat-${version}"; pname = "django-compat";
name = "${pname}-${version}";
version = "1.0.14"; version = "1.0.14";
src = fetchurl { src = fetchurl {

View file

@ -3,12 +3,13 @@
pyparsing, django, celery pyparsing, django, celery
}: }:
buildPythonPackage rec { buildPythonPackage rec {
name = "django-raster-${version}"; version = "0.4";
version = "0.3.1"; pname = "django-raster";
name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://pypi/d/django-raster/${name}.tar.gz"; url = "mirror://pypi/d/django-raster/${name}.tar.gz";
sha256 = "1hsrkvybak1adn9d9qdw7hx3rcxsbzas4ixwll6vrjkrizgfihk3"; sha256 = "7fd6afa42b07ac51a3873e3d4840325dd3a8a631fdb5b853c76fbbfe59a2b17f";
}; };
# Tests require a postgresql + postgis server # Tests require a postgresql + postgis server

View file

@ -3,7 +3,8 @@
geos, gdal geos, gdal
}: }:
buildPythonPackage rec { buildPythonPackage rec {
name = "Django-${version}"; pname = "Django";
name = "${pname}-${version}";
version = "1.10.7"; version = "1.10.7";
disabled = pythonOlder "2.7"; disabled = pythonOlder "2.7";

View file

@ -3,8 +3,10 @@
geos, gdal, pytz geos, gdal, pytz
}: }:
buildPythonPackage rec { buildPythonPackage rec {
name = "Django-${version}"; pname = "Django";
name = "${pname}-${version}";
version = "1.11.1"; version = "1.11.1";
disabled = pythonOlder "2.7"; disabled = pythonOlder "2.7";
src = fetchurl { src = fetchurl {

View file

@ -3,7 +3,8 @@
, pytest, pytestrunner, pytest-django, setuptools_scm , pytest, pytestrunner, pytest-django, setuptools_scm
}: }:
buildPythonPackage rec { buildPythonPackage rec {
name = "django-guardian-${version}"; pname = "django-guardian";
name = "${pname}-${version}";
version = "1.4.8"; version = "1.4.8";
src = fetchurl { src = fetchurl {

View file

@ -1,11 +1,12 @@
{ stdenv, buildPythonPackage, fetchurl, django }: { stdenv, buildPythonPackage, fetchurl, django }:
buildPythonPackage rec { buildPythonPackage rec {
name = "djangorestframework-${version}"; version = "3.6.3";
version = "3.5.4"; pname = "djangorestframework";
name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://pypi/d/djangorestframework/${name}.tar.gz"; url = "mirror://pypi/d/djangorestframework/${name}.tar.gz";
sha256 = "1rays9d8jxqng13fv18ldf11y44w0ln6vvj2k8m4sd9gw9da75gr"; sha256 = "6aa6aafdfb7f6152a401873ecae93aff9eb54d7a74266065347cf4de68278ae4";
}; };
# Test settings are missing # Test settings are missing

View file

@ -3,12 +3,13 @@
, ipaddress, backports_ssl_match_hostname, docker_pycreds , ipaddress, backports_ssl_match_hostname, docker_pycreds
}: }:
buildPythonPackage rec { buildPythonPackage rec {
name = "docker-${version}"; version = "2.3.0";
version = "2.0.2"; pname = "docker";
name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://pypi/d/docker/${name}.tar.gz"; url = "mirror://pypi/d/docker/${name}.tar.gz";
sha256 = "1m16n2r8is1gxwmyr6163na2jdyzsnhhk2qj12l7rzm1sr9nhx7z"; sha256 = "b0e3f353a3df3eedfbbcaf48235117263479b893edfa0cf6d8d056cca5edde1c";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View file

@ -6,12 +6,13 @@
, enum34, functools32 , enum34, functools32
}: }:
buildPythonApplication rec { buildPythonApplication rec {
version = "1.10.0"; version = "1.13.0";
name = "docker-compose-${version}"; pname = "docker-compose";
name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://pypi/d/docker-compose/${name}.tar.gz"; url = "mirror://pypi/d/docker-compose/${name}.tar.gz";
sha256 = "023y2yhkvglaq07d78i89g2p8h040d71il8nfbyg2f9fkffigx9z"; sha256 = "3c7b62cd0ab5f33d21db197d8a74739d320a6fe32e4ef8282c35d4dee5a7c77c";
}; };
# lots of networking and other fails # lots of networking and other fails

View file

@ -4,12 +4,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "dogpile.cache"; pname = "dogpile.cache";
version = "0.6.2"; version = "0.6.3";
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "73793471af07af6dc5b3ee015abfaca4220caaa34c615537f5ab007ed150726d"; sha256 = "e9747f5e31f8dea1b80d6204358885f943f69e53574d88005438ca3651c44553";
}; };
# Disable concurrency tests that often fail, # Disable concurrency tests that often fail,

View file

@ -4,7 +4,8 @@
}: }:
buildPythonPackage rec { buildPythonPackage rec {
name = "ds4drv-${version}"; pname = "ds4drv";
name = "${pname}-${version}";
version = "0.5.1"; version = "0.5.1";
# PyPi only carries py3 wheel # PyPi only carries py3 wheel

View file

@ -3,12 +3,13 @@
, git, glibcLocales }: , git, glibcLocales }:
buildPythonPackage rec { buildPythonPackage rec {
name = "dulwich-${version}"; version = "0.17.3";
version = "0.14.1"; pname = "dulwich";
name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://pypi/d/dulwich/${name}.tar.gz"; url = "mirror://pypi/d/dulwich/${name}.tar.gz";
sha256 = "14xsyxha6qyxxyf0ma3zv1sy31iy22vzwayk519n7a1gwzk4j7vw"; sha256 = "0c3eccac93823e172b05d57aaeab3d6f03c6c0f1867613606d1909a3ab4100ca";
}; };
LC_ALL = "en_US.UTF-8"; LC_ALL = "en_US.UTF-8";

View file

@ -3,14 +3,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "edward"; pname = "edward";
version = "1.2.2"; version = "1.3.1";
name = "${pname}-${version}"; name = "${pname}-${version}";
disabled = !(isPy27 || pythonAtLeast "3.4"); disabled = !(isPy27 || pythonAtLeast "3.4");
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "0h9i15l7mczwx8jvabjbvxjjidr13x81h6vylb1p8r308w01r2as"; sha256 = "5f868604c4d13ccc054906fae6c0115edf295a81897cc9dc97026bb083d275ae";
}; };
# disabled for now due to Tensorflow trying to create files in $HOME: # disabled for now due to Tensorflow trying to create files in $HOME:

View file

@ -2,7 +2,8 @@
buildPythonPackage rec { buildPythonPackage rec {
version = "0.8.1"; version = "0.8.1";
name = "ezdxf-${version}"; pname = "ezdxf";
name = "${pname}-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mozman"; owner = "mozman";

View file

@ -1,7 +1,9 @@
{ stdenv, buildPythonPackage, glibcLocales, fetchurl, six, pytz }: { stdenv, buildPythonPackage, glibcLocales, fetchurl, six, pytz }:
buildPythonPackage rec { buildPythonPackage rec {
name = "feedgenerator-1.9"; pname = "feedgenerator";
version = "1.9";
name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://pypi/f/feedgenerator/${name}.tar.gz"; url = "mirror://pypi/f/feedgenerator/${name}.tar.gz";

View file

@ -1,7 +1,8 @@
{ lib, fetchurl, buildPythonPackage }: { lib, fetchurl, buildPythonPackage }:
buildPythonPackage rec { buildPythonPackage rec {
name = "flake8-blind-except-${version}"; pname = "flake8-blind-except";
name = "${pname}-${version}";
version = "0.1.1"; version = "0.1.1";
src = fetchurl { src = fetchurl {
url = "mirror://pypi/f/flake8-blind-except/${name}.tar.gz"; url = "mirror://pypi/f/flake8-blind-except/${name}.tar.gz";

View file

@ -1,7 +1,8 @@
{ lib, fetchurl, buildPythonPackage, flake8, nose }: { lib, fetchurl, buildPythonPackage, flake8, nose }:
buildPythonPackage rec { buildPythonPackage rec {
name = "flake8-debugger-${version}"; pname = "flake8-debugger";
name = "${pname}-${version}";
version = "1.4.0"; version = "1.4.0";
src = fetchurl { src = fetchurl {
url = "mirror://pypi/f/flake8-debugger/${name}.tar.gz"; url = "mirror://pypi/f/flake8-debugger/${name}.tar.gz";

View file

@ -2,7 +2,8 @@
, flask, elasticsearch }: , flask, elasticsearch }:
buildPythonPackage rec { buildPythonPackage rec {
name = "Flask-Elastic-${version}"; pname = "Flask-Elastic";
name = "${pname}-${version}";
version = "0.2"; version = "0.2";
src = fetchurl { src = fetchurl {

View file

@ -3,7 +3,9 @@
, mock, nose }: , mock, nose }:
buildPythonPackage rec { buildPythonPackage rec {
name = "flask-ldap-login-0.3.0"; pname = "flask-ldap-login";
version = "0.3.0";
name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://pypi/f/flask-ldap-login/${name}.tar.gz"; url = "mirror://pypi/f/flask-ldap-login/${name}.tar.gz";

View file

@ -2,7 +2,8 @@
, flask, nose, mock, blinker}: , flask, nose, mock, blinker}:
buildPythonPackage rec { buildPythonPackage rec {
name = "Flask-Login-${version}"; pname = "Flask-Login";
name = "${pname}-${version}";
version = "0.4.0"; version = "0.4.0";
src = fetchFromGitHub { src = fetchFromGitHub {

View file

@ -2,7 +2,8 @@
, flask, oauthlib, requests_oauthlib, flask_sqlalchemy , flask, oauthlib, requests_oauthlib, flask_sqlalchemy
, mock, nose}: , mock, nose}:
buildPythonPackage rec { buildPythonPackage rec {
name = "Flask-OAuthlib-${version}"; pname = "Flask-OAuthlib";
name = "${pname}-${version}";
version = "0.9.3"; version = "0.9.3";
src = fetchFromGitHub { src = fetchFromGitHub {

View file

@ -1,7 +1,9 @@
{ stdenv, fetchurl, buildPythonPackage, flask, wtforms, nose }: { stdenv, fetchurl, buildPythonPackage, flask, wtforms, nose }:
buildPythonPackage rec { buildPythonPackage rec {
name = "Flask-WTF-0.14.2"; pname = "Flask-WTF";
version = "0.14.2";
name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://pypi/F/Flask-WTF/${name}.tar.gz"; url = "mirror://pypi/F/Flask-WTF/${name}.tar.gz";

View file

@ -2,7 +2,9 @@
, zope_testrunner, six, chardet}: , zope_testrunner, six, chardet}:
buildPythonPackage rec { buildPythonPackage rec {
name = "ghdiff-0.4"; pname = "ghdiff";
version = "0.4";
name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://pypi/g/ghdiff/${name}.tar.gz"; url = "mirror://pypi/g/ghdiff/${name}.tar.gz";

View file

@ -2,11 +2,13 @@
, pytest, mock, pytestcov, coverage }: , pytest, mock, pytestcov, coverage }:
buildPythonPackage rec { buildPythonPackage rec {
name = "gunicorn-19.3.0"; pname = "gunicorn";
version = "19.7.1";
name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://pypi/g/gunicorn/${name}.tar.gz"; url = "mirror://pypi/g/gunicorn/${name}.tar.gz";
sha256 = "12d0jd9y9fyssc28mn8j6nzrck8y05hc946p5h0rmbc25043bj4b"; sha256 = "eee1169f0ca667be05db3351a0960765620dad53f53434262ff8901b68a1b622";
}; };
buildInputs = [ pytest mock pytestcov coverage ]; buildInputs = [ pytest mock pytestcov coverage ];

View file

@ -11,12 +11,13 @@ let
mpiSupport = hdf5.mpiSupport; mpiSupport = hdf5.mpiSupport;
in buildPythonPackage rec { in buildPythonPackage rec {
name = "h5py-${version}"; version = "2.7.0";
version = "2.6.0"; pname = "h5py";
name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://pypi/h/h5py/${name}.tar.gz"; url = "mirror://pypi/h/h5py/${name}.tar.gz";
sha256 = "0df46dg7i7xfking9lp221bfm8dbl974yvlrbi1w7r6m61ac7bxj"; sha256 = "79254312df2e6154c4928f5e3b22f7a2847b6e5ffb05ddc33e37b16e76d36310";
}; };
configure_flags = "--hdf5=${hdf5}" + optionalString mpiSupport " --mpi"; configure_flags = "--hdf5=${hdf5}" + optionalString mpiSupport " --mpi";

View file

@ -1,8 +1,9 @@
{ stdenv , fetchurl , buildPythonPackage , sphinx }: { stdenv , fetchurl , buildPythonPackage , sphinx }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "hieroglyph";
version = "0.7.1"; version = "0.7.1";
name = "hieroglyph-${version}"; name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://pypi/h/hieroglyph/${name}.tar.gz"; url = "mirror://pypi/h/hieroglyph/${name}.tar.gz";

View file

@ -9,25 +9,26 @@ buildPythonPackage rec {
# pytz fake_factory django numpy pytest # pytz fake_factory django numpy pytest
# If you need these, you can just add them to your environment. # If you need these, you can just add them to your environment.
name = "hypothesis-${version}"; version = "3.11.0";
version = "3.7.0"; pname = "hypothesis";
name = "${pname}-${version}";
# Upstream prefers github tarballs # Upstream prefers github tarballs
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "HypothesisWorks"; owner = "HypothesisWorks";
repo = "hypothesis"; repo = "hypothesis-python";
rev = "${version}"; 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 ]; propagatedBuildInputs = stdenv.lib.optionals (pythonOlder "3.4") [ enum34 ];
inherit doCheck; inherit doCheck;
# https://github.com/DRMacIver/hypothesis/issues/300 # https://github.com/DRMacIver/hypothesis/issues/300
checkPhase = '' checkPhase = ''
${python.interpreter} -m pytest tests/cover py.test tests/cover
''; '';
# Unsupport by upstream on certain versions # Unsupport by upstream on certain versions

View file

@ -3,11 +3,11 @@
buildPythonPackage rec { buildPythonPackage rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "incremental"; pname = "incremental";
version = "16.10.1"; version = "17.5.0";
src = fetchurl { src = fetchurl {
url = "mirror://pypi/i/${pname}/${name}.tar.gz"; url = "mirror://pypi/i/${pname}/${name}.tar.gz";
sha256 = "0hh382gsj5lfl3fsabblk2djngl4n5yy90xakinasyn41rr6pb8l"; sha256 = "7b751696aaf36eebfab537e458929e194460051ccad279c72b755a167eebd4b3";
}; };
meta = with stdenv.lib; { meta = with stdenv.lib; {

View file

@ -1,7 +1,9 @@
{ stdenv, buildPythonPackage, isPy3k, fetchurl, xmpppy }: { stdenv, buildPythonPackage, isPy3k, fetchurl, xmpppy }:
buildPythonPackage rec { buildPythonPackage rec {
name = "jabberbot-0.16"; pname = "jabberbot";
version = "0.16";
name = "${pname}-${version}";
disabled = isPy3k; disabled = isPy3k;
src = fetchurl { src = fetchurl {

View file

@ -1,21 +1,23 @@
{ stdenv, fetchurl, buildPythonApplication, EditorConfig, pytest, six }: { stdenv, fetchurl, buildPythonApplication, EditorConfig, pytest, six }:
buildPythonApplication rec { 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 { src = fetchurl {
url = "mirror://pypi/j/jsbeautifier/${name}.tar.gz"; url = "mirror://pypi/j/jsbeautifier/${name}.tar.gz";
sha256 = "50b2af556aa1da7283a6a92eaa699668312cb91f2ba6b78a4422b1d42af964a2"; sha256 = "50b2af556aa1da7283a6a92eaa699668312cb91f2ba6b78a4422b1d42af964a2";
}; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = "http://jsbeautifier.org"; homepage = "http://jsbeautifier.org";
description = "JavaScript unobfuscator and beautifier."; description = "JavaScript unobfuscator and beautifier.";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ apeyroux ]; maintainers = with maintainers; [ apeyroux ];
}; };
} }

View file

@ -12,12 +12,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "Keras"; pname = "Keras";
version = "2.0.3"; version = "2.0.4";
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1x4p179smmnki6mng9n3lsi9glv2jg0y1ls154msplz9jm5bv39r"; sha256 = "1cbe62af6821963321b275d5598fd94e63c11feaa1d4deaa79c9eb9ee0e1d68a";
}; };
checkInputs = [ checkInputs = [

View file

@ -1,7 +1,9 @@
{ stdenv, fetchurl, buildPythonPackage, pycurl }: { stdenv, fetchurl, buildPythonPackage, pycurl }:
buildPythonPackage rec { buildPythonPackage rec {
name = "koji-1.8"; pname = "koji";
version = "1.8";
name = "${pname}-${version}";
format = "other"; format = "other";
src = fetchurl { src = fetchurl {

View file

@ -2,12 +2,14 @@
, openldap, cyrus_sasl, openssl }: , openldap, cyrus_sasl, openssl }:
buildPythonPackage rec { buildPythonPackage rec {
name = "ldap-2.4.22"; pname = "python-ldap";
version = "2.4.38";
name = "${pname}-${version}";
disabled = isPy3k; disabled = isPy3k;
src = fetchurl { src = fetchurl {
url = "mirror://pypi/p/python-ldap/python-${name}.tar.gz"; url = "mirror://pypi/p/python-ldap/python-${name}.tar.gz";
sha256 = "1dshpq84kl4xpa0hmnjrh6q5h5bybn09r83sa3z3ybr9jlm8gxcy"; sha256 = "88bab69e519dd8bd83becbe36bd141c174b0fe309e84936cf1bae685b31be779";
}; };
NIX_CFLAGS_COMPILE = "-I${cyrus_sasl.dev}/include/sasl"; NIX_CFLAGS_COMPILE = "-I${cyrus_sasl.dev}/include/sasl";

View file

@ -2,7 +2,8 @@
six, pytest, pytestrunner, pytestcov, coverage six, pytest, pytestrunner, pytestcov, coverage
}: }:
buildPythonPackage rec { buildPythonPackage rec {
name = "libais-${version}"; pname = "libais";
name = "${pname}-${version}";
version = "0.16"; version = "0.16";
src = fetchurl { src = fetchurl {

View file

@ -5,7 +5,8 @@ then throw "libArcus not supported for interpreter ${python.executable}"
else else
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libarcus-${version}"; pname = "libarcus";
name = "${pname}-${version}";
version = "2.4.0"; version = "2.4.0";
src = fetchFromGitHub { src = fetchFromGitHub {

View file

@ -2,7 +2,8 @@
, libasyncns, pkgconfig }: , libasyncns, pkgconfig }:
buildPythonPackage rec { buildPythonPackage rec {
name = "libasyncns-python-${version}"; pname = "libasyncns-python";
name = "${pname}-${version}";
version = "0.7.1"; version = "0.7.1";
src = fetchurl { src = fetchurl {

View file

@ -1,7 +1,8 @@
{ stdenv, fetchurl, buildPythonPackage, libsexy, pkgconfig, libxml2, pygtk, pango, gtk2, glib }: { stdenv, fetchurl, buildPythonPackage, libsexy, pkgconfig, libxml2, pygtk, pango, gtk2, glib }:
buildPythonPackage rec { buildPythonPackage rec {
name = "libsexy-${version}"; pname = "libsexy";
name = "${pname}-${version}";
version = "0.1.9"; version = "0.1.9";
format = "other"; format = "other";

View file

@ -11,13 +11,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "llvmlite"; pname = "llvmlite";
name = "${pname}-${version}"; name = "${pname}-${version}";
version = "0.16.0"; version = "0.18.0";
disabled = isPyPy; disabled = isPyPy;
src = fetchurl { src = fetchurl {
url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; 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; propagatedBuildInputs = [ llvm ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34;

View file

@ -1,7 +1,8 @@
{ stdenv, buildPythonPackage, fetchurl, { stdenv, buildPythonPackage, fetchurl,
mistune, docutils } : mistune, docutils } :
buildPythonPackage rec { buildPythonPackage rec {
name = "m2r-${version}"; pname = "m2r";
name = "${pname}-${version}";
version = "0.1.5"; version = "0.1.5";
src = fetchurl { src = fetchurl {

View file

@ -16,12 +16,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "magic-wormhole"; pname = "magic-wormhole";
version = "0.8.1"; version = "0.9.2";
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1yh5nbhh9z1am2pqnb5qqyq1zjl1m7z6jnkmvry2q14qwspw9had"; sha256 = "14aed4b453278651d92c3fd8955a105e2d33dcde279fa25d1d759e0e769f16b3";
}; };
checkInputs = [ mock ]; checkInputs = [ mock ];

View file

@ -1,8 +1,9 @@
{ stdenv, buildPythonPackage, fetchurl }: { stdenv, buildPythonPackage, fetchurl }:
buildPythonPackage rec { buildPythonPackage rec {
name = "markdown2-${version}"; pname = "markdown2";
version = "2.3.1"; version = "2.3.1";
name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://pypi/m/markdown2/${name}.zip"; url = "mirror://pypi/m/markdown2/${name}.zip";

View file

@ -20,12 +20,13 @@ assert enableTk -> (tcl != null)
assert enableQt -> pyqt4 != null; assert enableQt -> pyqt4 != null;
buildPythonPackage rec { buildPythonPackage rec {
name = "matplotlib-${version}"; version = "2.0.2";
version = "2.0.0"; pname = "matplotlib";
name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://pypi/m/matplotlib/${name}.tar.gz"; 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"; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";

View file

@ -1,11 +1,13 @@
{ stdenv, fetchurl, python, buildPythonPackage, mpi, openssh, isPy3k, isPyPy }: { stdenv, fetchurl, python, buildPythonPackage, mpi, openssh, isPy3k, isPyPy }:
buildPythonPackage rec { buildPythonPackage rec {
name = "mpi4py-1.3.1"; pname = "mpi4py";
version = "2.0.0";
name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "https://bitbucket.org/mpi4py/mpi4py/downloads/${name}.tar.gz"; url = "https://bitbucket.org/mpi4py/mpi4py/downloads/${name}.tar.gz";
sha256 = "e7bd2044aaac5a6ea87a87b2ecc73b310bb6efe5026031e33067ea3c2efc3507"; sha256 = "6543a05851a7aa1e6d165e673d422ba24e45c41e4221f0993fe1e5924a00cb81";
}; };
passthru = { passthru = {

View file

@ -7,13 +7,13 @@
let let
pname = "multidict"; pname = "multidict";
version = "2.1.4"; version = "2.1.5";
in buildPythonPackage rec { in buildPythonPackage rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
sha256 = "a77aa8c9f68846c3b5db43ff8ed2a7a884dbe845d01f55113a3fba78518c4cd7"; sha256 = "20a30a474882ad174eb64873cfa7bae4604944105adf7f6847141bd7938c5ed1";
}; };
buildInputs = [ pytest ]; buildInputs = [ pytest ];

View file

@ -2,7 +2,8 @@
, numpy, zlib, netcdf, hdf5, curl, libjpeg , numpy, zlib, netcdf, hdf5, curl, libjpeg
}: }:
buildPythonPackage rec { buildPythonPackage rec {
name = "netCDF4-${version}"; pname = "netCDF4";
name = "${pname}-${version}";
version = "1.2.7"; version = "1.2.7";
disabled = isPyPy; disabled = isPyPy;

View file

@ -1,12 +1,13 @@
{ fetchurl, buildPythonPackage, isPy33, lib, six, pythonAtLeast, pythonOlder }: { fetchurl, buildPythonPackage, isPy33, lib, six, pythonAtLeast, pythonOlder }:
buildPythonPackage rec { buildPythonPackage rec {
name = "nltk-${version}"; version = "3.2.4";
version = "3.2.2"; pname = "nltk";
name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://pypi/n/nltk/nltk-${version}.tar.gz"; url = "mirror://pypi/n/nltk/nltk-${version}.tar.gz";
sha256 = "13m8i393h5mhpyvh5rghxxpax3bscv8li3ynwfdiq0kh8wsdndqv"; sha256 = "8682ae52f5de4f2ba7b77bd78222a38575ad01ef29946214b254dfdf93a3a0eb";
}; };
propagatedBuildInputs = [ six ]; propagatedBuildInputs = [ six ];

View file

@ -14,12 +14,13 @@
}: }:
buildPythonPackage rec { buildPythonPackage rec {
version = "0.31.0"; version = "0.33.0";
name = "numba-${version}"; pname = "numba";
name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://pypi/n/numba/${name}.tar.gz"; 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"; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";

View file

@ -3,12 +3,13 @@
coverage, oslosphinx, oslotest, testscenarios, six, ddt coverage, oslosphinx, oslotest, testscenarios, six, ddt
}: }:
buildPythonPackage rec { buildPythonPackage rec {
name = "os-testr-${version}"; version = "0.8.2";
version = "0.8.1"; pname = "os-testr";
name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://pypi/o/os-testr/${name}.tar.gz"; url = "mirror://pypi/o/os-testr/${name}.tar.gz";
sha256 = "10ws7l5p25psnp6rwymwdzh4zagmmnbf56xwg06cn2292m95l4i7"; sha256 = "d8a60bd56c541714a5cab4d1996c8ddfdb5c7c35393d55be617803048c170837";
}; };
patchPhase = '' patchPhase = ''

View file

@ -70,7 +70,6 @@ in buildPythonPackage rec {
--replace OSError ImportError --replace OSError ImportError
''; '';
# The flag `-A 'not network'` will disable tests that use internet.
checkPhase = '' checkPhase = ''
runHook preCheck runHook preCheck
py.test $out/${python.sitePackages}/pandas --skip-slow --skip-network py.test $out/${python.sitePackages}/pandas --skip-slow --skip-network

View file

@ -2,12 +2,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pbr"; pname = "pbr";
version = "2.0.0"; version = "3.0.1";
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "0ccd2db529afd070df815b1521f01401d43de03941170f8a800e7531faba265d"; sha256 = "d7e8917458094002b9a2e0030ba60ba4c834c456071f2d0c1ccb5265992ada91";
}; };
# circular dependencies with fixtures # circular dependencies with fixtures

View file

@ -5,7 +5,8 @@
, blinker, pillow, beautifulsoup4, markupsafe }: , blinker, pillow, beautifulsoup4, markupsafe }:
buildPythonPackage rec { buildPythonPackage rec {
name = "pelican-${version}"; pname = "pelican";
name = "${pname}-${version}";
version = "3.7.1"; version = "3.7.1";
disabled = isPy26; disabled = isPy26;

View file

@ -1,6 +1,7 @@
{ stdenv, buildPythonPackage, fetchurl, pytest, mock }: { stdenv, buildPythonPackage, fetchurl, pytest, mock }:
buildPythonPackage rec { buildPythonPackage rec {
name = "pep257-${version}"; pname = "pep257";
name = "${pname}-${version}";
version = "0.7.0"; version = "0.7.0";
src = fetchurl { src = fetchurl {

View file

@ -1,7 +1,9 @@
{ stdenv, fetchurl, buildPythonPackage }: { stdenv, fetchurl, buildPythonPackage }:
buildPythonPackage rec { buildPythonPackage rec {
name = "phonenumbers-8.4.0"; pname = "phonenumbers";
version = "8.5.0";
name = "${pname}-${version}";
meta = { meta = {
description = "Python version of Google's common library for parsing, formatting, storing and validating international phone numbers"; 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 { src = fetchurl {
url = "mirror://pypi/p/phonenumbers/${name}.tar.gz"; url = "mirror://pypi/p/phonenumbers/${name}.tar.gz";
sha256 = "1c052gd7ra3v183jq2x5nwa428wxh1g3psfh0ay5jwwmcxy78vab"; sha256 = "6d3d82a3dcb0418431099d1b1c24efb280cbec8f81c7ce3d1abf417c238b8859";
}; };
} }

View file

@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, buildPythonPackage, pip, pytest, click, six, first, glibcLocales }: { stdenv, fetchFromGitHub, buildPythonPackage, pip, pytest, click, six, first, glibcLocales }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "pip-tools"; pname = "pip-tools";
version = "1.8.1rc3"; version = "1.9.0";
name = "pip-tools-${version}"; name = "pip-tools-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jazzband"; owner = "jazzband";
repo = "pip-tools"; repo = "pip-tools";
rev = version; rev = version;
sha256 = "09rbgzj71bfp1x1jfr1zx3vax4qjbw5l6vcd3fqvshsdvg9lcnpx"; sha256 = "0706feb27263a2dade6d39cc508e718282bd08f455d0643f251659f905be4d56";
}; };
LC_ALL = "en_US.UTF-8"; LC_ALL = "en_US.UTF-8";

View file

@ -1,8 +1,9 @@
{ stdenv, fetchurl, pkgconfig, at_spi2_core, pythonPackages }: { stdenv, fetchurl, pkgconfig, at_spi2_core, pythonPackages }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "pyatspi";
version = "2.18.0"; version = "2.18.0";
name = "pyatspi-${version}"; name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/pyatspi/2.18/${name}.tar.xz"; url = "mirror://gnome/sources/pyatspi/2.18/${name}.tar.xz";

View file

@ -9,8 +9,9 @@ if (isPyPy) then throw "pycairo not supported for interpreter ${python.executabl
patch_waf-py3_5 = ./waf-py3_5.patch; patch_waf-py3_5 = ./waf-py3_5.patch;
in buildPythonPackage rec { in buildPythonPackage rec {
pname = "pycairo";
version = "1.10.0"; version = "1.10.0";
name = "pycairo-${version}"; name = "${pname}-${version}";
format = "other"; format = "other";
src = if isPy3k src = if isPy3k

View file

@ -1,12 +1,13 @@
{ stdenv, fetchurl, python, buildPythonPackage, gmp }: { stdenv, fetchurl, python, buildPythonPackage, gmp }:
buildPythonPackage rec { buildPythonPackage rec {
version = "3.4.3"; version = "3.4.6";
name = "pycryptodome-${version}"; pname = "pycryptodome";
name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://pypi/p/pycryptodome/${name}.tar.gz"; url = "mirror://pypi/p/pycryptodome/${name}.tar.gz";
sha256 = "1x2kk2va77lqys2dd7gwh35m4vrp052zz5hvv1zqxzksg2srf5jb"; sha256 = "df1be662060cf3abdcf2086ebb401f750744106425ddebf74c57feab410e4923";
}; };
meta = { meta = {

View file

@ -22,12 +22,12 @@ let
in in
buildPythonPackage rec { buildPythonPackage rec {
pname = "pycuda"; pname = "pycuda";
version = "2016.1.2"; version = "2017.1";
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
sha256 = "0dvf1cnrlvmrc7i100n2ndrnd7fjm7aq3wpmk2nx5h7hwb3xmnx7"; sha256 = "a92725ccd8515b4d7284b9127184b6fdb61f224daa086e7fc6b926e2094b055f";
}; };
preConfigure = '' preConfigure = ''

View file

@ -1,9 +1,9 @@
{ stdenv, fetchurl, python, exiv2, scons, boost }: { stdenv, fetchurl, python, exiv2, scons, boost }:
let version = "0.3.2"; in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "pyexiv2-${version}"; pname = "pyexiv2";
version = "0.3.2";
name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "http://launchpad.net/pyexiv2/0.3.x/0.3.2/+download/${name}.tar.bz2"; url = "http://launchpad.net/pyexiv2/0.3.x/0.3.2/+download/${name}.tar.bz2";

View file

@ -3,11 +3,11 @@
buildPythonPackage rec { buildPythonPackage rec {
name = pname + "-" + version; name = pname + "-" + version;
pname = "pyext"; pname = "pyext";
version = "0.7"; version = "0.6";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1pvwjkrjqajzh4wiiw1mzqp0bb81cqc2gk23nj24m32fpqssc676"; sha256 = "6c406cf71b991e1fc5a7f963d3a289525bce5e7ad1c43b697d9f5223185fcaef";
}; };
meta = with stdenv.lib; { meta = with stdenv.lib; {

View file

@ -3,7 +3,8 @@
}: }:
buildPythonPackage rec { buildPythonPackage rec {
name = "pygame-${version}"; pname = "pygame";
name = "${pname}-${version}";
version = "1.9.3"; version = "1.9.3";
src = fetchurl { src = fetchurl {

View file

@ -1,11 +1,12 @@
{ buildPythonPackage, fetchurl, stdenv, libmemcached, zlib }: { buildPythonPackage, fetchurl, stdenv, libmemcached, zlib }:
buildPythonPackage rec { buildPythonPackage rec {
name = "pylibmc-${version}"; version = "1.5.2";
version = "1.5.1"; pname = "pylibmc";
name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "https://pypi.python.org/packages/source/p/pylibmc/${name}.tar.gz"; url = "https://pypi.python.org/packages/source/p/pylibmc/${name}.tar.gz";
sha256 = "1mnd8lng9wmcihl7mxd940hy1dzzvzsb971qclrvmqf3b4c2dfpc"; sha256 = "fc54e28a9f1b5b2ec0c030da29c7ad8a15c2755bd98aaa4142eaf419d5fabb33";
}; };
buildInputs = [ libmemcached zlib ]; buildInputs = [ libmemcached zlib ];

View file

@ -4,11 +4,11 @@
buildPythonPackage rec { buildPythonPackage rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "pylint"; pname = "pylint";
version = "1.6.5"; version = "1.7.1";
src = fetchurl { src = fetchurl {
url = "mirror://pypi/p/${pname}/${name}.tar.gz"; url = "mirror://pypi/p/${pname}/${name}.tar.gz";
sha256 = "06b78nl996949a7h01c4ycy8779hl5cm7vpxij5lm3npim59hwx6"; sha256 = "8b4a7ab6cf5062e40e2763c0b4a596020abada1d7304e369578b522e46a6264a";
}; };
buildInputs = [ pytest mccabe configparser backports_functools_lru_cache ]; buildInputs = [ pytest mccabe configparser backports_functools_lru_cache ];

View file

@ -15,7 +15,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pyopencl"; pname = "pyopencl";
version = "2016.2"; version = "2017.1";
name = "${pname}-${version}"; name = "${pname}-${version}";
buildInputs = [ pytest opencl-headers ocl-icd ]; buildInputs = [ pytest opencl-headers ocl-icd ];
@ -24,7 +24,7 @@ buildPythonPackage rec {
src = fetchurl { src = fetchurl {
url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; 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 # gcc: error: pygpu_language_opencl.cpp: No such file or directory

View file

@ -1,7 +1,9 @@
{ lib, buildPythonPackage, fetchurl, requests, novaclient, keyring, { lib, buildPythonPackage, fetchurl, requests, novaclient, keyring,
rackspace-novaclient, six, isPy3k, pytest, glibcLocales }: rackspace-novaclient, six, isPy3k, pytest, glibcLocales }:
buildPythonPackage rec { buildPythonPackage rec {
name = "pyrax-1.9.8"; pname = "pyrax";
version = "1.9.8";
name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://pypi/p/pyrax/${name}.tar.gz"; url = "mirror://pypi/p/pyrax/${name}.tar.gz";

View file

@ -1,11 +1,13 @@
{stdenv, buildPythonPackage, fetchurl}: {stdenv, buildPythonPackage, fetchurl}:
buildPythonPackage rec { buildPythonPackage rec {
name = "pyroute2-0.4.13"; pname = "pyroute2";
version = "0.4.14";
name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://pypi/p/pyroute2/${name}.tar.gz"; url = "mirror://pypi/p/pyroute2/${name}.tar.gz";
sha256 = "0f8a1ihxc1r78m6dqwhks2vdp4vwwbw72mbv88v70qmkb0pxgwwk"; sha256 = "eb41cdc5a9e7c017c65c8ff11013fd1b6d6699163bcf469e643cb1799a87d330";
}; };
# requires root priviledges # requires root priviledges

View file

@ -1,12 +1,13 @@
{ stdenv, fetchurl, buildPythonPackage, swig, pcsclite }: { stdenv, fetchurl, buildPythonPackage, swig, pcsclite }:
buildPythonPackage rec { buildPythonPackage rec {
name = "pyscard-${version}"; version = "1.9.5";
version = "1.9.4"; pname = "pyscard";
name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://pypi/p/pyscard/${name}.tar.gz"; url = "mirror://pypi/p/pyscard/${name}.tar.gz";
sha256 = "0gn0p4p8dhk99g8vald0dcnh45jbf82bj72n4djyr8b4hawkck4v"; sha256 = "7eef027e1939b7595fc13c03616f262f90d118594fdb6f7620af46b54fa06835";
}; };
patchPhase = '' patchPhase = ''

View file

@ -2,7 +2,8 @@
# This derivation provides a Python module and should therefore be called via `python-packages.nix`. # This derivation provides a Python module and should therefore be called via `python-packages.nix`.
buildPythonPackage rec { buildPythonPackage rec {
name = "pyside-${version}"; pname = "pyside";
name = "${pname}-${version}";
version = "1.2.4"; version = "1.2.4";
format = "other"; format = "other";

View file

@ -6,7 +6,8 @@
}: }:
buildPythonApplication rec { buildPythonApplication rec {
name = "pysrt-${version}"; pname = "pysrt";
name = "${pname}-${version}";
version = "1.1.1"; version = "1.1.1";
src = fetchFromGitHub { src = fetchFromGitHub {

View file

@ -3,7 +3,8 @@
, fetchpatch , fetchpatch
}: }:
buildPythonPackage rec { buildPythonPackage rec {
name = "pytest-django-${version}"; pname = "pytest-django";
name = "${pname}-${version}";
version = "3.1.2"; version = "3.1.2";
src = fetchurl { src = fetchurl {

View file

@ -10,7 +10,8 @@
}: }:
buildPythonPackage rec { buildPythonPackage rec {
name = "pytest-httpbin-${version}"; pname = "pytest-httpbin";
name = "${pname}-${version}";
version = "0.2.3"; version = "0.2.3";
src = fetchFromGitHub { src = fetchFromGitHub {

Some files were not shown because too many files have changed in this diff Show more