From b7387c5cf4618fb9642ac1da3a4a182659addd91 Mon Sep 17 00:00:00 2001 From: blargg Date: Tue, 20 Apr 2021 19:12:28 -0700 Subject: [PATCH] yadm: 2.5.0 -> 3.1.0 Updated completions to pull from the new location. Switch to using the install helpers. Update license, gpl3 -> gpl3Plus. --- .../version-management/yadm/default.nix | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/version-management/yadm/default.nix b/pkgs/applications/version-management/yadm/default.nix index b75af94af56..fc8bee5fcb7 100644 --- a/pkgs/applications/version-management/yadm/default.nix +++ b/pkgs/applications/version-management/yadm/default.nix @@ -1,17 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, git, gnupg }: +{ lib, stdenv, fetchFromGitHub, git, gnupg, installShellFiles }: -let version = "2.5.0"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "yadm"; - inherit version; + version = "3.1.0"; buildInputs = [ git gnupg ]; + nativeBuildInputs = [ installShellFiles ]; + src = fetchFromGitHub { owner = "TheLocehiliosan"; repo = "yadm"; rev = version; - sha256 = "128qlx8mp7h5ifapqqgsj3fwghn3q6x6ya0y33h5r7gnassd3njr"; + sha256 = "0ga0p28nvqilswa07bzi93adk7wx6d5pgxlacr9wl9v1h6cds92s"; }; dontConfigure = true; @@ -20,12 +21,16 @@ stdenv.mkDerivation { installPhase = '' runHook preInstall install -Dt $out/bin yadm - install -Dt $out/share/man/man1 yadm.1 - install -D completion/yadm.zsh_completion $out/share/zsh/site-functions/_yadm - install -D completion/yadm.bash_completion $out/share/bash-completion/completions/yadm.bash runHook postInstall ''; + postInstall = '' + installManPage yadm.1 + installShellCompletion --cmd yadm \ + --zsh completion/zsh/_yadm \ + --bash completion/bash/yadm + ''; + meta = { homepage = "https://github.com/TheLocehiliosan/yadm"; description = "Yet Another Dotfiles Manager"; @@ -35,7 +40,7 @@ stdenv.mkDerivation { * Provides a way to use alternate files on a specific OS or host. * Supplies a method of encrypting confidential data so it can safely be stored in your repository. ''; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ abathur ]; platforms = lib.platforms.unix; };