diff options
Diffstat (limited to 'pkgs/tools')
29 files changed, 87 insertions, 395 deletions
diff --git a/pkgs/tools/X11/xcalib/default.nix b/pkgs/tools/X11/xcalib/default.nix index 2f925b11ba5..4e400ee8a24 100644 --- a/pkgs/tools/X11/xcalib/default.nix +++ b/pkgs/tools/X11/xcalib/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { inherit (src.meta) homepage; description = "A tiny monitor calibration loader for X and MS-Windows"; license = licenses.gpl2; - maintainers = [ maintainers.rickynils ]; + maintainers = []; platforms = platforms.linux; }; } diff --git a/pkgs/tools/backup/wal-e/default.nix b/pkgs/tools/backup/wal-e/default.nix index 3b66ac1b491..42a3f51ee60 100644 --- a/pkgs/tools/backup/wal-e/default.nix +++ b/pkgs/tools/backup/wal-e/default.nix @@ -25,7 +25,7 @@ pythonPackages.buildPythonApplication rec { meta = { description = "A Postgres WAL-shipping disaster recovery and replication toolkit"; homepage = https://github.com/wal-e/wal-e; - maintainers = [ stdenv.lib.maintainers.rickynils ]; + maintainers = []; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix index 257396e0428..5a153393ccd 100644 --- a/pkgs/tools/compression/zstd/default.nix +++ b/pkgs/tools/compression/zstd/default.nix @@ -5,10 +5,10 @@ stdenv.mkDerivation rec { pname = "zstd"; - version = "1.4.1"; + version = "1.4.3"; src = fetchFromGitHub { - sha256 = "1f2nvhsx1fsd6zbnwvc6bbrm9ghkcvamqqg79fxgk5284rc6nynv"; + sha256 = "0mmgs98cfh92gcbjyv37vz8nq7x4x7fbzymlxyqd9awwpv9v0i5n"; rev = "v${version}"; repo = "zstd"; owner = "facebook"; diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index e915cc1c132..606e41e582e 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, fuse, bison, flex_2_5_35, openssl, python2, ncurses, readline, +{stdenv, fetchurl, fuse, bison, flex_2_5_35, openssl, python3, ncurses, readline, autoconf, automake, libtool, pkgconfig, zlib, libaio, libxml2, acl, sqlite, liburcu, attr, makeWrapper, coreutils, gnused, gnugrep, which, openssh, gawk, findutils, utillinux, lvm2, btrfs-progs, e2fsprogs, xfsprogs, systemd, @@ -15,25 +15,26 @@ let # The command # find /nix/store/...-glusterfs-.../ -name '*.py' -executable # can help with finding new Python scripts. - version = "4.0.0"; + version = "6.5"; name="${baseName}-${version}"; url="https://github.com/gluster/glusterfs/archive/v${version}.tar.gz"; - sha256 = "0af3fwiixddds6gdwhkyq3l214mmjl2wpjc2qayp5rpz79lnclq3"; + sha256 = "17vdrw71ys1n5g9pdmzipmr706bslq0gbxxjhacxnrgsz8r4rl6a"; }; + buildInputs = [ fuse bison flex_2_5_35 openssl ncurses readline autoconf automake libtool pkgconfig zlib libaio libxml2 - acl sqlite liburcu attr makeWrapper - (python2.withPackages (pkgs: [ + acl sqlite liburcu attr makeWrapper utillinux + (python3.withPackages (pkgs: [ pkgs.flask pkgs.prettytable pkgs.requests pkgs.pyxattr ])) - # NOTE: `python2` has to be *AFTER* the above `python2.withPackages`, + # NOTE: `python3` has to be *AFTER* the above `python3.withPackages`, # to ensure that the packages are available but the `toPythonPath` # shell function used in `postFixup` is also still available. - python2 + python3 ]; # Some of the headers reference acl propagatedBuildInputs = [ @@ -65,21 +66,15 @@ rec { inherit (s) name version; inherit buildInputs propagatedBuildInputs; - postPatch = '' - sed -e '/chmod u+s/d' -i contrib/fuse-util/Makefile.am - ''; - patches = [ - # Remove when https://bugzilla.redhat.com/show_bug.cgi?id=1450546 is fixed - ./glusterfs-use-PATH-instead-of-hardcodes.patch - # Remove when https://bugzilla.redhat.com/show_bug.cgi?id=1450593 is fixed - ./glusterfs-python-remove-find_library.patch # Remove when https://bugzilla.redhat.com/show_bug.cgi?id=1489610 is fixed ./glusterfs-fix-bug-1489610-glusterfind-var-data-under-prefix.patch - # Remove when https://bugzilla.redhat.com/show_bug.cgi?id=1559130 is fixed - ./glusterfs-glusterfind-log-remote-node_cmd-error.patch ]; + postPatch = '' + sed -e '/chmod u+s/d' -i contrib/fuse-util/Makefile.am + ''; + # Note that the VERSION file is something that is present in release tarballs # but not in git tags (at least not as of writing in v3.10.1). # That's why we have to create it. @@ -92,6 +87,7 @@ rec { preConfigure = '' echo "v${s.version}" > VERSION ./autogen.sh + export PYTHON=${python3}/bin/python ''; configureFlags = [ @@ -178,6 +174,9 @@ rec { # on a real TTY for testing purposes. echo "" | (mkdir -p nix-test-dir-for-gfid_to_path && touch b && $out/libexec/glusterfs/gfind_missing_files/gfid_to_path.py nix-test-dir-for-gfid_to_path) $out/share/glusterfs/scripts/eventsdash.py --help + + # this gets falsely loaded as module by glusterfind + rm -r $out/bin/conf.py ''; src = fetchurl { diff --git a/pkgs/tools/filesystems/glusterfs/glusterfs-fix-bug-1489610-glusterfind-var-data-under-prefix.patch b/pkgs/tools/filesystems/glusterfs/glusterfs-fix-bug-1489610-glusterfind-var-data-under-prefix.patch index f679fb8f4c1..f08d73cf3a6 100644 --- a/pkgs/tools/filesystems/glusterfs/glusterfs-fix-bug-1489610-glusterfind-var-data-under-prefix.patch +++ b/pkgs/tools/filesystems/glusterfs/glusterfs-fix-bug-1489610-glusterfind-var-data-under-prefix.patch @@ -18,10 +18,10 @@ index f87d8a454..b4d3f5d10 100644 fi GLUSTERFS_LIBEXECDIR="$(eval echo $libexecdir)/glusterfs" -GLUSTERFSD_MISCDIR="$(eval echo $prefix)/var/lib/misc/glusterfsd" -+GLUSTERFSD_MISCDIR="$(eval echo $localstatedir)/var/lib/misc/glusterfsd" ++GLUSTERFSD_MISCDIR="$(eval echo $localstatedir)/lib/misc/glusterfsd" prefix=$old_prefix exec_prefix=$old_exec_prefix - --- + +-- 2.12.0 diff --git a/pkgs/tools/filesystems/glusterfs/glusterfs-glusterfind-log-remote-node_cmd-error.patch b/pkgs/tools/filesystems/glusterfs/glusterfs-glusterfind-log-remote-node_cmd-error.patch deleted file mode 100644 index 8bc00fdbf75..00000000000 --- a/pkgs/tools/filesystems/glusterfs/glusterfs-glusterfind-log-remote-node_cmd-error.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 92a6b84a37e7e2e0ec0655ca45cedb64ab72080e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me> -Date: Fri, 8 Sep 2017 02:40:01 +0200 -Subject: [PATCH] glusterfind: Log remote stderr on `node_cmd` error. - -The problem of lost stderr was introduced in -commit feea851fad4f89b48bfe89fe3b75250cc7bd6501. - -Change-Id: Ic98f9bc9682ae3bd9c3ebea3855667fc8ba2843d ---- - tools/glusterfind/src/main.py | 17 ++++++++++++++++- - 1 file changed, 16 insertions(+), 1 deletion(-) - -diff --git a/tools/glusterfind/src/main.py b/tools/glusterfind/src/main.py -index c125f970a..6fffce4b3 100644 ---- a/tools/glusterfind/src/main.py -+++ b/tools/glusterfind/src/main.py -@@ -75,12 +75,27 @@ def node_cmd(host, host_uuid, task, cmd, args, opts): - cmd = ["ssh", - "-oNumberOfPasswordPrompts=0", - "-oStrictHostKeyChecking=no", -+ # We force TTY allocation (-t -t) so that Ctrl+C is handed -+ # through; see: -+ # https://bugzilla.redhat.com/show_bug.cgi?id=1382236 -+ # Note that this turns stderr of the remote `cmd` -+ # into stdout locally. - "-t", - "-t", - "-i", pem_key_path, - "root@%s" % host] + cmd - -- execute(cmd, exit_msg="%s - %s failed" % (host, task), logger=logger) -+ (returncode, err, out) = execute(cmd, logger=logger) -+ if returncode != 0: -+ # Because the `-t -t` above turns the remote stderr into -+ # local stdout, we need to log both stderr and stdout -+ # here to print all error messages. -+ fail("%s - %s failed; stdout (including remote stderr):\n" -+ "%s\n" -+ "stderr:\n" -+ "%s" % (host, task, out, err), -+ returncode, -+ logger=logger) - - if opts.get("copy_outfile", False) and not localdir: - cmd_copy = ["scp", --- -2.12.0 - diff --git a/pkgs/tools/filesystems/glusterfs/glusterfs-python-remove-find_library.patch b/pkgs/tools/filesystems/glusterfs/glusterfs-python-remove-find_library.patch deleted file mode 100644 index 4757f2fce77..00000000000 --- a/pkgs/tools/filesystems/glusterfs/glusterfs-python-remove-find_library.patch +++ /dev/null @@ -1,156 +0,0 @@ -From e6293e367f56833457291e32a4df7b21a52365a7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me> -Date: Sat, 13 May 2017 18:54:36 +0200 -Subject: [PATCH] python: Remove all uses of find_library. Fixes #1450593 - -`find_library()` doesn't consider LD_LIBRARY_PATH on Python < 3.6. - -Change-Id: Iee26085cb5d14061001f19f032c2664d69a378a8 ---- - api/examples/getvolfile.py | 2 +- - geo-replication/syncdaemon/libcxattr.py | 3 +-- - geo-replication/syncdaemon/libgfchangelog.py | 6 ++---- - tests/features/ipctest.py | 10 ++-------- - tests/utils/libcxattr.py | 5 ++--- - tools/glusterfind/src/libgfchangelog.py | 3 +-- - .../features/changelog/lib/examples/python/libgfchangelog.py | 3 +-- - 7 files changed, 10 insertions(+), 22 deletions(-) - -diff --git a/api/examples/getvolfile.py b/api/examples/getvolfile.py -index 0c95213f0..32c2268b3 100755 ---- a/api/examples/getvolfile.py -+++ b/api/examples/getvolfile.py -@@ -3,7 +3,7 @@ - import ctypes - import ctypes.util - --api = ctypes.CDLL(ctypes.util.find_library("gfapi")) -+api = ctypes.CDLL("libgfapi.so") - api.glfs_get_volfile.argtypes = [ctypes.c_void_p, - ctypes.c_void_p, - ctypes.c_ulong] -diff --git a/geo-replication/syncdaemon/libcxattr.py b/geo-replication/syncdaemon/libcxattr.py -index 3671e102c..f576648b7 100644 ---- a/geo-replication/syncdaemon/libcxattr.py -+++ b/geo-replication/syncdaemon/libcxattr.py -@@ -10,7 +10,6 @@ - - import os - from ctypes import CDLL, create_string_buffer, get_errno --from ctypes.util import find_library - - - class Xattr(object): -@@ -25,7 +24,7 @@ class Xattr(object): - sizes we expect - """ - -- libc = CDLL(find_library("c"), use_errno=True) -+ libc = CDLL("libc.so.6", use_errno=True) - - @classmethod - def geterrno(cls): -diff --git a/geo-replication/syncdaemon/libgfchangelog.py b/geo-replication/syncdaemon/libgfchangelog.py -index 334f5e9ea..093ae157a 100644 ---- a/geo-replication/syncdaemon/libgfchangelog.py -+++ b/geo-replication/syncdaemon/libgfchangelog.py -@@ -9,14 +9,12 @@ - # - - import os --from ctypes import CDLL, RTLD_GLOBAL, create_string_buffer, \ -- get_errno, byref, c_ulong --from ctypes.util import find_library -+from ctypes import CDLL, RTLD_GLOBAL, create_string_buffer, get_errno, byref, c_ulong - from syncdutils import ChangelogException, ChangelogHistoryNotAvailable - - - class Changes(object): -- libgfc = CDLL(find_library("gfchangelog"), mode=RTLD_GLOBAL, -+ libgfc = CDLL("libgfchangelog.so", mode=RTLD_GLOBAL, - use_errno=True) - - @classmethod -diff --git a/tests/features/ipctest.py b/tests/features/ipctest.py -index 5aff319b8..933924861 100755 ---- a/tests/features/ipctest.py -+++ b/tests/features/ipctest.py -@@ -1,14 +1,8 @@ - #!/usr/bin/python - - import ctypes --import ctypes.util -- --# find_library does not lookup LD_LIBRARY_PATH and may miss the --# function. In that case, retry with less portable but explicit name. --libgfapi = ctypes.util.find_library("gfapi") --if libgfapi == None: -- libgfapi = "libgfapi.so" --api = ctypes.CDLL(libgfapi,mode=ctypes.RTLD_GLOBAL) -+ -+api = ctypes.CDLL("libgfapi.so",mode=ctypes.RTLD_GLOBAL) - - api.glfs_ipc.argtypes = [ ctypes.c_void_p, ctypes.c_int, ctypes.c_void_p, ctypes.c_void_p ] - api.glfs_ipc.restype = ctypes.c_int -diff --git a/tests/utils/libcxattr.py b/tests/utils/libcxattr.py -index 149db72e6..4e6e6c46d 100644 ---- a/tests/utils/libcxattr.py -+++ b/tests/utils/libcxattr.py -@@ -11,7 +11,6 @@ - import os - import sys - from ctypes import CDLL, c_int, create_string_buffer --from ctypes.util import find_library - - - class Xattr(object): -@@ -28,9 +27,9 @@ class Xattr(object): - - if sys.hexversion >= 0x02060000: - from ctypes import DEFAULT_MODE -- libc = CDLL(find_library("libc"), DEFAULT_MODE, None, True) -+ libc = CDLL("libc.so.6", DEFAULT_MODE, None, True) - else: -- libc = CDLL(find_library("libc")) -+ libc = CDLL("libc.so.6") - - @classmethod - def geterrno(cls): -diff --git a/tools/glusterfind/src/libgfchangelog.py b/tools/glusterfind/src/libgfchangelog.py -index 0f6b40d6c..9ca3f326b 100644 ---- a/tools/glusterfind/src/libgfchangelog.py -+++ b/tools/glusterfind/src/libgfchangelog.py -@@ -11,14 +11,13 @@ - import os - from ctypes import CDLL, get_errno, create_string_buffer, c_ulong, byref - from ctypes import RTLD_GLOBAL --from ctypes.util import find_library - - - class ChangelogException(OSError): - pass - - --libgfc = CDLL(find_library("gfchangelog"), use_errno=True, mode=RTLD_GLOBAL) -+libgfc = CDLL("libgfchangelog.so", use_errno=True, mode=RTLD_GLOBAL) - - - def raise_oserr(): -diff --git a/xlators/features/changelog/lib/examples/python/libgfchangelog.py b/xlators/features/changelog/lib/examples/python/libgfchangelog.py -index 10e73c02b..2cdbf1152 100644 ---- a/xlators/features/changelog/lib/examples/python/libgfchangelog.py -+++ b/xlators/features/changelog/lib/examples/python/libgfchangelog.py -@@ -1,9 +1,8 @@ - import os - from ctypes import * --from ctypes.util import find_library - - class Changes(object): -- libgfc = CDLL(find_library("gfchangelog"), mode=RTLD_GLOBAL, use_errno=True) -+ libgfc = CDLL("libgfchangelog.so", mode=RTLD_GLOBAL, use_errno=True) - - @classmethod - def geterrno(cls): --- -2.12.0 - diff --git a/pkgs/tools/filesystems/glusterfs/glusterfs-use-PATH-instead-of-hardcodes.patch b/pkgs/tools/filesystems/glusterfs/glusterfs-use-PATH-instead-of-hardcodes.patch deleted file mode 100644 index acb15464e48..00000000000 --- a/pkgs/tools/filesystems/glusterfs/glusterfs-use-PATH-instead-of-hardcodes.patch +++ /dev/null @@ -1,138 +0,0 @@ -From 616381bc25b0e90198683fb049f994e82d467d96 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me> -Date: Sat, 13 May 2017 02:45:49 +0200 -Subject: [PATCH] Don't use hardcoded /sbin, /usr/bin etc. paths. Fixes - #1450546. - -Instead, rely on programs to be in PATH, as gluster already -does in many places across its code base. - -Change-Id: Id21152fe42f5b67205d8f1571b0656c4d5f74246 ---- - contrib/fuse-lib/mount-common.c | 8 ++++---- - xlators/mgmt/glusterd/src/glusterd-ganesha.c | 6 +++--- - xlators/mgmt/glusterd/src/glusterd-quota.c | 6 +++--- - xlators/mgmt/glusterd/src/glusterd-snapshot.c | 4 ++-- - xlators/mgmt/glusterd/src/glusterd-utils.c | 14 +------------- - 5 files changed, 13 insertions(+), 25 deletions(-) - -diff --git a/contrib/fuse-lib/mount-common.c b/contrib/fuse-lib/mount-common.c -index e9f80fe81..6380dd867 100644 ---- a/contrib/fuse-lib/mount-common.c -+++ b/contrib/fuse-lib/mount-common.c -@@ -255,16 +255,16 @@ fuse_mnt_umount (const char *progname, const char *abs_mnt, - exit (1); - } - #ifdef GF_LINUX_HOST_OS -- execl ("/bin/umount", "/bin/umount", "-i", rel_mnt, -+ execl ("umount", "umount", "-i", rel_mnt, - lazy ? "-l" : NULL, NULL); -- GFFUSE_LOGERR ("%s: failed to execute /bin/umount: %s", -+ GFFUSE_LOGERR ("%s: failed to execute umount: %s", - progname, strerror (errno)); - #elif __NetBSD__ - /* exitting the filesystem causes the umount */ - exit (0); - #else -- execl ("/sbin/umount", "/sbin/umount", "-f", rel_mnt, NULL); -- GFFUSE_LOGERR ("%s: failed to execute /sbin/umount: %s", -+ execl ("umount", "umount", "-f", rel_mnt, NULL); -+ GFFUSE_LOGERR ("%s: failed to execute umount: %s", - progname, strerror (errno)); - #endif /* GF_LINUX_HOST_OS */ - exit (1); -diff --git a/xlators/mgmt/glusterd/src/glusterd-quota.c b/xlators/mgmt/glusterd/src/glusterd-quota.c -index 0e6629cf0..fcb4738b7 100644 ---- a/xlators/mgmt/glusterd/src/glusterd-quota.c -+++ b/xlators/mgmt/glusterd/src/glusterd-quota.c -@@ -30,7 +30,7 @@ - - #ifndef _PATH_SETFATTR - # ifdef GF_LINUX_HOST_OS --# define _PATH_SETFATTR "/usr/bin/setfattr" -+# define _PATH_SETFATTR "setfattr" - # endif - # ifdef __NetBSD__ - # define _PATH_SETFATTR "/usr/pkg/bin/setfattr" -@@ -335,7 +335,7 @@ _glusterd_quota_initiate_fs_crawl (glusterd_conf_t *priv, - - if (type == GF_QUOTA_OPTION_TYPE_ENABLE || - type == GF_QUOTA_OPTION_TYPE_ENABLE_OBJECTS) -- runner_add_args (&runner, "/usr/bin/find", ".", NULL); -+ runner_add_args (&runner, "find", ".", NULL); - - else if (type == GF_QUOTA_OPTION_TYPE_DISABLE) { - -@@ -351,7 +351,7 @@ _glusterd_quota_initiate_fs_crawl (glusterd_conf_t *priv, - VIRTUAL_QUOTA_XATTR_CLEANUP_KEY, "1", - "{}", "\\", ";", NULL); - #else -- runner_add_args (&runner, "/usr/bin/find", ".", -+ runner_add_args (&runner, "find", ".", - "-exec", _PATH_SETFATTR, "-n", - VIRTUAL_QUOTA_XATTR_CLEANUP_KEY, "-v", - "1", "{}", "\\", ";", NULL); -diff --git a/xlators/mgmt/glusterd/src/glusterd-snapshot.c b/xlators/mgmt/glusterd/src/glusterd-snapshot.c -index da0152366..f0d135350 100644 ---- a/xlators/mgmt/glusterd/src/glusterd-snapshot.c -+++ b/xlators/mgmt/glusterd/src/glusterd-snapshot.c -@@ -121,7 +121,7 @@ glusterd_build_snap_device_path (char *device, char *snapname, - } - - runinit (&runner); -- runner_add_args (&runner, "/sbin/lvs", "--noheadings", "-o", "vg_name", -+ runner_add_args (&runner, "lvs", "--noheadings", "-o", "vg_name", - device, NULL); - runner_redir (&runner, STDOUT_FILENO, RUN_PIPE); - snprintf (msg, sizeof (msg), "Get volume group for device %s", device); -@@ -1982,7 +1982,7 @@ glusterd_is_thinp_brick (char *device, uint32_t *op_errno) - - runinit (&runner); - -- runner_add_args (&runner, "/sbin/lvs", "--noheadings", "-o", "pool_lv", -+ runner_add_args (&runner, "lvs", "--noheadings", "-o", "pool_lv", - device, NULL); - runner_redir (&runner, STDOUT_FILENO, RUN_PIPE); - runner_log (&runner, this->name, GF_LOG_DEBUG, msg); -diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c -index 51db13df0..6fa7b92f9 100644 ---- a/xlators/mgmt/glusterd/src/glusterd-utils.c -+++ b/xlators/mgmt/glusterd/src/glusterd-utils.c -@@ -6027,7 +6027,6 @@ static struct fs_info { - char *fs_tool_pattern; - char *fs_tool_pkg; - } glusterd_fs[] = { -- /* some linux have these in /usr/sbin/and others in /sbin/? */ - { "xfs", "xfs_info", NULL, "isize=", "xfsprogs" }, - { "ext3", "tune2fs", "-l", "Inode size:", "e2fsprogs" }, - { "ext4", "tune2fs", "-l", "Inode size:", "e2fsprogs" }, -@@ -6048,7 +6047,6 @@ glusterd_add_inode_size_to_dict (dict_t *dict, int count) - char *trail = NULL; - runner_t runner = {0, }; - struct fs_info *fs = NULL; -- char fs_tool_name[256] = {0, }; - static dict_t *cached_fs = NULL; - - memset (key, 0, sizeof (key)); -@@ -6085,17 +6083,7 @@ glusterd_add_inode_size_to_dict (dict_t *dict, int count) - cur_word = "N/A"; - goto cached; - } -- -- snprintf (fs_tool_name, sizeof (fs_tool_name), -- "/usr/sbin/%s", fs->fs_tool_name); -- if (sys_access (fs_tool_name, R_OK|X_OK) == 0) -- runner_add_arg (&runner, fs_tool_name); -- else { -- snprintf (fs_tool_name, sizeof (fs_tool_name), -- "/sbin/%s", fs->fs_tool_name); -- if (sys_access (fs_tool_name, R_OK|X_OK) == 0) -- runner_add_arg (&runner, fs_tool_name); -- } -+ runner_add_arg (&runner, fs->fs_tool_name); - break; - } - } --- -2.12.0 - diff --git a/pkgs/tools/graphics/argyllcms/default.nix b/pkgs/tools/graphics/argyllcms/default.nix index b66257f442e..23a1f26db97 100644 --- a/pkgs/tools/graphics/argyllcms/default.nix +++ b/pkgs/tools/graphics/argyllcms/default.nix @@ -115,7 +115,7 @@ stdenv.mkDerivation rec { homepage = http://www.argyllcms.com; description = "Color management system (compatible with ICC)"; license = licenses.gpl3; - maintainers = [ maintainers.rickynils ]; + maintainers = []; platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/geekbench/default.nix b/pkgs/tools/misc/geekbench/default.nix index fddb1c99634..d71227ae8f5 100644 --- a/pkgs/tools/misc/geekbench/default.nix +++ b/pkgs/tools/misc/geekbench/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "geekbench-${version}"; - version = "4.4.0"; + version = "4.4.1"; src = fetchurl { url = "https://cdn.geekbench.com/Geekbench-${version}-Linux.tar.gz"; - sha256 = "1awdr54vw29ah7aah2bxpy4qkqasxj67sqk6gir8ybnxb5hxm3ri"; + sha256 = "0s3v8frflqqifyzq84xi6322wg8c9f5wcaic9zlpdf6wylqsiali"; }; dontConfigure = true; diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin.nix b/pkgs/tools/misc/libbitcoin/libbitcoin.nix index 18177c0a7e3..8009fe563ee 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin.nix @@ -3,7 +3,7 @@ let pname = "libbitcoin"; - version = "3.5.0"; + version = "3.6.0"; in stdenv.mkDerivation { name = "${pname}-${version}"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1qy637hpv6kkhf602yxxi5b9j0qhsp644fazljcqbnxzp7vv2qyd"; + sha256 = "1rppyp3zpb6ymwangjpblwf6qh4y3d1hczrjx8aavmrq7hznnrhq"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/tools/misc/ncdu/default.nix b/pkgs/tools/misc/ncdu/default.nix index bb792451564..6b2e7d68170 100644 --- a/pkgs/tools/misc/ncdu/default.nix +++ b/pkgs/tools/misc/ncdu/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ncdu-${version}"; - version = "1.14"; + version = "1.14.1"; src = fetchurl { url = "https://dev.yorhel.nl/download/${name}.tar.gz"; - sha256 = "0i4cap2z3037xx2rdzhrlazl2igk3xy4ncddp9j7xqi1mcx7i566"; + sha256 = "0gp1aszzrh8b6fhv8fspvkmr0qwc55z6z4w6l7r8j09sq7lf0cdy"; }; buildInputs = [ ncurses ]; diff --git a/pkgs/tools/misc/riemann-c-client/default.nix b/pkgs/tools/misc/riemann-c-client/default.nix index 970cf28c26d..69bf9cafa53 100644 --- a/pkgs/tools/misc/riemann-c-client/default.nix +++ b/pkgs/tools/misc/riemann-c-client/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/algernon/riemann-c-client; description = "A C client library for the Riemann monitoring system"; license = licenses.gpl3; - maintainers = with maintainers; [ rickynils pradeepchhetri ]; + maintainers = with maintainers; [ pradeepchhetri ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/uhubctl/default.nix b/pkgs/tools/misc/uhubctl/default.nix new file mode 100644 index 00000000000..5c858944b3f --- /dev/null +++ b/pkgs/tools/misc/uhubctl/default.nix @@ -0,0 +1,28 @@ +{ stdenv +, fetchFromGitHub +, libusb +}: + +stdenv.mkDerivation rec { + pname = "uhubctl"; + version = "unstable-2019-07-31"; + + src = fetchFromGitHub { + owner = "mvp"; + repo = "uhubctl"; + rev = "1961aa02e9924a54a6219d16c61a0beb0d626e46"; + sha256 = "15mvqp1xh079nqp0mynh3l1wmw4maa320pn4jr8bz7nh3knmk0n1"; + }; + + buildInputs = [ libusb ]; + + installFlags = [ "prefix=$(out)" ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/mvp/uhubctl"; + description = "Utility to control USB power per-port on smart USB hubs"; + license = licenses.gpl2; + maintainers = with maintainers; [ prusnak ]; + platforms = with platforms; linux ++ darwin; + }; +} diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix index 33f004190e4..127244a2992 100644 --- a/pkgs/tools/networking/chrony/default.nix +++ b/pkgs/tools/networking/chrony/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { repositories.git = git://git.tuxfamily.org/gitroot/chrony/chrony.git; license = licenses.gpl2; platforms = with platforms; linux ++ freebsd ++ openbsd; - maintainers = with maintainers; [ rickynils fpletz ]; + maintainers = with maintainers; [ fpletz ]; longDescription = '' Chronyd is a daemon which runs in background on the system. It obtains diff --git a/pkgs/tools/networking/httping/default.nix b/pkgs/tools/networking/httping/default.nix index abde3f2a380..1a6aeb57ab8 100644 --- a/pkgs/tools/networking/httping/default.nix +++ b/pkgs/tools/networking/httping/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { latency of the webserver + network. It supports IPv6. ''; license = licenses.agpl3; - maintainers = with maintainers; [ rickynils ]; + maintainers = []; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/tools/networking/memtier-benchmark/default.nix b/pkgs/tools/networking/memtier-benchmark/default.nix index ae8d3d96483..c3a076076f1 100644 --- a/pkgs/tools/networking/memtier-benchmark/default.nix +++ b/pkgs/tools/networking/memtier-benchmark/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "memtier-benchmark-${version}"; - version = "1.2.11"; + version = "1.2.17"; src = fetchFromGitHub { owner = "redislabs"; repo = "memtier_benchmark"; rev = "refs/tags/${version}"; - sha256 = "0a1lz4j9whj6yf94xn7rna00abgrv2qs30vmpns1n9zqlpaj6b6a"; + sha256 = "18cka6sv3w8ffa81126nzi04if9g1wd3i3apxsgmv7xm2p8fsa39"; }; patchPhase = '' diff --git a/pkgs/tools/networking/network-manager/applet.nix b/pkgs/tools/networking/network-manager/applet.nix index f7df0740ba1..0fb11e1b0eb 100644 --- a/pkgs/tools/networking/network-manager/applet.nix +++ b/pkgs/tools/networking/network-manager/applet.nix @@ -54,7 +54,7 @@ in stdenv.mkDerivation rec { homepage = https://wiki.gnome.org/Projects/NetworkManager; description = "NetworkManager control applet for GNOME"; license = licenses.gpl2; - maintainers = with maintainers; [ phreedom rickynils ]; + maintainers = with maintainers; [ phreedom ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index c0e29c6538b..95d37e16478 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -120,7 +120,7 @@ in stdenv.mkDerivation rec { homepage = https://wiki.gnome.org/Projects/NetworkManager; description = "Network configuration and management tool"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ phreedom rickynils domenkozar obadz ]; + maintainers = with maintainers; [ phreedom domenkozar obadz ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/openapi-generator-cli/default.nix b/pkgs/tools/networking/openapi-generator-cli/default.nix index 363963b1b14..38255a68ffe 100644 --- a/pkgs/tools/networking/openapi-generator-cli/default.nix +++ b/pkgs/tools/networking/openapi-generator-cli/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { - version = "4.0.3"; + version = "4.1.0"; pname = "openapi-generator-cli"; jarfilename = "${pname}-${version}.jar"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://central.maven.org/maven2/org/openapitools/${pname}/${version}/${jarfilename}"; - sha256 = "1x09db62i81gamj6pm9bng994z54y7gqc6wvj8hnn0j0ay9gkcf5"; + sha256 = "0pkibvhk1f999mg1zv2ikxzjpkrrbb0wwq5x0gzpmvr5sgywr6k4"; }; phases = [ "installPhase" ]; diff --git a/pkgs/tools/networking/swaks/default.nix b/pkgs/tools/networking/swaks/default.nix index 2abdab773dd..a9b0d04360e 100644 --- a/pkgs/tools/networking/swaks/default.nix +++ b/pkgs/tools/networking/swaks/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { A featureful, flexible, scriptable, transaction-oriented SMTP test tool ''; license = licenses.gpl2; - maintainers = with maintainers; [ rickynils ndowens ]; + maintainers = with maintainers; [ ndowens ]; platforms = platforms.all; }; diff --git a/pkgs/tools/networking/whois/default.nix b/pkgs/tools/networking/whois/default.nix index ddac709e577..ee72cf4d2d8 100644 --- a/pkgs/tools/networking/whois/default.nix +++ b/pkgs/tools/networking/whois/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, perl, gettext, pkgconfig, libidn2, libiconv }: stdenv.mkDerivation rec { - version = "5.5.0"; + version = "5.5.1"; name = "whois-${version}"; src = fetchFromGitHub { owner = "rfc1036"; repo = "whois"; rev = "v${version}"; - sha256 = "0h6lvsz868533irx68vd3hjhwcz93zh88axfq0qzji5ndc0ks4qb"; + sha256 = "05dbc58dgq5ln28pahififljdb19gqicwlcmnni0vw4ny4r7r9bg"; }; nativeBuildInputs = [ perl gettext pkgconfig ]; diff --git a/pkgs/tools/security/kpcli/default.nix b/pkgs/tools/security/kpcli/default.nix index 350d0e66dc7..e7c09e0b2d5 100644 --- a/pkgs/tools/security/kpcli/default.nix +++ b/pkgs/tools/security/kpcli/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, perl, perlPackages }: stdenv.mkDerivation rec { - version = "3.2"; + version = "3.3"; name = "kpcli-${version}"; src = fetchurl { url = "mirror://sourceforge/kpcli/${name}.pl"; - sha256 = "11z6zbnsmqgjw73ai4nrq4idr83flrib22d8fqh1637d36p1nnk1"; + sha256 = "1z6dy70d3ag16vgzzafcnxb8gap3wahfmy4vd22fpgbrdd6riph4"; }; buildInputs = [ makeWrapper perl ]; diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix index 3bc5758aad4..bf9c7a4fc46 100644 --- a/pkgs/tools/security/nmap/default.nix +++ b/pkgs/tools/security/nmap/default.nix @@ -20,11 +20,11 @@ let in stdenv.mkDerivation rec { name = "nmap${optionalString graphicalSupport "-graphical"}-${version}"; - version = "7.70"; + version = "7.80"; src = fetchurl { url = "https://nmap.org/dist/nmap-${version}.tar.bz2"; - sha256 = "063fg8adx23l4irrh5kn57hsmi1xvjkar4vm4k6g94ppan4hcyw4"; + sha256 = "1aizfys6l9f9grm82bk878w56mg0zpkfns3spzj157h98875mypw"; }; patches = [ ./zenmap.patch ] diff --git a/pkgs/tools/system/runit/default.nix b/pkgs/tools/system/runit/default.nix index 4d5de56fbf0..131ba53f584 100644 --- a/pkgs/tools/system/runit/default.nix +++ b/pkgs/tools/system/runit/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { description = "UNIX init scheme with service supervision"; license = licenses.bsd3; homepage = http://smarden.org/runit; - maintainers = with maintainers; [ rickynils joachifm ]; + maintainers = with maintainers; [ joachifm ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/system/syslog-ng-incubator/default.nix b/pkgs/tools/system/syslog-ng-incubator/default.nix index a57cafb54e2..1f444ca5cd8 100644 --- a/pkgs/tools/system/syslog-ng-incubator/default.nix +++ b/pkgs/tools/system/syslog-ng-incubator/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/balabit/syslog-ng-incubator; description = "A collection of tools and modules for syslog-ng"; license = licenses.gpl2; - maintainers = [ maintainers.rickynils ]; + maintainers = []; platforms = platforms.linux; broken = true; # 2018-05-12 }; diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix index dcc9942a061..6998ed36ee5 100644 --- a/pkgs/tools/system/syslog-ng/default.nix +++ b/pkgs/tools/system/syslog-ng/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { homepage = https://www.balabit.com/network-security/syslog-ng/; description = "Next-generation syslogd with advanced networking and filtering capabilities"; license = licenses.gpl2; - maintainers = with maintainers; [ rickynils fpletz ]; + maintainers = with maintainers; [ fpletz ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/typesetting/biber/default.nix b/pkgs/tools/typesetting/biber/default.nix index 3f9ba73e13d..6d26129f2c1 100644 --- a/pkgs/tools/typesetting/biber/default.nix +++ b/pkgs/tools/typesetting/biber/default.nix @@ -1,4 +1,4 @@ -{ stdenv, perlPackages, texlive }: +{ stdenv, perlPackages, shortenPerlShebang, texlive }: let biberSource = stdenv.lib.head (builtins.filter (p: p.tlType == "source") texlive.biber.pkgs); @@ -21,6 +21,11 @@ perlPackages.buildPerlModule { TestDifferences PerlIOutf8_strict ]; + nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; + + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + shortenPerlShebang $out/bin/biber + ''; meta = with stdenv.lib; { description = "Backend for BibLaTeX"; diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index 5aab4c80d27..57347a12021 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -5,7 +5,7 @@ , perl, perlPackages, pkgconfig, autoreconfHook , poppler, libpaper, graphite2, zziplib, harfbuzz, potrace, gmp, mpfr , cairo, pixman, xorg, clisp, biber -, makeWrapper +, makeWrapper, shortenPerlShebang }: # Useful resource covering build options: @@ -292,6 +292,7 @@ latexindent = perlPackages.buildPerlPackage rec { outputs = [ "out" ]; + nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; propagatedBuildInputs = with perlPackages; [ FileHomeDir LogDispatch LogLog4perl UnicodeLineBreak YAMLTiny ]; postPatch = '' @@ -308,6 +309,8 @@ latexindent = perlPackages.buildPerlPackage rec { install -D ./scripts/latexindent/latexindent.pl "$out"/bin/latexindent mkdir -p "$out"/${perl.libPrefix} cp -r ./scripts/latexindent/LatexIndent "$out"/${perl.libPrefix}/ + '' + stdenv.lib.optionalString stdenv.isDarwin '' + shortenPerlShebang "$out"/bin/latexindent ''; }; |