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

Merge TAMPI release and git in the same file

Browse Source 
In order to reduce duplicate information we just place the two sources
in the same file.

Reviewed-by: Aleix Roca Nonell <aleix.rocanonell@bsc.es>
This commit is contained in:
Rodrigo Arias 2023-11-29 16:59:19 +01:00
parent 9aaea0da0e
commit fec4ddf6ab
2 changed files with 35 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
pkgs/tampi/default.nix
View File

@ -9,22 +9,46 @@
, mpi , mpi
, gcc , gcc
, autoreconfHook , autoreconfHook
, useGit ? false
, gitUrl ? "ssh://git@bscpm03.bsc.es/interoperability/tampi.git"
, gitBranch ? "master"
, gitCommit ? "16f92094ca6da25e2f561c000f5fbc2901944f7b"
}: }:
stdenv.mkDerivation rec { let
version = "3.0"; release = rec {
version = "3.0";
src = fetchFromGitHub {
owner = "bsc-pm";
repo = "tampi";
rev = "v${version}";
hash = "sha256-qdWBxPsXKM428F2ojt2B6/0ZsQyGzEiojNaqbhDmrks=";
};
};
git = rec {
version = src.shortRev;
src = builtins.fetchGit {
url = gitUrl;
ref = gitBranch;
rev = gitCommit;
};
};
source = if (useGit) then git else release;
in stdenv.mkDerivation rec {
pname = "tampi"; pname = "tampi";
inherit (source) src version;
enableParallelBuilding = true; enableParallelBuilding = true;
separateDebugInfo = true; separateDebugInfo = true;
buildInputs = [ autoreconfHook automake autoconf libtool gnumake boost mpi gcc ]; buildInputs = [
autoreconfHook
automake
autoconf
libtool
gnumake
boost
mpi
gcc
];
dontDisableStatic = true; dontDisableStatic = true;
src = fetchFromGitHub {
owner = "bsc-pm";
repo = "tampi";
rev = "v${version}";
hash = "sha256-qdWBxPsXKM428F2ojt2B6/0ZsQyGzEiojNaqbhDmrks=";
};
hardeningDisable = [ "all" ]; hardeningDisable = [ "all" ];
} }

26
pkgs/tampi/git.nix
View File

@ -1,26 +0,0 @@
{
stdenv
, fetchurl
, automake
, autoconf
, libtool
, gnumake
, boost
, mpi
, gcc
, autoreconfHook
}:
stdenv.mkDerivation rec {
pname = "tampi";
version = "${src.shortRev}";
enableParallelBuilding = true;
buildInputs = [ autoreconfHook automake autoconf libtool gnumake boost mpi gcc ];
dontDisableStatic = true;
makeFlags = [ "V=1" ];
src = builtins.fetchGit {
url = "ssh://git@bscpm03.bsc.es/interoperability/tampi";
ref = "master";
};
hardeningDisable = [ "all" ];
}