diff options
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/X11/bumblebee/default.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/X11/bumblebee/nixos.patch | 3 | ||||
-rw-r--r-- | pkgs/tools/X11/xpra/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/X11/xpra/gtk3.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/misc/cloc/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/fsmon/default.nix | 25 | ||||
-rw-r--r-- | pkgs/tools/misc/system-config-printer/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/misc/xvfb-run/default.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/misc/youtube-dl/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/networking/fping/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/networking/offlineimap/default.nix | 4 |
11 files changed, 41 insertions, 17 deletions
diff --git a/pkgs/tools/X11/bumblebee/default.nix b/pkgs/tools/X11/bumblebee/default.nix index 0429faab2ef8..eac44efdf273 100644 --- a/pkgs/tools/X11/bumblebee/default.nix +++ b/pkgs/tools/X11/bumblebee/default.nix @@ -18,7 +18,7 @@ { stdenv, lib, fetchurl, fetchpatch, pkgconfig, help2man, makeWrapper , glib, libbsd -, libX11, libXext, xorgserver, xkbcomp, kmod, xkeyboard_config, xf86videonouveau +, libX11, libXext, xorgserver, xkbcomp, kmod, xf86videonouveau , nvidia_x11, virtualgl, primusLib , automake111x, autoconf # The below should only be non-null in a x86_64 system. On a i686 @@ -125,7 +125,6 @@ in stdenv.mkDerivation rec { CFLAGS = [ "-DX_MODULE_APPENDS=\\\"${xmodules}\\\"" - "-DX_XKB_DIR=\\\"${xkeyboard_config}/etc/X11/xkb\\\"" ]; postInstall = '' diff --git a/pkgs/tools/X11/bumblebee/nixos.patch b/pkgs/tools/X11/bumblebee/nixos.patch index 00fb8ad7a535..cf6ee5add98f 100644 --- a/pkgs/tools/X11/bumblebee/nixos.patch +++ b/pkgs/tools/X11/bumblebee/nixos.patch @@ -49,12 +49,11 @@ index 71a6b73..a682d8a 100644 char *x_argv[] = { XORG_BINARY, bb_config.x_display, -@@ -153,24 +170,25 @@ bool start_secondary(bool need_secondary) { +@@ -153,24 +170,24 @@ bool start_secondary(bool need_secondary) { "-sharevts", "-nolisten", "tcp", "-noreset", + "-logfile", "/var/log/X.bumblebee.log", -+ "-xkbdir", X_XKB_DIR, "-verbose", "3", "-isolateDevice", pci_id, - "-modulepath", bb_config.mod_path, // keep last diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 4ae367abf612..eadae7ad3c45 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, python2Packages, pkgconfig , xorg, gtk2, glib, pango, cairo, gdk_pixbuf, atk -, makeWrapper, xkbcomp, xorgserver, getopt, xauth, utillinux, which, fontsConf, xkeyboard_config +, makeWrapper, xkbcomp, xorgserver, getopt, xauth, utillinux, which, fontsConf , ffmpeg, x264, libvpx, libwebp , libfakeXinerama , gst_all_1, pulseaudioLight, gobjectIntrospection }: diff --git a/pkgs/tools/X11/xpra/gtk3.nix b/pkgs/tools/X11/xpra/gtk3.nix index a9ba93507364..f66b7389f315 100644 --- a/pkgs/tools/X11/xpra/gtk3.nix +++ b/pkgs/tools/X11/xpra/gtk3.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, buildPythonApplication , python, cython, pkgconfig , xorg, gtk3, glib, pango, cairo, gdk_pixbuf, atk, pygobject3, pycairo, gobjectIntrospection -, makeWrapper, xkbcomp, xorgserver, getopt, xauth, utillinux, which, fontsConf, xkeyboard_config +, makeWrapper, xkbcomp, xorgserver, getopt, xauth, utillinux, which, fontsConf , ffmpeg, x264, libvpx, libwebp , libfakeXinerama }: diff --git a/pkgs/tools/misc/cloc/default.nix b/pkgs/tools/misc/cloc/default.nix index b58ae6505dc9..fb1c79d250a0 100644 --- a/pkgs/tools/misc/cloc/default.nix +++ b/pkgs/tools/misc/cloc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "cloc-${version}"; - version = "1.70"; + version = "1.72"; src = fetchFromGitHub { owner = "AlDanial"; repo = "cloc"; rev = "v${version}"; - sha256 = "1abkfkjn4fxplq33cwqjmgxabk2x6ij2klqn0w4a0lj82a7xx10x"; + sha256 = "192z3fzib71y3sjic03ll67xv51igdlpvfhx12yv9wnzkir7lx02"; }; sourceRoot = "cloc-v${version}-src/Unix"; diff --git a/pkgs/tools/misc/fsmon/default.nix b/pkgs/tools/misc/fsmon/default.nix new file mode 100644 index 000000000000..d3a1a7124669 --- /dev/null +++ b/pkgs/tools/misc/fsmon/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "fsmon-${version}"; + version = "1.4"; + + src = fetchFromGitHub { + owner = "nowsecure"; + repo = "fsmon"; + rev = "${version}"; + sha256 = "0sqld41jn142d4zbqmylzrnx1km7xs6r8dnmf453gyhi3yzdbr1j"; + }; + + installPhase = '' + make install PREFIX=$out + ''; + + meta = with stdenv.lib; { + description = "FileSystem Monitor utility"; + homepage = https://github.com/nowsecure/fsmon; + license = licenses.mit; + maintainers = [ maintainers.dezgeg ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix index ab4a008fa092..fc4a24ec355b 100644 --- a/pkgs/tools/misc/system-config-printer/default.nix +++ b/pkgs/tools/misc/system-config-printer/default.nix @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { ]; pythonPath = with pythonPackages; - [ pycups pycurl dbus-python pygobject3 requests2 ]; + [ pycups pycurl dbus-python pygobject3 requests2 pycairo ]; configureFlags = [ "--with-udev-rules" diff --git a/pkgs/tools/misc/xvfb-run/default.nix b/pkgs/tools/misc/xvfb-run/default.nix index c33f09529a56..8bcbf4951d12 100644 --- a/pkgs/tools/misc/xvfb-run/default.nix +++ b/pkgs/tools/misc/xvfb-run/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, xkbcomp, xorgserver, getopt, xkeyboard_config +{ stdenv, fetchurl, makeWrapper, xkbcomp, xorgserver, getopt , xauth, utillinux, which, fontsConf, gawk, coreutils }: let xvfb_run = fetchurl { @@ -12,7 +12,6 @@ stdenv.mkDerivation { buildCommand = '' mkdir -p $out/bin cp ${xvfb_run} $out/bin/xvfb-run - sed -i 's|XVFBARGS="|XVFBARGS="-xkbdir ${xkeyboard_config}/etc/X11/xkb |' $out/bin/xvfb-run chmod a+x $out/bin/xvfb-run wrapProgram $out/bin/xvfb-run \ diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index ef2164b5a142..f9590b3f0442 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.01.14"; + version = "2017.01.18"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "76c8bd77db6c820bfa72f1e2a873101ca736fd1d9954ccebf349fa7caef99cca"; + sha256 = "7c16f3ce7cf8a673a4c531e4a1fc10801467a61732cb65430e40b3ab8b2f2d2e"; }; buildInputs = [ makeWrapper zip ] ++ optional generateManPage pandoc; diff --git a/pkgs/tools/networking/fping/default.nix b/pkgs/tools/networking/fping/default.nix index 83899c2380c3..11e019dfec3b 100644 --- a/pkgs/tools/networking/fping/default.nix +++ b/pkgs/tools/networking/fping/default.nix @@ -1,13 +1,15 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "fping-3.13"; + name = "fping-3.15"; src = fetchurl { url = "http://www.fping.org/dist/${name}.tar.gz"; - sha256 = "082pis2c2ad6kkj35zmsf6xb2lm8v8hdrnjiwl529ldk3kyqxcjb"; + sha256 = "072jhm9wpz1bvwnwgvz24ijw0xwwnn3z3zan4mgr5s5y6ml8z54n"; }; + configureFlags = [ "--enable-ipv6" "--enable-ipv4" ]; + meta = { homepage = "http://fping.org/"; description = "Send ICMP echo probes to network hosts"; diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix index a11b34ef9914..bed9bba16b06 100644 --- a/pkgs/tools/networking/offlineimap/default.nix +++ b/pkgs/tools/networking/offlineimap/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pythonPackages, }: pythonPackages.buildPythonApplication rec { - version = "7.0.9"; + version = "7.0.12"; name = "offlineimap-${version}"; namePrefix = ""; @@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication rec { owner = "OfflineIMAP"; repo = "offlineimap"; rev = "v${version}"; - sha256 = "1jrg6n4fpww98vj7gfp2li9ab4pbnrpb249cqa1bs8jjwpmrsqac"; + sha256 = "1i83p40lxjqnvh88x623iydrwnsxib1k91qbl9myc4hi5i4fnr6x"; }; doCheck = false; |