Skip to content

Commit aee5fa2

Browse files
pSubpSub
committedMay 28, 2017
moreutils: 0.59 -> 0.61
·
branch-off-24.1117.09-beta
1 parent 157b5bd commit aee5fa2

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed
 

‎pkgs/tools/misc/moreutils/default.nix

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1-
{ stdenv, fetchurl, libxml2, libxslt, docbook-xsl, docbook_xml_dtd_44, perl, IPCRun, TimeDate, TimeDuration, makeWrapper }:
1+
{ stdenv, fetchgit, libxml2, libxslt, docbook-xsl, docbook_xml_dtd_44, perl, IPCRun, TimeDate, TimeDuration, makeWrapper }:
22

33
with stdenv.lib;
44
stdenv.mkDerivation rec {
55
name = "moreutils-${version}";
6-
version = "0.59";
6+
version = "0.61";
77

8-
src = fetchurl {
9-
url = "http://ftp.de.debian.org/debian/pool/main/m/moreutils/moreutils_${version}.orig.tar.gz";
10-
sha256 = "1d6ik3j4lwp90vb93p7yv60k6vk2chz448d1z9xrmxvv371i33m4";
8+
src = fetchgit {
9+
url = "git://git.joeyh.name/moreutils";
10+
rev = "refs/tags/${version}";
11+
sha256 = "1qvwlq0a2zs7qkjqc9c842979axkjfdr7nic1gsm4zc6jd72y7pr";
1112
};
1213

1314
preBuild = ''
@@ -25,7 +26,7 @@ stdenv.mkDerivation rec {
2526
meta = {
2627
description = "Growing collection of the unix tools that nobody thought to write long ago when unix was young";
2728
homepage = https://joeyh.name/code/moreutils/;
28-
maintainers = with maintainers; [ koral ];
29+
maintainers = with maintainers; [ koral pSub ];
2930
platforms = platforms.all;
3031
};
3132
}

4 commit comments

Comments
 (4)

yurrriq commented on Jun 19, 2017

@yurrriq
yurrriq
on Jun 19, 2017
Member

I'm not able to build this on darwin. Here's the relevant output:

building
make flags: SHELL=/nix/store/vkh1qq7m28v6wajva1k50a4i8x3l0r9c-bash-4.4-p12/bin/bash
make -C is_utf8/
make[1]: Entering directory '/nix/tmp/nix-build-moreutils-0.61.drv-0/moreutils/is_utf8'
gcc -O3 -Wextra -Wall -ansi -Wstrict-prototypes   -c -o main.o main.c
/nix/store/vkh1qq7m28v6wajva1k50a4i8x3l0r9c-bash-4.4-p12/bin/bash: gcc: command not found
make[1]: *** [<builtin>: main.o] Error 127
make[1]: Leaving directory '/nix/tmp/nix-build-moreutils-0.61.drv-0/moreutils/is_utf8'
make: *** [Makefile:22: isutf8] Error 2
builder for ‘/nix/store/lkspg0bmmp599vpgbzz7jkjx8zs16m18-moreutils-0.61.drv’ failed with exit code 2

pSub commented on Jun 20, 2017

@pSub
pSub
on Jun 20, 2017edited by pSub
MemberAuthor

Should be fixed in 065bb61. Edit: At least travis says it builds now. I currently don't have access to a darwin machine.

yurrriq commented on Jun 20, 2017

@yurrriq
yurrriq
on Jun 20, 2017
Member

👍 I'm trying now.

yurrriq commented on Jun 20, 2017

@yurrriq
yurrriq
on Jun 20, 2017
Member

Works for me, but maybe we should s/cc/clang/ as suggested here.

Please sign in to comment.