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: 62b3e5592347
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: bae2f2dbda35
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Oct 2, 2018

  1. hyperfine: 1.1.0 -> 1.3.0 (#47521)

    @dywedir @xeji
    dywedir authored and xeji committed Oct 2, 2018
    Copy the full SHA
    bae2f2d View commit details
Showing with 11 additions and 5 deletions.
  1. +8 −4 pkgs/tools/misc/hyperfine/default.nix
  2. +3 −1 pkgs/top-level/all-packages.nix
12 changes: 8 additions & 4 deletions pkgs/tools/misc/hyperfine/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,21 @@
{ stdenv, fetchFromGitHub, rustPlatform }:
{ stdenv, fetchFromGitHub, rustPlatform
, Security
}:

rustPlatform.buildRustPackage rec {
name = "hyperfine-${version}";
version = "1.1.0";
version = "1.3.0";

src = fetchFromGitHub {
owner = "sharkdp";
repo = "hyperfine";
rev = "refs/tags/v${version}";
sha256 = "13h43sjp059yq3bmdbb9i1082fkx5yzmhrkf5kpkxhnyn67xbdsg";
sha256 = "06kghk3gmi47c8g28n8srpb578yym104fa30s4m33ajb60fvwlld";
};

cargoSha256 = "0saf0hl21ba2ckqbsw64908nvs0x1rjrnm73ackzpmv5pi9j567s";
cargoSha256 = "1rwh8kyrkk5jza4lx7sf1pln68ljwsv4ccyfvzcvc140y7ya8ps0";

buildInputs = stdenv.lib.optional stdenv.isDarwin Security;

meta = with stdenv.lib; {
description = "Command-line benchmarking tool";
4 changes: 3 additions & 1 deletion pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -21734,7 +21734,9 @@ with pkgs;

hplipWithPlugin_3_16_11 = hplip_3_16_11.override { withPlugin = true; };

hyperfine = callPackage ../tools/misc/hyperfine { };
hyperfine = callPackage ../tools/misc/hyperfine {
inherit (darwin.apple_sdk.frameworks) Security;
};

epkowa = callPackage ../misc/drivers/epkowa { };