summary refs log tree commit diff
path: root/doc/languages-frameworks
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2021-03-08 18:22:56 +0000
committerGitHub <noreply@github.com>2021-03-08 18:22:56 +0000
commit5c2a7abde78a325f4ec8006306ed4faf32205400 (patch)
tree414cef78bfb45e84cad56691bc3a90003a2fb5bc /doc/languages-frameworks
parent277d488026e413a8277319eaaa2b4b6fbdf52cb5 (diff)
parent448151f5097b2ab00ee13809af69bf3ca7de59df (diff)
downloadnixpkgs-5c2a7abde78a325f4ec8006306ed4faf32205400.tar
nixpkgs-5c2a7abde78a325f4ec8006306ed4faf32205400.tar.gz
nixpkgs-5c2a7abde78a325f4ec8006306ed4faf32205400.tar.bz2
nixpkgs-5c2a7abde78a325f4ec8006306ed4faf32205400.tar.lz
nixpkgs-5c2a7abde78a325f4ec8006306ed4faf32205400.tar.xz
nixpkgs-5c2a7abde78a325f4ec8006306ed4faf32205400.tar.zst
nixpkgs-5c2a7abde78a325f4ec8006306ed4faf32205400.zip
Merge master into staging-next
Diffstat (limited to 'doc/languages-frameworks')
-rw-r--r--doc/languages-frameworks/python.section.md3
1 files changed, 2 insertions, 1 deletions
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