mirror of
https://github.com/nix-community/dream2nix.git
synced 2024-09-11 14:35:30 +03:00
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:
parent
233c4d8106
commit
0a30902e27
@ -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
|
||||
|
@ -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;
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user