bonnie: refactor

+19 -9
+18 -6
pkgs/tools/filesystems/bonnie/default.nix
··· 1 - { lib, stdenv, fetchurl, perl }: 1 + { lib 2 + , stdenv 3 + , fetchurl 4 + , fetchpatch 5 + }: 2 6 3 7 stdenv.mkDerivation rec { 4 8 pname = "bonnie++"; ··· 6 10 7 11 src = fetchurl { 8 12 url = "https://www.coker.com.au/bonnie++/bonnie++-${version}.tgz"; 9 - sha256 = "sha256-qNM7vYG8frVZzlv25YS5tT+uo5zPtK6S5Y8nJX5Gjw4="; 13 + hash = "sha256-qNM7vYG8frVZzlv25YS5tT+uo5zPtK6S5Y8nJX5Gjw4="; 10 14 }; 11 15 12 - enableParallelBuilding = true; 16 + patches = [ 17 + (fetchpatch { 18 + name = "bonnie++-2.00a-gcc11.patch"; 19 + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-benchmarks/bonnie++/files/bonnie++-2.00a-gcc11.patch?id=d0f29755e969c805fbd6240905e3925671340666"; 20 + hash = "sha256-/cIC4HYQco5Nv1UoTELl2OGD5hdWhbz3L0+GjN/vcdE="; 21 + }) 22 + ]; 13 23 14 - buildInputs = [ perl ]; 24 + enableParallelBuilding = true; 15 25 16 26 meta = { 17 - homepage = "http://www.coker.com.au/bonnie++/"; 18 27 description = "Hard drive and file system benchmark suite"; 19 - license = lib.licenses.gpl2; 28 + homepage = "http://www.coker.com.au/bonnie++/"; 29 + license = lib.licenses.gpl2Only; 30 + mainProgram = "bonnie++"; 31 + maintainers = with lib.maintainers; [ wegank ]; 20 32 platforms = lib.platforms.linux ++ lib.platforms.darwin; 21 33 }; 22 34 }
+1 -3
pkgs/top-level/all-packages.nix
··· 3597 3597 3598 3598 bonnmotion = callPackage ../development/tools/misc/bonnmotion { }; 3599 3599 3600 - bonnie = callPackage ../tools/filesystems/bonnie { 3601 - stdenv = gcc10StdenvCompat; 3602 - }; 3600 + bonnie = callPackage ../tools/filesystems/bonnie { }; 3603 3601 3604 3602 boron = callPackage ../development/interpreters/boron { }; 3605 3603