From 23448e8bf2054a4d9b92e4986952214abc1c7804 Mon Sep 17 00:00:00 2001 From: legendofmiracles Date: Thu, 4 Nov 2021 11:51:24 -0600 Subject: eztrace: 1-1-7 -> 1.1-11, fix build, switch to fetchFromGitLab, refactor --- .../tools/profiling/EZTrace/default.nix | 40 ++++++++++++---------- 1 file changed, 21 insertions(+), 19 deletions(-) (limited to 'pkgs/development/tools/profiling') diff --git a/pkgs/development/tools/profiling/EZTrace/default.nix b/pkgs/development/tools/profiling/EZTrace/default.nix index e057fc8ebe1..41b343cdf1c 100644 --- a/pkgs/development/tools/profiling/EZTrace/default.nix +++ b/pkgs/development/tools/profiling/EZTrace/default.nix @@ -1,31 +1,33 @@ -{ lib, stdenv -, fetchurl, autoconf, gfortran -, libelf, libiberty, zlib, libbfd, libopcodes -, buildPackages +{ lib, + stdenv, + fetchFromGitLab, + gfortran, + libelf, + libiberty, + zlib, + libbfd, + libopcodes, + buildPackages, + autoreconfHook }: stdenv.mkDerivation rec { - version = "1.1-7"; pname = "EZTrace"; + version = "1.1-11"; - src = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/file/37155/eztrace-${version}.tar.gz"; - sha256 = "0cr2d4fdv4ljvag55dsz3rpha1jan2gc3jhr06ycyk43450pl58p"; + src = fetchFromGitLab { + owner = "eztrace"; + repo = "eztrace"; + rev = "eztrace-${version}"; + sha256 = "sha256-A6HMr4ib5Ka1lTbbTQOdq3kIdCoN/CwAKRdXdv9wpfU="; }; - # Goes past the rpl_malloc linking failure; fixes silent file breakage - preConfigure = '' - export ac_cv_func_malloc_0_nonnull=yes - substituteInPlace ./configure \ - --replace "/usr/bin/file" "${buildPackages.file}/bin/file" - ''; - - nativeBuildInputs = [ autoconf gfortran ]; + nativeBuildInputs = [ gfortran autoreconfHook ]; buildInputs = [ libelf libiberty zlib libbfd libopcodes ]; - meta = { + meta = with lib; { description = "Tool that aims at generating automatically execution trace from HPC programs"; - license = lib.licenses.cecill-b; - maintainers = with lib.maintainers; [ ]; + license = licenses.cecill-b; + maintainers = with maintainers; [ ]; }; } -- cgit 1.4.1