From d0db877f36a70b356e415763de3c22ba7ee8c9ee Mon Sep 17 00:00:00 2001 From: "Matthew T. Pham (NixOS)" Date: Fri, 17 Jan 2025 04:09:35 -0600 Subject: [PATCH 1/2] maintainers: add mtpham99 --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 98a9caf1e9f1..0a97136143c8 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -15640,6 +15640,13 @@ githubId = 2176611; name = "Marko Poikonen"; }; + mtpham99 = { + name = "Matthew Pham"; + email = "mtpham.nixos@protonmail.com"; + github = "mtpham99"; + githubId = 72663763; + keys = [ { fingerprint = "DB3E A12D B291 594A 79C5 F6B3 10AB 6868 37F6 FA3F"; } ]; + }; mtreca = { email = "maxime.treca@gmail.com"; github = "mtreca"; From e356d3187c68516306baaee890308e246166e83b Mon Sep 17 00:00:00 2001 From: "Matthew T. Pham (NixOS)" Date: Fri, 17 Jan 2025 04:10:30 -0600 Subject: [PATCH 2/2] nanobench: init at 4.3.11 --- pkgs/by-name/na/nanobench/package.nix | 53 +++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 pkgs/by-name/na/nanobench/package.nix diff --git a/pkgs/by-name/na/nanobench/package.nix b/pkgs/by-name/na/nanobench/package.nix new file mode 100644 index 000000000000..af59b41ee20b --- /dev/null +++ b/pkgs/by-name/na/nanobench/package.nix @@ -0,0 +1,53 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + cmake, + nix-update-script, +}: + +stdenv.mkDerivation rec { + pname = "nanobench"; + version = "4.3.11"; + + src = fetchFromGitHub { + owner = "martinus"; + repo = "nanobench"; + tag = "v${version}"; + hash = "sha256-6OoVU31cNY0pIYpK/PdB9Qej+9IJo7+fHFQCTymBVrk="; + }; + + patches = [ + # Missing header from a test file. Required for compiling as of gcc13. Patched in commit from master branch. + # Remove on next release. + (fetchpatch { + url = "https://github.com/martinus/nanobench/commit/e4327893194f06928012eb81cabc606c4e4791ac.patch"; + hash = "sha256-vmpohg9TbIxT+p4JerWh/QBcZ3/+1gPSNf15sqW6leM="; + }) + + # Change cmake install directories to conventional locations. Patches from unmerged pull request. + # Remove when merged upstream. + (fetchpatch { + url = "https://github.com/martinus/nanobench/pull/98/commits/92c6995ccaebbda87fed13de8eaf3d135d1af0c0.patch"; + hash = "sha256-JwCpwSRzV1qnwwcJIGEJWxthT4Vj12TXhAGG0bc8KGM="; + }) + (fetchpatch { + url = "https://github.com/martinus/nanobench/pull/98/commits/17a1f0b598a09d399dd492c72bca5b48ad76c794.patch"; + hash = "sha256-2lOD63qN7gywUQxrdSRVyddpzcQjjeWOrA3hqu7x+CY="; + }) + ]; + + nativeBuildInputs = [ cmake ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Simple, fast, accurate single-header microbenchmarking functionality for C++11/14/17/20"; + homepage = "https://nanobench.ankerl.com/"; + changelog = "https://github.com/martinus/nanobench/releases/tag/v${version}"; + platforms = lib.platforms.all; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ mtpham99 ]; + }; +}