From 980edd9751a3cd87f792ab1e6ed3e954b100c9ad Mon Sep 17 00:00:00 2001 From: chn Date: Fri, 12 Sep 2025 08:18:22 +0800 Subject: [PATCH] Revert "devices.jykang.xmuhpc: add python-cai" This reverts commit 66ef3a1eb9e959814d3d9bc77596b449bfe608fe. --- devices/jykang.xmuhpc/default.nix | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/devices/jykang.xmuhpc/default.nix b/devices/jykang.xmuhpc/default.nix index ead674c4..d50a1d22 100644 --- a/devices/jykang.xmuhpc/default.nix +++ b/devices/jykang.xmuhpc/default.nix @@ -2,23 +2,15 @@ # sudo nix-store --store 'local?store=/data/gpfs01/jykang/.nix/store&state=/data/gpfs01/jykang/.nix/state&log=/data/gpfs01/jykang/.nix/log' -qR ./result | grep -Fxv -f <(ssh jykang find .nix/store -maxdepth 1 -exec realpath '{}' '\;') | sudo xargs nix-store --store 'local?store=/data/gpfs01/jykang/.nix/store&state=/data/gpfs01/jykang/.nix/state&log=/data/gpfs01/jykang/.nix/log' --export | xz -T0 | pv > jykang.nar.xz # cat data.nar | nix-store --import { inputs, localLib }: -let - pkgs = import inputs.nixpkgs (localLib.buildNixpkgsConfig - { - inputs = { inherit (inputs.nixpkgs) lib; topInputs = inputs; }; - nixpkgs = { march = "haswell"; cuda = null; nixRoot = "/data/gpfs01/jykang/.nix"; nixos = false; }; - }); - python-cai = - let py = pkgs.python3.withPackages (ps: with ps; [ pytorch ]); - in pkgs.runCommand "python-cai" { } - '' - mkdir -p $out/bin - ln -s ${py}/bin/python3 $out/bin/python-cai - ''; +let pkgs = import inputs.nixpkgs (localLib.buildNixpkgsConfig +{ + inputs = { inherit (inputs.nixpkgs) lib; topInputs = inputs; }; + nixpkgs = { march = "haswell"; cuda = null; nixRoot = "/data/gpfs01/jykang/.nix"; nixos = false; }; +}); in pkgs.symlinkJoin { name = "jykang"; - paths = with pkgs; [ hello iotop gnuplot localPackages.vaspkit pv btop python-cai ]; + paths = with pkgs; [ hello iotop gnuplot localPackages.vaspkit pv btop ]; postBuild = "echo ${inputs.self.rev or "dirty"} > $out/.version"; passthru = { inherit pkgs; }; }