mirror of
https://github.com/nix-community/dream2nix.git
synced 2024-09-11 14:35:30 +03:00
python: remove catchConflicts = false overrides
Those are not needed anymore since the hook has been improved in nixpkgs
This commit is contained in:
parent
b8d00b7c98
commit
87c725e8db
@ -16,9 +16,6 @@
|
|||||||
src = ./.;
|
src = ./.;
|
||||||
};
|
};
|
||||||
|
|
||||||
# workaround because the setuptools hook propagates its inputs resulting in conflicts
|
|
||||||
buildPythonPackage.catchConflicts = false;
|
|
||||||
|
|
||||||
# This is not strictly required, but setting it will keep most dependencies
|
# This is not strictly required, but setting it will keep most dependencies
|
||||||
# locked, even when new dependencies are added via pyproject.toml
|
# locked, even when new dependencies are added via pyproject.toml
|
||||||
pip.pypiSnapshotDate = "2023-09-12";
|
pip.pypiSnapshotDate = "2023-09-12";
|
||||||
|
@ -43,9 +43,6 @@ in {
|
|||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
# workaround because the setuptools hook propagates its inputs resulting in conflicts
|
|
||||||
buildPythonPackage.catchConflicts = false;
|
|
||||||
|
|
||||||
pip = {
|
pip = {
|
||||||
pypiSnapshotDate = "2023-01-01";
|
pypiSnapshotDate = "2023-01-01";
|
||||||
requirementsList = [
|
requirementsList = [
|
||||||
@ -71,8 +68,6 @@ in {
|
|||||||
# transitive dependencies (i.e. typing-extensions) are
|
# transitive dependencies (i.e. typing-extensions) are
|
||||||
# compatible with the rest of our lock file.
|
# compatible with the rest of our lock file.
|
||||||
mkDerivation.buildInputs = [config.pip.drvs.setuptools-scm.public];
|
mkDerivation.buildInputs = [config.pip.drvs.setuptools-scm.public];
|
||||||
# workaround because the setuptools hook propagates its inputs resulting in conflicts
|
|
||||||
buildPythonPackage.catchConflicts = false;
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -10,6 +10,4 @@ in {
|
|||||||
imports = [dream2nix.modules.dream2nix.nixpkgs-overrides];
|
imports = [dream2nix.modules.dream2nix.nixpkgs-overrides];
|
||||||
nixpkgs-overrides.enable = isSdist;
|
nixpkgs-overrides.enable = isSdist;
|
||||||
nixpkgs-overrides.exclude = ["propagatedBuildInputs"];
|
nixpkgs-overrides.exclude = ["propagatedBuildInputs"];
|
||||||
# TODO: upstream: fix setuptools collision (build-hook propagates setuptools)
|
|
||||||
buildPythonPackage.catchConflicts = ! isSdist;
|
|
||||||
}
|
}
|
||||||
|
@ -16,7 +16,4 @@ in {
|
|||||||
|
|
||||||
# add postgresql to nativeBuildInputs
|
# add postgresql to nativeBuildInputs
|
||||||
mkDerivation.nativeBuildInputs = lib.mkIf isSdist [config.deps.postgresql];
|
mkDerivation.nativeBuildInputs = lib.mkIf isSdist [config.deps.postgresql];
|
||||||
|
|
||||||
# TODO: upstream: fix setuptools collision (build-hook propagates setuptools)
|
|
||||||
buildPythonPackage.catchConflicts = ! isSdist;
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user