From d03988738614712e91d97cc13fddf011b3f2d822 Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Sun, 10 Mar 2019 10:09:55 +0100
Subject: [PATCH 1/2] bonnie: 1.97.3 -> 1.98

Version is already available in debian testing.
---
 pkgs/tools/filesystems/bonnie/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/filesystems/bonnie/default.nix b/pkgs/tools/filesystems/bonnie/default.nix
index 55edf97d17b..bd7c8f0ecfb 100644
--- a/pkgs/tools/filesystems/bonnie/default.nix
+++ b/pkgs/tools/filesystems/bonnie/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "bonnie++-1.97.3";
+  name = "bonnie++-1.98";
   src = fetchurl {
-    url = "https://fossies.org/linux/privat/${name}.tgz";
-    sha256 = "0vkl42rsrsy95fc1ykc6g8rsdbnpxayvdaihnnkly1fww1m3hyz2";
+    url = "https://www.coker.com.au/bonnie++/${name}.tgz";
+    sha256 = "010bmlmi0nrlp3aq7p624sfaj5a65lswnyyxk3cnz1bqig0cn2vf";
   };
 
   enableParallelBuilding = true;

From 260f0e0c5cb4196c74624e5c7235824e554f1914 Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Sun, 10 Mar 2019 10:24:02 +0100
Subject: [PATCH 2/2] bonnie: fix bon_csv2txt utility

The bon_csv2txt utility is a perl script. By default it is looking forbonnie: fix bon_csv2txt utility

The bon_csv2txt utility is a perl script. By default it is looking for
perl in /usr/bin/perl which doesn't work on nixos.

This changes patches the perl interpreter correctly. But this comes as at a cost of
closure size increase from 34'006'536 bytes to  90'289'456 bytes as perl is now a dependency.

An alterantive would be to patch the file to use /usr/bin/env perl and just rely on a perl interpreter
being present in PATH.

perl in /usr/bin/perl which doesn't work on nixos.

This changes patches the perl interpreter correctly. But this comes as at a cost of
closure size increase as perl is now a dependency.

An alterantive would be to patch the file to use /usr/bin/env perl and just rely on a perl interpreter
being present in PATH.
---
 pkgs/tools/filesystems/bonnie/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/filesystems/bonnie/default.nix b/pkgs/tools/filesystems/bonnie/default.nix
index bd7c8f0ecfb..57dc51e4111 100644
--- a/pkgs/tools/filesystems/bonnie/default.nix
+++ b/pkgs/tools/filesystems/bonnie/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, perl }:
 
 stdenv.mkDerivation rec {
   name = "bonnie++-1.98";
@@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  buildInputs = [ perl ];
+
   meta = {
     homepage = http://www.coker.com.au/bonnie++/;
     description = "Hard drive and file system benchmark suite";