yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Removed democlan dependency

Browse Source
This commit is contained in:
Qubasa
2023-12-09 00:23:19 +01:00
parent b319db0df9
commit 030d31c8b4
2 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/clan-cli/default.nix
View File

@@ -37,7 +37,6 @@
, clan-core-path , clan-core-path
, writeShellScriptBin , writeShellScriptBin
, nodePackages , nodePackages
, democlan ? null
}: }:
let let
@@ -155,17 +154,6 @@ python3.pkgs.buildPythonApplication {
${checkPython}/bin/python -m pytest -m "not impure and with_core" -s ./tests ${checkPython}/bin/python -m pytest -m "not impure and with_core" -s ./tests
touch $out touch $out
''; '';
# clan-pytest-with-democlan = runCommand "clan-pytest-with-democlan" { nativeBuildInputs = [ checkPython ] ++ pytestDependencies; } ''
# cp -r ${source} ./src
# chmod +w -R ./src
# cd ./src
# export DEMOCLAN_ROOT=${democlan}
# export CLAN_CORE=${clan-core-path}
# export NIX_STATE_DIR=$TMPDIR/nix IN_NIX_SANDBOX=1
# ${checkPython}/bin/python -m pytest -m "not impure and with_democlan" -s ./tests
# touch $out
# '';
clan-pytest = runCommand "clan-pytest" { } '' clan-pytest = runCommand "clan-pytest" { } ''
echo ${clan-pytest-without-core} echo ${clan-pytest-without-core}

3
pkgs/clan-cli/shell.nix
View File

@@ -1,4 +1,4 @@
{ nix-unit, clan-cli, ui-assets, system, mkShell, writeScriptBin, openssh, ruff, python3, democlan ? null }: { nix-unit, clan-cli, ui-assets, system, mkShell, writeScriptBin, openssh, ruff, python3 }:
let let
checkScript = writeScriptBin "check" '' checkScript = writeScriptBin "check" ''
nix build .#checks.${system}.{treefmt,clan-pytest} -L "$@" nix build .#checks.${system}.{treefmt,clan-pytest} -L "$@"
@@ -24,7 +24,6 @@ mkShell {
shellHook = '' shellHook = ''
tmp_path=$(realpath ./.direnv) tmp_path=$(realpath ./.direnv)
# export DEMOCLAN_ROOT=${democlan}
repo_root=$(realpath .) repo_root=$(realpath .)
mkdir -p "$tmp_path/python/${pythonWithDeps.sitePackages}" mkdir -p "$tmp_path/python/${pythonWithDeps.sitePackages}"