byteio/nixos-config
1
0
Fork 0
mirror of https://github.com/librephoenix/nixos-config synced 2025-07-06 06:52:13 +05:30
Code Issues Projects Releases Packages Wiki Activity

Deleted/fixed some todos on magit-todos

Browse source
This commit is contained in:
Emmet 2024-02-03 15:51:01 -06:00
parent 40c1b61089
commit 08533eed08
6 changed files with 7 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
patches/nixos-nixpkgs-268027.patch
View file

@ -12,12 +12,10 @@ diff --git a/pkgs/development/interpreters/python/python2/mk-python-derivation.n
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 @@
@@ -57,3 +57,3 @@
# 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