JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pythonPackages: Add version and pname attributes to packages

Browse Source
This commit is contained in:
adisbladis 2017-11-09 19:26:09 +08:00 committed by Frederik Rietdijk
parent 4ae5f31403
commit d99378654f
79 changed files with 240 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/office/paperwork/backend.nix
View File

@ -9,7 +9,7 @@
}: }:
buildPythonPackage rec { buildPythonPackage rec {
name = "paperwork-backend-${version}"; pname = "paperwork-backend";
version = "1.2.1"; version = "1.2.1";
src = fetchFromGitHub { src = fetchFromGitHub {

1
pkgs/development/compilers/jsonnet/default.nix
View File

@ -4,6 +4,7 @@ let version = "0.9.4"; in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "jsonnet-${version}"; name = "jsonnet-${version}";
version = version;
src = fetchFromGitHub { src = fetchFromGitHub {
rev = "v${version}"; rev = "v${version}";

2
pkgs/development/libraries/boost/generic.nix
View File

@ -125,7 +125,7 @@ in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "boost-${version}"; name = "boost-${version}";
inherit src patches; inherit src patches version;
meta = { meta = {
homepage = http://boost.org/; homepage = http://boost.org/;

4
pkgs/development/libraries/kmsxx/default.nix
View File

@ -1,7 +1,9 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, libdrm, python }: { stdenv, fetchFromGitHub, cmake, pkgconfig, libdrm, python }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "kmsxx-2017-10-10"; pname = "kmsxx";
version = "2017-10-10";
name = pname + "-" + version;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tomba"; owner = "tomba";

4
pkgs/development/libraries/libxslt/default.nix
View File

@ -10,7 +10,9 @@ assert pythonSupport -> libxml2.pythonSupport;
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libxslt-1.1.29"; pname = "libxslt";
version = "1.1.29";
name = pname + "-" + version;
src = fetchurl { src = fetchurl {
url = "http://xmlsoft.org/sources/${name}.tar.gz"; url = "http://xmlsoft.org/sources/${name}.tar.gz";

3
pkgs/development/python-modules/arelle/default.nix
View File

@ -5,8 +5,9 @@
... }: ... }:
buildPythonPackage rec { buildPythonPackage rec {
name = "arelle-${version}${lib.optionalString (!gui) "-headless"}"; pname = "arelle-${version}${lib.optionalString (!gui) "-headless"}";
version = "2017-08-24"; version = "2017-08-24";
name = pname + "-" + version;
disabled = !isPy3k; disabled = !isPy3k;

3
pkgs/development/python-modules/asn1ate/default.nix
View File

@ -4,7 +4,8 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "asn1ate"; pname = "asn1ate";
date = "20160810"; date = "20160810";
name = "${pname}-unstable-${date}"; version = "unstable-${date}";
name = "${pname}-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
sha256 = "04pddr1mh2v9qq8fg60czwvjny5qwh4nyxszr3qc4bipiiv2xk9w"; sha256 = "04pddr1mh2v9qq8fg60czwvjny5qwh4nyxszr3qc4bipiiv2xk9w";

3
pkgs/development/python-modules/augeas/default.nix
View File

@ -1,7 +1,8 @@
{ stdenv, lib, buildPythonPackage, fetchFromGitHub, augeas, cffi }: { stdenv, lib, buildPythonPackage, fetchFromGitHub, augeas, cffi }:
buildPythonPackage rec { buildPythonPackage rec {
name = "augeas-${version}"; pname = "augeas";
version = "1.0.2"; version = "1.0.2";
name = pname + "-" + version;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "hercules-team"; owner = "hercules-team";

3
pkgs/development/python-modules/blockdiag/default.nix
View File

@ -3,8 +3,9 @@
}: }:
buildPythonPackage rec { buildPythonPackage rec {
name = "blockdiag-${version}"; pname = "blockdiag";
version = "1.5.3"; version = "1.5.3";
name = pname + "-" + version;
src = fetchurl { src = fetchurl {
url = "https://bitbucket.org/blockdiag/blockdiag/get/${version}.tar.bz2"; url = "https://bitbucket.org/blockdiag/blockdiag/get/${version}.tar.bz2";

3
pkgs/development/python-modules/bottleneck/default.nix
View File

@ -8,8 +8,9 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "Bottleneck"; pname = "Bottleneck";
name = "Bottleneck-${version}";
version = "1.2.1"; version = "1.2.1";
name = pname + "-" + version;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "6efcde5f830aed64feafca0359b51db0e184c72af8ba6675b4a99f263922eb36"; sha256 = "6efcde5f830aed64feafca0359b51db0e184c72af8ba6675b4a99f263922eb36";

3
pkgs/development/python-modules/cgroup-utils/default.nix
View File

@ -2,7 +2,8 @@
buildPythonPackage rec { buildPythonPackage rec {
version = "0.6"; version = "0.6";
name = "cgroup-utils-${version}"; pname = "cgroup-utils";
name = pname + "-" + version;
buildInputs = [ pep8 nose ]; buildInputs = [ pep8 nose ];
# Pep8 tests fail... # Pep8 tests fail...

3
pkgs/development/python-modules/construct/default.nix
View File

@ -1,8 +1,9 @@
{ stdenv, buildPythonPackage, fetchFromGitHub, six, pythonOlder }: { stdenv, buildPythonPackage, fetchFromGitHub, six, pythonOlder }:
buildPythonPackage rec { buildPythonPackage rec {
name = "construct-${version}"; pname = "construct";
version = "2.8.16"; version = "2.8.16";
name = pname + "-" + version;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "construct"; owner = "construct";

3
pkgs/development/python-modules/cymem/default.nix
View File

@ -5,8 +5,9 @@
, python , python
}: }:
buildPythonPackage rec { buildPythonPackage rec {
name = "cymem-${version}"; pname = "cymem";
version = "1.31.2"; version = "1.31.2";
name = pname + "-" + version;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "explosion"; owner = "explosion";

3
pkgs/development/python-modules/django-hijack/default.nix
View File

@ -2,8 +2,9 @@
django, django_compat, django_nose django, django_compat, django_nose
}: }:
buildPythonPackage rec { buildPythonPackage rec {
name = "django-hijack-${version}"; pname = "django-hijack";
version = "2.1.4"; version = "2.1.4";
name = pname + "-" + version;
# the pypi packages don't include everything required for the tests # the pypi packages don't include everything required for the tests
src = fetchFromGitHub { src = fetchFromGitHub {

3
pkgs/development/python-modules/dkimpy/default.nix
View File

@ -2,10 +2,11 @@
, pytest, dns }: , pytest, dns }:
buildPythonApplication rec { buildPythonApplication rec {
name = "${pname}-${majorversion}.${minorversion}"; name = "${pname}-${version}";
pname = "dkimpy"; pname = "dkimpy";
majorversion = "0.6"; majorversion = "0.6";
minorversion = "2"; minorversion = "2";
version = "${majorversion}.${minorversion}";
src = fetchurl { src = fetchurl {
url = "https://launchpad.net/${pname}/${majorversion}/${majorversion}.${minorversion}/+download/${name}.tar.gz"; url = "https://launchpad.net/${pname}/${majorversion}/${majorversion}.${minorversion}/+download/${name}.tar.gz";

7
pkgs/development/python-modules/first/default.nix
View File

@ -1,10 +1,9 @@
{ stdenv, buildPythonPackage, fetchPypi }: { stdenv, buildPythonPackage, fetchPypi }:
let
buildPythonPackage rec {
pname = "first"; pname = "first";
version = "2.0.1"; version = "2.0.1";
in name = pname + "-" + version;
buildPythonPackage {
name = "${pname}-${version}";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;

3
pkgs/development/python-modules/geopandas/default.nix
View File

@ -3,8 +3,9 @@
, pytest }: , pytest }:
buildPythonPackage rec { buildPythonPackage rec {
name = "geopandas-${version}"; pname = "geopandas";
version = "0.3.0"; version = "0.3.0";
name = pname + "-" + version;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "geopandas"; owner = "geopandas";

4
pkgs/development/python-modules/gevent/default.nix
View File

@ -1,7 +1,9 @@
{ stdenv, fetchurl, buildPythonPackage, isPyPy, python, libev, greenlet }: { stdenv, fetchurl, buildPythonPackage, isPyPy, python, libev, greenlet }:
buildPythonPackage rec { buildPythonPackage rec {
name = "gevent-1.2.2"; pname = "gevent";
version = "1.2.2";
name = pname + "-" + version;
src = fetchurl { src = fetchurl {
url = "mirror://pypi/g/gevent/${name}.tar.gz"; url = "mirror://pypi/g/gevent/${name}.tar.gz";

3
pkgs/development/python-modules/gflags/default.nix
View File

@ -2,7 +2,8 @@
buildPythonPackage rec { buildPythonPackage rec {
version = "3.1.2"; version = "3.1.2";
name = "gflags-${version}"; pname = "gflags";
name = pname + "-" + version;
src = fetchPypi { src = fetchPypi {
inherit version; inherit version;

3
pkgs/development/python-modules/hmmlearn/default.nix
View File

@ -1,8 +1,9 @@
{ lib, fetchurl, buildPythonPackage, numpy }: { lib, fetchurl, buildPythonPackage, numpy }:
buildPythonPackage rec { buildPythonPackage rec {
name = "hmmlearn-${version}"; pname = "hmmlearn";
version = "0.2.0"; version = "0.2.0";
name = pname + "-" + version;
src = fetchurl { src = fetchurl {
url = "mirror://pypi/h/hmmlearn/${name}.tar.gz"; url = "mirror://pypi/h/hmmlearn/${name}.tar.gz";

4
pkgs/development/python-modules/hyperlink/default.nix
View File

@ -1,7 +1,9 @@
{ stdenv, buildPythonPackage, fetchurl, pytest }: { stdenv, buildPythonPackage, fetchurl, pytest }:
buildPythonPackage rec { buildPythonPackage rec {
name = "hyperlink-${version}"; pname = "hyperlink";
version = "17.3.0"; version = "17.3.0";
name = pname + "-" + version;
src = fetchurl { src = fetchurl {
url = "mirror://pypi/h/hyperlink/${name}.tar.gz"; url = "mirror://pypi/h/hyperlink/${name}.tar.gz";

3
pkgs/development/python-modules/keystoneclient/default.nix
View File

@ -9,8 +9,9 @@
}: }:
buildPythonPackage rec { buildPythonPackage rec {
name = "keystoneclient-${version}"; pname = "keystoneclient";
version = "1.8.1"; version = "1.8.1";
name = pname + "-" + version;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "openstack"; owner = "openstack";

3
pkgs/development/python-modules/keyutils/default.nix
View File

@ -1,9 +1,8 @@
{ lib, buildPythonPackage, fetchurl, pkgs, pytestrunner }: { lib, buildPythonPackage, fetchurl, pkgs, pytestrunner }:
let buildPythonPackage rec {
pname = "keyutils"; pname = "keyutils";
version = "0.5"; version = "0.5";
in buildPythonPackage rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchurl { src = fetchurl {

3
pkgs/development/python-modules/libgpuarray/default.nix
View File

@ -14,8 +14,9 @@
}: }:
buildPythonPackage rec { buildPythonPackage rec {
name = "libgpuarray-${version}"; pname = "libgpuarray";
version = "0.6.9"; version = "0.6.9";
name = pname + "-" + version;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Theano"; owner = "Theano";

4
pkgs/development/python-modules/llfuse/default.nix
View File

@ -3,7 +3,9 @@
}: }:
buildPythonPackage rec { buildPythonPackage rec {
name = "llfuse-1.0"; pname = "llfuse";
version = "1.0";
name = pname + "-" + version;
src = fetchurl { src = fetchurl {
url = "mirror://pypi/l/llfuse/${name}.tar.bz2"; url = "mirror://pypi/l/llfuse/${name}.tar.bz2";

3
pkgs/development/python-modules/murmurhash/default.nix
View File

@ -6,8 +6,9 @@
}: }:
buildPythonPackage rec { buildPythonPackage rec {
name = "murmurhash-${version}"; pname = "murmurhash";
version = "0.26.4"; version = "0.26.4";
name = pname + "-" + version;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "explosion"; owner = "explosion";

2
pkgs/development/python-modules/nilearn/default.nix
View File

@ -4,7 +4,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "nilearn"; pname = "nilearn";
version = "0.3.1"; version = "0.3.1";
name = "nilearn-${version}"; name = pname + "-" + version;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;

4
pkgs/development/python-modules/nwdiag/default.nix
View File

@ -3,7 +3,9 @@
}: }:
buildPythonPackage rec { buildPythonPackage rec {
name = "nwdiag-1.0.3"; pname = "nwdiag";
version = "1.0.3";
name = pname + "-" + version;
src = fetchurl { src = fetchurl {
url = "mirror://pypi/n/nwdiag/${name}.tar.gz"; url = "mirror://pypi/n/nwdiag/${name}.tar.gz";

2
pkgs/development/python-modules/path.py/default.nix
View File

@ -10,7 +10,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "path.py"; pname = "path.py";
version = "10.4"; version = "10.4";
name = "path.py-${version}"; name = pname + "-" + version;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;

2
pkgs/development/python-modules/pip-tools/default.nix
View File

@ -4,7 +4,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pip-tools"; pname = "pip-tools";
version = "1.10.1"; version = "1.10.1";
name = "pip-tools-${version}"; name = pname + "-" + version;
src = fetchurl { src = fetchurl {
url = "mirror://pypi/p/pip-tools/${name}.tar.gz"; url = "mirror://pypi/p/pip-tools/${name}.tar.gz";

8
pkgs/development/python-modules/powerline/default.nix
View File

@ -12,10 +12,12 @@
# the executables of git, mercurial and bazaar. # the executables of git, mercurial and bazaar.
buildPythonPackage rec { buildPythonPackage rec {
rev = "2.6"; version = "2.6";
name = "powerline-${rev}"; pname = "powerline";
name = pname + "-" + version;
src = fetchurl { src = fetchurl {
url = "https://github.com/powerline/powerline/archive/${rev}.tar.gz"; url = "https://github.com/powerline/powerline/archive/${version}.tar.gz";
name = "${name}.tar.gz"; name = "${name}.tar.gz";
sha256 = "c108f11fe10dc910febb94b87d3abded85d4363fb950366a9e30282b9ba7c272"; sha256 = "c108f11fe10dc910febb94b87d3abded85d4363fb950366a9e30282b9ba7c272";
}; };

2
pkgs/development/python-modules/protobuf/default.nix
View File

@ -5,7 +5,7 @@
with stdenv.lib; with stdenv.lib;
buildPythonPackage rec { buildPythonPackage rec {
inherit (protobuf) name src; inherit (protobuf) name src version;
inherit disabled doCheck; inherit disabled doCheck;
NIX_CFLAGS_COMPILE = NIX_CFLAGS_COMPILE =

2
pkgs/development/python-modules/pwntools/default.nix
View File

@ -7,7 +7,7 @@
buildPythonPackage rec { buildPythonPackage rec {
version = "3.10.0"; version = "3.10.0";
pname = "pwntools"; pname = "pwntools";
name = "pwntools-${version}"; name = pname + "-" + version;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;

3
pkgs/development/python-modules/pyGithub/default.nix
View File

@ -3,8 +3,9 @@
, buildPythonPackage, python-jose }: , buildPythonPackage, python-jose }:
buildPythonPackage rec { buildPythonPackage rec {
name = "PyGithub-${version}"; pname = "PyGithub";
version = "1.32"; version = "1.32";
name = pname + "-" + version;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "PyGithub"; owner = "PyGithub";

3
pkgs/development/python-modules/pychromecast/default.nix
View File

@ -1,8 +1,9 @@
{ lib, fetchurl, buildPythonPackage, requests, six, zeroconf, protobuf }: { lib, fetchurl, buildPythonPackage, requests, six, zeroconf, protobuf }:
buildPythonPackage rec { buildPythonPackage rec {
name = "PyChromecast-${version}"; pname = "PyChromecast";
version = "0.8.1"; version = "0.8.1";
name = pname + "-" + version;
src = fetchurl { src = fetchurl {
url = "mirror://pypi/p/pychromecast/${name}.tar.gz"; url = "mirror://pypi/p/pychromecast/${name}.tar.gz";

3
pkgs/development/python-modules/pycrypto/default.nix
View File

@ -3,10 +3,9 @@
# This is a dummy package providing the drop-in replacement pycryptodome. # This is a dummy package providing the drop-in replacement pycryptodome.
# https://github.com/NixOS/nixpkgs/issues/21671 # https://github.com/NixOS/nixpkgs/issues/21671
let buildPythonPackage rec {
version = pycryptodome.version; version = pycryptodome.version;
pname = "pycrypto"; pname = "pycrypto";
in buildPythonPackage rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
# Cannot build wheel otherwise (zip 1980 issue) # Cannot build wheel otherwise (zip 1980 issue)

3
pkgs/development/python-modules/pycuda/compyte.nix
View File

@ -3,8 +3,9 @@
}: }:
mkDerivation rec { mkDerivation rec {
name = "compyte-${version}"; pname = "compyte";
version = "git-20150817"; version = "git-20150817";
name = pname + "-" + version;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "inducer"; owner = "inducer";

4
pkgs/development/python-modules/pyev/default.nix
View File

@ -1,7 +1,9 @@
{ stdenv, fetchurl, buildPythonPackage, libev }: { stdenv, fetchurl, buildPythonPackage, libev }:
buildPythonPackage rec { buildPythonPackage rec {
name = "pyev-0.9.0"; pname = "pyev";
version = "0.9.0";
name = pname + "-" + version;
src = fetchurl { src = fetchurl {
url = "mirror://pypi/p/pyev/${name}.tar.gz"; url = "mirror://pypi/p/pyev/${name}.tar.gz";

8
pkgs/development/python-modules/pyftgl/default.nix
View File

@ -2,12 +2,14 @@
, boost, freetype, ftgl, mesa }: , boost, freetype, ftgl, mesa }:
buildPythonPackage rec { buildPythonPackage rec {
name = "pyftgl-0.4b"; pname = "pyftgl";
version = "0.4b";
name = pname + "-" + version;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "umlaeute"; owner = "umlaeute";
repo = "pyftgl"; repo = name;
rev = "0.4b"; rev = version;
sha256 = "12zcjv4cwwjihiaf74kslrdmmk4bs47h7006gyqfwdfchfjdgg4r"; sha256 = "12zcjv4cwwjihiaf74kslrdmmk4bs47h7006gyqfwdfchfjdgg4r";
}; };

3
pkgs/development/python-modules/pygame/git.nix
View File

@ -3,8 +3,9 @@
}: }:
buildPythonPackage rec { buildPythonPackage rec {
name = "pygame-${version}"; pname = "pygame";
version = "2016-05-17"; version = "2016-05-17";
name = pname + "-" + version;
src = fetchFromBitbucket { src = fetchFromBitbucket {
owner = "pygame"; owner = "pygame";

4
pkgs/development/python-modules/pygobject/3.nix
View File

@ -3,8 +3,10 @@
buildPythonPackage rec { buildPythonPackage rec {
major = "3.24"; major = "3.24";
minor = "1"; minor = "1";
name = "pygobject-${major}.${minor}"; version = "${major}.${minor}";
format = "other"; format = "other";
pname = "pygobject";
name = pname + "-" + version;
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/pygobject/${major}/${name}.tar.xz"; url = "mirror://gnome/sources/pygobject/${major}/${name}.tar.xz";

3
pkgs/development/python-modules/pygobject/default.nix
View File

@ -1,9 +1,10 @@
{ stdenv, fetchurl, python, buildPythonPackage, pkgconfig, glib }: { stdenv, fetchurl, python, buildPythonPackage, pkgconfig, glib }:
buildPythonPackage rec { buildPythonPackage rec {
name = "pygobject-${version}"; pname = "pygobject";
version = "2.28.6"; version = "2.28.6";
format = "other"; format = "other";
name = pname + "-" + version;
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/pygobject/2.28/${name}.tar.xz"; url = "mirror://gnome/sources/pygobject/2.28/${name}.tar.xz";

4
pkgs/development/python-modules/pygtk/default.nix
View File

@ -2,7 +2,9 @@
, buildPythonPackage, libglade ? null, isPy3k }: , buildPythonPackage, libglade ? null, isPy3k }:
buildPythonPackage rec { buildPythonPackage rec {
name = "pygtk-2.24.0"; pname = "pygtk";
version = "2.24.0";
name = pname + "-" + version;
disabled = isPy3k; disabled = isPy3k;

8
pkgs/development/python-modules/pygtksourceview/default.nix
View File

@ -1,10 +1,10 @@
{ lib, fetchurl, python, buildPythonPackage, pkgconfig, pygobject2, glib, pygtk, gnome2 }: { lib, fetchurl, python, buildPythonPackage, pkgconfig, pygobject2, glib, pygtk, gnome2 }:
let version = "2.10.1"; in buildPythonPackage rec {
pname = "pygtksourceview";
buildPythonPackage {
name = "pygtksourceview-${version}";
format = "other"; format = "other";
version = "2.10.1";
name = pname + "-" + version;
src = fetchurl { src = fetchurl {
url = "http://ftp.gnome.org/pub/gnome/sources/pygtksourceview/2.10/pygtksourceview-${version}.tar.bz2"; url = "http://ftp.gnome.org/pub/gnome/sources/pygtksourceview/2.10/pygtksourceview-${version}.tar.bz2";

3
pkgs/development/python-modules/pyocr/default.nix
View File

@ -3,8 +3,9 @@
}: }:
buildPythonPackage rec { buildPythonPackage rec {
name = "pyocr-${version}"; pname = "pyocr";
version = "0.4.7"; version = "0.4.7";
name = pname + "-" + version;
# Don't fetch from PYPI because it doesn't contain tests. # Don't fetch from PYPI because it doesn't contain tests.
src = fetchFromGitHub { src = fetchFromGitHub {

6
pkgs/development/python-modules/pyqt/4.x.nix
View File

@ -1,10 +1,14 @@
{ stdenv, fetchurl, pythonPackages, qt4, pkgconfig, lndir, dbus_libs, makeWrapper }: { stdenv, fetchurl, pythonPackages, qt4, pkgconfig, lndir, dbus_libs, makeWrapper }:
let let
pname = "PyQt-x11-gpl";
version = "4.12"; version = "4.12";
inherit (pythonPackages) buildPythonPackage python dbus-python sip; inherit (pythonPackages) buildPythonPackage python dbus-python sip;
in buildPythonPackage { in buildPythonPackage {
name = "PyQt-x11-gpl-${version}"; pname = pname;
name = pname + "-" + version;
version = version;
format = "other"; format = "other";
src = fetchurl { src = fetchurl {

6
pkgs/development/python-modules/pyqt/5.x.nix
View File

@ -5,11 +5,15 @@
}: }:
let let
pname = "PyQt";
version = "5.9"; version = "5.9";
inherit (pythonPackages) buildPythonPackage python dbus-python sip; inherit (pythonPackages) buildPythonPackage python dbus-python sip;
in buildPythonPackage { in buildPythonPackage {
name = "PyQt-${version}"; pname = pname;
version = version;
format = "other"; format = "other";
name = pname + "-" + version;
meta = with lib; { meta = with lib; {
description = "Python bindings for Qt5"; description = "Python bindings for Qt5";

5
pkgs/development/python-modules/pyro/default.nix
View File

@ -1,7 +1,10 @@
{ stdenv, fetchurl, buildPythonPackage, isPy3k }: { stdenv, fetchurl, buildPythonPackage, isPy3k }:
buildPythonPackage rec { buildPythonPackage rec {
name = "Pyro-3.16"; pname = "Pyro";
version = "3.16";
name = pname + "-" + version;
disabled = isPy3k; disabled = isPy3k;
src = fetchurl { src = fetchurl {

4
pkgs/development/python-modules/pyslurm/default.nix
View File

@ -1,7 +1,9 @@
{ lib, fetchFromGitHub, buildPythonPackage, cython, slurm }: { lib, fetchFromGitHub, buildPythonPackage, cython, slurm }:
buildPythonPackage rec { buildPythonPackage rec {
name = "pyslurm"; pname = "pyslurm";
version = "unstable-69e4f4f";
name = pname + "-" + version;
src = fetchFromGitHub { src = fetchFromGitHub {
repo = "pyslurm"; repo = "pyslurm";

2
pkgs/development/python-modules/pysoundfile/default.nix
View File

@ -11,8 +11,8 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "PySoundFile"; pname = "PySoundFile";
name = "PySoundFile-${version}";
version = "0.8.1"; version = "0.8.1";
name = pname + "-" + version;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;

3
pkgs/development/python-modules/pytest-expect/default.nix
View File

@ -6,10 +6,9 @@
, six , six
}: }:
let buildPythonPackage rec {
pname = "pytest-expect"; pname = "pytest-expect";
version = "1.1.0"; version = "1.1.0";
in buildPythonPackage rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchurl { src = fetchurl {

4
pkgs/development/python-modules/pytest/2_7.nix
View File

@ -1,6 +1,8 @@
{ stdenv, pkgs, buildPythonPackage, fetchurl, isPy26, argparse, py, selenium }: { stdenv, pkgs, buildPythonPackage, fetchurl, isPy26, argparse, py, selenium }:
buildPythonPackage rec { buildPythonPackage rec {
name = "pytest-2.7.3"; pname = "pytest";
version = "2.7.3";
name = pname + "-" + version;
src = fetchurl { src = fetchurl {
url = "mirror://pypi/p/pytest/${name}.tar.gz"; url = "mirror://pypi/p/pytest/${name}.tar.gz";

4
pkgs/development/python-modules/pytest/2_8.nix
View File

@ -1,6 +1,8 @@
{ stdenv, pkgs, buildPythonPackage, fetchurl, isPy26, argparse, py, selenium }: { stdenv, pkgs, buildPythonPackage, fetchurl, isPy26, argparse, py, selenium }:
buildPythonPackage rec { buildPythonPackage rec {
name = "pytest-2.8.7"; pname = "pytest";
version = "2.8.7";
name = pname + "-" + version;
src = fetchurl { src = fetchurl {
url = "mirror://pypi/p/pytest/${name}.tar.gz"; url = "mirror://pypi/p/pytest/${name}.tar.gz";

4
pkgs/development/python-modules/pytest/2_9.nix
View File

@ -1,6 +1,8 @@
{ stdenv, pkgs, buildPythonPackage, fetchurl, isPy26, argparse, py, selenium }: { stdenv, pkgs, buildPythonPackage, fetchurl, isPy26, argparse, py, selenium }:
buildPythonPackage rec { buildPythonPackage rec {
name = "pytest-2.9.2"; pname = "pytest";
version = "2.9.2";
name = pname + "-" + version;
src = fetchurl { src = fetchurl {
url = "mirror://pypi/p/pytest/${name}.tar.gz"; url = "mirror://pypi/p/pytest/${name}.tar.gz";

3
pkgs/development/python-modules/python-utils/default.nix
View File

@ -1,8 +1,9 @@
{ lib, buildPythonPackage, fetchFromGitHub, pytest, pytestrunner, pytestcov, pytestflakes, pytestpep8, sphinx, six }: { lib, buildPythonPackage, fetchFromGitHub, pytest, pytestrunner, pytestcov, pytestflakes, pytestpep8, sphinx, six }:
buildPythonPackage rec { buildPythonPackage rec {
name = "python-utils-${version}"; pname = "python-utils";
version = "2.2.0"; version = "2.2.0";
name = pname + "-" + version;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "WoLpH"; owner = "WoLpH";

2
pkgs/development/python-modules/python_fedora/default.nix
View File

@ -4,7 +4,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "python-fedora"; pname = "python-fedora";
version = "0.9.0"; version = "0.9.0";
name = "python-fedora-${version}"; name = pname + "-" + version;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;

33
pkgs/development/python-modules/rackspace-novaclient/default.nix
View File

@ -1,7 +1,9 @@
{ buildPythonPackage, fetchurl, isPy3k, requests, novaclient, six, lib }: { buildPythonPackage, fetchurl, isPy3k, requests, novaclient, six, lib }:
let let
os-virtual-interfacesv2-python-novaclient-ext = buildPythonPackage rec { os-virtual-interfacesv2-python-novaclient-ext = buildPythonPackage rec {
name = "os_virtual_interfacesv2_python_novaclient_ext-0.20"; pname = "os_virtual_interfacesv2_python_novaclient_ext";
version = "0.20";
name = pname + "-" + version;
src = fetchurl { src = fetchurl {
url = "mirror://pypi/o/os-virtual-interfacesv2-python-novaclient-ext/${name}.tar.gz"; url = "mirror://pypi/o/os-virtual-interfacesv2-python-novaclient-ext/${name}.tar.gz";
@ -18,7 +20,9 @@ os-virtual-interfacesv2-python-novaclient-ext = buildPythonPackage rec {
}; };
ip-associations-python-novaclient-ext = buildPythonPackage rec { ip-associations-python-novaclient-ext = buildPythonPackage rec {
name = "ip_associations_python_novaclient_ext-0.2"; pname = "ip_associations_python_novaclient_ext";
version = "0.2";
name = pname + "-" + version;
src = fetchurl { src = fetchurl {
url = "mirror://pypi/i/ip_associations_python_novaclient_ext/${name}.tar.gz"; url = "mirror://pypi/i/ip_associations_python_novaclient_ext/${name}.tar.gz";
@ -34,9 +38,10 @@ ip-associations-python-novaclient-ext = buildPythonPackage rec {
}; };
}; };
rackspace-auth-openstack = buildPythonPackage rec { rackspace-auth-openstack = buildPythonPackage rec {
name = "rackspace-auth-openstack-1.3"; pname = "rackspace-auth-openstack";
version = "1.3";
name = pname + "-" + version;
src = fetchurl { src = fetchurl {
url = "mirror://pypi/r/rackspace-auth-openstack/${name}.tar.gz"; url = "mirror://pypi/r/rackspace-auth-openstack/${name}.tar.gz";
@ -52,7 +57,9 @@ rackspace-auth-openstack = buildPythonPackage rec {
}; };
}; };
rax-default-network-flags-python-novaclient-ext = buildPythonPackage rec { rax-default-network-flags-python-novaclient-ext = buildPythonPackage rec {
name = "rax_default_network_flags_python_novaclient_ext-0.4.0"; pname = "rax_default_network_flags_python_novaclient_ext";
version = "0.4.0";
name = pname + "-" + version;
src = fetchurl { src = fetchurl {
url = "mirror://pypi/r/rax_default_network_flags_python_novaclient_ext/${name}.tar.gz"; url = "mirror://pypi/r/rax_default_network_flags_python_novaclient_ext/${name}.tar.gz";
@ -68,7 +75,9 @@ rax-default-network-flags-python-novaclient-ext = buildPythonPackage rec {
}; };
}; };
os-networksv2-python-novaclient-ext = buildPythonPackage rec { os-networksv2-python-novaclient-ext = buildPythonPackage rec {
name = "os_networksv2_python_novaclient_ext-0.26"; pname = "os_networksv2_python_novaclient_ext";
version = "0.26";
name = pname + "-" + version;
src = fetchurl { src = fetchurl {
url = "mirror://pypi/o/os_networksv2_python_novaclient_ext/${name}.tar.gz"; url = "mirror://pypi/o/os_networksv2_python_novaclient_ext/${name}.tar.gz";
@ -85,7 +94,9 @@ os-networksv2-python-novaclient-ext = buildPythonPackage rec {
}; };
rax-scheduled-images-python-novaclient-ext = buildPythonPackage rec { rax-scheduled-images-python-novaclient-ext = buildPythonPackage rec {
name = "rax_scheduled_images_python_novaclient_ext-0.3.1"; pname = "rax_scheduled_images_python_novaclient_ext";
version = "0.3.1";
name = pname + "-" + version;
src = fetchurl { src = fetchurl {
url = "mirror://pypi/r/rax_scheduled_images_python_novaclient_ext/${name}.tar.gz"; url = "mirror://pypi/r/rax_scheduled_images_python_novaclient_ext/${name}.tar.gz";
@ -102,7 +113,9 @@ rax-scheduled-images-python-novaclient-ext = buildPythonPackage rec {
}; };
os-diskconfig-python-novaclient-ext = buildPythonPackage rec { os-diskconfig-python-novaclient-ext = buildPythonPackage rec {
name = "os_diskconfig_python_novaclient_ext-0.1.3"; pname = "os_diskconfig_python_novaclient_ext";
version = "0.1.3";
name = pname + "-" + version;
src = fetchurl { src = fetchurl {
url = "mirror://pypi/o/os_diskconfig_python_novaclient_ext/${name}.tar.gz"; url = "mirror://pypi/o/os_diskconfig_python_novaclient_ext/${name}.tar.gz";
@ -120,7 +133,9 @@ os-diskconfig-python-novaclient-ext = buildPythonPackage rec {
in in
buildPythonPackage rec { buildPythonPackage rec {
name = "rackspace-novaclient-2.1"; pname = "rackspace-novaclient";
version = "2.1";
name = pname + "-" + version;
src = fetchurl { src = fetchurl {
url = "mirror://pypi/r/rackspace-novaclient/${name}.tar.gz"; url = "mirror://pypi/r/rackspace-novaclient/${name}.tar.gz";

4
pkgs/development/python-modules/raven/default.nix
View File

@ -1,7 +1,9 @@
{ lib, buildPythonPackage, fetchurl, isPy3k, contextlib2 }: { lib, buildPythonPackage, fetchurl, isPy3k, contextlib2 }:
buildPythonPackage rec { buildPythonPackage rec {
name = "raven-6.3.0"; pname = "raven";
version = "6.3.0";
name = pname + "-" + version;
src = fetchurl { src = fetchurl {
url = "mirror://pypi/r/raven/${name}.tar.gz"; url = "mirror://pypi/r/raven/${name}.tar.gz";

4
pkgs/development/python-modules/recursive-pth-loader/default.nix
View File

@ -1,7 +1,9 @@
{ stdenv, python }: { stdenv, python }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "python-recursive-pth-loader-1.0"; pname = "python-recursive-pth-loader";
version = "1.0";
name = pname + "-" + version;
unpackPhase = "true"; unpackPhase = "true";

4
pkgs/development/python-modules/robomachine/default.nix
View File

@ -1,7 +1,9 @@
{ stdenv, fetchurl, buildPythonPackage, pyparsing, argparse, robotframework }: { stdenv, fetchurl, buildPythonPackage, pyparsing, argparse, robotframework }:
buildPythonPackage rec { buildPythonPackage rec {
name = "robomachine-0.6"; pname = "robomachine";
version = "0.6";
name = pname + "-" + version;
src = fetchurl { src = fetchurl {
url = "mirror://pypi/R/RoboMachine/RoboMachine-0.6.tar.gz"; url = "mirror://pypi/R/RoboMachine/RoboMachine-0.6.tar.gz";

3
pkgs/development/python-modules/robotframework-ride/default.nix
View File

@ -2,8 +2,9 @@
buildPythonPackage rec { buildPythonPackage rec {
version = "1.2.3"; version = "1.2.3";
name = "robotframework-ride-${version}"; pname = "robotframework-ride";
disabled = isPy3k; disabled = isPy3k;
name = pname + "-" + version;
src = fetchurl { src = fetchurl {
url = "https://robotframework-ride.googlecode.com/files/${name}.tar.gz"; url = "https://robotframework-ride.googlecode.com/files/${name}.tar.gz";

3
pkgs/development/python-modules/robotframework/default.nix
View File

@ -2,8 +2,9 @@
buildPythonPackage rec { buildPythonPackage rec {
version = "3.0.2"; version = "3.0.2";
name = "robotframework-${version}"; pname = "robotframework";
disabled = isPy3k; disabled = isPy3k;
name = pname + "-" + version;
src = fetchurl { src = fetchurl {
url = "mirror://pypi/r/robotframework/${name}.tar.gz"; url = "mirror://pypi/r/robotframework/${name}.tar.gz";

4
pkgs/development/python-modules/scapy/default.nix
View File

@ -1,7 +1,9 @@
{ stdenv, fetchurl, buildPythonPackage, isPy3k, isPyPy }: { stdenv, fetchurl, buildPythonPackage, isPy3k, isPyPy }:
buildPythonPackage rec { buildPythonPackage rec {
name = "scapy-2.2.0"; pname = "scapy";
version = "2.2.0";
name = pname + "-" + version;
disabled = isPy3k || isPyPy; disabled = isPy3k || isPyPy;

5
pkgs/development/python-modules/selenium/default.nix
View File

@ -8,7 +8,10 @@
}: }:
buildPythonPackage rec { buildPythonPackage rec {
name = "selenium-3.6.0"; pname = "selenium";
version = "3.6.0";
name = pname + "-" + version;
src = fetchurl { src = fetchurl {
url = "mirror://pypi/s/selenium/${name}.tar.gz"; url = "mirror://pypi/s/selenium/${name}.tar.gz";
sha256 = "15qpvz0bdwjvpcj11fm0rw6r5inr66sqw89ww50l025sbhf04qwm"; sha256 = "15qpvz0bdwjvpcj11fm0rw6r5inr66sqw89ww50l025sbhf04qwm";

4
pkgs/development/python-modules/seqdiag/default.nix
View File

@ -3,7 +3,9 @@
}: }:
buildPythonPackage rec { buildPythonPackage rec {
name = "seqdiag-0.9.4"; pname = "seqdiag";
version = "0.9.4";
name = pname + "-" + version;
src = fetchurl { src = fetchurl {
url = "mirror://pypi/s/seqdiag/${name}.tar.gz"; url = "mirror://pypi/s/seqdiag/${name}.tar.gz";

3
pkgs/development/python-modules/spacy/default.nix
View File

@ -33,8 +33,9 @@ let
}; };
}; };
in buildPythonPackage rec { in buildPythonPackage rec {
name = "spacy-${version}"; pname = "spacy";
version = "1.8.2"; version = "1.8.2";
name = pname + "-" + version;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "explosion"; owner = "explosion";

3
pkgs/development/python-modules/sphfile/default.nix
View File

@ -1,8 +1,9 @@
{ lib, fetchurl, buildPythonPackage, numpy }: { lib, fetchurl, buildPythonPackage, numpy }:
buildPythonPackage rec { buildPythonPackage rec {
name = "sphfile-${version}"; pname = "sphfile";
version = "1.0.0"; version = "1.0.0";
name = pname + "-" + version;
src = fetchurl { src = fetchurl {
url = "mirror://pypi/s/sphfile/${name}.tar.gz"; url = "mirror://pypi/s/sphfile/${name}.tar.gz";

2
pkgs/development/python-modules/spotipy/default.nix
View File

@ -2,8 +2,8 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "spotipy"; pname = "spotipy";
name = "spotipy-${version}";
version = "2.4.4"; version = "2.4.4";
name = pname + "-" + version;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;

3
pkgs/development/python-modules/sybase/default.nix
View File

@ -6,8 +6,9 @@
}: }:
buildPythonPackage rec { buildPythonPackage rec {
name = "python-sybase-${version}"; pname = "python-sybase";
version = "0.40pre2"; version = "0.40pre2";
name = pname + "-" + version;
disabled = isPy3k; disabled = isPy3k;
src = fetchurl { src = fetchurl {

3
pkgs/development/python-modules/systemd/default.nix
View File

@ -1,8 +1,9 @@
{ stdenv, buildPythonPackage, fetchFromGitHub, systemd, pkgconfig }: { stdenv, buildPythonPackage, fetchFromGitHub, systemd, pkgconfig }:
buildPythonPackage rec { buildPythonPackage rec {
name = "python-systemd-${version}"; pname = "systemd";
version = "234"; version = "234";
name = pname + "-" + version;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "systemd"; owner = "systemd";

2
pkgs/development/python-modules/tensorflow/default.nix
View File

@ -97,6 +97,8 @@ let
}; };
in buildPythonPackage (common // { in buildPythonPackage (common // {
pname = "tensorflow";
version = common.version;
name = "tensorflow-${common.version}"; name = "tensorflow-${common.version}";
deps = stdenv.mkDerivation (common // { deps = stdenv.mkDerivation (common // {

3
pkgs/development/python-modules/thinc/default.nix
View File

@ -37,8 +37,9 @@ let
doCheck = false; # fails to import support from test doCheck = false; # fails to import support from test
}; };
in buildPythonPackage rec { in buildPythonPackage rec {
name = "thinc-${version}"; pname = "thinc";
version = "6.5.1"; version = "6.5.1";
name = pname + "-" + version;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "explosion"; owner = "explosion";

3
pkgs/development/python-modules/u-msgpack-python/default.nix
View File

@ -5,10 +5,9 @@
, python , python
}: }:
let buildPythonPackage rec {
pname = "u-msgpack-python"; pname = "u-msgpack-python";
version = "2.4.1"; version = "2.4.1";
in buildPythonPackage rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchurl { src = fetchurl {

3
pkgs/development/python-modules/umemcache/default.nix
View File

@ -1,9 +1,10 @@
{ stdenv, buildPythonPackage, isPy3k, fetchurl }: { stdenv, buildPythonPackage, isPy3k, fetchurl }:
buildPythonPackage rec { buildPythonPackage rec {
name = "umemcache-${version}"; pname = "umemcache";
version = "1.6.3"; version = "1.6.3";
disabled = isPy3k; disabled = isPy3k;
name = pname + "-" + version;
src = fetchurl { src = fetchurl {
url = "mirror://pypi/u/umemcache/${name}.zip"; url = "mirror://pypi/u/umemcache/${name}.zip";

2
pkgs/development/python-modules/uritools/default.nix
View File

@ -2,8 +2,8 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "uritools"; pname = "uritools";
name = "uritools-${version}";
version = "2.1.0"; version = "2.1.0";
name = pname + "-" + version;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;

3
pkgs/development/python-modules/usbtmc/default.nix
View File

@ -1,8 +1,9 @@
{ stdenv, fetchurl, buildPythonPackage, pyusb }: { stdenv, fetchurl, buildPythonPackage, pyusb }:
buildPythonPackage rec { buildPythonPackage rec {
name = "usbtmc-${version}"; pname = "usbtmc";
version = "0.8"; version = "0.8";
name = pname + "-" + version;
src = fetchurl { src = fetchurl {
url = "https://github.com/python-ivi/python-usbtmc/archive/v${version}.tar.gz"; url = "https://github.com/python-ivi/python-usbtmc/archive/v${version}.tar.gz";

8
pkgs/development/python-modules/waitress-django/default.nix
View File

@ -1,6 +1,10 @@
{ buildPythonPackage, django_1_8, waitress }: { buildPythonPackage, django_1_8, waitress }:
buildPythonPackage {
name = "waitress-django"; buildPythonPackage rec {
pname = "waitress-django";
version = "0.0.0";
name = pname;
src = ./.; src = ./.;
pythonPath = [ django_1_8 waitress ]; pythonPath = [ django_1_8 waitress ];
doCheck = false; doCheck = false;

3
pkgs/development/python-modules/webencodings/default.nix
View File

@ -4,10 +4,9 @@
, pytest , pytest
}: }:
let buildPythonPackage rec {
pname = "webencodings"; pname = "webencodings";
version = "0.5.1"; version = "0.5.1";
in buildPythonPackage rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchurl { src = fetchurl {

3
pkgs/development/python-modules/wxPython/3.0.nix
View File

@ -19,8 +19,9 @@
assert wxGTK.unicode; assert wxGTK.unicode;
buildPythonPackage rec { buildPythonPackage rec {
name = "wxPython-${version}"; pname = "wxPython";
version = "3.0.2.0"; version = "3.0.2.0";
name = pname + "-" + version;
disabled = isPy3k || isPyPy; disabled = isPy3k || isPyPy;
doCheck = false; doCheck = false;