Remove cluster scripts from nixtools
This commit is contained in:
parent
04328d81ff
commit
05b37aa11d
@ -1,25 +1,17 @@
|
||||
{
|
||||
stdenv
|
||||
, glibc
|
||||
, targetCluster
|
||||
, nixPrefix
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "nixtools-${targetCluster}";
|
||||
#version = "${src.shortRev}";
|
||||
src = ~/nixtools;
|
||||
pname = "nixtools";
|
||||
version = "${src.shortRev}";
|
||||
src = builtins.fetchGit {
|
||||
url = "ssh://git@bscpm02.bsc.es/rarias/nixtools";
|
||||
ref = "master";
|
||||
};
|
||||
buildInputs = [ glibc.static ];
|
||||
makeFlags = [ "DESTDIR=$(out)" ];
|
||||
preBuild = "env";
|
||||
dontPatchShebangs = true;
|
||||
inherit nixPrefix targetCluster;
|
||||
postPatch = ''
|
||||
substituteAllInPlace scripts/cobi/runexp
|
||||
sed -i s:@nixtools@:$out:g scripts/cobi/runexp
|
||||
'';
|
||||
#src = builtins.fetchGit {
|
||||
# url = "ssh://git@bscpm02.bsc.es/rarias/nixtools";
|
||||
# ref = "master";
|
||||
#};
|
||||
}
|
||||
|
@ -135,10 +135,7 @@ let
|
||||
enableStatic = true;
|
||||
};
|
||||
|
||||
nixtools = callPackage ./bsc/nixtools/default.nix {
|
||||
targetCluster = "mn4";
|
||||
nixPrefix = "/gpfs/projects/bsc15/nix";
|
||||
};
|
||||
nixtools = callPackage ./bsc/nixtools/default.nix { };
|
||||
|
||||
garlicTools = callPackage ./garlic/tools.nix {};
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user