chn/bscpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove cluster scripts from nixtools

Browse Source
This commit is contained in:
Rodrigo Arias Mallo 2020-10-13 14:16:30 +02:00
parent 04328d81ff
commit 05b37aa11d
2 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
bsc/nixtools/default.nix
View File

@ -1,25 +1,17 @@
{ {
stdenv stdenv
, glibc , glibc
, targetCluster
, nixPrefix
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "nixtools-${targetCluster}"; pname = "nixtools";
#version = "${src.shortRev}"; version = "${src.shortRev}";
src = ~/nixtools; src = builtins.fetchGit {
url = "ssh://git@bscpm02.bsc.es/rarias/nixtools";
ref = "master";
};
buildInputs = [ glibc.static ]; buildInputs = [ glibc.static ];
makeFlags = [ "DESTDIR=$(out)" ]; makeFlags = [ "DESTDIR=$(out)" ];
preBuild = "env"; preBuild = "env";
dontPatchShebangs = true; 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";
#};
} }

5
overlay.nix
View File

@ -135,10 +135,7 @@ let
enableStatic = true; enableStatic = true;
}; };
nixtools = callPackage ./bsc/nixtools/default.nix { nixtools = callPackage ./bsc/nixtools/default.nix { };
targetCluster = "mn4";
nixPrefix = "/gpfs/projects/bsc15/nix";
};
garlicTools = callPackage ./garlic/tools.nix {}; garlicTools = callPackage ./garlic/tools.nix {};