nix-community/dream2nix
1
1
Fork 0
mirror of https://github.com/nix-community/dream2nix.git synced 2024-10-26 23:28:55 +03:00
Code Issues Projects Releases Wiki Activity

pdm: stop using config.deps.python3 in favor of config.deps.python

Browse Source
This commit is contained in:
DavHau 2024-01-24 15:06:03 +07:00 committed by mergify[bot]
parent 0a30902e27
commit 16f2c654c6
3 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
examples/packages/single-language/python-pdm/default.nix
View File

@ -7,13 +7,16 @@
imports = [ imports = [
dream2nix.modules.dream2nix.WIP-python-pdm dream2nix.modules.dream2nix.WIP-python-pdm
]; ];
# select python 3.10
deps = {nixpkgs, ...}: {
python = nixpkgs.python310;
};
pdm.lockfile = ./pdm.lock; pdm.lockfile = ./pdm.lock;
pdm.pyproject = ./pyproject.toml; pdm.pyproject = ./pyproject.toml;
pdm.pythonInterpreter = config.deps.python3;
mkDerivation = { mkDerivation = {
src = ./.; src = ./.;
buildInputs = [ buildInputs = [
config.deps.python3.pkgs.pdm-backend config.deps.python.pkgs.pdm-backend
]; ];
}; };
} }

19
modules/dream2nix/WIP-python-pdm/default.nix
View File

@ -6,9 +6,9 @@
}: let }: let
libpdm = import ./lib.nix { libpdm = import ./lib.nix {
inherit lib libpyproject; inherit lib libpyproject;
python3 = config.deps.python3; python3 = config.deps.python;
targetPlatform = 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;}; libpyproject = import (dream2nix.inputs.pyproject-nix + "/lib") {inherit lib;};
@ -16,13 +16,13 @@
inherit lib; inherit lib;
curl = config.deps.curl; curl = config.deps.curl;
jq = config.deps.jq; jq = config.deps.jq;
python3 = config.deps.python3; python3 = config.deps.python;
runCommand = config.deps.runCommand; runCommand = config.deps.runCommand;
stdenvNoCC = config.deps.stdenvNoCC; stdenvNoCC = config.deps.stdenvNoCC;
}; };
lock_data = lib.importTOML config.pdm.lockfile; 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); pyproject = libpdm.loadPdmPyProject (lib.importTOML config.pdm.pyproject);
@ -79,13 +79,12 @@ in {
stdenvNoCC stdenvNoCC
stdenv stdenv
; ;
python = config.deps.python3; python = lib.mkDefault config.deps.python3;
}; };
overrideAll = { overrideAll = {
imports = [commonModule]; imports = [commonModule];
deps = {nixpkgs, ...}: { deps = {nixpkgs, ...}: {
python3 = lib.mkDefault config.deps.python3; python = lib.mkDefault config.deps.python;
python = lib.mkDefault config.deps.python3;
}; };
sourceSelector = lib.mkOptionDefault config.pdm.sourceSelector; sourceSelector = lib.mkOptionDefault config.pdm.sourceSelector;
}; };
@ -94,7 +93,7 @@ in {
format = lib.mkDefault "pyproject"; format = lib.mkDefault "pyproject";
}; };
mkDerivation = { mkDerivation = {
buildInputs = map (name: config.deps.python3.pkgs.${name}) buildSystemNames; buildInputs = map (name: config.deps.python.pkgs.${name}) buildSystemNames;
propagatedBuildInputs = propagatedBuildInputs =
map map
(x: (lib.head (lib.attrValues x)).public) (x: (lib.head (lib.attrValues x)).public)
@ -160,8 +159,8 @@ in {
doCheck = lib.mkDefault false; doCheck = lib.mkDefault false;
dontStrip = lib.mkDefault true; dontStrip = lib.mkDefault true;
}; };
# required for python3.withPackages to recognize it as a python package. # required for python.withPackages to recognize it as a python package.
public.pythonModule = config.deps.python3; public.pythonModule = config.deps.python;
}; };
}); });
in {inherit packages;}; in {inherit packages;};

3
modules/dream2nix/WIP-python-pdm/interface.nix
View File

@ -14,9 +14,6 @@ in {
pyproject = l.mkOption { pyproject = l.mkOption {
type = t.path; type = t.path;
}; };
pythonInterpreter = l.mkOption {
type = t.package;
};
sourceSelector = import ./sourceSelectorOption.nix {inherit lib;}; sourceSelector = import ./sourceSelectorOption.nix {inherit lib;};
}; };