Skip to content

Commit

Permalink
moreutils: 0.59 -> 0.61
Browse files Browse the repository at this point in the history
  • Loading branch information
@pSub
pSub committed May 28, 2017
1 parent 157b5bd commit aee5fa2
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions pkgs/tools/misc/moreutils/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
{ stdenv, fetchurl, libxml2, libxslt, docbook-xsl, docbook_xml_dtd_44, perl, IPCRun, TimeDate, TimeDuration, makeWrapper }:
{ stdenv, fetchgit, libxml2, libxslt, docbook-xsl, docbook_xml_dtd_44, perl, IPCRun, TimeDate, TimeDuration, makeWrapper }:

with stdenv.lib;
stdenv.mkDerivation rec {
name = "moreutils-${version}";
version = "0.59";
version = "0.61";

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

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

4 comments on commit aee5fa2

@yurrriq
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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
Copy link
Member Author

@pSub pSub commented on aee5fa2 Jun 20, 2017 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@yurrriq
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 I'm trying now.

@yurrriq
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Please sign in to comment.