diff options
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/bluetooth/blueman/default.nix | 9 | ||||
-rw-r--r-- | pkgs/tools/compression/lzip/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/compression/zstd/default.nix | 17 | ||||
-rw-r--r-- | pkgs/tools/graphics/wkhtmltopdf/default.nix | 31 | ||||
-rw-r--r-- | pkgs/tools/misc/clac/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/misc/direnv/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/fzf/default.nix | 10 | ||||
-rw-r--r-- | pkgs/tools/misc/lnav/default.nix | 9 | ||||
-rw-r--r-- | pkgs/tools/misc/partition-manager/default.nix | 32 | ||||
-rw-r--r-- | pkgs/tools/misc/svtplay-dl/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/networking/megatools/default.nix | 16 | ||||
-rw-r--r-- | pkgs/tools/networking/mu/default.nix | 22 | ||||
-rw-r--r-- | pkgs/tools/text/kdiff3/default.nix | 11 | ||||
-rw-r--r-- | pkgs/tools/text/languagetool/default.nix | 4 |
14 files changed, 117 insertions, 58 deletions
diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix index 6dce2a38798a..0c298aa1f218 100644 --- a/pkgs/tools/bluetooth/blueman/default.nix +++ b/pkgs/tools/bluetooth/blueman/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, intltool, pkgconfig, pythonPackages, bluez, polkit, gtk3 -, obex_data_server, xdg_utils, libnotify, dconf, gsettings_desktop_schemas, dnsmasq, dhcp +, obex_data_server, xdg_utils, libnotify, dnsmasq, dhcp , hicolor_icon_theme, librsvg, wrapGAppsHook , withPulseAudio ? true, libpulseaudio }: @@ -9,7 +9,7 @@ let in stdenv.mkDerivation rec { name = "blueman-${version}"; version = "2.0.4"; - + src = fetchurl { url = "https://github.com/blueman-project/blueman/releases/download/${version}/${name}.tar.xz"; sha256 = "03s305mbc57nl3sq5ywh9casz926k4aqnylgaidli8bmgz1djbg9"; @@ -17,8 +17,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ intltool pkgconfig pythonPackages.wrapPython pythonPackages.cython wrapGAppsHook ]; - buildInputs = [ bluez gtk3 pythonPackages.python libnotify dconf librsvg - gsettings_desktop_schemas hicolor_icon_theme ] + buildInputs = [ bluez gtk3 pythonPackages.python libnotify librsvg hicolor_icon_theme ] ++ pythonPath ++ lib.optional withPulseAudio libpulseaudio; @@ -28,7 +27,7 @@ in stdenv.mkDerivation rec { pythonPath = with pythonPackages; [ dbus-python pygobject3 pycairo ]; - propagatedUserEnvPkgs = [ obex_data_server dconf ]; + propagatedUserEnvPkgs = [ obex_data_server ]; configureFlags = [ (lib.enableFeature withPulseAudio "pulseaudio") ]; diff --git a/pkgs/tools/compression/lzip/default.nix b/pkgs/tools/compression/lzip/default.nix index 36014fdd0ad1..17bc24ab5995 100644 --- a/pkgs/tools/compression/lzip/default.nix +++ b/pkgs/tools/compression/lzip/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "lzip-${version}"; - version = "1.18"; + version = "1.19"; buildInputs = [ texinfo ]; src = fetchurl { url = "mirror://savannah/lzip/${name}.tar.gz"; - sha256 = "1p8lvc22sv3damld9ng8y6i8z2dvvpsbi9v7yhr5bc2a20m8iya7"; + sha256 = "1abbch762gv8rjr579q3qyyk6c80plklbv2mw4x0vg71dgsw9bgz"; }; configureFlags = "CPPFLAGS=-DNDEBUG CFLAGS=-O3 CXXFLAGS=-O3"; diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix index dba6e6fc3376..82ead0baa16d 100644 --- a/pkgs/tools/compression/zstd/default.nix +++ b/pkgs/tools/compression/zstd/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchFromGitHub +{ stdenv, fetchFromGitHub, gnugrep , legacySupport ? false }: stdenv.mkDerivation rec { name = "zstd-${version}"; - version = "1.1.3"; + version = "1.2.0"; src = fetchFromGitHub { - sha256 = "1d46hs6pyq55izcmnk7hzvbl8iyxh7bp7qchc7rl8ay396ax2sd5"; + sha256 = "01b5w4yrwa8lgnjyi42zxjhw8cfyh8yfhdsjr04y5qsblz0hv0zl"; rev = "v${version}"; repo = "zstd"; owner = "facebook"; @@ -24,6 +24,15 @@ stdenv.mkDerivation rec { "PREFIX=$(out)" ]; + preInstall = '' + substituteInPlace programs/zstdgrep \ + --replace "=grep" "=${gnugrep}/bin/grep" \ + --replace "=zstdcat" "=$out/bin/zstdcat" + + substituteInPlace programs/zstdless \ + --replace "zstdcat" "$out/bin/zstdcat" + ''; + meta = with stdenv.lib; { description = "Zstandard real-time compression algorithm"; longDescription = '' @@ -40,6 +49,6 @@ stdenv.mkDerivation rec { license = with licenses; [ gpl2Plus bsd2 ]; platforms = platforms.unix; - maintainers = with maintainers; [ nckx ]; + maintainers = with maintainers; [ nckx orivej ]; }; } diff --git a/pkgs/tools/graphics/wkhtmltopdf/default.nix b/pkgs/tools/graphics/wkhtmltopdf/default.nix index 24c4f2433c6f..b513115c68fe 100644 --- a/pkgs/tools/graphics/wkhtmltopdf/default.nix +++ b/pkgs/tools/graphics/wkhtmltopdf/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchFromGitHub, qt4, fontconfig, freetype, libpng, zlib, libjpeg +{ stdenv, fetchFromGitHub, fetchpatch, qt4, fontconfig, freetype, libpng, zlib, libjpeg , openssl, libX11, libXext, libXrender, overrideDerivation }: stdenv.mkDerivation rec { - version = "0.12.3.2"; + version = "0.12.4"; name = "wkhtmltopdf-${version}"; src = fetchFromGitHub { owner = "wkhtmltopdf"; repo = "wkhtmltopdf"; - rev = "${version}"; - sha256 = "1yyqjhxv4dvpkad79scs7xdx4iz8jpyidr9ya86k3zpfyvh4gq3s"; + rev = version; + sha256 = "09yzj9ylc6ci4a1qlhz60cgxi1nm9afwjrjxfikf8wwjd3i24vp2"; }; wkQt = overrideDerivation qt4 (deriv: { @@ -105,13 +105,26 @@ stdenv.mkDerivation rec { ''; }); - buildInputs = [ wkQt fontconfig freetype libpng zlib libjpeg openssl - libX11 libXext libXrender - ]; + buildInputs = [ + wkQt fontconfig freetype libpng zlib libjpeg openssl + libX11 libXext libXrender + ]; - configurePhase = "qmake wkhtmltopdf.pro INSTALLBASE=$out"; + prePatch = '' + for f in src/image/image.pro src/pdf/pdf.pro ; do + substituteInPlace $f --replace '$(INSTALL_ROOT)' "" + done + ''; + + patches = [ + (fetchpatch { + name = "make-0.12.4-compile.patch"; + url = "https://github.com/efx/aports/raw/eb9f8e6bb9a488460929db747b15b8fceddd7abd/testing/wkhtmltopdf/10-patch1.patch"; + sha256 = "1c136jz0klr2rmhmy13gdbgsgkpjfdp2sif8bnw8d23mr9pym3s1"; + }) + ]; - patches = [ ./makefix.patch ]; + configurePhase = "qmake wkhtmltopdf.pro INSTALLBASE=$out"; enableParallelBuilding = true; diff --git a/pkgs/tools/misc/clac/default.nix b/pkgs/tools/misc/clac/default.nix index 9fd8711a3d08..48f3b613564f 100644 --- a/pkgs/tools/misc/clac/default.nix +++ b/pkgs/tools/misc/clac/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { description = "Interactive stack-based calculator"; license = stdenv.lib.licenses.bsd2; maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; homepage = "https://github.com/soveran/clac"; }; } diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix index 596df4167438..346ee7976373 100644 --- a/pkgs/tools/misc/direnv/default.nix +++ b/pkgs/tools/misc/direnv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, go, bash }: +{ stdenv, fetchFromGitHub, go, bash, writeText}: stdenv.mkDerivation rec { name = "direnv-${version}"; @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { installPhase = '' make install DESTDIR=$out + mkdir -p $out/share/fish/vendor_conf.d + echo "eval ($out/bin/direnv hook fish)" > $out/share/fish/vendor_conf.d/direnv.fish ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index 872a02ed9ded..e1e998b7b564 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, ncurses, buildGoPackage, fetchFromGitHub }: +{ stdenv, lib, ncurses, buildGoPackage, fetchFromGitHub, writeText }: buildGoPackage rec { name = "fzf-${version}"; @@ -16,6 +16,8 @@ buildGoPackage rec { outputs = [ "bin" "out" "man" ]; + fishHook = writeText "load-fzf-keybindings.fish" "fzf_key_bindings"; + buildInputs = [ ncurses ]; goDeps = ./deps.nix; @@ -25,6 +27,12 @@ buildGoPackage rec { sed -i -e "s|expand('<sfile>:h:h').'/bin/fzf-tmux'|'$bin/bin/fzf-tmux'|" plugin/fzf.vim ''; + preInstall = '' + mkdir -p $bin/share/fish/vendor_functions.d $bin/share/fish/vendor_conf.d + cp $src/shell/key-bindings.fish $bin/share/fish/vendor_functions.d/fzf_key_bindings.fish + cp ${fishHook} $bin/share/fish/vendor_conf.d/load-fzf-key-bindings.fish + ''; + postInstall = '' cp $src/bin/fzf-tmux $bin/bin mkdir -p $man/share/man diff --git a/pkgs/tools/misc/lnav/default.nix b/pkgs/tools/misc/lnav/default.nix index 23e823eb9632..206fe987e626 100644 --- a/pkgs/tools/misc/lnav/default.nix +++ b/pkgs/tools/misc/lnav/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, pcre-cpp, sqlite, ncurses, - readline, zlib, bzip2, autoconf, automake }: +{ stdenv, fetchFromGitHub, pcre-cpp, sqlite, ncurses +, readline, zlib, bzip2, autoconf, automake, curl }: stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { owner = "tstack"; repo = "lnav"; rev = "v${meta.version}"; - sha256 = "0pag2rl7b6s2xfl80c629vhwsdvvlhcdy6732yvpgfv94w0zyjp9"; + sha256 = "1jdjn64cxgbhhyg73cisrfrk7vjg1hr9nvkmfdk8gxc4g82y3xxc"; inherit name; }; @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { pcre-cpp readline sqlite + curl ]; preConfigure = '' @@ -42,7 +43,7 @@ stdenv.mkDerivation rec { ''; downloadPage = "https://github.com/tstack/lnav/releases"; license = licenses.bsd2; - version = "0.8.1"; + version = "0.8.2"; maintainers = [ maintainers.dochang ]; }; diff --git a/pkgs/tools/misc/partition-manager/default.nix b/pkgs/tools/misc/partition-manager/default.nix new file mode 100644 index 000000000000..dcea9c47aec7 --- /dev/null +++ b/pkgs/tools/misc/partition-manager/default.nix @@ -0,0 +1,32 @@ +{ kdeDerivation, kdeWrapper, fetchurl, lib +, ecm, kdoctools +, kconfig, kinit, kpmcore +, eject, libatasmart }: + +let + pname = "partitionmanager"; + unwrapped = kdeDerivation rec { + name = "${pname}-${version}"; + version = "3.0.1"; + + src = fetchurl { + url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; + sha256 = "08sb9xa7dvvgha3k2xm1srl339przxpxd2y5bh1lnx6k1x7dk410"; + }; + + meta = with lib; { + description = "KDE Partition Manager"; + license = licenses.gpl2; + maintainers = with maintainers; [ peterhoeg ]; + }; + nativeBuildInputs = [ ecm kdoctools ]; + # refer to kpmcore for the use of eject + buildInputs = [ eject libatasmart ]; + propagatedBuildInputs = [ kconfig kinit kpmcore ]; + enableParallelBuilding = true; + }; + +in kdeWrapper { + inherit unwrapped; + targets = [ "bin/partitionmanager" ]; +} diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index 8d65f253c9b4..a652243a9d60 100644 --- a/pkgs/tools/misc/svtplay-dl/default.nix +++ b/pkgs/tools/misc/svtplay-dl/default.nix @@ -5,13 +5,13 @@ let inherit (pythonPackages) python nose pycrypto requests mock; in stdenv.mkDerivation rec { name = "svtplay-dl-${version}"; - version = "1.9.3"; + version = "1.9.4"; src = fetchFromGitHub { owner = "spaam"; repo = "svtplay-dl"; rev = version; - sha256 = "14qksi1svi89niffykxg47kay013byls6bnhkrkzkanq04075lmw"; + sha256 = "15vjaia1qbs49gplpfi8sj5scl9mb4qg8n2z4zyzjs5461lx5qqv"; }; pythonPaths = [ pycrypto requests ]; diff --git a/pkgs/tools/networking/megatools/default.nix b/pkgs/tools/networking/megatools/default.nix index f948ab8eb616..7c7c63ef230c 100644 --- a/pkgs/tools/networking/megatools/default.nix +++ b/pkgs/tools/networking/megatools/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, glib, fuse, curl, glib_networking, gsettings_desktop_schemas -, asciidoc, makeWrapper }: +{ stdenv, fetchurl, pkgconfig, glib, fuse, curl, glib_networking +, asciidoc, wrapGAppsHook }: stdenv.mkDerivation rec { name = "megatools-${version}"; @@ -10,16 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0vx1farp0dpg4zwvxdbfdnzjk9qx3sn109p1r1zl3g3xsaj221cv"; }; - buildInputs = [ pkgconfig glib fuse curl makeWrapper - gsettings_desktop_schemas asciidoc ]; - - postInstall = '' - for i in $(find $out/bin/ -type f); do - wrapProgram "$i" \ - --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" - done - ''; + nativeBuildInputs = [ pkgconfig wrapGAppsHook asciidoc ]; + buildInputs = [ glib glib_networking fuse curl ]; meta = with stdenv.lib; { description = "Command line client for Mega.co.nz"; diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index 0fc6d7273eaf..33db7b1cabac 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -1,15 +1,17 @@ -{ fetchurl, stdenv, sqlite, pkgconfig, autoreconfHook, pmccabe +{ stdenv, fetchFromGitHub, sqlite, pkgconfig, autoreconfHook, pmccabe , xapian, glib, gmime, texinfo , emacs, guile , gtk3, webkitgtk24x, libsoup, icu , withMug ? false }: stdenv.mkDerivation rec { - version = "0.9.18"; name = "mu-${version}"; + version = "0.9.18"; - src = fetchurl { - url = "https://github.com/djcb/mu/archive/${version}.tar.gz"; - sha256 = "0gfwi4dwqhsz138plryd0j935vx2i44p63jpfx85ki3l4ysmmlwd"; + src = fetchFromGitHub { + owner = "djcb"; + repo = "mu"; + rev = version; + sha256 = "0zy0p196bfrfzsq8f58xv04rpnr948sdvljflgzvi6js0vz4009y"; }; # as of 0.9.18 2 tests are failing but previously we had no tests @@ -19,9 +21,10 @@ stdenv.mkDerivation rec { # pmccabe should be a checkInput instead, but configure looks for it buildInputs = [ - sqlite xapian glib gmime texinfo emacs guile libsoup icu pmccabe + sqlite xapian glib gmime texinfo emacs guile libsoup icu ] ++ stdenv.lib.optionals withMug [ gtk3 webkitgtk24x ]; nativeBuildInputs = [ pkgconfig autoreconfHook ]; + checkInputs = [ pmccabe ]; doCheck = true; @@ -37,8 +40,9 @@ stdenv.mkDerivation rec { # Install mug and msg2pdf postInstall = stdenv.lib.optionalString withMug '' - cp -v toys/msg2pdf/msg2pdf $out/bin/ - cp -v toys/mug/mug $out/bin/ + for f in msg2pdf mug ; do + install -m755 toys/$f/$f $out/bin/$f + done ''; meta = with stdenv.lib; { @@ -46,6 +50,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; homepage = "http://www.djcbsoftware.nl/code/mu/"; platforms = platforms.mesaPlatforms; - maintainers = with maintainers; [ antono the-kenny ]; + maintainers = with maintainers; [ antono the-kenny peterhoeg ]; }; } diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix index bd76b89ccf74..124855525ac6 100644 --- a/pkgs/tools/text/kdiff3/default.nix +++ b/pkgs/tools/text/kdiff3/default.nix @@ -4,16 +4,15 @@ }: let - rev = "468652ce70b1214842cef0a021c81d056ec6aa01"; - unwrapped = kdeDerivation rec { name = "kdiff3-${version}"; - version = "1.7.0-${lib.strings.substring 0 7 rev}"; + version = "1.7.0-2017-02-19"; src = fetchgit { - url = "https://gitlab.com/tfischer/kdiff3"; - sha256 = "126xl7jbb26v2970ba1rw1d6clhd14p1f2avcwvj8wzqmniq5y5m"; - inherit rev; + # gitlab is outdated + url = https://anongit.kde.org/scratch/thomasfischer/kdiff3.git; + sha256 = "0znlk9m844a6qsskbd898w4yk48dkg5bkqlkd5abvyrk1jipzyy8"; + rev = "0d2ac328164e3cbe2db35875d3df3a86187ae84f"; }; setSourceRoot = ''sourceRoot="$(echo */kdiff3/)"''; diff --git a/pkgs/tools/text/languagetool/default.nix b/pkgs/tools/text/languagetool/default.nix index 383e9cf72c35..62d544ff4083 100644 --- a/pkgs/tools/text/languagetool/default.nix +++ b/pkgs/tools/text/languagetool/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "LanguageTool"; - version = "3.5"; + version = "3.7"; name = pname + "-" + version; src = fetchurl { url = "https://www.languagetool.org/download/${name}.zip"; - sha256 = "1axw8fqg2wlkmv45s71q5pg44sg1s06szpkjhyscy704i7d2jc34"; + sha256 = "04i49z022k3nyyr8hnlxima9k5id8qvh2nr3dv8zgcqm5sin6xx9"; }; buildInputs = [ unzip jdk ]; installPhase = |