From 6c4d3aa6f7aaffeaf40213fd5ae651e99440d19c Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 7 Feb 2021 20:00:07 +0000 Subject: [PATCH] git-cinnabar: 0.5.4 -> 0.5.6 Also add missing installPhase hooks, and clarify license. I'm assuming GPL-2.0-only, because it doesn't seem to be specified, and the helper links with git, which is -only. --- .../git-and-tools/git-cinnabar/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-cinnabar/default.nix b/pkgs/applications/version-management/git-and-tools/git-cinnabar/default.nix index 679e8dbdf50..e7eea5e43a1 100644 --- a/pkgs/applications/version-management/git-and-tools/git-cinnabar/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-cinnabar/default.nix @@ -8,13 +8,13 @@ in stdenv.mkDerivation rec { pname = "git-cinnabar"; - version = "0.5.4"; + version = "0.5.6"; src = fetchFromGitHub { owner = "glandium"; repo = "git-cinnabar"; rev = version; - sha256 = "1cjn2cc6mj4m736wxab9s6qx83p5n5ha8cr3x84s9ra6rxs8d7pi"; + sha256 = "1wbp4xqpkaqhhkjw8rbbsagwiciqffacqqbm4j49q41mlk371ai3"; fetchSubmodules = true; }; @@ -27,6 +27,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; installPhase = '' + runHook preInstall + mkdir -p $out/bin $out/libexec install git-cinnabar-helper $out/bin install git-cinnabar git-remote-hg $out/libexec @@ -38,12 +40,14 @@ stdenv.mkDerivation rec { --prefix GIT_CINNABAR_EXPERIMENTS , python3 \ --set PYTHONPATH ${mercurial}/${python3.sitePackages} done + + runHook postInstall ''; meta = with lib; { homepage = "https://github.com/glandium/git-cinnabar"; description = "git remote helper to interact with mercurial repositories"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ qyliss ]; platforms = platforms.all; };