pdm: fix various bugs

- default to correct version of setuptools from lock file
- better default for python3 set in dream2nix.core.paths
This commit is contained in:
DavHau 2024-01-24 14:25:28 +07:00 committed by mergify[bot]
parent 233c4d8106
commit 0a30902e27
2 changed files with 4 additions and 2 deletions

View File

@ -42,7 +42,9 @@
setuptools =
if cfg.name == "setuptools"
then config.deps.python.pkgs.setuptools
else config.pip.drvs.setuptools.public or config.deps.python.pkgs.setuptools;
else if config.groups.default.packages ? setuptools
then (lib.head (lib.attrValues config.groups.default.packages.setuptools)).public
else config.deps.python.pkgs.setuptools;
in {
mkDerivation.buildInputs =
lib.optionals

View File

@ -8,7 +8,7 @@
../deps
];
deps = {nixpkgs, ...}:
lib.mapAttrs (_: opt: lib.mkOverride 49 opt) {
lib.mapAttrs (_: opt: lib.mkOverride 1003 opt) {
python3 = nixpkgs.python3;
substituteAll = nixpkgs.substituteAll;
};