diff --git a/pkgs/applications/misc/cura/stable.nix b/pkgs/applications/misc/cura/stable.nix deleted file mode 100644 index d330a8a5ae28..000000000000 --- a/pkgs/applications/misc/cura/stable.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ lib, stdenv, python27Packages, curaengine, makeDesktopItem, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "cura"; - version = "15.06.03"; - - src = fetchFromGitHub { - owner = "daid"; - repo = "Cura"; - rev = version; - sha256 = "sha256-o1cAi4Wi19WOijlRB9iYwNEpSNnmywUj5Bth8rRhqFA="; - }; - - desktopItem = makeDesktopItem { - name = "Cura"; - exec = "cura"; - icon = "cura"; - comment = "Cura"; - desktopName = "Cura"; - genericName = "3D printing host software"; - categories = [ "GNOME" "GTK" "Utility" ]; - }; - - python_deps = with python27Packages; [ pyopengl pyserial numpy wxPython30 power setuptools ]; - - pythonPath = python_deps; - - propagatedBuildInputs = python_deps; - - buildInputs = [ curaengine python27Packages.wrapPython ]; - - configurePhase = ""; - buildPhase = ""; - - patches = [ ./numpy-cast.patch ]; - - installPhase = '' - # Install Python code. - site_packages=$out/lib/python2.7/site-packages - mkdir -p $site_packages - cp -r Cura $site_packages/ - - # Install resources. - resources=$out/share/cura - mkdir -p $resources - cp -r resources/* $resources/ - sed -i 's|os.path.join(os.path.dirname(__file__), "../../resources")|"'$resources'"|g' $site_packages/Cura/util/resources.py - - # Install executable. - mkdir -p $out/bin - cp Cura/cura.py $out/bin/cura - chmod +x $out/bin/cura - sed -i 's|#!/usr/bin/python|#!/usr/bin/env python|' $out/bin/cura - wrapPythonPrograms - - # Make it find CuraEngine. - echo "def getEngineFilename(): return '${curaengine}/bin/CuraEngine'" >> $site_packages/Cura/util/sliceEngine.py - - # Install desktop item. - mkdir -p "$out"/share/applications - cp "$desktopItem"/share/applications/* "$out"/share/applications/ - mkdir -p "$out"/share/icons - ln -s "$resources/images/c.png" "$out"/share/icons/cura.png - ''; - - meta = with lib; { - description = "3D printing host software"; - homepage = "https://github.com/daid/Cura"; - license = licenses.agpl3; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/misc/haxor-news/default.nix b/pkgs/applications/misc/haxor-news/default.nix index c93d31f66305..9170af04e61c 100644 --- a/pkgs/applications/misc/haxor-news/default.nix +++ b/pkgs/applications/misc/haxor-news/default.nix @@ -16,7 +16,13 @@ let }; }); # Use click 7 - click = self.callPackage ../../../development/python2-modules/click/default.nix { }; + click = super.click.overridePythonAttrs (old: rec { + version = "7.1.2"; + src = old.src.override { + inherit version; + sha256 = "d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a"; + }; + }); }; }; in diff --git a/pkgs/applications/misc/plover/default.nix b/pkgs/applications/misc/plover/default.nix index 02162a4039e3..6bd4ee6b3c18 100644 --- a/pkgs/applications/misc/plover/default.nix +++ b/pkgs/applications/misc/plover/default.nix @@ -2,30 +2,7 @@ qtbase, mkDerivationWith }: { - stable = with python27Packages; buildPythonPackage rec { - pname = "plover"; - version = "3.1.1"; - - meta = with lib; { - broken = stdenv.isDarwin; - description = "OpenSteno Plover stenography software"; - maintainers = with maintainers; [ twey kovirobi ]; - license = licenses.gpl2; - }; - - src = fetchFromGitHub { - owner = "openstenoproject"; - repo = "plover"; - rev = "v${version}"; - sha256 = "sha256-LIhTwHMphg+xTR9NKvjAZ6p0mmqPNcZd9C4cgnenmYQ="; - }; - - nativeBuildInputs = [ setuptools-scm ]; - buildInputs = [ pytest mock ]; - propagatedBuildInputs = [ - six setuptools pyserial appdirs hidapi wxPython xlib wmctrl dbus-python - ]; - }; + stable = throw "plover.stable was removed because it used Python 2. Use plover.dev instead."; # added 2022-06-05 dev = with python3Packages; mkDerivationWith buildPythonPackage rec { pname = "plover"; diff --git a/pkgs/applications/misc/privacyidea/default.nix b/pkgs/applications/misc/privacyidea/default.nix index d89364280795..5c3afc301556 100644 --- a/pkgs/applications/misc/privacyidea/default.nix +++ b/pkgs/applications/misc/privacyidea/default.nix @@ -65,18 +65,30 @@ let sha256 = "sha256-WUxngH+xYjizDES99082wCzfItHIzake+KDtjav1Ygo="; }; }); - # Required by flask-babel itsdangerous = super.itsdangerous.overridePythonAttrs (old: rec { - version = "2.0.1"; + version = "1.1.0"; src = old.src.override { inherit version; - sha256 = "sha256-nnJNaPwikCoUNTUfhMP7hiPzA//8xWaky5Ut+MVyz/A="; + sha256 = "321b033d07f2a4136d3ec762eac9f16a10ccd60f53c0c91af90217ace7ba1f19"; + }; + }); + flask = super.flask.overridePythonAttrs (old: rec { + version = "1.1.4"; + src = old.src.override { + inherit version; + sha256 = "0fbeb6180d383a9186d0d6ed954e0042ad9f18e0e8de088b2b419d526927d196"; }; }); - flask = self.callPackage ../../../development/python2-modules/flask { }; sqlsoup = super.sqlsoup.overrideAttrs ({ meta ? {}, ... }: { meta = meta // { broken = false; }; }); + click = super.click.overridePythonAttrs (old: rec { + version = "7.1.2"; + src = old.src.override { + inherit version; + sha256 = "d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a"; + }; + }); }; }; in diff --git a/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix b/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix deleted file mode 100644 index 6a6302e74955..000000000000 --- a/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ lib, stdenv, fetchurl, python27Packages, file }: - -let - inherit (python27Packages) python; - requirements = (import ./requirements.nix { - inherit lib fetchurl; - pythonPackages = python27Packages; - }); - -in - stdenv.mkDerivation rec { - pname = "salut-a-toi"; - version = "0.6.1"; - - src = fetchurl { - url = "ftp://ftp.goffi.org/sat/sat-${version}.tar.bz2"; - sha256 = "0kn9403n8fpzl0hsb9kkzicsmzq2fjl627l31yykbqzc4nsr780d"; - }; - - buildInputs = with python27Packages; - [ - python twisted urwid wxPython pygobject2 - dbus-python wrapPython setuptools file - pycrypto pyxdg - ] ++ (with requirements; [ - pyfeed - wokkel - ]); - - configurePhase = '' - sed -i "/use_setuptools/d" setup.py - sed -e "s@sys.prefix@'$out'@g" -i setup.py - sed -e "1aexport PATH=\"\$PATH\":\"$out/bin\":\"${python27Packages.twisted}/bin\"" -i src/sat.sh - sed -e "1aexport PYTHONPATH=\"\$PYTHONPATHPATH\":\"$PYTHONPATH\":"$out/${python.sitePackages}"" -i src/sat.sh - - echo 'import wokkel.muc' | python - ''; - - buildPhase = '' - ${python.interpreter} setup.py build - ''; - - installPhase = '' - ${python.interpreter} setup.py install --prefix="$out" - - for i in "$out/bin"/*; do - head -n 1 "$i" | grep -E '[/ ]python( |$)' && { - wrapProgram "$i" --prefix PYTHONPATH : "$PYTHONPATH:$out/${python.sitePackages}" - } || true - done - ''; - - meta = with lib; { - homepage = "http://sat.goffi.org/"; - description = "A multi-frontend XMPP client"; - platforms = platforms.linux; - maintainers = [ maintainers.raskin ]; - license = licenses.gpl3Plus; - }; - } diff --git a/pkgs/applications/networking/instant-messengers/salut-a-toi/requirements.nix b/pkgs/applications/networking/instant-messengers/salut-a-toi/requirements.nix deleted file mode 100644 index a8e711c447d5..000000000000 --- a/pkgs/applications/networking/instant-messengers/salut-a-toi/requirements.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ fetchurl -, lib -, pythonPackages -}: - -let - buildPythonPackage = pythonPackages.buildPythonPackage; - - xe = buildPythonPackage rec { - url = "http://www.blarg.net/%7Esteveha/xe-0.7.4.tar.gz"; - name = lib.nameFromURL url ".tar"; - src = fetchurl { - inherit url; - sha256 = "0v9878cl0y9cczdsr6xjy8v9l139lc23h4m5f86p4kpf2wlnpi42"; - }; - - # error: invalid command 'test' - doCheck = false; - - meta = { - homepage = "http://home.blarg.net/~steveha/xe.html"; - description = "XML elements"; - }; - }; - -in { - - pyfeed = (buildPythonPackage rec { - url = "http://www.blarg.net/%7Esteveha/pyfeed-0.7.4.tar.gz"; - - name = lib.nameFromURL url ".tar"; - - src = fetchurl { - inherit url; - sha256 = "1h4msq573m7wm46h3cqlx4rsn99f0l11rhdqgf50lv17j8a8vvy1"; - }; - - propagatedBuildInputs = [ xe ]; - - # error: invalid command 'test' - doCheck = false; - - meta = with lib; { - homepage = "http://home.blarg.net/~steveha/pyfeed.html"; - description = "Tools for syndication feeds"; - }; - - }); - - wokkel = buildPythonPackage (rec { - url = "http://wokkel.ik.nu/releases/0.7.0/wokkel-0.7.0.tar.gz"; - name = lib.nameFromURL url ".tar"; - src = fetchurl { - inherit url; - sha256 = "0rnshrzw8605x05mpd8ndrx3ri8h6cx713mp8sl4f04f4gcrz8ml"; - }; - - propagatedBuildInputs = with pythonPackages; [twisted python-dateutil]; - - meta = with lib; { - description = "Some (mainly XMPP-related) additions to twisted"; - homepage = "http://wokkel.ik.nu/"; - license = licenses.mit; - }; - }); - -} diff --git a/pkgs/applications/networking/instant-messengers/torchat/default.nix b/pkgs/applications/networking/instant-messengers/torchat/default.nix deleted file mode 100644 index 224a70ce9f72..000000000000 --- a/pkgs/applications/networking/instant-messengers/torchat/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, python2, unzip, tor }: - -stdenv.mkDerivation rec { - pname = "torchat"; - version = "0.9.9.553"; - - src = fetchFromGitHub { - owner = "prof7bit"; - repo = "TorChat"; - rev = version; - sha256 = "2LHG9qxZDo5rV6wsputdRo2Y1aHs+irMwt1ucFnXQE0="; - }; - - nativeBuildInputs = [ unzip ]; - buildInputs = with python2.pkgs; [ python wxPython wrapPython ]; - pythonPath = with python2.pkgs; [ wxPython ]; - - preConfigure = "cd torchat/src; rm portable.txt"; - - installPhase = '' - substituteInPlace "Tor/tor.sh" --replace "tor -f" "${tor}/bin/tor -f" - - wrapPythonPrograms - - mkdir -p $out/lib/torchat - cp -rf * $out/lib/torchat - makeWrapper ${python2}/bin/python $out/bin/torchat \ - --set PYTHONPATH $out/lib/torchat:$program_PYTHONPATH \ - --chdir "$out/lib/torchat" \ - --add-flags "-O $out/lib/torchat/torchat.py" - ''; - - meta = with lib; { - homepage = "https://github.com/prof7bit/TorChat"; - description = "Instant messaging application on top of the Tor network and it's location hidden services"; - license = licenses.gpl3; - maintainers = [ ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/python2-modules/click/default.nix b/pkgs/development/python2-modules/click/default.nix deleted file mode 100644 index fcbd4d0981af..000000000000 --- a/pkgs/development/python2-modules/click/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi, locale, pytestCheckHook }: - -buildPythonPackage rec { - pname = "click"; - version = "7.1.2"; - - src = fetchPypi { - inherit pname version; - sha256 = "d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a"; - }; - - postPatch = '' - substituteInPlace src/click/_unicodefun.py \ - --replace "'locale'" "'${locale}/bin/locale'" - ''; - - checkInputs = [ pytestCheckHook ]; - - meta = with lib; { - homepage = "https://click.palletsprojects.com/"; - description = "Create beautiful command line interfaces in Python"; - longDescription = '' - A Python package for creating beautiful command line interfaces in a - composable way, with as little code as necessary. - ''; - license = licenses.bsd3; - }; -} diff --git a/pkgs/development/python2-modules/cryptography/default.nix b/pkgs/development/python2-modules/cryptography/default.nix deleted file mode 100644 index 0b4e2ae394cd..000000000000 --- a/pkgs/development/python2-modules/cryptography/default.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ lib -, stdenv -, callPackage -, buildPythonPackage -, fetchPypi -, isPy27 -, ipaddress -, openssl -, darwin -, packaging -, six -, isPyPy -, cffi -, pytest -, pretend -, iso8601 -, pytz -, hypothesis -, enum34 -}: - -let - cryptography-vectors = callPackage ./vectors.nix { }; -in -buildPythonPackage rec { - pname = "cryptography"; - version = "3.3.2"; # Also update the hash in vectors-3.3.nix - - src = fetchPypi { - inherit pname version; - sha256 = "1vcvw4lkw1spiq322pm1256kail8nck6bbgpdxx3pqa905wd6q2s"; - }; - - patches = [ ./cryptography-py27-warning.patch ]; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = lib.optionals (!isPyPy) [ - cffi - ]; - - buildInputs = [ openssl ] - ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; - propagatedBuildInputs = [ - packaging - six - ] ++ lib.optionals (!isPyPy) [ - cffi - ] ++ lib.optionals isPy27 [ - ipaddress - enum34 - ]; - - checkInputs = [ - cryptography-vectors - hypothesis - iso8601 - pretend - pytest - pytz - ]; - - checkPhase = '' - py.test --disable-pytest-warnings tests - ''; - - # IOKit's dependencies are inconsistent between OSX versions, so this is the best we - # can do until nix 1.11's release - __impureHostDeps = [ "/usr/lib" ]; - - meta = with lib; { - description = "A package which provides cryptographic recipes and primitives"; - longDescription = '' - Cryptography includes both high level recipes and low level interfaces to - common cryptographic algorithms such as symmetric ciphers, message - digests, and key derivation functions. - Our goal is for it to be your "cryptographic standard library". It - supports Python 2.7, Python 3.5+, and PyPy 5.4+. - ''; - homepage = "https://github.com/pyca/cryptography"; - changelog = "https://cryptography.io/en/latest/changelog/#v" - + replaceStrings [ "." ] [ "-" ] version; - license = with licenses; [ asl20 bsd3 psfl ]; - maintainers = with maintainers; [ primeos ]; - }; -} diff --git a/pkgs/development/python2-modules/cryptography/vectors.nix b/pkgs/development/python2-modules/cryptography/vectors.nix deleted file mode 100644 index 4d6214807e73..000000000000 --- a/pkgs/development/python2-modules/cryptography/vectors.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ buildPythonPackage, fetchPypi, lib, cryptography }: - -buildPythonPackage rec { - pname = "cryptography-vectors"; - # The test vectors must have the same version as the cryptography package: - version = cryptography.version; - - src = fetchPypi { - pname = "cryptography_vectors"; - inherit version; - sha256 = "1yhaps0f3h2yjb6lmz953z1l1d84y9swk4k3gj9nqyk4vbx5m7cc"; - }; - - # No tests included - doCheck = false; - - meta = with lib; { - description = "Test vectors for the cryptography package"; - homepage = "https://cryptography.io/en/latest/development/test-vectors/"; - # Source: https://github.com/pyca/cryptography/tree/master/vectors; - license = with licenses; [ asl20 bsd3 ]; - maintainers = with maintainers; [ primeos ]; - }; -} diff --git a/pkgs/development/python2-modules/decorator/default.nix b/pkgs/development/python2-modules/decorator/default.nix deleted file mode 100644 index 8e8fd28f0b54..000000000000 --- a/pkgs/development/python2-modules/decorator/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -}: - -buildPythonPackage rec { - pname = "decorator"; - version = "4.4.2"; - - src = fetchPypi { - inherit pname version; - sha256 = "1rxzhk5zwiggk45hl53zydvy70lk654kg0nc1p54090p402jz9p3"; - }; - - meta = with lib; { - homepage = "https://pypi.python.org/pypi/decorator"; - description = "Better living through Python with decorators"; - license = lib.licenses.mit; - maintainers = [ maintainers.costrouc ]; - }; -} diff --git a/pkgs/development/python2-modules/flask/default.nix b/pkgs/development/python2-modules/flask/default.nix deleted file mode 100644 index 27f436c3c53c..000000000000 --- a/pkgs/development/python2-modules/flask/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi -, itsdangerous, click, werkzeug, jinja2, pytest }: - -buildPythonPackage rec { - version = "1.1.2"; - pname = "Flask"; - - src = fetchPypi { - inherit pname version; - sha256 = "4efa1ae2d7c9865af48986de8aeb8504bf32c7f3d6fdc9353d34b21f4b127060"; - }; - - checkInputs = [ pytest ]; - propagatedBuildInputs = [ itsdangerous click werkzeug jinja2 ]; - - checkPhase = '' - py.test - ''; - - # Tests require extra dependencies - doCheck = false; - - meta = with lib; { - homepage = "http://flask.pocoo.org/"; - description = "A microframework based on Werkzeug, Jinja 2, and good intentions"; - license = licenses.bsd3; - }; -} diff --git a/pkgs/development/python2-modules/freezegun/default.nix b/pkgs/development/python2-modules/freezegun/default.nix deleted file mode 100644 index 7f77616f2a4e..000000000000 --- a/pkgs/development/python2-modules/freezegun/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, python-dateutil -, six -, mock -, nose -, pytest -}: - -buildPythonPackage rec { - pname = "freezegun"; - version = "0.3.15"; - - src = fetchPypi { - inherit pname version; - sha256 = "e2062f2c7f95cc276a834c22f1a17179467176b624cc6f936e8bc3be5535ad1b"; - }; - - propagatedBuildInputs = [ python-dateutil six ]; - checkInputs = [ mock nose pytest ]; - - meta = with lib; { - description = "FreezeGun: Let your Python tests travel through time"; - homepage = "https://github.com/spulec/freezegun"; - license = licenses.asl20; - }; - -} diff --git a/pkgs/development/python2-modules/ipaddr/default.nix b/pkgs/development/python2-modules/ipaddr/default.nix deleted file mode 100644 index b29ee9179287..000000000000 --- a/pkgs/development/python2-modules/ipaddr/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, isPy3k -}: - -buildPythonPackage rec { - pname = "ipaddr"; - version = "2.2.0"; - disabled = isPy3k; - - src = fetchPypi { - inherit pname version; - sha256 = "1ml8r8z3f0mnn381qs1snbffa920i9ycp6mm2am1d3aqczkdz4j0"; - }; - - meta = with lib; { - description = "Google's IP address manipulation library"; - homepage = "https://github.com/google/ipaddr-py"; - license = licenses.asl20; - }; - -} diff --git a/pkgs/development/python2-modules/itsdangerous/default.nix b/pkgs/development/python2-modules/itsdangerous/default.nix deleted file mode 100644 index d1669a1ed5bf..000000000000 --- a/pkgs/development/python2-modules/itsdangerous/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -}: - -buildPythonPackage rec { - pname = "itsdangerous"; - version = "1.1.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "321b033d07f2a4136d3ec762eac9f16a10ccd60f53c0c91af90217ace7ba1f19"; - }; - - meta = with lib; { - description = "Helpers to pass trusted data to untrusted environments and back"; - homepage = "https://pypi.python.org/pypi/itsdangerous/"; - license = licenses.bsd0; - }; - -} diff --git a/pkgs/development/python2-modules/libcloud/default.nix b/pkgs/development/python2-modules/libcloud/default.nix deleted file mode 100644 index 504e7753a978..000000000000 --- a/pkgs/development/python2-modules/libcloud/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, isPy27 -, mock -, pycrypto -, requests -, pytest-runner -, pytest -, requests-mock -, typing -, backports_ssl_match_hostname -}: - -buildPythonPackage rec { - pname = "apache-libcloud"; - version = "2.8.3"; - - src = fetchPypi { - inherit pname version; - sha256 = "70096690b24a7832cc5abdfda1954b49fddc1c09a348a1e6caa781ac867ed4c6"; - }; - - checkInputs = [ mock pytest pytest-runner requests-mock ]; - propagatedBuildInputs = [ pycrypto requests ] - ++ lib.optionals isPy27 [ typing backports_ssl_match_hostname ]; - - preConfigure = "cp libcloud/test/secrets.py-dist libcloud/test/secrets.py"; - - # requires a certificates file - doCheck = false; - - meta = with lib; { - description = "A unified interface to many cloud providers"; - homepage = "https://libcloud.apache.org/"; - license = licenses.asl20; - }; - -} diff --git a/pkgs/development/python2-modules/lpod/default.nix b/pkgs/development/python2-modules/lpod/default.nix deleted file mode 100644 index 9c719d234f89..000000000000 --- a/pkgs/development/python2-modules/lpod/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, lxml -, docutils -, pillow -, isPy3k -}: - -buildPythonPackage { - version = "1.1.7"; - pname = "python-lpod"; - # lpod library currently does not support Python 3.x - disabled = isPy3k; - - propagatedBuildInputs = [ lxml docutils pillow ]; - - src = fetchFromGitHub { - owner = "lpod"; - repo = "lpod-python"; - rev = "dee32120ee582ff337b0c52a95a9a87cca71fd67"; - sha256 = "1mikvzp27wxkzpr2lii4wg1hhx8h610agckqynvsrdc8v3nw9ciw"; - }; - - meta = with lib; { - homepage = "https://github.com/lpod/lpod-python/"; - description = "Library implementing the ISO/IEC 26300 OpenDocument Format standard (ODF) "; - license = licenses.gpl3; - }; - -} diff --git a/pkgs/development/python2-modules/pyjwt/default.nix b/pkgs/development/python2-modules/pyjwt/default.nix deleted file mode 100644 index 011f526e520f..000000000000 --- a/pkgs/development/python2-modules/pyjwt/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, cryptography -, ecdsa -, pytestCheckHook -, pythonOlder -}: - -buildPythonPackage rec { - pname = "pyjwt"; - version = "1.7.1"; - - src = fetchPypi { - pname = "PyJWT"; - inherit version; - sha256 = "8d59a976fb773f3e6a39c85636357c4f0e242707394cadadd9814f5cbaa20e96"; - }; - - postPatch = '' - sed -i '/^addopts/d' setup.cfg - ''; - - propagatedBuildInputs = [ - cryptography - ecdsa - ]; - - checkInputs = [ - pytestCheckHook - ]; - - disabledTests = [ - "test_ec_verify_should_return_false_if_signature_invalid" - ]; - - pythonImportsCheck = [ "jwt" ]; - - meta = with lib; { - description = "JSON Web Token implementation in Python"; - homepage = "https://github.com/jpadilla/pyjwt"; - license = licenses.mit; - knownVulnerabilities = [ - "CVE-2022-29217" - ]; - }; -} diff --git a/pkgs/development/python2-modules/urllib3/default.nix b/pkgs/development/python2-modules/urllib3/default.nix deleted file mode 100644 index c23835ce4dc2..000000000000 --- a/pkgs/development/python2-modules/urllib3/default.nix +++ /dev/null @@ -1,84 +0,0 @@ -{ lib -, brotli -, buildPythonPackage -, certifi -, cryptography -, python-dateutil -, fetchpatch -, fetchPypi -, idna -, mock -, pyopenssl -, pysocks -, pytest-freezegun -, pytest-timeout -, pytestCheckHook -, tornado -, trustme -}: - -buildPythonPackage rec { - pname = "urllib3"; - version = "1.26.2"; - - src = fetchPypi { - inherit pname version; - sha256 = "19188f96923873c92ccb987120ec4acaa12f0461fa9ce5d3d0772bc965a39e08"; - }; - - patches = [ - (fetchpatch { - name = "CVE-2021-28363.patch"; - url = "https://github.com/urllib3/urllib3/commit/8d65ea1ecf6e2cdc27d42124e587c1b83a3118b0.patch"; - sha256 = "1lqhrd11p03iv14bp89rh67ynf000swmwsfvr3jpfdycdqr3ka9q"; - }) - ]; - - propagatedBuildInputs = [ - brotli - certifi - cryptography - idna - pyopenssl - pysocks - ]; - - checkInputs = [ - python-dateutil - mock - pytest-freezegun - pytest-timeout - pytestCheckHook - tornado - trustme - ]; - - # Tests in urllib3 are mostly timeout-based instead of event-based and - # are therefore inherently flaky. On your own machine, the tests will - # typically build fine, but on a loaded cluster such as Hydra random - # timeouts will occur. - # - # The urllib3 test suite has two different timeouts in their test suite - # (see `test/__init__.py`): - # - SHORT_TIMEOUT - # - LONG_TIMEOUT - # When CI is in the env, LONG_TIMEOUT will be significantly increased. - # Still, failures can occur and for that reason tests are disabled. - doCheck = false; - - preCheck = '' - export CI # Increases LONG_TIMEOUT - ''; - - pythonImportsCheck = [ "urllib3" ]; - - meta = with lib; { - description = "Powerful, sanity-friendly HTTP client for Python"; - homepage = "https://github.com/shazow/urllib3"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; - knownVulnerabilities = [ - "CVE-2021-33503" - ]; - }; -} diff --git a/pkgs/development/python2-modules/vcrpy/default.nix b/pkgs/development/python2-modules/vcrpy/default.nix deleted file mode 100644 index ddd4015aad1e..000000000000 --- a/pkgs/development/python2-modules/vcrpy/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ buildPythonPackage -, lib -, six -, fetchPypi -, pyyaml -, mock -, contextlib2 -, wrapt -, pytest -, pytest-httpbin -, yarl -, pythonOlder -, pythonAtLeast -}: - -buildPythonPackage rec { - pname = "vcrpy"; - version = "3.0.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "21168d5ae14263a833d4b71acfd8278d8841114f24be1b4ab4a5719d0c7f07bc"; - }; - - checkInputs = [ - pytest - pytest-httpbin - ]; - - propagatedBuildInputs = [ - pyyaml - wrapt - six - ] - ++ lib.optionals (pythonOlder "3.3") [ contextlib2 mock ] - ++ lib.optionals (pythonAtLeast "3.4") [ yarl ]; - - checkPhase = '' - py.test --ignore=tests/integration -k "not TestVCRConnection" - ''; - - meta = with lib; { - description = "Automatically mock your HTTP interactions to simplify and speed up testing"; - homepage = "https://github.com/kevin1024/vcrpy"; - license = licenses.mit; - }; -} - diff --git a/pkgs/development/python2-modules/werkzeug/default.nix b/pkgs/development/python2-modules/werkzeug/default.nix deleted file mode 100644 index c03cc6935d2f..000000000000 --- a/pkgs/development/python2-modules/werkzeug/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi -, itsdangerous, hypothesis -, pytestCheckHook, requests -, pytest-timeout - }: - -buildPythonPackage rec { - pname = "Werkzeug"; - version = "1.0.1"; - - src = fetchPypi { - inherit pname version; - sha256 = "6c80b1e5ad3665290ea39320b91e1be1e0d5f60652b964a3070216de83d2e47c"; - }; - - propagatedBuildInputs = [ itsdangerous ]; - checkInputs = [ pytestCheckHook requests hypothesis pytest-timeout ]; - - postPatch = '' - # ResourceWarning causes tests to fail - rm tests/test_routing.py - ''; - - disabledTests = [ - "test_save_to_pathlib_dst" - "test_cookie_maxsize" - "test_cookie_samesite_attribute" - "test_cookie_samesite_invalid" - "test_range_parsing" - "test_content_range_parsing" - "test_http_date_lt_1000" - "test_best_match_works" - "test_date_to_unix" - "test_easteregg" - - # Seems to be a problematic test-case: - # - # > warnings.warn(pytest.PytestUnraisableExceptionWarning(msg)) - # E pytest.PytestUnraisableExceptionWarning: Exception ignored in: <_io.FileIO [closed]> - # E - # E Traceback (most recent call last): - # E File "/nix/store/cwv8aj4vsqvimzljw5dxsxy663vjgibj-python3.9-Werkzeug-1.0.1/lib/python3.9/site-packages/werkzeug/formparser.py", line 318, in parse_multipart_headers - # E return Headers(result) - # E ResourceWarning: unclosed file <_io.FileIO name=11 mode='rb+' closefd=True> - "test_basic_routing" - "test_merge_slashes_match" - "test_merge_slashes_build" - "TestMultiPart" - "TestHTTPUtility" - ] ++ lib.optionals stdenv.isDarwin [ - "test_get_machine_id" - ]; - - meta = with lib; { - homepage = "https://palletsprojects.com/p/werkzeug/"; - description = "A WSGI utility library for Python"; - license = licenses.bsd3; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/python2-modules/wsproto/default.nix b/pkgs/development/python2-modules/wsproto/default.nix deleted file mode 100644 index a8488d8c4ab8..000000000000 --- a/pkgs/development/python2-modules/wsproto/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi, h11, enum34, pytest }: - -buildPythonPackage rec { - pname = "wsproto"; - version = "0.14.1"; - - src = fetchPypi { - inherit pname version; - sha256 = "051s127qb5dladxa14n9nqajwq7xki1dz1was5r5v9df5a0jq8pd"; - }; - - propagatedBuildInputs = [ h11 enum34 ]; - - checkInputs = [ pytest ]; - - checkPhase = '' - py.test - ''; - - meta = with lib; { - description = "Pure Python, pure state-machine WebSocket implementation"; - homepage = "https://github.com/python-hyper/wsproto/"; - license = licenses.mit; - }; -} diff --git a/pkgs/development/python2-modules/wxPython/default.nix b/pkgs/development/python2-modules/wxPython/default.nix deleted file mode 100644 index 6649c5f69315..000000000000 --- a/pkgs/development/python2-modules/wxPython/default.nix +++ /dev/null @@ -1,91 +0,0 @@ -{ fetchurl -, lib -, stdenv -, darwin -, openglSupport ? true -, libX11 -, wxGTK -, wxmac -, pkg-config -, buildPythonPackage -, pyopengl -, isPy3k -, isPyPy -, python -, cairo -, pango -}: - -assert wxGTK.unicode; - -buildPythonPackage rec { - pname = "wxPython"; - version = "3.0.2.0"; - - disabled = isPy3k || isPyPy; - doCheck = false; - - src = fetchurl { - url = "mirror://sourceforge/wxpython/wxPython-src-${version}.tar.bz2"; - sha256 = "0qfzx3sqx4mwxv99sfybhsij4b5pc03ricl73h4vhkzazgjjjhfm"; - }; - - dontUseSetuptoolsBuild = true; - dontUsePipInstall = true; - - hardeningDisable = [ "format" ]; - - nativeBuildInputs = [ pkg-config ] - ++ (lib.optionals (!stdenv.isDarwin) [ wxGTK libX11 ]) - ++ (lib.optionals stdenv.isDarwin [ wxmac ]); - - buildInputs = [ ] - ++ (lib.optionals (!stdenv.isDarwin) [ (wxGTK.gtk) ]) - ++ (lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ - ApplicationServices - AudioToolbox - CFNetwork - Carbon - Cocoa - CoreGraphics - CoreServices - CoreText - DiskArbitration - IOKit - ImageIO - OpenGL - Security - ])) - ++ (lib.optional openglSupport pyopengl); - - preConfigure = '' - cd wxPython - # remove wxPython's darwin hack that interference with python-2.7-distutils-C++.patch - substituteInPlace config.py \ - --replace "distutils.unixccompiler.UnixCCompiler = MyUnixCCompiler" "" - # set the WXPREFIX to $out instead of the storepath of wxwidgets - substituteInPlace config.py \ - --replace "WXPREFIX = getWxConfigValue('--prefix')" "WXPREFIX = '$out'" - # this check is supposed to only return false on older systems running non-framework python - substituteInPlace src/osx_cocoa/_core_wrap.cpp \ - --replace "return wxPyTestDisplayAvailable();" "return true;" - '' + lib.optionalString (!stdenv.isDarwin) '' - substituteInPlace wx/lib/wxcairo.py \ - --replace 'cairoLib = None' 'cairoLib = ctypes.CDLL("${cairo}/lib/libcairo.so")' - substituteInPlace wx/lib/wxcairo.py \ - --replace '_dlls = dict()' '_dlls = {k: ctypes.CDLL(v) for k, v in [ - ("gdk", "${wxGTK.gtk}/lib/libgtk-x11-2.0.so"), - ("pangocairo", "${pango.out}/lib/libpangocairo-1.0.so"), - ("appsvc", None) - ]}' - ''; - - buildPhase = ""; - - installPhase = '' - ${python.interpreter} setup.py install WXPORT=${if stdenv.isDarwin then "osx_cocoa" else "gtk2"} NO_HEADERS=0 BUILD_GLCANVAS=${if openglSupport then "1" else "0"} UNICODE=1 --prefix=$out - wrapPythonPrograms - ''; - - passthru = { inherit wxGTK openglSupport; }; -} diff --git a/pkgs/tools/misc/csvs-to-sqlite/default.nix b/pkgs/tools/misc/csvs-to-sqlite/default.nix index 1deae6b3f833..736cc1c3dc5a 100644 --- a/pkgs/tools/misc/csvs-to-sqlite/default.nix +++ b/pkgs/tools/misc/csvs-to-sqlite/default.nix @@ -8,7 +8,13 @@ let python = python3.override { packageOverrides = self: super: { # Use click 7 - click = self.callPackage ../../../development/python2-modules/click/default.nix { }; + click = super.click.overridePythonAttrs (old: rec { + version = "7.1.2"; + src = old.src.override { + inherit version; + sha256 = "d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a"; + }; + }); }; }; in with python.pkgs; buildPythonApplication rec { diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 2707fce25485..6894ed5335cb 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -267,6 +267,7 @@ mapAliases ({ cudnn_cudatoolkit_9_0 = throw "cudnn_cudatoolkit_9_0 has been removed in favor of newer versions"; # Added 2021-04-18 cudnn_cudatoolkit_9_1 = throw "cudnn_cudatoolkit_9_1 has been removed in favor of newer versions"; # Added 2021-04-18 cudnn_cudatoolkit_9_2 = throw "cudnn_cudatoolkit_9_2 has been removed in favor of newer versions"; # Added 2021-04-18 + cura_stable = throw "cura_stable was removed because it was broken and used Python 2"; # added 2022-06-05 curl_unix_socket = throw "curl_unix_socket has been dropped due to the lack of maintanence from upstream since 2015"; # Added 2022-06-02 cutensor = throw "cutensor is now part of cudaPackages*"; # Added 2022-04-04 cutensor_cudatoolkit_10 = throw "cutensor* is now part of cudaPackages*"; # Added 2022-04-04 @@ -1226,6 +1227,7 @@ mapAliases ({ s6Networking = throw "'s6Networking' has been renamed to/replaced by 's6-networking'"; # Converted to throw 2022-02-22 s6PortableUtils = throw "'s6PortableUtils' has been renamed to/replaced by 's6-portable-utils'"; # Converted to throw 2022-02-22 sagemath = throw "'sagemath' has been renamed to/replaced by 'sage'"; # Converted to throw 2022-02-22 + salut_a_toi = throw "salut_a_toi was removed because it was broken and used Python 2"; # added 2022-06-05 sam = throw "'sam' has been renamed to/replaced by 'deadpixi-sam'"; # Converted to throw 2022-02-22 samsungUnifiedLinuxDriver = throw "'samsungUnifiedLinuxDriver' has been renamed to/replaced by 'samsung-unified-linux-driver'"; # Converted to throw 2022-02-22 sane-backends-git = sane-backends; # Added 2021-02-19 @@ -1588,6 +1590,7 @@ mapAliases ({ todolist = throw "todolist is now ultralist"; # Added 2020-12-27 tor-browser-bundle = throw "tor-browser-bundle was removed because it was out of date and inadequately maintained. Please use tor-browser-bundle-bin instead"; # Added 2020-01-10 tor-browser-unwrapped = throw "tor-browser-unwrapped was removed because it was out of date and inadequately maintained. Please use tor-browser-bundle-bin instead"; # Added 2020-01-10 + torchat = throw "torchat was removed because it was broken and requires Python 2"; # added 2022-06-05 ttyrec = ovh-ttyrec; # Added 2021-01-02 zplugin = zinit; # Added 2021-01-30 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5683a5368379..bd878b1669ca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10104,8 +10104,6 @@ with pkgs; salt = callPackage ../tools/admin/salt {}; - salut_a_toi = callPackage ../applications/networking/instant-messengers/salut-a-toi {}; - samim-fonts = callPackage ../data/fonts/samim-fonts {}; saml2aws = callPackage ../tools/security/saml2aws { @@ -29653,9 +29651,6 @@ with pkgs; }; curaengine_stable = callPackage ../applications/misc/curaengine/stable.nix { }; - cura_stable = callPackage ../applications/misc/cura/stable.nix { - curaengine = curaengine_stable; - }; curaengine = callPackage ../applications/misc/curaengine { inherit (python3.pkgs) libarcus; }; @@ -30073,8 +30068,6 @@ with pkgs; topydo = callPackage ../applications/misc/topydo {}; - torchat = callPackage ../applications/networking/instant-messengers/torchat { }; - torrential = callPackage ../applications/networking/p2p/torrential { }; tortoisehg = callPackage ../applications/version-management/tortoisehg { }; diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index c915fc5c8c50..717c16785704 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -18,8 +18,6 @@ with self; with super; { cheetah = callPackage ../development/python2-modules/cheetah { }; - click = callPackage ../development/python2-modules/click { }; - configparser = callPackage ../development/python2-modules/configparser { }; construct = callPackage ../development/python2-modules/construct { }; @@ -28,18 +26,10 @@ with self; with super; { coverage = callPackage ../development/python2-modules/coverage { }; - cryptography = callPackage ../development/python2-modules/cryptography { }; - - decorator = callPackage ../development/python2-modules/decorator { }; - enum = callPackage ../development/python2-modules/enum { }; filelock = callPackage ../development/python2-modules/filelock { }; - flask = callPackage ../development/python2-modules/flask { }; - - freezegun = callPackage ../development/python2-modules/freezegun { }; - futures = callPackage ../development/python2-modules/futures { }; google-apputils = callPackage ../development/python2-modules/google-apputils { }; @@ -54,16 +44,8 @@ with self; with super; { importlib-metadata = callPackage ../development/python2-modules/importlib-metadata { }; - ipaddr = callPackage ../development/python2-modules/ipaddr { }; - - itsdangerous = callPackage ../development/python2-modules/itsdangerous { }; - jinja2 = callPackage ../development/python2-modules/jinja2 { }; - libcloud = callPackage ../development/python2-modules/libcloud { }; - - lpod = callPackage ../development/python2-modules/lpod { }; - marisa = callPackage ../development/python2-modules/marisa { inherit (pkgs) marisa; }; @@ -110,8 +92,6 @@ with self; with super; { pygtk = callPackage ../development/python2-modules/pygtk { }; - pyjwt = callPackage ../development/python2-modules/pyjwt { }; - pyparsing = callPackage ../development/python2-modules/pyparsing { }; pyroma = callPackage ../development/python2-modules/pyroma { }; @@ -160,20 +140,6 @@ with self; with super; { typing = callPackage ../development/python2-modules/typing { }; - urllib3 = callPackage ../development/python2-modules/urllib3 { }; - - werkzeug = callPackage ../development/python2-modules/werkzeug { }; - - wsproto = callPackage ../development/python2-modules/wsproto { }; - - wxPython30 = callPackage ../development/python2-modules/wxPython { - wxGTK = pkgs.wxGTK30; - }; - - wxPython = self.wxPython30; - - vcrpy = callPackage ../development/python2-modules/vcrpy { }; - zeek = disabled super.zeek; zipp = callPackage ../development/python2-modules/zipp { };