From 182a524cceac5f4d2699cf682bf44a101f5c66e7 Mon Sep 17 00:00:00 2001 From: Gavin John Date: Fri, 8 Nov 2024 17:09:45 -0800 Subject: [PATCH 1/4] cpm-cmake: Set CURRENT_CPM_VERSION cpm-cmake has a test to see if the CURRENT_CPM_VERSION contains development-version, and if so, it produces a warning. By setting it to the correct value, this warning is dismissed --- pkgs/by-name/cp/cpm-cmake/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/cp/cpm-cmake/package.nix b/pkgs/by-name/cp/cpm-cmake/package.nix index 83d2019493c0..12920d3aa924 100644 --- a/pkgs/by-name/cp/cpm-cmake/package.nix +++ b/pkgs/by-name/cp/cpm-cmake/package.nix @@ -14,6 +14,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { hash = "sha256-KIRVztkE72juIgXquZlC6AYo78QKHBD7iCvCa+ri66k="; }; + postPatch = '' + substituteInPlace cmake/CPM.cmake \ + --replace-fail "set(CURRENT_CPM_VERSION 1.0.0-development-version)" "set(CURRENT_CPM_VERSION ${finalAttrs.version})" + ''; + dontConfigure = true; dontBuild = true; From ba62c1d84992ffb0f04fecfa19b88db79d6fea20 Mon Sep 17 00:00:00 2001 From: Gavin John Date: Fri, 8 Nov 2024 17:12:06 -0800 Subject: [PATCH 2/4] cpm-cmake: Add pandapip1 to maintainers list --- pkgs/by-name/cp/cpm-cmake/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/cp/cpm-cmake/package.nix b/pkgs/by-name/cp/cpm-cmake/package.nix index 12920d3aa924..081c7daa3568 100644 --- a/pkgs/by-name/cp/cpm-cmake/package.nix +++ b/pkgs/by-name/cp/cpm-cmake/package.nix @@ -42,7 +42,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { simple API and more. ''; license = licenses.mit; - maintainers = [ ]; + maintainers = with maintainers; [ pandapip1 ]; platforms = platforms.all; }; }) From 612e61fd7a0f20f919feb3e01636a269cb8bfcbf Mon Sep 17 00:00:00 2001 From: Gavin John Date: Sat, 9 Nov 2024 00:56:58 -0800 Subject: [PATCH 3/4] cpm-cmake: nixfmt --- pkgs/by-name/cp/cpm-cmake/package.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cp/cpm-cmake/package.nix b/pkgs/by-name/cp/cpm-cmake/package.nix index 081c7daa3568..cb095ea37827 100644 --- a/pkgs/by-name/cp/cpm-cmake/package.nix +++ b/pkgs/by-name/cp/cpm-cmake/package.nix @@ -1,6 +1,7 @@ -{ lib -, stdenvNoCC -, fetchFromGitHub +{ + lib, + stdenvNoCC, + fetchFromGitHub, }: stdenvNoCC.mkDerivation (finalAttrs: { From 7d627de21ba2b854c4b9510627d88cb2e85c282b Mon Sep 17 00:00:00 2001 From: Gavin John Date: Sat, 9 Nov 2024 00:57:57 -0800 Subject: [PATCH 4/4] cpm-cmake: remove a with lib from meta --- pkgs/by-name/cp/cpm-cmake/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/cp/cpm-cmake/package.nix b/pkgs/by-name/cp/cpm-cmake/package.nix index cb095ea37827..dbf54de2a448 100644 --- a/pkgs/by-name/cp/cpm-cmake/package.nix +++ b/pkgs/by-name/cp/cpm-cmake/package.nix @@ -33,7 +33,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postInstall ''; - meta = with lib; { + meta = { homepage = "https://github.com/cpm-cmake/CPM.cmake"; description = "CMake's missing package manager"; longDescription = '' @@ -42,8 +42,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { CMake's FetchContent module that adds version control, caching, a simple API and more. ''; - license = licenses.mit; - maintainers = with maintainers; [ pandapip1 ]; - platforms = platforms.all; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pandapip1 ]; + platforms = lib.platforms.all; }; })