Merge pull request #246330 from badboy/git-cinnabar-0.6.2

git-cinnabar: 0.6.1 -> 0.6.2

authored by

Pol Dellaiera and committed by
GitHub
714bd4a3 3b58feff

+38 -17
+38 -17
pkgs/applications/version-management/git-cinnabar/default.nix
··· 1 - { stdenv, lib, fetchFromGitHub, cargo, pkg-config, rustPlatform 2 - , bzip2, curl, zlib, zstd, libiconv, CoreServices 1 + { stdenv 2 + , lib 3 + , fetchFromGitHub 4 + , cargo 5 + , pkg-config 6 + , rustPlatform 7 + , bzip2 8 + , curl 9 + , zlib 10 + , zstd 11 + , libiconv 12 + , CoreServices 3 13 }: 4 14 5 - stdenv.mkDerivation rec { 15 + stdenv.mkDerivation (finalAttrs: { 6 16 pname = "git-cinnabar"; 7 - version = "0.6.1"; 17 + version = "0.6.2"; 8 18 9 19 src = fetchFromGitHub { 10 20 owner = "glandium"; 11 21 repo = "git-cinnabar"; 12 - rev = version; 13 - sha256 = "VvfoMypiFT68YJuGpEyPCxGOjdbDoF6FXtzLWlw0uxY="; 22 + rev = finalAttrs.version; 23 + hash = "sha256-1Y4zd4rYNRatemDXRMkQQwBJdkfOGfDWk9QBvJOgi7s="; 14 24 fetchSubmodules = true; 15 25 }; 16 26 17 27 nativeBuildInputs = [ 18 - pkg-config rustPlatform.cargoSetupHook cargo 28 + cargo 29 + pkg-config 30 + rustPlatform.cargoSetupHook 19 31 ]; 20 32 21 - buildInputs = [ bzip2 curl zlib zstd ] 22 - ++ lib.optionals stdenv.isDarwin [ libiconv CoreServices ]; 33 + buildInputs = [ 34 + bzip2 35 + curl 36 + zlib 37 + zstd 38 + ] ++ lib.optionals stdenv.isDarwin [ 39 + libiconv 40 + CoreServices 41 + ]; 23 42 24 43 cargoDeps = rustPlatform.fetchCargoTarball { 25 - inherit src; 26 - sha256 = "GApYgE7AezKmcGWNY+dF1Yp1TZmEeUdq3CsjvMvo/Rw="; 44 + inherit (finalAttrs) src; 45 + hash = "sha256-p85AS2DukUzEbW9UGYmiF3hpnZvPrZ2sRaeA9dU8j/8="; 27 46 }; 28 47 29 48 ZSTD_SYS_USE_PKG_CONFIG = true; ··· 32 51 33 52 installPhase = '' 34 53 runHook preInstall 54 + 35 55 mkdir -p $out/bin 36 56 install -v target/release/git-cinnabar $out/bin 37 57 ln -sv git-cinnabar $out/bin/git-remote-hg 58 + 38 59 runHook postInstall 39 60 ''; 40 61 41 - meta = with lib; { 62 + meta = { 63 + description = "git remote helper to interact with mercurial repositories"; 42 64 homepage = "https://github.com/glandium/git-cinnabar"; 43 - description = "git remote helper to interact with mercurial repositories"; 44 - license = licenses.gpl2Only; 45 - maintainers = with maintainers; [ qyliss ]; 46 - platforms = platforms.all; 65 + license = lib.licenses.gpl2Only; 66 + maintainers = with lib.maintainers; [ qyliss ]; 67 + platforms = lib.platforms.all; 47 68 }; 48 - } 69 + })