diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-09-27 16:00:58 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-09-27 16:00:58 +0000 |
| commit | c504e5d19d940926b3ddcf62c983d66f49f3cbb2 (patch) | |
| tree | ec955e58bcac2cb93b9f8c10786b23f61d40cd7e /nixpkgs/pkgs/development/libraries/criterion | |
| parent | 72789cefce7b17419815f600fbd18238d89afcc9 (diff) | |
| parent | 1737f98af6667560e3e4f930312f9b5002649d04 (diff) | |
| download | nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.gz nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.bz2 nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.lz nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.xz nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.zst nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.zip | |
Merge commit '1737f98af6667560e3e4f930312f9b5002649d04'
Conflicts: nixpkgs/nixos/modules/services/networking/ssh/sshd.nix nixpkgs/pkgs/applications/networking/irc/weechat/scripts/default.nix nixpkgs/pkgs/development/node-packages/default.nix nixpkgs/pkgs/development/python-modules/priority/deadline.patch
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/criterion')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/criterion/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/development/libraries/criterion/default.nix b/nixpkgs/pkgs/development/libraries/criterion/default.nix index ba436fec0a26..a1e7137d92ab 100644 --- a/nixpkgs/pkgs/development/libraries/criterion/default.nix +++ b/nixpkgs/pkgs/development/libraries/criterion/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, boxfort, cmake, libcsptr, pkg-config, gettext -, dyncall , nanomsg, python37Packages }: +, dyncall , nanomsg, python3Packages }: stdenv.mkDerivation rec { version = "2.3.3"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nanomsg ]; - checkInputs = with python37Packages; [ cram ]; + checkInputs = with python3Packages; [ cram ]; cmakeFlags = [ "-DCTESTS=ON" ]; doCheck = true; |