nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-02 07:31:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

vcsh: update to latest version and add missing Perl test suite dependencies to fix the build

Browse Source
This commit is contained in:
Peter Simons 2018-04-13 09:58:25 +02:00
parent 9df0c12cde
commit d503d493ab
2 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pkgs/applications/version-management/vcsh/default.nix
View File

@ -1,29 +1,22 @@
{ stdenv, fetchpatch, fetchFromGitHub, which, git, ronn, perl, ShellCommand, TestMost }:
{ stdenv, fetchFromGitHub, which, git, ronn, perl, ShellCommand
, TestMost, TestDifferences, TestDeep, TestException, TestWarn
}:
stdenv.mkDerivation rec {
version = "1.20170226"; # date of commit we're pulling
version = "1.20170915"; # date of commit we're pulling
name = "vcsh-${version}";
src = fetchFromGitHub {
owner = "RichiH";
repo = "vcsh";
rev = "36a7cedf196793a6d99f9d3ba2e69805cfff23ab";
sha256 = "16lb28m4k7n796cc1kifyc1ixry4bg69q9wqivjzygdsb77awgln";
rev = "eadb8df6aa71a76e5be36492edcadb118bd862ac";
sha256 = "1wfzp8167lcq6akdpbi8fikjv0z3h1i5minh3423dljc04q0klm1";
};
patches =
[
(fetchpatch {
url = "https://patch-diff.githubusercontent.com/raw/RichiH/vcsh/pull/222.patch";
sha256 = "0grdbiwq04x5qj0a1yd9a78g5v28dxhwl6mwxvgvvmzs6k5wnl3k";
})
(fetchpatch {
url = "https://patch-diff.githubusercontent.com/raw/RichiH/vcsh/pull/228.patch";
sha256 = "0sdn4mzrhaynw85knia2iw5b6rgy0l1rd6dwh0lwspnh668wqgam";
})
];
buildInputs = [ which git ronn perl ShellCommand TestMost ];
buildInputs = [
which git ronn perl ShellCommand TestMost TestDifferences TestDeep
TestException TestWarn
];
installPhase = "make install PREFIX=$out";

3
pkgs/top-level/all-packages.nix
View File

@ -5311,7 +5311,8 @@ with pkgs;
vcftools = callPackage ../applications/science/biology/vcftools { };
vcsh = callPackage ../applications/version-management/vcsh {
inherit (perlPackages) ShellCommand TestMost;
inherit (perlPackages) ShellCommand TestMost TestDifferences TestDeep
TestException TestWarn;
};
vcstool = callPackage ../development/tools/vcstool { };