diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2017-03-24 21:07:55 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2017-03-24 21:07:55 +0100 |
commit | 455ce3528c9caddf4aea774388707da13bf52ef3 (patch) | |
tree | defbc9f4831074917cd93eb5ebe9ce225276c045 /pkgs/top-level/python-packages.nix | |
parent | 9a777013d1d34acc4ea217a7f09bfab96c6be50f (diff) | |
parent | c1a9dc3d3753ee02eff4ffdcf6a0238554afd243 (diff) | |
download | nixlib-455ce3528c9caddf4aea774388707da13bf52ef3.tar nixlib-455ce3528c9caddf4aea774388707da13bf52ef3.tar.gz nixlib-455ce3528c9caddf4aea774388707da13bf52ef3.tar.bz2 nixlib-455ce3528c9caddf4aea774388707da13bf52ef3.tar.lz nixlib-455ce3528c9caddf4aea774388707da13bf52ef3.tar.xz nixlib-455ce3528c9caddf4aea774388707da13bf52ef3.tar.zst nixlib-455ce3528c9caddf4aea774388707da13bf52ef3.zip |
Merge branch 'staging'
Diffstat (limited to 'pkgs/top-level/python-packages.nix')
-rw-r--r-- | pkgs/top-level/python-packages.nix | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 39c361a16bbd..505098ded65e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7035,9 +7035,10 @@ in { buildInputs = with self; [ fudge_9 nose ]; }; - fedora_cert = mkPythonDerivation rec { + fedora_cert = buildPythonPackage rec { name = "fedora-cert-0.5.9.2"; meta.maintainers = with maintainers; [ mornfall ]; + format = "other"; src = pkgs.fetchurl { url = "https://fedorahosted.org/releases/f/e/fedora-packager/fedora-packager-0.5.9.2.tar.bz2"; @@ -21810,8 +21811,9 @@ in { }; - pysvn = mkPythonDerivation rec { + pysvn = buildPythonPackage rec { name = "pysvn-1.8.0"; + format = "other"; src = pkgs.fetchurl { url = "http://pysvn.barrys-emacs.org/source_kits/${name}.tar.gz"; @@ -21966,9 +21968,10 @@ in { }); - pywebkitgtk = mkPythonDerivation rec { + pywebkitgtk = buildPythonPackage rec { name = "pywebkitgtk-${version}"; version = "1.1.8"; + format = "other"; src = pkgs.fetchurl { url = "http://pywebkitgtk.googlecode.com/files/${name}.tar.bz2"; @@ -22301,10 +22304,11 @@ in { qscintilla = if isPy3k || isPyPy then throw "qscintilla-${pkgs.qscintilla.version} not supported for interpreter ${python.executable}" - else mkPythonDerivation rec { + else buildPythonPackage rec { # TODO: Qt5 support name = "qscintilla-${version}"; version = pkgs.qscintilla.version; + format = "other"; src = pkgs.qscintilla.src; @@ -25853,9 +25857,10 @@ in { # Python package. tkinter = let py = python.override{x11Support=true;}; - in mkPythonDerivation rec { + in buildPythonPackage rec { name = "tkinter-${python.version}"; src = py; + format = "other"; disabled = isPy26 || isPyPy; |