diff options
| author | Vladimír Čunát <vladimir.cunat@nic.cz> | 2016-07-14 15:51:28 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vladimir.cunat@nic.cz> | 2016-07-14 15:51:28 +0200 |
| commit | 1b5ac058451e5e0a0bc3ad36d1d1546e9aba61bb (patch) | |
| tree | 79da6273c3244e5de7a0cb5c5093376aa3efa2c6 /pkgs/development/tools | |
| parent | ab9515092b291fb92cf83a21c2a344a096ae8474 (diff) | |
| parent | d9aafc885fe9424689ae30b11736b214be3cf9c2 (diff) | |
| download | nixlib-1b5ac058451e5e0a0bc3ad36d1d1546e9aba61bb.tar nixlib-1b5ac058451e5e0a0bc3ad36d1d1546e9aba61bb.tar.gz nixlib-1b5ac058451e5e0a0bc3ad36d1d1546e9aba61bb.tar.bz2 nixlib-1b5ac058451e5e0a0bc3ad36d1d1546e9aba61bb.tar.lz nixlib-1b5ac058451e5e0a0bc3ad36d1d1546e9aba61bb.tar.xz nixlib-1b5ac058451e5e0a0bc3ad36d1d1546e9aba61bb.tar.zst nixlib-1b5ac058451e5e0a0bc3ad36d1d1546e9aba61bb.zip | |
Merge branch 'staging'
Includes security fixes in gd and libarchive.
Diffstat (limited to 'pkgs/development/tools')
| -rw-r--r-- | pkgs/development/tools/build-managers/gnumake/4.2/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/texinfo/6.1.nix (renamed from pkgs/development/tools/misc/texinfo/6.0.nix) | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix index edb3f841069a..323f33d7d6cc 100644 --- a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix @@ -3,14 +3,14 @@ assert guileSupport -> ( pkgconfig != null && guile != null ); let - version = "4.2"; + version = "4.2.1"; in stdenv.mkDerivation { name = "gnumake-${version}"; src = fetchurl { url = "mirror://gnu/make/make-${version}.tar.bz2"; - sha256 = "0pv5rvz5pp4njxiz3syf786d2xp4j7gzddwjvgw5zmz55yvf6p2f"; + sha256 = "12f5zzyq2w56g95nni65hc0g5p7154033y2f3qmjvd016szn5qnn"; }; patchFlags = "-p0"; diff --git a/pkgs/development/tools/misc/texinfo/6.0.nix b/pkgs/development/tools/misc/texinfo/6.1.nix index 507ca22cd1ae..f19ccb35508f 100644 --- a/pkgs/development/tools/misc/texinfo/6.0.nix +++ b/pkgs/development/tools/misc/texinfo/6.1.nix @@ -3,11 +3,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "texinfo-6.0"; + name = "texinfo-6.1"; src = fetchurl { url = "mirror://gnu/texinfo/${name}.tar.xz"; - sha256 = "1r3i6jyynn6ab45fxw5bms8mflk9ry4qpj6gqyry72vfd5c47fhi"; + sha256 = "1ll3d0l8izygdxqz96wfr2631kxahifwdknpgsx2090vw963js5c"; }; buildInputs = [ perl xz ] @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { description = "The GNU documentation system"; license = licenses.gpl3Plus; platforms = platforms.all; + maintainers = [ maintainers.vrthra ]; longDescription = '' Texinfo is the official documentation format of the GNU project. |