From f4b327a9c2ce0c45ad6ccd94137e64a16ec89ada Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 8 Mar 2021 11:04:59 +0100 Subject: [PATCH 1/2] python2nix: drop --- .../package-management/python2nix/default.nix | 19 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 21 deletions(-) delete mode 100644 pkgs/tools/package-management/python2nix/default.nix diff --git a/pkgs/tools/package-management/python2nix/default.nix b/pkgs/tools/package-management/python2nix/default.nix deleted file mode 100644 index c36a488647a..00000000000 --- a/pkgs/tools/package-management/python2nix/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ lib, fetchFromGitHub, pythonPackages }: - -pythonPackages.buildPythonApplication { - name = "python2nix-20140927"; - - src = fetchFromGitHub { - owner = "proger"; - repo = "python2nix"; - rev = "84e3a5bbe82e5d9d694d6db8dabf73def4ac917b"; - sha256 = "022gr0gw6azfi3iq4ggb3fhkw2jljs6n5rncn45hb5liwakigj8i"; - }; - - propagatedBuildInputs = with pythonPackages; [ requests pip setuptools ]; - - meta = with lib; { - maintainers = [ ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index cd6418e1e81..e212021362d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -553,6 +553,7 @@ mapAliases ({ phonon-backend-vlc = throw "phonon-backend-vlc: Please use libsForQt5.phonon-backend-vlc, as Qt4 support in this package has been removed."; # added 2019-11-22 phonon = throw "phonon: Please use libsForQt5.phonon, as Qt4 support in this package has been removed."; # added 2019-11-22 pynagsystemd = throw "pynagsystemd was removed as it was unmaintained and incompatible with recent systemd versions. Instead use its fork check_systemd."; # added 2020-10-24 + python2nix = throw "python2nix has been removed as it is outdated. Use e.g. nixpkgs-pytools instead."; # added 2021-03-08 qca-qt5 = libsForQt5.qca-qt5; # added 2015-12-19 qcsxcad = libsForQt5.qcsxcad; # added 2020-11-05 qr-filetransfer = throw ''"qr-filetransfer" has been renamed to "qrcp"''; # added 2020-12-02 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 80e973fc02a..e9e6b472326 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11576,8 +11576,6 @@ in # Should eventually be moved inside Python interpreters. python-setup-hook = callPackage ../development/interpreters/python/setup-hook.nix { }; - python2nix = callPackage ../tools/package-management/python2nix { }; - pythonDocs = recurseIntoAttrs (callPackage ../development/interpreters/python/cpython/docs {}); pypi2nix = callPackage ../development/tools/pypi2nix {}; From 11f4fa4a22af70647bf2004a1711cb2f803af80e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 8 Mar 2021 11:06:24 +0100 Subject: [PATCH 2/2] doc: mention up-to-date tools for generating Python expressions --- doc/languages-frameworks/python.section.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 46491a785a7..e569cdaa935 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -1188,7 +1188,8 @@ community to help save time. No tool is preferred at the moment. expressions for your Python project. Note that [sharing derivations from pypi2nix with nixpkgs is possible but not encouraged](https://github.com/nix-community/pypi2nix/issues/222#issuecomment-443497376). -- [python2nix](https://github.com/proger/python2nix) by Vladimir Kirillov. +- [nixpkgs-pytools](https://github.com/nix-community/nixpkgs-pytools) +- [poetry2nix](https://github.com/nix-community/poetry2nix) ### Deterministic builds