Merge branch 'master' into staging

Haskell rebuild.
Hydra: ?compare=1430378
This commit is contained in:
Vladimír Čunát
2018-02-01 09:34:41 +01:00
59 changed files with 3828 additions and 4828 deletions

View File

@@ -3,12 +3,12 @@
with stdenv.lib;
stdenv.mkDerivation rec {
name = "moreutils-${version}";
version = "0.61";
version = "0.62";
src = fetchgit {
url = "git://git.joeyh.name/moreutils";
rev = "refs/tags/${version}";
sha256 = "1qvwlq0a2zs7qkjqc9c842979axkjfdr7nic1gsm4zc6jd72y7pr";
sha256 = "0sk7rgqsqbdwr69mh7y4v9lv4v0nfmsrqgvbpy2gvy82snhfzar2";
};
preBuild = ''