diff options
author | Robert Schütz <rschuetz17@gmail.com> | 2018-08-08 11:18:21 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-08 11:18:21 +0200 |
commit | 6342ab656cc26526961622d3dd88100138b93fbb (patch) | |
tree | 96a841c3d1c759f38d969c29778258446e1046eb | |
parent | 90e72bb7697e19e215ecb845e43c03705ea1a20c (diff) | |
parent | f0aa5654eeb405f4a0a5a06b0a259be153d62b55 (diff) | |
download | nixlib-6342ab656cc26526961622d3dd88100138b93fbb.tar nixlib-6342ab656cc26526961622d3dd88100138b93fbb.tar.gz nixlib-6342ab656cc26526961622d3dd88100138b93fbb.tar.bz2 nixlib-6342ab656cc26526961622d3dd88100138b93fbb.tar.lz nixlib-6342ab656cc26526961622d3dd88100138b93fbb.tar.xz nixlib-6342ab656cc26526961622d3dd88100138b93fbb.tar.zst nixlib-6342ab656cc26526961622d3dd88100138b93fbb.zip |
Merge pull request #44446 from rnhmjoj/python2->python3
Make python{2,3} version explicit
-rw-r--r-- | pkgs/applications/misc/ranger/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/python-modules/robotframework/default.nix | 10 | ||||
-rw-r--r-- | pkgs/development/python-modules/robotsuite/default.nix | 9 | ||||
-rw-r--r-- | pkgs/development/python-modules/selenium/default.nix | 11 | ||||
-rw-r--r-- | pkgs/os-specific/linux/btfs/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/mail/mailman/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/matrix-synapse/default.nix | 16 | ||||
-rw-r--r-- | pkgs/servers/varnish/default.nix | 6 | ||||
-rw-r--r-- | pkgs/servers/web-apps/searx/default.nix | 9 | ||||
-rw-r--r-- | pkgs/tools/misc/asciinema/default.nix | 10 | ||||
-rw-r--r-- | pkgs/tools/networking/offlineimap/default.nix | 9 | ||||
-rw-r--r-- | pkgs/tools/networking/speedtest-cli/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/package-management/nox/default.nix | 8 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 8 |
14 files changed, 58 insertions, 56 deletions
diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix index b13bc4cb7af2..e3a3a5e80d68 100644 --- a/pkgs/applications/misc/ranger/default.nix +++ b/pkgs/applications/misc/ranger/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchFromGitHub, pythonPackages, file, less +{ stdenv, fetchFromGitHub, python3Packages, file, less , imagePreviewSupport ? true, w3m ? null}: with stdenv.lib; assert imagePreviewSupport -> w3m != null; -pythonPackages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { name = "ranger-${version}"; version = "1.9.1"; @@ -16,7 +16,7 @@ pythonPackages.buildPythonApplication rec { sha256= "1zhds37j1scxa9b183qbrjwxqldrdk581c5xiy81vg17sndb1kqj"; }; - checkInputs = with pythonPackages; [ pytest ]; + checkInputs = with python3Packages; [ pytest ]; propagatedBuildInputs = [ file ]; checkPhase = '' diff --git a/pkgs/development/python-modules/robotframework/default.nix b/pkgs/development/python-modules/robotframework/default.nix index f07d0208167c..6d19feed3fb7 100644 --- a/pkgs/development/python-modules/robotframework/default.nix +++ b/pkgs/development/python-modules/robotframework/default.nix @@ -1,13 +1,11 @@ -{ stdenv, fetchurl, buildPythonPackage, isPy3k }: +{ stdenv, fetchPypi, buildPythonPackage }: buildPythonPackage rec { - version = "3.0.4"; pname = "robotframework"; - disabled = isPy3k; - name = pname + "-" + version; + version = "3.0.4"; - src = fetchurl { - url = "mirror://pypi/r/robotframework/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "ab94257cbd848dfca7148e092d233a12853cc7e840ce8231af9cbb5e7f51aa47"; }; diff --git a/pkgs/development/python-modules/robotsuite/default.nix b/pkgs/development/python-modules/robotsuite/default.nix index 9fcced49b925..59ef766adf11 100644 --- a/pkgs/development/python-modules/robotsuite/default.nix +++ b/pkgs/development/python-modules/robotsuite/default.nix @@ -1,4 +1,6 @@ -{ stdenv, buildPythonPackage, fetchPypi, unittest2, robotframework, lxml }: +{ stdenv, buildPythonPackage, fetchPypi +, unittest2, lxml, robotframework +}: buildPythonPackage rec { pname = "robotsuite"; @@ -12,6 +14,11 @@ buildPythonPackage rec { buildInputs = [ unittest2 ]; propagatedBuildInputs = [ robotframework lxml ]; + postPatch = '' + substituteInPlace setup.py \ + --replace robotframework-python3 robotframework + ''; + meta = with stdenv.lib; { description = "Python unittest test suite for Robot Framework"; homepage = https://github.com/collective/robotsuite/; diff --git a/pkgs/development/python-modules/selenium/default.nix b/pkgs/development/python-modules/selenium/default.nix index 1661dd2cf3aa..cd4a6389a351 100644 --- a/pkgs/development/python-modules/selenium/default.nix +++ b/pkgs/development/python-modules/selenium/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, fetchurl +, fetchPypi , fetchFromGitHub , buildPythonPackage , geckodriver @@ -22,12 +22,11 @@ in buildPythonPackage rec { pname = "selenium"; - version = "3.6.0"; - name = pname + "-" + version; + version = "3.8.1"; - src = fetchurl { - url = "mirror://pypi/s/selenium/${name}.tar.gz"; - sha256 = "15qpvz0bdwjvpcj11fm0rw6r5inr66sqw89ww50l025sbhf04qwm"; + src = fetchPypi { + inherit pname version; + sha256 = "1lqm2md84g11g7lqi94xqb5lydm93vgmlznfhf27g6sy9ayjvgcs"; }; buildInputs = [xorg.libX11]; diff --git a/pkgs/os-specific/linux/btfs/default.nix b/pkgs/os-specific/linux/btfs/default.nix index 83c442618b8e..9c2692b037ef 100644 --- a/pkgs/os-specific/linux/btfs/default.nix +++ b/pkgs/os-specific/linux/btfs/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, - python, boost, fuse, libtorrentRasterbar, curl }: + python3, boost, fuse, libtorrentRasterbar, curl }: stdenv.mkDerivation rec { name = "btfs-${version}"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { preInstall = '' substituteInPlace scripts/btplay \ - --replace "/usr/bin/env python" "${python}/bin/python" + --replace "/usr/bin/env python" "${python3.interpreter}" ''; meta = with stdenv.lib; { diff --git a/pkgs/servers/mail/mailman/default.nix b/pkgs/servers/mail/mailman/default.nix index 8ff20869b94e..93990360c1a5 100644 --- a/pkgs/servers/mail/mailman/default.nix +++ b/pkgs/servers/mail/mailman/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, pythonPackages }: +{ stdenv, fetchurl, python2 }: stdenv.mkDerivation rec { name = "mailman-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1r6sjapjmbav45xibjzc2a8y1xf4ikz09470ma1kw7iz174wn8z7"; }; - buildInputs = [ python pythonPackages.dnspython ]; + buildInputs = [ python2 python2.pkgs.dnspython ]; patches = [ ./fix-var-prefix.patch ]; diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 62fd3397cb63..d0c496d38577 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -1,6 +1,6 @@ -{ stdenv, pythonPackages, fetchurl, fetchFromGitHub }: +{ stdenv, python2Packages, fetchurl, fetchFromGitHub }: let - matrix-angular-sdk = pythonPackages.buildPythonPackage rec { + matrix-angular-sdk = python2Packages.buildPythonPackage rec { name = "matrix-angular-sdk-${version}"; version = "0.6.8"; @@ -9,7 +9,7 @@ let sha256 = "0gmx4y5kqqphnq3m7xk2vpzb0w2a4palicw7wfdr1q2schl9fhz2"; }; }; - matrix-synapse-ldap3 = pythonPackages.buildPythonPackage rec { + matrix-synapse-ldap3 = python2Packages.buildPythonPackage rec { pname = "matrix-synapse-ldap3"; version = "0.1.3"; @@ -20,11 +20,11 @@ let sha256 = "0ss7ld3bpmqm8wcs64q1kb7vxlpmwk9lsgq0mh21a9izyfc7jb2l"; }; - propagatedBuildInputs = with pythonPackages; [ service-identity ldap3 twisted ]; + propagatedBuildInputs = with python2Packages; [ service-identity ldap3 twisted ]; - checkInputs = with pythonPackages; [ ldaptor mock ]; + checkInputs = with python2Packages; [ ldaptor mock ]; }; -in pythonPackages.buildPythonApplication rec { +in python2Packages.buildPythonApplication rec { name = "matrix-synapse-${version}"; version = "0.33.0"; @@ -39,7 +39,7 @@ in pythonPackages.buildPythonApplication rec { ./matrix-synapse.patch ]; - propagatedBuildInputs = with pythonPackages; [ + propagatedBuildInputs = with python2Packages; [ blist canonicaljson daemonize dateutil frozendict pillow pyasn1 pydenticon pymacaroons-pynacl pynacl pyopenssl pysaml2 pytz requests signedjson systemd twisted ujson unpaddedbase64 pyyaml prometheus_client @@ -51,7 +51,7 @@ in pythonPackages.buildPythonApplication rec { # Checks fail because of Tox. doCheck = false; - buildInputs = with pythonPackages; [ + buildInputs = with python2Packages; [ mock setuptoolsTrial ]; diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index 68660ce6b36c..ff1acad90944 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pcre, libxslt, groff, ncurses, pkgconfig, readline, libedit -, python, pythonPackages, makeWrapper }: +, python2, makeWrapper }: let common = { version, sha256 }: @@ -13,8 +13,8 @@ let nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pcre libxslt groff ncurses readline python libedit - pythonPackages.docutils makeWrapper + pcre libxslt groff ncurses readline python2 libedit + python2.pkgs.docutils makeWrapper ]; buildFlags = "localstatedir=/var/spool"; diff --git a/pkgs/servers/web-apps/searx/default.nix b/pkgs/servers/web-apps/searx/default.nix index 3835f5ae3324..cde8f9fecbc8 100644 --- a/pkgs/servers/web-apps/searx/default.nix +++ b/pkgs/servers/web-apps/searx/default.nix @@ -1,6 +1,6 @@ -{ lib, pythonPackages, fetchFromGitHub }: +{ lib, python3Packages, fetchFromGitHub }: -with pythonPackages; +with python3Packages; buildPythonApplication rec { pname = "searx"; @@ -32,10 +32,13 @@ buildPythonApplication rec { pyasn1 pyasn1-modules ndg-httpsclient certifi pysocks ]; - checkInputs = [ splinter mock plone-testing robotsuite unittest2 ]; + checkInputs = [ + splinter mock plone-testing robotsuite unittest2 selenium + ]; preCheck = '' rm tests/test_robot.py # A variable that is imported is commented out + rm tests/unit/engines/pubmed.py ''; meta = with lib; { diff --git a/pkgs/tools/misc/asciinema/default.nix b/pkgs/tools/misc/asciinema/default.nix index c1cca25c576e..daaffbf080fd 100644 --- a/pkgs/tools/misc/asciinema/default.nix +++ b/pkgs/tools/misc/asciinema/default.nix @@ -1,13 +1,11 @@ { lib, python3Packages, fetchFromGitHub, glibcLocales }: -let - pythonPackages = python3Packages; -in pythonPackages.buildPythonApplication rec { - name = "asciinema-${version}"; +python3Packages.buildPythonApplication rec { + pname = "asciinema"; version = "2.0.1"; - buildInputs = with pythonPackages; [ nose ]; - propagatedBuildInputs = with pythonPackages; [ requests ]; + buildInputs = with python3Packages; [ nose ]; + propagatedBuildInputs = with python3Packages; [ requests ]; src = fetchFromGitHub { owner = "asciinema"; diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix index 647b7ed26da9..13c195d64e88 100644 --- a/pkgs/tools/networking/offlineimap/default.nix +++ b/pkgs/tools/networking/offlineimap/default.nix @@ -1,10 +1,9 @@ -{ stdenv, fetchFromGitHub, pythonPackages, +{ stdenv, fetchFromGitHub, python2Packages, asciidoc, libxml2, libxslt, docbook_xsl }: -pythonPackages.buildPythonApplication rec { +python2Packages.buildPythonApplication rec { version = "7.2.1"; - name = "offlineimap-${version}"; - namePrefix = ""; + pname = "offlineimap"; src = fetchFromGitHub { owner = "OfflineIMAP"; @@ -21,7 +20,7 @@ pythonPackages.buildPythonApplication rec { doCheck = false; nativeBuildInputs = [ asciidoc libxml2 libxslt docbook_xsl ]; - propagatedBuildInputs = [ pythonPackages.six pythonPackages.kerberos ]; + propagatedBuildInputs = with python2Packages; [ six kerberos ]; postInstall = '' make -C docs man diff --git a/pkgs/tools/networking/speedtest-cli/default.nix b/pkgs/tools/networking/speedtest-cli/default.nix index 623081fbb4ef..eedea841356d 100644 --- a/pkgs/tools/networking/speedtest-cli/default.nix +++ b/pkgs/tools/networking/speedtest-cli/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, pythonPackages }: +{ stdenv, fetchFromGitHub, python3Packages }: -pythonPackages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { name = "speedtest-cli-${version}"; version = "2.0.2"; diff --git a/pkgs/tools/package-management/nox/default.nix b/pkgs/tools/package-management/nox/default.nix index f6c5c7b53e13..c22a8a5e85ec 100644 --- a/pkgs/tools/package-management/nox/default.nix +++ b/pkgs/tools/package-management/nox/default.nix @@ -1,6 +1,6 @@ -{ lib, pythonPackages, fetchurl, git }: +{ lib, python3Packages, fetchurl, git }: -pythonPackages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { name = "nox-${version}"; version = "0.0.6"; namePrefix = ""; @@ -12,9 +12,9 @@ pythonPackages.buildPythonApplication rec { patches = [ ./nox-review-wip.patch ]; - buildInputs = [ pythonPackages.pbr git ]; + buildInputs = [ python3Packages.pbr git ]; - propagatedBuildInputs = with pythonPackages; [ + propagatedBuildInputs = with python3Packages; [ dogpile_cache click requests diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 25759b0e7923..8cd0eb706aea 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4222,9 +4222,7 @@ with pkgs; notify-osd = callPackage ../applications/misc/notify-osd { }; - nox = callPackage ../tools/package-management/nox { - pythonPackages = python3Packages; - }; + nox = callPackage ../tools/package-management/nox { }; nq = callPackage ../tools/system/nq { }; @@ -19384,9 +19382,9 @@ with pkgs; yoshimi = callPackage ../applications/audio/yoshimi { }; - youtube-dl = with pythonPackages; toPythonApplication youtube-dl; + youtube-dl = with python3Packages; toPythonApplication youtube-dl; - youtube-dl-light = with pythonPackages; toPythonApplication youtube-dl-light; + youtube-dl-light = with python3Packages; toPythonApplication youtube-dl-light; youtube-viewer = perlPackages.WWWYoutubeViewer; |