Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 83e3aff78d2b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f9bb0b3c3af4
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 10, 2019

  1. bonnie: 1.97.3 -> 1.98 

    Version is already available in debian testing.
    @bachp
    bachp committed Mar 10, 2019
    Copy the full SHA
    d039887 View commit details

  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.
    @bachp
    bachp committed Mar 10, 2019
    Copy the full SHA
    260f0e0 View commit details

  3. Merge pull request #57232 from bachp/bonnie-1.98 

    bonnie: 1.97.3 -> 1.98
    @srhb
    srhb authored Mar 10, 2019
    Copy the full SHA
    f9bb0b3 View commit details
Showing with 6 additions and 4 deletions.
  1. +6 −4 pkgs/tools/filesystems/bonnie/default.nix
10 changes: 6 additions & 4 deletions pkgs/tools/filesystems/bonnie/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
{ stdenv, fetchurl }:
{ stdenv, fetchurl, perl }:

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;

buildInputs = [ perl ];

meta = {
homepage = http://www.coker.com.au/bonnie++/;
description = "Hard drive and file system benchmark suite";