diff options
Diffstat (limited to 'pkgs/tools')
38 files changed, 423 insertions, 199 deletions
diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index 1aec4209b4d3..64ec5e9b418e 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "lxd-${version}"; - version = "2.14"; + version = "2.16"; rev = "lxd-${version}"; goPackagePath = "github.com/lxc/lxd"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "lxc"; repo = "lxd"; - sha256 = "1jy60lb2m0497bnjj09qvflsj2rb0jjmlb8pm1xn5g4lpzibszjm"; + sha256 = "0i2mq9m8k9kznwz1i0xb48plp1ffpzvbdrvqvagis4sm17yab3fn"; }; goDeps = ./deps.nix; diff --git a/pkgs/tools/backup/tarsnap/default.nix b/pkgs/tools/backup/tarsnap/default.nix index 9fca48bde1bb..3767a377cfcf 100644 --- a/pkgs/tools/backup/tarsnap/default.nix +++ b/pkgs/tools/backup/tarsnap/default.nix @@ -8,11 +8,11 @@ let in stdenv.mkDerivation rec { name = "tarsnap-${version}"; - version = "1.0.38"; + version = "1.0.39"; src = fetchurl { url = "https://www.tarsnap.com/download/tarsnap-autoconf-${version}.tgz"; - sha256 = "0nyd722i7q8h81h5mvwxai0f3jmwd93r3ahjkmr12k55p8c0rvkn"; + sha256 = "10i0whbmb345l2ggnf4vs66qjcyf6hmlr8f4nqqcfq0h5a5j24sn"; }; preConfigure = '' diff --git a/pkgs/tools/cd-dvd/brasero/default.nix b/pkgs/tools/cd-dvd/brasero/default.nix index d033371cbcd6..d62f2c25623f 100644 --- a/pkgs/tools/cd-dvd/brasero/default.nix +++ b/pkgs/tools/cd-dvd/brasero/default.nix @@ -6,7 +6,7 @@ let major = "3.12"; - minor = "1"; + minor = "2"; binpath = lib.makeBinPath [ dvdauthor vcdimager ]; in stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "http://download.gnome.org/sources/brasero/${major}/${name}.tar.xz"; - sha256 = "09vi2hyhl0bz7imv3ky6h7x5m3d546n968wcghydwrkvwm9ylpls"; + sha256 = "0h90y674j26rvjahb8cc0w79zx477rb6zaqcj26wzvq8kmpic8k8"; }; nativeBuildInputs = [ pkgconfig itstool intltool wrapGAppsHook ]; diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix index cb7dc65c710d..bb9555fa600c 100644 --- a/pkgs/tools/compression/gzip/default.nix +++ b/pkgs/tools/compression/gzip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xz }: +{ stdenv, hostPlatform, fetchurl, xz }: stdenv.mkDerivation rec { name = "gzip-${version}"; @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1lxv3p4iyx7833mlihkn5wfwmz4cys5nybwpz3dfawag8kn6f5zz"; }; + patches = stdenv.lib.optional hostPlatform.isDarwin stdenv.secure-format-patch; + outputs = [ "out" "man" "info" ]; enableParallelBuilding = true; diff --git a/pkgs/tools/filesystems/zerofree/default.nix b/pkgs/tools/filesystems/zerofree/default.nix index 994777680dbd..593715b2068d 100644 --- a/pkgs/tools/filesystems/zerofree/default.nix +++ b/pkgs/tools/filesystems/zerofree/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "zerofree-${version}"; - version = "1.0.4"; + version = "1.1.0"; src = fetchurl { url = "http://frippery.org/uml/${name}.tgz"; - sha256 = "0f38mvn3wfacapayl54q04qlz4in417pfm6gapgm7dhyjs9y5yd7"; + sha256 = "059g29x5r1xj6wcj4xj85l8w6qrxyl86yqbybjqqz6nxz4falxzf"; }; buildInputs = [ e2fsprogs ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://frippery.org/uml/index.html; + homepage = https://frippery.org/uml/; description = "Zero free blocks from ext2, ext3 and ext4 file-systems"; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.theuni ]; diff --git a/pkgs/tools/graphics/argyllcms/default.nix b/pkgs/tools/graphics/argyllcms/default.nix index 3c7af45f81dd..3cdb4497baf1 100644 --- a/pkgs/tools/graphics/argyllcms/default.nix +++ b/pkgs/tools/graphics/argyllcms/default.nix @@ -84,6 +84,8 @@ stdenv.mkDerivation rec { substituteInPlace Makefile --replace "-j 3" "-j $NIX_BUILD_CORES" # Remove tiff, jpg and png to be sure the nixpkgs-provided ones are used rm -rf tiff jpg png + + unset AR ''; buildInputs = [ diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index 3b537fad91db..6100573153ba 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -21,11 +21,11 @@ let withX = libX11 != null && !aquaterm && !stdenv.isDarwin; in stdenv.mkDerivation rec { - name = "gnuplot-5.0.3"; + name = "gnuplot-5.0.6"; src = fetchurl { url = "mirror://sourceforge/gnuplot/${name}.tar.gz"; - sha256 = "05f7p21d2b0r3h0af8i75bh2inx9pws1k4crx5c400927xgy6vjz"; + sha256 = "0q5lr6nala3ln6f3yp6g17ziymb9r9gx9zylnw1y3hjmwl9lggjv"; }; buildInputs = diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 9a988a2b4311..099e9ee0849d 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -24,7 +24,8 @@ stdenv.mkDerivation rec { # FIXME needs gcc 4.9 in bootstrap tools hardeningDisable = [ "stackprotector" ]; - patches = optional hostPlatform.isCygwin ./coreutils-8.23-4.cygwin.patch; + patches = optional hostPlatform.isCygwin ./coreutils-8.23-4.cygwin.patch + ++ optional hostPlatform.isDarwin stdenv.secure-format-patch; # The test tends to fail on btrfs and maybe other unusual filesystems. postPatch = optionalString (!hostPlatform.isDarwin) '' diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix new file mode 100644 index 000000000000..763ca668d181 --- /dev/null +++ b/pkgs/tools/misc/fd/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + name = "fd-${version}"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "sharkdp"; + repo = "fd"; + rev = "v${version}"; + sha256 = "1xs4y9zf5m0ykl95787jv98xg0a60gkcyyh7kg7qg4xrcgf4qz4j"; + }; + + depsSha256 = "1hxf3j4584jgpwrwykx6yil6q6ka9l81qvx6zrbprdxk3pslp049"; + + meta = { + description = "A simple, fast and user-friendly alternative to find"; + longDescription = '' + `fd` is a simple, fast and user-friendly alternative to `find`. + + While it does not seek to mirror all of `find`'s powerful functionality, + it provides sensible (opinionated) defaults for 80% of the use cases. + ''; + homepage = "https://github.com/sharkdp/fd"; + license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index 2bbeea8133e7..634022e88e02 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -85,6 +85,8 @@ stdenv.mkDerivation rec { # See <http://www.mail-archive.com/qemu-devel@nongnu.org/msg22775.html>. sed -i "tests/util/grub-shell.in" \ -e's/qemu-system-i386/qemu-system-x86_64 -nodefaults/g' + + unset CPP # setting CPP intereferes with dependency calculation ''; prePatch = diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 07326e7a8ed6..648d09b42654 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, perl, makeWrapper, procps }: stdenv.mkDerivation rec { - name = "parallel-20170522"; + name = "parallel-20170722"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "1k5wlcc0dr2fxna0vi48s0l6pvbyl4pbclbih4103f1155im23ca"; + sha256 = "117g50bx1kcbrqix0f1539z5rzhvgsni2wddjv939wcxkrdb1idx"; }; nativeBuildInputs = [ makeWrapper perl ]; diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index b730d45c9e20..bf05cd9bf5cd 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -15,11 +15,11 @@ with stdenv.lib; buildPythonApplication rec { name = "youtube-dl-${version}"; - version = "2017.07.09"; + version = "2017.07.30.1"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "0phrfby2nk5y5x5173bbg3jcr2ajk849al3zji5y39z39dj36ba2"; + sha256 = "1m1n5d06xh8hnild6kssiv9yaq2sm7vy0c8h506v3nff7i9wf0a7"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/networking/altermime/debian-patches.nix b/pkgs/tools/networking/altermime/debian-patches.nix deleted file mode 100644 index cd0ae77511b6..000000000000 --- a/pkgs/tools/networking/altermime/debian-patches.nix +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by debian-patches.sh from debian-patches.txt -let - prefix = "http://patch-tracker.debian.org/patch/series/dl/altermime/0.3.10-7"; -in -[ - { - url = "${prefix}/15_fix_snprintf.diff"; - sha256 = "0fbi99s7pc2jvg9s2zldvg18i6g5ca3pcyaxy47kyabnz956dris"; - } - { - url = "${prefix}/10_fix_printk_warnings.diff"; - sha256 = "1fqsym07r3gv8zllg7c956g5a04gsxnr1ibbgkjr3yx6nm5ci1j7"; - } - { - url = "${prefix}/20_fix-unused-but-set-variables.diff"; - sha256 = "0ski67k44amrgg2g3gwdjzrlix2gjg60r5rs5wbjingvq1n7255r"; - } -] diff --git a/pkgs/tools/networking/altermime/debian-patches.txt b/pkgs/tools/networking/altermime/debian-patches.txt deleted file mode 100644 index 77cb0ff10c15..000000000000 --- a/pkgs/tools/networking/altermime/debian-patches.txt +++ /dev/null @@ -1,4 +0,0 @@ -altermime/0.3.10-7 -15_fix_snprintf.diff -10_fix_printk_warnings.diff -20_fix-unused-but-set-variables.diff diff --git a/pkgs/tools/networking/altermime/default.nix b/pkgs/tools/networking/altermime/default.nix index e532739ecd4f..f05669a4e502 100644 --- a/pkgs/tools/networking/altermime/default.nix +++ b/pkgs/tools/networking/altermime/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation rec { baseName = "altermime"; name = "${baseName}-${version}"; - version = "0.3.10"; + version = "0.3.11"; src = fetchurl { url = "http://www.pldaniels.com/${baseName}/${name}.tar.gz"; - sha256 = "0vn3vmbcimv0n14khxr1782m76983zz9sf4j2kz5v86lammxld43"; + sha256 = "15zxg6spcmd35r6xbidq2fgcg2nzyv1sbbqds08lzll70mqx4pj7"; }; - patches = map fetchurl (import ./debian-patches.nix); + NIX_CFLAGS_COMPILE = "-Wno-error=format"; postPatch = '' sed -i Makefile -e "s@/usr/local@$out@" diff --git a/pkgs/tools/networking/inadyn/default.nix b/pkgs/tools/networking/inadyn/default.nix index 4f9e8b045b0d..3495d2d56f0a 100644 --- a/pkgs/tools/networking/inadyn/default.nix +++ b/pkgs/tools/networking/inadyn/default.nix @@ -1,16 +1,25 @@ -{ stdenv, fetchurl, gnutls, autoreconfHook, pkgconfig, libite, libconfuse }: +{ stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig +, gnutls, libite, libconfuse }: let - version = "2.0"; + version = "2.1"; in stdenv.mkDerivation { name = "inadyn-${version}"; src = fetchurl { url = "https://github.com/troglobit/inadyn/releases/download/v${version}/inadyn-${version}.tar.xz"; - sha256 = "16nmbxj337vkqkk6f7vx7fa8mczjv6dl3ybaxy16c23h486y0mzh"; + sha256 = "1b5khr2y5q1x2mn08zrnjf9hsals4y403mhsc1s7016w3my9lqw7"; }; + patches = [ + ./remove-unused-macro.patch + (fetchpatch { + url = "https://github.com/troglobit/inadyn/commit/ed3a7761015441b5d5cacd691b7aa114da048bef.patch"; + sha256 = "1passghmjd7gmrfcqkfqw9lvg8l22s91nm65ys3n3rylzsgaaq8i"; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ gnutls libite libconfuse ]; diff --git a/pkgs/tools/networking/inadyn/remove-unused-macro.patch b/pkgs/tools/networking/inadyn/remove-unused-macro.patch new file mode 100644 index 000000000000..0ee6a5d7757c --- /dev/null +++ b/pkgs/tools/networking/inadyn/remove-unused-macro.patch @@ -0,0 +1,242 @@ +From b5c70461822003238784ff56f4c8eead10cfc2c1 Mon Sep 17 00:00:00 2001 +From: Joachim Nilsson <troglobit@gmail.com> +Date: Sun, 2 Jul 2017 21:01:33 +0200 +Subject: [PATCH] Remove UNUSED() macro and disable the compiler warning + instead + +Signed-off-by: Joachim Nilsson <troglobit@gmail.com> + +diff --git a/plugins/common.c b/plugins/common.c +index 55c1ac3..9e7ba7b 100644 +--- a/plugins/common.c ++++ b/plugins/common.c +@@ -64,7 +64,7 @@ int common_request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias) + * DynDNS response validator -- common to many other DDNS providers as well + * 'good' or 'nochg' are the good answers, + */ +-int common_response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias)) ++int common_response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias) + { + char *body = trans->rsp_body; + +diff --git a/plugins/ddnss.c b/plugins/ddnss.c +index fea41e9..5184db0 100644 +--- a/plugins/ddnss.c ++++ b/plugins/ddnss.c +@@ -60,7 +60,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias) + info->user_agent); + } + +-static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias)) ++static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias) + { + char *resp = trans->rsp_body; + +diff --git a/plugins/dhis.c b/plugins/dhis.c +index 11edd2c..b6e8e0b 100644 +--- a/plugins/dhis.c ++++ b/plugins/dhis.c +@@ -65,7 +65,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias) + info->user_agent); + } + +-static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *alias) ++static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias) + { + char *rsp = trans->rsp_body; + +diff --git a/plugins/dnsexit.c b/plugins/dnsexit.c +index c456f38..4bf0a08 100644 +--- a/plugins/dnsexit.c ++++ b/plugins/dnsexit.c +@@ -62,7 +62,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias) + info->user_agent); + } + +-static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias)) ++static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias) + { + int code = -1; + char *tmp; +diff --git a/plugins/dtdns.c b/plugins/dtdns.c +index e7996fe..38f0977 100644 +--- a/plugins/dtdns.c ++++ b/plugins/dtdns.c +@@ -58,7 +58,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias) + info->user_agent); + } + +-static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias)) ++static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias) + { + char *resp = trans->rsp_body; + +diff --git a/plugins/duckdns.c b/plugins/duckdns.c +index 9ca46ae..66d9c25 100755 +--- a/plugins/duckdns.c ++++ b/plugins/duckdns.c +@@ -78,7 +78,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias) + info->user_agent); + } + +-static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias)) ++static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias) + { + char *resp = trans->rsp_body; + +diff --git a/plugins/duiadns.c b/plugins/duiadns.c +index 7c4ced3..7dc09c9 100644 +--- a/plugins/duiadns.c ++++ b/plugins/duiadns.c +@@ -58,7 +58,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias) + info->user_agent); + } + +-static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias)) ++static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias) + { + char *resp = trans->rsp_body; + +diff --git a/plugins/dynv6-ipv4.c b/plugins/dynv6-ipv4.c +index 5dab9f1..f37215a 100644 +--- a/plugins/dynv6-ipv4.c ++++ b/plugins/dynv6-ipv4.c +@@ -59,7 +59,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias) + info->user_agent); + } + +-static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias)) ++static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias) + { + char *resp = trans->rsp_body; + +diff --git a/plugins/dynv6.c b/plugins/dynv6.c +index 84b7c40..03b1b4c 100644 +--- a/plugins/dynv6.c ++++ b/plugins/dynv6.c +@@ -59,7 +59,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias) + info->user_agent); + } + +-static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias)) ++static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias) + { + char *resp = trans->rsp_body; + +diff --git a/plugins/easydns.c b/plugins/easydns.c +index c9d8059..7718c56 100644 +--- a/plugins/easydns.c ++++ b/plugins/easydns.c +@@ -70,7 +70,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias) + /* + * NOERROR is the OK code here + */ +-static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias)) ++static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias) + { + char *resp = trans->rsp_body; + +diff --git a/plugins/freedns.c b/plugins/freedns.c +index 2c56ca4..2a2991f 100644 +--- a/plugins/freedns.c ++++ b/plugins/freedns.c +@@ -134,7 +134,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias) + fail blabla and n.n.n.n + are the good answers. We search our own IP address in response and that's enough. + */ +-static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *alias) ++static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias) + { + char *resp = trans->rsp_body; + +diff --git a/plugins/generic.c b/plugins/generic.c +index 8f23de4..3cee1f2 100644 +--- a/plugins/generic.c ++++ b/plugins/generic.c +@@ -238,7 +238,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias) + return ret; + } + +-static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *UNUSED(alias)) ++static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias) + { + char *resp = trans->rsp_body; + size_t i; +diff --git a/plugins/giradns.c b/plugins/giradns.c +index 2d6043e..ea19f77 100644 +--- a/plugins/giradns.c ++++ b/plugins/giradns.c +@@ -57,7 +57,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias) + info->server_name.name, info->user_agent); + } + +-static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias)) ++static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias) + { + char *resp = trans->rsp_body; + +diff --git a/plugins/sitelutions.c b/plugins/sitelutions.c +index c484a62..611c865 100644 +--- a/plugins/sitelutions.c ++++ b/plugins/sitelutions.c +@@ -64,7 +64,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias) + info->user_agent); + } + +-static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias)) ++static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias) + { + char *resp = trans->rsp_body; + +diff --git a/plugins/tunnelbroker.c b/plugins/tunnelbroker.c +index 1f58990..17eb2b9 100644 +--- a/plugins/tunnelbroker.c ++++ b/plugins/tunnelbroker.c +@@ -77,7 +77,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias) + * Hurricate Electric IPv6 tunnelbroker specific response validator + * Own IP address and 'already in use' are the good answers. + */ +-static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *alias) ++static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias) + { + char *resp = trans->rsp_body; + +diff --git a/plugins/tzo.c b/plugins/tzo.c +index 0a36e87..eba3da4 100644 +--- a/plugins/tzo.c ++++ b/plugins/tzo.c +@@ -66,7 +66,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias) + } + + /* TZO specific response validator. */ +-static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias)) ++static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias) + { + int code = -1; + +diff --git a/plugins/zerigo.c b/plugins/zerigo.c +index 4fb29ab..cc71348 100644 +--- a/plugins/zerigo.c ++++ b/plugins/zerigo.c +@@ -70,7 +70,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias) + * Server error + * Status: 5xx + */ +-static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias)) ++static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias) + { + char *ptr, *rsp = trans->rsp_body; + +diff --git a/plugins/zoneedit.c b/plugins/zoneedit.c +index 7178b9c..464ed66 100644 +--- a/plugins/zoneedit.c ++++ b/plugins/zoneedit.c +@@ -65,7 +65,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias) + * CODE=200, 201 + * CODE=707, for duplicated updates + */ +-static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias)) ++static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias) + { + int code = -1; + diff --git a/pkgs/tools/networking/mosh/default.nix b/pkgs/tools/networking/mosh/default.nix index 5f3975a1df86..1f465bc4f8a8 100644 --- a/pkgs/tools/networking/mosh/default.nix +++ b/pkgs/tools/networking/mosh/default.nix @@ -2,11 +2,11 @@ , makeWrapper, perl, openssl, autoreconfHook, openssh }: stdenv.mkDerivation rec { - name = "mosh-1.3.0"; + name = "mosh-1.3.2"; src = fetchurl { url = "https://mosh.org/${name}.tar.gz"; - sha256 = "0xikz40q873g9ihvz3x6bwkcb9hb8kcnp5wpcmb72pg5c7s143ij"; + sha256 = "05hjhlp6lk8yjcy59zywpf0r6s0h0b9zxq0lw66dh9x8vxrhaq6s"; }; buildInputs = [ autoreconfHook protobuf ncurses zlib pkgconfig IOTty makeWrapper perl openssl ]; diff --git a/pkgs/tools/networking/openntpd/default.nix b/pkgs/tools/networking/openntpd/default.nix index 6f3aab3082f0..3ead2ef0f214 100644 --- a/pkgs/tools/networking/openntpd/default.nix +++ b/pkgs/tools/networking/openntpd/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "openntpd-${version}"; - version = "6.0p1"; + version = "6.2p1"; src = fetchurl { url = "mirror://openbsd/OpenNTPD/${name}.tar.gz"; - sha256 = "1s3plmxmybwpfrimq6sc54wxnn6ca7rb2g5k2bdjm4c88w4q1axi"; + sha256 = "1g6hi03ylhv47sbar3xxgsrar8schqfwn4glckh6m6lni67ndq85"; }; configureFlags = [ diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index aaef2723da0c..c0440e78a389 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -60,6 +60,12 @@ stdenv.mkDerivation rec { ++ optional withKerberos kerberos ++ optional hpnSupport autoreconfHook; + preConfigure = '' + # Setting LD causes `configure' and `make' to disagree about which linker + # to use: `configure' wants `gcc', but `make' wants `ld'. + unset LD + ''; + # I set --disable-strip because later we strip anyway. And it fails to strip # properly when cross building. configureFlags = [ diff --git a/pkgs/tools/networking/ppp/default.nix b/pkgs/tools/networking/ppp/default.nix index 90a4b988c3f7..d07770260ff6 100644 --- a/pkgs/tools/networking/ppp/default.nix +++ b/pkgs/tools/networking/ppp/default.nix @@ -34,7 +34,9 @@ stdenv.mkDerivation rec { ''; postFixup = '' - substituteInPlace $out/bin/{pon,poff,plog} --replace "/usr/sbin" "$out/bin" + for tgt in pon poff plog; do + substituteInPlace "$out/bin/$tgt" --replace "/usr/sbin" "$out/bin" + done ''; meta = { diff --git a/pkgs/tools/networking/radvd/default.nix b/pkgs/tools/networking/radvd/default.nix index a5008e91423f..9ebce846e416 100644 --- a/pkgs/tools/networking/radvd/default.nix +++ b/pkgs/tools/networking/radvd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "radvd-${version}"; - version = "2.16"; + version = "2.17"; src = fetchurl { url = "http://www.litech.org/radvd/dist/${name}.tar.xz"; - sha256 = "1s3aqgn3db0wb4920b0mrvwb5isgijlb6izb1wliqhhashwffz1i"; + sha256 = "1md6n63sg1n9x8yv0p7fwm1xxaiadj1q3mpadiqsvn14y1ddc2av"; }; nativeBuildInputs = [ pkgconfig bison flex check ]; diff --git a/pkgs/tools/networking/speedtest-cli/default.nix b/pkgs/tools/networking/speedtest-cli/default.nix index 8ccc924d9f6e..592a173df7e8 100644 --- a/pkgs/tools/networking/speedtest-cli/default.nix +++ b/pkgs/tools/networking/speedtest-cli/default.nix @@ -2,13 +2,13 @@ pythonPackages.buildPythonApplication rec { name = "speedtest-cli-${version}"; - version = "1.0.4"; - + version = "1.0.6"; + src = fetchFromGitHub { owner = "sivel"; repo = "speedtest-cli"; rev = "v${version}"; - sha256 = "13i7bvhvwv8h2lxnz9pfxq6jv915lb948d6xjiy5p7rqbki40ng2"; + sha256 = "008a0wymn06h93gdkxwlgxg8039ybdni96i4blhpayj52jkbflnv"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index e700ea4fb286..5b6b2ee7ba70 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, nettle, expat, libevent }: +{ stdenv, fetchurl, openssl, nettle, expat, libevent, dns-root-data }: stdenv.mkDerivation rec { name = "unbound-${version}"; @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { "--localstatedir=/var" "--sysconfdir=/etc" "--sbindir=\${out}/bin" + "--with-rootkey-file=${dns-root-data}/root.key" "--enable-pie" "--enable-relro-now" ]; diff --git a/pkgs/tools/networking/wavemon/default.nix b/pkgs/tools/networking/wavemon/default.nix index ece252a9b6c7..0457c1ce6233 100644 --- a/pkgs/tools/networking/wavemon/default.nix +++ b/pkgs/tools/networking/wavemon/default.nix @@ -1,20 +1,26 @@ -{stdenv, fetchgit, ncurses, libnl, pkgconfig}: +{ stdenv, fetchFromGitHub, ncurses, libnl, pkgconfig }: + stdenv.mkDerivation rec { - version = "0.7.6.20151001"; - baseName="wavemon"; - name="${baseName}-${version}"; - buildInputs = [ncurses libnl pkgconfig]; - src = fetchgit { - url = https://github.com/uoaerg/wavemon.git ; - rev = "05753aed2ec5a786d602c7903c89fc6a230f8d42"; - sha256 = "13y4bi4qz4596f11ng6zaqir5j234wv64z4670q3pzh3fqmzmpm4"; + version = "0.8.1"; + baseName = "wavemon"; + name = "${baseName}-${version}"; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ncurses libnl ]; + + src = fetchFromGitHub { + owner = "uoaerg"; + repo = "wavemon"; + rev = "v${version}"; + sha256 = "0mx61rzl8a66pmigv2fh75zgdalxx75a5s1b7ydbviz18ihhjyls"; }; - meta = { + + meta = with stdenv.lib; { inherit version; - description = "WiFi state monitor"; - license = stdenv.lib.licenses.gpl3Plus ; - maintainers = [stdenv.lib.maintainers.raskin]; + description = "Ncurses-based monitoring application for wireless network devices"; + homepage = https://github.com/uoaerg/wavemon; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ raskin fpletz ]; platforms = stdenv.lib.platforms.linux; - downloadPage = https://github.com/uoaerg/wavemon.git ; }; } diff --git a/pkgs/tools/networking/whois/default.nix b/pkgs/tools/networking/whois/default.nix index fd1045d03d99..e6f251768645 100644 --- a/pkgs/tools/networking/whois/default.nix +++ b/pkgs/tools/networking/whois/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, perl, gettext }: stdenv.mkDerivation rec { - version = "5.2.16"; + version = "5.2.17"; name = "whois-${version}"; src = fetchFromGitHub { owner = "rfc1036"; repo = "whois"; rev = "v${version}"; - sha256 = "1axkj3xp8ryw94ml8lkqgpdqkv56aygbyv18kynf2bcglxildyvv"; + sha256 = "15jnzk0js8wxiapz1bw7jnck0fl3mcli56f9635z9x7vk63ss68z"; }; buildInputs = [ perl gettext ]; diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix index e7a052c90f1c..31f2262cd9ff 100644 --- a/pkgs/tools/security/fail2ban/default.nix +++ b/pkgs/tools/security/fail2ban/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, python, pythonPackages, gamin }: -let version = "0.9.6"; in +let version = "0.9.7"; in pythonPackages.buildPythonApplication { name = "fail2ban-${version}"; @@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication { owner = "fail2ban"; repo = "fail2ban"; rev = version; - sha256 = "1a75xjjqhn98zd9i51k15vjvcy0ql0gmcv9xf8pbd0bpvblgdah8"; + sha256 = "07l5pz93mz1r3g59xiyyznlpjfpv2zgvh3h9w0cbn79v7njim8kb"; }; propagatedBuildInputs = [ gamin ] diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix index e74b0920f4a2..9590ee746b8b 100644 --- a/pkgs/tools/security/gnupg/21.nix +++ b/pkgs/tools/security/gnupg/21.nix @@ -15,11 +15,11 @@ assert guiSupport -> pinentry != null; stdenv.mkDerivation rec { name = "gnupg-${version}"; - version = "2.1.21"; + version = "2.1.22"; src = fetchurl { url = "mirror://gnupg/gnupg/${name}.tar.bz2"; - sha256 = "1p97limv29p01y79mgnzpwixa50lv53wgdl3ymk9idkmpaldisks"; + sha256 = "1msazgy1q1pp7y2xr46z0il4pfzmzgzkp7v0hv5cz4hvkspnywa6"; }; buildInputs = [ diff --git a/pkgs/tools/security/hashcat/hashcat3/default.nix b/pkgs/tools/security/hashcat/hashcat3/default.nix index c8a8acf907d3..1cb028a1a333 100644 --- a/pkgs/tools/security/hashcat/hashcat3/default.nix +++ b/pkgs/tools/security/hashcat/hashcat3/default.nix @@ -4,15 +4,15 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { name = "hashcat-${version}"; - version = "3.10"; + version = "3.6.0"; src = fetchurl { - name = "${name}.tar.gz"; - url = "https://hashcat.net/files_legacy/hashcat-${version}.tar.gz"; - sha256 = "1sg30d9as6xsl7b0i7mz26igachbv0l0yimwb12nmarmgdgmwm9v"; + url = "https://hashcat.net/files/hashcat-${version}.tar.gz"; + sha256 = "127hdvq6ikah7r5vch63jnnkcsj7y61f9h8x79c3w25x9w55bxry"; }; - buildInputs = [ opencl-headers makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ opencl-headers ]; makeFlags = [ "OPENCL_HEADERS_KHRONOS=${opencl-headers}/include" ]; diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix index e3aaca2e5b22..74bb5cc58197 100644 --- a/pkgs/tools/security/pcsclite/default.nix +++ b/pkgs/tools/security/pcsclite/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "pcsclite-${version}"; - version = "1.8.21"; + version = "1.8.22"; src = fetchurl { # This URL changes in unpredictable ways, so it is not sensible # to put a version variable in there. - url = "https://alioth.debian.org/frs/download.php/file/4216/pcsc-lite-1.8.21.tar.bz2"; - sha256 = "1b8kwl81f6s3y7qh68ahr8sp8a0w6m464v9b3s4zxq2cgpmnaczy"; + url = "https://alioth.debian.org/frs/download.php/file/4225/pcsc-lite-1.8.22.tar.bz2"; + sha256 = "01flkdyqs7kr6c63dv2qg8dwir3v9jlr9rzlw7vafrivxmhqydba"; }; patches = [ ./no-dropdir-literals.patch ]; diff --git a/pkgs/tools/security/vulnix/requirements.nix b/pkgs/tools/security/vulnix/requirements.nix index 11faca44ef93..d44d49f12a92 100644 --- a/pkgs/tools/security/vulnix/requirements.nix +++ b/pkgs/tools/security/vulnix/requirements.nix @@ -1,38 +1,6 @@ { pythonPackages, fetchurl, stdenv }: rec { - BTrees = pythonPackages.buildPythonPackage { - name = "BTrees-4.3.1"; - src = fetchurl { - url = "https://pypi.python.org/packages/24/76/cd6f225f2180c22af5cdb6656f51aec5fca45e45bdc4fa75c0a32f161a61/BTrees-4.3.1.tar.gz"; - sha256 = "2565b7d35260dfc6b1e2934470fd0a2f9326c58c535a2b4cb396289d1c195a95"; - }; - propagatedBuildInputs = [ - persistent - transaction - ] ++ (with pythonPackages; [ zope_interface coverage ]); - - meta = with stdenv.lib; { - homepage = ""; - license = licenses.zpt21; - description = "Scalable persistent object containers"; - }; - }; - - ZConfig = pythonPackages.buildPythonPackage { - name = "ZConfig-3.1.0"; - src = fetchurl { - url = "https://pypi.python.org/packages/52/b3/a96d62711a26d8cfbe546519975dc9ed54d2eb50b3238d2e6de045764796/ZConfig-3.1.0.tar.gz"; - sha256 = "c21fa3a073a56925a8098036d46717392994a92cffea1b3cda3176b70c0a842e"; - }; - propagatedBuildInputs = with pythonPackages; [ zope_testrunner ]; - meta = with stdenv.lib; { - homepage = ""; - license = licenses.zpt21; - description = "Structured Configuration Library"; - }; - }; - zodb = pythonPackages.buildPythonPackage { name = "ZODB-5.2.0"; src = fetchurl { @@ -41,31 +9,22 @@ rec { }; doCheck = false; propagatedBuildInputs = [ - BTrees - persistent transaction - ZConfig - zc.lockfile + ] ++ (with pythonPackages; [ + six + wheel + zope_interface zodbpickle - ] ++ (with pythonPackages; [ six wheel zope_interface ]); - meta = with stdenv.lib; { - homepage = ""; - license = licenses.zpt21; - description = "Zope Object Database: object database and persistence"; - }; - }; + zconfig + persistent + zc_lockfile + BTrees + ]); - persistent = pythonPackages.buildPythonPackage { - name = "persistent-4.2.2"; - src = fetchurl { - url = "https://pypi.python.org/packages/3d/71/3302512282b606ec4d054e09be24c065915518903b29380b6573bff79c24/persistent-4.2.2.tar.gz"; - sha256 = "52ececc6dbba5ef572d3435189318b4dff07675bafa9620e32f785e147c6563c"; - }; - propagatedBuildInputs = with pythonPackages; [ zope_interface six wheel ]; meta = with stdenv.lib; { homepage = ""; license = licenses.zpt21; - description = "Translucent persistent objects"; + description = "Zope Object Database: object database and persistence"; }; }; @@ -75,39 +34,16 @@ rec { url = "https://pypi.python.org/packages/8c/af/3ffafe85bcc93ecb09459f3f2bd8fbe142e9ab34048f9e2774543b470cbd/transaction-2.0.3.tar.gz"; sha256 = "67bfb81309ba9717edbb2ca2e5717c325b78beec0bf19f44e5b4b9410f82df7f"; }; - propagatedBuildInputs = with pythonPackages; [ zope_interface six wheel ]; + propagatedBuildInputs = with pythonPackages; [ + zope_interface + six + wheel + mock + ]; meta = with stdenv.lib; { homepage = ""; license = licenses.zpt21; description = "Transaction management for Python"; }; }; - - zc.lockfile = pythonPackages.buildPythonPackage { - name = "zc.lockfile-1.2.1"; - src = fetchurl { - url = "https://pypi.python.org/packages/bd/84/0299bbabbc9d3f84f718ba1039cc068030d3ad723c08f82a64337edf901e/zc.lockfile-1.2.1.tar.gz"; - sha256 = "11db91ada7f22fe8aae268d4bfdeae012c4fe655f66bbb315b00822ec00d043e"; - }; - meta = with stdenv.lib; { - homepage = ""; - license = licenses.zpt21; - description = "Basic inter-process locks"; - }; - }; - - zodbpickle = pythonPackages.buildPythonPackage { - name = "zodbpickle-0.6.0"; - src = fetchurl { - url = "https://pypi.python.org/packages/7a/fc/f6f437a5222b330735eaf8f1e67a6845bd1b600e9a9455e552d3c13c4902/zodbpickle-0.6.0.tar.gz"; - sha256 = "ea3248be966159e7791e3db0e35ea992b9235d52e7d39835438686741d196665"; - }; - doCheck = false; - - meta = with stdenv.lib; { - homepage = ""; - license = licenses.zpt21; - description = "Fork of Python 3 pickle module."; - }; - }; } diff --git a/pkgs/tools/system/ipmiutil/default.nix b/pkgs/tools/system/ipmiutil/default.nix index 174772107268..90feb381ae57 100644 --- a/pkgs/tools/system/ipmiutil/default.nix +++ b/pkgs/tools/system/ipmiutil/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { baseName = "ipmiutil"; - version = "3.0.2"; + version = "3.0.5"; name = "${baseName}-${version}"; src = fetchurl { url = "mirror://sourceforge/project/${baseName}/${name}.tar.gz"; - sha256 = "0nw12v7w9gx2px3b081i5mm5gl4l9n3vxhhk5n18vj1bs2jsxf4d"; + sha256 = "0ppfxh04c0aj9dxpkzj3xv1kylc17k1kvqabp8r7h70k6ljzgmxj"; }; buildInputs = [ openssl ]; diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix index 998a3bdf6d1d..8a4fe6cb3cff 100644 --- a/pkgs/tools/system/pciutils/default.nix +++ b/pkgs/tools/system/pciutils/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, zlib, kmod, which }: stdenv.mkDerivation rec { - name = "pciutils-3.5.4"; # with database from 2017-02 + name = "pciutils-3.5.5"; # with database from 2017-07 src = fetchurl { url = "mirror://kernel/software/utils/pciutils/${name}.tar.xz"; - sha256 = "0rpy7kkb2y89wmbcbfjjjxsk2x89v5xxhxib4vpl131ip5m3qab4"; + sha256 = "1d62f8fa192f90e61c35a6fc15ff3cb9a7a792f782407acc42ef67817c5939f5"; }; buildInputs = [ pkgconfig zlib kmod which ]; diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix index c3f05edd9adb..26d84ae0320e 100644 --- a/pkgs/tools/system/smartmontools/default.nix +++ b/pkgs/tools/system/smartmontools/default.nix @@ -1,20 +1,18 @@ -{ stdenv, fetchurl, IOKit ? null , ApplicationServices ? null }: +{ stdenv, fetchurl, autoreconfHook +, IOKit ? null , ApplicationServices ? null }: let - version = "6.5"; - dbrev = "4391"; + dbrev = "4394"; drivedbBranch = "RELEASE_${builtins.replaceStrings ["."] ["_"] version}_DRIVEDB"; driverdb = fetchurl { url = "http://sourceforge.net/p/smartmontools/code/${dbrev}/tree/branches/${drivedbBranch}/smartmontools/drivedb.h?format=raw"; - sha256 = "1da99m81wr0rjdhcz2xx0sbbrqxkxffja2kllg4srmhih7fps5p1"; + sha256 = "1kdpgbl1az0xhqn7j613cx366n7amra8xz3391jpzzrd3vlga393"; name = "smartmontools-drivedb.h"; }; -in - -stdenv.mkDerivation rec { +in stdenv.mkDerivation rec { name = "smartmontools-${version}"; src = fetchurl { @@ -22,16 +20,18 @@ stdenv.mkDerivation rec { sha256 = "1g25r6sx85b5lay5n6sbnqv05qxzj6xsafsp93hnrg1h044bps49"; }; - buildInputs = [] ++ stdenv.lib.optionals stdenv.isDarwin [IOKit ApplicationServices]; - patches = [ ./smartmontools.patch ]; postPatch = "cp -v ${driverdb} drivedb.h"; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [] ++ stdenv.lib.optionals stdenv.isDarwin [IOKit ApplicationServices]; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Tools for monitoring the health of hard drives"; - homepage = http://smartmontools.sourceforge.net/; - license = licenses.gpl2Plus; - platforms = with platforms; linux ++ darwin; - maintainers = [ maintainers.peti ]; + homepage = http://smartmontools.sourceforge.net/; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ peti ]; + platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/tools/text/catdoc/default.nix b/pkgs/tools/text/catdoc/default.nix index fb0309e75325..2a06b25b11da 100644 --- a/pkgs/tools/text/catdoc/default.nix +++ b/pkgs/tools/text/catdoc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, fetchpatch }: stdenv.mkDerivation rec { name = "catdoc-${version}"; @@ -9,6 +9,13 @@ stdenv.mkDerivation rec { sha256 = "514a84180352b6bf367c1d2499819dfa82b60d8c45777432fa643a5ed7d80796"; }; + patches = [ + (fetchpatch { + url = "https://anonscm.debian.org/git/collab-maint/catdoc.git/diff/debian/patches/05-CVE-2017-11110.patch?id=21dd5b29b11be04149587657dd90253f52dfef0b"; + sha256 = "0mdqa9w1p6cmli6976v4wi0sw9r4p5prkj7lzfd1877wk11c9c73"; + }) + ]; + configureFlags = "--disable-wordview"; meta = with stdenv.lib; { diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix index b33ea7169783..0db140c7891c 100644 --- a/pkgs/tools/text/gnugrep/default.nix +++ b/pkgs/tools/text/gnugrep/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, pcre, libiconv, perl }: -let version = "3.0"; in +let version = "3.1"; in stdenv.mkDerivation { name = "gnugrep-${version}"; src = fetchurl { url = "mirror://gnu/grep/grep-${version}.tar.xz"; - sha256 = "1dcasjp3a578nrvzrcn38mpizb8w1q6mvfzhjmcqqgkf0nsivj72"; + sha256 = "0zm0ywmyz9g8vn1plw14mn8kj74yipx5qsljndbyfgmvndx5qqnv"; }; # Perl is needed for testing diff --git a/pkgs/tools/text/mawk/default.nix b/pkgs/tools/text/mawk/default.nix index 6698334791c6..8840130dde50 100644 --- a/pkgs/tools/text/mawk/default.nix +++ b/pkgs/tools/text/mawk/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "mawk-1.3.4-20141206"; + name = "mawk-1.3.4-20161120"; src = fetchurl { url = "ftp://invisible-island.net/mawk/${name}.tgz"; - sha256 = "1j49ffl8gpfaq99hkylf3fjiygq74w1kpfp8f52xbpx57vn9587g"; + sha256 = "07hc33g2ip7463dravsiz0zwfc8vy4y4jxqvp7rz3hb896xw27in"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/typesetting/pdfgrep/default.nix b/pkgs/tools/typesetting/pdfgrep/default.nix index 6e5f98d4a717..0c288ca02ccf 100644 --- a/pkgs/tools/typesetting/pdfgrep/default.nix +++ b/pkgs/tools/typesetting/pdfgrep/default.nix @@ -1,26 +1,28 @@ -{ fetchurl, stdenv, pkgconfig, poppler, makeWrapper }: +{ stdenv, fetchurl, pkgconfig, poppler, libgcrypt, pcre, asciidoc }: stdenv.mkDerivation rec { name = "pdfgrep-${version}"; - version = "1.3.1"; + version = "2.0.1"; src = fetchurl { - url = "mirror://sourceforge/project/pdfgrep/${version}/${name}.tar.gz"; - sha256 = "6e8bcaf8b219e1ad733c97257a97286a94124694958c27506b2ea7fc8e532437"; + url = "https://pdfgrep.org/download/${name}.tar.gz"; + sha256 = "07llkrkcfjwd3ybai9ad10ybhr0biffcplmy7lw4fb87nd2dfw03"; }; - buildInputs = [ pkgconfig poppler makeWrapper ]; - - patchPhase = '' - sed -i -e "s%cpp/poppler-document.h%poppler/cpp/poppler-document.h%" pdfgrep.cc - sed -i -e "s%cpp/poppler-page.h%poppler/cpp/poppler-page.h%" pdfgrep.cc + postPatch = '' + for i in ./src/search.h ./src/pdfgrep.cc ./src/search.cc; do + substituteInPlace $i --replace '<cpp/' '<' + done ''; + nativeBuildInputs = [ pkgconfig asciidoc ]; + buildInputs = [ poppler libgcrypt pcre ]; + meta = { - description = "A tool to search text in PDF files"; - homepage = http://pdfgrep.sourceforge.net/; - license = stdenv.lib.licenses.free; - maintainers = with stdenv.lib.maintainers; [qknight]; + description = "Commandline utility to search text in PDF files"; + homepage = https://pdfgrep.org/; + license = stdenv.lib.licenses.gpl2Plus; + maintainers = with stdenv.lib.maintainers; [ qknight fpletz ]; platforms = with stdenv.lib.platforms; linux; }; } |