Merge 'staging' into closure-size
- there were many easy merge conflicts - cc-wrapper needed nontrivial changes Many other problems might've been created by interaction of the branches, but stdenv and a few other packages build fine now.
This commit is contained in:
@@ -4,16 +4,19 @@ let
|
||||
inherit (stdenv.lib) optional;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gawk-4.1.0";
|
||||
name = "gawk-4.1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/gawk/${name}.tar.xz";
|
||||
sha256 = "0hin2hswbbd6kd6i4zzvgciwpl5fba8d2s524z8y5qagyz3x010q";
|
||||
sha256 = "1nz83vpss8xv7m475sv4qhhj40g74nvcw0y9kwq9ds8wzfmcdm7g";
|
||||
};
|
||||
|
||||
# When we do build separate interactive version, it makes sense to always include docs.
|
||||
outputs = stdenv.lib.optionals (!interactive) [ "out" "doc" ]; #ToDo
|
||||
|
||||
# Currently broken due to locale tests failing
|
||||
#doCheck = !stdenv.isCygwin; # XXX: `test-dup2' segfaults on Cygwin 6.1
|
||||
|
||||
buildInputs = [ xz.bin libsigsegv ]
|
||||
++ optional interactive readline;
|
||||
|
||||
@@ -44,6 +47,6 @@ stdenv.mkDerivation rec {
|
||||
|
||||
license = stdenv.lib.licenses.gpl3Plus;
|
||||
|
||||
maintainers = [ stdenv.lib.maintainers.ludo ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user