public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #84062 from abathur/fix/yadm_src_usage 

yadm: install from build directory instead of $src
This commit is contained in:
Graham Christensen 2020-12-15 10:39:20 -05:00 committed by GitHub
parent a3ad080853 32e666aa4b
commit 9612cb9092
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
maintainers/maintainer-list.nix
View File

@ -100,6 +100,12 @@
githubId = 178750; githubId = 178750;
name = "Andreas Baldeau"; name = "Andreas Baldeau";
}; };
abathur = {
email = "travis.a.everett+nixpkgs@gmail.com";
github = "abathur";
githubId = 2548365;
name = "Travis A. Everett";
};
abbe = { abbe = {
email = "ashish.is@lostca.se"; email = "ashish.is@lostca.se";
github = "wahjava"; github = "wahjava";

9
pkgs/applications/version-management/yadm/default.nix
View File

@ -19,10 +19,10 @@ stdenv.mkDerivation {
installPhase = '' installPhase = ''
runHook preInstall runHook preInstall
install -Dt $out/bin $src/yadm install -Dt $out/bin yadm
install -Dt $out/share/man/man1 $src/yadm.1 install -Dt $out/share/man/man1 yadm.1
install -D $src/completion/yadm.zsh_completion $out/share/zsh/site-functions/_yadm install -D completion/yadm.zsh_completion $out/share/zsh/site-functions/_yadm
install -D $src/completion/yadm.bash_completion $out/share/bash-completion/completions/yadm.bash install -D completion/yadm.bash_completion $out/share/bash-completion/completions/yadm.bash
runHook postInstall runHook postInstall
''; '';
@ -36,6 +36,7 @@ stdenv.mkDerivation {
* Supplies a method of encrypting confidential data so it can safely be stored in your repository. * Supplies a method of encrypting confidential data so it can safely be stored in your repository.
''; '';
license = stdenv.lib.licenses.gpl3; license = stdenv.lib.licenses.gpl3;
maintainers = with stdenv.lib.maintainers; [ abathur ];
platforms = stdenv.lib.platforms.unix; platforms = stdenv.lib.platforms.unix;
}; };
} }