chvp/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update dependencies

Browse source
This commit is contained in:
Charlotte Van Petegem 2023-11-18 12:25:26 +01:00
parent 0dd5fadc57
commit c7d29abdf7
No known key found for this signature in database
GPG key ID: 019E764B7184435A
5 changed files with 54 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

14
patches/268027.patch Normal file
View file

@ -0,0 +1,14 @@
diff --git a/pkgs/development/interpreters/python/python2/mk-python-derivation.nix b/pkgs/development/interpreters/python/python2/mk-python-derivation.nix
index 1a6f9c784cf675..6d51b51b215d43 100644
--- a/pkgs/development/interpreters/python/python2/mk-python-derivation.nix
+++ b/pkgs/development/interpreters/python/python2/mk-python-derivation.nix
@@ -57,7 +57,8 @@
# Raise an error if two packages are installed with the same name
# TODO: For cross we probably need a different PYTHONPATH, or not
# add the runtime deps until after buildPhase.
-, catchConflicts ? (python.stdenv.hostPlatform == python.stdenv.buildPlatform)
+# FIXME: disabled for Python 2 because broken
+, catchConflicts ? false
# Additional arguments to pass to the makeWrapper function, which wraps
# generated binaries.