Merge branch 'master' into stdenv-updates

ssp is disabled for glibc-2.13 unconditionally
This commit is contained in:
Shea Levy
2012-06-27 13:48:22 -04:00
439 changed files with 6858 additions and 6571 deletions

View File

@@ -1,7 +1,7 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
name = "ncompress-4.2.4.3";
name = "ncompress-4.2.4.4";
builder = ./builder.sh;
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://sourceforge/project/ncompress/${name}.tar.gz";
sha256 = "1y44ixc1w2vfvj1lm4dkcljlwv882ynrvm5i6l0lg1gf883j246l";
sha256 = "0yjiwv1hwb253x3m6r1dq2k7m5c9nz0ib2j7fnm3hark7y6s42xh";
};
meta = {