diff --git a/modules/dream2nix/WIP-python-pdm/default.nix b/modules/dream2nix/WIP-python-pdm/default.nix index 269c2aa7cc..b434d04687 100644 --- a/modules/dream2nix/WIP-python-pdm/default.nix +++ b/modules/dream2nix/WIP-python-pdm/default.nix @@ -75,6 +75,7 @@ in { buildPackages curl jq + mkShell runCommand stdenvNoCC stdenv @@ -100,6 +101,12 @@ in { # all packages attrs prefixed with version (lib.attrValues config.groups.default.packages); }; + public.devShell = let + interpreter = config.deps.python.withPackages (ps: config.mkDerivation.propagatedBuildInputs); + in + config.deps.mkShell { + packages = [interpreter]; + }; groups = let groupNames = lib.attrNames groups_with_deps; populateGroup = groupname: let @@ -131,7 +138,7 @@ in { (dream2nix.overrides.python.${name} or {}) ]; inherit name; - version = pkg.version; + version = lib.mkDefault pkg.version; buildPythonPackage = { format = lib.mkDefault ( if lib.hasSuffix ".whl" source.file diff --git a/modules/dream2nix/core/lock/default.nix b/modules/dream2nix/core/lock/default.nix index 58b5d4bb89..9d4c128e67 100644 --- a/modules/dream2nix/core/lock/default.nix +++ b/modules/dream2nix/core/lock/default.nix @@ -27,7 +27,7 @@ repo_path = Path(subprocess.run( ['${config.paths.findRoot}'], # noqa: E501 - check=True, text=True, capture_output=True + check=True, text=True, stdout=subprocess.PIPE ).stdout.strip()) lock_path_rel = Path('${config.paths.package}/${config.paths.lockFile}') # noqa: E501 lock_path = repo_path / lock_path_rel.relative_to(lock_path_rel.anchor)