From 6d3f057365a40895b22c9b5eff5be34b8fb89d8b Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Sun, 1 Sep 2024 15:58:11 +0200 Subject: [PATCH 1/7] tomlplusplus: format code Signed-off-by: Sefa Eyeoglu --- .../libraries/tomlplusplus/default.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/tomlplusplus/default.nix b/pkgs/development/libraries/tomlplusplus/default.nix index dda352d0769fb..2dd63ce9d9ded 100644 --- a/pkgs/development/libraries/tomlplusplus/default.nix +++ b/pkgs/development/libraries/tomlplusplus/default.nix @@ -1,9 +1,10 @@ -{ lib -, stdenv -, meson -, cmake -, ninja -, fetchFromGitHub +{ + cmake, + fetchFromGitHub, + lib, + meson, + ninja, + stdenv, }: stdenv.mkDerivation (finalAttrs: { @@ -17,7 +18,11 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-h5tbO0Rv2tZezY58yUbyRVpsfRjY3i+5TPkkxr6La8M="; }; - nativeBuildInputs = [ meson cmake ninja ]; + nativeBuildInputs = [ + meson + cmake + ninja + ]; meta = with lib; { homepage = "https://github.com/marzer/tomlplusplus"; From 7556940b5e194df737127401df7710f68a106720 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Sun, 1 Sep 2024 16:01:17 +0200 Subject: [PATCH 2/7] tomlplusplus: add pkg-config test Signed-off-by: Sefa Eyeoglu --- pkgs/development/libraries/tomlplusplus/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/libraries/tomlplusplus/default.nix b/pkgs/development/libraries/tomlplusplus/default.nix index 2dd63ce9d9ded..c0da632beb4a1 100644 --- a/pkgs/development/libraries/tomlplusplus/default.nix +++ b/pkgs/development/libraries/tomlplusplus/default.nix @@ -4,7 +4,9 @@ lib, meson, ninja, + pkg-config, stdenv, + testers, }: stdenv.mkDerivation (finalAttrs: { @@ -22,13 +24,21 @@ stdenv.mkDerivation (finalAttrs: { meson cmake ninja + pkg-config ]; + passthru = { + tests.pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + }; + }; + 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 ]; + pkgConfigModules = [ "tomlplusplus" ]; platforms = platforms.unix; }; }) From 2d09cfe396252cdde960e3e484dcd0b442b2e3a4 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Sun, 1 Sep 2024 16:01:57 +0200 Subject: [PATCH 3/7] tomlplusplus: add update script Signed-off-by: Sefa Eyeoglu --- pkgs/development/libraries/tomlplusplus/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/tomlplusplus/default.nix b/pkgs/development/libraries/tomlplusplus/default.nix index c0da632beb4a1..cd87b513df4de 100644 --- a/pkgs/development/libraries/tomlplusplus/default.nix +++ b/pkgs/development/libraries/tomlplusplus/default.nix @@ -4,6 +4,7 @@ lib, meson, ninja, + nix-update-script, pkg-config, stdenv, testers, @@ -28,6 +29,7 @@ stdenv.mkDerivation (finalAttrs: { ]; passthru = { + updateScript = nix-update-script { }; tests.pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; }; From 40100a5851e4cdc4c0ab593a514a6505ab1e3308 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Sun, 1 Sep 2024 16:02:52 +0200 Subject: [PATCH 4/7] tomlplusplus: enable checks Signed-off-by: Sefa Eyeoglu --- pkgs/development/libraries/tomlplusplus/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/libraries/tomlplusplus/default.nix b/pkgs/development/libraries/tomlplusplus/default.nix index cd87b513df4de..529a9c349a497 100644 --- a/pkgs/development/libraries/tomlplusplus/default.nix +++ b/pkgs/development/libraries/tomlplusplus/default.nix @@ -1,6 +1,7 @@ { cmake, fetchFromGitHub, + glibcLocales, lib, meson, ninja, @@ -28,6 +29,13 @@ stdenv.mkDerivation (finalAttrs: { pkg-config ]; + checkInputs = [ + glibcLocales + ]; + + doCheck = true; + mesonFlags = [ "-Dbuild_tests=${lib.boolToString finalAttrs.doCheck}" ]; + passthru = { updateScript = nix-update-script { }; tests.pkg-config = testers.hasPkgConfigModules { From dea4c28928fd9ffe665788b9484869a92cfe2c86 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Sun, 1 Sep 2024 16:20:37 +0200 Subject: [PATCH 5/7] tomlplusplus: build example programs Signed-off-by: Sefa Eyeoglu --- .../libraries/tomlplusplus/default.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/tomlplusplus/default.nix b/pkgs/development/libraries/tomlplusplus/default.nix index 529a9c349a497..38217f3f2b576 100644 --- a/pkgs/development/libraries/tomlplusplus/default.nix +++ b/pkgs/development/libraries/tomlplusplus/default.nix @@ -1,6 +1,7 @@ { cmake, fetchFromGitHub, + fetchpatch2, glibcLocales, lib, meson, @@ -22,6 +23,15 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-h5tbO0Rv2tZezY58yUbyRVpsfRjY3i+5TPkkxr6La8M="; }; + patches = [ + # https://github.com/marzer/tomlplusplus/pull/233 + (fetchpatch2 { + name = "tomlplusplus-install-example-programs.patch"; + url = "https://github.com/marzer/tomlplusplus/commit/8128eb632325d1820f4d17dd8250dcda6ab07743.patch"; + hash = "sha256-7m2P+e1/OASHrzm9LSy6RnayS/kGxFC82xOyGBGXeG0="; + }) + ]; + nativeBuildInputs = [ meson cmake @@ -34,7 +44,10 @@ stdenv.mkDerivation (finalAttrs: { ]; doCheck = true; - mesonFlags = [ "-Dbuild_tests=${lib.boolToString finalAttrs.doCheck}" ]; + mesonFlags = [ + "-Dbuild_tests=${lib.boolToString finalAttrs.doCheck}" + "-Dbuild_examples=true" + ]; passthru = { updateScript = nix-update-script { }; From 4af69f9c3a037ea8816ca28a9c3085578ce855d1 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Sun, 1 Sep 2024 16:21:35 +0200 Subject: [PATCH 6/7] tomlplusplus: move to by-name Signed-off-by: Sefa Eyeoglu --- .../default.nix => by-name/to/tomlplusplus/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/libraries/tomlplusplus/default.nix => by-name/to/tomlplusplus/package.nix} (100%) diff --git a/pkgs/development/libraries/tomlplusplus/default.nix b/pkgs/by-name/to/tomlplusplus/package.nix similarity index 100% rename from pkgs/development/libraries/tomlplusplus/default.nix rename to pkgs/by-name/to/tomlplusplus/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ab4e0b8b7236e..bc70a9633e3e6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23293,8 +23293,6 @@ with pkgs; kyotocabinet = callPackage ../development/libraries/kyotocabinet { }; - tomlplusplus = callPackage ../development/libraries/tomlplusplus { }; - tokyocabinet = callPackage ../development/libraries/tokyo-cabinet { }; tokyotyrant = callPackage ../development/libraries/tokyo-tyrant { }; From 6e6fc8e967a85d32f09ba4e9c49c7e3346719668 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Sun, 20 Oct 2024 20:23:02 +0200 Subject: [PATCH 7/7] tomlplusplus: fix nits Signed-off-by: Sefa Eyeoglu --- pkgs/by-name/to/tomlplusplus/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/to/tomlplusplus/package.nix b/pkgs/by-name/to/tomlplusplus/package.nix index 38217f3f2b576..7d95a15503b14 100644 --- a/pkgs/by-name/to/tomlplusplus/package.nix +++ b/pkgs/by-name/to/tomlplusplus/package.nix @@ -19,11 +19,12 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "marzer"; repo = "tomlplusplus"; - rev = "v${finalAttrs.version}"; + rev = "refs/tags/v${finalAttrs.version}"; hash = "sha256-h5tbO0Rv2tZezY58yUbyRVpsfRjY3i+5TPkkxr6La8M="; }; patches = [ + # TODO: Remove this patch at the next update # https://github.com/marzer/tomlplusplus/pull/233 (fetchpatch2 { name = "tomlplusplus-install-example-programs.patch";