diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
| commit | 99fcaeccb89621dd492203ce1f2d551c06f228ed (patch) | |
| tree | 41cb730ae07383004789779b0f6e11cb3f4642a3 /nixpkgs/pkgs/development/libraries/criterion | |
| parent | 59c5f5ac8682acc13bb22bc29c7cf02f7d75f01f (diff) | |
| parent | 75a5ebf473cd60148ba9aec0d219f72e5cf52519 (diff) | |
| download | nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.gz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.bz2 nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.lz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.xz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.zst nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/nixos/modules/config/console.nix nixpkgs/nixos/modules/services/mail/mailman.nix nixpkgs/nixos/modules/services/mail/public-inbox.nix nixpkgs/nixos/modules/services/mail/rss2email.nix nixpkgs/nixos/modules/services/networking/ssh/sshd.nix nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix nixpkgs/pkgs/applications/networking/irc/weechat/default.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/interpreters/python/default.nix nixpkgs/pkgs/development/node-packages/overrides.nix nixpkgs/pkgs/development/tools/b4/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix nixpkgs/pkgs/servers/mail/public-inbox/default.nix nixpkgs/pkgs/tools/security/pinentry/default.nix nixpkgs/pkgs/tools/text/unoconv/default.nix nixpkgs/pkgs/top-level/all-packages.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/criterion')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/criterion/default.nix | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/nixpkgs/pkgs/development/libraries/criterion/default.nix b/nixpkgs/pkgs/development/libraries/criterion/default.nix index 723865ab11d3..9b3304f6012f 100644 --- a/nixpkgs/pkgs/development/libraries/criterion/default.nix +++ b/nixpkgs/pkgs/development/libraries/criterion/default.nix @@ -1,19 +1,20 @@ -{ lib, stdenv, fetchFromGitHub, boxfort, cmake, libcsptr, pkg-config, gettext -, dyncall , nanomsg, python3Packages }: +{ lib, stdenv, fetchFromGitHub, boxfort, meson, libcsptr, pkg-config, gettext +, cmake, ninja, protobuf, libffi, libgit2, dyncall, nanomsg, nanopbMalloc +, python3Packages }: stdenv.mkDerivation rec { - version = "2.3.3"; pname = "criterion"; + version = "2.4.1"; src = fetchFromGitHub { owner = "Snaipe"; repo = "Criterion"; rev = "v${version}"; - sha256 = "0y1ay8is54k3y82vagdy0jsa3nfkczpvnqfcjm5n9iarayaxaq8p"; + sha256 = "KT1XvhT9t07/ubsqzrVUp4iKcpVc1Z+saGF4pm2RsgQ="; fetchSubmodules = true; }; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ meson ninja cmake pkg-config protobuf ]; buildInputs = [ boxfort.dev @@ -21,13 +22,18 @@ stdenv.mkDerivation rec { gettext libcsptr nanomsg + nanopbMalloc + libgit2 + libffi ]; - checkInputs = with python3Packages; [ cram ]; + nativeCheckInputs = with python3Packages; [ cram ]; - cmakeFlags = [ "-DCTESTS=ON" ]; doCheck = true; - checkTarget = "criterion_tests test"; + + postPatch = '' + patchShebangs ci/isdir.py src/protocol/gen-pb.py + ''; outputs = [ "dev" "out" ]; |