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

Python: replace mkPythonDerivation with buildPythonPackage and format="other";

Browse Source 
This way all Python packages use the same function,
`buildPythonPackage`.
This commit is contained in:
Frederik Rietdijk 2017-03-21 13:01:17 +01:00
parent 1b0d9e9ae6
commit 3760c8c7fd
18 changed files with 55 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/applications/version-management/mercurial/default.nix
View File

@ -7,8 +7,9 @@ let
version = "3.9.2"; version = "3.9.2";
name = "mercurial-${version}"; name = "mercurial-${version}";
inherit (python2Packages) docutils hg-git dulwich python; inherit (python2Packages) docutils hg-git dulwich python;
in python2Packages.mkPythonDerivation { in python2Packages.buildPythonApplication {
inherit name; inherit name;
format = "other";
src = fetchurl { src = fetchurl {
url = "https://mercurial-scm.org/release/${name}.tar.gz"; url = "https://mercurial-scm.org/release/${name}.tar.gz";

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

@ -1,8 +1,9 @@
{ lib, fetchurl, mkPythonDerivation, python, pkgconfig, dbus, dbus_glib, dbus_tools, isPyPy { lib, fetchurl, buildPythonPackage, python, pkgconfig, dbus, dbus_glib, dbus_tools, isPyPy
, ncurses, pygobject3 }: , ncurses, pygobject3 }:
if isPyPy then throw "dbus-python not supported for interpreter ${python.executable}" else mkPythonDerivation rec { if isPyPy then throw "dbus-python not supported for interpreter ${python.executable}" else buildPythonPackage rec {
name = "dbus-python-1.2.4"; name = "dbus-python-1.2.4";
format = "other";
src = fetchurl { src = fetchurl {
url = "http://dbus.freedesktop.org/releases/dbus-python/${name}.tar.gz"; url = "http://dbus.freedesktop.org/releases/dbus-python/${name}.tar.gz";

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

@ -1,7 +1,8 @@
{ stdenv, fetchurl, mkPythonDerivation, pycurl }: { stdenv, fetchurl, buildPythonPackage, pycurl }:
mkPythonDerivation rec { buildPythonPackage rec {
name = "koji-1.8"; name = "koji-1.8";
format = "other";
src = fetchurl { src = fetchurl {
url = "https://fedorahosted.org/released/koji/koji-1.8.0.tar.bz2"; url = "https://fedorahosted.org/released/koji/koji-1.8.0.tar.bz2";

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

@ -1,8 +1,9 @@
{ stdenv, fetchurl, mkPythonDerivation, libsexy, pkgconfig, libxml2, pygtk, pango, gtk2, glib }: { stdenv, fetchurl, buildPythonPackage, libsexy, pkgconfig, libxml2, pygtk, pango, gtk2, glib }:
mkPythonDerivation rec { buildPythonPackage rec {
name = "libsexy-${version}"; name = "libsexy-${version}";
version = "0.1.9"; version = "0.1.9";
format = "other";
src = fetchurl { src = fetchurl {
url = "http://releases.chipx86.com/libsexy/sexy-python/sexy-python-${version}.tar.gz"; url = "http://releases.chipx86.com/libsexy/sexy-python/sexy-python-${version}.tar.gz";

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

@ -1,8 +1,9 @@
{ lib, fetchurl, fetchpatch, python, mkPythonDerivation, pkgconfig, cairo, xlibsWrapper, isPyPy, isPy35, isPy3k }: { lib, fetchurl, fetchpatch, python, buildPythonPackage, pkgconfig, cairo, xlibsWrapper, isPyPy, isPy35, isPy3k }:
if (isPyPy) then throw "pycairo not supported for interpreter ${python.executable}" else mkPythonDerivation rec { if (isPyPy) then throw "pycairo not supported for interpreter ${python.executable}" else buildPythonPackage rec {
version = "1.10.0"; version = "1.10.0";
name = "pycairo-${version}"; name = "pycairo-${version}";
format = "other";
src = if isPy3k src = if isPy3k
then fetchurl { then fetchurl {
url = "http://cairographics.org/releases/pycairo-${version}.tar.bz2"; url = "http://cairographics.org/releases/pycairo-${version}.tar.bz2";

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

@ -1,9 +1,10 @@
{ stdenv, fetchurl, mkPythonDerivation, python, pkgconfig, glib, gobjectIntrospection, pycairo, cairo, which, ncurses}: { stdenv, fetchurl, buildPythonPackage, python, pkgconfig, glib, gobjectIntrospection, pycairo, cairo, which, ncurses}:
mkPythonDerivation rec { buildPythonPackage rec {
major = "3.22"; major = "3.22";
minor = "0"; minor = "0";
name = "pygobject-${major}.${minor}"; name = "pygobject-${major}.${minor}";
format = "other";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/pygobject/${major}/${name}.tar.xz"; url = "mirror://gnome/sources/pygobject/${major}/${name}.tar.xz";

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

@ -1,6 +1,6 @@
{ stdenv, fetchurl, python, mkPythonDerivation, pkgconfig, glib }: { stdenv, fetchurl, python, buildPythonPackage, pkgconfig, glib }:
mkPythonDerivation rec { buildPythonPackage rec {
name = "pygobject-${version}"; name = "pygobject-${version}";
version = "2.28.6"; version = "2.28.6";

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

@ -1,9 +1,10 @@
{ lib, fetchurl, python, mkPythonDerivation, pkgconfig, pygobject2, glib, pygtk, gnome2 }: { lib, fetchurl, python, buildPythonPackage, pkgconfig, pygobject2, glib, pygtk, gnome2 }:
let version = "2.10.1"; in let version = "2.10.1"; in
mkPythonDerivation { buildPythonPackage {
name = "pygtksourceview-${version}"; name = "pygtksourceview-${version}";
format = "other";
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";

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

@ -2,9 +2,10 @@
let let
version = "4.12"; version = "4.12";
inherit (pythonPackages) mkPythonDerivation python dbus-python sip; inherit (pythonPackages) buildPythonPackage python dbus-python sip;
in mkPythonDerivation { in buildPythonPackage {
name = "PyQt-x11-gpl-${version}"; name = "PyQt-x11-gpl-${version}";
format = "other";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/pyqt/PyQt4_gpl_x11-${version}.tar.gz"; url = "mirror://sourceforge/pyqt/PyQt4_gpl_x11-${version}.tar.gz";

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

@ -3,9 +3,10 @@
let let
version = "5.8.1"; version = "5.8.1";
inherit (pythonPackages) mkPythonDerivation python dbus-python sip; inherit (pythonPackages) buildPythonPackage python dbus-python sip;
in mkPythonDerivation { in buildPythonPackage {
name = "PyQt-${version}"; name = "PyQt-${version}";
format = "other";
meta = with lib; { meta = with lib; {
description = "Python bindings for Qt5"; description = "Python bindings for Qt5";

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

@ -1,8 +1,9 @@
{ lib, fetchurl, cmake, python, mkPythonDerivation, pysideGeneratorrunner, pysideShiboken, qt4 }: { lib, fetchurl, cmake, python, buildPythonPackage, pysideGeneratorrunner, pysideShiboken, qt4 }:
mkPythonDerivation rec { buildPythonPackage rec {
name = "pyside-${version}"; name = "pyside-${version}";
version = "1.2.4"; version = "1.2.4";
format = "other";
src = fetchurl { src = fetchurl {
url = "https://github.com/PySide/PySide/archive/${version}.tar.gz"; url = "https://github.com/PySide/PySide/archive/${version}.tar.gz";

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

@ -1,7 +1,8 @@
{lib, fetchurl, python, mkPythonDerivation, makeWrapper}: {lib, fetchurl, python, buildPythonPackage, makeWrapper}:
mkPythonDerivation rec { buildPythonPackage rec {
name = "PyXML-0.8.4"; name = "PyXML-0.8.4";
format = "other";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/pyxml/${name}.tar.gz"; url = "mirror://sourceforge/pyxml/${name}.tar.gz";
sha256 = "04wc8i7cdkibhrldy6j65qp5l75zjxf5lx6qxdxfdf2gb3wndawz"; sha256 = "04wc8i7cdkibhrldy6j65qp5l75zjxf5lx6qxdxfdf2gb3wndawz";

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

@ -1,7 +1,8 @@
{ lib, fetchurl, mkPythonDerivation, python, isPyPy }: { lib, fetchurl, buildPythonPackage, python, isPyPy }:
if isPyPy then throw "sip not supported for interpreter ${python.executable}" else mkPythonDerivation rec { if isPyPy then throw "sip not supported for interpreter ${python.executable}" else buildPythonPackage rec {
name = "sip-4.19.1"; name = "sip-4.19.1";
format = "other";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/pyqt/sip/${name}/${name}.tar.gz"; url = "mirror://sourceforge/pyqt/sip/${name}/${name}.tar.gz";

3
pkgs/development/tools/documentation/gnome-doc-utils/default.nix
View File

@ -1,8 +1,9 @@
{stdenv, fetchurl, pkgconfig, libxml2Python, libxslt, intltool {stdenv, fetchurl, pkgconfig, libxml2Python, libxslt, intltool
, makeWrapper, python2Packages }: , makeWrapper, python2Packages }:
python2Packages.mkPythonDerivation { python2Packages.buildPythonApplication {
name = "gnome-doc-utils-0.20.10"; name = "gnome-doc-utils-0.20.10";
format = "other";
src = fetchurl { src = fetchurl {
url = mirror://gnome/sources/gnome-doc-utils/0.20/gnome-doc-utils-0.20.10.tar.xz; url = mirror://gnome/sources/gnome-doc-utils/0.20/gnome-doc-utils-0.20.10.tar.xz;

4
pkgs/development/tools/misc/d-feet/default.nix
View File

@ -4,9 +4,9 @@
let let
version = "${major}.11"; version = "${major}.11";
major = "0.3"; major = "0.3";
in pythonPackages.mkPythonDerivation rec { in pythonPackages.buildPythonApplication rec {
name = "d-feet-${version}"; name = "d-feet-${version}";
namePrefix = ""; format = "other";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/d-feet/${major}/d-feet-${version}.tar.xz"; url = "mirror://gnome/sources/d-feet/${major}/d-feet-${version}.tar.xz";

3
pkgs/misc/drivers/hplip/default.nix
View File

@ -47,8 +47,9 @@ in
assert withPlugin -> builtins.elem hplipArch pluginArches assert withPlugin -> builtins.elem hplipArch pluginArches
|| throw "HPLIP plugin not supported on ${stdenv.system}"; || throw "HPLIP plugin not supported on ${stdenv.system}";
pythonPackages.mkPythonDerivation { pythonPackages.buildPythonApplication {
inherit name src; inherit name src;
format = "other";
buildInputs = [ buildInputs = [
libjpeg libjpeg

3
pkgs/os-specific/linux/dstat/default.nix
View File

@ -1,7 +1,8 @@
{ stdenv, fetchurl, python2Packages }: { stdenv, fetchurl, python2Packages }:
python2Packages.mkPythonDerivation rec { python2Packages.buildPythonApplication rec {
name = "dstat-${version}"; name = "dstat-${version}";
format = "other";
version = "0.7.3"; version = "0.7.3";
src = fetchurl { src = fetchurl {

15
pkgs/top-level/python-packages.nix
View File

@ -7035,9 +7035,10 @@ in {
buildInputs = with self; [ fudge_9 nose ]; buildInputs = with self; [ fudge_9 nose ];
}; };
fedora_cert = mkPythonDerivation rec { fedora_cert = buildPythonPackage rec {
name = "fedora-cert-0.5.9.2"; name = "fedora-cert-0.5.9.2";
meta.maintainers = with maintainers; [ mornfall ]; meta.maintainers = with maintainers; [ mornfall ];
format = "other";
src = pkgs.fetchurl { src = pkgs.fetchurl {
url = "https://fedorahosted.org/releases/f/e/fedora-packager/fedora-packager-0.5.9.2.tar.bz2"; url = "https://fedorahosted.org/releases/f/e/fedora-packager/fedora-packager-0.5.9.2.tar.bz2";
@ -21809,8 +21810,9 @@ in {
}; };
pysvn = mkPythonDerivation rec { pysvn = buildPythonPackage rec {
name = "pysvn-1.8.0"; name = "pysvn-1.8.0";
format = "other";
src = pkgs.fetchurl { src = pkgs.fetchurl {
url = "http://pysvn.barrys-emacs.org/source_kits/${name}.tar.gz"; url = "http://pysvn.barrys-emacs.org/source_kits/${name}.tar.gz";
@ -21965,9 +21967,10 @@ in {
}); });
pywebkitgtk = mkPythonDerivation rec { pywebkitgtk = buildPythonPackage rec {
name = "pywebkitgtk-${version}"; name = "pywebkitgtk-${version}";
version = "1.1.8"; version = "1.1.8";
format = "other";
src = pkgs.fetchurl { src = pkgs.fetchurl {
url = "http://pywebkitgtk.googlecode.com/files/${name}.tar.bz2"; url = "http://pywebkitgtk.googlecode.com/files/${name}.tar.bz2";
@ -22300,10 +22303,11 @@ in {
qscintilla = if isPy3k || isPyPy qscintilla = if isPy3k || isPyPy
then throw "qscintilla-${pkgs.qscintilla.version} not supported for interpreter ${python.executable}" then throw "qscintilla-${pkgs.qscintilla.version} not supported for interpreter ${python.executable}"
else mkPythonDerivation rec { else buildPythonPackage rec {
# TODO: Qt5 support # TODO: Qt5 support
name = "qscintilla-${version}"; name = "qscintilla-${version}";
version = pkgs.qscintilla.version; version = pkgs.qscintilla.version;
format = "other";
src = pkgs.qscintilla.src; src = pkgs.qscintilla.src;
@ -25833,9 +25837,10 @@ in {
# Python package. # Python package.
tkinter = let tkinter = let
py = python.override{x11Support=true;}; py = python.override{x11Support=true;};
in mkPythonDerivation rec { in buildPythonPackage rec {
name = "tkinter-${python.version}"; name = "tkinter-${python.version}";
src = py; src = py;
format = "other";
disabled = isPy26 || isPyPy; disabled = isPy26 || isPyPy;