From 030d31c8b41e6c91b8c98e2efa37b551d65da181 Mon Sep 17 00:00:00 2001 From: Qubasa Date: Sat, 9 Dec 2023 00:23:19 +0100 Subject: [PATCH] Removed democlan dependency --- pkgs/clan-cli/default.nix | 12 ------------ pkgs/clan-cli/shell.nix | 3 +-- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/pkgs/clan-cli/default.nix b/pkgs/clan-cli/default.nix index 685df1671..daa999419 100644 --- a/pkgs/clan-cli/default.nix +++ b/pkgs/clan-cli/default.nix @@ -37,7 +37,6 @@ , clan-core-path , writeShellScriptBin , nodePackages -, democlan ? null }: let @@ -155,17 +154,6 @@ python3.pkgs.buildPythonApplication { ${checkPython}/bin/python -m pytest -m "not impure and with_core" -s ./tests 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" { } '' echo ${clan-pytest-without-core} diff --git a/pkgs/clan-cli/shell.nix b/pkgs/clan-cli/shell.nix index bfa47087f..055154739 100644 --- a/pkgs/clan-cli/shell.nix +++ b/pkgs/clan-cli/shell.nix @@ -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 checkScript = writeScriptBin "check" '' nix build .#checks.${system}.{treefmt,clan-pytest} -L "$@" @@ -24,7 +24,6 @@ mkShell { shellHook = '' tmp_path=$(realpath ./.direnv) - # export DEMOCLAN_ROOT=${democlan} repo_root=$(realpath .) mkdir -p "$tmp_path/python/${pythonWithDeps.sitePackages}"