From f1ce2d43a12e1c34273751ad25b0e76512f04f29 Mon Sep 17 00:00:00 2001 From: Ken Matsui <26405363+ken-matsui@users.noreply.github.com> Date: Fri, 15 Jul 2022 11:13:32 +0900 Subject: [PATCH 1/3] maintainers: add ken-matsui --- maintainers/maintainer-list.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6d9da62e2ddf..d8ad052206fd 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6615,6 +6615,15 @@ githubId = 15373888; name = "Claudius Holeksa"; }; + ken-matsui = { + email = "nix@kmatsui.me"; + github = "ken-matsui"; + githubId = 26405363; + name = "Ken Matsui"; + keys = [{ + fingerprint = "3611 8CD3 6DE8 3334 B44A DDE4 1033 60B3 298E E433"; + }]; + }; kennyballou = { email = "kb@devnulllabs.io"; github = "kennyballou"; From bc5e66a82b8edc0f1b0af2631c680ed2ceea6b97 Mon Sep 17 00:00:00 2001 From: Ken Matsui <26405363+ken-matsui@users.noreply.github.com> Date: Fri, 15 Jul 2022 11:14:41 +0900 Subject: [PATCH 2/3] cpm: init at 0.35.1 --- pkgs/development/tools/cpm/default.nix | 39 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/tools/cpm/default.nix diff --git a/pkgs/development/tools/cpm/default.nix b/pkgs/development/tools/cpm/default.nix new file mode 100644 index 000000000000..114a94d0c68e --- /dev/null +++ b/pkgs/development/tools/cpm/default.nix @@ -0,0 +1,39 @@ +{ lib +, stdenv +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "cpm"; + version = "0.35.1"; + + src = fetchFromGitHub { + owner = "cpm-cmake"; + repo = "CPM.cmake"; + rev = "v${version}"; + hash = "sha256-Oon/5iwkUUASsUDvde69iEwLe8/CAzwYKYsyzH5K+V0="; + }; + + dontConfigure = true; + + dontBuild = true; + + installPhase = '' + mkdir -p ${placeholder "out"}/share/cpm/ + cp ./cmake/CPM.cmake ${placeholder "out"}/share/cpm/ + ''; + + meta = with lib; { + homepage = "https://github.com/cpm-cmake/CPM.cmake"; + description = "CMake's missing package manager"; + longDescription = '' + CPM.cmake is a cross-platform CMake script that adds dependency + management capabilities to CMake. It's built as a thin wrapper around + CMake's FetchContent module that adds version control, caching, a + simple API and more. + ''; + license = licenses.mit; + maintainers = with maintainers; [ ken-matsui ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9e65d7719fae..5d594c4b0754 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -382,6 +382,8 @@ with pkgs; cp437 = callPackage ../tools/misc/cp437 { }; + cpm = callPackage ../development/tools/cpm { }; + cpu-x = callPackage ../applications/misc/cpu-x { }; crackle = callPackage ../tools/networking/crackle { }; From dc968bc7c3a5f08c571ebd24a62f3af6abcfd2ae Mon Sep 17 00:00:00 2001 From: Ken Matsui <26405363+ken-matsui@users.noreply.github.com> Date: Sat, 16 Jul 2022 03:33:29 +0900 Subject: [PATCH 3/3] cpm: replace `stdenv` with `stdenvNoCC` because of no compilation Co-authored-by: Sandro --- pkgs/development/tools/cpm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/cpm/default.nix b/pkgs/development/tools/cpm/default.nix index 114a94d0c68e..1f8b93358177 100644 --- a/pkgs/development/tools/cpm/default.nix +++ b/pkgs/development/tools/cpm/default.nix @@ -1,9 +1,9 @@ { lib -, stdenv +, stdenvNoCC , fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "cpm"; version = "0.35.1";