From 36e312cb5fdeb25bb3a93b38a93ca7d42dc0622d Mon Sep 17 00:00:00 2001
From: Tobias Mayer <tobim@fastmail.fm>
Date: Sun, 8 Dec 2024 19:16:11 +0100
Subject: [PATCH 1/3] prometheus-cpp: reformat

---
 pkgs/by-name/pr/prometheus-cpp/package.nix | 33 ++++++++++++++--------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/pr/prometheus-cpp/package.nix b/pkgs/by-name/pr/prometheus-cpp/package.nix
index dda515932f2c..cedb6075053d 100644
--- a/pkgs/by-name/pr/prometheus-cpp/package.nix
+++ b/pkgs/by-name/pr/prometheus-cpp/package.nix
@@ -1,12 +1,13 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, cmake
-, gbenchmark
-, gtest
-, civetweb
-, zlib
-, curl
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  civetweb,
+  curl,
+  gbenchmark,
+  gtest,
+  zlib,
 }:
 
 stdenv.mkDerivation rec {
@@ -21,16 +22,24 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ cmake ];
-  buildInputs = [ gbenchmark gtest zlib curl ];
+  buildInputs = [
+    curl
+    gbenchmark
+    gtest
+    zlib
+  ];
   propagatedBuildInputs = [ civetweb ];
   strictDeps = true;
 
   cmakeFlags = [
-    "-DUSE_THIRDPARTY_LIBRARIES=OFF"
     "-DBUILD_SHARED_LIBS=ON"
+    "-DUSE_THIRDPARTY_LIBRARIES=OFF"
   ];
 
-  outputs = [ "out" "dev" ];
+  outputs = [
+    "out"
+    "dev"
+  ];
 
   postInstall = ''
     mkdir -p $dev/lib/pkgconfig

From 3dd3225b53d9f9654c61951248f707e3a69b5a8b Mon Sep 17 00:00:00 2001
From: Tobias Mayer <tobim@fastmail.fm>
Date: Sun, 8 Dec 2024 19:17:28 +0100
Subject: [PATCH 2/3] prometheus-cpp: use finalAttrs pattern

---
 pkgs/by-name/pr/prometheus-cpp/package.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/pr/prometheus-cpp/package.nix b/pkgs/by-name/pr/prometheus-cpp/package.nix
index cedb6075053d..748217863f3b 100644
--- a/pkgs/by-name/pr/prometheus-cpp/package.nix
+++ b/pkgs/by-name/pr/prometheus-cpp/package.nix
@@ -10,14 +10,14 @@
   zlib,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "prometheus-cpp";
   version = "1.1.0";
 
   src = fetchFromGitHub {
     owner = "jupp0r";
-    repo = pname;
-    rev = "v${version}";
+    repo = "prometheus-cpp";
+    rev = "v${finalAttrs.version}";
     sha256 = "sha256-qx6oBxd0YrUyFq+7ArnKBqOwrl5X8RS9nErhRDUJ7+8=";
   };
 
@@ -51,5 +51,4 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/jupp0r/prometheus-cpp";
     license = [ lib.licenses.mit ];
   };
-
-}
+})

From 73b7d880f14c87a54ad49f25cf41c218163b1c68 Mon Sep 17 00:00:00 2001
From: Tobias Mayer <tobim@fastmail.fm>
Date: Sun, 8 Dec 2024 20:09:30 +0100
Subject: [PATCH 3/3] prometheus-cpp: 1.1.0 -> 1.3.0

And stop overriding the generated pkg-config file.
---
 pkgs/by-name/pr/prometheus-cpp/package.nix     | 18 +++++++++---------
 .../pr/prometheus-cpp/prometheus-cpp.pc.in     | 10 ----------
 2 files changed, 9 insertions(+), 19 deletions(-)
 delete mode 100644 pkgs/by-name/pr/prometheus-cpp/prometheus-cpp.pc.in

diff --git a/pkgs/by-name/pr/prometheus-cpp/package.nix b/pkgs/by-name/pr/prometheus-cpp/package.nix
index 748217863f3b..2a0f4a88c5ea 100644
--- a/pkgs/by-name/pr/prometheus-cpp/package.nix
+++ b/pkgs/by-name/pr/prometheus-cpp/package.nix
@@ -3,6 +3,7 @@
   stdenv,
   fetchFromGitHub,
   cmake,
+  pkg-config,
   civetweb,
   curl,
   gbenchmark,
@@ -12,16 +13,19 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "prometheus-cpp";
-  version = "1.1.0";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "jupp0r";
     repo = "prometheus-cpp";
-    rev = "v${finalAttrs.version}";
-    sha256 = "sha256-qx6oBxd0YrUyFq+7ArnKBqOwrl5X8RS9nErhRDUJ7+8=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-XQ8N+affKVqn/hrMHWg0eN+0Op6m9ZdVNNAW0GpDAng=";
   };
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ];
   buildInputs = [
     curl
     gbenchmark
@@ -33,6 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   cmakeFlags = [
     "-DBUILD_SHARED_LIBS=ON"
+    "-DOVERRIDE_CXX_STANDARD_FLAGS=OFF"
     "-DUSE_THIRDPARTY_LIBRARIES=OFF"
   ];
 
@@ -41,11 +46,6 @@ stdenv.mkDerivation (finalAttrs: {
     "dev"
   ];
 
-  postInstall = ''
-    mkdir -p $dev/lib/pkgconfig
-    substituteAll ${./prometheus-cpp.pc.in} $dev/lib/pkgconfig/prometheus-cpp.pc
-  '';
-
   meta = {
     description = "Prometheus Client Library for Modern C++";
     homepage = "https://github.com/jupp0r/prometheus-cpp";
diff --git a/pkgs/by-name/pr/prometheus-cpp/prometheus-cpp.pc.in b/pkgs/by-name/pr/prometheus-cpp/prometheus-cpp.pc.in
deleted file mode 100644
index c373f4153b55..000000000000
--- a/pkgs/by-name/pr/prometheus-cpp/prometheus-cpp.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=@out@
-includedir=${prefix}/include
-libdir=${prefix}/lib
-
-Name: prometheus-cpp
-Description: Prometheus Client Library for Modern C++
-URL: https://github.com/jupp0r/prometheus-cpp
-Version: @version@
-Cflags: -isystem${includedir}
-Libs: -Wl,-rpath,${libdir} -L${libdir} -lprometheus-cpp-core -lprometheus-cpp-pull -lprometheus-cpp-push