From 1421309df4793bc69e722c2f7a6910da062382b6 Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Fri, 28 May 2021 18:38:34 -0700 Subject: [PATCH] papi: 5.6.0 -> 6.0.0.1 --- .../science/benchmark/papi/default.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/science/benchmark/papi/default.nix b/pkgs/development/libraries/science/benchmark/papi/default.nix index c265f24c182b..d4610d60415b 100644 --- a/pkgs/development/libraries/science/benchmark/papi/default.nix +++ b/pkgs/development/libraries/science/benchmark/papi/default.nix @@ -2,19 +2,17 @@ , fetchurl }: -stdenv.mkDerivation { - version = "5.6.0"; +stdenv.mkDerivation rec { + version = "6.0.0.1"; pname = "papi"; src = fetchurl { - url = "https://bitbucket.org/icl/papi/get/papi-5-6-0-t.tar.gz"; - sha256 = "13mngf9kl0y2wfxqvkad0smdaag7k8fvw82b4312gx62nwhc1i6r"; + url = "https://bitbucket.org/icl/papi/get/papi-${lib.replaceStrings ["."] ["-"] version}-t.tar.gz"; + sha256 = "1jd67yadyffzxwsqlylsi0bx8ishb0cgj2ziz1wdslaz6ylvyf9j"; }; - NIX_CFLAGS_COMPILE = "-Wno-error=format-truncation"; - - preConfigure = '' - cd src + setSourceRoot = '' + sourceRoot=$(echo */src) ''; doCheck = true; @@ -22,9 +20,9 @@ stdenv.mkDerivation { meta = with lib; { homepage = "https://icl.utk.edu/papi/"; - description = "PAPI provides the tool designer and application engineer with a consistent interface and methodology for use of the performance counter hardware found in most major microprocessors"; + description = "Library providing access to various hardware performance counters"; license = licenses.bsdOriginal; platforms = platforms.linux; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc zhaofengli ]; }; }