diff options
| author | Peter Simons <simons@cryp.to> | 2017-06-13 17:19:14 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2017-06-13 20:16:30 +0200 |
| commit | 14283b6a95b40881a79cf37d1b46cd5cfc0ff971 (patch) | |
| tree | 39a7c5bd2f673ecb2390947f779985efb6eeef4c | |
| parent | 8d71c758a105e3aade5d087933476cc3e1a63087 (diff) | |
| download | nixlib-14283b6a95b40881a79cf37d1b46cd5cfc0ff971.tar nixlib-14283b6a95b40881a79cf37d1b46cd5cfc0ff971.tar.gz nixlib-14283b6a95b40881a79cf37d1b46cd5cfc0ff971.tar.bz2 nixlib-14283b6a95b40881a79cf37d1b46cd5cfc0ff971.tar.lz nixlib-14283b6a95b40881a79cf37d1b46cd5cfc0ff971.tar.xz nixlib-14283b6a95b40881a79cf37d1b46cd5cfc0ff971.tar.zst nixlib-14283b6a95b40881a79cf37d1b46cd5cfc0ff971.zip | |
vcsh: update to latest Git head, enable test suite, install man page
| -rw-r--r-- | pkgs/applications/version-management/vcsh/default.nix | 19 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 12 insertions, 11 deletions
diff --git a/pkgs/applications/version-management/vcsh/default.nix b/pkgs/applications/version-management/vcsh/default.nix index 4f87f4b569c7..038e72e83a07 100644 --- a/pkgs/applications/version-management/vcsh/default.nix +++ b/pkgs/applications/version-management/vcsh/default.nix @@ -1,20 +1,19 @@ -{stdenv, fetchurl}: +{ stdenv, fetchFromGitHub, which, git, ronn, perl, ShellCommand, TestMost }: stdenv.mkDerivation rec { - version = "1.20151229-1"; + version = "1.20170226"; # date of commit we're pulling name = "vcsh-${version}"; - src = fetchurl { - url = "https://github.com/RichiH/vcsh/archive/v${version}.tar.gz"; - sha256 = "0wgg5zz11ql2v37vby5gbqvnbs80g1q83b9qbvm8d2pqx8bsb0kn"; + src = fetchFromGitHub { + owner = "RichiH"; + repo = "vcsh"; + rev = "36a7cedf196793a6d99f9d3ba2e69805cfff23ab"; + sha256 = "16lb28m4k7n796cc1kifyc1ixry4bg69q9wqivjzygdsb77awgln"; }; - phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; + buildInputs = [ which git ronn perl ShellCommand TestMost ]; - installPhase = '' - mkdir -p $out/bin - cp vcsh $out/bin - ''; + installPhase = "make install PREFIX=$out"; meta = with stdenv.lib; { description = "Version Control System for $HOME"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b29525a1f77a..ab9c2abcf14a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4515,7 +4515,9 @@ with pkgs; vboot_reference = callPackage ../tools/system/vboot_reference { }; - vcsh = callPackage ../applications/version-management/vcsh { }; + vcsh = callPackage ../applications/version-management/vcsh { + inherit (perlPackages) ShellCommand TestMost; + }; verilator = callPackage ../applications/science/electronics/verilator {}; |