From 9b34f19bdf7ffaac555da9346bf3b8d95acaa9df Mon Sep 17 00:00:00 2001 From: Ada Date: Wed, 23 Feb 2022 19:40:32 -0700 Subject: [PATCH] shell dev: remove old code --- artiq-fast/shell-dev.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/artiq-fast/shell-dev.nix b/artiq-fast/shell-dev.nix index 88deddd..df8f5ef 100644 --- a/artiq-fast/shell-dev.nix +++ b/artiq-fast/shell-dev.nix @@ -3,7 +3,6 @@ with import {}; let - set-scratch-dir = ./set-scratch-dir.sh; artiqpkgs = import ./default.nix { inherit pkgs; }; vivado = import ./vivado.nix { inherit pkgs; }; sipyco = python3Packages.buildPythonPackage rec { @@ -74,14 +73,13 @@ in artiqpkgs.openocd ]; shellHook = '' - source ${set-scratch-dir}; - export PYTHONPATH="$scratch_dir/artiq_tools:$PYTHONPATH" - export PYTHONPATH="$scratch_dir/oitg:$PYTHONPATH" - export PYTHONPATH="$scratch_dir/analysis-library:$PYTHONPATH" - export PYTHONPATH="$scratch_dir/python-library:$PYTHONPATH" - export PYTHONPATH="$scratch_dir/strontium-library:$PYTHONPATH" - export PYTHONPATH="$scratch_dir/ndscan:$PYTHONPATH" - export PYTHONPATH="$scratch_dir/sipyco:$PYTHONPATH" + export PYTHONPATH="/home/thomp/scratch/artiq_tools:$PYTHONPATH" + export PYTHONPATH="/home/thomp/scratch/oitg:$PYTHONPATH" + export PYTHONPATH="/home/thomp/scratch/analysis-library:$PYTHONPATH" + export PYTHONPATH="/home/thomp/scratch/python-library:$PYTHONPATH" + export PYTHONPATH="/home/thomp/scratch/strontium-library:$PYTHONPATH" + export PYTHONPATH="/home/thomp/scratch/ndscan:$PYTHONPATH" + export PYTHONPATH="/home/thomp/scratch/sipyco:$PYTHONPATH" ''; TARGET_AR="or1k-linux-ar"; }