mirror of
https://github.com/nix-community/dream2nix.git
synced 2024-10-26 23:28:55 +03:00
pdm: stop using config.deps.python3 in favor of config.deps.python
This commit is contained in:
parent
0a30902e27
commit
16f2c654c6
@ -7,13 +7,16 @@
|
||||
imports = [
|
||||
dream2nix.modules.dream2nix.WIP-python-pdm
|
||||
];
|
||||
# select python 3.10
|
||||
deps = {nixpkgs, ...}: {
|
||||
python = nixpkgs.python310;
|
||||
};
|
||||
pdm.lockfile = ./pdm.lock;
|
||||
pdm.pyproject = ./pyproject.toml;
|
||||
pdm.pythonInterpreter = config.deps.python3;
|
||||
mkDerivation = {
|
||||
src = ./.;
|
||||
buildInputs = [
|
||||
config.deps.python3.pkgs.pdm-backend
|
||||
config.deps.python.pkgs.pdm-backend
|
||||
];
|
||||
};
|
||||
}
|
||||
|
@ -6,9 +6,9 @@
|
||||
}: let
|
||||
libpdm = import ./lib.nix {
|
||||
inherit lib libpyproject;
|
||||
python3 = config.deps.python3;
|
||||
python3 = config.deps.python;
|
||||
targetPlatform =
|
||||
lib.systems.elaborate config.deps.python3.stdenv.targetPlatform;
|
||||
lib.systems.elaborate config.deps.python.stdenv.targetPlatform;
|
||||
};
|
||||
|
||||
libpyproject = import (dream2nix.inputs.pyproject-nix + "/lib") {inherit lib;};
|
||||
@ -16,13 +16,13 @@
|
||||
inherit lib;
|
||||
curl = config.deps.curl;
|
||||
jq = config.deps.jq;
|
||||
python3 = config.deps.python3;
|
||||
python3 = config.deps.python;
|
||||
runCommand = config.deps.runCommand;
|
||||
stdenvNoCC = config.deps.stdenvNoCC;
|
||||
};
|
||||
|
||||
lock_data = lib.importTOML config.pdm.lockfile;
|
||||
environ = libpyproject.pep508.mkEnviron config.deps.python3;
|
||||
environ = libpyproject.pep508.mkEnviron config.deps.python;
|
||||
|
||||
pyproject = libpdm.loadPdmPyProject (lib.importTOML config.pdm.pyproject);
|
||||
|
||||
@ -79,13 +79,12 @@ in {
|
||||
stdenvNoCC
|
||||
stdenv
|
||||
;
|
||||
python = config.deps.python3;
|
||||
python = lib.mkDefault config.deps.python3;
|
||||
};
|
||||
overrideAll = {
|
||||
imports = [commonModule];
|
||||
deps = {nixpkgs, ...}: {
|
||||
python3 = lib.mkDefault config.deps.python3;
|
||||
python = lib.mkDefault config.deps.python3;
|
||||
python = lib.mkDefault config.deps.python;
|
||||
};
|
||||
sourceSelector = lib.mkOptionDefault config.pdm.sourceSelector;
|
||||
};
|
||||
@ -94,7 +93,7 @@ in {
|
||||
format = lib.mkDefault "pyproject";
|
||||
};
|
||||
mkDerivation = {
|
||||
buildInputs = map (name: config.deps.python3.pkgs.${name}) buildSystemNames;
|
||||
buildInputs = map (name: config.deps.python.pkgs.${name}) buildSystemNames;
|
||||
propagatedBuildInputs =
|
||||
map
|
||||
(x: (lib.head (lib.attrValues x)).public)
|
||||
@ -160,8 +159,8 @@ in {
|
||||
doCheck = lib.mkDefault false;
|
||||
dontStrip = lib.mkDefault true;
|
||||
};
|
||||
# required for python3.withPackages to recognize it as a python package.
|
||||
public.pythonModule = config.deps.python3;
|
||||
# required for python.withPackages to recognize it as a python package.
|
||||
public.pythonModule = config.deps.python;
|
||||
};
|
||||
});
|
||||
in {inherit packages;};
|
||||
|
@ -14,9 +14,6 @@ in {
|
||||
pyproject = l.mkOption {
|
||||
type = t.path;
|
||||
};
|
||||
pythonInterpreter = l.mkOption {
|
||||
type = t.package;
|
||||
};
|
||||
|
||||
sourceSelector = import ./sourceSelectorOption.nix {inherit lib;};
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user