ed: 1.14.1 -> 1.14.2

This commit is contained in:
Robin Gloster 2017-08-27 20:29:52 +02:00
parent dfd905b548
commit ccbdab96d4
No known key found for this signature in database
GPG Key ID: D5C458DF6DD97EDF

View File

@ -1,26 +1,20 @@
{ stdenv, fetchurl
{ stdenv, fetchurl, lzip
, buildPlatform, hostPlatform
}:
stdenv.mkDerivation rec {
name = "ed-${version}";
version = "1.14.1";
version = "1.14.2";
src = fetchurl {
# gnu only provides *.lz tarball, which is unfriendly for stdenv bootstrapping
#url = "mirror://gnu/ed/${name}.tar.gz";
# When updating, please make sure the sources pulled match those upstream by
# Unpacking both tarballs and running `find . -type f -exec sha256sum \{\} \; | sha256sum`
# in the resulting directory
urls = let file_sha512 = "84396fe4e4f0bf0b591037277ff8679a08b2883207628aaa387644ad83ca5fbdaa74a581f33310e28222d2fea32a0b8ba37e579597cc7d6145df6eb956ea75db";
in [
("http://pkgs.fedoraproject.org/repo/extras/ed"
+ "/${name}.tar.bz2/sha512/${file_sha512}/${name}.tar.bz2")
"http://fossies.org/linux/privat/${name}.tar.bz2"
];
sha256 = "1pk6qa4sr7qc6vgm34hjx44hsh8x2bwaxhdi78jhsacnn4zwi7bw";
url = "mirror://gnu/ed/${name}.tar.lz";
sha256 = "1nqhk3n1s1p77g2bjnj55acicsrlyb2yasqxqwpx0w0djfx64ygm";
};
unpackCmd = "tar --lzip -xf";
nativeBuildInputs = [ lzip ];
/* FIXME: Tests currently fail on Darwin:
building test scripts for ed-1.5...
@ -32,11 +26,7 @@ stdenv.mkDerivation rec {
*/
doCheck = !(hostPlatform.isDarwin || hostPlatform != buildPlatform);
# TODO(@Ericson2314): Use placeholder to make this a configure flag once Nix
# 1.12 is released.
preConfigure = ''
export DESTDIR=$out
'';
installFlags = [ "DESTDIR=$(out)" ];
configureFlags = [
"--exec-prefix=${stdenv.cc.prefix}"