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:19:30 +01:00
parent d4b8cef242
commit 136246de79
5 changed files with 22 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,7 +37,7 @@
, clan-core-path
, writeShellScriptBin
, nodePackages
, democlan
, democlan ? null
}:
let
@@ -155,17 +155,17 @@ 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
# 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
'';
# 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}

2
pkgs/clan-cli/flake-module.nix
View File

@@ -37,7 +37,7 @@
clan-cli = pkgs.python3.pkgs.callPackage ./default.nix {
inherit (self'.packages) ui-assets;
inherit (inputs) nixpkgs;
inherit (inputs) democlan;
# inherit (inputs) democlan;
inherit (inputs.nixpkgs-for-deal.legacyPackages.${system}.python3Packages) deal;
#inherit (inputs.nixpkgs-for-deal.legacyPackages.${system}.python3Packages) schemathesis;
clan-core-path = clanCoreWithVendoredDeps;

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

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