From 07acee59ed679a7fe672be43777013684ac6f00f Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Mon, 26 Sep 2022 15:58:05 +0200 Subject: [PATCH 1/2] maintainers: add Scrumplex Signed-off-by: Sefa Eyeoglu --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ab14ba2a5b0b..a49a545e50e2 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11987,6 +11987,16 @@ githubId = 3598650; name = "Fritz Otlinghaus"; }; + Scrumplex = { + name = "Sefa Eyeoglu"; + email = "contact@scrumplex.net"; + matrix = "@Scrumplex:duckhub.io"; + github = "Scrumplex"; + githubId = 11587657; + keys = [{ + fingerprint = "AF1F B107 E188 CB97 9A94 FD7F C104 1129 4912 A422"; + }]; + }; scubed2 = { email = "scubed2@gmail.com"; github = "scubed2"; From af411622fd0eea4d0485d1a0588fb53274c9bbde Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Mon, 26 Sep 2022 16:11:45 +0200 Subject: [PATCH 2/2] tomlplusplus: init at 3.2.0 Signed-off-by: Sefa Eyeoglu --- .../libraries/tomlplusplus/default.nix | 28 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/libraries/tomlplusplus/default.nix diff --git a/pkgs/development/libraries/tomlplusplus/default.nix b/pkgs/development/libraries/tomlplusplus/default.nix new file mode 100644 index 000000000000..be1c4b7d9c81 --- /dev/null +++ b/pkgs/development/libraries/tomlplusplus/default.nix @@ -0,0 +1,28 @@ +{ lib +, stdenv +, meson +, ninja +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "tomlplusplus"; + version = "3.2.0"; + + src = fetchFromGitHub { + owner = "marzer"; + repo = pname; + rev = "v${version}"; + hash = "sha256-nohO4eySs73BSgjvq+uzybiE5lw2rFY5YqGbl/oqGek="; + }; + + nativeBuildInputs = [ meson ninja ]; + + meta = with lib;{ + homepage = "https://github.com/marzer/tomlplusplus"; + description = "Header-only TOML config file parser and serializer for C++17"; + license = licenses.mit; + maintainers = with maintainers; [ Scrumplex ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1b7297191de4..8eb95a84bf5b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22166,6 +22166,8 @@ with pkgs; tomlcpp = callPackage ../development/libraries/tomlcpp { }; + tomlplusplus = callPackage ../development/libraries/tomlplusplus { }; + tokyocabinet = callPackage ../development/libraries/tokyo-cabinet { }; tokyotyrant = callPackage ../development/libraries/tokyo-tyrant { };