diff options
| author | Anderson Torres <torres.anderson.85@protonmail.com> | 2022-12-12 21:29:29 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-12 21:29:29 -0300 |
| commit | bbea0cf4523f1132b61f2b01fe0b7ab1cdd39993 (patch) | |
| tree | f0c3cbca86b222bb6ca2474c5a39b64a9423b5ce | |
| parent | Merge pull request #205822 from figsoda/cargo-modules (diff) | |
| parent | cpm-cmake: use github source (diff) | |
| download | nixpkgs-bbea0cf4523f1132b61f2b01fe0b7ab1cdd39993.tar.gz | |
Merge pull request #205817 from atorres1985-contrib/cpm-cmake
cpm-cmake: use github source
| -rw-r--r-- | pkgs/development/tools/cpm-cmake/default.nix (renamed from pkgs/development/tools/cpm/default.nix) | 21 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 13 insertions, 10 deletions
diff --git a/pkgs/development/tools/cpm/default.nix b/pkgs/development/tools/cpm-cmake/default.nix index 1d5bdc3b694f..9689df362aa8 100644 --- a/pkgs/development/tools/cpm/default.nix +++ b/pkgs/development/tools/cpm-cmake/default.nix @@ -1,25 +1,28 @@ { lib , stdenvNoCC -, fetchurl +, fetchFromGitHub }: -stdenvNoCC.mkDerivation rec { - pname = "cpm"; +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "cpm-cmake"; version = "0.36.0"; - src = fetchurl { - url = "https://github.com/cpm-cmake/CPM.cmake/releases/download/v${version}/CPM.cmake"; - sha256 = "sha256-F5YA1Z8OdSihipjo7QhqIZMKBcvm9WyfJ5l4WZwW9Cc="; + src = fetchFromGitHub { + owner = "cpm-cmake"; + repo = "cpm.cmake"; + rev = "v${finalAttrs.version}"; + hash = "sha256-XI3yDBhmglQnIe/t6sfL9WxaclqtOgE1kDmocQL+xnA="; }; - dontUnpack = true; dontConfigure = true; dontBuild = true; installPhase = '' runHook preInstall - install -Dm644 $src $out/share/cpm/CPM.cmake + mkdir -p $out/share/{,doc/}cpm + install -Dm644 cmake/CPM.cmake $out/share/cpm/CPM.cmake + install -Dm644 README.md CONTRIBUTING.md $out/share/doc/cpm/ runHook postInstall ''; @@ -37,4 +40,4 @@ stdenvNoCC.mkDerivation rec { 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 bfb10eeb3412..8c5966cb7eb4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -434,7 +434,7 @@ with pkgs; cp437 = callPackage ../tools/misc/cp437 { }; - cpm = callPackage ../development/tools/cpm { }; + cpm-cmake = callPackage ../development/tools/cpm-cmake { }; cpu-x = callPackage ../applications/misc/cpu-x { }; |